{"instance_id": "commons-app__apps-android-commons-6324", "org": "commons-app", "repo": "apps-android-commons", "number": 6324, "state": "closed", "title": "Fix infinite loading circular progress bar after nominating for deletion", "body": "**Description (required)**\r\n\r\nFixes #5531 \r\n\r\nWhat changes did you make and why?\r\nParneet fixed the issue in his PR #5610 by making changes in the `MediaDetailFragment.java` file. However, that file was migrated to `Kotlin` and caused merge conflicts. So, I pull from his branch, copy the changes to the migrated file and refactor the related code for better code quality.\r\n\r\n**Tests performed (required)**\r\n\r\nTested prodDebug on Samsung A14 with API level 34.\r\n\r\n**Screenshots (for UI changes only)**\r\n\r\nhttps://github.com/user-attachments/assets/2be3519a-9076-45f6-8602-3a97a446bf79\r\n\r\n", "base": {"label": "commons-app:main", "ref": "main", "sha": "5d7f42d127600f205773214bb877472f259ff552"}, "resolved_issues": [{"number": 5531, "title": "[Bug]: Circular Progress bar keeps on moving even though nomination for deletion is successful", "body": "### Summary\n\nWhen the user clicks on 'Nominate for Deletion,' the circular progress bar keeps moving even though the nomination for deletion is successful. This doesn't provide any visible status and makes the user think that the process is ongoing. Only a notification is received, which can be piled up among other notifications.\n\n### Steps to reproduce\n\n1. Open the App\r\n2. Click on any contribution\r\n3. Click on Nominate for Deletion\n\n### Expected behaviour\n\nOnSuccess : Circular Progress bar should stop and Text should change to nominated for deletion\n\n### Actual behaviour\n\nOnSuccess : Circular Progress bar keeps on moving\n\n### Device name\n\nSamsung S21\n\n### Android version\n\nAndroid 14\n\n### Commons app version\n\n4.2.1-debug-HEAD~d4b473656\n\n### Device logs\n\n_No response_\n\n### Screen-shots\n\n\r\nhttps://github.com/commons-app/apps-android-commons/assets/114223204/f215652b-00a3-4256-8c34-c90eeadf31c0\r\n\r\n\n\n### Would you like to work on the issue?\n\nYes"}], "lang": "kotlin", "problem_statement": "[Bug]: Circular Progress bar keeps on moving even though nomination for deletion is successful\n### Summary\n\nWhen the user clicks on 'Nominate for Deletion,' the circular progress bar keeps moving even though the nomination for deletion is successful. This doesn't provide any visible status and makes the user think that the process is ongoing. Only a notification is received, which can be piled up among other notifications.\n\n### Steps to reproduce\n\n1. Open the App\r\n2. Click on any contribution\r\n3. Click on Nominate for Deletion\n\n### Expected behaviour\n\nOnSuccess : Circular Progress bar should stop and Text should change to nominated for deletion\n\n### Actual behaviour\n\nOnSuccess : Circular Progress bar keeps on moving\n\n### Device name\n\nSamsung S21\n\n### Android version\n\nAndroid 14\n\n### Commons app version\n\n4.2.1-debug-HEAD~d4b473656\n\n### Device logs\n\n_No response_\n\n### Screen-shots\n\n\r\nhttps://github.com/commons-app/apps-android-commons/assets/114223204/f215652b-00a3-4256-8c34-c90eeadf31c0\r\n\r\n\n\n### Would you like to work on the issue?\n\nYes\n", "hints": "please assign #5531 @nicolas-raoul \nCan I work on this @kanahia1 ?\nSure @neeldoshii, You can take it !", "pull_url": "https://github.com/commons-app/apps-android-commons/pull/6324", "issue_urls": ["https://github.com/commons-app/apps-android-commons/issues/5531"], "test_command": "./gradlew :app:testBetaDebugUnitTest --tests \"fr.free.nrw.commons.delete.ReasonBuilderTest\"", "fix_patch": "diff --git a/app/build.gradle.kts b/app/build.gradle.kts\nindex 9c53155a77..2e391a24fd 100644\n--- a/app/build.gradle.kts\n+++ b/app/build.gradle.kts\n@@ -347,6 +347,7 @@ dependencies {\n // Kotlin + coroutines\n implementation(libs.androidx.work.runtime.ktx)\n implementation(libs.androidx.work.runtime)\n+ implementation(libs.kotlinx.coroutines.rx2)\n testImplementation(libs.androidx.work.testing)\n \n //Glide\ndiff --git a/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.kt b/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.kt\nindex 09959d0ef5..3f9ae47ac1 100644\n--- a/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.kt\n@@ -53,7 +53,6 @@ class DeleteHelper @Inject constructor(\n media: Media?,\n reason: String?\n ): Single? {\n-\n if(context == null && media == null) {\n return null\n }\n@@ -86,7 +85,6 @@ class DeleteHelper @Inject constructor(\n * @return\n */\n private fun delete(media: Media, reason: String): Observable {\n- Timber.d(\"thread is delete %s\", Thread.currentThread().name)\n val summary = \"Nominating ${media.filename} for deletion.\"\n val calendar = Calendar.getInstance()\n val fileDeleteString = \"\"\"\ndiff --git a/app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.kt b/app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.kt\nindex 09018c249b..c4cd73b8a6 100644\n--- a/app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.kt\n@@ -2,21 +2,19 @@ package fr.free.nrw.commons.delete\n \n import android.annotation.SuppressLint\n import android.content.Context\n-\n-import fr.free.nrw.commons.utils.DateUtil\n-import java.util.Locale\n-\n-import javax.inject.Inject\n-import javax.inject.Singleton\n-\n import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.R\n-import fr.free.nrw.commons.profile.achievements.FeedbackResponse\n import fr.free.nrw.commons.auth.SessionManager\n import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient\n+import fr.free.nrw.commons.utils.DateUtil\n import fr.free.nrw.commons.utils.ViewUtilWrapper\n import io.reactivex.Single\n+import kotlinx.coroutines.Dispatchers\n+import kotlinx.coroutines.rx2.rxSingle\n import timber.log.Timber\n+import java.util.Locale\n+import javax.inject.Inject\n+import javax.inject.Singleton\n \n /**\n * This class handles the reason for deleting a Media object\n@@ -29,6 +27,8 @@ class ReasonBuilder @Inject constructor(\n private val viewUtilWrapper: ViewUtilWrapper\n ) {\n \n+ private val defaultFileUsagePageSize = 10\n+\n /**\n * To process the reason and append the media's upload date and uploaded_by_me string\n * @param media\n@@ -39,7 +39,7 @@ class ReasonBuilder @Inject constructor(\n if (media == null || reason == null) {\n return Single.just(\"Not known\")\n }\n- return fetchArticleNumber(media, reason)\n+ return getAndAppendFileUsage(media, reason)\n }\n \n /**\n@@ -54,27 +54,36 @@ class ReasonBuilder @Inject constructor(\n }\n }\n \n- private fun fetchArticleNumber(media: Media, reason: String): Single {\n- return if (checkAccount()) {\n- okHttpJsonApiClient\n- .getAchievements(sessionManager.userName)\n- .map { feedbackResponse -> appendArticlesUsed(feedbackResponse, media, reason) }\n- } else {\n- Single.just(\"\")\n+ private fun getAndAppendFileUsage(media: Media, reason: String): Single {\n+ return rxSingle(context = Dispatchers.IO) {\n+ if (!checkAccount()) return@rxSingle \"\"\n+\n+ try {\n+ val globalFileUsage = okHttpJsonApiClient.getGlobalFileUsages(\n+ fileName = media.filename,\n+ pageSize = defaultFileUsagePageSize\n+ )\n+ val globalUsages = globalFileUsage?.query?.pages?.sumOf { it.fileUsage.size } ?: 0\n+\n+ appendArticlesUsed(globalUsages, media, reason)\n+ } catch (e: Exception) {\n+ Timber.e(e, \"Error fetching file usage\")\n+ throw e\n+ }\n }\n }\n \n /**\n- * Takes the uploaded_by_me string, the upload date, name of articles using images\n+ * Takes the uploaded_by_me string, the upload date, no. of articles using images\n * and appends it to the received reason\n- * @param feedBack object\n+ * @param fileUsages No. of files/articles using this image\n * @param media whose upload data is to be fetched\n- * @param reason\n+ * @param reason string to be appended\n */\n @SuppressLint(\"StringFormatInvalid\")\n- private fun appendArticlesUsed(feedBack: FeedbackResponse, media: Media, reason: String): String {\n+ private fun appendArticlesUsed(fileUsages: Int, media: Media, reason: String): String {\n val reason1Template = context.getString(R.string.uploaded_by_myself)\n- return reason + String.format(Locale.getDefault(), reason1Template, prettyUploadedDate(media), feedBack.articlesUsingImages)\n+ return reason + String.format(Locale.getDefault(), reason1Template, prettyUploadedDate(media), fileUsages)\n .also { Timber.i(\"New Reason %s\", it) }\n }\n \ndiff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt\nindex 8a4d530c47..f371b733f7 100644\n--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt\n@@ -74,7 +74,6 @@ import fr.free.nrw.commons.BuildConfig\n import fr.free.nrw.commons.CameraPosition\n import fr.free.nrw.commons.CommonsApplication\n import fr.free.nrw.commons.CommonsApplication.Companion.instance\n-import fr.free.nrw.commons.locationpicker.LocationPicker\n import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.MediaDataExtractor\n import fr.free.nrw.commons.R\n@@ -102,6 +101,7 @@ import fr.free.nrw.commons.explore.depictions.WikidataItemDetailsActivity\n import fr.free.nrw.commons.kvstore.JsonKvStore\n import fr.free.nrw.commons.language.AppLanguageLookUpTable\n import fr.free.nrw.commons.location.LocationServiceManager\n+import fr.free.nrw.commons.locationpicker.LocationPicker\n import fr.free.nrw.commons.media.MediaDetailPagerFragment.MediaDetailProvider\n import fr.free.nrw.commons.profile.ProfileActivity\n import fr.free.nrw.commons.review.ReviewHelper\n@@ -116,6 +116,7 @@ import fr.free.nrw.commons.utils.LangCodeUtils.getLocalizedResources\n import fr.free.nrw.commons.utils.PermissionUtils.PERMISSIONS_STORAGE\n import fr.free.nrw.commons.utils.PermissionUtils.checkPermissionsAndPerformAction\n import fr.free.nrw.commons.utils.PermissionUtils.hasPermission\n+import fr.free.nrw.commons.utils.ViewUtil\n import fr.free.nrw.commons.utils.ViewUtil.showShortToast\n import fr.free.nrw.commons.utils.ViewUtilWrapper\n import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage.Revision\n@@ -125,6 +126,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers\n import io.reactivex.schedulers.Schedulers\n import org.apache.commons.lang3.StringUtils\n import timber.log.Timber\n+import java.lang.String.format\n import java.util.Date\n import java.util.Locale\n import java.util.Objects\n@@ -1646,7 +1648,7 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C\n getString(R.string.cancel),\n {\n val reason: String = input.text.toString()\n- onDeleteClickeddialogtext(reason)\n+ onDeleteClickedDialogText(reason)\n },\n {},\n input\n@@ -1700,26 +1702,48 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C\n resultSingle\n .subscribeOn(Schedulers.io())\n .observeOn(AndroidSchedulers.mainThread())\n- .subscribe { _ ->\n- if (applicationKvStore.getBoolean(\n- String.format(\n- NOMINATING_FOR_DELETION_MEDIA, media!!.imageUrl\n- ), false\n- )\n- ) {\n- applicationKvStore.remove(\n- String.format(\n- NOMINATING_FOR_DELETION_MEDIA,\n- media!!.imageUrl\n- )\n- )\n- callback!!.nominatingForDeletion(index)\n- }\n- }\n+ .subscribe(this::handleDeletionResult, this::handleDeletionError);\n+ }\n+\n+ /**\n+ * Disables Progress Bar and Update delete button text.\n+ */\n+ private fun disableProgressBar() {\n+ activity?.run {\n+ runOnUiThread(Runnable {\n+ binding.progressBarDeletion.visibility = View.GONE\n+ })\n+ } ?: return // Prevent NullPointerException when fragment is not attached to activity\n+ }\n+\n+ private fun handleDeletionResult(success: Boolean) {\n+ if (success) {\n+ binding.nominateDeletion.text = getString(R.string.nominated_for_deletion_btn)\n+ ViewUtil.showLongSnackbar(requireView(), getString(R.string.nominated_for_deletion))\n+ disableProgressBar()\n+ checkAndClearDeletionFlag()\n+ } else {\n+ disableProgressBar()\n+ }\n+ }\n+\n+ private fun handleDeletionError(throwable: Throwable) {\n+ throwable.printStackTrace()\n+ disableProgressBar()\n+ checkAndClearDeletionFlag()\n+ }\n+\n+ private fun checkAndClearDeletionFlag() {\n+ if (applicationKvStore\n+ .getBoolean(format(NOMINATING_FOR_DELETION_MEDIA, media!!.imageUrl), false)\n+ ) {\n+ applicationKvStore.remove(format(NOMINATING_FOR_DELETION_MEDIA, media!!.imageUrl))\n+ callback!!.nominatingForDeletion(index)\n+ }\n }\n \n @SuppressLint(\"CheckResult\")\n- private fun onDeleteClickeddialogtext(reason: String) {\n+ private fun onDeleteClickedDialogText(reason: String) {\n applicationKvStore.putBoolean(\n String.format(\n NOMINATING_FOR_DELETION_MEDIA,\n@@ -1736,22 +1760,7 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C\n resultSingletext\n .subscribeOn(Schedulers.io())\n .observeOn(AndroidSchedulers.mainThread())\n- .subscribe { _ ->\n- if (applicationKvStore.getBoolean(\n- String.format(\n- NOMINATING_FOR_DELETION_MEDIA, media!!.imageUrl\n- ), false\n- )\n- ) {\n- applicationKvStore.remove(\n- String.format(\n- NOMINATING_FOR_DELETION_MEDIA,\n- media!!.imageUrl\n- )\n- )\n- callback!!.nominatingForDeletion(index)\n- }\n- }\n+ .subscribe(this::handleDeletionResult, this::handleDeletionError);\n }\n \n private fun onSeeMoreClicked() {\ndiff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.kt b/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.kt\nindex 4fa7979d2f..a2f92c2e67 100644\n--- a/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.kt\n@@ -281,6 +281,7 @@ class OkHttpJsonApiClient @Inject constructor(\n FeedbackResponse::class.java\n )\n } catch (e: Exception) {\n+ e.printStackTrace()\n return@fromCallable FeedbackResponse(0, 0, 0, FeaturedImages(0, 0), 0, \"\")\n }\n }\ndiff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml\nindex 68dba88bec..c9a2d16c86 100644\n--- a/app/src/main/res/values/strings.xml\n+++ b/app/src/main/res/values/strings.xml\n@@ -431,7 +431,7 @@\n I changed my mind, I don\\'t want it to be publicly visible anymore\n Sorry this picture is not interesting for an encyclopedia\n \n- Uploaded by myself on %1$s, used in %2$d article(s).\n+ Uploaded by myself on %1$s, used in %2$d article(s) at least.\n \n Welcome to Commons!\\n\n Upload your first media by tapping on the add button.\n@@ -876,4 +876,5 @@ Upload your first media by tapping on the add button.\n Show in Nearby\n Created and uploaded by: %1$s\n Created by %1$s and uploaded by %2$s\n+ Nominated for Deletion\n \ndiff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml\nindex f38357b045..df4b7bb43a 100644\n--- a/gradle/libs.versions.toml\n+++ b/gradle/libs.versions.toml\n@@ -16,6 +16,7 @@ constraintlayout = \"1.1.3\"\n coordinates2country = \"1.8\"\n dexcount = \"4.0.0\"\n githubTripletPlay = \"2.7.2\"\n+kotlinxCoroutinesRx2 = \"1.8.0\"\n osmdroidAndroid = \"6.1.17\"\n testCore = \"1.4.0\"\n coreKtx = \"1.9.0\"\n@@ -127,6 +128,7 @@ dagger-compiler = { module = \"com.google.dagger:dagger-compiler\", version.ref =\n facebook-fresco = { module = \"com.facebook.fresco:fresco\", version.ref = \"frescoVersion\" }\n glide-compiler = { module = \"com.github.bumptech.glide:compiler\", version.ref = \"glide\" }\n glide = { module = \"com.github.bumptech.glide:glide\", version.ref = \"glide\" }\n+kotlinx-coroutines-rx2 = { module = \"org.jetbrains.kotlinx:kotlinx-coroutines-rx2\", version.ref = \"kotlinxCoroutinesRx2\" }\n photoview = { module = \"com.github.chrisbanes:PhotoView\", version.ref = \"photoviewVersion\" }\n \n # RxJava and Reactive Programming\n", "test_patch": "diff --git a/app/src/test/kotlin/fr/free/nrw/commons/delete/ReasonBuilderTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/delete/ReasonBuilderTest.kt\nindex e89a02dece..bd67475ee3 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/delete/ReasonBuilderTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/delete/ReasonBuilderTest.kt\n@@ -5,13 +5,14 @@ import android.content.res.Resources\n import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.auth.SessionManager\n+import fr.free.nrw.commons.fileusages.GlobalFileUsagesResponse\n import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient\n-import fr.free.nrw.commons.profile.achievements.FeedbackResponse\n import fr.free.nrw.commons.profile.leaderboard.LeaderboardResponse\n import fr.free.nrw.commons.profile.leaderboard.UpdateAvatarResponse\n import fr.free.nrw.commons.utils.ViewUtilWrapper\n import io.reactivex.Observable\n import io.reactivex.Single\n+import kotlinx.coroutines.test.runTest\n import media\n import org.junit.Before\n import org.junit.Test\n@@ -58,16 +59,16 @@ class ReasonBuilderTest {\n PowerMockito.`when`(context?.getString(R.string.user_not_logged_in))\n .thenReturn(\"Log-in expired. Please log in again.\")\n \n- reasonBuilder!!.getReason(mock(Media::class.java), \"test\")\n+ reasonBuilder!!.getReason(mock(Media::class.java), \"test\").test().await()\n verify(sessionManager, times(1))!!.forceLogin(any(Context::class.java))\n }\n \n @Test\n- fun getReason() {\n+ fun getReason() = runTest {\n `when`(sessionManager?.userName).thenReturn(\"Testuser\")\n `when`(sessionManager?.doesAccountExist()).thenReturn(true)\n- `when`(okHttpJsonApiClient!!.getAchievements(anyString()))\n- .thenReturn(Single.just(mock(FeedbackResponse::class.java)))\n+ `when`(okHttpJsonApiClient!!.getGlobalFileUsages(anyString(), anyInt()))\n+ .thenReturn(mock(GlobalFileUsagesResponse::class.java))\n `when`(okHttpJsonApiClient!!.getLeaderboard(anyString(), anyString(), anyString(), anyString(), anyString()))\n .thenReturn(Observable.just(mock(LeaderboardResponse::class.java)))\n `when`(okHttpJsonApiClient!!.setAvatar(anyString(), anyString()))\n@@ -75,8 +76,8 @@ class ReasonBuilderTest {\n \n val media = media(filename = \"test_file\", dateUploaded = Date())\n \n- reasonBuilder!!.getReason(media, \"test\")\n+ reasonBuilder!!.getReason(media, \"test\").test().await()\n verify(sessionManager, times(0))!!.forceLogin(any(Context::class.java))\n- verify(okHttpJsonApiClient, times(1))!!.getAchievements(anyString())\n+ verify(okHttpJsonApiClient, times(1))!!.getGlobalFileUsages(anyString(), anyInt())\n }\n }\n", "n2p_tests": {"fr.free.nrw.commons.delete.ReasonBuilderTest.getReason": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {"fr.free.nrw.commons.delete.ReasonBuilderTest.forceLoginWhenAccountIsNull": {"run": "PASS", "test": "FAIL", "fix": "PASS"}}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "element-hq__element-x-android-2588", "org": "element-hq", "repo": "element-x-android", "number": 2588, "state": "closed", "title": "Remove Welcome screen from the FTUE", "body": "\r\n \r\n## Type of change\r\n\r\n- [ ] Feature\r\n- [ ] Bugfix\r\n- [ ] Technical\r\n- [x] Other : UI flow changes\r\n\r\n## Content\r\n\r\n- Remove `WelcomeScreen` from the FTUE flow.\r\n\r\n## Motivation and context\r\n\r\nCloses #2584.\r\n\r\n## Screenshots / GIFs\r\n\r\nA few screenshots should have been removed.\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Log into the app.\r\n\r\nThe welcome screen, which should appear as the first step in the FTUE flow, should be gone. You should see the notification permission screen instead in API >= 33 or the analytics one in API < 33.\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s): 12, 13.\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 23\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [x] Pull request is based on the develop branch\r\n- [x] Pull request includes a new file under ./changelog.d. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#changelog\r\n- [x] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)\r\n- [x] You've made a self review of your PR\r\n", "base": {"label": "element-hq:develop", "ref": "develop", "sha": "62435d674730503773b1ed438627a47e2eb996a1"}, "resolved_issues": [{"number": 2584, "title": "[Task] FTUE - Remove the welcome screen", "body": "Please see and discuss the details in the meta issue."}], "lang": "kotlin", "problem_statement": "[Task] FTUE - Remove the welcome screen\nPlease see and discuss the details in the meta issue.\n", "pull_url": "https://github.com/element-hq/element-x-android/pull/2588", "issue_urls": ["https://github.com/element-hq/element-x-android/issues/2584"], "test_command": "./gradlew :features:ftue:impl:testDebugUnitTest --tests \"io.element.android.features.ftue.impl.DefaultFtueStateTests\"", "fix_patch": "diff --git a/changelog.d/2584.misc b/changelog.d/2584.misc\nnew file mode 100644\nindex 00000000000..de85b9d90fa\n--- /dev/null\n+++ b/changelog.d/2584.misc\n@@ -0,0 +1,1 @@\n+Remove Welcome screen from the FTUE.\ndiff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt\nindex 983e0c8db2e..652b6dddd40 100644\n--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt\n+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt\n@@ -36,7 +36,6 @@ import io.element.android.features.ftue.api.FtueEntryPoint\n import io.element.android.features.ftue.impl.notifications.NotificationsOptInNode\n import io.element.android.features.ftue.impl.state.DefaultFtueState\n import io.element.android.features.ftue.impl.state.FtueStep\n-import io.element.android.features.ftue.impl.welcome.WelcomeNode\n import io.element.android.features.lockscreen.api.LockScreenEntryPoint\n import io.element.android.libraries.architecture.BackstackView\n import io.element.android.libraries.architecture.BaseFlowNode\n@@ -73,9 +72,6 @@ class FtueFlowNode @AssistedInject constructor(\n @Parcelize\n data object Placeholder : NavTarget\n \n- @Parcelize\n- data object WelcomeScreen : NavTarget\n-\n @Parcelize\n data object NotificationsOptIn : NavTarget\n \n@@ -110,15 +106,6 @@ class FtueFlowNode @AssistedInject constructor(\n NavTarget.Placeholder -> {\n createNode(buildContext)\n }\n- NavTarget.WelcomeScreen -> {\n- val callback = object : WelcomeNode.Callback {\n- override fun onContinueClicked() {\n- ftueState.setWelcomeScreenShown()\n- lifecycleScope.launch { moveToNextStep() }\n- }\n- }\n- createNode(buildContext, listOf(callback))\n- }\n NavTarget.NotificationsOptIn -> {\n val callback = object : NotificationsOptInNode.Callback {\n override fun onNotificationsOptInFinished() {\n@@ -146,9 +133,6 @@ class FtueFlowNode @AssistedInject constructor(\n \n private fun moveToNextStep() {\n when (ftueState.getNextStep()) {\n- FtueStep.WelcomeScreen -> {\n- backstack.newRoot(NavTarget.WelcomeScreen)\n- }\n FtueStep.NotificationsOptIn -> {\n backstack.newRoot(NavTarget.NotificationsOptIn)\n }\ndiff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueState.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueState.kt\nindex ce7a769187f..f1a1c84545e 100644\n--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueState.kt\n+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueState.kt\n@@ -21,7 +21,6 @@ import android.os.Build\n import androidx.annotation.VisibleForTesting\n import com.squareup.anvil.annotations.ContributesBinding\n import io.element.android.features.ftue.api.state.FtueState\n-import io.element.android.features.ftue.impl.welcome.state.WelcomeScreenState\n import io.element.android.features.lockscreen.api.LockScreenService\n import io.element.android.libraries.di.SessionScope\n import io.element.android.libraries.permissions.api.PermissionStateProvider\n@@ -40,14 +39,12 @@ class DefaultFtueState @Inject constructor(\n private val sdkVersionProvider: BuildVersionSdkIntProvider,\n coroutineScope: CoroutineScope,\n private val analyticsService: AnalyticsService,\n- private val welcomeScreenState: WelcomeScreenState,\n private val permissionStateProvider: PermissionStateProvider,\n private val lockScreenService: LockScreenService,\n ) : FtueState {\n override val shouldDisplayFlow = MutableStateFlow(isAnyStepIncomplete())\n \n override suspend fun reset() {\n- welcomeScreenState.reset()\n analyticsService.reset()\n if (sdkVersionProvider.isAtLeast(Build.VERSION_CODES.TIRAMISU)) {\n permissionStateProvider.resetPermission(Manifest.permission.POST_NOTIFICATIONS)\n@@ -62,12 +59,7 @@ class DefaultFtueState @Inject constructor(\n \n fun getNextStep(currentStep: FtueStep? = null): FtueStep? =\n when (currentStep) {\n- null -> if (shouldDisplayWelcomeScreen()) {\n- FtueStep.WelcomeScreen\n- } else {\n- getNextStep(FtueStep.WelcomeScreen)\n- }\n- FtueStep.WelcomeScreen -> if (shouldAskNotificationPermissions()) {\n+ null -> if (shouldAskNotificationPermissions()) {\n FtueStep.NotificationsOptIn\n } else {\n getNextStep(FtueStep.NotificationsOptIn)\n@@ -87,7 +79,6 @@ class DefaultFtueState @Inject constructor(\n \n private fun isAnyStepIncomplete(): Boolean {\n return listOf(\n- { shouldDisplayWelcomeScreen() },\n { shouldAskNotificationPermissions() },\n { needsAnalyticsOptIn() },\n { shouldDisplayLockscreenSetup() },\n@@ -99,10 +90,6 @@ class DefaultFtueState @Inject constructor(\n return runBlocking { analyticsService.didAskUserConsent().first().not() }\n }\n \n- private fun shouldDisplayWelcomeScreen(): Boolean {\n- return welcomeScreenState.isWelcomeScreenNeeded()\n- }\n-\n private fun shouldAskNotificationPermissions(): Boolean {\n return if (sdkVersionProvider.isAtLeast(Build.VERSION_CODES.TIRAMISU)) {\n val permission = Manifest.permission.POST_NOTIFICATIONS\n@@ -120,11 +107,6 @@ class DefaultFtueState @Inject constructor(\n }\n }\n \n- fun setWelcomeScreenShown() {\n- welcomeScreenState.setWelcomeScreenShown()\n- updateState()\n- }\n-\n @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)\n internal fun updateState() {\n shouldDisplayFlow.value = isAnyStepIncomplete()\n@@ -132,7 +114,6 @@ class DefaultFtueState @Inject constructor(\n }\n \n sealed interface FtueStep {\n- data object WelcomeScreen : FtueStep\n data object NotificationsOptIn : FtueStep\n data object AnalyticsOptIn : FtueStep\n data object LockscreenSetup : FtueStep\n", "test_patch": "diff --git a/.maestro/tests/account/login.yaml b/.maestro/tests/account/login.yaml\nindex 397cc61f5c8..dcb5cd32234 100644\n--- a/.maestro/tests/account/login.yaml\n+++ b/.maestro/tests/account/login.yaml\n@@ -23,8 +23,6 @@ appId: ${MAESTRO_APP_ID}\n - inputText: ${MAESTRO_PASSWORD}\n - pressKey: Enter\n - tapOn: \"Continue\"\n-- runFlow: ../assertions/assertWelcomeScreenDisplayed.yaml\n-- tapOn: \"Continue\"\n - runFlow: ../assertions/assertAnalyticsDisplayed.yaml\n - tapOn: \"Not now\"\n - runFlow: ../assertions/assertHomeDisplayed.yaml\ndiff --git a/.maestro/tests/assertions/assertWelcomeScreenDisplayed.yaml b/.maestro/tests/assertions/assertWelcomeScreenDisplayed.yaml\ndeleted file mode 100644\nindex 340d21ff2e0..00000000000\n--- a/.maestro/tests/assertions/assertWelcomeScreenDisplayed.yaml\n+++ /dev/null\n@@ -1,6 +0,0 @@\n-appId: ${MAESTRO_APP_ID}\n----\n-- extendedWaitUntil:\n- visible:\n- id: \"welcome_screen-title\"\n- timeout: 10000\ndiff --git a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueStateTests.kt b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueStateTests.kt\nindex 834aaa5c1f4..1f0b8178509 100644\n--- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueStateTests.kt\n+++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueStateTests.kt\n@@ -20,7 +20,6 @@ import android.os.Build\n import com.google.common.truth.Truth.assertThat\n import io.element.android.features.ftue.impl.state.DefaultFtueState\n import io.element.android.features.ftue.impl.state.FtueStep\n-import io.element.android.features.ftue.impl.welcome.state.FakeWelcomeState\n import io.element.android.features.lockscreen.api.LockScreenService\n import io.element.android.features.lockscreen.test.FakeLockScreenService\n import io.element.android.libraries.permissions.impl.FakePermissionStateProvider\n@@ -47,7 +46,6 @@ class DefaultFtueStateTests {\n \n @Test\n fun `given all checks being true, should display flow is false`() = runTest {\n- val welcomeState = FakeWelcomeState()\n val analyticsService = FakeAnalyticsService()\n val permissionStateProvider = FakePermissionStateProvider(permissionGranted = true)\n val lockScreenService = FakeLockScreenService()\n@@ -55,13 +53,11 @@ class DefaultFtueStateTests {\n \n val state = createState(\n coroutineScope = coroutineScope,\n- welcomeState = welcomeState,\n analyticsService = analyticsService,\n permissionStateProvider = permissionStateProvider,\n lockScreenService = lockScreenService,\n )\n \n- welcomeState.setWelcomeScreenShown()\n analyticsService.setDidAskUserConsent()\n permissionStateProvider.setPermissionGranted()\n lockScreenService.setIsPinSetup(true)\n@@ -75,7 +71,6 @@ class DefaultFtueStateTests {\n \n @Test\n fun `traverse flow`() = runTest {\n- val welcomeState = FakeWelcomeState()\n val analyticsService = FakeAnalyticsService()\n val permissionStateProvider = FakePermissionStateProvider(permissionGranted = false)\n val lockScreenService = FakeLockScreenService()\n@@ -83,26 +78,21 @@ class DefaultFtueStateTests {\n \n val state = createState(\n coroutineScope = coroutineScope,\n- welcomeState = welcomeState,\n analyticsService = analyticsService,\n permissionStateProvider = permissionStateProvider,\n lockScreenService = lockScreenService,\n )\n val steps = mutableListOf()\n \n- // First step, welcome screen\n- steps.add(state.getNextStep(steps.lastOrNull()))\n- welcomeState.setWelcomeScreenShown()\n-\n- // Second step, notifications opt in\n+ // Notifications opt in\n steps.add(state.getNextStep(steps.lastOrNull()))\n permissionStateProvider.setPermissionGranted()\n \n- // Third step, entering PIN code\n+ // Entering PIN code\n steps.add(state.getNextStep(steps.lastOrNull()))\n lockScreenService.setIsPinSetup(true)\n \n- // Fourth step, analytics opt in\n+ // Analytics opt in\n steps.add(state.getNextStep(steps.lastOrNull()))\n analyticsService.setDidAskUserConsent()\n \n@@ -110,7 +100,6 @@ class DefaultFtueStateTests {\n steps.add(state.getNextStep(steps.lastOrNull()))\n \n assertThat(steps).containsExactly(\n- FtueStep.WelcomeScreen,\n FtueStep.NotificationsOptIn,\n FtueStep.LockscreenSetup,\n FtueStep.AnalyticsOptIn,\n@@ -135,15 +124,14 @@ class DefaultFtueStateTests {\n lockScreenService = lockScreenService,\n )\n \n- // Skip first 3 steps\n- state.setWelcomeScreenShown()\n+ // Skip first 2 steps\n permissionStateProvider.setPermissionGranted()\n lockScreenService.setIsPinSetup(true)\n \n assertThat(state.getNextStep()).isEqualTo(FtueStep.AnalyticsOptIn)\n \n analyticsService.setDidAskUserConsent()\n- assertThat(state.getNextStep(FtueStep.WelcomeScreen)).isNull()\n+ assertThat(state.getNextStep(null)).isNull()\n \n // Cleanup\n coroutineScope.cancel()\n@@ -162,14 +150,12 @@ class DefaultFtueStateTests {\n lockScreenService = lockScreenService,\n )\n \n- assertThat(state.getNextStep()).isEqualTo(FtueStep.WelcomeScreen)\n- state.setWelcomeScreenShown()\n lockScreenService.setIsPinSetup(true)\n \n assertThat(state.getNextStep()).isEqualTo(FtueStep.AnalyticsOptIn)\n \n analyticsService.setDidAskUserConsent()\n- assertThat(state.getNextStep(FtueStep.WelcomeScreen)).isNull()\n+ assertThat(state.getNextStep(null)).isNull()\n \n // Cleanup\n coroutineScope.cancel()\n@@ -177,7 +163,6 @@ class DefaultFtueStateTests {\n \n private fun createState(\n coroutineScope: CoroutineScope,\n- welcomeState: FakeWelcomeState = FakeWelcomeState(),\n analyticsService: AnalyticsService = FakeAnalyticsService(),\n permissionStateProvider: FakePermissionStateProvider = FakePermissionStateProvider(permissionGranted = false),\n lockScreenService: LockScreenService = FakeLockScreenService(),\n@@ -187,7 +172,6 @@ class DefaultFtueStateTests {\n sdkVersionProvider = FakeBuildVersionSdkIntProvider(sdkIntVersion),\n coroutineScope = coroutineScope,\n analyticsService = analyticsService,\n- welcomeScreenState = welcomeState,\n permissionStateProvider = permissionStateProvider,\n lockScreenService = lockScreenService,\n )\n", "n2p_tests": {"io.element.android.features.ftue.impl.DefaultFtueStateTests.traverse flow": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.ftue.impl.DefaultFtueStateTests.if version is older than 13 we don't display the notification opt in screen": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.ftue.impl.DefaultFtueStateTests.given all checks being true, should display flow is false": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.ftue.impl.DefaultFtueStateTests.given any check being false, should display flow is true": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.ftue.impl.DefaultFtueStateTests.if a check for a step is true, start from the next one": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "element-hq__element-x-android-2594", "org": "element-hq", "repo": "element-x-android", "number": 2594, "state": "closed", "title": "Move session verification to FTUE flow, make it mandatory", "body": "\r\n \r\n## Type of change\r\n\r\n- [x] Feature\r\n- [ ] Bugfix\r\n- [ ] Technical\r\n- [ ] Other :\r\n\r\n## Content\r\n\r\n- Moves the session verification flow to be the first step of the FTUE flow.\r\n- Makes it mandatory.\r\n- Removes session verification banner.\r\n- Implements new designs from [Figma](https://www.figma.com/file/qjs3RKuofeKzBRPnOmLo2a/OIDC-sign-in-with-QR-code?type=design&node-id=1%3A839&mode=design&t=SRVsMNZV8b43XVtb-1).\r\n- Fixes bug with verification cancellation.\r\n\r\n## Motivation and context\r\n\r\nCloses #2580.\r\n\r\n## Screenshots / GIFs\r\n\r\n[verification-in-ftue.webm](https://github.com/element-hq/element-x-android/assets/480955/9448f31d-5fd5-46c6-aba3-3f1062e85f75)\r\n\r\n## Tests\r\n\r\n- Do a fresh log in.\r\n- The FTUE flow should now start with the session verification. It shouldn't be skippable.\r\n\r\n## Tested devices\r\n\r\n- [x] Physical\r\n- [ ] Emulator\r\n- OS version(s): 14\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 23\r\n- [x] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [x] Pull request is based on the develop branch\r\n- [x] Pull request includes a new file under ./changelog.d. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#changelog\r\n- [x] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)\r\n- [x] You've made a self review of your PR\r\n", "base": {"label": "element-hq:develop", "ref": "develop", "sha": "05f6770d356d8256e7ee7f9c0f96b05dc8c94138"}, "resolved_issues": [{"number": 2580, "title": "[Task] FTUE - Move session verification to the login flow", "body": "Please see and discuss the details in the meta issue."}], "lang": "kotlin", "problem_statement": "[Task] FTUE - Move session verification to the login flow\nPlease see and discuss the details in the meta issue.\n", "pull_url": "https://github.com/element-hq/element-x-android/pull/2594", "issue_urls": ["https://github.com/element-hq/element-x-android/issues/2580"], "test_command": "./gradlew :features:preferences:impl:testDebugUnitTest --tests \"io.element.android.features.preferences.impl.root.PreferencesRootPresenterTest\" :features:messages:impl:testDebugUnitTest --tests \"io.element.android.features.messages.impl.timeline.TimelinePresenterTest\" --tests \"io.element.android.features.messages.impl.MessagesPresenterTest\" :features:roomlist:impl:testDebugUnitTest --tests \"io.element.android.features.roomlist.impl.RoomListViewTest\" --tests \"io.element.android.features.roomlist.impl.RoomListPresenterTests\" :features:verifysession:impl:testDebugUnitTest --tests \"io.element.android.features.verifysession.impl.VerifySelfSessionViewTest\" --tests \"io.element.android.features.verifysession.impl.VerifySelfSessionPresenterTests\" :features:ftue:impl:testDebugUnitTest --tests \"io.element.android.features.ftue.impl.DefaultFtueServiceTests\" :appnav:testDebugUnitTest --tests \"io.element.android.appnav.loggedin.LoggedInPresenterTest\"", "fix_patch": "diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt\nindex b59c1cebdf7..22300b77142 100644\n--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt\n+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt\n@@ -19,8 +19,6 @@ package io.element.android.appnav\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage\n import io.element.android.libraries.matrix.api.room.RoomMembershipObserver\n-import io.element.android.libraries.matrix.api.verification.SessionVerificationService\n-import io.element.android.libraries.matrix.api.verification.VerificationFlowState\n import io.element.android.libraries.ui.strings.CommonStrings\n import kotlinx.coroutines.CoroutineScope\n import kotlinx.coroutines.Job\n@@ -34,16 +32,12 @@ import javax.inject.Inject\n class LoggedInEventProcessor @Inject constructor(\n private val snackbarDispatcher: SnackbarDispatcher,\n roomMembershipObserver: RoomMembershipObserver,\n- sessionVerificationService: SessionVerificationService,\n ) {\n private var observingJob: Job? = null\n \n private val displayLeftRoomMessage = roomMembershipObserver.updates\n .map { !it.isUserInRoom }\n \n- private val displayVerificationSuccessfulMessage = sessionVerificationService.verificationFlowState\n- .map { it == VerificationFlowState.Finished }\n-\n fun observeEvents(coroutineScope: CoroutineScope) {\n observingJob = coroutineScope.launch {\n displayLeftRoomMessage\n@@ -52,13 +46,6 @@ class LoggedInEventProcessor @Inject constructor(\n displayMessage(CommonStrings.common_current_user_left_room)\n }\n .launchIn(this)\n-\n- displayVerificationSuccessfulMessage\n- .filter { it }\n- .onEach {\n- displayMessage(CommonStrings.common_verification_complete)\n- }\n- .launchIn(this)\n }\n }\n \ndiff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt\nindex a9dd485285d..2027f2868a4 100644\n--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt\n+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt\n@@ -45,6 +45,7 @@ import io.element.android.appnav.room.RoomFlowNode\n import io.element.android.appnav.room.RoomLoadedFlowNode\n import io.element.android.features.createroom.api.CreateRoomEntryPoint\n import io.element.android.features.ftue.api.FtueEntryPoint\n+import io.element.android.features.ftue.api.state.FtueService\n import io.element.android.features.ftue.api.state.FtueState\n import io.element.android.features.invitelist.api.InviteListEntryPoint\n import io.element.android.features.lockscreen.api.LockScreenEntryPoint\n@@ -56,13 +57,13 @@ import io.element.android.features.preferences.api.PreferencesEntryPoint\n import io.element.android.features.roomdirectory.api.RoomDirectoryEntryPoint\n import io.element.android.features.roomlist.api.RoomListEntryPoint\n import io.element.android.features.securebackup.api.SecureBackupEntryPoint\n-import io.element.android.features.verifysession.api.VerifySessionEntryPoint\n import io.element.android.libraries.architecture.BackstackView\n import io.element.android.libraries.architecture.BaseFlowNode\n import io.element.android.libraries.architecture.createNode\n import io.element.android.libraries.architecture.waitForChildAttached\n import io.element.android.libraries.deeplink.DeeplinkData\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n+import io.element.android.libraries.di.AppScope\n import io.element.android.libraries.di.SessionScope\n import io.element.android.libraries.matrix.api.MatrixClient\n import io.element.android.libraries.matrix.api.core.MAIN_SPACE\n@@ -75,6 +76,8 @@ import kotlinx.coroutines.CoroutineScope\n import kotlinx.coroutines.FlowPreview\n import kotlinx.coroutines.flow.combine\n import kotlinx.coroutines.flow.debounce\n+import kotlinx.coroutines.flow.launchIn\n+import kotlinx.coroutines.flow.onEach\n import kotlinx.coroutines.launch\n import kotlinx.coroutines.withContext\n import kotlinx.parcelize.Parcelize\n@@ -88,14 +91,13 @@ class LoggedInFlowNode @AssistedInject constructor(\n private val preferencesEntryPoint: PreferencesEntryPoint,\n private val createRoomEntryPoint: CreateRoomEntryPoint,\n private val appNavigationStateService: AppNavigationStateService,\n- private val verifySessionEntryPoint: VerifySessionEntryPoint,\n private val secureBackupEntryPoint: SecureBackupEntryPoint,\n private val inviteListEntryPoint: InviteListEntryPoint,\n private val ftueEntryPoint: FtueEntryPoint,\n private val coroutineScope: CoroutineScope,\n private val networkMonitor: NetworkMonitor,\n private val notificationDrawerManager: NotificationDrawerManager,\n- private val ftueState: FtueState,\n+ private val ftueService: FtueService,\n private val lockScreenEntryPoint: LockScreenEntryPoint,\n private val lockScreenStateService: LockScreenService,\n private val roomDirectoryEntryPoint: RoomDirectoryEntryPoint,\n@@ -103,7 +105,7 @@ class LoggedInFlowNode @AssistedInject constructor(\n snackbarDispatcher: SnackbarDispatcher,\n ) : BaseFlowNode(\n backstack = BackStack(\n- initialElement = NavTarget.RoomList,\n+ initialElement = NavTarget.Placeholder,\n savedStateMap = buildContext.savedStateMap,\n ),\n permanentNavModel = PermanentNavModel(\n@@ -121,7 +123,6 @@ class LoggedInFlowNode @AssistedInject constructor(\n private val loggedInFlowProcessor = LoggedInEventProcessor(\n snackbarDispatcher,\n matrixClient.roomMembershipObserver(),\n- matrixClient.sessionVerificationService(),\n )\n \n override fun onBuilt() {\n@@ -133,9 +134,15 @@ class LoggedInFlowNode @AssistedInject constructor(\n appNavigationStateService.onNavigateToSpace(id, MAIN_SPACE)\n loggedInFlowProcessor.observeEvents(coroutineScope)\n \n- if (ftueState.shouldDisplayFlow.value) {\n- backstack.push(NavTarget.Ftue)\n- }\n+ ftueService.state\n+ .onEach { ftueState ->\n+ when (ftueState) {\n+ is FtueState.Unknown -> Unit // Nothing to do\n+ is FtueState.Incomplete -> backstack.safeRoot(NavTarget.Ftue)\n+ is FtueState.Complete -> backstack.safeRoot(NavTarget.RoomList)\n+ }\n+ }\n+ .launchIn(lifecycleScope)\n },\n onStop = {\n coroutineScope.launch {\n@@ -191,6 +198,9 @@ class LoggedInFlowNode @AssistedInject constructor(\n }\n \n sealed interface NavTarget : Parcelable {\n+ @Parcelize\n+ data object Placeholder : NavTarget\n+\n @Parcelize\n data object LoggedInPermanent : NavTarget\n \n@@ -214,9 +224,6 @@ class LoggedInFlowNode @AssistedInject constructor(\n @Parcelize\n data object CreateRoom : NavTarget\n \n- @Parcelize\n- data object VerifySession : NavTarget\n-\n @Parcelize\n data class SecureBackup(\n val initialElement: SecureBackupEntryPoint.InitialTarget = SecureBackupEntryPoint.InitialTarget.Root\n@@ -234,6 +241,7 @@ class LoggedInFlowNode @AssistedInject constructor(\n \n override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {\n return when (navTarget) {\n+ NavTarget.Placeholder -> createNode(buildContext)\n NavTarget.LoggedInPermanent -> {\n createNode(buildContext)\n }\n@@ -256,10 +264,6 @@ class LoggedInFlowNode @AssistedInject constructor(\n backstack.push(NavTarget.CreateRoom)\n }\n \n- override fun onSessionVerificationClicked() {\n- backstack.push(NavTarget.VerifySession)\n- }\n-\n override fun onSessionConfirmRecoveryKeyClicked() {\n backstack.push(NavTarget.SecureBackup(initialElement = SecureBackupEntryPoint.InitialTarget.EnterRecoveryKey))\n }\n@@ -308,10 +312,6 @@ class LoggedInFlowNode @AssistedInject constructor(\n plugins().forEach { it.onOpenBugReport() }\n }\n \n- override fun onVerifyClicked() {\n- backstack.push(NavTarget.VerifySession)\n- }\n-\n override fun onSecureBackupClicked() {\n backstack.push(NavTarget.SecureBackup())\n }\n@@ -338,25 +338,6 @@ class LoggedInFlowNode @AssistedInject constructor(\n .callback(callback)\n .build()\n }\n- NavTarget.VerifySession -> {\n- val callback = object : VerifySessionEntryPoint.Callback {\n- override fun onEnterRecoveryKey() {\n- backstack.replace(\n- NavTarget.SecureBackup(\n- initialElement = SecureBackupEntryPoint.InitialTarget.EnterRecoveryKey\n- )\n- )\n- }\n-\n- override fun onDone() {\n- backstack.pop()\n- }\n- }\n- verifySessionEntryPoint\n- .nodeBuilder(this, buildContext)\n- .callback(callback)\n- .build()\n- }\n is NavTarget.SecureBackup -> {\n secureBackupEntryPoint.nodeBuilder(this, buildContext)\n .params(SecureBackupEntryPoint.Params(initialElement = navTarget.initialElement))\n@@ -381,7 +362,7 @@ class LoggedInFlowNode @AssistedInject constructor(\n ftueEntryPoint.nodeBuilder(this, buildContext)\n .callback(object : FtueEntryPoint.Callback {\n override fun onFtueFlowFinished() {\n- backstack.pop()\n+ lifecycleScope.launch { attachRoomList() }\n }\n })\n .build()\n@@ -398,20 +379,23 @@ class LoggedInFlowNode @AssistedInject constructor(\n }\n }\n \n- suspend fun attachRoot(): Node {\n- return attachChild {\n+ suspend fun attachRoomList() {\n+ if (!canShowRoomList()) return\n+ attachChild {\n backstack.singleTop(NavTarget.RoomList)\n }\n }\n \n- suspend fun attachRoom(roomId: RoomId): RoomFlowNode {\n- return attachChild {\n+ suspend fun attachRoom(roomId: RoomId) {\n+ if (!canShowRoomList()) return\n+ attachChild {\n backstack.singleTop(NavTarget.RoomList)\n backstack.push(NavTarget.Room(roomId))\n }\n }\n \n internal suspend fun attachInviteList(deeplinkData: DeeplinkData.InviteList) = withContext(lifecycleScope.coroutineContext) {\n+ if (!canShowRoomList()) return@withContext\n notificationDrawerManager.clearMembershipNotificationForSession(deeplinkData.sessionId)\n backstack.singleTop(NavTarget.RoomList)\n backstack.push(NavTarget.InviteList)\n@@ -420,13 +404,17 @@ class LoggedInFlowNode @AssistedInject constructor(\n }\n }\n \n+ private fun canShowRoomList(): Boolean {\n+ return ftueService.state.value is FtueState.Complete\n+ }\n+\n @Composable\n override fun View(modifier: Modifier) {\n Box(modifier = modifier) {\n val lockScreenState by lockScreenStateService.lockState.collectAsState()\n+ val isFtueDisplayed by ftueService.state.collectAsState()\n BackstackView()\n- val isFtueDisplayed by ftueState.shouldDisplayFlow.collectAsState()\n- if (!isFtueDisplayed) {\n+ if (isFtueDisplayed is FtueState.Complete) {\n PermanentChild(permanentNavModel = permanentNavModel, navTarget = NavTarget.LoggedInPermanent)\n }\n if (lockScreenState == LockScreenLockState.Locked) {\n@@ -434,4 +422,10 @@ class LoggedInFlowNode @AssistedInject constructor(\n }\n }\n }\n+\n+ @ContributesNode(AppScope::class)\n+ class PlaceholderNode @AssistedInject constructor(\n+ @Assisted buildContext: BuildContext,\n+ @Assisted plugins: List,\n+ ) : Node(buildContext, plugins = plugins)\n }\ndiff --git a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt\nindex e4ecdd88640..d310a02b99b 100644\n--- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt\n+++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt\n@@ -288,7 +288,7 @@ class RootFlowNode @AssistedInject constructor(\n .attachSession()\n .apply {\n when (deeplinkData) {\n- is DeeplinkData.Root -> attachRoot()\n+ is DeeplinkData.Root -> attachRoomList()\n is DeeplinkData.Room -> attachRoom(deeplinkData.roomId)\n is DeeplinkData.InviteList -> attachInviteList(deeplinkData)\n }\ndiff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt\nindex a9c4a6ecf8f..7cb1d634b89 100644\n--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt\n+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt\n@@ -27,22 +27,32 @@ import io.element.android.features.networkmonitor.api.NetworkStatus\n import io.element.android.libraries.architecture.Presenter\n import io.element.android.libraries.matrix.api.MatrixClient\n import io.element.android.libraries.matrix.api.roomlist.RoomListService\n+import io.element.android.libraries.matrix.api.verification.SessionVerificationService\n+import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus\n import io.element.android.libraries.push.api.PushService\n+import kotlinx.coroutines.flow.map\n import javax.inject.Inject\n \n class LoggedInPresenter @Inject constructor(\n private val matrixClient: MatrixClient,\n private val networkMonitor: NetworkMonitor,\n private val pushService: PushService,\n+ private val sessionVerificationService: SessionVerificationService,\n ) : Presenter {\n @Composable\n override fun present(): LoggedInState {\n- LaunchedEffect(Unit) {\n- // Ensure pusher is registered\n- // TODO Manually select push provider for now\n- val pushProvider = pushService.getAvailablePushProviders().firstOrNull() ?: return@LaunchedEffect\n- val distributor = pushProvider.getDistributors().firstOrNull() ?: return@LaunchedEffect\n- pushService.registerWith(matrixClient, pushProvider, distributor)\n+ val isVerified by remember {\n+ sessionVerificationService.sessionVerifiedStatus.map { it == SessionVerifiedStatus.Verified }\n+ }.collectAsState(initial = false)\n+\n+ LaunchedEffect(isVerified) {\n+ if (isVerified) {\n+ // Ensure pusher is registered\n+ // TODO Manually select push provider for now\n+ val pushProvider = pushService.getAvailablePushProviders().firstOrNull() ?: return@LaunchedEffect\n+ val distributor = pushProvider.getDistributors().firstOrNull() ?: return@LaunchedEffect\n+ pushService.registerWith(matrixClient, pushProvider, distributor)\n+ }\n }\n \n val syncIndicator by matrixClient.roomListService.syncIndicator.collectAsState()\ndiff --git a/changelog.d/2580.feature b/changelog.d/2580.feature\nnew file mode 100644\nindex 00000000000..8d3ede2ccc5\n--- /dev/null\n+++ b/changelog.d/2580.feature\n@@ -0,0 +1,1 @@\n+Move session verification to the after login flow and make it mandatory.\ndiff --git a/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/state/FtueState.kt b/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/state/FtueService.kt\nsimilarity index 53%\nrename from features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/state/FtueState.kt\nrename to features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/state/FtueService.kt\nindex cd172669ccd..77dd258b222 100644\n--- a/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/state/FtueState.kt\n+++ b/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/state/FtueService.kt\n@@ -18,8 +18,25 @@ package io.element.android.features.ftue.api.state\n \n import kotlinx.coroutines.flow.StateFlow\n \n-interface FtueState {\n- val shouldDisplayFlow: StateFlow\n+/**\n+ * Service to manage the First Time User Experience state (aka Onboarding).\n+ */\n+interface FtueService {\n+ /** The current state of the FTUE. */\n+ val state: StateFlow\n \n+ /** Reset the FTUE state. */\n suspend fun reset()\n }\n+\n+/** The state of the FTUE. */\n+sealed interface FtueState {\n+ /** The FTUE state is unknown, nothing to do for now. */\n+ data object Unknown : FtueState\n+\n+ /** The FTUE state is incomplete. The FTUE flow should be displayed. */\n+ data object Incomplete : FtueState\n+\n+ /** The FTUE state is complete. The FTUE flow should not be displayed anymore. */\n+ data object Complete : FtueState\n+}\ndiff --git a/features/ftue/impl/build.gradle.kts b/features/ftue/impl/build.gradle.kts\nindex 1719aecbe14..06251cfe5dc 100644\n--- a/features/ftue/impl/build.gradle.kts\n+++ b/features/ftue/impl/build.gradle.kts\n@@ -42,6 +42,8 @@ dependencies {\n implementation(projects.libraries.uiStrings)\n implementation(projects.libraries.testtags)\n implementation(projects.features.analytics.api)\n+ implementation(projects.features.securebackup.api)\n+ implementation(projects.features.verifysession.api)\n implementation(projects.services.analytics.api)\n implementation(projects.features.lockscreen.api)\n implementation(projects.libraries.permissions.api)\ndiff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt\nindex 652b6dddd40..cb77100d94e 100644\n--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt\n+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt\n@@ -34,7 +34,8 @@ import io.element.android.anvilannotations.ContributesNode\n import io.element.android.features.analytics.api.AnalyticsEntryPoint\n import io.element.android.features.ftue.api.FtueEntryPoint\n import io.element.android.features.ftue.impl.notifications.NotificationsOptInNode\n-import io.element.android.features.ftue.impl.state.DefaultFtueState\n+import io.element.android.features.ftue.impl.sessionverification.FtueSessionVerificationFlowNode\n+import io.element.android.features.ftue.impl.state.DefaultFtueService\n import io.element.android.features.ftue.impl.state.FtueStep\n import io.element.android.features.lockscreen.api.LockScreenEntryPoint\n import io.element.android.libraries.architecture.BackstackView\n@@ -55,7 +56,7 @@ import kotlinx.parcelize.Parcelize\n class FtueFlowNode @AssistedInject constructor(\n @Assisted buildContext: BuildContext,\n @Assisted plugins: List,\n- private val ftueState: DefaultFtueState,\n+ private val ftueState: DefaultFtueService,\n private val analyticsEntryPoint: AnalyticsEntryPoint,\n private val analyticsService: AnalyticsService,\n private val lockScreenEntryPoint: LockScreenEntryPoint,\n@@ -72,6 +73,9 @@ class FtueFlowNode @AssistedInject constructor(\n @Parcelize\n data object Placeholder : NavTarget\n \n+ @Parcelize\n+ data object SessionVerification : NavTarget\n+\n @Parcelize\n data object NotificationsOptIn : NavTarget\n \n@@ -106,6 +110,14 @@ class FtueFlowNode @AssistedInject constructor(\n NavTarget.Placeholder -> {\n createNode(buildContext)\n }\n+ NavTarget.SessionVerification -> {\n+ val callback = object : FtueSessionVerificationFlowNode.Callback {\n+ override fun onDone() {\n+ lifecycleScope.launch { moveToNextStep() }\n+ }\n+ }\n+ createNode(buildContext, listOf(callback))\n+ }\n NavTarget.NotificationsOptIn -> {\n val callback = object : NotificationsOptInNode.Callback {\n override fun onNotificationsOptInFinished() {\n@@ -133,6 +145,9 @@ class FtueFlowNode @AssistedInject constructor(\n \n private fun moveToNextStep() {\n when (ftueState.getNextStep()) {\n+ FtueStep.SessionVerification -> {\n+ backstack.newRoot(NavTarget.SessionVerification)\n+ }\n FtueStep.NotificationsOptIn -> {\n backstack.newRoot(NavTarget.NotificationsOptIn)\n }\ndiff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/FtueSessionVerificationFlowNode.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/FtueSessionVerificationFlowNode.kt\nnew file mode 100644\nindex 00000000000..53e7b329954\n--- /dev/null\n+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/FtueSessionVerificationFlowNode.kt\n@@ -0,0 +1,98 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.ftue.impl.sessionverification\n+\n+import android.os.Parcelable\n+import androidx.compose.runtime.Composable\n+import androidx.compose.ui.Modifier\n+import com.bumble.appyx.core.modality.BuildContext\n+import com.bumble.appyx.core.node.Node\n+import com.bumble.appyx.core.plugin.Plugin\n+import com.bumble.appyx.core.plugin.plugins\n+import com.bumble.appyx.navmodel.backstack.BackStack\n+import com.bumble.appyx.navmodel.backstack.operation.push\n+import dagger.assisted.Assisted\n+import dagger.assisted.AssistedInject\n+import io.element.android.anvilannotations.ContributesNode\n+import io.element.android.features.securebackup.api.SecureBackupEntryPoint\n+import io.element.android.features.verifysession.api.VerifySessionEntryPoint\n+import io.element.android.libraries.architecture.BackstackView\n+import io.element.android.libraries.architecture.BaseFlowNode\n+import io.element.android.libraries.di.SessionScope\n+import kotlinx.parcelize.Parcelize\n+\n+@ContributesNode(SessionScope::class)\n+class FtueSessionVerificationFlowNode @AssistedInject constructor(\n+ @Assisted buildContext: BuildContext,\n+ @Assisted plugins: List,\n+ private val verifySessionEntryPoint: VerifySessionEntryPoint,\n+ private val secureBackupEntryPoint: SecureBackupEntryPoint,\n+) : BaseFlowNode(\n+ backstack = BackStack(\n+ initialElement = NavTarget.Root,\n+ savedStateMap = buildContext.savedStateMap,\n+ ),\n+ buildContext = buildContext,\n+ plugins = plugins,\n+) {\n+ sealed interface NavTarget : Parcelable {\n+ @Parcelize\n+ data object Root : NavTarget\n+\n+ @Parcelize\n+ data object EnterRecoveryKey : NavTarget\n+ }\n+\n+ interface Callback : Plugin {\n+ fun onDone()\n+ }\n+\n+ private val callback = plugins().first()\n+\n+ override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {\n+ return when (navTarget) {\n+ is NavTarget.Root -> {\n+ verifySessionEntryPoint.nodeBuilder(this, buildContext)\n+ .callback(object : VerifySessionEntryPoint.Callback {\n+ override fun onEnterRecoveryKey() {\n+ backstack.push(NavTarget.EnterRecoveryKey)\n+ }\n+\n+ override fun onDone() {\n+ callback.onDone()\n+ }\n+ })\n+ .build()\n+ }\n+ is NavTarget.EnterRecoveryKey -> {\n+ secureBackupEntryPoint.nodeBuilder(this, buildContext)\n+ .params(SecureBackupEntryPoint.Params(SecureBackupEntryPoint.InitialTarget.EnterRecoveryKey))\n+ .callback(object : SecureBackupEntryPoint.Callback {\n+ override fun onDone() {\n+ callback.onDone()\n+ }\n+ })\n+ .build()\n+ }\n+ }\n+ }\n+\n+ @Composable\n+ override fun View(modifier: Modifier) {\n+ BackstackView()\n+ }\n+}\ndiff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueState.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueService.kt\nsimilarity index 74%\nrename from features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueState.kt\nrename to features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueService.kt\nindex f1a1c84545e..384d518452e 100644\n--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueState.kt\n+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueService.kt\n@@ -20,9 +20,12 @@ import android.Manifest\n import android.os.Build\n import androidx.annotation.VisibleForTesting\n import com.squareup.anvil.annotations.ContributesBinding\n+import io.element.android.features.ftue.api.state.FtueService\n import io.element.android.features.ftue.api.state.FtueState\n import io.element.android.features.lockscreen.api.LockScreenService\n import io.element.android.libraries.di.SessionScope\n+import io.element.android.libraries.matrix.api.verification.SessionVerificationService\n+import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus\n import io.element.android.libraries.permissions.api.PermissionStateProvider\n import io.element.android.services.analytics.api.AnalyticsService\n import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider\n@@ -35,14 +38,15 @@ import kotlinx.coroutines.runBlocking\n import javax.inject.Inject\n \n @ContributesBinding(SessionScope::class)\n-class DefaultFtueState @Inject constructor(\n+class DefaultFtueService @Inject constructor(\n private val sdkVersionProvider: BuildVersionSdkIntProvider,\n coroutineScope: CoroutineScope,\n private val analyticsService: AnalyticsService,\n private val permissionStateProvider: PermissionStateProvider,\n private val lockScreenService: LockScreenService,\n-) : FtueState {\n- override val shouldDisplayFlow = MutableStateFlow(isAnyStepIncomplete())\n+ private val sessionVerificationService: SessionVerificationService,\n+) : FtueService {\n+ override val state = MutableStateFlow(FtueState.Unknown)\n \n override suspend fun reset() {\n analyticsService.reset()\n@@ -52,6 +56,10 @@ class DefaultFtueState @Inject constructor(\n }\n \n init {\n+ sessionVerificationService.sessionVerifiedStatus\n+ .onEach { updateState() }\n+ .launchIn(coroutineScope)\n+\n analyticsService.didAskUserConsent()\n .onEach { updateState() }\n .launchIn(coroutineScope)\n@@ -59,7 +67,12 @@ class DefaultFtueState @Inject constructor(\n \n fun getNextStep(currentStep: FtueStep? = null): FtueStep? =\n when (currentStep) {\n- null -> if (shouldAskNotificationPermissions()) {\n+ null -> if (isSessionNotVerified()) {\n+ FtueStep.SessionVerification\n+ } else {\n+ getNextStep(FtueStep.SessionVerification)\n+ }\n+ FtueStep.SessionVerification -> if (shouldAskNotificationPermissions()) {\n FtueStep.NotificationsOptIn\n } else {\n getNextStep(FtueStep.NotificationsOptIn)\n@@ -79,12 +92,21 @@ class DefaultFtueState @Inject constructor(\n \n private fun isAnyStepIncomplete(): Boolean {\n return listOf(\n+ { isSessionNotVerified() },\n { shouldAskNotificationPermissions() },\n { needsAnalyticsOptIn() },\n { shouldDisplayLockscreenSetup() },\n ).any { it() }\n }\n \n+ private fun isSessionVerificationServiceReady(): Boolean {\n+ return sessionVerificationService.sessionVerifiedStatus.value != SessionVerifiedStatus.Unknown\n+ }\n+\n+ private fun isSessionNotVerified(): Boolean {\n+ return sessionVerificationService.sessionVerifiedStatus.value == SessionVerifiedStatus.NotVerified\n+ }\n+\n private fun needsAnalyticsOptIn(): Boolean {\n // We need this function to not be suspend, so we need to load the value through runBlocking\n return runBlocking { analyticsService.didAskUserConsent().first().not() }\n@@ -109,11 +131,16 @@ class DefaultFtueState @Inject constructor(\n \n @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)\n internal fun updateState() {\n- shouldDisplayFlow.value = isAnyStepIncomplete()\n+ state.value = when {\n+ !isSessionVerificationServiceReady() -> FtueState.Unknown\n+ isAnyStepIncomplete() -> FtueState.Incomplete\n+ else -> FtueState.Complete\n+ }\n }\n }\n \n sealed interface FtueStep {\n+ data object SessionVerification : FtueStep\n data object NotificationsOptIn : FtueStep\n data object AnalyticsOptIn : FtueStep\n data object LockscreenSetup : FtueStep\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt\nindex 67915bf9d44..3cd525c614b 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt\n@@ -33,7 +33,6 @@ import io.element.android.features.messages.impl.MessagesNavigator\n import io.element.android.features.messages.impl.timeline.factories.TimelineItemsFactory\n import io.element.android.features.messages.impl.timeline.model.NewEventState\n import io.element.android.features.messages.impl.timeline.model.TimelineItem\n-import io.element.android.features.messages.impl.timeline.session.SessionState\n import io.element.android.features.messages.impl.voicemessages.timeline.RedactedVoiceMessageManager\n import io.element.android.features.poll.api.actions.EndPollAction\n import io.element.android.features.poll.api.actions.SendPollResponseAction\n@@ -41,15 +40,11 @@ import io.element.android.features.preferences.api.store.SessionPreferencesStore\n import io.element.android.libraries.architecture.Presenter\n import io.element.android.libraries.core.coroutine.CoroutineDispatchers\n import io.element.android.libraries.matrix.api.core.EventId\n-import io.element.android.libraries.matrix.api.encryption.BackupState\n-import io.element.android.libraries.matrix.api.encryption.EncryptionService\n import io.element.android.libraries.matrix.api.room.MatrixRoom\n import io.element.android.libraries.matrix.api.room.MessageEventType\n import io.element.android.libraries.matrix.api.room.roomMembers\n import io.element.android.libraries.matrix.api.timeline.ReceiptType\n import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemEventOrigin\n-import io.element.android.libraries.matrix.api.verification.SessionVerificationService\n-import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus\n import io.element.android.libraries.matrix.ui.room.canSendMessageAsState\n import kotlinx.collections.immutable.ImmutableList\n import kotlinx.coroutines.CoroutineScope\n@@ -68,8 +63,6 @@ class TimelinePresenter @AssistedInject constructor(\n private val dispatchers: CoroutineDispatchers,\n private val appScope: CoroutineScope,\n @Assisted private val navigator: MessagesNavigator,\n- private val verificationService: SessionVerificationService,\n- private val encryptionService: EncryptionService,\n private val redactedVoiceMessageManager: RedactedVoiceMessageManager,\n private val sendPollResponseAction: SendPollResponseAction,\n private val endPollAction: EndPollAction,\n@@ -101,21 +94,9 @@ class TimelinePresenter @AssistedInject constructor(\n val prevMostRecentItemId = rememberSaveable { mutableStateOf(null) }\n val newItemState = remember { mutableStateOf(NewEventState.None) }\n \n- val sessionVerifiedStatus by verificationService.sessionVerifiedStatus.collectAsState()\n- val keyBackupState by encryptionService.backupStateStateFlow.collectAsState()\n-\n val isSendPublicReadReceiptsEnabled by sessionPreferencesStore.isSendPublicReadReceiptsEnabled().collectAsState(initial = true)\n val renderReadReceipts by sessionPreferencesStore.isRenderReadReceiptsEnabled().collectAsState(initial = true)\n \n- val sessionState by remember {\n- derivedStateOf {\n- SessionState(\n- isSessionVerified = sessionVerifiedStatus == SessionVerifiedStatus.Verified,\n- isKeyBackupEnabled = keyBackupState == BackupState.ENABLED\n- )\n- }\n- }\n-\n fun handleEvents(event: TimelineEvents) {\n when (event) {\n TimelineEvents.LoadMore -> localScope.paginateBackwards()\n@@ -184,7 +165,6 @@ class TimelinePresenter @AssistedInject constructor(\n timelineItems = timelineItems,\n renderReadReceipts = renderReadReceipts,\n newEventState = newItemState.value,\n- sessionState = sessionState,\n eventSink = { handleEvents(it) }\n )\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineState.kt\nindex ab9d93d6788..4e2f9b8d429 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineState.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineState.kt\n@@ -19,7 +19,6 @@ package io.element.android.features.messages.impl.timeline\n import androidx.compose.runtime.Immutable\n import io.element.android.features.messages.impl.timeline.model.NewEventState\n import io.element.android.features.messages.impl.timeline.model.TimelineItem\n-import io.element.android.features.messages.impl.timeline.session.SessionState\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.timeline.MatrixTimeline\n import kotlinx.collections.immutable.ImmutableList\n@@ -32,7 +31,6 @@ data class TimelineState(\n val highlightedEventId: EventId?,\n val paginationState: MatrixTimeline.PaginationState,\n val newEventState: NewEventState,\n- val sessionState: SessionState,\n val eventSink: (TimelineEvents) -> Unit\n )\n \ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt\nindex aa35b620b9e..ae7f62ebd78 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt\n@@ -29,7 +29,6 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt\n import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemStateEventContent\n import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent\n import io.element.android.features.messages.impl.timeline.model.virtual.aTimelineItemDaySeparatorModel\n-import io.element.android.features.messages.impl.timeline.session.aSessionState\n import io.element.android.libraries.designsystem.components.avatar.AvatarData\n import io.element.android.libraries.designsystem.components.avatar.AvatarSize\n import io.element.android.libraries.matrix.api.core.EventId\n@@ -58,10 +57,6 @@ fun aTimelineState(\n renderReadReceipts = renderReadReceipts,\n highlightedEventId = null,\n newEventState = NewEventState.None,\n- sessionState = aSessionState(\n- isSessionVerified = true,\n- isKeyBackupEnabled = true,\n- ),\n eventSink = eventSink,\n )\n \ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt\nindex 58692387532..56a2676f43c 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt\n@@ -148,7 +148,6 @@ fun TimelineView(\n onMoreReactionsClick = onMoreReactionsClicked,\n onReadReceiptClick = onReadReceiptClick,\n onTimestampClicked = onTimestampClicked,\n- sessionState = state.sessionState,\n eventSink = state.eventSink,\n onSwipeToReply = onSwipeToReply,\n )\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt\nindex bc05882f1b0..a5d42d5dbf3 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt\n@@ -32,8 +32,6 @@ import io.element.android.features.messages.impl.timeline.components.group.Group\n import io.element.android.features.messages.impl.timeline.components.receipt.ReadReceiptViewState\n import io.element.android.features.messages.impl.timeline.components.receipt.TimelineItemReadReceiptView\n import io.element.android.features.messages.impl.timeline.model.TimelineItem\n-import io.element.android.features.messages.impl.timeline.session.SessionState\n-import io.element.android.features.messages.impl.timeline.session.aSessionState\n import io.element.android.libraries.designsystem.preview.ElementPreview\n import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n import io.element.android.libraries.matrix.api.core.EventId\n@@ -46,7 +44,6 @@ fun TimelineItemGroupedEventsRow(\n renderReadReceipts: Boolean,\n isLastOutgoingMessage: Boolean,\n highlightedItem: String?,\n- sessionState: SessionState,\n onClick: (TimelineItem.Event) -> Unit,\n onLongClick: (TimelineItem.Event) -> Unit,\n inReplyToClick: (EventId) -> Unit,\n@@ -74,7 +71,6 @@ fun TimelineItemGroupedEventsRow(\n highlightedItem = highlightedItem,\n renderReadReceipts = renderReadReceipts,\n isLastOutgoingMessage = isLastOutgoingMessage,\n- sessionState = sessionState,\n onClick = onClick,\n onLongClick = onLongClick,\n inReplyToClick = inReplyToClick,\n@@ -99,7 +95,6 @@ private fun TimelineItemGroupedEventsRowContent(\n highlightedItem: String?,\n renderReadReceipts: Boolean,\n isLastOutgoingMessage: Boolean,\n- sessionState: SessionState,\n onClick: (TimelineItem.Event) -> Unit,\n onLongClick: (TimelineItem.Event) -> Unit,\n inReplyToClick: (EventId) -> Unit,\n@@ -133,7 +128,6 @@ private fun TimelineItemGroupedEventsRowContent(\n renderReadReceipts = renderReadReceipts,\n isLastOutgoingMessage = isLastOutgoingMessage,\n highlightedItem = highlightedItem,\n- sessionState = sessionState,\n onClick = onClick,\n onLongClick = onLongClick,\n inReplyToClick = inReplyToClick,\n@@ -174,7 +168,6 @@ internal fun TimelineItemGroupedEventsRowContentExpandedPreview() = ElementPrevi\n highlightedItem = null,\n renderReadReceipts = true,\n isLastOutgoingMessage = false,\n- sessionState = aSessionState(),\n onClick = {},\n onLongClick = {},\n inReplyToClick = {},\n@@ -200,7 +193,6 @@ internal fun TimelineItemGroupedEventsRowContentCollapsePreview() = ElementPrevi\n highlightedItem = null,\n renderReadReceipts = true,\n isLastOutgoingMessage = false,\n- sessionState = aSessionState(),\n onClick = {},\n onLongClick = {},\n inReplyToClick = {},\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt\nindex 5146c87df64..89b223dafee 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt\n@@ -23,7 +23,6 @@ import io.element.android.features.messages.impl.timeline.TimelineRoomInfo\n import io.element.android.features.messages.impl.timeline.model.TimelineItem\n import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLegacyCallInviteContent\n import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateContent\n-import io.element.android.features.messages.impl.timeline.session.SessionState\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.core.UserId\n \n@@ -34,7 +33,6 @@ internal fun TimelineItemRow(\n renderReadReceipts: Boolean,\n isLastOutgoingMessage: Boolean,\n highlightedItem: String?,\n- sessionState: SessionState,\n onUserDataClick: (UserId) -> Unit,\n onLinkClicked: (String) -> Unit,\n onClick: (TimelineItem.Event) -> Unit,\n@@ -53,7 +51,6 @@ internal fun TimelineItemRow(\n is TimelineItem.Virtual -> {\n TimelineItemVirtualRow(\n virtual = timelineItem,\n- sessionState = sessionState,\n modifier = modifier,\n )\n }\n@@ -100,7 +97,6 @@ internal fun TimelineItemRow(\n renderReadReceipts = renderReadReceipts,\n isLastOutgoingMessage = isLastOutgoingMessage,\n highlightedItem = highlightedItem,\n- sessionState = sessionState,\n onClick = onClick,\n onLongClick = onLongClick,\n inReplyToClick = inReplyToClick,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemVirtualRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemVirtualRow.kt\nindex 5ef3c2ef2c9..306c11aaba7 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemVirtualRow.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemVirtualRow.kt\n@@ -25,17 +25,15 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem\n import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemDaySeparatorModel\n import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemEncryptedHistoryBannerVirtualModel\n import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemReadMarkerModel\n-import io.element.android.features.messages.impl.timeline.session.SessionState\n \n @Composable\n fun TimelineItemVirtualRow(\n virtual: TimelineItem.Virtual,\n- sessionState: SessionState,\n modifier: Modifier = Modifier\n ) {\n when (virtual.model) {\n is TimelineItemDaySeparatorModel -> TimelineItemDaySeparatorView(virtual.model, modifier)\n TimelineItemReadMarkerModel -> TimelineItemReadMarkerView()\n- is TimelineItemEncryptedHistoryBannerVirtualModel -> TimelineEncryptedHistoryBannerView(sessionState, modifier)\n+ is TimelineItemEncryptedHistoryBannerVirtualModel -> TimelineEncryptedHistoryBannerView(modifier)\n }\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineEncryptedHistoryBannerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineEncryptedHistoryBannerView.kt\nindex c5553528648..db0dd1ae9aa 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineEncryptedHistoryBannerView.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineEncryptedHistoryBannerView.kt\n@@ -16,7 +16,6 @@\n \n package io.element.android.features.messages.impl.timeline.components.virtual\n \n-import androidx.annotation.StringRes\n import androidx.compose.foundation.background\n import androidx.compose.foundation.border\n import androidx.compose.foundation.layout.Arrangement\n@@ -29,20 +28,16 @@ import androidx.compose.runtime.Composable\n import androidx.compose.ui.Modifier\n import androidx.compose.ui.draw.clip\n import androidx.compose.ui.res.stringResource\n-import androidx.compose.ui.tooling.preview.PreviewParameter\n import androidx.compose.ui.unit.dp\n import io.element.android.compound.theme.ElementTheme\n import io.element.android.compound.tokens.generated.CompoundIcons\n import io.element.android.features.messages.impl.R\n-import io.element.android.features.messages.impl.timeline.session.SessionState\n-import io.element.android.features.messages.impl.timeline.session.SessionStateProvider\n import io.element.android.libraries.designsystem.preview.ElementPreview\n import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n import io.element.android.libraries.designsystem.theme.components.Icon\n \n @Composable\n fun TimelineEncryptedHistoryBannerView(\n- sessionState: SessionState,\n modifier: Modifier = Modifier,\n ) {\n Row(\n@@ -61,26 +56,15 @@ fun TimelineEncryptedHistoryBannerView(\n tint = ElementTheme.colors.iconInfoPrimary\n )\n Text(\n- text = stringResource(sessionState.toStringResId()),\n+ text = stringResource(R.string.screen_room_encrypted_history_banner),\n style = ElementTheme.typography.fontBodyMdMedium,\n color = ElementTheme.colors.textInfoPrimary\n )\n }\n }\n \n-@StringRes\n-private fun SessionState.toStringResId(): Int {\n- return when {\n- isSessionVerified.not() -> R.string.screen_room_encrypted_history_banner_unverified\n- isKeyBackupEnabled.not() -> R.string.screen_room_encrypted_history_banner\n- else -> R.string.screen_room_encrypted_history_banner // TODO strings need to be updated\n- }\n-}\n-\n @PreviewsDayNight\n @Composable\n-internal fun EncryptedHistoryBannerViewPreview(\n- @PreviewParameter(SessionStateProvider::class) sessionState: SessionState,\n-) = ElementPreview {\n- TimelineEncryptedHistoryBannerView(sessionState = sessionState)\n+internal fun EncryptedHistoryBannerViewPreview() = ElementPreview {\n+ TimelineEncryptedHistoryBannerView()\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/session/SessionStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/session/SessionStateProvider.kt\ndeleted file mode 100644\nindex 2dd27d54569..00000000000\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/session/SessionStateProvider.kt\n+++ /dev/null\n@@ -1,36 +0,0 @@\n-/*\n- * Copyright (c) 2023 New Vector Ltd\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- */\n-\n-package io.element.android.features.messages.impl.timeline.session\n-\n-import androidx.compose.ui.tooling.preview.PreviewParameterProvider\n-\n-open class SessionStateProvider : PreviewParameterProvider {\n- override val values: Sequence\n- get() = sequenceOf(\n- aSessionState(isSessionVerified = false, isKeyBackupEnabled = false),\n- aSessionState(isSessionVerified = true, isKeyBackupEnabled = false),\n- aSessionState(isSessionVerified = true, isKeyBackupEnabled = true),\n- )\n-}\n-\n-internal fun aSessionState(\n- isSessionVerified: Boolean = false,\n- isKeyBackupEnabled: Boolean = false,\n-) = SessionState(\n- isSessionVerified = isSessionVerified,\n- isKeyBackupEnabled = isKeyBackupEnabled,\n-)\ndiff --git a/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/PreferencesEntryPoint.kt b/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/PreferencesEntryPoint.kt\nindex 05774126047..e488d911ede 100644\n--- a/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/PreferencesEntryPoint.kt\n+++ b/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/PreferencesEntryPoint.kt\n@@ -45,7 +45,6 @@ interface PreferencesEntryPoint : FeatureEntryPoint {\n \n interface Callback : Plugin {\n fun onOpenBugReport()\n- fun onVerifyClicked()\n fun onSecureBackupClicked()\n fun onOpenRoomNotificationSettings(roomId: RoomId)\n }\ndiff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt\nindex 1dc5f650fd1..b93e02dd39b 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt\n@@ -115,10 +115,6 @@ class PreferencesFlowNode @AssistedInject constructor(\n plugins().forEach { it.onOpenBugReport() }\n }\n \n- override fun onVerifyClicked() {\n- plugins().forEach { it.onVerifyClicked() }\n- }\n-\n override fun onSecureBackupClicked() {\n plugins().forEach { it.onSecureBackupClicked() }\n }\ndiff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootNode.kt\nindex 3bd762794d7..11f3fc3dd32 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootNode.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootNode.kt\n@@ -44,7 +44,6 @@ class PreferencesRootNode @AssistedInject constructor(\n ) : Node(buildContext, plugins = plugins) {\n interface Callback : Plugin {\n fun onOpenBugReport()\n- fun onVerifyClicked()\n fun onSecureBackupClicked()\n fun onOpenAnalytics()\n fun onOpenAbout()\n@@ -61,10 +60,6 @@ class PreferencesRootNode @AssistedInject constructor(\n plugins().forEach { it.onOpenBugReport() }\n }\n \n- private fun onVerifyClicked() {\n- plugins().forEach { it.onVerifyClicked() }\n- }\n-\n private fun onSecureBackupClicked() {\n plugins().forEach { it.onSecureBackupClicked() }\n }\n@@ -138,7 +133,6 @@ class PreferencesRootNode @AssistedInject constructor(\n onOpenRageShake = this::onOpenBugReport,\n onOpenAnalytics = this::onOpenAnalytics,\n onOpenAbout = this::onOpenAbout,\n- onVerifyClicked = this::onVerifyClicked,\n onSecureBackupClicked = this::onSecureBackupClicked,\n onOpenDeveloperSettings = this::onOpenDeveloperSettings,\n onOpenAdvancedSettings = this::onOpenAdvancedSettings,\ndiff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt\nindex f80ee11abae..20c28427a8a 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt\n@@ -74,7 +74,7 @@ class PreferencesRootPresenter @Inject constructor(\n }\n \n // We should display the 'complete verification' option if the current session can be verified\n- val showCompleteVerification by sessionVerificationService.canVerifySessionFlow.collectAsState(false)\n+ val canVerifyUserSession by sessionVerificationService.canVerifySessionFlow.collectAsState(false)\n \n val showSecureBackupIndicator by indicatorService.showSettingChatBackupIndicator()\n \n@@ -102,8 +102,7 @@ class PreferencesRootPresenter @Inject constructor(\n myUser = matrixUser.value,\n version = versionFormatter.get(),\n deviceId = matrixClient.deviceId,\n- showCompleteVerification = showCompleteVerification,\n- showSecureBackup = !showCompleteVerification,\n+ showSecureBackup = !canVerifyUserSession,\n showSecureBackupBadge = showSecureBackupIndicator,\n accountManagementUrl = accountManagementUrl.value,\n devicesManagementUrl = devicesManagementUrl.value,\ndiff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootState.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootState.kt\nindex eabdc80da04..336690638d5 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootState.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootState.kt\n@@ -24,7 +24,6 @@ data class PreferencesRootState(\n val myUser: MatrixUser,\n val version: String,\n val deviceId: String?,\n- val showCompleteVerification: Boolean,\n val showSecureBackup: Boolean,\n val showSecureBackupBadge: Boolean,\n val accountManagementUrl: String?,\ndiff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootStateProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootStateProvider.kt\nindex b688a493b6a..3373cb6ba00 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootStateProvider.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootStateProvider.kt\n@@ -27,7 +27,6 @@ fun aPreferencesRootState(\n myUser = myUser,\n version = \"Version 1.1 (1)\",\n deviceId = \"ILAKNDNASDLK\",\n- showCompleteVerification = true,\n showSecureBackup = true,\n showSecureBackupBadge = true,\n accountManagementUrl = \"aUrl\",\ndiff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt\nindex 293889e8689..c6283158f2d 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt\n@@ -51,7 +51,6 @@ import io.element.android.libraries.ui.strings.CommonStrings\n fun PreferencesRootView(\n state: PreferencesRootState,\n onBackPressed: () -> Unit,\n- onVerifyClicked: () -> Unit,\n onSecureBackupClicked: () -> Unit,\n onManageAccountClicked: (url: String) -> Unit,\n onOpenAnalytics: () -> Unit,\n@@ -81,13 +80,6 @@ fun PreferencesRootView(\n },\n user = state.myUser,\n )\n- if (state.showCompleteVerification) {\n- ListItem(\n- headlineContent = { Text(text = stringResource(CommonStrings.common_verify_device)) },\n- leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.CheckCircle())),\n- onClick = onVerifyClicked\n- )\n- }\n if (state.showSecureBackup) {\n ListItem(\n headlineContent = { Text(stringResource(id = CommonStrings.common_chat_backup)) },\n@@ -95,8 +87,6 @@ fun PreferencesRootView(\n trailingContent = ListItemContent.Badge.takeIf { state.showSecureBackupBadge },\n onClick = onSecureBackupClicked,\n )\n- }\n- if (state.showCompleteVerification || state.showSecureBackup) {\n HorizontalDivider()\n }\n if (state.accountManagementUrl != null) {\n@@ -232,7 +222,6 @@ private fun ContentToPreview(matrixUser: MatrixUser) {\n onOpenDeveloperSettings = {},\n onOpenAdvancedSettings = {},\n onOpenAbout = {},\n- onVerifyClicked = {},\n onSecureBackupClicked = {},\n onManageAccountClicked = {},\n onOpenNotificationSettings = {},\ndiff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt\nindex 2d590b90c17..9227eef3646 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt\n@@ -22,7 +22,7 @@ import android.content.Context\n import coil.Coil\n import coil.annotation.ExperimentalCoilApi\n import com.squareup.anvil.annotations.ContributesBinding\n-import io.element.android.features.ftue.api.state.FtueState\n+import io.element.android.features.ftue.api.state.FtueService\n import io.element.android.features.preferences.impl.DefaultCacheService\n import io.element.android.features.roomlist.api.migration.MigrationScreenStore\n import io.element.android.libraries.core.coroutine.CoroutineDispatchers\n@@ -45,7 +45,7 @@ class DefaultClearCacheUseCase @Inject constructor(\n private val coroutineDispatchers: CoroutineDispatchers,\n private val defaultCacheIndexProvider: DefaultCacheService,\n private val okHttpClient: Provider,\n- private val ftueState: FtueState,\n+ private val ftueService: FtueService,\n private val migrationScreenStore: MigrationScreenStore,\n ) : ClearCacheUseCase {\n override suspend fun invoke() = withContext(coroutineDispatchers.io) {\n@@ -61,7 +61,7 @@ class DefaultClearCacheUseCase @Inject constructor(\n // Clear app cache\n context.cacheDir.deleteRecursively()\n // Clear some settings\n- ftueState.reset()\n+ ftueService.reset()\n // Clear migration screen store\n migrationScreenStore.reset()\n // Ensure the app is restarted\ndiff --git a/features/roomlist/api/src/main/kotlin/io/element/android/features/roomlist/api/RoomListEntryPoint.kt b/features/roomlist/api/src/main/kotlin/io/element/android/features/roomlist/api/RoomListEntryPoint.kt\nindex c3b2ff36a20..b5d1c1299f2 100644\n--- a/features/roomlist/api/src/main/kotlin/io/element/android/features/roomlist/api/RoomListEntryPoint.kt\n+++ b/features/roomlist/api/src/main/kotlin/io/element/android/features/roomlist/api/RoomListEntryPoint.kt\n@@ -33,7 +33,6 @@ interface RoomListEntryPoint : FeatureEntryPoint {\n fun onRoomClicked(roomId: RoomId)\n fun onCreateRoomClicked()\n fun onSettingsClicked()\n- fun onSessionVerificationClicked()\n fun onSessionConfirmRecoveryKeyClicked()\n fun onInvitesClicked()\n fun onRoomSettingsClicked(roomId: RoomId)\ndiff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListNode.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListNode.kt\nindex a9740bcfcba..e9af66d3314 100644\n--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListNode.kt\n+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListNode.kt\n@@ -64,10 +64,6 @@ class RoomListNode @AssistedInject constructor(\n plugins().forEach { it.onCreateRoomClicked() }\n }\n \n- private fun onSessionVerificationClicked() {\n- plugins().forEach { it.onSessionVerificationClicked() }\n- }\n-\n private fun onSessionConfirmRecoveryKeyClicked() {\n plugins().forEach { it.onSessionConfirmRecoveryKeyClicked() }\n }\n@@ -104,7 +100,6 @@ class RoomListNode @AssistedInject constructor(\n onRoomClicked = this::onRoomClicked,\n onSettingsClicked = this::onOpenSettings,\n onCreateRoomClicked = this::onCreateRoomClicked,\n- onVerifyClicked = this::onSessionVerificationClicked,\n onConfirmRecoveryKeyClicked = this::onSessionConfirmRecoveryKeyClicked,\n onInvitesClicked = this::onInvitesClicked,\n onRoomSettingsClicked = this::onRoomSettingsClicked,\ndiff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt\nindex 900e640981a..0b5d07dc696 100644\n--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt\n+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt\n@@ -58,7 +58,6 @@ import io.element.android.libraries.matrix.api.roomlist.RoomList\n import io.element.android.libraries.matrix.api.sync.SyncService\n import io.element.android.libraries.matrix.api.sync.SyncState\n import io.element.android.libraries.matrix.api.timeline.ReceiptType\n-import io.element.android.libraries.matrix.api.verification.SessionVerificationService\n import io.element.android.services.analytics.api.AnalyticsService\n import io.element.android.services.analyticsproviders.api.trackers.captureInteraction\n import kotlinx.collections.immutable.toPersistentList\n@@ -92,7 +91,6 @@ class RoomListPresenter @Inject constructor(\n private val analyticsService: AnalyticsService,\n ) : Presenter {\n private val encryptionService: EncryptionService = client.encryptionService()\n- private val sessionVerificationService: SessionVerificationService = client.sessionVerificationService()\n private val syncService: SyncService = client.syncService()\n \n @Composable\n@@ -159,19 +157,12 @@ class RoomListPresenter @Inject constructor(\n securityBannerDismissed: Boolean,\n ): State {\n val currentSecurityBannerDismissed by rememberUpdatedState(securityBannerDismissed)\n- val canVerifySession by sessionVerificationService.canVerifySessionFlow.collectAsState(initial = false)\n- val isLastDevice by encryptionService.isLastDevice.collectAsState()\n val recoveryState by encryptionService.recoveryStateStateFlow.collectAsState()\n val syncState by syncService.syncState.collectAsState()\n return remember {\n derivedStateOf {\n when {\n currentSecurityBannerDismissed -> SecurityBannerState.None\n- canVerifySession -> if (isLastDevice) {\n- SecurityBannerState.RecoveryKeyConfirmation\n- } else {\n- SecurityBannerState.SessionVerification\n- }\n recoveryState == RecoveryState.INCOMPLETE &&\n syncState == SyncState.Running -> SecurityBannerState.RecoveryKeyConfirmation\n else -> SecurityBannerState.None\ndiff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt\nindex 250f1c8e87f..62f59b4eaaa 100644\n--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt\n+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt\n@@ -63,7 +63,6 @@ enum class InvitesState {\n \n enum class SecurityBannerState {\n None,\n- SessionVerification,\n RecoveryKeyConfirmation,\n }\n \ndiff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt\nindex 00f6833f02a..c80430f9fe8 100644\n--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt\n+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt\n@@ -45,7 +45,6 @@ open class RoomListStateProvider : PreviewParameterProvider {\n aRoomListState(contentState = aRoomsContentState(invitesState = InvitesState.NewInvites)),\n aRoomListState(contextMenu = aContextMenuShown(roomName = \"A nice room name\")),\n aRoomListState(contextMenu = aContextMenuShown(isFavorite = true)),\n- aRoomListState(contentState = aRoomsContentState(securityBannerState = SecurityBannerState.SessionVerification)),\n aRoomListState(contentState = aRoomsContentState(securityBannerState = SecurityBannerState.RecoveryKeyConfirmation)),\n aRoomListState(contentState = anEmptyContentState()),\n aRoomListState(contentState = aSkeletonContentState()),\ndiff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt\nindex e0a3fc52012..881d06411e9 100644\n--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt\n+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt\n@@ -53,7 +53,6 @@ fun RoomListView(\n state: RoomListState,\n onRoomClicked: (RoomId) -> Unit,\n onSettingsClicked: () -> Unit,\n- onVerifyClicked: () -> Unit,\n onConfirmRecoveryKeyClicked: () -> Unit,\n onCreateRoomClicked: () -> Unit,\n onInvitesClicked: () -> Unit,\n@@ -86,7 +85,6 @@ fun RoomListView(\n RoomListScaffold(\n modifier = Modifier.padding(top = topPadding),\n state = state,\n- onVerifyClicked = onVerifyClicked,\n onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,\n onRoomClicked = onRoomClicked,\n onRoomLongClicked = { onRoomLongClicked(it) },\n@@ -115,7 +113,6 @@ fun RoomListView(\n @Composable\n private fun RoomListScaffold(\n state: RoomListState,\n- onVerifyClicked: () -> Unit,\n onConfirmRecoveryKeyClicked: () -> Unit,\n onRoomClicked: (RoomId) -> Unit,\n onRoomLongClicked: (RoomListRoomSummary) -> Unit,\n@@ -154,7 +151,6 @@ private fun RoomListScaffold(\n contentState = state.contentState,\n filtersState = state.filtersState,\n eventSink = state.eventSink,\n- onVerifyClicked = onVerifyClicked,\n onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,\n onRoomClicked = ::onRoomClicked,\n onRoomLongClicked = onRoomLongClicked,\n@@ -193,7 +189,6 @@ internal fun RoomListViewPreview(@PreviewParameter(RoomListStateProvider::class)\n state = state,\n onRoomClicked = {},\n onSettingsClicked = {},\n- onVerifyClicked = {},\n onConfirmRecoveryKeyClicked = {},\n onCreateRoomClicked = {},\n onInvitesClicked = {},\ndiff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RequestVerificationHeader.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RequestVerificationHeader.kt\ndeleted file mode 100644\nindex d3ad6db2062..00000000000\n--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RequestVerificationHeader.kt\n+++ /dev/null\n@@ -1,49 +0,0 @@\n-/*\n- * Copyright (c) 2023 New Vector Ltd\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- */\n-\n-package io.element.android.features.roomlist.impl.components\n-\n-import androidx.compose.runtime.Composable\n-import androidx.compose.ui.Modifier\n-import androidx.compose.ui.res.stringResource\n-import io.element.android.features.roomlist.impl.R\n-import io.element.android.libraries.designsystem.atomic.molecules.DialogLikeBannerMolecule\n-import io.element.android.libraries.designsystem.preview.ElementPreview\n-import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n-\n-@Composable\n-internal fun RequestVerificationHeader(\n- onVerifyClicked: () -> Unit,\n- onDismissClicked: () -> Unit,\n- modifier: Modifier = Modifier,\n-) {\n- DialogLikeBannerMolecule(\n- modifier = modifier,\n- title = stringResource(R.string.session_verification_banner_title),\n- content = stringResource(R.string.session_verification_banner_message),\n- onSubmitClicked = onVerifyClicked,\n- onDismissClicked = onDismissClicked,\n- )\n-}\n-\n-@PreviewsDayNight\n-@Composable\n-internal fun RequestVerificationHeaderPreview() = ElementPreview {\n- RequestVerificationHeader(\n- onVerifyClicked = {},\n- onDismissClicked = {},\n- )\n-}\ndiff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt\nindex 1bb5af4e7a9..552ff008a0b 100644\n--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt\n+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt\n@@ -73,7 +73,6 @@ fun RoomListContentView(\n contentState: RoomListContentState,\n filtersState: RoomListFiltersState,\n eventSink: (RoomListEvents) -> Unit,\n- onVerifyClicked: () -> Unit,\n onConfirmRecoveryKeyClicked: () -> Unit,\n onRoomClicked: (RoomListRoomSummary) -> Unit,\n onRoomLongClicked: (RoomListRoomSummary) -> Unit,\n@@ -103,7 +102,6 @@ fun RoomListContentView(\n state = contentState,\n filtersState = filtersState,\n eventSink = eventSink,\n- onVerifyClicked = onVerifyClicked,\n onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,\n onRoomClicked = onRoomClicked,\n onRoomLongClicked = onRoomLongClicked,\n@@ -161,7 +159,6 @@ private fun RoomsView(\n state: RoomListContentState.Rooms,\n filtersState: RoomListFiltersState,\n eventSink: (RoomListEvents) -> Unit,\n- onVerifyClicked: () -> Unit,\n onConfirmRecoveryKeyClicked: () -> Unit,\n onRoomClicked: (RoomListRoomSummary) -> Unit,\n onRoomLongClicked: (RoomListRoomSummary) -> Unit,\n@@ -177,7 +174,6 @@ private fun RoomsView(\n RoomsViewList(\n state = state,\n eventSink = eventSink,\n- onVerifyClicked = onVerifyClicked,\n onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,\n onRoomClicked = onRoomClicked,\n onRoomLongClicked = onRoomLongClicked,\n@@ -191,7 +187,6 @@ private fun RoomsView(\n private fun RoomsViewList(\n state: RoomListContentState.Rooms,\n eventSink: (RoomListEvents) -> Unit,\n- onVerifyClicked: () -> Unit,\n onConfirmRecoveryKeyClicked: () -> Unit,\n onRoomClicked: (RoomListRoomSummary) -> Unit,\n onRoomLongClicked: (RoomListRoomSummary) -> Unit,\n@@ -222,14 +217,6 @@ private fun RoomsViewList(\n contentPadding = PaddingValues(bottom = 80.dp)\n ) {\n when (state.securityBannerState) {\n- SecurityBannerState.SessionVerification -> {\n- item {\n- RequestVerificationHeader(\n- onVerifyClicked = onVerifyClicked,\n- onDismissClicked = { eventSink(RoomListEvents.DismissRequestVerificationPrompt) }\n- )\n- }\n- }\n SecurityBannerState.RecoveryKeyConfirmation -> {\n item {\n ConfirmRecoveryKeyBanner(\n@@ -316,10 +303,10 @@ internal fun RoomListContentViewPreview(@PreviewParameter(RoomListContentStatePr\n filterSelectionStates = RoomListFilter.entries.map { FilterSelectionState(it, isSelected = true) }\n ),\n eventSink = {},\n- onVerifyClicked = { },\n- onConfirmRecoveryKeyClicked = { },\n+ onConfirmRecoveryKeyClicked = {},\n onRoomClicked = {},\n onRoomLongClicked = {},\n- onCreateRoomClicked = { },\n- onInvitesClicked = { })\n+ onCreateRoomClicked = {},\n+ onInvitesClicked = {}\n+ )\n }\ndiff --git a/features/securebackup/api/src/main/kotlin/io/element/android/features/securebackup/api/SecureBackupEntryPoint.kt b/features/securebackup/api/src/main/kotlin/io/element/android/features/securebackup/api/SecureBackupEntryPoint.kt\nindex 1fee6418a91..8a00063fef2 100644\n--- a/features/securebackup/api/src/main/kotlin/io/element/android/features/securebackup/api/SecureBackupEntryPoint.kt\n+++ b/features/securebackup/api/src/main/kotlin/io/element/android/features/securebackup/api/SecureBackupEntryPoint.kt\n@@ -19,6 +19,7 @@ package io.element.android.features.securebackup.api\n import android.os.Parcelable\n import com.bumble.appyx.core.modality.BuildContext\n import com.bumble.appyx.core.node.Node\n+import com.bumble.appyx.core.plugin.Plugin\n import io.element.android.libraries.architecture.FeatureEntryPoint\n import io.element.android.libraries.architecture.NodeInputs\n import kotlinx.parcelize.Parcelize\n@@ -36,8 +37,13 @@ interface SecureBackupEntryPoint : FeatureEntryPoint {\n \n fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder\n \n+ interface Callback : Plugin {\n+ fun onDone()\n+ }\n+\n interface NodeBuilder {\n fun params(params: Params): NodeBuilder\n+ fun callback(callback: Callback): NodeBuilder\n fun build(): Node\n }\n }\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupEntryPoint.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupEntryPoint.kt\nindex e3d5fde9618..d2385604634 100644\n--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupEntryPoint.kt\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupEntryPoint.kt\n@@ -36,6 +36,11 @@ class DefaultSecureBackupEntryPoint @Inject constructor() : SecureBackupEntryPoi\n return this\n }\n \n+ override fun callback(callback: SecureBackupEntryPoint.Callback): SecureBackupEntryPoint.NodeBuilder {\n+ plugins += callback\n+ return this\n+ }\n+\n override fun build(): Node {\n return parentNode.createNode(buildContext, plugins)\n }\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt\nindex 172c6672e55..b698d2719ff 100644\n--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt\n@@ -22,7 +22,9 @@ import androidx.compose.ui.Modifier\n import com.bumble.appyx.core.modality.BuildContext\n import com.bumble.appyx.core.node.Node\n import com.bumble.appyx.core.plugin.Plugin\n+import com.bumble.appyx.core.plugin.plugins\n import com.bumble.appyx.navmodel.backstack.BackStack\n+import com.bumble.appyx.navmodel.backstack.operation.pop\n import com.bumble.appyx.navmodel.backstack.operation.push\n import dagger.assisted.Assisted\n import dagger.assisted.AssistedInject\n@@ -74,6 +76,8 @@ class SecureBackupFlowNode @AssistedInject constructor(\n data object EnterRecoveryKey : NavTarget\n }\n \n+ private val callback = plugins().firstOrNull()\n+\n override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {\n return when (navTarget) {\n NavTarget.Root -> {\n@@ -119,7 +123,16 @@ class SecureBackupFlowNode @AssistedInject constructor(\n createNode(buildContext)\n }\n NavTarget.EnterRecoveryKey -> {\n- createNode(buildContext)\n+ val callback = object : SecureBackupEnterRecoveryKeyNode.Callback {\n+ override fun onEnterRecoveryKeySuccess() {\n+ if (callback != null) {\n+ callback.onDone()\n+ } else {\n+ backstack.pop()\n+ }\n+ }\n+ }\n+ createNode(buildContext, plugins = listOf(callback))\n }\n }\n }\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyNode.kt\nindex 8c6ae282fa7..597ab4c14eb 100644\n--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyNode.kt\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyNode.kt\n@@ -17,48 +17,36 @@\n package io.element.android.features.securebackup.impl.enter\n \n import androidx.compose.runtime.Composable\n-import androidx.compose.runtime.rememberCoroutineScope\n import androidx.compose.ui.Modifier\n import com.bumble.appyx.core.modality.BuildContext\n import com.bumble.appyx.core.node.Node\n import com.bumble.appyx.core.plugin.Plugin\n+import com.bumble.appyx.core.plugin.plugins\n import dagger.assisted.Assisted\n import dagger.assisted.AssistedInject\n import io.element.android.anvilannotations.ContributesNode\n-import io.element.android.features.securebackup.impl.R\n-import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n-import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage\n import io.element.android.libraries.di.SessionScope\n-import kotlinx.coroutines.CoroutineScope\n-import kotlinx.coroutines.launch\n \n @ContributesNode(SessionScope::class)\n class SecureBackupEnterRecoveryKeyNode @AssistedInject constructor(\n @Assisted buildContext: BuildContext,\n @Assisted plugins: List,\n private val presenter: SecureBackupEnterRecoveryKeyPresenter,\n- private val snackbarDispatcher: SnackbarDispatcher,\n ) : Node(buildContext, plugins = plugins) {\n+ interface Callback : Plugin {\n+ fun onEnterRecoveryKeySuccess()\n+ }\n+\n+ private val callback = plugins().first()\n+\n @Composable\n override fun View(modifier: Modifier) {\n- val coroutineScope = rememberCoroutineScope()\n val state = presenter.present()\n SecureBackupEnterRecoveryKeyView(\n state = state,\n modifier = modifier,\n- onDone = {\n- coroutineScope.postSuccessSnackbar()\n- navigateUp()\n- },\n+ onDone = callback::onEnterRecoveryKeySuccess,\n onBackClicked = ::navigateUp,\n )\n }\n-\n- private fun CoroutineScope.postSuccessSnackbar() = launch {\n- snackbarDispatcher.post(\n- SnackbarMessage(\n- messageResId = R.string.screen_recovery_key_confirm_success\n- )\n- )\n- }\n }\ndiff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionNode.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionNode.kt\nindex cc97faa6e35..d2e8ad39dae 100644\n--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionNode.kt\n+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionNode.kt\n@@ -53,7 +53,7 @@ class VerifySelfSessionNode @AssistedInject constructor(\n state = state,\n modifier = modifier,\n onEnterRecoveryKey = ::onEnterRecoveryKey,\n- goBack = ::onDone,\n+ onFinished = ::onDone,\n )\n }\n }\ndiff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionPresenter.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionPresenter.kt\nindex 2a7740d8d00..a060469199f 100644\n--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionPresenter.kt\n+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionPresenter.kt\n@@ -68,10 +68,10 @@ class VerifySelfSessionPresenter @Inject constructor(\n when (event) {\n VerifySelfSessionViewEvents.RequestVerification -> stateAndDispatch.dispatchAction(StateMachineEvent.RequestVerification)\n VerifySelfSessionViewEvents.StartSasVerification -> stateAndDispatch.dispatchAction(StateMachineEvent.StartSasVerification)\n- VerifySelfSessionViewEvents.Restart -> stateAndDispatch.dispatchAction(StateMachineEvent.Restart)\n VerifySelfSessionViewEvents.ConfirmVerification -> stateAndDispatch.dispatchAction(StateMachineEvent.AcceptChallenge)\n VerifySelfSessionViewEvents.DeclineVerification -> stateAndDispatch.dispatchAction(StateMachineEvent.DeclineChallenge)\n- VerifySelfSessionViewEvents.CancelAndClose -> stateAndDispatch.dispatchAction(StateMachineEvent.Cancel)\n+ VerifySelfSessionViewEvents.Cancel -> stateAndDispatch.dispatchAction(StateMachineEvent.Cancel)\n+ VerifySelfSessionViewEvents.Reset -> stateAndDispatch.dispatchAction(StateMachineEvent.Reset)\n }\n }\n return VerifySelfSessionState(\n@@ -118,7 +118,7 @@ class VerifySelfSessionPresenter @Inject constructor(\n private fun CoroutineScope.observeVerificationService() {\n sessionVerificationService.verificationFlowState.onEach { verificationAttemptState ->\n when (verificationAttemptState) {\n- VerificationFlowState.Initial -> stateMachine.dispatch(VerifySelfSessionStateMachine.Event.Restart)\n+ VerificationFlowState.Initial -> stateMachine.dispatch(VerifySelfSessionStateMachine.Event.Reset)\n VerificationFlowState.AcceptedVerificationRequest -> {\n stateMachine.dispatch(VerifySelfSessionStateMachine.Event.DidAcceptVerificationRequest)\n }\ndiff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionStateMachine.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionStateMachine.kt\nindex 2a1c63370e0..29a484521a7 100644\n--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionStateMachine.kt\n+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionStateMachine.kt\n@@ -20,24 +20,35 @@\n package io.element.android.features.verifysession.impl\n \n import com.freeletics.flowredux.dsl.FlowReduxStateMachine\n+import io.element.android.libraries.core.bool.orFalse\n+import io.element.android.libraries.core.data.tryOrNull\n+import io.element.android.libraries.matrix.api.encryption.EncryptionService\n+import io.element.android.libraries.matrix.api.encryption.RecoveryState\n import io.element.android.libraries.matrix.api.verification.SessionVerificationData\n import io.element.android.libraries.matrix.api.verification.SessionVerificationService\n import kotlinx.coroutines.ExperimentalCoroutinesApi\n+import kotlinx.coroutines.FlowPreview\n+import kotlinx.coroutines.flow.filter\n+import kotlinx.coroutines.flow.first\n+import kotlinx.coroutines.flow.timeout\n import javax.inject.Inject\n+import kotlin.time.Duration.Companion.seconds\n import com.freeletics.flowredux.dsl.State as MachineState\n \n+@OptIn(FlowPreview::class)\n class VerifySelfSessionStateMachine @Inject constructor(\n private val sessionVerificationService: SessionVerificationService,\n+ private val encryptionService: EncryptionService,\n ) : FlowReduxStateMachine(\n initialState = State.Initial\n ) {\n init {\n spec {\n inState {\n- on { _: Event.RequestVerification, state: MachineState ->\n+ on { _: Event.RequestVerification, state ->\n state.override { State.RequestingVerification }\n }\n- on { _: Event.StartSasVerification, state: MachineState ->\n+ on { _: Event.StartSasVerification, state ->\n state.override { State.StartingSasVerification }\n }\n }\n@@ -45,12 +56,9 @@ class VerifySelfSessionStateMachine @Inject constructor(\n onEnterEffect {\n sessionVerificationService.requestVerification()\n }\n- on { _: Event.DidAcceptVerificationRequest, state: MachineState ->\n+ on { _: Event.DidAcceptVerificationRequest, state ->\n state.override { State.VerificationRequestAccepted }\n }\n- on { _: Event.DidFail, state: MachineState ->\n- state.override { State.Initial }\n- }\n }\n inState {\n onEnterEffect {\n@@ -58,25 +66,28 @@ class VerifySelfSessionStateMachine @Inject constructor(\n }\n }\n inState {\n- on { _: Event.StartSasVerification, state: MachineState ->\n+ on { _: Event.StartSasVerification, state ->\n state.override { State.StartingSasVerification }\n }\n }\n inState {\n- on { _: Event.Restart, state: MachineState ->\n+ on { _: Event.RequestVerification, state ->\n state.override { State.RequestingVerification }\n }\n+ on { _: Event.Reset, state ->\n+ state.override { State.Initial }\n+ }\n }\n inState {\n- on { event: Event.DidReceiveChallenge, state: MachineState ->\n+ on { event: Event.DidReceiveChallenge, state ->\n state.override { State.Verifying.ChallengeReceived(event.data) }\n }\n }\n inState {\n- on { _: Event.AcceptChallenge, state: MachineState ->\n+ on { _: Event.AcceptChallenge, state ->\n state.override { State.Verifying.Replying(state.snapshot.data, accept = true) }\n }\n- on { _: Event.DeclineChallenge, state: MachineState ->\n+ on { _: Event.DeclineChallenge, state ->\n state.override { State.Verifying.Replying(state.snapshot.data, accept = false) }\n }\n }\n@@ -88,11 +99,21 @@ class VerifySelfSessionStateMachine @Inject constructor(\n sessionVerificationService.declineVerification()\n }\n }\n- on { _: Event.DidAcceptChallenge, state: MachineState ->\n+ on { _: Event.DidAcceptChallenge, state ->\n+ // If a key backup exists, wait until it's restored or a timeout happens\n+ val hasBackup = encryptionService.doesBackupExistOnServer().getOrNull().orFalse()\n+ if (hasBackup) {\n+ tryOrNull {\n+ encryptionService.recoveryStateStateFlow.filter { it == RecoveryState.ENABLED }\n+ .timeout(10.seconds)\n+ .first()\n+ }\n+ }\n state.override { State.Completed }\n }\n }\n inState {\n+ // TODO The 'Canceling' -> 'Canceled' transitions doesn't seem to work anymore, check if something changed in the Rust SDK\n onEnterEffect {\n sessionVerificationService.cancelVerification()\n }\n@@ -102,21 +123,24 @@ class VerifySelfSessionStateMachine @Inject constructor(\n state.override { State.SasVerificationStarted }\n }\n on { _: Event.Cancel, state: MachineState ->\n- if (state.snapshot in sequenceOf(\n- State.Initial,\n- State.Completed,\n- State.Canceled\n- )) {\n- state.noChange()\n- } else {\n- state.override { State.Canceling }\n+ when (state.snapshot) {\n+ State.Initial, State.Completed, State.Canceled -> state.noChange()\n+ // For some reason `cancelVerification` is not calling its delegate `didCancel` method so we don't pass from\n+ // `Canceling` state to `Canceled` automatically anymore\n+ else -> {\n+ sessionVerificationService.cancelVerification()\n+ state.override { State.Canceled }\n+ }\n }\n }\n on { _: Event.DidCancel, state: MachineState ->\n state.override { State.Canceled }\n }\n on { _: Event.DidFail, state: MachineState ->\n- state.override { State.Canceled }\n+ when (state.snapshot) {\n+ is State.RequestingVerification -> state.override { State.Initial }\n+ else -> state.override { State.Canceled }\n+ }\n }\n }\n }\n@@ -190,7 +214,7 @@ class VerifySelfSessionStateMachine @Inject constructor(\n /** Request failed. */\n data object DidFail : Event\n \n- /** Restart the verification flow. */\n- data object Restart : Event\n+ /** Reset the verification flow to the initial state. */\n+ data object Reset : Event\n }\n }\ndiff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt\nindex 69fdfc5dfcf..7a1ad12b095 100644\n--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt\n+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt\n@@ -30,9 +30,6 @@ import androidx.compose.foundation.layout.size\n import androidx.compose.foundation.layout.widthIn\n import androidx.compose.material3.MaterialTheme\n import androidx.compose.runtime.Composable\n-import androidx.compose.runtime.derivedStateOf\n-import androidx.compose.runtime.getValue\n-import androidx.compose.runtime.remember\n import androidx.compose.ui.Alignment\n import androidx.compose.ui.Modifier\n import androidx.compose.ui.res.painterResource\n@@ -42,15 +39,16 @@ import androidx.compose.ui.text.style.TextOverflow\n import androidx.compose.ui.tooling.preview.PreviewParameter\n import androidx.compose.ui.unit.dp\n import io.element.android.compound.theme.ElementTheme\n+import io.element.android.compound.tokens.generated.CompoundIcons\n import io.element.android.features.verifysession.impl.emoji.toEmojiResource\n import io.element.android.libraries.architecture.AsyncData\n import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule\n-import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule\n import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage\n+import io.element.android.libraries.designsystem.components.BigIcon\n+import io.element.android.libraries.designsystem.components.PageTitle\n import io.element.android.libraries.designsystem.preview.ElementPreview\n import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n import io.element.android.libraries.designsystem.theme.components.Button\n-import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator\n import io.element.android.libraries.designsystem.theme.components.Text\n import io.element.android.libraries.designsystem.theme.components.TextButton\n import io.element.android.libraries.matrix.api.verification.SessionVerificationData\n@@ -62,36 +60,37 @@ import io.element.android.features.verifysession.impl.VerifySelfSessionState.Ver\n fun VerifySelfSessionView(\n state: VerifySelfSessionState,\n onEnterRecoveryKey: () -> Unit,\n- goBack: () -> Unit,\n+ onFinished: () -> Unit,\n modifier: Modifier = Modifier,\n ) {\n- fun goBackAndCancelIfNeeded() {\n- state.eventSink(VerifySelfSessionViewEvents.CancelAndClose)\n- goBack()\n- }\n- if (state.verificationFlowStep is FlowStep.Completed) {\n- goBack()\n+ fun resetFlow() {\n+ state.eventSink(VerifySelfSessionViewEvents.Reset)\n }\n BackHandler {\n- goBackAndCancelIfNeeded()\n+ when (state.verificationFlowStep) {\n+ is FlowStep.Canceled -> resetFlow()\n+ is FlowStep.AwaitingOtherDeviceResponse, FlowStep.Ready -> state.eventSink(VerifySelfSessionViewEvents.Cancel)\n+ is FlowStep.Verifying -> {\n+ if (!state.verificationFlowStep.state.isLoading()) {\n+ state.eventSink(VerifySelfSessionViewEvents.DeclineVerification)\n+ }\n+ }\n+ else -> Unit\n+ }\n }\n val verificationFlowStep = state.verificationFlowStep\n- val buttonsVisible by remember(verificationFlowStep) {\n- derivedStateOf { verificationFlowStep != FlowStep.AwaitingOtherDeviceResponse && verificationFlowStep != FlowStep.Completed }\n- }\n HeaderFooterPage(\n modifier = modifier,\n header = {\n HeaderContent(verificationFlowStep = verificationFlowStep)\n },\n footer = {\n- if (buttonsVisible) {\n- BottomMenu(\n- screenState = state,\n- goBack = ::goBackAndCancelIfNeeded,\n- onEnterRecoveryKey = onEnterRecoveryKey\n- )\n- }\n+ BottomMenu(\n+ screenState = state,\n+ goBack = ::resetFlow,\n+ onEnterRecoveryKey = onEnterRecoveryKey,\n+ onFinished = onFinished,\n+ )\n }\n ) {\n Content(flowState = verificationFlowStep)\n@@ -100,40 +99,38 @@ fun VerifySelfSessionView(\n \n @Composable\n private fun HeaderContent(verificationFlowStep: FlowStep) {\n- val iconResourceId = when (verificationFlowStep) {\n- is FlowStep.Initial -> R.drawable.ic_verification_devices\n- FlowStep.Canceled -> R.drawable.ic_verification_warning\n- FlowStep.AwaitingOtherDeviceResponse -> R.drawable.ic_verification_waiting\n- FlowStep.Ready, is FlowStep.Verifying, FlowStep.Completed -> R.drawable.ic_verification_emoji\n+ val iconStyle = when (verificationFlowStep) {\n+ is FlowStep.Initial, FlowStep.AwaitingOtherDeviceResponse -> BigIcon.Style.Default(CompoundIcons.LockSolid())\n+ FlowStep.Canceled -> BigIcon.Style.AlertSolid\n+ FlowStep.Ready, is FlowStep.Verifying -> BigIcon.Style.Default(CompoundIcons.Reaction())\n+ FlowStep.Completed -> BigIcon.Style.SuccessSolid\n }\n val titleTextId = when (verificationFlowStep) {\n- is FlowStep.Initial -> R.string.screen_session_verification_open_existing_session_title\n+ is FlowStep.Initial, FlowStep.AwaitingOtherDeviceResponse -> R.string.screen_identity_confirmation_title\n FlowStep.Canceled -> CommonStrings.common_verification_cancelled\n- FlowStep.AwaitingOtherDeviceResponse -> R.string.screen_session_verification_waiting_to_accept_title\n- FlowStep.Ready,\n- FlowStep.Completed -> R.string.screen_session_verification_compare_emojis_title\n+ FlowStep.Ready -> R.string.screen_session_verification_compare_emojis_title\n+ FlowStep.Completed -> R.string.screen_identity_confirmed_title\n is FlowStep.Verifying -> when (verificationFlowStep.data) {\n is SessionVerificationData.Decimals -> R.string.screen_session_verification_compare_numbers_title\n is SessionVerificationData.Emojis -> R.string.screen_session_verification_compare_emojis_title\n }\n }\n val subtitleTextId = when (verificationFlowStep) {\n- is FlowStep.Initial -> R.string.screen_session_verification_open_existing_session_subtitle\n+ is FlowStep.Initial, FlowStep.AwaitingOtherDeviceResponse -> R.string.screen_identity_confirmation_subtitle\n FlowStep.Canceled -> R.string.screen_session_verification_cancelled_subtitle\n- FlowStep.AwaitingOtherDeviceResponse -> R.string.screen_session_verification_waiting_to_accept_subtitle\n FlowStep.Ready -> R.string.screen_session_verification_ready_subtitle\n- FlowStep.Completed -> R.string.screen_session_verification_compare_emojis_subtitle\n+ FlowStep.Completed -> R.string.screen_identity_confirmation_subtitle\n is FlowStep.Verifying -> when (verificationFlowStep.data) {\n is SessionVerificationData.Decimals -> R.string.screen_session_verification_compare_numbers_subtitle\n is SessionVerificationData.Emojis -> R.string.screen_session_verification_compare_emojis_subtitle\n }\n }\n \n- IconTitleSubtitleMolecule(\n+ PageTitle(\n modifier = Modifier.padding(top = 60.dp),\n- iconResourceId = iconResourceId,\n+ iconStyle = iconStyle,\n title = stringResource(id = titleTextId),\n- subTitle = stringResource(id = subtitleTextId)\n+ subtitle = stringResource(id = subtitleTextId)\n )\n }\n \n@@ -141,20 +138,12 @@ private fun HeaderContent(verificationFlowStep: FlowStep) {\n private fun Content(flowState: FlowStep) {\n Column(Modifier.fillMaxHeight(), verticalArrangement = Arrangement.Center) {\n when (flowState) {\n- is FlowStep.Initial, FlowStep.Ready, FlowStep.Canceled, FlowStep.Completed -> Unit\n- FlowStep.AwaitingOtherDeviceResponse -> ContentWaiting()\n+ is FlowStep.Initial, FlowStep.AwaitingOtherDeviceResponse, FlowStep.Ready, FlowStep.Canceled, FlowStep.Completed -> Unit\n is FlowStep.Verifying -> ContentVerifying(flowState)\n }\n }\n }\n \n-@Composable\n-private fun ContentWaiting() {\n- Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {\n- CircularProgressIndicator()\n- }\n-}\n-\n @Composable\n private fun ContentVerifying(verificationFlowStep: FlowStep.Verifying) {\n when (verificationFlowStep.data) {\n@@ -212,76 +201,102 @@ private fun BottomMenu(\n screenState: VerifySelfSessionState,\n onEnterRecoveryKey: () -> Unit,\n goBack: () -> Unit,\n+ onFinished: () -> Unit,\n ) {\n val verificationViewState = screenState.verificationFlowStep\n val eventSink = screenState.eventSink\n \n val isVerifying = (verificationViewState as? FlowStep.Verifying)?.state is AsyncData.Loading\n- val positiveButtonTitle = when (verificationViewState) {\n- is FlowStep.Initial -> R.string.screen_session_verification_positive_button_initial\n- FlowStep.Canceled -> R.string.screen_session_verification_positive_button_canceled\n+\n+ when (verificationViewState) {\n+ is FlowStep.Initial -> {\n+ BottomMenu(\n+ positiveButtonTitle = stringResource(R.string.screen_identity_use_another_device),\n+ onPositiveButtonClicked = { eventSink(VerifySelfSessionViewEvents.RequestVerification) },\n+ negativeButtonTitle = stringResource(R.string.screen_session_verification_enter_recovery_key),\n+ onNegativeButtonClicked = onEnterRecoveryKey,\n+ )\n+ }\n+ is FlowStep.Canceled -> {\n+ BottomMenu(\n+ positiveButtonTitle = stringResource(R.string.screen_session_verification_positive_button_canceled),\n+ onPositiveButtonClicked = { eventSink(VerifySelfSessionViewEvents.RequestVerification) },\n+ negativeButtonTitle = stringResource(CommonStrings.action_cancel),\n+ onNegativeButtonClicked = goBack,\n+ )\n+ }\n+ is FlowStep.Ready -> {\n+ BottomMenu(\n+ positiveButtonTitle = stringResource(CommonStrings.action_start),\n+ onPositiveButtonClicked = { eventSink(VerifySelfSessionViewEvents.StartSasVerification) },\n+ negativeButtonTitle = stringResource(CommonStrings.action_cancel),\n+ onNegativeButtonClicked = goBack,\n+ )\n+ }\n+ is FlowStep.AwaitingOtherDeviceResponse -> {\n+ BottomMenu(\n+ positiveButtonTitle = stringResource(R.string.screen_identity_waiting_on_other_device),\n+ onPositiveButtonClicked = {},\n+ isLoading = true,\n+ )\n+ }\n is FlowStep.Verifying -> {\n- if (isVerifying) {\n- R.string.screen_session_verification_positive_button_verifying_ongoing\n+ val positiveButtonTitle = if (isVerifying) {\n+ stringResource(R.string.screen_session_verification_positive_button_verifying_ongoing)\n } else {\n- R.string.screen_session_verification_they_match\n+ stringResource(R.string.screen_session_verification_they_match)\n }\n+ BottomMenu(\n+ positiveButtonTitle = positiveButtonTitle,\n+ onPositiveButtonClicked = {\n+ if (!isVerifying) {\n+ eventSink(VerifySelfSessionViewEvents.ConfirmVerification)\n+ }\n+ },\n+ negativeButtonTitle = stringResource(R.string.screen_session_verification_they_dont_match),\n+ onNegativeButtonClicked = { eventSink(VerifySelfSessionViewEvents.DeclineVerification) },\n+ isLoading = isVerifying,\n+ )\n }\n- FlowStep.Ready -> CommonStrings.action_start\n- else -> null\n- }\n- val negativeButtonTitle = when (verificationViewState) {\n- is FlowStep.Initial -> CommonStrings.action_cancel\n- FlowStep.Canceled -> CommonStrings.action_cancel\n- is FlowStep.Verifying -> R.string.screen_session_verification_they_dont_match\n- else -> null\n- }\n- val negativeButtonEnabled = !isVerifying\n-\n- val positiveButtonEvent = when (verificationViewState) {\n- is FlowStep.Initial -> VerifySelfSessionViewEvents.RequestVerification\n- FlowStep.Ready -> VerifySelfSessionViewEvents.StartSasVerification\n- is FlowStep.Verifying -> if (!isVerifying) VerifySelfSessionViewEvents.ConfirmVerification else null\n- FlowStep.Canceled -> VerifySelfSessionViewEvents.Restart\n- else -> null\n- }\n-\n- val negativeButtonCallback: () -> Unit = when (verificationViewState) {\n- is FlowStep.Verifying -> {\n- { eventSink(VerifySelfSessionViewEvents.DeclineVerification) }\n+ is FlowStep.Completed -> {\n+ BottomMenu(\n+ positiveButtonTitle = stringResource(CommonStrings.action_continue),\n+ onPositiveButtonClicked = onFinished,\n+ )\n }\n- else -> goBack\n }\n+}\n \n+@Composable\n+private fun BottomMenu(\n+ positiveButtonTitle: String?,\n+ onPositiveButtonClicked: () -> Unit,\n+ modifier: Modifier = Modifier,\n+ negativeButtonTitle: String? = null,\n+ negativeButtonEnabled: Boolean = negativeButtonTitle != null,\n+ onNegativeButtonClicked: () -> Unit = {},\n+ isLoading: Boolean = false,\n+) {\n ButtonColumnMolecule(\n- modifier = Modifier.padding(bottom = 20.dp)\n+ modifier = modifier.padding(bottom = 16.dp)\n ) {\n if (positiveButtonTitle != null) {\n Button(\n- text = stringResource(positiveButtonTitle),\n- showProgress = isVerifying,\n+ text = positiveButtonTitle,\n+ showProgress = isLoading,\n modifier = Modifier.fillMaxWidth(),\n- onClick = { positiveButtonEvent?.let { eventSink(it) } }\n+ onClick = onPositiveButtonClicked,\n )\n }\n if (negativeButtonTitle != null) {\n TextButton(\n- text = stringResource(negativeButtonTitle),\n+ text = negativeButtonTitle,\n modifier = Modifier.fillMaxWidth(),\n- onClick = negativeButtonCallback,\n+ onClick = onNegativeButtonClicked,\n enabled = negativeButtonEnabled,\n )\n- }\n- if (verificationViewState is FlowStep.Initial && verificationViewState.canEnterRecoveryKey) {\n- Text(\n- text = stringResource(id = CommonStrings.common_or),\n- color = ElementTheme.colors.textSecondary,\n- )\n- TextButton(\n- text = stringResource(R.string.screen_session_verification_enter_recovery_key),\n- modifier = Modifier.fillMaxWidth(),\n- onClick = onEnterRecoveryKey,\n- )\n+ } else {\n+ Spacer(modifier = Modifier.height(48.dp))\n }\n }\n }\n@@ -292,6 +307,6 @@ internal fun VerifySelfSessionViewPreview(@PreviewParameter(VerifySelfSessionSta\n VerifySelfSessionView(\n state = state,\n onEnterRecoveryKey = {},\n- goBack = {},\n+ onFinished = {},\n )\n }\ndiff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewEvents.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewEvents.kt\nindex 8f9c69085c0..2b86ca6f187 100644\n--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewEvents.kt\n+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewEvents.kt\n@@ -19,8 +19,8 @@ package io.element.android.features.verifysession.impl\n sealed interface VerifySelfSessionViewEvents {\n data object RequestVerification : VerifySelfSessionViewEvents\n data object StartSasVerification : VerifySelfSessionViewEvents\n- data object Restart : VerifySelfSessionViewEvents\n data object ConfirmVerification : VerifySelfSessionViewEvents\n data object DeclineVerification : VerifySelfSessionViewEvents\n- data object CancelAndClose : VerifySelfSessionViewEvents\n+ data object Cancel : VerifySelfSessionViewEvents\n+ data object Reset : VerifySelfSessionViewEvents\n }\ndiff --git a/features/verifysession/impl/src/main/res/drawable/ic_verification_devices.xml b/features/verifysession/impl/src/main/res/drawable/ic_verification_devices.xml\ndeleted file mode 100644\nindex 8ae6dd30fa9..00000000000\n--- a/features/verifysession/impl/src/main/res/drawable/ic_verification_devices.xml\n+++ /dev/null\n@@ -1,9 +0,0 @@\n-\n- \n-\ndiff --git a/features/verifysession/impl/src/main/res/drawable/ic_verification_emoji.xml b/features/verifysession/impl/src/main/res/drawable/ic_verification_emoji.xml\ndeleted file mode 100644\nindex 82583a4011f..00000000000\n--- a/features/verifysession/impl/src/main/res/drawable/ic_verification_emoji.xml\n+++ /dev/null\n@@ -1,9 +0,0 @@\n-\n- \n-\ndiff --git a/features/verifysession/impl/src/main/res/drawable/ic_verification_waiting.xml b/features/verifysession/impl/src/main/res/drawable/ic_verification_waiting.xml\ndeleted file mode 100644\nindex 5b9f2e3cfce..00000000000\n--- a/features/verifysession/impl/src/main/res/drawable/ic_verification_waiting.xml\n+++ /dev/null\n@@ -1,9 +0,0 @@\n-\n- \n-\ndiff --git a/features/verifysession/impl/src/main/res/drawable/ic_verification_warning.xml b/features/verifysession/impl/src/main/res/drawable/ic_verification_warning.xml\ndeleted file mode 100644\nindex 882ac62cd79..00000000000\n--- a/features/verifysession/impl/src/main/res/drawable/ic_verification_warning.xml\n+++ /dev/null\n@@ -1,9 +0,0 @@\n-\n- \n-\ndiff --git a/features/verifysession/impl/src/main/res/values/localazy.xml b/features/verifysession/impl/src/main/res/values/localazy.xml\nindex b46954f42b1..9fea2d98dfd 100644\n--- a/features/verifysession/impl/src/main/res/values/localazy.xml\n+++ b/features/verifysession/impl/src/main/res/values/localazy.xml\n@@ -1,5 +1,11 @@\n \n \n+ \"Verify this device to set up secure messaging.\"\n+ \"Confirm that it\\'s you\"\n+ \"Now you can read or send messages securely, and anyone you chat with can also trust this device.\"\n+ \"Device verified\"\n+ \"Use another device\"\n+ \"Waiting on other device\u2026\"\n \"Something doesn\u2019t seem right. Either the request timed out or the request was denied.\"\n \"Confirm that the emojis below match those shown on your other session.\"\n \"Compare emojis\"\ndiff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt\nindex 1dc72309734..b90cf80aaa7 100644\n--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt\n+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt\n@@ -32,6 +32,7 @@ import io.element.android.compound.theme.ElementTheme\n import io.element.android.compound.tokens.generated.CompoundIcons\n import io.element.android.libraries.designsystem.atomic.atoms.RoundedIconAtom\n import io.element.android.libraries.designsystem.atomic.atoms.RoundedIconAtomSize\n+import io.element.android.libraries.designsystem.icons.CompoundDrawables\n import io.element.android.libraries.designsystem.preview.ElementPreview\n import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n import io.element.android.libraries.designsystem.theme.components.Text\n@@ -95,3 +96,14 @@ internal fun IconTitleSubtitleMoleculePreview() = ElementPreview {\n subTitle = \"Subtitle\",\n )\n }\n+\n+@PreviewsDayNight\n+@Composable\n+internal fun IconTitleSubtitleMoleculeWithResIconPreview() = ElementPreview {\n+ IconTitleSubtitleMolecule(\n+ iconResourceId = CompoundDrawables.ic_compound_admin,\n+ iconTint = Color.Black,\n+ title = \"Title\",\n+ subTitle = \"Subtitle\",\n+ )\n+}\ndiff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/PageTitle.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/PageTitle.kt\nindex 9ff8ef38da0..de1e25f5f3b 100644\n--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/PageTitle.kt\n+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/PageTitle.kt\n@@ -52,9 +52,7 @@ fun PageTitle(\n callToAction: @Composable (() -> Unit)? = null,\n ) {\n Column(\n- modifier = modifier\n- .fillMaxWidth()\n- .padding(bottom = 40.dp),\n+ modifier = modifier.fillMaxWidth(),\n horizontalAlignment = Alignment.CenterHorizontally,\n ) {\n BigIcon(style = iconStyle)\ndiff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationService.kt\nindex 00fd9dc5618..8d22fc174e0 100644\n--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationService.kt\n+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationService.kt\n@@ -85,6 +85,9 @@ sealed interface SessionVerifiedStatus {\n \n /** Verified session status. */\n data object Verified : SessionVerifiedStatus\n+\n+ /** Returns whether the session is [Verified]. */\n+ fun isVerified(): Boolean = this is Verified\n }\n \n /** States produced by the [SessionVerificationService]. */\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt\nindex 0212a5293ad..546acc6e845 100644\n--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt\n@@ -40,6 +40,7 @@ import io.element.android.libraries.matrix.api.roomdirectory.RoomDirectoryServic\n import io.element.android.libraries.matrix.api.roomlist.RoomListService\n import io.element.android.libraries.matrix.api.roomlist.awaitLoaded\n import io.element.android.libraries.matrix.api.sync.SyncService\n+import io.element.android.libraries.matrix.api.sync.SyncState\n import io.element.android.libraries.matrix.api.user.MatrixSearchUserResults\n import io.element.android.libraries.matrix.api.user.MatrixUser\n import io.element.android.libraries.matrix.api.verification.SessionVerificationService\n@@ -84,8 +85,7 @@ import kotlinx.coroutines.flow.StateFlow\n import kotlinx.coroutines.flow.buffer\n import kotlinx.coroutines.flow.filter\n import kotlinx.coroutines.flow.first\n-import kotlinx.coroutines.flow.launchIn\n-import kotlinx.coroutines.flow.onEach\n+import kotlinx.coroutines.flow.map\n import kotlinx.coroutines.flow.stateIn\n import kotlinx.coroutines.launch\n import kotlinx.coroutines.withContext\n@@ -130,11 +130,6 @@ class RustMatrixClient(\n private val innerRoomListService = syncService.roomListService()\n private val sessionDispatcher = dispatchers.io.limitedParallelism(64)\n private val rustSyncService = RustSyncService(syncService, sessionCoroutineScope)\n- private val verificationService = RustSessionVerificationService(\n- client = client,\n- syncService = rustSyncService,\n- sessionCoroutineScope = sessionCoroutineScope,\n- ).apply { start() }\n private val pushersService = RustPushersService(\n client = client,\n dispatchers = dispatchers,\n@@ -230,6 +225,12 @@ class RustMatrixClient(\n ),\n )\n \n+ private val verificationService = RustSessionVerificationService(\n+ client = client,\n+ isSyncServiceReady = rustSyncService.syncState.map { it == SyncState.Running },\n+ sessionCoroutineScope = sessionCoroutineScope,\n+ )\n+\n private val eventFilters = TimelineConfig.excludedEvents\n .takeIf { it.isNotEmpty() }\n ?.let { listStateEventType ->\n@@ -274,11 +275,6 @@ class RustMatrixClient(\n .stateIn(sessionCoroutineScope, started = SharingStarted.Eagerly, initialValue = persistentListOf())\n \n init {\n- roomListService.state.onEach { state ->\n- if (state == RoomListService.State.Running) {\n- setupVerificationControllerIfNeeded()\n- }\n- }.launchIn(sessionCoroutineScope)\n sessionCoroutineScope.launch {\n // Force a refresh of the profile\n getUserProfile()\n@@ -490,6 +486,7 @@ class RustMatrixClient(\n ignoreSdkError: Boolean,\n ): String? {\n var result: String? = null\n+ syncService.stop()\n withContext(sessionDispatcher) {\n if (doRequest) {\n try {\n@@ -525,16 +522,6 @@ class RustMatrixClient(\n }\n }\n \n- private fun setupVerificationControllerIfNeeded() {\n- if (verificationService.verificationController == null) {\n- try {\n- verificationService.verificationController = client.getSessionVerificationController()\n- } catch (e: Throwable) {\n- Timber.e(e, \"Could not start verification service. Will try again on the next sliding sync update.\")\n- }\n- }\n- }\n-\n override fun roomMembershipObserver(): RoomMembershipObserver = roomMembershipObserver\n \n private suspend fun File.getCacheSize(\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt\nindex 157e751d21f..bb0821570bb 100644\n--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt\n@@ -16,92 +16,135 @@\n \n package io.element.android.libraries.matrix.impl.verification\n \n-import io.element.android.libraries.core.bool.orFalse\n import io.element.android.libraries.core.data.tryOrNull\n-import io.element.android.libraries.matrix.api.sync.SyncState\n import io.element.android.libraries.matrix.api.verification.SessionVerificationData\n import io.element.android.libraries.matrix.api.verification.SessionVerificationService\n import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus\n import io.element.android.libraries.matrix.api.verification.VerificationEmoji\n import io.element.android.libraries.matrix.api.verification.VerificationFlowState\n-import io.element.android.libraries.matrix.impl.sync.RustSyncService\n import io.element.android.libraries.matrix.impl.util.cancelAndDestroy\n import kotlinx.coroutines.CoroutineScope\n+import kotlinx.coroutines.flow.Flow\n import kotlinx.coroutines.flow.MutableStateFlow\n import kotlinx.coroutines.flow.StateFlow\n import kotlinx.coroutines.flow.asStateFlow\n import kotlinx.coroutines.flow.combine\n-import kotlinx.coroutines.launch\n+import kotlinx.coroutines.flow.launchIn\n+import kotlinx.coroutines.flow.onEach\n import org.matrix.rustcomponents.sdk.Client\n import org.matrix.rustcomponents.sdk.Encryption\n import org.matrix.rustcomponents.sdk.RecoveryState\n import org.matrix.rustcomponents.sdk.RecoveryStateListener\n import org.matrix.rustcomponents.sdk.SessionVerificationController\n import org.matrix.rustcomponents.sdk.SessionVerificationControllerDelegate\n-import org.matrix.rustcomponents.sdk.SessionVerificationControllerInterface\n import org.matrix.rustcomponents.sdk.TaskHandle\n+import org.matrix.rustcomponents.sdk.VerificationState\n+import org.matrix.rustcomponents.sdk.VerificationStateListener\n import org.matrix.rustcomponents.sdk.use\n+import timber.log.Timber\n import org.matrix.rustcomponents.sdk.SessionVerificationData as RustSessionVerificationData\n \n class RustSessionVerificationService(\n client: Client,\n- private val syncService: RustSyncService,\n- private val sessionCoroutineScope: CoroutineScope,\n+ isSyncServiceReady: Flow,\n+ sessionCoroutineScope: CoroutineScope,\n ) : SessionVerificationService, SessionVerificationControllerDelegate {\n+ private var verificationStateListenerTaskHandle: TaskHandle? = null\n private var recoveryStateListenerTaskHandle: TaskHandle? = null\n private val encryptionService: Encryption = client.encryption()\n- var verificationController: SessionVerificationControllerInterface? = null\n- set(value) {\n- field = value\n- _isReady.value = value != null\n- // If status was 'Unknown', move it to either 'Verified' or 'NotVerified'\n- if (value != null) {\n- value.setDelegate(this)\n- sessionCoroutineScope.launch { updateVerificationStatus(value.isVerified()) }\n- }\n- }\n+ private lateinit var verificationController: SessionVerificationController\n \n private val _verificationFlowState = MutableStateFlow(VerificationFlowState.Initial)\n override val verificationFlowState = _verificationFlowState.asStateFlow()\n \n- private val _isReady = MutableStateFlow(false)\n- override val isReady = _isReady.asStateFlow()\n-\n private val _sessionVerifiedStatus = MutableStateFlow(SessionVerifiedStatus.Unknown)\n override val sessionVerifiedStatus: StateFlow = _sessionVerifiedStatus.asStateFlow()\n \n- override val canVerifySessionFlow = combine(sessionVerifiedStatus, syncService.syncState) { verificationStatus, syncState ->\n- syncState == SyncState.Running && verificationStatus == SessionVerifiedStatus.NotVerified\n+ override val isReady = MutableStateFlow(false)\n+\n+ override val canVerifySessionFlow = combine(sessionVerifiedStatus, isReady) { verificationStatus, isReady ->\n+ isReady && verificationStatus == SessionVerifiedStatus.NotVerified\n }\n \n- fun start() {\n- recoveryStateListenerTaskHandle = encryptionService.recoveryStateListener(object : RecoveryStateListener {\n- override fun onUpdate(status: RecoveryState) {\n- sessionCoroutineScope.launch {\n- updateVerificationStatus(verificationController?.isVerified().orFalse())\n+ init {\n+ isSyncServiceReady\n+ .onEach { syncServiceReady ->\n+ if (syncServiceReady) {\n+ isReady.value = true\n+ runCatching {\n+ // If the controller was failed to initialize before, we try to get it again\n+ if (!this::verificationController.isInitialized) {\n+ verificationController = client.getSessionVerificationController()\n+ }\n+ }\n+ .onFailure {\n+ isReady.value = false\n+ Timber.e(it, \"Failed to get verification controller. Trying again in next sync.\")\n+ }\n+ } else {\n+ isReady.value = false\n }\n }\n- })\n+ .launchIn(sessionCoroutineScope)\n+\n+ isReady.onEach { isReady ->\n+ if (isReady) {\n+ Timber.d(\"Starting verification service\")\n+ // Setup delegate\n+ verificationController.setDelegate(this)\n+\n+ // Immediate status update\n+ updateVerificationStatus(encryptionService.verificationState())\n+\n+ // Listen for changes in verification status and update accordingly\n+ verificationStateListenerTaskHandle?.cancelAndDestroy()\n+ verificationStateListenerTaskHandle = encryptionService.verificationStateListener(object : VerificationStateListener {\n+ override fun onUpdate(status: VerificationState) {\n+ Timber.d(\"New verification state: $status\")\n+ updateVerificationStatus(status)\n+ }\n+ })\n+\n+ // In case we enter the recovery key instead we check changes in the recovery state, since the listener above won't be triggered\n+ recoveryStateListenerTaskHandle?.cancelAndDestroy()\n+ recoveryStateListenerTaskHandle = encryptionService.recoveryStateListener(object : RecoveryStateListener {\n+ override fun onUpdate(status: RecoveryState) {\n+ Timber.d(\"New recovery state: $status\")\n+ // We could check the `RecoveryState`, but it's easier to just use the verification state directly\n+ updateVerificationStatus(encryptionService.verificationState())\n+ }\n+ })\n+ } else {\n+ Timber.d(\"Stopping verification service\")\n+ if (this::verificationController.isInitialized) {\n+ verificationController.setDelegate(null)\n+ }\n+ }\n+ }\n+ .launchIn(sessionCoroutineScope)\n }\n \n override suspend fun requestVerification() = tryOrFail {\n- verificationController?.requestVerification()\n+ verificationController.requestVerification()\n }\n \n- override suspend fun cancelVerification() = tryOrFail { verificationController?.cancelVerification() }\n+ override suspend fun cancelVerification() = tryOrFail { verificationController.cancelVerification() }\n \n- override suspend fun approveVerification() = tryOrFail { verificationController?.approveVerification() }\n+ override suspend fun approveVerification() = tryOrFail { verificationController.approveVerification() }\n \n- override suspend fun declineVerification() = tryOrFail { verificationController?.declineVerification() }\n+ override suspend fun declineVerification() = tryOrFail { verificationController.declineVerification() }\n \n override suspend fun startVerification() = tryOrFail {\n- verificationController?.startSasVerification()\n+ verificationController.startSasVerification()\n }\n \n private suspend fun tryOrFail(block: suspend () -> Unit) {\n runCatching {\n block()\n- }.onFailure { didFail() }\n+ }.onFailure {\n+ Timber.e(it, \"Failed to verify session\")\n+ didFail()\n+ }\n }\n \n // region Delegate implementation\n@@ -116,13 +159,14 @@ class RustSessionVerificationService(\n }\n \n override fun didFail() {\n+ Timber.e(\"Session verification failed with an unknown error\")\n _verificationFlowState.value = VerificationFlowState.Failed\n }\n \n override fun didFinish() {\n _verificationFlowState.value = VerificationFlowState.Finished\n // Ideally this should be `verificationController?.isVerified().orFalse()` but for some reason it always returns false\n- updateVerificationStatus(isVerified = true)\n+ updateVerificationStatus(VerificationState.VERIFIED)\n }\n \n override fun didReceiveVerificationData(data: RustSessionVerificationData) {\n@@ -139,25 +183,26 @@ class RustSessionVerificationService(\n override suspend fun reset() {\n if (isReady.value) {\n // Cancel any pending verification attempt\n- tryOrNull { verificationController?.cancelVerification() }\n+ tryOrNull { verificationController.cancelVerification() }\n }\n _verificationFlowState.value = VerificationFlowState.Initial\n }\n \n fun destroy() {\n+ Timber.d(\"Destroying RustSessionVerificationService\")\n recoveryStateListenerTaskHandle?.cancelAndDestroy()\n- verificationController?.setDelegate(null)\n- (verificationController as? SessionVerificationController)?.destroy()\n- verificationController = null\n+ if (this::verificationController.isInitialized) {\n+ verificationController.setDelegate(null)\n+ (verificationController as? SessionVerificationController)?.destroy()\n+ }\n }\n \n- private fun updateVerificationStatus(isVerified: Boolean) {\n- val newValue = when {\n- !isReady.value -> SessionVerifiedStatus.Unknown\n- !isVerified -> SessionVerifiedStatus.NotVerified\n- else -> SessionVerifiedStatus.Verified\n+ private fun updateVerificationStatus(verificationState: VerificationState) {\n+ _sessionVerifiedStatus.value = when (verificationState) {\n+ VerificationState.UNKNOWN -> SessionVerifiedStatus.Unknown\n+ VerificationState.VERIFIED -> SessionVerifiedStatus.Verified\n+ VerificationState.UNVERIFIED -> SessionVerifiedStatus.NotVerified\n }\n- _sessionVerifiedStatus.value = newValue\n }\n }\n \ndiff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml\nindex 2f9812fc79f..97ddec4b3b2 100644\n--- a/libraries/ui-strings/src/main/res/values/localazy.xml\n+++ b/libraries/ui-strings/src/main/res/values/localazy.xml\n@@ -254,6 +254,8 @@\n \"Failed selecting media, please try again.\"\n \"Failed processing media to upload, please try again.\"\n \"Failed uploading media, please try again.\"\n+ \"Failed loading\"\n+ \"Room directory\"\n \"Failed processing media to upload, please try again.\"\n \"Could not retrieve user details\"\n \"Block\"\ndiff --git a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt\nindex 7bf32613715..264a754e730 100644\n--- a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt\n+++ b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt\n@@ -152,7 +152,6 @@ class RoomListScreen(\n state = state,\n onRoomClicked = ::onRoomClicked,\n onSettingsClicked = {},\n- onVerifyClicked = {},\n onConfirmRecoveryKeyClicked = {},\n onCreateRoomClicked = {},\n onInvitesClicked = {},\ndiff --git a/tools/localazy/config.json b/tools/localazy/config.json\nindex d63ede56389..566ea071e05 100644\n--- a/tools/localazy/config.json\n+++ b/tools/localazy/config.json\n@@ -48,7 +48,8 @@\n {\n \"name\" : \":features:verifysession:impl\",\n \"includeRegex\" : [\n- \"screen_session_verification_.*\"\n+ \"screen_session_verification_.*\",\n+ \"screen_identity_.*\"\n ]\n },\n {\n", "test_patch": "diff --git a/.maestro/tests/account/login.yaml b/.maestro/tests/account/login.yaml\nindex dcb5cd32234..69833a985ed 100644\n--- a/.maestro/tests/account/login.yaml\n+++ b/.maestro/tests/account/login.yaml\n@@ -23,7 +23,8 @@ appId: ${MAESTRO_APP_ID}\n - inputText: ${MAESTRO_PASSWORD}\n - pressKey: Enter\n - tapOn: \"Continue\"\n+- runFlow: ../assertions/assertSessionVerificationDisplayed.yaml\n+- runFlow: ./verifySession.yaml\n - runFlow: ../assertions/assertAnalyticsDisplayed.yaml\n - tapOn: \"Not now\"\n - runFlow: ../assertions/assertHomeDisplayed.yaml\n-- runFlow: ./verifySession.yaml\ndiff --git a/.maestro/tests/account/verifySession.yaml b/.maestro/tests/account/verifySession.yaml\nindex eeb0489e3eb..5449f4f7da0 100644\n--- a/.maestro/tests/account/verifySession.yaml\n+++ b/.maestro/tests/account/verifySession.yaml\n@@ -1,6 +1,5 @@\n appId: ${MAESTRO_APP_ID}\n ---\n-- tapOn: \"Continue\"\n - takeScreenshot: build/maestro/150-Verify\n - tapOn: \"Enter recovery key\"\n - tapOn:\n@@ -8,4 +7,3 @@ appId: ${MAESTRO_APP_ID}\n - inputText: ${MAESTRO_RECOVERY_KEY}\n - hideKeyboard\n - tapOn: \"Confirm\"\n-- runFlow: ../assertions/assertHomeDisplayed.yaml\ndiff --git a/.maestro/tests/assertions/assertSessionVerificationDisplayed.yaml b/.maestro/tests/assertions/assertSessionVerificationDisplayed.yaml\nnew file mode 100644\nindex 00000000000..85785ac968a\n--- /dev/null\n+++ b/.maestro/tests/assertions/assertSessionVerificationDisplayed.yaml\n@@ -0,0 +1,5 @@\n+appId: ${MAESTRO_APP_ID}\n+---\n+- extendedWaitUntil:\n+ visible: \"Confirm that it's you\"\n+ timeout: 10000\ndiff --git a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt\nindex 0da579aa764..df170535129 100644\n--- a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt\n+++ b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt\n@@ -25,6 +25,7 @@ import io.element.android.features.networkmonitor.test.FakeNetworkMonitor\n import io.element.android.libraries.matrix.api.roomlist.RoomListService\n import io.element.android.libraries.matrix.test.FakeMatrixClient\n import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService\n+import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService\n import io.element.android.libraries.push.test.FakePushService\n import io.element.android.tests.testutils.WarmUpRule\n import io.element.android.tests.testutils.consumeItemsUntilPredicate\n@@ -71,6 +72,7 @@ class LoggedInPresenterTest {\n matrixClient = FakeMatrixClient(roomListService = roomListService),\n networkMonitor = FakeNetworkMonitor(networkStatus),\n pushService = FakePushService(),\n+ sessionVerificationService = FakeSessionVerificationService(),\n )\n }\n }\ndiff --git a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueStateTests.kt b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueServiceTests.kt\nsimilarity index 70%\nrename from features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueStateTests.kt\nrename to features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueServiceTests.kt\nindex 1f0b8178509..f3f21836b9a 100644\n--- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueStateTests.kt\n+++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueServiceTests.kt\n@@ -17,11 +17,15 @@\n package io.element.android.features.ftue.impl\n \n import android.os.Build\n+import app.cash.turbine.test\n import com.google.common.truth.Truth.assertThat\n-import io.element.android.features.ftue.impl.state.DefaultFtueState\n+import io.element.android.features.ftue.api.state.FtueState\n+import io.element.android.features.ftue.impl.state.DefaultFtueService\n import io.element.android.features.ftue.impl.state.FtueStep\n import io.element.android.features.lockscreen.api.LockScreenService\n import io.element.android.features.lockscreen.test.FakeLockScreenService\n+import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus\n+import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService\n import io.element.android.libraries.permissions.impl.FakePermissionStateProvider\n import io.element.android.services.analytics.api.AnalyticsService\n import io.element.android.services.analytics.test.FakeAnalyticsService\n@@ -32,38 +36,51 @@ import kotlinx.coroutines.cancel\n import kotlinx.coroutines.test.runTest\n import org.junit.Test\n \n-class DefaultFtueStateTests {\n+class DefaultFtueServiceTests {\n @Test\n- fun `given any check being false, should display flow is true`() = runTest {\n+ fun `given any check being false and session verification state being loaded, FtueState is Incomplete`() = runTest {\n+ val sessionVerificationService = FakeSessionVerificationService().apply {\n+ givenVerifiedStatus(SessionVerifiedStatus.Unknown)\n+ }\n val coroutineScope = CoroutineScope(coroutineContext + SupervisorJob())\n- val state = createState(coroutineScope)\n+ val state = createState(coroutineScope, sessionVerificationService)\n \n- assertThat(state.shouldDisplayFlow.value).isTrue()\n+ state.state.test {\n+ // Verification state is unknown, we don't display the flow yet\n+ assertThat(awaitItem()).isEqualTo(FtueState.Unknown)\n+\n+ // Verification state is known, we should display the flow if any check is false\n+ sessionVerificationService.givenVerifiedStatus(SessionVerifiedStatus.NotVerified)\n+ assertThat(awaitItem()).isEqualTo(FtueState.Incomplete)\n+ }\n \n // Cleanup\n coroutineScope.cancel()\n }\n \n @Test\n- fun `given all checks being true, should display flow is false`() = runTest {\n+ fun `given all checks being true, FtueState is Complete`() = runTest {\n val analyticsService = FakeAnalyticsService()\n+ val sessionVerificationService = FakeSessionVerificationService()\n val permissionStateProvider = FakePermissionStateProvider(permissionGranted = true)\n val lockScreenService = FakeLockScreenService()\n val coroutineScope = CoroutineScope(coroutineContext + SupervisorJob())\n \n val state = createState(\n coroutineScope = coroutineScope,\n+ sessionVerificationService = sessionVerificationService,\n analyticsService = analyticsService,\n permissionStateProvider = permissionStateProvider,\n lockScreenService = lockScreenService,\n )\n \n+ sessionVerificationService.givenVerifiedStatus(SessionVerifiedStatus.Verified)\n analyticsService.setDidAskUserConsent()\n permissionStateProvider.setPermissionGranted()\n lockScreenService.setIsPinSetup(true)\n state.updateState()\n \n- assertThat(state.shouldDisplayFlow.value).isFalse()\n+ assertThat(state.state.value).isEqualTo(FtueState.Complete)\n \n // Cleanup\n coroutineScope.cancel()\n@@ -71,6 +88,9 @@ class DefaultFtueStateTests {\n \n @Test\n fun `traverse flow`() = runTest {\n+ val sessionVerificationService = FakeSessionVerificationService().apply {\n+ givenVerifiedStatus(SessionVerifiedStatus.NotVerified)\n+ }\n val analyticsService = FakeAnalyticsService()\n val permissionStateProvider = FakePermissionStateProvider(permissionGranted = false)\n val lockScreenService = FakeLockScreenService()\n@@ -78,12 +98,17 @@ class DefaultFtueStateTests {\n \n val state = createState(\n coroutineScope = coroutineScope,\n+ sessionVerificationService = sessionVerificationService,\n analyticsService = analyticsService,\n permissionStateProvider = permissionStateProvider,\n lockScreenService = lockScreenService,\n )\n val steps = mutableListOf()\n \n+ // Session verification\n+ steps.add(state.getNextStep(steps.lastOrNull()))\n+ sessionVerificationService.givenVerifiedStatus(SessionVerifiedStatus.Verified)\n+\n // Notifications opt in\n steps.add(state.getNextStep(steps.lastOrNull()))\n permissionStateProvider.setPermissionGranted()\n@@ -100,6 +125,7 @@ class DefaultFtueStateTests {\n steps.add(state.getNextStep(steps.lastOrNull()))\n \n assertThat(steps).containsExactly(\n+ FtueStep.SessionVerification,\n FtueStep.NotificationsOptIn,\n FtueStep.LockscreenSetup,\n FtueStep.AnalyticsOptIn,\n@@ -114,17 +140,20 @@ class DefaultFtueStateTests {\n @Test\n fun `if a check for a step is true, start from the next one`() = runTest {\n val coroutineScope = CoroutineScope(coroutineContext + SupervisorJob())\n+ val sessionVerificationService = FakeSessionVerificationService()\n val analyticsService = FakeAnalyticsService()\n val permissionStateProvider = FakePermissionStateProvider(permissionGranted = false)\n val lockScreenService = FakeLockScreenService()\n val state = createState(\n coroutineScope = coroutineScope,\n+ sessionVerificationService = sessionVerificationService,\n analyticsService = analyticsService,\n permissionStateProvider = permissionStateProvider,\n lockScreenService = lockScreenService,\n )\n \n- // Skip first 2 steps\n+ // Skip first 3 steps\n+ sessionVerificationService.givenVerifiedStatus(SessionVerifiedStatus.Verified)\n permissionStateProvider.setPermissionGranted()\n lockScreenService.setIsPinSetup(true)\n \n@@ -140,16 +169,19 @@ class DefaultFtueStateTests {\n @Test\n fun `if version is older than 13 we don't display the notification opt in screen`() = runTest {\n val coroutineScope = CoroutineScope(coroutineContext + SupervisorJob())\n+ val sessionVerificationService = FakeSessionVerificationService()\n val analyticsService = FakeAnalyticsService()\n val lockScreenService = FakeLockScreenService()\n \n val state = createState(\n sdkIntVersion = Build.VERSION_CODES.M,\n+ sessionVerificationService = sessionVerificationService,\n coroutineScope = coroutineScope,\n analyticsService = analyticsService,\n lockScreenService = lockScreenService,\n )\n \n+ sessionVerificationService.givenVerifiedStatus(SessionVerifiedStatus.Verified)\n lockScreenService.setIsPinSetup(true)\n \n assertThat(state.getNextStep()).isEqualTo(FtueStep.AnalyticsOptIn)\n@@ -163,14 +195,16 @@ class DefaultFtueStateTests {\n \n private fun createState(\n coroutineScope: CoroutineScope,\n+ sessionVerificationService: FakeSessionVerificationService = FakeSessionVerificationService(),\n analyticsService: AnalyticsService = FakeAnalyticsService(),\n permissionStateProvider: FakePermissionStateProvider = FakePermissionStateProvider(permissionGranted = false),\n lockScreenService: LockScreenService = FakeLockScreenService(),\n // First version where notification permission is required\n sdkIntVersion: Int = Build.VERSION_CODES.TIRAMISU,\n- ) = DefaultFtueState(\n- sdkVersionProvider = FakeBuildVersionSdkIntProvider(sdkIntVersion),\n+ ) = DefaultFtueService(\n coroutineScope = coroutineScope,\n+ sessionVerificationService = sessionVerificationService,\n+ sdkVersionProvider = FakeBuildVersionSdkIntProvider(sdkIntVersion),\n analyticsService = analyticsService,\n permissionStateProvider = permissionStateProvider,\n lockScreenService = lockScreenService,\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt\nindex 6cceb6b5b54..237c7f357a3 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt\n@@ -76,13 +76,11 @@ import io.element.android.libraries.matrix.test.A_SESSION_ID\n import io.element.android.libraries.matrix.test.A_SESSION_ID_2\n import io.element.android.libraries.matrix.test.FakeMatrixClient\n import io.element.android.libraries.matrix.test.core.aBuildMeta\n-import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService\n import io.element.android.libraries.matrix.test.permalink.FakePermalinkBuilder\n import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser\n import io.element.android.libraries.matrix.test.room.FakeMatrixRoom\n import io.element.android.libraries.matrix.test.room.aRoomInfo\n import io.element.android.libraries.matrix.test.room.aRoomMember\n-import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService\n import io.element.android.libraries.mediapickers.test.FakePickerProvider\n import io.element.android.libraries.mediaplayer.test.FakeMediaPlayer\n import io.element.android.libraries.mediaupload.api.MediaSender\n@@ -745,8 +743,6 @@ class MessagesPresenterTest {\n dispatchers = coroutineDispatchers,\n appScope = this,\n navigator = navigator,\n- encryptionService = FakeEncryptionService(),\n- verificationService = FakeSessionVerificationService(),\n redactedVoiceMessageManager = FakeRedactedVoiceMessageManager(),\n endPollAction = endPollAction,\n sendPollResponseAction = FakeSendPollResponseAction(),\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt\nindex 5ee6ca8aa0c..2485e571723 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt\n@@ -26,7 +26,6 @@ import io.element.android.features.messages.impl.fixtures.aTimelineItemsFactory\n import io.element.android.features.messages.impl.timeline.factories.TimelineItemsFactory\n import io.element.android.features.messages.impl.timeline.model.NewEventState\n import io.element.android.features.messages.impl.timeline.model.TimelineItem\n-import io.element.android.features.messages.impl.timeline.session.SessionState\n import io.element.android.features.messages.impl.voicemessages.timeline.FakeRedactedVoiceMessageManager\n import io.element.android.features.messages.impl.voicemessages.timeline.RedactedVoiceMessageManager\n import io.element.android.features.messages.impl.voicemessages.timeline.aRedactedMatrixTimeline\n@@ -47,13 +46,11 @@ import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTime\n import io.element.android.libraries.matrix.test.AN_EVENT_ID\n import io.element.android.libraries.matrix.test.AN_EVENT_ID_2\n import io.element.android.libraries.matrix.test.A_USER_ID\n-import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService\n import io.element.android.libraries.matrix.test.room.FakeMatrixRoom\n import io.element.android.libraries.matrix.test.room.aRoomMember\n import io.element.android.libraries.matrix.test.timeline.FakeMatrixTimeline\n import io.element.android.libraries.matrix.test.timeline.aMessageContent\n import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem\n-import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService\n import io.element.android.libraries.matrix.ui.components.aMatrixUserList\n import io.element.android.tests.testutils.WarmUpRule\n import io.element.android.tests.testutils.awaitLastSequentialItem\n@@ -89,7 +86,6 @@ class TimelinePresenterTest {\n assertThat(initialState.timelineItems).isEmpty()\n val loadedNoTimelineState = awaitItem()\n assertThat(loadedNoTimelineState.timelineItems).isEmpty()\n- assertThat(loadedNoTimelineState.sessionState).isEqualTo(SessionState(isSessionVerified = false, isKeyBackupEnabled = false))\n }\n }\n \n@@ -512,8 +508,6 @@ class TimelinePresenterTest {\n dispatchers = testCoroutineDispatchers(),\n appScope = this,\n navigator = messagesNavigator,\n- encryptionService = FakeEncryptionService(),\n- verificationService = FakeSessionVerificationService(),\n redactedVoiceMessageManager = redactedVoiceMessageManager,\n endPollAction = endPollAction,\n sendPollResponseAction = sendPollResponseAction,\ndiff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt\nindex 3288e94eb42..8bc6e923286 100644\n--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt\n+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt\n@@ -92,7 +92,6 @@ class PreferencesRootPresenterTest {\n )\n )\n assertThat(initialState.version).isEqualTo(\"A Version\")\n- assertThat(loadedState.showCompleteVerification).isTrue()\n assertThat(loadedState.showSecureBackup).isFalse()\n assertThat(loadedState.showSecureBackupBadge).isTrue()\n assertThat(loadedState.accountManagementUrl).isNull()\ndiff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt\nindex 6b5877a0102..0f2c288a635 100644\n--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt\n+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt\n@@ -239,52 +239,28 @@ class RoomListPresenterTests {\n }\n }\n \n- @Test\n- fun `present - handle RecoveryKeyConfirmation last session`() = runTest {\n- val scope = CoroutineScope(context = coroutineContext + SupervisorJob())\n- val roomListService = FakeRoomListService().apply {\n- postAllRoomsLoadingState(RoomList.LoadingState.Loaded(1))\n- }\n- val presenter = createRoomListPresenter(\n- coroutineScope = scope,\n- client = FakeMatrixClient(\n- encryptionService = FakeEncryptionService().apply {\n- emitIsLastDevice(true)\n- },\n- roomListService = roomListService\n- ),\n- )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n- val eventSink = consumeItemsUntilPredicate {\n- it.contentState is RoomListContentState.Rooms\n- }.last().eventSink\n- // For the last session, the state is not SessionVerification, but RecoveryKeyConfirmation\n- assertThat(awaitItem().contentAsRooms().securityBannerState).isEqualTo(SecurityBannerState.RecoveryKeyConfirmation)\n- eventSink(RoomListEvents.DismissRequestVerificationPrompt)\n- assertThat(awaitItem().contentAsRooms().securityBannerState).isEqualTo(SecurityBannerState.None)\n- scope.cancel()\n- }\n- }\n-\n @Test\n fun `present - handle DismissRequestVerificationPrompt`() = runTest {\n val scope = CoroutineScope(context = coroutineContext + SupervisorJob())\n val roomListService = FakeRoomListService().apply {\n postAllRoomsLoadingState(RoomList.LoadingState.Loaded(1))\n }\n+ val encryptionService = FakeEncryptionService().apply {\n+ emitRecoveryState(RecoveryState.INCOMPLETE)\n+ }\n+ val syncService = FakeSyncService(initialState = SyncState.Running)\n val presenter = createRoomListPresenter(\n- client = FakeMatrixClient(roomListService = roomListService),\n+ client = FakeMatrixClient(roomListService = roomListService, encryptionService = encryptionService, syncService = syncService),\n coroutineScope = scope,\n )\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n- val eventSink = consumeItemsUntilPredicate {\n+ val eventWithContentAsRooms = consumeItemsUntilPredicate {\n it.contentState is RoomListContentState.Rooms\n- }.last().eventSink\n- assertThat(awaitItem().contentAsRooms().securityBannerState).isEqualTo(SecurityBannerState.SessionVerification)\n+ }.last()\n+ val eventSink = eventWithContentAsRooms.eventSink\n+ assertThat(eventWithContentAsRooms.contentAsRooms().securityBannerState).isEqualTo(SecurityBannerState.RecoveryKeyConfirmation)\n eventSink(RoomListEvents.DismissRequestVerificationPrompt)\n assertThat(awaitItem().contentAsRooms().securityBannerState).isEqualTo(SecurityBannerState.None)\n scope.cancel()\n@@ -342,10 +318,10 @@ class RoomListPresenterTests {\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n- consumeItemsUntilPredicate {\n+ val firstItem = consumeItemsUntilPredicate {\n it.contentState is RoomListContentState.Rooms\n- }\n- assertThat(awaitItem().contentAsRooms().invitesState).isEqualTo(InvitesState.NoInvites)\n+ }.last()\n+ assertThat(firstItem.contentAsRooms().invitesState).isEqualTo(InvitesState.NoInvites)\n \n inviteStateFlow.value = InvitesState.SeenInvites\n assertThat(awaitItem().contentAsRooms().invitesState).isEqualTo(InvitesState.SeenInvites)\ndiff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt\nindex c860b6fc423..2dbec363956 100644\n--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt\n+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt\n@@ -43,35 +43,6 @@ import org.junit.runner.RunWith\n class RoomListViewTest {\n @get:Rule val rule = createAndroidComposeRule()\n \n- @Test\n- fun `clicking on close verification banner emits the expected Event`() {\n- val eventsRecorder = EventsRecorder()\n- rule.setRoomListView(\n- state = aRoomListState(\n- contentState = aRoomsContentState(securityBannerState = SecurityBannerState.SessionVerification),\n- eventSink = eventsRecorder,\n- )\n- )\n- val close = rule.activity.getString(CommonStrings.action_close)\n- rule.onNodeWithContentDescription(close).performClick()\n- eventsRecorder.assertSingle(RoomListEvents.DismissRequestVerificationPrompt)\n- }\n-\n- @Test\n- fun `clicking on continue verification banner invokes the expected callback`() {\n- val eventsRecorder = EventsRecorder(expectEvents = false)\n- ensureCalledOnce { callback ->\n- rule.setRoomListView(\n- state = aRoomListState(\n- contentState = aRoomsContentState(securityBannerState = SecurityBannerState.SessionVerification),\n- eventSink = eventsRecorder,\n- ),\n- onVerifyClicked = callback,\n- )\n- rule.clickOn(CommonStrings.action_continue)\n- }\n- }\n-\n @Test\n fun `clicking on close recovery key banner emits the expected Event`() {\n val eventsRecorder = EventsRecorder()\n@@ -185,7 +156,6 @@ private fun AndroidComposeTestRule.setRoomL\n state: RoomListState,\n onRoomClicked: (RoomId) -> Unit = EnsureNeverCalledWithParam(),\n onSettingsClicked: () -> Unit = EnsureNeverCalled(),\n- onVerifyClicked: () -> Unit = EnsureNeverCalled(),\n onConfirmRecoveryKeyClicked: () -> Unit = EnsureNeverCalled(),\n onCreateRoomClicked: () -> Unit = EnsureNeverCalled(),\n onInvitesClicked: () -> Unit = EnsureNeverCalled(),\n@@ -198,7 +168,6 @@ private fun AndroidComposeTestRule.setRoomL\n state = state,\n onRoomClicked = onRoomClicked,\n onSettingsClicked = onSettingsClicked,\n- onVerifyClicked = onVerifyClicked,\n onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,\n onCreateRoomClicked = onCreateRoomClicked,\n onInvitesClicked = onInvitesClicked,\ndiff --git a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionPresenterTests.kt b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionPresenterTests.kt\nindex ad128b450d0..025e782e8fd 100644\n--- a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionPresenterTests.kt\n+++ b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionPresenterTests.kt\n@@ -106,13 +106,13 @@ class VerifySelfSessionPresenterTests {\n val initialState = awaitItem()\n assertThat(initialState.verificationFlowStep).isEqualTo(VerificationStep.Initial(false))\n val eventSink = initialState.eventSink\n- eventSink(VerifySelfSessionViewEvents.CancelAndClose)\n+ eventSink(VerifySelfSessionViewEvents.Cancel)\n expectNoEvents()\n }\n }\n \n @Test\n- fun `present - A fail in the flow cancels it`() = runTest {\n+ fun `present - A failure when verifying cancels it`() = runTest {\n val service = FakeSessionVerificationService()\n val presenter = createVerifySelfSessionPresenter(service)\n moleculeFlow(RecompositionMode.Immediate) {\n@@ -128,6 +128,21 @@ class VerifySelfSessionPresenterTests {\n }\n }\n \n+ @Test\n+ fun `present - A fail when requesting verification resets the state to the initial one`() = runTest {\n+ val service = FakeSessionVerificationService()\n+ val presenter = createVerifySelfSessionPresenter(service)\n+ moleculeFlow(RecompositionMode.Immediate) {\n+ presenter.present()\n+ }.test {\n+ service.shouldFail = true\n+ awaitItem().eventSink(VerifySelfSessionViewEvents.RequestVerification)\n+ service.shouldFail = false\n+ assertThat(awaitItem().verificationFlowStep).isInstanceOf(VerificationStep.AwaitingOtherDeviceResponse::class.java)\n+ assertThat(awaitItem().verificationFlowStep).isEqualTo(VerificationStep.Initial(false))\n+ }\n+ }\n+\n @Test\n fun `present - Canceling the flow once it's verifying cancels it`() = runTest {\n val service = FakeSessionVerificationService()\n@@ -136,8 +151,7 @@ class VerifySelfSessionPresenterTests {\n presenter.present()\n }.test {\n val state = requestVerificationAndAwaitVerifyingState(service)\n- state.eventSink(VerifySelfSessionViewEvents.CancelAndClose)\n- assertThat(awaitItem().verificationFlowStep).isEqualTo(VerificationStep.AwaitingOtherDeviceResponse)\n+ state.eventSink(VerifySelfSessionViewEvents.Cancel)\n assertThat(awaitItem().verificationFlowStep).isEqualTo(VerificationStep.Canceled)\n }\n }\n@@ -165,13 +179,30 @@ class VerifySelfSessionPresenterTests {\n val state = requestVerificationAndAwaitVerifyingState(service)\n service.givenVerificationFlowState(VerificationFlowState.Canceled)\n assertThat(awaitItem().verificationFlowStep).isEqualTo(VerificationStep.Canceled)\n- state.eventSink(VerifySelfSessionViewEvents.Restart)\n+ state.eventSink(VerifySelfSessionViewEvents.RequestVerification)\n // Went back to requesting verification\n assertThat(awaitItem().verificationFlowStep).isEqualTo(VerificationStep.AwaitingOtherDeviceResponse)\n cancelAndIgnoreRemainingEvents()\n }\n }\n \n+ @Test\n+ fun `present - Go back after cancelation returns to initial state`() = runTest {\n+ val service = FakeSessionVerificationService()\n+ val presenter = createVerifySelfSessionPresenter(service)\n+ moleculeFlow(RecompositionMode.Immediate) {\n+ presenter.present()\n+ }.test {\n+ val state = requestVerificationAndAwaitVerifyingState(service)\n+ service.givenVerificationFlowState(VerificationFlowState.Canceled)\n+ assertThat(awaitItem().verificationFlowStep).isEqualTo(VerificationStep.Canceled)\n+ state.eventSink(VerifySelfSessionViewEvents.Reset)\n+ // Went back to initial state\n+ assertThat(awaitItem().verificationFlowStep).isEqualTo(VerificationStep.Initial(false))\n+ cancelAndIgnoreRemainingEvents()\n+ }\n+ }\n+\n @Test\n fun `present - When verification is approved, the flow completes if there is no error`() = runTest {\n val emojis = listOf(\n@@ -247,7 +278,7 @@ class VerifySelfSessionPresenterTests {\n return VerifySelfSessionPresenter(\n sessionVerificationService = service,\n encryptionService = encryptionService,\n- stateMachine = VerifySelfSessionStateMachine(service),\n+ stateMachine = VerifySelfSessionStateMachine(service, encryptionService),\n )\n }\n }\ndiff --git a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewTest.kt b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewTest.kt\nindex 4dfad8c9c99..1ca5bca32f0 100644\n--- a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewTest.kt\n+++ b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewTest.kt\n@@ -36,45 +36,98 @@ class VerifySelfSessionViewTest {\n @get:Rule val rule = createAndroidComposeRule()\n \n @Test\n- fun `clicking on cancel calls the expected callback and emits the expected Event`() {\n+ fun `back key pressed - when canceled resets the flow`() {\n val eventsRecorder = EventsRecorder()\n- ensureCalledOnce { callback ->\n- rule.setContent {\n- VerifySelfSessionView(\n- aVerifySelfSessionState(\n- verificationFlowStep = VerifySelfSessionState.VerificationStep.Initial(true),\n- eventSink = eventsRecorder\n+ rule.setContent {\n+ VerifySelfSessionView(\n+ aVerifySelfSessionState(\n+ verificationFlowStep = VerifySelfSessionState.VerificationStep.Canceled,\n+ eventSink = eventsRecorder\n+ ),\n+ onEnterRecoveryKey = EnsureNeverCalled(),\n+ onFinished = EnsureNeverCalled(),\n+ )\n+ }\n+ rule.pressBackKey()\n+ eventsRecorder.assertSingle(VerifySelfSessionViewEvents.Reset)\n+ }\n+\n+ @Test\n+ fun `back key pressed - when awaiting response cancels the verification`() {\n+ val eventsRecorder = EventsRecorder()\n+ rule.setContent {\n+ VerifySelfSessionView(\n+ aVerifySelfSessionState(\n+ verificationFlowStep = VerifySelfSessionState.VerificationStep.AwaitingOtherDeviceResponse,\n+ eventSink = eventsRecorder\n+ ),\n+ onEnterRecoveryKey = EnsureNeverCalled(),\n+ onFinished = EnsureNeverCalled(),\n+ )\n+ }\n+ rule.pressBackKey()\n+ eventsRecorder.assertSingle(VerifySelfSessionViewEvents.Cancel)\n+ }\n+\n+ @Test\n+ fun `back key pressed - when ready to verify cancels the verification`() {\n+ val eventsRecorder = EventsRecorder()\n+ rule.setContent {\n+ VerifySelfSessionView(\n+ aVerifySelfSessionState(\n+ verificationFlowStep = VerifySelfSessionState.VerificationStep.Ready,\n+ eventSink = eventsRecorder\n+ ),\n+ onEnterRecoveryKey = EnsureNeverCalled(),\n+ onFinished = EnsureNeverCalled(),\n+ )\n+ }\n+ rule.pressBackKey()\n+ eventsRecorder.assertSingle(VerifySelfSessionViewEvents.Cancel)\n+ }\n+\n+ @Test\n+ fun `back key pressed - when verifying and not loading declines the verification`() {\n+ val eventsRecorder = EventsRecorder()\n+ rule.setContent {\n+ VerifySelfSessionView(\n+ aVerifySelfSessionState(\n+ verificationFlowStep = VerifySelfSessionState.VerificationStep.Verifying(\n+ data = aEmojisSessionVerificationData(),\n+ state = AsyncData.Uninitialized,\n ),\n- onEnterRecoveryKey = EnsureNeverCalled(),\n- goBack = callback,\n- )\n- }\n- rule.clickOn(CommonStrings.action_cancel)\n+ eventSink = eventsRecorder\n+ ),\n+ onEnterRecoveryKey = EnsureNeverCalled(),\n+ onFinished = EnsureNeverCalled(),\n+ )\n }\n- eventsRecorder.assertSingle(VerifySelfSessionViewEvents.CancelAndClose)\n+ rule.pressBackKey()\n+ eventsRecorder.assertSingle(VerifySelfSessionViewEvents.DeclineVerification)\n }\n \n @Test\n- fun `clicking on back key calls the expected callback and emits the expected Event`() {\n+ fun `back key pressed - when verifying and loading does nothing`() {\n val eventsRecorder = EventsRecorder()\n- ensureCalledOnce { callback ->\n- rule.setContent {\n- VerifySelfSessionView(\n- aVerifySelfSessionState(\n- verificationFlowStep = VerifySelfSessionState.VerificationStep.Initial(true),\n- eventSink = eventsRecorder\n+ rule.setContent {\n+ VerifySelfSessionView(\n+ aVerifySelfSessionState(\n+ verificationFlowStep = VerifySelfSessionState.VerificationStep.Verifying(\n+ data = aEmojisSessionVerificationData(),\n+ state = AsyncData.Loading(),\n ),\n- onEnterRecoveryKey = EnsureNeverCalled(),\n- goBack = callback,\n- )\n- }\n- rule.pressBackKey()\n+ eventSink = eventsRecorder\n+ ),\n+ onEnterRecoveryKey = EnsureNeverCalled(),\n+ onFinished = EnsureNeverCalled(),\n+ )\n }\n- eventsRecorder.assertSingle(VerifySelfSessionViewEvents.CancelAndClose)\n+ rule.pressBackKey()\n+ eventsRecorder.assertEmpty()\n }\n \n @Test\n- fun `when flow is completed, the expected callback is invoked`() {\n+ fun `when flow is completed and the user clicks on the continue button, the expected callback is invoked`() {\n val eventsRecorder = EventsRecorder(expectEvents = false)\n ensureCalledOnce { callback ->\n rule.setContent {\n@@ -84,9 +137,10 @@ class VerifySelfSessionViewTest {\n eventSink = eventsRecorder\n ),\n onEnterRecoveryKey = EnsureNeverCalled(),\n- goBack = callback,\n+ onFinished = callback,\n )\n }\n+ rule.clickOn(CommonStrings.action_continue)\n }\n }\n \n@@ -102,7 +156,7 @@ class VerifySelfSessionViewTest {\n eventSink = eventsRecorder\n ),\n onEnterRecoveryKey = callback,\n- goBack = EnsureNeverCalled(),\n+ onFinished = EnsureNeverCalled(),\n )\n }\n rule.clickOn(R.string.screen_session_verification_enter_recovery_key)\n@@ -122,7 +176,7 @@ class VerifySelfSessionViewTest {\n eventSink = eventsRecorder\n ),\n onEnterRecoveryKey = EnsureNeverCalled(),\n- goBack = EnsureNeverCalled(),\n+ onFinished = EnsureNeverCalled(),\n )\n }\n rule.clickOn(R.string.screen_session_verification_they_match)\n@@ -142,7 +196,7 @@ class VerifySelfSessionViewTest {\n eventSink = eventsRecorder\n ),\n onEnterRecoveryKey = EnsureNeverCalled(),\n- goBack = EnsureNeverCalled(),\n+ onFinished = EnsureNeverCalled(),\n )\n }\n rule.clickOn(R.string.screen_session_verification_they_dont_match)\ndiff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/verification/FakeSessionVerificationService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/verification/FakeSessionVerificationService.kt\nindex 4a7aa1c304d..64c7c8ab974 100644\n--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/verification/FakeSessionVerificationService.kt\n+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/verification/FakeSessionVerificationService.kt\n@@ -38,7 +38,11 @@ class FakeSessionVerificationService : SessionVerificationService {\n override val isReady: StateFlow = _isReady\n \n override suspend fun requestVerification() {\n- _verificationFlowState.value = VerificationFlowState.AcceptedVerificationRequest\n+ if (!shouldFail) {\n+ _verificationFlowState.value = VerificationFlowState.AcceptedVerificationRequest\n+ } else {\n+ _verificationFlowState.value = VerificationFlowState.Failed\n+ }\n }\n \n override suspend fun cancelVerification() {\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Day-57_57_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Day-57_57_null,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Day-57_57_null_1,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Day-57_57_null,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Day-57_57_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Day-57_57_null_0,NEXUS_5,1.0,en].png\ndeleted file mode 100644\nindex a8bf2184ef6..00000000000\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Day-57_57_null_0,NEXUS_5,1.0,en].png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:455964d5b4d1652b5b9eeb8b7236f14c2c9490123399e8c65f1b9e920d20071d\n-size 21053\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Day-57_57_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Day-57_57_null_2,NEXUS_5,1.0,en].png\ndeleted file mode 100644\nindex e6c83e61dea..00000000000\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Day-57_57_null_2,NEXUS_5,1.0,en].png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:84d78e6672aaafd2c7974630e7d9391ee7e649c9a9de470627d1ed6e1241a1f4\n-size 13366\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Night-57_58_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Night-57_58_null,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Night-57_58_null_1,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Night-57_58_null,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Night-57_58_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Night-57_58_null_0,NEXUS_5,1.0,en].png\ndeleted file mode 100644\nindex 098d9fe8006..00000000000\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Night-57_58_null_0,NEXUS_5,1.0,en].png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:c90e7168839f33c8ea4ef79308cc2b1c7a1ad4ec07dbeedba14dd080a3a841d8\n-size 20169\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Night-57_58_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Night-57_58_null_2,NEXUS_5,1.0,en].png\ndeleted file mode 100644\nindex 302905149e4..00000000000\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components.virtual_EncryptedHistoryBannerView_null_EncryptedHistoryBannerView-Night-57_58_null_2,NEXUS_5,1.0,en].png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:0628f8cd42815e725efc8f7bfe0bc790c2369f8d4cabfd31aabd494a469f7379\n-size 12867\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.preferences.impl.root_PreferencesRootViewDark_null_PreferencesRootViewDark--1_1_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.preferences.impl.root_PreferencesRootViewDark_null_PreferencesRootViewDark--1_1_null_0,NEXUS_5,1.0,en].png\nindex d4df69f7435..c54c15e9ca2 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.preferences.impl.root_PreferencesRootViewDark_null_PreferencesRootViewDark--1_1_null_0,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.preferences.impl.root_PreferencesRootViewDark_null_PreferencesRootViewDark--1_1_null_0,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:be4d708775d03680be450dfd5eebfeda24f1841eedced3e7de2ba036669ac479\n-size 39086\n+oid sha256:75fb611e02345fe1cf7947d1e160e309cf8520f0256ebd25b43bab8c3102f3f8\n+size 37138\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.preferences.impl.root_PreferencesRootViewDark_null_PreferencesRootViewDark--1_1_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.preferences.impl.root_PreferencesRootViewDark_null_PreferencesRootViewDark--1_1_null_1,NEXUS_5,1.0,en].png\nindex 9d950f5916f..90e78c16a58 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.preferences.impl.root_PreferencesRootViewDark_null_PreferencesRootViewDark--1_1_null_1,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.preferences.impl.root_PreferencesRootViewDark_null_PreferencesRootViewDark--1_1_null_1,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:53660f4354d2a750ab539370151c9ee4ac49f9d06712f7646fdd487bf133753a\n-size 38766\n+oid sha256:a7be4df5a4e391d2253f283acf0fb9362b965fa887235221b794915d74891899\n+size 36783\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.preferences.impl.root_PreferencesRootViewLight_null_PreferencesRootViewLight--0_0_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.preferences.impl.root_PreferencesRootViewLight_null_PreferencesRootViewLight--0_0_null_0,NEXUS_5,1.0,en].png\nindex d8b913deea6..4f2683cf780 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.preferences.impl.root_PreferencesRootViewLight_null_PreferencesRootViewLight--0_0_null_0,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.preferences.impl.root_PreferencesRootViewLight_null_PreferencesRootViewLight--0_0_null_0,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:8ae1828957e00adcbdbb772a0ebdc1fb6604afbe644cc5d8662da9fcd3973129\n-size 41162\n+oid sha256:67503a61f560ef79d7e981057094dccf46eda167ee84427c1aceb9f83edf0146\n+size 39080\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.preferences.impl.root_PreferencesRootViewLight_null_PreferencesRootViewLight--0_0_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.preferences.impl.root_PreferencesRootViewLight_null_PreferencesRootViewLight--0_0_null_1,NEXUS_5,1.0,en].png\nindex 7f24f64da52..12e2374878c 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.preferences.impl.root_PreferencesRootViewLight_null_PreferencesRootViewLight--0_0_null_1,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.preferences.impl.root_PreferencesRootViewLight_null_PreferencesRootViewLight--0_0_null_1,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:58e567815b4dc36abf8422b17f9902d8581dbec1a1ed216df2f120c6198b6fe5\n-size 41124\n+oid sha256:5cb3be70de8e3878bdd90db9945aed60fb2b38d8c66ea610806226c21b1f5a5a\n+size 39052\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_DefaultRoomListTopBarWithIndicator_null_DefaultRoomListTopBarWithIndicator-Day-8_9_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_DefaultRoomListTopBarWithIndicator_null_DefaultRoomListTopBarWithIndicator-Day-7_8_null,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_DefaultRoomListTopBarWithIndicator_null_DefaultRoomListTopBarWithIndicator-Day-8_9_null,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_DefaultRoomListTopBarWithIndicator_null_DefaultRoomListTopBarWithIndicator-Day-7_8_null,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_DefaultRoomListTopBarWithIndicator_null_DefaultRoomListTopBarWithIndicator-Night-8_10_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_DefaultRoomListTopBarWithIndicator_null_DefaultRoomListTopBarWithIndicator-Night-7_9_null,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_DefaultRoomListTopBarWithIndicator_null_DefaultRoomListTopBarWithIndicator-Night-8_10_null,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_DefaultRoomListTopBarWithIndicator_null_DefaultRoomListTopBarWithIndicator-Night-7_9_null,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_DefaultRoomListTopBar_null_DefaultRoomListTopBar-Day-7_8_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_DefaultRoomListTopBar_null_DefaultRoomListTopBar-Day-6_7_null,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_DefaultRoomListTopBar_null_DefaultRoomListTopBar-Day-7_8_null,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_DefaultRoomListTopBar_null_DefaultRoomListTopBar-Day-6_7_null,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_DefaultRoomListTopBar_null_DefaultRoomListTopBar-Night-7_9_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_DefaultRoomListTopBar_null_DefaultRoomListTopBar-Night-6_8_null,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_DefaultRoomListTopBar_null_DefaultRoomListTopBar-Night-7_9_null,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_DefaultRoomListTopBar_null_DefaultRoomListTopBar-Night-6_8_null,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RequestVerificationHeader_null_RequestVerificationHeader-Day-5_6_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RequestVerificationHeader_null_RequestVerificationHeader-Day-5_6_null,NEXUS_5,1.0,en].png\ndeleted file mode 100644\nindex 1ff9a4e1407..00000000000\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RequestVerificationHeader_null_RequestVerificationHeader-Day-5_6_null,NEXUS_5,1.0,en].png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:f5fd867f51badedc8e9ded0900eb904ac11af348243573dcf34b8aaa3c1548b7\n-size 26926\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RequestVerificationHeader_null_RequestVerificationHeader-Night-5_7_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RequestVerificationHeader_null_RequestVerificationHeader-Night-5_7_null,NEXUS_5,1.0,en].png\ndeleted file mode 100644\nindex 604e02b79d4..00000000000\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RequestVerificationHeader_null_RequestVerificationHeader-Night-5_7_null,NEXUS_5,1.0,en].png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:318838247c7d0cee133fd5c98bbbee6f2c5be09a95b6c2fd293c041e21480ab8\n-size 26080\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-6_7_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-5_6_null_0,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-6_7_null_0,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-5_6_null_0,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-6_7_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-5_6_null_1,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-6_7_null_1,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-5_6_null_1,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-6_7_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-5_6_null_2,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-6_7_null_2,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-5_6_null_2,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-6_7_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-5_6_null_3,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-6_7_null_3,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-5_6_null_3,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-6_7_null_4,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-5_6_null_4,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-6_7_null_4,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Day-5_6_null_4,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-6_8_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-5_7_null_0,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-6_8_null_0,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-5_7_null_0,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-6_8_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-5_7_null_1,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-6_8_null_1,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-5_7_null_1,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-6_8_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-5_7_null_2,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-6_8_null_2,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-5_7_null_2,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-6_8_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-5_7_null_3,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-6_8_null_3,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-5_7_null_3,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-6_8_null_4,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-5_7_null_4,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-6_8_null_4,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomListContentView_null_RoomListContentView-Night-5_7_null_4,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryPlaceholderRow_null_RoomSummaryPlaceholderRow-Day-9_10_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryPlaceholderRow_null_RoomSummaryPlaceholderRow-Day-8_9_null,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryPlaceholderRow_null_RoomSummaryPlaceholderRow-Day-9_10_null,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryPlaceholderRow_null_RoomSummaryPlaceholderRow-Day-8_9_null,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryPlaceholderRow_null_RoomSummaryPlaceholderRow-Night-9_11_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryPlaceholderRow_null_RoomSummaryPlaceholderRow-Night-8_10_null,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryPlaceholderRow_null_RoomSummaryPlaceholderRow-Night-9_11_null,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryPlaceholderRow_null_RoomSummaryPlaceholderRow-Night-8_10_null,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_0,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_0,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_0,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_1,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_1,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_1,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_10,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_10,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_10,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_10,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_11,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_11,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_11,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_11,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_12,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_12,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_12,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_12,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_13,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_13,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_13,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_13,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_14,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_14,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_14,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_14,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_15,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_15,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_15,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_15,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_16,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_16,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_16,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_16,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_17,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_17,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_17,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_17,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_18,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_18,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_18,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_18,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_19,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_19,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_19,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_19,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_2,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_2,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_2,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_20,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_20,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_20,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_20,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_21,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_21,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_21,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_21,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_22,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_22,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_22,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_22,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_23,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_23,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_23,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_23,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_24,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_24,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_24,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_24,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_25,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_25,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_25,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_25,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_26,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_26,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_26,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_26,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_27,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_27,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_27,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_27,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_3,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_3,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_3,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_4,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_4,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_4,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_4,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_5,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_5,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_5,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_5,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_6,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_6,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_6,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_6,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_7,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_7,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_7,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_7,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_8,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_8,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_8,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_8,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_9,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_9,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-10_11_null_9,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Day-9_10_null_9,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_0,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_0,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_0,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_1,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_1,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_1,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_10,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_10,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_10,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_10,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_11,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_11,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_11,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_11,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_12,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_12,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_12,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_12,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_13,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_13,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_13,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_13,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_14,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_14,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_14,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_14,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_15,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_15,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_15,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_15,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_16,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_16,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_16,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_16,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_17,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_17,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_17,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_17,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_18,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_18,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_18,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_18,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_19,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_19,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_19,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_19,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_2,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_2,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_2,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_20,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_20,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_20,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_20,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_21,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_21,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_21,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_21,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_22,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_22,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_22,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_22,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_23,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_23,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_23,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_23,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_24,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_24,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_24,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_24,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_25,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_25,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_25,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_25,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_26,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_26,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_26,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_26,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_27,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_27,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_27,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_27,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_3,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_3,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_3,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_4,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_4,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_4,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_4,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_5,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_5,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_5,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_5,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_6,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_6,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_6,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_6,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_7,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_7,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_7,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_7,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_8,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_8,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_8,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_8,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_9,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_9,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-10_12_null_9,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.components_RoomSummaryRow_null_RoomSummaryRow-Night-9_11_null_9,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.filters_RoomListFiltersView_null_RoomListFiltersView-Day-11_12_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.filters_RoomListFiltersView_null_RoomListFiltersView-Day-10_11_null_0,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.filters_RoomListFiltersView_null_RoomListFiltersView-Day-11_12_null_0,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.filters_RoomListFiltersView_null_RoomListFiltersView-Day-10_11_null_0,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.filters_RoomListFiltersView_null_RoomListFiltersView-Day-11_12_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.filters_RoomListFiltersView_null_RoomListFiltersView-Day-10_11_null_1,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.filters_RoomListFiltersView_null_RoomListFiltersView-Day-11_12_null_1,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.filters_RoomListFiltersView_null_RoomListFiltersView-Day-10_11_null_1,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.filters_RoomListFiltersView_null_RoomListFiltersView-Night-11_13_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.filters_RoomListFiltersView_null_RoomListFiltersView-Night-10_12_null_0,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.filters_RoomListFiltersView_null_RoomListFiltersView-Night-11_13_null_0,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.filters_RoomListFiltersView_null_RoomListFiltersView-Night-10_12_null_0,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.filters_RoomListFiltersView_null_RoomListFiltersView-Night-11_13_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.filters_RoomListFiltersView_null_RoomListFiltersView-Night-10_12_null_1,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.filters_RoomListFiltersView_null_RoomListFiltersView-Night-11_13_null_1,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.filters_RoomListFiltersView_null_RoomListFiltersView-Night-10_12_null_1,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.migration_MigrationView_null_MigrationView-Day-12_13_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.migration_MigrationView_null_MigrationView-Day-11_12_null,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.migration_MigrationView_null_MigrationView-Day-12_13_null,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.migration_MigrationView_null_MigrationView-Day-11_12_null,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.migration_MigrationView_null_MigrationView-Night-12_14_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.migration_MigrationView_null_MigrationView-Night-11_13_null,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.migration_MigrationView_null_MigrationView-Night-12_14_null,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.migration_MigrationView_null_MigrationView-Night-11_13_null,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Day-13_14_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Day-12_13_null_0,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Day-13_14_null_0,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Day-12_13_null_0,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Day-13_14_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Day-12_13_null_1,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Day-13_14_null_1,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Day-12_13_null_1,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Day-13_14_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Day-12_13_null_2,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Day-13_14_null_2,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Day-12_13_null_2,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Night-13_15_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Night-12_14_null_0,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Night-13_15_null_0,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Night-12_14_null_0,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Night-13_15_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Night-12_14_null_1,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Night-13_15_null_1,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Night-12_14_null_1,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Night-13_15_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Night-12_14_null_2,NEXUS_5,1.0,en].png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Night-13_15_null_2,NEXUS_5,1.0,en].png\nrename to tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl.search_RoomListSearchResultContent_null_RoomListSearchResultContent-Night-12_14_null_2,NEXUS_5,1.0,en].png\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_10,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_10,NEXUS_5,1.0,en].png\nindex 761cb8d3a8e..1ff067e54b7 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_10,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_10,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:8de26fbd49153871bdd18defc2297b2ab314f541fe598894a9c81fe633488db7\n-size 51359\n+oid sha256:0197c643bbbbc46dbb58ac8911b61003bb09fceb15f1997cba64bcb00aee90fe\n+size 162642\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_11,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_11,NEXUS_5,1.0,en].png\nindex 1ff067e54b7..3057c59ef73 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_11,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_11,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:0197c643bbbbc46dbb58ac8911b61003bb09fceb15f1997cba64bcb00aee90fe\n-size 162642\n+oid sha256:af42c9891a6670cdde07cf054e139ce1f83e877bb68f60463fcad6dd28d8e049\n+size 6867\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_12,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_12,NEXUS_5,1.0,en].png\nindex 3057c59ef73..19b6010d173 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_12,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_12,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:af42c9891a6670cdde07cf054e139ce1f83e877bb68f60463fcad6dd28d8e049\n-size 6867\n+oid sha256:46e28da384551af27bf9c52a45c17b8441f8875494b3d3fd901ad66f5d7ff89b\n+size 74803\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_13,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_13,NEXUS_5,1.0,en].png\ndeleted file mode 100644\nindex 19b6010d173..00000000000\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_13,NEXUS_5,1.0,en].png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:46e28da384551af27bf9c52a45c17b8441f8875494b3d3fd901ad66f5d7ff89b\n-size 74803\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_7,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_7,NEXUS_5,1.0,en].png\nindex a5a84223bbd..872429b353e 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_7,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_7,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:0ecdd0cf6f38c2be14eaad9152d7f0eac02682d12c10703abc605bcc73adbb92\n-size 86084\n+oid sha256:3f314f241b95aeaccd576c8235cfd907abaf5d796b5dc6f4e2acac8a4b9c7c2d\n+size 88678\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_8,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_8,NEXUS_5,1.0,en].png\nindex 872429b353e..6efd101daca 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_8,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_8,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:3f314f241b95aeaccd576c8235cfd907abaf5d796b5dc6f4e2acac8a4b9c7c2d\n-size 88678\n+oid sha256:a0037f0401b53088f2a75af67f8e4df374866fbce80c052535af1d97354c9b22\n+size 56605\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_9,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_9,NEXUS_5,1.0,en].png\nindex 6efd101daca..761cb8d3a8e 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_9,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Day-3_4_null_9,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:a0037f0401b53088f2a75af67f8e4df374866fbce80c052535af1d97354c9b22\n-size 56605\n+oid sha256:8de26fbd49153871bdd18defc2297b2ab314f541fe598894a9c81fe633488db7\n+size 51359\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_10,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_10,NEXUS_5,1.0,en].png\nindex 168ee31a4d0..043a1223a40 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_10,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_10,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:35f35f058cff4435c278ba8cb9f60d68edabcc5da3ab58823abf99a082346978\n-size 53292\n+oid sha256:4b167704c2d05c857715aa11c3d7fb3abdf3b59ad7d6d2c479936d934a67f32d\n+size 186756\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_11,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_11,NEXUS_5,1.0,en].png\nindex 043a1223a40..08cfca5c0b6 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_11,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_11,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:4b167704c2d05c857715aa11c3d7fb3abdf3b59ad7d6d2c479936d934a67f32d\n-size 186756\n+oid sha256:6e95dac6e75d3f615ccf4d8e98f1780d8aeace1cddf0b33bba8b485860d3216b\n+size 6688\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_12,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_12,NEXUS_5,1.0,en].png\nindex 08cfca5c0b6..52eccc7865a 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_12,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_12,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:6e95dac6e75d3f615ccf4d8e98f1780d8aeace1cddf0b33bba8b485860d3216b\n-size 6688\n+oid sha256:58ce650742396cd4addf9f545b2488bc2666e848b361a501d3ea2508c92c2a8a\n+size 76908\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_13,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_13,NEXUS_5,1.0,en].png\ndeleted file mode 100644\nindex 52eccc7865a..00000000000\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_13,NEXUS_5,1.0,en].png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:58ce650742396cd4addf9f545b2488bc2666e848b361a501d3ea2508c92c2a8a\n-size 76908\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_7,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_7,NEXUS_5,1.0,en].png\nindex 21f5c4f252b..2728c83aa1c 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_7,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_7,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:308e785ea0c43cafd2daea869ecad96cb2e4baeffd747148f1c2f853604603c8\n-size 88246\n+oid sha256:59c4e7f70dbef1f7c95edc705729dc37f7be3e96f48264e5b63c51f92c13aa22\n+size 90762\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_8,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_8,NEXUS_5,1.0,en].png\nindex 2728c83aa1c..9b8391501a8 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_8,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_8,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:59c4e7f70dbef1f7c95edc705729dc37f7be3e96f48264e5b63c51f92c13aa22\n-size 90762\n+oid sha256:528d43fa1989f1368c33f4f447347caa2fefb92c3a0a1e48846974ad96f262de\n+size 58510\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_9,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_9,NEXUS_5,1.0,en].png\nindex 9b8391501a8..168ee31a4d0 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_9,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.roomlist.impl_RoomListView_null_RoomListView-Night-3_5_null_9,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:528d43fa1989f1368c33f4f447347caa2fefb92c3a0a1e48846974ad96f262de\n-size 58510\n+oid sha256:35f35f058cff4435c278ba8cb9f60d68edabcc5da3ab58823abf99a082346978\n+size 53292\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_0,NEXUS_5,1.0,en].png\nindex 25be545a897..87165509bc6 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_0,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_0,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:3e5c225258a6b257afcfc935971df619199a8985ad87203528d27a166a6fda2a\n-size 28334\n+oid sha256:2ef711f98b345d4913e930a4ef2794d1d4ae2f19e29f842548664713dbc2f82c\n+size 27670\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_1,NEXUS_5,1.0,en].png\nindex abbb0fefb92..cdd49027669 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_1,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_1,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:c13a37dfd42c7e3872cb7854b5f4b5b03e24e40f1751a8a3c430376cab8a0669\n-size 27203\n+oid sha256:97b2c76523b5475a45d7023960356feee4748ef3be6fa6a33b0f727b327dc667\n+size 25541\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_2,NEXUS_5,1.0,en].png\nindex f239a762491..dddcf52c2fc 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_2,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_2,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:c4545536311f20615a2809a067af9eabf1a9398f39a9df819dd3c0a4c3de64bd\n-size 51321\n+oid sha256:5f6269ea5f1be9794e768671ba27d44932ce8d7a2d2d599ad2a9837e6346d7ba\n+size 50761\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_3,NEXUS_5,1.0,en].png\nindex 4e7f01ae48e..ff7200bbe7b 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_3,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_3,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:26759996939952786a94b9d860e02c40154c0903a49afb8e7be05a20787f0fa4\n-size 52615\n+oid sha256:e1ba54ee6e97535ca0a350f687ea64e826c1c590e67fddf95ff5e6f85c9ca0ea\n+size 52342\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_4,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_4,NEXUS_5,1.0,en].png\nindex 22ffbb29ae7..eeb7a029bb7 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_4,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_4,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:3ce368edd4536137fb4545fb21892c51af43d7325f21b6e34e5ac1a72b818b34\n-size 31575\n+oid sha256:eb6e3df51c248b69357ec7dd3dd8c5ba8bb8c579c8f08e5279039c78d50c541e\n+size 31024\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_5,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_5,NEXUS_5,1.0,en].png\nindex 7dec5258dae..771889d3c28 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_5,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_5,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:d4bff39ac46298be6b968326b64c632aa73b13a51f1efff512d5c6894c414a1b\n-size 20951\n+oid sha256:aa8ed00e0184ac4636fbf26b42dd10893e1bc9aa64b6107922d7ad97e7304d80\n+size 21927\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_6,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_6,NEXUS_5,1.0,en].png\nindex 7908dfeabd6..e37ce30fa79 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_6,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_6,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:0843965afef3d142709f377ab408866cacfb016f652107ee84dc2fd39770ff17\n-size 35490\n+oid sha256:ae000f0f2e0f81cf75588d800f3b623f875db1dee7d5459abebfb1cbb67d5da1\n+size 34937\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_7,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_7,NEXUS_5,1.0,en].png\nindex 609952770ef..87165509bc6 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_7,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Day-0_1_null_7,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:7cbaaf6ee91626a9e8db83ce42be14e1a02a8c841230bf7829fa74aff8cbdfab\n-size 32513\n+oid sha256:2ef711f98b345d4913e930a4ef2794d1d4ae2f19e29f842548664713dbc2f82c\n+size 27670\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_0,NEXUS_5,1.0,en].png\nindex 0795fad021e..e2a4d4b4b3e 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_0,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_0,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:8ef7b72a829b4add1f21b5f7fc06d6a260227b9c065c08ad770d70656b28f815\n-size 26848\n+oid sha256:f8cb1d19005b68d1f9f09240f58937bdf30efd00bf87758693791bda6627191f\n+size 25745\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_1,NEXUS_5,1.0,en].png\nindex 54d46147c06..74ea9fb0bc6 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_1,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_1,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:383436d7acb3474d2d217bce7e566f9ca2957324fca95eb2ffb93fa1b2038082\n-size 26117\n+oid sha256:1141421ad8fc3ebc2e321a45604dd1d6dc4494a9ae7b860e7853e4a0cd610d5f\n+size 23697\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_2,NEXUS_5,1.0,en].png\nindex 128acd813b4..a3bd57d7a00 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_2,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_2,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:9fdcab5fa8620cb0ba0cc0cb822fe4a4807198dbbcd7de7dd7a230d2fe3030e0\n-size 49141\n+oid sha256:7a1b73e341ce8c0932f1253b9ee159a219e1b64abef54f14b286ac551b2542e4\n+size 48479\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_3,NEXUS_5,1.0,en].png\nindex c8329b273e4..1ccd2010c9d 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_3,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_3,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:06b8e6bce1573d8e39a1bf5823945733152fde066a394a3e90f2bf8dc7929ea3\n-size 50526\n+oid sha256:f06386b912ef02aa34cd1806588c065e76ab1373892cd62ded705537dd593a81\n+size 50027\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_4,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_4,NEXUS_5,1.0,en].png\nindex 2db49fef257..62977b86c39 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_4,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_4,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:10c16c9a29f898a6a33f8bfa10df24d2da9adb93eeb764e2b744c6efe531890e\n-size 30007\n+oid sha256:118b4d64a5977842c3d65d27bcf545cef8b5bf62f8417ab66934553fd3985b67\n+size 29534\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_5,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_5,NEXUS_5,1.0,en].png\nindex 29ac2f3227f..e00771d9138 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_5,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_5,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:f4786a280d694ead76992dfa75f09bd2e20c292376509f86462a359d19be3e50\n-size 19984\n+oid sha256:35409dad83ef81e0aaa74a36b350e028d07a5d90cdcc75c29f9156fbdeb2e3c1\n+size 20771\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_6,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_6,NEXUS_5,1.0,en].png\nindex b2be2a2397f..507ff9cd8e7 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_6,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_6,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:59cabf858188557db3f2660f71cafc9b041977c656693dc5bc009da71a5c7648\n-size 33457\n+oid sha256:5da97854c7dd24f5f890ff1bcce8e8061892f2a66b919caf254c85ecf1831c38\n+size 32717\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_7,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_7,NEXUS_5,1.0,en].png\nindex cb997ffa7dc..e2a4d4b4b3e 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_7,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.verifysession.impl_VerifySelfSessionView_null_VerifySelfSessionView-Night-0_2_null_7,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:efcf672eba104371f27b43c9204d207f11f9ce42098da0e4dce3da4aa6639153\n-size 30517\n+oid sha256:f8cb1d19005b68d1f9f09240f58937bdf30efd00bf87758693791bda6627191f\n+size 25745\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.atomic.molecules_IconTitleSubtitleMoleculeWithResIcon_null_IconTitleSubtitleMoleculeWithResIcon-Day_0_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.atomic.molecules_IconTitleSubtitleMoleculeWithResIcon_null_IconTitleSubtitleMoleculeWithResIcon-Day_0_null,NEXUS_5,1.0,en].png\nnew file mode 100644\nindex 00000000000..461a325d97f\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.atomic.molecules_IconTitleSubtitleMoleculeWithResIcon_null_IconTitleSubtitleMoleculeWithResIcon-Day_0_null,NEXUS_5,1.0,en].png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:2050a2e304b492d54d2cc20ee65f02f7ae0d380a33e207b41e2bb8a8cae4dac8\n+size 10117\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.atomic.molecules_IconTitleSubtitleMoleculeWithResIcon_null_IconTitleSubtitleMoleculeWithResIcon-Night_1_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.atomic.molecules_IconTitleSubtitleMoleculeWithResIcon_null_IconTitleSubtitleMoleculeWithResIcon-Night_1_null,NEXUS_5,1.0,en].png\nnew file mode 100644\nindex 00000000000..ae597898892\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[l.designsystem.atomic.molecules_IconTitleSubtitleMoleculeWithResIcon_null_IconTitleSubtitleMoleculeWithResIcon-Night_1_null,NEXUS_5,1.0,en].png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:dfb15c08455c3b7c323ed81362d56beddf84a387ff06d30336dbfab75b4df8a9\n+size 9732\n", "n2p_tests": {"io.element.android.features.ftue.impl.DefaultFtueServiceTests.if a check for a step is true, start from the next one": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to an image media message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - on scroll finished send read receipt if an event is before the index": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.back key pressed - when verifying and not loading declines the verification": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionPresenterTests.present - Go back after cancelation returns to initial state": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - check that the room's unread flag is removed": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListViewTest.clicking on start chat when the session has no room invokes the expected callback": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - call is disabled if user cannot join it even if there is an ongoing call": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action copy": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionPresenterTests.present - Handles startSasVerification": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action edit": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle toggling a reaction twice": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when memberlist is ready": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action redact": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - check that the room is marked as read with correct RR and as unread": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when memberlist is error": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle dismiss action": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListViewTest.clicking on invites invokes the expected callback": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to a poll": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - when room member info is loaded, read receipts info should be updated": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - on scroll finished will not send read receipt the first visible event is the same as before": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListViewTest.clicking on continue recovery key banner invokes the expected callback": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.back key pressed - when verifying and loading does nothing": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.clicking on they match emits the expected event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionPresenterTests.present - When verification is approved, the flow completes if there is no error": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action report content": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionPresenterTests.present - Restart after cancelation returns to requesting verification": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.ftue.impl.DefaultFtueServiceTests.given all checks being true, FtueState is Complete": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when memberlist is not ready": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - shows prompt to reinvite users in DM": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListViewTest.clicking on a room invokes the expected callback": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - PollAnswerSelected event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionPresenterTests.present - Initial state is received, can use recovery key": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.back key pressed - when canceled resets the flow": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionPresenterTests.present - When verification is declined, the flow is canceled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.appnav.loggedin.LoggedInPresenterTest.present - initial state": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionPresenterTests.present - Cancelation on initial state does nothing": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - load 1 room with success": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionPresenterTests.present - When verifying, if we receive another challenge we ignore it": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle toggling a reaction": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action edit poll": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when inviting fails": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - initial state": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListViewTest.clicking on a room setting invokes the expected callback and emits expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - permission to redact other": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - PollEndClicked event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - side effect on redacted items is invoked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionPresenterTests.present - A failure when verifying cancels it": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionPresenterTests.present - Canceling the flow once it's verifying cancels it": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.back key pressed - when awaiting response cancels the verification": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - on scroll finished mark a room as read if the first visible index is 0": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.ftue.impl.DefaultFtueServiceTests.traverse flow": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - change in migration presenter state modifies contentState": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionPresenterTests.present - Initial state is received": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - permission to post": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - initial state": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.clicking on enter recovery key calls the expected callback": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - no permission to post": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - leave room calls into leave room presenter": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - update visible range": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - permission to redact own": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - on scroll finished send a private read receipt if an event is at an index other than 0 and public read receipts are disabled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to a file media message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action end poll": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - change in notification settings updates the summary for decorations": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - doesn't show reinvite prompt if other party is present": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListViewTest.long clicking on a room emits the expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - doesn't show reinvite prompt in non-direct room": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - should start with no user and then load user with error": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - handle DismissRequestVerificationPrompt": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.back key pressed - when ready to verify cancels the verification": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - show context menu": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - when set is favorite event is emitted, then the action is called": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - covers newEventState scenarios": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - reaction ordering": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - toggle search menu": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.appnav.loggedin.LoggedInPresenterTest.present - show sync spinner": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - hide context menu": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListViewTest.clicking on close recovery key banner emits the expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - PollEditClicked event navigates": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - handle DismissRecoveryKeyPrompt": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - show avatar indicator": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - when room service returns no room, then contentState is Empty": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to an event with no id does nothing": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.ftue.impl.DefaultFtueServiceTests.given any check being false and session verification state being loaded, FtueState is Incomplete": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - should start with no user and then load user with success": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - on scroll finished will not send read receipt only virtual events exist before the index": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action forward": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.clicking on they do not match emits the expected event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to a video media message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.ftue.impl.DefaultFtueServiceTests.if version is older than 13 we don't display the notification opt in screen": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - set highlighted event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.when flow is completed and the user clicks on the continue button, the expected callback is invoked": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionPresenterTests.present - A fail when requesting verification resets the state to the initial one": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action show developer info": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionPresenterTests.present - Handles requestVerification": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - load more": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.roomlist.impl.RoomListPresenterTests.present - sets invite state": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {"io.element.android.features.preferences.impl.root.PreferencesRootPresenterTest.present - initial state": {"run": "PASS", "test": "PASS", "fix": "PASS"}}, "s2p_tests": {}} {"instance_id": "element-hq__element-x-android-2653", "org": "element-hq", "repo": "element-x-android", "number": 2653, "state": "closed", "title": "Copy permalink", "body": "\r\n \r\n## Type of change\r\n\r\n- [ ] Feature\r\n- [ ] Bugfix\r\n- [ ] Technical\r\n- [ ] Other :\r\n\r\n## Content\r\n\r\n\r\nAdd action on message bottom sheet to copy permalink on some Event.\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #2650 \r\n\r\n## Screenshots / GIFs\r\n\r\n\r\nSee recorded one\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Long click on a message and observe that there is a new action to copy the permalink.\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 23\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request includes a new file under ./changelog.d. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#changelog\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)\r\n- [ ] You've made a self review of your PR\r\n", "base": {"label": "element-hq:develop", "ref": "develop", "sha": "05f6770d356d8256e7ee7f9c0f96b05dc8c94138"}, "resolved_issues": [{"number": 2650, "title": "[Task] Copy permalink for Event", "body": "Please see and discuss the details in the meta issue."}], "lang": "kotlin", "problem_statement": "[Task] Copy permalink for Event\nPlease see and discuss the details in the meta issue.\n", "pull_url": "https://github.com/element-hq/element-x-android/pull/2653", "issue_urls": ["https://github.com/element-hq/element-x-android/issues/2650"], "test_command": "./gradlew :features:messages:impl:testDebugUnitTest --tests \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest\" --tests \"io.element.android.features.messages.impl.MessagesPresenterTest\"", "fix_patch": "diff --git a/changelog.d/2650.feature b/changelog.d/2650.feature\nnew file mode 100644\nindex 00000000000..4287d42ac79\n--- /dev/null\n+++ b/changelog.d/2650.feature\n@@ -0,0 +1,1 @@\n+Add action to copy permalink\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt\nindex 4c92585b0db..4edc943a730 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt\n@@ -89,6 +89,7 @@ import io.element.android.libraries.matrix.ui.room.canRedactOtherAsState\n import io.element.android.libraries.matrix.ui.room.canRedactOwnAsState\n import io.element.android.libraries.matrix.ui.room.canSendMessageAsState\n import io.element.android.libraries.textcomposer.model.MessageComposerMode\n+import io.element.android.libraries.ui.strings.CommonStrings\n import kotlinx.coroutines.CoroutineScope\n import kotlinx.coroutines.launch\n import kotlinx.coroutines.withContext\n@@ -273,6 +274,7 @@ class MessagesPresenter @AssistedInject constructor(\n ) = launch {\n when (action) {\n TimelineItemAction.Copy -> handleCopyContents(targetEvent)\n+ TimelineItemAction.CopyLink -> handleCopyLink(targetEvent)\n TimelineItemAction.Redact -> handleActionRedact(targetEvent)\n TimelineItemAction.Edit -> handleActionEdit(targetEvent, composerState, enableTextFormatting)\n TimelineItemAction.Reply,\n@@ -435,6 +437,20 @@ class MessagesPresenter @AssistedInject constructor(\n event.eventId?.let { timelineState.eventSink(TimelineEvents.PollEndClicked(it)) }\n }\n \n+ private suspend fun handleCopyLink(event: TimelineItem.Event) {\n+ event.eventId ?: return\n+ room.getPermalinkFor(event.eventId).fold(\n+ onSuccess = { permalink ->\n+ clipboardHelper.copyPlainText(permalink)\n+ snackbarDispatcher.post(SnackbarMessage(CommonStrings.common_link_copied_to_clipboard))\n+ },\n+ onFailure = {\n+ Timber.e(it, \"Failed to get permalink for event ${event.eventId}\")\n+ snackbarDispatcher.post(SnackbarMessage(CommonStrings.common_error))\n+ }\n+ )\n+ }\n+\n private suspend fun handleCopyContents(event: TimelineItem.Event) {\n val content = when (event.content) {\n is TimelineItemTextBasedContent -> event.content.body\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt\nindex f836e2f8a05..5ebedeb06f5 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt\n@@ -96,6 +96,7 @@ class ActionListPresenter @Inject constructor(\n is TimelineItemStateContent -> {\n buildList {\n add(TimelineItemAction.Copy)\n+ add(TimelineItemAction.CopyLink)\n if (isDeveloperModeEnabled) {\n add(TimelineItemAction.ViewSource)\n }\n@@ -119,6 +120,7 @@ class ActionListPresenter @Inject constructor(\n if (timelineItem.content.canBeCopied()) {\n add(TimelineItemAction.Copy)\n }\n+ add(TimelineItemAction.CopyLink)\n if (isDeveloperModeEnabled) {\n add(TimelineItemAction.ViewSource)\n }\n@@ -136,6 +138,7 @@ class ActionListPresenter @Inject constructor(\n add(TimelineItemAction.Reply)\n add(TimelineItemAction.Forward)\n }\n+ add(TimelineItemAction.CopyLink)\n if (isDeveloperModeEnabled) {\n add(TimelineItemAction.ViewSource)\n }\n@@ -176,6 +179,7 @@ class ActionListPresenter @Inject constructor(\n if (timelineItem.content.canBeCopied()) {\n add(TimelineItemAction.Copy)\n }\n+ add(TimelineItemAction.CopyLink)\n if (isDeveloperModeEnabled) {\n add(TimelineItemAction.ViewSource)\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt\nindex 10952058b50..be78037d761 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt\n@@ -135,6 +135,7 @@ fun aTimelineItemActionList(): ImmutableList {\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n TimelineItemAction.Copy,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.Edit,\n TimelineItemAction.Redact,\n TimelineItemAction.ReportContent,\n@@ -146,6 +147,7 @@ fun aTimelineItemPollActionList(): ImmutableList {\n TimelineItemAction.EndPoll,\n TimelineItemAction.Reply,\n TimelineItemAction.Copy,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.ViewSource,\n TimelineItemAction.ReportContent,\n TimelineItemAction.Redact,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt\nindex f244f515f36..f61e6197c21 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt\n@@ -31,6 +31,7 @@ sealed class TimelineItemAction(\n ) {\n data object Forward : TimelineItemAction(CommonStrings.action_forward, CompoundDrawables.ic_compound_forward)\n data object Copy : TimelineItemAction(CommonStrings.action_copy, CompoundDrawables.ic_compound_copy)\n+ data object CopyLink : TimelineItemAction(CommonStrings.action_copy_link_to_message, CompoundDrawables.ic_compound_link)\n data object Redact : TimelineItemAction(CommonStrings.action_remove, CompoundDrawables.ic_compound_delete, destructive = true)\n data object Reply : TimelineItemAction(CommonStrings.action_reply, CompoundDrawables.ic_compound_reply)\n data object ReplyInThread : TimelineItemAction(CommonStrings.action_reply_in_thread, CompoundDrawables.ic_compound_reply)\ndiff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt\nindex 3e01155a86b..aa1f3fa0254 100644\n--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt\n+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt\n@@ -328,5 +328,12 @@ interface MatrixRoom : Closeable {\n */\n fun getWidgetDriver(widgetSettings: MatrixWidgetSettings): Result\n \n+ /**\n+ * Get the permalink for the provided [eventId].\n+ * @param eventId The event id to get the permalink for.\n+ * @return The permalink, or a failure.\n+ */\n+ suspend fun getPermalinkFor(eventId: EventId): Result\n+\n override fun close() = destroy()\n }\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt\nindex 7ab6e3640b6..be61b063103 100644\n--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt\n@@ -16,6 +16,7 @@\n \n package io.element.android.libraries.matrix.impl.room\n \n+import io.element.android.appconfig.MatrixConfiguration\n import io.element.android.libraries.core.coroutine.CoroutineDispatchers\n import io.element.android.libraries.core.coroutine.childScope\n import io.element.android.libraries.matrix.api.core.EventId\n@@ -711,6 +712,19 @@ class RustMatrixRoom(\n )\n }\n \n+ override suspend fun getPermalinkFor(eventId: EventId): Result {\n+ // FIXME Use the SDK API once https://github.com/matrix-org/matrix-rust-sdk/issues/3259 has been done\n+ // Now use a simple builder\n+ return runCatching {\n+ buildString {\n+ append(MatrixConfiguration.MATRIX_TO_PERMALINK_BASE_URL)\n+ append(roomId.value)\n+ append(\"/\")\n+ append(eventId.value)\n+ }\n+ }\n+ }\n+\n private fun sendAttachment(files: List, handle: () -> SendAttachmentJoinHandle): Result {\n return runCatching {\n MediaUploadHandlerImpl(files, handle())\n", "test_patch": "diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt\nindex 6cceb6b5b54..bce97f4a6ee 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt\n@@ -233,6 +233,27 @@ class MessagesPresenterTest {\n }\n }\n \n+ @Test\n+ fun `present - handle action copy link`() = runTest {\n+ val clipboardHelper = FakeClipboardHelper()\n+ val event = aMessageEvent()\n+ val matrixRoom = FakeMatrixRoom(\n+ permalinkResult = { Result.success(\"a link\") },\n+ )\n+ val presenter = createMessagesPresenter(\n+ clipboardHelper = clipboardHelper,\n+ matrixRoom = matrixRoom,\n+ )\n+ moleculeFlow(RecompositionMode.Immediate) {\n+ presenter.present()\n+ }.test {\n+ val initialState = awaitFirstItem()\n+ initialState.eventSink.invoke(MessagesEvents.HandleAction(TimelineItemAction.CopyLink, event))\n+ assertThat(awaitItem().actionListState.target).isEqualTo(ActionListState.Target.None)\n+ assertThat(clipboardHelper.clipboardContents).isEqualTo(\"a link\")\n+ }\n+ }\n+\n @Test\n fun `present - handle action reply`() = runTest {\n val presenter = createMessagesPresenter()\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt\nindex 981e8fc8ac0..c1062625f7d 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt\n@@ -153,6 +153,7 @@ class ActionListPresenterTest {\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n TimelineItemAction.Copy,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.ViewSource,\n TimelineItemAction.ReportContent,\n )\n@@ -193,6 +194,7 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Forward,\n TimelineItemAction.Copy,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.ViewSource,\n TimelineItemAction.ReportContent,\n )\n@@ -232,6 +234,7 @@ class ActionListPresenterTest {\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n TimelineItemAction.Copy,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.ViewSource,\n TimelineItemAction.ReportContent,\n TimelineItemAction.Redact,\n@@ -272,6 +275,7 @@ class ActionListPresenterTest {\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n TimelineItemAction.Copy,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.ViewSource,\n TimelineItemAction.ReportContent,\n TimelineItemAction.Redact,\n@@ -315,6 +319,7 @@ class ActionListPresenterTest {\n TimelineItemAction.Forward,\n TimelineItemAction.Edit,\n TimelineItemAction.Copy,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.ViewSource,\n TimelineItemAction.Redact,\n )\n@@ -357,6 +362,7 @@ class ActionListPresenterTest {\n TimelineItemAction.Forward,\n TimelineItemAction.Edit,\n TimelineItemAction.Copy,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.ViewSource,\n )\n )\n@@ -396,6 +402,7 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.ViewSource,\n TimelineItemAction.Redact,\n )\n@@ -435,6 +442,7 @@ class ActionListPresenterTest {\n displayEmojiReactions = false,\n actions = persistentListOf(\n TimelineItemAction.Copy,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.ViewSource,\n )\n )\n@@ -473,6 +481,7 @@ class ActionListPresenterTest {\n displayEmojiReactions = false,\n actions = persistentListOf(\n TimelineItemAction.Copy,\n+ TimelineItemAction.CopyLink,\n )\n )\n )\n@@ -513,6 +522,7 @@ class ActionListPresenterTest {\n TimelineItemAction.Forward,\n TimelineItemAction.Edit,\n TimelineItemAction.Copy,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.Redact,\n )\n )\n@@ -595,6 +605,7 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Edit,\n TimelineItemAction.Copy,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.Redact,\n )\n )\n@@ -632,6 +643,7 @@ class ActionListPresenterTest {\n TimelineItemAction.Reply,\n TimelineItemAction.Edit,\n TimelineItemAction.EndPoll,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.Redact,\n )\n )\n@@ -668,6 +680,7 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Reply,\n TimelineItemAction.EndPoll,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.Redact,\n )\n )\n@@ -703,6 +716,7 @@ class ActionListPresenterTest {\n displayEmojiReactions = true,\n actions = persistentListOf(\n TimelineItemAction.Reply,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.Redact,\n )\n )\n@@ -738,6 +752,7 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.Redact,\n )\n )\ndiff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt\nindex 32575e59245..f2395241b5c 100644\n--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt\n+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt\n@@ -84,6 +84,7 @@ class FakeMatrixRoom(\n override val activeMemberCount: Long = 234L,\n val notificationSettingsService: NotificationSettingsService = FakeNotificationSettingsService(),\n private val matrixTimeline: MatrixTimeline = FakeMatrixTimeline(),\n+ private var permalinkResult: () -> Result = { Result.success(\"link\") },\n canRedactOwn: Boolean = false,\n canRedactOther: Boolean = false,\n ) : MatrixRoom {\n@@ -273,6 +274,10 @@ class FakeMatrixRoom(\n return cancelSendResult\n }\n \n+ override suspend fun getPermalinkFor(eventId: EventId): Result {\n+ return permalinkResult()\n+ }\n+\n override suspend fun editMessage(\n originalEventId: EventId?,\n transactionId: TransactionId?,\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_10,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_10,NEXUS_5,1.0,en].png\nindex a2fa0ff4c9d..758bb383113 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_10,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_10,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:654d73d145ba000b0a58e1974206bd9c7970a5a384186336469504cd35b19890\n-size 29036\n+oid sha256:f5aa4c9aab5727c56ee6efcf8c136cca8276d54695d28a4f548af9d51f3df4b9\n+size 34264\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_2,NEXUS_5,1.0,en].png\nindex 0cf654af986..8ac22522d01 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_2,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_2,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:32c2a61124bd68fc1921439f834744c1a40fa615de1270b8d97dd5c4365bbd25\n-size 39317\n+oid sha256:0d31d3549643b37a21f043f9ec9a33fa93e25f4004b077af713097855235effe\n+size 44276\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_3,NEXUS_5,1.0,en].png\nindex 942a986658b..f5be0071937 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_3,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_3,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:17c00b93a8073bdc2741f0492623ffef80d37e3f3fc8744650233d489b6efc82\n-size 39866\n+oid sha256:dfe460e8bab0a27a31984ce8c85ed98aef2a994584f724375cd436d5c1c7c6ca\n+size 44758\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_4,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_4,NEXUS_5,1.0,en].png\nindex ca3fc4b9e22..8f629512ea7 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_4,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_4,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:2bcd9a9db22a88210afa8ba3700abc1895d040c044ec11aa324d720651a3bc0b\n-size 40404\n+oid sha256:e287869aa819ff569ab187f8995260410c47c32817caba61ba7639d6b0a2fe44\n+size 45245\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_5,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_5,NEXUS_5,1.0,en].png\nindex 8a6fc8596a4..e5b5b23b085 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_5,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_5,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:00804549fdbada3e48531ffab2bd5e013cd592d11c56e65eb2385b07910bc6e3\n-size 39998\n+oid sha256:1f6602e1e19e1c5b545522ff7444b294cc926d02b1910f196461a9770f64af4a\n+size 44882\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_6,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_6,NEXUS_5,1.0,en].png\nindex 8f3fe73e50b..9f81bd59e2b 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_6,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_6,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:4f71497d55a8cb048b3249221e8b24c883e3015533f4e543650b742542b5daac\n-size 40645\n+oid sha256:4c321a39333a03b5eadf287e2a37e809da3620205d97caa1ae63f9ab99dc4f82\n+size 45464\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_7,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_7,NEXUS_5,1.0,en].png\nindex c044d8db01b..a9ba8ca80e6 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_7,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_7,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:0d4ad5e2fb1b518495f23b70fde606d791536adbea3ffac76c5fbb54e4c22138\n-size 41343\n+oid sha256:135f36df3ade2a4e210fc5560b8a00593e842153424da5efcd25b5c64036f59c\n+size 46240\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_8,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_8,NEXUS_5,1.0,en].png\nindex 870e1cd2c6c..2d2bf39bf1d 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_8,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_8,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:675bbd412179ad4960c6cf78f973c67fd11809340e414f7ebf3eef5e41434e0e\n-size 41201\n+oid sha256:ea154dca2cde0829bb70dbcf9e032e63d052c35194b159dd72db8c72a58863b0\n+size 46082\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_9,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_9,NEXUS_5,1.0,en].png\nindex d8fffdef9a5..97c322b6a95 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_9,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Day-1_1_null_9,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:33e82110711be0bdff074df90c93c3911e77bf53672df336c5fa6bf74f28d86f\n-size 28191\n+oid sha256:f2124f3afde9e0fc4e42733d3624f69a74b898a035e47e4369acfad2834d0e02\n+size 33378\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_10,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_10,NEXUS_5,1.0,en].png\nindex 683a9a47550..0ce605591d5 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_10,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_10,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:7220aa1b48506d58f800d71c0aa1b3ea1650fa2153246d1572213e5ff0170b04\n-size 27759\n+oid sha256:61da843a4fd576317ce1dab5a95cba47f269c96096157f880da5c6f3f8a944c7\n+size 32148\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_2,NEXUS_5,1.0,en].png\nindex 04e465574f8..7e260976f90 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_2,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_2,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:36262a1ed8e2029519eb519e64dd973a5170269c04ad509464596b87bcbd9247\n-size 37891\n+oid sha256:0345399ddbe34e4fb13468571921fb2de8db1b7db01cb6a7439970b15046d37e\n+size 42361\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_3,NEXUS_5,1.0,en].png\nindex c36ec3d9994..0cbbb24fd4b 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_3,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_3,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:3c75a4422846ab1e4d12c48916a5f306b506cd1c082f1709104560634106a8ba\n-size 38420\n+oid sha256:63b40ee6d9b4fa6f049dedbfc628380069360e67129b8e53b94e04d25b5897bf\n+size 42898\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_4,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_4,NEXUS_5,1.0,en].png\nindex 08bc6aed16e..02acc78564d 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_4,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_4,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:e28f6654d3fd5fb6e332a999fda8393bdff4988a87039e683cd94a251f4b9b07\n-size 38926\n+oid sha256:a5d9f66ab910df80652ef7658869ee05f570af134f1e05e8fc5b19d9a05a453e\n+size 43388\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_5,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_5,NEXUS_5,1.0,en].png\nindex e5917eb1ae0..38a46d54121 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_5,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_5,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:9a2cd0f46f405978dda374ce865bc5f409280716830fcd2d29e290c11b36f118\n-size 38538\n+oid sha256:e37056a6b4d6416a77af752d04b040d1fc8dbd65bdaaae8d50c05e7a11309d05\n+size 43013\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_6,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_6,NEXUS_5,1.0,en].png\nindex 490bfe9f87e..0dd6058fd1e 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_6,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_6,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:eac8803bd70cc677841f124eeb19e70f50a257cf89360410618db2c2f601c27a\n-size 39178\n+oid sha256:995e4bfb172bbc09177d1427f63063f86348cedd5e497a5341eb0e8374e80cc9\n+size 43634\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_7,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_7,NEXUS_5,1.0,en].png\nindex 6bd5bbeda89..139f2d887a1 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_7,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_7,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:96c95a7ca59ed0d8bba59e735a2248d2cee3d0a8d4c045a0491fe1731c8c9574\n-size 39848\n+oid sha256:1d086a8c7b3f9e6dbbf30495ba1d209b8436a8ef5d31dc9a3605a0b2cd9ce72e\n+size 44276\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_8,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_8,NEXUS_5,1.0,en].png\nindex 3c897184fae..0058b2ffd35 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_8,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_8,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:a395ca5f5dbf4647ad1b5dea90f3c7a1cada2e934c4053f5ecc1e793e4efa879\n-size 39718\n+oid sha256:013dce6e34f67c62a514b958b502a511c9975551eb745b4e502c5794584e730a\n+size 44150\ndiff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_9,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_9,NEXUS_5,1.0,en].png\nindex 1afb6e95320..6505ba7ac70 100644\n--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_9,NEXUS_5,1.0,en].png\n+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.actionlist_SheetContent_null_SheetContent-Night-1_2_null_9,NEXUS_5,1.0,en].png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:4bf2d4ecc1c9e67cd833ca5cd61b4f77e5da9381e4425f332b91e7fbf8d9d0f4\n-size 26781\n+oid sha256:cda82238c49b88bf0da5f462bcb05dee7fe2e659345c03997456be635ff4bae2\n+size 31287\n", "n2p_tests": {"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for message from others redacted": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to an image media message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - check that the room's unread flag is removed": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - permission to post": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - no permission to post": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - call is disabled if user cannot join it even if there is an ongoing call": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action copy": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action edit": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle toggling a reaction twice": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - permission to redact own": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when memberlist is ready": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action redact": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to a file media message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action end poll": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when memberlist is error": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - doesn't show reinvite prompt if other party is present": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for my message cannot redact": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - doesn't show reinvite prompt in non-direct room": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for non-editable poll message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - initial state": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle dismiss action": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to a poll": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a state item in non-debuggable build": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for ended poll message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action copy link": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message cannot sent message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action report content": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when memberlist is not ready": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for voice message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - shows prompt to reinvite users in DM": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for message from me redacted": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to an event with no id does nothing": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message in non-debuggable build": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to a video media message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action forward": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message and cannot send reaction": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message and can redact": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for my message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for editable poll message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action edit poll": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle toggling a reaction": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message with no actions": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a media item": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when inviting fails": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action show developer info": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - initial state": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - permission to redact other": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute not sent message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a state item in debug build": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "element-hq__element-x-android-3298", "org": "element-hq", "repo": "element-x-android", "number": 3298, "state": "closed", "title": "Feature: identity reset", "body": "\r\n \r\n## Content\r\n\r\n- Moves OIDC related code to their own modules: `libraries/oidc`.\r\n- Improves the custom chrome tab implementation and fixes issues with the fallback webview one (it was freezing after signing in).\r\n- Creates `OidcEntryPoint` which allows opening any of the OIDC flow options (custom tab, webview).\r\n- Adds new flows for identity reset: root screen with confirmation, OIDC one which uses the extracted OIDC logic, user+password one.\r\n- Create `IdentityResetHandle` wrappers for both OIDC and password variants.\r\n\r\n## Motivation and context\r\n\r\nCloses #3268.\r\n\r\n## Screenshots / GIFs\r\n\r\nIn the PR.\r\n\r\n## Tests\r\n\r\nWith a user + password based account whose data you don't mind losing:\r\n\r\n- Log in.\r\n- Select 'Can't confirm?'.\r\n- Continue, add your password and confirm.\r\n- You should be fully logged in now and the system will ask you to add key backup.\r\n\r\nWith an OIDC one (maybe using `synapse-oidc.element.dev`?):\r\n\r\n- Log in.\r\n- Select 'Can't confirm?'.\r\n- Continue, confirm the reset in the custom tab/webview, then go back.\r\n- You should be fully logged in now and the system will ask you to add key backup.\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s): 13\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 23\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [x] Pull request is based on the develop branch\r\n- [x] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [x] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)\r\n- [x] You've made a self review of your PR\r\n", "base": {"label": "element-hq:develop", "ref": "develop", "sha": "45775d71fd29354749ae64651a312c32ebbd10e1"}, "resolved_issues": [{"number": 3268, "title": "[Story] Crypto identity reset", "body": "See details in the parent ticket"}], "lang": "kotlin", "problem_statement": "[Story] Crypto identity reset\nSee details in the parent ticket\n", "pull_url": "https://github.com/element-hq/element-x-android/pull/3298", "issue_urls": ["https://github.com/element-hq/element-x-android/issues/3268"], "test_command": "./gradlew :features:securebackup:impl:testDebugUnitTest --tests \"io.element.android.features.securebackup.impl.reset.root.ResetIdentityRootViewTest\" --tests \"io.element.android.features.securebackup.impl.reset.password.ResetIdentityPasswordViewTest\" --tests \"io.element.android.features.securebackup.impl.reset.root.ResetIdentityRootPresenterTest\" --tests \"io.element.android.features.securebackup.impl.reset.ResetIdentityFlowManagerTest\" --tests \"io.element.android.features.securebackup.impl.reset.password.ResetIdentityPasswordPresenterTest\" :features:login:impl:testDebugUnitTest --tests \"io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderPresenterTest\" :features:verifysession:impl:testDebugUnitTest --tests \"io.element.android.features.verifysession.impl.VerifySelfSessionViewTest\" :libraries:oidc:impl:testDebugUnitTest --tests \"io.element.android.libraries.oidc.impl.OidcUrlParserTest\" --tests \"io.element.android.libraries.oidc.impl.webview.OidcPresenterTest\" :appnav:testDebugUnitTest --tests \"io.element.android.appnav.intent.IntentResolverTest\"", "fix_patch": "diff --git a/appnav/build.gradle.kts b/appnav/build.gradle.kts\nindex 53680fd44ea..887f48e203b 100644\n--- a/appnav/build.gradle.kts\n+++ b/appnav/build.gradle.kts\n@@ -42,6 +42,7 @@ dependencies {\n implementation(projects.libraries.architecture)\n implementation(projects.libraries.deeplink)\n implementation(projects.libraries.matrix.api)\n+ implementation(projects.libraries.oidc.api)\n implementation(projects.libraries.preferences.api)\n implementation(projects.libraries.push.api)\n implementation(projects.libraries.pushproviders.api)\n@@ -66,6 +67,7 @@ dependencies {\n testImplementation(libs.test.truth)\n testImplementation(libs.test.turbine)\n testImplementation(projects.libraries.matrix.test)\n+ testImplementation(projects.libraries.oidc.impl)\n testImplementation(projects.libraries.push.test)\n testImplementation(projects.libraries.pushproviders.test)\n testImplementation(projects.features.networkmonitor.test)\ndiff --git a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt\nindex d200acb84e8..87e08b6bb90 100644\n--- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt\n+++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt\n@@ -42,8 +42,6 @@ import io.element.android.appnav.intent.ResolvedIntent\n import io.element.android.appnav.root.RootNavStateFlowFactory\n import io.element.android.appnav.root.RootPresenter\n import io.element.android.appnav.root.RootView\n-import io.element.android.features.login.api.oidc.OidcAction\n-import io.element.android.features.login.api.oidc.OidcActionFlow\n import io.element.android.features.rageshake.api.bugreport.BugReportEntryPoint\n import io.element.android.features.signedout.api.SignedOutEntryPoint\n import io.element.android.features.viewfolder.api.ViewFolderEntryPoint\n@@ -58,6 +56,8 @@ import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService\n import io.element.android.libraries.matrix.api.core.SessionId\n import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias\n import io.element.android.libraries.matrix.api.permalink.PermalinkData\n+import io.element.android.libraries.oidc.api.OidcAction\n+import io.element.android.libraries.oidc.api.OidcActionFlow\n import io.element.android.libraries.sessionstorage.api.LoggedInState\n import kotlinx.coroutines.flow.distinctUntilChanged\n import kotlinx.coroutines.flow.launchIn\ndiff --git a/appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt b/appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt\nindex d41fbbfebb3..73ad6f60085 100644\n--- a/appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt\n+++ b/appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt\n@@ -17,12 +17,12 @@\n package io.element.android.appnav.intent\n \n import android.content.Intent\n-import io.element.android.features.login.api.oidc.OidcAction\n-import io.element.android.features.login.api.oidc.OidcIntentResolver\n import io.element.android.libraries.deeplink.DeeplinkData\n import io.element.android.libraries.deeplink.DeeplinkParser\n import io.element.android.libraries.matrix.api.permalink.PermalinkData\n import io.element.android.libraries.matrix.api.permalink.PermalinkParser\n+import io.element.android.libraries.oidc.api.OidcAction\n+import io.element.android.libraries.oidc.api.OidcIntentResolver\n import timber.log.Timber\n import javax.inject.Inject\n \ndiff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/FtueSessionVerificationFlowNode.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/FtueSessionVerificationFlowNode.kt\nindex a5dc8402670..3e4ed218a5a 100644\n--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/FtueSessionVerificationFlowNode.kt\n+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/FtueSessionVerificationFlowNode.kt\n@@ -58,6 +58,9 @@ class FtueSessionVerificationFlowNode @AssistedInject constructor(\n \n @Parcelize\n data object EnterRecoveryKey : NavTarget\n+\n+ @Parcelize\n+ data object ResetIdentity : NavTarget\n }\n \n interface Callback : Plugin {\n@@ -85,6 +88,10 @@ class FtueSessionVerificationFlowNode @AssistedInject constructor(\n override fun onDone() {\n plugins().forEach { it.onDone() }\n }\n+\n+ override fun onResetKey() {\n+ backstack.push(NavTarget.ResetIdentity)\n+ }\n })\n .build()\n }\n@@ -94,6 +101,16 @@ class FtueSessionVerificationFlowNode @AssistedInject constructor(\n .callback(secureBackupEntryPointCallback)\n .build()\n }\n+ is NavTarget.ResetIdentity -> {\n+ secureBackupEntryPoint.nodeBuilder(this, buildContext)\n+ .params(SecureBackupEntryPoint.Params(SecureBackupEntryPoint.InitialTarget.ResetIdentity))\n+ .callback(object : SecureBackupEntryPoint.Callback {\n+ override fun onDone() {\n+ plugins().forEach { it.onDone() }\n+ }\n+ })\n+ .build()\n+ }\n }\n }\n \ndiff --git a/features/login/impl/build.gradle.kts b/features/login/impl/build.gradle.kts\nindex 6fcdc2c1de3..3fbe55f1f9e 100644\n--- a/features/login/impl/build.gradle.kts\n+++ b/features/login/impl/build.gradle.kts\n@@ -50,6 +50,7 @@ dependencies {\n implementation(projects.libraries.uiStrings)\n implementation(projects.libraries.permissions.api)\n implementation(projects.libraries.qrcode)\n+ implementation(projects.libraries.oidc.api)\n implementation(libs.androidx.browser)\n implementation(platform(libs.network.retrofit.bom))\n implementation(libs.network.retrofit)\n@@ -65,6 +66,7 @@ dependencies {\n testImplementation(libs.test.truth)\n testImplementation(libs.test.turbine)\n testImplementation(projects.libraries.matrix.test)\n+ testImplementation(projects.libraries.oidc.impl)\n testImplementation(projects.libraries.permissions.test)\n testImplementation(projects.tests.testutils)\n testReleaseImplementation(libs.androidx.compose.ui.test.manifest)\ndiff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt\nindex 0af102a4038..13aac03de4a 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt\n+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt\n@@ -36,12 +36,7 @@ import dagger.assisted.AssistedInject\n import io.element.android.anvilannotations.ContributesNode\n import io.element.android.compound.theme.ElementTheme\n import io.element.android.features.login.api.LoginFlowType\n-import io.element.android.features.login.api.oidc.OidcAction\n-import io.element.android.features.login.api.oidc.OidcActionFlow\n import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource\n-import io.element.android.features.login.impl.oidc.CustomTabAvailabilityChecker\n-import io.element.android.features.login.impl.oidc.customtab.CustomTabHandler\n-import io.element.android.features.login.impl.oidc.webview.OidcNode\n import io.element.android.features.login.impl.qrcode.QrCodeLoginFlowNode\n import io.element.android.features.login.impl.screens.changeaccountprovider.ChangeAccountProviderNode\n import io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderNode\n@@ -56,6 +51,9 @@ import io.element.android.libraries.architecture.createNode\n import io.element.android.libraries.architecture.inputs\n import io.element.android.libraries.di.AppScope\n import io.element.android.libraries.matrix.api.auth.OidcDetails\n+import io.element.android.libraries.oidc.api.OidcAction\n+import io.element.android.libraries.oidc.api.OidcActionFlow\n+import io.element.android.libraries.oidc.api.OidcEntryPoint\n import kotlinx.coroutines.delay\n import kotlinx.coroutines.launch\n import kotlinx.parcelize.Parcelize\n@@ -64,11 +62,10 @@ import kotlinx.parcelize.Parcelize\n class LoginFlowNode @AssistedInject constructor(\n @Assisted buildContext: BuildContext,\n @Assisted plugins: List,\n- private val customTabAvailabilityChecker: CustomTabAvailabilityChecker,\n- private val customTabHandler: CustomTabHandler,\n private val accountProviderDataSource: AccountProviderDataSource,\n private val defaultLoginUserStory: DefaultLoginUserStory,\n private val oidcActionFlow: OidcActionFlow,\n+ private val oidcEntryPoint: OidcEntryPoint,\n ) : BaseFlowNode(\n backstack = BackStack(\n initialElement = NavTarget.Root,\n@@ -146,11 +143,11 @@ class LoginFlowNode @AssistedInject constructor(\n )\n val callback = object : ConfirmAccountProviderNode.Callback {\n override fun onOidcDetails(oidcDetails: OidcDetails) {\n- if (customTabAvailabilityChecker.supportCustomTab()) {\n+ if (oidcEntryPoint.canUseCustomTab()) {\n // In this case open a Chrome Custom tab\n activity?.let {\n customChromeTabStarted = true\n- customTabHandler.open(it, darkTheme, oidcDetails.url)\n+ oidcEntryPoint.openUrlInCustomTab(it, darkTheme, oidcDetails.url)\n }\n } else {\n // Fallback to WebView mode\n@@ -201,8 +198,7 @@ class LoginFlowNode @AssistedInject constructor(\n createNode(buildContext, plugins = listOf(callback))\n }\n is NavTarget.OidcView -> {\n- val input = OidcNode.Inputs(navTarget.oidcDetails)\n- createNode(buildContext, plugins = listOf(input))\n+ oidcEntryPoint.createFallbackWebViewNode(this, buildContext, navTarget.oidcDetails.url)\n }\n is NavTarget.WaitList -> {\n val inputs = WaitListNode.Inputs(\ndiff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt\nindex 27aec75739f..fdf7994d7eb 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt\n+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt\n@@ -27,15 +27,15 @@ import androidx.compose.runtime.rememberCoroutineScope\n import dagger.assisted.Assisted\n import dagger.assisted.AssistedFactory\n import dagger.assisted.AssistedInject\n-import io.element.android.features.login.api.oidc.OidcAction\n import io.element.android.features.login.impl.DefaultLoginUserStory\n import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource\n import io.element.android.features.login.impl.error.ChangeServerError\n-import io.element.android.features.login.impl.oidc.customtab.DefaultOidcActionFlow\n import io.element.android.libraries.architecture.AsyncData\n import io.element.android.libraries.architecture.Presenter\n import io.element.android.libraries.architecture.runCatchingUpdatingState\n import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService\n+import io.element.android.libraries.oidc.api.OidcAction\n+import io.element.android.libraries.oidc.api.OidcActionFlow\n import kotlinx.coroutines.CoroutineScope\n import kotlinx.coroutines.launch\n \n@@ -43,7 +43,7 @@ class ConfirmAccountProviderPresenter @AssistedInject constructor(\n @Assisted private val params: Params,\n private val accountProviderDataSource: AccountProviderDataSource,\n private val authenticationService: MatrixAuthenticationService,\n- private val defaultOidcActionFlow: DefaultOidcActionFlow,\n+ private val oidcActionFlow: OidcActionFlow,\n private val defaultLoginUserStory: DefaultLoginUserStory,\n ) : Presenter {\n data class Params(\n@@ -65,7 +65,7 @@ class ConfirmAccountProviderPresenter @AssistedInject constructor(\n }\n \n LaunchedEffect(Unit) {\n- defaultOidcActionFlow.collect { oidcAction ->\n+ oidcActionFlow.collect { oidcAction ->\n if (oidcAction != null) {\n onOidcAction(oidcAction, loginFlowAction)\n }\n@@ -133,6 +133,6 @@ class ConfirmAccountProviderPresenter @AssistedInject constructor(\n }\n }\n }\n- defaultOidcActionFlow.reset()\n+ oidcActionFlow.reset()\n }\n }\ndiff --git a/features/securebackup/api/src/main/kotlin/io/element/android/features/securebackup/api/SecureBackupEntryPoint.kt b/features/securebackup/api/src/main/kotlin/io/element/android/features/securebackup/api/SecureBackupEntryPoint.kt\nindex 45e3a75738f..416ecff1bc7 100644\n--- a/features/securebackup/api/src/main/kotlin/io/element/android/features/securebackup/api/SecureBackupEntryPoint.kt\n+++ b/features/securebackup/api/src/main/kotlin/io/element/android/features/securebackup/api/SecureBackupEntryPoint.kt\n@@ -34,6 +34,9 @@ interface SecureBackupEntryPoint : FeatureEntryPoint {\n \n @Parcelize\n data object CreateNewRecoveryKey : InitialTarget\n+\n+ @Parcelize\n+ data object ResetIdentity : InitialTarget\n }\n \n data class Params(val initialElement: InitialTarget) : NodeInputs\ndiff --git a/features/securebackup/impl/build.gradle.kts b/features/securebackup/impl/build.gradle.kts\nindex 41f3ba8942c..a2a2e04a5d8 100644\n--- a/features/securebackup/impl/build.gradle.kts\n+++ b/features/securebackup/impl/build.gradle.kts\n@@ -45,6 +45,7 @@ dependencies {\n implementation(projects.libraries.matrix.api)\n implementation(projects.libraries.matrixui)\n implementation(projects.libraries.designsystem)\n+ implementation(projects.libraries.oidc.api)\n implementation(projects.libraries.uiStrings)\n implementation(projects.libraries.testtags)\n api(libs.statemachine)\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt\nindex f54bfaee967..d741eb11a7e 100644\n--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt\n@@ -34,6 +34,7 @@ import io.element.android.features.securebackup.impl.createkey.CreateNewRecovery\n import io.element.android.features.securebackup.impl.disable.SecureBackupDisableNode\n import io.element.android.features.securebackup.impl.enable.SecureBackupEnableNode\n import io.element.android.features.securebackup.impl.enter.SecureBackupEnterRecoveryKeyNode\n+import io.element.android.features.securebackup.impl.reset.ResetIdentityFlowNode\n import io.element.android.features.securebackup.impl.root.SecureBackupRootNode\n import io.element.android.features.securebackup.impl.setup.SecureBackupSetupNode\n import io.element.android.libraries.architecture.BackstackView\n@@ -48,10 +49,11 @@ class SecureBackupFlowNode @AssistedInject constructor(\n @Assisted plugins: List,\n ) : BaseFlowNode(\n backstack = BackStack(\n- initialElement = when (plugins.filterIsInstance(SecureBackupEntryPoint.Params::class.java).first().initialElement) {\n+ initialElement = when (plugins.filterIsInstance().first().initialElement) {\n SecureBackupEntryPoint.InitialTarget.Root -> NavTarget.Root\n SecureBackupEntryPoint.InitialTarget.EnterRecoveryKey -> NavTarget.EnterRecoveryKey\n SecureBackupEntryPoint.InitialTarget.CreateNewRecoveryKey -> NavTarget.CreateNewRecoveryKey\n+ is SecureBackupEntryPoint.InitialTarget.ResetIdentity -> NavTarget.ResetIdentity\n },\n savedStateMap = buildContext.savedStateMap,\n ),\n@@ -79,6 +81,9 @@ class SecureBackupFlowNode @AssistedInject constructor(\n \n @Parcelize\n data object CreateNewRecoveryKey : NavTarget\n+\n+ @Parcelize\n+ data object ResetIdentity : NavTarget\n }\n \n private val callbacks = plugins()\n@@ -146,6 +151,14 @@ class SecureBackupFlowNode @AssistedInject constructor(\n NavTarget.CreateNewRecoveryKey -> {\n createNode(buildContext)\n }\n+ is NavTarget.ResetIdentity -> {\n+ val callback = object : ResetIdentityFlowNode.Callback {\n+ override fun onDone() {\n+ callbacks.forEach { it.onDone() }\n+ }\n+ }\n+ createNode(buildContext, listOf(callback))\n+ }\n }\n }\n \ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManager.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManager.kt\nnew file mode 100644\nindex 00000000000..16850890a7f\n--- /dev/null\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManager.kt\n@@ -0,0 +1,79 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset\n+\n+import io.element.android.libraries.architecture.AsyncData\n+import io.element.android.libraries.di.annotations.SessionCoroutineScope\n+import io.element.android.libraries.matrix.api.MatrixClient\n+import io.element.android.libraries.matrix.api.encryption.IdentityResetHandle\n+import io.element.android.libraries.matrix.api.verification.SessionVerificationService\n+import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus\n+import kotlinx.coroutines.CoroutineScope\n+import kotlinx.coroutines.Job\n+import kotlinx.coroutines.flow.MutableStateFlow\n+import kotlinx.coroutines.flow.StateFlow\n+import kotlinx.coroutines.flow.filterIsInstance\n+import kotlinx.coroutines.flow.first\n+import kotlinx.coroutines.launch\n+import javax.inject.Inject\n+\n+class ResetIdentityFlowManager @Inject constructor(\n+ private val matrixClient: MatrixClient,\n+ @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,\n+ private val sessionVerificationService: SessionVerificationService,\n+) {\n+ private val resetHandleFlow: MutableStateFlow> = MutableStateFlow(AsyncData.Uninitialized)\n+ val currentHandleFlow: StateFlow> = resetHandleFlow\n+ private var whenResetIsDoneWaitingJob: Job? = null\n+\n+ fun whenResetIsDone(block: () -> Unit) {\n+ whenResetIsDoneWaitingJob = sessionCoroutineScope.launch {\n+ sessionVerificationService.sessionVerifiedStatus.filterIsInstance().first()\n+ block()\n+ }\n+ }\n+\n+ fun getResetHandle(): StateFlow> {\n+ return if (resetHandleFlow.value.isLoading() || resetHandleFlow.value.isSuccess()) {\n+ resetHandleFlow\n+ } else {\n+ resetHandleFlow.value = AsyncData.Loading()\n+\n+ sessionCoroutineScope.launch {\n+ matrixClient.encryptionService().startIdentityReset()\n+ .onSuccess { handle ->\n+ resetHandleFlow.value = if (handle != null) {\n+ AsyncData.Success(handle)\n+ } else {\n+ AsyncData.Failure(IllegalStateException(\"Could not get a reset identity handle\"))\n+ }\n+ }\n+ .onFailure { resetHandleFlow.value = AsyncData.Failure(it) }\n+ }\n+\n+ resetHandleFlow\n+ }\n+ }\n+\n+ suspend fun cancel() {\n+ currentHandleFlow.value.dataOrNull()?.cancel()\n+ resetHandleFlow.value = AsyncData.Uninitialized\n+\n+ whenResetIsDoneWaitingJob?.cancel()\n+ whenResetIsDoneWaitingJob = null\n+ }\n+}\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowNode.kt\nnew file mode 100644\nindex 00000000000..50dcc2dd12a\n--- /dev/null\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowNode.kt\n@@ -0,0 +1,180 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset\n+\n+import android.app.Activity\n+import android.os.Parcelable\n+import androidx.compose.runtime.Composable\n+import androidx.compose.runtime.collectAsState\n+import androidx.compose.runtime.getValue\n+import androidx.compose.ui.Modifier\n+import androidx.compose.ui.platform.LocalContext\n+import androidx.compose.ui.window.DialogProperties\n+import androidx.lifecycle.DefaultLifecycleObserver\n+import androidx.lifecycle.LifecycleOwner\n+import com.bumble.appyx.core.modality.BuildContext\n+import com.bumble.appyx.core.node.Node\n+import com.bumble.appyx.core.plugin.Plugin\n+import com.bumble.appyx.core.plugin.plugins\n+import com.bumble.appyx.navmodel.backstack.BackStack\n+import com.bumble.appyx.navmodel.backstack.operation.push\n+import dagger.assisted.Assisted\n+import dagger.assisted.AssistedInject\n+import io.element.android.anvilannotations.ContributesNode\n+import io.element.android.features.securebackup.impl.reset.password.ResetIdentityPasswordNode\n+import io.element.android.features.securebackup.impl.reset.root.ResetIdentityRootNode\n+import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab\n+import io.element.android.libraries.architecture.AsyncData\n+import io.element.android.libraries.architecture.BackstackView\n+import io.element.android.libraries.architecture.BaseFlowNode\n+import io.element.android.libraries.architecture.createNode\n+import io.element.android.libraries.designsystem.components.ProgressDialog\n+import io.element.android.libraries.di.SessionScope\n+import io.element.android.libraries.matrix.api.encryption.IdentityOidcResetHandle\n+import io.element.android.libraries.matrix.api.encryption.IdentityPasswordResetHandle\n+import io.element.android.libraries.oidc.api.OidcEntryPoint\n+import kotlinx.coroutines.CoroutineScope\n+import kotlinx.coroutines.Job\n+import kotlinx.coroutines.flow.collectLatest\n+import kotlinx.coroutines.launch\n+import kotlinx.parcelize.Parcelize\n+import timber.log.Timber\n+\n+@ContributesNode(SessionScope::class)\n+class ResetIdentityFlowNode @AssistedInject constructor(\n+ @Assisted buildContext: BuildContext,\n+ @Assisted plugins: List,\n+ private val resetIdentityFlowManager: ResetIdentityFlowManager,\n+ private val coroutineScope: CoroutineScope,\n+ private val oidcEntryPoint: OidcEntryPoint,\n+) : BaseFlowNode(\n+ backstack = BackStack(initialElement = NavTarget.Root, savedStateMap = buildContext.savedStateMap),\n+ buildContext = buildContext,\n+ plugins = plugins,\n+) {\n+ interface Callback : Plugin {\n+ fun onDone()\n+ }\n+\n+ sealed interface NavTarget : Parcelable {\n+ @Parcelize\n+ data object Root : NavTarget\n+\n+ @Parcelize\n+ data object ResetPassword : NavTarget\n+\n+ @Parcelize\n+ data class ResetOidc(val url: String) : NavTarget\n+ }\n+\n+ private lateinit var activity: Activity\n+ private var resetJob: Job? = null\n+\n+ override fun onBuilt() {\n+ super.onBuilt()\n+\n+ resetIdentityFlowManager.whenResetIsDone {\n+ plugins().forEach { it.onDone() }\n+ }\n+\n+ lifecycle.addObserver(object : DefaultLifecycleObserver {\n+ override fun onStart(owner: LifecycleOwner) {\n+ // If the custom tab was opened, we need to cancel the reset job\n+ // when we come back to the node if the reset wasn't successful\n+ cancelResetJob()\n+ }\n+\n+ override fun onDestroy(owner: LifecycleOwner) {\n+ // Make sure we cancel the reset job when the node is destroyed, just in case\n+ cancelResetJob()\n+ }\n+ })\n+ }\n+\n+ override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {\n+ return when (navTarget) {\n+ is NavTarget.Root -> {\n+ val callback = object : ResetIdentityRootNode.Callback {\n+ override fun onContinue() {\n+ coroutineScope.startReset()\n+ }\n+ }\n+ createNode(buildContext, listOf(callback))\n+ }\n+ is NavTarget.ResetPassword -> {\n+ val handle = resetIdentityFlowManager.currentHandleFlow.value.dataOrNull() as? IdentityPasswordResetHandle ?: error(\"No password handle found\")\n+ createNode(\n+ buildContext,\n+ listOf(ResetIdentityPasswordNode.Inputs(handle))\n+ )\n+ }\n+ is NavTarget.ResetOidc -> {\n+ oidcEntryPoint.createFallbackWebViewNode(this, buildContext, navTarget.url)\n+ }\n+ }\n+ }\n+\n+ private fun CoroutineScope.startReset() = launch {\n+ resetIdentityFlowManager.getResetHandle()\n+ .collectLatest { state ->\n+ when (state) {\n+ is AsyncData.Failure -> {\n+ cancelResetJob()\n+ Timber.e(state.error, \"Could not load the reset identity handle.\")\n+ }\n+ is AsyncData.Success -> {\n+ when (val handle = state.data) {\n+ is IdentityOidcResetHandle -> {\n+ if (oidcEntryPoint.canUseCustomTab()) {\n+ activity.openUrlInChromeCustomTab(null, false, handle.url)\n+ } else {\n+ backstack.push(NavTarget.ResetOidc(handle.url))\n+ }\n+ resetJob = launch { handle.resetOidc() }\n+ }\n+ is IdentityPasswordResetHandle -> backstack.push(NavTarget.ResetPassword)\n+ }\n+ }\n+ else -> Unit\n+ }\n+ }\n+ }\n+\n+ private fun cancelResetJob() {\n+ resetJob?.cancel()\n+ resetJob = null\n+ coroutineScope.launch { resetIdentityFlowManager.cancel() }\n+ }\n+\n+ @Composable\n+ override fun View(modifier: Modifier) {\n+ // Workaround to get the current activity\n+ if (!this::activity.isInitialized) {\n+ activity = LocalContext.current as Activity\n+ }\n+\n+ val startResetState by resetIdentityFlowManager.currentHandleFlow.collectAsState()\n+ if (startResetState.isLoading()) {\n+ ProgressDialog(\n+ properties = DialogProperties(dismissOnBackPress = true, dismissOnClickOutside = true),\n+ onDismissRequest = { cancelResetJob() }\n+ )\n+ }\n+\n+ BackstackView(modifier)\n+ }\n+}\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordEvent.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordEvent.kt\nnew file mode 100644\nindex 00000000000..b76dff920f1\n--- /dev/null\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordEvent.kt\n@@ -0,0 +1,22 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset.password\n+\n+sealed interface ResetIdentityPasswordEvent {\n+ data class Reset(val password: String) : ResetIdentityPasswordEvent\n+ data object DismissError : ResetIdentityPasswordEvent\n+}\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordNode.kt\nnew file mode 100644\nindex 00000000000..75d487d00e0\n--- /dev/null\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordNode.kt\n@@ -0,0 +1,54 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset.password\n+\n+import androidx.compose.runtime.Composable\n+import androidx.compose.ui.Modifier\n+import com.bumble.appyx.core.modality.BuildContext\n+import com.bumble.appyx.core.node.Node\n+import com.bumble.appyx.core.plugin.Plugin\n+import dagger.assisted.Assisted\n+import dagger.assisted.AssistedInject\n+import io.element.android.anvilannotations.ContributesNode\n+import io.element.android.libraries.architecture.NodeInputs\n+import io.element.android.libraries.architecture.inputs\n+import io.element.android.libraries.core.coroutine.CoroutineDispatchers\n+import io.element.android.libraries.di.SessionScope\n+import io.element.android.libraries.matrix.api.encryption.IdentityPasswordResetHandle\n+\n+@ContributesNode(SessionScope::class)\n+class ResetIdentityPasswordNode @AssistedInject constructor(\n+ @Assisted buildContext: BuildContext,\n+ @Assisted plugins: List,\n+ coroutineDispatchers: CoroutineDispatchers,\n+) : Node(buildContext, plugins = plugins) {\n+ data class Inputs(val handle: IdentityPasswordResetHandle) : NodeInputs\n+\n+ private val presenter = ResetIdentityPasswordPresenter(\n+ identityPasswordResetHandle = inputs().handle,\n+ dispatchers = coroutineDispatchers\n+ )\n+\n+ @Composable\n+ override fun View(modifier: Modifier) {\n+ val state = presenter.present()\n+ ResetIdentityPasswordView(\n+ state = state,\n+ onBack = ::navigateUp\n+ )\n+ }\n+}\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordPresenter.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordPresenter.kt\nnew file mode 100644\nindex 00000000000..baa8ab28449\n--- /dev/null\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordPresenter.kt\n@@ -0,0 +1,60 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset.password\n+\n+import androidx.compose.runtime.Composable\n+import androidx.compose.runtime.MutableState\n+import androidx.compose.runtime.mutableStateOf\n+import androidx.compose.runtime.remember\n+import androidx.compose.runtime.rememberCoroutineScope\n+import io.element.android.libraries.architecture.AsyncAction\n+import io.element.android.libraries.architecture.Presenter\n+import io.element.android.libraries.architecture.runCatchingUpdatingState\n+import io.element.android.libraries.core.coroutine.CoroutineDispatchers\n+import io.element.android.libraries.matrix.api.encryption.IdentityPasswordResetHandle\n+import kotlinx.coroutines.CoroutineScope\n+import kotlinx.coroutines.launch\n+\n+class ResetIdentityPasswordPresenter(\n+ private val identityPasswordResetHandle: IdentityPasswordResetHandle,\n+ private val dispatchers: CoroutineDispatchers,\n+) : Presenter {\n+ @Composable\n+ override fun present(): ResetIdentityPasswordState {\n+ val coroutineScope = rememberCoroutineScope()\n+\n+ val resetAction = remember { mutableStateOf>(AsyncAction.Uninitialized) }\n+\n+ fun handleEvent(event: ResetIdentityPasswordEvent) {\n+ when (event) {\n+ is ResetIdentityPasswordEvent.Reset -> coroutineScope.reset(event.password, resetAction)\n+ ResetIdentityPasswordEvent.DismissError -> resetAction.value = AsyncAction.Uninitialized\n+ }\n+ }\n+\n+ return ResetIdentityPasswordState(\n+ resetAction = resetAction.value,\n+ eventSink = ::handleEvent\n+ )\n+ }\n+\n+ private fun CoroutineScope.reset(password: String, action: MutableState>) = launch(dispatchers.io) {\n+ suspend {\n+ identityPasswordResetHandle.resetPassword(password).getOrThrow()\n+ }.runCatchingUpdatingState(action)\n+ }\n+}\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordState.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordState.kt\nnew file mode 100644\nindex 00000000000..47662b623e8\n--- /dev/null\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordState.kt\n@@ -0,0 +1,24 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset.password\n+\n+import io.element.android.libraries.architecture.AsyncAction\n+\n+data class ResetIdentityPasswordState(\n+ val resetAction: AsyncAction,\n+ val eventSink: (ResetIdentityPasswordEvent) -> Unit,\n+)\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordStateProvider.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordStateProvider.kt\nnew file mode 100644\nindex 00000000000..1a1e7684261\n--- /dev/null\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordStateProvider.kt\n@@ -0,0 +1,38 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset.password\n+\n+import androidx.compose.ui.tooling.preview.PreviewParameterProvider\n+import io.element.android.libraries.architecture.AsyncAction\n+\n+class ResetIdentityPasswordStateProvider : PreviewParameterProvider {\n+ override val values: Sequence\n+ get() = sequenceOf(\n+ aResetIdentityPasswordState(),\n+ aResetIdentityPasswordState(resetAction = AsyncAction.Loading),\n+ aResetIdentityPasswordState(resetAction = AsyncAction.Success(Unit)),\n+ aResetIdentityPasswordState(resetAction = AsyncAction.Failure(IllegalStateException(\"Failed\"))),\n+ )\n+}\n+\n+private fun aResetIdentityPasswordState(\n+ resetAction: AsyncAction = AsyncAction.Uninitialized,\n+ eventSink: (ResetIdentityPasswordEvent) -> Unit = {},\n+) = ResetIdentityPasswordState(\n+ resetAction = resetAction,\n+ eventSink = eventSink,\n+)\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordView.kt\nnew file mode 100644\nindex 00000000000..074752ddead\n--- /dev/null\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordView.kt\n@@ -0,0 +1,130 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset.password\n+\n+import androidx.compose.foundation.layout.fillMaxWidth\n+import androidx.compose.runtime.Composable\n+import androidx.compose.runtime.getValue\n+import androidx.compose.runtime.mutableStateOf\n+import androidx.compose.runtime.remember\n+import androidx.compose.runtime.setValue\n+import androidx.compose.ui.Modifier\n+import androidx.compose.ui.platform.LocalFocusManager\n+import androidx.compose.ui.res.stringResource\n+import androidx.compose.ui.text.input.PasswordVisualTransformation\n+import androidx.compose.ui.text.input.VisualTransformation\n+import androidx.compose.ui.tooling.preview.PreviewParameter\n+import io.element.android.compound.tokens.generated.CompoundIcons\n+import io.element.android.features.securebackup.impl.R\n+import io.element.android.libraries.designsystem.atomic.pages.FlowStepPage\n+import io.element.android.libraries.designsystem.components.BigIcon\n+import io.element.android.libraries.designsystem.components.ProgressDialog\n+import io.element.android.libraries.designsystem.components.form.textFieldState\n+import io.element.android.libraries.designsystem.preview.ElementPreview\n+import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n+import io.element.android.libraries.designsystem.theme.components.Button\n+import io.element.android.libraries.designsystem.theme.components.Icon\n+import io.element.android.libraries.designsystem.theme.components.IconButton\n+import io.element.android.libraries.designsystem.theme.components.OutlinedTextField\n+import io.element.android.libraries.designsystem.theme.components.Text\n+import io.element.android.libraries.designsystem.theme.components.onTabOrEnterKeyFocusNext\n+import io.element.android.libraries.ui.strings.CommonStrings\n+\n+@Composable\n+fun ResetIdentityPasswordView(\n+ state: ResetIdentityPasswordState,\n+ onBack: () -> Unit,\n+ modifier: Modifier = Modifier,\n+) {\n+ val passwordState = textFieldState(stateValue = \"\")\n+ FlowStepPage(\n+ modifier = modifier,\n+ iconStyle = BigIcon.Style.Default(CompoundIcons.LockSolid()),\n+ title = stringResource(R.string.screen_reset_encryption_password_title),\n+ subTitle = stringResource(R.string.screen_reset_encryption_password_subtitle),\n+ onBackClick = onBack,\n+ content = {\n+ Content(\n+ text = passwordState.value,\n+ onTextChange = { newText ->\n+ if (state.resetAction.isFailure()) {\n+ state.eventSink(ResetIdentityPasswordEvent.DismissError)\n+ }\n+ passwordState.value = newText\n+ },\n+ hasError = state.resetAction.isFailure(),\n+ )\n+ },\n+ buttons = {\n+ Button(\n+ modifier = Modifier.fillMaxWidth(),\n+ text = stringResource(CommonStrings.action_reset_identity),\n+ onClick = { state.eventSink(ResetIdentityPasswordEvent.Reset(passwordState.value)) },\n+ destructive = true,\n+ enabled = passwordState.value.isNotEmpty(),\n+ )\n+ }\n+ )\n+\n+ // On success we need to wait until the screen is automatically dismissed, so we keep the progress dialog\n+ if (state.resetAction.isLoading() || state.resetAction.isSuccess()) {\n+ ProgressDialog()\n+ }\n+}\n+\n+@Composable\n+private fun Content(text: String, onTextChange: (String) -> Unit, hasError: Boolean) {\n+ var showPassword by remember { mutableStateOf(false) }\n+ OutlinedTextField(\n+ modifier = Modifier\n+ .fillMaxWidth()\n+ .onTabOrEnterKeyFocusNext(LocalFocusManager.current),\n+ value = text,\n+ onValueChange = onTextChange,\n+ label = { Text(stringResource(CommonStrings.common_password)) },\n+ placeholder = { Text(stringResource(R.string.screen_reset_encryption_password_placeholder)) },\n+ singleLine = true,\n+ visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),\n+ trailingIcon = {\n+ val image =\n+ if (showPassword) CompoundIcons.VisibilityOn() else CompoundIcons.VisibilityOff()\n+ val description =\n+ if (showPassword) stringResource(CommonStrings.a11y_hide_password) else stringResource(CommonStrings.a11y_show_password)\n+\n+ IconButton(onClick = { showPassword = !showPassword }) {\n+ Icon(imageVector = image, description)\n+ }\n+ },\n+ isError = hasError,\n+ supportingText = if (hasError) {\n+ { Text(stringResource(R.string.screen_reset_encryption_password_error)) }\n+ } else {\n+ null\n+ }\n+ )\n+}\n+\n+@PreviewsDayNight\n+@Composable\n+internal fun ResetIdentityPasswordViewPreview(@PreviewParameter(ResetIdentityPasswordStateProvider::class) state: ResetIdentityPasswordState) {\n+ ElementPreview {\n+ ResetIdentityPasswordView(\n+ state = state,\n+ onBack = {}\n+ )\n+ }\n+}\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootEvent.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootEvent.kt\nnew file mode 100644\nindex 00000000000..a1ec4cbe826\n--- /dev/null\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootEvent.kt\n@@ -0,0 +1,22 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset.root\n+\n+sealed interface ResetIdentityRootEvent {\n+ data object Continue : ResetIdentityRootEvent\n+ data object DismissDialog : ResetIdentityRootEvent\n+}\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootNode.kt\nnew file mode 100644\nindex 00000000000..3dd9876fc0d\n--- /dev/null\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootNode.kt\n@@ -0,0 +1,51 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset.root\n+\n+import androidx.compose.runtime.Composable\n+import androidx.compose.ui.Modifier\n+import com.bumble.appyx.core.modality.BuildContext\n+import com.bumble.appyx.core.node.Node\n+import com.bumble.appyx.core.plugin.Plugin\n+import dagger.assisted.Assisted\n+import dagger.assisted.AssistedInject\n+import io.element.android.anvilannotations.ContributesNode\n+import io.element.android.libraries.di.SessionScope\n+\n+@ContributesNode(SessionScope::class)\n+class ResetIdentityRootNode @AssistedInject constructor(\n+ @Assisted buildContext: BuildContext,\n+ @Assisted plugins: List,\n+) : Node(buildContext, plugins = plugins) {\n+ interface Callback : Plugin {\n+ fun onContinue()\n+ }\n+\n+ private val presenter = ResetIdentityRootPresenter()\n+ private val callback: Callback = plugins.filterIsInstance().first()\n+\n+ @Composable\n+ override fun View(modifier: Modifier) {\n+ val state = presenter.present()\n+ ResetIdentityRootView(\n+ modifier = modifier,\n+ state = state,\n+ onContinue = callback::onContinue,\n+ onBack = ::navigateUp,\n+ )\n+ }\n+}\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenter.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenter.kt\nnew file mode 100644\nindex 00000000000..11c96e9ad8f\n--- /dev/null\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenter.kt\n@@ -0,0 +1,43 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset.root\n+\n+import androidx.compose.runtime.Composable\n+import androidx.compose.runtime.getValue\n+import androidx.compose.runtime.mutableStateOf\n+import androidx.compose.runtime.remember\n+import androidx.compose.runtime.setValue\n+import io.element.android.libraries.architecture.Presenter\n+\n+class ResetIdentityRootPresenter : Presenter {\n+ @Composable\n+ override fun present(): ResetIdentityRootState {\n+ var displayConfirmDialog by remember { mutableStateOf(false) }\n+\n+ fun handleEvent(event: ResetIdentityRootEvent) {\n+ displayConfirmDialog = when (event) {\n+ ResetIdentityRootEvent.Continue -> true\n+ ResetIdentityRootEvent.DismissDialog -> false\n+ }\n+ }\n+\n+ return ResetIdentityRootState(\n+ displayConfirmationDialog = displayConfirmDialog,\n+ eventSink = ::handleEvent\n+ )\n+ }\n+}\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootState.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootState.kt\nnew file mode 100644\nindex 00000000000..de1054c97f4\n--- /dev/null\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootState.kt\n@@ -0,0 +1,22 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset.root\n+\n+data class ResetIdentityRootState(\n+ val displayConfirmationDialog: Boolean,\n+ val eventSink: (ResetIdentityRootEvent) -> Unit,\n+)\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootStateProvider.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootStateProvider.kt\nnew file mode 100644\nindex 00000000000..8d780343fe3\n--- /dev/null\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootStateProvider.kt\n@@ -0,0 +1,33 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset.root\n+\n+import androidx.compose.ui.tooling.preview.PreviewParameterProvider\n+\n+class ResetIdentityRootStateProvider : PreviewParameterProvider {\n+ override val values: Sequence\n+ get() = sequenceOf(\n+ ResetIdentityRootState(\n+ displayConfirmationDialog = false,\n+ eventSink = {}\n+ ),\n+ ResetIdentityRootState(\n+ displayConfirmationDialog = true,\n+ eventSink = {}\n+ )\n+ )\n+}\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootView.kt\nnew file mode 100644\nindex 00000000000..9983f06b44e\n--- /dev/null\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootView.kt\n@@ -0,0 +1,152 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset.root\n+\n+import androidx.compose.foundation.layout.Arrangement\n+import androidx.compose.foundation.layout.Column\n+import androidx.compose.foundation.layout.fillMaxWidth\n+import androidx.compose.foundation.layout.padding\n+import androidx.compose.foundation.layout.size\n+import androidx.compose.runtime.Composable\n+import androidx.compose.ui.Modifier\n+import androidx.compose.ui.res.stringResource\n+import androidx.compose.ui.text.style.TextAlign\n+import androidx.compose.ui.tooling.preview.PreviewParameter\n+import androidx.compose.ui.unit.dp\n+import io.element.android.compound.theme.ElementTheme\n+import io.element.android.compound.tokens.generated.CompoundIcons\n+import io.element.android.features.securebackup.impl.R\n+import io.element.android.libraries.designsystem.atomic.organisms.InfoListItem\n+import io.element.android.libraries.designsystem.atomic.organisms.InfoListOrganism\n+import io.element.android.libraries.designsystem.atomic.pages.FlowStepPage\n+import io.element.android.libraries.designsystem.components.BigIcon\n+import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog\n+import io.element.android.libraries.designsystem.preview.ElementPreview\n+import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n+import io.element.android.libraries.designsystem.theme.components.Button\n+import io.element.android.libraries.designsystem.theme.components.Icon\n+import io.element.android.libraries.designsystem.theme.components.Text\n+import io.element.android.libraries.ui.strings.CommonStrings\n+import kotlinx.collections.immutable.persistentListOf\n+\n+@Composable\n+fun ResetIdentityRootView(\n+ state: ResetIdentityRootState,\n+ onContinue: () -> Unit,\n+ onBack: () -> Unit,\n+ modifier: Modifier = Modifier,\n+) {\n+ FlowStepPage(\n+ modifier = modifier,\n+ iconStyle = BigIcon.Style.AlertSolid,\n+ title = stringResource(R.string.screen_encryption_reset_title),\n+ subTitle = stringResource(R.string.screen_encryption_reset_subtitle),\n+ isScrollable = true,\n+ content = { Content() },\n+ buttons = {\n+ Button(\n+ modifier = Modifier.fillMaxWidth(),\n+ text = stringResource(id = CommonStrings.action_continue),\n+ onClick = { state.eventSink(ResetIdentityRootEvent.Continue) },\n+ destructive = true,\n+ )\n+ },\n+ onBackClick = onBack,\n+ )\n+\n+ if (state.displayConfirmationDialog) {\n+ ConfirmationDialog(\n+ title = stringResource(R.string.screen_reset_encryption_confirmation_alert_title),\n+ content = stringResource(R.string.screen_reset_encryption_confirmation_alert_subtitle),\n+ submitText = stringResource(R.string.screen_reset_encryption_confirmation_alert_action),\n+ onSubmitClick = {\n+ state.eventSink(ResetIdentityRootEvent.DismissDialog)\n+ onContinue()\n+ },\n+ destructiveSubmit = true,\n+ onDismiss = { state.eventSink(ResetIdentityRootEvent.DismissDialog) }\n+ )\n+ }\n+}\n+\n+@Composable\n+private fun Content() {\n+ Column(\n+ modifier = Modifier.padding(top = 8.dp, bottom = 40.dp),\n+ verticalArrangement = Arrangement.spacedBy(24.dp),\n+ ) {\n+ InfoListOrganism(\n+ modifier = Modifier.fillMaxWidth(),\n+ items = persistentListOf(\n+ InfoListItem(\n+ message = stringResource(R.string.screen_encryption_reset_bullet_1),\n+ iconComposable = {\n+ Icon(\n+ modifier = Modifier.size(20.dp),\n+ imageVector = CompoundIcons.Check(),\n+ contentDescription = null,\n+ tint = ElementTheme.colors.iconSuccessPrimary,\n+ )\n+ },\n+ ),\n+ InfoListItem(\n+ message = stringResource(R.string.screen_encryption_reset_bullet_2),\n+ iconComposable = {\n+ Icon(\n+ modifier = Modifier.size(20.dp),\n+ imageVector = CompoundIcons.Close(),\n+ contentDescription = null,\n+ tint = ElementTheme.colors.iconCriticalPrimary,\n+ )\n+ },\n+ ),\n+ InfoListItem(\n+ message = stringResource(R.string.screen_encryption_reset_bullet_3),\n+ iconComposable = {\n+ Icon(\n+ modifier = Modifier.size(20.dp),\n+ imageVector = CompoundIcons.Close(),\n+ contentDescription = null,\n+ tint = ElementTheme.colors.iconCriticalPrimary,\n+ )\n+ },\n+ ),\n+ ),\n+ backgroundColor = ElementTheme.colors.bgActionSecondaryHovered,\n+ )\n+\n+ Text(\n+ modifier = Modifier.fillMaxWidth(),\n+ text = stringResource(R.string.screen_encryption_reset_footer),\n+ style = ElementTheme.typography.fontBodyMdMedium,\n+ color = ElementTheme.colors.textActionPrimary,\n+ textAlign = TextAlign.Center,\n+ )\n+ }\n+}\n+\n+@PreviewsDayNight\n+@Composable\n+internal fun ResetIdentityRootViewPreview(@PreviewParameter(ResetIdentityRootStateProvider::class) state: ResetIdentityRootState) {\n+ ElementPreview {\n+ ResetIdentityRootView(\n+ state = state,\n+ onContinue = {},\n+ onBack = {},\n+ )\n+ }\n+}\ndiff --git a/features/securebackup/impl/src/main/res/values/localazy.xml b/features/securebackup/impl/src/main/res/values/localazy.xml\nindex e1159031a2d..85e801fce17 100644\n--- a/features/securebackup/impl/src/main/res/values/localazy.xml\n+++ b/features/securebackup/impl/src/main/res/values/localazy.xml\n@@ -16,6 +16,12 @@\n \"Follow the instructions to create a new recovery key\"\n \"Save your new recovery key in a password manager or encrypted note\"\n \"Reset the encryption for your account using another device\"\n+ \"Your account details, contacts, preferences, and chat list will be kept\"\n+ \"You will lose your existing message history\"\n+ \"You will need to verify all your existing devices and contacts again\"\n+ \"Only reset your identity if you don\u2019t have access to another signed-in device and you\u2019ve lost your recovery key.\"\n+ \"If you\u2019re not signed in to any other devices and you\u2019ve lost your recovery key, then you\u2019ll need to reset your identity to continue using the app. \"\n+ \"Reset your identity in case you can\u2019t confirm another way\"\n \"Turn off\"\n \"You will lose your encrypted messages if you are signed out of all devices.\"\n \"Are you sure you want to turn off backup?\"\n@@ -51,4 +57,11 @@\n \"Make sure you can store your recovery key somewhere safe\"\n \"Recovery setup successful\"\n \"Set up recovery\"\n+ \"Yes, reset now\"\n+ \"This process is irreversible.\"\n+ \"Are you sure you want to reset your encryption?\"\n+ \"An unknown error happened. Please check your account password is correct and try again.\"\n+ \"Enter\u2026\"\n+ \"Confirm that you want to reset your encryption.\"\n+ \"Enter your account password to continue\"\n \ndiff --git a/features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/VerifySessionEntryPoint.kt b/features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/VerifySessionEntryPoint.kt\nindex 8d19ca56989..deb5cdf2672 100644\n--- a/features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/VerifySessionEntryPoint.kt\n+++ b/features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/VerifySessionEntryPoint.kt\n@@ -31,6 +31,7 @@ interface VerifySessionEntryPoint : FeatureEntryPoint {\n \n interface Callback : Plugin {\n fun onEnterRecoveryKey()\n+ fun onResetKey()\n fun onDone()\n }\n }\ndiff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionNode.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionNode.kt\nindex 9ce13586831..0ed9524626f 100644\n--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionNode.kt\n+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionNode.kt\n@@ -43,6 +43,7 @@ class VerifySelfSessionNode @AssistedInject constructor(\n state = state,\n modifier = modifier,\n onEnterRecoveryKey = callback::onEnterRecoveryKey,\n+ onResetKey = callback::onResetKey,\n onFinish = callback::onDone,\n )\n }\ndiff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt\nindex 6b908e3ebd6..446114752e8 100644\n--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt\n+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt\n@@ -20,6 +20,7 @@ import androidx.activity.compose.BackHandler\n import androidx.compose.foundation.Image\n import androidx.compose.foundation.layout.Arrangement\n import androidx.compose.foundation.layout.Column\n+import androidx.compose.foundation.layout.ColumnScope\n import androidx.compose.foundation.layout.Row\n import androidx.compose.foundation.layout.Spacer\n import androidx.compose.foundation.layout.fillMaxHeight\n@@ -53,6 +54,7 @@ import io.element.android.libraries.designsystem.components.PageTitle\n import io.element.android.libraries.designsystem.preview.ElementPreview\n import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n import io.element.android.libraries.designsystem.theme.components.Button\n+import io.element.android.libraries.designsystem.theme.components.OutlinedButton\n import io.element.android.libraries.designsystem.theme.components.Text\n import io.element.android.libraries.designsystem.theme.components.TextButton\n import io.element.android.libraries.designsystem.theme.components.TopAppBar\n@@ -66,6 +68,7 @@ import io.element.android.features.verifysession.impl.VerifySelfSessionState.Ver\n fun VerifySelfSessionView(\n state: VerifySelfSessionState,\n onEnterRecoveryKey: () -> Unit,\n+ onResetKey: () -> Unit,\n onFinish: () -> Unit,\n modifier: Modifier = Modifier,\n ) {\n@@ -115,6 +118,7 @@ fun VerifySelfSessionView(\n goBack = ::resetFlow,\n onEnterRecoveryKey = onEnterRecoveryKey,\n onFinish = onFinish,\n+ onResetKey = onResetKey,\n )\n }\n ) {\n@@ -226,6 +230,7 @@ private fun EmojiItemView(emoji: VerificationEmoji, modifier: Modifier = Modifie\n private fun BottomMenu(\n screenState: VerifySelfSessionState,\n onEnterRecoveryKey: () -> Unit,\n+ onResetKey: () -> Unit,\n goBack: () -> Unit,\n onFinish: () -> Unit,\n ) {\n@@ -236,42 +241,72 @@ private fun BottomMenu(\n \n when (verificationViewState) {\n is FlowStep.Initial -> {\n- if (verificationViewState.isLastDevice) {\n- BottomMenu(\n- positiveButtonTitle = stringResource(R.string.screen_session_verification_enter_recovery_key),\n- onPositiveButtonClick = onEnterRecoveryKey,\n- )\n- } else {\n- BottomMenu(\n- positiveButtonTitle = stringResource(R.string.screen_identity_use_another_device),\n- onPositiveButtonClick = { eventSink(VerifySelfSessionViewEvents.RequestVerification) },\n- negativeButtonTitle = stringResource(R.string.screen_session_verification_enter_recovery_key),\n- onNegativeButtonClick = onEnterRecoveryKey,\n+ BottomMenu {\n+ if (verificationViewState.isLastDevice) {\n+ Button(\n+ modifier = Modifier.fillMaxWidth(),\n+ text = stringResource(R.string.screen_session_verification_enter_recovery_key),\n+ onClick = onEnterRecoveryKey,\n+ )\n+ } else {\n+ Button(\n+ modifier = Modifier.fillMaxWidth(),\n+ text = stringResource(R.string.screen_identity_use_another_device),\n+ onClick = { eventSink(VerifySelfSessionViewEvents.RequestVerification) },\n+ )\n+ OutlinedButton(\n+ modifier = Modifier.fillMaxWidth(),\n+ text = stringResource(R.string.screen_session_verification_enter_recovery_key),\n+ onClick = onEnterRecoveryKey,\n+ )\n+ }\n+ // This option should always be displayed\n+ TextButton(\n+ modifier = Modifier.fillMaxWidth(),\n+ text = stringResource(R.string.screen_identity_confirmation_cannot_confirm),\n+ onClick = onResetKey,\n )\n }\n }\n is FlowStep.Canceled -> {\n- BottomMenu(\n- positiveButtonTitle = stringResource(R.string.screen_session_verification_positive_button_canceled),\n- onPositiveButtonClick = { eventSink(VerifySelfSessionViewEvents.RequestVerification) },\n- negativeButtonTitle = stringResource(CommonStrings.action_cancel),\n- onNegativeButtonClick = goBack,\n- )\n+ BottomMenu {\n+ Button(\n+ modifier = Modifier.fillMaxWidth(),\n+ text = stringResource(R.string.screen_session_verification_positive_button_canceled),\n+ onClick = { eventSink(VerifySelfSessionViewEvents.RequestVerification) },\n+ )\n+ TextButton(\n+ modifier = Modifier.fillMaxWidth(),\n+ text = stringResource(CommonStrings.action_cancel),\n+ onClick = goBack,\n+ )\n+ }\n }\n is FlowStep.Ready -> {\n- BottomMenu(\n- positiveButtonTitle = stringResource(CommonStrings.action_start),\n- onPositiveButtonClick = { eventSink(VerifySelfSessionViewEvents.StartSasVerification) },\n- negativeButtonTitle = stringResource(CommonStrings.action_cancel),\n- onNegativeButtonClick = goBack,\n- )\n+ BottomMenu {\n+ Button(\n+ modifier = Modifier.fillMaxWidth(),\n+ text = stringResource(CommonStrings.action_start),\n+ onClick = { eventSink(VerifySelfSessionViewEvents.StartSasVerification) },\n+ )\n+ TextButton(\n+ modifier = Modifier.fillMaxWidth(),\n+ text = stringResource(CommonStrings.action_cancel),\n+ onClick = goBack,\n+ )\n+ }\n }\n is FlowStep.AwaitingOtherDeviceResponse -> {\n- BottomMenu(\n- positiveButtonTitle = stringResource(R.string.screen_identity_waiting_on_other_device),\n- onPositiveButtonClick = {},\n- isLoading = true,\n- )\n+ BottomMenu {\n+ Button(\n+ modifier = Modifier.fillMaxWidth(),\n+ text = stringResource(R.string.screen_identity_waiting_on_other_device),\n+ onClick = {},\n+ showProgress = true,\n+ )\n+ // Placeholder so the 1st button keeps its vertical position\n+ Spacer(modifier = Modifier.height(40.dp))\n+ }\n }\n is FlowStep.Verifying -> {\n val positiveButtonTitle = if (isVerifying) {\n@@ -279,23 +314,34 @@ private fun BottomMenu(\n } else {\n stringResource(R.string.screen_session_verification_they_match)\n }\n- BottomMenu(\n- positiveButtonTitle = positiveButtonTitle,\n- onPositiveButtonClick = {\n- if (!isVerifying) {\n- eventSink(VerifySelfSessionViewEvents.ConfirmVerification)\n- }\n- },\n- negativeButtonTitle = stringResource(R.string.screen_session_verification_they_dont_match),\n- onNegativeButtonClick = { eventSink(VerifySelfSessionViewEvents.DeclineVerification) },\n- isLoading = isVerifying,\n- )\n+ BottomMenu {\n+ Button(\n+ modifier = Modifier.fillMaxWidth(),\n+ text = positiveButtonTitle,\n+ showProgress = isVerifying,\n+ onClick = {\n+ if (!isVerifying) {\n+ eventSink(VerifySelfSessionViewEvents.ConfirmVerification)\n+ }\n+ },\n+ )\n+ TextButton(\n+ modifier = Modifier.fillMaxWidth(),\n+ text = stringResource(R.string.screen_session_verification_they_dont_match),\n+ onClick = { eventSink(VerifySelfSessionViewEvents.DeclineVerification) },\n+ )\n+ }\n }\n is FlowStep.Completed -> {\n- BottomMenu(\n- positiveButtonTitle = stringResource(CommonStrings.action_continue),\n- onPositiveButtonClick = onFinish,\n- )\n+ BottomMenu {\n+ Button(\n+ modifier = Modifier.fillMaxWidth(),\n+ text = stringResource(CommonStrings.action_continue),\n+ onClick = onFinish,\n+ )\n+ // Placeholder so the 1st button keeps its vertical position\n+ Spacer(modifier = Modifier.height(48.dp))\n+ }\n }\n is FlowStep.Skipped -> return\n }\n@@ -303,35 +349,13 @@ private fun BottomMenu(\n \n @Composable\n private fun BottomMenu(\n- positiveButtonTitle: String?,\n- onPositiveButtonClick: () -> Unit,\n modifier: Modifier = Modifier,\n- negativeButtonTitle: String? = null,\n- negativeButtonEnabled: Boolean = negativeButtonTitle != null,\n- onNegativeButtonClick: () -> Unit = {},\n- isLoading: Boolean = false,\n+ buttons: @Composable ColumnScope.() -> Unit,\n ) {\n ButtonColumnMolecule(\n modifier = modifier.padding(bottom = 16.dp)\n ) {\n- if (positiveButtonTitle != null) {\n- Button(\n- text = positiveButtonTitle,\n- showProgress = isLoading,\n- modifier = Modifier.fillMaxWidth(),\n- onClick = onPositiveButtonClick,\n- )\n- }\n- if (negativeButtonTitle != null) {\n- TextButton(\n- text = negativeButtonTitle,\n- modifier = Modifier.fillMaxWidth(),\n- onClick = onNegativeButtonClick,\n- enabled = negativeButtonEnabled,\n- )\n- } else {\n- Spacer(modifier = Modifier.height(48.dp))\n- }\n+ buttons()\n }\n }\n \n@@ -341,6 +365,7 @@ internal fun VerifySelfSessionViewPreview(@PreviewParameter(VerifySelfSessionSta\n VerifySelfSessionView(\n state = state,\n onEnterRecoveryKey = {},\n+ onResetKey = {},\n onFinish = {},\n )\n }\ndiff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ChromeCustomTab.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ChromeCustomTab.kt\nindex ec0d9662c7f..425133b797b 100644\n--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ChromeCustomTab.kt\n+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ChromeCustomTab.kt\n@@ -47,12 +47,19 @@ fun Activity.openUrlInChromeCustomTab(\n true -> CustomTabsIntent.COLOR_SCHEME_DARK\n }\n )\n+ .setShareIdentityEnabled(false)\n // Note: setting close button icon does not work\n // .setCloseButtonIcon(BitmapFactory.decodeResource(context.resources, R.drawable.ic_back_24dp))\n // .setStartAnimations(context, R.anim.enter_fade_in, R.anim.exit_fade_out)\n // .setExitAnimations(context, R.anim.enter_fade_in, R.anim.exit_fade_out)\n .apply { session?.let { setSession(it) } }\n .build()\n+ .apply {\n+ // Disable download button\n+ intent.putExtra(\"org.chromium.chrome.browser.customtabs.EXTRA_DISABLE_DOWNLOAD_BUTTON\", true)\n+ // Disable bookmark button\n+ intent.putExtra(\"org.chromium.chrome.browser.customtabs.EXTRA_DISABLE_START_BUTTON\", true)\n+ }\n .launchUrl(this, Uri.parse(url))\n } catch (activityNotFoundException: ActivityNotFoundException) {\n // TODO context.toast(R.string.error_no_external_application_found)\ndiff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EncryptionService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EncryptionService.kt\nindex f47487c6346..5afb81648ba 100644\n--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EncryptionService.kt\n+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EncryptionService.kt\n@@ -62,4 +62,52 @@ interface EncryptionService {\n * called the fingerprint of the device.\n */\n suspend fun deviceEd25519(): String?\n+\n+ /**\n+ * Starts the identity reset process. This will return a handle that can be used to reset the identity.\n+ */\n+ suspend fun startIdentityReset(): Result\n+}\n+\n+/**\n+ * A handle to reset the user's identity.\n+ */\n+interface IdentityResetHandle {\n+ /**\n+ * Cancel the reset process and drops the existing handle in the SDK.\n+ */\n+ suspend fun cancel()\n+}\n+\n+/**\n+ * A handle to reset the user's identity with a password login type.\n+ */\n+interface IdentityPasswordResetHandle : IdentityResetHandle {\n+ /**\n+ * Reset the password of the user.\n+ *\n+ * This method will block the coroutine it's running on and keep polling indefinitely until either the coroutine is cancelled, the [cancel] method is\n+ * called, or the identity is reset.\n+ *\n+ * @param password the current password, which will be validated before the process takes place.\n+ */\n+ suspend fun resetPassword(password: String): Result\n+}\n+\n+/**\n+ * A handle to reset the user's identity with an OIDC login type.\n+ */\n+interface IdentityOidcResetHandle : IdentityResetHandle {\n+ /**\n+ * The URL to open in a webview/custom tab to reset the identity.\n+ */\n+ val url: String\n+\n+ /**\n+ * Reset the identity using the OIDC flow.\n+ *\n+ * This method will block the coroutine it's running on and keep polling indefinitely until either the coroutine is cancelled, the [cancel] method is\n+ * called, or the identity is reset.\n+ */\n+ suspend fun resetOidc(): Result\n }\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt\nindex 68ab4a611e3..ae681b27719 100644\n--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt\n@@ -18,10 +18,12 @@ package io.element.android.libraries.matrix.impl.encryption\n \n import io.element.android.libraries.core.coroutine.CoroutineDispatchers\n import io.element.android.libraries.core.extensions.mapFailure\n+import io.element.android.libraries.matrix.api.core.SessionId\n import io.element.android.libraries.matrix.api.encryption.BackupState\n import io.element.android.libraries.matrix.api.encryption.BackupUploadState\n import io.element.android.libraries.matrix.api.encryption.EnableRecoveryProgress\n import io.element.android.libraries.matrix.api.encryption.EncryptionService\n+import io.element.android.libraries.matrix.api.encryption.IdentityResetHandle\n import io.element.android.libraries.matrix.api.encryption.RecoveryState\n import io.element.android.libraries.matrix.api.sync.SyncState\n import io.element.android.libraries.matrix.impl.sync.RustSyncService\n@@ -54,6 +56,7 @@ internal class RustEncryptionService(\n private val dispatchers: CoroutineDispatchers,\n ) : EncryptionService {\n private val service: Encryption = client.encryption()\n+ private val sessionId = SessionId(client.session().userId)\n \n private val enableRecoveryProgressMapper = EnableRecoveryProgressMapper()\n private val backupUploadStateMapper = BackupUploadStateMapper()\n@@ -198,4 +201,12 @@ internal class RustEncryptionService(\n override suspend fun deviceEd25519(): String? {\n return service.ed25519Key()\n }\n+\n+ override suspend fun startIdentityReset(): Result {\n+ return runCatching {\n+ service.resetIdentity()?.let { handle ->\n+ RustIdentityResetHandleFactory.create(sessionId, handle)\n+ }?.getOrNull()\n+ }\n+ }\n }\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustIdentityResetHandle.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustIdentityResetHandle.kt\nnew file mode 100644\nindex 00000000000..c4c20eb7d62\n--- /dev/null\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustIdentityResetHandle.kt\n@@ -0,0 +1,71 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.libraries.matrix.impl.encryption\n+\n+import io.element.android.libraries.matrix.api.core.UserId\n+import io.element.android.libraries.matrix.api.encryption.IdentityOidcResetHandle\n+import io.element.android.libraries.matrix.api.encryption.IdentityPasswordResetHandle\n+import io.element.android.libraries.matrix.api.encryption.IdentityResetHandle\n+import org.matrix.rustcomponents.sdk.AuthData\n+import org.matrix.rustcomponents.sdk.AuthDataPasswordDetails\n+import org.matrix.rustcomponents.sdk.CrossSigningResetAuthType\n+\n+object RustIdentityResetHandleFactory {\n+ fun create(\n+ userId: UserId,\n+ identityResetHandle: org.matrix.rustcomponents.sdk.IdentityResetHandle\n+ ): Result {\n+ return runCatching {\n+ when (val authType = identityResetHandle.authType()) {\n+ is CrossSigningResetAuthType.Oidc -> RustOidcIdentityResetHandle(identityResetHandle, authType.info.approvalUrl)\n+ // User interactive authentication (user + password)\n+ CrossSigningResetAuthType.Uiaa -> RustPasswordIdentityResetHandle(userId, identityResetHandle)\n+ }\n+ }\n+ }\n+}\n+\n+class RustPasswordIdentityResetHandle(\n+ private val userId: UserId,\n+ private val identityResetHandle: org.matrix.rustcomponents.sdk.IdentityResetHandle,\n+) : IdentityPasswordResetHandle {\n+ override suspend fun resetPassword(password: String): Result {\n+ return runCatching { identityResetHandle.reset(AuthData.Password(AuthDataPasswordDetails(userId.value, password))) }\n+ }\n+\n+ override suspend fun cancel() {\n+ identityResetHandle.cancelAndDestroy()\n+ }\n+}\n+\n+class RustOidcIdentityResetHandle(\n+ private val identityResetHandle: org.matrix.rustcomponents.sdk.IdentityResetHandle,\n+ override val url: String,\n+) : IdentityOidcResetHandle {\n+ override suspend fun resetOidc(): Result {\n+ return runCatching { identityResetHandle.reset(null) }\n+ }\n+\n+ override suspend fun cancel() {\n+ identityResetHandle.cancelAndDestroy()\n+ }\n+}\n+\n+private suspend fun org.matrix.rustcomponents.sdk.IdentityResetHandle.cancelAndDestroy() {\n+ cancel()\n+ destroy()\n+}\ndiff --git a/libraries/oidc/api/build.gradle.kts b/libraries/oidc/api/build.gradle.kts\nnew file mode 100644\nindex 00000000000..4e01547d2ca\n--- /dev/null\n+++ b/libraries/oidc/api/build.gradle.kts\n@@ -0,0 +1,27 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+plugins {\n+ id(\"io.element.android-library\")\n+ id(\"kotlin-parcelize\")\n+}\n+\n+android {\n+ namespace = \"io.element.android.libraries.oidc.api\"\n+}\n+\n+dependencies {\n+ implementation(projects.libraries.architecture)\n+}\ndiff --git a/features/login/api/src/main/kotlin/io/element/android/features/login/api/oidc/OidcAction.kt b/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcAction.kt\nsimilarity index 93%\nrename from features/login/api/src/main/kotlin/io/element/android/features/login/api/oidc/OidcAction.kt\nrename to libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcAction.kt\nindex 6d878728796..cc171599601 100644\n--- a/features/login/api/src/main/kotlin/io/element/android/features/login/api/oidc/OidcAction.kt\n+++ b/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcAction.kt\n@@ -14,7 +14,7 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.api.oidc\n+package io.element.android.libraries.oidc.api\n \n sealed interface OidcAction {\n data object GoBack : OidcAction\ndiff --git a/features/login/api/src/main/kotlin/io/element/android/features/login/api/oidc/OidcActionFlow.kt b/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcActionFlow.kt\nsimilarity index 79%\nrename from features/login/api/src/main/kotlin/io/element/android/features/login/api/oidc/OidcActionFlow.kt\nrename to libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcActionFlow.kt\nindex 004e7c8a51e..1fd67cfaf5b 100644\n--- a/features/login/api/src/main/kotlin/io/element/android/features/login/api/oidc/OidcActionFlow.kt\n+++ b/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcActionFlow.kt\n@@ -14,8 +14,12 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.api.oidc\n+package io.element.android.libraries.oidc.api\n+\n+import kotlinx.coroutines.flow.FlowCollector\n \n interface OidcActionFlow {\n fun post(oidcAction: OidcAction)\n+ suspend fun collect(collector: FlowCollector)\n+ fun reset()\n }\ndiff --git a/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcEntryPoint.kt b/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcEntryPoint.kt\nnew file mode 100644\nindex 00000000000..c00bf263aff\n--- /dev/null\n+++ b/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcEntryPoint.kt\n@@ -0,0 +1,27 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.libraries.oidc.api\n+\n+import android.app.Activity\n+import com.bumble.appyx.core.modality.BuildContext\n+import com.bumble.appyx.core.node.Node\n+\n+interface OidcEntryPoint {\n+ fun canUseCustomTab(): Boolean\n+ fun openUrlInCustomTab(activity: Activity, darkTheme: Boolean, url: String)\n+ fun createFallbackWebViewNode(parentNode: Node, buildContext: BuildContext, url: String): Node\n+}\ndiff --git a/features/login/api/src/main/kotlin/io/element/android/features/login/api/oidc/OidcIntentResolver.kt b/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcIntentResolver.kt\nsimilarity index 93%\nrename from features/login/api/src/main/kotlin/io/element/android/features/login/api/oidc/OidcIntentResolver.kt\nrename to libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcIntentResolver.kt\nindex a6ecf26fca9..77597fd4322 100644\n--- a/features/login/api/src/main/kotlin/io/element/android/features/login/api/oidc/OidcIntentResolver.kt\n+++ b/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcIntentResolver.kt\n@@ -14,7 +14,7 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.api.oidc\n+package io.element.android.libraries.oidc.api\n \n import android.content.Intent\n \ndiff --git a/libraries/oidc/impl/build.gradle.kts b/libraries/oidc/impl/build.gradle.kts\nnew file mode 100644\nindex 00000000000..db1cdf8d0a0\n--- /dev/null\n+++ b/libraries/oidc/impl/build.gradle.kts\n@@ -0,0 +1,63 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+plugins {\n+ id(\"io.element.android-compose-library\")\n+ alias(libs.plugins.anvil)\n+ id(\"kotlin-parcelize\")\n+ alias(libs.plugins.kotlin.serialization)\n+}\n+\n+android {\n+ namespace = \"io.element.android.libraries.oidc.impl\"\n+\n+ testOptions {\n+ unitTests {\n+ isIncludeAndroidResources = true\n+ }\n+ }\n+}\n+\n+anvil {\n+ generateDaggerFactories.set(true)\n+}\n+\n+dependencies {\n+ implementation(projects.anvilannotations)\n+ implementation(projects.appconfig)\n+ anvil(projects.anvilcodegen)\n+ implementation(projects.libraries.core)\n+ implementation(projects.libraries.androidutils)\n+ implementation(projects.libraries.architecture)\n+ implementation(projects.libraries.matrix.api)\n+ implementation(projects.libraries.designsystem)\n+ implementation(projects.libraries.uiStrings)\n+ implementation(libs.androidx.browser)\n+ implementation(platform(libs.network.retrofit.bom))\n+ implementation(libs.network.retrofit)\n+ implementation(libs.serialization.json)\n+ api(projects.libraries.oidc.api)\n+\n+ testImplementation(libs.test.junit)\n+ testImplementation(libs.androidx.test.ext.junit)\n+ testImplementation(libs.coroutines.test)\n+ testImplementation(libs.molecule.runtime)\n+ testImplementation(libs.test.truth)\n+ testImplementation(libs.test.turbine)\n+ testImplementation(projects.libraries.matrix.test)\n+ testImplementation(projects.libraries.permissions.test)\n+ testImplementation(projects.tests.testutils)\n+}\ndiff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/CustomTabAvailabilityChecker.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/CustomTabAvailabilityChecker.kt\nsimilarity index 95%\nrename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/CustomTabAvailabilityChecker.kt\nrename to libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/CustomTabAvailabilityChecker.kt\nindex 424e9f13bc2..6258e67b0ed 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/CustomTabAvailabilityChecker.kt\n+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/CustomTabAvailabilityChecker.kt\n@@ -14,7 +14,7 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.impl.oidc\n+package io.element.android.libraries.oidc.impl\n \n import android.content.Context\n import androidx.browser.customtabs.CustomTabsClient\ndiff --git a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcEntryPoint.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcEntryPoint.kt\nnew file mode 100644\nindex 00000000000..185c27bf19a\n--- /dev/null\n+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcEntryPoint.kt\n@@ -0,0 +1,49 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.libraries.oidc.impl\n+\n+import android.app.Activity\n+import com.bumble.appyx.core.modality.BuildContext\n+import com.bumble.appyx.core.node.Node\n+import com.squareup.anvil.annotations.ContributesBinding\n+import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab\n+import io.element.android.libraries.architecture.createNode\n+import io.element.android.libraries.di.AppScope\n+import io.element.android.libraries.matrix.api.auth.OidcDetails\n+import io.element.android.libraries.oidc.api.OidcEntryPoint\n+import io.element.android.libraries.oidc.impl.webview.OidcNode\n+import javax.inject.Inject\n+\n+@ContributesBinding(AppScope::class)\n+class DefaultOidcEntryPoint @Inject constructor(\n+ private val customTabAvailabilityChecker: CustomTabAvailabilityChecker,\n+) : OidcEntryPoint {\n+ override fun canUseCustomTab(): Boolean {\n+ return customTabAvailabilityChecker.supportCustomTab()\n+ }\n+\n+ override fun openUrlInCustomTab(activity: Activity, darkTheme: Boolean, url: String) {\n+ assert(canUseCustomTab()) { \"Custom tab is not supported in this device.\" }\n+ activity.openUrlInChromeCustomTab(null, darkTheme, url)\n+ }\n+\n+ override fun createFallbackWebViewNode(parentNode: Node, buildContext: BuildContext, url: String): Node {\n+ assert(!canUseCustomTab()) { \"Custom tab should be used instead of the fallback node.\" }\n+ val inputs = OidcNode.Inputs(OidcDetails(url))\n+ return parentNode.createNode(buildContext, listOf(inputs))\n+ }\n+}\ndiff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/DefaultOidcIntentResolver.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcIntentResolver.kt\nsimilarity index 85%\nrename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/DefaultOidcIntentResolver.kt\nrename to libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcIntentResolver.kt\nindex 8b6844e0f3d..9777cee22fe 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/DefaultOidcIntentResolver.kt\n+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcIntentResolver.kt\n@@ -14,13 +14,13 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.impl.oidc\n+package io.element.android.libraries.oidc.impl\n \n import android.content.Intent\n import com.squareup.anvil.annotations.ContributesBinding\n-import io.element.android.features.login.api.oidc.OidcAction\n-import io.element.android.features.login.api.oidc.OidcIntentResolver\n import io.element.android.libraries.di.AppScope\n+import io.element.android.libraries.oidc.api.OidcAction\n+import io.element.android.libraries.oidc.api.OidcIntentResolver\n import javax.inject.Inject\n \n @ContributesBinding(AppScope::class)\ndiff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/OidcUrlParser.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/OidcUrlParser.kt\nsimilarity index 93%\nrename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/OidcUrlParser.kt\nrename to libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/OidcUrlParser.kt\nindex 8c8c895acda..ae502d0a8cd 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/OidcUrlParser.kt\n+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/OidcUrlParser.kt\n@@ -14,10 +14,10 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.impl.oidc\n+package io.element.android.libraries.oidc.impl\n \n-import io.element.android.features.login.api.oidc.OidcAction\n import io.element.android.libraries.matrix.api.auth.OidcConfig\n+import io.element.android.libraries.oidc.api.OidcAction\n import javax.inject.Inject\n \n /**\ndiff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/customtab/CustomTabHandler.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/customtab/CustomTabHandler.kt\nsimilarity index 97%\nrename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/customtab/CustomTabHandler.kt\nrename to libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/customtab/CustomTabHandler.kt\nindex b83c0eb1acc..21c673145ed 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/customtab/CustomTabHandler.kt\n+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/customtab/CustomTabHandler.kt\n@@ -14,7 +14,7 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.impl.oidc.customtab\n+package io.element.android.libraries.oidc.impl.customtab\n \n import android.app.Activity\n import android.content.ComponentName\ndiff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/customtab/DefaultOidcActionFlow.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/customtab/DefaultOidcActionFlow.kt\nsimilarity index 82%\nrename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/customtab/DefaultOidcActionFlow.kt\nrename to libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/customtab/DefaultOidcActionFlow.kt\nindex 17dfa8418f7..0c0737b43e7 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/customtab/DefaultOidcActionFlow.kt\n+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/customtab/DefaultOidcActionFlow.kt\n@@ -14,13 +14,13 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.impl.oidc.customtab\n+package io.element.android.libraries.oidc.impl.customtab\n \n import com.squareup.anvil.annotations.ContributesBinding\n-import io.element.android.features.login.api.oidc.OidcAction\n-import io.element.android.features.login.api.oidc.OidcActionFlow\n import io.element.android.libraries.di.AppScope\n import io.element.android.libraries.di.SingleIn\n+import io.element.android.libraries.oidc.api.OidcAction\n+import io.element.android.libraries.oidc.api.OidcActionFlow\n import kotlinx.coroutines.flow.FlowCollector\n import kotlinx.coroutines.flow.MutableStateFlow\n import javax.inject.Inject\n@@ -34,11 +34,11 @@ class DefaultOidcActionFlow @Inject constructor() : OidcActionFlow {\n mutableStateFlow.value = oidcAction\n }\n \n- suspend fun collect(collector: FlowCollector) {\n+ override suspend fun collect(collector: FlowCollector) {\n mutableStateFlow.collect(collector)\n }\n \n- fun reset() {\n+ override fun reset() {\n mutableStateFlow.value = null\n }\n }\ndiff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcEvents.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcEvents.kt\nsimilarity index 86%\nrename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcEvents.kt\nrename to libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcEvents.kt\nindex 9d2f945e25b..602d50628a8 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcEvents.kt\n+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcEvents.kt\n@@ -14,9 +14,9 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.impl.oidc.webview\n+package io.element.android.libraries.oidc.impl.webview\n \n-import io.element.android.features.login.api.oidc.OidcAction\n+import io.element.android.libraries.oidc.api.OidcAction\n \n sealed interface OidcEvents {\n data object Cancel : OidcEvents\ndiff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcNode.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcNode.kt\nsimilarity index 96%\nrename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcNode.kt\nrename to libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcNode.kt\nindex 5cd7cf0c3b6..d31bdcd0320 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcNode.kt\n+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcNode.kt\n@@ -14,7 +14,7 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.impl.oidc.webview\n+package io.element.android.libraries.oidc.impl.webview\n \n import androidx.compose.runtime.Composable\n import androidx.compose.ui.Modifier\ndiff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcPresenter.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcPresenter.kt\nsimilarity index 96%\nrename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcPresenter.kt\nrename to libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcPresenter.kt\nindex 3f10ba256a7..5e886644f61 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcPresenter.kt\n+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcPresenter.kt\n@@ -14,7 +14,7 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.impl.oidc.webview\n+package io.element.android.libraries.oidc.impl.webview\n \n import androidx.compose.runtime.Composable\n import androidx.compose.runtime.getValue\n@@ -25,11 +25,11 @@ import androidx.compose.runtime.setValue\n import dagger.assisted.Assisted\n import dagger.assisted.AssistedFactory\n import dagger.assisted.AssistedInject\n-import io.element.android.features.login.api.oidc.OidcAction\n import io.element.android.libraries.architecture.AsyncAction\n import io.element.android.libraries.architecture.Presenter\n import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService\n import io.element.android.libraries.matrix.api.auth.OidcDetails\n+import io.element.android.libraries.oidc.api.OidcAction\n import kotlinx.coroutines.launch\n \n class OidcPresenter @AssistedInject constructor(\ndiff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcState.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcState.kt\nsimilarity index 93%\nrename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcState.kt\nrename to libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcState.kt\nindex dc4f26d51e6..8b1b01b03dd 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcState.kt\n+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcState.kt\n@@ -14,7 +14,7 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.impl.oidc.webview\n+package io.element.android.libraries.oidc.impl.webview\n \n import io.element.android.libraries.architecture.AsyncAction\n import io.element.android.libraries.matrix.api.auth.OidcDetails\ndiff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcStateProvider.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcStateProvider.kt\nsimilarity index 95%\nrename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcStateProvider.kt\nrename to libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcStateProvider.kt\nindex 5d446574628..7127c9160e9 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcStateProvider.kt\n+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcStateProvider.kt\n@@ -14,7 +14,7 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.impl.oidc.webview\n+package io.element.android.libraries.oidc.impl.webview\n \n import androidx.compose.ui.tooling.preview.PreviewParameterProvider\n import io.element.android.libraries.architecture.AsyncAction\ndiff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcView.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt\nsimilarity index 63%\nrename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcView.kt\nrename to libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt\nindex c07078cdff7..0ba9d4ea528 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcView.kt\n+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt\n@@ -14,32 +14,39 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.impl.oidc.webview\n+package io.element.android.libraries.oidc.impl.webview\n \n+import android.annotation.SuppressLint\n import android.webkit.WebView\n import androidx.activity.compose.BackHandler\n-import androidx.compose.foundation.layout.Box\n-import androidx.compose.foundation.layout.statusBarsPadding\n+import androidx.compose.foundation.layout.padding\n+import androidx.compose.material3.ExperimentalMaterial3Api\n import androidx.compose.runtime.Composable\n import androidx.compose.runtime.getValue\n import androidx.compose.runtime.mutableStateOf\n import androidx.compose.runtime.remember\n import androidx.compose.runtime.setValue\n import androidx.compose.ui.Modifier\n+import androidx.compose.ui.platform.LocalInspectionMode\n import androidx.compose.ui.tooling.preview.PreviewParameter\n import androidx.compose.ui.viewinterop.AndroidView\n-import io.element.android.features.login.impl.oidc.OidcUrlParser\n import io.element.android.libraries.core.bool.orFalse\n import io.element.android.libraries.designsystem.components.async.AsyncActionView\n+import io.element.android.libraries.designsystem.components.button.BackButton\n import io.element.android.libraries.designsystem.preview.ElementPreview\n import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n+import io.element.android.libraries.designsystem.theme.components.Scaffold\n+import io.element.android.libraries.designsystem.theme.components.TopAppBar\n+import io.element.android.libraries.oidc.impl.OidcUrlParser\n \n+@OptIn(ExperimentalMaterial3Api::class)\n @Composable\n fun OidcView(\n state: OidcState,\n onNavigateBack: () -> Unit,\n modifier: Modifier = Modifier,\n ) {\n+ val isPreview = LocalInspectionMode.current\n val oidcUrlParser = remember { OidcUrlParser() }\n var webView by remember { mutableStateOf(null) }\n fun shouldOverrideUrl(url: String): Boolean {\n@@ -55,7 +62,7 @@ fun OidcView(\n OidcWebViewClient(::shouldOverrideUrl)\n }\n \n- BackHandler {\n+ fun onBack() {\n if (webView?.canGoBack().orFalse()) {\n webView?.goBack()\n } else {\n@@ -64,12 +71,35 @@ fun OidcView(\n }\n }\n \n- Box(modifier = modifier.statusBarsPadding()) {\n+ BackHandler { onBack() }\n+\n+ Scaffold(\n+ modifier = modifier,\n+ topBar = {\n+ TopAppBar(\n+ title = {},\n+ navigationIcon = {\n+ BackButton(onClick = ::onBack)\n+ },\n+ )\n+ }\n+ ) { contentPadding ->\n AndroidView(\n+ modifier = Modifier.padding(contentPadding),\n factory = { context ->\n WebView(context).apply {\n- webViewClient = oidcWebViewClient\n- loadUrl(state.oidcDetails.url)\n+ if (!isPreview) {\n+ webViewClient = oidcWebViewClient\n+ settings.apply {\n+ @SuppressLint(\"SetJavaScriptEnabled\")\n+ javaScriptEnabled = true\n+ allowContentAccess = true\n+ allowFileAccess = true\n+ databaseEnabled = true\n+ domStorageEnabled = true\n+ }\n+ loadUrl(state.oidcDetails.url)\n+ }\n }.also {\n webView = it\n }\ndiff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcWebViewClient.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcWebViewClient.kt\nsimilarity index 95%\nrename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcWebViewClient.kt\nrename to libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcWebViewClient.kt\nindex a9cd576e6de..d20eabf00e4 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcWebViewClient.kt\n+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcWebViewClient.kt\n@@ -14,7 +14,7 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.impl.oidc.webview\n+package io.element.android.libraries.oidc.impl.webview\n \n import android.webkit.WebResourceRequest\n import android.webkit.WebView\ndiff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/WebViewEventListener.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/WebViewEventListener.kt\nsimilarity index 93%\nrename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/WebViewEventListener.kt\nrename to libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/WebViewEventListener.kt\nindex 446754aced7..8f587966bf3 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/WebViewEventListener.kt\n+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/WebViewEventListener.kt\n@@ -14,7 +14,7 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.impl.oidc.webview\n+package io.element.android.libraries.oidc.impl.webview\n \n fun interface WebViewEventListener {\n /**\ndiff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml\nindex ef997755dd8..730afa291e9 100644\n--- a/libraries/ui-strings/src/main/res/values/localazy.xml\n+++ b/libraries/ui-strings/src/main/res/values/localazy.xml\n@@ -268,12 +268,6 @@ Reason: %1$s.\"\n \"Hey, talk to me on %1$s: %2$s\"\n \"%1$s Android\"\n \"Rageshake to report bug\"\n- \"Your account details, contacts, preferences, and chat list will be kept\"\n- \"You will lose your existing message history\"\n- \"You will need to verify all your existing devices and contacts again\"\n- \"Only reset your identity if you don\u2019t have access to another signed-in device and you\u2019ve lost your recovery key.\"\n- \"If you\u2019re not signed in to any other devices and you\u2019ve lost your recovery key, then you\u2019ll need to reset your identity to continue using the app. \"\n- \"Reset your identity in case you can\u2019t confirm another way\"\n \"Failed selecting media, please try again.\"\n \"Failed processing media to upload, please try again.\"\n \"Failed uploading media, please try again.\"\n@@ -284,12 +278,6 @@ Reason: %1$s.\"\n \"%1$d Pinned messages\"\n \n \"Pinned messages\"\n- \"Yes, reset now\"\n- \"This process is irreversible.\"\n- \"Are you sure you want to reset your encryption?\"\n- \"Enter\u2026\"\n- \"Confirm that you want to reset your encryption.\"\n- \"Enter your account password to continue\"\n \"Pinned messages\"\n \"Failed processing media to upload, please try again.\"\n \"Could not retrieve user details\"\ndiff --git a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt\nindex 9fd82af4ae4..bd83d527ca6 100644\n--- a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt\n+++ b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt\n@@ -116,6 +116,7 @@ fun DependencyHandlerScope.allLibrariesImpl() {\n implementation(project(\":libraries:mediaviewer:impl\"))\n implementation(project(\":libraries:troubleshoot:impl\"))\n implementation(project(\":libraries:fullscreenintent:impl\"))\n+ implementation(project(\":libraries:oidc:impl\"))\n }\n \n fun DependencyHandlerScope.allServicesImpl() {\ndiff --git a/tools/localazy/config.json b/tools/localazy/config.json\nindex 47ef2c1c51f..82fb4f22777 100644\n--- a/tools/localazy/config.json\n+++ b/tools/localazy/config.json\n@@ -210,7 +210,10 @@\n \"screen_chat_backup_.*\",\n \"screen_key_backup_disable_.*\",\n \"screen_recovery_key_.*\",\n- \"screen_create_new_recovery_key_.*\"\n+ \"screen_create_new_recovery_key_.*\",\n+ \"screen_encryption_reset.*\",\n+ \"screen_reset_encryption.*\",\n+ \"screen\\\\.reset_encryption.*\"\n ]\n },\n {\n", "test_patch": "diff --git a/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt\nindex aa0fe9cbf12..8134c091f61 100644\n--- a/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt\n+++ b/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt\n@@ -21,9 +21,6 @@ import android.content.Intent\n import android.net.Uri\n import androidx.core.net.toUri\n import com.google.common.truth.Truth.assertThat\n-import io.element.android.features.login.api.oidc.OidcAction\n-import io.element.android.features.login.impl.oidc.DefaultOidcIntentResolver\n-import io.element.android.features.login.impl.oidc.OidcUrlParser\n import io.element.android.libraries.deeplink.DeepLinkCreator\n import io.element.android.libraries.deeplink.DeeplinkData\n import io.element.android.libraries.deeplink.DeeplinkParser\n@@ -33,6 +30,9 @@ import io.element.android.libraries.matrix.test.A_ROOM_ID\n import io.element.android.libraries.matrix.test.A_SESSION_ID\n import io.element.android.libraries.matrix.test.A_THREAD_ID\n import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser\n+import io.element.android.libraries.oidc.api.OidcAction\n+import io.element.android.libraries.oidc.impl.DefaultOidcIntentResolver\n+import io.element.android.libraries.oidc.impl.OidcUrlParser\n import io.element.android.tests.testutils.lambda.lambdaError\n import org.junit.Assert.assertThrows\n import org.junit.Test\ndiff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenterTest.kt\nindex 5a02797bdb3..3875a4b245b 100644\n--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenterTest.kt\n+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenterTest.kt\n@@ -20,10 +20,8 @@ import app.cash.molecule.RecompositionMode\n import app.cash.molecule.moleculeFlow\n import app.cash.turbine.test\n import com.google.common.truth.Truth.assertThat\n-import io.element.android.features.login.api.oidc.OidcAction\n import io.element.android.features.login.impl.DefaultLoginUserStory\n import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource\n-import io.element.android.features.login.impl.oidc.customtab.DefaultOidcActionFlow\n import io.element.android.features.login.impl.util.defaultAccountProvider\n import io.element.android.libraries.architecture.AsyncData\n import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService\n@@ -31,6 +29,8 @@ import io.element.android.libraries.matrix.test.A_HOMESERVER\n import io.element.android.libraries.matrix.test.A_HOMESERVER_OIDC\n import io.element.android.libraries.matrix.test.A_THROWABLE\n import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService\n+import io.element.android.libraries.oidc.api.OidcAction\n+import io.element.android.libraries.oidc.impl.customtab.DefaultOidcActionFlow\n import io.element.android.tests.testutils.WarmUpRule\n import io.element.android.tests.testutils.waitForPredicate\n import kotlinx.coroutines.test.runTest\n@@ -274,7 +274,7 @@ class ConfirmAccountProviderPresenterTest {\n params = params,\n accountProviderDataSource = accountProviderDataSource,\n authenticationService = matrixAuthenticationService,\n- defaultOidcActionFlow = defaultOidcActionFlow,\n+ oidcActionFlow = defaultOidcActionFlow,\n defaultLoginUserStory = defaultLoginUserStory,\n )\n }\ndiff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManagerTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManagerTest.kt\nnew file mode 100644\nindex 00000000000..eb33fe5c366\n--- /dev/null\n+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManagerTest.kt\n@@ -0,0 +1,148 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset\n+\n+import app.cash.turbine.test\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.architecture.AsyncData\n+import io.element.android.libraries.matrix.api.encryption.IdentityResetHandle\n+import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus\n+import io.element.android.libraries.matrix.test.FakeMatrixClient\n+import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService\n+import io.element.android.libraries.matrix.test.encryption.FakeIdentityPasswordResetHandle\n+import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService\n+import io.element.android.tests.testutils.lambda.lambdaRecorder\n+import kotlinx.coroutines.CoroutineScope\n+import kotlinx.coroutines.ExperimentalCoroutinesApi\n+import kotlinx.coroutines.test.TestScope\n+import kotlinx.coroutines.test.advanceUntilIdle\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Test\n+\n+class ResetIdentityFlowManagerTest {\n+ @Test\n+ fun `getResetHandle - emits a reset handle`() = runTest {\n+ val startResetLambda = lambdaRecorder> { Result.success(FakeIdentityPasswordResetHandle()) }\n+ val encryptionService = FakeEncryptionService(startIdentityResetLambda = startResetLambda)\n+ val flowManager = createFlowManager(encryptionService = encryptionService)\n+\n+ flowManager.getResetHandle().test {\n+ assertThat(awaitItem().isLoading()).isTrue()\n+ assertThat(awaitItem().isSuccess()).isTrue()\n+ startResetLambda.assertions().isCalledOnce()\n+ }\n+ }\n+\n+ @Test\n+ fun `getResetHandle - om successful handle retrieval returns that same handle`() = runTest {\n+ val startResetLambda = lambdaRecorder> { Result.success(FakeIdentityPasswordResetHandle()) }\n+ val encryptionService = FakeEncryptionService(startIdentityResetLambda = startResetLambda)\n+ val flowManager = createFlowManager(encryptionService = encryptionService)\n+\n+ var result: AsyncData.Success? = null\n+ flowManager.getResetHandle().test {\n+ assertThat(awaitItem().isLoading()).isTrue()\n+ result = awaitItem() as? AsyncData.Success\n+ assertThat(result).isNotNull()\n+ }\n+\n+ flowManager.getResetHandle().test {\n+ assertThat(awaitItem()).isSameInstanceAs(result)\n+ }\n+ }\n+\n+ @Test\n+ fun `getResetHandle - will fail if it receives a null reset handle`() = runTest {\n+ val startResetLambda = lambdaRecorder> { Result.success(null) }\n+ val encryptionService = FakeEncryptionService(startIdentityResetLambda = startResetLambda)\n+ val flowManager = createFlowManager(encryptionService = encryptionService)\n+\n+ flowManager.getResetHandle().test {\n+ assertThat(awaitItem().isLoading()).isTrue()\n+ assertThat(awaitItem().isFailure()).isTrue()\n+ startResetLambda.assertions().isCalledOnce()\n+ }\n+ }\n+\n+ @Test\n+ fun `getResetHandle - fails gracefully when receiving an exception from the encryption service`() = runTest {\n+ val startResetLambda = lambdaRecorder> { Result.failure(IllegalStateException(\"Failure\")) }\n+ val encryptionService = FakeEncryptionService(startIdentityResetLambda = startResetLambda)\n+ val flowManager = createFlowManager(encryptionService = encryptionService)\n+\n+ flowManager.getResetHandle().test {\n+ assertThat(awaitItem().isLoading()).isTrue()\n+ assertThat(awaitItem().isFailure()).isTrue()\n+ startResetLambda.assertions().isCalledOnce()\n+ }\n+ }\n+\n+ @Test\n+ fun `cancel - resets the state and calls cancel on the reset handle`() = runTest {\n+ val cancelLambda = lambdaRecorder { }\n+ val resetHandle = FakeIdentityPasswordResetHandle(cancelLambda = cancelLambda)\n+ val startResetLambda = lambdaRecorder> { Result.success(resetHandle) }\n+ val encryptionService = FakeEncryptionService(startIdentityResetLambda = startResetLambda)\n+ val flowManager = createFlowManager(encryptionService = encryptionService)\n+\n+ flowManager.getResetHandle().test {\n+ assertThat(awaitItem().isLoading()).isTrue()\n+ assertThat(awaitItem().isSuccess()).isTrue()\n+\n+ flowManager.cancel()\n+ cancelLambda.assertions().isCalledOnce()\n+ assertThat(awaitItem().isUninitialized()).isTrue()\n+ }\n+ }\n+\n+ @OptIn(ExperimentalCoroutinesApi::class)\n+ @Test\n+ fun `whenResetIsDone - will trigger the lambda when verification status is verified`() = runTest {\n+ val verificationService = FakeSessionVerificationService()\n+ val flowManager = createFlowManager(sessionVerificationService = verificationService)\n+ var isDone = false\n+\n+ flowManager.whenResetIsDone {\n+ isDone = true\n+ }\n+\n+ assertThat(isDone).isFalse()\n+\n+ verificationService.emitVerifiedStatus(SessionVerifiedStatus.Unknown)\n+ advanceUntilIdle()\n+ assertThat(isDone).isFalse()\n+\n+ verificationService.emitVerifiedStatus(SessionVerifiedStatus.NotVerified)\n+ advanceUntilIdle()\n+ assertThat(isDone).isFalse()\n+\n+ verificationService.emitVerifiedStatus(SessionVerifiedStatus.Verified)\n+ advanceUntilIdle()\n+ assertThat(isDone).isTrue()\n+ }\n+\n+ private fun TestScope.createFlowManager(\n+ encryptionService: FakeEncryptionService = FakeEncryptionService(),\n+ client: FakeMatrixClient = FakeMatrixClient(encryptionService = encryptionService),\n+ sessionCoroutineScope: CoroutineScope = this,\n+ sessionVerificationService: FakeSessionVerificationService = FakeSessionVerificationService(),\n+ ) = ResetIdentityFlowManager(\n+ matrixClient = client,\n+ sessionCoroutineScope = sessionCoroutineScope,\n+ sessionVerificationService = sessionVerificationService,\n+ )\n+}\ndiff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordPresenterTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordPresenterTest.kt\nnew file mode 100644\nindex 00000000000..059983df3d2\n--- /dev/null\n+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordPresenterTest.kt\n@@ -0,0 +1,96 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset.password\n+\n+import app.cash.molecule.RecompositionMode\n+import app.cash.molecule.moleculeFlow\n+import app.cash.turbine.test\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.matrix.test.encryption.FakeIdentityPasswordResetHandle\n+import io.element.android.tests.testutils.lambda.lambdaRecorder\n+import io.element.android.tests.testutils.testCoroutineDispatchers\n+import kotlinx.coroutines.test.TestScope\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Test\n+\n+class ResetIdentityPasswordPresenterTest {\n+ @Test\n+ fun `present - initial state`() = runTest {\n+ val presenter = createPresenter()\n+ moleculeFlow(RecompositionMode.Immediate) {\n+ presenter.present()\n+ }.test {\n+ val initialState = awaitItem()\n+ assertThat(initialState.resetAction.isUninitialized()).isTrue()\n+ }\n+ }\n+\n+ @Test\n+ fun `present - Reset event succeeds`() = runTest {\n+ val resetLambda = lambdaRecorder> { _ -> Result.success(Unit) }\n+ val resetHandle = FakeIdentityPasswordResetHandle(resetPasswordLambda = resetLambda)\n+ val presenter = createPresenter(identityResetHandle = resetHandle)\n+ moleculeFlow(RecompositionMode.Immediate) {\n+ presenter.present()\n+ }.test {\n+ val initialState = awaitItem()\n+ initialState.eventSink(ResetIdentityPasswordEvent.Reset(\"password\"))\n+ assertThat(awaitItem().resetAction.isLoading()).isTrue()\n+ assertThat(awaitItem().resetAction.isSuccess()).isTrue()\n+ }\n+ }\n+\n+ @Test\n+ fun `present - Reset event can fail gracefully`() = runTest {\n+ val resetLambda = lambdaRecorder> { _ -> Result.failure(IllegalStateException(\"Failed\")) }\n+ val resetHandle = FakeIdentityPasswordResetHandle(resetPasswordLambda = resetLambda)\n+ val presenter = createPresenter(identityResetHandle = resetHandle)\n+ moleculeFlow(RecompositionMode.Immediate) {\n+ presenter.present()\n+ }.test {\n+ val initialState = awaitItem()\n+ initialState.eventSink(ResetIdentityPasswordEvent.Reset(\"password\"))\n+ assertThat(awaitItem().resetAction.isLoading()).isTrue()\n+ assertThat(awaitItem().resetAction.isFailure()).isTrue()\n+ }\n+ }\n+\n+ @Test\n+ fun `present - DismissError event resets the state`() = runTest {\n+ val resetLambda = lambdaRecorder> { _ -> Result.failure(IllegalStateException(\"Failed\")) }\n+ val resetHandle = FakeIdentityPasswordResetHandle(resetPasswordLambda = resetLambda)\n+ val presenter = createPresenter(identityResetHandle = resetHandle)\n+ moleculeFlow(RecompositionMode.Immediate) {\n+ presenter.present()\n+ }.test {\n+ val initialState = awaitItem()\n+ initialState.eventSink(ResetIdentityPasswordEvent.Reset(\"password\"))\n+ assertThat(awaitItem().resetAction.isLoading()).isTrue()\n+ assertThat(awaitItem().resetAction.isFailure()).isTrue()\n+\n+ initialState.eventSink(ResetIdentityPasswordEvent.DismissError)\n+ assertThat(awaitItem().resetAction.isUninitialized()).isTrue()\n+ }\n+ }\n+\n+ private fun TestScope.createPresenter(\n+ identityResetHandle: FakeIdentityPasswordResetHandle = FakeIdentityPasswordResetHandle(),\n+ ) = ResetIdentityPasswordPresenter(\n+ identityPasswordResetHandle = identityResetHandle,\n+ dispatchers = testCoroutineDispatchers(),\n+ )\n+}\ndiff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordViewTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordViewTest.kt\nnew file mode 100644\nindex 00000000000..2449146399c\n--- /dev/null\n+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordViewTest.kt\n@@ -0,0 +1,97 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset.password\n+\n+import androidx.activity.ComponentActivity\n+import androidx.compose.ui.test.junit4.AndroidComposeTestRule\n+import androidx.compose.ui.test.junit4.createAndroidComposeRule\n+import androidx.compose.ui.test.onNodeWithText\n+import androidx.compose.ui.test.performTextInput\n+import androidx.test.ext.junit.runners.AndroidJUnit4\n+import io.element.android.libraries.architecture.AsyncAction\n+import io.element.android.libraries.ui.strings.CommonStrings\n+import io.element.android.tests.testutils.EnsureNeverCalled\n+import io.element.android.tests.testutils.EventsRecorder\n+import io.element.android.tests.testutils.clickOn\n+import io.element.android.tests.testutils.ensureCalledOnce\n+import io.element.android.tests.testutils.pressBack\n+import io.element.android.tests.testutils.pressBackKey\n+import org.junit.Rule\n+import org.junit.Test\n+import org.junit.rules.TestRule\n+import org.junit.runner.RunWith\n+\n+@RunWith(AndroidJUnit4::class)\n+class ResetIdentityPasswordViewTest {\n+ @get:Rule\n+ val rule = createAndroidComposeRule()\n+\n+ @Test\n+ fun `pressing the back HW button invokes the expected callback`() {\n+ ensureCalledOnce {\n+ rule.setResetPasswordView(\n+ ResetIdentityPasswordState(resetAction = AsyncAction.Uninitialized, eventSink = {}),\n+ onBack = it,\n+ )\n+ rule.pressBackKey()\n+ }\n+ }\n+\n+ @Test\n+ fun `clicking on the back navigation button invokes the expected callback`() {\n+ ensureCalledOnce {\n+ rule.setResetPasswordView(\n+ ResetIdentityPasswordState(resetAction = AsyncAction.Uninitialized, eventSink = {}),\n+ onBack = it,\n+ )\n+ rule.pressBack()\n+ }\n+ }\n+\n+ @Test\n+ fun `clicking 'Reset identity' confirms the reset`() {\n+ val eventsRecorder = EventsRecorder()\n+ rule.setResetPasswordView(\n+ ResetIdentityPasswordState(resetAction = AsyncAction.Uninitialized, eventSink = eventsRecorder),\n+ )\n+ rule.onNodeWithText(\"Password\").performTextInput(\"A password\")\n+\n+ rule.clickOn(CommonStrings.action_reset_identity)\n+\n+ eventsRecorder.assertSingle(ResetIdentityPasswordEvent.Reset(\"A password\"))\n+ }\n+\n+ @Test\n+ fun `modifying the password dismisses the error state`() {\n+ val eventsRecorder = EventsRecorder()\n+ rule.setResetPasswordView(\n+ ResetIdentityPasswordState(resetAction = AsyncAction.Failure(IllegalStateException(\"A failure\")), eventSink = eventsRecorder),\n+ )\n+ rule.onNodeWithText(\"Password\").performTextInput(\"A password\")\n+\n+ eventsRecorder.assertSingle(ResetIdentityPasswordEvent.DismissError)\n+ }\n+}\n+\n+private fun AndroidComposeTestRule.setResetPasswordView(\n+ state: ResetIdentityPasswordState,\n+ onBack: () -> Unit = EnsureNeverCalled(),\n+) {\n+ setContent {\n+ ResetIdentityPasswordView(state = state, onBack = onBack)\n+ }\n+}\ndiff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenterTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenterTest.kt\nnew file mode 100644\nindex 00000000000..feb00bf4de5\n--- /dev/null\n+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenterTest.kt\n@@ -0,0 +1,65 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset.root\n+\n+import app.cash.molecule.RecompositionMode\n+import app.cash.molecule.moleculeFlow\n+import app.cash.turbine.test\n+import com.google.common.truth.Truth.assertThat\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Test\n+\n+class ResetIdentityRootPresenterTest {\n+ @Test\n+ fun `present - initial state`() = runTest {\n+ val presenter = ResetIdentityRootPresenter()\n+ moleculeFlow(RecompositionMode.Immediate) {\n+ presenter.present()\n+ }.test {\n+ val initialState = awaitItem()\n+ assertThat(initialState.displayConfirmationDialog).isFalse()\n+ }\n+ }\n+\n+ @Test\n+ fun `present - Continue event displays the confirmation dialog`() = runTest {\n+ val presenter = ResetIdentityRootPresenter()\n+ moleculeFlow(RecompositionMode.Immediate) {\n+ presenter.present()\n+ }.test {\n+ val initialState = awaitItem()\n+ initialState.eventSink(ResetIdentityRootEvent.Continue)\n+\n+ assertThat(awaitItem().displayConfirmationDialog).isTrue()\n+ }\n+ }\n+\n+ @Test\n+ fun `present - DismissDialog event hides the confirmation dialog`() = runTest {\n+ val presenter = ResetIdentityRootPresenter()\n+ moleculeFlow(RecompositionMode.Immediate) {\n+ presenter.present()\n+ }.test {\n+ val initialState = awaitItem()\n+ initialState.eventSink(ResetIdentityRootEvent.Continue)\n+ assertThat(awaitItem().displayConfirmationDialog).isTrue()\n+\n+ initialState.eventSink(ResetIdentityRootEvent.DismissDialog)\n+ assertThat(awaitItem().displayConfirmationDialog).isFalse()\n+ }\n+ }\n+}\ndiff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootViewTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootViewTest.kt\nnew file mode 100644\nindex 00000000000..da7f11ba42e\n--- /dev/null\n+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootViewTest.kt\n@@ -0,0 +1,108 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.features.securebackup.impl.reset.root\n+\n+import androidx.activity.ComponentActivity\n+import androidx.compose.ui.test.junit4.AndroidComposeTestRule\n+import androidx.compose.ui.test.junit4.createAndroidComposeRule\n+import androidx.test.ext.junit.runners.AndroidJUnit4\n+import io.element.android.features.securebackup.impl.R\n+import io.element.android.libraries.ui.strings.CommonStrings\n+import io.element.android.tests.testutils.EnsureNeverCalled\n+import io.element.android.tests.testutils.EventsRecorder\n+import io.element.android.tests.testutils.clickOn\n+import io.element.android.tests.testutils.ensureCalledOnce\n+import io.element.android.tests.testutils.pressBack\n+import io.element.android.tests.testutils.pressBackKey\n+import org.junit.Rule\n+import org.junit.Test\n+import org.junit.rules.TestRule\n+import org.junit.runner.RunWith\n+import org.robolectric.annotation.Config\n+\n+@RunWith(AndroidJUnit4::class)\n+class ResetIdentityRootViewTest {\n+ @get:Rule\n+ val rule = createAndroidComposeRule()\n+\n+ @Test\n+ fun `pressing the back HW button invokes the expected callback`() {\n+ ensureCalledOnce {\n+ rule.setResetRootView(\n+ ResetIdentityRootState(displayConfirmationDialog = false, eventSink = {}),\n+ onBack = it,\n+ )\n+ rule.pressBackKey()\n+ }\n+ }\n+\n+ @Test\n+ fun `clicking on the back navigation button invokes the expected callback`() {\n+ ensureCalledOnce {\n+ rule.setResetRootView(\n+ ResetIdentityRootState(displayConfirmationDialog = false, eventSink = {}),\n+ onBack = it,\n+ )\n+ rule.pressBack()\n+ }\n+ }\n+\n+ @Test\n+ @Config(qualifiers = \"h720dp\")\n+ fun `clicking Continue displays the confirmation dialog`() {\n+ val eventsRecorder = EventsRecorder()\n+ rule.setResetRootView(\n+ ResetIdentityRootState(displayConfirmationDialog = false, eventSink = eventsRecorder),\n+ )\n+\n+ rule.clickOn(CommonStrings.action_continue)\n+\n+ eventsRecorder.assertSingle(ResetIdentityRootEvent.Continue)\n+ }\n+\n+ @Test\n+ fun `clicking 'Yes, reset now' confirms the reset`() {\n+ ensureCalledOnce {\n+ rule.setResetRootView(\n+ ResetIdentityRootState(displayConfirmationDialog = true, eventSink = {}),\n+ onContinue = it,\n+ )\n+ rule.clickOn(R.string.screen_reset_encryption_confirmation_alert_action)\n+ }\n+ }\n+\n+ @Test\n+ fun `clicking Cancel dismisses the dialog`() {\n+ val eventsRecorder = EventsRecorder()\n+ rule.setResetRootView(\n+ ResetIdentityRootState(displayConfirmationDialog = true, eventSink = eventsRecorder),\n+ )\n+\n+ rule.clickOn(CommonStrings.action_cancel)\n+ eventsRecorder.assertSingle(ResetIdentityRootEvent.DismissDialog)\n+ }\n+}\n+\n+private fun AndroidComposeTestRule.setResetRootView(\n+ state: ResetIdentityRootState,\n+ onBack: () -> Unit = EnsureNeverCalled(),\n+ onContinue: () -> Unit = EnsureNeverCalled(),\n+) {\n+ setContent {\n+ ResetIdentityRootView(state = state, onContinue = onContinue, onBack = onBack)\n+ }\n+}\ndiff --git a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewTest.kt b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewTest.kt\nindex f19f3e1f298..7e5bf928e27 100644\n--- a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewTest.kt\n+++ b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewTest.kt\n@@ -217,12 +217,14 @@ class VerifySelfSessionViewTest {\n state: VerifySelfSessionState,\n onEnterRecoveryKey: () -> Unit = EnsureNeverCalled(),\n onFinished: () -> Unit = EnsureNeverCalled(),\n+ onResetKey: () -> Unit = EnsureNeverCalled(),\n ) {\n setContent {\n VerifySelfSessionView(\n state = state,\n onEnterRecoveryKey = onEnterRecoveryKey,\n onFinish = onFinished,\n+ onResetKey = onResetKey,\n )\n }\n }\ndiff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeEncryptionService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeEncryptionService.kt\nindex b864c69b0b2..82ab5e251f9 100644\n--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeEncryptionService.kt\n+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeEncryptionService.kt\n@@ -20,13 +20,17 @@ import io.element.android.libraries.matrix.api.encryption.BackupState\n import io.element.android.libraries.matrix.api.encryption.BackupUploadState\n import io.element.android.libraries.matrix.api.encryption.EnableRecoveryProgress\n import io.element.android.libraries.matrix.api.encryption.EncryptionService\n+import io.element.android.libraries.matrix.api.encryption.IdentityResetHandle\n import io.element.android.libraries.matrix.api.encryption.RecoveryState\n+import io.element.android.tests.testutils.lambda.lambdaError\n import io.element.android.tests.testutils.simulateLongTask\n import kotlinx.coroutines.flow.Flow\n import kotlinx.coroutines.flow.MutableStateFlow\n import kotlinx.coroutines.flow.flowOf\n \n-class FakeEncryptionService : EncryptionService {\n+class FakeEncryptionService(\n+ var startIdentityResetLambda: () -> Result = { lambdaError() },\n+) : EncryptionService {\n private var disableRecoveryFailure: Exception? = null\n override val backupStateStateFlow: MutableStateFlow = MutableStateFlow(BackupState.UNKNOWN)\n override val recoveryStateStateFlow: MutableStateFlow = MutableStateFlow(RecoveryState.UNKNOWN)\n@@ -118,6 +122,10 @@ class FakeEncryptionService : EncryptionService {\n enableRecoveryProgressStateFlow.emit(state)\n }\n \n+ override suspend fun startIdentityReset(): Result {\n+ return startIdentityResetLambda()\n+ }\n+\n companion object {\n const val FAKE_RECOVERY_KEY = \"fake\"\n }\ndiff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeIdentityResetHandle.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeIdentityResetHandle.kt\nnew file mode 100644\nindex 00000000000..69087163d28\n--- /dev/null\n+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeIdentityResetHandle.kt\n@@ -0,0 +1,47 @@\n+/*\n+ * Copyright (c) 2024 New Vector Ltd\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * https://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+\n+package io.element.android.libraries.matrix.test.encryption\n+\n+import io.element.android.libraries.matrix.api.encryption.IdentityOidcResetHandle\n+import io.element.android.libraries.matrix.api.encryption.IdentityPasswordResetHandle\n+\n+class FakeIdentityOidcResetHandle(\n+ override val url: String = \"\",\n+ var resetOidcLambda: () -> Result = { error(\"Not implemented\") },\n+ var cancelLambda: () -> Unit = { error(\"Not implemented\") },\n+) : IdentityOidcResetHandle {\n+ override suspend fun resetOidc(): Result {\n+ return resetOidcLambda()\n+ }\n+\n+ override suspend fun cancel() {\n+ cancelLambda()\n+ }\n+}\n+\n+class FakeIdentityPasswordResetHandle(\n+ var resetPasswordLambda: (String) -> Result = { _ -> error(\"Not implemented\") },\n+ var cancelLambda: () -> Unit = { error(\"Not implemented\") },\n+) : IdentityPasswordResetHandle {\n+ override suspend fun resetPassword(password: String): Result {\n+ return resetPasswordLambda(password)\n+ }\n+\n+ override suspend fun cancel() {\n+ cancelLambda()\n+ }\n+}\ndiff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/oidc/OidcUrlParserTest.kt b/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/OidcUrlParserTest.kt\nsimilarity index 94%\nrename from features/login/impl/src/test/kotlin/io/element/android/features/login/impl/oidc/OidcUrlParserTest.kt\nrename to libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/OidcUrlParserTest.kt\nindex 6f63673b234..895e416faa0 100644\n--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/oidc/OidcUrlParserTest.kt\n+++ b/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/OidcUrlParserTest.kt\n@@ -14,11 +14,11 @@\n * limitations under the License.\n */\n \n-package io.element.android.features.login.impl.oidc\n+package io.element.android.libraries.oidc.impl\n \n import com.google.common.truth.Truth.assertThat\n-import io.element.android.features.login.api.oidc.OidcAction\n import io.element.android.libraries.matrix.api.auth.OidcConfig\n+import io.element.android.libraries.oidc.api.OidcAction\n import org.junit.Assert\n import org.junit.Test\n \ndiff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/oidc/webview/OidcPresenterTest.kt b/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/webview/OidcPresenterTest.kt\nsimilarity index 97%\nrename from features/login/impl/src/test/kotlin/io/element/android/features/login/impl/oidc/webview/OidcPresenterTest.kt\nrename to libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/webview/OidcPresenterTest.kt\nindex 38d0506dd8d..994334d2e9a 100644\n--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/oidc/webview/OidcPresenterTest.kt\n+++ b/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/webview/OidcPresenterTest.kt\n@@ -16,17 +16,17 @@\n \n @file:OptIn(ExperimentalCoroutinesApi::class)\n \n-package io.element.android.features.login.impl.oidc.webview\n+package io.element.android.libraries.oidc.impl.webview\n \n import app.cash.molecule.RecompositionMode\n import app.cash.molecule.moleculeFlow\n import app.cash.turbine.test\n import com.google.common.truth.Truth.assertThat\n-import io.element.android.features.login.api.oidc.OidcAction\n import io.element.android.libraries.architecture.AsyncAction\n import io.element.android.libraries.matrix.test.A_THROWABLE\n import io.element.android.libraries.matrix.test.auth.A_OIDC_DATA\n import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService\n+import io.element.android.libraries.oidc.api.OidcAction\n import io.element.android.tests.testutils.WarmUpRule\n import kotlinx.coroutines.ExperimentalCoroutinesApi\n import kotlinx.coroutines.test.runTest\ndiff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.oidc.webview_OidcView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.oidc.webview_OidcView_Day_0_en.png\ndeleted file mode 100644\nindex 1022157a43f..00000000000\n--- a/tests/uitests/src/test/snapshots/images/features.login.impl.oidc.webview_OidcView_Day_0_en.png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:38b4c852a4bb957a10e24a72b70d7edd89a921983a9426592dc1fc53c1d54d99\n-size 5450\ndiff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.oidc.webview_OidcView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.oidc.webview_OidcView_Day_1_en.png\ndeleted file mode 100644\nindex 39071712f4e..00000000000\n--- a/tests/uitests/src/test/snapshots/images/features.login.impl.oidc.webview_OidcView_Day_1_en.png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:9cdc07cc74bf427e7ae0244b97543f65aecb6b2f8fee7958d18906d333b868b8\n-size 8848\ndiff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.oidc.webview_OidcView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.oidc.webview_OidcView_Night_0_en.png\ndeleted file mode 100644\nindex 15ff876cf4a..00000000000\n--- a/tests/uitests/src/test/snapshots/images/features.login.impl.oidc.webview_OidcView_Night_0_en.png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:a0c39aabac135aa3954ac881a43cc2bd79a2e357ec76f9aa46351b2985c17d73\n-size 5437\ndiff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.oidc.webview_OidcView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.oidc.webview_OidcView_Night_1_en.png\ndeleted file mode 100644\nindex f99c8e006d8..00000000000\n--- a/tests/uitests/src/test/snapshots/images/features.login.impl.oidc.webview_OidcView_Night_1_en.png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:c773553943c9728f1e80b6ca6491c9c8c50f9394f3bd1cb430abb24029a3f926\n-size 7791\ndiff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en.png\nnew file mode 100644\nindex 00000000000..a49af920d90\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:e09769c04ba21aba09eb0de5865f659ad092ba2e46a8b3933f95b1170b09d303\n+size 28540\ndiff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en.png\nnew file mode 100644\nindex 00000000000..4c6ae5f1496\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:3702ebe296d7a14e20b3d683fb79f6b2455064a8986ce48c870b5cfd68dc5933\n+size 27407\ndiff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en.png\nnew file mode 100644\nindex 00000000000..4c6ae5f1496\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:3702ebe296d7a14e20b3d683fb79f6b2455064a8986ce48c870b5cfd68dc5933\n+size 27407\ndiff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en.png\nnew file mode 100644\nindex 00000000000..1d5e048087b\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:b683ed9986e3fd139ee735e51a369322ba3652b2b8a578c05a61f26ee27898e0\n+size 39996\ndiff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en.png\nnew file mode 100644\nindex 00000000000..96ec36ca5ef\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:14d4ed02bb2f949c4cbba84933bbbfb0c550ad261695a371ef12e74a2dbd8812\n+size 27600\ndiff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en.png\nnew file mode 100644\nindex 00000000000..c4e2dae54bb\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:53f3dc9352250ba7495b6af312f3f370463291d29b76c40d4b3c340b77aa5712\n+size 25455\ndiff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en.png\nnew file mode 100644\nindex 00000000000..c4e2dae54bb\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:53f3dc9352250ba7495b6af312f3f370463291d29b76c40d4b3c340b77aa5712\n+size 25455\ndiff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en.png\nnew file mode 100644\nindex 00000000000..0fa0e6a5196\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:b380335d847fa37e5319541f46f341c5fe8016f3af48765cfe7537c59dd1f58a\n+size 38379\ndiff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en.png\nnew file mode 100644\nindex 00000000000..499713a15dd\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:e9b7a1e2d20171a78da4ce4f590372e1d84f9624c4d56a011e74f91105c09f36\n+size 79989\ndiff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en.png\nnew file mode 100644\nindex 00000000000..6bc0eec9c01\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:43f2eb2cb1f1b986b58d2614c892f2f7f15f1b696a656165ba1f8644f7759476\n+size 62679\ndiff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en.png\nnew file mode 100644\nindex 00000000000..8685aa5e425\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:c3c38d62929774fe6e6e003f656efbeec1f675b5dbb9994a917c4978f64d61a9\n+size 78280\ndiff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en.png\nnew file mode 100644\nindex 00000000000..e79557dae61\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:08e5a9d4e1bc45e9411b74c7277f34fa0ba8d46fdd1556b65b9c50cc78f1468e\n+size 60595\ndiff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Day_0_en.png\nindex b5f11147ba5..cf48a305b74 100644\n--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Day_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Day_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:45548cd4afaac73a72ab4738c099506eb9dead138e8e0cf5668a75c4948b81f6\n-size 26027\n+oid sha256:ee9c90a91ef8703c4878ea9314121ad8343dd3392c051e7e3e3079198a32ef99\n+size 30555\ndiff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Day_1_en.png\nindex a989b3b4748..bfef3aada5e 100644\n--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Day_1_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Day_1_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:88f3de0736a207057ce0e71fea632e5197874d93045e87443a957ef0da64b8bd\n-size 22760\n+oid sha256:a4b44b23029dd1ff76a082a29c0b39584a1e20c92795eb4815d632608abd2858\n+size 22702\ndiff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Day_7_en.png\nindex 4a5ee01fb81..a2d07ed6a45 100644\n--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Day_7_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Day_7_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:146a2a2439de11035332340ce27e622ff20b661d600fc2977d1f82deb81d0f21\n-size 24828\n+oid sha256:ce48c81c355317abd6b9de4600e86492c3acde2807ca3572e064b61abc06239c\n+size 29426\ndiff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Day_8_en.png\nindex a4cde41390f..69eb60569f7 100644\n--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Day_8_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Day_8_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:281e08f29d84da5c1e7c01d701bf5d8f415b6d80fb8a1298742d6e629314a7d8\n-size 21186\n+oid sha256:4d9810f3b326a05492c870ef22dbceec19112dba8beaa000066504cc96d1387a\n+size 23913\ndiff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Night_0_en.png\nindex 6ec093bbc87..31ba47d4a41 100644\n--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Night_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Night_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:bf610f5f758e65ae67836a2b40924e966a8add94fd00605c89ef75ddbd3bf22c\n-size 25324\n+oid sha256:453cab91aa056f3536c899354a2fb5de21519e7dce3d5675b1cbca702000e2c1\n+size 29602\ndiff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Night_1_en.png\nindex fddd555a334..89dcb3654d6 100644\n--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Night_1_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Night_1_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:d2ed85817f1d95d1259e07aa566ede6d40360a688e29c0c463378770dd091540\n-size 22003\n+oid sha256:f468a4a9140c4dc23ab3d394049f59b86f0ca2f332bee50abf8eaa0acce166b5\n+size 22030\ndiff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Night_7_en.png\nindex 130cf67cf45..39ce0ef07f8 100644\n--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Night_7_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Night_7_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:354c1daceebd169b35a6db0173c954a3425c534156fdc662edfba4d710f51a49\n-size 24155\n+oid sha256:c21120a08c871c7f64952c20be2c90b28590901f8e52893702775b6b2f176892\n+size 28524\ndiff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Night_8_en.png\nindex 4c87611adad..7d1bfb8eab2 100644\n--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Night_8_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl_VerifySelfSessionView_Night_8_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:5d6ce5c3b44127d5d661ac450ea2cf48617e81e4ae40dfb6d9a5cf89f3591800\n-size 20598\n+oid sha256:1e46ffc3c3679eb5490d01c34d02314bae5611a7b10fb3c758331a28ae78f065\n+size 23267\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.oidc.impl.webview_OidcView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.oidc.impl.webview_OidcView_Day_0_en.png\nnew file mode 100644\nindex 00000000000..785f56af7f5\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/libraries.oidc.impl.webview_OidcView_Day_0_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:154a56d848cc735efc25274052ce92b1a20bc8f80f75e91d0d4cfc7d488cd246\n+size 5874\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.oidc.impl.webview_OidcView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.oidc.impl.webview_OidcView_Day_1_en.png\nnew file mode 100644\nindex 00000000000..ae8924e66eb\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/libraries.oidc.impl.webview_OidcView_Day_1_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:0915d4781155524bece1db737050ceb78ef76128da39b339fd67dd4a2a4dd79d\n+size 9229\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.oidc.impl.webview_OidcView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.oidc.impl.webview_OidcView_Night_0_en.png\nnew file mode 100644\nindex 00000000000..c41c1c79218\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/libraries.oidc.impl.webview_OidcView_Night_0_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:2dd3462935091cfe022f0e6fc71b082eed7dab4769def13398a81a90f871b61a\n+size 5807\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.oidc.impl.webview_OidcView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.oidc.impl.webview_OidcView_Night_1_en.png\nnew file mode 100644\nindex 00000000000..98b81898ef9\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/libraries.oidc.impl.webview_OidcView_Night_1_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:b7cd23334c15b9039cbf0924a82703035b4498e67489418e5244cf2df576af9c\n+size 8111\n", "n2p_tests": {"io.element.android.features.securebackup.impl.reset.root.ResetIdentityRootPresenterTest.present - DismissDialog event hides the confirmation dialog": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.oidc.impl.webview.OidcPresenterTest.present - go back with failure": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.back key pressed - when awaiting response cancels the verification": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.appnav.intent.IntentResolverTest.test resolve invalid": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderPresenterTest.present - continue password login": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.root.ResetIdentityRootViewTest.clicking 'Yes, reset now' confirms the reset": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.clicking on 'Skip' emits the expected event": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.back key pressed - when verifying and not loading declines the verification": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.root.ResetIdentityRootViewTest.clicking Cancel dismisses the dialog": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.password.ResetIdentityPasswordPresenterTest.present - DismissError event resets the state": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.clicking on enter recovery key calls the expected callback": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.appnav.intent.IntentResolverTest.test incoming share multiple": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.oidc.impl.webview.OidcPresenterTest.present - login success": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.ResetIdentityFlowManagerTest.whenResetIsDone - will trigger the lambda when verification status is verified": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.root.ResetIdentityRootPresenterTest.present - initial state": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.ResetIdentityFlowManagerTest.getResetHandle - will fail if it receives a null reset handle": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.oidc.impl.webview.OidcPresenterTest.present - user cancels from webview": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderPresenterTest.present - continue oidc": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderPresenterTest.present - oidc - success with success": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.oidc.impl.webview.OidcPresenterTest.present - go back": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.appnav.intent.IntentResolverTest.test resolve external permalink, invalid action": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.root.ResetIdentityRootViewTest.clicking Continue displays the confirmation dialog": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.appnav.intent.IntentResolverTest.test resolve oidc go back": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.back key pressed - when ready to verify cancels the verification": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.root.ResetIdentityRootPresenterTest.present - Continue event displays the confirmation dialog": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.oidc.impl.OidcUrlParserTest.test cancel url": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderPresenterTest.present - oidc - cancel with failure": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderPresenterTest.present - oidc - success with failure": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.root.ResetIdentityRootViewTest.clicking on the back navigation button invokes the expected callback": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderPresenterTest.present - clear error": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.oidc.impl.OidcUrlParserTest.test empty url": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.back key pressed - when verifying and loading does nothing": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.oidc.impl.webview.OidcPresenterTest.present - login error": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.password.ResetIdentityPasswordViewTest.clicking on the back navigation button invokes the expected callback": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.password.ResetIdentityPasswordViewTest.clicking 'Reset identity' confirms the reset": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.ResetIdentityFlowManagerTest.cancel - resets the state and calls cancel on the reset handle": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.clicking on they match emits the expected event": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.appnav.intent.IntentResolverTest.test resolve navigation intent thread": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.password.ResetIdentityPasswordPresenterTest.present - Reset event can fail gracefully": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.back key pressed - on Completed step does nothing": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.oidc.impl.webview.OidcPresenterTest.present - initial state": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.password.ResetIdentityPasswordViewTest.modifying the password dismisses the error state": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.root.ResetIdentityRootViewTest.pressing the back HW button invokes the expected callback": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.appnav.intent.IntentResolverTest.test resolve navigation intent room": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.appnav.intent.IntentResolverTest.resolve launcher intent should return null": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.back key pressed - when canceled resets the flow": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.password.ResetIdentityPasswordPresenterTest.present - Reset event succeeds": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.ResetIdentityFlowManagerTest.getResetHandle - fails gracefully when receiving an exception from the encryption service": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.clicking on they do not match emits the expected event": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.on Skipped step - onFinished callback is called immediately": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.appnav.intent.IntentResolverTest.test resolve oidc invalid": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderPresenterTest.present - oidc - cancel with success": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.appnav.intent.IntentResolverTest.test resolve oidc success": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.appnav.intent.IntentResolverTest.test resolve external permalink": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.appnav.intent.IntentResolverTest.test resolve navigation intent root": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.appnav.intent.IntentResolverTest.test resolve external permalink, FallbackLink should be ignored": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.appnav.intent.IntentResolverTest.test incoming share simple": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.password.ResetIdentityPasswordViewTest.pressing the back HW button invokes the expected callback": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.ResetIdentityFlowManagerTest.getResetHandle - om successful handle retrieval returns that same handle": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.verifysession.impl.VerifySelfSessionViewTest.when flow is completed and the user clicks on the continue button, the expected callback is invoked": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.ResetIdentityFlowManagerTest.getResetHandle - emits a reset handle": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.oidc.impl.OidcUrlParserTest.test success url": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.securebackup.impl.reset.password.ResetIdentityPasswordPresenterTest.present - initial state": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderPresenterTest.present - submit fails": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.oidc.impl.OidcUrlParserTest.test regular url": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderPresenterTest.present - initial test": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.oidc.impl.OidcUrlParserTest.test unknown url": {"run": "NONE", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "element-hq__element-x-android-3633", "org": "element-hq", "repo": "element-x-android", "number": 3633, "state": "closed", "title": "QrCode intro screen: add subtitle and fix button wording #3632", "body": "\r\n \r\n## Content\r\n\r\n\r\nAdd subtitle and fix button wording.\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #3632 \r\n\r\n## Screenshots / GIFs\r\n\r\n\r\nSee recorded one\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Check that screenshot is updated and match the design at https://www.figma.com/design/pDlJZGBsri47FNTXMnEdXB/Compound-Android-Templates?node-id=41-10347&t=sOWqqbMWIr3wJpMn-4\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 23\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)\r\n- [ ] You've made a self review of your PR\r\n", "base": {"label": "element-hq:develop", "ref": "develop", "sha": "47dcdef6aad573dd12612c1815841d127b79c0e6"}, "resolved_issues": [{"number": 3632, "title": "[Task] Show a hint that QR code login is only available when the account provider supports.", "body": "Please see and discuss the details in the meta issue.\r\n"}], "lang": "kotlin", "problem_statement": "[Task] Show a hint that QR code login is only available when the account provider supports.\nPlease see and discuss the details in the meta issue.\r\n\n", "pull_url": "https://github.com/element-hq/element-x-android/pull/3633", "issue_urls": ["https://github.com/element-hq/element-x-android/issues/3632"], "test_command": "./gradlew :features:login:impl:testDebugUnitTest --tests \"io.element.android.features.login.impl.screens.qrcode.intro.QrCodeIntroViewTest\"", "fix_patch": "diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt\nindex a128884e408..0a2892d661a 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt\n+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt\n@@ -30,7 +30,6 @@ import io.element.android.libraries.designsystem.theme.components.Button\n import io.element.android.libraries.designsystem.theme.components.Icon\n import io.element.android.libraries.designsystem.utils.annotatedTextWithBold\n import io.element.android.libraries.permissions.api.PermissionsView\n-import io.element.android.libraries.ui.strings.CommonStrings\n import kotlinx.collections.immutable.persistentListOf\n \n @Composable\n@@ -51,6 +50,7 @@ fun QrCodeIntroView(\n onBackClick = onBackClick,\n iconStyle = BigIcon.Style.Default(CompoundIcons.Computer()),\n title = stringResource(id = R.string.screen_qr_code_login_initial_state_title, state.desktopAppName),\n+ subTitle = stringResource(id = R.string.screen_qr_code_login_initial_state_subtitle),\n content = { Content(state = state) },\n buttons = { Buttons(state = state) }\n )\n@@ -87,7 +87,7 @@ private fun ColumnScope.Buttons(\n state: QrCodeIntroState,\n ) {\n Button(\n- text = stringResource(id = CommonStrings.action_continue),\n+ text = stringResource(id = R.string.screen_qr_code_login_initial_state_button_title),\n modifier = Modifier.fillMaxWidth(),\n onClick = {\n state.eventSink.invoke(QrCodeIntroEvents.Continue)\ndiff --git a/features/login/impl/src/main/res/values/localazy.xml b/features/login/impl/src/main/res/values/localazy.xml\nindex a46b083d636..be01bd56d5e 100644\n--- a/features/login/impl/src/main/res/values/localazy.xml\n+++ b/features/login/impl/src/main/res/values/localazy.xml\n@@ -60,6 +60,7 @@ Try signing in manually, or scan the QR code with another device.\"\n \"Select %1$s\"\n \"\u201cLink new device\u201d\"\n \"Scan the QR code with this device\"\n+ \"Only available if your account provider supports it.\"\n \"Open %1$s on another device to get the QR code\"\n \"Use the QR code shown on the other device.\"\n \"Try again\"\n", "test_patch": "diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroViewTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroViewTest.kt\nindex 11762d502bc..2655624c0e8 100644\n--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroViewTest.kt\n+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroViewTest.kt\n@@ -11,7 +11,7 @@ import androidx.activity.ComponentActivity\n import androidx.compose.ui.test.junit4.AndroidComposeTestRule\n import androidx.compose.ui.test.junit4.createAndroidComposeRule\n import androidx.test.ext.junit.runners.AndroidJUnit4\n-import io.element.android.libraries.ui.strings.CommonStrings\n+import io.element.android.features.login.impl.R\n import io.element.android.tests.testutils.EnsureNeverCalled\n import io.element.android.tests.testutils.EventsRecorder\n import io.element.android.tests.testutils.clickOn\n@@ -61,12 +61,12 @@ class QrCodeIntroViewTest {\n }\n \n @Test\n- fun `on continue button clicked - emits the Continue event`() {\n+ fun `on submit button clicked - emits the Continue event`() {\n val eventRecorder = EventsRecorder()\n rule.setQrCodeIntroView(\n state = aQrCodeIntroState(eventSink = eventRecorder),\n )\n- rule.clickOn(CommonStrings.action_continue)\n+ rule.clickOn(R.string.screen_qr_code_login_initial_state_button_title)\n eventRecorder.assertSingle(QrCodeIntroEvents.Continue)\n }\n \ndiff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en.png\nindex 1517bc5b180..21ab27c511e 100644\n--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:c20777e79d65269c7e330c56bdd591ad771c97fb0fa8b74e18e45ffa8aa3525b\n-size 42436\n+oid sha256:021982f9575de9946f905c348f3be4cd12e58550fc2ba6f7e86d44f72c35a254\n+size 50081\ndiff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en.png\nindex 5873bdab62e..074ce8fb9ee 100644\n--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:b1a76c6c3e57652e16c3e5fa9168ea24cc16e55806ba972228397146fe0fdbb3\n-size 42356\n+oid sha256:2f30cfd5af7247c188851213b122e78e51bf38f0b8c94870776c081b4d69f9e0\n+size 48509\ndiff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en.png\nindex bdd1dcc323d..32c359384b5 100644\n--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:fab7adfa1fedf07847a39f374b1a0fb8c41b0a2d2862b9dc35cd26f1a30c8c32\n-size 41045\n+oid sha256:4b16db86e6aa5ba64d4f4539120d28588ce9e5daf3aef30b275d47f00ec55776\n+size 48634\ndiff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en.png\nindex f8d32fb22a7..de297410b0e 100644\n--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:b7bc76f3dc71082e683707659aad62e63965e0ceee5845d1a540c976513187ae\n-size 40079\n+oid sha256:ef3187936592091492d4d4d349954000722a8e764d9baa35ea987b49d5bd4b8a\n+size 46145\n", "n2p_tests": {"io.element.android.features.login.impl.screens.qrcode.intro.QrCodeIntroViewTest.on back button clicked - calls the expected callback": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.login.impl.screens.qrcode.intro.QrCodeIntroViewTest.when can continue - calls the expected callback": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.login.impl.screens.qrcode.intro.QrCodeIntroViewTest.on submit button clicked - emits the Continue event": {"run": "NONE", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {"io.element.android.features.login.impl.screens.qrcode.intro.QrCodeIntroViewTest.on back pressed - calls the expected callback": {"run": "PASS", "test": "FAIL", "fix": "PASS"}}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "element-hq__element-x-android-3918", "org": "element-hq", "repo": "element-x-android", "number": 3918, "state": "closed", "title": "Remove AttachmentsState and use the MessagesNavigator", "body": "Remove AttachmentsState and use the MessagesNavigator.\r\n\r\nClose #3910 \r\n\r\nLet the Node use the factories so that we have cleaner Presenter constructors.", "base": {"label": "element-hq:develop", "ref": "develop", "sha": "e8af711777c97d75a8e2de9c07f38f0c388b08fb"}, "resolved_issues": [{"number": 3910, "title": "Remove `AttachmentsState` and use the `MessagesNavigator`", "body": "To do once https://github.com/element-hq/element-x-android/pull/3902 has been merged."}], "lang": "kotlin", "problem_statement": "Remove `AttachmentsState` and use the `MessagesNavigator`\nTo do once https://github.com/element-hq/element-x-android/pull/3902 has been merged.\n", "pull_url": "https://github.com/element-hq/element-x-android/pull/3918", "issue_urls": ["https://github.com/element-hq/element-x-android/issues/3910"], "test_command": "./gradlew :features:messages:impl:testDebugUnitTest --tests \"io.element.android.features.messages.impl.timeline.TimelinePresenterTest\" --tests \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest\" --tests \"io.element.android.features.messages.impl.MessagesViewTest\" --tests \"io.element.android.features.messages.impl.MessagesPresenterTest\"", "fix_patch": "diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt\nindex 3eba997eea9..470d9da9c42 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt\n@@ -7,13 +7,16 @@\n \n package io.element.android.features.messages.impl\n \n+import io.element.android.features.messages.impl.attachments.Attachment\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.core.UserId\n import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo\n+import kotlinx.collections.immutable.ImmutableList\n \n interface MessagesNavigator {\n fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo)\n fun onForwardEventClick(eventId: EventId)\n fun onReportContentClick(eventId: EventId, senderId: UserId)\n fun onEditPollClick(eventId: EventId)\n+ fun onPreviewAttachment(attachments: ImmutableList)\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt\nindex 9fd823445f8..17985848537 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt\n@@ -30,7 +30,9 @@ import io.element.android.anvilannotations.ContributesNode\n import io.element.android.compound.theme.ElementTheme\n import io.element.android.features.messages.impl.attachments.Attachment\n import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvents\n+import io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenter\n import io.element.android.features.messages.impl.timeline.TimelineEvents\n+import io.element.android.features.messages.impl.timeline.TimelinePresenter\n import io.element.android.features.messages.impl.timeline.di.LocalTimelineItemPresenterFactories\n import io.element.android.features.messages.impl.timeline.di.TimelineItemPresenterFactories\n import io.element.android.features.messages.impl.timeline.model.TimelineItem\n@@ -60,12 +62,18 @@ class MessagesNode @AssistedInject constructor(\n @Assisted plugins: List,\n private val room: MatrixRoom,\n private val analyticsService: AnalyticsService,\n+ messageComposerPresenterFactory: MessageComposerPresenter.Factory,\n+ timelinePresenterFactory: TimelinePresenter.Factory,\n presenterFactory: MessagesPresenter.Factory,\n private val timelineItemPresenterFactories: TimelineItemPresenterFactories,\n private val mediaPlayer: MediaPlayer,\n private val permalinkParser: PermalinkParser,\n ) : Node(buildContext, plugins = plugins), MessagesNavigator {\n- private val presenter = presenterFactory.create(this)\n+ private val presenter = presenterFactory.create(\n+ navigator = this,\n+ composerPresenter = messageComposerPresenterFactory.create(this),\n+ timelinePresenter = timelinePresenterFactory.create(this),\n+ )\n private val callbacks = plugins()\n \n data class Inputs(val focusedEventId: EventId?) : NodeInputs\n@@ -114,10 +122,6 @@ class MessagesNode @AssistedInject constructor(\n .orFalse()\n }\n \n- private fun onPreviewAttachments(attachments: ImmutableList) {\n- callbacks.forEach { it.onPreviewAttachments(attachments) }\n- }\n-\n private fun onUserDataClick(userId: UserId) {\n callbacks.forEach { it.onUserDataClick(userId) }\n }\n@@ -178,6 +182,10 @@ class MessagesNode @AssistedInject constructor(\n callbacks.forEach { it.onEditPollClick(eventId) }\n }\n \n+ override fun onPreviewAttachment(attachments: ImmutableList) {\n+ callbacks.forEach { it.onPreviewAttachments(attachments) }\n+ }\n+\n private fun onViewAllPinnedMessagesClick() {\n callbacks.forEach { it.onViewAllPinnedEvents() }\n }\n@@ -213,7 +221,6 @@ class MessagesNode @AssistedInject constructor(\n onBackClick = this::navigateUp,\n onRoomDetailsClick = this::onRoomDetailsClick,\n onEventContentClick = this::onEventClick,\n- onPreviewAttachments = this::onPreviewAttachments,\n onUserDataClick = this::onUserDataClick,\n onLinkClick = { url -> onLinkClick(activity, isDark, url, state.timelineState.eventSink) },\n onSendLocationClick = this::onSendLocationClick,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt\nindex 49d3015c056..e39056ec9b7 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt\n@@ -37,7 +37,6 @@ import io.element.android.features.messages.impl.messagecomposer.MessageComposer\n import io.element.android.features.messages.impl.pinned.banner.PinnedMessagesBannerState\n import io.element.android.features.messages.impl.timeline.TimelineController\n import io.element.android.features.messages.impl.timeline.TimelineEvents\n-import io.element.android.features.messages.impl.timeline.TimelinePresenter\n import io.element.android.features.messages.impl.timeline.TimelineState\n import io.element.android.features.messages.impl.timeline.components.customreaction.CustomReactionState\n import io.element.android.features.messages.impl.timeline.components.reactionsummary.ReactionSummaryState\n@@ -89,12 +88,12 @@ import timber.log.Timber\n class MessagesPresenter @AssistedInject constructor(\n @Assisted private val navigator: MessagesNavigator,\n private val room: MatrixRoom,\n- private val composerPresenter: Presenter,\n+ @Assisted private val composerPresenter: Presenter,\n private val voiceMessageComposerPresenter: Presenter,\n- timelinePresenterFactory: TimelinePresenter.Factory,\n+ @Assisted private val timelinePresenter: Presenter,\n private val timelineProtectionPresenter: Presenter,\n private val identityChangeStatePresenter: Presenter,\n- private val actionListPresenterFactory: ActionListPresenter.Factory,\n+ actionListPresenterFactory: ActionListPresenter.Factory,\n private val customReactionPresenter: Presenter,\n private val reactionSummaryPresenter: Presenter,\n private val readReceiptBottomSheetPresenter: Presenter,\n@@ -111,12 +110,15 @@ class MessagesPresenter @AssistedInject constructor(\n private val permalinkParser: PermalinkParser,\n private val analyticsService: AnalyticsService,\n ) : Presenter {\n- private val timelinePresenter = timelinePresenterFactory.create(navigator = navigator)\n private val actionListPresenter = actionListPresenterFactory.create(TimelineItemActionPostProcessor.Default)\n \n @AssistedFactory\n interface Factory {\n- fun create(navigator: MessagesNavigator): MessagesPresenter\n+ fun create(\n+ navigator: MessagesNavigator,\n+ composerPresenter: Presenter,\n+ timelinePresenter: Presenter,\n+ ): MessagesPresenter\n }\n \n @Composable\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt\nindex 49cbac6268b..fa66e463bbc 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt\n@@ -32,10 +32,8 @@ import androidx.compose.material3.ExperimentalMaterial3Api\n import androidx.compose.material3.MaterialTheme\n import androidx.compose.runtime.Composable\n import androidx.compose.runtime.LaunchedEffect\n-import androidx.compose.runtime.getValue\n import androidx.compose.runtime.mutableIntStateOf\n import androidx.compose.runtime.remember\n-import androidx.compose.runtime.rememberUpdatedState\n import androidx.compose.ui.Alignment\n import androidx.compose.ui.Modifier\n import androidx.compose.ui.draw.clip\n@@ -55,10 +53,8 @@ import io.element.android.compound.theme.ElementTheme\n import io.element.android.features.messages.impl.actionlist.ActionListEvents\n import io.element.android.features.messages.impl.actionlist.ActionListView\n import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction\n-import io.element.android.features.messages.impl.attachments.Attachment\n import io.element.android.features.messages.impl.crypto.identity.IdentityChangeStateView\n import io.element.android.features.messages.impl.messagecomposer.AttachmentsBottomSheet\n-import io.element.android.features.messages.impl.messagecomposer.AttachmentsState\n import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvents\n import io.element.android.features.messages.impl.messagecomposer.MessageComposerView\n import io.element.android.features.messages.impl.messagecomposer.suggestions.SuggestionsPickerView\n@@ -115,7 +111,6 @@ fun MessagesView(\n onEventContentClick: (event: TimelineItem.Event) -> Boolean,\n onUserDataClick: (UserId) -> Unit,\n onLinkClick: (String) -> Unit,\n- onPreviewAttachments: (ImmutableList) -> Unit,\n onSendLocationClick: () -> Unit,\n onCreatePollClick: () -> Unit,\n onJoinCallClick: () -> Unit,\n@@ -129,11 +124,6 @@ fun MessagesView(\n \n KeepScreenOn(state.voiceMessageComposerState.keepScreenOn)\n \n- AttachmentStateView(\n- state = state.composerState.attachmentsState,\n- onPreviewAttachments = onPreviewAttachments,\n- )\n-\n val snackbarHostState = rememberSnackbarHostState(snackbarMessage = state.snackbarMessage)\n \n // This is needed because the composer is inside an AndroidView that can't be affected by the FocusManager in Compose\n@@ -273,22 +263,6 @@ private fun ReinviteDialog(state: MessagesState) {\n }\n }\n \n-@Composable\n-private fun AttachmentStateView(\n- state: AttachmentsState,\n- onPreviewAttachments: (ImmutableList) -> Unit,\n-) {\n- when (state) {\n- AttachmentsState.None -> Unit\n- is AttachmentsState.Previewing -> {\n- val latestOnPreviewAttachments by rememberUpdatedState(onPreviewAttachments)\n- LaunchedEffect(state) {\n- latestOnPreviewAttachments(state.attachments)\n- }\n- }\n- }\n-}\n-\n @Composable\n private fun MessagesViewContent(\n state: MessagesState,\n@@ -557,7 +531,6 @@ internal fun MessagesViewPreview(@PreviewParameter(MessagesStateProvider::class)\n onEventContentClick = { false },\n onUserDataClick = {},\n onLinkClick = {},\n- onPreviewAttachments = {},\n onSendLocationClick = {},\n onCreatePollClick = {},\n onJoinCallClick = {},\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/MessagesViewWithIdentityChangePreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/MessagesViewWithIdentityChangePreview.kt\nindex 04750b6ad86..34c58bdb060 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/MessagesViewWithIdentityChangePreview.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/MessagesViewWithIdentityChangePreview.kt\n@@ -36,7 +36,6 @@ internal fun MessagesViewWithIdentityChangePreview(\n onEventContentClick = { false },\n onUserDataClick = {},\n onLinkClick = {},\n- onPreviewAttachments = {},\n onSendLocationClick = {},\n onCreatePollClick = {},\n onJoinCallClick = {},\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/di/MessagesModule.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/di/MessagesModule.kt\nindex d987e978095..567c95bcc7c 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/di/MessagesModule.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/di/MessagesModule.kt\n@@ -14,8 +14,6 @@ import io.element.android.features.messages.impl.crypto.identity.IdentityChangeS\n import io.element.android.features.messages.impl.crypto.identity.IdentityChangeStatePresenter\n import io.element.android.features.messages.impl.crypto.sendfailure.resolve.ResolveVerifiedUserSendFailurePresenter\n import io.element.android.features.messages.impl.crypto.sendfailure.resolve.ResolveVerifiedUserSendFailureState\n-import io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenter\n-import io.element.android.features.messages.impl.messagecomposer.MessageComposerState\n import io.element.android.features.messages.impl.pinned.banner.PinnedMessagesBannerPresenter\n import io.element.android.features.messages.impl.pinned.banner.PinnedMessagesBannerState\n import io.element.android.features.messages.impl.timeline.components.customreaction.CustomReactionPresenter\n@@ -48,9 +46,6 @@ interface MessagesModule {\n @Binds\n fun bindTimelineProtectionPresenter(presenter: TimelineProtectionPresenter): Presenter\n \n- @Binds\n- fun bindMessageComposerPresenter(presenter: MessageComposerPresenter): Presenter\n-\n @Binds\n fun bindVoiceMessageComposerPresenter(presenter: VoiceMessageComposerPresenter): Presenter\n \ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt\nindex ebccc8dff46..bf3ea2b112c 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt\n@@ -14,7 +14,6 @@ import androidx.annotation.VisibleForTesting\n import androidx.compose.runtime.Composable\n import androidx.compose.runtime.DisposableEffect\n import androidx.compose.runtime.LaunchedEffect\n-import androidx.compose.runtime.MutableState\n import androidx.compose.runtime.collectAsState\n import androidx.compose.runtime.getValue\n import androidx.compose.runtime.mutableStateListOf\n@@ -26,8 +25,12 @@ import androidx.compose.runtime.saveable.rememberSaveable\n import androidx.compose.runtime.setValue\n import androidx.media3.common.MimeTypes\n import androidx.media3.common.util.UnstableApi\n+import dagger.assisted.Assisted\n+import dagger.assisted.AssistedFactory\n+import dagger.assisted.AssistedInject\n import im.vector.app.features.analytics.plan.Composer\n import im.vector.app.features.analytics.plan.Interaction\n+import io.element.android.features.messages.impl.MessagesNavigator\n import io.element.android.features.messages.impl.attachments.Attachment\n import io.element.android.features.messages.impl.attachments.preview.error.sendAttachmentError\n import io.element.android.features.messages.impl.draft.ComposerDraftService\n@@ -38,8 +41,6 @@ import io.element.android.features.messages.impl.utils.TextPillificationHelper\n import io.element.android.libraries.architecture.Presenter\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage\n-import io.element.android.libraries.di.RoomScope\n-import io.element.android.libraries.di.SingleIn\n import io.element.android.libraries.featureflag.api.FeatureFlagService\n import io.element.android.libraries.featureflag.api.FeatureFlags\n import io.element.android.libraries.matrix.api.core.UserId\n@@ -89,12 +90,11 @@ import kotlinx.coroutines.flow.filter\n import kotlinx.coroutines.flow.merge\n import kotlinx.coroutines.launch\n import timber.log.Timber\n-import javax.inject.Inject\n import kotlin.time.Duration.Companion.seconds\n import io.element.android.libraries.core.mimetype.MimeTypes.Any as AnyMimeTypes\n \n-@SingleIn(RoomScope::class)\n-class MessageComposerPresenter @Inject constructor(\n+class MessageComposerPresenter @AssistedInject constructor(\n+ @Assisted private val navigator: MessagesNavigator,\n private val appCoroutineScope: CoroutineScope,\n private val room: MatrixRoom,\n private val mediaPickerProvider: PickerProvider,\n@@ -117,6 +117,11 @@ class MessageComposerPresenter @Inject constructor(\n private val roomMemberProfilesCache: RoomMemberProfilesCache,\n private val suggestionsProcessor: SuggestionsProcessor,\n ) : Presenter {\n+ @AssistedFactory\n+ interface Factory {\n+ fun create(navigator: MessagesNavigator): MessageComposerPresenter\n+ }\n+\n private val cameraPermissionPresenter = permissionsPresenterFactory.create(Manifest.permission.CAMERA)\n private var pendingEvent: MessageComposerEvents? = null\n private val suggestionSearchTrigger = MutableStateFlow(null)\n@@ -147,9 +152,6 @@ class MessageComposerPresenter @Inject constructor(\n }\n \n val cameraPermissionState = cameraPermissionPresenter.present()\n- val attachmentsState = remember {\n- mutableStateOf(AttachmentsState.None)\n- }\n \n val canShareLocation = remember { mutableStateOf(false) }\n LaunchedEffect(Unit) {\n@@ -162,16 +164,16 @@ class MessageComposerPresenter @Inject constructor(\n }\n \n val galleryMediaPicker = mediaPickerProvider.registerGalleryPicker { uri, mimeType ->\n- handlePickedMedia(attachmentsState, uri, mimeType)\n+ handlePickedMedia(uri, mimeType)\n }\n val filesPicker = mediaPickerProvider.registerFilePicker(AnyMimeTypes) { uri ->\n- handlePickedMedia(attachmentsState, uri)\n+ handlePickedMedia(uri)\n }\n val cameraPhotoPicker = mediaPickerProvider.registerCameraPhotoPicker { uri ->\n- handlePickedMedia(attachmentsState, uri, MimeTypes.IMAGE_JPEG)\n+ handlePickedMedia(uri, MimeTypes.IMAGE_JPEG)\n }\n val cameraVideoPicker = mediaPickerProvider.registerCameraVideoPicker { uri ->\n- handlePickedMedia(attachmentsState, uri, MimeTypes.VIDEO_MP4)\n+ handlePickedMedia(uri, MimeTypes.VIDEO_MP4)\n }\n val isFullScreen = rememberSaveable {\n mutableStateOf(false)\n@@ -277,7 +279,6 @@ class MessageComposerPresenter @Inject constructor(\n formattedFileSize = null\n ),\n ),\n- attachmentState = attachmentsState,\n )\n is MessageComposerEvents.SetMode -> {\n localCoroutineScope.setMode(event.composerMode, markdownTextEditorState, richTextEditorState)\n@@ -396,7 +397,6 @@ class MessageComposerPresenter @Inject constructor(\n showTextFormatting = showTextFormatting,\n canShareLocation = canShareLocation.value,\n canCreatePoll = canCreatePoll.value,\n- attachmentsState = attachmentsState.value,\n suggestions = suggestions.toPersistentList(),\n resolveMentionDisplay = resolveMentionDisplay,\n eventSink = { handleEvents(it) },\n@@ -459,14 +459,12 @@ class MessageComposerPresenter @Inject constructor(\n \n private fun CoroutineScope.sendAttachment(\n attachment: Attachment,\n- attachmentState: MutableState,\n ) = when (attachment) {\n is Attachment.Media -> {\n launch {\n sendMedia(\n uri = attachment.localMedia.uri,\n mimeType = attachment.localMedia.info.mimeType,\n- attachmentState = attachmentState,\n )\n }\n }\n@@ -474,14 +472,10 @@ class MessageComposerPresenter @Inject constructor(\n \n @UnstableApi\n private fun handlePickedMedia(\n- attachmentsState: MutableState,\n uri: Uri?,\n mimeType: String? = null,\n ) {\n- if (uri == null) {\n- attachmentsState.value = AttachmentsState.None\n- return\n- }\n+ uri ?: return\n val localMedia = localMediaFactory.createFromUri(\n uri = uri,\n mimeType = mimeType,\n@@ -489,13 +483,12 @@ class MessageComposerPresenter @Inject constructor(\n formattedFileSize = null\n )\n val mediaAttachment = Attachment.Media(localMedia)\n- attachmentsState.value = AttachmentsState.Previewing(persistentListOf(mediaAttachment))\n+ navigator.onPreviewAttachment(persistentListOf(mediaAttachment))\n }\n \n private suspend fun sendMedia(\n uri: Uri,\n mimeType: String,\n- attachmentState: MutableState,\n ) = runCatching {\n mediaSender.sendMedia(\n uri = uri,\n@@ -503,12 +496,8 @@ class MessageComposerPresenter @Inject constructor(\n progressCallback = null,\n ).getOrThrow()\n }\n- .onSuccess {\n- attachmentState.value = AttachmentsState.None\n- }\n .onFailure { cause ->\n Timber.e(cause, \"Failed to send attachment\")\n- attachmentState.value = AttachmentsState.None\n if (cause is CancellationException) {\n throw cause\n } else {\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerState.kt\nindex d0e9528e487..58e40dbb14e 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerState.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerState.kt\n@@ -7,9 +7,7 @@\n \n package io.element.android.features.messages.impl.messagecomposer\n \n-import androidx.compose.runtime.Immutable\n import androidx.compose.runtime.Stable\n-import io.element.android.features.messages.impl.attachments.Attachment\n import io.element.android.libraries.textcomposer.mentions.ResolvedSuggestion\n import io.element.android.libraries.textcomposer.model.MessageComposerMode\n import io.element.android.libraries.textcomposer.model.TextEditorState\n@@ -25,14 +23,7 @@ data class MessageComposerState(\n val showTextFormatting: Boolean,\n val canShareLocation: Boolean,\n val canCreatePoll: Boolean,\n- val attachmentsState: AttachmentsState,\n val suggestions: ImmutableList,\n val resolveMentionDisplay: (String, String) -> TextDisplay,\n val eventSink: (MessageComposerEvents) -> Unit,\n )\n-\n-@Immutable\n-sealed interface AttachmentsState {\n- data object None : AttachmentsState\n- data class Previewing(val attachments: ImmutableList) : AttachmentsState\n-}\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt\nindex a36102bc7d8..7811322c3dd 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt\n@@ -31,7 +31,6 @@ fun aMessageComposerState(\n showAttachmentSourcePicker: Boolean = false,\n canShareLocation: Boolean = true,\n canCreatePoll: Boolean = true,\n- attachmentsState: AttachmentsState = AttachmentsState.None,\n suggestions: ImmutableList = persistentListOf(),\n eventSink: (MessageComposerEvents) -> Unit = {},\n ) = MessageComposerState(\n@@ -42,7 +41,6 @@ fun aMessageComposerState(\n showAttachmentSourcePicker = showAttachmentSourcePicker,\n canShareLocation = canShareLocation,\n canCreatePoll = canCreatePoll,\n- attachmentsState = attachmentsState,\n suggestions = suggestions,\n resolveMentionDisplay = { _, _ -> TextDisplay.Plain },\n eventSink = eventSink,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenter.kt\nindex cf8d5668a3e..cc6d134802e 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenter.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenter.kt\n@@ -23,8 +23,6 @@ import im.vector.app.features.analytics.plan.Composer\n import io.element.android.features.messages.api.MessageComposerContext\n import io.element.android.features.messages.impl.voicemessages.VoiceMessageException\n import io.element.android.libraries.architecture.Presenter\n-import io.element.android.libraries.di.RoomScope\n-import io.element.android.libraries.di.SingleIn\n import io.element.android.libraries.mediaupload.api.MediaSender\n import io.element.android.libraries.permissions.api.PermissionsEvents\n import io.element.android.libraries.permissions.api.PermissionsPresenter\n@@ -45,7 +43,6 @@ import javax.inject.Inject\n import kotlin.time.Duration\n import kotlin.time.Duration.Companion.milliseconds\n \n-@SingleIn(RoomScope::class)\n class VoiceMessageComposerPresenter @Inject constructor(\n private val appCoroutineScope: CoroutineScope,\n private val voiceRecorder: VoiceRecorder,\n", "test_patch": "diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt\nindex fa5e412f27b..5dcc4e74966 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt\n@@ -7,36 +7,37 @@\n \n package io.element.android.features.messages.impl\n \n+import io.element.android.features.messages.impl.attachments.Attachment\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.core.UserId\n import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo\n-\n-class FakeMessagesNavigator : MessagesNavigator {\n- var onShowEventDebugInfoClickedCount = 0\n- private set\n-\n- var onForwardEventClickedCount = 0\n- private set\n-\n- var onReportContentClickedCount = 0\n- private set\n-\n- var onEditPollClickedCount = 0\n- private set\n-\n+import io.element.android.tests.testutils.lambda.lambdaError\n+import kotlinx.collections.immutable.ImmutableList\n+\n+class FakeMessagesNavigator(\n+ private val onShowEventDebugInfoClickLambda: (eventId: EventId?, debugInfo: TimelineItemDebugInfo) -> Unit = { _, _ -> lambdaError() },\n+ private val onForwardEventClickLambda: (eventId: EventId) -> Unit = { _ -> lambdaError() },\n+ private val onReportContentClickLambda: (eventId: EventId, senderId: UserId) -> Unit = { _, _ -> lambdaError() },\n+ private val onEditPollClickLambda: (eventId: EventId) -> Unit = { _ -> lambdaError() },\n+ private val onPreviewAttachmentLambda: (attachments: ImmutableList) -> Unit = { _ -> lambdaError() },\n+) : MessagesNavigator {\n override fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {\n- onShowEventDebugInfoClickedCount++\n+ onShowEventDebugInfoClickLambda(eventId, debugInfo)\n }\n \n override fun onForwardEventClick(eventId: EventId) {\n- onForwardEventClickedCount++\n+ onForwardEventClickLambda(eventId)\n }\n \n override fun onReportContentClick(eventId: EventId, senderId: UserId) {\n- onReportContentClickedCount++\n+ onReportContentClickLambda(eventId, senderId)\n }\n \n override fun onEditPollClick(eventId: EventId) {\n- onEditPollClickedCount++\n+ onEditPollClickLambda(eventId)\n+ }\n+\n+ override fun onPreviewAttachment(attachments: ImmutableList) {\n+ onPreviewAttachmentLambda(attachments)\n }\n }\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt\nindex 3d4969fd28e..61606a51de9 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt\n@@ -23,8 +23,8 @@ import io.element.android.features.messages.impl.messagecomposer.MessageComposer\n import io.element.android.features.messages.impl.messagecomposer.aMessageComposerState\n import io.element.android.features.messages.impl.pinned.banner.aLoadedPinnedMessagesBannerState\n import io.element.android.features.messages.impl.timeline.TimelineController\n-import io.element.android.features.messages.impl.timeline.TimelinePresenter\n-import io.element.android.features.messages.impl.timeline.createTimelinePresenter\n+import io.element.android.features.messages.impl.timeline.TimelineEvents\n+import io.element.android.features.messages.impl.timeline.aTimelineState\n import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContent\n import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent\n import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextContent\n@@ -36,8 +36,6 @@ import io.element.android.features.messages.impl.timeline.protection.aTimelinePr\n import io.element.android.features.messages.impl.voicemessages.composer.aVoiceMessageComposerState\n import io.element.android.features.messages.test.timeline.FakeHtmlConverterProvider\n import io.element.android.features.networkmonitor.test.FakeNetworkMonitor\n-import io.element.android.features.poll.api.actions.EndPollAction\n-import io.element.android.features.poll.test.actions.FakeEndPollAction\n import io.element.android.features.roomcall.api.aStandByCallState\n import io.element.android.libraries.androidutils.clipboard.FakeClipboardHelper\n import io.element.android.libraries.architecture.AsyncData\n@@ -56,6 +54,7 @@ import io.element.android.libraries.matrix.api.room.MatrixRoom\n import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState\n import io.element.android.libraries.matrix.api.room.MessageEventType\n import io.element.android.libraries.matrix.api.room.RoomMembershipState\n+import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo\n import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId\n import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId\n import io.element.android.libraries.matrix.test.AN_AVATAR_URL\n@@ -65,12 +64,14 @@ import io.element.android.libraries.matrix.test.A_ROOM_ID\n import io.element.android.libraries.matrix.test.A_SESSION_ID\n import io.element.android.libraries.matrix.test.A_SESSION_ID_2\n import io.element.android.libraries.matrix.test.A_THROWABLE\n+import io.element.android.libraries.matrix.test.A_USER_ID\n import io.element.android.libraries.matrix.test.core.aBuildMeta\n import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser\n import io.element.android.libraries.matrix.test.room.FakeMatrixRoom\n import io.element.android.libraries.matrix.test.room.aRoomInfo\n import io.element.android.libraries.matrix.test.room.aRoomMember\n import io.element.android.libraries.matrix.test.timeline.FakeTimeline\n+import io.element.android.libraries.matrix.test.timeline.aTimelineItemDebugInfo\n import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails\n import io.element.android.libraries.textcomposer.model.MessageComposerMode\n import io.element.android.libraries.textcomposer.model.TextEditorState\n@@ -217,7 +218,10 @@ class MessagesPresenterTest {\n \n @Test\n fun `present - handle action forward`() = runTest {\n- val navigator = FakeMessagesNavigator()\n+ val onForwardEventClickLambda = lambdaRecorder { }\n+ val navigator = FakeMessagesNavigator(\n+ onForwardEventClickLambda = onForwardEventClickLambda,\n+ )\n val presenter = createMessagesPresenter(navigator = navigator)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n@@ -225,7 +229,7 @@ class MessagesPresenterTest {\n val initialState = awaitItem()\n initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.Forward, aMessageEvent()))\n assertThat(awaitItem().actionListState.target).isEqualTo(ActionListState.Target.None)\n- assertThat(navigator.onForwardEventClickedCount).isEqualTo(1)\n+ onForwardEventClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))\n }\n }\n \n@@ -452,7 +456,10 @@ class MessagesPresenterTest {\n \n @Test\n fun `present - handle action edit poll`() = runTest {\n- val navigator = FakeMessagesNavigator()\n+ val onEditPollClickLambda = lambdaRecorder { }\n+ val navigator = FakeMessagesNavigator(\n+ onEditPollClickLambda = onEditPollClickLambda\n+ )\n val presenter = createMessagesPresenter(navigator = navigator)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n@@ -460,22 +467,21 @@ class MessagesPresenterTest {\n val initialState = awaitItem()\n initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.Edit, aMessageEvent(content = aTimelineItemPollContent())))\n awaitItem()\n- assertThat(navigator.onEditPollClickedCount).isEqualTo(1)\n+ onEditPollClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))\n }\n }\n \n @Test\n fun `present - handle action end poll`() = runTest {\n- val endPollAction = FakeEndPollAction()\n- val presenter = createMessagesPresenter(endPollAction = endPollAction)\n+ val timelineEventSink = EventsRecorder()\n+ val presenter = createMessagesPresenter(timelineEventSink = timelineEventSink)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n val initialState = awaitItem()\n- endPollAction.verifyExecutionCount(0)\n initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.EndPoll, aMessageEvent(content = aTimelineItemPollContent())))\n delay(1)\n- endPollAction.verifyExecutionCount(1)\n+ timelineEventSink.assertSingle(TimelineEvents.EndPoll(AN_EVENT_ID))\n cancelAndIgnoreRemainingEvents()\n }\n }\n@@ -516,7 +522,10 @@ class MessagesPresenterTest {\n \n @Test\n fun `present - handle action report content`() = runTest {\n- val navigator = FakeMessagesNavigator()\n+ val onReportContentClickLambda = lambdaRecorder { _: EventId, _: UserId -> }\n+ val navigator = FakeMessagesNavigator(\n+ onReportContentClickLambda = onReportContentClickLambda\n+ )\n val presenter = createMessagesPresenter(navigator = navigator)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n@@ -524,7 +533,7 @@ class MessagesPresenterTest {\n val initialState = awaitItem()\n initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.ReportContent, aMessageEvent()))\n assertThat(awaitItem().actionListState.target).isEqualTo(ActionListState.Target.None)\n- assertThat(navigator.onReportContentClickedCount).isEqualTo(1)\n+ onReportContentClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID), value(A_USER_ID))\n }\n }\n \n@@ -542,7 +551,10 @@ class MessagesPresenterTest {\n \n @Test\n fun `present - handle action show developer info`() = runTest {\n- val navigator = FakeMessagesNavigator()\n+ val onShowEventDebugInfoClickLambda = lambdaRecorder { _: EventId?, _: TimelineItemDebugInfo -> }\n+ val navigator = FakeMessagesNavigator(\n+ onShowEventDebugInfoClickLambda = onShowEventDebugInfoClickLambda\n+ )\n val presenter = createMessagesPresenter(navigator = navigator)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n@@ -550,7 +562,7 @@ class MessagesPresenterTest {\n val initialState = awaitItem()\n initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.ViewSource, aMessageEvent()))\n assertThat(awaitItem().actionListState.target).isEqualTo(ActionListState.Target.None)\n- assertThat(navigator.onShowEventDebugInfoClickedCount).isEqualTo(1)\n+ onShowEventDebugInfoClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID), value(aTimelineItemDebugInfo()))\n }\n }\n \n@@ -1087,7 +1099,7 @@ class MessagesPresenterTest {\n navigator: FakeMessagesNavigator = FakeMessagesNavigator(),\n clipboardHelper: FakeClipboardHelper = FakeClipboardHelper(),\n analyticsService: FakeAnalyticsService = FakeAnalyticsService(),\n- endPollAction: EndPollAction = FakeEndPollAction(),\n+ timelineEventSink: (TimelineEvents) -> Unit = {},\n permalinkParser: PermalinkParser = FakePermalinkParser(),\n messageComposerPresenter: Presenter = Presenter {\n aMessageComposerState(\n@@ -1097,19 +1109,12 @@ class MessagesPresenterTest {\n },\n actionListEventSink: (ActionListEvents) -> Unit = {},\n ): MessagesPresenter {\n- val timelinePresenterFactory = object : TimelinePresenter.Factory {\n- override fun create(navigator: MessagesNavigator): TimelinePresenter {\n- return createTimelinePresenter(\n- endPollAction = endPollAction,\n- )\n- }\n- }\n val featureFlagService = FakeFeatureFlagService()\n return MessagesPresenter(\n room = matrixRoom,\n composerPresenter = messageComposerPresenter,\n voiceMessageComposerPresenter = { aVoiceMessageComposerState() },\n- timelinePresenterFactory = timelinePresenterFactory,\n+ timelinePresenter = { aTimelineState(eventSink = timelineEventSink) },\n timelineProtectionPresenter = { aTimelineProtectionState() },\n actionListPresenterFactory = FakeActionListPresenter.Factory(actionListEventSink),\n customReactionPresenter = { aCustomReactionState() },\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt\nindex c040ce99264..1d4e1a43b34 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt\n@@ -33,7 +33,6 @@ import io.element.android.features.messages.impl.actionlist.ActionListEvents\n import io.element.android.features.messages.impl.actionlist.ActionListState\n import io.element.android.features.messages.impl.actionlist.anActionListState\n import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction\n-import io.element.android.features.messages.impl.attachments.Attachment\n import io.element.android.features.messages.impl.crypto.sendfailure.VerifiedUserSendFailure\n import io.element.android.features.messages.impl.crypto.sendfailure.resolve.aChangedIdentitySendFailure\n import io.element.android.features.messages.impl.messagecomposer.aMessageComposerState\n@@ -64,7 +63,6 @@ import io.element.android.tests.testutils.clickOn\n import io.element.android.tests.testutils.ensureCalledOnce\n import io.element.android.tests.testutils.ensureCalledOnceWithParam\n import io.element.android.tests.testutils.pressBack\n-import kotlinx.collections.immutable.ImmutableList\n import kotlinx.collections.immutable.persistentListOf\n import org.junit.Rule\n import org.junit.Test\n@@ -514,7 +512,6 @@ private fun AndroidComposeTestRule.setMessa\n onEventClick: (event: TimelineItem.Event) -> Boolean = EnsureNeverCalledWithParamAndResult(),\n onUserDataClick: (UserId) -> Unit = EnsureNeverCalledWithParam(),\n onLinkClick: (String) -> Unit = EnsureNeverCalledWithParam(),\n- onPreviewAttachments: (ImmutableList) -> Unit = EnsureNeverCalledWithParam(),\n onSendLocationClick: () -> Unit = EnsureNeverCalled(),\n onCreatePollClick: () -> Unit = EnsureNeverCalled(),\n onJoinCallClick: () -> Unit = EnsureNeverCalled(),\n@@ -532,7 +529,6 @@ private fun AndroidComposeTestRule.setMessa\n onEventContentClick = onEventClick,\n onUserDataClick = onUserDataClick,\n onLinkClick = onLinkClick,\n- onPreviewAttachments = onPreviewAttachments,\n onSendLocationClick = onSendLocationClick,\n onCreatePollClick = onCreatePollClick,\n onJoinCallClick = onJoinCallClick,\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt\nindex 1654a061c8c..d0b41bbb1ee 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt\n@@ -18,6 +18,9 @@ import app.cash.turbine.test\n import com.google.common.truth.Truth.assertThat\n import im.vector.app.features.analytics.plan.Composer\n import im.vector.app.features.analytics.plan.Interaction\n+import io.element.android.features.messages.impl.FakeMessagesNavigator\n+import io.element.android.features.messages.impl.MessagesNavigator\n+import io.element.android.features.messages.impl.attachments.Attachment\n import io.element.android.features.messages.impl.draft.ComposerDraftService\n import io.element.android.features.messages.impl.draft.FakeComposerDraftService\n import io.element.android.features.messages.impl.messagecomposer.suggestions.SuggestionsProcessor\n@@ -91,6 +94,7 @@ import io.element.android.tests.testutils.lambda.value\n import io.element.android.tests.testutils.test\n import io.element.android.tests.testutils.waitForPredicate\n import io.mockk.mockk\n+import kotlinx.collections.immutable.ImmutableList\n import kotlinx.collections.immutable.persistentListOf\n import kotlinx.coroutines.CoroutineScope\n import kotlinx.coroutines.ExperimentalCoroutinesApi\n@@ -133,7 +137,6 @@ class MessageComposerPresenterTest {\n assertThat(initialState.mode).isEqualTo(MessageComposerMode.Normal)\n assertThat(initialState.showAttachmentSourcePicker).isFalse()\n assertThat(initialState.canShareLocation).isTrue()\n- assertThat(initialState.attachmentsState).isEqualTo(AttachmentsState.None)\n }\n }\n \n@@ -685,7 +688,15 @@ class MessageComposerPresenterTest {\n val room = FakeMatrixRoom(\n typingNoticeResult = { Result.success(Unit) }\n )\n- val presenter = createPresenter(this, room = room)\n+ val onPreviewAttachmentLambda = lambdaRecorder { _: ImmutableList -> }\n+ val navigator = FakeMessagesNavigator(\n+ onPreviewAttachmentLambda = onPreviewAttachmentLambda\n+ )\n+ val presenter = createPresenter(\n+ coroutineScope = this,\n+ room = room,\n+ navigator = navigator,\n+ )\n pickerProvider.givenMimeType(MimeTypes.Images)\n mediaPreProcessor.givenResult(\n Result.success(\n@@ -709,9 +720,7 @@ class MessageComposerPresenterTest {\n }.test {\n val initialState = awaitFirstItem()\n initialState.eventSink(MessageComposerEvents.PickAttachmentSource.FromGallery)\n- val previewingState = awaitItem()\n- assertThat(previewingState.showAttachmentSourcePicker).isFalse()\n- assertThat(previewingState.attachmentsState).isInstanceOf(AttachmentsState.Previewing::class.java)\n+ onPreviewAttachmentLambda.assertions().isCalledOnce()\n }\n }\n \n@@ -720,7 +729,15 @@ class MessageComposerPresenterTest {\n val room = FakeMatrixRoom(\n typingNoticeResult = { Result.success(Unit) }\n )\n- val presenter = createPresenter(this, room = room)\n+ val onPreviewAttachmentLambda = lambdaRecorder { _: ImmutableList -> }\n+ val navigator = FakeMessagesNavigator(\n+ onPreviewAttachmentLambda = onPreviewAttachmentLambda\n+ )\n+ val presenter = createPresenter(\n+ coroutineScope = this,\n+ room = room,\n+ navigator = navigator,\n+ )\n pickerProvider.givenMimeType(MimeTypes.Videos)\n mediaPreProcessor.givenResult(\n Result.success(\n@@ -745,9 +762,7 @@ class MessageComposerPresenterTest {\n }.test {\n val initialState = awaitFirstItem()\n initialState.eventSink(MessageComposerEvents.PickAttachmentSource.FromGallery)\n- val previewingState = awaitItem()\n- assertThat(previewingState.showAttachmentSourcePicker).isFalse()\n- assertThat(previewingState.attachmentsState).isInstanceOf(AttachmentsState.Previewing::class.java)\n+ onPreviewAttachmentLambda.assertions().isCalledOnce()\n }\n }\n \n@@ -772,15 +787,21 @@ class MessageComposerPresenterTest {\n val room = FakeMatrixRoom(\n typingNoticeResult = { Result.success(Unit) }\n )\n- val presenter = createPresenter(this, room = room)\n+ val onPreviewAttachmentLambda = lambdaRecorder { _: ImmutableList -> }\n+ val navigator = FakeMessagesNavigator(\n+ onPreviewAttachmentLambda = onPreviewAttachmentLambda\n+ )\n+ val presenter = createPresenter(\n+ coroutineScope = this,\n+ room = room,\n+ navigator = navigator,\n+ )\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n val initialState = awaitFirstItem()\n initialState.eventSink(MessageComposerEvents.PickAttachmentSource.FromFiles)\n- val sendingState = awaitItem()\n- assertThat(sendingState.showAttachmentSourcePicker).isFalse()\n- assertThat(sendingState.attachmentsState).isInstanceOf(AttachmentsState.Previewing::class.java)\n+ onPreviewAttachmentLambda.assertions().isCalledOnce()\n }\n }\n \n@@ -828,19 +849,22 @@ class MessageComposerPresenterTest {\n typingNoticeResult = { Result.success(Unit) }\n )\n val permissionPresenter = FakePermissionsPresenter().apply { setPermissionGranted() }\n+ val onPreviewAttachmentLambda = lambdaRecorder { _: ImmutableList -> }\n+ val navigator = FakeMessagesNavigator(\n+ onPreviewAttachmentLambda = onPreviewAttachmentLambda\n+ )\n val presenter = createPresenter(\n- this,\n+ coroutineScope = this,\n room = room,\n permissionPresenter = permissionPresenter,\n+ navigator = navigator,\n )\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n val initialState = awaitFirstItem()\n initialState.eventSink(MessageComposerEvents.PickAttachmentSource.PhotoFromCamera)\n- val finalState = awaitItem()\n- assertThat(finalState.attachmentsState).isInstanceOf(AttachmentsState.Previewing::class.java)\n- cancelAndIgnoreRemainingEvents()\n+ onPreviewAttachmentLambda.assertions().isCalledOnce()\n }\n }\n \n@@ -850,23 +874,23 @@ class MessageComposerPresenterTest {\n typingNoticeResult = { Result.success(Unit) }\n )\n val permissionPresenter = FakePermissionsPresenter()\n+ val onPreviewAttachmentLambda = lambdaRecorder { _: ImmutableList -> }\n+ val navigator = FakeMessagesNavigator(\n+ onPreviewAttachmentLambda = onPreviewAttachmentLambda\n+ )\n val presenter = createPresenter(\n- this,\n+ coroutineScope = this,\n room = room,\n permissionPresenter = permissionPresenter,\n+ navigator = navigator,\n )\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n val initialState = awaitFirstItem()\n initialState.eventSink(MessageComposerEvents.PickAttachmentSource.PhotoFromCamera)\n- val permissionState = awaitItem()\n- assertThat(permissionState.showAttachmentSourcePicker).isFalse()\n- assertThat(permissionState.attachmentsState).isInstanceOf(AttachmentsState.None::class.java)\n permissionPresenter.setPermissionGranted()\n- skipItems(1)\n- val finalState = awaitItem()\n- assertThat(finalState.attachmentsState).isInstanceOf(AttachmentsState.Previewing::class.java)\n+ onPreviewAttachmentLambda.assertions().isCalledOnce()\n cancelAndIgnoreRemainingEvents()\n }\n }\n@@ -877,19 +901,22 @@ class MessageComposerPresenterTest {\n typingNoticeResult = { Result.success(Unit) }\n )\n val permissionPresenter = FakePermissionsPresenter().apply { setPermissionGranted() }\n+ val onPreviewAttachmentLambda = lambdaRecorder { _: ImmutableList -> }\n+ val navigator = FakeMessagesNavigator(\n+ onPreviewAttachmentLambda = onPreviewAttachmentLambda\n+ )\n val presenter = createPresenter(\n- this,\n+ coroutineScope = this,\n room = room,\n permissionPresenter = permissionPresenter,\n+ navigator = navigator,\n )\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n val initialState = awaitFirstItem()\n initialState.eventSink(MessageComposerEvents.PickAttachmentSource.VideoFromCamera)\n- val finalState = awaitItem()\n- assertThat(finalState.attachmentsState).isInstanceOf(AttachmentsState.Previewing::class.java)\n- cancelAndIgnoreRemainingEvents()\n+ onPreviewAttachmentLambda.assertions().isCalledOnce()\n }\n }\n \n@@ -899,10 +926,15 @@ class MessageComposerPresenterTest {\n typingNoticeResult = { Result.success(Unit) }\n )\n val permissionPresenter = FakePermissionsPresenter()\n+ val onPreviewAttachmentLambda = lambdaRecorder { _: ImmutableList -> }\n+ val navigator = FakeMessagesNavigator(\n+ onPreviewAttachmentLambda = onPreviewAttachmentLambda\n+ )\n val presenter = createPresenter(\n- this,\n+ coroutineScope = this,\n room = room,\n permissionPresenter = permissionPresenter,\n+ navigator = navigator,\n )\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n@@ -911,12 +943,9 @@ class MessageComposerPresenterTest {\n initialState.eventSink(MessageComposerEvents.PickAttachmentSource.VideoFromCamera)\n val permissionState = awaitItem()\n assertThat(permissionState.showAttachmentSourcePicker).isFalse()\n- assertThat(permissionState.attachmentsState).isInstanceOf(AttachmentsState.None::class.java)\n permissionPresenter.setPermissionGranted()\n skipItems(1)\n- val finalState = awaitItem()\n- assertThat(finalState.attachmentsState).isInstanceOf(AttachmentsState.Previewing::class.java)\n- cancelAndIgnoreRemainingEvents()\n+ onPreviewAttachmentLambda.assertions().isCalledOnce()\n }\n }\n \n@@ -1500,6 +1529,7 @@ class MessageComposerPresenterTest {\n room: MatrixRoom = FakeMatrixRoom(\n typingNoticeResult = { Result.success(Unit) }\n ),\n+ navigator: MessagesNavigator = FakeMessagesNavigator(),\n pickerProvider: PickerProvider = this.pickerProvider,\n featureFlagService: FeatureFlagService = this.featureFlagService,\n sessionPreferencesStore: SessionPreferencesStore = InMemorySessionPreferencesStore(),\n@@ -1514,6 +1544,7 @@ class MessageComposerPresenterTest {\n isRichTextEditorEnabled: Boolean = true,\n draftService: ComposerDraftService = FakeComposerDraftService(),\n ) = MessageComposerPresenter(\n+ navigator = navigator,\n appCoroutineScope = coroutineScope,\n room = room,\n mediaPickerProvider = pickerProvider,\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt\nindex d153dd57437..a21dcb28345 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt\n@@ -431,7 +431,10 @@ import kotlin.time.Duration.Companion.seconds\n \n @Test\n fun `present - PollEditClicked event navigates`() = runTest {\n- val navigator = FakeMessagesNavigator()\n+ val onEditPollClickLambda = lambdaRecorder { _: EventId -> }\n+ val navigator = FakeMessagesNavigator(\n+ onEditPollClickLambda = onEditPollClickLambda\n+ )\n val presenter = createTimelinePresenter(\n messagesNavigator = navigator,\n )\n@@ -439,7 +442,7 @@ import kotlin.time.Duration.Companion.seconds\n presenter.present()\n }.test {\n awaitFirstItem().eventSink(TimelineEvents.EditPoll(AN_EVENT_ID))\n- assertThat(navigator.onEditPollClickedCount).isEqualTo(1)\n+ onEditPollClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))\n }\n }\n \n@@ -657,35 +660,35 @@ import kotlin.time.Duration.Companion.seconds\n private suspend fun ReceiveTurbine.awaitFirstItem(): T {\n return awaitItem()\n }\n-}\n \n-internal fun TestScope.createTimelinePresenter(\n- timeline: Timeline = FakeTimeline(),\n- room: FakeMatrixRoom = FakeMatrixRoom(\n- liveTimeline = timeline,\n- canUserSendMessageResult = { _, _ -> Result.success(true) }\n- ),\n- redactedVoiceMessageManager: RedactedVoiceMessageManager = FakeRedactedVoiceMessageManager(),\n- messagesNavigator: FakeMessagesNavigator = FakeMessagesNavigator(),\n- endPollAction: EndPollAction = FakeEndPollAction(),\n- sendPollResponseAction: SendPollResponseAction = FakeSendPollResponseAction(),\n- sessionPreferencesStore: InMemorySessionPreferencesStore = InMemorySessionPreferencesStore(),\n- timelineItemIndexer: TimelineItemIndexer = TimelineItemIndexer(),\n-): TimelinePresenter {\n- return TimelinePresenter(\n- timelineItemsFactoryCreator = aTimelineItemsFactoryCreator(),\n- room = room,\n- dispatchers = testCoroutineDispatchers(),\n- appScope = this,\n- navigator = messagesNavigator,\n- redactedVoiceMessageManager = redactedVoiceMessageManager,\n- endPollAction = endPollAction,\n- sendPollResponseAction = sendPollResponseAction,\n- sessionPreferencesStore = sessionPreferencesStore,\n- timelineItemIndexer = timelineItemIndexer,\n- timelineController = TimelineController(room),\n- resolveVerifiedUserSendFailurePresenter = { aResolveVerifiedUserSendFailureState() },\n- typingNotificationPresenter = { aTypingNotificationState() },\n- roomCallStatePresenter = { aStandByCallState() },\n- )\n+ private fun TestScope.createTimelinePresenter(\n+ timeline: Timeline = FakeTimeline(),\n+ room: FakeMatrixRoom = FakeMatrixRoom(\n+ liveTimeline = timeline,\n+ canUserSendMessageResult = { _, _ -> Result.success(true) }\n+ ),\n+ redactedVoiceMessageManager: RedactedVoiceMessageManager = FakeRedactedVoiceMessageManager(),\n+ messagesNavigator: FakeMessagesNavigator = FakeMessagesNavigator(),\n+ endPollAction: EndPollAction = FakeEndPollAction(),\n+ sendPollResponseAction: SendPollResponseAction = FakeSendPollResponseAction(),\n+ sessionPreferencesStore: InMemorySessionPreferencesStore = InMemorySessionPreferencesStore(),\n+ timelineItemIndexer: TimelineItemIndexer = TimelineItemIndexer(),\n+ ): TimelinePresenter {\n+ return TimelinePresenter(\n+ timelineItemsFactoryCreator = aTimelineItemsFactoryCreator(),\n+ room = room,\n+ dispatchers = testCoroutineDispatchers(),\n+ appScope = this,\n+ navigator = messagesNavigator,\n+ redactedVoiceMessageManager = redactedVoiceMessageManager,\n+ endPollAction = endPollAction,\n+ sendPollResponseAction = sendPollResponseAction,\n+ sessionPreferencesStore = sessionPreferencesStore,\n+ timelineItemIndexer = timelineItemIndexer,\n+ timelineController = TimelineController(room),\n+ resolveVerifiedUserSendFailurePresenter = { aResolveVerifiedUserSendFailureState() },\n+ typingNotificationPresenter = { aTypingNotificationState() },\n+ roomCallStatePresenter = { aStandByCallState() },\n+ )\n+ }\n }\n", "n2p_tests": {"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to an image media message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - on scroll finished send read receipt if an event is before the index": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - when there is no draft, nothing is restored": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.clicking on more reaction from action list emits the expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - handle typing notice event when sending typing notice is disabled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - check that the room's unread flag is removed": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.clicking on verified user send failure from action list emits the expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - when there is a draft for edit, it is restored": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - cancel reply": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action copy": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action pin": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - toggle fullscreen": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action edit": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle toggling a reaction twice": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when memberlist is ready": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action redact": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - send message with plain text enabled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.clicking on a read receipt list emits the expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when memberlist is error": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.swiping on an Event emits no Event if user does not have permission to send message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - room member mention suggestions": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.clicking on an Event invoke expected callback": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - send message with rich text enabled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.swiping on an Event emits the expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle dismiss action": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to a poll": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Record video with permission request": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - change message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Pick file from storage will open the preview": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - when save draft event is invoked and composer is not empty then service is called": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - when room member info is loaded, read receipts info should be updated": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - on scroll finished will not send read receipt the first visible event is the same as before": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - when there is a draft for reply, it is restored": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - ToggleTextFormatting toggles text formatting": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Dismiss attachments menu": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action report content": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Take photo": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - change mode to edit": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.clicking on room name invoke expected callback": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when memberlist is not ready": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - shows prompt to reinvite users in DM": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - PollAnswerSelected event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action remove caption": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Open attachments menu": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action add caption": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - focus on event and jump to live make the presenter update the state with the correct Events": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action edit poll": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle toggling a reaction": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.long clicking on a reaction emits the expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.clicking on a custom emoji emits the expected Events": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - initial state": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when inviting fails": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - change mode to edit caption": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - share location": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.clicking on send location invoke expected callback": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - permission to redact other": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - PollEndClicked event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - show shield hide shield": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - side effect on redacted items is invoked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.clicking on create poll invoke expected callback": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Pick image from gallery": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - on scroll finished mark a room as read if the first visible index is 0": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action view in timeline, it should have no effect": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Pick media from gallery & cancel does nothing": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - permission to post": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.selecting a action on a message emits the expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - room member mention suggestions in a DM": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - initial state": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - no permission to post": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.long clicking on an Event emits the expected Event userHasPermissionToRedactOther": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - change mode to reply": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Record video": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.long clicking on an Event emits the expected Event userHasPermissionToSendMessage": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.clicking on more reaction emits the expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - permission to redact own": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - on scroll finished send a private read receipt if an event is at an index other than 0 and public read receipts are disabled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to a file media message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action end poll": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - edit not sent message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - create poll": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - doesn't show reinvite prompt if other party is present": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.long clicking on an Event emits the expected Event userHasPermissionToSendReaction": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action edit caption": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - edit sent message event not found": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - reply message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - doesn't show reinvite prompt in non-direct room": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - when save draft event is invoked and composer is empty then service is called with null draft": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Take photo with permission request": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.clicking on pinned messages banner emits the expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - errors are tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - covers newEventState scenarios": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.clicking on a reaction emits the expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - when there is a draft for new message with rich text, it is restored": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action copy link": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - reaction ordering": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - change mode to reply after edit": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - PollEditClicked event navigates": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - when there is a draft for new message with plain text, it is restored": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.clicking on join call invoke expected callback": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to an event with no id does nothing": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - send messages with intentional mentions": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - on scroll finished will not send read receipt only virtual events exist before the index": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action forward": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to a video media message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.clicking on back invoke expected callback": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.clicking on the sender of an Event invoke expected callback": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - send uri": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - initial state": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action unpin": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - focus on event error case": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - handle typing notice event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Pick video from gallery": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - edit sent message": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action show developer info": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - focus on known event retrieves the event from cache": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.timeline.TimelinePresenterTest.present - load more": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - change mode to edit caption and send the caption": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.features.messages.impl.MessagesViewTest.long clicking on an Event emits the expected Event userHasPermissionToRedactOwn": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "element-hq__element-x-android-4161", "org": "element-hq", "repo": "element-x-android", "number": 4161, "state": "closed", "title": "Media navigation with swipe gesture", "body": "\r\n \r\n## Content\r\n\r\n\r\nAdd ability to swipe between media (images and videos) and files (files, audio and voice message) when navigating from the gallery.\r\n\r\nNote: for now, when opening a media from the room, swipe is not supported. This support will come later.\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #4174 \r\nRelated to #1484\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\nhttps://github.com/user-attachments/assets/38eeaa17-c210-425f-9238-b4e10c8143fd\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Open a room and navigate to settings/Media and files\r\n- Open an image\r\n- Swipe left and right\r\n- press back\r\n- open the files tab\r\n- open a file\r\n- Swipe left and right\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 24\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] You've made a self review of your PR", "base": {"label": "element-hq:develop", "ref": "develop", "sha": "e4768a88507d8ea940a8629eebc082327bd451da"}, "resolved_issues": [{"number": 4174, "title": "[Task] Attachment viewer: navigation by swiping left and right", "body": "Please see and discuss the details in the meta issue.\n\n(Note: this is actually #1484)"}], "lang": "kotlin", "problem_statement": "[Task] Attachment viewer: navigation by swiping left and right\nPlease see and discuss the details in the meta issue.\n\n(Note: this is actually #1484)\n", "pull_url": "https://github.com/element-hq/element-x-android/pull/4161", "issue_urls": ["https://github.com/element-hq/element-x-android/issues/4174"], "test_command": "./gradlew :libraries:mediaviewer:impl:testDebugUnitTest --tests \"io.element.android.libraries.mediaviewer.impl.gallery.TimelineMediaGalleryDataSourceTest\" --tests \"io.element.android.libraries.mediaviewer.impl.gallery.SingleMediaGalleryDataSourceTest\" --tests \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerViewTest\" --tests \"io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest\" --tests \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest\" --tests \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest\" --tests \"io.element.android.libraries.mediaviewer.impl.gallery.MediaItemsPostProcessorTest\" --tests \"io.element.android.libraries.mediaviewer.impl.local.AndroidLocalMediaFactoryTest\" --tests \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest\" :libraries:matrix:impl:testDebugUnitTest --tests \"io.element.android.libraries.matrix.impl.timeline.RustTimelineTest\" :tests:konsist:testDebugUnitTest --tests \"io.element.android.tests.konsist.KonsistClassNameTest\"", "fix_patch": "diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt\nindex 61f6426978d..f9d9bbf27f0 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt\n@@ -48,6 +48,7 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt\n import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStickerContent\n import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent\n import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVoiceContent\n+import io.element.android.features.messages.impl.timeline.model.event.duration\n import io.element.android.features.poll.api.create.CreatePollEntryPoint\n import io.element.android.features.poll.api.create.CreatePollMode\n import io.element.android.libraries.architecture.BackstackWithOverlayBox\n@@ -58,6 +59,7 @@ import io.element.android.libraries.architecture.overlay.operation.hide\n import io.element.android.libraries.architecture.overlay.operation.show\n import io.element.android.libraries.dateformatter.api.DateFormatter\n import io.element.android.libraries.dateformatter.api.DateFormatterMode\n+import io.element.android.libraries.dateformatter.api.toHumanReadableDuration\n import io.element.android.libraries.di.RoomScope\n import io.element.android.libraries.matrix.api.MatrixClient\n import io.element.android.libraries.matrix.api.core.EventId\n@@ -246,6 +248,8 @@ class MessagesFlowNode @AssistedInject constructor(\n }\n is NavTarget.MediaViewer -> {\n val params = MediaViewerEntryPoint.Params(\n+ // TODO When we will be able to load a media timeline from a EventId, change mode here (and use a mixed mode?)\n+ mode = MediaViewerEntryPoint.MediaViewerMode.SingleMedia,\n eventId = navTarget.eventId,\n mediaInfo = navTarget.mediaInfo,\n mediaSource = navTarget.mediaSource,\n@@ -447,6 +451,7 @@ class MessagesFlowNode @AssistedInject constructor(\n mode = DateFormatterMode.Full,\n ),\n waveform = (content as? TimelineItemVoiceContent)?.waveform,\n+ duration = content.duration()?.toHumanReadableDuration(),\n ),\n mediaSource = mediaSource,\n thumbnailSource = thumbnailSource,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt\nindex aeb847b80ac..9eda2e72536 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt\n@@ -9,6 +9,7 @@ package io.element.android.features.messages.impl.timeline.model.event\n \n import androidx.compose.runtime.Immutable\n import io.element.android.libraries.matrix.api.media.MediaSource\n+import kotlin.time.Duration\n \n @Immutable\n sealed interface TimelineItemEventContent {\n@@ -90,3 +91,12 @@ fun TimelineItemEventContent.isEdited(): Boolean = when (this) {\n is TimelineItemEventMutableContent -> isEdited\n else -> false\n }\n+\n+fun TimelineItemEventContentWithAttachment.duration(): Duration? {\n+ return when (this) {\n+ is TimelineItemAudioContent -> duration\n+ is TimelineItemVideoContent -> duration\n+ is TimelineItemVoiceContent -> duration\n+ else -> null\n+ }\n+}\ndiff --git a/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DurationFormatter.kt b/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DurationFormatter.kt\nindex 63e30d49285..04c6df1d022 100644\n--- a/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DurationFormatter.kt\n+++ b/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DurationFormatter.kt\n@@ -8,6 +8,7 @@\n package io.element.android.libraries.dateformatter.api\n \n import java.util.Locale\n+import kotlin.time.Duration\n \n /**\n * Convert milliseconds to human readable duration.\n@@ -38,3 +39,5 @@ fun Long.toHumanReadableDuration(): String {\n String.format(Locale.US, \"%d:%02d\", minutes, seconds)\n }\n }\n+\n+fun Duration.toHumanReadableDuration() = inWholeMilliseconds.toHumanReadableDuration()\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt\nindex 3e10ce1a5bf..4908d73d2e8 100644\n--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt\n@@ -55,8 +55,6 @@ import kotlinx.coroutines.flow.MutableSharedFlow\n import kotlinx.coroutines.flow.MutableStateFlow\n import kotlinx.coroutines.flow.StateFlow\n import kotlinx.coroutines.flow.combine\n-import kotlinx.coroutines.flow.distinctUntilChanged\n-import kotlinx.coroutines.flow.filter\n import kotlinx.coroutines.flow.first\n import kotlinx.coroutines.flow.getAndUpdate\n import kotlinx.coroutines.flow.launchIn\n@@ -213,8 +211,8 @@ class RustTimeline(\n \n override val timelineItems: Flow> = combine(\n _timelineItems,\n- backPaginationStatus.filter { !it.isPaginating }.distinctUntilChanged(),\n- forwardPaginationStatus.filter { !it.isPaginating }.distinctUntilChanged(),\n+ backPaginationStatus,\n+ forwardPaginationStatus,\n matrixRoom.roomInfoFlow.map { it.creator },\n isTimelineInitialized,\n ) { timelineItems,\ndiff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaInfo.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaInfo.kt\nindex 374bf701a6c..7426251ca0f 100644\n--- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaInfo.kt\n+++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaInfo.kt\n@@ -25,6 +25,7 @@ data class MediaInfo(\n val dateSent: String?,\n val dateSentFull: String?,\n val waveform: List?,\n+ val duration: String?,\n ) : Parcelable\n \n fun anImageMediaInfo(\n@@ -45,6 +46,7 @@ fun anImageMediaInfo(\n dateSent = dateSent,\n dateSentFull = dateSentFull,\n waveform = null,\n+ duration = null,\n )\n \n fun aVideoMediaInfo(\n@@ -52,6 +54,7 @@ fun aVideoMediaInfo(\n senderName: String? = null,\n dateSent: String? = null,\n dateSentFull: String? = null,\n+ duration: String? = null,\n ): MediaInfo = MediaInfo(\n filename = \"a video file.mp4\",\n caption = caption,\n@@ -64,6 +67,7 @@ fun aVideoMediaInfo(\n dateSent = dateSent,\n dateSentFull = dateSentFull,\n waveform = null,\n+ duration = duration,\n )\n \n fun aPdfMediaInfo(\n@@ -84,6 +88,7 @@ fun aPdfMediaInfo(\n dateSent = dateSent,\n dateSentFull = dateSentFull,\n waveform = null,\n+ duration = null,\n )\n \n fun anApkMediaInfo(\n@@ -103,6 +108,7 @@ fun anApkMediaInfo(\n dateSent = dateSent,\n dateSentFull = dateSentFull,\n waveform = null,\n+ duration = null,\n )\n \n fun anAudioMediaInfo(\n@@ -112,6 +118,7 @@ fun anAudioMediaInfo(\n dateSent: String? = null,\n dateSentFull: String? = null,\n waveForm: List? = null,\n+ duration: String? = null,\n ): MediaInfo = MediaInfo(\n filename = filename,\n caption = caption,\n@@ -124,6 +131,7 @@ fun anAudioMediaInfo(\n dateSent = dateSent,\n dateSentFull = dateSentFull,\n waveform = waveForm,\n+ duration = duration,\n )\n \n fun aVoiceMediaInfo(\n@@ -133,6 +141,7 @@ fun aVoiceMediaInfo(\n dateSent: String? = null,\n dateSentFull: String? = null,\n waveForm: List? = null,\n+ duration: String? = null,\n ): MediaInfo = MediaInfo(\n filename = filename,\n caption = caption,\n@@ -145,4 +154,5 @@ fun aVoiceMediaInfo(\n dateSent = dateSent,\n dateSentFull = dateSentFull,\n waveform = waveForm,\n+ duration = duration,\n )\ndiff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaViewerEntryPoint.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaViewerEntryPoint.kt\nindex d76cd9e2d85..a824fc55406 100644\n--- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaViewerEntryPoint.kt\n+++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaViewerEntryPoint.kt\n@@ -31,10 +31,17 @@ interface MediaViewerEntryPoint : FeatureEntryPoint {\n }\n \n data class Params(\n+ val mode: MediaViewerMode,\n val eventId: EventId?,\n val mediaInfo: MediaInfo,\n val mediaSource: MediaSource,\n val thumbnailSource: MediaSource?,\n val canShowInfo: Boolean,\n ) : NodeInputs\n+\n+ enum class MediaViewerMode {\n+ SingleMedia,\n+ TimelineImagesAndVideos,\n+ TimelineFilesAndAudios,\n+ }\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPoint.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPoint.kt\nindex 5a2912fdbe7..64cd9093a2b 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPoint.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPoint.kt\n@@ -42,6 +42,7 @@ class DefaultMediaViewerEntryPoint @Inject constructor() : MediaViewerEntryPoint\n val mimeType = MimeTypes.Images\n return params(\n MediaViewerEntryPoint.Params(\n+ mode = MediaViewerEntryPoint.MediaViewerMode.SingleMedia,\n eventId = null,\n mediaInfo = MediaInfo(\n filename = filename,\n@@ -55,6 +56,7 @@ class DefaultMediaViewerEntryPoint @Inject constructor() : MediaViewerEntryPoint\n dateSent = null,\n dateSentFull = null,\n waveform = null,\n+ duration = null,\n ),\n mediaSource = MediaSource(url = avatarUrl),\n thumbnailSource = null,\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/EventItemFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/EventItemFactory.kt\nindex e8e242d2e0f..293329c2dd6 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/EventItemFactory.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/EventItemFactory.kt\n@@ -40,7 +40,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.getAvatarUrl\n import io.element.android.libraries.matrix.api.timeline.item.event.getDisambiguatedDisplayName\n import io.element.android.libraries.mediaviewer.api.MediaInfo\n import io.element.android.libraries.mediaviewer.api.util.FileExtensionExtractor\n-import kotlinx.collections.immutable.persistentListOf\n import timber.log.Timber\n import javax.inject.Inject\n \n@@ -102,6 +101,7 @@ class EventItemFactory @Inject constructor(\n dateSent = dateSent,\n dateSentFull = dateSentFull,\n waveform = null,\n+ duration = null,\n ),\n mediaSource = type.source,\n )\n@@ -120,8 +120,10 @@ class EventItemFactory @Inject constructor(\n dateSent = dateSent,\n dateSentFull = dateSentFull,\n waveform = null,\n+ duration = null,\n ),\n mediaSource = type.source,\n+ // TODO We may want to add a thumbnailSource and set it to type.info?.thumbnailSource\n )\n is ImageMessageType -> MediaItem.Image(\n id = currentTimelineItem.uniqueId,\n@@ -138,9 +140,10 @@ class EventItemFactory @Inject constructor(\n dateSent = dateSent,\n dateSentFull = dateSentFull,\n waveform = null,\n+ duration = null,\n ),\n mediaSource = type.source,\n- thumbnailSource = null,\n+ thumbnailSource = type.info?.thumbnailSource,\n )\n is StickerMessageType -> MediaItem.Image(\n id = currentTimelineItem.uniqueId,\n@@ -157,9 +160,10 @@ class EventItemFactory @Inject constructor(\n dateSent = dateSent,\n dateSentFull = dateSentFull,\n waveform = null,\n+ duration = null,\n ),\n mediaSource = type.source,\n- thumbnailSource = null,\n+ thumbnailSource = type.info?.thumbnailSource,\n )\n is VideoMessageType -> MediaItem.Video(\n id = currentTimelineItem.uniqueId,\n@@ -176,10 +180,10 @@ class EventItemFactory @Inject constructor(\n dateSent = dateSent,\n dateSentFull = dateSentFull,\n waveform = null,\n+ duration = type.info?.duration?.inWholeMilliseconds?.toHumanReadableDuration(),\n ),\n mediaSource = type.source,\n thumbnailSource = type.info?.thumbnailSource,\n- duration = type.info?.duration?.inWholeMilliseconds?.toHumanReadableDuration(),\n )\n is VoiceMessageType -> MediaItem.Voice(\n id = currentTimelineItem.uniqueId,\n@@ -196,10 +200,9 @@ class EventItemFactory @Inject constructor(\n dateSent = dateSent,\n dateSentFull = dateSentFull,\n waveform = type.details?.waveform.orEmpty(),\n+ duration = type.info?.duration?.inWholeMilliseconds?.toHumanReadableDuration(),\n ),\n mediaSource = type.source,\n- duration = type.info?.duration?.inWholeMilliseconds?.toHumanReadableDuration(),\n- waveform = type.details?.waveform ?: persistentListOf(),\n )\n }\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryDataSource.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryDataSource.kt\nnew file mode 100644\nindex 00000000000..0e126531086\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryDataSource.kt\n@@ -0,0 +1,100 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.gallery\n+\n+import com.squareup.anvil.annotations.ContributesBinding\n+import io.element.android.libraries.architecture.AsyncData\n+import io.element.android.libraries.di.RoomScope\n+import io.element.android.libraries.di.SingleIn\n+import io.element.android.libraries.matrix.api.core.EventId\n+import io.element.android.libraries.matrix.api.room.MatrixRoom\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId\n+import kotlinx.coroutines.ExperimentalCoroutinesApi\n+import kotlinx.coroutines.flow.Flow\n+import kotlinx.coroutines.flow.MutableSharedFlow\n+import kotlinx.coroutines.flow.flatMapLatest\n+import kotlinx.coroutines.flow.flow\n+import kotlinx.coroutines.flow.launchIn\n+import kotlinx.coroutines.flow.map\n+import kotlinx.coroutines.flow.onCompletion\n+import kotlinx.coroutines.flow.onEach\n+import java.util.concurrent.atomic.AtomicBoolean\n+import javax.inject.Inject\n+\n+interface MediaGalleryDataSource {\n+ fun start()\n+ fun groupedMediaItemsFlow(): Flow>\n+ fun getLastData(): AsyncData\n+ suspend fun loadMore(direction: Timeline.PaginationDirection)\n+ suspend fun deleteItem(eventId: EventId)\n+}\n+\n+@SingleIn(RoomScope::class)\n+@ContributesBinding(RoomScope::class)\n+class TimelineMediaGalleryDataSource @Inject constructor(\n+ private val room: MatrixRoom,\n+ private val timelineMediaItemsFactory: TimelineMediaItemsFactory,\n+ private val mediaItemsPostProcessor: MediaItemsPostProcessor,\n+) : MediaGalleryDataSource {\n+ private var timeline: Timeline? = null\n+\n+ private val groupedMediaItemsFlow = MutableSharedFlow>(replay = 1)\n+\n+ override fun groupedMediaItemsFlow(): Flow> = groupedMediaItemsFlow\n+\n+ override fun getLastData(): AsyncData = groupedMediaItemsFlow.replayCache.firstOrNull() ?: AsyncData.Uninitialized\n+\n+ private val isStarted = AtomicBoolean(false)\n+\n+ @OptIn(ExperimentalCoroutinesApi::class)\n+ override fun start() {\n+ if (!isStarted.compareAndSet(false, true)) {\n+ return\n+ }\n+ flow {\n+ groupedMediaItemsFlow.emit(AsyncData.Loading())\n+ room.mediaTimeline().fold(\n+ {\n+ timeline = it\n+ emit(it)\n+ },\n+ {\n+ groupedMediaItemsFlow.emit(AsyncData.Failure(it))\n+ },\n+ )\n+ }.flatMapLatest { timeline ->\n+ timeline.timelineItems.onEach {\n+ timelineMediaItemsFactory.replaceWith(\n+ timelineItems = it,\n+ )\n+ }\n+ }.flatMapLatest {\n+ timelineMediaItemsFactory.timelineItems\n+ }.map { timelineItems ->\n+ mediaItemsPostProcessor.process(mediaItems = timelineItems)\n+ }.onEach { groupedMediaItems ->\n+ groupedMediaItemsFlow.emit(AsyncData.Success(groupedMediaItems))\n+ }\n+ .onCompletion {\n+ timeline?.close()\n+ }\n+ .launchIn(room.roomCoroutineScope)\n+ }\n+\n+ override suspend fun loadMore(direction: Timeline.PaginationDirection) {\n+ timeline?.paginate(direction)\n+ }\n+\n+ override suspend fun deleteItem(eventId: EventId) {\n+ timeline?.redactEvent(\n+ eventOrTransactionId = eventId.toEventOrTransactionId(),\n+ reason = null,\n+ )\n+ }\n+}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt\nindex f9d1e9c5472..476e86c5c58 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt\n@@ -9,15 +9,12 @@ package io.element.android.libraries.mediaviewer.impl.gallery\n \n import android.content.ActivityNotFoundException\n import androidx.compose.runtime.Composable\n-import androidx.compose.runtime.DisposableEffect\n import androidx.compose.runtime.LaunchedEffect\n import androidx.compose.runtime.collectAsState\n-import androidx.compose.runtime.derivedStateOf\n import androidx.compose.runtime.getValue\n import androidx.compose.runtime.mutableStateOf\n import androidx.compose.runtime.remember\n import androidx.compose.runtime.rememberCoroutineScope\n-import androidx.compose.runtime.rememberUpdatedState\n import androidx.compose.runtime.setValue\n import dagger.assisted.Assisted\n import dagger.assisted.AssistedFactory\n@@ -33,30 +30,21 @@ import io.element.android.libraries.matrix.api.media.MatrixMediaLoader\n import io.element.android.libraries.matrix.api.room.MatrixRoom\n import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOther\n import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOwn\n-import io.element.android.libraries.matrix.api.timeline.Timeline\n-import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId\n import io.element.android.libraries.mediaviewer.api.local.LocalMedia\n import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory\n import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState\n import io.element.android.libraries.mediaviewer.impl.local.LocalMediaActions\n import io.element.android.libraries.ui.strings.CommonStrings\n-import kotlinx.collections.immutable.ImmutableList\n-import kotlinx.coroutines.CoroutineScope\n-import kotlinx.coroutines.flow.flowOf\n-import kotlinx.coroutines.flow.launchIn\n-import kotlinx.coroutines.flow.map\n-import kotlinx.coroutines.flow.onEach\n import kotlinx.coroutines.launch\n \n class MediaGalleryPresenter @AssistedInject constructor(\n @Assisted private val navigator: MediaGalleryNavigator,\n private val room: MatrixRoom,\n- private val timelineMediaItemsFactory: TimelineMediaItemsFactory,\n+ private val mediaGalleryDataSource: MediaGalleryDataSource,\n private val localMediaFactory: LocalMediaFactory,\n private val mediaLoader: MatrixMediaLoader,\n private val localMediaActions: LocalMediaActions,\n private val snackbarDispatcher: SnackbarDispatcher,\n- private val mediaItemsPostProcessor: MediaItemsPostProcessor,\n ) : Presenter {\n @AssistedFactory\n interface Factory {\n@@ -74,39 +62,17 @@ class MediaGalleryPresenter @AssistedInject constructor(\n \n var mediaBottomSheetState by remember { mutableStateOf(MediaBottomSheetState.Hidden) }\n \n- var mediaItems by remember {\n- mutableStateOf>>(AsyncData.Uninitialized)\n- }\n val groupedMediaItems by remember {\n- derivedStateOf {\n- mediaItemsPostProcessor.process(\n- mediaItems = mediaItems,\n- )\n- }\n+ mediaGalleryDataSource.groupedMediaItemsFlow()\n }\n- val snackbarMessage by snackbarDispatcher.collectSnackbarMessageAsState()\n- localMediaActions.Configure()\n+ .collectAsState(AsyncData.Uninitialized)\n \n- var timeline by remember { mutableStateOf>(AsyncData.Uninitialized) }\n LaunchedEffect(Unit) {\n- room.mediaTimeline()\n- .fold(\n- { timeline = AsyncData.Success(it) },\n- { timeline = AsyncData.Failure(it) },\n- )\n- }\n- DisposableEffect(Unit) {\n- onDispose {\n- timeline.dataOrNull()?.close()\n- }\n+ mediaGalleryDataSource.start()\n }\n \n- MediaListEffect(\n- timeline = timeline,\n- onItemsChange = { newItems ->\n- mediaItems = newItems\n- }\n- )\n+ val snackbarMessage by snackbarDispatcher.collectSnackbarMessageAsState()\n+ localMediaActions.Configure()\n \n fun handleEvents(event: MediaGalleryEvents) {\n when (event) {\n@@ -114,16 +80,18 @@ class MediaGalleryPresenter @AssistedInject constructor(\n mode = event.mode\n }\n is MediaGalleryEvents.LoadMore -> coroutineScope.launch {\n- timeline.dataOrNull()?.paginate(event.direction)\n+ mediaGalleryDataSource.loadMore(event.direction)\n+ }\n+ is MediaGalleryEvents.Delete -> coroutineScope.launch {\n+ mediaGalleryDataSource.deleteItem(event.eventId)\n }\n- is MediaGalleryEvents.Delete -> coroutineScope.delete(timeline, event.eventId)\n is MediaGalleryEvents.SaveOnDisk -> coroutineScope.launch {\n- mediaItems.dataOrNull().find(event.eventId)?.let {\n+ groupedMediaItems.dataOrNull().find(event.eventId)?.let {\n saveOnDisk(it)\n }\n }\n is MediaGalleryEvents.Share -> coroutineScope.launch {\n- mediaItems.dataOrNull().find(event.eventId)?.let {\n+ groupedMediaItems.dataOrNull().find(event.eventId)?.let {\n share(it)\n }\n }\n@@ -172,49 +140,6 @@ class MediaGalleryPresenter @AssistedInject constructor(\n )\n }\n \n- @Composable\n- private fun MediaListEffect(\n- timeline: AsyncData,\n- onItemsChange: (AsyncData>) -> Unit,\n- ) {\n- val updatedOnItemsChange by rememberUpdatedState(onItemsChange)\n-\n- LaunchedEffect(timeline) {\n- when (timeline) {\n- AsyncData.Uninitialized -> flowOf(AsyncData.Uninitialized)\n- is AsyncData.Failure -> flowOf(AsyncData.Failure(timeline.error))\n- is AsyncData.Loading -> flowOf(AsyncData.Loading())\n- is AsyncData.Success -> {\n- timeline.data.timelineItems\n- .onEach { items ->\n- timelineMediaItemsFactory.replaceWith(\n- timelineItems = items,\n- )\n- }\n- .launchIn(this)\n-\n- timelineMediaItemsFactory.timelineItems.map { timelineItems ->\n- AsyncData.Success(timelineItems)\n- }\n- }\n- }\n- .onEach { items ->\n- updatedOnItemsChange(items)\n- }\n- .launchIn(this)\n- }\n- }\n-\n- private fun CoroutineScope.delete(\n- timeline: AsyncData,\n- eventId: EventId,\n- ) = launch {\n- timeline.dataOrNull()?.redactEvent(\n- eventOrTransactionId = eventId.toEventOrTransactionId(),\n- reason = null,\n- )\n- }\n-\n private suspend fun downloadMedia(mediaItem: MediaItem.Event): Result {\n return mediaLoader.downloadMediaFile(\n source = mediaItem.mediaSource(),\n@@ -264,10 +189,10 @@ class MediaGalleryPresenter @AssistedInject constructor(\n }\n }\n \n-private fun List?.find(eventId: EventId?): MediaItem.Event? {\n+private fun GroupedMediaItems?.find(eventId: EventId?): MediaItem.Event? {\n if (this == null || eventId == null) {\n return null\n }\n- return filterIsInstance()\n+ return (imageAndVideoItems + fileItems).filterIsInstance()\n .firstOrNull { it.eventId() == eventId }\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryStateProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryStateProvider.kt\nindex 949c8818147..5a1b5fcca80 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryStateProvider.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryStateProvider.kt\n@@ -122,7 +122,7 @@ private fun aMediaGalleryState(\n eventSink = {}\n )\n \n-private fun aGroupedMediaItems(\n+fun aGroupedMediaItems(\n imageAndVideoItems: List = emptyList(),\n fileItems: List = emptyList(),\n ) = GroupedMediaItems(\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt\nindex bcd9b2a2388..3f5e1fc1072 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt\n@@ -108,15 +108,15 @@ fun MediaGalleryView(\n ) { paddingValues ->\n Column(\n modifier = Modifier\n- .padding(paddingValues)\n- .consumeWindowInsets(paddingValues)\n- .fillMaxSize(),\n+ .padding(paddingValues)\n+ .consumeWindowInsets(paddingValues)\n+ .fillMaxSize(),\n verticalArrangement = Arrangement.spacedBy(2.dp),\n ) {\n SingleChoiceSegmentedButtonRow(\n modifier = Modifier\n- .fillMaxWidth()\n- .padding(horizontal = 16.dp),\n+ .fillMaxWidth()\n+ .padding(horizontal = 16.dp),\n ) {\n MediaGalleryMode.entries.forEach { mode ->\n SegmentedButton(\n@@ -137,7 +137,6 @@ fun MediaGalleryView(\n HorizontalPager(\n state = pagerState,\n userScrollEnabled = false,\n- modifier = Modifier,\n ) { page ->\n val mode = MediaGalleryMode.entries[page]\n MediaGalleryPage(\n@@ -198,6 +197,13 @@ private fun MediaGalleryPage(\n ) {\n val groupedMediaItems = state.groupedMediaItems\n if (groupedMediaItems.isLoadingItems(mode)) {\n+ // Need to trigger a pagination now if there is only one LoadingIndicator.\n+ val loadingItem = groupedMediaItems.dataOrNull()?.getItems(mode)?.singleOrNull() as? MediaItem.LoadingIndicator\n+ if (loadingItem != null) {\n+ LaunchedEffect(loadingItem.timestamp) {\n+ state.eventSink(MediaGalleryEvents.LoadMore(loadingItem.direction))\n+ }\n+ }\n LoadingContent(mode)\n } else {\n when (groupedMediaItems) {\n@@ -348,8 +354,8 @@ private fun MediaGalleryImageGrid(\n ) {\n LazyVerticalGrid(\n modifier = Modifier\n- .fillMaxSize()\n- .padding(horizontal = 16.dp),\n+ .fillMaxSize()\n+ .padding(horizontal = 16.dp),\n columns = GridCells.Adaptive(80.dp),\n horizontalArrangement = Arrangement.spacedBy(4.dp),\n verticalArrangement = Arrangement.spacedBy(4.dp),\n@@ -420,9 +426,9 @@ private fun LoadingMoreIndicator(\n Timeline.PaginationDirection.FORWARDS -> {\n LinearProgressIndicator(\n modifier = Modifier\n- .fillMaxWidth()\n- .padding(top = 2.dp)\n- .height(1.dp)\n+ .fillMaxWidth()\n+ .padding(top = 2.dp)\n+ .height(1.dp)\n )\n }\n Timeline.PaginationDirection.BACKWARDS -> {\n@@ -460,9 +466,9 @@ private fun EmptyContent(\n OnboardingBackground()\n PageTitle(\n modifier = Modifier\n- .fillMaxWidth()\n- .padding(top = 44.dp)\n- .padding(24.dp),\n+ .fillMaxWidth()\n+ .padding(top = 44.dp)\n+ .padding(24.dp),\n title = stringResource(titleRes),\n iconStyle = BigIcon.Style.Default(icon),\n subtitle = stringResource(subtitleRes),\n@@ -480,9 +486,9 @@ private fun LoadingContent(\n OnboardingBackground()\n Column(\n modifier = Modifier\n- .fillMaxSize()\n- .padding(top = 48.dp)\n- .padding(24.dp),\n+ .fillMaxSize()\n+ .padding(top = 48.dp)\n+ .padding(24.dp),\n verticalArrangement = Arrangement.spacedBy(16.dp),\n horizontalAlignment = Alignment.CenterHorizontally,\n ) {\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItem.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItem.kt\nindex 2f2054ebe06..e1bd4d779ac 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItem.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItem.kt\n@@ -13,7 +13,6 @@ import io.element.android.libraries.matrix.api.media.MediaSource\n import io.element.android.libraries.matrix.api.timeline.Timeline\n import io.element.android.libraries.matrix.ui.media.MediaRequestData\n import io.element.android.libraries.mediaviewer.api.MediaInfo\n-import kotlinx.collections.immutable.ImmutableList\n \n sealed interface MediaItem {\n data class DateSeparator(\n@@ -46,7 +45,6 @@ sealed interface MediaItem {\n val mediaInfo: MediaInfo,\n val mediaSource: MediaSource,\n val thumbnailSource: MediaSource?,\n- val duration: String?,\n ) : Event {\n val thumbnailMediaRequestData: MediaRequestData\n get() = MediaRequestData(thumbnailSource ?: mediaSource, MediaRequestData.Kind.Thumbnail(100))\n@@ -64,8 +62,6 @@ sealed interface MediaItem {\n val eventId: EventId?,\n val mediaInfo: MediaInfo,\n val mediaSource: MediaSource,\n- val duration: String?,\n- val waveform: ImmutableList,\n ) : Event\n \n data class File(\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessor.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessor.kt\nindex e5de5bbd58e..3fb8d81b1fd 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessor.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessor.kt\n@@ -7,32 +7,19 @@\n \n package io.element.android.libraries.mediaviewer.impl.gallery\n \n-import io.element.android.libraries.architecture.AsyncData\n-import kotlinx.collections.immutable.ImmutableList\n import kotlinx.collections.immutable.toImmutableList\n import javax.inject.Inject\n \n class MediaItemsPostProcessor @Inject constructor() {\n fun process(\n- mediaItems: AsyncData>,\n- ): AsyncData {\n- return when (mediaItems) {\n- is AsyncData.Uninitialized -> AsyncData.Uninitialized\n- is AsyncData.Loading -> AsyncData.Loading()\n- is AsyncData.Failure -> AsyncData.Failure(mediaItems.error)\n- is AsyncData.Success -> AsyncData.Success(\n- mediaItems.data.process()\n- )\n- }\n- }\n-\n- private fun List.process(): GroupedMediaItems {\n+ mediaItems: List,\n+ ): GroupedMediaItems {\n val imageAndVideoItems = mutableListOf()\n val fileItems = mutableListOf()\n \n val imageAndVideoItemsSubList = mutableListOf()\n val fileItemsSublist = mutableListOf()\n- forEach { item ->\n+ mediaItems.forEach { item ->\n when (item) {\n is MediaItem.DateSeparator -> {\n if (imageAndVideoItemsSubList.isNotEmpty()) {\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/SingleMediaGalleryDataSource.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/SingleMediaGalleryDataSource.kt\nnew file mode 100644\nindex 00000000000..8e6b708a7f1\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/SingleMediaGalleryDataSource.kt\n@@ -0,0 +1,85 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.gallery\n+\n+import io.element.android.libraries.architecture.AsyncData\n+import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeAudio\n+import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeImage\n+import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeVideo\n+import io.element.android.libraries.matrix.api.core.EventId\n+import io.element.android.libraries.matrix.api.core.UniqueId\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint\n+import kotlinx.collections.immutable.persistentListOf\n+import kotlinx.coroutines.flow.flowOf\n+\n+class SingleMediaGalleryDataSource(\n+ private val data: GroupedMediaItems,\n+) : MediaGalleryDataSource {\n+ override fun start() = Unit\n+ override fun groupedMediaItemsFlow() = flowOf(AsyncData.Success(data))\n+ override fun getLastData(): AsyncData = AsyncData.Success(data)\n+ override suspend fun loadMore(direction: Timeline.PaginationDirection) = Unit\n+ override suspend fun deleteItem(eventId: EventId) = Unit\n+\n+ companion object {\n+ fun createFrom(params: MediaViewerEntryPoint.Params) = SingleMediaGalleryDataSource(\n+ data = when {\n+ params.mediaInfo.mimeType.isMimeTypeImage() -> {\n+ MediaItem.Image(\n+ id = UniqueId(\"dummy\"),\n+ eventId = params.eventId,\n+ mediaInfo = params.mediaInfo,\n+ mediaSource = params.mediaSource,\n+ thumbnailSource = params.thumbnailSource,\n+ )\n+ }\n+ params.mediaInfo.mimeType.isMimeTypeVideo() -> {\n+ MediaItem.Video(\n+ id = UniqueId(\"dummy\"),\n+ eventId = params.eventId,\n+ mediaInfo = params.mediaInfo,\n+ mediaSource = params.mediaSource,\n+ thumbnailSource = params.thumbnailSource,\n+ )\n+ }\n+ params.mediaInfo.mimeType.isMimeTypeAudio() -> {\n+ if (params.mediaInfo.waveform == null) {\n+ MediaItem.Audio(\n+ id = UniqueId(\"dummy\"),\n+ eventId = params.eventId,\n+ mediaInfo = params.mediaInfo,\n+ mediaSource = params.mediaSource,\n+ )\n+ } else {\n+ MediaItem.Voice(\n+ id = UniqueId(\"dummy\"),\n+ eventId = params.eventId,\n+ mediaInfo = params.mediaInfo,\n+ mediaSource = params.mediaSource,\n+ )\n+ }\n+ }\n+ else -> {\n+ MediaItem.File(\n+ id = UniqueId(\"dummy\"),\n+ eventId = params.eventId,\n+ mediaInfo = params.mediaInfo,\n+ mediaSource = params.mediaSource,\n+ )\n+ }\n+ }.let { mediaItem ->\n+ GroupedMediaItems(\n+ // Always use imageAndVideoItems, in Single mode, this is the data that will be used\n+ imageAndVideoItems = persistentListOf(mediaItem),\n+ fileItems = persistentListOf(),\n+ )\n+ }\n+ )\n+ }\n+}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryRootNode.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryRootNode.kt\nindex 357e314d1c5..71a4057f4b1 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryRootNode.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryRootNode.kt\n@@ -60,6 +60,7 @@ class MediaGalleryRootNode @AssistedInject constructor(\n \n @Parcelize\n data class MediaViewer(\n+ val mode: MediaViewerEntryPoint.MediaViewerMode,\n val eventId: EventId?,\n val mediaInfo: MediaInfo,\n val mediaSource: MediaSource,\n@@ -92,8 +93,16 @@ class MediaGalleryRootNode @AssistedInject constructor(\n }\n \n override fun onItemClick(item: MediaItem.Event) {\n+ val mode = when (item) {\n+ is MediaItem.Audio,\n+ is MediaItem.Voice,\n+ is MediaItem.File -> MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios\n+ is MediaItem.Image,\n+ is MediaItem.Video -> MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos\n+ }\n overlay.show(\n NavTarget.MediaViewer(\n+ mode = mode,\n eventId = item.eventId(),\n mediaInfo = item.mediaInfo(),\n mediaSource = item.mediaSource(),\n@@ -117,6 +126,7 @@ class MediaGalleryRootNode @AssistedInject constructor(\n mediaViewerEntryPoint.nodeBuilder(this, buildContext)\n .params(\n MediaViewerEntryPoint.Params(\n+ mode = navTarget.mode,\n eventId = navTarget.eventId,\n mediaInfo = navTarget.mediaInfo,\n mediaSource = navTarget.mediaSource,\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemFileProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemFileProvider.kt\nindex 99fcb790c43..c80e287c301 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemFileProvider.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemFileProvider.kt\n@@ -9,6 +9,7 @@ package io.element.android.libraries.mediaviewer.impl.gallery.ui\n \n import androidx.compose.ui.tooling.preview.PreviewParameterProvider\n import io.element.android.libraries.core.preview.loremIpsum\n+import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.core.UniqueId\n import io.element.android.libraries.matrix.api.media.MediaSource\n import io.element.android.libraries.mediaviewer.api.aPdfMediaInfo\n@@ -30,12 +31,13 @@ class MediaItemFileProvider : PreviewParameterProvider {\n \n fun aMediaItemFile(\n id: UniqueId = UniqueId(\"fileId\"),\n+ eventId: EventId? = null,\n filename: String = \"filename\",\n caption: String? = null,\n ): MediaItem.File {\n return MediaItem.File(\n id = id,\n- eventId = null,\n+ eventId = eventId,\n mediaInfo = aPdfMediaInfo(\n filename = filename,\n caption = caption,\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemImageProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemImageProvider.kt\nindex 2ed781c7aee..ceb934fbe2b 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemImageProvider.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemImageProvider.kt\n@@ -18,6 +18,7 @@ fun aMediaItemImage(\n id: UniqueId = UniqueId(\"imageId\"),\n eventId: EventId? = null,\n senderId: UserId? = null,\n+ mediaSourceUrl: String = \"\",\n ): MediaItem.Image {\n return MediaItem.Image(\n id = id,\n@@ -25,7 +26,7 @@ fun aMediaItemImage(\n mediaInfo = anImageMediaInfo(\n senderId = senderId,\n ),\n- mediaSource = MediaSource(\"\"),\n+ mediaSource = MediaSource(mediaSourceUrl),\n thumbnailSource = null,\n )\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemLoadingIndicatorProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemLoadingIndicatorProvider.kt\nindex 546d2f0127c..2c788983255 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemLoadingIndicatorProvider.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemLoadingIndicatorProvider.kt\n@@ -13,10 +13,11 @@ import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n \n fun aMediaItemLoadingIndicator(\n id: UniqueId = UniqueId(\"loadingId\"),\n+ direction: Timeline.PaginationDirection = Timeline.PaginationDirection.BACKWARDS,\n ): MediaItem.LoadingIndicator {\n return MediaItem.LoadingIndicator(\n id = id,\n- direction = Timeline.PaginationDirection.BACKWARDS,\n+ direction = direction,\n timestamp = 123,\n )\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVideoProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVideoProvider.kt\nindex 47642d48374..8e59b925b75 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVideoProvider.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVideoProvider.kt\n@@ -31,9 +31,10 @@ fun aMediaItemVideo(\n return MediaItem.Video(\n id = id,\n eventId = null,\n- mediaInfo = aVideoMediaInfo(),\n+ mediaInfo = aVideoMediaInfo(\n+ duration = duration\n+ ),\n mediaSource = mediaSource,\n thumbnailSource = null,\n- duration = duration,\n )\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVoiceProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVoiceProvider.kt\nindex c84a74c7a1f..43e04491de4 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVoiceProvider.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVoiceProvider.kt\n@@ -14,7 +14,6 @@ import io.element.android.libraries.matrix.api.core.UniqueId\n import io.element.android.libraries.matrix.api.media.MediaSource\n import io.element.android.libraries.mediaviewer.api.aVoiceMediaInfo\n import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n-import kotlinx.collections.immutable.toImmutableList\n \n class MediaItemVoiceProvider : PreviewParameterProvider {\n override val values: Sequence\n@@ -46,9 +45,9 @@ fun aMediaItemVoice(\n mediaInfo = aVoiceMediaInfo(\n filename = filename,\n caption = caption,\n+ duration = duration,\n+ waveForm = waveform,\n ),\n mediaSource = MediaSource(\"\"),\n- duration = duration,\n- waveform = waveform.toImmutableList(),\n )\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VideoItemView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VideoItemView.kt\nindex 0adeabd20f3..6b394e7c55c 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VideoItemView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VideoItemView.kt\n@@ -101,10 +101,10 @@ private fun VideoInfoRow(\n imageVector = CompoundIcons.VideoCallSolid(),\n contentDescription = null\n )\n- if (video.duration != null) {\n+ video.mediaInfo.duration?.let { duration ->\n Spacer(Modifier.weight(1f))\n Text(\n- text = video.duration,\n+ text = duration,\n style = ElementTheme.typography.fontBodySmMedium,\n color = ElementTheme.colors.textPrimary,\n )\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VoiceItemView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VoiceItemView.kt\nindex a5f55875bd8..d34555e1758 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VoiceItemView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VoiceItemView.kt\n@@ -115,7 +115,7 @@ private fun VoiceInfoRow(\n }\n Spacer(Modifier.width(8.dp))\n Text(\n- text = if (state.progress > 0f) state.time else voice.duration ?: state.time,\n+ text = if (state.progress > 0f) state.time else voice.mediaInfo.duration ?: state.time,\n color = ElementTheme.colors.textSecondary,\n style = ElementTheme.typography.fontBodyMdMedium,\n maxLines = 1,\n@@ -128,7 +128,7 @@ private fun VoiceInfoRow(\n .height(34.dp),\n showCursor = state.showCursor,\n playbackProgress = state.progress,\n- waveform = voice.waveform.toPersistentList(),\n+ waveform = voice.mediaInfo.waveform.orEmpty().toPersistentList(),\n onSeek = {\n state.eventSink(VoiceMessageEvents.Seek(it))\n },\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactory.kt\nindex 297ee4dac2b..b7ae566ab11 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactory.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactory.kt\n@@ -48,6 +48,7 @@ class AndroidLocalMediaFactory @Inject constructor(\n dateSent = mediaInfo.dateSent,\n dateSentFull = mediaInfo.dateSentFull,\n waveform = mediaInfo.waveform,\n+ duration = mediaInfo.duration,\n )\n \n override fun createFromUri(\n@@ -67,6 +68,7 @@ class AndroidLocalMediaFactory @Inject constructor(\n dateSent = null,\n dateSentFull = null,\n waveform = null,\n+ duration = null,\n )\n \n private fun createFromUri(\n@@ -81,6 +83,7 @@ class AndroidLocalMediaFactory @Inject constructor(\n dateSent: String?,\n dateSentFull: String?,\n waveform: List?,\n+ duration: String?,\n ): LocalMedia {\n val resolvedMimeType = mimeType ?: context.getMimeType(uri) ?: MimeTypes.OctetStream\n val fileName = name ?: context.getFileName(uri) ?: \"\"\n@@ -100,6 +103,7 @@ class AndroidLocalMediaFactory @Inject constructor(\n dateSent = dateSent,\n dateSentFull = dateSentFull,\n waveform = waveform,\n+ duration = duration,\n )\n )\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaView.kt\nindex 8e90e84a155..8752b19080a 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaView.kt\n@@ -27,6 +27,7 @@ fun LocalMediaView(\n bottomPaddingInPixels: Int,\n onClick: () -> Unit,\n modifier: Modifier = Modifier,\n+ isDisplayed: Boolean = true,\n localMediaViewState: LocalMediaViewState = rememberLocalMediaViewState(),\n mediaInfo: MediaInfo? = localMedia?.info,\n ) {\n@@ -39,6 +40,7 @@ fun LocalMediaView(\n onClick = onClick,\n )\n mimeType.isMimeTypeVideo() -> MediaVideoView(\n+ isDisplayed = isDisplayed,\n localMediaViewState = localMediaViewState,\n bottomPaddingInPixels = bottomPaddingInPixels,\n localMedia = localMedia,\n@@ -51,6 +53,7 @@ fun LocalMediaView(\n onClick = onClick,\n )\n mimeType.isMimeTypeAudio() -> MediaAudioView(\n+ isDisplayed = isDisplayed,\n localMediaViewState = localMediaViewState,\n bottomPaddingInPixels = bottomPaddingInPixels,\n localMedia = localMedia,\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaAudioView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaAudioView.kt\nindex a1ffc169e33..226aa85234e 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaAudioView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaAudioView.kt\n@@ -83,9 +83,11 @@ fun MediaAudioView(\n localMedia: LocalMedia?,\n info: MediaInfo?,\n modifier: Modifier = Modifier,\n+ isDisplayed: Boolean = true,\n ) {\n val exoPlayer = rememberExoPlayer()\n ExoPlayerMediaAudioView(\n+ isDisplayed = isDisplayed,\n localMediaViewState = localMediaViewState,\n bottomPaddingInPixels = bottomPaddingInPixels,\n exoPlayer = exoPlayer,\n@@ -98,6 +100,7 @@ fun MediaAudioView(\n @SuppressLint(\"UnsafeOptInUsageError\")\n @Composable\n private fun ExoPlayerMediaAudioView(\n+ isDisplayed: Boolean,\n localMediaViewState: LocalMediaViewState,\n bottomPaddingInPixels: Int,\n exoPlayer: ExoPlayer,\n@@ -176,6 +179,12 @@ private fun ExoPlayerMediaAudioView(\n )\n }\n }\n+ LaunchedEffect(isDisplayed) {\n+ // If not displayed, make sure to pause the audio\n+ if (!isDisplayed) {\n+ exoPlayer.pause()\n+ }\n+ }\n if (localMedia?.uri != null) {\n LaunchedEffect(localMedia.uri) {\n val mediaItem = MediaItem.fromUri(localMedia.uri)\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerView.kt\nindex 3d1cef88e80..67868be7dc4 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerView.kt\n@@ -26,7 +26,6 @@ import androidx.compose.runtime.setValue\n import androidx.compose.ui.Alignment\n import androidx.compose.ui.Modifier\n import androidx.compose.ui.draw.clip\n-import androidx.compose.ui.graphics.Color\n import androidx.compose.ui.res.stringResource\n import androidx.compose.ui.text.style.TextAlign\n import androidx.compose.ui.tooling.preview.PreviewParameter\n@@ -40,6 +39,7 @@ import io.element.android.libraries.designsystem.theme.components.Icon\n import io.element.android.libraries.designsystem.theme.components.IconButton\n import io.element.android.libraries.designsystem.theme.components.Slider\n import io.element.android.libraries.designsystem.theme.components.Text\n+import io.element.android.libraries.mediaviewer.impl.util.bgCanvasWithTransparency\n import io.element.android.libraries.ui.strings.CommonStrings\n \n @Composable\n@@ -58,7 +58,7 @@ fun MediaPlayerControllerView(\n ) {\n Box(\n modifier = Modifier\n- .background(color = Color(0x99101317))\n+ .background(color = bgCanvasWithTransparency)\n .padding(horizontal = 8.dp, vertical = 4.dp),\n contentAlignment = Alignment.Center,\n ) {\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/video/MediaVideoView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/video/MediaVideoView.kt\nindex 5dd7427e1a5..934f7e8352d 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/video/MediaVideoView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/video/MediaVideoView.kt\n@@ -57,6 +57,7 @@ import kotlin.time.Duration.Companion.seconds\n @SuppressLint(\"UnsafeOptInUsageError\")\n @Composable\n fun MediaVideoView(\n+ isDisplayed: Boolean,\n localMediaViewState: LocalMediaViewState,\n bottomPaddingInPixels: Int,\n localMedia: LocalMedia?,\n@@ -64,6 +65,7 @@ fun MediaVideoView(\n ) {\n val exoPlayer = rememberExoPlayer()\n ExoPlayerMediaVideoView(\n+ isDisplayed = isDisplayed,\n localMediaViewState = localMediaViewState,\n bottomPaddingInPixels = bottomPaddingInPixels,\n exoPlayer = exoPlayer,\n@@ -75,6 +77,7 @@ fun MediaVideoView(\n @SuppressLint(\"UnsafeOptInUsageError\")\n @Composable\n private fun ExoPlayerMediaVideoView(\n+ isDisplayed: Boolean,\n localMediaViewState: LocalMediaViewState,\n bottomPaddingInPixels: Int,\n exoPlayer: ExoPlayer,\n@@ -161,6 +164,12 @@ private fun ExoPlayerMediaVideoView(\n )\n }\n }\n+ LaunchedEffect(isDisplayed) {\n+ // If not displayed, make sure to pause the video\n+ if (!isDisplayed) {\n+ exoPlayer.pause()\n+ }\n+ }\n if (localMedia?.uri != null) {\n LaunchedEffect(localMedia.uri) {\n val mediaItem = MediaItem.fromUri(localMedia.uri)\n@@ -245,6 +254,7 @@ private fun ExoPlayerMediaVideoView(\n @Composable\n internal fun MediaVideoViewPreview() = ElementPreview {\n MediaVideoView(\n+ isDisplayed = true,\n modifier = Modifier.fillMaxSize(),\n bottomPaddingInPixels = 0,\n localMediaViewState = rememberLocalMediaViewState(),\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/Colors.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/Colors.kt\nnew file mode 100644\nindex 00000000000..5105f1ba9b1\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/Colors.kt\n@@ -0,0 +1,16 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.util\n+\n+import androidx.compose.runtime.Composable\n+import androidx.compose.ui.graphics.Color\n+import io.element.android.compound.theme.ElementTheme\n+\n+val bgCanvasWithTransparency: Color\n+ @Composable\n+ get() = ElementTheme.colors.bgCanvasDefault.copy(alpha = 0.6f)\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSource.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSource.kt\nnew file mode 100644\nindex 00000000000..b185834c3e4\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSource.kt\n@@ -0,0 +1,175 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.viewer\n+\n+import androidx.annotation.VisibleForTesting\n+import androidx.compose.runtime.Composable\n+import androidx.compose.runtime.MutableState\n+import androidx.compose.runtime.State\n+import androidx.compose.runtime.collectAsState\n+import androidx.compose.runtime.mutableStateOf\n+import androidx.compose.runtime.remember\n+import io.element.android.libraries.architecture.AsyncData\n+import io.element.android.libraries.matrix.api.media.MatrixMediaLoader\n+import io.element.android.libraries.matrix.api.media.MediaFile\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.libraries.mediaviewer.api.local.LocalMedia\n+import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory\n+import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryDataSource\n+import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryMode\n+import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.gallery.eventId\n+import io.element.android.libraries.mediaviewer.impl.gallery.mediaInfo\n+import io.element.android.libraries.mediaviewer.impl.gallery.mediaSource\n+import io.element.android.libraries.mediaviewer.impl.gallery.thumbnailSource\n+import io.element.android.services.toolbox.api.systemclock.SystemClock\n+import kotlinx.collections.immutable.PersistentList\n+import kotlinx.collections.immutable.persistentListOf\n+import kotlinx.collections.immutable.toPersistentList\n+import kotlinx.coroutines.CoroutineDispatcher\n+import kotlinx.coroutines.flow.Flow\n+import kotlinx.coroutines.flow.map\n+import kotlinx.coroutines.withContext\n+import timber.log.Timber\n+\n+class MediaViewerDataSource(\n+ private val galleryMode: MediaGalleryMode,\n+ private val dispatcher: CoroutineDispatcher,\n+ private val galleryDataSource: MediaGalleryDataSource,\n+ private val mediaLoader: MatrixMediaLoader,\n+ private val localMediaFactory: LocalMediaFactory,\n+ private val systemClock: SystemClock,\n+) {\n+ // List of media files that are currently being loaded\n+ private val mediaFiles: MutableList = mutableListOf()\n+\n+ // Map of sourceUrl to local media state\n+ private val localMediaStates: MutableMap>> =\n+ mutableMapOf()\n+\n+ fun setup() {\n+ galleryDataSource.start()\n+ }\n+\n+ fun dispose() {\n+ mediaFiles.forEach { it.close() }\n+ mediaFiles.clear()\n+ localMediaStates.clear()\n+ }\n+\n+ @Composable\n+ fun collectAsState(): State> {\n+ return remember { dataFlow() }.collectAsState(initialData())\n+ }\n+\n+ @VisibleForTesting\n+ fun dataFlow(): Flow> {\n+ return galleryDataSource.groupedMediaItemsFlow()\n+ .map { groupedItems ->\n+ when (groupedItems) {\n+ AsyncData.Uninitialized,\n+ is AsyncData.Loading -> {\n+ persistentListOf(\n+ MediaViewerPageData.Loading(\n+ direction = Timeline.PaginationDirection.BACKWARDS,\n+ timestamp = systemClock.epochMillis(),\n+ )\n+ )\n+ }\n+ is AsyncData.Failure -> {\n+ persistentListOf(\n+ MediaViewerPageData.Failure(groupedItems.error),\n+ )\n+ }\n+ is AsyncData.Success -> {\n+ withContext(dispatcher) {\n+ val mediaItems = groupedItems.data.getItems(galleryMode)\n+ buildMediaViewerPageList(mediaItems)\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ private fun initialData(): PersistentList {\n+ val initialMediaItems =\n+ galleryDataSource.getLastData().dataOrNull()?.getItems(galleryMode).orEmpty()\n+ return buildMediaViewerPageList(initialMediaItems)\n+ }\n+\n+ /**\n+ * Build a list of [MediaViewerPageData] from a list of [MediaItem].\n+ * In particular, create a mutable state of AsyncData for each media item, which\n+ * will be used to render the downloaded media (see [loadMedia] which will update this value).\n+ */\n+ private fun buildMediaViewerPageList(groupedItems: List) = buildList {\n+ groupedItems.forEach { mediaItem ->\n+ when (mediaItem) {\n+ is MediaItem.DateSeparator -> Unit\n+ is MediaItem.Event -> {\n+ val sourceUrl = mediaItem.mediaSource().url\n+ val localMedia = localMediaStates.getOrPut(sourceUrl) {\n+ mutableStateOf(AsyncData.Uninitialized)\n+ }\n+ add(\n+ MediaViewerPageData.MediaViewerData(\n+ eventId = mediaItem.eventId(),\n+ mediaInfo = mediaItem.mediaInfo(),\n+ mediaSource = mediaItem.mediaSource(),\n+ thumbnailSource = mediaItem.thumbnailSource(),\n+ downloadedMedia = localMedia,\n+ )\n+ )\n+ }\n+ is MediaItem.LoadingIndicator -> add(\n+ MediaViewerPageData.Loading(\n+ direction = mediaItem.direction,\n+ timestamp = systemClock.epochMillis(),\n+ )\n+ )\n+ }\n+ }\n+ }.toPersistentList()\n+\n+ fun clearLoadingError(data: MediaViewerPageData.MediaViewerData) {\n+ localMediaStates[data.mediaSource.url]?.value = AsyncData.Uninitialized\n+ }\n+\n+ suspend fun loadMore(direction: Timeline.PaginationDirection) {\n+ galleryDataSource.loadMore(direction)\n+ }\n+\n+ suspend fun loadMedia(data: MediaViewerPageData.MediaViewerData) {\n+ Timber.d(\"loadMedia for ${data.eventId}\")\n+ val localMediaState = localMediaStates.getOrPut(data.mediaSource.url) {\n+ mutableStateOf(AsyncData.Uninitialized)\n+ }\n+ localMediaState.value = AsyncData.Loading()\n+ mediaLoader\n+ .downloadMediaFile(\n+ source = data.mediaSource,\n+ mimeType = data.mediaInfo.mimeType,\n+ filename = data.mediaInfo.filename\n+ )\n+ .onSuccess { mediaFile ->\n+ mediaFiles.add(mediaFile)\n+ }\n+ .mapCatching { mediaFile ->\n+ localMediaFactory.createFromMediaFile(\n+ mediaFile = mediaFile,\n+ mediaInfo = data.mediaInfo\n+ )\n+ }\n+ .onSuccess {\n+ localMediaState.value = AsyncData.Success(it)\n+ }\n+ .onFailure {\n+ localMediaState.value = AsyncData.Failure(it)\n+ }\n+ }\n+}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerEvents.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerEvents.kt\nindex f9fb32d3250..708c423d363 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerEvents.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerEvents.kt\n@@ -8,16 +8,23 @@\n package io.element.android.libraries.mediaviewer.impl.viewer\n \n import io.element.android.libraries.matrix.api.core.EventId\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n \n sealed interface MediaViewerEvents {\n- data object SaveOnDisk : MediaViewerEvents\n- data object Share : MediaViewerEvents\n- data object OpenWith : MediaViewerEvents\n- data object RetryLoading : MediaViewerEvents\n- data object ClearLoadingError : MediaViewerEvents\n+ data class LoadMedia(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents\n+ data class SaveOnDisk(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents\n+ data class Share(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents\n+ data class OpenWith(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents\n+ data class ClearLoadingError(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents\n data class ViewInTimeline(val eventId: EventId) : MediaViewerEvents\n- data object OpenInfo : MediaViewerEvents\n- data class ConfirmDelete(val eventId: EventId) : MediaViewerEvents\n+ data class OpenInfo(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents\n+ data class ConfirmDelete(\n+ val eventId: EventId,\n+ val data: MediaViewerPageData.MediaViewerData,\n+ ) : MediaViewerEvents\n+\n data object CloseBottomSheet : MediaViewerEvents\n data class Delete(val eventId: EventId) : MediaViewerEvents\n+ data class OnNavigateTo(val index: Int) : MediaViewerEvents\n+ data class LoadMore(val direction: Timeline.PaginationDirection) : MediaViewerEvents\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerFlickToDismiss.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerFlickToDismiss.kt\nnew file mode 100644\nindex 00000000000..1b99cdfa03c\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerFlickToDismiss.kt\n@@ -0,0 +1,95 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.viewer\n+\n+import androidx.compose.animation.core.animateFloatAsState\n+import androidx.compose.foundation.background\n+import androidx.compose.foundation.layout.BoxScope\n+import androidx.compose.runtime.Composable\n+import androidx.compose.runtime.LaunchedEffect\n+import androidx.compose.runtime.getValue\n+import androidx.compose.runtime.rememberUpdatedState\n+import androidx.compose.ui.Modifier\n+import androidx.compose.ui.graphics.Color\n+import io.element.android.compound.theme.ElementTheme\n+import kotlinx.coroutines.delay\n+import me.saket.telephoto.flick.FlickToDismiss\n+import me.saket.telephoto.flick.FlickToDismissState\n+import me.saket.telephoto.flick.rememberFlickToDismissState\n+import kotlin.time.Duration\n+\n+@Composable\n+fun MediaViewerFlickToDismiss(\n+ onDismiss: () -> Unit,\n+ modifier: Modifier = Modifier,\n+ onDragging: () -> Unit = {},\n+ onResetting: () -> Unit = {},\n+ content: @Composable BoxScope.() -> Unit,\n+) {\n+ val flickState = rememberFlickToDismissState(dismissThresholdRatio = 0.1f, rotateOnDrag = false)\n+ DismissFlickEffects(\n+ flickState = flickState,\n+ onDismissing = { animationDuration ->\n+ delay(animationDuration / 3)\n+ onDismiss()\n+ },\n+ onDragging = onDragging,\n+ onResetting = onResetting,\n+ )\n+ FlickToDismiss(\n+ state = flickState,\n+ modifier = modifier.background(backgroundColorFor(flickState)),\n+ content = content,\n+ )\n+}\n+\n+@Composable\n+private fun DismissFlickEffects(\n+ flickState: FlickToDismissState,\n+ onDismissing: suspend (Duration) -> Unit,\n+ onDragging: suspend () -> Unit,\n+ onResetting: suspend () -> Unit,\n+) {\n+ val currentOnDismissing by rememberUpdatedState(onDismissing)\n+ val currentOnDragging by rememberUpdatedState(onDragging)\n+ val currentOnResetting by rememberUpdatedState(onResetting)\n+\n+ when (val gestureState = flickState.gestureState) {\n+ is FlickToDismissState.GestureState.Dismissing -> {\n+ LaunchedEffect(Unit) {\n+ currentOnDismissing(gestureState.animationDuration)\n+ }\n+ }\n+ is FlickToDismissState.GestureState.Dragging -> {\n+ LaunchedEffect(Unit) {\n+ currentOnDragging()\n+ }\n+ }\n+ is FlickToDismissState.GestureState.Resetting -> {\n+ LaunchedEffect(Unit) {\n+ currentOnResetting()\n+ }\n+ }\n+ else -> Unit\n+ }\n+}\n+\n+@Composable\n+private fun backgroundColorFor(flickState: FlickToDismissState): Color {\n+ val animatedAlpha by animateFloatAsState(\n+ targetValue = when (flickState.gestureState) {\n+ is FlickToDismissState.GestureState.Dismissed,\n+ is FlickToDismissState.GestureState.Dismissing -> 0f\n+ is FlickToDismissState.GestureState.Dragging,\n+ is FlickToDismissState.GestureState.Idle,\n+ is FlickToDismissState.GestureState.Resetting -> 1f - flickState.offsetFraction\n+ },\n+ label = \"Background alpha\",\n+ )\n+ return ElementTheme.colors.bgCanvasDefault.copy(alpha = animatedAlpha)\n+}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt\nindex 4cd528457dc..e06b6915202 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt\n@@ -18,15 +18,27 @@ import dagger.assisted.AssistedInject\n import io.element.android.anvilannotations.ContributesNode\n import io.element.android.compound.theme.ForcedDarkElementTheme\n import io.element.android.libraries.architecture.inputs\n+import io.element.android.libraries.core.coroutine.CoroutineDispatchers\n import io.element.android.libraries.di.RoomScope\n import io.element.android.libraries.matrix.api.core.EventId\n+import io.element.android.libraries.matrix.api.media.MatrixMediaLoader\n import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint\n+import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory\n+import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryMode\n+import io.element.android.libraries.mediaviewer.impl.gallery.SingleMediaGalleryDataSource\n+import io.element.android.libraries.mediaviewer.impl.gallery.TimelineMediaGalleryDataSource\n+import io.element.android.services.toolbox.api.systemclock.SystemClock\n \n @ContributesNode(RoomScope::class)\n class MediaViewerNode @AssistedInject constructor(\n @Assisted buildContext: BuildContext,\n @Assisted plugins: List,\n presenterFactory: MediaViewerPresenter.Factory,\n+ timelineMediaGalleryDataSource: TimelineMediaGalleryDataSource,\n+ mediaLoader: MatrixMediaLoader,\n+ localMediaFactory: LocalMediaFactory,\n+ coroutineDispatchers: CoroutineDispatchers,\n+ systemClock: SystemClock,\n ) : Node(buildContext, plugins = plugins),\n MediaViewerNavigator {\n private val inputs = inputs()\n@@ -47,9 +59,29 @@ class MediaViewerNode @AssistedInject constructor(\n onDone()\n }\n \n+ private val mediaGallerySource = if (inputs.mode == MediaViewerEntryPoint.MediaViewerMode.SingleMedia) {\n+ SingleMediaGalleryDataSource.createFrom(inputs)\n+ } else {\n+ timelineMediaGalleryDataSource\n+ }\n+\n+ private val galleryMode = when (inputs.mode) {\n+ MediaViewerEntryPoint.MediaViewerMode.SingleMedia,\n+ MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos -> MediaGalleryMode.Images\n+ MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios -> MediaGalleryMode.Files\n+ }\n+\n private val presenter = presenterFactory.create(\n inputs = inputs,\n navigator = this,\n+ dataSource = MediaViewerDataSource(\n+ dispatcher = coroutineDispatchers.computation,\n+ galleryMode = galleryMode,\n+ galleryDataSource = mediaGallerySource,\n+ mediaLoader = mediaLoader,\n+ localMediaFactory = localMediaFactory,\n+ systemClock = systemClock,\n+ )\n )\n \n @Composable\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt\nindex 7a8b006da1f..a801437e825 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt\n@@ -10,7 +10,6 @@ package io.element.android.libraries.mediaviewer.impl.viewer\n import android.content.ActivityNotFoundException\n import androidx.compose.runtime.Composable\n import androidx.compose.runtime.DisposableEffect\n-import androidx.compose.runtime.MutableState\n import androidx.compose.runtime.getValue\n import androidx.compose.runtime.mutableIntStateOf\n import androidx.compose.runtime.mutableStateOf\n@@ -26,15 +25,12 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatch\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage\n import io.element.android.libraries.designsystem.utils.snackbar.collectSnackbarMessageAsState\n import io.element.android.libraries.matrix.api.core.EventId\n-import io.element.android.libraries.matrix.api.media.MatrixMediaLoader\n-import io.element.android.libraries.matrix.api.media.MediaFile\n import io.element.android.libraries.matrix.api.room.MatrixRoom\n import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOther\n import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOwn\n import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId\n import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint\n import io.element.android.libraries.mediaviewer.api.local.LocalMedia\n-import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory\n import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState\n import io.element.android.libraries.mediaviewer.impl.local.LocalMediaActions\n import io.element.android.libraries.ui.strings.CommonStrings\n@@ -45,9 +41,8 @@ import io.element.android.libraries.androidutils.R as UtilsR\n class MediaViewerPresenter @AssistedInject constructor(\n @Assisted private val inputs: MediaViewerEntryPoint.Params,\n @Assisted private val navigator: MediaViewerNavigator,\n+ @Assisted private val dataSource: MediaViewerDataSource,\n private val room: MatrixRoom,\n- private val localMediaFactory: LocalMediaFactory,\n- private val mediaLoader: MatrixMediaLoader,\n private val localMediaActions: LocalMediaActions,\n private val snackbarDispatcher: SnackbarDispatcher,\n ) : Presenter {\n@@ -56,83 +51,89 @@ class MediaViewerPresenter @AssistedInject constructor(\n fun create(\n inputs: MediaViewerEntryPoint.Params,\n navigator: MediaViewerNavigator,\n+ dataSource: MediaViewerDataSource,\n ): MediaViewerPresenter\n }\n \n @Composable\n override fun present(): MediaViewerState {\n val coroutineScope = rememberCoroutineScope()\n- var loadMediaTrigger by remember { mutableIntStateOf(0) }\n- val mediaFile: MutableState = remember {\n- mutableStateOf(null)\n- }\n- val localMedia: MutableState> = remember {\n- mutableStateOf(AsyncData.Uninitialized)\n- }\n+ val data by dataSource.collectAsState()\n+ var currentIndex by remember { mutableIntStateOf(searchIndex(data, inputs.eventId)) }\n val snackbarMessage by snackbarDispatcher.collectSnackbarMessageAsState()\n- localMediaActions.Configure()\n- DisposableEffect(loadMediaTrigger) {\n- coroutineScope.downloadMedia(mediaFile, localMedia)\n+\n+ var mediaBottomSheetState by remember { mutableStateOf(MediaBottomSheetState.Hidden) }\n+\n+ DisposableEffect(Unit) {\n+ dataSource.setup()\n onDispose {\n- mediaFile.value?.close()\n+ dataSource.dispose()\n }\n }\n- var mediaBottomSheetState by remember { mutableStateOf(MediaBottomSheetState.Hidden) }\n+ localMediaActions.Configure()\n \n- fun handleEvents(mediaViewerEvents: MediaViewerEvents) {\n- when (mediaViewerEvents) {\n- MediaViewerEvents.RetryLoading -> loadMediaTrigger++\n- MediaViewerEvents.ClearLoadingError -> localMedia.value = AsyncData.Uninitialized\n- MediaViewerEvents.SaveOnDisk -> {\n+ fun handleEvents(event: MediaViewerEvents) {\n+ when (event) {\n+ is MediaViewerEvents.LoadMedia -> {\n+ coroutineScope.downloadMedia(data = event.data)\n+ }\n+ is MediaViewerEvents.ClearLoadingError -> {\n+ dataSource.clearLoadingError(event.data)\n+ }\n+ is MediaViewerEvents.SaveOnDisk -> {\n mediaBottomSheetState = MediaBottomSheetState.Hidden\n- coroutineScope.saveOnDisk(localMedia.value)\n+ coroutineScope.saveOnDisk(event.data.downloadedMedia.value)\n }\n- MediaViewerEvents.Share -> {\n+ is MediaViewerEvents.Share -> {\n mediaBottomSheetState = MediaBottomSheetState.Hidden\n- coroutineScope.share(localMedia.value)\n+ coroutineScope.share(event.data.downloadedMedia.value)\n }\n- MediaViewerEvents.OpenWith -> {\n+ is MediaViewerEvents.OpenWith -> {\n mediaBottomSheetState = MediaBottomSheetState.Hidden\n- coroutineScope.open(localMedia.value)\n+ coroutineScope.open(event.data.downloadedMedia.value)\n }\n is MediaViewerEvents.Delete -> {\n mediaBottomSheetState = MediaBottomSheetState.Hidden\n- coroutineScope.delete(mediaViewerEvents.eventId)\n+ coroutineScope.delete(event.eventId)\n }\n is MediaViewerEvents.ViewInTimeline -> {\n mediaBottomSheetState = MediaBottomSheetState.Hidden\n- navigator.onViewInTimelineClick(mediaViewerEvents.eventId)\n+ navigator.onViewInTimelineClick(event.eventId)\n }\n- MediaViewerEvents.OpenInfo -> coroutineScope.launch {\n+ is MediaViewerEvents.OpenInfo -> coroutineScope.launch {\n mediaBottomSheetState = MediaBottomSheetState.MediaDetailsBottomSheetState(\n- eventId = inputs.eventId,\n- canDelete = when (inputs.mediaInfo.senderId) {\n+ eventId = event.data.eventId,\n+ canDelete = when (event.data.mediaInfo.senderId) {\n null -> false\n- room.sessionId -> room.canRedactOwn().getOrElse { false } && inputs.eventId != null\n- else -> room.canRedactOther().getOrElse { false } && inputs.eventId != null\n+ room.sessionId -> room.canRedactOwn().getOrElse { false } && event.data.eventId != null\n+ else -> room.canRedactOther().getOrElse { false } && event.data.eventId != null\n },\n- mediaInfo = inputs.mediaInfo,\n- thumbnailSource = inputs.thumbnailSource,\n+ mediaInfo = event.data.mediaInfo,\n+ thumbnailSource = event.data.thumbnailSource,\n )\n }\n is MediaViewerEvents.ConfirmDelete -> {\n mediaBottomSheetState = MediaBottomSheetState.MediaDeleteConfirmationState(\n- eventId = mediaViewerEvents.eventId,\n- mediaInfo = inputs.mediaInfo,\n- thumbnailSource = inputs.thumbnailSource ?: inputs.mediaSource,\n+ eventId = event.eventId,\n+ mediaInfo = event.data.mediaInfo,\n+ thumbnailSource = event.data.thumbnailSource ?: event.data.mediaSource,\n )\n }\n MediaViewerEvents.CloseBottomSheet -> {\n mediaBottomSheetState = MediaBottomSheetState.Hidden\n }\n+ is MediaViewerEvents.OnNavigateTo -> {\n+ currentIndex = event.index\n+ }\n+ is MediaViewerEvents.LoadMore -> coroutineScope.launch {\n+ dataSource.loadMore(event.direction)\n+ }\n }\n }\n \n return MediaViewerState(\n- eventId = inputs.eventId,\n- mediaInfo = inputs.mediaInfo,\n- thumbnailSource = inputs.thumbnailSource,\n- downloadedMedia = localMedia.value,\n+ listData = data,\n+ currentIndex = currentIndex,\n snackbarMessage = snackbarMessage,\n canShowInfo = inputs.canShowInfo,\n mediaBottomSheetState = mediaBottomSheetState,\n@@ -140,28 +141,10 @@ class MediaViewerPresenter @AssistedInject constructor(\n )\n }\n \n- private fun CoroutineScope.downloadMedia(mediaFile: MutableState, localMedia: MutableState>) = launch {\n- localMedia.value = AsyncData.Loading()\n- mediaLoader.downloadMediaFile(\n- source = inputs.mediaSource,\n- mimeType = inputs.mediaInfo.mimeType,\n- filename = inputs.mediaInfo.filename\n- )\n- .onSuccess {\n- mediaFile.value = it\n- }\n- .mapCatching { mediaFile ->\n- localMediaFactory.createFromMediaFile(\n- mediaFile = mediaFile,\n- mediaInfo = inputs.mediaInfo\n- )\n- }\n- .onSuccess {\n- localMedia.value = AsyncData.Success(it)\n- }\n- .onFailure {\n- localMedia.value = AsyncData.Failure(it)\n- }\n+ private fun CoroutineScope.downloadMedia(\n+ data: MediaViewerPageData.MediaViewerData,\n+ ) = launch {\n+ dataSource.loadMedia(data)\n }\n \n private fun CoroutineScope.saveOnDisk(localMedia: AsyncData) = launch {\n@@ -216,4 +199,13 @@ class MediaViewerPresenter @AssistedInject constructor(\n CommonStrings.error_unknown\n }\n }\n+\n+ private fun searchIndex(data: List, eventId: EventId?): Int {\n+ if (eventId == null) {\n+ return 0\n+ }\n+ return data.indexOfFirst {\n+ (it as? MediaViewerPageData.MediaViewerData)?.eventId == eventId\n+ }.coerceAtLeast(0)\n+ }\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerState.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerState.kt\nindex b9779b0fd47..cf363a70f18 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerState.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerState.kt\n@@ -7,21 +7,41 @@\n \n package io.element.android.libraries.mediaviewer.impl.viewer\n \n+import androidx.compose.runtime.State\n import io.element.android.libraries.architecture.AsyncData\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.media.MediaSource\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n import io.element.android.libraries.mediaviewer.api.MediaInfo\n import io.element.android.libraries.mediaviewer.api.local.LocalMedia\n import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState\n+import kotlinx.collections.immutable.ImmutableList\n \n data class MediaViewerState(\n- val eventId: EventId?,\n- val mediaInfo: MediaInfo,\n- val thumbnailSource: MediaSource?,\n- val downloadedMedia: AsyncData,\n+ val listData: ImmutableList,\n+ val currentIndex: Int,\n val snackbarMessage: SnackbarMessage?,\n val canShowInfo: Boolean,\n val mediaBottomSheetState: MediaBottomSheetState,\n val eventSink: (MediaViewerEvents) -> Unit,\n )\n+\n+sealed interface MediaViewerPageData {\n+ data class Failure(\n+ val throwable: Throwable,\n+ ) : MediaViewerPageData\n+\n+ data class Loading(\n+ val direction: Timeline.PaginationDirection,\n+ val timestamp: Long,\n+ ) : MediaViewerPageData\n+\n+ data class MediaViewerData(\n+ val eventId: EventId?,\n+ val mediaInfo: MediaInfo,\n+ val mediaSource: MediaSource,\n+ val thumbnailSource: MediaSource?,\n+ val downloadedMedia: State>,\n+ ) : MediaViewerPageData\n+}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt\nindex 70c6e62e7ee..2c54751fed0 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt\n@@ -8,9 +8,12 @@\n package io.element.android.libraries.mediaviewer.impl.viewer\n \n import android.net.Uri\n+import androidx.compose.runtime.mutableStateOf\n import androidx.compose.ui.tooling.preview.PreviewParameterProvider\n import io.element.android.libraries.architecture.AsyncData\n import io.element.android.libraries.designsystem.components.media.aWaveForm\n+import io.element.android.libraries.matrix.api.media.MediaSource\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n import io.element.android.libraries.mediaviewer.api.MediaInfo\n import io.element.android.libraries.mediaviewer.api.aPdfMediaInfo\n import io.element.android.libraries.mediaviewer.api.aVideoMediaInfo\n@@ -21,23 +24,28 @@ import io.element.android.libraries.mediaviewer.api.local.LocalMedia\n import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState\n import io.element.android.libraries.mediaviewer.impl.details.aMediaDeleteConfirmationState\n import io.element.android.libraries.mediaviewer.impl.details.aMediaDetailsBottomSheetState\n+import kotlinx.collections.immutable.toPersistentList\n \n open class MediaViewerStateProvider : PreviewParameterProvider {\n override val values: Sequence\n get() = sequenceOf(\n aMediaViewerState(),\n- aMediaViewerState(AsyncData.Loading()),\n- aMediaViewerState(AsyncData.Failure(IllegalStateException(\"error\"))),\n+ aMediaViewerState(listOf(aMediaViewerPageData(AsyncData.Loading()))),\n+ aMediaViewerState(listOf(aMediaViewerPageData(AsyncData.Failure(IllegalStateException(\"error\"))))),\n anImageMediaInfo(\n senderName = \"Sally Sanderson\",\n dateSent = \"21 NOV, 2024\",\n caption = \"A caption\",\n ).let {\n aMediaViewerState(\n- downloadedMedia = AsyncData.Success(\n- LocalMedia(Uri.EMPTY, it)\n- ),\n- mediaInfo = it,\n+ listOf(\n+ aMediaViewerPageData(\n+ downloadedMedia = AsyncData.Success(\n+ LocalMedia(Uri.EMPTY, it)\n+ ),\n+ mediaInfo = it,\n+ )\n+ )\n )\n },\n aVideoMediaInfo(\n@@ -46,50 +54,78 @@ open class MediaViewerStateProvider : PreviewParameterProvider\n caption = \"A caption\",\n ).let {\n aMediaViewerState(\n- downloadedMedia = AsyncData.Success(\n- LocalMedia(Uri.EMPTY, it)\n- ),\n- mediaInfo = it,\n+ listOf(\n+ aMediaViewerPageData(\n+ downloadedMedia = AsyncData.Success(\n+ LocalMedia(Uri.EMPTY, it)\n+ ),\n+ mediaInfo = it,\n+ )\n+ )\n )\n },\n aPdfMediaInfo().let {\n aMediaViewerState(\n- downloadedMedia = AsyncData.Success(\n- LocalMedia(Uri.EMPTY, it)\n- ),\n- mediaInfo = it,\n+ listOf(\n+ aMediaViewerPageData(\n+ downloadedMedia = AsyncData.Success(\n+ LocalMedia(Uri.EMPTY, it)\n+ ),\n+ mediaInfo = it,\n+ )\n+ )\n )\n },\n aMediaViewerState(\n- downloadedMedia = AsyncData.Loading(),\n- mediaInfo = anApkMediaInfo(),\n+ listOf(\n+ aMediaViewerPageData(\n+ downloadedMedia = AsyncData.Loading(),\n+ mediaInfo = anApkMediaInfo(),\n+ )\n+ )\n ),\n anApkMediaInfo().let {\n aMediaViewerState(\n- downloadedMedia = AsyncData.Success(\n- LocalMedia(Uri.EMPTY, it)\n- ),\n- mediaInfo = it,\n+ listOf(\n+ aMediaViewerPageData(\n+ downloadedMedia = AsyncData.Success(\n+ LocalMedia(Uri.EMPTY, it)\n+ ),\n+ mediaInfo = it,\n+ )\n+ )\n )\n },\n aMediaViewerState(\n- downloadedMedia = AsyncData.Loading(),\n- mediaInfo = anAudioMediaInfo(),\n+ listOf(\n+ aMediaViewerPageData(\n+ downloadedMedia = AsyncData.Loading(),\n+ mediaInfo = anAudioMediaInfo(),\n+ )\n+ )\n ),\n anAudioMediaInfo().let {\n aMediaViewerState(\n- downloadedMedia = AsyncData.Success(\n- LocalMedia(Uri.EMPTY, it)\n- ),\n- mediaInfo = it,\n+ listOf(\n+ aMediaViewerPageData(\n+ downloadedMedia = AsyncData.Success(\n+ LocalMedia(Uri.EMPTY, it)\n+ ),\n+ mediaInfo = it,\n+ )\n+ )\n )\n },\n anImageMediaInfo().let {\n aMediaViewerState(\n- downloadedMedia = AsyncData.Success(\n- LocalMedia(Uri.EMPTY, it)\n+ listOf(\n+ aMediaViewerPageData(\n+ downloadedMedia = AsyncData.Success(\n+ LocalMedia(Uri.EMPTY, it)\n+ ),\n+ mediaInfo = it,\n+ )\n ),\n- mediaInfo = it,\n canShowInfo = false,\n )\n },\n@@ -103,26 +139,60 @@ open class MediaViewerStateProvider : PreviewParameterProvider\n waveForm = aWaveForm(),\n ).let {\n aMediaViewerState(\n- downloadedMedia = AsyncData.Success(\n- LocalMedia(Uri.EMPTY, it)\n- ),\n- mediaInfo = it,\n+ listOf(\n+ aMediaViewerPageData(\n+ downloadedMedia = AsyncData.Success(\n+ LocalMedia(Uri.EMPTY, it)\n+ ),\n+ mediaInfo = it,\n+ )\n+ )\n )\n },\n+ aMediaViewerState(\n+ listOf(\n+ aMediaViewerPageDataLoading()\n+ ),\n+ ),\n+ aMediaViewerState(\n+ listOf(\n+ MediaViewerPageData.Failure(Exception(\"error\"))\n+ ),\n+ ),\n )\n }\n \n-fun aMediaViewerState(\n+fun aMediaViewerPageDataLoading(\n+ direction: Timeline.PaginationDirection = Timeline.PaginationDirection.BACKWARDS,\n+ timestamp: Long = 0L,\n+): MediaViewerPageData {\n+ return MediaViewerPageData.Loading(\n+ direction = direction,\n+ timestamp = timestamp,\n+ )\n+}\n+\n+fun aMediaViewerPageData(\n downloadedMedia: AsyncData = AsyncData.Uninitialized,\n mediaInfo: MediaInfo = anImageMediaInfo(),\n+ mediaSource: MediaSource = MediaSource(\"\"),\n+): MediaViewerPageData.MediaViewerData = MediaViewerPageData.MediaViewerData(\n+ eventId = null,\n+ mediaInfo = mediaInfo,\n+ mediaSource = mediaSource,\n+ thumbnailSource = null,\n+ downloadedMedia = mutableStateOf(downloadedMedia),\n+)\n+\n+fun aMediaViewerState(\n+ listData: List = listOf(aMediaViewerPageData()),\n+ currentIndex: Int = 0,\n canShowInfo: Boolean = true,\n mediaBottomSheetState: MediaBottomSheetState = MediaBottomSheetState.Hidden,\n eventSink: (MediaViewerEvents) -> Unit = {},\n ) = MediaViewerState(\n- eventId = null,\n- mediaInfo = mediaInfo,\n- thumbnailSource = null,\n- downloadedMedia = downloadedMedia,\n+ listData = listData.toPersistentList(),\n+ currentIndex = currentIndex,\n snackbarMessage = null,\n canShowInfo = canShowInfo,\n mediaBottomSheetState = mediaBottomSheetState,\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt\nindex a05d46c72c5..695725009f1 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt\n@@ -11,7 +11,6 @@ package io.element.android.libraries.mediaviewer.impl.viewer\n \n import androidx.activity.compose.BackHandler\n import androidx.compose.animation.AnimatedVisibility\n-import androidx.compose.animation.core.animateFloatAsState\n import androidx.compose.animation.fadeIn\n import androidx.compose.animation.fadeOut\n import androidx.compose.foundation.background\n@@ -22,6 +21,8 @@ import androidx.compose.foundation.layout.fillMaxWidth\n import androidx.compose.foundation.layout.height\n import androidx.compose.foundation.layout.navigationBarsPadding\n import androidx.compose.foundation.layout.padding\n+import androidx.compose.foundation.pager.HorizontalPager\n+import androidx.compose.foundation.pager.rememberPagerState\n import androidx.compose.material.icons.Icons\n import androidx.compose.material.icons.automirrored.filled.OpenInNew\n import androidx.compose.material3.ExperimentalMaterial3Api\n@@ -35,6 +36,7 @@ import androidx.compose.runtime.mutableStateOf\n import androidx.compose.runtime.remember\n import androidx.compose.runtime.rememberUpdatedState\n import androidx.compose.runtime.setValue\n+import androidx.compose.runtime.snapshotFlow\n import androidx.compose.ui.Alignment\n import androidx.compose.ui.Modifier\n import androidx.compose.ui.graphics.Color\n@@ -52,6 +54,8 @@ import io.element.android.compound.tokens.generated.CompoundIcons\n import io.element.android.libraries.architecture.AsyncData\n import io.element.android.libraries.core.mimetype.MimeTypes\n import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeVideo\n+import io.element.android.libraries.designsystem.components.async.AsyncFailure\n+import io.element.android.libraries.designsystem.components.async.AsyncLoading\n import io.element.android.libraries.designsystem.components.button.BackButton\n import io.element.android.libraries.designsystem.components.dialogs.RetryDialog\n import io.element.android.libraries.designsystem.preview.ElementPreviewDark\n@@ -74,14 +78,12 @@ import io.element.android.libraries.mediaviewer.impl.details.MediaDetailsBottomS\n import io.element.android.libraries.mediaviewer.impl.local.LocalMediaView\n import io.element.android.libraries.mediaviewer.impl.local.PlayableState\n import io.element.android.libraries.mediaviewer.impl.local.rememberLocalMediaViewState\n+import io.element.android.libraries.mediaviewer.impl.util.bgCanvasWithTransparency\n import io.element.android.libraries.ui.strings.CommonStrings\n import kotlinx.coroutines.delay\n-import me.saket.telephoto.flick.FlickToDismiss\n-import me.saket.telephoto.flick.FlickToDismissState\n-import me.saket.telephoto.flick.rememberFlickToDismissState\n import me.saket.telephoto.zoomable.ZoomSpec\n import me.saket.telephoto.zoomable.rememberZoomableState\n-import kotlin.time.Duration\n+import timber.log.Timber\n \n @Composable\n fun MediaViewerView(\n@@ -93,51 +95,129 @@ fun MediaViewerView(\n var showOverlay by remember { mutableStateOf(true) }\n \n val defaultBottomPaddingInPixels = if (LocalInspectionMode.current) 303 else 0\n- var bottomPaddingInPixels by remember { mutableIntStateOf(defaultBottomPaddingInPixels) }\n+ val currentData = state.listData.getOrNull(state.currentIndex)\n BackHandler { onBackClick() }\n Scaffold(\n modifier,\n containerColor = Color.Transparent,\n snackbarHost = { SnackbarHost(snackbarHostState) },\n ) {\n- MediaViewerPage(\n- showOverlay = showOverlay,\n- bottomPaddingInPixels = bottomPaddingInPixels,\n- state = state,\n- onDismiss = {\n- onBackClick()\n- },\n- onShowOverlayChange = {\n- showOverlay = it\n+ val pagerState = rememberPagerState(state.currentIndex, 0f) {\n+ state.listData.size\n+ }\n+ LaunchedEffect(pagerState) {\n+ snapshotFlow { pagerState.currentPage }.collect { page ->\n+ state.eventSink(MediaViewerEvents.OnNavigateTo(page))\n }\n- )\n+ }\n+ LaunchedEffect(state.listData) {\n+ Timber.d(\"MediaViewerView: state.listData: ${state.listData}\")\n+ }\n+ HorizontalPager(\n+ state = pagerState,\n+ modifier = Modifier,\n+ // Pre-load previous and next pages\n+ beyondViewportPageCount = 1,\n+ ) { page ->\n+ when (val dataForPage = state.listData[page]) {\n+ is MediaViewerPageData.Failure -> {\n+ MediaViewerErrorPage(\n+ throwable = dataForPage.throwable,\n+ onDismiss = onBackClick,\n+ )\n+ }\n+ is MediaViewerPageData.Loading -> {\n+ LaunchedEffect(dataForPage.timestamp) {\n+ state.eventSink(MediaViewerEvents.LoadMore(dataForPage.direction))\n+ }\n+ MediaViewerLoadingPage(\n+ onDismiss = onBackClick,\n+ )\n+ }\n+ is MediaViewerPageData.MediaViewerData -> {\n+ var bottomPaddingInPixels by remember { mutableIntStateOf(defaultBottomPaddingInPixels) }\n+ LaunchedEffect(Unit) {\n+ state.eventSink(MediaViewerEvents.LoadMedia(dataForPage))\n+ }\n+ Box(\n+ modifier = Modifier.fillMaxSize()\n+ ) {\n+ MediaViewerPage(\n+ isDisplayed = page == pagerState.settledPage,\n+ showOverlay = showOverlay,\n+ bottomPaddingInPixels = bottomPaddingInPixels,\n+ data = dataForPage,\n+ onDismiss = onBackClick,\n+ onRetry = {\n+ state.eventSink(MediaViewerEvents.LoadMedia(dataForPage))\n+ },\n+ onDismissError = {\n+ state.eventSink(MediaViewerEvents.ClearLoadingError(dataForPage))\n+ },\n+ onShowOverlayChange = {\n+ showOverlay = it\n+ }\n+ )\n+ // Bottom bar\n+ AnimatedVisibility(visible = showOverlay, enter = fadeIn(), exit = fadeOut()) {\n+ Box(\n+ modifier = Modifier\n+ .fillMaxSize()\n+ .navigationBarsPadding()\n+ ) {\n+ MediaViewerBottomBar(\n+ modifier = Modifier.align(Alignment.BottomCenter),\n+ showDivider = dataForPage.mediaInfo.mimeType.isMimeTypeVideo(),\n+ caption = dataForPage.mediaInfo.caption,\n+ onHeightChange = { bottomPaddingInPixels = it },\n+ )\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+ // Top bar\n AnimatedVisibility(visible = showOverlay, enter = fadeIn(), exit = fadeOut()) {\n Box(\n modifier = Modifier\n .fillMaxSize()\n .navigationBarsPadding()\n ) {\n- MediaViewerTopBar(\n- actionsEnabled = state.downloadedMedia is AsyncData.Success,\n- mimeType = state.mediaInfo.mimeType,\n- senderName = state.mediaInfo.senderName,\n- dateSent = state.mediaInfo.dateSent,\n- canShowInfo = state.canShowInfo,\n- onBackClick = onBackClick,\n- onInfoClick = {\n- state.eventSink(MediaViewerEvents.OpenInfo)\n- },\n- eventSink = state.eventSink\n- )\n- MediaViewerBottomBar(\n- modifier = Modifier.align(Alignment.BottomCenter),\n- showDivider = state.mediaInfo.mimeType.isMimeTypeVideo(),\n- caption = state.mediaInfo.caption,\n- onHeightChange = { bottomPaddingInPixels = it },\n- )\n+ when (currentData) {\n+ is MediaViewerPageData.MediaViewerData -> {\n+ MediaViewerTopBar(\n+ data = currentData,\n+ canShowInfo = state.canShowInfo,\n+ onBackClick = onBackClick,\n+ onInfoClick = {\n+ state.eventSink(MediaViewerEvents.OpenInfo(currentData))\n+ },\n+ eventSink = state.eventSink\n+ )\n+ }\n+ else -> {\n+ TopAppBar(\n+ title = {\n+ if (currentData is MediaViewerPageData.Loading) {\n+ Text(\n+ text = stringResource(id = CommonStrings.common_loading_more),\n+ style = ElementTheme.typography.fontBodyMdMedium,\n+ color = ElementTheme.colors.textPrimary,\n+ )\n+ }\n+ },\n+ colors = TopAppBarDefaults.topAppBarColors(\n+ containerColor = bgCanvasWithTransparency,\n+ ),\n+ navigationIcon = { BackButton(onClick = onBackClick) },\n+ )\n+ }\n+ }\n }\n }\n }\n+\n when (val bottomSheetState = state.mediaBottomSheetState) {\n MediaBottomSheetState.Hidden -> Unit\n is MediaBottomSheetState.MediaDetailsBottomSheetState -> {\n@@ -147,13 +227,24 @@ fun MediaViewerView(\n state.eventSink(MediaViewerEvents.ViewInTimeline(it))\n },\n onShare = {\n- state.eventSink(MediaViewerEvents.Share)\n+ (currentData as? MediaViewerPageData.MediaViewerData)?.let {\n+ state.eventSink(MediaViewerEvents.Share(currentData))\n+ }\n },\n onDownload = {\n- state.eventSink(MediaViewerEvents.SaveOnDisk)\n+ (currentData as? MediaViewerPageData.MediaViewerData)?.let {\n+ state.eventSink(MediaViewerEvents.SaveOnDisk(currentData))\n+ }\n },\n onDelete = { eventId ->\n- state.eventSink(MediaViewerEvents.ConfirmDelete(eventId))\n+ (currentData as? MediaViewerPageData.MediaViewerData)?.let {\n+ state.eventSink(\n+ MediaViewerEvents.ConfirmDelete(\n+ eventId,\n+ currentData,\n+ )\n+ )\n+ }\n },\n onDismiss = {\n state.eventSink(MediaViewerEvents.CloseBottomSheet)\n@@ -176,41 +267,31 @@ fun MediaViewerView(\n \n @Composable\n private fun MediaViewerPage(\n+ isDisplayed: Boolean,\n showOverlay: Boolean,\n bottomPaddingInPixels: Int,\n- state: MediaViewerState,\n+ data: MediaViewerPageData.MediaViewerData,\n onDismiss: () -> Unit,\n+ onRetry: () -> Unit,\n+ onDismissError: () -> Unit,\n onShowOverlayChange: (Boolean) -> Unit,\n modifier: Modifier = Modifier,\n ) {\n- fun onRetry() {\n- state.eventSink(MediaViewerEvents.RetryLoading)\n- }\n-\n- fun onDismissError() {\n- state.eventSink(MediaViewerEvents.ClearLoadingError)\n- }\n-\n val currentShowOverlay by rememberUpdatedState(showOverlay)\n val currentOnShowOverlayChange by rememberUpdatedState(onShowOverlayChange)\n- val flickState = rememberFlickToDismissState(dismissThresholdRatio = 0.1f, rotateOnDrag = false)\n \n- DismissFlickEffects(\n- flickState = flickState,\n- onDismissing = { animationDuration ->\n- delay(animationDuration / 3)\n- onDismiss()\n- },\n+ MediaViewerFlickToDismiss(\n+ onDismiss = onDismiss,\n onDragging = {\n currentOnShowOverlayChange(false)\n- }\n- )\n-\n- FlickToDismiss(\n- state = flickState,\n- modifier = modifier.background(backgroundColorFor(flickState))\n+ },\n+ onResetting = {\n+ currentOnShowOverlayChange(true)\n+ },\n+ modifier = modifier,\n ) {\n- val showProgress = rememberShowProgress(state.downloadedMedia)\n+ val downloadedMedia by data.downloadedMedia\n+ val showProgress = rememberShowProgress(downloadedMedia)\n \n Box(\n modifier = Modifier\n@@ -224,7 +305,7 @@ private fun MediaViewerPage(\n val localMediaViewState = rememberLocalMediaViewState(zoomableState)\n val showThumbnail = !localMediaViewState.isReady\n val playableState = localMediaViewState.playableState\n- val showError = state.downloadedMedia is AsyncData.Failure\n+ val showError = downloadedMedia.isFailure()\n \n LaunchedEffect(playableState) {\n if (playableState is PlayableState.Playable) {\n@@ -234,10 +315,11 @@ private fun MediaViewerPage(\n \n LocalMediaView(\n modifier = Modifier.fillMaxSize(),\n+ isDisplayed = isDisplayed,\n bottomPaddingInPixels = bottomPaddingInPixels,\n localMediaViewState = localMediaViewState,\n- localMedia = state.downloadedMedia.dataOrNull(),\n- mediaInfo = state.mediaInfo,\n+ localMedia = downloadedMedia.dataOrNull(),\n+ mediaInfo = data.mediaInfo,\n onClick = {\n if (playableState is PlayableState.NotPlayable) {\n currentOnShowOverlayChange(!currentShowOverlay)\n@@ -245,15 +327,15 @@ private fun MediaViewerPage(\n },\n )\n ThumbnailView(\n- mediaInfo = state.mediaInfo,\n- thumbnailSource = state.thumbnailSource,\n+ mediaInfo = data.mediaInfo,\n+ thumbnailSource = data.thumbnailSource,\n isVisible = showThumbnail,\n )\n if (showError) {\n ErrorView(\n errorMessage = stringResource(id = CommonStrings.error_unknown),\n- onRetry = ::onRetry,\n- onDismiss = ::onDismissError\n+ onRetry = onRetry,\n+ onDismiss = onDismissError\n )\n }\n }\n@@ -269,26 +351,46 @@ private fun MediaViewerPage(\n }\n \n @Composable\n-private fun DismissFlickEffects(\n- flickState: FlickToDismissState,\n- onDismissing: suspend (Duration) -> Unit,\n- onDragging: suspend () -> Unit,\n+private fun MediaViewerLoadingPage(\n+ onDismiss: () -> Unit,\n+ modifier: Modifier = Modifier,\n ) {\n- val currentOnDismissing by rememberUpdatedState(onDismissing)\n- val currentOnDragging by rememberUpdatedState(onDragging)\n-\n- when (val gestureState = flickState.gestureState) {\n- is FlickToDismissState.GestureState.Dismissing -> {\n- LaunchedEffect(Unit) {\n- currentOnDismissing(gestureState.animationDuration)\n- }\n+ MediaViewerFlickToDismiss(\n+ onDismiss = onDismiss,\n+ modifier = modifier,\n+ ) {\n+ Box(\n+ modifier = Modifier\n+ .fillMaxSize()\n+ .navigationBarsPadding(),\n+ contentAlignment = Alignment.Center\n+ ) {\n+ AsyncLoading()\n }\n- is FlickToDismissState.GestureState.Dragging -> {\n- LaunchedEffect(Unit) {\n- currentOnDragging()\n- }\n+ }\n+}\n+\n+@Composable\n+private fun MediaViewerErrorPage(\n+ throwable: Throwable,\n+ onDismiss: () -> Unit,\n+ modifier: Modifier = Modifier,\n+) {\n+ MediaViewerFlickToDismiss(\n+ onDismiss = onDismiss,\n+ modifier = modifier,\n+ ) {\n+ Box(\n+ modifier = Modifier\n+ .fillMaxSize()\n+ .navigationBarsPadding(),\n+ contentAlignment = Alignment.Center\n+ ) {\n+ AsyncFailure(\n+ throwable = throwable,\n+ onRetry = null\n+ )\n }\n- else -> Unit\n }\n }\n \n@@ -316,15 +418,17 @@ private fun rememberShowProgress(downloadedMedia: AsyncData): Boolea\n @OptIn(ExperimentalMaterial3Api::class)\n @Composable\n private fun MediaViewerTopBar(\n- actionsEnabled: Boolean,\n- mimeType: String,\n- senderName: String?,\n- dateSent: String?,\n+ data: MediaViewerPageData.MediaViewerData,\n canShowInfo: Boolean,\n onBackClick: () -> Unit,\n onInfoClick: () -> Unit,\n eventSink: (MediaViewerEvents) -> Unit,\n ) {\n+ val downloadedMedia by data.downloadedMedia\n+ val actionsEnabled = downloadedMedia.isSuccess()\n+ val mimeType = data.mediaInfo.mimeType\n+ val senderName = data.mediaInfo.senderName\n+ val dateSent = data.mediaInfo.dateSent\n TopAppBar(\n title = {\n if (senderName != null && dateSent != null) {\n@@ -350,14 +454,14 @@ private fun MediaViewerTopBar(\n }\n },\n colors = TopAppBarDefaults.topAppBarColors(\n- containerColor = Color.Transparent.copy(0.6f),\n+ containerColor = bgCanvasWithTransparency,\n ),\n navigationIcon = { BackButton(onClick = onBackClick) },\n actions = {\n IconButton(\n enabled = actionsEnabled,\n onClick = {\n- eventSink(MediaViewerEvents.OpenWith)\n+ eventSink(MediaViewerEvents.OpenWith(data))\n },\n ) {\n when (mimeType) {\n@@ -378,7 +482,7 @@ private fun MediaViewerTopBar(\n ) {\n Icon(\n imageVector = CompoundIcons.Info(),\n- contentDescription = null,\n+ contentDescription = stringResource(id = CommonStrings.a11y_view_details),\n )\n }\n }\n@@ -396,7 +500,7 @@ private fun MediaViewerBottomBar(\n Column(\n modifier = modifier\n .fillMaxWidth()\n- .background(Color(0x99101317))\n+ .background(bgCanvasWithTransparency)\n .onSizeChanged {\n onHeightChange(it.height)\n },\n@@ -457,21 +561,6 @@ private fun ErrorView(\n )\n }\n \n-@Composable\n-private fun backgroundColorFor(flickState: FlickToDismissState): Color {\n- val animatedAlpha by animateFloatAsState(\n- targetValue = when (flickState.gestureState) {\n- is FlickToDismissState.GestureState.Dismissed,\n- is FlickToDismissState.GestureState.Dismissing -> 0f\n- is FlickToDismissState.GestureState.Dragging,\n- is FlickToDismissState.GestureState.Idle,\n- is FlickToDismissState.GestureState.Resetting -> 1f - flickState.offsetFraction\n- },\n- label = \"Background alpha\",\n- )\n- return Color.Black.copy(alpha = animatedAlpha)\n-}\n-\n // Only preview in dark, dark theme is forced on the Node.\n @Preview\n @Composable\ndiff --git a/libraries/mediaviewer/impl/src/main/res/values/localazy.xml b/libraries/mediaviewer/impl/src/main/res/values/localazy.xml\nindex 11d6219565e..52a22183318 100644\n--- a/libraries/mediaviewer/impl/src/main/res/values/localazy.xml\n+++ b/libraries/mediaviewer/impl/src/main/res/values/localazy.xml\n@@ -14,6 +14,8 @@\n \"Media and files\"\n \"File format\"\n \"File name\"\n+ \"No more files to show\"\n+ \"No more media to show\"\n \"This file will be removed from the room and members won\u2019t have access to it.\"\n \"Delete file?\"\n \"Uploaded by\"\ndiff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml\nindex 4a31e05852e..26a87bde89a 100644\n--- a/libraries/ui-strings/src/main/res/values/localazy.xml\n+++ b/libraries/ui-strings/src/main/res/values/localazy.xml\n@@ -29,6 +29,7 @@\n \"Show password\"\n \"Start a call\"\n \"User menu\"\n+ \"View details\"\n \"Record voice message.\"\n \"Stop recording\"\n \"Accept\"\n@@ -181,6 +182,7 @@ Reason: %1$s.\"\n \"Light\"\n \"Link copied to clipboard\"\n \"Loading\u2026\"\n+ \"Loading more\u2026\"\n \n \"%1$d member\"\n \"%1$d members\"\n", "test_patch": "diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRustTimeline.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRustTimeline.kt\nindex e269a30b1b1..042d4c98a19 100644\n--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRustTimeline.kt\n+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRustTimeline.kt\n@@ -8,10 +8,12 @@\n package io.element.android.libraries.matrix.impl.fixtures.fakes\n \n import org.matrix.rustcomponents.sdk.NoPointer\n+import org.matrix.rustcomponents.sdk.PaginationStatusListener\n import org.matrix.rustcomponents.sdk.TaskHandle\n import org.matrix.rustcomponents.sdk.Timeline\n import org.matrix.rustcomponents.sdk.TimelineDiff\n import org.matrix.rustcomponents.sdk.TimelineListener\n+import uniffi.matrix_sdk_ui.LiveBackPaginationStatus\n \n class FakeRustTimeline : Timeline(NoPointer) {\n private var listener: TimelineListener? = null\n@@ -23,4 +25,16 @@ class FakeRustTimeline : Timeline(NoPointer) {\n fun emitDiff(diff: List) {\n listener!!.onUpdate(diff)\n }\n+\n+ private var paginationStatusListener: PaginationStatusListener? = null\n+ override suspend fun subscribeToBackPaginationStatus(listener: PaginationStatusListener): TaskHandle {\n+ this.paginationStatusListener = listener\n+ return FakeRustTaskHandle()\n+ }\n+\n+ fun emitPaginationStatus(status: LiveBackPaginationStatus) {\n+ paginationStatusListener!!.onUpdate(status)\n+ }\n+\n+ override suspend fun fetchMembers() = Unit\n }\ndiff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimelineTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimelineTest.kt\nnew file mode 100644\nindex 00000000000..8e9120a8399\n--- /dev/null\n+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimelineTest.kt\n@@ -0,0 +1,124 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+@file:OptIn(ExperimentalCoroutinesApi::class)\n+\n+package io.element.android.libraries.matrix.impl.timeline\n+\n+import app.cash.turbine.test\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.featureflag.api.FeatureFlagService\n+import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n+import io.element.android.libraries.matrix.api.room.MatrixRoom\n+import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTimelineItem\n+import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeRustRoomListService\n+import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeRustTimeline\n+import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeRustTimelineDiff\n+import io.element.android.libraries.matrix.impl.room.RoomContentForwarder\n+import io.element.android.libraries.matrix.test.room.FakeMatrixRoom\n+import io.element.android.libraries.matrix.test.room.aRoomInfo\n+import io.element.android.services.toolbox.api.systemclock.SystemClock\n+import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP\n+import io.element.android.services.toolbox.test.systemclock.FakeSystemClock\n+import io.element.android.tests.testutils.testCoroutineDispatchers\n+import kotlinx.coroutines.CoroutineDispatcher\n+import kotlinx.coroutines.CoroutineScope\n+import kotlinx.coroutines.ExperimentalCoroutinesApi\n+import kotlinx.coroutines.test.TestScope\n+import kotlinx.coroutines.test.runCurrent\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Test\n+import org.matrix.rustcomponents.sdk.TimelineChange\n+import uniffi.matrix_sdk_ui.LiveBackPaginationStatus\n+import org.matrix.rustcomponents.sdk.Timeline as InnerTimeline\n+\n+class RustTimelineTest {\n+ @Test\n+ fun `ensure that the timeline emits new loading item when pagination does not bring new events`() = runTest {\n+ val inner = FakeRustTimeline()\n+ val systemClock = FakeSystemClock()\n+ val sut = createRustTimeline(\n+ inner = inner,\n+ systemClock = systemClock,\n+ )\n+ sut.timelineItems.test {\n+ // Give time for the listener to be set\n+ runCurrent()\n+ inner.emitDiff(\n+ listOf(\n+ FakeRustTimelineDiff(\n+ item = null,\n+ change = TimelineChange.RESET,\n+ )\n+ )\n+ )\n+ with(awaitItem()) {\n+ assertThat(size).isEqualTo(1)\n+ // Typing notification\n+ assertThat((get(0) as MatrixTimelineItem.Virtual).virtual).isEqualTo(VirtualTimelineItem.TypingNotification)\n+ }\n+ with(awaitItem()) {\n+ assertThat(size).isEqualTo(2)\n+ // The loading\n+ assertThat((get(0) as MatrixTimelineItem.Virtual).virtual).isEqualTo(\n+ VirtualTimelineItem.LoadingIndicator(\n+ direction = Timeline.PaginationDirection.BACKWARDS,\n+ timestamp = A_FAKE_TIMESTAMP,\n+ )\n+ )\n+ // Typing notification\n+ assertThat((get(1) as MatrixTimelineItem.Virtual).virtual).isEqualTo(VirtualTimelineItem.TypingNotification)\n+ }\n+ systemClock.epochMillisResult = A_FAKE_TIMESTAMP + 1\n+ // Start pagination\n+ sut.paginate(Timeline.PaginationDirection.BACKWARDS)\n+ // Simulate SDK starting pagination\n+ inner.emitPaginationStatus(LiveBackPaginationStatus.Paginating)\n+ // No new events received\n+ // Simulate SDK stopping pagination, more event to load\n+ inner.emitPaginationStatus(LiveBackPaginationStatus.Idle(hitStartOfTimeline = false))\n+ // expect an item to be emitted, with an updated timestamp\n+ with(awaitItem()) {\n+ assertThat(size).isEqualTo(2)\n+ // The loading\n+ assertThat((get(0) as MatrixTimelineItem.Virtual).virtual).isEqualTo(\n+ VirtualTimelineItem.LoadingIndicator(\n+ direction = Timeline.PaginationDirection.BACKWARDS,\n+ timestamp = A_FAKE_TIMESTAMP + 1,\n+ )\n+ )\n+ // Typing notification\n+ assertThat((get(1) as MatrixTimelineItem.Virtual).virtual).isEqualTo(VirtualTimelineItem.TypingNotification)\n+ }\n+ }\n+ }\n+}\n+\n+private fun TestScope.createRustTimeline(\n+ inner: InnerTimeline,\n+ mode: Timeline.Mode = Timeline.Mode.LIVE,\n+ systemClock: SystemClock = FakeSystemClock(),\n+ matrixRoom: MatrixRoom = FakeMatrixRoom().apply { givenRoomInfo(aRoomInfo()) },\n+ coroutineScope: CoroutineScope = backgroundScope,\n+ dispatcher: CoroutineDispatcher = testCoroutineDispatchers().io,\n+ roomContentForwarder: RoomContentForwarder = RoomContentForwarder(FakeRustRoomListService()),\n+ featureFlagsService: FeatureFlagService = FakeFeatureFlagService(),\n+ onNewSyncedEvent: () -> Unit = {},\n+): RustTimeline {\n+ return RustTimeline(\n+ inner = inner,\n+ mode = mode,\n+ systemClock = systemClock,\n+ matrixRoom = matrixRoom,\n+ coroutineScope = coroutineScope,\n+ dispatcher = dispatcher,\n+ roomContentForwarder = roomContentForwarder,\n+ featureFlagsService = featureFlagsService,\n+ onNewSyncedEvent = onNewSyncedEvent,\n+ )\n+}\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/DefaultEventItemFactoryTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/DefaultEventItemFactoryTest.kt\nindex 9b9a6092b5d..a0bc4c1f0fc 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/DefaultEventItemFactoryTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/DefaultEventItemFactoryTest.kt\n@@ -165,6 +165,7 @@ class DefaultEventItemFactoryTest {\n dateSent = \"0 Day false\",\n dateSentFull = \"0 Full false\",\n waveform = null,\n+ duration = null,\n ),\n mediaSource = MediaSource(\"\"),\n )\n@@ -214,6 +215,7 @@ class DefaultEventItemFactoryTest {\n dateSent = \"0 Day false\",\n dateSentFull = \"0 Full false\",\n waveform = null,\n+ duration = null,\n ),\n mediaSource = MediaSource(\"\"),\n thumbnailSource = null,\n@@ -260,6 +262,7 @@ class DefaultEventItemFactoryTest {\n dateSent = \"0 Day false\",\n dateSentFull = \"0 Full false\",\n waveform = null,\n+ duration = null,\n ),\n mediaSource = MediaSource(\"\"),\n )\n@@ -310,10 +313,10 @@ class DefaultEventItemFactoryTest {\n dateSent = \"0 Day false\",\n dateSentFull = \"0 Full false\",\n waveform = null,\n+ duration = \"2:03\",\n ),\n mediaSource = MediaSource(\"\"),\n thumbnailSource = null,\n- duration = \"2:03\",\n )\n )\n }\n@@ -361,10 +364,9 @@ class DefaultEventItemFactoryTest {\n dateSent = \"0 Day false\",\n dateSentFull = \"0 Full false\",\n waveform = listOf(1f, 2f).toImmutableList(),\n+ duration = \"7:36\",\n ),\n mediaSource = MediaSource(\"\"),\n- duration = \"7:36\",\n- waveform = listOf(1f, 2f).toImmutableList(),\n )\n )\n }\n@@ -412,6 +414,7 @@ class DefaultEventItemFactoryTest {\n dateSent = \"0 Day false\",\n dateSentFull = \"0 Full false\",\n waveform = null,\n+ duration = null,\n ),\n mediaSource = MediaSource(\"\"),\n thumbnailSource = null,\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/FakeMediaGalleryDataSource.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/FakeMediaGalleryDataSource.kt\nnew file mode 100644\nindex 00000000000..419c2c568a3\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/FakeMediaGalleryDataSource.kt\n@@ -0,0 +1,47 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.gallery\n+\n+import io.element.android.libraries.architecture.AsyncData\n+import io.element.android.libraries.matrix.api.core.EventId\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.tests.testutils.lambda.lambdaError\n+import kotlinx.coroutines.flow.Flow\n+import kotlinx.coroutines.flow.MutableSharedFlow\n+\n+class FakeMediaGalleryDataSource(\n+ private val startLambda: () -> Unit = { lambdaError() },\n+ private val loadMoreLambda: (Timeline.PaginationDirection) -> Unit = { lambdaError() },\n+ private val deleteItemLambda: (EventId) -> Unit = { lambdaError() },\n+ ) : MediaGalleryDataSource {\n+ override fun start() = startLambda()\n+\n+ private val groupedMediaItemsFlow = MutableSharedFlow>(\n+ replay = 1\n+ )\n+\n+ override fun groupedMediaItemsFlow(): Flow> {\n+ return groupedMediaItemsFlow\n+ }\n+\n+ suspend fun emitGroupedMediaItems(groupedMediaItems: AsyncData) {\n+ groupedMediaItemsFlow.emit(groupedMediaItems)\n+ }\n+\n+ override fun getLastData(): AsyncData {\n+ return groupedMediaItemsFlow.replayCache.firstOrNull() ?: AsyncData.Uninitialized\n+ }\n+\n+ override suspend fun loadMore(direction: Timeline.PaginationDirection) {\n+ loadMoreLambda(direction)\n+ }\n+\n+ override suspend fun deleteItem(eventId: EventId) {\n+ deleteItemLambda(eventId)\n+ }\n+}\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt\nindex 3a206dc244a..0f304f209e9 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt\n@@ -8,12 +8,12 @@\n package io.element.android.libraries.mediaviewer.impl.gallery\n \n import android.net.Uri\n+import app.cash.turbine.ReceiveTurbine\n import com.google.common.truth.Truth.assertThat\n-import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter\n-import io.element.android.libraries.dateformatter.test.FakeDateFormatter\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.room.MatrixRoom\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n import io.element.android.libraries.matrix.test.AN_EVENT_ID\n import io.element.android.libraries.matrix.test.A_ROOM_NAME\n import io.element.android.libraries.matrix.test.A_USER_ID\n@@ -25,15 +25,11 @@ import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetSta\n import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemImage\n import io.element.android.libraries.mediaviewer.test.FakeLocalMediaActions\n import io.element.android.libraries.mediaviewer.test.FakeLocalMediaFactory\n-import io.element.android.libraries.mediaviewer.test.util.FileExtensionExtractorWithoutValidation\n import io.element.android.tests.testutils.WarmUpRule\n import io.element.android.tests.testutils.lambda.lambdaRecorder\n import io.element.android.tests.testutils.lambda.value\n import io.element.android.tests.testutils.test\n-import io.element.android.tests.testutils.testCoroutineDispatchers\n import io.mockk.mockk\n-import kotlinx.collections.immutable.persistentListOf\n-import kotlinx.coroutines.test.TestScope\n import kotlinx.coroutines.test.runTest\n import org.junit.Rule\n import org.junit.Test\n@@ -47,49 +43,37 @@ class MediaGalleryPresenterTest {\n \n @Test\n fun `present - initial state`() = runTest {\n- val onViewInTimelineClickLambda = lambdaRecorder { }\n- val navigator = FakeMediaGalleryNavigator(\n- onViewInTimelineClickLambda = onViewInTimelineClickLambda,\n- )\n+ val startLambda = lambdaRecorder { }\n val presenter = createMediaGalleryPresenter(\n- navigator = navigator,\n+ mediaGalleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = startLambda,\n+ ),\n room = FakeMatrixRoom(\n displayName = A_ROOM_NAME,\n mediaTimelineResult = { Result.success(FakeTimeline()) },\n )\n )\n presenter.test {\n- skipItems(2)\n- val initialState = awaitItem()\n+ val initialState = awaitFirstItem()\n assertThat(initialState.mode).isEqualTo(MediaGalleryMode.Images)\n assertThat(initialState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)\n assertThat(initialState.roomName).isEqualTo(A_ROOM_NAME)\n- assertThat(initialState.groupedMediaItems.dataOrNull()).isEqualTo(\n- GroupedMediaItems(\n- imageAndVideoItems = persistentListOf(),\n- fileItems = persistentListOf(),\n- )\n- )\n+ assertThat(initialState.groupedMediaItems.isUninitialized()).isTrue()\n assertThat(initialState.snackbarMessage).isNull()\n }\n+ startLambda.assertions().isCalledOnce()\n }\n \n @Test\n fun `present - change mode`() = runTest {\n- val onViewInTimelineClickLambda = lambdaRecorder { }\n- val navigator = FakeMediaGalleryNavigator(\n- onViewInTimelineClickLambda = onViewInTimelineClickLambda,\n- )\n val presenter = createMediaGalleryPresenter(\n- navigator = navigator,\n room = FakeMatrixRoom(\n displayName = A_ROOM_NAME,\n mediaTimelineResult = { Result.success(FakeTimeline()) },\n )\n )\n presenter.test {\n- skipItems(2)\n- val initialState = awaitItem()\n+ val initialState = awaitFirstItem()\n assertThat(initialState.mode).isEqualTo(MediaGalleryMode.Images)\n initialState.eventSink(MediaGalleryEvents.ChangeMode(MediaGalleryMode.Files))\n val state = awaitItem()\n@@ -110,7 +94,7 @@ class MediaGalleryPresenterTest {\n `present - bottom sheet state - own message`(canDeleteOwn = false)\n }\n \n- private suspend fun TestScope.`present - bottom sheet state - own message`(canDeleteOwn: Boolean) {\n+ private suspend fun `present - bottom sheet state - own message`(canDeleteOwn: Boolean) {\n val presenter = createMediaGalleryPresenter(\n room = FakeMatrixRoom(\n sessionId = A_USER_ID,\n@@ -120,8 +104,7 @@ class MediaGalleryPresenterTest {\n )\n )\n presenter.test {\n- skipItems(2)\n- val initialState = awaitItem()\n+ val initialState = awaitFirstItem()\n assertThat(initialState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)\n val item = aMediaItemImage(\n eventId = AN_EVENT_ID,\n@@ -154,7 +137,7 @@ class MediaGalleryPresenterTest {\n `present - bottom sheet state - other message`(canDeleteOther = false)\n }\n \n- private suspend fun TestScope.`present - bottom sheet state - other message`(canDeleteOther: Boolean) {\n+ private suspend fun `present - bottom sheet state - other message`(canDeleteOther: Boolean) {\n val presenter = createMediaGalleryPresenter(\n room = FakeMatrixRoom(\n sessionId = A_USER_ID,\n@@ -164,8 +147,7 @@ class MediaGalleryPresenterTest {\n )\n )\n presenter.test {\n- skipItems(2)\n- val initialState = awaitItem()\n+ val initialState = awaitFirstItem()\n assertThat(initialState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)\n val item = aMediaItemImage(\n eventId = AN_EVENT_ID,\n@@ -197,8 +179,7 @@ class MediaGalleryPresenterTest {\n )\n )\n presenter.test {\n- skipItems(2)\n- val initialState = awaitItem()\n+ val initialState = awaitFirstItem()\n // Delete bottom sheet\n val item = aMediaItemImage()\n initialState.eventSink(MediaGalleryEvents.ConfirmDelete(AN_EVENT_ID, item.mediaInfo, item.thumbnailSource))\n@@ -217,6 +198,42 @@ class MediaGalleryPresenterTest {\n }\n }\n \n+ @Test\n+ fun `present - delete item`() = runTest {\n+ val deleteItemLambda = lambdaRecorder { }\n+ val presenter = createMediaGalleryPresenter(\n+ mediaGalleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = { },\n+ deleteItemLambda = deleteItemLambda,\n+ ),\n+ )\n+ presenter.test {\n+ val initialState = awaitFirstItem()\n+ initialState.eventSink(MediaGalleryEvents.Delete(AN_EVENT_ID))\n+ deleteItemLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))\n+ }\n+ }\n+\n+ @Test\n+ fun `present - share item`() = runTest {\n+ val presenter = createMediaGalleryPresenter()\n+ presenter.test {\n+ val initialState = awaitFirstItem()\n+ initialState.eventSink(MediaGalleryEvents.Share(AN_EVENT_ID))\n+ }\n+ // TODO Add more test on this part\n+ }\n+\n+ @Test\n+ fun `present - save on disk`() = runTest {\n+ val presenter = createMediaGalleryPresenter()\n+ presenter.test {\n+ val initialState = awaitFirstItem()\n+ initialState.eventSink(MediaGalleryEvents.SaveOnDisk(AN_EVENT_ID))\n+ }\n+ // TODO Add more test on this part\n+ }\n+\n @Test\n fun `present - view in timeline invokes the navigator`() = runTest {\n val onViewInTimelineClickLambda = lambdaRecorder { }\n@@ -230,15 +247,37 @@ class MediaGalleryPresenterTest {\n navigator = navigator,\n )\n presenter.test {\n- skipItems(2)\n- val initialState = awaitItem()\n+ val initialState = awaitFirstItem()\n initialState.eventSink(MediaGalleryEvents.ViewInTimeline(AN_EVENT_ID))\n onViewInTimelineClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))\n }\n }\n \n- private fun TestScope.createMediaGalleryPresenter(\n+ @Test\n+ fun `present - load more`() = runTest {\n+ val loadMoreLambda = lambdaRecorder { }\n+ val presenter = createMediaGalleryPresenter(\n+ mediaGalleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = { },\n+ loadMoreLambda = loadMoreLambda,\n+ ),\n+ )\n+ presenter.test {\n+ val initialState = awaitFirstItem()\n+ initialState.eventSink(MediaGalleryEvents.LoadMore(Timeline.PaginationDirection.BACKWARDS))\n+ loadMoreLambda.assertions().isCalledOnce().with(value(Timeline.PaginationDirection.BACKWARDS))\n+ }\n+ }\n+\n+ private suspend fun ReceiveTurbine.awaitFirstItem(): T {\n+ return awaitItem()\n+ }\n+\n+ private fun createMediaGalleryPresenter(\n matrixMediaLoader: FakeMatrixMediaLoader = FakeMatrixMediaLoader(),\n+ mediaGalleryDataSource: MediaGalleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = { },\n+ ),\n localMediaActions: FakeLocalMediaActions = FakeLocalMediaActions(),\n snackbarDispatcher: SnackbarDispatcher = SnackbarDispatcher(),\n navigator: MediaGalleryNavigator = FakeMediaGalleryNavigator(),\n@@ -249,22 +288,11 @@ class MediaGalleryPresenterTest {\n return MediaGalleryPresenter(\n navigator = navigator,\n room = room,\n- timelineMediaItemsFactory = TimelineMediaItemsFactory(\n- dispatchers = testCoroutineDispatchers(),\n- virtualItemFactory = VirtualItemFactory(\n- dateFormatter = FakeDateFormatter(),\n- ),\n- eventItemFactory = EventItemFactory(\n- fileSizeFormatter = FakeFileSizeFormatter(),\n- fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),\n- dateFormatter = FakeDateFormatter(),\n- ),\n- ),\n+ mediaGalleryDataSource = mediaGalleryDataSource,\n localMediaFactory = localMediaFactory,\n mediaLoader = matrixMediaLoader,\n localMediaActions = localMediaActions,\n snackbarDispatcher = snackbarDispatcher,\n- mediaItemsPostProcessor = MediaItemsPostProcessor(),\n )\n }\n }\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessorTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessorTest.kt\nindex 9a8fc615fff..4c823350ce6 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessorTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessorTest.kt\n@@ -8,9 +8,7 @@\n package io.element.android.libraries.mediaviewer.impl.gallery\n \n import com.google.common.truth.Truth.assertThat\n-import io.element.android.libraries.architecture.AsyncData\n import io.element.android.libraries.matrix.api.core.UniqueId\n-import io.element.android.libraries.matrix.test.AN_EXCEPTION\n import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemAudio\n import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemDateSeparator\n import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemFile\n@@ -42,27 +40,6 @@ class MediaItemsPostProcessorTest {\n private val date3 = aMediaItemDateSeparator(id = UniqueId(\"3\"))\n private val loading1 = aMediaItemLoadingIndicator(id = UniqueId(\"1\"))\n \n- @Test\n- fun `process Uninitialized`() {\n- val sut = MediaItemsPostProcessor()\n- val result = sut.process(AsyncData.Uninitialized)\n- assertThat(result).isEqualTo(AsyncData.Uninitialized)\n- }\n-\n- @Test\n- fun `process Loading`() {\n- val sut = MediaItemsPostProcessor()\n- val result = sut.process(AsyncData.Loading())\n- assertThat(result).isEqualTo(AsyncData.Loading())\n- }\n-\n- @Test\n- fun `process Failure`() {\n- val sut = MediaItemsPostProcessor()\n- val result = sut.process(AsyncData.Failure(AN_EXCEPTION))\n- assertThat(result).isEqualTo(AsyncData.Failure(AN_EXCEPTION))\n- }\n-\n @Test\n fun `process Empty`() {\n test(\n@@ -215,19 +192,16 @@ class MediaItemsPostProcessorTest {\n expectedFileItems: List,\n ) {\n val sut = MediaItemsPostProcessor()\n- val result = sut.process(AsyncData.Success(mediaItems.toImmutableList()))\n- val data = result.dataOrNull()!!\n+ val result = sut.process(mediaItems.toImmutableList())\n \n // Compare the lists to have better failure info\n- assertThat(data.imageAndVideoItems.toList()).isEqualTo(expectedImageAndVideoItems)\n- assertThat(data.fileItems.toList()).isEqualTo(expectedFileItems)\n+ assertThat(result.imageAndVideoItems.toList()).isEqualTo(expectedImageAndVideoItems)\n+ assertThat(result.fileItems.toList()).isEqualTo(expectedFileItems)\n \n assertThat(result).isEqualTo(\n- AsyncData.Success(\n- GroupedMediaItems(\n- imageAndVideoItems = expectedImageAndVideoItems.toImmutableList(),\n- fileItems = expectedFileItems.toImmutableList(),\n- )\n+ GroupedMediaItems(\n+ imageAndVideoItems = expectedImageAndVideoItems.toImmutableList(),\n+ fileItems = expectedFileItems.toImmutableList(),\n )\n )\n }\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/SingleMediaGalleryDataSourceTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/SingleMediaGalleryDataSourceTest.kt\nnew file mode 100644\nindex 00000000000..d616322ddca\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/SingleMediaGalleryDataSourceTest.kt\n@@ -0,0 +1,179 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.gallery\n+\n+import app.cash.turbine.test\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.architecture.AsyncData\n+import io.element.android.libraries.designsystem.components.media.createFakeWaveform\n+import io.element.android.libraries.matrix.api.core.UniqueId\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.libraries.matrix.test.AN_EVENT_ID\n+import io.element.android.libraries.matrix.test.media.aMediaSource\n+import io.element.android.libraries.mediaviewer.api.MediaInfo\n+import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint\n+import io.element.android.libraries.mediaviewer.api.aVideoMediaInfo\n+import io.element.android.libraries.mediaviewer.api.aVoiceMediaInfo\n+import io.element.android.libraries.mediaviewer.api.anApkMediaInfo\n+import io.element.android.libraries.mediaviewer.api.anAudioMediaInfo\n+import io.element.android.libraries.mediaviewer.api.anImageMediaInfo\n+import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemFile\n+import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemImage\n+import io.element.android.tests.testutils.WarmUpRule\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Rule\n+import org.junit.Test\n+\n+class SingleMediaGalleryDataSourceTest {\n+ @get:Rule\n+ val warmUpRule = WarmUpRule()\n+\n+ @Test\n+ fun `function start is no op`() {\n+ val sut = SingleMediaGalleryDataSource(aGroupedMediaItems())\n+ sut.start()\n+ }\n+\n+ @Test\n+ fun `function loadMore is no op`() = runTest {\n+ val sut = SingleMediaGalleryDataSource(aGroupedMediaItems())\n+ sut.loadMore(Timeline.PaginationDirection.BACKWARDS)\n+ sut.loadMore(Timeline.PaginationDirection.FORWARDS)\n+ }\n+\n+ @Test\n+ fun `function deleteItem is no op`() = runTest {\n+ val sut = SingleMediaGalleryDataSource(aGroupedMediaItems())\n+ sut.deleteItem(AN_EVENT_ID)\n+ }\n+\n+ @Test\n+ fun `getLastData should return the data`() {\n+ val data = aGroupedMediaItems(\n+ imageAndVideoItems = listOf(aMediaItemImage()),\n+ fileItems = listOf(aMediaItemFile()),\n+ )\n+ val sut = SingleMediaGalleryDataSource(data)\n+ assertThat(sut.getLastData()).isEqualTo(AsyncData.Success(data))\n+ }\n+\n+ @Test\n+ fun `groupedMediaItemsFlow emit a single item`() = runTest {\n+ val data = aGroupedMediaItems(\n+ imageAndVideoItems = listOf(aMediaItemImage()),\n+ fileItems = listOf(aMediaItemFile()),\n+ )\n+ val sut = SingleMediaGalleryDataSource(data)\n+ sut.groupedMediaItemsFlow().test {\n+ assertThat(awaitItem()).isEqualTo(AsyncData.Success(data))\n+ awaitComplete()\n+ }\n+ }\n+\n+ @Test\n+ fun `createFrom should create a SingleMediaGalleryDataSource with an image item`() {\n+ testFactory(\n+ mediaInfo = anImageMediaInfo(),\n+ expectedResult = { params ->\n+ MediaItem.Image(\n+ id = UniqueId(\"dummy\"),\n+ eventId = params.eventId,\n+ mediaInfo = params.mediaInfo,\n+ mediaSource = params.mediaSource,\n+ thumbnailSource = params.thumbnailSource,\n+ )\n+ }\n+ )\n+ }\n+\n+ @Test\n+ fun `createFrom should create a SingleMediaGalleryDataSource with a video item`() {\n+ testFactory(\n+ mediaInfo = aVideoMediaInfo(),\n+ expectedResult = { params ->\n+ MediaItem.Video(\n+ id = UniqueId(\"dummy\"),\n+ eventId = params.eventId,\n+ mediaInfo = params.mediaInfo,\n+ mediaSource = params.mediaSource,\n+ thumbnailSource = params.thumbnailSource,\n+ )\n+ }\n+ )\n+ }\n+\n+ @Test\n+ fun `createFrom should create a SingleMediaGalleryDataSource with an audio item`() {\n+ testFactory(\n+ mediaInfo = anAudioMediaInfo(),\n+ expectedResult = { params ->\n+ MediaItem.Audio(\n+ id = UniqueId(\"dummy\"),\n+ eventId = params.eventId,\n+ mediaInfo = params.mediaInfo,\n+ mediaSource = params.mediaSource,\n+ )\n+ }\n+ )\n+ }\n+\n+ @Test\n+ fun `createFrom should create a SingleMediaGalleryDataSource with a voice item`() {\n+ testFactory(\n+ mediaInfo = aVoiceMediaInfo(\n+ waveForm = createFakeWaveform(),\n+ duration = \"12:34\",\n+ ),\n+ expectedResult = { params ->\n+ MediaItem.Voice(\n+ id = UniqueId(\"dummy\"),\n+ eventId = params.eventId,\n+ mediaInfo = params.mediaInfo,\n+ mediaSource = params.mediaSource,\n+ )\n+ }\n+ )\n+ }\n+\n+ @Test\n+ fun `createFrom should create a SingleMediaGalleryDataSource with a file item`() {\n+ testFactory(\n+ mediaInfo = anApkMediaInfo(),\n+ expectedResult = { params ->\n+ MediaItem.File(\n+ id = UniqueId(\"dummy\"),\n+ eventId = params.eventId,\n+ mediaInfo = params.mediaInfo,\n+ mediaSource = params.mediaSource,\n+ )\n+ }\n+ )\n+ }\n+\n+ private fun testFactory(\n+ mediaInfo: MediaInfo,\n+ expectedResult: (MediaViewerEntryPoint.Params) -> MediaItem,\n+ ) {\n+ val params = aMediaViewerEntryPointParams(mediaInfo)\n+ val result = SingleMediaGalleryDataSource.createFrom(params)\n+ val resultData = result.getLastData().dataOrNull()\n+ assertThat(resultData!!.imageAndVideoItems.first()).isEqualTo(expectedResult(params))\n+ assertThat(resultData.fileItems).isEmpty()\n+ }\n+\n+ private fun aMediaViewerEntryPointParams(\n+ mediaInfo: MediaInfo,\n+ ) = MediaViewerEntryPoint.Params(\n+ mode = MediaViewerEntryPoint.MediaViewerMode.SingleMedia,\n+ eventId = AN_EVENT_ID,\n+ mediaInfo = mediaInfo,\n+ mediaSource = aMediaSource(url = \"aUrl\"),\n+ thumbnailSource = aMediaSource(url = \"aThumbnailUrl\"),\n+ canShowInfo = true,\n+ )\n+}\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/TimelineMediaGalleryDataSourceTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/TimelineMediaGalleryDataSourceTest.kt\nnew file mode 100644\nindex 00000000000..2f8cd634eca\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/TimelineMediaGalleryDataSourceTest.kt\n@@ -0,0 +1,277 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.gallery\n+\n+import app.cash.turbine.test\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter\n+import io.element.android.libraries.architecture.AsyncData\n+import io.element.android.libraries.core.mimetype.MimeTypes\n+import io.element.android.libraries.dateformatter.test.FakeDateFormatter\n+import io.element.android.libraries.matrix.api.media.ImageInfo\n+import io.element.android.libraries.matrix.api.media.MediaSource\n+import io.element.android.libraries.matrix.api.media.ThumbnailInfo\n+import io.element.android.libraries.matrix.api.room.MatrixRoom\n+import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId\n+import io.element.android.libraries.matrix.api.timeline.item.event.FormattedBody\n+import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType\n+import io.element.android.libraries.matrix.api.timeline.item.event.MessageFormat\n+import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId\n+import io.element.android.libraries.matrix.test.AN_EVENT_ID\n+import io.element.android.libraries.matrix.test.AN_EXCEPTION\n+import io.element.android.libraries.matrix.test.A_UNIQUE_ID\n+import io.element.android.libraries.matrix.test.A_USER_ID\n+import io.element.android.libraries.matrix.test.room.FakeMatrixRoom\n+import io.element.android.libraries.matrix.test.timeline.FakeTimeline\n+import io.element.android.libraries.matrix.test.timeline.aMessageContent\n+import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem\n+import io.element.android.libraries.matrix.ui.components.A_BLUR_HASH\n+import io.element.android.libraries.mediaviewer.api.MediaInfo\n+import io.element.android.libraries.mediaviewer.test.util.FileExtensionExtractorWithoutValidation\n+import io.element.android.tests.testutils.WarmUpRule\n+import io.element.android.tests.testutils.lambda.lambdaRecorder\n+import io.element.android.tests.testutils.lambda.value\n+import io.element.android.tests.testutils.testCoroutineDispatchers\n+import kotlinx.collections.immutable.persistentListOf\n+import kotlinx.coroutines.flow.MutableStateFlow\n+import kotlinx.coroutines.test.TestScope\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Rule\n+import org.junit.Test\n+\n+class TimelineMediaGalleryDataSourceTest {\n+ @get:Rule\n+ val warmUpRule = WarmUpRule()\n+\n+ @Test\n+ fun `test - not started TimelineMediaGalleryDataSource emits no events`() = runTest {\n+ val fakeTimeline = FakeTimeline()\n+ val sut = createTimelineMediaGalleryDataSource(\n+ room = FakeMatrixRoom(\n+ mediaTimelineResult = { Result.success(fakeTimeline) },\n+ roomCoroutineScope = backgroundScope,\n+ )\n+ )\n+ sut.groupedMediaItemsFlow().test {\n+ // Also, loadMore and deleteItem should be no-op\n+ sut.loadMore(Timeline.PaginationDirection.BACKWARDS)\n+ sut.deleteItem(AN_EVENT_ID)\n+ expectNoEvents()\n+ }\n+ }\n+\n+ @Test\n+ fun `test - getLastData should return the previous emitted data`() {\n+ val fakeTimeline = FakeTimeline()\n+ runTest {\n+ val sut = createTimelineMediaGalleryDataSource(\n+ room = FakeMatrixRoom(\n+ mediaTimelineResult = { Result.success(fakeTimeline) },\n+ roomCoroutineScope = backgroundScope,\n+ )\n+ )\n+ sut.start()\n+ assertThat(sut.getLastData()).isEqualTo(AsyncData.Uninitialized)\n+ sut.groupedMediaItemsFlow().test {\n+ assertThat(awaitItem().isLoading()).isTrue()\n+ assertThat(sut.getLastData().isLoading()).isTrue()\n+ assertThat(awaitItem()).isEqualTo(\n+ AsyncData.Success(\n+ GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(),\n+ fileItems = persistentListOf(),\n+ )\n+ )\n+ )\n+ assertThat(sut.getLastData().isSuccess()).isTrue()\n+ // Also test that starting again should have no effect\n+ sut.start()\n+ }\n+ }\n+ // Ensure that the timeline has been closed on flow completion\n+ assertThat(fakeTimeline.closeCounter).isEqualTo(1)\n+ }\n+\n+ @Test\n+ fun `test - load more should call the timeline paginate method`() = runTest {\n+ val paginateLambdaRecorder =\n+ lambdaRecorder> { _ ->\n+ Result.success(true)\n+ }\n+ val fakeTimeline = FakeTimeline().apply {\n+ paginateLambda = paginateLambdaRecorder\n+ }\n+ val sut = createTimelineMediaGalleryDataSource(\n+ room = FakeMatrixRoom(\n+ mediaTimelineResult = { Result.success(fakeTimeline) },\n+ roomCoroutineScope = backgroundScope,\n+ )\n+ )\n+ sut.start()\n+ sut.groupedMediaItemsFlow().test {\n+ skipItems(2)\n+ sut.loadMore(Timeline.PaginationDirection.BACKWARDS)\n+ paginateLambdaRecorder.assertions().isCalledOnce().with(value(Timeline.PaginationDirection.BACKWARDS))\n+ }\n+ }\n+\n+ @Test\n+ fun `test - delete item should call the timeline redact method`() = runTest {\n+ val redactEventLambdaRecorder =\n+ lambdaRecorder> { _, _ ->\n+ Result.success(Unit)\n+ }\n+ val fakeTimeline = FakeTimeline().apply {\n+ redactEventLambda = redactEventLambdaRecorder\n+ }\n+ val sut = createTimelineMediaGalleryDataSource(\n+ room = FakeMatrixRoom(\n+ mediaTimelineResult = { Result.success(fakeTimeline) },\n+ roomCoroutineScope = backgroundScope,\n+ )\n+ )\n+ sut.start()\n+ sut.groupedMediaItemsFlow().test {\n+ skipItems(2)\n+ sut.deleteItem(AN_EVENT_ID)\n+ redactEventLambdaRecorder.assertions().isCalledOnce().with(\n+ value(AN_EVENT_ID.toEventOrTransactionId()),\n+ value(null),\n+ )\n+ }\n+ }\n+\n+ @Test\n+ fun `test - failing to load timeline should emit an error`() = runTest {\n+ val sut = createTimelineMediaGalleryDataSource(\n+ room = FakeMatrixRoom(\n+ mediaTimelineResult = { Result.failure(AN_EXCEPTION) },\n+ roomCoroutineScope = backgroundScope,\n+ )\n+ )\n+ sut.start()\n+ sut.groupedMediaItemsFlow().test {\n+ assertThat(awaitItem().isLoading()).isTrue()\n+ assertThat(sut.getLastData().isLoading()).isTrue()\n+ assertThat(awaitItem()).isEqualTo(\n+ AsyncData.Failure(AN_EXCEPTION)\n+ )\n+ }\n+ }\n+\n+ @Test\n+ fun `test - when timeline emits new data, the flow emits the data`() = runTest {\n+ val timelineItems = MutableStateFlow>(emptyList())\n+ val fakeTimeline = FakeTimeline(\n+ timelineItems = timelineItems,\n+ )\n+ val sut = createTimelineMediaGalleryDataSource(\n+ room = FakeMatrixRoom(\n+ mediaTimelineResult = { Result.success(fakeTimeline) },\n+ roomCoroutineScope = backgroundScope,\n+ )\n+ )\n+ sut.start()\n+ sut.groupedMediaItemsFlow().test {\n+ assertThat(awaitItem().isLoading()).isTrue()\n+ assertThat(sut.getLastData().isLoading()).isTrue()\n+ assertThat(awaitItem()).isEqualTo(\n+ AsyncData.Success(\n+ GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(),\n+ fileItems = persistentListOf(),\n+ )\n+ )\n+ )\n+ timelineItems.emit(\n+ listOf(\n+ MatrixTimelineItem.Event(\n+ uniqueId = A_UNIQUE_ID,\n+ event = anEventTimelineItem(\n+ content = aMessageContent(\n+ messageType = ImageMessageType(\n+ filename = \"body.jpg\",\n+ caption = \"body.jpg caption\",\n+ formattedCaption = FormattedBody(MessageFormat.HTML, \"formatted\"),\n+ source = MediaSource(\"url\"),\n+ info = ImageInfo(\n+ height = 10L,\n+ width = 5L,\n+ mimetype = MimeTypes.Jpeg,\n+ size = 888L,\n+ thumbnailInfo = ThumbnailInfo(\n+ height = 10L,\n+ width = 5L,\n+ mimetype = MimeTypes.Jpeg,\n+ size = 111L,\n+ ),\n+ thumbnailSource = MediaSource(\"url_thumbnail\"),\n+ blurhash = A_BLUR_HASH,\n+ )\n+ )\n+ )\n+ ),\n+ )\n+ )\n+ )\n+ assertThat(awaitItem()).isEqualTo(\n+ AsyncData.Success(\n+ GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(\n+ MediaItem.Image(\n+ id = A_UNIQUE_ID,\n+ eventId = AN_EVENT_ID,\n+ mediaInfo = MediaInfo(\n+ filename = \"body.jpg\",\n+ caption = \"body.jpg caption\",\n+ mimeType = MimeTypes.Jpeg,\n+ formattedFileSize = \"888 Bytes\",\n+ fileExtension = \"jpg\",\n+ senderId = A_USER_ID,\n+ senderName = \"alice\",\n+ senderAvatar = null,\n+ dateSent = \"0 Day false\",\n+ dateSentFull = \"0 Full false\",\n+ waveform = null,\n+ duration = null\n+ ),\n+ mediaSource = MediaSource(\"url\"),\n+ thumbnailSource = MediaSource(\"url_thumbnail\"),\n+ )\n+ ),\n+ fileItems = persistentListOf()\n+ )\n+ )\n+ )\n+ }\n+ }\n+\n+ private fun TestScope.createTimelineMediaGalleryDataSource(\n+ room: MatrixRoom = FakeMatrixRoom(\n+ liveTimeline = FakeTimeline(),\n+ ),\n+ ): TimelineMediaGalleryDataSource {\n+ return TimelineMediaGalleryDataSource(\n+ room = room,\n+ timelineMediaItemsFactory = TimelineMediaItemsFactory(\n+ dispatchers = testCoroutineDispatchers(),\n+ virtualItemFactory = VirtualItemFactory(\n+ dateFormatter = FakeDateFormatter(),\n+ ),\n+ eventItemFactory = EventItemFactory(\n+ fileSizeFormatter = FakeFileSizeFormatter(),\n+ fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),\n+ dateFormatter = FakeDateFormatter(),\n+ ),\n+ ),\n+ mediaItemsPostProcessor = MediaItemsPostProcessor(),\n+ )\n+ }\n+}\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactoryTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactoryTest.kt\nindex 829efd7a155..48c636297bc 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactoryTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactoryTest.kt\n@@ -50,6 +50,7 @@ class AndroidLocalMediaFactoryTest {\n dateSent = \"12:34\",\n dateSentFull = \"full\",\n waveform = null,\n+ duration = null,\n )\n )\n }\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSourceTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSourceTest.kt\nnew file mode 100644\nindex 00000000000..5348eb2aa34\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSourceTest.kt\n@@ -0,0 +1,278 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.viewer\n+\n+import android.net.Uri\n+import app.cash.turbine.test\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.architecture.AsyncData\n+import io.element.android.libraries.matrix.api.media.MatrixMediaLoader\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.libraries.matrix.test.AN_EVENT_ID\n+import io.element.android.libraries.matrix.test.AN_EVENT_ID_2\n+import io.element.android.libraries.matrix.test.AN_EXCEPTION\n+import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader\n+import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory\n+import io.element.android.libraries.mediaviewer.impl.gallery.FakeMediaGalleryDataSource\n+import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryDataSource\n+import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryMode\n+import io.element.android.libraries.mediaviewer.impl.gallery.aGroupedMediaItems\n+import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemDateSeparator\n+import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemFile\n+import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemImage\n+import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemLoadingIndicator\n+import io.element.android.libraries.mediaviewer.test.FakeLocalMediaFactory\n+import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP\n+import io.element.android.services.toolbox.test.systemclock.FakeSystemClock\n+import io.element.android.tests.testutils.lambda.lambdaRecorder\n+import io.element.android.tests.testutils.lambda.value\n+import io.element.android.tests.testutils.testCoroutineDispatchers\n+import io.mockk.mockk\n+import kotlinx.coroutines.test.TestScope\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Test\n+\n+class MediaViewerDataSourceTest {\n+ private val mockMediaUrl: Uri = mockk(\"localMediaUri\")\n+\n+ @Test\n+ fun `setup should start the gallery data source`() = runTest {\n+ val startLambda = lambdaRecorder { }\n+ val galleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = startLambda\n+ )\n+ val sut = createMediaViewerDataSource(\n+ galleryDataSource = galleryDataSource,\n+ )\n+ sut.setup()\n+ startLambda.assertions().isCalledOnce()\n+ }\n+\n+ @Test\n+ fun `test dispose`() = runTest {\n+ val sut = createMediaViewerDataSource()\n+ sut.dispose()\n+ }\n+\n+ @Test\n+ fun `test dataFlow uninitialized, loading and error`() = runTest {\n+ val galleryDataSource = FakeMediaGalleryDataSource()\n+ val sut = createMediaViewerDataSource(\n+ galleryDataSource = galleryDataSource,\n+ )\n+ sut.dataFlow().test {\n+ galleryDataSource.emitGroupedMediaItems(AsyncData.Uninitialized)\n+ assertThat(awaitItem().first()).isInstanceOf(MediaViewerPageData.Loading::class.java)\n+ galleryDataSource.emitGroupedMediaItems(AsyncData.Loading())\n+ assertThat(awaitItem().first()).isInstanceOf(MediaViewerPageData.Loading::class.java)\n+ galleryDataSource.emitGroupedMediaItems(AsyncData.Failure(AN_EXCEPTION))\n+ assertThat(awaitItem().first()).isEqualTo(MediaViewerPageData.Failure(AN_EXCEPTION))\n+ }\n+ }\n+\n+ @Test\n+ fun `test dataFlow empty`() = runTest {\n+ val galleryDataSource = FakeMediaGalleryDataSource()\n+ val sut = createMediaViewerDataSource(\n+ galleryDataSource = galleryDataSource,\n+ )\n+ sut.dataFlow().test {\n+ galleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ aGroupedMediaItems(\n+ imageAndVideoItems = listOf(),\n+ fileItems = listOf(),\n+ )\n+ )\n+ )\n+ val result = awaitItem()\n+ assertThat(result).isEmpty()\n+ }\n+ }\n+\n+ @Test\n+ fun `test dataFlow loading items`() = runTest {\n+ val galleryDataSource = FakeMediaGalleryDataSource()\n+ val sut = createMediaViewerDataSource(\n+ galleryDataSource = galleryDataSource,\n+ )\n+ sut.dataFlow().test {\n+ galleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ aGroupedMediaItems(\n+ imageAndVideoItems = listOf(\n+ aMediaItemLoadingIndicator(\n+ direction = Timeline.PaginationDirection.BACKWARDS,\n+ ),\n+ aMediaItemLoadingIndicator(\n+ direction = Timeline.PaginationDirection.FORWARDS,\n+ ),\n+ ),\n+ fileItems = listOf(),\n+ )\n+ )\n+ )\n+ val result = awaitItem()\n+ assertThat(result).containsExactly(\n+ MediaViewerPageData.Loading(\n+ direction = Timeline.PaginationDirection.BACKWARDS,\n+ timestamp = A_FAKE_TIMESTAMP,\n+ ),\n+ MediaViewerPageData.Loading(\n+ direction = Timeline.PaginationDirection.FORWARDS,\n+ timestamp = A_FAKE_TIMESTAMP,\n+ ),\n+ )\n+ }\n+ }\n+\n+ @Test\n+ fun `test dataFlow with data galleryMode image`() = runTest {\n+ val galleryDataSource = FakeMediaGalleryDataSource()\n+ val sut = createMediaViewerDataSource(\n+ galleryMode = MediaGalleryMode.Images,\n+ galleryDataSource = galleryDataSource,\n+ )\n+ sut.dataFlow().test {\n+ galleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ aGroupedMediaItems(\n+ imageAndVideoItems = listOf(aMediaItemImage(eventId = AN_EVENT_ID)),\n+ fileItems = listOf(aMediaItemFile(eventId = AN_EVENT_ID_2)),\n+ )\n+ )\n+ )\n+ val result = awaitItem()\n+ assertThat(result).hasSize(1)\n+ assertThat((result.first() as MediaViewerPageData.MediaViewerData).eventId).isEqualTo(AN_EVENT_ID)\n+ }\n+ }\n+\n+ @Test\n+ fun `test dataFlow with data galleryMode files`() = runTest {\n+ val galleryDataSource = FakeMediaGalleryDataSource()\n+ val sut = createMediaViewerDataSource(\n+ galleryMode = MediaGalleryMode.Files,\n+ galleryDataSource = galleryDataSource,\n+ )\n+ sut.dataFlow().test {\n+ galleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ aGroupedMediaItems(\n+ imageAndVideoItems = listOf(aMediaItemImage(eventId = AN_EVENT_ID)),\n+ fileItems = listOf(aMediaItemFile(eventId = AN_EVENT_ID_2)),\n+ )\n+ )\n+ )\n+ val result = awaitItem()\n+ assertThat(result).hasSize(1)\n+ assertThat((result.first() as MediaViewerPageData.MediaViewerData).eventId).isEqualTo(AN_EVENT_ID_2)\n+ }\n+ }\n+\n+ @Test\n+ fun `test dataFlow - date separator are filtered out`() = runTest {\n+ val galleryDataSource = FakeMediaGalleryDataSource()\n+ val sut = createMediaViewerDataSource(\n+ galleryDataSource = galleryDataSource,\n+ )\n+ sut.dataFlow().test {\n+ galleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ aGroupedMediaItems(\n+ imageAndVideoItems = listOf(aMediaItemDateSeparator(), aMediaItemImage(), aMediaItemDateSeparator()),\n+ fileItems = emptyList(),\n+ )\n+ )\n+ )\n+ val result = awaitItem()\n+ assertThat(result).hasSize(1)\n+ }\n+ }\n+\n+ @Test\n+ fun `loadMore invokes the gallery data source loadMore`() = runTest {\n+ val loadMoreLambda = lambdaRecorder { }\n+ val galleryDataSource = FakeMediaGalleryDataSource(\n+ loadMoreLambda = loadMoreLambda\n+ )\n+ val sut = createMediaViewerDataSource(\n+ galleryDataSource = galleryDataSource,\n+ )\n+ sut.loadMore(Timeline.PaginationDirection.BACKWARDS)\n+ loadMoreLambda.assertions().isCalledOnce().with(value(Timeline.PaginationDirection.BACKWARDS))\n+ }\n+\n+ @Test\n+ fun `test dataFlow with data galleryMode image and load media`() = runTest {\n+ val galleryDataSource = FakeMediaGalleryDataSource()\n+ val sut = createMediaViewerDataSource(\n+ galleryDataSource = galleryDataSource,\n+ )\n+ sut.dataFlow().test {\n+ galleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ aGroupedMediaItems(\n+ imageAndVideoItems = listOf(aMediaItemImage(eventId = AN_EVENT_ID)),\n+ )\n+ )\n+ )\n+ val result = awaitItem()\n+ val mediaViewerData = result.first() as MediaViewerPageData.MediaViewerData\n+ assertThat(mediaViewerData.downloadedMedia.value).isEqualTo(AsyncData.Uninitialized)\n+ sut.loadMedia(mediaViewerData)\n+ assertThat(mediaViewerData.downloadedMedia.value.isSuccess()).isTrue()\n+ }\n+ }\n+\n+ @Test\n+ fun `test dataFlow with data galleryMode image and load media with failure then success`() = runTest {\n+ val galleryDataSource = FakeMediaGalleryDataSource()\n+ val mediaLoader = FakeMatrixMediaLoader()\n+ val sut = createMediaViewerDataSource(\n+ galleryDataSource = galleryDataSource,\n+ mediaLoader = mediaLoader,\n+ )\n+ sut.dataFlow().test {\n+ galleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ aGroupedMediaItems(\n+ imageAndVideoItems = listOf(aMediaItemImage(eventId = AN_EVENT_ID)),\n+ )\n+ )\n+ )\n+ val result = awaitItem()\n+ val mediaViewerData = result.first() as MediaViewerPageData.MediaViewerData\n+ assertThat(mediaViewerData.downloadedMedia.value).isEqualTo(AsyncData.Uninitialized)\n+ mediaLoader.shouldFail = true\n+ sut.loadMedia(mediaViewerData)\n+ assertThat(mediaViewerData.downloadedMedia.value.isFailure()).isTrue()\n+ // clear the error\n+ sut.clearLoadingError(mediaViewerData)\n+ assertThat(mediaViewerData.downloadedMedia.value).isEqualTo(AsyncData.Uninitialized)\n+ // load again with success\n+ mediaLoader.shouldFail = false\n+ sut.loadMedia(mediaViewerData)\n+ assertThat(mediaViewerData.downloadedMedia.value.isSuccess()).isTrue()\n+ }\n+ }\n+\n+ private fun TestScope.createMediaViewerDataSource(\n+ galleryMode: MediaGalleryMode = MediaGalleryMode.Images,\n+ galleryDataSource: MediaGalleryDataSource = FakeMediaGalleryDataSource(),\n+ mediaLoader: MatrixMediaLoader = FakeMatrixMediaLoader(),\n+ localMediaFactory: LocalMediaFactory = FakeLocalMediaFactory(mockMediaUrl),\n+ ) = MediaViewerDataSource(\n+ galleryMode = galleryMode,\n+ dispatcher = testCoroutineDispatchers().computation,\n+ galleryDataSource = galleryDataSource,\n+ mediaLoader = mediaLoader,\n+ localMediaFactory = localMediaFactory,\n+ systemClock = FakeSystemClock(),\n+ )\n+}\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt\nindex 3f62fe463cf..ac0acfe7193 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt\n@@ -10,14 +10,14 @@\n package io.element.android.libraries.mediaviewer.impl.viewer\n \n import android.net.Uri\n-import app.cash.molecule.RecompositionMode\n-import app.cash.molecule.moleculeFlow\n-import app.cash.turbine.test\n+import app.cash.turbine.ReceiveTurbine\n import com.google.common.truth.Truth.assertThat\n import io.element.android.libraries.architecture.AsyncData\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n import io.element.android.libraries.matrix.api.core.EventId\n+import io.element.android.libraries.matrix.api.media.MediaSource\n import io.element.android.libraries.matrix.api.room.MatrixRoom\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId\n import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId\n import io.element.android.libraries.matrix.test.AN_EVENT_ID\n@@ -30,14 +30,23 @@ import io.element.android.libraries.matrix.test.timeline.FakeTimeline\n import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint\n import io.element.android.libraries.mediaviewer.api.anApkMediaInfo\n import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState\n+import io.element.android.libraries.mediaviewer.impl.gallery.FakeMediaGalleryDataSource\n+import io.element.android.libraries.mediaviewer.impl.gallery.GroupedMediaItems\n+import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryDataSource\n+import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryMode\n+import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemImage\n import io.element.android.libraries.mediaviewer.test.FakeLocalMediaActions\n import io.element.android.libraries.mediaviewer.test.FakeLocalMediaFactory\n+import io.element.android.services.toolbox.test.systemclock.FakeSystemClock\n import io.element.android.tests.testutils.WarmUpRule\n import io.element.android.tests.testutils.lambda.lambdaRecorder\n import io.element.android.tests.testutils.lambda.value\n import io.element.android.tests.testutils.test\n+import io.element.android.tests.testutils.testCoroutineDispatchers\n import io.mockk.mockk\n+import kotlinx.collections.immutable.persistentListOf\n import kotlinx.coroutines.ExperimentalCoroutinesApi\n+import kotlinx.coroutines.test.TestScope\n import kotlinx.coroutines.test.runTest\n import org.junit.Rule\n import org.junit.Test\n@@ -52,6 +61,7 @@ class MediaViewerPresenterTest {\n \n private val mockMediaUri: Uri = mockk(\"localMediaUri\")\n private val localMediaFactory = FakeLocalMediaFactory(mockMediaUri)\n+ private val aUrl = \"aUrl\"\n \n @Test\n fun `present - initial state null Event`() = runTest {\n@@ -61,9 +71,9 @@ class MediaViewerPresenterTest {\n )\n )\n presenter.test {\n- skipItems(2)\n- val initialState = awaitItem()\n- assertThat(initialState.downloadedMedia).isInstanceOf(AsyncData.Success::class.java)\n+ val initialState = awaitFirstItem()\n+ assertThat(initialState.listData).isEmpty()\n+ assertThat(initialState.currentIndex).isEqualTo(0)\n assertThat(initialState.snackbarMessage).isNull()\n assertThat(initialState.canShowInfo).isTrue()\n assertThat(initialState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)\n@@ -79,9 +89,9 @@ class MediaViewerPresenterTest {\n )\n )\n presenter.test {\n- skipItems(2)\n- val initialState = awaitItem()\n- assertThat(initialState.downloadedMedia).isInstanceOf(AsyncData.Success::class.java)\n+ val initialState = awaitFirstItem()\n+ assertThat(initialState.listData).isEmpty()\n+ assertThat(initialState.currentIndex).isEqualTo(0)\n assertThat(initialState.snackbarMessage).isNull()\n assertThat(initialState.canShowInfo).isFalse()\n assertThat(initialState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)\n@@ -97,9 +107,9 @@ class MediaViewerPresenterTest {\n )\n )\n presenter.test {\n- skipItems(2)\n- val initialState = awaitItem()\n- assertThat(initialState.downloadedMedia).isInstanceOf(AsyncData.Success::class.java)\n+ val initialState = awaitFirstItem()\n+ assertThat(initialState.listData).isEmpty()\n+ assertThat(initialState.currentIndex).isEqualTo(0)\n assertThat(initialState.snackbarMessage).isNull()\n assertThat(initialState.canShowInfo).isTrue()\n assertThat(initialState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)\n@@ -116,9 +126,9 @@ class MediaViewerPresenterTest {\n )\n )\n presenter.test {\n- skipItems(2)\n- val initialState = awaitItem()\n- assertThat(initialState.downloadedMedia).isInstanceOf(AsyncData.Success::class.java)\n+ val initialState = awaitFirstItem()\n+ assertThat(initialState.listData).isEmpty()\n+ assertThat(initialState.currentIndex).isEqualTo(0)\n assertThat(initialState.snackbarMessage).isNull()\n assertThat(initialState.canShowInfo).isTrue()\n assertThat(initialState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)\n@@ -126,114 +136,280 @@ class MediaViewerPresenterTest {\n }\n \n @Test\n- fun `present - download media success scenario`() = runTest {\n+ fun `present - data source update`() = runTest {\n+ val mediaGalleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = { },\n+ )\n val presenter = createMediaViewerPresenter(\n- room = FakeMatrixRoom(\n- canRedactOwnResult = { Result.success(true) },\n+ mediaGalleryDataSource = mediaGalleryDataSource,\n+ )\n+ val anImage = aMediaItemImage()\n+ presenter.test {\n+ val initialState = awaitFirstItem()\n+ assertThat(initialState.listData).isEmpty()\n+ mediaGalleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(anImage),\n+ fileItems = persistentListOf(),\n+ )\n+ )\n )\n+ val updatedState = awaitFirstItem()\n+ assertThat(updatedState.listData).hasSize(1)\n+ val item = updatedState.listData.first() as MediaViewerPageData.MediaViewerData\n+ assertThat(item.eventId).isNull()\n+ assertThat(item.mediaInfo).isEqualTo(anImage.mediaInfo)\n+ assertThat(item.mediaSource).isEqualTo(anImage.mediaSource)\n+ assertThat(item.thumbnailSource).isEqualTo(anImage.thumbnailSource)\n+ assertThat(item.downloadedMedia.value).isEqualTo(AsyncData.Uninitialized)\n+ }\n+ }\n+\n+ @Test\n+ fun `present - load media`() = runTest {\n+ val mediaGalleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = { },\n )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n- var state = awaitItem()\n- assertThat(state.downloadedMedia).isEqualTo(AsyncData.Uninitialized)\n- assertThat(state.mediaInfo).isEqualTo(TESTED_MEDIA_INFO)\n- state = awaitItem()\n- assertThat(state.downloadedMedia).isInstanceOf(AsyncData.Loading::class.java)\n- state = awaitItem()\n- val successData = state.downloadedMedia.dataOrNull()\n- assertThat(state.downloadedMedia).isInstanceOf(AsyncData.Success::class.java)\n- assertThat(successData).isNotNull()\n+ val presenter = createMediaViewerPresenter(\n+ mediaGalleryDataSource = mediaGalleryDataSource,\n+ )\n+ val anImage = aMediaItemImage(\n+ mediaSourceUrl = aUrl,\n+ )\n+ presenter.test {\n+ awaitFirstItem()\n+ mediaGalleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(anImage),\n+ fileItems = persistentListOf(),\n+ )\n+ )\n+ )\n+ val updatedState = awaitItem()\n+ updatedState.eventSink(\n+ MediaViewerEvents.LoadMedia(\n+ aMediaViewerPageData(\n+ mediaSource = MediaSource(aUrl)\n+ )\n+ )\n+ )\n }\n }\n \n @Test\n- fun `present - check all actions`() = runTest {\n- val mediaActions = FakeLocalMediaActions()\n- val snackbarDispatcher = SnackbarDispatcher()\n+ fun `present - open info`() = runTest {\n+ val mediaGalleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = { },\n+ )\n val presenter = createMediaViewerPresenter(\n- localMediaActions = mediaActions,\n- snackbarDispatcher = snackbarDispatcher,\n+ mediaGalleryDataSource = mediaGalleryDataSource,\n room = FakeMatrixRoom(\n canRedactOwnResult = { Result.success(true) },\n )\n )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n- var state = awaitItem()\n- assertThat(state.downloadedMedia).isEqualTo(AsyncData.Uninitialized)\n- state = awaitItem()\n- assertThat(state.downloadedMedia).isInstanceOf(AsyncData.Loading::class.java)\n- // no state changes while media is loading\n- state.eventSink(MediaViewerEvents.OpenWith)\n- state.eventSink(MediaViewerEvents.Share)\n- state.eventSink(MediaViewerEvents.SaveOnDisk)\n- state = awaitItem()\n- assertThat(state.downloadedMedia).isInstanceOf(AsyncData.Success::class.java)\n- // Should succeed without change of state\n- state.eventSink(MediaViewerEvents.OpenWith)\n- // Should succeed without change of state\n- state.eventSink(MediaViewerEvents.Share)\n- state.eventSink(MediaViewerEvents.SaveOnDisk)\n- state = awaitItem()\n- assertThat(state.snackbarMessage).isNotNull()\n- snackbarDispatcher.clear()\n- assertThat(awaitItem().snackbarMessage).isNull()\n+ val anImage = aMediaItemImage(\n+ mediaSourceUrl = aUrl,\n+ )\n+ presenter.test {\n+ awaitFirstItem()\n+ mediaGalleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(anImage),\n+ fileItems = persistentListOf(),\n+ )\n+ )\n+ )\n+ val updatedState = awaitItem()\n+ updatedState.eventSink(\n+ MediaViewerEvents.OpenInfo(\n+ aMediaViewerPageData(\n+ mediaSource = MediaSource(aUrl)\n+ )\n+ )\n+ )\n+ val withInfoState = awaitItem()\n+ assertThat(withInfoState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDetailsBottomSheetState::class.java)\n+ withInfoState.eventSink(\n+ MediaViewerEvents.CloseBottomSheet\n+ )\n+ val finalState = awaitItem()\n+ assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)\n+ }\n+ }\n \n- // Check failures\n- mediaActions.shouldFail = true\n- state.eventSink(MediaViewerEvents.OpenWith)\n- state = awaitItem()\n- assertThat(state.snackbarMessage).isNotNull()\n- snackbarDispatcher.clear()\n- assertThat(awaitItem().snackbarMessage).isNull()\n- state.eventSink(MediaViewerEvents.Share)\n- state = awaitItem()\n- assertThat(state.snackbarMessage).isNotNull()\n- snackbarDispatcher.clear()\n- assertThat(awaitItem().snackbarMessage).isNull()\n- state.eventSink(MediaViewerEvents.SaveOnDisk)\n- state = awaitItem()\n- assertThat(state.snackbarMessage).isNotNull()\n+ @Test\n+ fun `present - clear loading error`() = runTest {\n+ val mediaGalleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = { },\n+ )\n+ val presenter = createMediaViewerPresenter(\n+ mediaGalleryDataSource = mediaGalleryDataSource,\n+ )\n+ val anImage = aMediaItemImage(\n+ mediaSourceUrl = aUrl,\n+ )\n+ presenter.test {\n+ awaitFirstItem()\n+ mediaGalleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(anImage),\n+ fileItems = persistentListOf(),\n+ )\n+ )\n+ )\n+ val updatedState = awaitItem()\n+ updatedState.eventSink(\n+ MediaViewerEvents.ClearLoadingError(\n+ aMediaViewerPageData(\n+ mediaSource = MediaSource(aUrl)\n+ )\n+ )\n+ )\n }\n }\n \n @Test\n- fun `present - download media failure then retry with success scenario`() = runTest {\n- val matrixMediaLoader = FakeMatrixMediaLoader()\n+ fun `present - share`() = runTest {\n+ val mediaGalleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = { },\n+ )\n val presenter = createMediaViewerPresenter(\n- matrixMediaLoader = matrixMediaLoader,\n- room = FakeMatrixRoom(\n- canRedactOwnResult = { Result.success(true) },\n+ mediaGalleryDataSource = mediaGalleryDataSource,\n+ )\n+ val anImage = aMediaItemImage(\n+ mediaSourceUrl = aUrl,\n+ )\n+ presenter.test {\n+ awaitFirstItem()\n+ mediaGalleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(anImage),\n+ fileItems = persistentListOf(),\n+ )\n+ )\n+ )\n+ val updatedState = awaitItem()\n+ updatedState.eventSink(\n+ MediaViewerEvents.Share(\n+ aMediaViewerPageData(\n+ mediaSource = MediaSource(aUrl)\n+ )\n+ )\n )\n+ }\n+ }\n+\n+ @Test\n+ fun `present - save on disk`() = runTest {\n+ val mediaGalleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = { },\n )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n- matrixMediaLoader.shouldFail = true\n- val initialState = awaitItem()\n- assertThat(initialState.downloadedMedia).isEqualTo(AsyncData.Uninitialized)\n- assertThat(initialState.mediaInfo).isEqualTo(TESTED_MEDIA_INFO)\n- val loadingState = awaitItem()\n- assertThat(loadingState.downloadedMedia).isInstanceOf(AsyncData.Loading::class.java)\n- val failureState = awaitItem()\n- assertThat(failureState.downloadedMedia).isInstanceOf(AsyncData.Failure::class.java)\n- matrixMediaLoader.shouldFail = false\n- failureState.eventSink(MediaViewerEvents.RetryLoading)\n- // There is one recomposition because of the retry mechanism\n- skipItems(1)\n- val retryLoadingState = awaitItem()\n- assertThat(retryLoadingState.downloadedMedia).isInstanceOf(AsyncData.Loading::class.java)\n- val successState = awaitItem()\n- val successData = successState.downloadedMedia.dataOrNull()\n- assertThat(successState.downloadedMedia).isInstanceOf(AsyncData.Success::class.java)\n- assertThat(successData).isNotNull()\n+ val presenter = createMediaViewerPresenter(\n+ mediaGalleryDataSource = mediaGalleryDataSource,\n+ )\n+ val anImage = aMediaItemImage(\n+ mediaSourceUrl = aUrl,\n+ )\n+ presenter.test {\n+ awaitFirstItem()\n+ mediaGalleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(anImage),\n+ fileItems = persistentListOf(),\n+ )\n+ )\n+ )\n+ val updatedState = awaitItem()\n+ updatedState.eventSink(\n+ MediaViewerEvents.SaveOnDisk(\n+ aMediaViewerPageData(\n+ mediaSource = MediaSource(aUrl)\n+ )\n+ )\n+ )\n+ }\n+ }\n+\n+ @Test\n+ fun `present - open with`() = runTest {\n+ val mediaGalleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = { },\n+ )\n+ val presenter = createMediaViewerPresenter(\n+ mediaGalleryDataSource = mediaGalleryDataSource,\n+ )\n+ val anImage = aMediaItemImage(\n+ mediaSourceUrl = aUrl,\n+ )\n+ presenter.test {\n+ awaitFirstItem()\n+ mediaGalleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(anImage),\n+ fileItems = persistentListOf(),\n+ )\n+ )\n+ )\n+ val updatedState = awaitItem()\n+ updatedState.eventSink(\n+ MediaViewerEvents.OpenWith(\n+ aMediaViewerPageData(\n+ mediaSource = MediaSource(aUrl)\n+ )\n+ )\n+ )\n }\n }\n \n @Test\n- fun `present - delete media success scenario`() = runTest {\n+ fun `present - delete and cancel`() = runTest {\n+ val mediaGalleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = { },\n+ )\n+ val presenter = createMediaViewerPresenter(\n+ mediaGalleryDataSource = mediaGalleryDataSource,\n+ )\n+ val anImage = aMediaItemImage(\n+ mediaSourceUrl = aUrl,\n+ )\n+ presenter.test {\n+ awaitFirstItem()\n+ mediaGalleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(anImage),\n+ fileItems = persistentListOf(),\n+ )\n+ )\n+ )\n+ val updatedState = awaitItem()\n+ updatedState.eventSink(\n+ MediaViewerEvents.ConfirmDelete(\n+ eventId = AN_EVENT_ID,\n+ data = aMediaViewerPageData(\n+ mediaSource = MediaSource(aUrl)\n+ )\n+ )\n+ )\n+ val withBottomSheetState = awaitItem()\n+ assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDeleteConfirmationState::class.java)\n+ withBottomSheetState.eventSink(\n+ MediaViewerEvents.CloseBottomSheet\n+ )\n+ val finalState = awaitItem()\n+ assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)\n+ }\n+ }\n+\n+ @Test\n+ fun `present - delete`() = runTest {\n val redactEventLambda = lambdaRecorder> { _, _ ->\n Result.success(Unit)\n }\n@@ -241,26 +417,51 @@ class MediaViewerPresenterTest {\n this.redactEventLambda = redactEventLambda\n }\n val onItemDeletedLambda = lambdaRecorder { }\n- val navigator = FakeMediaViewerNavigator(\n- onItemDeletedLambda = onItemDeletedLambda,\n+ val mediaGalleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = { },\n )\n-\n val presenter = createMediaViewerPresenter(\n room = FakeMatrixRoom(\n liveTimeline = timeline,\n canRedactOwnResult = { Result.success(true) },\n ),\n- mediaViewerNavigator = navigator,\n+ mediaGalleryDataSource = mediaGalleryDataSource,\n+ mediaViewerNavigator = FakeMediaViewerNavigator(\n+ onItemDeletedLambda = onItemDeletedLambda\n+ )\n+ )\n+ val anImage = aMediaItemImage(\n+ eventId = AN_EVENT_ID,\n+ mediaSourceUrl = aUrl,\n )\n presenter.test {\n- val initialState = awaitItem()\n- assertThat(initialState.downloadedMedia).isEqualTo(AsyncData.Uninitialized)\n- assertThat(initialState.mediaInfo).isEqualTo(TESTED_MEDIA_INFO)\n- val loadingState = awaitItem()\n- assertThat(loadingState.downloadedMedia).isInstanceOf(AsyncData.Loading::class.java)\n- val successState = awaitItem()\n- assertThat(successState.downloadedMedia).isInstanceOf(AsyncData.Success::class.java)\n- successState.eventSink(MediaViewerEvents.Delete(AN_EVENT_ID))\n+ awaitFirstItem()\n+ mediaGalleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(anImage),\n+ fileItems = persistentListOf(),\n+ )\n+ )\n+ )\n+ val updatedState = awaitItem()\n+ updatedState.eventSink(\n+ MediaViewerEvents.ConfirmDelete(\n+ eventId = AN_EVENT_ID,\n+ data = aMediaViewerPageData(\n+ mediaSource = MediaSource(aUrl)\n+ )\n+ )\n+ )\n+ val withBottomSheetState = awaitItem()\n+ assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDeleteConfirmationState::class.java)\n+ updatedState.eventSink(\n+ MediaViewerEvents.Delete(\n+ eventId = AN_EVENT_ID,\n+ )\n+ )\n+ val finalState = awaitItem()\n+ assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)\n redactEventLambda.assertions()\n .isCalledOnce()\n .with(\n@@ -272,7 +473,71 @@ class MediaViewerPresenterTest {\n }\n \n @Test\n- fun `present - view in timeline invokes the navigator`() = runTest {\n+ fun `present - on navigate to`() = runTest {\n+ val mediaGalleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = { },\n+ )\n+ val presenter = createMediaViewerPresenter(\n+ mediaGalleryDataSource = mediaGalleryDataSource,\n+ )\n+ val anImage = aMediaItemImage(\n+ mediaSourceUrl = aUrl,\n+ )\n+ val anImage2 = aMediaItemImage(\n+ mediaSourceUrl = aUrl,\n+ )\n+ presenter.test {\n+ awaitFirstItem()\n+ mediaGalleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(anImage, anImage2),\n+ fileItems = persistentListOf(),\n+ )\n+ )\n+ )\n+ val updatedState = awaitItem()\n+ updatedState.eventSink(\n+ MediaViewerEvents.OnNavigateTo(1)\n+ )\n+ val finalState = awaitItem()\n+ assertThat(finalState.currentIndex).isEqualTo(1)\n+ }\n+ }\n+\n+ @Test\n+ fun `present - load more`() = runTest {\n+ val loadMoreLambda = lambdaRecorder { }\n+ val mediaGalleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = { },\n+ loadMoreLambda = loadMoreLambda,\n+ )\n+ val presenter = createMediaViewerPresenter(\n+ mediaGalleryDataSource = mediaGalleryDataSource,\n+ )\n+ val anImage = aMediaItemImage(\n+ mediaSourceUrl = aUrl,\n+ )\n+ presenter.test {\n+ awaitFirstItem()\n+ mediaGalleryDataSource.emitGroupedMediaItems(\n+ AsyncData.Success(\n+ GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(anImage),\n+ fileItems = persistentListOf(),\n+ )\n+ )\n+ )\n+ val updatedState = awaitItem()\n+ updatedState.eventSink(\n+ MediaViewerEvents.LoadMore(Timeline.PaginationDirection.BACKWARDS)\n+ )\n+ loadMoreLambda.assertions().isCalledOnce().with(value(Timeline.PaginationDirection.BACKWARDS))\n+ }\n+ }\n+\n+ @Test\n+ fun `present - view in timeline hide the bottom sheet and invokes the navigator`() = runTest {\n val onViewInTimelineClickLambda = lambdaRecorder { }\n val navigator = FakeMediaViewerNavigator(\n onViewInTimelineClickLambda = onViewInTimelineClickLambda,\n@@ -285,22 +550,28 @@ class MediaViewerPresenterTest {\n )\n presenter.test {\n val initialState = awaitItem()\n- assertThat(initialState.downloadedMedia).isEqualTo(AsyncData.Uninitialized)\n- assertThat(initialState.mediaInfo).isEqualTo(TESTED_MEDIA_INFO)\n- val loadingState = awaitItem()\n- assertThat(loadingState.downloadedMedia).isInstanceOf(AsyncData.Loading::class.java)\n- val successState = awaitItem()\n- assertThat(successState.downloadedMedia).isInstanceOf(AsyncData.Success::class.java)\n- successState.eventSink(MediaViewerEvents.ViewInTimeline(AN_EVENT_ID))\n+ initialState.eventSink(MediaViewerEvents.OpenInfo(aMediaViewerPageData()))\n+ val withBottomSheetState = awaitItem()\n+ assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDetailsBottomSheetState::class.java)\n+ initialState.eventSink(MediaViewerEvents.ViewInTimeline(AN_EVENT_ID))\n+ val finalState = awaitItem()\n+ assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)\n onViewInTimelineClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))\n }\n }\n \n- private fun createMediaViewerPresenter(\n+ private suspend fun ReceiveTurbine.awaitFirstItem(): T {\n+ return awaitItem()\n+ }\n+\n+ private fun TestScope.createMediaViewerPresenter(\n eventId: EventId? = null,\n matrixMediaLoader: FakeMatrixMediaLoader = FakeMatrixMediaLoader(),\n localMediaActions: FakeLocalMediaActions = FakeLocalMediaActions(),\n snackbarDispatcher: SnackbarDispatcher = SnackbarDispatcher(),\n+ mediaGalleryDataSource: MediaGalleryDataSource = FakeMediaGalleryDataSource(\n+ startLambda = { },\n+ ),\n canShowInfo: Boolean = true,\n mediaViewerNavigator: MediaViewerNavigator = FakeMediaViewerNavigator(),\n room: MatrixRoom = FakeMatrixRoom(\n@@ -309,18 +580,25 @@ class MediaViewerPresenterTest {\n ): MediaViewerPresenter {\n return MediaViewerPresenter(\n inputs = MediaViewerEntryPoint.Params(\n+ mode = MediaViewerEntryPoint.MediaViewerMode.SingleMedia,\n eventId = eventId,\n mediaInfo = TESTED_MEDIA_INFO,\n mediaSource = aMediaSource(),\n thumbnailSource = null,\n canShowInfo = canShowInfo,\n ),\n- localMediaFactory = localMediaFactory,\n- mediaLoader = matrixMediaLoader,\n- localMediaActions = localMediaActions,\n- snackbarDispatcher = snackbarDispatcher,\n navigator = mediaViewerNavigator,\n+ dataSource = MediaViewerDataSource(\n+ galleryMode = MediaGalleryMode.Images,\n+ dispatcher = testCoroutineDispatchers().computation,\n+ galleryDataSource = mediaGalleryDataSource,\n+ mediaLoader = matrixMediaLoader,\n+ localMediaFactory = localMediaFactory,\n+ systemClock = FakeSystemClock(),\n+ ),\n room = room,\n+ localMediaActions = localMediaActions,\n+ snackbarDispatcher = snackbarDispatcher,\n )\n }\n }\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerViewTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerViewTest.kt\nindex 89dfc0dd91f..bfc294098b5 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerViewTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerViewTest.kt\n@@ -18,15 +18,15 @@ import androidx.compose.ui.test.performTouchInput\n import androidx.compose.ui.test.swipeDown\n import androidx.test.ext.junit.runners.AndroidJUnit4\n import io.element.android.libraries.architecture.AsyncData\n-import io.element.android.libraries.mediaviewer.api.anImageMediaInfo\n-import io.element.android.libraries.mediaviewer.api.local.LocalMedia\n import io.element.android.libraries.mediaviewer.impl.details.aMediaDetailsBottomSheetState\n+import io.element.android.libraries.mediaviewer.test.viewer.aLocalMedia\n import io.element.android.libraries.ui.strings.CommonStrings\n import io.element.android.tests.testutils.EnsureNeverCalled\n import io.element.android.tests.testutils.EventsRecorder\n import io.element.android.tests.testutils.clickOn\n import io.element.android.tests.testutils.ensureCalledOnce\n import io.element.android.tests.testutils.pressBack\n+import io.mockk.mockk\n import org.junit.Rule\n import org.junit.Test\n import org.junit.rules.TestRule\n@@ -36,78 +36,127 @@ import org.junit.runner.RunWith\n class MediaViewerViewTest {\n @get:Rule val rule = createAndroidComposeRule()\n \n+ private val mockMediaUrl: Uri = mockk(\"localMediaUri\")\n+\n @Test\n fun `clicking on back invokes expected callback`() {\n- val eventsRecorder = EventsRecorder(expectEvents = false)\n+ val eventsRecorder = EventsRecorder()\n+ val state = aMediaViewerState(\n+ eventSink = eventsRecorder\n+ )\n ensureCalledOnce { callback ->\n rule.setMediaViewerView(\n- aMediaViewerState(\n- eventSink = eventsRecorder\n- ),\n+ state = state,\n onBackClick = callback,\n )\n rule.pressBack()\n }\n+ eventsRecorder.assertList(\n+ listOf(\n+ MediaViewerEvents.OnNavigateTo(0),\n+ MediaViewerEvents.LoadMedia(state.listData.first() as MediaViewerPageData.MediaViewerData),\n+ )\n+ )\n }\n \n @Test\n fun `clicking on open emit expected Event`() {\n- testMenuAction(CommonStrings.action_open_with, MediaViewerEvents.OpenWith)\n+ val data = aMediaViewerPageData(\n+ downloadedMedia = AsyncData.Success(aLocalMedia(uri = mockMediaUrl)),\n+ )\n+ testMenuAction(\n+ data,\n+ CommonStrings.action_open_with,\n+ MediaViewerEvents.OpenWith(data),\n+ )\n+ }\n+\n+ @Test\n+ fun `clicking on info emit expected Event`() {\n+ val data = aMediaViewerPageData(\n+ downloadedMedia = AsyncData.Success(aLocalMedia(uri = mockMediaUrl)),\n+ )\n+ testMenuAction(\n+ data,\n+ CommonStrings.a11y_view_details,\n+ MediaViewerEvents.OpenInfo(data),\n+ )\n }\n \n- private fun testMenuAction(contentDescriptionRes: Int, expectedEvent: MediaViewerEvents) {\n+ private fun testMenuAction(\n+ data: MediaViewerPageData.MediaViewerData,\n+ contentDescriptionRes: Int,\n+ expectedEvent: MediaViewerEvents,\n+ ) {\n val eventsRecorder = EventsRecorder()\n rule.setMediaViewerView(\n aMediaViewerState(\n- downloadedMedia = AsyncData.Success(\n- LocalMedia(Uri.EMPTY, anImageMediaInfo())\n- ),\n- mediaInfo = anImageMediaInfo(),\n+ listData = listOf(data),\n eventSink = eventsRecorder\n ),\n )\n val contentDescription = rule.activity.getString(contentDescriptionRes)\n rule.onNodeWithContentDescription(contentDescription).performClick()\n- eventsRecorder.assertSingle(expectedEvent)\n+ eventsRecorder.assertList(\n+ listOf(\n+ MediaViewerEvents.OnNavigateTo(0),\n+ MediaViewerEvents.LoadMedia(data),\n+ expectedEvent,\n+ )\n+ )\n }\n \n @Test\n fun `clicking on save emit expected Event`() {\n- testBottomSheetAction(CommonStrings.action_save, MediaViewerEvents.SaveOnDisk)\n+ val data = aMediaViewerPageData()\n+ testBottomSheetAction(\n+ data,\n+ CommonStrings.action_save,\n+ MediaViewerEvents.SaveOnDisk(data),\n+ )\n }\n \n @Test\n fun `clicking on share emit expected Event`() {\n- testBottomSheetAction(CommonStrings.action_share, MediaViewerEvents.Share)\n+ val data = aMediaViewerPageData()\n+ testBottomSheetAction(\n+ data,\n+ CommonStrings.action_share,\n+ MediaViewerEvents.Share(data),\n+ )\n }\n \n- private fun testBottomSheetAction(contentDescriptionRes: Int, expectedEvent: MediaViewerEvents) {\n+ private fun testBottomSheetAction(\n+ data: MediaViewerPageData.MediaViewerData,\n+ contentDescriptionRes: Int,\n+ expectedEvent: MediaViewerEvents,\n+ ) {\n val eventsRecorder = EventsRecorder()\n rule.setMediaViewerView(\n aMediaViewerState(\n- downloadedMedia = AsyncData.Success(\n- LocalMedia(Uri.EMPTY, anImageMediaInfo())\n- ),\n- mediaInfo = anImageMediaInfo(),\n+ listData = listOf(data),\n mediaBottomSheetState = aMediaDetailsBottomSheetState(),\n eventSink = eventsRecorder\n ),\n )\n rule.clickOn(contentDescriptionRes)\n- eventsRecorder.assertSingle(expectedEvent)\n+ eventsRecorder.assertList(\n+ listOf(\n+ MediaViewerEvents.OnNavigateTo(0),\n+ MediaViewerEvents.LoadMedia(data),\n+ expectedEvent,\n+ )\n+ )\n }\n \n @Test\n fun `clicking on image hides the overlay`() {\n- val eventsRecorder = EventsRecorder(expectEvents = false)\n+ val eventsRecorder = EventsRecorder()\n+ val state = aMediaViewerState(\n+ eventSink = eventsRecorder\n+ )\n rule.setMediaViewerView(\n- aMediaViewerState(\n- downloadedMedia = AsyncData.Success(\n- LocalMedia(Uri.EMPTY, anImageMediaInfo())\n- ),\n- mediaInfo = anImageMediaInfo(),\n- eventSink = eventsRecorder\n- ),\n+ state = state,\n )\n // Ensure that the action are visible\n val contentDescription = rule.activity.getString(CommonStrings.action_open_with)\n@@ -120,54 +169,79 @@ class MediaViewerViewTest {\n rule.mainClock.advanceTimeBy(1_000)\n rule.onNodeWithContentDescription(contentDescription)\n .assertDoesNotExist()\n+ eventsRecorder.assertList(\n+ listOf(\n+ MediaViewerEvents.OnNavigateTo(0),\n+ MediaViewerEvents.LoadMedia(state.listData.first() as MediaViewerPageData.MediaViewerData),\n+ )\n+ )\n }\n \n @Test\n fun `clicking swipe on the image invokes the expected callback`() {\n- val eventsRecorder = EventsRecorder(expectEvents = false)\n+ val eventsRecorder = EventsRecorder()\n+ val state = aMediaViewerState(\n+ eventSink = eventsRecorder\n+ )\n ensureCalledOnce { callback ->\n rule.setMediaViewerView(\n- aMediaViewerState(\n- downloadedMedia = AsyncData.Success(\n- LocalMedia(Uri.EMPTY, anImageMediaInfo())\n- ),\n- mediaInfo = anImageMediaInfo(),\n- eventSink = eventsRecorder\n- ),\n+ state = state,\n onBackClick = callback,\n )\n val imageContentDescription = rule.activity.getString(CommonStrings.common_image)\n rule.onNodeWithContentDescription(imageContentDescription).performTouchInput { swipeDown(startY = centerY) }\n rule.mainClock.advanceTimeBy(1_000)\n }\n+ eventsRecorder.assertList(\n+ listOf(\n+ MediaViewerEvents.OnNavigateTo(0),\n+ MediaViewerEvents.LoadMedia(state.listData.first() as MediaViewerPageData.MediaViewerData),\n+ )\n+ )\n }\n \n @Test\n fun `error case, click on retry emits the expected Event`() {\n val eventsRecorder = EventsRecorder()\n+ val data = aMediaViewerPageData(\n+ downloadedMedia = AsyncData.Failure(IllegalStateException(\"error\")),\n+ )\n rule.setMediaViewerView(\n aMediaViewerState(\n- downloadedMedia = AsyncData.Failure(IllegalStateException(\"error\")),\n- mediaInfo = anImageMediaInfo(),\n+ listData = listOf(data),\n eventSink = eventsRecorder\n ),\n )\n rule.clickOn(CommonStrings.action_retry)\n- eventsRecorder.assertSingle(MediaViewerEvents.RetryLoading)\n+ eventsRecorder.assertList(\n+ listOf(\n+ MediaViewerEvents.OnNavigateTo(0),\n+ MediaViewerEvents.LoadMedia(data),\n+ MediaViewerEvents.LoadMedia(data),\n+ )\n+ )\n }\n \n @Test\n fun `error case, click on cancel emits the expected Event`() {\n val eventsRecorder = EventsRecorder()\n+ val data = aMediaViewerPageData(\n+ downloadedMedia = AsyncData.Failure(IllegalStateException(\"error\")),\n+ )\n rule.setMediaViewerView(\n aMediaViewerState(\n- downloadedMedia = AsyncData.Failure(IllegalStateException(\"error\")),\n- mediaInfo = anImageMediaInfo(),\n+ listData = listOf(data),\n eventSink = eventsRecorder\n ),\n )\n rule.clickOn(CommonStrings.action_cancel)\n- eventsRecorder.assertSingle(MediaViewerEvents.ClearLoadingError)\n+ eventsRecorder.assertList(\n+ listOf(\n+ MediaViewerEvents.OnNavigateTo(0),\n+ MediaViewerEvents.LoadMedia(data),\n+ MediaViewerEvents.ClearLoadingError(data)\n+ )\n+ )\n }\n }\n \ndiff --git a/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaFactory.kt b/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaFactory.kt\nindex 1b93856bde3..f1ebbd04e94 100644\n--- a/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaFactory.kt\n+++ b/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaFactory.kt\n@@ -43,6 +43,7 @@ class FakeLocalMediaFactory(\n dateSent = null,\n dateSentFull = null,\n waveform = null,\n+ duration = null,\n )\n return aLocalMedia(uri, mediaInfo)\n }\ndiff --git a/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/systemclock/FakeSystemClock.kt b/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/systemclock/FakeSystemClock.kt\nindex 3835b163ac4..444502aea83 100644\n--- a/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/systemclock/FakeSystemClock.kt\n+++ b/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/systemclock/FakeSystemClock.kt\n@@ -11,8 +11,8 @@ import io.element.android.services.toolbox.api.systemclock.SystemClock\n \n const val A_FAKE_TIMESTAMP = 123L\n \n-class FakeSystemClock : SystemClock {\n- override fun epochMillis(): Long {\n- return A_FAKE_TIMESTAMP\n- }\n+class FakeSystemClock(\n+ var epochMillisResult: Long = A_FAKE_TIMESTAMP\n+) : SystemClock {\n+ override fun epochMillis() = epochMillisResult\n }\ndiff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt\nindex 0e8a347ef28..d140d3fea48 100644\n--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt\n+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt\n@@ -122,6 +122,7 @@ class KonsistClassNameTest {\n .withoutName(\n \"Factory\",\n \"TimelineController\",\n+ \"TimelineMediaGalleryDataSource\",\n )\n .withoutNameStartingWith(\n \"Accompanist\",\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_0_en.png\nindex 70d447adcdb..10f75384f6f 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:7c7d4201ed9aa37995f4ab8ac982404f59e77374f316a057685886f14e698c35\n-size 24680\n+oid sha256:8d8842663702441ce586c7e2141c0cdf47032a26b6015e592abb5682e3cd2c60\n+size 25152\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_1_en.png\nindex 41b0cc2f9a7..3eb086fab4f 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_1_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_1_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:b94fd31b7ed71eacfe8f136bfd59405b85d31a0fe557800311794f4ba7006271\n-size 22749\n+oid sha256:e57fc21cd01917630a08324f49a3d76d82823ee4a2f90f23624c120126426689\n+size 23190\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_0_en.png\nindex 93d2782dbbe..c497a8cb269 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:333a21a41a7d5f8d47946648a7381dadeccf213a1176696b3512c08ae929d4d6\n-size 7819\n+oid sha256:ddb495eaf8113f0be1ba572697083bd5b8ccd4c308780478b6c4691dd0f8d922\n+size 8019\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_1_en.png\nindex a40e83dc489..257beda2948 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_1_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_1_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:cba8f49caf65856569266a561206437840a43da2d41ed5f08321ecda99204329\n-size 8236\n+oid sha256:22e4744300d62e550a9c545420621fe6aa8db1674a876731be31a12fbc426cbc\n+size 7320\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_2_en.png\nindex b5b75d1b639..a9f023e618e 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_2_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_2_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:a6d04e0ee068682ebb0a3842ba73407855f2b83b7389d26fa0f3e2ec20d42dc8\n-size 7389\n+oid sha256:5076cbf15e1d0ec2c70432c88a5f48eb074490bdf8431cfb51109f91ad4e9576\n+size 7495\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.video_MediaVideoView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.video_MediaVideoView_Day_0_en.png\nindex 6ab81fd4de1..4bd792bedf9 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.video_MediaVideoView_Day_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.video_MediaVideoView_Day_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:267d4be8b727a0ecb5af1e5f1e69adfd68f50f32f1de78f4f9fde60f635244b5\n-size 13045\n+oid sha256:b3599a3a6fb43f98d928ce71c3ef7a8b8102d558c31ea1f735a948e337738f95\n+size 13533\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_0_en.png\nindex fd5c2af6e60..0ab3d99837b 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:66437179fb0b851d4d4d647d00cab94cc7422d625f559839c675b378dbf1af38\n-size 389408\n+oid sha256:1e4ef6ed6fe4c858ac4c67bf2bc5d428f4d4734cf8b01244a3bc963a815a540a\n+size 389328\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_10_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_10_en.png\nindex 6a81f3f1294..81afb4ea1cd 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_10_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_10_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:2b286342ff4d46637beac1f980294f77b3e2eb6824d56448cdbdce7b41c911ab\n-size 388612\n+oid sha256:67ca752577251e9e57e7680ae1bbdef3324c84ec6a1037aa9f7c228bb8206f4c\n+size 388634\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_11_en.png\nindex 4a43ce31dae..b66dd0d5064 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_11_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_11_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:8165bcb4b0d52a227aad4e1f3951fc3628ef647947ef2584ed50d8ede8a6a344\n-size 38248\n+oid sha256:96941aab9596583187e4a089bd448252be551e3ef6b2fb7550c3bad5c7ba60fb\n+size 37905\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_12_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_12_en.png\nindex f3d0c19a9fc..2b16d56f044 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_12_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_12_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:c9efb4ed1ee82bba30351bf213f0873637e8194140a3bbea669321bf76bc6483\n-size 31449\n+oid sha256:add442c1cabc79cde42e65775b22413c92918bba93d96bb72a9ff214b9ae7fac\n+size 31126\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_13_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_13_en.png\nindex 6d8afe11407..a227321f6b1 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_13_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_13_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:5d2882d79b9f66726c6d16c8c6fc84cb9f65a5674222fe85794229dc5ba12a6b\n-size 24679\n+oid sha256:0c288f75fcccb93e074afd8178219887ce8a541d8e444df18ca041647114d340\n+size 24491\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_14_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_14_en.png\nnew file mode 100644\nindex 00000000000..c96f6f4bfbf\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_14_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:9a60bd02d969c7c6ccc0eb2e8f4f2c5551b8d910e5bb2f96710589040541691d\n+size 7973\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_15_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_15_en.png\nnew file mode 100644\nindex 00000000000..205d657d464\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_15_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:049993637421009db857dbd8a647d268241cd0f88a12a376804444647f94e885\n+size 5069\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_1_en.png\nindex 12d5df3fa13..73e4bde51ea 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_1_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_1_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:da172fdf40dc8702bc6dcb89bcc75e93bd279f6bbb9454f5283febe4da25d399\n-size 389440\n+oid sha256:248ad0bbfc8c8a56975c2fc6ddfa5275ff4f3ad39b9a76126c8d4bdd0c566e88\n+size 389354\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_2_en.png\nindex bf9ae5ebac5..ef7f299a264 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_2_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_2_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:ee478f10b781385a5bd472a9fb1047e869ca2e46e1bab28758315722ff911bbc\n-size 94992\n+oid sha256:ecdd1219635a61be5473773464d3796ea6a8f17ac2c384e131265e9557dadf42\n+size 95129\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_3_en.png\nindex 40ff36cd942..adf626696dc 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_3_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_3_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:7ad6e45382dec9bb27593b6e2ed92ed633204479040ccebaf4d362bb2f41fec7\n-size 396403\n+oid sha256:c89d437ccf40ac25227d19d1b775ae0992cad7970784e29586438a60f6bf950b\n+size 396206\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_4_en.png\nindex d94989c7571..cf56e5a13bc 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_4_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_4_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:d10cb9be5b5139f0fdfdfb11cc3d3eca1955297180e5db8142bfea6250f20d73\n-size 25811\n+oid sha256:9ac33be436135d5022024108ec403ea3e53995d8e42dcc52bbd3d8041e5e2975\n+size 25053\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_5_en.png\nindex 3603786361f..75b5e2302f3 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_5_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_5_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:69b5d7572ae6e4ff084867fac1bae41a55c75c9a5236cb6ccb4c31b89ef77898\n-size 5442\n+oid sha256:4d0288375c9e746d4cbb9b270c1c7f5e97633d76027186bd9568555edeaf8700\n+size 5411\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_6_en.png\nindex 6b6e6a655da..2bfbd92c3b7 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_6_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_6_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:f8d3e3f8733424870b254be90599ed1ff6ba784089600bcb200fbef62c81537c\n-size 14562\n+oid sha256:c756b50710b1ed10eea01d8f97d8cca79a3b3440c559e1f593c790b55e5f6556\n+size 14194\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_7_en.png\nindex 32e7fcef893..be7ed165cf0 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_7_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_7_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:d1785d90957316791969f047e66bd779da62d675004914099f2af2b69bebe405\n-size 14700\n+oid sha256:2c5a6e30127fe88d1d55da6daebff64981e88bbf7a37c712c99f831849e56172\n+size 14374\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_8_en.png\nindex dc33c0aef45..654e1d891ed 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_8_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_8_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:1ddcd8e9e20de4171a3d9f8175806a268723e47a14dca431849c2c29edaf5d0b\n-size 26267\n+oid sha256:1ddd7d087dac24b5f2861b59c946eb89046b9bcb1a709dca423b8893f55a81f9\n+size 26217\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_9_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_9_en.png\nindex d115aaa7edf..f230ae125e2 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_9_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_9_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:035ef0079af6e9825a52b86e2eab50667404a66d70dd2756596b60cc1cea376a\n-size 26404\n+oid sha256:8a0e84ee0e17fa30222ffb5fe58f353ca847b251a8da7088a58faa467f1f6742\n+size 26258\n", "n2p_tests": {"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - delete bottom sheet": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerViewTest.clicking on image hides the overlay": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerViewTest.clicking on open emit expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - change mode": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - initial state cannot show info": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dataFlow loading items": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - save on disk": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - delete item": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest.create for StickerMessageType": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - load more": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaItemsPostProcessorTest.process will split images, videos and files": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.TimelineMediaGalleryDataSourceTest.test - when timeline emits new data, the flow emits the data": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaItemsPostProcessorTest.process will reorder files": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaItemsPostProcessorTest.process Empty": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - save on disk": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.TimelineMediaGalleryDataSourceTest.test - getLastData should return the previous emitted data": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - initial state": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.loadMore invokes the gallery data source loadMore": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaItemsPostProcessorTest.process will handle complex case": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerViewTest.clicking swipe on the image invokes the expected callback": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - data source update": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - delete": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - initial state null Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerViewTest.clicking on back invokes expected callback": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.SingleMediaGalleryDataSourceTest.groupedMediaItemsFlow emit a single item": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - view in timeline invokes the navigator": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dataFlow empty": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - initial state Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dataFlow uninitialized, loading and error": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.SingleMediaGalleryDataSourceTest.function start is no op": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - initial state Event from other": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.SingleMediaGalleryDataSourceTest.function deleteItem is no op": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - delete and cancel": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerViewTest.error case, click on retry emits the expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaItemsPostProcessorTest.process will skip date if there is no items": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.SingleMediaGalleryDataSourceTest.getLastData should return the data": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - bottom sheet state - own message and cannot delete own": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - bottom sheet state - other message and cannot delete other": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaItemsPostProcessorTest.process will add the loading indicator to both list": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest.create for AudioMessageType": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerViewTest.error case, click on cancel emits the expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.SingleMediaGalleryDataSourceTest.createFrom should create a SingleMediaGalleryDataSource with a video item": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest.create for VideoMessageType": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerViewTest.clicking on share emit expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest.create for FileMessageType": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.setup should start the gallery data source": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dataFlow with data galleryMode image and load media": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - share item": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.TimelineMediaGalleryDataSourceTest.test - not started TimelineMediaGalleryDataSource emits no events": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dispose": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - view in timeline hide the bottom sheet and invokes the navigator": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.SingleMediaGalleryDataSourceTest.function loadMore is no op": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest.create for ImageMessageType": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dataFlow with data galleryMode image": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.TimelineMediaGalleryDataSourceTest.test - load more should call the timeline paginate method": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - clear loading error": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - share": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerViewTest.clicking on save emit expected Event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.local.AndroidLocalMediaFactoryTest.test AndroidLocalMediaFactory": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest.create check all null cases": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dataFlow with data galleryMode image and load media with failure then success": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - bottom sheet state - own message and can delete own": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.TimelineMediaGalleryDataSourceTest.test - delete item should call the timeline redact method": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - load more": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.SingleMediaGalleryDataSourceTest.createFrom should create a SingleMediaGalleryDataSource with an audio item": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest.create MessageContent check all null cases": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - load media": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.SingleMediaGalleryDataSourceTest.createFrom should create a SingleMediaGalleryDataSource with an image item": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerViewTest.clicking on info emit expected Event": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest.create for VoiceMessageType": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaItemsPostProcessorTest.process will reorder images": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.TimelineMediaGalleryDataSourceTest.test - failing to load timeline should emit an error": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - open info": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - bottom sheet state - other message and can delete other": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dataFlow - date separator are filtered out": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - open with": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - on navigate to": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.SingleMediaGalleryDataSourceTest.createFrom should create a SingleMediaGalleryDataSource with a voice item": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.gallery.SingleMediaGalleryDataSourceTest.createFrom should create a SingleMediaGalleryDataSource with a file item": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dataFlow with data galleryMode files": {"run": "NONE", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {"io.element.android.libraries.matrix.impl.timeline.RustTimelineTest.ensure that the timeline emits new loading item when pagination does not bring new events": {"run": "NONE", "test": "FAIL", "fix": "PASS"}}, "p2p_tests": {"io.element.android.tests.konsist.KonsistClassNameTest.Class implementing interface should have name not end with 'Impl' but start with 'Default'": {"run": "PASS", "test": "PASS", "fix": "PASS"}, "io.element.android.tests.konsist.KonsistClassNameTest.Classes extending 'Node' should have 'Node' suffix": {"run": "PASS", "test": "PASS", "fix": "PASS"}, "io.element.android.tests.konsist.KonsistClassNameTest.Class with 'ContributeBinding' annotation should have allowed prefix": {"run": "PASS", "test": "PASS", "fix": "PASS"}, "io.element.android.tests.konsist.KonsistClassNameTest.Classes extending 'Presenter' should have 'Presenter' suffix": {"run": "PASS", "test": "PASS", "fix": "PASS"}, "io.element.android.tests.konsist.KonsistClassNameTest.Fake classes must be named using Fake and the interface it fakes": {"run": "PASS", "test": "PASS", "fix": "PASS"}, "io.element.android.tests.konsist.KonsistClassNameTest.Classes extending 'PreviewParameterProvider' name MUST end with 'Provider' and MUST contain provided class name": {"run": "PASS", "test": "PASS", "fix": "PASS"}}, "s2p_tests": {}} {"instance_id": "streetcomplete__StreetComplete-4657", "org": "streetcomplete", "repo": "StreetComplete", "number": 4657, "state": "closed", "title": "Cycleway overlay", "body": "- refactored cycleway, street parking and sidewalk parsers to be be consistent and properly handle all edge cases when tagging only one side (fixes #4634). A side-effect of this is that the app will always merge same `*:left` and `*:right` values to `*:both` as was requested several times somewhere in this issue tracker and where I was like \ud83e\udd37 before.\r\n- refactored cycleway quest to share as much code with the overlay as possible\r\n- fixed a bug in cycleway parsing: If in flow direction of a oneway there was a dual track or dual lane and in contra-flow direction there was nothing, the parser would wrongly interpret the contra-flow side as being \"none, no oneway\", i.e. as if bicycles could go in contraflow on the street itself\r\n- made cycleway parser more strict: The parser does not accept values like `on_street`, `none` etc. anymore / classifies them as `INVALID` rather than `UNKNOWN`\r\n- disabled cycleway quest\r\n- added `cycleway=shoulder` option for overlay and quest (see [discussion](https://community.openstreetmap.org/t/rare-cycleway-value-shoulder-obsolete-or-useful/5849))\r\n- sidewalk overlay: do not show missing sidewalks on roads with a speed limit <= 10 km/h and unpaved roads as missing\r\n- sidewalk overlay: show sidewalks mapped on cycleways, paths etc\r\n- sidewalk overlay: allow editing of sidewalks mapped on exclusive cycleways\r\n- sidewalk overlay: prefer tagging `sidewalk:both=separate` over `sidewalk=separate`\r\n\r\n### Features of the overlay\r\n\r\n\r\n\r\nDisplay and change cycleway layout.\r\n- Cycleways behind the curb are blue-ish (a track, a shared sidewalk)\r\n- Lanes on the street are yellow-ish\r\n- Black is none\r\n- Red is missing, invalid or ambiguos.\r\n\r\n\r\n\r\nDisplay bicycle boulevards, can be selected instead of defining cycleways left and right in countries where they exist legally, see [hasBicycleBoulevard.yml](https://github.com/streetcomplete/countrymetadata/blob/master/data/hasBicycleBoulevard.yml)\r\n\r\n\r\n\r\n\r\nChange the cycleway situation on separately mapped ways and paths.\r\n\r\n\r\nhttps://user-images.githubusercontent.com/4661658/204665892-cdda5758-21c4-47d3-88d8-469f2088b218.mp4\r\n\r\nDisplay and select to reverse the direction of cycleways (functionality also added to respective quest). \r\n\r\nThis was necessary because the quest could ignore (=not show) roads tagged with such cycleways, while the overlay must support it in order to not overwrite the data with wrong data.\r\n\r\nYes, this very rarely actually happens, see\r\nhttps://www.openstreetmap.org/way/1032480826\r\nhttps://www.google.de/maps/@40.6761578,-73.9508024,3a,75y,266.58h,74.83t/data=!3m6!1e1!3m4!1snlCNLeAEszlMGEmNGcfURA!2e0!7i16384!8i8192\r\n\r\nThis required a large refactor, because the parser that reads the OSM data, the creator that puts the data model back into the tags and all of the display code needs to handle pairs of cycleway type + cycleway direction. Before, it just had to handle the cycleway type.", "base": {"label": "streetcomplete:master", "ref": "master", "sha": "b75c8ae4f833173cee72a4f2b8279ef5577b6dbd"}, "resolved_issues": [{"number": 4634, "title": "Crash when adding a parking lane", "body": "The crash only happens with a specific way, but is deterministic.\r\n\r\n**How to Reproduce**\r\n* Select this way in the parking lane overlay: https://www.openstreetmap.org/way/4014978\r\n* Then select the south side and add \u201cparallel on street side\u201d (screenshot below). Leave the north side as-is.\r\n* The app crashes when confirming.\r\n\r\n**Expected Behavior**\r\nI would expect the app to add the information I gave to the map.\r\n\r\nAlternatively, if the way was not meant to be added a parking lane, then I would not expect the app to let me select it in the first place.\r\n\r\n**Additional information**\r\nScreenshot:\r\n![Screenshot_2022-11-15-10-45-48-614_de westnordost streetcomplete](https://user-images.githubusercontent.com/1829786/201890408-1a79fd86-3e00-4625-a645-72ffd644d555.jpg)\r\n\r\nHere is the backtrace that I get:\r\n```\r\njava.lang.IllegalArgumentException: Attempting to tag invalid parking lane\r\n\tat de.westnordost.streetcomplete.osm.street_parking.StreetParkingKt.toOsmLaneValue(StreetParking.kt:122)\r\n\tat de.westnordost.streetcomplete.osm.street_parking.StreetParkingKt.applyTo(StreetParking.kt:92)\r\n\tat de.westnordost.streetcomplete.overlays.street_parking.StreetParkingOverlayForm.onClickOk(StreetParkingOverlayForm.kt:136)\r\n\tat de.westnordost.streetcomplete.overlays.AbstractOverlayForm.onViewCreated$lambda-6(AbstractOverlayForm.kt:194)\r\n\tat de.westnordost.streetcomplete.overlays.AbstractOverlayForm.$r8$lambda$18Xv-GzCmBt76jzZFt341LP4EVc(AbstractOverlayForm.kt)\r\n\tat de.westnordost.streetcomplete.overlays.AbstractOverlayForm$$ExternalSyntheticLambda2.onClick(R8$$SyntheticClass)\r\n\tat android.view.View.performClick(View.java:5647)\r\n\tat android.view.View$PerformClick.run(View.java:22465)\r\n\tat android.os.Handler.handleCallback(Handler.java:754)\r\n\tat android.os.Handler.dispatchMessage(Handler.java:95)\r\n\tat android.os.Looper.loop(Looper.java:163)\r\n\tat android.app.ActivityThread.main(ActivityThread.java:6238)\r\n\tat java.lang.reflect.Method.invoke(Native Method)\r\n\tat com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:933)\r\n\tat com.android.internal.os.ZygoteInit.main(ZygoteInit.java:823)\r\n```\r\n\r\nHere are the keys of the way in question:\r\n```\r\nhighway=service\r\nmaxspeed=30\r\nname=Rue Eug\u00e8ne Chavant\r\nparking:lane:both=parallel\r\nsurface=asphalt\r\n```\r\n\r\nThe reason why I leave the north side as-is is that there is a discrepancy between what is meant to be and what there is: according to what the signs says, it should be `parking:lane:left=no`, but in practice people will informally park there where they can, so it\u2019s more like `parking:lane:left=parallel`, `parking:lane:left:parallel=half_on_kerb`, leaving no actual space for pedestrians.\r\nIf the goal of this key is to measure the space dedicated to cars, I guess that the second would be more useful (as this part of the street is filled with cars), but if the goal is to tell drivers where to safely park, the first version is preferable. If we add to this the fact that the town actually uses OSM maps, then drivers could start complaining against fines because the town maps says so.\r\nSo really, there is no solution that I\u2019m comfortable with about the north side of the street. The south is clear though, hence my answer \u263a\r\n\r\n**Versions affected**\r\nAndroid version: 7.1.2 N2G47H\r\nKernel version: 3.18.31-perf-g6507e5c\r\nStreetComplete version: v49.0\r\n"}], "lang": "kotlin", "problem_statement": "Crash when adding a parking lane\nThe crash only happens with a specific way, but is deterministic.\r\n\r\n**How to Reproduce**\r\n* Select this way in the parking lane overlay: https://www.openstreetmap.org/way/4014978\r\n* Then select the south side and add \u201cparallel on street side\u201d (screenshot below). Leave the north side as-is.\r\n* The app crashes when confirming.\r\n\r\n**Expected Behavior**\r\nI would expect the app to add the information I gave to the map.\r\n\r\nAlternatively, if the way was not meant to be added a parking lane, then I would not expect the app to let me select it in the first place.\r\n\r\n**Additional information**\r\nScreenshot:\r\n![Screenshot_2022-11-15-10-45-48-614_de westnordost streetcomplete](https://user-images.githubusercontent.com/1829786/201890408-1a79fd86-3e00-4625-a645-72ffd644d555.jpg)\r\n\r\nHere is the backtrace that I get:\r\n```\r\njava.lang.IllegalArgumentException: Attempting to tag invalid parking lane\r\n\tat de.westnordost.streetcomplete.osm.street_parking.StreetParkingKt.toOsmLaneValue(StreetParking.kt:122)\r\n\tat de.westnordost.streetcomplete.osm.street_parking.StreetParkingKt.applyTo(StreetParking.kt:92)\r\n\tat de.westnordost.streetcomplete.overlays.street_parking.StreetParkingOverlayForm.onClickOk(StreetParkingOverlayForm.kt:136)\r\n\tat de.westnordost.streetcomplete.overlays.AbstractOverlayForm.onViewCreated$lambda-6(AbstractOverlayForm.kt:194)\r\n\tat de.westnordost.streetcomplete.overlays.AbstractOverlayForm.$r8$lambda$18Xv-GzCmBt76jzZFt341LP4EVc(AbstractOverlayForm.kt)\r\n\tat de.westnordost.streetcomplete.overlays.AbstractOverlayForm$$ExternalSyntheticLambda2.onClick(R8$$SyntheticClass)\r\n\tat android.view.View.performClick(View.java:5647)\r\n\tat android.view.View$PerformClick.run(View.java:22465)\r\n\tat android.os.Handler.handleCallback(Handler.java:754)\r\n\tat android.os.Handler.dispatchMessage(Handler.java:95)\r\n\tat android.os.Looper.loop(Looper.java:163)\r\n\tat android.app.ActivityThread.main(ActivityThread.java:6238)\r\n\tat java.lang.reflect.Method.invoke(Native Method)\r\n\tat com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:933)\r\n\tat com.android.internal.os.ZygoteInit.main(ZygoteInit.java:823)\r\n```\r\n\r\nHere are the keys of the way in question:\r\n```\r\nhighway=service\r\nmaxspeed=30\r\nname=Rue Eug\u00e8ne Chavant\r\nparking:lane:both=parallel\r\nsurface=asphalt\r\n```\r\n\r\nThe reason why I leave the north side as-is is that there is a discrepancy between what is meant to be and what there is: according to what the signs says, it should be `parking:lane:left=no`, but in practice people will informally park there where they can, so it\u2019s more like `parking:lane:left=parallel`, `parking:lane:left:parallel=half_on_kerb`, leaving no actual space for pedestrians.\r\nIf the goal of this key is to measure the space dedicated to cars, I guess that the second would be more useful (as this part of the street is filled with cars), but if the goal is to tell drivers where to safely park, the first version is preferable. If we add to this the fact that the town actually uses OSM maps, then drivers could start complaining against fines because the town maps says so.\r\nSo really, there is no solution that I\u2019m comfortable with about the north side of the street. The south is clear though, hence my answer \u263a\r\n\r\n**Versions affected**\r\nAndroid version: 7.1.2 N2G47H\r\nKernel version: 3.18.31-perf-g6507e5c\r\nStreetComplete version: v49.0\r\n\n", "pull_url": "https://github.com/streetcomplete/StreetComplete/pull/4657", "issue_urls": ["https://github.com/streetcomplete/StreetComplete/issues/4634"], "test_command": "./gradlew :app:testDebugUnitTest --tests \"de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest\" --tests \"de.westnordost.streetcomplete.osm.street_parking.StreetParkingKtTest\" --tests \"de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest\" --tests \"de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest\" --tests \"de.westnordost.streetcomplete.quests.sidewalk.AddSidewalkTest\" --tests \"de.westnordost.streetcomplete.osm.sidewalk.SidewalkCreatorKtTest\" --tests \"de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayParserKtTest\" --tests \"de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest\" --tests \"de.westnordost.streetcomplete.osm.bicycle_boulevard.BicycleBoulevardKtTest\" --tests \"de.westnordost.streetcomplete.osm.cycleway.CyclewayKtTest\" --tests \"de.westnordost.streetcomplete.osm.OnewayKtTest\" --tests \"de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest\" --tests \"de.westnordost.streetcomplete.osm.sidewalk.SidewalkKtTest\"", "fix_patch": "diff --git a/app/src/main/assets/country_metadata/AQ.yml b/app/src/main/assets/country_metadata/AQ.yml\nnew file mode 100644\nindex 00000000000..cc4a63ba104\n--- /dev/null\n+++ b/app/src/main/assets/country_metadata/AQ.yml\n@@ -0,0 +1,2 @@\n+# Do not edit. Data is from res/country/metadata and https://github.com/streetcomplete/countrymetadata\n+noParkingLineStyle: yellow\ndiff --git a/app/src/main/assets/country_metadata/AT.yml b/app/src/main/assets/country_metadata/AT.yml\nindex 94acdecf713..37fd19700b1 100644\n--- a/app/src/main/assets/country_metadata/AT.yml\n+++ b/app/src/main/assets/country_metadata/AT.yml\n@@ -6,6 +6,7 @@ clothesContainerOperators: [Humana, Holding Graz, Kolping, Rotes Kreuz, MA 48, C\n exclusiveCycleLaneStyle: white\n hasAdvisoryCycleLane: true\n hasAdvisorySpeedLimitSign: false\n+hasBicycleBoulevard: true\n hasDailyAlternateSideParkingSign: true\n hasLivingStreet: true\n hasSlowZone: true\ndiff --git a/app/src/main/assets/country_metadata/BE.yml b/app/src/main/assets/country_metadata/BE.yml\nindex 39d4af56504..8cebdcd0cbb 100644\n--- a/app/src/main/assets/country_metadata/BE.yml\n+++ b/app/src/main/assets/country_metadata/BE.yml\n@@ -7,6 +7,7 @@ exclusiveCycleLaneStyle: white dashes on both sides\n hasAdvisoryCycleLane: true\n hasAdvisorySpeedLimitSign: false\n hasBiWeeklyAlternateSideParkingSign: true\n+hasBicycleBoulevard: true\n hasLivingStreet: true\n hasSlowZone: true\n livingStreetSignStyle: vienna\ndiff --git a/app/src/main/assets/country_metadata/CH.yml b/app/src/main/assets/country_metadata/CH.yml\nindex 8a8952dde24..ba5fdc05840 100644\n--- a/app/src/main/assets/country_metadata/CH.yml\n+++ b/app/src/main/assets/country_metadata/CH.yml\n@@ -5,6 +5,7 @@ clothesContainerOperators: [Texaid, Ville de Geneve, Contex, coop, TexAid, Coop,\n exclusiveCycleLaneStyle: yellow dashes\n hasAdvisoryCycleLane: false\n hasAdvisorySpeedLimitSign: false\n+hasBicycleBoulevard: true\n hasLivingStreet: true\n hasSlowZone: true\n livingStreetSignStyle: vienna\ndiff --git a/app/src/main/assets/country_metadata/DE.yml b/app/src/main/assets/country_metadata/DE.yml\nindex 78bc5e39e34..e689c5f10ca 100644\n--- a/app/src/main/assets/country_metadata/DE.yml\n+++ b/app/src/main/assets/country_metadata/DE.yml\n@@ -7,6 +7,7 @@ edgeLineStyle: white\n exclusiveCycleLaneStyle: white\n hasAdvisoryCycleLane: true\n hasAdvisorySpeedLimitSign: false\n+hasBicycleBoulevard: true\n hasLivingStreet: true\n hasSlowZone: true\n livingStreetSignStyle: vienna\ndiff --git a/app/src/main/assets/country_metadata/DK.yml b/app/src/main/assets/country_metadata/DK.yml\nindex b6572f47778..10635cc065d 100644\n--- a/app/src/main/assets/country_metadata/DK.yml\n+++ b/app/src/main/assets/country_metadata/DK.yml\n@@ -1,7 +1,10 @@\n # Do not edit. Data is from res/country/metadata and https://github.com/streetcomplete/countrymetadata\n+advisoryCycleLaneStyle: white dashes without pictogram\n atmOperators: [Danske Bank, Nordea, Euronet, Sydbank, Jyske Bank, Arbejdernes Landsbank, Spar Nord, Nykredit, Sparekassen Kronjylland, Nordjyske Bank, Andelskassen, Sparekassen Sj\u00e6lland, Totalbanken, L\u00e5n & Spar, Handelsbanken, SparekassenThy, SparNord, Vestjysk Bank, Skjern Bank, DiBa, Sparekassen Vendsyssel, Jutlander Bank, Sparekassen Thy, Ringk\u00f8bing Landbobank, Fr\u00f8s Herreds Sparekasse, L\u00e5n & Spar Bank, Bank Nordik, Djurslands Bank]\n exclusiveCycleLaneStyle: white\n+hasAdvisoryCycleLane: true\n hasAdvisorySpeedLimitSign: true\n+hasBicycleBoulevard: true\n hasLivingStreet: true\n hasSlowZone: true\n livingStreetSignStyle: vienna\ndiff --git a/app/src/main/assets/country_metadata/ES.yml b/app/src/main/assets/country_metadata/ES.yml\nindex b20512a1ce6..fbd1dd98684 100644\n--- a/app/src/main/assets/country_metadata/ES.yml\n+++ b/app/src/main/assets/country_metadata/ES.yml\n@@ -8,6 +8,7 @@ exclusiveCycleLaneStyle: white\n hasAdvisoryCycleLane: false\n hasAdvisorySpeedLimitSign: true\n hasBiWeeklyAlternateSideParkingSign: true\n+hasBicycleBoulevard: true\n hasDailyAlternateSideParkingSign: true\n hasLivingStreet: true\n hasSlowZone: true\ndiff --git a/app/src/main/assets/country_metadata/FI.yml b/app/src/main/assets/country_metadata/FI.yml\nindex 419dfa9b1ab..400950af0e7 100644\n--- a/app/src/main/assets/country_metadata/FI.yml\n+++ b/app/src/main/assets/country_metadata/FI.yml\n@@ -5,6 +5,7 @@ clothesContainerOperators: [UFF, Rinki, HSY, Rosk'n roll, Rinki Oy, Fida, Suomen\n exclusiveCycleLaneStyle: white dashes\n hasAdvisoryCycleLane: false\n hasAdvisorySpeedLimitSign: true\n+hasBicycleBoulevard: true\n hasDailyAlternateSideParkingSign: true\n hasLivingStreet: true\n hasSlowZone: true\ndiff --git a/app/src/main/assets/country_metadata/FR.yml b/app/src/main/assets/country_metadata/FR.yml\nindex 85b8a3d0771..91939c4d749 100644\n--- a/app/src/main/assets/country_metadata/FR.yml\n+++ b/app/src/main/assets/country_metadata/FR.yml\n@@ -7,6 +7,7 @@ exclusiveCycleLaneStyle: white dashes\n hasAdvisoryCycleLane: true\n hasAdvisorySpeedLimitSign: true\n hasBiWeeklyAlternateSideParkingSign: true\n+hasBicycleBoulevard: true\n hasLivingStreet: true\n hasSlowZone: true\n livingStreetSignStyle: france\ndiff --git a/app/src/main/assets/country_metadata/LI.yml b/app/src/main/assets/country_metadata/LI.yml\nindex baec77109f6..9a51d19ad36 100644\n--- a/app/src/main/assets/country_metadata/LI.yml\n+++ b/app/src/main/assets/country_metadata/LI.yml\n@@ -2,6 +2,7 @@\n atmOperators: [Liechtensteinische Landesbank AG, Liechtensteinische Landesbank]\n exclusiveCycleLaneStyle: yellow\n hasAdvisoryCycleLane: false\n+hasBicycleBoulevard: true\n hasSlowZone: true\n mobileCountryCode: 295\n noParkingLineStyle: dashed yellow line with Xs\ndiff --git a/app/src/main/assets/country_metadata/LU.yml b/app/src/main/assets/country_metadata/LU.yml\nindex 13b4c855db1..3ce79e2286d 100644\n--- a/app/src/main/assets/country_metadata/LU.yml\n+++ b/app/src/main/assets/country_metadata/LU.yml\n@@ -1,10 +1,12 @@\n # Do not edit. Data is from res/country/metadata and https://github.com/streetcomplete/countrymetadata\n-advisoryCycleLaneStyle: white dashes\n+advisoryCycleLaneStyle: white dashes without pictogram\n atmOperators: [BCEE, BIL, P&T, BGL BNP Paribas, Raiffeisen, Banque Raiffeisen, Post, S-Bank, Banque Internationale \u00e0 Luxembourg, Post.lu, BNP Paribas]\n chargingStationOperators: [Chargy, Enovos]\n exclusiveCycleLaneStyle: white\n+hasAdvisoryCycleLane: true\n hasAdvisorySpeedLimitSign: true\n hasBiWeeklyAlternateSideParkingSign: true\n+hasBicycleBoulevard: true\n hasLivingStreet: true\n hasSlowZone: true\n livingStreetSignStyle: vienna\ndiff --git a/app/src/main/assets/country_metadata/MC.yml b/app/src/main/assets/country_metadata/MC.yml\nindex 46e54ff537c..36e48b3e32b 100644\n--- a/app/src/main/assets/country_metadata/MC.yml\n+++ b/app/src/main/assets/country_metadata/MC.yml\n@@ -2,6 +2,7 @@\n advisoryCycleLaneStyle: white dashes without pictogram\n exclusiveCycleLaneStyle: white dashes\n hasAdvisoryCycleLane: true\n+hasBicycleBoulevard: true\n hasSlowZone: true\n mobileCountryCode: 212\n noParkingLineStyle: dashed yellow\ndiff --git a/app/src/main/assets/country_metadata/NL.yml b/app/src/main/assets/country_metadata/NL.yml\nindex 6cb965983cb..5f6b53f0bdb 100644\n--- a/app/src/main/assets/country_metadata/NL.yml\n+++ b/app/src/main/assets/country_metadata/NL.yml\n@@ -5,6 +5,7 @@ chargingStationOperators: [Allego, NUON, Fastned, Nuon, EVBOX, Ecotap, Vattenfal\n clothesContainerOperators: [ROVA, Sympany, Leger des Heils ReShare, Leger des Heils, Gemeente Amsterdam, RD4, Curitas, Twiddus, Noppes, Leger des heils, hetgoed, Waardlanden, Opnieuw & Co, HVC]\n exclusiveCycleLaneStyle: white dashes\n hasAdvisoryCycleLane: true\n+hasBicycleBoulevard: true\n hasLivingStreet: true\n hasSlowZone: true\n livingStreetSignStyle: vienna\ndiff --git a/app/src/main/assets/country_metadata/SV.yml b/app/src/main/assets/country_metadata/SV.yml\nindex fdf916d981d..69de988f1c7 100644\n--- a/app/src/main/assets/country_metadata/SV.yml\n+++ b/app/src/main/assets/country_metadata/SV.yml\n@@ -1,8 +1,10 @@\n # Do not edit. Data is from res/country/metadata and https://github.com/streetcomplete/countrymetadata\n+advisoryCycleLaneStyle: white dashes without pictogram\n atmOperators: [Banco Agr\u00edcola, Banco de Am\u00e9rica Central, Banco Cuscatlan, Scotiabank, Caja de Cr\u00e9dito, Davivienda]\n centerLineStyle: yellow\n exclusiveCycleLaneStyle: white dots\n-hasAdvisoryCycleLane: false\n+hasAdvisoryCycleLane: true\n+hasBicycleBoulevard: true\n hasDailyAlternateSideParkingSign: true\n mobileCountryCode: 706\n noParkingSignStyle: mutcd latin\ndiff --git a/app/src/main/assets/country_metadata/US.yml b/app/src/main/assets/country_metadata/US.yml\nindex 43b2ba6bdfd..07245d4de7c 100644\n--- a/app/src/main/assets/country_metadata/US.yml\n+++ b/app/src/main/assets/country_metadata/US.yml\n@@ -3,6 +3,7 @@ advisorySpeedLimitSignStyle: yellow\n atmOperators: [Bank of America, Wells Fargo, Chase, PNC Bank, US Bank, U.S. Bank, Citibank, Fifth Third Bank, KeyBank, BB&T, Banco Popular, TD Bank, BECU, Citizens Bank, Publix, Athena Bitcoin Inc., M&T Bank, Chase Bank, First Bank, SunTrust, PNC, MSUFCU, Commerce Bank, First National Bank, Allpoint, Cash Points, Bank of the West, Regions Bank, Cardtronics, Black Frog, BMO Harris Bank, Capital One, Huntington Bank, Union Bank, Wells Fargo Bank, Wells Fargo ATM, Santander, Huntington, State Employees' Credit Union, Partners Credit Union, First Hawaiian Bank, iTHINK Financial, First Citizens Bank, Navy Federal Credit Union, Pinnacle Bank, Regions, USAA, TCF Bank, MetaBank, ATM, Bitcoin of America, Rockitcoin, CEFCU, BBVA Compass, ANZ Guam, United Community Bank, Bank of Hawaii, Umpqua Bank, Columbia Bank, Cardtronics ATM, Associated Bank, Synovus, California Coast Credit Union, Arvest Bank, Great Western Bank, State Employee's Credit Union, San Diego County Credit Union, Access to Money, CU Anytime, Key Bank, SunTrust Bank, Local Government Federal Credit Union, OnPoint, Bank of Washington, CashPoints\u00ae ATM, LibertyX Bitcoin ATM, Wachovia, Swipe, Travelex, UW Credit Union, Cash Points ATM, 7-Eleven, Banner Bank, State Employees Credit Union, State Employee's Credit Union (ATM), Coin Cloud, Scotiabank, Kansas State Bank, ESL, Pioneer Bank, Alaska USA Federal Credit Union, Chase ATM, Comerica Bank, First National Bank of Omaha, Triton, AmeriCU Credit Union, Webster Bank, First Republic Bank, Great Southern Bank, Academy Bank, Capitol One, Founders Federal Credit Union, Heritage Bank, HomeStreet Bank, Athena Bitcoin ATM, Palmetto Citizens Federal Credit Union ATM, WesBanco, Valley Bank ATM, Venco, Michigan State Federal Credit Union, Eastern Bank, MSU Federal Credit Union, First Midwest Bank, California Bank & Trust, South Carolina Federal Credit Union, IBC Bank, First Financial Bank, Centennial Bank, Premier Bank, Washington Federal, Liberty Bank, Busey Bank, First State Bank, UMB Bank, Nautilus Hyosung, CapitolOne, Diebold Nixdorf, Bank of Springfield, Community First Credit Union, AlaskaUSA Federal Credit Union, Vermont Federal Credit Union, Randolph Brooks Federal Credit Union, Hancock Whitney, Citizen's Bank, Bay Federal Credit Union, USE Credit Union, AlaskaUSA, Associated Credit Union, Sovereign Bank, PenFed Credit Union, TCF, Golden 1 Credit Union, Michigan State University Federal Credit Union, Mission Federal Credit Union, M&T, First School, City National Bank, ESL Federal Credit Union, Florence Savings Bank, Comerica, Think Bank, Boeing Employees Credit Union, San Mateo Credit Union, Zions Bank, State Employees Credit Union (ATM), Walmart, Provident Credit Union, Charter One, Arvest, First Bank & Trust, Dacotah Bank, Suncoast Credit Union, Delta Community Credit Union, NBT Bank, Seattle Metropolitan Credit Union, Popular, Oriental, American National Bank, Ameris Bank, Community Bank of the South, East West Bank, Worldwide, Bank of the Southwest, Bank of Colorado, Bremer Bank, Horizon Bank, Hantle, Tampa Bay Federal Credit Union, iQ Credit Union, Bank Independent, University Federal Credit Union, BMO Harris, First Community Credit Union, The Huntington National Bank, Michigan Tech Employees Federal Credit Union, BBVA Compass Bank, Bank of America ATM, United Bank of Union, Bank of Sullivan, Western Union, 'ATM Network, Inc.', Citibank ATM, Cashpoints, SchoolsFirst, WSECU, Citizens National Bank, State Employees' Credit Union (ATM), VyStar, State Employee Credit Union (ATM), CVS, ATM (Wells Fargo Bank), North Shore Bank, PNC Bank ATM, Bitcoin Depot ATM, Visions Federal Credit Union, City ATM, Cypress Advantage, Well's Fargo, JP Morgan Chase, Cornerstone Bank, PSECU, Partners Federal Credit Union, M & T Bank, First Niagara Bank, Webster, UMB, Bank of Oklahoma, AZ Federal Credit Union, First Niagara, WSFS, Credit Union of Colorado, Town Bank, First Security Bank, Digital Credit Union, Public Service Credit Union, Bank of Texas, Jersey Shore State Bank, Eastman Credit Union, Johns Hopkins Federal Credit Union, United Bank, usbank, Univest, Penn Community Bank, Mountain America Credit Union, Home Federal, Nusenda Credit Union, Leonardville State Bank, Village Pointe, Bank of New Hampshire, Presto!, Peoples Bank, WECU, Bank Midwest, Caltech Employees Federal Credit Union, First American Bank, Exchange Bank, Washington State Employees Credit Union, Kennebec Savings Bank, Fidelity Bank, First National Bank of Northern California, Triangle Credit Union, University of Colorado Colorado Springs, Ent Credit Union, Fifth Third, Valley National Bank, Banterra Bank, Morton Community Bank, 5/3, SECU, CorTrust Bank, Home Federal Bank, First Dakota National Bank, Old Second Bank, Farmers & Merchants State Bank, Cal-Ed Federal Credit Union, Security First Bank, Elevations Credit Union, Busey, Veridian Credit Union, Well Fargo, Wells Fargo (Perm. Closed), Kitsap Credit Union, Bank of North Georgia, LGE Community Credit Union, Capital Bank, Community Resource Bank, Sun Trust, BMO, Southern Mississippi Federal Credit Union, TD, Coinucopia.io, Patelco Credit Union, Alliant Credit Union, Fort Campbell Federal Credit Union, FNBT, Sunflower Bank, XBTeller, Canandaigua National Bank & Trust, Glass City Federal Credit Union, Purdue Federal Credit Union, Riverview Community Bank, NC State Employees Credit Union, First Tech Federal Credit Union, First Commonwealth Bank, United Bank & Trust, Citizens State Bank, Oregon Community Credit Union | OCCU, Columbia Credit Union, 'Payment Alliance International, Inc.', INB, Bank Iowa, Oriental Bank, First Financial Northwest Bank, Ohio University Credit Union, Truist, Opus Bank, Happy State Bank, Mainstreet Credit Union, Bitcoin ATM, WestAmerica Bank, Affinity, Community Banks of Colorado, Banco Popular de Puerto Rico, First National Santa Fe, Bank of Franklin County, Reliance Bank, TFCU, North Carolina State Employees' Credit Union, InRoads Credit Union, Premier, Credit Union of Georgia, Seattle Credit Union, EcoATM, Frost Bank, Hills Bank and Trust Company, Sidney Federal Credit Union, Beacon Credit Union, BECU (Burien Plaza), HSBC, ATM Express, Blue Eagle Credit Union, Express Mart, Valley National Bank ATM, Santander Bank ATM, ATM (TD Bank), NC State Employees' Credit Union, Canvas Credit Union, Heartland State Bank, Tri Counties Bank, The First, First Commonweaith, Guadalupe Credit Union, Trustco Bank, Stanford Federal Credit Union, Century Bank, U.S. Bank ATM, LANB, Freedom Federal Credit Union, Altra Federal Credit Union, First-Knox National Bank, Xplore, Genmega, 1st Source Bank, Terre Haute Savings Bank, Cash Points (ATM), Bank OZK, Northwest Bank, Red Canoe, Broadway Bank, Educators Credit Union, ChaseBank, Centra Credit Union, Richton Bank & Trust Company]\n centerLineStyle: yellow\n exclusiveCycleLaneStyle: white\n+hasAdvisoryCycleLane: false\n hasAdvisorySpeedLimitSign: true\n hasCenterLeftTurnLane: true\n hasNoStandingSign: true\ndiff --git a/app/src/main/assets/country_metadata/default.yml b/app/src/main/assets/country_metadata/default.yml\nindex 72efd9cd982..ae97e041d03 100644\n--- a/app/src/main/assets/country_metadata/default.yml\n+++ b/app/src/main/assets/country_metadata/default.yml\n@@ -7,6 +7,7 @@ firstDayOfWorkweek: Mo\n hasAdvisoryCycleLane: false\n hasAdvisorySpeedLimitSign: false\n hasBiWeeklyAlternateSideParkingSign: false\n+hasBicycleBoulevard: false\n hasCenterLeftTurnLane: false\n hasDailyAlternateSideParkingSign: false\n hasLivingStreet: false\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.kt b/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.kt\nindex d4942e18223..1ec2d2bb634 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.kt\n@@ -49,6 +49,7 @@ data class IncompleteCountryInfo(\n val hasBiWeeklyAlternateSideParkingSign: Boolean? = null,\n val hasCenterLeftTurnLane: Boolean? = null,\n val hasAdvisoryCycleLane: Boolean? = null,\n+ val hasBicycleBoulevard: Boolean? = null,\n val hasDailyAlternateSideParkingSign: Boolean? = null,\n val hasLivingStreet: Boolean? = null,\n val hasNoStandingSign: Boolean? = null,\n@@ -100,6 +101,8 @@ data class CountryInfo(private val infos: List) {\n get() = infos.firstNotNullOf { it.hasAdvisoryCycleLane }\n val hasAdvisorySpeedLimitSign: Boolean\n get() = infos.firstNotNullOf { it.hasAdvisorySpeedLimitSign }\n+ val hasBicycleBoulevard: Boolean\n+ get() = infos.firstNotNullOf { it.hasBicycleBoulevard }\n val hasBiWeeklyAlternateSideParkingSign: Boolean\n get() = infos.firstNotNullOf { it.hasBiWeeklyAlternateSideParkingSign }\n val hasCenterLeftTurnLane: Boolean\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/data/osm/osmquests/OsmElementQuestType.kt b/app/src/main/java/de/westnordost/streetcomplete/data/osm/osmquests/OsmElementQuestType.kt\nindex dbf1e288ede..d5627ef88ed 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/data/osm/osmquests/OsmElementQuestType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/data/osm/osmquests/OsmElementQuestType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.data.osm.osmquests\n \n import de.westnordost.streetcomplete.data.osm.edits.ElementEditType\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.quest.AllCountries\n@@ -96,9 +97,10 @@ interface OsmElementQuestType : QuestType, ElementEditType {\n * any misunderstandings which element is meant that far apart. */\n val highlightedElementsRadius: Double get() = 30.0\n \n- /** applies the data from [answer] to the element that has last been edited at [timestampEdited].\n- * The element is not directly modified, instead, a map of [tags] is built */\n- fun applyAnswerTo(answer: T, tags: Tags, timestampEdited: Long)\n+ /** Applies the data from [answer] to the element that has last been edited at [timestampEdited]\n+ * with the given [tags] and the given [geometry].\n+ * The element is not directly modified, instead, a map of [tags] is modified */\n+ fun applyAnswerTo(answer: T, tags: Tags, geometry: ElementGeometry, timestampEdited: Long)\n \n override fun createForm(): AbstractOsmQuestForm\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/data/user/achievements/AchievementsModule.kt b/app/src/main/java/de/westnordost/streetcomplete/data/user/achievements/AchievementsModule.kt\nindex 400e8318de6..4b224ac4658 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/data/user/achievements/AchievementsModule.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/data/user/achievements/AchievementsModule.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.data.user.achievements\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.overlays.street_parking.StreetParkingOverlay\n+import de.westnordost.streetcomplete.quests.cycleway.AddCycleway\n import de.westnordost.streetcomplete.quests.foot.AddProhibitedForPedestrians\n import de.westnordost.streetcomplete.quests.oneway.AddOneway\n import de.westnordost.streetcomplete.quests.sidewalk.AddSidewalk\n@@ -51,6 +52,7 @@ private val typeAliases = listOf(\n // whether lit roads have been added in context of the quest or the overlay should not matter for the statistics\n \"WayLitOverlay\" to AddWayLit::class.simpleName!!,\n \"SidewalkOverlay\" to AddSidewalk::class.simpleName!!,\n+ \"CyclewayOverlay\" to AddCycleway::class.simpleName!!,\n \"AddStreetParking\" to StreetParkingOverlay::class.simpleName!!\n )\n \ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/Oneway.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/Oneway.kt\nindex 9f0854fe945..4ddfa1bb6e9 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/osm/Oneway.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/Oneway.kt\n@@ -17,3 +17,14 @@ fun isNotOnewayForCyclists(tags: Map, isLeftHandTraffic: Boolean\n || tags[\n if (isLeftHandTraffic xor isReversedOneway(tags)) \"cycleway:right\" else \"cycleway:left\"\n ]?.startsWith(\"opposite\") == true\n+\n+/** Return whether the given side is in the contra-flow of a oneway. E.g. in Germany for a forward\n+ * oneway, it is the left side */\n+fun isInContraflowOfOneway(\n+ isRightSide: Boolean,\n+ tags: Map,\n+ isLeftHandTraffic: Boolean\n+): Boolean {\n+ val isReverseSideRight = isReversedOneway(tags) xor isLeftHandTraffic\n+ return isOneway(tags) && isReverseSideRight == isRightSide\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/RoadWidth.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/RoadWidth.kt\nindex 8ed0eeba785..305d615ed72 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/osm/RoadWidth.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/RoadWidth.kt\n@@ -100,12 +100,12 @@ fun estimateCycleTrackWidth(tags: Map): Float? =\n private fun estimateCyclewaysWidth(tags: Map, isLane: Boolean): Float? {\n val sides = createCyclewaySides(tags, false) ?: return null\n \n- val leftWidth = if (sides.left?.isLane == isLane) {\n+ val leftWidth = if (sides.left?.cycleway?.isLane == isLane) {\n (tags[\"cycleway:both:width\"] ?: tags[\"cycleway:left:width\"])?.toFloatOrNull()\n ?: sides.left.estimatedWidth\n } else 0f\n \n- val rightWidth = if (sides.right?.isLane == isLane) {\n+ val rightWidth = if (sides.right?.cycleway?.isLane == isLane) {\n (tags[\"cycleway:both:width\"] ?: tags[\"cycleway:right:width\"])?.toFloatOrNull()\n ?: sides.right.estimatedWidth\n } else 0f\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/Surface.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/Surface.kt\nindex 7fdaaa3caf4..93ed76c6622 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/osm/Surface.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/Surface.kt\n@@ -1,6 +1,8 @@\n package de.westnordost.streetcomplete.osm\n \n-val SOFT_SURFACES = setOf(\"ground\", \"earth\", \"dirt\", \"grass\", \"sand\", \"mud\", \"ice\", \"salt\", \"snow\", \"woodchips\")\n+val SOFT_SURFACES = setOf(\n+ \"ground\", \"earth\", \"dirt\", \"grass\", \"sand\", \"mud\", \"ice\", \"salt\", \"snow\", \"woodchips\"\n+)\n \n val ANYTHING_UNPAVED = SOFT_SURFACES + setOf(\n \"unpaved\", \"compacted\", \"gravel\", \"fine_gravel\", \"pebblestone\", \"grass_paver\",\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/Tags.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/Tags.kt\nindex dd662b23ace..d4f18f1d962 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/osm/Tags.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/Tags.kt\n@@ -3,3 +3,26 @@ package de.westnordost.streetcomplete.osm\n import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapChangesBuilder\n \n typealias Tags = StringMapChangesBuilder\n+\n+fun Tags.expandSides(key: String, postfix: String? = null, includeBareTag: Boolean = true) {\n+ val post = if (postfix != null) \":$postfix\" else \"\"\n+ val both = get(\"$key:both$post\") ?: (if (includeBareTag) get(\"$key$post\") else null)\n+ if (both != null) {\n+ // *:left/right is seen as more specific/correct in case the two contradict each other\n+ if (!containsKey(\"$key:left$post\")) set(\"$key:left$post\", both)\n+ if (!containsKey(\"$key:right$post\")) set(\"$key:right$post\", both)\n+ }\n+ remove(\"$key:both$post\")\n+ if (includeBareTag) remove(\"$key$post\")\n+}\n+\n+fun Tags.mergeSides(key: String, postfix: String? = null) {\n+ val post = if (postfix != null) \":$postfix\" else \"\"\n+ val left = get(\"$key:left$post\")\n+ val right = get(\"$key:right$post\")\n+ if (left != null && left == right) {\n+ set(\"$key:both$post\", left)\n+ remove(\"$key:left$post\")\n+ remove(\"$key:right$post\")\n+ }\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/bicycle_boulevard/BicycleBoulevard.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/bicycle_boulevard/BicycleBoulevard.kt\nnew file mode 100644\nindex 00000000000..5838b305046\n--- /dev/null\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/bicycle_boulevard/BicycleBoulevard.kt\n@@ -0,0 +1,36 @@\n+package de.westnordost.streetcomplete.osm.bicycle_boulevard\n+\n+import de.westnordost.streetcomplete.osm.Tags\n+import de.westnordost.streetcomplete.osm.bicycle_boulevard.BicycleBoulevard.*\n+\n+enum class BicycleBoulevard { YES, NO }\n+\n+fun createBicycleBoulevard(tags: Map): BicycleBoulevard =\n+ // \"no\" value is extremely uncommon, hence the lack of this tag can be interpreted as \"no\"\n+ if (tags[\"bicycle_road\"] == \"yes\" || tags[\"cyclestreet\"] == \"yes\") YES else NO\n+\n+fun BicycleBoulevard.applyTo(tags: Tags, countryCode: String) {\n+ when (this) {\n+ YES -> {\n+ // do not re-tag to different key if one already exists\n+ val useBicycleRoad = when {\n+ tags.containsKey(\"bicycle_road\") -> true\n+ tags.containsKey(\"cyclestreet\") -> false\n+ // in BeNeLux countries, cyclestreet established itself instead\n+ countryCode in listOf(\"BE\", \"NL\", \"LU\") -> false\n+ else -> true\n+ }\n+ if (useBicycleRoad) {\n+ tags[\"bicycle_road\"] = \"yes\"\n+ tags.remove(\"cyclestreet\")\n+ } else {\n+ tags[\"cyclestreet\"] = \"yes\"\n+ tags.remove(\"bicycle_road\")\n+ }\n+ }\n+ NO -> {\n+ tags.remove(\"bicycle_road\")\n+ tags.remove(\"cyclestreet\")\n+ }\n+ }\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/Cycleway.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/Cycleway.kt\nindex 8470cb85cba..4b71658bbcf 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/Cycleway.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/Cycleway.kt\n@@ -1,16 +1,80 @@\n package de.westnordost.streetcomplete.osm.cycleway\n \n+import kotlinx.serialization.Serializable\n import de.westnordost.streetcomplete.data.meta.CountryInfo\n import de.westnordost.streetcomplete.osm.cycleway.Cycleway.*\n+import de.westnordost.streetcomplete.osm.cycleway.Direction.*\n+import de.westnordost.streetcomplete.osm.isForwardOneway\n+import de.westnordost.streetcomplete.osm.isInContraflowOfOneway\n+import de.westnordost.streetcomplete.osm.isNotOnewayForCyclists\n+import de.westnordost.streetcomplete.osm.isOneway\n+import de.westnordost.streetcomplete.osm.isReversedOneway\n+\n+data class LeftAndRightCycleway(val left: CyclewayAndDirection?, val right: CyclewayAndDirection?)\n+\n+fun LeftAndRightCycleway.any(block: (cycleway: CyclewayAndDirection) -> Boolean): Boolean =\n+ left?.let(block) == true || right?.let(block) == true\n+\n+fun LeftAndRightCycleway.selectableOrNullValues(countryInfo: CountryInfo): LeftAndRightCycleway {\n+ val leftIsSelectable = left?.isSelectable(countryInfo) != false\n+ val rightIsSelectable = right?.isSelectable(countryInfo) != false\n+ if (leftIsSelectable && rightIsSelectable) return this\n+ return LeftAndRightCycleway(\n+ if (leftIsSelectable) left else null,\n+ if (rightIsSelectable) right else null\n+ )\n+}\n+\n+fun LeftAndRightCycleway.wasNoOnewayForCyclistsButNowItIs(tags: Map, isLeftHandTraffic: Boolean): Boolean =\n+ isOneway(tags)\n+ && isNotOnewayForCyclists(tags, isLeftHandTraffic)\n+ && !isNotOnewayForCyclistsNow(tags, isLeftHandTraffic)\n+\n+fun LeftAndRightCycleway.isNotOnewayForCyclistsNow(tags: Map, isLeftHandTraffic: Boolean): Boolean {\n+ val onewayDir = when {\n+ isForwardOneway(tags) -> FORWARD\n+ isReversedOneway(tags) -> BACKWARD\n+ else -> return true\n+ }\n+ val previous = createCyclewaySides(tags, isLeftHandTraffic)\n+ val l = (left ?: previous?.left)\n+ val r = (right ?: previous?.right)\n+ // \"no cycleway\" has no direction and should be ignored\n+ val leftDir = l?.direction?.takeIf { l.cycleway != NONE }\n+ val rightDir = r?.direction?.takeIf { r.cycleway != NONE }\n+\n+ return leftDir == BOTH || rightDir == BOTH ||\n+ leftDir != null && leftDir != onewayDir ||\n+ rightDir != null && rightDir != onewayDir\n+}\n \n+@Serializable\n+data class CyclewayAndDirection(val cycleway: Cycleway, val direction: Direction)\n+\n+fun CyclewayAndDirection.isSelectable(countryInfo: CountryInfo): Boolean =\n+ cycleway.isSelectable(countryInfo) &&\n+ // only allow dual track and dual lanes (not dual pictograms or something)\n+ (direction != BOTH || cycleway == TRACK || cycleway == UNSPECIFIED_LANE || cycleway == EXCLUSIVE_LANE)\n+\n+@Serializable\n+enum class Direction {\n+ FORWARD, BACKWARD, BOTH;\n+\n+ fun reverse(): Direction = when (this) {\n+ FORWARD -> BACKWARD\n+ BACKWARD -> FORWARD\n+ BOTH -> BOTH\n+ }\n+}\n+\n+@Serializable\n enum class Cycleway {\n /** a.k.a. cycle lane with continuous markings, dedicated lane or simply (proper) lane. Usually\n * exclusive access for cyclists */\n EXCLUSIVE_LANE,\n- /** [EXCLUSIVE_LANE] in both directions */\n- DUAL_LANE,\n- /** a.k.a. cycle lane with dashed markings, protective lane, multipurpose lane, soft lane or\n- * recommended lane. Usually priority access for cyclists, cars may use if necessary */\n+ /** a.k.a. cycle lane with dashed markings, protective lane, multipurpose lane, soft lane,\n+ * recommended lane or cycle lanes on 2-1 roads. Usually priority access for cyclists, cars\n+ * may use if necessary */\n ADVISORY_LANE,\n /** some kind of cycle lane, not specified whether exclusive or advisory */\n UNSPECIFIED_LANE,\n@@ -30,8 +94,6 @@ enum class Cycleway {\n \n /** cycle track, i.e. beyond curb or other barrier */\n TRACK,\n- /** [TRACK] in both directions */\n- DUAL_TRACK,\n \n /** cyclists share space with bus lane */\n BUSWAY,\n@@ -52,6 +114,9 @@ enum class Cycleway {\n /** cycleway is mapped as a separate way */\n SEPARATE,\n \n+ /** no cycle track or lane, but cyclists use shoudler */\n+ SHOULDER,\n+\n /** unknown cycleway tag set */\n UNKNOWN,\n \n@@ -64,7 +129,7 @@ enum class Cycleway {\n /** is a lane (cycleway=lane or cycleway=shared_lane), shared on busway doesn't count as a lane\n * in that sense because it is not a subtag of the mentioned tags */\n val isLane get() = when (this) {\n- EXCLUSIVE_LANE, DUAL_LANE, ADVISORY_LANE, UNSPECIFIED_LANE, UNKNOWN_LANE,\n+ EXCLUSIVE_LANE, ADVISORY_LANE, UNSPECIFIED_LANE, UNKNOWN_LANE,\n SUGGESTION_LANE, PICTOGRAMS, UNSPECIFIED_SHARED_LANE, UNKNOWN_SHARED_LANE -> true\n else -> false\n }\n@@ -74,11 +139,17 @@ enum class Cycleway {\n else -> false\n }\n \n- val isInvalid get() = this == INVALID\n+ val isReversible get() = when (this) {\n+ NONE, NONE_NO_ONEWAY, SEPARATE, SHOULDER -> false\n+ else -> true\n+ }\n \n- val isOneway get() = this != DUAL_LANE && this != DUAL_TRACK\n+ val isInvalid get() = this == INVALID\n }\n \n+private fun Cycleway.isSelectable(countryInfo: CountryInfo): Boolean =\n+ !isInvalid && !isUnknown && !isAmbiguous(countryInfo)\n+\n fun Cycleway.isAmbiguous(countryInfo: CountryInfo) = when (this) {\n UNSPECIFIED_SHARED_LANE ->\n true\n@@ -88,7 +159,12 @@ fun Cycleway.isAmbiguous(countryInfo: CountryInfo) = when (this) {\n false\n }\n \n-fun getSelectableCyclewaysInCountry(countryInfo: CountryInfo): List {\n+fun getSelectableCycleways(\n+ countryInfo: CountryInfo,\n+ roadTags: Map,\n+ isRightSide: Boolean\n+): List {\n+ val dir = if (isRightSide xor countryInfo.isLeftHandTraffic) FORWARD else BACKWARD\n val cycleways = mutableListOf(\n NONE,\n TRACK,\n@@ -100,9 +176,15 @@ fun getSelectableCyclewaysInCountry(countryInfo: CountryInfo): List {\n PICTOGRAMS,\n BUSWAY,\n SIDEWALK_EXPLICIT,\n- DUAL_LANE,\n- DUAL_TRACK\n+ SHOULDER\n+ )\n+ val dualCycleways = listOf(\n+ CyclewayAndDirection(if (countryInfo.hasAdvisoryCycleLane) EXCLUSIVE_LANE else UNSPECIFIED_LANE, BOTH),\n+ CyclewayAndDirection(TRACK, BOTH),\n )\n+\n+ // no need to distinguish between advisory and exclusive lane where the concept of exclusive\n+ // lanes does not exist\n if (countryInfo.hasAdvisoryCycleLane) {\n cycleways.remove(UNSPECIFIED_LANE)\n } else {\n@@ -115,17 +197,20 @@ fun getSelectableCyclewaysInCountry(countryInfo: CountryInfo): List {\n } else {\n cycleways.remove(SUGGESTION_LANE)\n }\n- return cycleways\n+ // different wording for a contraflow lane that is marked like a \"shared\" lane (just bicycle pictogram)\n+ if (isInContraflowOfOneway(isRightSide, roadTags, countryInfo.isLeftHandTraffic)) {\n+ cycleways.remove(PICTOGRAMS)\n+ cycleways.add(cycleways.indexOf(NONE) + 1, NONE_NO_ONEWAY)\n+ }\n+ return cycleways.map { CyclewayAndDirection(it, dir) } + dualCycleways\n }\n \n-val Cycleway.estimatedWidth: Float get() = when (this) {\n+val CyclewayAndDirection.estimatedWidth: Float get() = when (cycleway) {\n EXCLUSIVE_LANE -> 1.5f\n- DUAL_LANE -> 3f\n ADVISORY_LANE -> 1f\n UNSPECIFIED_LANE -> 1f\n UNKNOWN_LANE -> 1f\n SUGGESTION_LANE -> 0.75f\n TRACK -> 1.5f\n- DUAL_TRACK -> 3f\n else -> 0f\n-}\n+} * if (direction == BOTH) 2 else 1\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayCreator.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayCreator.kt\nnew file mode 100644\nindex 00000000000..cd1049701ef\n--- /dev/null\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayCreator.kt\n@@ -0,0 +1,155 @@\n+package de.westnordost.streetcomplete.osm.cycleway\n+\n+import de.westnordost.streetcomplete.osm.cycleway.Cycleway.*\n+import de.westnordost.streetcomplete.osm.Tags\n+import de.westnordost.streetcomplete.osm.cycleway.Direction.*\n+import de.westnordost.streetcomplete.osm.expandSides\n+import de.westnordost.streetcomplete.osm.hasCheckDateForKey\n+import de.westnordost.streetcomplete.osm.isInContraflowOfOneway\n+import de.westnordost.streetcomplete.osm.isOneway\n+import de.westnordost.streetcomplete.osm.mergeSides\n+import de.westnordost.streetcomplete.osm.sidewalk.LeftAndRightSidewalk\n+import de.westnordost.streetcomplete.osm.sidewalk.Sidewalk\n+import de.westnordost.streetcomplete.osm.sidewalk.applyTo\n+import de.westnordost.streetcomplete.osm.updateCheckDateForKey\n+\n+fun LeftAndRightCycleway.applyTo(tags: Tags, isLeftHandTraffic: Boolean) {\n+ if (left == null && right == null) return\n+ /* for being able to modify only one side (e.g. `left` is null while `right` is not null),\n+ the sides conflated in `:both` keys need to be separated first. E.g. `cycleway=no`\n+ when left side is made `separate` should become\n+ - cycleway:right=no\n+ - cycleway:left=separate\n+ First separating the values and then later conflating them again, if possible, solves this.\n+ */\n+ tags.expandSides(\"cycleway\")\n+ tags.expandSides(\"cycleway\", \"lane\")\n+ tags.expandSides(\"cycleway\", \"oneway\")\n+ tags.expandSides(\"cycleway\", \"segregated\")\n+\n+ applyOnewayNotForCyclists(tags, isLeftHandTraffic)\n+ left?.applyTo(tags, false, isLeftHandTraffic)\n+ right?.applyTo(tags, true, isLeftHandTraffic)\n+\n+ tags.mergeSides(\"cycleway\")\n+ tags.mergeSides(\"cycleway\", \"lane\")\n+ tags.mergeSides(\"cycleway\", \"oneway\")\n+ tags.mergeSides(\"cycleway\", \"segregated\")\n+\n+ // update check date\n+ if (!tags.hasChanges || tags.hasCheckDateForKey(\"cycleway\")) {\n+ tags.updateCheckDateForKey(\"cycleway\")\n+ }\n+\n+ // tag sidewalk after setting the check date because we want to primarily set the check date\n+ // of the cycleway, not of the sidewalk, if there are no changes\n+ LeftAndRightSidewalk(\n+ if (left?.cycleway == SIDEWALK_EXPLICIT) Sidewalk.YES else null,\n+ if (right?.cycleway == SIDEWALK_EXPLICIT) Sidewalk.YES else null,\n+ ).applyTo(tags)\n+}\n+\n+private fun LeftAndRightCycleway.applyOnewayNotForCyclists(tags: Tags, isLeftHandTraffic: Boolean) {\n+ if (isOneway(tags) && isNotOnewayForCyclistsNow(tags, isLeftHandTraffic)) {\n+ tags[\"oneway:bicycle\"] = \"no\"\n+ } else {\n+ if (tags[\"oneway:bicycle\"] == \"no\") {\n+ tags.remove(\"oneway:bicycle\")\n+ }\n+ }\n+}\n+\n+private fun CyclewayAndDirection.applyTo(tags: Tags, isRight: Boolean, isLeftHandTraffic: Boolean) {\n+ val side = if (isRight) \"right\" else \"left\"\n+ val cyclewayKey = \"cycleway:$side\"\n+ when (cycleway) {\n+ NONE, NONE_NO_ONEWAY -> {\n+ tags[cyclewayKey] = \"no\"\n+ }\n+ UNSPECIFIED_LANE -> {\n+ tags[cyclewayKey] = \"lane\"\n+ // does not remove any cycleway:lane tag because this value is not considered explicit\n+ }\n+ ADVISORY_LANE -> {\n+ tags[cyclewayKey] = \"lane\"\n+ tags[\"$cyclewayKey:lane\"] = \"advisory\"\n+ }\n+ EXCLUSIVE_LANE -> {\n+ tags[cyclewayKey] = \"lane\"\n+ tags[\"$cyclewayKey:lane\"] = \"exclusive\"\n+ }\n+ TRACK -> {\n+ tags[cyclewayKey] = \"track\"\n+ // only set if already set, because \"yes\" is considered the implicit default\n+ if (tags.containsKey(\"$cyclewayKey:segregated\")) {\n+ tags[\"$cyclewayKey:segregated\"] = \"yes\"\n+ }\n+ }\n+ SIDEWALK_EXPLICIT -> {\n+ // https://wiki.openstreetmap.org/wiki/File:Z240GemeinsamerGehundRadweg.jpeg\n+ tags[cyclewayKey] = \"track\"\n+ tags[\"$cyclewayKey:segregated\"] = \"no\"\n+ }\n+ PICTOGRAMS -> {\n+ tags[cyclewayKey] = \"shared_lane\"\n+ tags[\"$cyclewayKey:lane\"] = \"pictogram\"\n+ }\n+ SUGGESTION_LANE -> {\n+ tags[cyclewayKey] = \"shared_lane\"\n+ tags[\"$cyclewayKey:lane\"] = \"advisory\"\n+ }\n+ UNSPECIFIED_SHARED_LANE -> {\n+ tags[cyclewayKey] = \"shared_lane\"\n+ // does not remove any cycleway:lane tag because value is not considered explicit\n+ }\n+ BUSWAY -> {\n+ tags[cyclewayKey] = \"share_busway\"\n+ }\n+ SHOULDER -> {\n+ tags[cyclewayKey] = \"shoulder\"\n+ }\n+ SEPARATE -> {\n+ tags[cyclewayKey] = \"separate\"\n+ }\n+ else -> {\n+ throw IllegalArgumentException(\"Invalid cycleway\")\n+ }\n+ }\n+\n+ val isPhysicalCycleway = cycleway != NONE && cycleway != SEPARATE && cycleway != NONE_NO_ONEWAY\n+ if (!isPhysicalCycleway) {\n+ tags.remove(\"$cyclewayKey:oneway\")\n+ } else {\n+ /* explicitly tag cycleway direction when either\n+ - the selected direction is not the one assumed by default when the key is missing\n+ - or the road is a oneway and the cycleway is on the contra-flow side\n+ - or it is already tagged (to correct it if need be)\n+ */\n+ val isDefaultDirection = when (direction) {\n+ FORWARD -> isRight xor isLeftHandTraffic\n+ BACKWARD -> !isRight xor isLeftHandTraffic\n+ BOTH -> false\n+ }\n+ val isInContraflowOfOneway = isInContraflowOfOneway(isRight, tags, isLeftHandTraffic)\n+ if (!isDefaultDirection || isInContraflowOfOneway || tags.containsKey(\"$cyclewayKey:oneway\")) {\n+ tags[\"$cyclewayKey:oneway\"] = direction.onewayValue\n+ }\n+ }\n+\n+ // clear previous cycleway:lane value\n+ if (!cycleway.isLane) {\n+ tags.remove(\"$cyclewayKey:lane\")\n+ }\n+\n+ // clear previous cycleway:segregated value\n+ val touchedSegregatedValue = cycleway in listOf(SIDEWALK_EXPLICIT, TRACK)\n+ if (!touchedSegregatedValue) {\n+ tags.remove(\"$cyclewayKey:segregated\")\n+ }\n+}\n+\n+private val Direction.onewayValue get() = when (this) {\n+ FORWARD -> \"yes\"\n+ BACKWARD -> \"-1\"\n+ BOTH -> \"no\"\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayItem.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayItem.kt\nnew file mode 100644\nindex 00000000000..1520f263f73\n--- /dev/null\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayItem.kt\n@@ -0,0 +1,160 @@\n+package de.westnordost.streetcomplete.osm.cycleway\n+\n+import android.content.Context\n+import android.graphics.Canvas\n+import android.graphics.drawable.Drawable\n+import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.meta.CountryInfo\n+import de.westnordost.streetcomplete.osm.cycleway.Cycleway.*\n+import de.westnordost.streetcomplete.osm.cycleway.Direction.*\n+import de.westnordost.streetcomplete.util.ktx.advisoryCycleLaneResId\n+import de.westnordost.streetcomplete.util.ktx.advisoryCycleLaneMirroredResId\n+import de.westnordost.streetcomplete.util.ktx.dualCycleLaneMirroredResId\n+import de.westnordost.streetcomplete.util.ktx.dualCycleLaneResId\n+import de.westnordost.streetcomplete.util.ktx.exclusiveCycleLaneMirroredResId\n+import de.westnordost.streetcomplete.util.ktx.exclusiveCycleLaneResId\n+import de.westnordost.streetcomplete.util.ktx.noEntrySignDrawableResId\n+import de.westnordost.streetcomplete.util.ktx.pictogramCycleLaneMirroredResId\n+import de.westnordost.streetcomplete.util.ktx.pictogramCycleLaneResId\n+import de.westnordost.streetcomplete.view.DrawableImage\n+import de.westnordost.streetcomplete.view.DrawableWrapper\n+import de.westnordost.streetcomplete.view.Image\n+import de.westnordost.streetcomplete.view.ResImage\n+import de.westnordost.streetcomplete.view.ResText\n+import de.westnordost.streetcomplete.view.controller.StreetSideItem\n+import de.westnordost.streetcomplete.view.image_select.Item2\n+\n+fun CyclewayAndDirection.asDialogItem(\n+ isRight: Boolean,\n+ isContraflowInOneway: Boolean,\n+ context: Context,\n+ countryInfo: CountryInfo\n+) =\n+ Item2(\n+ this,\n+ getDialogIcon(context, isRight, countryInfo),\n+ ResText(getTitleResId(isContraflowInOneway))\n+ )\n+\n+fun CyclewayAndDirection.asStreetSideItem(\n+ isRight: Boolean,\n+ isContraflowInOneway: Boolean,\n+ countryInfo: CountryInfo\n+) =\n+ StreetSideItem(\n+ this,\n+ getIconResId(isRight, countryInfo),\n+ getTitleResId(isContraflowInOneway),\n+ getDialogIconResId(isRight, countryInfo),\n+ cycleway.getFloatingIconResId(isContraflowInOneway, countryInfo.noEntrySignDrawableResId)\n+ )\n+\n+private fun CyclewayAndDirection.getDialogIcon(\n+ context: Context,\n+ isRight: Boolean,\n+ countryInfo: CountryInfo\n+): Image {\n+ val id = getDialogIconResId(isRight, countryInfo)\n+ return if (countryInfo.isLeftHandTraffic) {\n+ DrawableImage(Rotate180Degrees(context.getDrawable(id)!!))\n+ } else {\n+ ResImage(id)\n+ }\n+}\n+\n+private fun CyclewayAndDirection.getDialogIconResId(isRight: Boolean, countryInfo: CountryInfo): Int =\n+ when (cycleway) {\n+ NONE -> R.drawable.ic_cycleway_none_in_selection\n+ SEPARATE -> R.drawable.ic_cycleway_separate\n+ else -> getIconResId(isRight, countryInfo)\n+ }\n+\n+private class Rotate180Degrees(drawable: Drawable) : DrawableWrapper(drawable) {\n+ override fun draw(canvas: Canvas) {\n+ canvas.scale(-1f, -1f, bounds.width() / 2f, bounds.height() / 2f)\n+ drawable.bounds = bounds\n+ drawable.draw(canvas)\n+ }\n+}\n+\n+private fun Cycleway.getFloatingIconResId(isContraflowInOneway: Boolean, noEntrySignDrawableResId: Int): Int? = when (this) {\n+ NONE -> if (isContraflowInOneway) noEntrySignDrawableResId else null\n+ SEPARATE -> R.drawable.ic_sidewalk_floating_separate\n+ else -> null\n+}\n+\n+private fun CyclewayAndDirection.getIconResId(isRight: Boolean, countryInfo: CountryInfo): Int = when (direction) {\n+ BOTH -> cycleway.getDualTrafficIconResId(countryInfo)\n+ else -> {\n+ val isForward = (direction == FORWARD)\n+ val showMirrored = isForward xor isRight\n+ if (showMirrored) cycleway.getLeftHandTrafficIconResId(countryInfo)\n+ else cycleway.getRightHandTrafficIconResId(countryInfo)\n+ }\n+}\n+\n+private fun Cycleway.getDualTrafficIconResId(countryInfo: CountryInfo): Int = when (this) {\n+ UNSPECIFIED_LANE, EXCLUSIVE_LANE ->\n+ if (countryInfo.isLeftHandTraffic) countryInfo.dualCycleLaneMirroredResId\n+ else countryInfo.dualCycleLaneResId\n+ TRACK ->\n+ if (countryInfo.isLeftHandTraffic) R.drawable.ic_cycleway_track_dual_l\n+ else R.drawable.ic_cycleway_track_dual\n+ else -> 0\n+}\n+\n+private fun Cycleway.getRightHandTrafficIconResId(countryInfo: CountryInfo): Int = when (this) {\n+ UNSPECIFIED_LANE -> countryInfo.exclusiveCycleLaneResId\n+ EXCLUSIVE_LANE -> countryInfo.exclusiveCycleLaneResId\n+ ADVISORY_LANE -> countryInfo.advisoryCycleLaneResId\n+ SUGGESTION_LANE -> countryInfo.advisoryCycleLaneResId\n+ TRACK -> R.drawable.ic_cycleway_track\n+ NONE -> R.drawable.ic_cycleway_none\n+ NONE_NO_ONEWAY -> R.drawable.ic_cycleway_none_no_oneway\n+ PICTOGRAMS -> countryInfo.pictogramCycleLaneResId\n+ SIDEWALK_EXPLICIT -> R.drawable.ic_cycleway_sidewalk_explicit\n+ BUSWAY -> R.drawable.ic_cycleway_bus_lane\n+ SEPARATE -> R.drawable.ic_cycleway_none\n+ SHOULDER -> R.drawable.ic_cycleway_shoulder\n+ else -> 0\n+}\n+\n+private fun Cycleway.getLeftHandTrafficIconResId(countryInfo: CountryInfo): Int = when (this) {\n+ UNSPECIFIED_LANE -> countryInfo.exclusiveCycleLaneMirroredResId\n+ EXCLUSIVE_LANE -> countryInfo.exclusiveCycleLaneMirroredResId\n+ ADVISORY_LANE -> countryInfo.advisoryCycleLaneMirroredResId\n+ SUGGESTION_LANE -> countryInfo.advisoryCycleLaneMirroredResId\n+ TRACK -> R.drawable.ic_cycleway_track_l\n+ NONE -> R.drawable.ic_cycleway_none\n+ NONE_NO_ONEWAY -> R.drawable.ic_cycleway_none_no_oneway_l\n+ PICTOGRAMS -> countryInfo.pictogramCycleLaneMirroredResId\n+ SIDEWALK_EXPLICIT -> R.drawable.ic_cycleway_sidewalk_explicit_l\n+ BUSWAY -> R.drawable.ic_cycleway_bus_lane_l\n+ SEPARATE -> R.drawable.ic_cycleway_none\n+ SHOULDER -> R.drawable.ic_cycleway_shoulder\n+ else -> 0\n+}\n+\n+private fun CyclewayAndDirection.getTitleResId(isContraflowInOneway: Boolean): Int = when (cycleway) {\n+ UNSPECIFIED_LANE, EXCLUSIVE_LANE -> {\n+ if (direction == BOTH) R.string.quest_cycleway_value_lane_dual\n+ else R.string.quest_cycleway_value_lane\n+ }\n+ TRACK -> {\n+ if (direction == BOTH) R.string.quest_cycleway_value_track_dual\n+ else R.string.quest_cycleway_value_track\n+ }\n+ NONE -> {\n+ if (isContraflowInOneway) R.string.quest_cycleway_value_none_and_oneway\n+ else R.string.quest_cycleway_value_none\n+ }\n+ ADVISORY_LANE,\n+ SUGGESTION_LANE -> R.string.quest_cycleway_value_advisory_lane\n+ NONE_NO_ONEWAY -> R.string.quest_cycleway_value_none_but_no_oneway\n+ PICTOGRAMS -> R.string.quest_cycleway_value_shared\n+ SIDEWALK_EXPLICIT -> R.string.quest_cycleway_value_sidewalk\n+ BUSWAY -> R.string.quest_cycleway_value_bus_lane\n+ SEPARATE -> R.string.quest_cycleway_value_separate\n+ SHOULDER -> R.string.quest_cycleway_value_shoulder\n+ else -> 0\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayParser.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayParser.kt\nindex 99217017044..dfd3fe59ed5 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayParser.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayParser.kt\n@@ -1,33 +1,14 @@\n package de.westnordost.streetcomplete.osm.cycleway\n \n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.ADVISORY_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.BUSWAY\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.DUAL_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.DUAL_TRACK\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.EXCLUSIVE_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.INVALID\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.NONE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.NONE_NO_ONEWAY\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.PICTOGRAMS\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.SEPARATE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.SIDEWALK_EXPLICIT\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.SUGGESTION_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.TRACK\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.UNKNOWN\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.UNKNOWN_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.UNKNOWN_SHARED_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.UNSPECIFIED_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.UNSPECIFIED_SHARED_LANE\n+import de.westnordost.streetcomplete.osm.cycleway.Cycleway.*\n import de.westnordost.streetcomplete.osm.isForwardOneway\n import de.westnordost.streetcomplete.osm.isNotOnewayForCyclists\n import de.westnordost.streetcomplete.osm.isReversedOneway\n import de.westnordost.streetcomplete.util.ktx.containsAny\n \n-data class LeftAndRightCycleway(val left: Cycleway?, val right: Cycleway?)\n-\n /** Returns the Cycleway values for the left and right side using the given tags */\n fun createCyclewaySides(tags: Map, isLeftHandTraffic: Boolean): LeftAndRightCycleway? {\n- if (!tags.keys.containsAny(KNOWN_CYCLEWAY_KEYS)) return null\n+ if (!tags.keys.containsAny(KNOWN_CYCLEWAY_AND_RELATED_KEYS)) return null\n \n val isForwardOneway = isForwardOneway(tags)\n val isReversedOneway = isReversedOneway(tags)\n@@ -39,11 +20,14 @@ fun createCyclewaySides(tags: Map, isLeftHandTraffic: Boolean):\n val isOnewayButNotForCyclists = isOneway && isNotOnewayForCyclists(tags, isLeftHandTraffic)\n \n // opposite tagging implies a oneway. So tagging is not understood if tags seem to contradict each other\n- val isAnyOppositeTagging = tags.filterKeys { it in KNOWN_CYCLEWAY_KEYS }.values.any { it.startsWith(\"opposite\") }\n+ val isAnyOppositeTagging = tags.filterKeys { it in KNOWN_CYCLEWAY_AND_RELATED_KEYS }.values.any { it.startsWith(\"opposite\") }\n if (!isOneway && isAnyOppositeTagging) return null\n \n- var left: Cycleway?\n- var right: Cycleway?\n+ var left: Cycleway? = null\n+ var right: Cycleway? = null\n+\n+ // first expand cycleway:both etc into cycleway:left + cycleway:right etc\n+ val expandedTags = expandRelevantSidesTags(tags)\n \n /* For oneways, the naked \"cycleway\"-keys should be interpreted differently:\n * E.g. a cycleway=lane in a oneway=yes probably means that only in the flow direction, there\n@@ -51,126 +35,138 @@ fun createCyclewaySides(tags: Map, isLeftHandTraffic: Boolean):\n * direction.\n * Whether there is anything each in the other direction, is not defined, so we have to treat\n * it that way. */\n- val cycleway = createCyclewayForSide(tags, null, isReverseSideRight)\n- if (isOneway && cycleway != null && cycleway != NONE) {\n- if (isOpposite) {\n- if (isReverseSideRight) {\n- left = null\n- right = cycleway\n- } else {\n- left = cycleway\n- right = null\n- }\n- } else {\n- if (isReverseSideRight) {\n- left = cycleway\n- right = null\n- } else {\n- left = null\n- right = cycleway\n- }\n- }\n+ val nakedCycleway = createCyclewayForSide(expandedTags, null, isLeftHandTraffic)\n+ if (isOneway && nakedCycleway != null && nakedCycleway != NONE) {\n+ val isRight = if (isOpposite) isReverseSideRight else !isReverseSideRight\n+ if (isRight) right = nakedCycleway else left = nakedCycleway\n } else {\n- // first expand cycleway:both etc into cycleway:left + cycleway:right etc\n- val expandedTags = expandRelevantSidesTags(tags)\n- // then get the values for left and right\n- left = createCyclewayForSide(expandedTags, \"left\", isReverseSideRight)\n- right = createCyclewayForSide(expandedTags, \"right\", isReverseSideRight)\n+ left = createCyclewayForSide(expandedTags, false, isLeftHandTraffic)\n+ right = createCyclewayForSide(expandedTags, true, isLeftHandTraffic)\n }\n \n+ val leftDir = createDirectionForSide(expandedTags, false, isLeftHandTraffic)\n+ val rightDir = createDirectionForSide(expandedTags, true, isLeftHandTraffic)\n+\n /* if there is no cycleway in a direction but it is a oneway in the other direction but not\n for cyclists, we have a special selection for that */\n if (isOnewayButNotForCyclists) {\n- if ((left == NONE || left == null) && !isReverseSideRight) left = NONE_NO_ONEWAY\n- if ((right == NONE || right == null) && isReverseSideRight) right = NONE_NO_ONEWAY\n+ if ((left == NONE || left == null) && !isReverseSideRight && rightDir != Direction.BOTH) {\n+ left = NONE_NO_ONEWAY\n+ }\n+ if ((right == NONE || right == null) && isReverseSideRight && leftDir != Direction.BOTH) {\n+ right = NONE_NO_ONEWAY\n+ }\n }\n \n if (left == null && right == null) return null\n \n- return LeftAndRightCycleway(left, right)\n+ return LeftAndRightCycleway(\n+ left?.let { CyclewayAndDirection(it, leftDir) },\n+ right?.let { CyclewayAndDirection(it, rightDir) }\n+ )\n }\n \n /** Returns the Cycleway value using the given tags, for the given side (left or right).\n * Returns null if nothing (understood) is tagged */\n private fun createCyclewayForSide(\n tags: Map,\n- side: String?,\n- isReverseSideRight: Boolean\n+ isRight: Boolean?,\n+ isLeftHandTraffic: Boolean\n ): Cycleway? {\n-\n- val sideVal = if (side != null) \":$side\" else \"\"\n- val cyclewayKey = \"cycleway$sideVal\"\n-\n- val oneway = tags[\"$cyclewayKey:oneway\"]\n-\n- val isOnewayInUnexpectedDirection = when (side) {\n- \"left\" -> when (oneway) {\n- \"yes\" -> !isReverseSideRight\n- \"-1\" -> isReverseSideRight\n- else -> false\n- }\n- \"right\" -> when (oneway) {\n- \"yes\" -> isReverseSideRight\n- \"-1\" -> !isReverseSideRight\n- else -> false\n- }\n- else -> false\n+ val sideVal = when (isRight) {\n+ true -> \":right\"\n+ false -> \":left\"\n+ null -> \"\"\n }\n- if (isOnewayInUnexpectedDirection) return UNKNOWN\n+ val cyclewayKey = \"cycleway$sideVal\"\n \n val cycleway = tags[cyclewayKey]\n- val isDual = oneway == \"no\"\n val cyclewayLane = tags[\"$cyclewayKey:lane\"]\n val isSegregated = tags[\"$cyclewayKey:segregated\"] != \"no\"\n \n val result = when (cycleway) {\n \"lane\", \"opposite_lane\" -> {\n when (cyclewayLane) {\n- \"exclusive\", \"exclusive_lane\", \"mandatory\" -> {\n- if (isDual) DUAL_LANE\n- else EXCLUSIVE_LANE\n- }\n- null -> {\n- if (isDual) DUAL_LANE\n- else UNSPECIFIED_LANE\n- }\n- \"advisory\", \"advisory_lane\", \"soft_lane\", \"dashed\" -> ADVISORY_LANE\n- else -> UNKNOWN_LANE\n+ \"exclusive\" -> EXCLUSIVE_LANE\n+ null -> UNSPECIFIED_LANE\n+ \"advisory\" -> ADVISORY_LANE\n+ \"yes\", \"right\", \"left\", \"both\", \"shoulder\", \"soft_lane\", \"mandatory\",\n+ \"advisory_lane\", \"exclusive_lane\" -> INVALID\n+ \"pictogram\" -> INVALID\n+ else -> UNKNOWN_LANE\n }\n }\n \"shared_lane\" -> {\n when (cyclewayLane) {\n- \"advisory\", \"advisory_lane\", \"soft_lane\", \"dashed\" -> SUGGESTION_LANE\n- \"pictogram\" -> PICTOGRAMS\n- null -> UNSPECIFIED_SHARED_LANE\n- else -> UNKNOWN_SHARED_LANE\n+ \"advisory\" -> SUGGESTION_LANE\n+ \"pictogram\" -> PICTOGRAMS\n+ null -> UNSPECIFIED_SHARED_LANE\n+ \"yes\", \"right\", \"left\", \"both\", \"shoulder\", \"soft_lane\", \"mandatory\",\n+ \"advisory_lane\", \"exclusive_lane\" -> INVALID\n+ \"exclusive\" -> INVALID\n+ else -> UNKNOWN_SHARED_LANE\n }\n }\n \"track\", \"opposite_track\" -> {\n- when {\n- !isSegregated -> SIDEWALK_EXPLICIT\n- isDual -> DUAL_TRACK\n- else -> TRACK\n- }\n+ if (isSegregated) TRACK else SIDEWALK_EXPLICIT\n }\n \"separate\" -> SEPARATE\n- \"no\", \"none\", \"opposite\" -> NONE\n+ \"no\", \"opposite\" -> NONE\n \"share_busway\", \"opposite_share_busway\" -> BUSWAY\n- \"yes\", \"right\", \"left\", \"both\", \"shared\" -> INVALID\n+ \"shoulder\" -> SHOULDER\n+ // values known to be invalid, ambiguous or obsolete:\n+ // 1.2% - ambiguous: there are more precise tags\n+ \"yes\", \"right\", \"left\", \"both\",\n+ \"on_street\", \"segregated\", \"shared\", // segregated from, shared with what?\n+ \"sidewalk\", \"share_sidewalk\", // allowed on sidewalk or mandatory on sidewalk?\n+ \"unmarked_lane\", // I don't even...\n+ // 0.4% - invalid: maybe synonymous(?) to valid tag or tag combination but never documented\n+ \"none\", // no\n+ \"sidepath\", \"use_sidepath\", // separate?\n+ \"buffered_lane\", \"buffered\", \"soft_lane\", \"doorzone\", // lane + subtags?\n+ // 0.1% - troll tags\n+ \"proposed\", \"construction\",\n+ -> INVALID\n null -> null\n else -> UNKNOWN\n }\n \n+ // fall back to bicycle=use_sidepath if set because it implies there is a separate cycleway\n+ if (result == null) {\n+ if (isRight != null) {\n+ val direction = if (isLeftHandTraffic xor isRight) \"forward\" else \"backward\"\n+ if (tags[\"bicycle:$direction\"] == \"use_sidepath\") return SEPARATE\n+ }\n+ if (tags[\"bicycle\"] == \"use_sidepath\") return SEPARATE\n+ }\n return result\n }\n \n+private fun createDirectionForSide(\n+ tags: Map,\n+ isRight: Boolean,\n+ isLeftHandTraffic: Boolean\n+): Direction {\n+ val sideVal = if (isRight) \":right\" else \":left\"\n+ val cyclewayKey = \"cycleway$sideVal\"\n+ val explicitDirection = when (tags[\"$cyclewayKey:oneway\"]) {\n+ \"yes\" -> Direction.FORWARD\n+ \"-1\" -> Direction.BACKWARD\n+ \"no\" -> Direction.BOTH\n+ else -> null\n+ }\n+ val defaultDirection =\n+ if (isRight xor isLeftHandTraffic) Direction.FORWARD else Direction.BACKWARD\n+\n+ return explicitDirection ?: defaultDirection\n+}\n+\n private fun expandRelevantSidesTags(tags: Map): Map {\n val result = tags.toMutableMap()\n expandSidesTag(\"cycleway\", \"\", result)\n expandSidesTag(\"cycleway\", \"lane\", result)\n expandSidesTag(\"cycleway\", \"oneway\", result)\n expandSidesTag(\"cycleway\", \"segregated\", result)\n- expandSidesTag(\"sidewalk\", \"bicycle\", result)\n return result\n }\n \n@@ -185,6 +181,7 @@ private fun expandSidesTag(keyPrefix: String, keyPostfix: String, tags: MutableM\n }\n }\n \n-private val KNOWN_CYCLEWAY_KEYS = listOf(\n- \"cycleway\", \"cycleway:left\", \"cycleway:right\", \"cycleway:both\"\n+private val KNOWN_CYCLEWAY_AND_RELATED_KEYS = listOf(\n+ \"cycleway\", \"cycleway:left\", \"cycleway:right\", \"cycleway:both\",\n+ \"bicycle\", \"bicycle:forward\", \"bicycle:backward\"\n )\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCycleway.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCycleway.kt\nnew file mode 100644\nindex 00000000000..6323a10191d\n--- /dev/null\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCycleway.kt\n@@ -0,0 +1,20 @@\n+package de.westnordost.streetcomplete.osm.cycleway_separate\n+\n+enum class SeparateCycleway {\n+ /** No bicycles here */\n+ NONE,\n+ /** Bicycles allowed on footway / path */\n+ ALLOWED,\n+ /** Unspecific value: This footway / path is not designated for cyclists. I.e. it is\n+ * either NONE or ALLOWED. This value is never output by the parser. */\n+ NON_DESIGNATED,\n+ /** Designated but not segregated from footway mapped on same way */\n+ NON_SEGREGATED,\n+ /** Designated and segregated from footway mapped on same way */\n+ SEGREGATED,\n+ /** This way is a cycleway only, no footway mapped on the same way */\n+ EXCLUSIVE,\n+ /** This way is a cycleway only, however it has a sidewalk mapped on the same way, like some\n+ * sort of tiny road for cyclists only */\n+ EXCLUSIVE_WITH_SIDEWALK\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayCreator.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayCreator.kt\nnew file mode 100644\nindex 00000000000..82ad030d3fe\n--- /dev/null\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayCreator.kt\n@@ -0,0 +1,85 @@\n+package de.westnordost.streetcomplete.osm.cycleway_separate\n+\n+import de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCycleway.*\n+import de.westnordost.streetcomplete.osm.Tags\n+import de.westnordost.streetcomplete.osm.hasCheckDateForKey\n+import de.westnordost.streetcomplete.osm.sidewalk.KNOWN_SIDEWALK_KEYS\n+import de.westnordost.streetcomplete.osm.sidewalk.Sidewalk\n+import de.westnordost.streetcomplete.osm.sidewalk.any\n+import de.westnordost.streetcomplete.osm.sidewalk.createSidewalkSides\n+import de.westnordost.streetcomplete.osm.updateCheckDateForKey\n+\n+fun SeparateCycleway.applyTo(tags: Tags) {\n+ val isCycleway = tags[\"highway\"] == \"cycleway\"\n+\n+ // tag bicycle=*, foot=* and retag highway=* if necessary\n+ when (this) {\n+ NONE, ALLOWED, NON_DESIGNATED -> {\n+ // not a cycleway if not designated as one!\n+ if (isCycleway) {\n+ tags[\"highway\"] = if (tags[\"foot\"] == \"designated\") \"footway\" else \"path\"\n+ }\n+\n+ when (this) {\n+ NONE -> tags[\"bicycle\"] = \"no\"\n+ ALLOWED -> tags[\"bicycle\"] = \"yes\"\n+ else -> if (tags[\"bicycle\"] == \"designated\") tags.remove(\"bicycle\")\n+ }\n+ if (tags.containsKey(\"foot\") && tags[\"foot\"] !in listOf(\"yes\", \"designated\")) {\n+ tags[\"foot\"] = \"yes\"\n+ }\n+ }\n+ NON_SEGREGATED, SEGREGATED -> {\n+ if (!isCycleway || tags.containsKey(\"bicycle\")) {\n+ tags[\"bicycle\"] = \"designated\"\n+ }\n+ if (isCycleway || tags.containsKey(\"foot\")) {\n+ tags[\"foot\"] = \"designated\"\n+ }\n+ }\n+ EXCLUSIVE, EXCLUSIVE_WITH_SIDEWALK -> {\n+ // retag if it is an exclusive cycleway\n+ tags[\"highway\"] = \"cycleway\"\n+ if (tags.containsKey(\"bicycle\")) tags[\"bicycle\"] = \"designated\"\n+\n+ if (this == EXCLUSIVE) tags[\"foot\"] = \"no\"\n+ // follow the same pattern as for roads here: It is uncommon for roads to have foot\n+ // tagged at all when such roads have sidewalks\n+ else tags.remove(\"foot\")\n+ }\n+ }\n+\n+ // tag or remove sidewalk\n+ val hasSidewalk = createSidewalkSides(tags)?.any { it == Sidewalk.YES } == true || tags[\"sidewalk\"] == \"yes\"\n+ when (this) {\n+ EXCLUSIVE_WITH_SIDEWALK -> {\n+ if (!hasSidewalk) {\n+ KNOWN_SIDEWALK_KEYS.forEach { tags.remove(it) }\n+ tags[\"sidewalk\"] = \"yes\" // cannot be more specific here\n+ }\n+ }\n+ else -> {\n+ if (hasSidewalk) {\n+ KNOWN_SIDEWALK_KEYS.forEach { tags.remove(it) }\n+ }\n+ }\n+ }\n+\n+ // tag segregated\n+ when (this) {\n+ NONE, ALLOWED, NON_DESIGNATED, EXCLUSIVE, EXCLUSIVE_WITH_SIDEWALK -> {\n+ tags.remove(\"segregated\")\n+ }\n+ NON_SEGREGATED -> {\n+ tags[\"segregated\"] = \"no\"\n+ }\n+ SEGREGATED -> {\n+ tags[\"segregated\"] = \"yes\"\n+ }\n+ }\n+\n+ // update check date\n+ if (!tags.hasChanges || tags.hasCheckDateForKey(\"bicycle\")) {\n+ tags.updateCheckDateForKey(\"bicycle\")\n+ }\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayItem.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayItem.kt\nnew file mode 100644\nindex 00000000000..02c441ba32e\n--- /dev/null\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayItem.kt\n@@ -0,0 +1,30 @@\n+package de.westnordost.streetcomplete.osm.cycleway_separate\n+\n+import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCycleway.*\n+import de.westnordost.streetcomplete.view.image_select.Item\n+\n+fun SeparateCycleway.asItem(isLeftHandTraffic: Boolean) =\n+ Item(this, getIconResId(isLeftHandTraffic), titleResId)\n+\n+private val SeparateCycleway.titleResId: Int get() = when (this) {\n+ NONE -> R.string.separate_cycleway_no\n+ ALLOWED -> R.string.separate_cycleway_allowed\n+ NON_DESIGNATED -> R.string.separate_cycleway_no_or_allowed\n+ NON_SEGREGATED -> R.string.separate_cycleway_non_segregated\n+ SEGREGATED -> R.string.separate_cycleway_segregated\n+ EXCLUSIVE -> R.string.separate_cycleway_exclusive\n+ EXCLUSIVE_WITH_SIDEWALK -> R.string.separate_cycleway_with_sidewalk\n+}\n+\n+private fun SeparateCycleway.getIconResId(isLeftHandTraffic: Boolean): Int = when (this) {\n+ NONE -> R.drawable.ic_separate_cycleway_no\n+ ALLOWED -> R.drawable.ic_separate_cycleway_allowed\n+ NON_DESIGNATED -> R.drawable.ic_separate_cycleway_no\n+ NON_SEGREGATED -> R.drawable.ic_separate_cycleway_not_segregated\n+ SEGREGATED -> if (isLeftHandTraffic) R.drawable.ic_separate_cycleway_segregated_l\n+ else R.drawable.ic_separate_cycleway_segregated\n+ EXCLUSIVE -> R.drawable.ic_separate_cycleway_exclusive\n+ EXCLUSIVE_WITH_SIDEWALK -> if (isLeftHandTraffic) R.drawable.ic_separate_cycleway_with_sidewalk_l\n+ else R.drawable.ic_separate_cycleway_with_sidewalk\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayParser.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayParser.kt\nnew file mode 100644\nindex 00000000000..218fa4f9fa6\n--- /dev/null\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayParser.kt\n@@ -0,0 +1,40 @@\n+package de.westnordost.streetcomplete.osm.cycleway_separate\n+\n+import de.westnordost.streetcomplete.osm.sidewalk.Sidewalk\n+import de.westnordost.streetcomplete.osm.sidewalk.any\n+import de.westnordost.streetcomplete.osm.sidewalk.createSidewalkSides\n+\n+/** Returns the situation for a separately mapped cycleway */\n+fun createSeparateCycleway(tags: Map): SeparateCycleway? {\n+\n+ /* bridleways (with cycleways) are not supported, because the complexity explodes when a path\n+ can not only have have states ranging between two tags with values \"no, yes, designated,\n+ segregated from each other, with sidewalk\" but three, with any mixture between these\n+ possible.\n+ In particular, it is not clear what \"segregated\" refers to on a path that potentially allows\n+ access to all three modes of travel and when re-tagging e.g. an exclusive cycleway to a\n+ non-designated one, it is unclear whether foot=yes or horse=yes or both should be added. So,\n+ this data model can only be about the relation between foot & bicycle, not about all three.\n+ */\n+ if (tags[\"highway\"] !in listOf(\"path\", \"footway\", \"cycleway\")) return null\n+\n+ // cycleway implies bicycle=designated\n+ val bicycle = tags[\"bicycle\"] ?: if (tags[\"highway\"] == \"cycleway\") \"designated\" else null\n+ if (bicycle != \"designated\") return if (bicycle == \"yes\") SeparateCycleway.ALLOWED else SeparateCycleway.NONE\n+\n+ val hasSidewalk = createSidewalkSides(tags)?.any { it == Sidewalk.YES } == true || tags[\"sidewalk\"] == \"yes\"\n+ if (hasSidewalk) {\n+ return SeparateCycleway.EXCLUSIVE_WITH_SIDEWALK\n+ }\n+\n+ // footway implies foot=designated, path implies foot=yes\n+ val foot = tags[\"foot\"] ?: when (tags[\"highway\"]) {\n+ \"footway\" -> \"designated\"\n+ \"path\" -> \"yes\"\n+ else -> null\n+ }\n+ if (foot !in listOf(\"yes\", \"designated\")) return SeparateCycleway.EXCLUSIVE\n+\n+ val segregated = tags[\"segregated\"] == \"yes\"\n+ return if (segregated) SeparateCycleway.SEGREGATED else SeparateCycleway.NON_SEGREGATED\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/shoulders/ShouldersParser.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/shoulders/ShouldersParser.kt\nindex a66cf4f08b7..a2ad2081973 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/osm/shoulders/ShouldersParser.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/shoulders/ShouldersParser.kt\n@@ -1,5 +1,8 @@\n package de.westnordost.streetcomplete.osm.shoulders\n \n+import de.westnordost.streetcomplete.osm.isOneway\n+import de.westnordost.streetcomplete.osm.isReversedOneway\n+\n /** Returns on which sides are shoulders. Returns null if there is no shoulders tagging at all */\n fun createShoulders(tags: Map, isLeftHandTraffic: Boolean): Shoulders? {\n val shoulder = createShouldersDefault(tags, isLeftHandTraffic)\n@@ -22,11 +25,9 @@ private fun createShouldersDefault(tags: Map, isLeftHandTraffic:\n \"right\" -> Shoulders(left = false, right = true)\n \"both\" -> Shoulders(left = true, right = true)\n \"yes\" -> {\n- val isForwardOneway = tags[\"oneway\"] == \"yes\" || (tags[\"junction\"] == \"roundabout\" && tags[\"oneway\"] != \"-1\")\n- val isReversedOneway = tags[\"oneway\"] == \"-1\"\n- val isOneway = isReversedOneway || isForwardOneway\n+ val isReversedOneway = isReversedOneway(tags)\n val isReverseSideRight = isReversedOneway xor isLeftHandTraffic\n- if (isOneway) {\n+ if (isOneway(tags)) {\n Shoulders(left = isReverseSideRight, right = !isReverseSideRight)\n } else {\n Shoulders(left = true, right = true)\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/sidewalk/Sidewalk.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/sidewalk/Sidewalk.kt\nindex e6db05db36b..e021fe803d1 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/osm/sidewalk/Sidewalk.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/sidewalk/Sidewalk.kt\n@@ -1,74 +1,20 @@\n package de.westnordost.streetcomplete.osm.sidewalk\n \n-import de.westnordost.streetcomplete.osm.Tags\n-import de.westnordost.streetcomplete.osm.hasCheckDateForKey\n import de.westnordost.streetcomplete.osm.sidewalk.Sidewalk.*\n-import de.westnordost.streetcomplete.osm.updateCheckDateForKey\n \n data class LeftAndRightSidewalk(val left: Sidewalk?, val right: Sidewalk?)\n \n-enum class Sidewalk {\n- YES,\n- NO,\n- SEPARATE,\n- INVALID\n-}\n+fun LeftAndRightSidewalk.any(block: (sidewalk: Sidewalk?) -> Boolean): Boolean =\n+ block(left) || block(right)\n \n fun LeftAndRightSidewalk.validOrNullValues(): LeftAndRightSidewalk {\n if (left != INVALID && right != INVALID) return this\n return LeftAndRightSidewalk(left?.takeIf { it != INVALID }, right?.takeIf { it != INVALID })\n }\n \n-fun LeftAndRightSidewalk.applyTo(tags: Tags) {\n- val currentSidewalk = createSidewalkSides(tags)\n-\n- // was set before and changed: may be incorrect now - remove subtags!\n- if (currentSidewalk?.left != null && currentSidewalk.left != left ||\n- currentSidewalk?.right != null && currentSidewalk.right != right) {\n- val sidewalkSubtagging = Regex(\"^sidewalk:(left|right|both):.*\")\n- for (key in tags.keys) {\n- if (key.matches(sidewalkSubtagging)) {\n- tags.remove(key)\n- }\n- }\n- }\n-\n- val sidewalkValue = simpleOsmValue\n- if (sidewalkValue != null) {\n- tags[\"sidewalk\"] = sidewalkValue\n- // In case of previous incomplete sidewalk tagging\n- tags.remove(\"sidewalk:left\")\n- tags.remove(\"sidewalk:right\")\n- tags.remove(\"sidewalk:both\")\n- } else {\n- if (left != null) tags[\"sidewalk:left\"] = left.osmValue\n- if (right != null) tags[\"sidewalk:right\"] = right.osmValue\n- // In case of previous incorrect sidewalk tagging\n- tags.remove(\"sidewalk:both\")\n- tags.remove(\"sidewalk\")\n- }\n-\n- if (!tags.hasChanges || tags.hasCheckDateForKey(\"sidewalk\")) {\n- tags.updateCheckDateForKey(\"sidewalk\")\n- }\n-}\n-\n-/** Value for the sidewalk=* key. Returns null for combinations that can't be expressed with the\n- * sidewalk=* key. */\n-private val LeftAndRightSidewalk.simpleOsmValue: String? get() = when {\n- left == YES && right == YES -> \"both\"\n- left == YES && right == NO -> \"left\"\n- left == NO && right == YES -> \"right\"\n- left == NO && right == NO -> \"no\"\n- left == SEPARATE && right == SEPARATE -> \"separate\"\n- else -> null\n-}\n-\n-private val Sidewalk.osmValue: String get() = when (this) {\n- YES -> \"yes\"\n- NO -> \"no\"\n- SEPARATE -> \"separate\"\n- else -> {\n- throw IllegalArgumentException(\"Attempting to tag invalid sidewalk\")\n- }\n+enum class Sidewalk {\n+ YES,\n+ NO,\n+ SEPARATE,\n+ INVALID\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/sidewalk/SidewalkCreator.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/sidewalk/SidewalkCreator.kt\nnew file mode 100644\nindex 00000000000..49bc9672816\n--- /dev/null\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/sidewalk/SidewalkCreator.kt\n@@ -0,0 +1,92 @@\n+package de.westnordost.streetcomplete.osm.sidewalk\n+\n+import de.westnordost.streetcomplete.osm.Tags\n+import de.westnordost.streetcomplete.osm.expandSides\n+import de.westnordost.streetcomplete.osm.sidewalk.Sidewalk.*\n+import de.westnordost.streetcomplete.osm.hasCheckDateForKey\n+import de.westnordost.streetcomplete.osm.mergeSides\n+import de.westnordost.streetcomplete.osm.updateCheckDateForKey\n+\n+fun LeftAndRightSidewalk.applyTo(tags: Tags) {\n+ if (left == null && right == null) return\n+ /* for being able to modify only one side (e.g. `left` is null while `right` is not null),\n+ first the conflated and merged sidewalk values (sidewalk=both and sidewalk:both=yes etc.)\n+ need to be separated.\n+ So even if there is an invalid value such as sidewalk=narrow but only the right side\n+ is modified to \"yes\" while the left side is not touched, it means that in the end, the\n+ invalid value must still be in the end result, like this:\n+ - sidewalk:left=narrow\n+ - sidewalk:right=yes\n+ First separating the values and then later conflating them again, if possible, solves this.\n+ */\n+\n+ /* NOT expanding the bare tag, because the bare tag follows a different schema\n+ E.g. sidewalk=both != sidewalk:left=both + sidewalk:right=both\n+ See separateConflatedSidewalk for proper parsing of that */\n+ tags.expandSides(\"sidewalk\", includeBareTag = false)\n+ tags.separateConflatedSidewalk()\n+\n+ if (left != null) tags[\"sidewalk:left\"] = left.osmValue\n+ if (right != null) tags[\"sidewalk:right\"] = right.osmValue\n+\n+ // use shortcut syntax if possible, preferred by community according to usage numbers on taginfo\n+ tags.conflateSidewalk()\n+ tags.mergeSides(\"sidewalk\")\n+\n+ if (!tags.hasChanges || tags.hasCheckDateForKey(\"sidewalk\")) {\n+ tags.updateCheckDateForKey(\"sidewalk\")\n+ }\n+}\n+\n+/** converts sidewalk=both to sidewalk:left=yes + sidewalk:right=yes etc. */\n+private fun Tags.separateConflatedSidewalk() {\n+ val leftRight = getSeparatedSidewalkValues(get(\"sidewalk\")) ?: return\n+ // don't overwrite more specific values if already set\n+ if (!containsKey(\"sidewalk:left\")) set(\"sidewalk:left\", leftRight.first)\n+ if (!containsKey(\"sidewalk:right\")) set(\"sidewalk:right\", leftRight.second)\n+ remove(\"sidewalk\")\n+}\n+\n+private fun getSeparatedSidewalkValues(sidewalk: String?): Pair? = when (sidewalk) {\n+ \"both\" -> Pair(\"yes\", \"yes\")\n+ \"left\" -> Pair(\"yes\", \"no\")\n+ \"right\" -> Pair(\"no\", \"yes\")\n+ null -> null\n+ // for \"separate\", \"no\", etc., and also invalid values\n+ else -> Pair(sidewalk, sidewalk)\n+}\n+\n+/** converts sidewalk:left=yes + sidewalk:right=yes to sidewalk=both etc. */\n+private fun Tags.conflateSidewalk() {\n+ val sidewalk = getConflatedSidewalkValue(get(\"sidewalk:left\"), get(\"sidewalk:right\"))\n+ if (sidewalk != null) {\n+ remove(\"sidewalk:left\")\n+ remove(\"sidewalk:right\")\n+ set(\"sidewalk\", sidewalk)\n+ }\n+}\n+\n+private fun getConflatedSidewalkValue(left: String?, right: String?): String? = when {\n+ left == \"yes\" && right == \"no\" -> \"left\"\n+ left == \"no\" && right == \"yes\" -> \"right\"\n+ /* shall only work for \"yes\" and \"no\" because the wiki states that sidewalk:both=separate\n+ should be preferred over sidewalk=separate: The former is more explicit while for the latter,\n+ it is not entirely clear if it is meant for both sides or only one side.\n+ (Same as with cycleway=separate vs cycleway:both=separate) */\n+ left == right -> when (left) {\n+ \"yes\" -> \"both\"\n+ \"no\" -> \"no\"\n+ else -> null\n+ }\n+ else -> null\n+}\n+\n+private val Sidewalk.osmValue: String get() = when (this) {\n+ YES -> \"yes\"\n+ NO -> \"no\"\n+ SEPARATE -> \"separate\"\n+ else -> {\n+ throw IllegalArgumentException(\"Attempting to tag invalid sidewalk\")\n+ }\n+}\n+\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/sidewalk/SidewalkParser.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/sidewalk/SidewalkParser.kt\nindex 6443e4eae95..54cb1b18c9f 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/osm/sidewalk/SidewalkParser.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/sidewalk/SidewalkParser.kt\n@@ -64,6 +64,6 @@ private fun createSidewalkSide(tag: String?): Sidewalk? = when (tag) {\n else -> INVALID\n }\n \n-private val KNOWN_SIDEWALK_KEYS = listOf(\n+val KNOWN_SIDEWALK_KEYS = listOf(\n \"sidewalk\", \"sidewalk:left\", \"sidewalk:right\", \"sidewalk:both\"\n )\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/street_parking/StreetParking.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/street_parking/StreetParking.kt\nindex 1171083ae77..73e1d864212 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/osm/street_parking/StreetParking.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/street_parking/StreetParking.kt\n@@ -1,16 +1,11 @@\n package de.westnordost.streetcomplete.osm.street_parking\n \n-import de.westnordost.streetcomplete.osm.Tags\n-import de.westnordost.streetcomplete.osm.hasCheckDateForKey\n import de.westnordost.streetcomplete.osm.street_parking.ParkingOrientation.DIAGONAL\n import de.westnordost.streetcomplete.osm.street_parking.ParkingOrientation.PARALLEL\n import de.westnordost.streetcomplete.osm.street_parking.ParkingOrientation.PERPENDICULAR\n import de.westnordost.streetcomplete.osm.street_parking.ParkingPosition.HALF_ON_KERB\n import de.westnordost.streetcomplete.osm.street_parking.ParkingPosition.ON_KERB\n import de.westnordost.streetcomplete.osm.street_parking.ParkingPosition.ON_STREET\n-import de.westnordost.streetcomplete.osm.street_parking.ParkingPosition.PAINTED_AREA_ONLY\n-import de.westnordost.streetcomplete.osm.street_parking.ParkingPosition.STREET_SIDE\n-import de.westnordost.streetcomplete.osm.updateCheckDateForKey\n import kotlinx.serialization.Serializable\n \n data class LeftAndRightStreetParking(val left: StreetParking?, val right: StreetParking?)\n@@ -74,64 +69,3 @@ private val ParkingPosition.estimatedWidthOnRoadFactor: Float get() = when (this\n ON_KERB -> 0f\n else -> 0.5f // otherwise let's assume it is somehow on the street\n }\n-\n-fun LeftAndRightStreetParking.applyTo(tags: Tags) {\n- val currentParking = createStreetParkingSides(tags)\n-\n- // first clear previous\n- val keyToRemove = Regex(\"parking:lane:(both|left|right)(:(parallel|diagonal|perpendicular))?\")\n- for (key in tags.keys) {\n- if (key.matches(keyToRemove)) tags.remove(key)\n- }\n-\n- val r = right ?: currentParking?.right\n- val l = left ?: currentParking?.left\n-\n- // parking:lane:\n- val laneRight = r?.toOsmLaneValue()\n- val laneLeft = l?.toOsmLaneValue()\n-\n- if (laneLeft == laneRight) {\n- if (laneLeft != null) tags[\"parking:lane:both\"] = laneLeft\n- } else {\n- if (laneLeft != null) tags[\"parking:lane:left\"] = laneLeft\n- if (laneRight != null) tags[\"parking:lane:right\"] = laneRight\n- }\n-\n- // parking:lane::\n- val positionRight = (r as? StreetParkingPositionAndOrientation)?.position?.toOsmValue()\n- val positionLeft = (l as? StreetParkingPositionAndOrientation)?.position?.toOsmValue()\n-\n- if (laneLeft == laneRight && positionLeft == positionRight) {\n- if (positionLeft != null) tags[\"parking:lane:both:$laneLeft\"] = positionLeft\n- } else {\n- if (positionLeft != null) tags[\"parking:lane:left:$laneLeft\"] = positionLeft\n- if (positionRight != null) tags[\"parking:lane:right:$laneRight\"] = positionRight\n- }\n-\n- if (!tags.hasChanges || tags.hasCheckDateForKey(\"parking:lane\")) {\n- tags.updateCheckDateForKey(\"parking:lane\")\n- }\n-}\n-\n-/** get the OSM value for the parking:lane key */\n-private fun StreetParking.toOsmLaneValue(): String = when (this) {\n- is StreetParkingPositionAndOrientation -> orientation.toOsmValue()\n- NoStreetParking -> \"no\"\n- StreetParkingSeparate -> \"separate\"\n- UnknownStreetParking, IncompleteStreetParking -> throw IllegalArgumentException(\"Attempting to tag invalid parking lane\")\n-}\n-\n-private fun ParkingPosition.toOsmValue() = when (this) {\n- ON_STREET -> \"on_street\"\n- HALF_ON_KERB -> \"half_on_kerb\"\n- ON_KERB -> \"on_kerb\"\n- STREET_SIDE -> \"street_side\"\n- PAINTED_AREA_ONLY -> \"painted_area_only\"\n-}\n-\n-private fun ParkingOrientation.toOsmValue() = when (this) {\n- PARALLEL -> \"parallel\"\n- DIAGONAL -> \"diagonal\"\n- PERPENDICULAR -> \"perpendicular\"\n-}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/street_parking/StreetParkingCreator.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/street_parking/StreetParkingCreator.kt\nnew file mode 100644\nindex 00000000000..87d1a9a34d5\n--- /dev/null\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/street_parking/StreetParkingCreator.kt\n@@ -0,0 +1,62 @@\n+package de.westnordost.streetcomplete.osm.street_parking\n+\n+import de.westnordost.streetcomplete.osm.Tags\n+import de.westnordost.streetcomplete.osm.expandSides\n+import de.westnordost.streetcomplete.osm.hasCheckDateForKey\n+import de.westnordost.streetcomplete.osm.mergeSides\n+import de.westnordost.streetcomplete.osm.updateCheckDateForKey\n+\n+fun LeftAndRightStreetParking.applyTo(tags: Tags) {\n+ if (left == null && right == null) return\n+ /* for being able to modify only one side (e.g. `left` is null while `right` is not null),\n+ the sides conflated in `:both` keys need to be separated first. E.g. `parking:lane=no`\n+ when left side is made `separate\u00b4 should become\n+ - parking:lane:right=no\n+ - parking:lane:left=separate\n+ First separating the values and then later conflating them again, if possible, solves this.\n+ */\n+ tags.expandSides(\"parking:lane\")\n+ ParkingOrientation.values().forEach { tags.expandSides(\"parking:lane\", it.osmValue, true) }\n+\n+ // parking:lane:\n+ left?.applyTo(tags, \"left\")\n+ right?.applyTo(tags, \"right\")\n+\n+ tags.mergeSides(\"parking:lane\")\n+ ParkingOrientation.values().forEach { tags.mergeSides(\"parking:lane\", it.osmValue) }\n+\n+ if (!tags.hasChanges || tags.hasCheckDateForKey(\"parking:lane\")) {\n+ tags.updateCheckDateForKey(\"parking:lane\")\n+ }\n+}\n+\n+private fun StreetParking.applyTo(tags: Tags, side: String) {\n+ tags[\"parking:lane:$side\"] = osmLaneValue\n+ // clear previous orientation(s)\n+ ParkingOrientation.values().forEach { tags.remove(\"parking:lane:$side:${it.osmValue}\") }\n+ if (this is StreetParkingPositionAndOrientation) {\n+ tags[\"parking:lane:$side:$osmLaneValue\"] = position.osmValue\n+ }\n+}\n+\n+/** get the OSM value for the parking:lane key */\n+private val StreetParking.osmLaneValue get() = when (this) {\n+ is StreetParkingPositionAndOrientation -> orientation.osmValue\n+ NoStreetParking -> \"no\"\n+ StreetParkingSeparate -> \"separate\"\n+ UnknownStreetParking, IncompleteStreetParking -> throw IllegalArgumentException(\"Attempting to tag invalid parking lane\")\n+}\n+\n+private val ParkingPosition.osmValue get() = when (this) {\n+ ParkingPosition.ON_STREET -> \"on_street\"\n+ ParkingPosition.HALF_ON_KERB -> \"half_on_kerb\"\n+ ParkingPosition.ON_KERB -> \"on_kerb\"\n+ ParkingPosition.STREET_SIDE -> \"street_side\"\n+ ParkingPosition.PAINTED_AREA_ONLY -> \"painted_area_only\"\n+}\n+\n+private val ParkingOrientation.osmValue get() = when (this) {\n+ ParkingOrientation.PARALLEL -> \"parallel\"\n+ ParkingOrientation.DIAGONAL -> \"diagonal\"\n+ ParkingOrientation.PERPENDICULAR -> \"perpendicular\"\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/street_parking/StreetParkingParser.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/street_parking/StreetParkingParser.kt\nindex e459ccc745e..c226f3a1b4e 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/osm/street_parking/StreetParkingParser.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/street_parking/StreetParkingParser.kt\n@@ -67,7 +67,6 @@ private fun String.toParkingPosition() = when (this) {\n private fun expandRelevantSidesTags(tags: Map): Map {\n val result = tags.toMutableMap()\n expandSidesTag(\"parking:lane\", \"\", result)\n- expandSidesTag(\"parking:condition\", \"\", result)\n expandSidesTag(\"parking:lane\", \"parallel\", result)\n expandSidesTag(\"parking:lane\", \"diagonal\", result)\n expandSidesTag(\"parking:lane\", \"perpendicular\", result)\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/street_parking/WithFootnoteDrawable.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/street_parking/WithFootnoteDrawable.kt\ndeleted file mode 100644\nindex accc75ddb8e..00000000000\n--- a/app/src/main/java/de/westnordost/streetcomplete/osm/street_parking/WithFootnoteDrawable.kt\n+++ /dev/null\n@@ -1,21 +0,0 @@\n-package de.westnordost.streetcomplete.osm.street_parking\n-\n-import android.content.Context\n-import android.graphics.Canvas\n-import android.graphics.drawable.Drawable\n-import de.westnordost.streetcomplete.R\n-import de.westnordost.streetcomplete.view.DrawableWrapper\n-\n-/** Container that contains another drawable but adds a fat \"*\" in the upper right corner */\n-class WithFootnoteDrawable(context: Context, drawable: Drawable) : DrawableWrapper(drawable) {\n-\n- private val footnoteDrawable = context.getDrawable(R.drawable.ic_fat_footnote)!!\n-\n- override fun draw(canvas: Canvas) {\n- drawable.bounds = bounds\n- drawable.draw(canvas)\n- val size = bounds.width() * 3 / 8\n- footnoteDrawable.setBounds(bounds.width() - size, 0, bounds.width(), size)\n- footnoteDrawable.draw(canvas)\n- }\n-}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt\nindex 56d4898ebcc..d353ff74347 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/overlays/AbstractOverlayForm.kt\n@@ -40,7 +40,6 @@ import de.westnordost.streetcomplete.data.osm.mapdata.Node\n import de.westnordost.streetcomplete.data.osm.mapdata.Way\n import de.westnordost.streetcomplete.data.overlays.OverlayRegistry\n import de.westnordost.streetcomplete.databinding.FragmentOverlayBinding\n-import de.westnordost.streetcomplete.quests.AnswerItem\n import de.westnordost.streetcomplete.screens.main.bottom_sheet.IsCloseableBottomSheet\n import de.westnordost.streetcomplete.screens.main.bottom_sheet.IsMapOrientationAware\n import de.westnordost.streetcomplete.screens.main.checkIsSurvey\n@@ -53,7 +52,11 @@ import de.westnordost.streetcomplete.util.ktx.popOut\n import de.westnordost.streetcomplete.util.ktx.setMargins\n import de.westnordost.streetcomplete.util.ktx.toast\n import de.westnordost.streetcomplete.util.ktx.viewLifecycleScope\n+import de.westnordost.streetcomplete.view.CharSequenceText\n+import de.westnordost.streetcomplete.view.ResText\n import de.westnordost.streetcomplete.view.RoundRectOutlineProvider\n+import de.westnordost.streetcomplete.view.Text\n+import de.westnordost.streetcomplete.view.add\n import de.westnordost.streetcomplete.view.insets_animation.respectSystemInsets\n import kotlinx.coroutines.Dispatchers\n import kotlinx.coroutines.launch\n@@ -129,7 +132,7 @@ abstract class AbstractOverlayForm :\n // overridable by child classes\n open val contentLayoutResId: Int? = null\n open val contentPadding = true\n- open val otherAnswers = listOf()\n+ open val otherAnswers = listOf()\n \n interface Listener {\n /** The GPS position at which the user is displayed at */\n@@ -185,6 +188,7 @@ abstract class AbstractOverlayForm :\n binding.speechbubbleContentContainer.outlineProvider = RoundRectOutlineProvider(\n cornerRadius, margin, margin, margin, margin\n )\n+ binding.speechbubbleContentContainer.clipToOutline = true\n \n setTitleHintLabel(\n element?.tags?.let { getNameAndLocationLabel(it, resources, featureDictionary) }\n@@ -333,7 +337,7 @@ abstract class AbstractOverlayForm :\n for (i in answers.indices) {\n val otherAnswer = answers[i]\n val order = answers.size - i\n- popup.menu.add(Menu.NONE, i, order, otherAnswer.titleResourceId)\n+ popup.menu.add(Menu.NONE, i, order, otherAnswer.title)\n }\n popup.show()\n \n@@ -343,8 +347,8 @@ abstract class AbstractOverlayForm :\n }\n }\n \n- private fun assembleOtherAnswers(): List {\n- val answers = mutableListOf()\n+ private fun assembleOtherAnswers(): List {\n+ val answers = mutableListOf()\n \n val element = element\n if (element != null) {\n@@ -427,4 +431,16 @@ abstract class AbstractOverlayForm :\n }\n }\n \n-data class AnswerItem(val titleResourceId: Int, val action: () -> Unit)\n+\n+interface IAnswerItem {\n+ val title: Text\n+ val action: () -> Unit\n+}\n+\n+data class AnswerItem(val titleResourceId: Int, override val action: () -> Unit) : IAnswerItem {\n+ override val title: Text get() = ResText(titleResourceId)\n+}\n+\n+data class AnswerItem2(val titleString: String, override val action: () -> Unit) : IAnswerItem {\n+ override val title: Text get() = CharSequenceText(titleString)\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/OverlaysModule.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/OverlaysModule.kt\nindex 6119120b82b..19cb5bd7c65 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/overlays/OverlaysModule.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/overlays/OverlaysModule.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.overlays\n \n import de.westnordost.streetcomplete.data.overlays.OverlayRegistry\n import de.westnordost.streetcomplete.overlays.address.AddressOverlay\n+import de.westnordost.streetcomplete.overlays.cycleway.CyclewayOverlay\n import de.westnordost.streetcomplete.overlays.shops.ShopsOverlay\n import de.westnordost.streetcomplete.overlays.sidewalk.SidewalkOverlay\n import de.westnordost.streetcomplete.overlays.street_parking.StreetParkingOverlay\n@@ -18,5 +19,6 @@ val overlaysModule = module {\n 2 to StreetParkingOverlay(),\n 3 to AddressOverlay(),\n 4 to ShopsOverlay(get(named(\"FeatureDictionaryFuture\"))),\n+ 5 to CyclewayOverlay(get(), get(named(\"CountryBoundariesFuture\"))),\n )) }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/address/AddressOverlayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/address/AddressOverlayForm.kt\nindex 9f034a04fa1..88a7f86a625 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/overlays/address/AddressOverlayForm.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/overlays/address/AddressOverlayForm.kt\n@@ -28,7 +28,7 @@ import de.westnordost.streetcomplete.osm.address.applyTo\n import de.westnordost.streetcomplete.osm.address.createAddressNumber\n import de.westnordost.streetcomplete.osm.address.streetHouseNumber\n import de.westnordost.streetcomplete.overlays.AbstractOverlayForm\n-import de.westnordost.streetcomplete.quests.AnswerItem\n+import de.westnordost.streetcomplete.overlays.AnswerItem\n import de.westnordost.streetcomplete.quests.road_name.RoadNameSuggestionsSource\n import de.westnordost.streetcomplete.util.getNameAndLocationLabel\n import de.westnordost.streetcomplete.util.ktx.isArea\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/cycleway/CyclewayOverlay.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/cycleway/CyclewayOverlay.kt\nnew file mode 100644\nindex 00000000000..776824e73c4\n--- /dev/null\n+++ b/app/src/main/java/de/westnordost/streetcomplete/overlays/cycleway/CyclewayOverlay.kt\n@@ -0,0 +1,156 @@\n+package de.westnordost.streetcomplete.overlays.cycleway\n+\n+import de.westnordost.countryboundaries.CountryBoundaries\n+import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.meta.CountryInfo\n+import de.westnordost.streetcomplete.data.meta.CountryInfos\n+import de.westnordost.streetcomplete.data.meta.getByLocation\n+import de.westnordost.streetcomplete.data.osm.mapdata.Element\n+import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n+import de.westnordost.streetcomplete.data.osm.mapdata.filter\n+import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement\n+import de.westnordost.streetcomplete.osm.ALL_ROADS\n+import de.westnordost.streetcomplete.osm.ANYTHING_UNPAVED\n+import de.westnordost.streetcomplete.osm.MAXSPEED_TYPE_KEYS\n+import de.westnordost.streetcomplete.osm.bicycle_boulevard.BicycleBoulevard\n+import de.westnordost.streetcomplete.osm.bicycle_boulevard.createBicycleBoulevard\n+import de.westnordost.streetcomplete.osm.cycleway.Cycleway\n+import de.westnordost.streetcomplete.osm.cycleway.Cycleway.*\n+import de.westnordost.streetcomplete.osm.cycleway.createCyclewaySides\n+import de.westnordost.streetcomplete.osm.cycleway.isAmbiguous\n+import de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCycleway\n+import de.westnordost.streetcomplete.osm.cycleway_separate.createSeparateCycleway\n+import de.westnordost.streetcomplete.osm.isPrivateOnFoot\n+import de.westnordost.streetcomplete.overlays.Color\n+import de.westnordost.streetcomplete.overlays.Overlay\n+import de.westnordost.streetcomplete.overlays.PolylineStyle\n+import de.westnordost.streetcomplete.overlays.StrokeStyle\n+import de.westnordost.streetcomplete.quests.cycleway.AddCycleway\n+import java.util.concurrent.FutureTask\n+\n+class CyclewayOverlay(\n+ private val countryInfos: CountryInfos,\n+ private val countryBoundaries: FutureTask\n+) : Overlay {\n+\n+ override val title = R.string.overlay_cycleway\n+ override val icon = R.drawable.ic_quest_bicycleway\n+ override val changesetComment = \"Specify whether there are cycleways\"\n+ override val wikiLink: String = \"Key:cycleway\"\n+ override val achievements = listOf(EditTypeAchievement.BICYCLIST)\n+ override val hidesQuestTypes = setOf(AddCycleway::class.simpleName!!)\n+\n+ override fun getStyledElements(mapData: MapDataWithGeometry) =\n+ // roads\n+ mapData.filter(\"\"\"\n+ ways with\n+ highway ~ ${ALL_ROADS.joinToString(\"|\")}\n+ and area != yes\n+ \"\"\").mapNotNull {\n+ val pos = mapData.getWayGeometry(it.id)?.center ?: return@mapNotNull null\n+ val countryInfo = countryInfos.getByLocation(\n+ countryBoundaries.get(),\n+ pos.longitude,\n+ pos.latitude\n+ )\n+ it to getStreetCyclewayStyle(it, countryInfo)\n+ } +\n+ // separately mapped ways\n+ mapData.filter(\"\"\"\n+ ways with\n+ highway ~ cycleway|path|footway\n+ and area != yes\n+ \"\"\").map { it to getSeparateCyclewayStyle(it) }\n+\n+ override fun createForm(element: Element?) =\n+ if (element == null) null\n+ else if (element.tags[\"highway\"] in ALL_ROADS) StreetCyclewayOverlayForm()\n+ else SeparateCyclewayForm()\n+}\n+\n+private fun getSeparateCyclewayStyle(element: Element) =\n+ PolylineStyle(StrokeStyle(createSeparateCycleway(element.tags).getColor()))\n+\n+private fun SeparateCycleway?.getColor() = when (this) {\n+ SeparateCycleway.NONE,\n+ SeparateCycleway.ALLOWED,\n+ SeparateCycleway.NON_DESIGNATED ->\n+ Color.BLACK\n+\n+ SeparateCycleway.NON_SEGREGATED ->\n+ Color.CYAN\n+\n+ SeparateCycleway.SEGREGATED,\n+ SeparateCycleway.EXCLUSIVE,\n+ SeparateCycleway.EXCLUSIVE_WITH_SIDEWALK ->\n+ Color.BLUE\n+\n+ null ->\n+ Color.INVISIBLE\n+}\n+\n+private fun getStreetCyclewayStyle(element: Element, countryInfo: CountryInfo): PolylineStyle {\n+ val cycleways = createCyclewaySides(element.tags, countryInfo.isLeftHandTraffic)\n+ val isBicycleBoulevard = createBicycleBoulevard(element.tags) == BicycleBoulevard.YES\n+\n+ // not set but on road that usually has no cycleway or it is private -> do not highlight as missing\n+ val isNoCyclewayExpected =\n+ cycleways == null && (cyclewayTaggingNotExpected(element) || isPrivateOnFoot(element))\n+\n+ return PolylineStyle(\n+ stroke = when {\n+ isBicycleBoulevard -> StrokeStyle(Color.GOLD, dashed = true)\n+ isNoCyclewayExpected -> StrokeStyle(Color.INVISIBLE)\n+ else -> null\n+ },\n+ strokeLeft = if (isNoCyclewayExpected) null else cycleways?.left?.cycleway.getStyle(countryInfo),\n+ strokeRight = if (isNoCyclewayExpected) null else cycleways?.right?.cycleway.getStyle(countryInfo)\n+ )\n+}\n+\n+private val cyclewayTaggingNotExpectedFilter by lazy { \"\"\"\n+ ways with\n+ highway ~ track|living_street|pedestrian|service|motorway_link|motorway\n+ or motorroad = yes\n+ or expressway = yes\n+ or maxspeed <= 20\n+ or cyclestreet = yes\n+ or bicycle_road = yes\n+ or surface ~ ${ANYTHING_UNPAVED.joinToString(\"|\")}\n+ or ~${(MAXSPEED_TYPE_KEYS + \"maxspeed\").joinToString(\"|\")} ~ \".*zone:?([1-9]|[1-2][0-9]|30)\"\n+\"\"\".toElementFilterExpression() }\n+\n+private fun cyclewayTaggingNotExpected(element: Element) =\n+ cyclewayTaggingNotExpectedFilter.matches(element)\n+\n+private fun Cycleway?.getStyle(countryInfo: CountryInfo) = when (this) {\n+ TRACK ->\n+ StrokeStyle(Color.BLUE)\n+\n+ EXCLUSIVE_LANE, UNSPECIFIED_LANE ->\n+ if (isAmbiguous(countryInfo)) StrokeStyle(Color.DATA_REQUESTED)\n+ else StrokeStyle(Color.GOLD)\n+\n+ ADVISORY_LANE, SUGGESTION_LANE, UNSPECIFIED_SHARED_LANE ->\n+ if (isAmbiguous(countryInfo)) StrokeStyle(Color.DATA_REQUESTED)\n+ else StrokeStyle(Color.ORANGE)\n+\n+ PICTOGRAMS ->\n+ StrokeStyle(Color.ORANGE, dashed = true)\n+\n+ UNKNOWN, INVALID, null, UNKNOWN_LANE, UNKNOWN_SHARED_LANE ->\n+ StrokeStyle(Color.DATA_REQUESTED)\n+\n+ BUSWAY ->\n+ StrokeStyle(Color.LIME, dashed = true)\n+\n+ SIDEWALK_EXPLICIT ->\n+ StrokeStyle(Color.CYAN, dashed = true)\n+\n+ NONE, NONE_NO_ONEWAY, SHOULDER ->\n+ StrokeStyle(Color.BLACK)\n+\n+ SEPARATE ->\n+ StrokeStyle(Color.INVISIBLE)\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/cycleway/SeparateCyclewayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/cycleway/SeparateCyclewayForm.kt\nnew file mode 100644\nindex 00000000000..4e16cfbb514\n--- /dev/null\n+++ b/app/src/main/java/de/westnordost/streetcomplete/overlays/cycleway/SeparateCyclewayForm.kt\n@@ -0,0 +1,68 @@\n+package de.westnordost.streetcomplete.overlays.cycleway\n+\n+import android.os.Bundle\n+import android.view.View\n+import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapChangesBuilder\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.UpdateElementTagsAction\n+import de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCycleway\n+import de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCycleway.*\n+import de.westnordost.streetcomplete.osm.cycleway_separate.applyTo\n+import de.westnordost.streetcomplete.osm.cycleway_separate.asItem\n+import de.westnordost.streetcomplete.osm.cycleway_separate.createSeparateCycleway\n+import de.westnordost.streetcomplete.overlays.AImageSelectOverlayForm\n+import de.westnordost.streetcomplete.view.image_select.DisplayItem\n+\n+class SeparateCyclewayForm : AImageSelectOverlayForm() {\n+\n+ override val items: List> get() =\n+ listOf(NON_DESIGNATED, NON_SEGREGATED, SEGREGATED, EXCLUSIVE_WITH_SIDEWALK, EXCLUSIVE).map {\n+ it.asItem(countryInfo.isLeftHandTraffic)\n+ }\n+\n+ override val itemsPerRow = 1\n+ override val cellLayoutId = R.layout.cell_labeled_icon_select_right\n+\n+ private var currentCycleway: SeparateCycleway? = null\n+\n+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {\n+ super.onViewCreated(view, savedInstanceState)\n+\n+ val cycleway = createSeparateCycleway(element!!.tags)\n+\n+ /* Not displaying bicycle=yes and bicycle=no on footways and treating it the same because\n+ whether riding a bike on a footway is allowed by default (without requiring signs) or\n+ only under certain conditions (e.g. certain minimum width of sidewalk) is very much\n+ dependent on the country or state one is in.\n+\n+ Hence, it is not verifiable well for the on-site surveyor: If there is no sign that\n+ specifically allows or forbids cycling on a footway, the user is left with his loose\n+ (mis)understanding of the local legislation to decide. After all, bicycle=yes/no\n+ is (usually) nothing physical, but merely describes what is legal. It is in that sense\n+ then not information surveyable on-the-ground, unless specifically signed.\n+ bicycle=yes/no does however not make a statement about from where this info is derived.\n+\n+ So, from an on-site surveyor point of view, it is always better to record what is signed,\n+ instead of what follows from that signage.\n+\n+ Signage, however, is out of scope of this overlay because while the physical presence of\n+ a cycleway can be validated at a glance, the presence of a sign requires to walk a bit up\n+ or down the street in order to find (or not find) a sign.\n+ More importantly, at the time of writing, there is no way to tag the information that a\n+ bicycle=* access restriction is derived from the presence of a sign. This however is a\n+ prerequisite for it being displayed as a selectable option due to the reasons stated\n+ above.\n+ */\n+ currentCycleway = if (cycleway == NONE || cycleway == ALLOWED) NON_DESIGNATED else cycleway\n+ selectedItem = currentCycleway?.asItem(countryInfo.isLeftHandTraffic)\n+ }\n+\n+ override fun hasChanges(): Boolean =\n+ selectedItem?.value != currentCycleway\n+\n+ override fun onClickOk() {\n+ val tagChanges = StringMapChangesBuilder(element!!.tags)\n+ selectedItem!!.value!!.applyTo(tagChanges)\n+ applyEdit(UpdateElementTagsAction(tagChanges.create()))\n+ }\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/cycleway/StreetCyclewayOverlayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/cycleway/StreetCyclewayOverlayForm.kt\nnew file mode 100644\nindex 00000000000..bb3ee5fff88\n--- /dev/null\n+++ b/app/src/main/java/de/westnordost/streetcomplete/overlays/cycleway/StreetCyclewayOverlayForm.kt\n@@ -0,0 +1,241 @@\n+package de.westnordost.streetcomplete.overlays.cycleway\n+\n+import android.os.Bundle\n+import android.view.View\n+import android.view.ViewGroup\n+import androidx.appcompat.app.AlertDialog\n+import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapChangesBuilder\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.UpdateElementTagsAction\n+import de.westnordost.streetcomplete.osm.bicycle_boulevard.BicycleBoulevard\n+import de.westnordost.streetcomplete.osm.bicycle_boulevard.applyTo\n+import de.westnordost.streetcomplete.osm.bicycle_boulevard.createBicycleBoulevard\n+import de.westnordost.streetcomplete.osm.cycleway.Cycleway\n+import de.westnordost.streetcomplete.osm.cycleway.CyclewayAndDirection\n+import de.westnordost.streetcomplete.osm.cycleway.LeftAndRightCycleway\n+import de.westnordost.streetcomplete.osm.cycleway.applyTo\n+import de.westnordost.streetcomplete.osm.cycleway.asDialogItem\n+import de.westnordost.streetcomplete.osm.cycleway.asStreetSideItem\n+import de.westnordost.streetcomplete.osm.cycleway.createCyclewaySides\n+import de.westnordost.streetcomplete.osm.cycleway.getSelectableCycleways\n+import de.westnordost.streetcomplete.osm.cycleway.selectableOrNullValues\n+import de.westnordost.streetcomplete.osm.cycleway.wasNoOnewayForCyclistsButNowItIs\n+import de.westnordost.streetcomplete.osm.isOneway\n+import de.westnordost.streetcomplete.osm.isReversedOneway\n+import de.westnordost.streetcomplete.overlays.AStreetSideSelectOverlayForm\n+import de.westnordost.streetcomplete.overlays.AnswerItem\n+import de.westnordost.streetcomplete.overlays.AnswerItem2\n+import de.westnordost.streetcomplete.overlays.IAnswerItem\n+import de.westnordost.streetcomplete.util.ktx.toast\n+import de.westnordost.streetcomplete.view.controller.StreetSideDisplayItem\n+import de.westnordost.streetcomplete.view.image_select.ImageListPickerDialog\n+import kotlinx.serialization.decodeFromString\n+import kotlinx.serialization.encodeToString\n+import kotlinx.serialization.json.Json\n+\n+class StreetCyclewayOverlayForm : AStreetSideSelectOverlayForm() {\n+\n+ override val otherAnswers: List get() =\n+ listOfNotNull(\n+ createSwitchBicycleBoulevardAnswer(),\n+ createReverseCyclewayDirectionAnswer()\n+ )\n+\n+ private var originalCycleway: LeftAndRightCycleway? = null\n+ private var originalBicycleBoulevard: BicycleBoulevard = BicycleBoulevard.NO\n+ private var bicycleBoulevard: BicycleBoulevard = BicycleBoulevard.NO\n+ private var reverseDirection: Boolean = false\n+\n+ /** returns whether the side that goes into the opposite direction of the driving direction of a\n+ * one-way is on the right side of the way */\n+ private val isReverseSideRight get() = isReversedOneway xor isLeftHandTraffic\n+\n+ private val isOneway get() = isOneway(element!!.tags)\n+ private val isReversedOneway get() = isReversedOneway(element!!.tags)\n+\n+ // just a shortcut\n+ private val isLeftHandTraffic get() = countryInfo.isLeftHandTraffic\n+\n+ private fun isContraflowInOneway(isRight: Boolean): Boolean =\n+ isOneway && (isReverseSideRight == isRight)\n+\n+ /* ---------------------------------------- lifecycle --------------------------------------- */\n+\n+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {\n+ super.onViewCreated(view, savedInstanceState)\n+\n+ originalCycleway = createCyclewaySides(element!!.tags, isLeftHandTraffic)?.selectableOrNullValues(countryInfo)\n+ originalBicycleBoulevard = createBicycleBoulevard(element!!.tags)\n+\n+ if (savedInstanceState == null) {\n+ initStateFromTags()\n+ } else {\n+ savedInstanceState.getString(BICYCLE_BOULEVARD)?.let {\n+ bicycleBoulevard = BicycleBoulevard.valueOf(it)\n+ }\n+ }\n+ updateBicycleBoulevard()\n+ }\n+\n+ override fun onSaveInstanceState(outState: Bundle) {\n+ super.onSaveInstanceState(outState)\n+ outState.putString(BICYCLE_BOULEVARD, bicycleBoulevard.name)\n+ }\n+\n+ private fun initStateFromTags() {\n+ bicycleBoulevard = originalBicycleBoulevard\n+\n+ val leftItem = originalCycleway?.left?.asStreetSideItem(false, isContraflowInOneway(false), countryInfo)\n+ streetSideSelect.setPuzzleSide(leftItem, false)\n+\n+ val rightItem = originalCycleway?.right?.asStreetSideItem(true, isContraflowInOneway(true), countryInfo)\n+ streetSideSelect.setPuzzleSide(rightItem, true)\n+ }\n+\n+ /* ----------------------------------- bicycle boulevards ----------------------------------- */\n+\n+ private fun createSwitchBicycleBoulevardAnswer(): IAnswerItem? =\n+ if (bicycleBoulevard == BicycleBoulevard.YES) {\n+ AnswerItem2(\n+ getString(R.string.bicycle_boulevard_is_not_a, getString(R.string.bicycle_boulevard)),\n+ ::removeBicycleBoulevard\n+ )\n+ } else if (countryInfo.hasBicycleBoulevard) {\n+ AnswerItem2(\n+ getString(R.string.bicycle_boulevard_is_a, getString(R.string.bicycle_boulevard)),\n+ ::addBicycleBoulevard\n+ )\n+ } else {\n+ null\n+ }\n+\n+ private fun removeBicycleBoulevard() {\n+ bicycleBoulevard = BicycleBoulevard.NO\n+ updateBicycleBoulevard()\n+ }\n+\n+ private fun addBicycleBoulevard() {\n+ bicycleBoulevard = BicycleBoulevard.YES\n+ updateBicycleBoulevard()\n+ }\n+\n+ private fun updateBicycleBoulevard() {\n+ val bicycleBoulevardSignView = requireView().findViewById(R.id.signBicycleBoulevard)\n+ if (bicycleBoulevard == BicycleBoulevard.YES) {\n+ if (bicycleBoulevardSignView == null) {\n+ layoutInflater.inflate(\n+ R.layout.sign_bicycle_boulevard,\n+ requireView().findViewById(R.id.content), true\n+ )\n+ }\n+ } else {\n+ (bicycleBoulevardSignView?.parent as? ViewGroup)?.removeView(bicycleBoulevardSignView)\n+ }\n+ }\n+\n+ /* ------------------------------ reverse cycleway direction -------------------------------- */\n+\n+ private fun createReverseCyclewayDirectionAnswer(): IAnswerItem? =\n+ if (bicycleBoulevard == BicycleBoulevard.YES) null\n+ else AnswerItem(R.string.cycleway_reverse_direction, ::selectReverseCyclewayDirection)\n+\n+ private fun selectReverseCyclewayDirection() {\n+ confirmSelectReverseCyclewayDirection {\n+ reverseDirection = true\n+ context?.toast(R.string.cycleway_reverse_direction_toast)\n+ }\n+ }\n+\n+ private fun confirmSelectReverseCyclewayDirection(callback: () -> Unit) {\n+ AlertDialog.Builder(requireContext())\n+ .setTitle(R.string.quest_generic_confirmation_title)\n+ .setMessage(R.string.cycleway_reverse_direction_warning)\n+ .setPositiveButton(R.string.quest_generic_confirmation_yes) { _, _ -> callback() }\n+ .setNegativeButton(R.string.quest_generic_confirmation_no, null)\n+ .show()\n+ }\n+\n+ private fun reverseCyclewayDirection(isRight: Boolean) {\n+ val isContraflowInOneway = isContraflowInOneway(isRight)\n+ reverseDirection = false\n+ val value = streetSideSelect.getPuzzleSide(isRight)?.value ?: return\n+ val newValue = value.copy(direction = value.direction.reverse())\n+ val newItem = newValue.asStreetSideItem(isRight, isContraflowInOneway, countryInfo)\n+ streetSideSelect.replacePuzzleSide(newItem, isRight)\n+ }\n+\n+ /* --------------------------------- select & apply answer ---------------------------------- */\n+\n+ override fun onClickSide(isRight: Boolean) {\n+ if (reverseDirection) {\n+ reverseCyclewayDirection(isRight)\n+ } else {\n+ selectCycleway(isRight)\n+ }\n+ }\n+\n+ private fun selectCycleway(isRight: Boolean) {\n+ val isContraflowInOneway = isContraflowInOneway(isRight)\n+ val dialogItems = getSelectableCycleways(countryInfo, element!!.tags, isRight)\n+ .map { it.asDialogItem(isRight, isContraflowInOneway, requireContext(), countryInfo) }\n+\n+ ImageListPickerDialog(requireContext(), dialogItems, R.layout.labeled_icon_button_cell, 2) { item ->\n+ val streetSideItem = item.value!!.asStreetSideItem(isRight, isContraflowInOneway, countryInfo)\n+ streetSideSelect.replacePuzzleSide(streetSideItem, isRight)\n+ }.show()\n+ }\n+\n+ override fun onClickOk() {\n+ if (bicycleBoulevard == BicycleBoulevard.YES) {\n+ val tags = StringMapChangesBuilder(element!!.tags)\n+ bicycleBoulevard.applyTo(tags, countryInfo.countryCode)\n+ applyEdit(UpdateElementTagsAction(tags.create()))\n+ } else {\n+ // only tag the cycleway if that is what is currently displayed\n+ val cycleways = LeftAndRightCycleway(streetSideSelect.left?.value, streetSideSelect.right?.value)\n+ if (cycleways.wasNoOnewayForCyclistsButNowItIs(element!!.tags, isLeftHandTraffic)) {\n+ confirmNotOnewayForCyclists { saveAndApplyCycleway(cycleways) }\n+ } else {\n+ saveAndApplyCycleway(cycleways)\n+ }\n+ }\n+ }\n+\n+ private fun confirmNotOnewayForCyclists(callback: () -> Unit) {\n+ AlertDialog.Builder(requireContext())\n+ .setMessage(R.string.quest_cycleway_confirmation_oneway_for_cyclists_too)\n+ .setPositiveButton(R.string.quest_generic_confirmation_yes) { _, _ -> callback() }\n+ .setNegativeButton(R.string.quest_generic_confirmation_no, null)\n+ .show()\n+ }\n+\n+ private fun saveAndApplyCycleway(cycleways: LeftAndRightCycleway) {\n+ streetSideSelect.saveLastSelection()\n+ val tags = StringMapChangesBuilder(element!!.tags)\n+ cycleways.applyTo(tags, countryInfo.isLeftHandTraffic)\n+ bicycleBoulevard.applyTo(tags, countryInfo.countryCode)\n+ applyEdit(UpdateElementTagsAction(tags.create()))\n+ }\n+\n+ /* ----------------------------- AStreetSideSelectOverlayForm ------------------------------- */\n+\n+ override fun hasChanges(): Boolean =\n+ streetSideSelect.left?.value != originalCycleway?.left ||\n+ streetSideSelect.right?.value != originalCycleway?.right ||\n+ originalBicycleBoulevard != bicycleBoulevard\n+\n+ override fun serialize(item: CyclewayAndDirection) = Json.encodeToString(item)\n+ override fun deserialize(str: String) = Json.decodeFromString(str)\n+ override fun asStreetSideItem(item: CyclewayAndDirection, isRight: Boolean): StreetSideDisplayItem {\n+ val isContraflowInOneway = isContraflowInOneway(isRight)\n+ // NONE_NO_ONEWAY is displayed as simply NONE if not in contraflow because the former makes\n+ // only really sense in contraflow. This can only happen when applying the side(s) via the\n+ // last answer button\n+ val item2 = if (item.cycleway == Cycleway.NONE_NO_ONEWAY && !isContraflowInOneway) item.copy(cycleway = Cycleway.NONE) else item\n+ return item2.asStreetSideItem(isRight, isContraflowInOneway, countryInfo)\n+ }\n+\n+ companion object {\n+ private const val BICYCLE_BOULEVARD = \"bicycle_boulevard\"\n+ }\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/shops/ShopsOverlayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/shops/ShopsOverlayForm.kt\nindex a9d93c3c9d8..cadd68b2a6d 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/overlays/shops/ShopsOverlayForm.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/overlays/shops/ShopsOverlayForm.kt\n@@ -26,7 +26,7 @@ import de.westnordost.streetcomplete.osm.applyTo\n import de.westnordost.streetcomplete.osm.createLocalizedNames\n import de.westnordost.streetcomplete.osm.replaceShop\n import de.westnordost.streetcomplete.overlays.AbstractOverlayForm\n-import de.westnordost.streetcomplete.quests.AnswerItem\n+import de.westnordost.streetcomplete.overlays.AnswerItem\n import de.westnordost.streetcomplete.quests.LocalizedNameAdapter\n import de.westnordost.streetcomplete.util.getLocalesForFeatureDictionary\n import de.westnordost.streetcomplete.util.getLocationLabel\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/sidewalk/SidewalkOverlay.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/sidewalk/SidewalkOverlay.kt\nindex 00224fe8a5d..09d1090ddfe 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/overlays/sidewalk/SidewalkOverlay.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/overlays/sidewalk/SidewalkOverlay.kt\n@@ -1,14 +1,20 @@\n package de.westnordost.streetcomplete.overlays.sidewalk\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.PEDESTRIAN\n import de.westnordost.streetcomplete.osm.ALL_ROADS\n+import de.westnordost.streetcomplete.osm.ANYTHING_UNPAVED\n+import de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCycleway\n+import de.westnordost.streetcomplete.osm.cycleway_separate.createSeparateCycleway\n import de.westnordost.streetcomplete.osm.isPrivateOnFoot\n import de.westnordost.streetcomplete.osm.sidewalk.Sidewalk\n+import de.westnordost.streetcomplete.osm.sidewalk.any\n import de.westnordost.streetcomplete.osm.sidewalk.createSidewalkSides\n+import de.westnordost.streetcomplete.overlays.AbstractOverlayForm\n import de.westnordost.streetcomplete.overlays.Color\n import de.westnordost.streetcomplete.overlays.Overlay\n import de.westnordost.streetcomplete.overlays.PolylineStyle\n@@ -31,24 +37,47 @@ class SidewalkOverlay : Overlay {\n highway ~ motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified|residential|living_street|pedestrian|service\n and area != yes\n \"\"\").map { it to getSidewalkStyle(it) } +\n- // footways etc, just to highlight e.g. separately mapped sidewalks\n+ // footways etc, just to highlight e.g. separately mapped sidewalks. However, it is also\n+ // possible to add sidewalks to them. At least in NL, cycleways with sidewalks actually exist\n mapData.filter(\"\"\"\n ways with (\n- highway ~ footway|steps\n- or highway ~ path|bridleway|cycleway and foot ~ yes|designated\n+ highway ~ footway|steps|path|bridleway|cycleway\n ) and area != yes\n- \"\"\").map { it to PolylineStyle(StrokeStyle(Color.SKY)) }\n+ \"\"\").map { it to getFootwayStyle(it) }\n \n- override fun createForm(element: Element?) =\n- if (element != null && element.tags[\"highway\"] in ALL_ROADS) SidewalkOverlayForm()\n- else null\n+ override fun createForm(element: Element?): AbstractOverlayForm? {\n+ if (element == null) return null\n+\n+ // allow editing of all roads and all exclusive cycleways\n+ return if (\n+ element.tags[\"highway\"] in ALL_ROADS ||\n+ createSeparateCycleway(element.tags) in listOf(SeparateCycleway.EXCLUSIVE, SeparateCycleway.EXCLUSIVE_WITH_SIDEWALK)\n+ ) SidewalkOverlayForm() else null\n+ }\n+}\n+\n+private fun getFootwayStyle(element: Element): PolylineStyle {\n+ val foot = element.tags[\"foot\"] ?: when (element.tags[\"highway\"]) {\n+ \"footway\" -> \"designated\"\n+ \"path\" -> \"yes\"\n+ else -> null\n+ }\n+\n+ return when {\n+ createSidewalkSides(element.tags)?.any { it == Sidewalk.YES } == true ->\n+ getSidewalkStyle(element)\n+ foot in listOf(\"yes\", \"designated\") ->\n+ PolylineStyle(StrokeStyle(Color.SKY))\n+ else ->\n+ PolylineStyle(StrokeStyle(Color.INVISIBLE))\n+ }\n }\n \n private fun getSidewalkStyle(element: Element): PolylineStyle {\n val sidewalkSides = createSidewalkSides(element.tags)\n // not set but on road that usually has no sidewalk or it is private -> do not highlight as missing\n if (sidewalkSides == null) {\n- if (sidewalkTaggingNotExpected(element.tags) || isPrivateOnFoot(element)) {\n+ if (sidewalkTaggingNotExpected(element) || isPrivateOnFoot(element)) {\n return PolylineStyle(StrokeStyle(Color.INVISIBLE))\n }\n }\n@@ -60,13 +89,17 @@ private fun getSidewalkStyle(element: Element): PolylineStyle {\n )\n }\n \n-private val highwayValuesWhereSidewalkTaggingIsNotExpected = setOf(\n- \"living_street\", \"pedestrian\", \"service\", \"motorway_link\"\n-)\n+private val sidewalkTaggingNotExpectedFilter by lazy { \"\"\"\n+ ways with\n+ highway ~ living_street|pedestrian|service|motorway_link\n+ or motorroad = yes\n+ or expressway = yes\n+ or maxspeed <= 10\n+ or surface ~ ${ANYTHING_UNPAVED.joinToString(\"|\")}\n+\"\"\".toElementFilterExpression() }\n \n-private fun sidewalkTaggingNotExpected(tags: Map): Boolean =\n- tags[\"highway\"] in highwayValuesWhereSidewalkTaggingIsNotExpected\n- || tags[\"motorroad\"] == \"yes\" || tags[\"expressway\"] == \"yes\"\n+private fun sidewalkTaggingNotExpected(element: Element) =\n+ sidewalkTaggingNotExpectedFilter.matches(element)\n \n private val Sidewalk?.style get() = StrokeStyle(when (this) {\n Sidewalk.YES -> Color.SKY\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/sidewalk/SidewalkOverlayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/sidewalk/SidewalkOverlayForm.kt\nindex 6cbca6a40ba..afcfbc7854c 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/overlays/sidewalk/SidewalkOverlayForm.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/overlays/sidewalk/SidewalkOverlayForm.kt\n@@ -24,13 +24,13 @@ class SidewalkOverlayForm : AStreetSideSelectOverlayForm() {\n \n override fun onViewCreated(view: View, savedInstanceState: Bundle?) {\n super.onViewCreated(view, savedInstanceState)\n+ originalSidewalk = createSidewalkSides(element!!.tags)?.validOrNullValues()\n if (savedInstanceState == null) {\n initStateFromTags()\n }\n }\n \n private fun initStateFromTags() {\n- originalSidewalk = createSidewalkSides(element!!.tags)?.validOrNullValues()\n streetSideSelect.setPuzzleSide(originalSidewalk?.left?.asStreetSideItem(), false)\n streetSideSelect.setPuzzleSide(originalSidewalk?.right?.asStreetSideItem(), true)\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/street_parking/StreetParkingOverlayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/street_parking/StreetParkingOverlayForm.kt\nindex 8feaf54b838..6e7a1c55fe9 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/overlays/street_parking/StreetParkingOverlayForm.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/overlays/street_parking/StreetParkingOverlayForm.kt\n@@ -66,13 +66,13 @@ class StreetParkingOverlayForm : AStreetSideSelectOverlayForm() {\n getString(R.string.street_parking_street_width, widthFormatted)\n } else null\n \n+ originalParking = createStreetParkingSides(element!!.tags)?.validOrNullValues()\n if (savedInstanceState == null) {\n initStateFromTags()\n }\n }\n \n private fun initStateFromTags() {\n- originalParking = createStreetParkingSides(element!!.tags)?.validOrNullValues()\n streetSideSelect.setPuzzleSide(originalParking?.left?.asStreetSideItem(requireContext(), isUpsideDown(false)), false)\n streetSideSelect.setPuzzleSide(originalParking?.right?.asStreetSideItem(requireContext(), isUpsideDown(true)), true)\n }\n@@ -129,7 +129,7 @@ class StreetParkingOverlayForm : AStreetSideSelectOverlayForm() {\n /* --------------------------------------- apply answer ------------------------------------- */\n \n override fun onClickOk() {\n- if (streetSideSelect.isComplete) streetSideSelect.saveLastSelection()\n+ streetSideSelect.saveLastSelection()\n val parking = LeftAndRightStreetParking(streetSideSelect.left?.value, streetSideSelect.right?.value)\n val tagChanges = StringMapChangesBuilder(element!!.tags)\n parking.applyTo(tagChanges)\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractOsmQuestForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractOsmQuestForm.kt\nindex 5777b38b0b9..b0b42fff090 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractOsmQuestForm.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractOsmQuestForm.kt\n@@ -42,6 +42,7 @@ import de.westnordost.streetcomplete.util.getNameAndLocationLabel\n import de.westnordost.streetcomplete.util.ktx.geometryType\n import de.westnordost.streetcomplete.util.ktx.isSplittable\n import de.westnordost.streetcomplete.util.ktx.viewLifecycleScope\n+import de.westnordost.streetcomplete.view.add\n import kotlinx.coroutines.Dispatchers\n import kotlinx.coroutines.launch\n import kotlinx.coroutines.withContext\n@@ -82,8 +83,8 @@ abstract class AbstractOsmQuestForm : AbstractQuestForm(), IsShowingQuestDeta\n }\n \n // overridable by child classes\n- open val otherAnswers = listOf()\n- open val buttonPanelAnswers = listOf()\n+ open val otherAnswers = listOf()\n+ open val buttonPanelAnswers = listOf()\n \n interface Listener {\n /** The GPS position at which the user is displayed at */\n@@ -135,8 +136,8 @@ abstract class AbstractOsmQuestForm : AbstractQuestForm(), IsShowingQuestDeta\n setButtonPanelAnswers(listOf(otherAnswersItem) + buttonPanelAnswers)\n }\n \n- private fun assembleOtherAnswers(): List {\n- val answers = mutableListOf()\n+ private fun assembleOtherAnswers(): List {\n+ val answers = mutableListOf()\n \n answers.add(AnswerItem(R.string.quest_generic_answer_notApplicable) { onClickCantSay() })\n \n@@ -176,7 +177,7 @@ abstract class AbstractOsmQuestForm : AbstractQuestForm(), IsShowingQuestDeta\n for (i in answers.indices) {\n val otherAnswer = answers[i]\n val order = answers.size - i\n- popup.menu.add(Menu.NONE, i, order, otherAnswer.titleResourceId)\n+ popup.menu.add(Menu.NONE, i, order, otherAnswer.title)\n }\n popup.show()\n \n@@ -226,7 +227,7 @@ abstract class AbstractOsmQuestForm : AbstractQuestForm(), IsShowingQuestDeta\n \n private fun createQuestChanges(answer: T): StringMapChanges {\n val changesBuilder = StringMapChangesBuilder(element.tags)\n- osmElementQuestType.applyAnswerTo(answer, changesBuilder, element.timestampEdited)\n+ osmElementQuestType.applyAnswerTo(answer, changesBuilder, geometry, element.timestampEdited)\n val changes = changesBuilder.create()\n require(!changes.isEmpty()) {\n \"${osmElementQuestType.name} was answered by the user but there are no changes!\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt\nindex cc8f6948a65..3169ba1424d 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestForm.kt\n@@ -27,6 +27,10 @@ import de.westnordost.streetcomplete.util.ktx.popIn\n import de.westnordost.streetcomplete.util.ktx.popOut\n import de.westnordost.streetcomplete.util.ktx.toast\n import de.westnordost.streetcomplete.util.ktx.updateConfiguration\n+import de.westnordost.streetcomplete.view.CharSequenceText\n+import de.westnordost.streetcomplete.view.ResText\n+import de.westnordost.streetcomplete.view.Text\n+import de.westnordost.streetcomplete.view.setText\n import kotlinx.serialization.decodeFromString\n import kotlinx.serialization.encodeToString\n import kotlinx.serialization.json.Json\n@@ -189,11 +193,11 @@ abstract class AbstractQuestForm :\n }\n }\n \n- protected fun setButtonPanelAnswers(buttonPanelAnswers: List) {\n+ protected fun setButtonPanelAnswers(buttonPanelAnswers: List) {\n binding.buttonPanel.removeAllViews()\n for (buttonPanelAnswer in buttonPanelAnswers) {\n val button = ButtonPanelButtonBinding.inflate(layoutInflater, binding.buttonPanel, true).root\n- button.setText(buttonPanelAnswer.titleResourceId)\n+ button.setText(buttonPanelAnswer.title)\n button.setOnClickListener { buttonPanelAnswer.action() }\n }\n }\n@@ -237,4 +241,15 @@ abstract class AbstractQuestForm :\n }\n }\n \n-data class AnswerItem(val titleResourceId: Int, val action: () -> Unit)\n+interface IAnswerItem {\n+ val title: Text\n+ val action: () -> Unit\n+}\n+\n+data class AnswerItem(val titleResourceId: Int, override val action: () -> Unit) : IAnswerItem {\n+ override val title: Text get() = ResText(titleResourceId)\n+}\n+\n+data class AnswerItem2(val titleString: String, override val action: () -> Unit) : IAnswerItem {\n+ override val title: Text get() = CharSequenceText(titleString)\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/accepts_cards/AddAcceptsCards.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/accepts_cards/AddAcceptsCards.kt\nindex f0b4b4aad7e..b3a7d1897d5 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/accepts_cards/AddAcceptsCards.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/accepts_cards/AddAcceptsCards.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.accepts_cards\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -37,7 +38,7 @@ class AddAcceptsCards : OsmFilterQuestType() {\n \n override fun createForm() = AddAcceptsCardsForm()\n \n- override fun applyAnswerTo(answer: CardAcceptance, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: CardAcceptance, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"payment:debit_cards\"] = answer.debit.toYesNo()\n tags[\"payment:credit_cards\"] = answer.credit.toYesNo()\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/accepts_cash/AddAcceptsCash.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/accepts_cash/AddAcceptsCash.kt\nindex b5078c0b9d9..27955458125 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/accepts_cash/AddAcceptsCash.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/accepts_cash/AddAcceptsCash.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.accepts_cash\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -68,7 +69,7 @@ class AddAcceptsCash : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"payment:cash\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/access_point_ref/AddAccessPointRef.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/access_point_ref/AddAccessPointRef.kt\nindex 828a4f944fe..8e96252ce2e 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/access_point_ref/AddAccessPointRef.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/access_point_ref/AddAccessPointRef.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.access_point_ref\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement\n import de.westnordost.streetcomplete.osm.Tags\n@@ -25,7 +26,7 @@ class AddAccessPointRef : OsmFilterQuestType() {\n \n override fun createForm() = AddAccessPointRefForm()\n \n- override fun applyAnswerTo(answer: AccessPointRefAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: AccessPointRefAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is NoVisibleAccessPointRef -> tags[\"ref:signed\"] = \"no\"\n is AccessPointRef -> tags[\"ref\"] = answer.ref\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/address/AddAddressStreet.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/address/AddAddressStreet.kt\nindex d9af46ab418..76ee3567386 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/address/AddAddressStreet.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/address/AddAddressStreet.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.address\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.ElementType\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n@@ -62,7 +63,7 @@ class AddAddressStreet : OsmElementQuestType {\n \n override fun createForm() = AddAddressStreetForm()\n \n- override fun applyAnswerTo(answer: StreetOrPlaceName, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: StreetOrPlaceName, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n answer.applyTo(tags)\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/address/AddHousenumber.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/address/AddHousenumber.kt\nindex ae5343a0339..8ebc82d4e69 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/address/AddHousenumber.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/address/AddHousenumber.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.address\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.geometry.ElementPolygonsGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.ElementType\n@@ -141,7 +142,7 @@ class AddHousenumber : OsmElementQuestType {\n \n override fun createForm() = AddHousenumberForm()\n \n- override fun applyAnswerTo(answer: HouseNumberAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: HouseNumberAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is AddressNumberOrName -> {\n if (answer.number == null && answer.name == null) {\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/air_conditioning/AddAirConditioning.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/air_conditioning/AddAirConditioning.kt\nindex d538105af79..989e06f9692 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/air_conditioning/AddAirConditioning.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/air_conditioning/AddAirConditioning.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.air_conditioning\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -36,7 +37,7 @@ class AddAirConditioning : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"air_conditioning\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/air_pump/AddAirCompressor.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/air_pump/AddAirCompressor.kt\nindex 1b27a7bec28..98ccd2c841b 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/air_pump/AddAirCompressor.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/air_pump/AddAirCompressor.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.air_pump\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -40,7 +41,7 @@ class AddAirCompressor : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"compressed_air\", answer.toYesNo())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/air_pump/AddBicyclePump.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/air_pump/AddBicyclePump.kt\nindex 967840abff9..92aa4c73dd8 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/air_pump/AddBicyclePump.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/air_pump/AddBicyclePump.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.air_pump\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -48,7 +49,7 @@ class AddBicyclePump : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"service:bicycle:pump\", answer.toYesNo())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/atm_cashin/AddAtmCashIn.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/atm_cashin/AddAtmCashIn.kt\nindex b9a273d700b..310b53232ba 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/atm_cashin/AddAtmCashIn.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/atm_cashin/AddAtmCashIn.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.atm_cashin\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -26,7 +27,7 @@ class AddAtmCashIn : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"cash_in\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/atm_operator/AddAtmOperator.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/atm_operator/AddAtmOperator.kt\nindex 0375caebfee..9b29d14e81c 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/atm_operator/AddAtmOperator.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/atm_operator/AddAtmOperator.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.atm_operator\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -24,7 +25,7 @@ class AddAtmOperator : OsmFilterQuestType() {\n \n override fun createForm() = AddAtmOperatorForm()\n \n- override fun applyAnswerTo(answer: String, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: String, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"operator\"] = answer\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/baby_changing_table/AddBabyChangingTable.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/baby_changing_table/AddBabyChangingTable.kt\nindex b8644a2dec7..2466ecd9ba1 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/baby_changing_table/AddBabyChangingTable.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/baby_changing_table/AddBabyChangingTable.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.baby_changing_table\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CITIZEN\n import de.westnordost.streetcomplete.osm.Tags\n@@ -31,7 +32,7 @@ class AddBabyChangingTable : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"changing_table\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_bicycle_barrier_installation/AddBicycleBarrierInstallation.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_bicycle_barrier_installation/AddBicycleBarrierInstallation.kt\nindex 03a7f783a22..aba5448eafc 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_bicycle_barrier_installation/AddBicycleBarrierInstallation.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_bicycle_barrier_installation/AddBicycleBarrierInstallation.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.barrier_bicycle_barrier_installation\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -31,7 +32,7 @@ class AddBicycleBarrierInstallation : OsmFilterQuestType tags[\"cycle_barrier:installation\"] = answer.osmValue\n BarrierTypeIsNotBicycleBarrier -> tags[\"barrier\"] = \"yes\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_bicycle_barrier_type/AddBicycleBarrierType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_bicycle_barrier_type/AddBicycleBarrierType.kt\nindex 961188bf45e..c4732884210 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_bicycle_barrier_type/AddBicycleBarrierType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_bicycle_barrier_type/AddBicycleBarrierType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.barrier_bicycle_barrier_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BICYCLIST\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BLIND\n@@ -21,7 +22,7 @@ class AddBicycleBarrierType : OsmFilterQuestType() {\n \n override fun createForm() = AddBicycleBarrierTypeForm()\n \n- override fun applyAnswerTo(answer: BicycleBarrierTypeAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: BicycleBarrierTypeAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is BicycleBarrierType -> tags[\"cycle_barrier\"] = answer.osmValue\n BarrierTypeIsNotBicycleBarrier -> tags[\"barrier\"] = \"yes\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_type/AddBarrierOnPath.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_type/AddBarrierOnPath.kt\nindex ed664cb215f..67d56a72fac 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_type/AddBarrierOnPath.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_type/AddBarrierOnPath.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.barrier_type\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Node\n@@ -41,6 +42,6 @@ class AddBarrierOnPath : OsmElementQuestType {\n \n override fun createForm() = AddBarrierTypeForm()\n \n- override fun applyAnswerTo(answer: BarrierType, tags: Tags, timestampEdited: Long) =\n+ override fun applyAnswerTo(answer: BarrierType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) =\n answer.applyTo(tags)\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_type/AddBarrierOnRoad.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_type/AddBarrierOnRoad.kt\nindex 60cebee750b..08fd1dabc2f 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_type/AddBarrierOnRoad.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_type/AddBarrierOnRoad.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.barrier_type\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Node\n@@ -40,6 +41,6 @@ class AddBarrierOnRoad : OsmElementQuestType {\n \n override fun createForm() = AddBarrierTypeForm()\n \n- override fun applyAnswerTo(answer: BarrierType, tags: Tags, timestampEdited: Long) =\n+ override fun applyAnswerTo(answer: BarrierType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) =\n answer.applyTo(tags)\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_type/AddBarrierType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_type/AddBarrierType.kt\nindex 2d3cca7c702..4a3fd40c502 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_type/AddBarrierType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_type/AddBarrierType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.barrier_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BICYCLIST\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BLIND\n@@ -35,6 +36,6 @@ class AddBarrierType : OsmFilterQuestType() {\n \n override fun createForm() = AddBarrierTypeForm()\n \n- override fun applyAnswerTo(answer: BarrierType, tags: Tags, timestampEdited: Long) =\n+ override fun applyAnswerTo(answer: BarrierType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) =\n answer.applyTo(tags)\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_type/AddStileType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_type/AddStileType.kt\nindex 2bf7a34ea7d..cc31e291622 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_type/AddStileType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_type/AddStileType.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.barrier_type\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType\n@@ -47,7 +48,7 @@ class AddStileType : OsmElementQuestType {\n \n override fun createForm() = AddStileTypeForm()\n \n- override fun applyAnswerTo(answer: StileTypeAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: StileTypeAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is StileType -> {\n val newType = answer.osmValue\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bench_backrest/AddBenchBackrest.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bench_backrest/AddBenchBackrest.kt\nindex 6a5713a887f..c5e0c34fcfb 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bench_backrest/AddBenchBackrest.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bench_backrest/AddBenchBackrest.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.bench_backrest\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -35,7 +36,7 @@ class AddBenchBackrest : OsmFilterQuestType() {\n \n override fun createForm() = AddBenchBackrestForm()\n \n- override fun applyAnswerTo(answer: BenchBackrestAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: BenchBackrestAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n PICNIC_TABLE -> {\n tags[\"leisure\"] = \"picnic_table\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bike_parking_capacity/AddBikeParkingCapacity.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bike_parking_capacity/AddBikeParkingCapacity.kt\nindex 067a3c491a7..13fdaf30b6d 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bike_parking_capacity/AddBikeParkingCapacity.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bike_parking_capacity/AddBikeParkingCapacity.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.bike_parking_capacity\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -38,7 +39,7 @@ class AddBikeParkingCapacity : OsmFilterQuestType() {\n \n override fun createForm() = AddBikeParkingCapacityForm.create(showClarificationText = true)\n \n- override fun applyAnswerTo(answer: Int, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Int, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"capacity\", answer.toString())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bike_parking_cover/AddBikeParkingCover.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bike_parking_cover/AddBikeParkingCover.kt\nindex 039b31641ce..16e95945485 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bike_parking_cover/AddBikeParkingCover.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bike_parking_cover/AddBikeParkingCover.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.bike_parking_cover\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -32,7 +33,7 @@ class AddBikeParkingCover : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"covered\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bike_parking_type/AddBikeParkingType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bike_parking_type/AddBikeParkingType.kt\nindex 1ff3c747c6f..03ddc252733 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bike_parking_type/AddBikeParkingType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bike_parking_type/AddBikeParkingType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.bike_parking_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -29,7 +30,7 @@ class AddBikeParkingType : OsmFilterQuestType() {\n \n override fun createForm() = AddBikeParkingTypeForm()\n \n- override fun applyAnswerTo(answer: BikeParkingType, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: BikeParkingType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"bicycle_parking\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bike_rental_capacity/AddBikeRentalCapacity.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bike_rental_capacity/AddBikeRentalCapacity.kt\nindex a5aaea831f6..20eeb34f909 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bike_rental_capacity/AddBikeRentalCapacity.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bike_rental_capacity/AddBikeRentalCapacity.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.bike_rental_capacity\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -33,7 +34,7 @@ class AddBikeRentalCapacity : OsmFilterQuestType() {\n \n override fun createForm() = AddBikeParkingCapacityForm.create(showClarificationText = false)\n \n- override fun applyAnswerTo(answer: Int, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Int, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"capacity\", answer.toString())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bike_rental_type/AddBikeRentalType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bike_rental_type/AddBikeRentalType.kt\nindex 74caca618e1..fffc16d5e2a 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bike_rental_type/AddBikeRentalType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bike_rental_type/AddBikeRentalType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.bike_rental_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -30,7 +31,7 @@ class AddBikeRentalType : OsmFilterQuestType() {\n \n override fun createForm() = AddBikeRentalTypeForm()\n \n- override fun applyAnswerTo(answer: BikeRentalTypeAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: BikeRentalTypeAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is BikeRentalType -> {\n tags[\"bicycle_rental\"] = answer.osmValue\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bike_shop/AddBikeRepairAvailability.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bike_shop/AddBikeRepairAvailability.kt\nindex fb009a9d0de..fb6de5ce16a 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bike_shop/AddBikeRepairAvailability.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bike_shop/AddBikeRepairAvailability.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.bike_shop\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -36,7 +37,7 @@ class AddBikeRepairAvailability : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"service:bicycle:repair\", answer.toYesNo())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bike_shop/AddSecondHandBicycleAvailability.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bike_shop/AddSecondHandBicycleAvailability.kt\nindex 3fe83d20714..a802005b5c4 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bike_shop/AddSecondHandBicycleAvailability.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bike_shop/AddSecondHandBicycleAvailability.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.bike_shop\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -39,7 +40,7 @@ class AddSecondHandBicycleAvailability : OsmFilterQuestType() {\n \n override fun createForm() = AddBoardTypeForm()\n \n- override fun applyAnswerTo(answer: BoardType, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: BoardType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n if (answer == BoardType.MAP) {\n tags[\"information\"] = \"map\"\n } else {\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bollard_type/AddBollardType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bollard_type/AddBollardType.kt\nindex 13119788b8d..1c06b8f34d2 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bollard_type/AddBollardType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bollard_type/AddBollardType.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.bollard_type\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -51,7 +52,7 @@ class AddBollardType : OsmElementQuestType {\n \n override fun createForm() = AddBollardTypeForm()\n \n- override fun applyAnswerTo(answer: BollardTypeAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: BollardTypeAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is BollardType -> tags[\"bollard\"] = answer.osmValue\n BarrierTypeIsNotBollard -> tags[\"barrier\"] = \"yes\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bridge_structure/AddBridgeStructure.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bridge_structure/AddBridgeStructure.kt\nindex 2d86cf365be..e75364cafe8 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bridge_structure/AddBridgeStructure.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bridge_structure/AddBridgeStructure.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.bridge_structure\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BUILDING\n import de.westnordost.streetcomplete.osm.Tags\n@@ -17,7 +18,7 @@ class AddBridgeStructure : OsmFilterQuestType() {\n \n override fun createForm() = AddBridgeStructureForm()\n \n- override fun applyAnswerTo(answer: BridgeStructure, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: BridgeStructure, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"bridge:structure\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/building_entrance/AddEntrance.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/building_entrance/AddEntrance.kt\nindex 0f696b83f60..e63dc3caf85 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/building_entrance/AddEntrance.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/building_entrance/AddEntrance.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.building_entrance\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType\n@@ -66,7 +67,7 @@ class AddEntrance : OsmElementQuestType {\n \n override fun createForm() = AddEntranceForm()\n \n- override fun applyAnswerTo(answer: EntranceAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: EntranceAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n DeadEnd -> tags[\"noexit\"] = \"yes\"\n is EntranceExistsAnswer -> tags[\"entrance\"] = answer.osmValue\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/building_entrance_reference/AddEntranceReference.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/building_entrance_reference/AddEntranceReference.kt\nindex c59ac088daa..43ce5dbcc7c 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/building_entrance_reference/AddEntranceReference.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/building_entrance_reference/AddEntranceReference.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.building_entrance_reference\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Node\n@@ -87,7 +88,7 @@ class AddEntranceReference : OsmElementQuestType {\n \n override fun createForm() = AddEntranceReferenceForm()\n \n- override fun applyAnswerTo(answer: EntranceAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: EntranceAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is FlatRange -> {\n tags[\"addr:flats\"] = answer.flatRange\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/building_levels/AddBuildingLevels.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/building_levels/AddBuildingLevels.kt\nindex 18236e0bad9..90a41411782 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/building_levels/AddBuildingLevels.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/building_levels/AddBuildingLevels.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.building_levels\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BUILDING\n import de.westnordost.streetcomplete.osm.BUILDINGS_WITH_LEVELS\n@@ -29,7 +30,7 @@ class AddBuildingLevels : OsmFilterQuestType() {\n \n override fun createForm() = AddBuildingLevelsForm()\n \n- override fun applyAnswerTo(answer: BuildingLevelsAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: BuildingLevelsAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"building:levels\"] = answer.levels.toString()\n answer.roofLevels?.let { tags[\"roof:levels\"] = it.toString() }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/building_type/AddBuildingType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/building_type/AddBuildingType.kt\nindex b7ced7a72e4..34666ec4d5d 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/building_type/AddBuildingType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/building_type/AddBuildingType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.building_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BUILDING\n import de.westnordost.streetcomplete.osm.Tags\n@@ -39,7 +40,7 @@ class AddBuildingType : OsmFilterQuestType() {\n \n override fun createForm() = AddBuildingTypeForm()\n \n- override fun applyAnswerTo(answer: BuildingType, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: BuildingType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n if (answer.osmKey == \"man_made\") {\n tags.remove(\"building\")\n tags[\"man_made\"] = answer.osmValue\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/building_underground/AddIsBuildingUnderground.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/building_underground/AddIsBuildingUnderground.kt\nindex 6c1d77788e4..329e5e6c387 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/building_underground/AddIsBuildingUnderground.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/building_underground/AddIsBuildingUnderground.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.building_underground\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BUILDING\n import de.westnordost.streetcomplete.osm.Tags\n@@ -18,7 +19,7 @@ class AddIsBuildingUnderground : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"location\"] = if (answer) \"underground\" else \"surface\"\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_bench/AddBenchStatusOnBusStop.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_bench/AddBenchStatusOnBusStop.kt\nindex a740b3dc8ec..0149bbede3a 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_bench/AddBenchStatusOnBusStop.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_bench/AddBenchStatusOnBusStop.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.bus_stop_bench\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.PEDESTRIAN\n import de.westnordost.streetcomplete.osm.Tags\n@@ -28,7 +29,7 @@ class AddBenchStatusOnBusStop : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"bench\", answer.toYesNo())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_bin/AddBinStatusOnBusStop.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_bin/AddBinStatusOnBusStop.kt\nindex 1254b294b6f..06d3d95736b 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_bin/AddBinStatusOnBusStop.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_bin/AddBinStatusOnBusStop.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.bus_stop_bin\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CITIZEN\n import de.westnordost.streetcomplete.osm.Tags\n@@ -28,7 +29,7 @@ class AddBinStatusOnBusStop : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"bin\", answer.toYesNo())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_lit/AddBusStopLit.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_lit/AddBusStopLit.kt\nindex 9fdad2e5910..262aa4000bb 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_lit/AddBusStopLit.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_lit/AddBusStopLit.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.bus_stop_lit\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.PEDESTRIAN\n import de.westnordost.streetcomplete.osm.Tags\n@@ -35,7 +36,7 @@ class AddBusStopLit : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"lit\", answer.toYesNo())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopName.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopName.kt\nindex 9fe189b49c2..276948ef555 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopName.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopName.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.bus_stop_name\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.quest.AllCountriesExcept\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.PEDESTRIAN\n@@ -28,7 +29,7 @@ class AddBusStopName : OsmFilterQuestType() {\n \n override fun createForm() = AddBusStopNameForm()\n \n- override fun applyAnswerTo(answer: BusStopNameAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: BusStopNameAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is NoBusStopName -> {\n tags[\"name:signed\"] = \"no\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_ref/AddBusStopRef.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_ref/AddBusStopRef.kt\nindex 5c2230a7fe0..a8b4db99407 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_ref/AddBusStopRef.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_ref/AddBusStopRef.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.bus_stop_ref\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.quest.NoCountriesExcept\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.PEDESTRIAN\n@@ -34,7 +35,7 @@ class AddBusStopRef : OsmFilterQuestType() {\n \n override fun createForm() = AddBusStopRefForm()\n \n- override fun applyAnswerTo(answer: BusStopRefAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: BusStopRefAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is NoVisibleBusStopRef -> tags[\"ref:signed\"] = \"no\"\n is BusStopRef -> tags[\"ref\"] = answer.ref\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_shelter/AddBusStopShelter.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_shelter/AddBusStopShelter.kt\nindex 9ba6f748e06..b9b6f844a42 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_shelter/AddBusStopShelter.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_shelter/AddBusStopShelter.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.bus_stop_shelter\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.PEDESTRIAN\n import de.westnordost.streetcomplete.osm.Tags\n@@ -36,7 +37,7 @@ class AddBusStopShelter : OsmFilterQuestType() {\n \n override fun createForm() = AddBusStopShelterForm()\n \n- override fun applyAnswerTo(answer: BusStopShelterAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: BusStopShelterAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n SHELTER -> tags.updateWithCheckDate(\"shelter\", \"yes\")\n NO_SHELTER -> tags.updateWithCheckDate(\"shelter\", \"no\")\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/camera_type/AddCameraType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/camera_type/AddCameraType.kt\nindex c547c38d547..6425f6abca7 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/camera_type/AddCameraType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/camera_type/AddCameraType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.camera_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -28,7 +29,7 @@ class AddCameraType : OsmFilterQuestType() {\n \n override fun createForm() = AddCameraTypeForm()\n \n- override fun applyAnswerTo(answer: CameraType, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: CameraType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"camera:type\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/camping/AddCampDrinkingWater.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/camping/AddCampDrinkingWater.kt\nindex c9ad71d8a74..d28a71a83a4 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/camping/AddCampDrinkingWater.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/camping/AddCampDrinkingWater.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.camping\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -33,7 +34,7 @@ class AddCampDrinkingWater : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"drinking_water\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/camping/AddCampPower.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/camping/AddCampPower.kt\nindex d0ca21cda79..5bc15f206eb 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/camping/AddCampPower.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/camping/AddCampPower.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.camping\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -33,7 +34,7 @@ class AddCampPower : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"power_supply\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/camping/AddCampShower.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/camping/AddCampShower.kt\nindex 5da91447e3c..03f789844ec 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/camping/AddCampShower.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/camping/AddCampShower.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.camping\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -33,7 +34,7 @@ class AddCampShower : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"shower\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/camping/AddCampType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/camping/AddCampType.kt\nindex b72bd4f65fb..c5a3042a998 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/camping/AddCampType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/camping/AddCampType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.camping\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -32,7 +33,7 @@ class AddCampType : OsmFilterQuestType() {\n \n override fun createForm() = AddCampTypeForm()\n \n- override fun applyAnswerTo(answer: CampType, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: CampType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n BACKCOUNTRY -> tags[\"backcountry\"] = \"yes\"\n else -> {\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/car_wash_type/AddCarWashType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/car_wash_type/AddCarWashType.kt\nindex 26e6688200f..38216c1e6d2 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/car_wash_type/AddCarWashType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/car_wash_type/AddCarWashType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.car_wash_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CAR\n import de.westnordost.streetcomplete.osm.Tags\n@@ -20,7 +21,7 @@ class AddCarWashType : OsmFilterQuestType>() {\n \n override fun createForm() = AddCarWashTypeForm()\n \n- override fun applyAnswerTo(answer: List, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: List, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n val isAutomated = answer.contains(AUTOMATED)\n tags[\"automated\"] = isAutomated.toYesNo()\n \ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/charging_station_capacity/AddChargingStationCapacity.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/charging_station_capacity/AddChargingStationCapacity.kt\nindex 9587c7b0544..e80a78b9c3b 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/charging_station_capacity/AddChargingStationCapacity.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/charging_station_capacity/AddChargingStationCapacity.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.charging_station_capacity\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -30,7 +31,7 @@ class AddChargingStationCapacity : OsmFilterQuestType() {\n \n override fun createForm() = AddChargingStationCapacityForm()\n \n- override fun applyAnswerTo(answer: Int, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Int, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"capacity\", answer.toString())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/charging_station_operator/AddChargingStationOperator.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/charging_station_operator/AddChargingStationOperator.kt\nindex 993a36e9c21..7f4f2a51d4e 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/charging_station_operator/AddChargingStationOperator.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/charging_station_operator/AddChargingStationOperator.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.charging_station_operator\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -28,7 +29,7 @@ class AddChargingStationOperator : OsmFilterQuestType() {\n \n override fun createForm() = AddChargingStationOperatorForm()\n \n- override fun applyAnswerTo(answer: String, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: String, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"operator\"] = answer\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/clothing_bin_operator/AddClothingBinOperator.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/clothing_bin_operator/AddClothingBinOperator.kt\nindex 34fbe68033d..30a3dc78b77 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/clothing_bin_operator/AddClothingBinOperator.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/clothing_bin_operator/AddClothingBinOperator.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.clothing_bin_operator\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -47,7 +48,7 @@ class AddClothingBinOperator : OsmElementQuestType {\n \n override fun createForm() = AddClothingBinOperatorForm()\n \n- override fun applyAnswerTo(answer: String, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: String, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"operator\"] = answer\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/construction/MarkCompletedBuildingConstruction.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/construction/MarkCompletedBuildingConstruction.kt\nindex 57a1d0a42ff..458764f71cf 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/construction/MarkCompletedBuildingConstruction.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/construction/MarkCompletedBuildingConstruction.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.construction\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BUILDING\n import de.westnordost.streetcomplete.osm.Tags\n@@ -23,7 +24,7 @@ class MarkCompletedBuildingConstruction : OsmFilterQuestType {\n tags[\"opening_date\"] = answer.date.toCheckDateString()\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/construction/MarkCompletedHighwayConstruction.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/construction/MarkCompletedHighwayConstruction.kt\nindex 7f2549aecb9..b808e9b1d26 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/construction/MarkCompletedHighwayConstruction.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/construction/MarkCompletedHighwayConstruction.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.construction\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CAR\n import de.westnordost.streetcomplete.osm.ALL_ROADS\n@@ -41,7 +42,7 @@ class MarkCompletedHighwayConstruction : OsmFilterQuestType {\n tags[\"opening_date\"] = answer.date.toCheckDateString()\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossing.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossing.kt\nindex f3105939f94..50a189316b4 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossing.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossing.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.crossing\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Node\n@@ -74,7 +75,7 @@ class AddCrossing : OsmElementQuestType {\n \n override fun createForm() = AddKerbHeightForm()\n \n- override fun applyAnswerTo(answer: KerbHeight, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: KerbHeight, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"kerb\", answer.osmValue)\n /* So, we don't assume there is a crossing here for kerb=no and kerb=raised.\n \ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/crossing_island/AddCrossingIsland.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/crossing_island/AddCrossingIsland.kt\nindex e8952f3cb29..1c3d847215f 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/crossing_island/AddCrossingIsland.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/crossing_island/AddCrossingIsland.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.crossing_island\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType\n@@ -56,7 +57,7 @@ class AddCrossingIsland : OsmElementQuestType {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"crossing:island\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/crossing_type/AddCrossingType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/crossing_type/AddCrossingType.kt\nindex 462fb62ac80..6de208aa73c 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/crossing_type/AddCrossingType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/crossing_type/AddCrossingType.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.crossing_type\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType\n@@ -63,7 +64,7 @@ class AddCrossingType : OsmElementQuestType {\n \n override fun createForm() = AddCrossingTypeForm()\n \n- override fun applyAnswerTo(answer: CrossingType, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: CrossingType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n val crossingValue = tags[\"crossing\"]\n val isAndWasMarked = answer == CrossingType.MARKED && crossingValue in listOf(\"zebra\", \"marked\", \"uncontrolled\")\n /* don't change the tag value of the synonyms for \"marked\" because it is something of a\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/AddCycleway.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/AddCycleway.kt\nindex 291d30516de..033f9b742e8 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/AddCycleway.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/AddCycleway.kt\n@@ -8,6 +8,7 @@ import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpressio\n import de.westnordost.streetcomplete.data.meta.CountryInfo\n import de.westnordost.streetcomplete.data.meta.CountryInfos\n import de.westnordost.streetcomplete.data.meta.getByLocation\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.geometry.ElementPolylinesGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n@@ -17,41 +18,29 @@ import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.\n import de.westnordost.streetcomplete.osm.ANYTHING_UNPAVED\n import de.westnordost.streetcomplete.osm.MAXSPEED_TYPE_KEYS\n import de.westnordost.streetcomplete.osm.Tags\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.ADVISORY_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.BUSWAY\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.DUAL_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.DUAL_TRACK\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.EXCLUSIVE_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.NONE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.NONE_NO_ONEWAY\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.PICTOGRAMS\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.SEPARATE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.SIDEWALK_EXPLICIT\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.SUGGESTION_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.TRACK\n import de.westnordost.streetcomplete.osm.cycleway.Cycleway.UNSPECIFIED_LANE\n import de.westnordost.streetcomplete.osm.cycleway.Cycleway.UNSPECIFIED_SHARED_LANE\n import de.westnordost.streetcomplete.osm.cycleway.LeftAndRightCycleway\n+import de.westnordost.streetcomplete.osm.cycleway.any\n+import de.westnordost.streetcomplete.osm.cycleway.applyTo\n import de.westnordost.streetcomplete.osm.cycleway.createCyclewaySides\n import de.westnordost.streetcomplete.osm.cycleway.isAmbiguous\n import de.westnordost.streetcomplete.osm.estimateParkingOffRoadWidth\n import de.westnordost.streetcomplete.osm.estimateRoadwayWidth\n import de.westnordost.streetcomplete.osm.guessRoadwayWidth\n-import de.westnordost.streetcomplete.osm.hasCheckDateForKey\n-import de.westnordost.streetcomplete.osm.updateCheckDateForKey\n import de.westnordost.streetcomplete.util.math.isNearAndAligned\n import java.util.concurrent.FutureTask\n \n class AddCycleway(\n private val countryInfos: CountryInfos,\n private val countryBoundariesFuture: FutureTask,\n-) : OsmElementQuestType {\n+) : OsmElementQuestType {\n \n override val changesetComment = \"Specify whether there are cycleways\"\n override val wikiLink = \"Key:cycleway\"\n override val icon = R.drawable.ic_quest_bicycleway\n override val achievements = listOf(BICYCLIST)\n+ override val defaultDisabledMessage = R.string.default_disabled_msg_overlay\n \n // See overview here: https://ent8r.github.io/blacklistr/?streetcomplete=cycleway/AddCycleway.kt\n // #749. sources:\n@@ -160,229 +149,93 @@ class AddCycleway(\n \n override fun createForm() = AddCyclewayForm()\n \n- override fun applyAnswerTo(answer: CyclewayAnswer, tags: Tags, timestampEdited: Long) {\n- if (answer.left == answer.right) {\n- answer.left?.let { applyCyclewayAnswerTo(it.cycleway, Side.BOTH, 0, tags) }\n- deleteCyclewayAnswerIfExists(Side.LEFT, tags)\n- deleteCyclewayAnswerIfExists(Side.RIGHT, tags)\n- } else {\n- answer.left?.let { applyCyclewayAnswerTo(it.cycleway, Side.LEFT, it.dirInOneway, tags) }\n- answer.right?.let { applyCyclewayAnswerTo(it.cycleway, Side.RIGHT, it.dirInOneway, tags) }\n- deleteCyclewayAnswerIfExists(Side.BOTH, tags)\n- }\n- deleteCyclewayAnswerIfExists(null, tags)\n-\n- applySidewalkAnswerTo(answer.left?.cycleway, answer.right?.cycleway, tags)\n-\n- if (answer.isOnewayNotForCyclists) {\n- tags[\"oneway:bicycle\"] = \"no\"\n- } else {\n- if (tags[\"oneway:bicycle\"] == \"no\") {\n- tags.remove(\"oneway:bicycle\")\n- }\n- }\n-\n- // only set the check date if nothing was changed\n- if (!tags.hasChanges || tags.hasCheckDateForKey(\"cycleway\")) {\n- tags.updateCheckDateForKey(\"cycleway\")\n- }\n- }\n-\n- /** Just add a sidewalk if we implicitly know from the answer that there is one */\n- private fun applySidewalkAnswerTo(cyclewayLeft: Cycleway?, cyclewayRight: Cycleway?, tags: Tags) {\n-\n- /* only tag if we know the sidewalk value for both sides (because it is not possible in\n- OSM to specify the sidewalk value only for one side. sidewalk:right/left=yes is not\n- well established. */\n- if (cyclewayLeft?.isOnSidewalk == true && cyclewayRight?.isOnSidewalk == true) {\n- tags[\"sidewalk\"] = \"both\"\n- }\n- }\n-\n- private enum class Side(val value: String) {\n- LEFT(\"left\"), RIGHT(\"right\"), BOTH(\"both\")\n- }\n-\n- private fun applyCyclewayAnswerTo(cycleway: Cycleway, side: Side, dir: Int, tags: Tags) {\n- val directionValue = when {\n- dir > 0 -> \"yes\"\n- dir < 0 -> \"-1\"\n- else -> null\n- }\n-\n- val cyclewayKey = \"cycleway:\" + side.value\n- when (cycleway) {\n- NONE, NONE_NO_ONEWAY -> {\n- tags[cyclewayKey] = \"no\"\n- }\n- EXCLUSIVE_LANE, ADVISORY_LANE, UNSPECIFIED_LANE -> {\n- tags[cyclewayKey] = \"lane\"\n- if (directionValue != null) {\n- tags[\"$cyclewayKey:oneway\"] = directionValue\n- }\n- if (cycleway == EXCLUSIVE_LANE) {\n- tags[\"$cyclewayKey:lane\"] = \"exclusive\"\n- } else if (cycleway == ADVISORY_LANE) {\n- tags[\"$cyclewayKey:lane\"] = \"advisory\"\n- }\n- }\n- TRACK -> {\n- tags[cyclewayKey] = \"track\"\n- if (directionValue != null) {\n- tags[\"$cyclewayKey:oneway\"] = directionValue\n- }\n- if (tags.containsKey(\"$cyclewayKey:segregated\")) {\n- tags[\"$cyclewayKey:segregated\"] = \"yes\"\n- }\n- }\n- DUAL_TRACK -> {\n- tags[cyclewayKey] = \"track\"\n- tags[\"$cyclewayKey:oneway\"] = \"no\"\n- }\n- DUAL_LANE -> {\n- tags[cyclewayKey] = \"lane\"\n- tags[\"$cyclewayKey:oneway\"] = \"no\"\n- tags[\"$cyclewayKey:lane\"] = \"exclusive\"\n- }\n- SIDEWALK_EXPLICIT -> {\n- // https://wiki.openstreetmap.org/wiki/File:Z240GemeinsamerGehundRadweg.jpeg\n- tags[cyclewayKey] = \"track\"\n- tags[\"$cyclewayKey:segregated\"] = \"no\"\n- }\n- PICTOGRAMS -> {\n- tags[cyclewayKey] = \"shared_lane\"\n- tags[\"$cyclewayKey:lane\"] = \"pictogram\"\n- }\n- SUGGESTION_LANE -> {\n- tags[cyclewayKey] = \"shared_lane\"\n- tags[\"$cyclewayKey:lane\"] = \"advisory\"\n- }\n- BUSWAY -> {\n- tags[cyclewayKey] = \"share_busway\"\n- }\n- SEPARATE -> {\n- tags[cyclewayKey] = \"separate\"\n- }\n- else -> {\n- throw IllegalArgumentException(\"Invalid cycleway\")\n- }\n- }\n-\n- // clear previous cycleway:lane value\n- if (!cycleway.isLane) {\n- tags.remove(\"$cyclewayKey:lane\")\n- }\n- // clear previous cycleway:oneway=no value (if not about to set a new value)\n- if (cycleway.isOneway && directionValue == null) {\n- if (tags[\"$cyclewayKey:oneway\"] == \"no\") {\n- tags.remove(\"$cyclewayKey:oneway\")\n- }\n- }\n- // clear previous cycleway:segregated=no value\n- if (cycleway != SIDEWALK_EXPLICIT && cycleway != TRACK) {\n- if (tags[\"$cyclewayKey:segregated\"] == \"no\") {\n- tags.remove(\"$cyclewayKey:segregated\")\n- }\n- }\n+ override fun applyAnswerTo(answer: LeftAndRightCycleway, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n+ val countryInfo = countryInfos.getByLocation(\n+ countryBoundariesFuture.get(),\n+ geometry.center.longitude,\n+ geometry.center.latitude\n+ )\n+ answer.applyTo(tags, countryInfo.isLeftHandTraffic)\n }\n+}\n \n- /** clear previous answers for the given side */\n- private fun deleteCyclewayAnswerIfExists(side: Side?, tags: Tags) {\n- val sideVal = if (side == null) \"\" else \":\" + side.value\n- val cyclewayKey = \"cycleway$sideVal\"\n-\n- // only things are cleared that are set by this quest\n- // for example cycleway:surface should only be cleared by a cycleway surface quest etc.\n- tags.remove(cyclewayKey)\n- tags.remove(\"$cyclewayKey:lane\")\n- tags.remove(\"$cyclewayKey:oneway\")\n- tags.remove(\"$cyclewayKey:segregated\")\n- tags.remove(\"sidewalk$sideVal:bicycle\")\n- }\n-\n- companion object {\n-\n- /* Excluded is\n- - anything explicitly tagged as no bicycles or having to use separately mapped sidepath\n- - if not already tagged with a cycleway: streets with low speed or that are not paved, as\n- they are very unlikely to have cycleway infrastructure\n- - for highway=residential without speed limit tagged assume low speed\n- - if not already tagged, roads that are close (15m) to foot or cycleways (see #718)\n- - if already tagged, if not older than 4 years or if the cycleway tag uses some unknown value\n- */\n-\n- // streets that may have cycleway tagging\n- private val roadsFilter by lazy { \"\"\"\n- ways with\n- highway ~ primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified|residential|service\n- and area != yes\n- and motorroad != yes\n- and bicycle_road != yes\n- and cyclestreet != yes\n- and bicycle != no\n- and bicycle != designated\n- and access !~ private|no\n- and bicycle != use_sidepath\n- and bicycle:backward != use_sidepath\n- and bicycle:forward != use_sidepath\n- and sidewalk != separate\n- \"\"\".toElementFilterExpression() }\n-\n- // streets that do not have cycleway tagging yet\n- private val untaggedRoadsFilter by lazy { \"\"\"\n- ways with (\n- highway ~ primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified\n- or highway = residential and (maxspeed > 33 or $notIn30ZoneOrLess)\n- )\n- and !cycleway\n- and !cycleway:left\n- and !cycleway:right\n- and !cycleway:both\n- and !sidewalk:bicycle\n- and !sidewalk:left:bicycle\n- and !sidewalk:right:bicycle\n- and !sidewalk:both:bicycle\n- and (\n- !maxspeed\n- or maxspeed > 20\n- or $notIn30ZoneOrLess\n- )\n- and surface !~ ${ANYTHING_UNPAVED.joinToString(\"|\")}\n- \"\"\".toElementFilterExpression() }\n-\n- private val maybeSeparatelyMappedCyclewaysFilter by lazy { \"\"\"\n- ways with highway ~ path|footway|cycleway|construction\n- \"\"\".toElementFilterExpression() }\n- // highway=construction included, as situation often changes during and after construction\n-\n- private val notIn30ZoneOrLess = MAXSPEED_TYPE_KEYS.joinToString(\" or \") {\n- \"\"\"$it and $it !~ \".*zone:?([1-9]|[1-2][0-9]|30)\"\"\"\"\n- }\n-\n- private val olderThan4Years = TagOlderThan(\"cycleway\", RelativeDate(-(365 * 4).toFloat()))\n+/* Excluded is\n+ - anything explicitly tagged as no bicycles or having to use separately mapped sidepath\n+ - if not already tagged with a cycleway: streets with low speed or that are not paved, as\n+ they are very unlikely to have cycleway infrastructure\n+ - for highway=residential without speed limit tagged assume low speed\n+ - if not already tagged, roads that are close (15m) to foot or cycleways (see #718)\n+ - if already tagged, if not older than 4 years or if the cycleway tag uses some unknown value\n+*/\n+\n+// streets that may have cycleway tagging\n+private val roadsFilter by lazy { \"\"\"\n+ ways with\n+ highway ~ primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified|residential|service\n+ and area != yes\n+ and motorroad != yes\n+ and expressway != yes\n+ and bicycle_road != yes\n+ and cyclestreet != yes\n+ and bicycle != no\n+ and bicycle != designated\n+ and access !~ private|no\n+ and bicycle != use_sidepath\n+ and bicycle:backward != use_sidepath\n+ and bicycle:forward != use_sidepath\n+ and sidewalk != separate\n+\"\"\".toElementFilterExpression() }\n+\n+// streets that do not have cycleway tagging yet\n+private val untaggedRoadsFilter by lazy { \"\"\"\n+ ways with (\n+ highway ~ primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified\n+ or highway = residential and (maxspeed > 33 or $notIn30ZoneOrLess)\n+ )\n+ and !cycleway\n+ and !cycleway:left\n+ and !cycleway:right\n+ and !cycleway:both\n+ and !sidewalk:bicycle\n+ and !sidewalk:left:bicycle\n+ and !sidewalk:right:bicycle\n+ and !sidewalk:both:bicycle\n+ and (\n+ !maxspeed\n+ or maxspeed > 20\n+ or $notIn30ZoneOrLess\n+ )\n+ and surface !~ ${ANYTHING_UNPAVED.joinToString(\"|\")}\n+\"\"\".toElementFilterExpression() }\n+\n+private val maybeSeparatelyMappedCyclewaysFilter by lazy { \"\"\"\n+ ways with highway ~ path|footway|cycleway|construction\n+\"\"\".toElementFilterExpression() }\n+// highway=construction included, as situation often changes during and after construction\n+\n+private val notIn30ZoneOrLess = MAXSPEED_TYPE_KEYS.joinToString(\" or \") {\n+ \"\"\"$it and $it !~ \".*zone:?([1-9]|[1-2][0-9]|30)\"\"\"\"\n+}\n \n- private fun Element.hasOldInvalidOrAmbiguousCyclewayTags(countryInfo: CountryInfo?): Boolean? {\n- val sides = createCyclewaySides(tags, false)\n- // has no cycleway tagging\n- if (sides == null) return false\n- // any cycleway tagging is not known: don't mess with that\n- if (sides.any { it.isUnknown }) return false\n- // has any invalid cycleway tags\n- if (sides.any { it.isInvalid }) return true\n- // or it is older than x years\n- if (olderThan4Years.matches(this)) return true\n- // has any ambiguous cycleway tags\n- if (countryInfo != null) {\n- if (sides.any { it.isAmbiguous(countryInfo) }) return true\n- } else {\n- if (sides.any { it == UNSPECIFIED_SHARED_LANE }) return true\n- // for this, a countryCode is necessary, thus return null if no country code is available\n- if (sides.any { it == UNSPECIFIED_LANE }) return null\n- }\n- return false\n- }\n+private val olderThan4Years = TagOlderThan(\"cycleway\", RelativeDate(-(365 * 4).toFloat()))\n+\n+private fun Element.hasOldInvalidOrAmbiguousCyclewayTags(countryInfo: CountryInfo?): Boolean? {\n+ val sides = createCyclewaySides(tags, false)\n+ // has no cycleway tagging\n+ if (sides == null) return false\n+ // any cycleway tagging is not known: don't mess with that\n+ if (sides.any { it.cycleway.isUnknown }) return false\n+ // has any invalid cycleway tags\n+ if (sides.any { it.cycleway.isInvalid }) return true\n+ // or it is older than x years\n+ if (olderThan4Years.matches(this)) return true\n+ // has any ambiguous cycleway tags\n+ if (countryInfo != null) {\n+ if (sides.any { it.cycleway.isAmbiguous(countryInfo) }) return true\n+ } else {\n+ if (sides.any { it.cycleway == UNSPECIFIED_SHARED_LANE }) return true\n+ // for this, a countryCode is necessary, thus return null if no country code is available\n+ if (sides.any { it.cycleway == UNSPECIFIED_LANE }) return null\n }\n+ return false\n }\n-\n-private fun LeftAndRightCycleway.any(block: (cycleway: Cycleway) -> Boolean): Boolean =\n- left?.let(block) == true || right?.let(block) == true\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/AddCyclewayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/AddCyclewayForm.kt\nindex 402240ba60b..20b10180487 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/AddCyclewayForm.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/AddCyclewayForm.kt\n@@ -6,22 +6,31 @@ import androidx.appcompat.app.AlertDialog\n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n import de.westnordost.streetcomplete.osm.cycleway.Cycleway\n+import de.westnordost.streetcomplete.osm.cycleway.CyclewayAndDirection\n+import de.westnordost.streetcomplete.osm.cycleway.LeftAndRightCycleway\n+import de.westnordost.streetcomplete.osm.cycleway.asDialogItem\n+import de.westnordost.streetcomplete.osm.cycleway.asStreetSideItem\n import de.westnordost.streetcomplete.osm.cycleway.createCyclewaySides\n-import de.westnordost.streetcomplete.osm.cycleway.getSelectableCyclewaysInCountry\n-import de.westnordost.streetcomplete.osm.cycleway.isAmbiguous\n-import de.westnordost.streetcomplete.osm.isForwardOneway\n-import de.westnordost.streetcomplete.osm.isNotOnewayForCyclists\n+import de.westnordost.streetcomplete.osm.cycleway.getSelectableCycleways\n+import de.westnordost.streetcomplete.osm.cycleway.wasNoOnewayForCyclistsButNowItIs\n+import de.westnordost.streetcomplete.osm.cycleway.selectableOrNullValues\n import de.westnordost.streetcomplete.osm.isOneway\n import de.westnordost.streetcomplete.osm.isReversedOneway\n import de.westnordost.streetcomplete.quests.AStreetSideSelectForm\n import de.westnordost.streetcomplete.quests.AnswerItem\n+import de.westnordost.streetcomplete.quests.IAnswerItem\n+import de.westnordost.streetcomplete.util.ktx.toast\n import de.westnordost.streetcomplete.view.controller.StreetSideDisplayItem\n+import de.westnordost.streetcomplete.view.controller.StreetSideSelectWithLastAnswerButtonViewController\n import de.westnordost.streetcomplete.view.controller.StreetSideSelectWithLastAnswerButtonViewController.Sides.BOTH\n import de.westnordost.streetcomplete.view.controller.StreetSideSelectWithLastAnswerButtonViewController.Sides.LEFT\n import de.westnordost.streetcomplete.view.controller.StreetSideSelectWithLastAnswerButtonViewController.Sides.RIGHT\n import de.westnordost.streetcomplete.view.image_select.ImageListPickerDialog\n+import kotlinx.serialization.decodeFromString\n+import kotlinx.serialization.encodeToString\n+import kotlinx.serialization.json.Json\n \n-class AddCyclewayForm : AStreetSideSelectForm() {\n+class AddCyclewayForm : AStreetSideSelectForm() {\n \n override val buttonPanelAnswers get() =\n if (isDisplayingPrevious) listOf(\n@@ -30,15 +39,11 @@ class AddCyclewayForm : AStreetSideSelectForm() {\n )\n else emptyList()\n \n- override val otherAnswers: List get() {\n- val isNoRoundabout = element.tags[\"junction\"] != \"roundabout\" && element.tags[\"junction\"] != \"circular\"\n- val result = mutableListOf()\n- if (streetSideSelect.showSides != BOTH && isNoRoundabout) {\n- result.add(AnswerItem(R.string.quest_cycleway_answer_contraflow_cycleway) { streetSideSelect.showSides = BOTH })\n- }\n- result.add(AnswerItem(R.string.quest_cycleway_answer_no_bicycle_infrastructure) { noCyclewayHereHint() })\n- return result\n- }\n+ override val otherAnswers: List get() = listOfNotNull(\n+ createShowBothSidesAnswer(),\n+ AnswerItem(R.string.quest_cycleway_answer_no_bicycle_infrastructure, ::noCyclewayHereHint),\n+ AnswerItem(R.string.cycleway_reverse_direction, ::selectReverseCyclewayDirection)\n+ )\n \n private fun noCyclewayHereHint() {\n activity?.let { AlertDialog.Builder(it)\n@@ -49,27 +54,22 @@ class AddCyclewayForm : AStreetSideSelectForm() {\n }\n }\n \n- private val likelyNoBicycleContraflow = \"\"\"\n- ways with oneway:bicycle != no and (\n- oneway ~ yes|-1 and highway ~ primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified\n- or junction ~ roundabout|circular\n- )\n- \"\"\".toElementFilterExpression()\n+ private var reverseDirection: Boolean = false\n \n /** returns whether the side that goes into the opposite direction of the driving direction of a\n * one-way is on the right side of the way */\n private val isReverseSideRight get() = isReversedOneway xor isLeftHandTraffic\n \n private val isOneway get() = isOneway(element.tags)\n-\n- private val isForwardOneway get() = isForwardOneway(element.tags)\n private val isReversedOneway get() = isReversedOneway(element.tags)\n \n // just a shortcut\n private val isLeftHandTraffic get() = countryInfo.isLeftHandTraffic\n \n private fun isContraflowInOneway(isRight: Boolean): Boolean =\n- isOneway && (isReverseSideRight xor !isRight)\n+ isOneway && (isReverseSideRight == isRight)\n+\n+ /* ---------------------------------------- lifecycle --------------------------------------- */\n \n override fun onViewCreated(view: View, savedInstanceState: Bundle?) {\n super.onViewCreated(view, savedInstanceState)\n@@ -79,106 +79,101 @@ class AddCyclewayForm : AStreetSideSelectForm() {\n }\n \n private fun initStateFromTags() {\n- val sides = createCyclewaySides(element.tags, isLeftHandTraffic)\n- val left = sides?.left?.takeIf { !it.isAmbiguous(countryInfo) && !it.isInvalid && !it.isUnknown }\n- val right = sides?.right?.takeIf { !it.isAmbiguous(countryInfo) && !it.isInvalid && !it.isUnknown }\n- val bothSidesWereDefinedBefore = sides?.left != null && sides.right != null\n- val bicycleTrafficOnBothSidesIsLikely = !likelyNoBicycleContraflow.matches(element)\n+ val cycleways = createCyclewaySides(element.tags, isLeftHandTraffic)?.selectableOrNullValues(countryInfo)\n \n- streetSideSelect.showSides = when {\n- bothSidesWereDefinedBefore || bicycleTrafficOnBothSidesIsLikely -> BOTH\n- isLeftHandTraffic -> LEFT\n- else -> RIGHT\n- }\n- val leftItem = left?.asStreetSideItem(countryInfo, isContraflowInOneway(false))\n+ streetSideSelect.showSides = getInitiallyShownSides(cycleways)\n+\n+ val leftItem = cycleways?.left?.asStreetSideItem(false, isContraflowInOneway(false), countryInfo)\n streetSideSelect.setPuzzleSide(leftItem, false)\n \n- val rightItem = right?.asStreetSideItem(countryInfo, isContraflowInOneway(true))\n+ val rightItem = cycleways?.right?.asStreetSideItem(true, isContraflowInOneway(true), countryInfo)\n streetSideSelect.setPuzzleSide(rightItem, true)\n \n // only show as re-survey (yes/no button) if the previous tagging was complete\n isDisplayingPrevious = streetSideSelect.isComplete\n }\n \n- /* ---------------------------------- selection dialog -------------------------------------- */\n+ /* --------------------------------- showing only one side ---------------------------------- */\n \n- override fun onClickSide(isRight: Boolean) {\n- val isContraflowInOneway = isContraflowInOneway(isRight)\n- val dialogItems = getSelectableCycleways(isRight)\n- .map { it.asDialogItem(requireContext(), countryInfo, isContraflowInOneway) }\n+ private fun createShowBothSidesAnswer(): IAnswerItem? {\n+ val isNoRoundabout = element.tags[\"junction\"] != \"roundabout\" && element.tags[\"junction\"] != \"circular\"\n+ return if (streetSideSelect.showSides != BOTH && isNoRoundabout) {\n+ AnswerItem(R.string.quest_cycleway_answer_contraflow_cycleway) { streetSideSelect.showSides = BOTH }\n+ } else null\n+ }\n \n- ImageListPickerDialog(requireContext(), dialogItems, R.layout.labeled_icon_button_cell, 2) { item ->\n- val streetSideItem = item.value!!.asStreetSideItem(countryInfo, isContraflowInOneway)\n- streetSideSelect.replacePuzzleSide(streetSideItem, isRight)\n- }.show()\n+ private fun getInitiallyShownSides(cycleways: LeftAndRightCycleway?): StreetSideSelectWithLastAnswerButtonViewController.Sides {\n+ val bothSidesWereDefinedBefore = cycleways?.left != null && cycleways.right != null\n+ val bicycleTrafficOnBothSidesIsLikely = !likelyNoBicycleContraflow.matches(element)\n+\n+ return when {\n+ bothSidesWereDefinedBefore || bicycleTrafficOnBothSidesIsLikely -> BOTH\n+ isLeftHandTraffic -> LEFT\n+ else -> RIGHT\n+ }\n }\n \n- private fun getSelectableCycleways(isRight: Boolean): List {\n- val values = getSelectableCyclewaysInCountry(countryInfo).toMutableList()\n- // different wording for a contraflow lane that is marked like a \"shared\" lane (just bicycle pictogram)\n- if (isOneway && isReverseSideRight == isRight) {\n- values.remove(Cycleway.PICTOGRAMS)\n- values.add(values.indexOf(Cycleway.NONE) + 1, Cycleway.NONE_NO_ONEWAY)\n+ private val likelyNoBicycleContraflow = \"\"\"\n+ ways with oneway:bicycle != no and (\n+ oneway ~ yes|-1 and highway ~ primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified\n+ or junction ~ roundabout|circular\n+ )\n+ \"\"\".toElementFilterExpression()\n+\n+ /* ------------------------------ reverse cycleway direction -------------------------------- */\n+\n+ private fun selectReverseCyclewayDirection() {\n+ confirmSelectReverseCyclewayDirection {\n+ reverseDirection = true\n+ context?.toast(R.string.cycleway_reverse_direction_toast)\n }\n- return values\n }\n \n- override fun serialize(item: Cycleway) = item.name\n- override fun deserialize(str: String) = Cycleway.valueOf(str)\n- override fun asStreetSideItem(item: Cycleway, isRight: Boolean): StreetSideDisplayItem {\n+ private fun confirmSelectReverseCyclewayDirection(callback: () -> Unit) {\n+ AlertDialog.Builder(requireContext())\n+ .setTitle(R.string.quest_generic_confirmation_title)\n+ .setMessage(R.string.cycleway_reverse_direction_warning)\n+ .setPositiveButton(R.string.quest_generic_confirmation_yes) { _, _ -> callback() }\n+ .setNegativeButton(R.string.quest_generic_confirmation_no, null)\n+ .show()\n+ }\n+\n+ private fun reverseCyclewayDirection(isRight: Boolean) {\n val isContraflowInOneway = isContraflowInOneway(isRight)\n- // NONE_NO_ONEWAY is displayed as simply NONE if not in contraflow because the former makes\n- // only really sense in contraflow. This can only happen when applying the side(s) via the\n- // last answer button\n- val item2 = if (item == Cycleway.NONE_NO_ONEWAY && !isContraflowInOneway) Cycleway.NONE else item\n- return item2.asStreetSideItem(countryInfo, isContraflowInOneway)\n+ reverseDirection = false\n+ val value = streetSideSelect.getPuzzleSide(isRight)?.value ?: return\n+ val newValue = value.copy(direction = value.direction.reverse())\n+ val newItem = newValue.asStreetSideItem(isRight, isContraflowInOneway, countryInfo)\n+ streetSideSelect.replacePuzzleSide(newItem, isRight)\n }\n \n- /* --------------------------------------- apply answer ------------------------------------- */\n+ /* --------------------------------- select & apply answer ---------------------------------- */\n \n- override fun onClickOk() {\n- val leftSide = streetSideSelect.left?.value\n- val rightSide = streetSideSelect.right?.value\n-\n- // a cycleway that goes into opposite direction of a oneway street needs special tagging\n- // as oneway:bicycle=* tag will differ from oneway=*\n- // there is no need to tag cases where oneway:bicycle=* would merely repeat oneway=*\n- var leftSideDir = 0\n- var rightSideDir = 0\n- var isOnewayNotForCyclists = false\n- if (isOneway && leftSide != null && rightSide != null) {\n- // if the road is oneway=-1, a cycleway that goes opposite to it would be cycleway:oneway=yes\n- val reverseDir = if (isReversedOneway) 1 else -1\n-\n- if (isReverseSideRight) {\n- if (rightSide.isSingleTrackOrLane()) {\n- rightSideDir = reverseDir\n- }\n- } else {\n- if (leftSide.isSingleTrackOrLane()) {\n- leftSideDir = reverseDir\n- }\n- }\n-\n- isOnewayNotForCyclists = leftSide.isDualTrackOrLane() || rightSide.isDualTrackOrLane()\n- || (if (isReverseSideRight) rightSide else leftSide) !== Cycleway.NONE\n+ override fun onClickSide(isRight: Boolean) {\n+ if (reverseDirection) {\n+ reverseCyclewayDirection(isRight)\n+ } else {\n+ selectCycleway(isRight)\n }\n+ }\n \n- val answer = CyclewayAnswer(\n- left = leftSide?.let { CyclewaySide(it, leftSideDir) },\n- right = rightSide?.let { CyclewaySide(it, rightSideDir) },\n- isOnewayNotForCyclists = isOnewayNotForCyclists\n- )\n+ private fun selectCycleway(isRight: Boolean) {\n+ val isContraflowInOneway = isContraflowInOneway(isRight)\n+ val dialogItems = getSelectableCycleways(countryInfo, element.tags, isRight)\n+ .map { it.asDialogItem(isRight, isContraflowInOneway, requireContext(), countryInfo, ) }\n \n- val wasOnewayNotForCyclists = isOneway && isNotOnewayForCyclists(element.tags, isLeftHandTraffic)\n- if (!isOnewayNotForCyclists && wasOnewayNotForCyclists) {\n- confirmNotOnewayForCyclists {\n- applyAnswer(answer)\n- streetSideSelect.saveLastSelection()\n- }\n+ ImageListPickerDialog(requireContext(), dialogItems, R.layout.labeled_icon_button_cell, 2) { item ->\n+ val streetSideItem = item.value!!.asStreetSideItem(isRight, isContraflowInOneway, countryInfo)\n+ streetSideSelect.replacePuzzleSide(streetSideItem, isRight)\n+ }.show()\n+ }\n+\n+ override fun onClickOk() {\n+ val cycleways = LeftAndRightCycleway(streetSideSelect.left?.value, streetSideSelect.right?.value)\n+ if (cycleways.wasNoOnewayForCyclistsButNowItIs(element.tags, isLeftHandTraffic)) {\n+ confirmNotOnewayForCyclists { saveAndApplyCycleway(cycleways) }\n } else {\n- applyAnswer(answer)\n- streetSideSelect.saveLastSelection()\n+ saveAndApplyCycleway(cycleways)\n }\n }\n \n@@ -189,10 +184,22 @@ class AddCyclewayForm : AStreetSideSelectForm() {\n .setNegativeButton(R.string.quest_generic_confirmation_no, null)\n .show()\n }\n-}\n \n-private fun Cycleway.isSingleTrackOrLane() =\n- this === Cycleway.TRACK || this === Cycleway.EXCLUSIVE_LANE\n+ private fun saveAndApplyCycleway(cycleways: LeftAndRightCycleway) {\n+ streetSideSelect.saveLastSelection()\n+ applyAnswer(cycleways)\n+ }\n+\n+ /* --------------------------------- AStreetSideSelectForm ---------------------------------- */\n \n-private fun Cycleway.isDualTrackOrLane() =\n- this === Cycleway.DUAL_TRACK || this === Cycleway.DUAL_LANE\n+ override fun serialize(item: CyclewayAndDirection) = Json.encodeToString(item)\n+ override fun deserialize(str: String) = Json.decodeFromString(str)\n+ override fun asStreetSideItem(item: CyclewayAndDirection, isRight: Boolean): StreetSideDisplayItem {\n+ val isContraflowInOneway = isContraflowInOneway(isRight)\n+ // NONE_NO_ONEWAY is displayed as simply NONE if not in contraflow because the former makes\n+ // only really sense in contraflow. This can only happen when applying the side(s) via the\n+ // last answer button\n+ val item2 = if (item.cycleway == Cycleway.NONE_NO_ONEWAY && !isContraflowInOneway) item.copy(cycleway = Cycleway.NONE) else item\n+ return item2.asStreetSideItem(isRight, isContraflowInOneway, countryInfo)\n+ }\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/CyclewayAnswer.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/CyclewayAnswer.kt\ndeleted file mode 100644\nindex 6e2dec09955..00000000000\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/CyclewayAnswer.kt\n+++ /dev/null\n@@ -1,11 +0,0 @@\n-package de.westnordost.streetcomplete.quests.cycleway\n-\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway\n-\n-data class CyclewayAnswer(\n- val left: CyclewaySide?,\n- val right: CyclewaySide?,\n- val isOnewayNotForCyclists: Boolean = false\n-)\n-\n-data class CyclewaySide(val cycleway: Cycleway, val dirInOneway: Int = 0)\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/CyclewayItem.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/CyclewayItem.kt\ndeleted file mode 100644\nindex 81ced59ca1e..00000000000\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/cycleway/CyclewayItem.kt\n+++ /dev/null\n@@ -1,139 +0,0 @@\n-package de.westnordost.streetcomplete.quests.cycleway\n-\n-import android.content.Context\n-import android.graphics.Canvas\n-import android.graphics.drawable.Drawable\n-import de.westnordost.streetcomplete.R\n-import de.westnordost.streetcomplete.data.meta.CountryInfo\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.ADVISORY_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.BUSWAY\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.DUAL_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.DUAL_TRACK\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.EXCLUSIVE_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.NONE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.NONE_NO_ONEWAY\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.PICTOGRAMS\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.SEPARATE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.SIDEWALK_EXPLICIT\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.SUGGESTION_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.TRACK\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.UNSPECIFIED_LANE\n-import de.westnordost.streetcomplete.util.ktx.getAdvisoryCycleLaneResId\n-import de.westnordost.streetcomplete.util.ktx.getDualCycleLaneResId\n-import de.westnordost.streetcomplete.util.ktx.getExclusiveCycleLaneResId\n-import de.westnordost.streetcomplete.util.ktx.getPictogramCycleLaneResId\n-import de.westnordost.streetcomplete.util.ktx.noEntrySignDrawableResId\n-import de.westnordost.streetcomplete.view.DrawableImage\n-import de.westnordost.streetcomplete.view.DrawableWrapper\n-import de.westnordost.streetcomplete.view.Image\n-import de.westnordost.streetcomplete.view.ResImage\n-import de.westnordost.streetcomplete.view.ResText\n-import de.westnordost.streetcomplete.view.controller.StreetSideItem\n-import de.westnordost.streetcomplete.view.image_select.Item2\n-\n-fun Cycleway.asDialogItem(context: Context, countryInfo: CountryInfo, isContraflowInOneway: Boolean) =\n- Item2(\n- this,\n- getDialogIcon(context, countryInfo),\n- ResText(getTitleResId(isContraflowInOneway))\n- )\n-\n-fun Cycleway.asStreetSideItem(\n- countryInfo: CountryInfo,\n- isContraflowInOneway: Boolean\n-) =\n- StreetSideItem(\n- this,\n- getIconResId(countryInfo),\n- getTitleResId(isContraflowInOneway),\n- getDialogIconResId(countryInfo),\n- getFloatingIconResId(isContraflowInOneway, countryInfo.noEntrySignDrawableResId)\n- )\n-\n-private fun Cycleway.getDialogIcon(context: Context, countryInfo: CountryInfo): Image {\n- val id = getDialogIconResId(countryInfo)\n- return if (countryInfo.isLeftHandTraffic) {\n- DrawableImage(Rotate180Degrees(context.getDrawable(id)!!))\n- } else {\n- ResImage(id)\n- }\n-}\n-\n-private fun Cycleway.getDialogIconResId(countryInfo: CountryInfo): Int =\n- when (this) {\n- NONE -> R.drawable.ic_cycleway_none_in_selection\n- SEPARATE -> R.drawable.ic_cycleway_separate\n- else -> getIconResId(countryInfo)\n- }\n-\n-private class Rotate180Degrees(drawable: Drawable) : DrawableWrapper(drawable) {\n- override fun draw(canvas: Canvas) {\n- canvas.scale(-1f, -1f, bounds.width() / 2f, bounds.height() / 2f)\n- drawable.bounds = bounds\n- drawable.draw(canvas)\n- }\n-}\n-\n-private fun Cycleway.getFloatingIconResId(isContraflowInOneway: Boolean, noEntrySignDrawableResId: Int): Int? = when (this) {\n- NONE -> if (isContraflowInOneway) noEntrySignDrawableResId else null\n- SEPARATE -> R.drawable.ic_sidewalk_floating_separate\n- else -> null\n-}\n-\n-private fun Cycleway.getIconResId(countryInfo: CountryInfo): Int =\n- if (countryInfo.isLeftHandTraffic) getLeftHandTrafficIconResId(countryInfo) else getRightHandTrafficIconResId(countryInfo)\n-\n-private fun Cycleway.getRightHandTrafficIconResId(countryInfo: CountryInfo): Int = when (this) {\n- UNSPECIFIED_LANE -> countryInfo.getExclusiveCycleLaneResId(false)\n- EXCLUSIVE_LANE -> countryInfo.getExclusiveCycleLaneResId(false)\n- ADVISORY_LANE -> countryInfo.getAdvisoryCycleLaneResId(false)\n- SUGGESTION_LANE -> countryInfo.getAdvisoryCycleLaneResId(false)\n- TRACK -> R.drawable.ic_cycleway_track\n- NONE -> R.drawable.ic_cycleway_none\n- NONE_NO_ONEWAY -> R.drawable.ic_cycleway_none_no_oneway\n- PICTOGRAMS -> countryInfo.getPictogramCycleLaneResId(false)\n- SIDEWALK_EXPLICIT -> R.drawable.ic_cycleway_sidewalk_explicit\n- DUAL_LANE -> countryInfo.getDualCycleLaneResId(false)\n- DUAL_TRACK -> R.drawable.ic_cycleway_track_dual\n- BUSWAY -> R.drawable.ic_cycleway_bus_lane\n- SEPARATE -> R.drawable.ic_cycleway_none\n- else -> 0\n-}\n-\n-private fun Cycleway.getLeftHandTrafficIconResId(countryInfo: CountryInfo): Int = when (this) {\n- UNSPECIFIED_LANE -> countryInfo.getExclusiveCycleLaneResId(true)\n- EXCLUSIVE_LANE -> countryInfo.getExclusiveCycleLaneResId(true)\n- ADVISORY_LANE -> countryInfo.getAdvisoryCycleLaneResId(true)\n- SUGGESTION_LANE -> countryInfo.getAdvisoryCycleLaneResId(true)\n- TRACK -> R.drawable.ic_cycleway_track_l\n- NONE -> R.drawable.ic_cycleway_none\n- NONE_NO_ONEWAY -> R.drawable.ic_cycleway_none_no_oneway_l\n- PICTOGRAMS -> countryInfo.getPictogramCycleLaneResId(true)\n- SIDEWALK_EXPLICIT -> R.drawable.ic_cycleway_sidewalk_explicit_l\n- DUAL_LANE -> countryInfo.getDualCycleLaneResId(true)\n- DUAL_TRACK -> R.drawable.ic_cycleway_track_dual_l\n- BUSWAY -> R.drawable.ic_cycleway_bus_lane_l\n- SEPARATE -> R.drawable.ic_cycleway_none\n- else -> 0\n-}\n-\n-private fun Cycleway.getTitleResId(isContraflowInOneway: Boolean): Int = when (this) {\n- UNSPECIFIED_LANE -> R.string.quest_cycleway_value_lane\n- EXCLUSIVE_LANE -> R.string.quest_cycleway_value_lane\n- ADVISORY_LANE -> R.string.quest_cycleway_value_advisory_lane\n- SUGGESTION_LANE -> R.string.quest_cycleway_value_advisory_lane\n- TRACK -> R.string.quest_cycleway_value_track\n- NONE -> {\n- if (isContraflowInOneway) R.string.quest_cycleway_value_none_and_oneway\n- else R.string.quest_cycleway_value_none\n- }\n- NONE_NO_ONEWAY -> R.string.quest_cycleway_value_none_but_no_oneway\n- PICTOGRAMS -> R.string.quest_cycleway_value_shared\n- SIDEWALK_EXPLICIT -> R.string.quest_cycleway_value_sidewalk\n- DUAL_LANE -> R.string.quest_cycleway_value_lane_dual\n- DUAL_TRACK -> R.string.quest_cycleway_value_track_dual\n- BUSWAY -> R.string.quest_cycleway_value_bus_lane\n- SEPARATE -> R.string.quest_cycleway_value_separate\n- else -> 0\n-}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/defibrillator/AddIsDefibrillatorIndoor.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/defibrillator/AddIsDefibrillatorIndoor.kt\nindex 4d36d1c139b..0842d373eb6 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/defibrillator/AddIsDefibrillatorIndoor.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/defibrillator/AddIsDefibrillatorIndoor.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.defibrillator\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -30,7 +31,7 @@ class AddIsDefibrillatorIndoor : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"indoor\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddHalal.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddHalal.kt\nindex 7ac67f6ef64..625807024d2 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddHalal.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddHalal.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.diet_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -38,7 +39,7 @@ class AddHalal : OsmFilterQuestType() {\n \n override fun createForm() = AddDietTypeForm.create(R.string.quest_dietType_explanation_halal)\n \n- override fun applyAnswerTo(answer: DietAvailabilityAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: DietAvailabilityAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is DietAvailability -> tags.updateWithCheckDate(\"diet:halal\", answer.osmValue)\n NoFood -> tags[\"food\"] = \"no\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddKosher.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddKosher.kt\nindex 52e38781d7f..7a06264a412 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddKosher.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddKosher.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.diet_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -38,7 +39,7 @@ class AddKosher : OsmFilterQuestType() {\n \n override fun createForm() = AddDietTypeForm.create(R.string.quest_dietType_explanation_kosher)\n \n- override fun applyAnswerTo(answer: DietAvailabilityAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: DietAvailabilityAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is DietAvailability -> tags.updateWithCheckDate(\"diet:kosher\", answer.osmValue)\n NoFood -> tags[\"food\"] = \"no\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddVegan.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddVegan.kt\nindex f4ca26104bc..a2e4edaa8e0 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddVegan.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddVegan.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.diet_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -42,7 +43,7 @@ class AddVegan : OsmFilterQuestType() {\n \n override fun createForm() = AddDietTypeForm.create(R.string.quest_dietType_explanation_vegan)\n \n- override fun applyAnswerTo(answer: DietAvailabilityAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: DietAvailabilityAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is DietAvailability -> tags.updateWithCheckDate(\"diet:vegan\", answer.osmValue)\n NoFood -> tags[\"food\"] = \"no\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddVegetarian.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddVegetarian.kt\nindex 5e8778f067c..ad33854a10e 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddVegetarian.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddVegetarian.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.diet_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -38,7 +39,7 @@ class AddVegetarian : OsmFilterQuestType() {\n \n override fun createForm() = AddDietTypeForm.create(R.string.quest_dietType_explanation_vegetarian)\n \n- override fun applyAnswerTo(answer: DietAvailabilityAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: DietAvailabilityAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is DietAvailability -> {\n tags.updateWithCheckDate(\"diet:vegetarian\", answer.osmValue)\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/drinking_water/AddDrinkingWater.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/drinking_water/AddDrinkingWater.kt\nindex b36f4e7de84..2e6eeb24fb5 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/drinking_water/AddDrinkingWater.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/drinking_water/AddDrinkingWater.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.drinking_water\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -39,7 +40,7 @@ class AddDrinkingWater : OsmFilterQuestType() {\n \n override fun createForm() = AddDrinkingWaterForm()\n \n- override fun applyAnswerTo(answer: DrinkingWater, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: DrinkingWater, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"drinking_water\"] = answer.osmValue\n answer.osmLegalValue?.let { tags[\"drinking_water:legal\"] = it }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/drinking_water_type/AddDrinkingWaterType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/drinking_water_type/AddDrinkingWaterType.kt\nindex 7acdc0bef86..76a00dfc470 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/drinking_water_type/AddDrinkingWaterType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/drinking_water_type/AddDrinkingWaterType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.drinking_water_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CITIZEN\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.OUTDOORS\n@@ -29,7 +30,7 @@ class AddDrinkingWaterType : OsmFilterQuestType() {\n \n override fun createForm() = AddDrinkingWaterTypeForm()\n \n- override fun applyAnswerTo(answer: DrinkingWaterType, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: DrinkingWaterType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n answer.applyTo(tags)\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/existence/CheckExistence.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/existence/CheckExistence.kt\nindex bce5b25af1e..f3f7714dc24 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/existence/CheckExistence.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/existence/CheckExistence.kt\n@@ -3,6 +3,7 @@ package de.westnordost.streetcomplete.quests.existence\n import de.westnordost.osmfeatures.FeatureDictionary\n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType\n@@ -114,7 +115,7 @@ class CheckExistence(\n \n override fun createForm() = CheckExistenceForm()\n \n- override fun applyAnswerTo(answer: Unit, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Unit, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateCheckDate()\n }\n \ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/ferry/AddFerryAccessMotorVehicle.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/ferry/AddFerryAccessMotorVehicle.kt\nindex 17396936209..8b8eaa5d676 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/ferry/AddFerryAccessMotorVehicle.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/ferry/AddFerryAccessMotorVehicle.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.ferry\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CAR\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.RARE\n@@ -21,7 +22,7 @@ class AddFerryAccessMotorVehicle : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"motor_vehicle\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/ferry/AddFerryAccessPedestrian.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/ferry/AddFerryAccessPedestrian.kt\nindex a99d7675c19..69c10f6f93b 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/ferry/AddFerryAccessPedestrian.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/ferry/AddFerryAccessPedestrian.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.ferry\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.PEDESTRIAN\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.RARE\n@@ -21,7 +22,7 @@ class AddFerryAccessPedestrian : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"foot\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant/AddFireHydrantType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant/AddFireHydrantType.kt\nindex f7658d54db3..d3076616b26 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant/AddFireHydrantType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant/AddFireHydrantType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.fire_hydrant\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -24,7 +25,7 @@ class AddFireHydrantType : OsmFilterQuestType() {\n \n override fun createForm() = AddFireHydrantTypeForm()\n \n- override fun applyAnswerTo(answer: FireHydrantType, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: FireHydrantType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"fire_hydrant:type\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant_diameter/AddFireHydrantDiameter.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant_diameter/AddFireHydrantDiameter.kt\nindex c8942f37033..cc142711327 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant_diameter/AddFireHydrantDiameter.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant_diameter/AddFireHydrantDiameter.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.fire_hydrant_diameter\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -36,7 +37,7 @@ class AddFireHydrantDiameter : OsmFilterQuestType() {\n \n override fun createForm() = AddFireHydrantDiameterForm()\n \n- override fun applyAnswerTo(answer: FireHydrantDiameterAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: FireHydrantDiameterAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is FireHydrantDiameter -> tags[\"fire_hydrant:diameter\"] = answer.toOsmValue()\n is NoFireHydrantDiameterSign -> tags[\"fire_hydrant:diameter:signed\"] = \"no\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant_position/AddFireHydrantPosition.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant_position/AddFireHydrantPosition.kt\nindex 6a1d429c43b..4703ec680a9 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant_position/AddFireHydrantPosition.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant_position/AddFireHydrantPosition.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.fire_hydrant_position\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -29,7 +30,7 @@ class AddFireHydrantPosition : OsmFilterQuestType() {\n \n override fun createForm() = AddFireHydrantPositionForm()\n \n- override fun applyAnswerTo(answer: FireHydrantPosition, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: FireHydrantPosition, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"fire_hydrant:position\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant_ref/AddFireHydrantRef.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant_ref/AddFireHydrantRef.kt\nindex 19167a9cd6c..8e6889d77fc 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant_ref/AddFireHydrantRef.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/fire_hydrant_ref/AddFireHydrantRef.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.fire_hydrant_ref\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.quest.NoCountriesExcept\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement\n@@ -26,7 +27,7 @@ class AddFireHydrantRef : OsmFilterQuestType() {\n \n override fun createForm() = AddFireHydrantRefForm()\n \n- override fun applyAnswerTo(answer: FireHydrantRefAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: FireHydrantRefAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is NoVisibleFireHydrantRef -> tags[\"ref:signed\"] = \"no\"\n is FireHydrantRef -> tags[\"ref\"] = answer.ref\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/foot/AddProhibitedForPedestrians.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/foot/AddProhibitedForPedestrians.kt\nindex ea4b290086b..022cd7c0466 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/foot/AddProhibitedForPedestrians.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/foot/AddProhibitedForPedestrians.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.foot\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.PEDESTRIAN\n import de.westnordost.streetcomplete.osm.ANYTHING_PAVED\n@@ -50,7 +51,7 @@ class AddProhibitedForPedestrians : OsmFilterQuestType foot=no etc\n YES -> tags[\"foot\"] = \"no\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/fuel_service/AddFuelSelfService.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/fuel_service/AddFuelSelfService.kt\nindex 973a62c6d0d..8dbea64eaa7 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/fuel_service/AddFuelSelfService.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/fuel_service/AddFuelSelfService.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.fuel_service\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.quest.NoCountriesExcept\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CAR\n@@ -26,7 +27,7 @@ class AddFuelSelfService : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"self_service\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/general_fee/AddGeneralFee.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/general_fee/AddGeneralFee.kt\nindex 2656c7709ac..f1234105ad7 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/general_fee/AddGeneralFee.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/general_fee/AddGeneralFee.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.general_fee\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CITIZEN\n import de.westnordost.streetcomplete.osm.Tags\n@@ -24,7 +25,7 @@ class AddGeneralFee : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"fee\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/handrail/AddHandrail.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/handrail/AddHandrail.kt\nindex c698a992722..4d2e0b574c3 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/handrail/AddHandrail.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/handrail/AddHandrail.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.handrail\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.PEDESTRIAN\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.WHEELCHAIR\n@@ -33,7 +34,7 @@ class AddHandrail : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"handrail\", answer.toYesNo())\n if (!answer) {\n tags.remove(\"handrail:left\")\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/incline_direction/AddBicycleIncline.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/incline_direction/AddBicycleIncline.kt\nindex 3cd283b6772..6dadbe720f7 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/incline_direction/AddBicycleIncline.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/incline_direction/AddBicycleIncline.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.incline_direction\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.geometry.ElementPolylinesGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n@@ -49,6 +50,6 @@ class AddBicycleIncline : OsmElementQuestType {\n \n override fun createForm() = AddBicycleInclineForm()\n \n- override fun applyAnswerTo(answer: BicycleInclineAnswer, tags: Tags, timestampEdited: Long) =\n+ override fun applyAnswerTo(answer: BicycleInclineAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) =\n answer.applyTo(tags)\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/incline_direction/AddStepsIncline.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/incline_direction/AddStepsIncline.kt\nindex 65edcc701ab..cee576352e0 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/incline_direction/AddStepsIncline.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/incline_direction/AddStepsIncline.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.incline_direction\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.PEDESTRIAN\n import de.westnordost.streetcomplete.osm.Tags\n@@ -23,6 +24,6 @@ class AddStepsIncline : OsmFilterQuestType() {\n \n override fun createForm() = AddInclineForm()\n \n- override fun applyAnswerTo(answer: Incline, tags: Tags, timestampEdited: Long) =\n+ override fun applyAnswerTo(answer: Incline, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) =\n answer.applyTo(tags)\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/internet_access/AddInternetAccess.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/internet_access/AddInternetAccess.kt\nindex 48bc536d937..d4d16fdbfdf 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/internet_access/AddInternetAccess.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/internet_access/AddInternetAccess.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.internet_access\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CITIZEN\n import de.westnordost.streetcomplete.osm.Tags\n@@ -35,7 +36,7 @@ class AddInternetAccess : OsmFilterQuestType() {\n \n override fun createForm() = AddInternetAccessForm()\n \n- override fun applyAnswerTo(answer: InternetAccess, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: InternetAccess, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"internet_access\", answer.osmValue)\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/kerb_height/AddKerbHeight.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/kerb_height/AddKerbHeight.kt\nindex 24f4650ee50..e14b6ebbde9 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/kerb_height/AddKerbHeight.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/kerb_height/AddKerbHeight.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.kerb_height\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Node\n@@ -39,7 +40,7 @@ class AddKerbHeight : OsmElementQuestType {\n \n override fun createForm() = AddKerbHeightForm()\n \n- override fun applyAnswerTo(answer: KerbHeight, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: KerbHeight, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"kerb\", answer.osmValue)\n if (answer.osmValue == \"no\") {\n tags.remove(\"barrier\")\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/lanes/AddLanes.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/lanes/AddLanes.kt\nindex ffc225b6cdd..9be325a06cc 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/lanes/AddLanes.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/lanes/AddLanes.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.lanes\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CAR\n import de.westnordost.streetcomplete.osm.ANYTHING_PAVED\n@@ -32,7 +33,7 @@ class AddLanes : OsmFilterQuestType() {\n \n override fun createForm() = AddLanesForm()\n \n- override fun applyAnswerTo(answer: LanesAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: LanesAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n \n val laneCount = answer.total\n \ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/leaf_detail/AddForestLeafType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/leaf_detail/AddForestLeafType.kt\nindex 708117e1e81..934ab1e6f37 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/leaf_detail/AddForestLeafType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/leaf_detail/AddForestLeafType.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.leaf_detail\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.geometry.ElementPolygonsGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n@@ -47,7 +48,7 @@ class AddForestLeafType : OsmElementQuestType {\n \n override fun createForm() = AddForestLeafTypeForm()\n \n- override fun applyAnswerTo(answer: ForestLeafType, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: ForestLeafType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"leaf_type\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/level/AddLevel.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/level/AddLevel.kt\nindex 04650a6e4a0..a9d3a77ff1c 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/level/AddLevel.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/level/AddLevel.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.level\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.geometry.ElementPolygonsGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n@@ -112,7 +113,7 @@ class AddLevel : OsmElementQuestType {\n \n override fun createForm() = AddLevelForm()\n \n- override fun applyAnswerTo(answer: String, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: String, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"level\"] = answer\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeight.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeight.kt\nindex 6ca923b2119..8a1c84c8b77 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeight.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxHeight.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.max_height\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.geometry.ElementPolylinesGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n@@ -122,7 +123,7 @@ class AddMaxHeight : OsmElementQuestType {\n \n override fun createForm() = AddMaxHeightForm()\n \n- override fun applyAnswerTo(answer: MaxHeightAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: MaxHeightAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is MaxHeight -> {\n tags[\"maxheight\"] = answer.value.toOsmValue()\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxPhysicalHeight.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxPhysicalHeight.kt\nindex 1df47b1c930..2684b7d0fc3 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxPhysicalHeight.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_height/AddMaxPhysicalHeight.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.max_height\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType\n@@ -62,7 +63,7 @@ class AddMaxPhysicalHeight(\n \n override fun createForm() = AddMaxPhysicalHeightForm()\n \n- override fun applyAnswerTo(answer: MaxPhysicalHeightAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: MaxPhysicalHeightAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n // overwrite maxheight value but retain the info that there is no sign onto another tag\n tags[\"maxheight\"] = answer.height.toOsmValue()\n tags[\"maxheight:signed\"] = \"no\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeed.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeed.kt\nindex d569dc2e706..b8bd4a6c728 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeed.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeed.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.max_speed\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.quest.AllCountriesExcept\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CAR\n@@ -36,7 +37,7 @@ class AddMaxSpeed : OsmFilterQuestType() {\n \n override fun createForm() = AddMaxSpeedForm()\n \n- override fun applyAnswerTo(answer: MaxSpeedAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: MaxSpeedAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is MaxSpeedSign -> {\n tags[\"maxspeed\"] = answer.value.toString()\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_weight/AddMaxWeight.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/max_weight/AddMaxWeight.kt\nindex 553a1634cce..02fcc541de0 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_weight/AddMaxWeight.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_weight/AddMaxWeight.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.max_weight\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CAR\n import de.westnordost.streetcomplete.osm.Tags\n@@ -37,7 +38,7 @@ class AddMaxWeight : OsmFilterQuestType() {\n \n override fun createForm() = AddMaxWeightForm()\n \n- override fun applyAnswerTo(answer: MaxWeightAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: MaxWeightAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is MaxWeight -> {\n tags[answer.sign.osmKey] = answer.weight.toString()\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/memorial_type/AddMemorialType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/memorial_type/AddMemorialType.kt\nindex a67ad290107..2d5f3c35eb3 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/memorial_type/AddMemorialType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/memorial_type/AddMemorialType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.memorial_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CITIZEN\n import de.westnordost.streetcomplete.osm.Tags\n@@ -22,7 +23,7 @@ class AddMemorialType : OsmFilterQuestType() {\n \n override fun createForm() = AddMemorialTypeForm()\n \n- override fun applyAnswerTo(answer: MemorialType, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: MemorialType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n answer.applyTo(tags)\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/motorcycle_parking_capacity/AddMotorcycleParkingCapacity.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/motorcycle_parking_capacity/AddMotorcycleParkingCapacity.kt\nindex 73fa4fe2cd0..f6f0653bd84 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/motorcycle_parking_capacity/AddMotorcycleParkingCapacity.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/motorcycle_parking_capacity/AddMotorcycleParkingCapacity.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.motorcycle_parking_capacity\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -29,7 +30,7 @@ class AddMotorcycleParkingCapacity : OsmFilterQuestType() {\n override fun getHighlightedElements(element: Element, getMapData: () -> MapDataWithGeometry) =\n getMapData().filter(\"nodes, ways with amenity = motorcycle_parking\")\n \n- override fun applyAnswerTo(answer: Int, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Int, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"capacity\", answer.toString())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/motorcycle_parking_cover/AddMotorcycleParkingCover.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/motorcycle_parking_cover/AddMotorcycleParkingCover.kt\nindex 74886df5623..23d36d24e51 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/motorcycle_parking_cover/AddMotorcycleParkingCover.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/motorcycle_parking_cover/AddMotorcycleParkingCover.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.motorcycle_parking_cover\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -31,7 +32,7 @@ class AddMotorcycleParkingCover : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"covered\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/oneway/AddOneway.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/oneway/AddOneway.kt\nindex 3c301cbd554..52ed5a2ef6a 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/oneway/AddOneway.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/oneway/AddOneway.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.oneway\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Way\n@@ -79,7 +80,7 @@ class AddOneway : OsmElementQuestType {\n \n override fun createForm() = AddOnewayForm()\n \n- override fun applyAnswerTo(answer: OnewayAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: OnewayAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"oneway\"] = when (answer) {\n FORWARD -> \"yes\"\n BACKWARD -> \"-1\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/oneway_suspects/AddSuspectedOneway.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/oneway_suspects/AddSuspectedOneway.kt\nindex f983649993e..bd3e5f92d80 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/oneway_suspects/AddSuspectedOneway.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/oneway_suspects/AddSuspectedOneway.kt\n@@ -3,6 +3,7 @@ package de.westnordost.streetcomplete.quests.oneway_suspects\n import android.util.Log\n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.geometry.ElementPolylinesGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.LatLon\n@@ -134,7 +135,7 @@ class AddSuspectedOneway(\n \n override fun createForm() = AddSuspectedOnewayForm()\n \n- override fun applyAnswerTo(answer: SuspectedOnewayAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: SuspectedOnewayAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n if (!answer.isOneway) {\n tags[\"oneway\"] = \"no\"\n } else {\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours/AddOpeningHours.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours/AddOpeningHours.kt\nindex d7ee8e7df68..c88f7051558 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours/AddOpeningHours.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours/AddOpeningHours.kt\n@@ -5,6 +5,7 @@ import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.filters.RelativeDate\n import de.westnordost.streetcomplete.data.elementfilter.filters.TagOlderThan\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -156,7 +157,7 @@ class AddOpeningHours(\n \n override fun createForm() = AddOpeningHoursForm()\n \n- override fun applyAnswerTo(answer: OpeningHoursAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: OpeningHoursAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n if (answer is NoOpeningHoursSign) {\n tags[\"opening_hours:signed\"] = \"no\"\n tags.updateCheckDateForKey(\"opening_hours\")\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours_signed/CheckOpeningHoursSigned.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours_signed/CheckOpeningHoursSigned.kt\nindex e8d02c4fc18..a88b57de1e0 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours_signed/CheckOpeningHoursSigned.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/opening_hours_signed/CheckOpeningHoursSigned.kt\n@@ -3,6 +3,7 @@ package de.westnordost.streetcomplete.quests.opening_hours_signed\n import de.westnordost.osmfeatures.FeatureDictionary\n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -62,7 +63,7 @@ class CheckOpeningHoursSigned(\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n \n if (answer) {\n tags.remove(\"opening_hours:signed\")\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/orchard_produce/AddOrchardProduce.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/orchard_produce/AddOrchardProduce.kt\nindex 2dea47d987e..ec33a2825f3 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/orchard_produce/AddOrchardProduce.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/orchard_produce/AddOrchardProduce.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.orchard_produce\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.OUTDOORS\n import de.westnordost.streetcomplete.osm.Tags\n@@ -22,7 +23,7 @@ class AddOrchardProduce : OsmFilterQuestType>() {\n \n override fun createForm() = AddOrchardProduceForm()\n \n- override fun applyAnswerTo(answer: List, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: List, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"produce\"] = answer.joinToString(\";\") { it.osmValue }\n \n val landuse = answer.singleOrNull()?.osmLanduseValue\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/parking_access/AddBikeParkingAccess.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/parking_access/AddBikeParkingAccess.kt\nindex b49b8cb3e82..9ecd16e4968 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/parking_access/AddBikeParkingAccess.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/parking_access/AddBikeParkingAccess.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.parking_access\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BICYCLIST\n import de.westnordost.streetcomplete.osm.Tags\n@@ -24,7 +25,7 @@ class AddBikeParkingAccess : OsmFilterQuestType() {\n \n override fun createForm() = AddParkingAccessForm()\n \n- override fun applyAnswerTo(answer: ParkingAccess, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: ParkingAccess, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"access\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/parking_access/AddParkingAccess.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/parking_access/AddParkingAccess.kt\nindex 3573521716f..0c811a62f7f 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/parking_access/AddParkingAccess.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/parking_access/AddParkingAccess.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.parking_access\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CAR\n import de.westnordost.streetcomplete.osm.Tags\n@@ -38,7 +39,7 @@ class AddParkingAccess : OsmFilterQuestType() {\n \n override fun createForm() = AddParkingAccessForm()\n \n- override fun applyAnswerTo(answer: ParkingAccess, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: ParkingAccess, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"access\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/parking_fee/AddBikeParkingFee.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/parking_fee/AddBikeParkingFee.kt\nindex f0e59d46213..1b782dad339 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/parking_fee/AddBikeParkingFee.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/parking_fee/AddBikeParkingFee.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.parking_fee\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BICYCLIST\n import de.westnordost.streetcomplete.osm.Tags\n@@ -30,6 +31,6 @@ class AddBikeParkingFee : OsmFilterQuestType() {\n \n override fun createForm() = AddParkingFeeForm()\n \n- override fun applyAnswerTo(answer: FeeAndMaxStay, tags: Tags, timestampEdited: Long) =\n+ override fun applyAnswerTo(answer: FeeAndMaxStay, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) =\n answer.applyTo(tags)\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/parking_fee/AddParkingFee.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/parking_fee/AddParkingFee.kt\nindex cf912383da6..654e8cd6474 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/parking_fee/AddParkingFee.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/parking_fee/AddParkingFee.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.parking_fee\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CAR\n import de.westnordost.streetcomplete.osm.Tags\n@@ -24,6 +25,6 @@ class AddParkingFee : OsmFilterQuestType() {\n \n override fun createForm() = AddParkingFeeForm()\n \n- override fun applyAnswerTo(answer: FeeAndMaxStay, tags: Tags, timestampEdited: Long) =\n+ override fun applyAnswerTo(answer: FeeAndMaxStay, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) =\n answer.applyTo(tags)\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/parking_type/AddParkingType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/parking_type/AddParkingType.kt\nindex 3ffb687bd91..eed0f5185f9 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/parking_type/AddParkingType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/parking_type/AddParkingType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.parking_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CAR\n import de.westnordost.streetcomplete.osm.Tags\n@@ -21,7 +22,7 @@ class AddParkingType : OsmFilterQuestType() {\n \n override fun createForm() = AddParkingTypeForm()\n \n- override fun applyAnswerTo(answer: ParkingType, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: ParkingType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"parking\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/picnic_table_cover/AddPicnicTableCover.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/picnic_table_cover/AddPicnicTableCover.kt\nindex b93c4e73514..309adb9a35f 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/picnic_table_cover/AddPicnicTableCover.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/picnic_table_cover/AddPicnicTableCover.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.picnic_table_cover\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -32,7 +33,7 @@ class AddPicnicTableCover : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"covered\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/pitch_lit/AddPitchLit.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/pitch_lit/AddPitchLit.kt\nindex a0176b8a7dc..b9be1b944a0 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/pitch_lit/AddPitchLit.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/pitch_lit/AddPitchLit.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.pitch_lit\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.OUTDOORS\n import de.westnordost.streetcomplete.osm.Tags\n@@ -29,7 +30,7 @@ class AddPitchLit : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"lit\", answer.toYesNo())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/place_name/AddPlaceName.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/place_name/AddPlaceName.kt\nindex a3fb6a8f695..2b98fc49261 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/place_name/AddPlaceName.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/place_name/AddPlaceName.kt\n@@ -3,6 +3,7 @@ package de.westnordost.streetcomplete.quests.place_name\n import de.westnordost.osmfeatures.FeatureDictionary\n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -128,7 +129,7 @@ class AddPlaceName(\n \n override fun createForm() = AddPlaceNameForm()\n \n- override fun applyAnswerTo(answer: PlaceNameAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: PlaceNameAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is NoPlaceNameSign -> {\n tags[\"name:signed\"] = \"no\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/playground_access/AddPlaygroundAccess.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/playground_access/AddPlaygroundAccess.kt\nindex 0bbd165a7a4..9d3f8e8b631 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/playground_access/AddPlaygroundAccess.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/playground_access/AddPlaygroundAccess.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.playground_access\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CITIZEN\n import de.westnordost.streetcomplete.osm.Tags\n@@ -17,7 +18,7 @@ class AddPlaygroundAccess : OsmFilterQuestType() {\n \n override fun createForm() = AddPlaygroundAccessForm()\n \n- override fun applyAnswerTo(answer: PlaygroundAccess, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: PlaygroundAccess, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"access\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/police_type/AddPoliceType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/police_type/AddPoliceType.kt\nindex c03c9594965..475e67530b3 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/police_type/AddPoliceType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/police_type/AddPoliceType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.police_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.quest.NoCountriesExcept\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CITIZEN\n@@ -19,7 +20,7 @@ class AddPoliceType : OsmFilterQuestType() {\n \n override fun createForm() = AddPoliceTypeForm()\n \n- override fun applyAnswerTo(answer: PoliceType, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: PoliceType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"operator\"] = answer.operatorName\n tags[\"operator:wikidata\"] = answer.wikidata\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_collection_times/AddPostboxCollectionTimes.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_collection_times/AddPostboxCollectionTimes.kt\nindex 89703e722bf..d952d8b989d 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_collection_times/AddPostboxCollectionTimes.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_collection_times/AddPostboxCollectionTimes.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.postbox_collection_times\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -79,7 +80,7 @@ class AddPostboxCollectionTimes : OsmElementQuestType {\n \n override fun createForm() = AddPostboxCollectionTimesForm()\n \n- override fun applyAnswerTo(answer: CollectionTimesAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: CollectionTimesAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is NoCollectionTimesSign -> {\n tags[\"collection_times:signed\"] = \"no\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_ref/AddPostboxRef.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_ref/AddPostboxRef.kt\nindex aca387761f7..a490bd91d14 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_ref/AddPostboxRef.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_ref/AddPostboxRef.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.postbox_ref\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -33,7 +34,7 @@ class AddPostboxRef : OsmFilterQuestType() {\n \n override fun createForm() = AddPostboxRefForm()\n \n- override fun applyAnswerTo(answer: PostboxRefAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: PostboxRefAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is NoVisiblePostboxRef -> tags[\"ref:signed\"] = \"no\"\n is PostboxRef -> tags[\"ref\"] = answer.ref\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_royal_cypher/AddPostboxRoyalCypher.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_royal_cypher/AddPostboxRoyalCypher.kt\nindex d9b829b81c3..5c8352533b7 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_royal_cypher/AddPostboxRoyalCypher.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/postbox_royal_cypher/AddPostboxRoyalCypher.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.postbox_royal_cypher\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -31,7 +32,7 @@ class AddPostboxRoyalCypher : OsmFilterQuestType() {\n \n override fun createForm() = AddPostboxRoyalCypherForm()\n \n- override fun applyAnswerTo(answer: PostboxRoyalCypher, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: PostboxRoyalCypher, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"royal_cypher\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/powerpoles_material/AddPowerPolesMaterial.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/powerpoles_material/AddPowerPolesMaterial.kt\nindex 10da20e391a..cc95a3e278f 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/powerpoles_material/AddPowerPolesMaterial.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/powerpoles_material/AddPowerPolesMaterial.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.powerpoles_material\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -35,7 +36,7 @@ class AddPowerPolesMaterial : OsmFilterQuestType() {\n \n override fun createForm() = AddPowerPolesMaterialForm()\n \n- override fun applyAnswerTo(answer: PowerPolesMaterial, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: PowerPolesMaterial, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"material\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/railway_crossing/AddRailwayCrossingBarrier.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/railway_crossing/AddRailwayCrossingBarrier.kt\nindex 3d6884f466f..e1fe9467dc9 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/railway_crossing/AddRailwayCrossingBarrier.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/railway_crossing/AddRailwayCrossingBarrier.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.railway_crossing\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType\n@@ -51,7 +52,7 @@ class AddRailwayCrossingBarrier : OsmElementQuestType {\n \n override fun createForm() = AddRailwayCrossingBarrierForm()\n \n- override fun applyAnswerTo(answer: RailwayCrossingBarrier, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: RailwayCrossingBarrier, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n if (answer.osmValue != null) {\n tags.remove(\"crossing:chicane\")\n tags.updateWithCheckDate(\"crossing:barrier\", answer.osmValue)\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/recycling/AddRecyclingType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/recycling/AddRecyclingType.kt\nindex 032f794a4e1..b4ddaeb04a0 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/recycling/AddRecyclingType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/recycling/AddRecyclingType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.recycling\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -27,7 +28,7 @@ class AddRecyclingType : OsmFilterQuestType() {\n \n override fun createForm() = AddRecyclingTypeForm()\n \n- override fun applyAnswerTo(answer: RecyclingType, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: RecyclingType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n RECYCLING_CENTRE -> {\n tags[\"recycling_type\"] = \"centre\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/recycling_glass/DetermineRecyclingGlass.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/recycling_glass/DetermineRecyclingGlass.kt\nindex 798d0167b6e..4bb95f39bd6 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/recycling_glass/DetermineRecyclingGlass.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/recycling_glass/DetermineRecyclingGlass.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.recycling_glass\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -35,7 +36,7 @@ class DetermineRecyclingGlass : OsmFilterQuestType() {\n \n override fun createForm() = DetermineRecyclingGlassForm()\n \n- override fun applyAnswerTo(answer: RecyclingGlass, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: RecyclingGlass, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n ANY -> {\n // to mark that it has been checked\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/recycling_material/AddRecyclingContainerMaterials.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/recycling_material/AddRecyclingContainerMaterials.kt\nindex f87bf6bfb57..58a56ea8066 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/recycling_material/AddRecyclingContainerMaterials.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/recycling_material/AddRecyclingContainerMaterials.kt\n@@ -4,6 +4,7 @@ import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.filters.RelativeDate\n import de.westnordost.streetcomplete.data.elementfilter.filters.TagOlderThan\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -52,7 +53,7 @@ class AddRecyclingContainerMaterials : OsmElementQuestType MapDataWithGeometry) =\n getMapData().filter(\"nodes with amenity = recycling\")\n \n- override fun applyAnswerTo(answer: RecyclingContainerMaterialsAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: RecyclingContainerMaterialsAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n if (answer is RecyclingMaterials) {\n applyRecyclingMaterialsAnswer(answer.materials, tags)\n } else if (answer is IsWasteContainer) {\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/religion/AddReligionToPlaceOfWorship.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/religion/AddReligionToPlaceOfWorship.kt\nindex 28a2835bbf9..68858a95ab9 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/religion/AddReligionToPlaceOfWorship.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/religion/AddReligionToPlaceOfWorship.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.religion\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CITIZEN\n import de.westnordost.streetcomplete.osm.Tags\n@@ -25,7 +26,7 @@ class AddReligionToPlaceOfWorship : OsmFilterQuestType() {\n \n override fun createForm() = AddReligionForm()\n \n- override fun applyAnswerTo(answer: Religion, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Religion, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"religion\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/religion/AddReligionToWaysideShrine.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/religion/AddReligionToWaysideShrine.kt\nindex 4b08e33943b..7509717c411 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/religion/AddReligionToWaysideShrine.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/religion/AddReligionToWaysideShrine.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.religion\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.OUTDOORS\n import de.westnordost.streetcomplete.osm.Tags\n@@ -22,7 +23,7 @@ class AddReligionToWaysideShrine : OsmFilterQuestType() {\n \n override fun createForm() = AddReligionForm()\n \n- override fun applyAnswerTo(answer: Religion, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Religion, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"religion\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/road_name/AddRoadName.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/road_name/AddRoadName.kt\nindex 5ddedaf45e8..ea8ea5d63d8 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/road_name/AddRoadName.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/road_name/AddRoadName.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.road_name\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.quest.AllCountriesExcept\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CAR\n@@ -36,7 +37,7 @@ class AddRoadName : OsmFilterQuestType() {\n \n override fun createForm() = AddRoadNameForm()\n \n- override fun applyAnswerTo(answer: RoadNameAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: RoadNameAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is NoRoadName -> tags[\"noname\"] = \"yes\"\n is RoadIsServiceRoad -> {\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/roof_shape/AddRoofShape.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/roof_shape/AddRoofShape.kt\nindex 8df4669efbd..89b7a282031 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/roof_shape/AddRoofShape.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/roof_shape/AddRoofShape.kt\n@@ -5,6 +5,7 @@ import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n import de.westnordost.streetcomplete.data.meta.CountryInfos\n import de.westnordost.streetcomplete.data.meta.getByLocation\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType\n@@ -64,7 +65,7 @@ class AddRoofShape(\n ).roofsAreUsuallyFlat\n }\n \n- override fun applyAnswerTo(answer: RoofShape, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: RoofShape, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"roof:shape\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/seating/AddSeating.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/seating/AddSeating.kt\nindex a24713456ad..8126bdfdfad 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/seating/AddSeating.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/seating/AddSeating.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.seating\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -35,7 +36,7 @@ class AddSeating : OsmFilterQuestType() {\n \n override fun createForm() = AddSeatingForm()\n \n- override fun applyAnswerTo(answer: Seating, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Seating, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n if (answer == Seating.NO) tags[\"takeaway\"] = \"only\"\n tags[\"outdoor_seating\"] = answer.hasOutdoorSeating.toYesNo()\n tags[\"indoor_seating\"] = answer.hasIndoorSeating.toYesNo()\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/segregated/AddCyclewaySegregation.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/segregated/AddCyclewaySegregation.kt\nindex f4d0139d4df..9b288bc2d90 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/segregated/AddCyclewaySegregation.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/segregated/AddCyclewaySegregation.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.segregated\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BICYCLIST\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.OUTDOORS\n@@ -32,7 +33,7 @@ class AddCyclewaySegregation : OsmFilterQuestType() {\n \n override fun createForm() = AddCyclewaySegregationForm()\n \n- override fun applyAnswerTo(answer: CyclewaySegregation, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: CyclewaySegregation, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"segregated\", answer.value.toYesNo())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/segregated/CyclewaySegregationItem.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/segregated/CyclewaySegregationItem.kt\nindex c0b483a06b7..216574dfd88 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/segregated/CyclewaySegregationItem.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/segregated/CyclewaySegregationItem.kt\n@@ -12,6 +12,6 @@ private val CyclewaySegregation.titleResId: Int get() = when (this.value) {\n }\n \n private fun CyclewaySegregation.getIconResId(isLeftHandTraffic: Boolean): Int = when (this.value) {\n- true -> if (isLeftHandTraffic) R.drawable.ic_path_segregated_l else R.drawable.ic_path_segregated\n- false -> R.drawable.ic_path_segregated_no\n+ true -> if (isLeftHandTraffic) R.drawable.ic_separate_cycleway_segregated_l else R.drawable.ic_separate_cycleway_segregated\n+ false -> R.drawable.ic_separate_cycleway_not_segregated\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/self_service/AddSelfServiceLaundry.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/self_service/AddSelfServiceLaundry.kt\nindex 7961f293eff..e5c1ab097c9 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/self_service/AddSelfServiceLaundry.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/self_service/AddSelfServiceLaundry.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.self_service\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CITIZEN\n import de.westnordost.streetcomplete.osm.Tags\n@@ -21,7 +22,7 @@ class AddSelfServiceLaundry : OsmFilterQuestType() {\n \n override fun createForm() = AddSelfServiceLaundryForm()\n \n- override fun applyAnswerTo(answer: SelfServiceLaundry, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: SelfServiceLaundry, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n NO -> {\n tags[\"self_service\"] = \"no\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/CheckShopType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/CheckShopType.kt\nindex 9eb498386d6..f30d7c3f682 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/CheckShopType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/CheckShopType.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.shop_type\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -49,7 +50,7 @@ class CheckShopType : OsmElementQuestType {\n \n override fun createForm() = ShopTypeForm()\n \n- override fun applyAnswerTo(answer: ShopTypeAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: ShopTypeAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is IsShopVacant -> {\n tags.updateCheckDate()\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/SpecifyShopType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/SpecifyShopType.kt\nindex 016327c9ec2..dd22d0f90e4 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/SpecifyShopType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/shop_type/SpecifyShopType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.shop_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -42,7 +43,7 @@ class SpecifyShopType : OsmFilterQuestType() {\n \n override fun createForm() = ShopTypeForm()\n \n- override fun applyAnswerTo(answer: ShopTypeAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: ShopTypeAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.removeCheckDates()\n when (answer) {\n is IsShopVacant -> {\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/shoulder/AddShoulder.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/shoulder/AddShoulder.kt\nindex 7759c80eb5a..1bf922279a7 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/shoulder/AddShoulder.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/shoulder/AddShoulder.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.shoulder\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CAR\n import de.westnordost.streetcomplete.osm.ANYTHING_UNPAVED\n@@ -60,7 +61,7 @@ class AddShoulder : OsmFilterQuestType() {\n \n override fun createForm() = AddShoulderForm()\n \n- override fun applyAnswerTo(answer: ShoulderSides, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: ShoulderSides, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"shoulder\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/sidewalk/AddSidewalk.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/sidewalk/AddSidewalk.kt\nindex f6f42dca73e..c28c6cc77c1 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/sidewalk/AddSidewalk.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/sidewalk/AddSidewalk.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.sidewalk\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.geometry.ElementPolylinesGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n@@ -15,8 +16,8 @@ import de.westnordost.streetcomplete.osm.estimateParkingOffRoadWidth\n import de.westnordost.streetcomplete.osm.estimateRoadwayWidth\n import de.westnordost.streetcomplete.osm.guessRoadwayWidth\n import de.westnordost.streetcomplete.osm.sidewalk.LeftAndRightSidewalk\n-import de.westnordost.streetcomplete.osm.sidewalk.Sidewalk\n import de.westnordost.streetcomplete.osm.sidewalk.Sidewalk.INVALID\n+import de.westnordost.streetcomplete.osm.sidewalk.any\n import de.westnordost.streetcomplete.osm.sidewalk.applyTo\n import de.westnordost.streetcomplete.osm.sidewalk.createSidewalkSides\n import de.westnordost.streetcomplete.util.math.isNearAndAligned\n@@ -100,69 +101,66 @@ class AddSidewalk : OsmElementQuestType {\n \n override fun createForm() = AddSidewalkForm()\n \n- override fun applyAnswerTo(answer: LeftAndRightSidewalk, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: LeftAndRightSidewalk, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n answer.applyTo(tags)\n }\n-\n- companion object {\n- // streets that may have sidewalk tagging\n- private val roadsFilter by lazy { \"\"\"\n- ways with\n- (\n- (\n- highway ~ trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified|residential|service\n- and motorroad != yes\n- and foot != no\n- )\n- or\n- (\n- highway ~ motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified|residential|service\n- and (foot ~ yes|designated or bicycle ~ yes|designated)\n- )\n- )\n- and area != yes\n- and access !~ private|no\n- \"\"\".toElementFilterExpression() }\n-\n- // streets that do not have sidewalk tagging yet\n- /* the filter additionally filters out ways that are unlikely to have sidewalks:\n- *\n- * + unpaved roads\n- * + roads that are probably not developed enough to have sidewalk (i.e. country roads)\n- * + roads with a very low speed limit\n- * + Also, anything explicitly tagged as no pedestrians or explicitly tagged that the sidewalk\n- * is mapped as a separate way OR that is tagged with that the cycleway is separate. If the\n- * cycleway is separate, the sidewalk is too for sure\n- * */\n- private val untaggedRoadsFilter by lazy { \"\"\"\n- ways with\n- highway ~ motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified|residential\n- and !sidewalk and !sidewalk:both and !sidewalk:left and !sidewalk:right\n- and (!maxspeed or maxspeed > 9)\n- and surface !~ ${ANYTHING_UNPAVED.joinToString(\"|\")}\n- and (\n- lit = yes\n- or highway = residential\n- or ~${(MAXSPEED_TYPE_KEYS + \"maxspeed\").joinToString(\"|\")} ~ .*urban|.*zone.*\n- or (foot ~ yes|designated and highway ~ motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link)\n- )\n- and foot != use_sidepath\n- and bicycle != use_sidepath\n- and bicycle:backward != use_sidepath\n- and bicycle:forward != use_sidepath\n- and cycleway != separate\n- and cycleway:left != separate\n- and cycleway:right != separate\n- and cycleway:both != separate\n- \"\"\".toElementFilterExpression() }\n- }\n-\n- private fun Element.hasInvalidOrIncompleteSidewalkTags(): Boolean {\n- val sides = createSidewalkSides(tags) ?: return false\n- if (sides.any { it == INVALID || it == null }) return true\n- return false\n- }\n }\n \n-private fun LeftAndRightSidewalk.any(block: (sidewalk: Sidewalk?) -> Boolean): Boolean =\n- block(left) || block(right)\n+// streets that may have sidewalk tagging\n+private val roadsFilter by lazy { \"\"\"\n+ ways with\n+ (\n+ (\n+ highway ~ trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified|residential|service\n+ and motorroad != yes\n+ and expressway != yes\n+ and foot != no\n+ )\n+ or\n+ (\n+ highway ~ motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified|residential|service\n+ and (foot ~ yes|designated or bicycle ~ yes|designated)\n+ )\n+ )\n+ and area != yes\n+ and access !~ private|no\n+\"\"\".toElementFilterExpression() }\n+\n+// streets that do not have sidewalk tagging yet\n+/* the filter additionally filters out ways that are unlikely to have sidewalks:\n+ *\n+ * + unpaved roads\n+ * + roads that are probably not developed enough to have sidewalk (i.e. country roads)\n+ * + roads with a very low speed limit\n+ * + Also, anything explicitly tagged as no pedestrians or explicitly tagged that the sidewalk\n+ * is mapped as a separate way OR that is tagged with that the cycleway is separate. If the\n+ * cycleway is separate, the sidewalk is too for sure\n+* */\n+private val untaggedRoadsFilter by lazy { \"\"\"\n+ ways with\n+ highway ~ motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified|residential\n+ and !sidewalk and !sidewalk:both and !sidewalk:left and !sidewalk:right\n+ and (!maxspeed or maxspeed > 9)\n+ and surface !~ ${ANYTHING_UNPAVED.joinToString(\"|\")}\n+ and (\n+ lit = yes\n+ or highway = residential\n+ or ~${(MAXSPEED_TYPE_KEYS + \"maxspeed\").joinToString(\"|\")} ~ .*urban|.*zone.*\n+ or (foot ~ yes|designated and highway ~ motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link)\n+ )\n+ and foot != use_sidepath\n+ and bicycle != use_sidepath\n+ and bicycle:backward != use_sidepath\n+ and bicycle:forward != use_sidepath\n+ and cycleway != separate\n+ and cycleway:left != separate\n+ and cycleway:right != separate\n+ and cycleway:both != separate\n+\"\"\".toElementFilterExpression() }\n+\n+\n+private fun Element.hasInvalidOrIncompleteSidewalkTags(): Boolean {\n+ val sides = createSidewalkSides(tags) ?: return false\n+ if (sides.any { it == INVALID || it == null }) return true\n+ return false\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/smoking/AddSmoking.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/smoking/AddSmoking.kt\nindex 3cfc295ce70..f515b520627 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/smoking/AddSmoking.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/smoking/AddSmoking.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.smoking\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -52,7 +53,7 @@ class AddSmoking : OsmFilterQuestType() {\n \n override fun createForm() = SmokingAllowedForm()\n \n- override fun applyAnswerTo(answer: SmokingAllowed, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: SmokingAllowed, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"smoking\", answer.osmValue)\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/smoothness/AddPathSmoothness.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/smoothness/AddPathSmoothness.kt\nindex 60be94f3eaa..15b3bea6901 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/smoothness/AddPathSmoothness.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/smoothness/AddPathSmoothness.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.smoothness\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BICYCLIST\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.WHEELCHAIR\n@@ -33,7 +34,7 @@ class AddPathSmoothness : OsmFilterQuestType() {\n \n override fun createForm() = AddSmoothnessForm()\n \n- override fun applyAnswerTo(answer: SmoothnessAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: SmoothnessAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n answer.applyTo(tags)\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/smoothness/AddRoadSmoothness.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/smoothness/AddRoadSmoothness.kt\nindex 3fd830bae13..da1ab5f1aeb 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/smoothness/AddRoadSmoothness.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/smoothness/AddRoadSmoothness.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.smoothness\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BICYCLIST\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CAR\n@@ -34,7 +35,7 @@ class AddRoadSmoothness : OsmFilterQuestType() {\n \n override fun createForm() = AddSmoothnessForm()\n \n- override fun applyAnswerTo(answer: SmoothnessAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: SmoothnessAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n if (answer is IsActuallyStepsAnswer) throw IllegalStateException()\n answer.applyTo(tags)\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/sport/AddSport.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/sport/AddSport.kt\nindex 4267c8e2dca..832c4f85450 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/sport/AddSport.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/sport/AddSport.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.sport\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.OUTDOORS\n import de.westnordost.streetcomplete.osm.Tags\n@@ -23,7 +24,7 @@ class AddSport : OsmFilterQuestType>() {\n \n override fun createForm() = AddSportForm()\n \n- override fun applyAnswerTo(answer: List, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: List, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"sport\"] = answer.joinToString(\";\") { it.osmValue }\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/step_count/AddStepCount.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/step_count/AddStepCount.kt\nindex 796085e9c55..3572c0855b8 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/step_count/AddStepCount.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/step_count/AddStepCount.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.step_count\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.PEDESTRIAN\n import de.westnordost.streetcomplete.osm.Tags\n@@ -25,7 +26,7 @@ class AddStepCount : OsmFilterQuestType() {\n \n override fun createForm() = AddStepCountForm()\n \n- override fun applyAnswerTo(answer: Int, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Int, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"step_count\"] = answer.toString()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/step_count/AddStepCountStile.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/step_count/AddStepCountStile.kt\nindex 0d31f5acd60..a301a9458be 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/step_count/AddStepCountStile.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/step_count/AddStepCountStile.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.step_count\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType\n@@ -46,7 +47,7 @@ class AddStepCountStile : OsmElementQuestType {\n \n override fun createForm() = AddStepCountForm.create(R.string.quest_step_count_stile_hint)\n \n- override fun applyAnswerTo(answer: Int, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Int, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"step_count\"] = answer.toString()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/steps_ramp/AddStepsRamp.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/steps_ramp/AddStepsRamp.kt\nindex 4f97c2ea6ba..026cf2d6860 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/steps_ramp/AddStepsRamp.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/steps_ramp/AddStepsRamp.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.steps_ramp\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BICYCLIST\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.PEDESTRIAN\n@@ -33,7 +34,7 @@ class AddStepsRamp : OsmFilterQuestType() {\n \n override fun createForm() = AddStepsRampForm()\n \n- override fun applyAnswerTo(answer: StepsRampAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: StepsRampAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n // special tagging if the wheelchair ramp is separate\n if (answer.wheelchairRamp == WheelchairRampStatus.SEPARATE) {\n val hasAnotherRamp = answer.bicycleRamp || answer.strollerRamp\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/summit/AddSummitCross.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/summit/AddSummitCross.kt\nindex 5acf55c2076..6825d1f4847 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/summit/AddSummitCross.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/summit/AddSummitCross.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.summit\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType\n@@ -72,7 +73,7 @@ class AddSummitCross : OsmElementQuestType {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"summit:cross\", answer.toYesNo())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/summit/AddSummitRegister.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/summit/AddSummitRegister.kt\nindex c2c092ea314..30229431669 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/summit/AddSummitRegister.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/summit/AddSummitRegister.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.summit\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType\n@@ -79,7 +80,7 @@ class AddSummitRegister : OsmElementQuestType {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"summit:register\", answer.toYesNo())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddCyclewayPartSurface.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddCyclewayPartSurface.kt\nindex 4e31900c932..efaa2f85ca4 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddCyclewayPartSurface.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddCyclewayPartSurface.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.surface\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BICYCLIST\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.OUTDOORS\n@@ -36,7 +37,7 @@ class AddCyclewayPartSurface : OsmFilterQuestType() {\n \n override fun createForm() = AddPathPartSurfaceForm()\n \n- override fun applyAnswerTo(answer: SurfaceAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: SurfaceAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n answer.applyTo(tags, \"cycleway\")\n answer.updateSegregatedFootAndCycleway(tags)\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddFootwayPartSurface.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddFootwayPartSurface.kt\nindex 49c06e2052e..e7bdbe7542d 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddFootwayPartSurface.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddFootwayPartSurface.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.surface\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.OUTDOORS\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.PEDESTRIAN\n@@ -37,7 +38,7 @@ class AddFootwayPartSurface : OsmFilterQuestType() {\n \n override fun createForm() = AddPathPartSurfaceForm()\n \n- override fun applyAnswerTo(answer: SurfaceAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: SurfaceAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n answer.applyTo(tags, \"footway\")\n answer.updateSegregatedFootAndCycleway(tags)\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPathSurface.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPathSurface.kt\nindex 671f4c5737c..9ece438a7f4 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPathSurface.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPathSurface.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.surface\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BICYCLIST\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.OUTDOORS\n@@ -39,7 +40,7 @@ class AddPathSurface : OsmFilterQuestType() {\n \n override fun createForm() = AddPathSurfaceForm()\n \n- override fun applyAnswerTo(answer: SurfaceOrIsStepsAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: SurfaceOrIsStepsAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is SurfaceAnswer -> {\n answer.applyTo(tags)\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPitchSurface.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPitchSurface.kt\nindex 8827a488dfc..8aaea19acf4 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPitchSurface.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPitchSurface.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.surface\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.OUTDOORS\n import de.westnordost.streetcomplete.osm.Tags\n@@ -46,7 +47,7 @@ class AddPitchSurface : OsmFilterQuestType() {\n \n override fun createForm() = AddPitchSurfaceForm()\n \n- override fun applyAnswerTo(answer: SurfaceAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: SurfaceAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n answer.applyTo(tags)\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurface.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurface.kt\nindex 61b67a652d5..7cf58b841a8 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurface.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurface.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.surface\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BICYCLIST\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CAR\n@@ -48,7 +49,7 @@ class AddRoadSurface : OsmFilterQuestType() {\n \n override fun createForm() = AddRoadSurfaceForm()\n \n- override fun applyAnswerTo(answer: SurfaceAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: SurfaceAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n answer.applyTo(tags)\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddSidewalkSurface.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddSidewalkSurface.kt\nindex 70ae193f886..b5563194ac2 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddSidewalkSurface.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddSidewalkSurface.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.surface\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.PEDESTRIAN\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.WHEELCHAIR\n@@ -37,7 +38,7 @@ class AddSidewalkSurface : OsmFilterQuestType() {\n \n override fun createForm() = AddSidewalkSurfaceForm()\n \n- override fun applyAnswerTo(answer: SidewalkSurfaceAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: SidewalkSurfaceAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is SidewalkIsDifferent -> {\n deleteSmoothnessKeys(Side.LEFT, tags)\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/tactile_paving/AddTactilePavingBusStop.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/tactile_paving/AddTactilePavingBusStop.kt\nindex 7ffc780915f..1739403cd60 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/tactile_paving/AddTactilePavingBusStop.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/tactile_paving/AddTactilePavingBusStop.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.tactile_paving\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BLIND\n import de.westnordost.streetcomplete.osm.Tags\n@@ -33,7 +34,7 @@ class AddTactilePavingBusStop : OsmFilterQuestType() {\n \n override fun createForm() = TactilePavingForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"tactile_paving\", answer.toYesNo())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/tactile_paving/AddTactilePavingCrosswalk.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/tactile_paving/AddTactilePavingCrosswalk.kt\nindex 0d56de5f2e7..37dec590599 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/tactile_paving/AddTactilePavingCrosswalk.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/tactile_paving/AddTactilePavingCrosswalk.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.tactile_paving\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType\n@@ -59,7 +60,7 @@ class AddTactilePavingCrosswalk : OsmElementQuestType {\n if (!eligibleKerbsFilter.matches(element) || element !is Node || !element.couldBeAKerb()) false\n else null\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"tactile_paving\", answer.toYesNo())\n if (tags[\"kerb\"] != \"no\") {\n tags[\"barrier\"] = \"kerb\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/toilet_availability/AddToiletAvailability.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/toilet_availability/AddToiletAvailability.kt\nindex 449405016dd..685124eee7b 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/toilet_availability/AddToiletAvailability.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/toilet_availability/AddToiletAvailability.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.toilet_availability\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CITIZEN\n import de.westnordost.streetcomplete.osm.Tags\n@@ -29,7 +30,7 @@ class AddToiletAvailability : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"toilets\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/toilets_fee/AddToiletsFee.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/toilets_fee/AddToiletsFee.kt\nindex c3350c5b242..0865853aa88 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/toilets_fee/AddToiletsFee.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/toilets_fee/AddToiletsFee.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.toilets_fee\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.quest.AllCountriesExcept\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CITIZEN\n@@ -28,7 +29,7 @@ class AddToiletsFee : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"fee\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/tourism_information/AddInformationToTourism.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/tourism_information/AddInformationToTourism.kt\nindex 7fdd26e4808..4d11a145039 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/tourism_information/AddInformationToTourism.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/tourism_information/AddInformationToTourism.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.tourism_information\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CITIZEN\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.OUTDOORS\n@@ -20,7 +21,7 @@ class AddInformationToTourism : OsmFilterQuestType() {\n \n override fun createForm() = AddInformationForm()\n \n- override fun applyAnswerTo(answer: TourismInformation, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: TourismInformation, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"information\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/tracktype/AddTracktype.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/tracktype/AddTracktype.kt\nindex ceddab2e6e3..9b14dbbadfd 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/tracktype/AddTracktype.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/tracktype/AddTracktype.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.tracktype\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BICYCLIST\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CAR\n@@ -30,7 +31,7 @@ class AddTracktype : OsmFilterQuestType() {\n \n override fun createForm() = AddTracktypeForm()\n \n- override fun applyAnswerTo(answer: Tracktype, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Tracktype, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"tracktype\", answer.osmValue)\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_calming_type/AddTrafficCalmingType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_calming_type/AddTrafficCalmingType.kt\nindex 5591d55f78d..6cb7c1caa91 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_calming_type/AddTrafficCalmingType.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_calming_type/AddTrafficCalmingType.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.traffic_calming_type\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.CAR\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.PEDESTRIAN\n@@ -19,7 +20,7 @@ class AddTrafficCalmingType : OsmFilterQuestType() {\n \n override fun createForm() = AddTrafficCalmingTypeForm()\n \n- override fun applyAnswerTo(answer: TrafficCalmingType, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: TrafficCalmingType, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"traffic_calming\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_signals_button/AddTrafficSignalsButton.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_signals_button/AddTrafficSignalsButton.kt\nindex ec9ab1add68..335ee42f1e8 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_signals_button/AddTrafficSignalsButton.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_signals_button/AddTrafficSignalsButton.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.traffic_signals_button\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n@@ -31,7 +32,7 @@ class AddTrafficSignalsButton : OsmFilterQuestType() {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"button_operated\"] = answer.toYesNo()\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_signals_sound/AddTrafficSignalsSound.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_signals_sound/AddTrafficSignalsSound.kt\nindex 343ce2f7b90..375f764c7d7 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_signals_sound/AddTrafficSignalsSound.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_signals_sound/AddTrafficSignalsSound.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.traffic_signals_sound\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType\n@@ -56,7 +57,7 @@ class AddTrafficSignalsSound : OsmElementQuestType {\n \n override fun createForm() = YesNoQuestForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(SOUND_SIGNALS, answer.toYesNo())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_signals_vibrate/AddTrafficSignalsVibration.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_signals_vibrate/AddTrafficSignalsVibration.kt\nindex 6b4cd968ad3..027a94e04c6 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_signals_vibrate/AddTrafficSignalsVibration.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/traffic_signals_vibrate/AddTrafficSignalsVibration.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.traffic_signals_vibrate\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType\n@@ -60,7 +61,7 @@ class AddTrafficSignalsVibration : OsmElementQuestType {\n \n override fun createForm() = AddTrafficSignalsVibrationForm()\n \n- override fun applyAnswerTo(answer: Boolean, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: Boolean, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(VIBRATING_BUTTON, answer.toYesNo())\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/way_lit/AddWayLit.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/way_lit/AddWayLit.kt\nindex bb839bce8b9..2469f78c183 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/way_lit/AddWayLit.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/way_lit/AddWayLit.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.way_lit\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.PEDESTRIAN\n import de.westnordost.streetcomplete.osm.MAXSPEED_TYPE_KEYS\n@@ -50,7 +51,7 @@ class AddWayLit : OsmFilterQuestType() {\n \n override fun createForm() = WayLitForm()\n \n- override fun applyAnswerTo(answer: WayLitOrIsStepsAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: WayLitOrIsStepsAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n when (answer) {\n is IsActuallyStepsAnswer -> tags[\"highway\"] = \"steps\"\n is WayLit -> answer.litStatus.applyTo(tags)\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessBusiness.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessBusiness.kt\nindex ced20c30acc..c47dc6cdb1d 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessBusiness.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessBusiness.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.wheelchair_access\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -117,7 +118,7 @@ class AddWheelchairAccessBusiness : OsmFilterQuestType() {\n \n override fun createForm() = AddWheelchairAccessBusinessForm()\n \n- override fun applyAnswerTo(answer: WheelchairAccess, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: WheelchairAccess, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags[\"wheelchair\"] = answer.osmValue\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessOutside.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessOutside.kt\nindex 7b216b2512d..a7cc144ff88 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessOutside.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessOutside.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.wheelchair_access\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.RARE\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.WHEELCHAIR\n@@ -24,7 +25,7 @@ class AddWheelchairAccessOutside : OsmFilterQuestType() {\n \n override fun createForm() = AddWheelchairAccessOutsideForm()\n \n- override fun applyAnswerTo(answer: WheelchairAccess, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: WheelchairAccess, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"wheelchair\", answer.osmValue)\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessPublicTransport.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessPublicTransport.kt\nindex ec91129ab58..23c14f9819c 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessPublicTransport.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessPublicTransport.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.wheelchair_access\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.WHEELCHAIR\n import de.westnordost.streetcomplete.osm.Tags\n@@ -27,7 +28,7 @@ class AddWheelchairAccessPublicTransport : OsmFilterQuestType(\n \n override fun createForm() = AddWheelchairAccessPublicTransportForm()\n \n- override fun applyAnswerTo(answer: WheelchairAccess, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: WheelchairAccess, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"wheelchair\", answer.osmValue)\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessToilets.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessToilets.kt\nindex c5fe8242183..654747c6e78 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessToilets.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessToilets.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.wheelchair_access\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.WHEELCHAIR\n import de.westnordost.streetcomplete.osm.Tags\n@@ -27,7 +28,7 @@ class AddWheelchairAccessToilets : OsmFilterQuestType() {\n \n override fun createForm() = AddWheelchairAccessToiletsForm()\n \n- override fun applyAnswerTo(answer: WheelchairAccess, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: WheelchairAccess, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"wheelchair\", answer.osmValue)\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessToiletsPart.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessToiletsPart.kt\nindex 8fc37418354..b00d64e0faf 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessToiletsPart.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/wheelchair_access/AddWheelchairAccessToiletsPart.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.wheelchair_access\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.RARE\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.WHEELCHAIR\n@@ -31,7 +32,7 @@ class AddWheelchairAccessToiletsPart : OsmFilterQuestType() {\n \n override fun createForm() = AddWheelchairAccessToiletsForm()\n \n- override fun applyAnswerTo(answer: WheelchairAccess, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: WheelchairAccess, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n tags.updateWithCheckDate(\"toilets:wheelchair\", answer.osmValue)\n }\n }\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/width/AddCyclewayWidth.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/width/AddCyclewayWidth.kt\nindex 9ee066b203c..a0670d82d31 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/width/AddCyclewayWidth.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/width/AddCyclewayWidth.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.quests.width\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.BICYCLIST\n import de.westnordost.streetcomplete.osm.Tags\n@@ -43,7 +44,7 @@ class AddCyclewayWidth(\n \n override fun createForm() = AddWidthForm()\n \n- override fun applyAnswerTo(answer: WidthAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: WidthAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n val isExclusive = tags[\"highway\"] == \"cycleway\" && tags[\"foot\"] != \"yes\" && tags[\"foot\"] != \"designated\"\n \n val key = if (isExclusive) \"width\" else \"cycleway:width\"\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/width/AddRoadWidth.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/width/AddRoadWidth.kt\nindex 875f9512584..0b0337465ec 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/quests/width/AddRoadWidth.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/width/AddRoadWidth.kt\n@@ -2,6 +2,7 @@ package de.westnordost.streetcomplete.quests.width\n \n import de.westnordost.streetcomplete.R\n import de.westnordost.streetcomplete.data.elementfilter.toElementFilterExpression\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.filter\n@@ -63,7 +64,7 @@ class AddRoadWidth(\n \n override fun createForm() = AddWidthForm()\n \n- override fun applyAnswerTo(answer: WidthAnswer, tags: Tags, timestampEdited: Long) {\n+ override fun applyAnswerTo(answer: WidthAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {\n val key = if (tags[\"traffic_calming\"] in ROAD_NARROWERS) \"maxwidth\" else \"width\"\n \n tags[key] = answer.width.toOsmValue()\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/util/ktx/CountryInfo.kt b/app/src/main/java/de/westnordost/streetcomplete/util/ktx/CountryInfo.kt\nindex 98d91e6a092..57fafa5c7d9 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/util/ktx/CountryInfo.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/util/ktx/CountryInfo.kt\n@@ -98,10 +98,7 @@ val CountryInfo.shoulderLineStyleResId: Int get() = when (edgeLineStyle) {\n else -> R.drawable.ic_shoulder_white_line\n }\n \n-fun CountryInfo.getExclusiveCycleLaneResId(isLeftHandedTraffic: Boolean): Int =\n- if (isLeftHandedTraffic) exclusiveCycleLaneLeftHandedTrafficResId else exclusiveCycleLaneResId\n-\n-private val CountryInfo.exclusiveCycleLaneResId: Int get() = when (exclusiveCycleLaneStyle) {\n+val CountryInfo.exclusiveCycleLaneResId: Int get() = when (exclusiveCycleLaneStyle) {\n \"white\" -> R.drawable.ic_cycleway_lane_white\n \"yellow\" -> R.drawable.ic_cycleway_lane_yellow\n \"white dots\" -> R.drawable.ic_cycleway_lane_dotted_white\n@@ -111,7 +108,7 @@ private val CountryInfo.exclusiveCycleLaneResId: Int get() = when (exclusiveCycl\n else -> R.drawable.ic_cycleway_lane_white\n }\n \n-private val CountryInfo.exclusiveCycleLaneLeftHandedTrafficResId: Int get() = when (exclusiveCycleLaneStyle) {\n+val CountryInfo.exclusiveCycleLaneMirroredResId: Int get() = when (exclusiveCycleLaneStyle) {\n \"white\" -> R.drawable.ic_cycleway_lane_white_l\n \"yellow\" -> R.drawable.ic_cycleway_lane_yellow_l\n \"white dots\" -> R.drawable.ic_cycleway_lane_dotted_white_l\n@@ -121,40 +118,39 @@ private val CountryInfo.exclusiveCycleLaneLeftHandedTrafficResId: Int get() = wh\n else -> R.drawable.ic_cycleway_lane_white_l\n }\n \n-fun CountryInfo.getDualCycleLaneResId(isLeftHandedTraffic: Boolean): Int =\n- if (isLeftHandedTraffic) dualCycleLaneLeftHandedTrafficResId else dualCycleLaneResId\n-\n-private val CountryInfo.dualCycleLaneResId: Int get() = when {\n+val CountryInfo.dualCycleLaneResId: Int get() = when {\n exclusiveCycleLaneStyle.startsWith(\"white\") -> R.drawable.ic_cycleway_lane_white_dual\n exclusiveCycleLaneStyle.startsWith(\"yellow\") -> R.drawable.ic_cycleway_lane_yellow_dual\n else -> R.drawable.ic_cycleway_lane_white_dual\n }\n \n-private val CountryInfo.dualCycleLaneLeftHandedTrafficResId: Int get() = when {\n+val CountryInfo.dualCycleLaneMirroredResId: Int get() = when {\n exclusiveCycleLaneStyle.startsWith(\"white\") -> R.drawable.ic_cycleway_lane_white_dual_l\n exclusiveCycleLaneStyle.startsWith(\"yellow\") -> R.drawable.ic_cycleway_lane_yellow_dual_l\n else -> R.drawable.ic_cycleway_lane_white_dual_l\n }\n \n-fun CountryInfo.getAdvisoryCycleLaneResId(isLeftHandedTraffic: Boolean): Int = when (advisoryCycleLaneStyle) {\n- \"white dashes\" ->\n- if (isLeftHandedTraffic) R.drawable.ic_cycleway_shared_lane_white_dashed_l\n- else R.drawable.ic_cycleway_shared_lane_white_dashed\n+val CountryInfo.advisoryCycleLaneResId: Int get() = when (advisoryCycleLaneStyle) {\n+ \"white dashes\" -> R.drawable.ic_cycleway_shared_lane_white_dashed\n \"white dashes without pictogram\" -> R.drawable.ic_cycleway_shared_lane_no_pictograms\n \"ochre background\" -> R.drawable.ic_cycleway_shared_lane_orchre_background\n else -> R.drawable.ic_cycleway_shared_lane_white_dashed\n }\n \n-fun CountryInfo.getPictogramCycleLaneResId(isLeftHandedTraffic: Boolean): Int =\n- if (isLeftHandedTraffic) pictogramCycleLaneLeftHandedTrafficResId else pictogramCycleLaneResId\n+val CountryInfo.advisoryCycleLaneMirroredResId: Int get() = when (advisoryCycleLaneStyle) {\n+ \"white dashes\" -> R.drawable.ic_cycleway_shared_lane_white_dashed_l\n+ \"white dashes without pictogram\" -> R.drawable.ic_cycleway_shared_lane_no_pictograms\n+ \"ochre background\" -> R.drawable.ic_cycleway_shared_lane_orchre_background\n+ else -> R.drawable.ic_cycleway_shared_lane_white_dashed_l\n+}\n \n-private val CountryInfo.pictogramCycleLaneResId: Int get() = when (pictogramCycleLaneStyle) {\n+val CountryInfo.pictogramCycleLaneResId: Int get() = when (pictogramCycleLaneStyle) {\n \"white\" -> R.drawable.ic_cycleway_pictograms_white\n \"yellow\" -> R.drawable.ic_cycleway_pictograms_yellow\n else -> R.drawable.ic_cycleway_pictograms_white\n }\n \n-private val CountryInfo.pictogramCycleLaneLeftHandedTrafficResId: Int get() = when (pictogramCycleLaneStyle) {\n+val CountryInfo.pictogramCycleLaneMirroredResId: Int get() = when (pictogramCycleLaneStyle) {\n \"white\" -> R.drawable.ic_cycleway_pictograms_white_l\n \"yellow\" -> R.drawable.ic_cycleway_pictograms_yellow_l\n else -> R.drawable.ic_cycleway_pictograms_white_l\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/view/Text.kt b/app/src/main/java/de/westnordost/streetcomplete/view/Text.kt\nindex 71424098785..2d9534e4a04 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/view/Text.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/view/Text.kt\n@@ -1,5 +1,6 @@\n package de.westnordost.streetcomplete.view\n \n+import android.view.Menu\n import android.widget.TextView\n import androidx.annotation.StringRes\n \n@@ -25,3 +26,10 @@ fun VerticalLabelView.setText(text: Text?) {\n null -> setText(\"\")\n }\n }\n+\n+fun Menu.add(groupId: Int, itemId: Int, order: Int, text: Text) {\n+ when (text) {\n+ is ResText -> add(groupId, itemId, order, text.resId)\n+ is CharSequenceText -> add(groupId, itemId, order, text.text)\n+ }\n+}\ndiff --git a/app/src/main/java/de/westnordost/streetcomplete/view/controller/StreetSideSelectWithLastAnswerButtonViewController.kt b/app/src/main/java/de/westnordost/streetcomplete/view/controller/StreetSideSelectWithLastAnswerButtonViewController.kt\nindex 3e5fc1ade11..513ce349f92 100644\n--- a/app/src/main/java/de/westnordost/streetcomplete/view/controller/StreetSideSelectWithLastAnswerButtonViewController.kt\n+++ b/app/src/main/java/de/westnordost/streetcomplete/view/controller/StreetSideSelectWithLastAnswerButtonViewController.kt\n@@ -128,6 +128,9 @@ class StreetSideSelectWithLastAnswerButtonViewController(\n \n /* ------------------------------------------------------------------------------------------ */\n \n+ fun getPuzzleSide(isRight: Boolean) =\n+ if (isRight) right else left\n+\n fun setPuzzleSide(item: StreetSideDisplayItem?, isRight: Boolean) {\n if (isRight) {\n if (item != null) {\ndiff --git a/app/src/main/res/drawable/ic_bicycle_white.xml b/app/src/main/res/drawable/ic_bicycle_white.xml\nnew file mode 100644\nindex 00000000000..7f1df0718a5\n--- /dev/null\n+++ b/app/src/main/res/drawable/ic_bicycle_white.xml\n@@ -0,0 +1,13 @@\n+\n+ \n+\ndiff --git a/app/src/main/res/drawable/ic_cycleway_shoulder.xml b/app/src/main/res/drawable/ic_cycleway_shoulder.xml\nnew file mode 100644\nindex 00000000000..d5bb9349134\n--- /dev/null\n+++ b/app/src/main/res/drawable/ic_cycleway_shoulder.xml\n@@ -0,0 +1,12 @@\n+\n+ \n+ \n+\ndiff --git a/app/src/main/res/drawable/ic_fat_footnote.xml b/app/src/main/res/drawable/ic_fat_footnote.xml\ndeleted file mode 100644\nindex 85a724e1dd6..00000000000\n--- a/app/src/main/res/drawable/ic_fat_footnote.xml\n+++ /dev/null\n@@ -1,11 +0,0 @@\n-\n- \n-\ndiff --git a/app/src/main/res/drawable/ic_separate_cycleway_allowed.xml b/app/src/main/res/drawable/ic_separate_cycleway_allowed.xml\nnew file mode 100644\nindex 00000000000..c8301b8ccd3\n--- /dev/null\n+++ b/app/src/main/res/drawable/ic_separate_cycleway_allowed.xml\n@@ -0,0 +1,31 @@\n+\n+ \n+ \n+ \n+ \n+ \n+ \n+\ndiff --git a/app/src/main/res/drawable/ic_separate_cycleway_exclusive.xml b/app/src/main/res/drawable/ic_separate_cycleway_exclusive.xml\nnew file mode 100644\nindex 00000000000..36a91e629f9\n--- /dev/null\n+++ b/app/src/main/res/drawable/ic_separate_cycleway_exclusive.xml\n@@ -0,0 +1,8 @@\n+\n+ \n+ \n+\ndiff --git a/app/src/main/res/drawable/ic_separate_cycleway_no.xml b/app/src/main/res/drawable/ic_separate_cycleway_no.xml\nnew file mode 100644\nindex 00000000000..821874a99b6\n--- /dev/null\n+++ b/app/src/main/res/drawable/ic_separate_cycleway_no.xml\n@@ -0,0 +1,12 @@\n+\n+ \n+ \n+\ndiff --git a/app/src/main/res/drawable/ic_path_segregated_no.xml b/app/src/main/res/drawable/ic_separate_cycleway_not_segregated.xml\nsimilarity index 100%\nrename from app/src/main/res/drawable/ic_path_segregated_no.xml\nrename to app/src/main/res/drawable/ic_separate_cycleway_not_segregated.xml\ndiff --git a/app/src/main/res/drawable/ic_path_segregated.xml b/app/src/main/res/drawable/ic_separate_cycleway_segregated.xml\nsimilarity index 100%\nrename from app/src/main/res/drawable/ic_path_segregated.xml\nrename to app/src/main/res/drawable/ic_separate_cycleway_segregated.xml\ndiff --git a/app/src/main/res/drawable/ic_path_segregated_l.xml b/app/src/main/res/drawable/ic_separate_cycleway_segregated_l.xml\nsimilarity index 100%\nrename from app/src/main/res/drawable/ic_path_segregated_l.xml\nrename to app/src/main/res/drawable/ic_separate_cycleway_segregated_l.xml\ndiff --git a/app/src/main/res/drawable/ic_separate_cycleway_with_sidewalk.xml b/app/src/main/res/drawable/ic_separate_cycleway_with_sidewalk.xml\nnew file mode 100644\nindex 00000000000..500a9dfdb5f\n--- /dev/null\n+++ b/app/src/main/res/drawable/ic_separate_cycleway_with_sidewalk.xml\n@@ -0,0 +1,20 @@\n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\ndiff --git a/app/src/main/res/drawable/ic_separate_cycleway_with_sidewalk_l.xml b/app/src/main/res/drawable/ic_separate_cycleway_with_sidewalk_l.xml\nnew file mode 100644\nindex 00000000000..b94e4f20b20\n--- /dev/null\n+++ b/app/src/main/res/drawable/ic_separate_cycleway_with_sidewalk_l.xml\n@@ -0,0 +1,20 @@\n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\ndiff --git a/app/src/main/res/layout/cell_labeled_icon_select_right.xml b/app/src/main/res/layout/cell_labeled_icon_select_right.xml\nindex 56e6e24d385..e318708ebc4 100644\n--- a/app/src/main/res/layout/cell_labeled_icon_select_right.xml\n+++ b/app/src/main/res/layout/cell_labeled_icon_select_right.xml\n@@ -16,7 +16,7 @@\n android:layout_height=\"wrap_content\"\n android:layout_marginEnd=\"6dp\"\n android:scaleType=\"fitCenter\"\n- tools:src=\"@drawable/ic_path_segregated_no\"\n+ tools:src=\"@drawable/ic_separate_cycleway_not_segregated\"\n />\n \n \ndiff --git a/app/src/main/res/layout/sign_bicycle_boulevard.xml b/app/src/main/res/layout/sign_bicycle_boulevard.xml\nnew file mode 100644\nindex 00000000000..d80d147ed83\n--- /dev/null\n+++ b/app/src/main/res/layout/sign_bicycle_boulevard.xml\n@@ -0,0 +1,40 @@\n+\n+\n+\n+ \n+\n+ \n+\n+ \n+\n+ \n+\n+\ndiff --git a/app/src/main/res/raw/changelog.yml b/app/src/main/res/raw/changelog.yml\nindex 0875b45f72d..b10dd1b7ddf 100644\n--- a/app/src/main/res/raw/changelog.yml\n+++ b/app/src/main/res/raw/changelog.yml\n@@ -1,12 +1,22 @@\n v50.0-beta1: |\n-

\ud83d\ude9a\ud83d\udce6 Move node (#3502, #4579), by @Helium314

\n+

\ud83d\udeb2\ufe0f\ufe0f Cycleway Overlay (#4657, #4233)

\n+

There is a new overlay which allows you to review and edit the streetside cycleway infrastructure as well as whether there is any segregation on combined foot- and cycle paths.

\n+

\ud83d\ude9a Move node (#3502, #4579), by @Helium314

\n

\"It\u2019s at slightly different position\u2026\" is a new generic answer available for every POI-based\n quest and overlay. It lets you correct the position of the POI.

\n \n+

Enhanced Overlays

\n+
    \n+
  • Sidewalks: Missing sidewalk information on unpaved roads and on roads with a very low speed limit are not shown in red
    • \n+
  • Sidewalks: Support sidewalks mapped on exclusive cycleways
    • \n+
  • Street parking: Fix a crash when editing partially (#4634)
    • \n+
  • Other small enhancements (see #4657)
    • \n+
\n

Enhanced Quests

\n
    \n
  • Surfaces for segregated foot and cycleway: Correct common surface (#4615), by @mnalis
    • \n-
  • Other small enhancements (#4637), thanks @matkoniecz
    • \n+
  • Disabled cycleway quest by default because it can be done more comprehensively in the overlay
    • \n+
  • Other small enhancements (#4637, ...), thanks @matkoniecz
    • \n
\n \n v49.2: |\ndiff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml\nindex 127b10f121b..94b7429c083 100644\n--- a/app/src/main/res/values/strings.xml\n+++ b/app/src/main/res/values/strings.xml\n@@ -940,6 +940,7 @@ Before uploading your changes, the app checks with a <a href=\\\"https://www.we\n sidepath or protected bicycle lane, both directions\n none, but cyclists may use road in both directions\n none, no cycling allowed in this direction\n+ none, but shoulder is usable for cyclists\n Also bicycle path on the other side\u2026\n No bicycle lane or path at all\n As usual, tap on one side of the illustration, select a proper answer and do the same for the other side.\\n\\nNote all the available options: some cases are not obvious, like a oneway road that allows cyclists in both directions!\n@@ -1469,29 +1470,6 @@ Otherwise, you can download another keyboard in the app store. Popular keyboards\n (unspecified)\n international\n \n- \"Select orientation toward roadway:\"\n- \"Select position:\"\n- \"Any sign or road marking here?\"\n- \"Parallel\"\n- \"Diagonal\"\n- \"Perpendicular\"\n- \"On street\"\n- \"Partially on street\"\n- \"Adjacent to street\"\n- \"Adjacent to street only in dedicated spaces\"\n- \"On street only in dedicated spaces\"\n- Parking displayed separately on map\n- No parking here / Not allowed\n- No parking\n- No stopping\n- No standing\n- Parking / Stopping restricted conditionally\n- No explicit sign / parking not possible\n- \"If it is at all possible to park or stop here, please answer how those who might park here can do so. Which restrictions apply exactly can be specified later.\n-\n-Alternatively, you can leave a note (with a photo).\"\n- Street width: %s\n-\n \"What surface does this piece of road have?\"\n \"What surface does this square have?\"\n \n@@ -1594,6 +1572,21 @@ Partially means that a wheelchair can enter and use the restroom, but no handrai\n \n Select Overlay\n \n+ Cycleways\n+ It\u2019s a %1$s\n+ It\u2019s not a %1$s\n+ Bicycle boulevard\n+ No cycling\n+ Cyclists are allowed\n+ Not designated for cyclists (regardless of whether cycling is allowed or not)\n+ Designated combined foot- and cycleway\n+ Segregated cycle- and footway\n+ Exclusive cycleway\n+ Exclusive cycleway which has a sidewalk for foot traffic (with kerb)\n+ Reverse cycleway direction\n+ That a cycleway goes into the other direction is extremely rare.\n+ Tap which side to reverse\n+\n None\n \n Street lighting\n@@ -1617,4 +1610,28 @@ Partially means that a wheelchair can enter and use the restroom, but no handrai\n \"Still same place\"\n \n Street parking\n+\n+ \"Select orientation toward roadway:\"\n+ \"Select position:\"\n+ \"Any sign or road marking here?\"\n+ \"Parallel\"\n+ \"Diagonal\"\n+ \"Perpendicular\"\n+ \"On street\"\n+ \"Partially on street\"\n+ \"Adjacent to street\"\n+ \"Adjacent to street only in dedicated spaces\"\n+ \"On street only in dedicated spaces\"\n+ Parking displayed separately on map\n+ No parking here / Not allowed\n+ No parking\n+ No stopping\n+ No standing\n+ Parking / Stopping restricted conditionally\n+ No explicit sign / parking not possible\n+ \"If it is at all possible to park or stop here, please answer how those who might park here can do so. Which restrictions apply exactly can be specified later.\n+\n+Alternatively, you can leave a note (with a photo).\"\n+ Street width: %s\n+\n \ndiff --git a/res/graphics/cycleway segregation/allowed.svg b/res/graphics/cycleway segregation/allowed.svg\nnew file mode 100644\nindex 00000000000..73295bba8ef\n--- /dev/null\n+++ b/res/graphics/cycleway segregation/allowed.svg\n@@ -0,0 +1,13 @@\n+\n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\ndiff --git a/res/graphics/cycleway segregation/exclusive.svg b/res/graphics/cycleway segregation/exclusive.svg\nnew file mode 100644\nindex 00000000000..a471aa3ec97\n--- /dev/null\n+++ b/res/graphics/cycleway segregation/exclusive.svg\n@@ -0,0 +1,7 @@\n+\n+\n+ \n+ \n+ \n+ \n+\ndiff --git a/res/graphics/cycleway segregation/no.svg b/res/graphics/cycleway segregation/no.svg\nnew file mode 100644\nindex 00000000000..d5f3fd7c921\n--- /dev/null\n+++ b/res/graphics/cycleway segregation/no.svg\n@@ -0,0 +1,7 @@\n+\n+\n+ \n+ \n+ \n+ \n+\ndiff --git a/res/graphics/cycleway segregation/segregated_r.svg b/res/graphics/cycleway segregation/segregated_r.svg\nindex c2e45b4d74a..c1c4e9c8f79 100644\n--- a/res/graphics/cycleway segregation/segregated_r.svg\n+++ b/res/graphics/cycleway segregation/segregated_r.svg\n@@ -1,7 +1,7 @@\n \n-\n- \n- \n- \n- \n+\n+ \n+ \n+ \n+ \n \ndiff --git a/res/graphics/cycleway segregation/with_sidewalk.svg b/res/graphics/cycleway segregation/with_sidewalk.svg\nnew file mode 100644\nindex 00000000000..c3ce86d3eec\n--- /dev/null\n+++ b/res/graphics/cycleway segregation/with_sidewalk.svg\n@@ -0,0 +1,17 @@\n+\n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\ndiff --git a/res/graphics/cycleway segregation/with_sidewalk_l.svg b/res/graphics/cycleway segregation/with_sidewalk_l.svg\nnew file mode 100644\nindex 00000000000..2827ad869e7\n--- /dev/null\n+++ b/res/graphics/cycleway segregation/with_sidewalk_l.svg\n@@ -0,0 +1,17 @@\n+\n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\ndiff --git a/res/graphics/cycleway/bicycle.svg b/res/graphics/cycleway/bicycle.svg\nnew file mode 100644\nindex 00000000000..df18c0f55ce\n--- /dev/null\n+++ b/res/graphics/cycleway/bicycle.svg\n@@ -0,0 +1,4 @@\n+\n+\n+ \n+\ndiff --git a/res/graphics/cycleway/shoulder.svg b/res/graphics/cycleway/shoulder.svg\nnew file mode 100644\nindex 00000000000..b0de9a09edf\n--- /dev/null\n+++ b/res/graphics/cycleway/shoulder.svg\n@@ -0,0 +1,5 @@\n+\n+\n+ \n+ \n+\n", "test_patch": "diff --git a/app/src/androidTest/java/de/westnordost/streetcomplete/data/osm/osmquests/TestQuestType.kt b/app/src/androidTest/java/de/westnordost/streetcomplete/data/osm/osmquests/TestQuestType.kt\nindex 176fed3129c..7b97c648cbe 100644\n--- a/app/src/androidTest/java/de/westnordost/streetcomplete/data/osm/osmquests/TestQuestType.kt\n+++ b/app/src/androidTest/java/de/westnordost/streetcomplete/data/osm/osmquests/TestQuestType.kt\n@@ -1,5 +1,6 @@\n package de.westnordost.streetcomplete.data.osm.osmquests\n \n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement\n@@ -9,7 +10,7 @@ import de.westnordost.streetcomplete.quests.AbstractOsmQuestForm\n open class TestQuestType : OsmElementQuestType {\n \n override fun isApplicableTo(element: Element): Boolean? = null\n- override fun applyAnswerTo(answer: String, tags: Tags, timestampEdited: Long) {}\n+ override fun applyAnswerTo(answer: String, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {}\n override val icon = 0\n override fun createForm(): AbstractOsmQuestForm = object : AbstractOsmQuestForm() {}\n override val changesetComment = \"\"\ndiff --git a/app/src/test/java/de/westnordost/streetcomplete/data/quest/TestQuestTypes.kt b/app/src/test/java/de/westnordost/streetcomplete/data/quest/TestQuestTypes.kt\nindex ad0cc0a8f0b..246bc53c6f0 100644\n--- a/app/src/test/java/de/westnordost/streetcomplete/data/quest/TestQuestTypes.kt\n+++ b/app/src/test/java/de/westnordost/streetcomplete/data/quest/TestQuestTypes.kt\n@@ -1,6 +1,7 @@\n package de.westnordost.streetcomplete.data.quest\n \n import de.westnordost.streetcomplete.R\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry\n import de.westnordost.streetcomplete.data.osm.mapdata.Element\n import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType\n@@ -12,7 +13,7 @@ open class TestQuestTypeA : OsmElementQuestType {\n \n override fun getTitle(tags: Map) = 0\n override fun isApplicableTo(element: Element): Boolean? = null\n- override fun applyAnswerTo(answer: String, tags: Tags, timestampEdited: Long) {}\n+ override fun applyAnswerTo(answer: String, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {}\n override fun createForm(): AbstractOsmQuestForm = object : AbstractOsmQuestForm() {}\n override val changesetComment = \"test me\"\n override fun getApplicableElements(mapData: MapDataWithGeometry) = mapData.filter { isApplicableTo(it) == true }\ndiff --git a/app/src/test/java/de/westnordost/streetcomplete/osm/OnewayKtTest.kt b/app/src/test/java/de/westnordost/streetcomplete/osm/OnewayKtTest.kt\nindex 359090a8b2b..dcf7e4b2e8e 100644\n--- a/app/src/test/java/de/westnordost/streetcomplete/osm/OnewayKtTest.kt\n+++ b/app/src/test/java/de/westnordost/streetcomplete/osm/OnewayKtTest.kt\n@@ -37,4 +37,31 @@ class OnewayKtTest {\n assertTrue(isNotOnewayForCyclists(mapOf(\"oneway:bicycle\" to \"no\"), isLeftHandTraffic))\n }\n }\n+\n+ @Test fun `is in contraflow of oneway`() {\n+ val oneway = mapOf(\"oneway\" to \"yes\")\n+ val reverseOneway = mapOf(\"oneway\" to \"-1\")\n+\n+ // not in oneway\n+ assertFalse(isInContraflowOfOneway(false, mapOf(), false))\n+ assertFalse(isInContraflowOfOneway(false, mapOf(), true))\n+ assertFalse(isInContraflowOfOneway(true, mapOf(), false))\n+ assertFalse(isInContraflowOfOneway(true, mapOf(), true))\n+\n+ // sides of oneway\n+ assertTrue(isInContraflowOfOneway(false, oneway, false))\n+ assertFalse(isInContraflowOfOneway(true, oneway, false))\n+\n+ // sides of reverse oneway\n+ assertFalse(isInContraflowOfOneway(false, reverseOneway, false))\n+ assertTrue(isInContraflowOfOneway(true, reverseOneway, false))\n+\n+ // sides of reverse oneway in left hand traffic countries\n+ assertTrue(isInContraflowOfOneway(false, reverseOneway, true))\n+ assertFalse(isInContraflowOfOneway(true, reverseOneway, true))\n+\n+ // sides of oneway in left hand traffic countries\n+ assertFalse(isInContraflowOfOneway(false, oneway, true))\n+ assertTrue(isInContraflowOfOneway(true, oneway, true))\n+ }\n }\ndiff --git a/app/src/test/java/de/westnordost/streetcomplete/osm/TagsKtTest.kt b/app/src/test/java/de/westnordost/streetcomplete/osm/TagsKtTest.kt\nnew file mode 100644\nindex 00000000000..0f53a80f6f7\n--- /dev/null\n+++ b/app/src/test/java/de/westnordost/streetcomplete/osm/TagsKtTest.kt\n@@ -0,0 +1,102 @@\n+package de.westnordost.streetcomplete.osm\n+\n+import org.junit.Assert.*\n+import org.junit.Test\n+\n+class TagsKtTest {\n+\n+ @Test fun `expand sides`() {\n+ val tags = Tags(mapOf(\"a:both\" to \"blub\", \"a\" to \"norg\"))\n+ tags.expandSides(\"a\", includeBareTag = false)\n+ assertEquals(\n+ mapOf(\"a:left\" to \"blub\", \"a:right\" to \"blub\", \"a\" to \"norg\"),\n+ tags.toMap()\n+ )\n+ }\n+\n+ @Test fun `expand sides with bare tag`() {\n+ val tags = Tags(mapOf(\"a\" to \"blub\"))\n+ tags.expandSides(\"a\")\n+ assertEquals(\n+ mapOf(\"a:left\" to \"blub\", \"a:right\" to \"blub\"),\n+ tags.toMap()\n+ )\n+ }\n+\n+ @Test fun `when expanding sides, explicit tag takes precedence over bare tag`() {\n+ val tags = Tags(mapOf(\"a\" to \"blub\", \"a:both\" to \"burg\"))\n+ tags.expandSides(\"a\")\n+ assertEquals(\n+ mapOf(\"a:left\" to \"burg\", \"a:right\" to \"burg\"),\n+ tags.toMap()\n+ )\n+ }\n+\n+ @Test fun `when expanding sides, does not overwrite left and right tags`() {\n+ val tags = Tags(mapOf(\"a:both\" to \"gah\", \"a:left\" to \"le\", \"a:right\" to \"ri\"))\n+ tags.expandSides(\"a\")\n+ assertEquals(\n+ mapOf(\"a:left\" to \"le\", \"a:right\" to \"ri\"),\n+ tags.toMap()\n+ )\n+ }\n+\n+ @Test fun `don't expand unrelated tags sides`() {\n+ val tags = Tags(mapOf(\"abc:both\" to \"blub\"))\n+ tags.expandSides(\"a\", includeBareTag = false)\n+ assertEquals(\n+ mapOf(\"abc:both\" to \"blub\"),\n+ tags.toMap()\n+ )\n+ }\n+\n+ @Test fun `expand sides with postfix`() {\n+ val tags = Tags(mapOf(\"a:both:c\" to \"blub\", \"a:c\" to \"blarg\"))\n+ tags.expandSides(\"a\", \"c\", includeBareTag = false)\n+ assertEquals(\n+ mapOf(\"a:left:c\" to \"blub\", \"a:right:c\" to \"blub\", \"a:c\" to \"blarg\"),\n+ tags.toMap()\n+ )\n+\n+ val tags2 = Tags(mapOf(\"a:c\" to \"blarg\"))\n+ tags2.expandSides(\"a\", \"c\")\n+ assertEquals(\n+ mapOf(\"a:left:c\" to \"blarg\", \"a:right:c\" to \"blarg\"),\n+ tags2.toMap()\n+ )\n+ }\n+\n+ @Test fun `merge sides`() {\n+ val tags = Tags(mapOf(\"a:left\" to \"blub\", \"a:right\" to \"blub\"))\n+ tags.mergeSides(\"a\")\n+ assertEquals(\n+ mapOf(\"a:both\" to \"blub\"),\n+ tags.toMap()\n+ )\n+ }\n+\n+ @Test fun `merge sides only merges if both are the same`() {\n+ val tags = Tags(mapOf(\"a:left\" to \"blub\"))\n+ tags.mergeSides(\"a\")\n+ assertEquals(\n+ mapOf(\"a:left\" to \"blub\"),\n+ tags.toMap()\n+ )\n+\n+ val tags2 = Tags(mapOf(\"a:left\" to \"blub\", \"a:right\" to \"blab\"))\n+ tags2.mergeSides(\"a\")\n+ assertEquals(\n+ mapOf(\"a:left\" to \"blub\", \"a:right\" to \"blab\"),\n+ tags2.toMap()\n+ )\n+ }\n+\n+ @Test fun `merge sides overwrites previous both tag`() {\n+ val tags = Tags(mapOf(\"a:left\" to \"blub\", \"a:right\" to \"blub\", \"a:both\" to \"old\"))\n+ tags.mergeSides(\"a\")\n+ assertEquals(\n+ mapOf(\"a:both\" to \"blub\"),\n+ tags.toMap()\n+ )\n+ }\n+}\ndiff --git a/app/src/test/java/de/westnordost/streetcomplete/osm/bicycle_boulevard/BicycleBoulevardKtTest.kt b/app/src/test/java/de/westnordost/streetcomplete/osm/bicycle_boulevard/BicycleBoulevardKtTest.kt\nnew file mode 100644\nindex 00000000000..862846d3888\n--- /dev/null\n+++ b/app/src/test/java/de/westnordost/streetcomplete/osm/bicycle_boulevard/BicycleBoulevardKtTest.kt\n@@ -0,0 +1,88 @@\n+package de.westnordost.streetcomplete.osm.bicycle_boulevard\n+\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapChangesBuilder\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAdd\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryChange\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDelete\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify\n+import de.westnordost.streetcomplete.osm.bicycle_boulevard.BicycleBoulevard.*\n+import org.assertj.core.api.Assertions\n+import org.junit.Assert.*\n+import org.junit.Test\n+\n+class BicycleBoulevardKtTest {\n+\n+ @Test fun create() {\n+ assertEquals(NO, createBicycleBoulevard(mapOf()))\n+ assertEquals(NO, createBicycleBoulevard(mapOf(\"bicycle_road\" to \"no\")))\n+ assertEquals(YES, createBicycleBoulevard(mapOf(\"bicycle_road\" to \"yes\")))\n+ assertEquals(NO, createBicycleBoulevard(mapOf(\"cyclestreet\" to \"no\")))\n+ assertEquals(YES, createBicycleBoulevard(mapOf(\"cyclestreet\" to \"yes\")))\n+ }\n+\n+ @Test fun `apply yes when it was not tagged before`() {\n+ verifyAnswer(mapOf(), YES, \"DE\", arrayOf(StringMapEntryAdd(\"bicycle_road\", \"yes\")))\n+ verifyAnswer(mapOf(), YES, \"US\", arrayOf(StringMapEntryAdd(\"bicycle_road\", \"yes\")))\n+\n+ verifyAnswer(mapOf(), YES, \"BE\", arrayOf(StringMapEntryAdd(\"cyclestreet\", \"yes\")))\n+ verifyAnswer(mapOf(), YES, \"NL\", arrayOf(StringMapEntryAdd(\"cyclestreet\", \"yes\")))\n+ verifyAnswer(mapOf(), YES, \"LU\", arrayOf(StringMapEntryAdd(\"cyclestreet\", \"yes\")))\n+ }\n+\n+ @Test fun `apply yes when it was tagged before`() {\n+ // modifying current tag\n+ verifyAnswer(\n+ mapOf(\"bicycle_road\" to \"no\"),\n+ YES, \"DE\",\n+ arrayOf(StringMapEntryModify(\"bicycle_road\", \"no\", \"yes\"))\n+ )\n+ verifyAnswer(\n+ mapOf(\"cyclestreet\" to \"no\"),\n+ YES, \"NL\",\n+ arrayOf(StringMapEntryModify(\"cyclestreet\", \"no\", \"yes\"))\n+ )\n+\n+ // keeping current tag in country where that tag is not usually used\n+ verifyAnswer(\n+ mapOf(\"cyclestreet\" to \"no\"),\n+ YES, \"DE\",\n+ arrayOf(StringMapEntryModify(\"cyclestreet\", \"no\", \"yes\"))\n+ )\n+ verifyAnswer(\n+ mapOf(\"bicycle_road\" to \"no\"),\n+ YES, \"NL\",\n+ arrayOf(StringMapEntryModify(\"bicycle_road\", \"no\", \"yes\"))\n+ )\n+ }\n+\n+ @Test fun `apply no`() {\n+ verifyAnswer(\n+ mapOf(\"bicycle_road\" to \"yes\", \"cyclestreet\" to \"yes\"),\n+ NO, \"DE\",\n+ arrayOf(\n+ StringMapEntryDelete(\"bicycle_road\", \"yes\"),\n+ StringMapEntryDelete(\"cyclestreet\", \"yes\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"bicycle_road\" to \"yes\", \"cyclestreet\" to \"yes\"),\n+ NO, \"DE\",\n+ arrayOf(\n+ StringMapEntryDelete(\"bicycle_road\", \"yes\"),\n+ StringMapEntryDelete(\"cyclestreet\", \"yes\"),\n+ )\n+ )\n+ }\n+}\n+\n+private fun verifyAnswer(\n+ tags: Map,\n+ answer: BicycleBoulevard,\n+ countryCode: String,\n+ expectedChanges: Array\n+) {\n+ val cb = StringMapChangesBuilder(tags)\n+ answer.applyTo(cb, countryCode)\n+ val changes = cb.create().changes\n+ Assertions.assertThat(changes).containsExactlyInAnyOrder(*expectedChanges)\n+}\ndiff --git a/app/src/test/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayCreatorKtTest.kt b/app/src/test/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayCreatorKtTest.kt\nnew file mode 100644\nindex 00000000000..95f1d887052\n--- /dev/null\n+++ b/app/src/test/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayCreatorKtTest.kt\n@@ -0,0 +1,728 @@\n+package de.westnordost.streetcomplete.osm.cycleway\n+\n+import de.westnordost.streetcomplete.osm.cycleway.Cycleway.*\n+import de.westnordost.streetcomplete.osm.cycleway.Direction.*\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapChangesBuilder\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAdd\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryChange\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDelete\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify\n+import de.westnordost.streetcomplete.osm.nowAsCheckDateString\n+import org.assertj.core.api.Assertions\n+import org.junit.Test\n+\n+class CyclewayCreatorKtTest {\n+\n+ @Test fun `apply nothing`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"cycleway:left\" to \"track\",\n+ \"cycleway\" to \"no\",\n+ \"cycleway:right\" to \"track\"\n+ ),\n+ LeftAndRightCycleway(null, null),\n+ arrayOf()\n+ )\n+ }\n+\n+ @Test fun `apply cycleway lane answer`() {\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(EXCLUSIVE_LANE, EXCLUSIVE_LANE),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"lane\"),\n+ StringMapEntryAdd(\"cycleway:both:lane\", \"exclusive\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply advisory lane answer`() {\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(ADVISORY_LANE, ADVISORY_LANE),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"lane\"),\n+ StringMapEntryAdd(\"cycleway:both:lane\", \"advisory\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply cycleway track answer`() {\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(TRACK, TRACK),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"track\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply unspecified cycle lane answer`() {\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(UNSPECIFIED_LANE, UNSPECIFIED_LANE),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"lane\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply unspecified cycle lane answer does not remove previous specific lane answer`() {\n+ verifyAnswer(\n+ mapOf(\"cycleway:both:lane\" to \"exclusive\"),\n+ cycleway(UNSPECIFIED_LANE, UNSPECIFIED_LANE),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"lane\"),\n+ StringMapEntryModify(\"cycleway:both:lane\", \"exclusive\", \"exclusive\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply bus lane answer`() {\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(BUSWAY, BUSWAY),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"share_busway\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply pictogram lane answer`() {\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(PICTOGRAMS, PICTOGRAMS),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"shared_lane\"),\n+ StringMapEntryAdd(\"cycleway:both:lane\", \"pictogram\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply suggestion lane answer`() {\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(SUGGESTION_LANE, SUGGESTION_LANE),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"shared_lane\"),\n+ StringMapEntryAdd(\"cycleway:both:lane\", \"advisory\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply no cycleway answer`() {\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(NONE, NONE),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"no\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply cycleway on sidewalk answer`() {\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(SIDEWALK_EXPLICIT, SIDEWALK_EXPLICIT),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"track\"),\n+ StringMapEntryAdd(\"cycleway:both:segregated\", \"no\"),\n+ StringMapEntryAdd(\"sidewalk\", \"both\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply cycleway on sidewalk answer on one side only`() {\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(null, SIDEWALK_EXPLICIT),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:right\", \"track\"),\n+ StringMapEntryAdd(\"cycleway:right:segregated\", \"no\"),\n+ StringMapEntryAdd(\"sidewalk:right\", \"yes\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"sidewalk\" to \"right\"),\n+ cycleway(SIDEWALK_EXPLICIT, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:left\", \"track\"),\n+ StringMapEntryAdd(\"cycleway:left:segregated\", \"no\"),\n+ StringMapEntryModify(\"sidewalk\", \"right\", \"both\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply separate cycleway answer`() {\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(SEPARATE, SEPARATE),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"separate\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply dual cycle track answer`() {\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(TRACK to BOTH, TRACK to BOTH),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"track\"),\n+ StringMapEntryAdd(\"cycleway:both:oneway\", \"no\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply dual cycle track answer in oneway`() {\n+ verifyAnswer(\n+ mapOf(\"oneway\" to \"yes\"),\n+ cycleway(TRACK to BOTH, TRACK to BOTH),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"track\"),\n+ StringMapEntryAdd(\"cycleway:both:oneway\", \"no\"),\n+ StringMapEntryAdd(\"oneway:bicycle\", \"no\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply dual cycle lane answer`() {\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(EXCLUSIVE_LANE to BOTH, EXCLUSIVE_LANE to BOTH),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"lane\"),\n+ StringMapEntryAdd(\"cycleway:both:oneway\", \"no\"),\n+ StringMapEntryAdd(\"cycleway:both:lane\", \"exclusive\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply dual cycle lane answer in oneway`() {\n+ verifyAnswer(\n+ mapOf(\"oneway\" to \"yes\"),\n+ cycleway(EXCLUSIVE_LANE to BOTH, EXCLUSIVE_LANE to BOTH),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"lane\"),\n+ StringMapEntryAdd(\"cycleway:both:oneway\", \"no\"),\n+ StringMapEntryAdd(\"cycleway:both:lane\", \"exclusive\"),\n+ StringMapEntryAdd(\"oneway:bicycle\", \"no\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply answer where left and right side are different`() {\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(TRACK, NONE),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:left\", \"track\"),\n+ StringMapEntryAdd(\"cycleway:right\", \"no\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply answer where there exists a cycleway in opposite direction of oneway`() {\n+ verifyAnswer(\n+ mapOf(\"oneway\" to \"yes\"),\n+ cycleway(TRACK, TRACK),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"track\"),\n+ StringMapEntryAdd(\"cycleway:left:oneway\", \"-1\"),\n+ StringMapEntryAdd(\"oneway:bicycle\", \"no\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply answer where there exists a cycleway in opposite direction of backward oneway`() {\n+ verifyAnswer(\n+ mapOf(\"oneway\" to \"-1\"),\n+ cycleway(TRACK, TRACK),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"track\"),\n+ StringMapEntryAdd(\"cycleway:right:oneway\", \"yes\"),\n+ StringMapEntryAdd(\"oneway:bicycle\", \"no\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply cycleway track answer updates segregated key`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"cycleway:both:segregated\" to \"no\",\n+ \"cycleway:both\" to \"no\"\n+ ),\n+ cycleway(TRACK, TRACK),\n+ arrayOf(\n+ StringMapEntryModify(\"cycleway:both:segregated\", \"no\", \"yes\"),\n+ StringMapEntryModify(\"cycleway:both\", \"no\", \"track\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply answer for both deletes any previous answers given for left, right, general`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"cycleway:left\" to \"lane\",\n+ \"cycleway:left:lane\" to \"advisory\",\n+ \"cycleway:left:segregated\" to \"maybe\",\n+ \"cycleway:left:oneway\" to \"yes\",\n+ \"cycleway:right\" to \"shared_lane\",\n+ \"cycleway:right:lane\" to \"pictogram\",\n+ \"cycleway:right:segregated\" to \"definitely\",\n+ \"cycleway:right:oneway\" to \"yes\",\n+ \"cycleway\" to \"shared_lane\",\n+ \"cycleway:lane\" to \"pictogram\",\n+ \"cycleway:segregated\" to \"definitely\",\n+ \"cycleway:oneway\" to \"yes\"\n+ ),\n+ cycleway(TRACK, TRACK),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"track\"),\n+ StringMapEntryDelete(\"cycleway:left\", \"lane\"),\n+ StringMapEntryDelete(\"cycleway:left:lane\", \"advisory\"),\n+ StringMapEntryDelete(\"cycleway:left:segregated\", \"maybe\"),\n+ StringMapEntryDelete(\"cycleway:right\", \"shared_lane\"),\n+ StringMapEntryDelete(\"cycleway:right:lane\", \"pictogram\"),\n+ StringMapEntryDelete(\"cycleway:right:segregated\", \"definitely\"),\n+ StringMapEntryDelete(\"cycleway\", \"shared_lane\"),\n+ StringMapEntryDelete(\"cycleway:lane\", \"pictogram\"),\n+ StringMapEntryDelete(\"cycleway:segregated\", \"definitely\"),\n+ StringMapEntryDelete(\"cycleway:oneway\", \"yes\"),\n+ StringMapEntryModify(\"cycleway:left:oneway\", \"yes\", \"-1\"),\n+ StringMapEntryModify(\"cycleway:right:oneway\", \"yes\", \"yes\"),\n+ StringMapEntryAdd(\"cycleway:both:segregated\", \"yes\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply answer for left, right deletes any previous answers given for both, general`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"cycleway:both\" to \"shared_lane\",\n+ \"cycleway:both:lane\" to \"pictogram\",\n+ \"cycleway\" to \"shared_lane\",\n+ \"cycleway:lane\" to \"pictogram\",\n+ \"cycleway:segregated\" to \"yes\",\n+ \"cycleway:oneway\" to \"yes\",\n+ ),\n+ cycleway(TRACK, NONE),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:left\", \"track\"),\n+ StringMapEntryAdd(\"cycleway:right\", \"no\"),\n+ StringMapEntryDelete(\"cycleway:both\", \"shared_lane\"),\n+ StringMapEntryDelete(\"cycleway:both:lane\", \"pictogram\"),\n+ StringMapEntryDelete(\"cycleway\", \"shared_lane\"),\n+ StringMapEntryDelete(\"cycleway:lane\", \"pictogram\"),\n+ StringMapEntryDelete(\"cycleway:oneway\", \"yes\"),\n+ StringMapEntryDelete(\"cycleway:segregated\", \"yes\"),\n+ StringMapEntryAdd(\"cycleway:left:oneway\", \"-1\"),\n+ StringMapEntryAdd(\"cycleway:left:segregated\", \"yes\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `deletes lane subkey when new answer is not a lane`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"cycleway:both\" to \"lane\",\n+ \"cycleway:both:lane\" to \"exclusive\"\n+ ),\n+ cycleway(TRACK, TRACK),\n+ arrayOf(\n+ StringMapEntryModify(\"cycleway:both\", \"lane\", \"track\"),\n+ StringMapEntryDelete(\"cycleway:both:lane\", \"exclusive\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `deletes shared lane subkey when new answer is not a lane`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"cycleway:both\" to \"shared_lane\",\n+ \"cycleway:both:lane\" to \"pictogram\"\n+ ),\n+ cycleway(TRACK, TRACK),\n+ arrayOf(\n+ StringMapEntryModify(\"cycleway:both\", \"shared_lane\", \"track\"),\n+ StringMapEntryDelete(\"cycleway:both:lane\", \"pictogram\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `modifies oneway tag tag when new answer is not a dual lane`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"cycleway:both\" to \"lane\",\n+ \"cycleway:both:lane\" to \"exclusive\",\n+ \"cycleway:both:oneway\" to \"no\"\n+ ),\n+ cycleway(EXCLUSIVE_LANE, EXCLUSIVE_LANE),\n+ arrayOf(\n+ StringMapEntryModify(\"cycleway:both\", \"lane\", \"lane\"),\n+ StringMapEntryModify(\"cycleway:both:lane\", \"exclusive\", \"exclusive\"),\n+ StringMapEntryDelete(\"cycleway:both:oneway\", \"no\"),\n+ StringMapEntryAdd(\"cycleway:left:oneway\", \"-1\"),\n+ StringMapEntryAdd(\"cycleway:right:oneway\", \"yes\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `modifies lane subkey when new answer is different lane`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"cycleway:both\" to \"shared_lane\",\n+ \"cycleway:both:lane\" to \"pictogram\"\n+ ),\n+ cycleway(SUGGESTION_LANE, SUGGESTION_LANE),\n+ arrayOf(\n+ StringMapEntryModify(\"cycleway:both\", \"shared_lane\", \"shared_lane\"),\n+ StringMapEntryModify(\"cycleway:both:lane\", \"pictogram\", \"advisory\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `modifies oneway tag when new answer is not a dual track`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"cycleway:both\" to \"track\",\n+ \"cycleway:both:oneway\" to \"no\"\n+ ),\n+ cycleway(TRACK, TRACK),\n+ arrayOf(\n+ StringMapEntryModify(\"cycleway:both\", \"track\", \"track\"),\n+ StringMapEntryDelete(\"cycleway:both:oneway\", \"no\"),\n+ StringMapEntryAdd(\"cycleway:left:oneway\", \"-1\"),\n+ StringMapEntryAdd(\"cycleway:right:oneway\", \"yes\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `modify segregated tag if new answer is now segregated`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"cycleway:both\" to \"track\",\n+ \"cycleway:both:segregated\" to \"no\"\n+ ),\n+ cycleway(TRACK, TRACK),\n+ arrayOf(\n+ StringMapEntryModify(\"cycleway:both\", \"track\", \"track\"),\n+ StringMapEntryModify(\"cycleway:both:segregated\", \"no\", \"yes\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `modify segregated tag if new answer is now not segregated`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"sidewalk\" to \"both\",\n+ \"cycleway:both\" to \"track\",\n+ \"cycleway:both:segregated\" to \"yes\"\n+ ),\n+ cycleway(SIDEWALK_EXPLICIT, SIDEWALK_EXPLICIT),\n+ arrayOf(\n+ StringMapEntryModify(\"sidewalk\", \"both\", \"both\"),\n+ StringMapEntryModify(\"cycleway:both\", \"track\", \"track\"),\n+ StringMapEntryModify(\"cycleway:both:segregated\", \"yes\", \"no\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `delete segregated tag if new answer is not a track or on sidewalk`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"cycleway:both\" to \"track\",\n+ \"cycleway:both:segregated\" to \"no\"\n+ ),\n+ cycleway(BUSWAY, BUSWAY),\n+ arrayOf(\n+ StringMapEntryModify(\"cycleway:both\", \"track\", \"share_busway\"),\n+ StringMapEntryDelete(\"cycleway:both:segregated\", \"no\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `sets check date if nothing changed`() {\n+ verifyAnswer(\n+ mapOf(\"cycleway:both\" to \"track\"),\n+ cycleway(TRACK, TRACK),\n+ arrayOf(\n+ StringMapEntryModify(\"cycleway:both\", \"track\", \"track\"),\n+ StringMapEntryAdd(\"check_date:cycleway\", nowAsCheckDateString())\n+ )\n+ )\n+ }\n+\n+ @Test fun `updates check date if nothing changed`() {\n+ verifyAnswer(\n+ mapOf(\"cycleway:both\" to \"track\", \"check_date:cycleway\" to \"2000-11-11\"),\n+ cycleway(TRACK, TRACK),\n+ arrayOf(\n+ StringMapEntryModify(\"cycleway:both\", \"track\", \"track\"),\n+ StringMapEntryModify(\"check_date:cycleway\", \"2000-11-11\", nowAsCheckDateString())\n+ )\n+ )\n+ }\n+\n+ @Test fun `remove oneway bicycle no tag if road is also a oneway for bicycles now`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"cycleway:both\" to \"no\",\n+ \"oneway\" to \"yes\",\n+ \"oneway:bicycle\" to \"no\"\n+ ),\n+ cycleway(NONE, NONE),\n+ arrayOf(\n+ StringMapEntryModify(\"cycleway:both\", \"no\", \"no\"),\n+ StringMapEntryDelete(\"oneway:bicycle\", \"no\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply value only for one side`() {\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(TRACK, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:left\", \"track\")\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(null, TRACK),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:right\", \"track\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply for one side does not touch the other side`() {\n+ verifyAnswer(\n+ mapOf(\"cycleway:right\" to \"no\"),\n+ cycleway(TRACK, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:left\", \"track\")\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"cycleway:left\" to \"no\"),\n+ cycleway(null, TRACK),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:right\", \"track\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply for one side does not touch the other side even if it is invalid`() {\n+ verifyAnswer(\n+ mapOf(\"cycleway:right\" to \"invalid\"),\n+ cycleway(TRACK, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:left\", \"track\")\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"cycleway:left\" to \"invalid\"),\n+ cycleway(null, TRACK),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:right\", \"track\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply for one side does not change values for the other side even if it was defined for both sides before and invalid`() {\n+ verifyAnswer(\n+ mapOf(\"cycleway:both\" to \"invalid\"),\n+ cycleway(TRACK, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:left\", \"track\"),\n+ StringMapEntryAdd(\"cycleway:right\", \"invalid\"),\n+ StringMapEntryDelete(\"cycleway:both\", \"invalid\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"cycleway:both\" to \"invalid\"),\n+ cycleway(null, TRACK),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:left\", \"invalid\"),\n+ StringMapEntryAdd(\"cycleway:right\", \"track\"),\n+ StringMapEntryDelete(\"cycleway:both\", \"invalid\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply conflates values`() {\n+ verifyAnswer(\n+ mapOf(\"cycleway:left\" to \"no\", \"cycleway:right\" to \"no\"),\n+ cycleway(NONE, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"no\"),\n+ StringMapEntryDelete(\"cycleway:left\", \"no\"),\n+ StringMapEntryDelete(\"cycleway:right\", \"no\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply updates oneway not for cyclists`() {\n+ // contra-flow side set to explicitly not oneway -> not oneway for cyclists\n+ verifyAnswer(\n+ mapOf(\n+ \"oneway:bicycle\" to \"no\",\n+ \"oneway\" to \"yes\"\n+ ),\n+ cycleway(NONE_NO_ONEWAY, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:left\", \"no\"),\n+ StringMapEntryModify(\"oneway:bicycle\", \"no\", \"no\"),\n+ )\n+ )\n+ // track on right side is dual-way -> not oneway for cyclists\n+ verifyAnswer(\n+ mapOf(\n+ \"oneway:bicycle\" to \"no\",\n+ \"oneway\" to \"yes\"\n+ ),\n+ cycleway(null, TRACK to BOTH),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:right\", \"track\"),\n+ StringMapEntryAdd(\"cycleway:right:oneway\", \"no\"),\n+ StringMapEntryModify(\"oneway:bicycle\", \"no\", \"no\"),\n+ )\n+ )\n+ // not a oneway at all\n+ verifyAnswer(\n+ mapOf(\n+ \"oneway:bicycle\" to \"no\",\n+ \"oneway\" to \"no\"\n+ ),\n+ cycleway(NONE, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:left\", \"no\"),\n+ StringMapEntryDelete(\"oneway:bicycle\", \"no\"),\n+ )\n+ )\n+ // contra-flow side is explicitly oneway and flow-side is not dual-way\n+ verifyAnswer(\n+ mapOf(\n+ \"oneway:bicycle\" to \"no\",\n+ \"oneway\" to \"yes\"\n+ ),\n+ cycleway(NONE, NONE),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:both\", \"no\"),\n+ StringMapEntryDelete(\"oneway:bicycle\", \"no\"),\n+ )\n+ )\n+ // no oneway for cyclists is deleted on left side but dual track on right side still there\n+ // -> still not oneway for cyclists\n+ verifyAnswer(\n+ mapOf(\n+ \"oneway:bicycle\" to \"no\",\n+ \"oneway\" to \"yes\",\n+ \"cycleway:both\" to \"track\",\n+ \"cycleway:right:oneway\" to \"no\",\n+ ),\n+ cycleway(NONE, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:left\", \"no\"),\n+ StringMapEntryAdd(\"cycleway:right\", \"track\"),\n+ StringMapEntryDelete(\"cycleway:both\", \"track\"),\n+ StringMapEntryModify(\"oneway:bicycle\", \"no\", \"no\"),\n+ )\n+ )\n+ // no oneway for cyclists is deleted on left side -> oneway for cyclists now\n+ verifyAnswer(\n+ mapOf(\n+ \"oneway:bicycle\" to \"no\",\n+ \"oneway\" to \"yes\",\n+ \"cycleway:left\" to \"no\",\n+ \"cycleway:right\" to \"track\",\n+ ),\n+ cycleway(NONE, null),\n+ arrayOf(\n+ StringMapEntryModify(\"cycleway:left\", \"no\", \"no\"),\n+ StringMapEntryDelete(\"oneway:bicycle\", \"no\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply no cycleway deletes cycleway direction`() {\n+ verifyAnswer(\n+ mapOf(\"cycleway:left:oneway\" to \"-1\"),\n+ cycleway(NONE, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:left\", \"no\"),\n+ StringMapEntryDelete(\"cycleway:left:oneway\", \"-1\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"cycleway:left:oneway\" to \"-1\", \"oneway\" to \"yes\"),\n+ cycleway(NONE_NO_ONEWAY, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:left\", \"no\"),\n+ StringMapEntryDelete(\"cycleway:left:oneway\", \"-1\"),\n+ StringMapEntryAdd(\"oneway:bicycle\", \"no\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"cycleway:left:oneway\" to \"-1\"),\n+ cycleway(SEPARATE, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:left\", \"separate\"),\n+ StringMapEntryDelete(\"cycleway:left:oneway\", \"-1\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply cycleway with non-standard direction adds cycleway direction`() {\n+ verifyAnswer(\n+ mapOf(),\n+ cycleway(TRACK to FORWARD, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:left\", \"track\"),\n+ StringMapEntryAdd(\"cycleway:left:oneway\", \"yes\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply cycleway in contraflow of oneway adds cycleway direction`() {\n+ verifyAnswer(\n+ mapOf(\"oneway\" to \"yes\"),\n+ cycleway(TRACK, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"cycleway:left\", \"track\"),\n+ StringMapEntryAdd(\"cycleway:left:oneway\", \"-1\"),\n+ StringMapEntryAdd(\"oneway:bicycle\", \"no\"),\n+ )\n+ )\n+ }\n+\n+ @Test(expected = IllegalArgumentException::class)\n+ fun `applying invalid left throws exception`() {\n+ cycleway(INVALID, null).applyTo(StringMapChangesBuilder(mapOf()), false)\n+ }\n+\n+ @Test(expected = IllegalArgumentException::class)\n+ fun `applying invalid right throws exception`() {\n+ cycleway(null, INVALID).applyTo(StringMapChangesBuilder(mapOf()), false)\n+ }\n+}\n+\n+private fun verifyAnswer(tags: Map, answer: LeftAndRightCycleway, expectedChanges: Array) {\n+ val cb = StringMapChangesBuilder(tags)\n+ answer.applyTo(cb, false)\n+ val changes = cb.create().changes\n+ Assertions.assertThat(changes).containsExactlyInAnyOrder(*expectedChanges)\n+}\n+\n+private fun cycleway(left: Pair?, right: Pair?) =\n+ LeftAndRightCycleway(\n+ left?.let { CyclewayAndDirection(it.first, it.second) },\n+ right?.let { CyclewayAndDirection(it.first, it.second) },\n+ )\n+\n+private fun cycleway(left: Cycleway?, right: Cycleway?, isLeftHandTraffic: Boolean = false) =\n+ LeftAndRightCycleway(\n+ left?.let { CyclewayAndDirection(it, if (isLeftHandTraffic) FORWARD else BACKWARD) },\n+ right?.let { CyclewayAndDirection(it, if (isLeftHandTraffic) BACKWARD else FORWARD) },\n+ )\ndiff --git a/app/src/test/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayKtTest.kt b/app/src/test/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayKtTest.kt\nnew file mode 100644\nindex 00000000000..5095a5c322a\n--- /dev/null\n+++ b/app/src/test/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayKtTest.kt\n@@ -0,0 +1,144 @@\n+package de.westnordost.streetcomplete.osm.cycleway\n+\n+import de.westnordost.streetcomplete.osm.cycleway.Cycleway.*\n+import de.westnordost.streetcomplete.osm.cycleway.Direction.*\n+import org.junit.Assert.assertFalse\n+import org.junit.Assert.assertTrue\n+import org.junit.Test\n+\n+class CyclewayKtTest {\n+\n+ @Test fun `was no oneway for cyclists but now it is`() {\n+ assertTrue(\n+ LeftAndRightCycleway(\n+ CyclewayAndDirection(NONE, BACKWARD),\n+ CyclewayAndDirection(NONE, FORWARD)\n+ )\n+ .wasNoOnewayForCyclistsButNowItIs(mapOf(\n+ \"oneway\" to \"yes\",\n+ \"oneway:bicycle\" to \"no\",\n+ \"cycleway:both\" to \"no\"\n+ ), false)\n+ )\n+ }\n+\n+ @Test fun `was no oneway for cyclists and still is`() {\n+ assertFalse(\n+ LeftAndRightCycleway(\n+ CyclewayAndDirection(NONE_NO_ONEWAY, BACKWARD),\n+ CyclewayAndDirection(NONE, FORWARD)\n+ )\n+ .wasNoOnewayForCyclistsButNowItIs(mapOf(\n+ \"oneway\" to \"yes\",\n+ \"oneway:bicycle\" to \"no\",\n+ \"cycleway:both\" to \"no\"\n+ ), false)\n+ )\n+ }\n+\n+ @Test fun `was oneway for cyclists and still is`() {\n+ assertFalse(\n+ LeftAndRightCycleway(\n+ CyclewayAndDirection(NONE, BACKWARD),\n+ CyclewayAndDirection(NONE, FORWARD)\n+ )\n+ .wasNoOnewayForCyclistsButNowItIs(mapOf(\n+ \"oneway\" to \"yes\",\n+ \"cycleway:both\" to \"no\"\n+ ), false)\n+ )\n+ }\n+\n+ @Test fun `was oneway for cyclists and is not anymore`() {\n+ assertFalse(\n+ LeftAndRightCycleway(\n+ CyclewayAndDirection(NONE_NO_ONEWAY, BACKWARD),\n+ CyclewayAndDirection(NONE, FORWARD)\n+ )\n+ .wasNoOnewayForCyclistsButNowItIs(mapOf(\n+ \"oneway\" to \"yes\",\n+ \"cycleway:both\" to \"no\"\n+ ), false)\n+ )\n+ }\n+\n+ @Test fun `not a oneway is no oneway for cyclists`() {\n+ assertTrue(\n+ LeftAndRightCycleway(\n+ CyclewayAndDirection(NONE, BACKWARD),\n+ CyclewayAndDirection(NONE, FORWARD)\n+ ).isNotOnewayForCyclistsNow(mapOf(), false)\n+ )\n+ }\n+\n+ @Test fun `forward oneway is oneway for cyclists`() {\n+ assertFalse(\n+ LeftAndRightCycleway(\n+ CyclewayAndDirection(NONE, BACKWARD),\n+ CyclewayAndDirection(NONE, FORWARD)\n+ ).isNotOnewayForCyclistsNow(mapOf(\"oneway\" to \"yes\"), false)\n+ )\n+ }\n+\n+ @Test fun `reverse oneway is oneway for cyclists`() {\n+ assertFalse(\n+ LeftAndRightCycleway(\n+ CyclewayAndDirection(NONE, BACKWARD),\n+ CyclewayAndDirection(NONE, FORWARD)\n+ ).isNotOnewayForCyclistsNow(mapOf(\"oneway\" to \"-1\"), false)\n+ )\n+ }\n+\n+ @Test fun `oneway is no oneway for cyclists when there is a dual track`() {\n+ assertTrue(\n+ LeftAndRightCycleway(\n+ CyclewayAndDirection(NONE, BACKWARD),\n+ CyclewayAndDirection(TRACK, BOTH)\n+ ).isNotOnewayForCyclistsNow(mapOf(\"oneway\" to \"yes\"), false)\n+ )\n+ assertTrue(\n+ LeftAndRightCycleway(\n+ CyclewayAndDirection(TRACK, BOTH),\n+ CyclewayAndDirection(NONE, FORWARD)\n+ ).isNotOnewayForCyclistsNow(mapOf(\"oneway\" to \"-1\"), false)\n+ )\n+ }\n+\n+ @Test fun `oneway is no oneway for cyclists when any cycleway goes in contra-flow direction`() {\n+ assertTrue(\n+ LeftAndRightCycleway(CyclewayAndDirection(TRACK, BACKWARD), null)\n+ .isNotOnewayForCyclistsNow(mapOf(\"oneway\" to \"yes\"), false)\n+ )\n+ assertTrue(\n+ LeftAndRightCycleway(null, CyclewayAndDirection(TRACK, BACKWARD))\n+ .isNotOnewayForCyclistsNow(mapOf(\"oneway\" to \"yes\"), false)\n+ )\n+ assertTrue(\n+ LeftAndRightCycleway(CyclewayAndDirection(TRACK, FORWARD), null)\n+ .isNotOnewayForCyclistsNow(mapOf(\"oneway\" to \"-1\"), false)\n+ )\n+ assertTrue(\n+ LeftAndRightCycleway(null, CyclewayAndDirection(TRACK, FORWARD))\n+ .isNotOnewayForCyclistsNow(mapOf(\"oneway\" to \"-1\"), false)\n+ )\n+ }\n+\n+ @Test fun `oneway is oneway for cyclists when no cycleway goes in contra-flow direction`() {\n+ assertFalse(\n+ LeftAndRightCycleway(CyclewayAndDirection(TRACK, FORWARD), null)\n+ .isNotOnewayForCyclistsNow(mapOf(\"oneway\" to \"yes\"), false)\n+ )\n+ assertFalse(\n+ LeftAndRightCycleway(null, CyclewayAndDirection(TRACK, FORWARD))\n+ .isNotOnewayForCyclistsNow(mapOf(\"oneway\" to \"yes\"), false)\n+ )\n+ assertFalse(\n+ LeftAndRightCycleway(CyclewayAndDirection(TRACK, BACKWARD), null)\n+ .isNotOnewayForCyclistsNow(mapOf(\"oneway\" to \"-1\"), false)\n+ )\n+ assertFalse(\n+ LeftAndRightCycleway(null, CyclewayAndDirection(TRACK, BACKWARD))\n+ .isNotOnewayForCyclistsNow(mapOf(\"oneway\" to \"-1\"), false)\n+ )\n+ }\n+}\ndiff --git a/app/src/test/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayParserKtTest.kt b/app/src/test/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayParserKtTest.kt\nindex bb32ff1fcb2..d86ba20cb2b 100644\n--- a/app/src/test/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayParserKtTest.kt\n+++ b/app/src/test/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayParserKtTest.kt\n@@ -1,23 +1,7 @@\n package de.westnordost.streetcomplete.osm.cycleway\n \n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.ADVISORY_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.BUSWAY\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.DUAL_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.DUAL_TRACK\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.EXCLUSIVE_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.INVALID\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.NONE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.NONE_NO_ONEWAY\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.PICTOGRAMS\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.SEPARATE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.SIDEWALK_EXPLICIT\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.SUGGESTION_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.TRACK\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.UNKNOWN\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.UNKNOWN_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.UNKNOWN_SHARED_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.UNSPECIFIED_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.UNSPECIFIED_SHARED_LANE\n+import de.westnordost.streetcomplete.osm.cycleway.Cycleway.*\n+import de.westnordost.streetcomplete.osm.cycleway.Direction.*\n import org.junit.Assert.assertEquals\n import org.junit.Assert.assertNull\n import org.junit.Test\n@@ -27,34 +11,132 @@ class CyclewayParserKtTest {\n * make (much) assumptions that the code is written in a way that if it is solved for one type,\n * it is solved for all */\n \n+ /* -------------------------------------- special cases ------------------------------------- */\n+\n+ @Test fun `do not interpret non-oneway for bicycles as NONE_NO_ONEWAY if the cycleway on the other side is not a oneway`() {\n+ assertEquals(\n+ cycleway(NONE to BACKWARD, TRACK to BOTH),\n+ parse(\n+ \"cycleway:right\" to \"track\",\n+ \"cycleway:right:oneway\" to \"no\",\n+ \"cycleway:left\" to \"no\",\n+ \"oneway\" to \"yes\",\n+ \"oneway:bicycle\" to \"no\",\n+ )\n+ )\n+ assertEquals(\n+ cycleway(TRACK to BOTH, NONE to BACKWARD),\n+ parseForLeftHandTraffic(\n+ \"cycleway:left\" to \"track\",\n+ \"cycleway:left:oneway\" to \"no\",\n+ \"cycleway:right\" to \"no\",\n+ \"oneway\" to \"yes\",\n+ \"oneway:bicycle\" to \"no\",\n+ )\n+ )\n+ }\n+\n+ @Test fun `fall back to bicycle=use_sidepath`() {\n+ assertEquals(\n+ cycleway(SEPARATE, SEPARATE),\n+ parse(\"bicycle\" to \"use_sidepath\")\n+ )\n+ assertEquals(\n+ cycleway(NONE, SEPARATE),\n+ parse(\"bicycle\" to \"use_sidepath\", \"cycleway:left\" to \"no\")\n+ )\n+ assertEquals(\n+ cycleway(SEPARATE, TRACK),\n+ parse(\"bicycle\" to \"use_sidepath\", \"cycleway:right\" to \"track\")\n+ )\n+ }\n+\n+ @Test fun `fall back to bicycle=use_sidepath with forward or backward`() {\n+ assertEquals(\n+ cycleway(null, SEPARATE),\n+ parse(\"bicycle:forward\" to \"use_sidepath\")\n+ )\n+ assertEquals(\n+ cycleway(SEPARATE, null),\n+ parse(\"bicycle:backward\" to \"use_sidepath\")\n+ )\n+ assertEquals(\n+ cycleway(SEPARATE, null, true),\n+ parseForLeftHandTraffic(\"bicycle:forward\" to \"use_sidepath\")\n+ )\n+ assertEquals(\n+ cycleway(null, SEPARATE, true),\n+ parseForLeftHandTraffic(\"bicycle:backward\" to \"use_sidepath\")\n+ )\n+ }\n+\n+ /* ----------------------------------------- direction -------------------------------------- */\n+\n+ @Test fun `default directions`() {\n+ assertEquals(\n+ cycleway(NONE to BACKWARD, NONE to FORWARD),\n+ parse(\"cycleway:both\" to \"no\")\n+ )\n+ assertEquals(\n+ cycleway(NONE to FORWARD, NONE to BACKWARD),\n+ parseForLeftHandTraffic(\"cycleway:both\" to \"no\")\n+ )\n+ }\n+\n+ @Test fun `fixed directions`() {\n+ assertEquals(\n+ cycleway(NONE to BACKWARD, NONE to BACKWARD),\n+ parse(\"cycleway:both\" to \"no\", \"cycleway:both:oneway\" to \"-1\")\n+ )\n+ assertEquals(\n+ cycleway(NONE to FORWARD, NONE to FORWARD),\n+ parse(\"cycleway:both\" to \"no\", \"cycleway:both:oneway\" to \"yes\")\n+ )\n+ assertEquals(\n+ cycleway(NONE to BOTH, NONE to BOTH),\n+ parse(\"cycleway:both\" to \"no\", \"cycleway:both:oneway\" to \"no\")\n+ )\n+ }\n+\n /* ------------------------------------------ cycleway -------------------------------------- */\n \n @Test fun invalid() {\n- val invalid = LeftAndRightCycleway(INVALID, INVALID)\n+ val invalid = cycleway(INVALID, INVALID)\n assertEquals(invalid, parse(\"cycleway\" to \"yes\"))\n assertEquals(invalid, parse(\"cycleway\" to \"both\"))\n assertEquals(invalid, parse(\"cycleway\" to \"left\"))\n assertEquals(invalid, parse(\"cycleway\" to \"right\"))\n assertEquals(invalid, parse(\"cycleway\" to \"shared\"))\n+ assertEquals(invalid, parse(\"cycleway\" to \"none\"))\n+\n+ assertEquals(invalid, parse(\"cycleway\" to \"lane\", \"cycleway:lane\" to \"yes\"))\n+ assertEquals(invalid, parse(\"cycleway\" to \"lane\", \"cycleway:lane\" to \"right\"))\n+ assertEquals(invalid, parse(\"cycleway\" to \"lane\", \"cycleway:lane\" to \"left\"))\n+ assertEquals(invalid, parse(\"cycleway\" to \"lane\", \"cycleway:lane\" to \"both\"))\n+ assertEquals(invalid, parse(\"cycleway\" to \"lane\", \"cycleway:lane\" to \"shoulder\"))\n+ assertEquals(invalid, parse(\"cycleway\" to \"lane\", \"cycleway:lane\" to \"soft_lane\"))\n+ assertEquals(invalid, parse(\"cycleway\" to \"lane\", \"cycleway:lane\" to \"advisory_lane\"))\n+ assertEquals(invalid, parse(\"cycleway\" to \"lane\", \"cycleway:lane\" to \"exclusive_lane\"))\n+ assertEquals(invalid, parse(\"cycleway\" to \"lane\", \"cycleway:lane\" to \"mandatory\"))\n }\n \n @Test fun unknown() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN, UNKNOWN),\n+ cycleway(UNKNOWN, UNKNOWN),\n parse(\"cycleway\" to \"something\")\n )\n }\n \n @Test fun `unknown in oneway`() {\n assertEquals(\n- LeftAndRightCycleway(null, UNKNOWN),\n+ cycleway(null, UNKNOWN),\n parse(\n \"cycleway\" to \"something\",\n \"oneway\" to \"yes\"\n )\n )\n assertEquals(\n- LeftAndRightCycleway(null, UNKNOWN),\n+ cycleway(null, UNKNOWN),\n parse(\n \"cycleway\" to \"something\",\n \"junction\" to \"roundabout\"\n@@ -64,14 +146,14 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown in oneway (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN, null),\n+ cycleway(UNKNOWN, null),\n parse(\n \"cycleway\" to \"something\",\n \"oneway\" to \"-1\"\n )\n )\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN, null),\n+ cycleway(UNKNOWN, null),\n parse(\n \"cycleway\" to \"something\",\n \"oneway\" to \"-1\",\n@@ -82,14 +164,14 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown in oneway (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN, null),\n+ cycleway(UNKNOWN, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"something\",\n \"oneway\" to \"yes\"\n )\n )\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN, null),\n+ cycleway(UNKNOWN, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"something\",\n \"junction\" to \"roundabout\"\n@@ -99,14 +181,14 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown in oneway (reversed, left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, UNKNOWN),\n+ cycleway(null, UNKNOWN, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"something\",\n \"oneway\" to \"-1\"\n )\n )\n assertEquals(\n- LeftAndRightCycleway(null, UNKNOWN),\n+ cycleway(null, UNKNOWN, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"something\",\n \"oneway\" to \"-1\",\n@@ -117,7 +199,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown cycle lane`() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN_LANE, UNKNOWN_LANE),\n+ cycleway(UNKNOWN_LANE, UNKNOWN_LANE),\n parse(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"something\"\n@@ -127,7 +209,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown cycle lane in oneway`() {\n assertEquals(\n- LeftAndRightCycleway(null, UNKNOWN_LANE),\n+ cycleway(null, UNKNOWN_LANE),\n parse(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"something\",\n@@ -138,7 +220,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown cycle lane in oneway (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN_LANE, null),\n+ cycleway(UNKNOWN_LANE, null),\n parse(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"something\",\n@@ -149,7 +231,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown cycle lane in oneway (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN_LANE, null),\n+ cycleway(UNKNOWN_LANE, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"something\",\n@@ -160,7 +242,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown cycle lane in oneway (reversed, left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, UNKNOWN_LANE),\n+ cycleway(null, UNKNOWN_LANE, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"something\",\n@@ -171,7 +253,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown shared lane`() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN_SHARED_LANE, UNKNOWN_SHARED_LANE),\n+ cycleway(UNKNOWN_SHARED_LANE, UNKNOWN_SHARED_LANE),\n parse(\n \"cycleway\" to \"shared_lane\",\n \"cycleway:lane\" to \"something\"\n@@ -181,7 +263,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown shared lane in oneway`() {\n assertEquals(\n- LeftAndRightCycleway(null, UNKNOWN_SHARED_LANE),\n+ cycleway(null, UNKNOWN_SHARED_LANE),\n parse(\n \"cycleway\" to \"shared_lane\",\n \"cycleway:lane\" to \"something\",\n@@ -192,7 +274,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown shared lane in oneway (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN_SHARED_LANE, null),\n+ cycleway(UNKNOWN_SHARED_LANE, null),\n parse(\n \"cycleway\" to \"shared_lane\",\n \"cycleway:lane\" to \"something\",\n@@ -203,7 +285,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown shared lane in oneway (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN_SHARED_LANE, null),\n+ cycleway(UNKNOWN_SHARED_LANE, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"shared_lane\",\n \"cycleway:lane\" to \"something\",\n@@ -214,7 +296,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown shared lane in oneway (reversed, left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, UNKNOWN_SHARED_LANE),\n+ cycleway(null, UNKNOWN_SHARED_LANE, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"shared_lane\",\n \"cycleway:lane\" to \"something\",\n@@ -225,14 +307,14 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified shared lane`() {\n assertEquals(\n- LeftAndRightCycleway(UNSPECIFIED_SHARED_LANE, UNSPECIFIED_SHARED_LANE),\n+ cycleway(UNSPECIFIED_SHARED_LANE, UNSPECIFIED_SHARED_LANE),\n parse(\"cycleway\" to \"shared_lane\")\n )\n }\n \n @Test fun `unspecified shared lane in oneway`() {\n assertEquals(\n- LeftAndRightCycleway(null, UNSPECIFIED_SHARED_LANE),\n+ cycleway(null, UNSPECIFIED_SHARED_LANE),\n parse(\n \"cycleway\" to \"shared_lane\",\n \"oneway\" to \"yes\"\n@@ -242,7 +324,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified shared lane in oneway (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(UNSPECIFIED_SHARED_LANE, null),\n+ cycleway(UNSPECIFIED_SHARED_LANE, null),\n parse(\n \"cycleway\" to \"shared_lane\",\n \"oneway\" to \"-1\"\n@@ -252,7 +334,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified shared lane in oneway (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(UNSPECIFIED_SHARED_LANE, null),\n+ cycleway(UNSPECIFIED_SHARED_LANE, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"shared_lane\",\n \"oneway\" to \"yes\"\n@@ -262,7 +344,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified shared lane in oneway (reversed, left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, UNSPECIFIED_SHARED_LANE),\n+ cycleway(null, UNSPECIFIED_SHARED_LANE, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"shared_lane\",\n \"oneway\" to \"-1\"\n@@ -272,14 +354,14 @@ class CyclewayParserKtTest {\n \n @Test fun track() {\n assertEquals(\n- LeftAndRightCycleway(TRACK, TRACK),\n+ cycleway(TRACK, TRACK),\n parse(\"cycleway\" to \"track\")\n )\n }\n \n @Test fun `track in oneway`() {\n assertEquals(\n- LeftAndRightCycleway(null, TRACK),\n+ cycleway(null, TRACK),\n parse(\n \"cycleway\" to \"track\",\n \"oneway\" to \"yes\"\n@@ -289,7 +371,7 @@ class CyclewayParserKtTest {\n \n @Test fun `track in oneway (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(TRACK, null),\n+ cycleway(TRACK, null),\n parse(\n \"cycleway\" to \"track\",\n \"oneway\" to \"-1\"\n@@ -299,7 +381,7 @@ class CyclewayParserKtTest {\n \n @Test fun `track in oneway (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(TRACK, null),\n+ cycleway(TRACK, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"track\",\n \"oneway\" to \"yes\"\n@@ -309,7 +391,7 @@ class CyclewayParserKtTest {\n \n @Test fun `track in oneway (reversed, left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, TRACK),\n+ cycleway(null, TRACK, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"track\",\n \"oneway\" to \"-1\"\n@@ -319,7 +401,7 @@ class CyclewayParserKtTest {\n \n @Test fun `explicitly on sidewalk`() {\n assertEquals(\n- LeftAndRightCycleway(SIDEWALK_EXPLICIT, SIDEWALK_EXPLICIT),\n+ cycleway(SIDEWALK_EXPLICIT, SIDEWALK_EXPLICIT),\n parse(\n \"cycleway\" to \"track\",\n \"cycleway:segregated\" to \"no\"\n@@ -329,7 +411,7 @@ class CyclewayParserKtTest {\n \n @Test fun `explicitly on sidewalk in oneway`() {\n assertEquals(\n- LeftAndRightCycleway(null, SIDEWALK_EXPLICIT),\n+ cycleway(null, SIDEWALK_EXPLICIT),\n parse(\n \"cycleway\" to \"track\",\n \"cycleway:segregated\" to \"no\",\n@@ -340,7 +422,7 @@ class CyclewayParserKtTest {\n \n @Test fun `explicitly on sidewalk in oneway (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(SIDEWALK_EXPLICIT, null),\n+ cycleway(SIDEWALK_EXPLICIT, null),\n parse(\n \"cycleway\" to \"track\",\n \"cycleway:segregated\" to \"no\",\n@@ -351,7 +433,7 @@ class CyclewayParserKtTest {\n \n @Test fun `explicitly on sidewalk in oneway (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(SIDEWALK_EXPLICIT, null),\n+ cycleway(SIDEWALK_EXPLICIT, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"track\",\n \"cycleway:segregated\" to \"no\",\n@@ -362,7 +444,7 @@ class CyclewayParserKtTest {\n \n @Test fun `explicitly on sidewalk in oneway (reversed, left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, SIDEWALK_EXPLICIT),\n+ cycleway(null, SIDEWALK_EXPLICIT, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"track\",\n \"cycleway:segregated\" to \"no\",\n@@ -373,7 +455,7 @@ class CyclewayParserKtTest {\n \n @Test fun `dual track`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_TRACK, DUAL_TRACK),\n+ cycleway(TRACK to BOTH, TRACK to BOTH),\n parse(\n \"cycleway\" to \"track\",\n \"cycleway:oneway\" to \"no\"\n@@ -383,7 +465,7 @@ class CyclewayParserKtTest {\n \n @Test fun `dual track in oneway`() {\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_TRACK),\n+ cycleway(null, TRACK to BOTH),\n parse(\n \"cycleway\" to \"track\",\n \"cycleway:oneway\" to \"no\",\n@@ -394,7 +476,7 @@ class CyclewayParserKtTest {\n \n @Test fun `dual track in oneway (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_TRACK, null),\n+ cycleway(TRACK to BOTH, null),\n parse(\n \"cycleway\" to \"track\",\n \"cycleway:oneway\" to \"no\",\n@@ -405,7 +487,7 @@ class CyclewayParserKtTest {\n \n @Test fun `dual track in oneway (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_TRACK, null),\n+ cycleway(TRACK to BOTH, null),\n parseForLeftHandTraffic(\n \"cycleway\" to \"track\",\n \"cycleway:oneway\" to \"no\",\n@@ -416,7 +498,7 @@ class CyclewayParserKtTest {\n \n @Test fun `dual track in oneway (reversed, left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_TRACK),\n+ cycleway(null, TRACK to BOTH),\n parseForLeftHandTraffic(\n \"cycleway\" to \"track\",\n \"cycleway:oneway\" to \"no\",\n@@ -427,14 +509,14 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified lane`() {\n assertEquals(\n- LeftAndRightCycleway(UNSPECIFIED_LANE, UNSPECIFIED_LANE),\n+ cycleway(UNSPECIFIED_LANE, UNSPECIFIED_LANE),\n parse(\"cycleway\" to \"lane\")\n )\n }\n \n @Test fun `unspecified lane in oneway`() {\n assertEquals(\n- LeftAndRightCycleway(null, UNSPECIFIED_LANE),\n+ cycleway(null, UNSPECIFIED_LANE),\n parse(\n \"cycleway\" to \"lane\",\n \"oneway\" to \"yes\"\n@@ -444,7 +526,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified lane in oneway (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(UNSPECIFIED_LANE, null),\n+ cycleway(UNSPECIFIED_LANE, null),\n parse(\n \"cycleway\" to \"lane\",\n \"oneway\" to \"-1\"\n@@ -454,7 +536,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified lane in oneway (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(UNSPECIFIED_LANE, null),\n+ cycleway(UNSPECIFIED_LANE, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"lane\",\n \"oneway\" to \"yes\"\n@@ -464,7 +546,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified lane in oneway (reversed, left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, UNSPECIFIED_LANE),\n+ cycleway(null, UNSPECIFIED_LANE, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"lane\",\n \"oneway\" to \"-1\"\n@@ -474,7 +556,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified dual lane`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n+ cycleway(UNSPECIFIED_LANE to BOTH, UNSPECIFIED_LANE to BOTH),\n parse(\n \"cycleway\" to \"lane\",\n \"cycleway:oneway\" to \"no\"\n@@ -484,7 +566,7 @@ class CyclewayParserKtTest {\n \n @Test fun `exclusive lane`() {\n assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, EXCLUSIVE_LANE),\n+ cycleway(EXCLUSIVE_LANE, EXCLUSIVE_LANE),\n parse(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"exclusive\"\n@@ -494,7 +576,7 @@ class CyclewayParserKtTest {\n \n @Test fun `exclusive lane in oneway`() {\n assertEquals(\n- LeftAndRightCycleway(null, EXCLUSIVE_LANE),\n+ cycleway(null, EXCLUSIVE_LANE),\n parse(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"exclusive\",\n@@ -505,7 +587,7 @@ class CyclewayParserKtTest {\n \n @Test fun `exclusive lane in oneway (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, null),\n+ cycleway(EXCLUSIVE_LANE, null),\n parse(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"exclusive\",\n@@ -516,7 +598,7 @@ class CyclewayParserKtTest {\n \n @Test fun `exclusive lane in oneway (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, null),\n+ cycleway(EXCLUSIVE_LANE, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"exclusive\",\n@@ -527,7 +609,7 @@ class CyclewayParserKtTest {\n \n @Test fun `exclusive lane in oneway (reversed, left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, EXCLUSIVE_LANE),\n+ cycleway(null, EXCLUSIVE_LANE, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"exclusive\",\n@@ -536,26 +618,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `exclusive lane synonyms`() {\n- assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, EXCLUSIVE_LANE),\n- parse(\n- \"cycleway\" to \"lane\",\n- \"cycleway:lane\" to \"exclusive_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, EXCLUSIVE_LANE),\n- parse(\n- \"cycleway\" to \"lane\",\n- \"cycleway:lane\" to \"mandatory\"\n- )\n- )\n- }\n-\n @Test fun `exclusive dual lane`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n+ cycleway(EXCLUSIVE_LANE to BOTH, EXCLUSIVE_LANE to BOTH),\n parse(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"exclusive\",\n@@ -566,7 +631,7 @@ class CyclewayParserKtTest {\n \n @Test fun `exclusive dual lane in oneway`() {\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, EXCLUSIVE_LANE to BOTH),\n parse(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"exclusive\",\n@@ -578,7 +643,7 @@ class CyclewayParserKtTest {\n \n @Test fun `exclusive dual lane in oneway (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(EXCLUSIVE_LANE to BOTH, null),\n parse(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"exclusive\",\n@@ -590,7 +655,7 @@ class CyclewayParserKtTest {\n \n @Test fun `exclusive dual lane in oneway (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(EXCLUSIVE_LANE to BOTH, null),\n parseForLeftHandTraffic(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"exclusive\",\n@@ -602,7 +667,7 @@ class CyclewayParserKtTest {\n \n @Test fun `exclusive dual lane in oneway (reversed, left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, EXCLUSIVE_LANE to BOTH),\n parseForLeftHandTraffic(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"exclusive\",\n@@ -612,28 +677,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `exclusive dual lane synonyms`() {\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n- parse(\n- \"cycleway\" to \"lane\",\n- \"cycleway:lane\" to \"exclusive_lane\",\n- \"cycleway:oneway\" to \"no\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n- parse(\n- \"cycleway\" to \"lane\",\n- \"cycleway:lane\" to \"mandatory\",\n- \"cycleway:oneway\" to \"no\"\n- )\n- )\n- }\n-\n @Test fun `advisory lane`() {\n assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, ADVISORY_LANE),\n+ cycleway(ADVISORY_LANE, ADVISORY_LANE),\n parse(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"advisory\"\n@@ -643,7 +689,7 @@ class CyclewayParserKtTest {\n \n @Test fun `advisory lane in oneway`() {\n assertEquals(\n- LeftAndRightCycleway(null, ADVISORY_LANE),\n+ cycleway(null, ADVISORY_LANE),\n parse(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"advisory\",\n@@ -654,7 +700,7 @@ class CyclewayParserKtTest {\n \n @Test fun `advisory lane in oneway (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, null),\n+ cycleway(ADVISORY_LANE, null),\n parse(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"advisory\",\n@@ -665,7 +711,7 @@ class CyclewayParserKtTest {\n \n @Test fun `advisory lane in oneway (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, null),\n+ cycleway(ADVISORY_LANE, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"advisory\",\n@@ -676,7 +722,7 @@ class CyclewayParserKtTest {\n \n @Test fun `advisory lane in oneway (reversed, left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, ADVISORY_LANE),\n+ cycleway(null, ADVISORY_LANE, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"lane\",\n \"cycleway:lane\" to \"advisory\",\n@@ -685,33 +731,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `advisory lane synonyms`() {\n- assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, ADVISORY_LANE),\n- parse(\n- \"cycleway\" to \"lane\",\n- \"cycleway:lane\" to \"advisory_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, ADVISORY_LANE),\n- parse(\n- \"cycleway\" to \"lane\",\n- \"cycleway:lane\" to \"soft_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, ADVISORY_LANE),\n- parse(\n- \"cycleway\" to \"lane\",\n- \"cycleway:lane\" to \"dashed\"\n- )\n- )\n- }\n-\n @Test fun `suggestion lane`() {\n assertEquals(\n- LeftAndRightCycleway(SUGGESTION_LANE, SUGGESTION_LANE),\n+ cycleway(SUGGESTION_LANE, SUGGESTION_LANE),\n parse(\n \"cycleway\" to \"shared_lane\",\n \"cycleway:lane\" to \"advisory\"\n@@ -721,7 +743,7 @@ class CyclewayParserKtTest {\n \n @Test fun `suggestion lane in oneway`() {\n assertEquals(\n- LeftAndRightCycleway(null, SUGGESTION_LANE),\n+ cycleway(null, SUGGESTION_LANE),\n parse(\n \"cycleway\" to \"shared_lane\",\n \"cycleway:lane\" to \"advisory\",\n@@ -732,7 +754,7 @@ class CyclewayParserKtTest {\n \n @Test fun `suggestion lane in oneway (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(SUGGESTION_LANE, null),\n+ cycleway(SUGGESTION_LANE, null),\n parse(\n \"cycleway\" to \"shared_lane\",\n \"cycleway:lane\" to \"advisory\",\n@@ -743,7 +765,7 @@ class CyclewayParserKtTest {\n \n @Test fun `suggestion lane in oneway (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(SUGGESTION_LANE, null),\n+ cycleway(SUGGESTION_LANE, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"shared_lane\",\n \"cycleway:lane\" to \"advisory\",\n@@ -754,7 +776,7 @@ class CyclewayParserKtTest {\n \n @Test fun `suggestion lane in oneway (reversed, left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, SUGGESTION_LANE),\n+ cycleway(null, SUGGESTION_LANE, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"shared_lane\",\n \"cycleway:lane\" to \"advisory\",\n@@ -763,33 +785,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `suggestion lane synonyms`() {\n- assertEquals(\n- LeftAndRightCycleway(SUGGESTION_LANE, SUGGESTION_LANE),\n- parse(\n- \"cycleway\" to \"shared_lane\",\n- \"cycleway:lane\" to \"advisory_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(SUGGESTION_LANE, SUGGESTION_LANE),\n- parse(\n- \"cycleway\" to \"shared_lane\",\n- \"cycleway:lane\" to \"soft_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(SUGGESTION_LANE, SUGGESTION_LANE),\n- parse(\n- \"cycleway\" to \"shared_lane\",\n- \"cycleway:lane\" to \"dashed\"\n- )\n- )\n- }\n-\n @Test fun pictograms() {\n assertEquals(\n- LeftAndRightCycleway(PICTOGRAMS, PICTOGRAMS),\n+ cycleway(PICTOGRAMS, PICTOGRAMS),\n parse(\n \"cycleway\" to \"shared_lane\",\n \"cycleway:lane\" to \"pictogram\"\n@@ -799,7 +797,7 @@ class CyclewayParserKtTest {\n \n @Test fun `pictograms in oneway`() {\n assertEquals(\n- LeftAndRightCycleway(null, PICTOGRAMS),\n+ cycleway(null, PICTOGRAMS),\n parse(\n \"cycleway\" to \"shared_lane\",\n \"cycleway:lane\" to \"pictogram\",\n@@ -810,7 +808,7 @@ class CyclewayParserKtTest {\n \n @Test fun `pictograms in oneway (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(PICTOGRAMS, null),\n+ cycleway(PICTOGRAMS, null),\n parse(\n \"cycleway\" to \"shared_lane\",\n \"cycleway:lane\" to \"pictogram\",\n@@ -821,7 +819,7 @@ class CyclewayParserKtTest {\n \n @Test fun `pictograms in oneway (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(PICTOGRAMS, null),\n+ cycleway(PICTOGRAMS, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"shared_lane\",\n \"cycleway:lane\" to \"pictogram\",\n@@ -832,7 +830,7 @@ class CyclewayParserKtTest {\n \n @Test fun `pictograms in oneway (reversed, left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, PICTOGRAMS),\n+ cycleway(null, PICTOGRAMS, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"shared_lane\",\n \"cycleway:lane\" to \"pictogram\",\n@@ -843,60 +841,56 @@ class CyclewayParserKtTest {\n \n @Test fun none() {\n assertEquals(\n- LeftAndRightCycleway(NONE, NONE),\n+ cycleway(NONE, NONE),\n parse(\"cycleway\" to \"no\")\n )\n- assertEquals(\n- LeftAndRightCycleway(NONE, NONE),\n- parse(\"cycleway\" to \"none\")\n- )\n }\n \n @Test fun separate() {\n assertEquals(\n- LeftAndRightCycleway(SEPARATE, SEPARATE),\n+ cycleway(SEPARATE, SEPARATE),\n parse(\"cycleway\" to \"separate\")\n )\n }\n \n @Test fun busway() {\n assertEquals(\n- LeftAndRightCycleway(BUSWAY, BUSWAY),\n+ cycleway(BUSWAY, BUSWAY),\n parse(\"cycleway\" to \"share_busway\")\n )\n }\n \n @Test fun `busway in oneway`() {\n assertEquals(\n- LeftAndRightCycleway(null, BUSWAY),\n+ cycleway(null, BUSWAY),\n parse(\"cycleway\" to \"share_busway\", \"oneway\" to \"yes\")\n )\n }\n \n @Test fun `busway in oneway (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(BUSWAY, null),\n+ cycleway(BUSWAY, null),\n parse(\"cycleway\" to \"share_busway\", \"oneway\" to \"-1\")\n )\n }\n \n @Test fun `busway in oneway (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(BUSWAY, null),\n+ cycleway(BUSWAY, null, true),\n parseForLeftHandTraffic(\"cycleway\" to \"share_busway\", \"oneway\" to \"yes\")\n )\n }\n \n @Test fun `busway in oneway (reversed, left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, BUSWAY),\n+ cycleway(null, BUSWAY, true),\n parseForLeftHandTraffic(\"cycleway\" to \"share_busway\", \"oneway\" to \"-1\")\n )\n }\n \n @Test fun `none but oneway that isn't a oneway for cyclists`() {\n assertEquals(\n- LeftAndRightCycleway(NONE_NO_ONEWAY, NONE),\n+ cycleway(NONE_NO_ONEWAY, NONE),\n parse(\n \"cycleway\" to \"no\",\n \"oneway\" to \"yes\",\n@@ -907,7 +901,7 @@ class CyclewayParserKtTest {\n \n @Test fun `none but oneway that isn't a oneway for cyclists (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(NONE, NONE_NO_ONEWAY),\n+ cycleway(NONE, NONE_NO_ONEWAY),\n parse(\n \"cycleway\" to \"no\",\n \"oneway\" to \"-1\",\n@@ -918,7 +912,7 @@ class CyclewayParserKtTest {\n \n @Test fun `none but oneway that isn't a oneway for cyclists (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(NONE, NONE_NO_ONEWAY),\n+ cycleway(NONE, NONE_NO_ONEWAY, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"no\",\n \"oneway\" to \"yes\",\n@@ -929,7 +923,7 @@ class CyclewayParserKtTest {\n \n @Test fun `none but oneway that isn't a oneway for cyclists (reversed + left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(NONE_NO_ONEWAY, NONE),\n+ cycleway(NONE_NO_ONEWAY, NONE, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"no\",\n \"oneway\" to \"-1\",\n@@ -938,11 +932,25 @@ class CyclewayParserKtTest {\n )\n }\n \n+ @Test fun shoulder() {\n+ assertEquals(\n+ cycleway(SHOULDER, SHOULDER),\n+ parse(\"cycleway\" to \"shoulder\")\n+ )\n+ }\n+\n+ @Test fun `shoulder in oneway`() {\n+ assertEquals(\n+ cycleway(null, SHOULDER),\n+ parse(\"cycleway\" to \"shoulder\", \"oneway\" to \"yes\")\n+ )\n+ }\n+\n /* ------------------------------ cycleway opposite taggings -------------------------------- */\n \n @Test fun `cycleway opposite`() {\n assertEquals(\n- LeftAndRightCycleway(NONE_NO_ONEWAY, NONE),\n+ cycleway(NONE_NO_ONEWAY, NONE),\n parse(\n \"cycleway\" to \"opposite\",\n \"oneway\" to \"yes\"\n@@ -952,7 +960,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(NONE, NONE_NO_ONEWAY),\n+ cycleway(NONE, NONE_NO_ONEWAY),\n parse(\n \"cycleway\" to \"opposite\",\n \"oneway\" to \"-1\"\n@@ -962,7 +970,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(NONE, NONE_NO_ONEWAY),\n+ cycleway(NONE, NONE_NO_ONEWAY, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite\",\n \"oneway\" to \"yes\"\n@@ -972,7 +980,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite (reversed + left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(NONE_NO_ONEWAY, NONE),\n+ cycleway(NONE_NO_ONEWAY, NONE, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite\",\n \"oneway\" to \"-1\"\n@@ -982,7 +990,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite track`() {\n assertEquals(\n- LeftAndRightCycleway(TRACK, null),\n+ cycleway(TRACK, null),\n parse(\n \"cycleway\" to \"opposite_track\",\n \"oneway\" to \"yes\"\n@@ -992,7 +1000,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite track (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(null, TRACK),\n+ cycleway(null, TRACK),\n parse(\n \"cycleway\" to \"opposite_track\",\n \"oneway\" to \"-1\"\n@@ -1002,7 +1010,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite track (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, TRACK),\n+ cycleway(null, TRACK, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite_track\",\n \"oneway\" to \"yes\"\n@@ -1012,7 +1020,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite track (reversed + left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(TRACK, null),\n+ cycleway(TRACK, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite_track\",\n \"oneway\" to \"-1\"\n@@ -1022,7 +1030,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite dual track`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_TRACK, null),\n+ cycleway(TRACK to BOTH, null),\n parse(\n \"cycleway\" to \"opposite_track\",\n \"oneway\" to \"yes\",\n@@ -1033,7 +1041,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite dual track (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_TRACK),\n+ cycleway(null, TRACK to BOTH),\n parse(\n \"cycleway\" to \"opposite_track\",\n \"oneway\" to \"-1\",\n@@ -1044,7 +1052,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite dual track (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_TRACK),\n+ cycleway(null, TRACK to BOTH),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite_track\",\n \"oneway\" to \"yes\",\n@@ -1055,7 +1063,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite dual track (reversed + left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_TRACK, null),\n+ cycleway(TRACK to BOTH, null),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite_track\",\n \"oneway\" to \"-1\",\n@@ -1066,7 +1074,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite busway`() {\n assertEquals(\n- LeftAndRightCycleway(BUSWAY, null),\n+ cycleway(BUSWAY, null),\n parse(\n \"cycleway\" to \"opposite_share_busway\",\n \"oneway\" to \"yes\"\n@@ -1076,7 +1084,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite busway (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(null, BUSWAY),\n+ cycleway(null, BUSWAY),\n parse(\n \"cycleway\" to \"opposite_share_busway\",\n \"oneway\" to \"-1\"\n@@ -1086,7 +1094,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite busway (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, BUSWAY),\n+ cycleway(null, BUSWAY, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite_share_busway\",\n \"oneway\" to \"yes\"\n@@ -1096,7 +1104,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite busway (reversed + left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(BUSWAY, null),\n+ cycleway(BUSWAY, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite_share_busway\",\n \"oneway\" to \"-1\"\n@@ -1106,7 +1114,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite unspecified lane`() {\n assertEquals(\n- LeftAndRightCycleway(UNSPECIFIED_LANE, null),\n+ cycleway(UNSPECIFIED_LANE, null),\n parse(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"yes\"\n@@ -1116,7 +1124,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite unspecified lane (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(null, UNSPECIFIED_LANE),\n+ cycleway(null, UNSPECIFIED_LANE),\n parse(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"-1\"\n@@ -1126,7 +1134,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite unspecified lane (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, UNSPECIFIED_LANE),\n+ cycleway(null, UNSPECIFIED_LANE, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"yes\"\n@@ -1136,7 +1144,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite unspecified lane (reversed + left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(UNSPECIFIED_LANE, null),\n+ cycleway(UNSPECIFIED_LANE, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"-1\"\n@@ -1146,7 +1154,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite unspecified dual lane`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(UNSPECIFIED_LANE to BOTH, null),\n parse(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"yes\",\n@@ -1157,7 +1165,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite unspecified dual lane (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, UNSPECIFIED_LANE to BOTH),\n parse(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"-1\",\n@@ -1168,7 +1176,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite unspecified dual lane (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, UNSPECIFIED_LANE to BOTH),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"yes\",\n@@ -1179,7 +1187,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite unspecified dual lane (reversed + left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(UNSPECIFIED_LANE to BOTH, null),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"-1\",\n@@ -1190,7 +1198,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite advisory lane`() {\n assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, null),\n+ cycleway(ADVISORY_LANE, null),\n parse(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"yes\",\n@@ -1201,7 +1209,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite advisory lane (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(null, ADVISORY_LANE),\n+ cycleway(null, ADVISORY_LANE),\n parse(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"-1\",\n@@ -1212,7 +1220,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite advisory lane (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, ADVISORY_LANE),\n+ cycleway(null, ADVISORY_LANE, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"yes\",\n@@ -1223,7 +1231,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite advisory lane (reversed + left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, null),\n+ cycleway(ADVISORY_LANE, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"-1\",\n@@ -1234,7 +1242,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite exclusive lane`() {\n assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, null),\n+ cycleway(EXCLUSIVE_LANE, null),\n parse(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"yes\",\n@@ -1245,7 +1253,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite exclusive lane (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(null, EXCLUSIVE_LANE),\n+ cycleway(null, EXCLUSIVE_LANE),\n parse(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"-1\",\n@@ -1256,7 +1264,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite exclusive lane (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, EXCLUSIVE_LANE),\n+ cycleway(null, EXCLUSIVE_LANE, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"yes\",\n@@ -1267,7 +1275,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite exclusive lane (reversed + left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, null),\n+ cycleway(EXCLUSIVE_LANE, null, true),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"-1\",\n@@ -1278,7 +1286,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite exclusive dual lane`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(EXCLUSIVE_LANE to BOTH, null),\n parse(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"yes\",\n@@ -1290,7 +1298,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite exclusive dual lane (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, EXCLUSIVE_LANE to BOTH),\n parse(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"-1\",\n@@ -1302,7 +1310,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite exclusive dual lane (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, EXCLUSIVE_LANE to BOTH),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"yes\",\n@@ -1314,7 +1322,7 @@ class CyclewayParserKtTest {\n \n @Test fun `cycleway opposite exclusive dual lane (reversed + left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(EXCLUSIVE_LANE to BOTH, null),\n parseForLeftHandTraffic(\n \"cycleway\" to \"opposite_lane\",\n \"oneway\" to \"-1\",\n@@ -1328,14 +1336,14 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown on left side`() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN, null),\n+ cycleway(UNKNOWN, null),\n parse(\"cycleway:left\" to \"something\")\n )\n }\n \n @Test fun `unknown cycle lane on left side`() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN_LANE, null),\n+ cycleway(UNKNOWN_LANE, null),\n parse(\n \"cycleway:left\" to \"lane\",\n \"cycleway:left:lane\" to \"something\"\n@@ -1345,7 +1353,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown shared lane on left side`() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN_SHARED_LANE, null),\n+ cycleway(UNKNOWN_SHARED_LANE, null),\n parse(\n \"cycleway:left\" to \"shared_lane\",\n \"cycleway:left:lane\" to \"something\"\n@@ -1355,21 +1363,21 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified shared lane on left side`() {\n assertEquals(\n- LeftAndRightCycleway(UNSPECIFIED_SHARED_LANE, null),\n+ cycleway(UNSPECIFIED_SHARED_LANE, null),\n parse(\"cycleway:left\" to \"shared_lane\")\n )\n }\n \n @Test fun `track left`() {\n assertEquals(\n- LeftAndRightCycleway(TRACK, null),\n+ cycleway(TRACK, null),\n parse(\"cycleway:left\" to \"track\")\n )\n }\n \n @Test fun `explicitly on sidewalk on left side`() {\n assertEquals(\n- LeftAndRightCycleway(SIDEWALK_EXPLICIT, null),\n+ cycleway(SIDEWALK_EXPLICIT, null),\n parse(\n \"cycleway:left\" to \"track\",\n \"cycleway:left:segregated\" to \"no\"\n@@ -1379,21 +1387,21 @@ class CyclewayParserKtTest {\n \n @Test fun `dual track on left side`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_TRACK, null),\n+ cycleway(TRACK to BOTH, null),\n parse(\n \"cycleway:left\" to \"track\",\n \"cycleway:left:oneway\" to \"no\"\n )\n )\n assertEquals(\n- LeftAndRightCycleway(DUAL_TRACK, null),\n+ cycleway(TRACK to BOTH, null),\n parse(\n \"cycleway:left\" to \"track\",\n \"cycleway:both:oneway\" to \"no\"\n )\n )\n assertEquals(\n- LeftAndRightCycleway(DUAL_TRACK, null),\n+ cycleway(TRACK to BOTH, null),\n parse(\n \"cycleway:left\" to \"track\",\n \"cycleway:oneway\" to \"no\"\n@@ -1403,14 +1411,14 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified lane on left side`() {\n assertEquals(\n- LeftAndRightCycleway(UNSPECIFIED_LANE, null),\n+ cycleway(UNSPECIFIED_LANE, null),\n parse(\"cycleway:left\" to \"lane\")\n )\n }\n \n @Test fun `unspecified dual lane on left side`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(UNSPECIFIED_LANE to BOTH, null),\n parse(\n \"cycleway:left\" to \"lane\",\n \"cycleway:left:oneway\" to \"no\"\n@@ -1418,14 +1426,14 @@ class CyclewayParserKtTest {\n )\n \n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(UNSPECIFIED_LANE to BOTH, null),\n parse(\n \"cycleway:left\" to \"lane\",\n \"cycleway:both:oneway\" to \"no\"\n )\n )\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(UNSPECIFIED_LANE to BOTH, null),\n parse(\n \"cycleway:left\" to \"lane\",\n \"cycleway:oneway\" to \"no\"\n@@ -1435,7 +1443,7 @@ class CyclewayParserKtTest {\n \n @Test fun `exclusive lane on left side`() {\n assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, null),\n+ cycleway(EXCLUSIVE_LANE, null),\n parse(\n \"cycleway:left\" to \"lane\",\n \"cycleway:left:lane\" to \"exclusive\"\n@@ -1443,26 +1451,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `exclusive lane synonyms on left side`() {\n- assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, null),\n- parse(\n- \"cycleway:left\" to \"lane\",\n- \"cycleway:left:lane\" to \"exclusive_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, null),\n- parse(\n- \"cycleway:left\" to \"lane\",\n- \"cycleway:left:lane\" to \"mandatory\"\n- )\n- )\n- }\n-\n @Test fun `exclusive dual lane on left side`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(EXCLUSIVE_LANE to BOTH, null),\n parse(\n \"cycleway:left\" to \"lane\",\n \"cycleway:left:lane\" to \"exclusive\",\n@@ -1470,7 +1461,7 @@ class CyclewayParserKtTest {\n )\n )\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(EXCLUSIVE_LANE to BOTH, null),\n parse(\n \"cycleway:left\" to \"lane\",\n \"cycleway:left:lane\" to \"exclusive\",\n@@ -1478,7 +1469,7 @@ class CyclewayParserKtTest {\n )\n )\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(EXCLUSIVE_LANE to BOTH, null),\n parse(\n \"cycleway:left\" to \"lane\",\n \"cycleway:left:lane\" to \"exclusive\",\n@@ -1487,61 +1478,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `exclusive dual lane synonyms on left side`() {\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n- parse(\n- \"cycleway:left\" to \"lane\",\n- \"cycleway:left:lane\" to \"exclusive_lane\",\n- \"cycleway:left:oneway\" to \"no\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n- parse(\n- \"cycleway:left\" to \"lane\",\n- \"cycleway:left:lane\" to \"mandatory\",\n- \"cycleway:left:oneway\" to \"no\"\n- )\n- )\n-\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n- parse(\n- \"cycleway:left\" to \"lane\",\n- \"cycleway:left:lane\" to \"exclusive_lane\",\n- \"cycleway:both:oneway\" to \"no\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n- parse(\n- \"cycleway:left\" to \"lane\",\n- \"cycleway:left:lane\" to \"mandatory\",\n- \"cycleway:both:oneway\" to \"no\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n- parse(\n- \"cycleway:left\" to \"lane\",\n- \"cycleway:left:lane\" to \"exclusive_lane\",\n- \"cycleway:oneway\" to \"no\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n- parse(\n- \"cycleway:left\" to \"lane\",\n- \"cycleway:left:lane\" to \"mandatory\",\n- \"cycleway:oneway\" to \"no\"\n- )\n- )\n- }\n-\n @Test fun `advisory lane on left side`() {\n assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, null),\n+ cycleway(ADVISORY_LANE, null),\n parse(\n \"cycleway:left\" to \"lane\",\n \"cycleway:left:lane\" to \"advisory\"\n@@ -1549,33 +1488,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `advisory lane synonyms on left side`() {\n- assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, null),\n- parse(\n- \"cycleway:left\" to \"lane\",\n- \"cycleway:left:lane\" to \"advisory_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, null),\n- parse(\n- \"cycleway:left\" to \"lane\",\n- \"cycleway:left:lane\" to \"soft_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, null),\n- parse(\n- \"cycleway:left\" to \"lane\",\n- \"cycleway:left:lane\" to \"dashed\"\n- )\n- )\n- }\n-\n @Test fun `suggestion lane on left side`() {\n assertEquals(\n- LeftAndRightCycleway(SUGGESTION_LANE, null),\n+ cycleway(SUGGESTION_LANE, null),\n parse(\n \"cycleway:left\" to \"shared_lane\",\n \"cycleway:left:lane\" to \"advisory\"\n@@ -1583,33 +1498,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `suggestion lane synonyms on left side`() {\n- assertEquals(\n- LeftAndRightCycleway(SUGGESTION_LANE, null),\n- parse(\n- \"cycleway:left\" to \"shared_lane\",\n- \"cycleway:left:lane\" to \"advisory_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(SUGGESTION_LANE, null),\n- parse(\n- \"cycleway:left\" to \"shared_lane\",\n- \"cycleway:left:lane\" to \"soft_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(SUGGESTION_LANE, null),\n- parse(\n- \"cycleway:left\" to \"shared_lane\",\n- \"cycleway:left:lane\" to \"dashed\"\n- )\n- )\n- }\n-\n @Test fun `pictograms on left side`() {\n assertEquals(\n- LeftAndRightCycleway(PICTOGRAMS, null),\n+ cycleway(PICTOGRAMS, null),\n parse(\n \"cycleway:left\" to \"shared_lane\",\n \"cycleway:left:lane\" to \"pictogram\"\n@@ -1619,32 +1510,28 @@ class CyclewayParserKtTest {\n \n @Test fun `none on left side`() {\n assertEquals(\n- LeftAndRightCycleway(NONE, null),\n+ cycleway(NONE, null),\n parse(\"cycleway:left\" to \"no\")\n )\n- assertEquals(\n- LeftAndRightCycleway(NONE, null),\n- parse(\"cycleway:left\" to \"none\")\n- )\n }\n \n @Test fun `separate on left side`() {\n assertEquals(\n- LeftAndRightCycleway(SEPARATE, null),\n+ cycleway(SEPARATE, null),\n parse(\"cycleway:left\" to \"separate\")\n )\n }\n \n @Test fun `busway on left side`() {\n assertEquals(\n- LeftAndRightCycleway(BUSWAY, null),\n+ cycleway(BUSWAY, null),\n parse(\"cycleway:left\" to \"share_busway\")\n )\n }\n \n @Test fun `none on left side but oneway that isn't a oneway for cyclists`() {\n assertEquals(\n- LeftAndRightCycleway(NONE_NO_ONEWAY, null),\n+ cycleway(NONE_NO_ONEWAY, null),\n parse(\n \"cycleway:left\" to \"no\",\n \"oneway\" to \"yes\",\n@@ -1655,7 +1542,7 @@ class CyclewayParserKtTest {\n \n @Test fun `none on left side but oneway that isn't a oneway for cyclists (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(NONE, NONE_NO_ONEWAY),\n+ cycleway(NONE, NONE_NO_ONEWAY),\n parse(\n \"cycleway:left\" to \"no\",\n \"oneway\" to \"-1\",\n@@ -1666,7 +1553,7 @@ class CyclewayParserKtTest {\n \n @Test fun `none on left side but oneway that isn't a oneway for cyclists (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(NONE, NONE_NO_ONEWAY),\n+ cycleway(NONE, NONE_NO_ONEWAY, true),\n parseForLeftHandTraffic(\n \"cycleway:left\" to \"no\",\n \"oneway\" to \"yes\",\n@@ -1677,7 +1564,7 @@ class CyclewayParserKtTest {\n \n @Test fun `none on left side but oneway that isn't a oneway for cyclists (reversed + left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(NONE_NO_ONEWAY, null),\n+ cycleway(NONE_NO_ONEWAY, null, true),\n parseForLeftHandTraffic(\n \"cycleway:left\" to \"no\",\n \"oneway\" to \"-1\",\n@@ -1686,11 +1573,18 @@ class CyclewayParserKtTest {\n )\n }\n \n+ @Test fun `shoulder on left side`() {\n+ assertEquals(\n+ cycleway(SHOULDER, null),\n+ parse(\"cycleway:left\" to \"shoulder\")\n+ )\n+ }\n+\n /* ------------------------------ cycleway:left opposite tagging --------------------------- */\n \n @Test fun `left opposite`() {\n assertEquals(\n- LeftAndRightCycleway(NONE_NO_ONEWAY, null),\n+ cycleway(NONE_NO_ONEWAY, null),\n parse(\n \"cycleway:left\" to \"opposite\",\n \"oneway\" to \"yes\"\n@@ -1700,7 +1594,7 @@ class CyclewayParserKtTest {\n \n @Test fun `left opposite (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(NONE, null),\n+ cycleway(NONE, null, true),\n parseForLeftHandTraffic(\n \"cycleway:left\" to \"opposite\",\n \"oneway\" to \"yes\"\n@@ -1710,7 +1604,7 @@ class CyclewayParserKtTest {\n \n @Test fun `track left opposite`() {\n assertEquals(\n- LeftAndRightCycleway(TRACK, null),\n+ cycleway(TRACK, null),\n parse(\n \"cycleway:left\" to \"opposite_track\",\n \"oneway\" to \"yes\"\n@@ -1720,7 +1614,7 @@ class CyclewayParserKtTest {\n \n @Test fun `explicitly on sidewalk on left side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(SIDEWALK_EXPLICIT, null),\n+ cycleway(SIDEWALK_EXPLICIT, null),\n parse(\n \"cycleway:left\" to \"opposite_track\",\n \"cycleway:left:segregated\" to \"no\",\n@@ -1728,7 +1622,7 @@ class CyclewayParserKtTest {\n )\n )\n assertEquals(\n- LeftAndRightCycleway(SIDEWALK_EXPLICIT, null),\n+ cycleway(SIDEWALK_EXPLICIT, null),\n parse(\n \"cycleway:left\" to \"opposite_track\",\n \"cycleway:both:segregated\" to \"no\",\n@@ -1736,7 +1630,7 @@ class CyclewayParserKtTest {\n )\n )\n assertEquals(\n- LeftAndRightCycleway(SIDEWALK_EXPLICIT, null),\n+ cycleway(SIDEWALK_EXPLICIT, null),\n parse(\n \"cycleway:left\" to \"opposite_track\",\n \"cycleway:segregated\" to \"no\",\n@@ -1747,7 +1641,7 @@ class CyclewayParserKtTest {\n \n @Test fun `dual track on left side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_TRACK, null),\n+ cycleway(TRACK to BOTH, null),\n parse(\n \"cycleway:left\" to \"opposite_track\",\n \"cycleway:left:oneway\" to \"no\",\n@@ -1755,7 +1649,7 @@ class CyclewayParserKtTest {\n )\n )\n assertEquals(\n- LeftAndRightCycleway(DUAL_TRACK, null),\n+ cycleway(TRACK to BOTH, null),\n parse(\n \"cycleway:left\" to \"opposite_track\",\n \"cycleway:both:oneway\" to \"no\",\n@@ -1763,7 +1657,7 @@ class CyclewayParserKtTest {\n )\n )\n assertEquals(\n- LeftAndRightCycleway(DUAL_TRACK, null),\n+ cycleway(TRACK to BOTH, null),\n parse(\n \"cycleway:left\" to \"opposite_track\",\n \"cycleway:oneway\" to \"no\",\n@@ -1774,7 +1668,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified lane on left side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(UNSPECIFIED_LANE, null),\n+ cycleway(UNSPECIFIED_LANE, null),\n parse(\n \"cycleway:left\" to \"opposite_lane\",\n \"oneway\" to \"yes\"\n@@ -1784,7 +1678,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified dual lane on left side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(UNSPECIFIED_LANE to BOTH, null),\n parse(\n \"cycleway:left\" to \"opposite_lane\",\n \"cycleway:left:oneway\" to \"no\",\n@@ -1793,7 +1687,7 @@ class CyclewayParserKtTest {\n )\n \n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(UNSPECIFIED_LANE to BOTH, null),\n parse(\n \"cycleway:left\" to \"opposite_lane\",\n \"cycleway:both:oneway\" to \"no\",\n@@ -1801,7 +1695,7 @@ class CyclewayParserKtTest {\n )\n )\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(UNSPECIFIED_LANE to BOTH, null),\n parse(\n \"cycleway:left\" to \"opposite_lane\",\n \"cycleway:oneway\" to \"no\",\n@@ -1812,7 +1706,7 @@ class CyclewayParserKtTest {\n \n @Test fun `exclusive lane on left side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, null),\n+ cycleway(EXCLUSIVE_LANE, null),\n parse(\n \"cycleway:left\" to \"opposite_lane\",\n \"cycleway:left:lane\" to \"exclusive\",\n@@ -1821,28 +1715,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `exclusive lane synonyms on left side opposite`() {\n- assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, null),\n- parse(\n- \"cycleway:left\" to \"opposite_lane\",\n- \"cycleway:left:lane\" to \"exclusive_lane\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, null),\n- parse(\n- \"cycleway:left\" to \"opposite_lane\",\n- \"cycleway:left:lane\" to \"mandatory\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- }\n-\n @Test fun `exclusive dual lane on left side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(EXCLUSIVE_LANE to BOTH, null),\n parse(\n \"cycleway:left\" to \"opposite_lane\",\n \"cycleway:left:lane\" to \"exclusive\",\n@@ -1852,7 +1727,7 @@ class CyclewayParserKtTest {\n )\n \n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(EXCLUSIVE_LANE to BOTH, null),\n parse(\n \"cycleway:left\" to \"opposite_lane\",\n \"cycleway:left:lane\" to \"exclusive\",\n@@ -1861,7 +1736,7 @@ class CyclewayParserKtTest {\n )\n )\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(EXCLUSIVE_LANE to BOTH, null),\n parse(\n \"cycleway:left\" to \"opposite_lane\",\n \"cycleway:left:lane\" to \"exclusive\",\n@@ -1871,135 +1746,49 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `exclusive dual lane synonyms on left side opposite`() {\n+ @Test fun `advisory lane on left side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(ADVISORY_LANE, null),\n parse(\n \"cycleway:left\" to \"opposite_lane\",\n- \"cycleway:left:lane\" to \"exclusive_lane\",\n- \"cycleway:left:oneway\" to \"no\",\n+ \"cycleway:left:lane\" to \"advisory\",\n \"oneway\" to \"yes\"\n )\n )\n+ }\n+\n+ @Test fun `busway on left side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(BUSWAY, null),\n parse(\n- \"cycleway:left\" to \"opposite_lane\",\n- \"cycleway:left:lane\" to \"mandatory\",\n- \"cycleway:left:oneway\" to \"no\",\n+ \"cycleway:left\" to \"opposite_share_busway\",\n \"oneway\" to \"yes\"\n )\n )\n+ }\n+\n+ /* -------------------------------------- cycleway:right ----------------------------------- */\n \n+ @Test fun `unknown on right side`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n- parse(\n- \"cycleway:left\" to \"opposite_lane\",\n- \"cycleway:left:lane\" to \"exclusive_lane\",\n- \"cycleway:both:oneway\" to \"no\",\n- \"oneway\" to \"yes\"\n- )\n+ cycleway(null, UNKNOWN),\n+ parse(\"cycleway:right\" to \"something\")\n )\n+ }\n+\n+ @Test fun `unknown cycle lane on right side`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n+ cycleway(null, UNKNOWN_LANE),\n parse(\n- \"cycleway:left\" to \"opposite_lane\",\n- \"cycleway:left:lane\" to \"mandatory\",\n- \"cycleway:both:oneway\" to \"no\",\n- \"oneway\" to \"yes\"\n- )\n- )\n-\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n- parse(\n- \"cycleway:left\" to \"opposite_lane\",\n- \"cycleway:left:lane\" to \"exclusive_lane\",\n- \"cycleway:oneway\" to \"no\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, null),\n- parse(\n- \"cycleway:left\" to \"opposite_lane\",\n- \"cycleway:left:lane\" to \"mandatory\",\n- \"cycleway:oneway\" to \"no\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- }\n-\n- @Test fun `advisory lane on left side opposite`() {\n- assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, null),\n- parse(\n- \"cycleway:left\" to \"opposite_lane\",\n- \"cycleway:left:lane\" to \"advisory\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- }\n-\n- @Test fun `advisory lane synonyms on left side opposite`() {\n- assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, null),\n- parse(\n- \"cycleway:left\" to \"opposite_lane\",\n- \"cycleway:left:lane\" to \"advisory_lane\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, null),\n- parse(\n- \"cycleway:left\" to \"opposite_lane\",\n- \"cycleway:left:lane\" to \"soft_lane\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, null),\n- parse(\n- \"cycleway:left\" to \"opposite_lane\",\n- \"cycleway:left:lane\" to \"dashed\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- }\n-\n- @Test fun `busway on left side opposite`() {\n- assertEquals(\n- LeftAndRightCycleway(BUSWAY, null),\n- parse(\n- \"cycleway:left\" to \"opposite_share_busway\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- }\n-\n- /* -------------------------------------- cycleway:right ----------------------------------- */\n-\n- @Test fun `unknown on right side`() {\n- assertEquals(\n- LeftAndRightCycleway(null, UNKNOWN),\n- parse(\"cycleway:right\" to \"something\")\n- )\n- }\n-\n- @Test fun `unknown cycle lane on right side`() {\n- assertEquals(\n- LeftAndRightCycleway(null, UNKNOWN_LANE),\n- parse(\n- \"cycleway:right\" to \"lane\",\n- \"cycleway:right:lane\" to \"something\"\n+ \"cycleway:right\" to \"lane\",\n+ \"cycleway:right:lane\" to \"something\"\n )\n )\n }\n \n @Test fun `unknown shared lane on right side`() {\n assertEquals(\n- LeftAndRightCycleway(null, UNKNOWN_SHARED_LANE),\n+ cycleway(null, UNKNOWN_SHARED_LANE),\n parse(\n \"cycleway:right\" to \"shared_lane\",\n \"cycleway:right:lane\" to \"something\"\n@@ -2009,21 +1798,21 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified shared lane on right side`() {\n assertEquals(\n- LeftAndRightCycleway(null, UNSPECIFIED_SHARED_LANE),\n+ cycleway(null, UNSPECIFIED_SHARED_LANE),\n parse(\"cycleway:right\" to \"shared_lane\")\n )\n }\n \n @Test fun `track right`() {\n assertEquals(\n- LeftAndRightCycleway(null, TRACK),\n+ cycleway(null, TRACK),\n parse(\"cycleway:right\" to \"track\")\n )\n }\n \n @Test fun `explicitly on sidewalk on right side`() {\n assertEquals(\n- LeftAndRightCycleway(null, SIDEWALK_EXPLICIT),\n+ cycleway(null, SIDEWALK_EXPLICIT),\n parse(\n \"cycleway:right\" to \"track\",\n \"cycleway:right:segregated\" to \"no\"\n@@ -2031,14 +1820,14 @@ class CyclewayParserKtTest {\n )\n \n assertEquals(\n- LeftAndRightCycleway(null, SIDEWALK_EXPLICIT),\n+ cycleway(null, SIDEWALK_EXPLICIT),\n parse(\n \"cycleway:right\" to \"track\",\n \"cycleway:both:segregated\" to \"no\"\n )\n )\n assertEquals(\n- LeftAndRightCycleway(null, SIDEWALK_EXPLICIT),\n+ cycleway(null, SIDEWALK_EXPLICIT),\n parse(\n \"cycleway:right\" to \"track\",\n \"cycleway:segregated\" to \"no\"\n@@ -2048,21 +1837,21 @@ class CyclewayParserKtTest {\n \n @Test fun `dual track on right side`() {\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_TRACK),\n+ cycleway(null, TRACK to BOTH),\n parse(\n \"cycleway:right\" to \"track\",\n \"cycleway:right:oneway\" to \"no\"\n )\n )\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_TRACK),\n+ cycleway(null, TRACK to BOTH),\n parse(\n \"cycleway:right\" to \"track\",\n \"cycleway:both:oneway\" to \"no\"\n )\n )\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_TRACK),\n+ cycleway(null, TRACK to BOTH),\n parse(\n \"cycleway:right\" to \"track\",\n \"cycleway:oneway\" to \"no\"\n@@ -2072,14 +1861,14 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified lane on right side`() {\n assertEquals(\n- LeftAndRightCycleway(null, UNSPECIFIED_LANE),\n+ cycleway(null, UNSPECIFIED_LANE),\n parse(\"cycleway:right\" to \"lane\")\n )\n }\n \n @Test fun `unspecified dual lane on right side`() {\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, UNSPECIFIED_LANE to BOTH),\n parse(\n \"cycleway:right\" to \"lane\",\n \"cycleway:right:oneway\" to \"no\"\n@@ -2087,14 +1876,14 @@ class CyclewayParserKtTest {\n )\n \n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, UNSPECIFIED_LANE to BOTH),\n parse(\n \"cycleway:right\" to \"lane\",\n \"cycleway:both:oneway\" to \"no\"\n )\n )\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, UNSPECIFIED_LANE to BOTH),\n parse(\n \"cycleway:right\" to \"lane\",\n \"cycleway:oneway\" to \"no\"\n@@ -2104,7 +1893,7 @@ class CyclewayParserKtTest {\n \n @Test fun `exclusive lane on right side`() {\n assertEquals(\n- LeftAndRightCycleway(null, EXCLUSIVE_LANE),\n+ cycleway(null, EXCLUSIVE_LANE),\n parse(\n \"cycleway:right\" to \"lane\",\n \"cycleway:right:lane\" to \"exclusive\"\n@@ -2112,26 +1901,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `exclusive lane synonyms on right side`() {\n- assertEquals(\n- LeftAndRightCycleway(null, EXCLUSIVE_LANE),\n- parse(\n- \"cycleway:right\" to \"lane\",\n- \"cycleway:right:lane\" to \"exclusive_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(null, EXCLUSIVE_LANE),\n- parse(\n- \"cycleway:right\" to \"lane\",\n- \"cycleway:right:lane\" to \"mandatory\"\n- )\n- )\n- }\n-\n @Test fun `exclusive dual lane on right side`() {\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, EXCLUSIVE_LANE to BOTH),\n parse(\n \"cycleway:right\" to \"lane\",\n \"cycleway:right:lane\" to \"exclusive\",\n@@ -2140,7 +1912,7 @@ class CyclewayParserKtTest {\n )\n \n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, EXCLUSIVE_LANE to BOTH),\n parse(\n \"cycleway:right\" to \"lane\",\n \"cycleway:right:lane\" to \"exclusive\",\n@@ -2148,7 +1920,7 @@ class CyclewayParserKtTest {\n )\n )\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, EXCLUSIVE_LANE to BOTH),\n parse(\n \"cycleway:right\" to \"lane\",\n \"cycleway:right:lane\" to \"exclusive\",\n@@ -2157,45 +1929,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `exclusive dual lane synonyms on right side`() {\n- assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n- parse(\n- \"cycleway:right\" to \"lane\",\n- \"cycleway:right:lane\" to \"exclusive_lane\",\n- \"cycleway:right:oneway\" to \"no\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n- parse(\n- \"cycleway:right\" to \"lane\",\n- \"cycleway:right:lane\" to \"mandatory\",\n- \"cycleway:right:oneway\" to \"no\"\n- )\n- )\n-\n- assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n- parse(\n- \"cycleway:right\" to \"lane\",\n- \"cycleway:right:lane\" to \"exclusive_lane\",\n- \"cycleway:both:oneway\" to \"no\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n- parse(\n- \"cycleway:right\" to \"lane\",\n- \"cycleway:right:lane\" to \"mandatory\",\n- \"cycleway:oneway\" to \"no\"\n- )\n- )\n- }\n-\n @Test fun `advisory lane on right side`() {\n assertEquals(\n- LeftAndRightCycleway(null, ADVISORY_LANE),\n+ cycleway(null, ADVISORY_LANE),\n parse(\n \"cycleway:right\" to \"lane\",\n \"cycleway:right:lane\" to \"advisory\"\n@@ -2203,33 +1939,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `advisory lane synonyms on right side`() {\n- assertEquals(\n- LeftAndRightCycleway(null, ADVISORY_LANE),\n- parse(\n- \"cycleway:right\" to \"lane\",\n- \"cycleway:right:lane\" to \"advisory_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(null, ADVISORY_LANE),\n- parse(\n- \"cycleway:right\" to \"lane\",\n- \"cycleway:right:lane\" to \"soft_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(null, ADVISORY_LANE),\n- parse(\n- \"cycleway:right\" to \"lane\",\n- \"cycleway:right:lane\" to \"dashed\"\n- )\n- )\n- }\n-\n @Test fun `suggestion lane on right side`() {\n assertEquals(\n- LeftAndRightCycleway(null, SUGGESTION_LANE),\n+ cycleway(null, SUGGESTION_LANE),\n parse(\n \"cycleway:right\" to \"shared_lane\",\n \"cycleway:right:lane\" to \"advisory\"\n@@ -2237,33 +1949,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `suggestion lane synonyms on right side`() {\n- assertEquals(\n- LeftAndRightCycleway(null, SUGGESTION_LANE),\n- parse(\n- \"cycleway:right\" to \"shared_lane\",\n- \"cycleway:right:lane\" to \"advisory_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(null, SUGGESTION_LANE),\n- parse(\n- \"cycleway:right\" to \"shared_lane\",\n- \"cycleway:right:lane\" to \"soft_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(null, SUGGESTION_LANE),\n- parse(\n- \"cycleway:right\" to \"shared_lane\",\n- \"cycleway:right:lane\" to \"dashed\"\n- )\n- )\n- }\n-\n @Test fun `pictograms on right side`() {\n assertEquals(\n- LeftAndRightCycleway(null, PICTOGRAMS),\n+ cycleway(null, PICTOGRAMS),\n parse(\n \"cycleway:right\" to \"shared_lane\",\n \"cycleway:right:lane\" to \"pictogram\"\n@@ -2273,32 +1961,28 @@ class CyclewayParserKtTest {\n \n @Test fun `none on right side`() {\n assertEquals(\n- LeftAndRightCycleway(null, NONE),\n+ cycleway(null, NONE),\n parse(\"cycleway:right\" to \"no\")\n )\n- assertEquals(\n- LeftAndRightCycleway(null, NONE),\n- parse(\"cycleway:right\" to \"none\")\n- )\n }\n \n @Test fun `separate on right side`() {\n assertEquals(\n- LeftAndRightCycleway(null, SEPARATE),\n+ cycleway(null, SEPARATE),\n parse(\"cycleway:right\" to \"separate\")\n )\n }\n \n @Test fun `busway on right side`() {\n assertEquals(\n- LeftAndRightCycleway(null, BUSWAY),\n+ cycleway(null, BUSWAY),\n parse(\"cycleway:right\" to \"share_busway\")\n )\n }\n \n @Test fun `none on right side but oneway that isn't a oneway for cyclists`() {\n assertEquals(\n- LeftAndRightCycleway(NONE_NO_ONEWAY, NONE),\n+ cycleway(NONE_NO_ONEWAY, NONE),\n parse(\n \"cycleway:right\" to \"no\",\n \"oneway\" to \"yes\",\n@@ -2309,7 +1993,7 @@ class CyclewayParserKtTest {\n \n @Test fun `none on right side but oneway that isn't a oneway for cyclists (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(null, NONE_NO_ONEWAY),\n+ cycleway(null, NONE_NO_ONEWAY),\n parse(\n \"cycleway:right\" to \"no\",\n \"oneway\" to \"-1\",\n@@ -2320,7 +2004,7 @@ class CyclewayParserKtTest {\n \n @Test fun `none on right side but oneway that isn't a oneway for cyclists (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, NONE_NO_ONEWAY),\n+ cycleway(null, NONE_NO_ONEWAY, true),\n parseForLeftHandTraffic(\n \"cycleway:right\" to \"no\",\n \"oneway\" to \"yes\",\n@@ -2331,7 +2015,7 @@ class CyclewayParserKtTest {\n \n @Test fun `none on right side but oneway that isn't a oneway for cyclists (reversed + left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(NONE_NO_ONEWAY, NONE),\n+ cycleway(NONE_NO_ONEWAY, NONE, true),\n parseForLeftHandTraffic(\n \"cycleway:right\" to \"no\",\n \"oneway\" to \"-1\",\n@@ -2340,9 +2024,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `track on left side that is not in contraflow direction is unsupported`() {\n+ @Test fun `track on left side that is not in contraflow direction`() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN, NONE),\n+ cycleway(TRACK to FORWARD, NONE to FORWARD),\n parse(\n \"cycleway:right\" to \"no\",\n \"cycleway:left\" to \"track\",\n@@ -2351,9 +2035,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `track on left side for left-hand-traffic that is not in flow direction is unsupported`() {\n+ @Test fun `track on left side for left-hand-traffic that is not in flow direction`() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN, NONE),\n+ cycleway(TRACK to BACKWARD, NONE to BACKWARD),\n parseForLeftHandTraffic(\n \"cycleway:right\" to \"no\",\n \"cycleway:left\" to \"track\",\n@@ -2362,9 +2046,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `track on right side that is not in flow direction is unsupported`() {\n+ @Test fun `track on right side that is not in flow direction`() {\n assertEquals(\n- LeftAndRightCycleway(NONE, UNKNOWN),\n+ cycleway(NONE to BACKWARD, TRACK to BACKWARD),\n parse(\n \"cycleway:left\" to \"no\",\n \"cycleway:right\" to \"track\",\n@@ -2373,9 +2057,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `track on right side for left-hand-traffic that is not in contraflow direction is unsupported`() {\n+ @Test fun `track on right side for left-hand-traffic that is not in contraflow direction`() {\n assertEquals(\n- LeftAndRightCycleway(NONE, UNKNOWN),\n+ cycleway(NONE to FORWARD, TRACK to FORWARD),\n parseForLeftHandTraffic(\n \"cycleway:left\" to \"no\",\n \"cycleway:right\" to \"track\",\n@@ -2384,11 +2068,18 @@ class CyclewayParserKtTest {\n )\n }\n \n+ @Test fun `shoulder on right side`() {\n+ assertEquals(\n+ cycleway(null, SHOULDER),\n+ parse(\"cycleway:right\" to \"shoulder\")\n+ )\n+ }\n+\n /* ------------------------------ cycleway:right opposite tagging --------------------------- */\n \n @Test fun `right opposite`() {\n assertEquals(\n- LeftAndRightCycleway(null, NONE),\n+ cycleway(null, NONE),\n parse(\n \"cycleway:right\" to \"opposite\",\n \"oneway\" to \"yes\"\n@@ -2398,7 +2089,7 @@ class CyclewayParserKtTest {\n \n @Test fun `right opposite (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(null, NONE_NO_ONEWAY),\n+ cycleway(null, NONE_NO_ONEWAY, true),\n parseForLeftHandTraffic(\n \"cycleway:right\" to \"opposite\",\n \"oneway\" to \"yes\"\n@@ -2408,7 +2099,7 @@ class CyclewayParserKtTest {\n \n @Test fun `track right opposite`() {\n assertEquals(\n- LeftAndRightCycleway(null, TRACK),\n+ cycleway(null, TRACK),\n parse(\n \"cycleway:right\" to \"opposite_track\",\n \"oneway\" to \"yes\"\n@@ -2418,7 +2109,7 @@ class CyclewayParserKtTest {\n \n @Test fun `explicitly on sidewalk on right side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(null, SIDEWALK_EXPLICIT),\n+ cycleway(null, SIDEWALK_EXPLICIT),\n parse(\n \"cycleway:right\" to \"opposite_track\",\n \"cycleway:right:segregated\" to \"no\",\n@@ -2427,7 +2118,7 @@ class CyclewayParserKtTest {\n )\n \n assertEquals(\n- LeftAndRightCycleway(null, SIDEWALK_EXPLICIT),\n+ cycleway(null, SIDEWALK_EXPLICIT),\n parse(\n \"cycleway:right\" to \"opposite_track\",\n \"cycleway:both:segregated\" to \"no\",\n@@ -2435,7 +2126,7 @@ class CyclewayParserKtTest {\n )\n )\n assertEquals(\n- LeftAndRightCycleway(null, SIDEWALK_EXPLICIT),\n+ cycleway(null, SIDEWALK_EXPLICIT),\n parse(\n \"cycleway:right\" to \"opposite_track\",\n \"cycleway:segregated\" to \"no\",\n@@ -2446,7 +2137,7 @@ class CyclewayParserKtTest {\n \n @Test fun `dual track on right side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_TRACK),\n+ cycleway(null, TRACK to BOTH),\n parse(\n \"cycleway:right\" to \"opposite_track\",\n \"cycleway:right:oneway\" to \"no\",\n@@ -2455,7 +2146,7 @@ class CyclewayParserKtTest {\n )\n \n assertEquals(\n- LeftAndRightCycleway(null, DUAL_TRACK),\n+ cycleway(null, TRACK to BOTH),\n parse(\n \"cycleway:right\" to \"opposite_track\",\n \"cycleway:both:oneway\" to \"no\",\n@@ -2463,7 +2154,7 @@ class CyclewayParserKtTest {\n )\n )\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_TRACK),\n+ cycleway(null, TRACK to BOTH),\n parse(\n \"cycleway:right\" to \"opposite_track\",\n \"cycleway:oneway\" to \"no\",\n@@ -2474,7 +2165,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified lane on right side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(null, UNSPECIFIED_LANE),\n+ cycleway(null, UNSPECIFIED_LANE),\n parse(\n \"cycleway:right\" to \"opposite_lane\",\n \"oneway\" to \"yes\"\n@@ -2484,7 +2175,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified dual lane on right side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, UNSPECIFIED_LANE to BOTH),\n parse(\n \"cycleway:right\" to \"opposite_lane\",\n \"cycleway:right:oneway\" to \"no\",\n@@ -2493,7 +2184,7 @@ class CyclewayParserKtTest {\n )\n \n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, UNSPECIFIED_LANE to BOTH),\n parse(\n \"cycleway:right\" to \"opposite_lane\",\n \"cycleway:both:oneway\" to \"no\",\n@@ -2501,7 +2192,7 @@ class CyclewayParserKtTest {\n )\n )\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, UNSPECIFIED_LANE to BOTH),\n parse(\n \"cycleway:right\" to \"opposite_lane\",\n \"cycleway:oneway\" to \"no\",\n@@ -2512,7 +2203,7 @@ class CyclewayParserKtTest {\n \n @Test fun `exclusive lane on right side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(null, EXCLUSIVE_LANE),\n+ cycleway(null, EXCLUSIVE_LANE),\n parse(\n \"cycleway:right\" to \"opposite_lane\",\n \"cycleway:right:lane\" to \"exclusive\",\n@@ -2521,28 +2212,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `exclusive lane synonyms on right side opposite`() {\n- assertEquals(\n- LeftAndRightCycleway(null, EXCLUSIVE_LANE),\n- parse(\n- \"cycleway:right\" to \"opposite_lane\",\n- \"cycleway:right:lane\" to \"exclusive_lane\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(null, EXCLUSIVE_LANE),\n- parse(\n- \"cycleway:right\" to \"opposite_lane\",\n- \"cycleway:right:lane\" to \"mandatory\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- }\n-\n @Test fun `exclusive dual lane on right side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, EXCLUSIVE_LANE to BOTH),\n parse(\n \"cycleway:right\" to \"opposite_lane\",\n \"cycleway:right:lane\" to \"exclusive\",\n@@ -2552,7 +2224,7 @@ class CyclewayParserKtTest {\n )\n \n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, EXCLUSIVE_LANE to BOTH),\n parse(\n \"cycleway:right\" to \"opposite_lane\",\n \"cycleway:right:lane\" to \"exclusive\",\n@@ -2561,7 +2233,7 @@ class CyclewayParserKtTest {\n )\n )\n assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n+ cycleway(null, EXCLUSIVE_LANE to BOTH),\n parse(\n \"cycleway:right\" to \"opposite_lane\",\n \"cycleway:right:lane\" to \"exclusive\",\n@@ -2571,49 +2243,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `exclusive dual lane synonyms on right side opposite`() {\n- assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n- parse(\n- \"cycleway:right\" to \"opposite_lane\",\n- \"cycleway:right:lane\" to \"exclusive_lane\",\n- \"cycleway:right:oneway\" to \"no\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n- parse(\n- \"cycleway:right\" to \"opposite_lane\",\n- \"cycleway:right:lane\" to \"mandatory\",\n- \"cycleway:right:oneway\" to \"no\",\n- \"oneway\" to \"yes\"\n- )\n- )\n-\n- assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n- parse(\n- \"cycleway:right\" to \"opposite_lane\",\n- \"cycleway:right:lane\" to \"exclusive_lane\",\n- \"cycleway:both:oneway\" to \"no\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(null, DUAL_LANE),\n- parse(\n- \"cycleway:right\" to \"opposite_lane\",\n- \"cycleway:right:lane\" to \"mandatory\",\n- \"cycleway:oneway\" to \"no\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- }\n-\n @Test fun `advisory lane on right side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(null, ADVISORY_LANE),\n+ cycleway(null, ADVISORY_LANE),\n parse(\n \"cycleway:right\" to \"opposite_lane\",\n \"cycleway:right:lane\" to \"advisory\",\n@@ -2622,36 +2254,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `advisory lane synonyms on right side opposite`() {\n- assertEquals(\n- LeftAndRightCycleway(null, ADVISORY_LANE),\n- parse(\n- \"cycleway:right\" to \"opposite_lane\",\n- \"cycleway:right:lane\" to \"advisory_lane\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(null, ADVISORY_LANE),\n- parse(\n- \"cycleway:right\" to \"opposite_lane\",\n- \"cycleway:right:lane\" to \"soft_lane\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(null, ADVISORY_LANE),\n- parse(\n- \"cycleway:right\" to \"opposite_lane\",\n- \"cycleway:right:lane\" to \"dashed\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- }\n-\n @Test fun `busway on right side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(null, BUSWAY),\n+ cycleway(null, BUSWAY),\n parse(\n \"cycleway:right\" to \"opposite_share_busway\",\n \"oneway\" to \"yes\"\n@@ -2663,14 +2268,14 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN, UNKNOWN),\n+ cycleway(UNKNOWN, UNKNOWN),\n parse(\"cycleway:both\" to \"something\")\n )\n }\n \n @Test fun `unknown cycle lane on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN_LANE, UNKNOWN_LANE),\n+ cycleway(UNKNOWN_LANE, UNKNOWN_LANE),\n parse(\n \"cycleway:both\" to \"lane\",\n \"cycleway:both:lane\" to \"something\"\n@@ -2680,7 +2285,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unknown shared lane on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(UNKNOWN_SHARED_LANE, UNKNOWN_SHARED_LANE),\n+ cycleway(UNKNOWN_SHARED_LANE, UNKNOWN_SHARED_LANE),\n parse(\n \"cycleway:both\" to \"shared_lane\",\n \"cycleway:both:lane\" to \"something\"\n@@ -2690,28 +2295,28 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified shared lane on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(UNSPECIFIED_SHARED_LANE, UNSPECIFIED_SHARED_LANE),\n+ cycleway(UNSPECIFIED_SHARED_LANE, UNSPECIFIED_SHARED_LANE),\n parse(\"cycleway:both\" to \"shared_lane\")\n )\n }\n \n @Test fun `track on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(TRACK, TRACK),\n+ cycleway(TRACK, TRACK),\n parse(\"cycleway:both\" to \"track\")\n )\n }\n \n @Test fun `explicitly on sidewalk on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(SIDEWALK_EXPLICIT, SIDEWALK_EXPLICIT),\n+ cycleway(SIDEWALK_EXPLICIT, SIDEWALK_EXPLICIT),\n parse(\n \"cycleway:both\" to \"track\",\n \"cycleway:both:segregated\" to \"no\"\n )\n )\n assertEquals(\n- LeftAndRightCycleway(SIDEWALK_EXPLICIT, SIDEWALK_EXPLICIT),\n+ cycleway(SIDEWALK_EXPLICIT, SIDEWALK_EXPLICIT),\n parse(\n \"cycleway:both\" to \"track\",\n \"cycleway:segregated\" to \"no\"\n@@ -2721,7 +2326,7 @@ class CyclewayParserKtTest {\n \n @Test fun `dual track on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_TRACK, DUAL_TRACK),\n+ cycleway(TRACK to BOTH, TRACK to BOTH),\n parse(\n \"cycleway:both\" to \"track\",\n \"cycleway:both:oneway\" to \"no\"\n@@ -2729,7 +2334,7 @@ class CyclewayParserKtTest {\n )\n \n assertEquals(\n- LeftAndRightCycleway(DUAL_TRACK, DUAL_TRACK),\n+ cycleway(TRACK to BOTH, TRACK to BOTH),\n parse(\n \"cycleway:both\" to \"track\",\n \"cycleway:oneway\" to \"no\"\n@@ -2739,14 +2344,14 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified lane on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(UNSPECIFIED_LANE, UNSPECIFIED_LANE),\n+ cycleway(UNSPECIFIED_LANE, UNSPECIFIED_LANE),\n parse(\"cycleway:both\" to \"lane\")\n )\n }\n \n @Test fun `unspecified dual lane on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n+ cycleway(UNSPECIFIED_LANE to BOTH, UNSPECIFIED_LANE to BOTH),\n parse(\n \"cycleway:both\" to \"lane\",\n \"cycleway:both:oneway\" to \"no\"\n@@ -2754,7 +2359,7 @@ class CyclewayParserKtTest {\n )\n \n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n+ cycleway(UNSPECIFIED_LANE to BOTH, UNSPECIFIED_LANE to BOTH),\n parse(\n \"cycleway:both\" to \"lane\",\n \"cycleway:oneway\" to \"no\"\n@@ -2764,7 +2369,7 @@ class CyclewayParserKtTest {\n \n @Test fun `exclusive lane on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, EXCLUSIVE_LANE),\n+ cycleway(EXCLUSIVE_LANE, EXCLUSIVE_LANE),\n parse(\n \"cycleway:both\" to \"lane\",\n \"cycleway:both:lane\" to \"exclusive\"\n@@ -2772,26 +2377,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `exclusive lane synonyms on both sides`() {\n- assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, EXCLUSIVE_LANE),\n- parse(\n- \"cycleway:both\" to \"lane\",\n- \"cycleway:both:lane\" to \"exclusive_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, EXCLUSIVE_LANE),\n- parse(\n- \"cycleway:both\" to \"lane\",\n- \"cycleway:both:lane\" to \"mandatory\"\n- )\n- )\n- }\n-\n @Test fun `exclusive dual lane on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n+ cycleway(EXCLUSIVE_LANE to BOTH, EXCLUSIVE_LANE to BOTH),\n parse(\n \"cycleway:both\" to \"lane\",\n \"cycleway:both:lane\" to \"exclusive\",\n@@ -2800,7 +2388,7 @@ class CyclewayParserKtTest {\n )\n \n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n+ cycleway(EXCLUSIVE_LANE to BOTH, EXCLUSIVE_LANE to BOTH),\n parse(\n \"cycleway:both\" to \"lane\",\n \"cycleway:both:lane\" to \"exclusive\",\n@@ -2809,45 +2397,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `exclusive dual lane synonyms on both sides`() {\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n- parse(\n- \"cycleway:both\" to \"lane\",\n- \"cycleway:both:lane\" to \"exclusive_lane\",\n- \"cycleway:both:oneway\" to \"no\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n- parse(\n- \"cycleway:both\" to \"lane\",\n- \"cycleway:both:lane\" to \"mandatory\",\n- \"cycleway:both:oneway\" to \"no\"\n- )\n- )\n-\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n- parse(\n- \"cycleway:both\" to \"lane\",\n- \"cycleway:both:lane\" to \"exclusive_lane\",\n- \"cycleway:oneway\" to \"no\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n- parse(\n- \"cycleway:both\" to \"lane\",\n- \"cycleway:both:lane\" to \"mandatory\",\n- \"cycleway:oneway\" to \"no\"\n- )\n- )\n- }\n-\n @Test fun `advisory lane on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, ADVISORY_LANE),\n+ cycleway(ADVISORY_LANE, ADVISORY_LANE),\n parse(\n \"cycleway:both\" to \"lane\",\n \"cycleway:both:lane\" to \"advisory\"\n@@ -2855,33 +2407,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `advisory lane synonyms on both sides`() {\n- assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, ADVISORY_LANE),\n- parse(\n- \"cycleway:both\" to \"lane\",\n- \"cycleway:both:lane\" to \"advisory_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, ADVISORY_LANE),\n- parse(\n- \"cycleway:both\" to \"lane\",\n- \"cycleway:both:lane\" to \"soft_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, ADVISORY_LANE),\n- parse(\n- \"cycleway:both\" to \"lane\",\n- \"cycleway:both:lane\" to \"dashed\"\n- )\n- )\n- }\n-\n @Test fun `suggestion lane on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(SUGGESTION_LANE, SUGGESTION_LANE),\n+ cycleway(SUGGESTION_LANE, SUGGESTION_LANE),\n parse(\n \"cycleway:both\" to \"shared_lane\",\n \"cycleway:both:lane\" to \"advisory\"\n@@ -2889,33 +2417,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `suggestion lane synonyms on both sides`() {\n- assertEquals(\n- LeftAndRightCycleway(SUGGESTION_LANE, SUGGESTION_LANE),\n- parse(\n- \"cycleway:both\" to \"shared_lane\",\n- \"cycleway:both:lane\" to \"advisory_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(SUGGESTION_LANE, SUGGESTION_LANE),\n- parse(\n- \"cycleway:both\" to \"shared_lane\",\n- \"cycleway:both:lane\" to \"soft_lane\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(SUGGESTION_LANE, SUGGESTION_LANE),\n- parse(\n- \"cycleway:both\" to \"shared_lane\",\n- \"cycleway:both:lane\" to \"dashed\"\n- )\n- )\n- }\n-\n @Test fun `pictograms on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(PICTOGRAMS, PICTOGRAMS),\n+ cycleway(PICTOGRAMS, PICTOGRAMS),\n parse(\n \"cycleway:both\" to \"shared_lane\",\n \"cycleway:both:lane\" to \"pictogram\"\n@@ -2925,32 +2429,28 @@ class CyclewayParserKtTest {\n \n @Test fun `none on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(NONE, NONE),\n+ cycleway(NONE, NONE),\n parse(\"cycleway:both\" to \"no\")\n )\n- assertEquals(\n- LeftAndRightCycleway(NONE, NONE),\n- parse(\"cycleway:both\" to \"none\")\n- )\n }\n \n @Test fun `separate on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(SEPARATE, SEPARATE),\n+ cycleway(SEPARATE, SEPARATE),\n parse(\"cycleway:both\" to \"separate\")\n )\n }\n \n @Test fun `busway on both sides`() {\n assertEquals(\n- LeftAndRightCycleway(BUSWAY, BUSWAY),\n+ cycleway(BUSWAY, BUSWAY),\n parse(\"cycleway:both\" to \"share_busway\")\n )\n }\n \n @Test fun `none on both sides but oneway that isn't a oneway for cyclists`() {\n assertEquals(\n- LeftAndRightCycleway(NONE_NO_ONEWAY, NONE),\n+ cycleway(NONE_NO_ONEWAY, NONE),\n parse(\n \"cycleway:both\" to \"no\",\n \"oneway\" to \"yes\",\n@@ -2961,7 +2461,7 @@ class CyclewayParserKtTest {\n \n @Test fun `none on both sides but oneway that isn't a oneway for cyclists (reversed)`() {\n assertEquals(\n- LeftAndRightCycleway(NONE, NONE_NO_ONEWAY),\n+ cycleway(NONE, NONE_NO_ONEWAY),\n parse(\n \"cycleway:both\" to \"no\",\n \"oneway\" to \"-1\",\n@@ -2972,7 +2472,7 @@ class CyclewayParserKtTest {\n \n @Test fun `none on both sides but oneway that isn't a oneway for cyclists (left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(NONE, NONE_NO_ONEWAY),\n+ cycleway(NONE, NONE_NO_ONEWAY, true),\n parseForLeftHandTraffic(\n \"cycleway:both\" to \"no\",\n \"oneway\" to \"yes\",\n@@ -2983,7 +2483,7 @@ class CyclewayParserKtTest {\n \n @Test fun `none on both sides but oneway that isn't a oneway for cyclists (reversed + left hand traffic)`() {\n assertEquals(\n- LeftAndRightCycleway(NONE_NO_ONEWAY, NONE),\n+ cycleway(NONE_NO_ONEWAY, NONE, true),\n parseForLeftHandTraffic(\n \"cycleway:both\" to \"no\",\n \"oneway\" to \"-1\",\n@@ -2992,11 +2492,18 @@ class CyclewayParserKtTest {\n )\n }\n \n+ @Test fun `shoulder on both sides`() {\n+ assertEquals(\n+ cycleway(SHOULDER, SHOULDER),\n+ parse(\"cycleway:both\" to \"shoulder\")\n+ )\n+ }\n+\n /* ------------------------------ cycleway:both opposite tagging --------------------------- */\n \n @Test fun `track both opposite`() {\n assertEquals(\n- LeftAndRightCycleway(TRACK, TRACK),\n+ cycleway(TRACK, TRACK),\n parse(\n \"cycleway:both\" to \"opposite_track\",\n \"oneway\" to \"yes\"\n@@ -3006,7 +2513,7 @@ class CyclewayParserKtTest {\n \n @Test fun `explicitly on sidewalk on both side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(SIDEWALK_EXPLICIT, SIDEWALK_EXPLICIT),\n+ cycleway(SIDEWALK_EXPLICIT, SIDEWALK_EXPLICIT),\n parse(\n \"cycleway:both\" to \"opposite_track\",\n \"cycleway:both:segregated\" to \"no\",\n@@ -3015,7 +2522,7 @@ class CyclewayParserKtTest {\n )\n \n assertEquals(\n- LeftAndRightCycleway(SIDEWALK_EXPLICIT, SIDEWALK_EXPLICIT),\n+ cycleway(SIDEWALK_EXPLICIT, SIDEWALK_EXPLICIT),\n parse(\n \"cycleway:both\" to \"opposite_track\",\n \"cycleway:segregated\" to \"no\",\n@@ -3026,7 +2533,7 @@ class CyclewayParserKtTest {\n \n @Test fun `dual track on both side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_TRACK, DUAL_TRACK),\n+ cycleway(TRACK to BOTH, TRACK to BOTH),\n parse(\n \"cycleway:both\" to \"opposite_track\",\n \"cycleway:both:oneway\" to \"no\",\n@@ -3035,7 +2542,7 @@ class CyclewayParserKtTest {\n )\n \n assertEquals(\n- LeftAndRightCycleway(DUAL_TRACK, DUAL_TRACK),\n+ cycleway(TRACK to BOTH, TRACK to BOTH),\n parse(\n \"cycleway:both\" to \"opposite_track\",\n \"cycleway:oneway\" to \"no\",\n@@ -3046,7 +2553,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified lane on both side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(UNSPECIFIED_LANE, UNSPECIFIED_LANE),\n+ cycleway(UNSPECIFIED_LANE, UNSPECIFIED_LANE),\n parse(\n \"cycleway:both\" to \"opposite_lane\",\n \"oneway\" to \"yes\"\n@@ -3056,7 +2563,7 @@ class CyclewayParserKtTest {\n \n @Test fun `unspecified dual lane on both side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n+ cycleway(UNSPECIFIED_LANE to BOTH, UNSPECIFIED_LANE to BOTH),\n parse(\n \"cycleway:both\" to \"opposite_lane\",\n \"cycleway:both:oneway\" to \"no\",\n@@ -3064,7 +2571,7 @@ class CyclewayParserKtTest {\n )\n )\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n+ cycleway(UNSPECIFIED_LANE to BOTH, UNSPECIFIED_LANE to BOTH),\n parse(\n \"cycleway:both\" to \"opposite_lane\",\n \"cycleway:oneway\" to \"no\",\n@@ -3075,7 +2582,7 @@ class CyclewayParserKtTest {\n \n @Test fun `exclusive lane on both side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, EXCLUSIVE_LANE),\n+ cycleway(EXCLUSIVE_LANE, EXCLUSIVE_LANE),\n parse(\n \"cycleway:both\" to \"opposite_lane\",\n \"cycleway:both:lane\" to \"exclusive\",\n@@ -3084,28 +2591,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `exclusive lane synonyms on both side opposite`() {\n- assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, EXCLUSIVE_LANE),\n- parse(\n- \"cycleway:both\" to \"opposite_lane\",\n- \"cycleway:both:lane\" to \"exclusive_lane\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(EXCLUSIVE_LANE, EXCLUSIVE_LANE),\n- parse(\n- \"cycleway:both\" to \"opposite_lane\",\n- \"cycleway:both:lane\" to \"mandatory\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- }\n-\n @Test fun `exclusive dual lane on both side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n+ cycleway(EXCLUSIVE_LANE to BOTH, EXCLUSIVE_LANE to BOTH),\n parse(\n \"cycleway:both\" to \"opposite_lane\",\n \"cycleway:both:lane\" to \"exclusive\",\n@@ -3114,7 +2602,7 @@ class CyclewayParserKtTest {\n )\n )\n assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n+ cycleway(EXCLUSIVE_LANE to BOTH, EXCLUSIVE_LANE to BOTH),\n parse(\n \"cycleway:both\" to \"opposite_lane\",\n \"cycleway:both:lane\" to \"exclusive\",\n@@ -3124,49 +2612,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `exclusive dual lane synonyms on both side opposite`() {\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n- parse(\n- \"cycleway:both\" to \"opposite_lane\",\n- \"cycleway:both:lane\" to \"exclusive_lane\",\n- \"cycleway:both:oneway\" to \"no\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n- parse(\n- \"cycleway:both\" to \"opposite_lane\",\n- \"cycleway:both:lane\" to \"mandatory\",\n- \"cycleway:both:oneway\" to \"no\",\n- \"oneway\" to \"yes\"\n- )\n- )\n-\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n- parse(\n- \"cycleway:both\" to \"opposite_lane\",\n- \"cycleway:both:lane\" to \"exclusive_lane\",\n- \"cycleway:oneway\" to \"no\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(DUAL_LANE, DUAL_LANE),\n- parse(\n- \"cycleway:both\" to \"opposite_lane\",\n- \"cycleway:both:lane\" to \"mandatory\",\n- \"cycleway:oneway\" to \"no\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- }\n-\n @Test fun `advisory lane on both side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, ADVISORY_LANE),\n+ cycleway(ADVISORY_LANE, ADVISORY_LANE),\n parse(\n \"cycleway:both\" to \"opposite_lane\",\n \"cycleway:both:lane\" to \"advisory\",\n@@ -3175,36 +2623,9 @@ class CyclewayParserKtTest {\n )\n }\n \n- @Test fun `advisory lane synonyms on both side opposite`() {\n- assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, ADVISORY_LANE),\n- parse(\n- \"cycleway:both\" to \"opposite_lane\",\n- \"cycleway:both:lane\" to \"advisory_lane\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, ADVISORY_LANE),\n- parse(\n- \"cycleway:both\" to \"opposite_lane\",\n- \"cycleway:both:lane\" to \"soft_lane\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- assertEquals(\n- LeftAndRightCycleway(ADVISORY_LANE, ADVISORY_LANE),\n- parse(\n- \"cycleway:both\" to \"opposite_lane\",\n- \"cycleway:both:lane\" to \"dashed\",\n- \"oneway\" to \"yes\"\n- )\n- )\n- }\n-\n @Test fun `busway on both side opposite`() {\n assertEquals(\n- LeftAndRightCycleway(BUSWAY, BUSWAY),\n+ cycleway(BUSWAY, BUSWAY),\n parse(\n \"cycleway:both\" to \"opposite_share_busway\",\n \"oneway\" to \"yes\"\n@@ -3232,6 +2653,18 @@ class CyclewayParserKtTest {\n }\n }\n \n+private fun cycleway(left: Pair?, right: Pair?) =\n+ LeftAndRightCycleway(\n+ left?.let { CyclewayAndDirection(it.first, it.second) },\n+ right?.let { CyclewayAndDirection(it.first, it.second) },\n+ )\n+\n+private fun cycleway(left: Cycleway?, right: Cycleway?, isLeftHandTraffic: Boolean = false) =\n+ LeftAndRightCycleway(\n+ left?.let { CyclewayAndDirection(it, if (isLeftHandTraffic) FORWARD else BACKWARD) },\n+ right?.let { CyclewayAndDirection(it, if (isLeftHandTraffic) BACKWARD else FORWARD) },\n+ )\n+\n private fun parse(vararg pairs: Pair) =\n createCyclewaySides(mapOf(*pairs), false)\n \ndiff --git a/app/src/test/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayCreatorKtTest.kt b/app/src/test/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayCreatorKtTest.kt\nnew file mode 100644\nindex 00000000000..4c776c379de\n--- /dev/null\n+++ b/app/src/test/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayCreatorKtTest.kt\n@@ -0,0 +1,576 @@\n+package de.westnordost.streetcomplete.osm.cycleway_separate\n+\n+import de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCycleway.*\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapChangesBuilder\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAdd\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryChange\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDelete\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify\n+import de.westnordost.streetcomplete.osm.nowAsCheckDateString\n+import org.assertj.core.api.Assertions\n+import org.junit.Test\n+\n+class SeparateCyclewayCreatorKtTest {\n+ @Test fun `apply none`() {\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"footway\"),\n+ NONE,\n+ arrayOf(StringMapEntryAdd(\"bicycle\", \"no\"))\n+ )\n+ }\n+\n+ @Test fun `apply none re-tags cycleway and adds foot=yes if foot was not yes before`() {\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"cycleway\", \"foot\" to \"no\"),\n+ NONE,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"no\"),\n+ StringMapEntryModify(\"highway\", \"cycleway\", \"path\"),\n+ StringMapEntryModify(\"foot\", \"no\", \"yes\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply none re-tags cycleway to footway if foot is designated`() {\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"cycleway\", \"foot\" to \"designated\"),\n+ NONE,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"no\"),\n+ StringMapEntryModify(\"highway\", \"cycleway\", \"footway\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply none removes sidewalk and segregated tags`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"footway\",\n+ \"segregated\" to \"yes\",\n+ \"sidewalk\" to \"both\",\n+ ),\n+ NONE,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"no\"),\n+ StringMapEntryDelete(\"segregated\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk\", \"both\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"footway\",\n+ \"segregated\" to \"yes\",\n+ \"sidewalk:both\" to \"yes\",\n+ ),\n+ NONE,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"no\"),\n+ StringMapEntryDelete(\"segregated\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:both\", \"yes\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"footway\",\n+ \"segregated\" to \"yes\",\n+ \"sidewalk:left\" to \"yes\",\n+ \"sidewalk:right\" to \"yes\",\n+ ),\n+ NONE,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"no\"),\n+ StringMapEntryDelete(\"segregated\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:left\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:right\", \"yes\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply allowed`() {\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"footway\"),\n+ ALLOWED,\n+ arrayOf(StringMapEntryAdd(\"bicycle\", \"yes\"))\n+ )\n+ }\n+\n+ @Test fun `apply allowed re-tags cycleway and adds foot=yes if foot was not yes before`() {\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"cycleway\", \"foot\" to \"no\"),\n+ ALLOWED,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"yes\"),\n+ StringMapEntryModify(\"highway\", \"cycleway\", \"path\"),\n+ StringMapEntryModify(\"foot\", \"no\", \"yes\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply allowed re-tags cycleway to footway if foot is designated`() {\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"cycleway\", \"foot\" to \"designated\"),\n+ ALLOWED,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"yes\"),\n+ StringMapEntryModify(\"highway\", \"cycleway\", \"footway\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply allowed removes sidewalk and segregated tags`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"footway\",\n+ \"segregated\" to \"yes\",\n+ \"sidewalk\" to \"both\",\n+ ),\n+ ALLOWED,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"yes\"),\n+ StringMapEntryDelete(\"segregated\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk\", \"both\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"footway\",\n+ \"segregated\" to \"yes\",\n+ \"sidewalk:both\" to \"yes\",\n+ ),\n+ ALLOWED,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"yes\"),\n+ StringMapEntryDelete(\"segregated\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:both\", \"yes\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"footway\",\n+ \"segregated\" to \"yes\",\n+ \"sidewalk:left\" to \"yes\",\n+ \"sidewalk:right\" to \"yes\",\n+ ),\n+ ALLOWED,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"yes\"),\n+ StringMapEntryDelete(\"segregated\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:left\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:right\", \"yes\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply non-designated`() {\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"footway\"),\n+ NON_DESIGNATED,\n+ arrayOf(StringMapEntryAdd(\"check_date:bicycle\", nowAsCheckDateString()))\n+ )\n+ }\n+\n+ @Test fun `apply non-designated does not change bicycle tag unless it is designated`() {\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"footway\", \"bicycle\" to \"designated\"),\n+ NON_DESIGNATED,\n+ arrayOf(StringMapEntryDelete(\"bicycle\", \"designated\"))\n+ )\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"footway\", \"bicycle\" to \"yes\"),\n+ NON_DESIGNATED,\n+ arrayOf(StringMapEntryAdd(\"check_date:bicycle\", nowAsCheckDateString()))\n+ )\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"footway\", \"bicycle\" to \"no\"),\n+ NON_DESIGNATED,\n+ arrayOf(StringMapEntryAdd(\"check_date:bicycle\", nowAsCheckDateString()))\n+ )\n+ }\n+\n+ @Test fun `apply non-designated re-tags cycleway and adds foot=yes if foot was not yes before`() {\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"cycleway\", \"foot\" to \"no\"),\n+ NON_DESIGNATED,\n+ arrayOf(\n+ StringMapEntryModify(\"highway\", \"cycleway\", \"path\"),\n+ StringMapEntryModify(\"foot\", \"no\", \"yes\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply non-designated re-tags cycleway to footway if foot is designated`() {\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"cycleway\", \"foot\" to \"designated\"),\n+ NON_DESIGNATED,\n+ arrayOf(\n+ StringMapEntryModify(\"highway\", \"cycleway\", \"footway\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply non-designated removes sidewalk and segregated tags`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"footway\",\n+ \"segregated\" to \"yes\",\n+ \"sidewalk\" to \"both\",\n+ ),\n+ NON_DESIGNATED,\n+ arrayOf(\n+ StringMapEntryDelete(\"segregated\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk\", \"both\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"footway\",\n+ \"segregated\" to \"yes\",\n+ \"sidewalk:left\" to \"yes\",\n+ \"sidewalk:right\" to \"yes\",\n+ ),\n+ NON_DESIGNATED,\n+ arrayOf(\n+ StringMapEntryDelete(\"segregated\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:left\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:right\", \"yes\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"footway\",\n+ \"segregated\" to \"yes\",\n+ \"sidewalk:both\" to \"yes\",\n+ ),\n+ NON_DESIGNATED,\n+ arrayOf(\n+ StringMapEntryDelete(\"segregated\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:both\", \"yes\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply non-segregated`() {\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"footway\"),\n+ NON_SEGREGATED,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"designated\"),\n+ StringMapEntryAdd(\"segregated\", \"no\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"footway\", \"foot\" to \"yes\"),\n+ NON_SEGREGATED,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"designated\"),\n+ StringMapEntryModify(\"foot\", \"yes\", \"designated\"),\n+ StringMapEntryAdd(\"segregated\", \"no\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"cycleway\"),\n+ NON_SEGREGATED,\n+ arrayOf(\n+ StringMapEntryAdd(\"foot\", \"designated\"),\n+ StringMapEntryAdd(\"segregated\", \"no\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"cycleway\", \"bicycle\" to \"yes\"),\n+ NON_SEGREGATED,\n+ arrayOf(\n+ StringMapEntryModify(\"bicycle\", \"yes\", \"designated\"),\n+ StringMapEntryAdd(\"foot\", \"designated\"),\n+ StringMapEntryAdd(\"segregated\", \"no\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply non-segregated removes sidewalk tags`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"footway\",\n+ \"sidewalk\" to \"both\",\n+ ),\n+ NON_SEGREGATED,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"designated\"),\n+ StringMapEntryAdd(\"segregated\", \"no\"),\n+ StringMapEntryDelete(\"sidewalk\", \"both\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"footway\",\n+ \"sidewalk:both\" to \"yes\",\n+ ),\n+ NON_SEGREGATED,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"designated\"),\n+ StringMapEntryAdd(\"segregated\", \"no\"),\n+ StringMapEntryDelete(\"sidewalk:both\", \"yes\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"footway\",\n+ \"sidewalk:left\" to \"yes\",\n+ \"sidewalk:right\" to \"yes\",\n+ ),\n+ NON_SEGREGATED,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"designated\"),\n+ StringMapEntryAdd(\"segregated\", \"no\"),\n+ StringMapEntryDelete(\"sidewalk:left\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:right\", \"yes\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply segregated`() {\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"footway\"),\n+ SEGREGATED,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"designated\"),\n+ StringMapEntryAdd(\"segregated\", \"yes\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"footway\", \"foot\" to \"yes\"),\n+ SEGREGATED,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"designated\"),\n+ StringMapEntryModify(\"foot\", \"yes\", \"designated\"),\n+ StringMapEntryAdd(\"segregated\", \"yes\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"cycleway\"),\n+ SEGREGATED,\n+ arrayOf(\n+ StringMapEntryAdd(\"foot\", \"designated\"),\n+ StringMapEntryAdd(\"segregated\", \"yes\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"cycleway\", \"bicycle\" to \"yes\"),\n+ SEGREGATED,\n+ arrayOf(\n+ StringMapEntryModify(\"bicycle\", \"yes\", \"designated\"),\n+ StringMapEntryAdd(\"foot\", \"designated\"),\n+ StringMapEntryAdd(\"segregated\", \"yes\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply segregated removes sidewalk tags`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"footway\",\n+ \"sidewalk\" to \"both\",\n+ ),\n+ SEGREGATED,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"designated\"),\n+ StringMapEntryAdd(\"segregated\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk\", \"both\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"footway\",\n+ \"sidewalk:both\" to \"yes\",\n+ ),\n+ SEGREGATED,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"designated\"),\n+ StringMapEntryAdd(\"segregated\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:both\", \"yes\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"footway\",\n+ \"sidewalk:left\" to \"yes\",\n+ \"sidewalk:right\" to \"yes\",\n+ ),\n+ SEGREGATED,\n+ arrayOf(\n+ StringMapEntryAdd(\"bicycle\", \"designated\"),\n+ StringMapEntryAdd(\"segregated\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:left\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:right\", \"yes\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply exclusive`() {\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"cycleway\"),\n+ EXCLUSIVE,\n+ arrayOf(\n+ StringMapEntryAdd(\"foot\", \"no\"),\n+ StringMapEntryModify(\"highway\", \"cycleway\", \"cycleway\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"footway\"),\n+ EXCLUSIVE,\n+ arrayOf(\n+ StringMapEntryAdd(\"foot\", \"no\"),\n+ StringMapEntryModify(\"highway\", \"footway\", \"cycleway\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"path\", \"foot\" to \"yes\"),\n+ EXCLUSIVE,\n+ arrayOf(\n+ StringMapEntryModify(\"foot\", \"yes\", \"no\"),\n+ StringMapEntryModify(\"highway\", \"path\", \"cycleway\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"cycleway\", \"bicycle\" to \"yes\"),\n+ EXCLUSIVE,\n+ arrayOf(\n+ StringMapEntryAdd(\"foot\", \"no\"),\n+ StringMapEntryModify(\"bicycle\", \"yes\", \"designated\"),\n+ StringMapEntryModify(\"highway\", \"cycleway\", \"cycleway\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply exclusive removes sidewalk and segregated tags`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"cycleway\",\n+ \"sidewalk\" to \"both\",\n+ \"segregated\" to \"yes\",\n+ ),\n+ EXCLUSIVE,\n+ arrayOf(\n+ StringMapEntryAdd(\"foot\", \"no\"),\n+ StringMapEntryModify(\"highway\", \"cycleway\", \"cycleway\"),\n+ StringMapEntryDelete(\"sidewalk\", \"both\"),\n+ StringMapEntryDelete(\"segregated\", \"yes\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"cycleway\",\n+ \"segregated\" to \"yes\",\n+ \"sidewalk:both\" to \"yes\",\n+ ),\n+ EXCLUSIVE,\n+ arrayOf(\n+ StringMapEntryAdd(\"foot\", \"no\"),\n+ StringMapEntryModify(\"highway\", \"cycleway\", \"cycleway\"),\n+ StringMapEntryDelete(\"segregated\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:both\", \"yes\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"cycleway\",\n+ \"segregated\" to \"yes\",\n+ \"sidewalk:left\" to \"yes\",\n+ \"sidewalk:right\" to \"yes\",\n+ ),\n+ EXCLUSIVE,\n+ arrayOf(\n+ StringMapEntryAdd(\"foot\", \"no\"),\n+ StringMapEntryModify(\"highway\", \"cycleway\", \"cycleway\"),\n+ StringMapEntryDelete(\"segregated\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:left\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:right\", \"yes\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply exclusive with sidewalk`() {\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"cycleway\"),\n+ EXCLUSIVE_WITH_SIDEWALK,\n+ arrayOf(\n+ StringMapEntryAdd(\"sidewalk\", \"yes\"),\n+ StringMapEntryModify(\"highway\", \"cycleway\", \"cycleway\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"cycleway\", \"foot\" to \"yes\"),\n+ EXCLUSIVE_WITH_SIDEWALK,\n+ arrayOf(\n+ StringMapEntryAdd(\"sidewalk\", \"yes\"),\n+ StringMapEntryDelete(\"foot\", \"yes\"),\n+ StringMapEntryModify(\"highway\", \"cycleway\", \"cycleway\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"footway\"),\n+ EXCLUSIVE_WITH_SIDEWALK,\n+ arrayOf(\n+ StringMapEntryAdd(\"sidewalk\", \"yes\"),\n+ StringMapEntryModify(\"highway\", \"footway\", \"cycleway\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"path\"),\n+ EXCLUSIVE_WITH_SIDEWALK,\n+ arrayOf(\n+ StringMapEntryAdd(\"sidewalk\", \"yes\"),\n+ StringMapEntryModify(\"highway\", \"path\", \"cycleway\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"path\", \"bicycle\" to \"yes\"),\n+ EXCLUSIVE_WITH_SIDEWALK,\n+ arrayOf(\n+ StringMapEntryAdd(\"sidewalk\", \"yes\"),\n+ StringMapEntryModify(\"bicycle\", \"yes\", \"designated\"),\n+ StringMapEntryModify(\"highway\", \"path\", \"cycleway\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply exclusive with sidewalk does not touch sidewalk tags if a sidewalk is already tagged`() {\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"cycleway\", \"sidewalk\" to \"both\"),\n+ EXCLUSIVE_WITH_SIDEWALK,\n+ arrayOf(\n+ StringMapEntryModify(\"highway\", \"cycleway\", \"cycleway\"),\n+ StringMapEntryAdd(\"check_date:bicycle\", nowAsCheckDateString())\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"highway\" to \"cycleway\", \"sidewalk:left\" to \"yes\"),\n+ EXCLUSIVE_WITH_SIDEWALK,\n+ arrayOf(\n+ StringMapEntryModify(\"highway\", \"cycleway\", \"cycleway\"),\n+ StringMapEntryAdd(\"check_date:bicycle\", nowAsCheckDateString())\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply exclusive with sidewalk removes segregated tags`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"highway\" to \"cycleway\",\n+ \"sidewalk\" to \"both\",\n+ \"segregated\" to \"yes\"\n+ ),\n+ EXCLUSIVE_WITH_SIDEWALK,\n+ arrayOf(\n+ StringMapEntryModify(\"highway\", \"cycleway\", \"cycleway\"),\n+ StringMapEntryDelete(\"segregated\", \"yes\"),\n+ )\n+ )\n+ }\n+}\n+\n+private fun verifyAnswer(tags: Map, answer: SeparateCycleway, expectedChanges: Array) {\n+ val cb = StringMapChangesBuilder(tags)\n+ answer.applyTo(cb)\n+ val changes = cb.create().changes\n+ Assertions.assertThat(changes).containsExactlyInAnyOrder(*expectedChanges)\n+}\ndiff --git a/app/src/test/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayParserKtTest.kt b/app/src/test/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayParserKtTest.kt\nnew file mode 100644\nindex 00000000000..fdfaebb3b96\n--- /dev/null\n+++ b/app/src/test/java/de/westnordost/streetcomplete/osm/cycleway_separate/SeparateCyclewayParserKtTest.kt\n@@ -0,0 +1,68 @@\n+package de.westnordost.streetcomplete.osm.cycleway_separate\n+\n+import de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCycleway.*\n+import org.junit.Assert.*\n+import org.junit.Test\n+\n+class SeparateCyclewayParserKtTest {\n+\n+ @Test fun `parse no cycleway at all`() {\n+ assertEquals(null, parse())\n+ assertEquals(null, parse(\"highway\" to \"residential\"))\n+ }\n+\n+ @Test fun `parse no bicyclists allowed on path`() {\n+ assertEquals(NONE, parse(\"highway\" to \"path\"))\n+ assertEquals(NONE, parse(\"highway\" to \"footway\"))\n+\n+ assertEquals(NONE, parse(\"highway\" to \"path\", \"bicycle\" to \"no\"))\n+ assertEquals(NONE, parse(\"highway\" to \"footway\", \"bicycle\" to \"no\"))\n+ assertEquals(NONE, parse(\"highway\" to \"cycleway\", \"bicycle\" to \"no\"))\n+ }\n+\n+ @Test fun `parse bicyclists allowed on path`() {\n+ assertEquals(ALLOWED, parse(\"highway\" to \"path\", \"bicycle\" to \"yes\"))\n+ assertEquals(ALLOWED, parse(\"highway\" to \"footway\", \"bicycle\" to \"yes\"))\n+ assertEquals(ALLOWED, parse(\"highway\" to \"cycleway\", \"bicycle\" to \"yes\"))\n+ }\n+\n+ @Test fun `parse cyclists on non-segregated path`() {\n+ assertEquals(NON_SEGREGATED, parse(\"highway\" to \"path\", \"bicycle\" to \"designated\", \"segregated\" to \"no\"))\n+ assertEquals(NON_SEGREGATED, parse(\"highway\" to \"footway\", \"bicycle\" to \"designated\", \"segregated\" to \"no\"))\n+ assertEquals(NON_SEGREGATED, parse(\"highway\" to \"cycleway\", \"segregated\" to \"no\", \"foot\" to \"yes\"))\n+ assertEquals(NON_SEGREGATED, parse(\"highway\" to \"cycleway\", \"segregated\" to \"no\", \"foot\" to \"designated\"))\n+ assertEquals(NON_SEGREGATED, parse(\"highway\" to \"cycleway\", \"bicycle\" to \"designated\", \"segregated\" to \"no\", \"foot\" to \"yes\"))\n+ }\n+\n+ @Test fun `parse cyclists on segregated path`() {\n+ assertEquals(SEGREGATED, parse(\"highway\" to \"path\", \"bicycle\" to \"designated\", \"segregated\" to \"yes\"))\n+ assertEquals(SEGREGATED, parse(\"highway\" to \"footway\", \"bicycle\" to \"designated\", \"segregated\" to \"yes\"))\n+\n+ assertEquals(SEGREGATED, parse(\"highway\" to \"cycleway\", \"bicycle\" to \"designated\", \"segregated\" to \"yes\", \"foot\" to \"yes\"))\n+ assertEquals(SEGREGATED, parse(\"highway\" to \"cycleway\", \"segregated\" to \"yes\", \"foot\" to \"yes\"))\n+ assertEquals(SEGREGATED, parse(\"highway\" to \"cycleway\", \"segregated\" to \"yes\", \"foot\" to \"designated\"))\n+ }\n+\n+ @Test fun `parse cyclists on exclusive path`() {\n+ assertEquals(EXCLUSIVE, parse(\"highway\" to \"path\", \"bicycle\" to \"designated\", \"foot\" to \"no\"))\n+ assertEquals(EXCLUSIVE, parse(\"highway\" to \"footway\", \"bicycle\" to \"designated\", \"foot\" to \"no\"))\n+ assertEquals(EXCLUSIVE, parse(\"highway\" to \"cycleway\"))\n+ assertEquals(EXCLUSIVE, parse(\"highway\" to \"cycleway\", \"foot\" to \"no\"))\n+\n+ assertEquals(EXCLUSIVE, parse(\"highway\" to \"cycleway\", \"sidewalk\" to \"separate\"))\n+ assertEquals(EXCLUSIVE, parse(\"highway\" to \"cycleway\", \"sidewalk\" to \"no\"))\n+ }\n+\n+ @Test fun `parse cycleway with sidewalk`() {\n+ assertEquals(EXCLUSIVE_WITH_SIDEWALK, parse(\"highway\" to \"path\", \"bicycle\" to \"designated\", \"sidewalk\" to \"left\"))\n+ assertEquals(EXCLUSIVE_WITH_SIDEWALK, parse(\"highway\" to \"footway\", \"bicycle\" to \"designated\", \"sidewalk\" to \"right\"))\n+\n+ assertEquals(EXCLUSIVE_WITH_SIDEWALK, parse(\"highway\" to \"cycleway\", \"bicycle\" to \"designated\", \"sidewalk:left\" to \"yes\"))\n+ assertEquals(EXCLUSIVE_WITH_SIDEWALK, parse(\"highway\" to \"cycleway\", \"sidewalk:both\" to \"yes\"))\n+ assertEquals(EXCLUSIVE_WITH_SIDEWALK, parse(\"highway\" to \"cycleway\", \"sidewalk:right\" to \"yes\"))\n+\n+ assertEquals(EXCLUSIVE_WITH_SIDEWALK, parse(\"highway\" to \"cycleway\", \"sidewalk\" to \"yes\"))\n+ }\n+}\n+\n+private fun parse(vararg pairs: Pair) = createSeparateCycleway(mapOf(*pairs))\ndiff --git a/app/src/test/java/de/westnordost/streetcomplete/osm/sidewalk/SidewalkCreatorKtTest.kt b/app/src/test/java/de/westnordost/streetcomplete/osm/sidewalk/SidewalkCreatorKtTest.kt\nnew file mode 100644\nindex 00000000000..53be49cada0\n--- /dev/null\n+++ b/app/src/test/java/de/westnordost/streetcomplete/osm/sidewalk/SidewalkCreatorKtTest.kt\n@@ -0,0 +1,267 @@\n+package de.westnordost.streetcomplete.osm.sidewalk\n+\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapChangesBuilder\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAdd\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryChange\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDelete\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify\n+import de.westnordost.streetcomplete.osm.nowAsCheckDateString\n+import org.assertj.core.api.Assertions\n+import org.junit.Test\n+\n+class SidewalkCreatorKtTest {\n+ @Test fun `apply nothing applies nothing`() {\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightSidewalk(null, null),\n+ arrayOf()\n+ )\n+ }\n+\n+ @Test fun `apply simple values`() {\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightSidewalk(Sidewalk.YES, Sidewalk.YES),\n+ arrayOf(StringMapEntryAdd(\"sidewalk\", \"both\"))\n+ )\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightSidewalk(Sidewalk.NO, Sidewalk.NO),\n+ arrayOf(StringMapEntryAdd(\"sidewalk\", \"no\"))\n+ )\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightSidewalk(Sidewalk.YES, Sidewalk.NO),\n+ arrayOf(StringMapEntryAdd(\"sidewalk\", \"left\"))\n+ )\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightSidewalk(Sidewalk.NO, Sidewalk.YES),\n+ arrayOf(StringMapEntryAdd(\"sidewalk\", \"right\"))\n+ )\n+ }\n+\n+ @Test fun `apply value when each side differs`() {\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightSidewalk(Sidewalk.YES, Sidewalk.SEPARATE),\n+ arrayOf(\n+ StringMapEntryAdd(\"sidewalk:left\", \"yes\"),\n+ StringMapEntryAdd(\"sidewalk:right\", \"separate\")\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightSidewalk(Sidewalk.SEPARATE, Sidewalk.NO),\n+ arrayOf(\n+ StringMapEntryAdd(\"sidewalk:left\", \"separate\"),\n+ StringMapEntryAdd(\"sidewalk:right\", \"no\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `clean up previous tagging`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"sidewalk\" to \"different\",\n+ \"sidewalk:left\" to \"yes\",\n+ \"sidewalk:right\" to \"separate\",\n+ \"sidewalk:both\" to \"yes and separate ;-)\"\n+ ),\n+ LeftAndRightSidewalk(Sidewalk.SEPARATE, Sidewalk.SEPARATE),\n+ arrayOf(\n+ StringMapEntryModify(\"sidewalk:both\", \"yes and separate ;-)\", \"separate\"),\n+ StringMapEntryDelete(\"sidewalk:left\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:right\", \"separate\"),\n+ StringMapEntryDelete(\"sidewalk\", \"different\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `clean up previous tagging when applying value for each side`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"sidewalk\" to \"both\",\n+ \"sidewalk:both\" to \"yes\",\n+ ),\n+ LeftAndRightSidewalk(Sidewalk.SEPARATE, Sidewalk.YES),\n+ arrayOf(\n+ StringMapEntryAdd(\"sidewalk:left\", \"separate\"),\n+ StringMapEntryAdd(\"sidewalk:right\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk\", \"both\"),\n+ StringMapEntryDelete(\"sidewalk:both\", \"yes\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `updates check date`() {\n+ verifyAnswer(\n+ mapOf(\"sidewalk\" to \"both\"),\n+ LeftAndRightSidewalk(Sidewalk.YES, Sidewalk.YES),\n+ arrayOf(\n+ StringMapEntryModify(\"sidewalk\", \"both\", \"both\"),\n+ StringMapEntryAdd(\"check_date:sidewalk\", nowAsCheckDateString())\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"sidewalk:left\" to \"separate\",\n+ \"sidewalk:right\" to \"no\"\n+ ),\n+ LeftAndRightSidewalk(Sidewalk.SEPARATE, Sidewalk.NO),\n+ arrayOf(\n+ StringMapEntryModify(\"sidewalk:left\", \"separate\", \"separate\"),\n+ StringMapEntryModify(\"sidewalk:right\", \"no\", \"no\"),\n+ StringMapEntryAdd(\"check_date:sidewalk\", nowAsCheckDateString())\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply value only for one side`() {\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightSidewalk(Sidewalk.YES, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"sidewalk:left\", \"yes\")\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightSidewalk(null, Sidewalk.NO),\n+ arrayOf(\n+ StringMapEntryAdd(\"sidewalk:right\", \"no\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply for one side does not touch the other side`() {\n+ verifyAnswer(\n+ mapOf(\"sidewalk:left\" to \"separate\"),\n+ LeftAndRightSidewalk(null, Sidewalk.YES),\n+ arrayOf(\n+ StringMapEntryAdd(\"sidewalk:right\", \"yes\")\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"sidewalk:right\" to \"yes\"),\n+ LeftAndRightSidewalk(Sidewalk.NO, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"sidewalk\", \"right\"),\n+ StringMapEntryDelete(\"sidewalk:right\", \"yes\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply for one side does not touch the other side even if it is invalid`() {\n+ verifyAnswer(\n+ mapOf(\"sidewalk:left\" to \"some invalid value\"),\n+ LeftAndRightSidewalk(null, Sidewalk.YES),\n+ arrayOf(\n+ StringMapEntryAdd(\"sidewalk:right\", \"yes\")\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"sidewalk:right\" to \"another invalid value\"),\n+ LeftAndRightSidewalk(Sidewalk.NO, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"sidewalk:left\", \"no\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply for one side does not change values for the other side even if it was defined for both sides before and invalid`() {\n+ verifyAnswer(\n+ mapOf(\"sidewalk:both\" to \"some invalid value\"),\n+ LeftAndRightSidewalk(null, Sidewalk.YES),\n+ arrayOf(\n+ StringMapEntryAdd(\"sidewalk:right\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:both\", \"some invalid value\"),\n+ StringMapEntryAdd(\"sidewalk:left\", \"some invalid value\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"sidewalk:both\" to \"some invalid value\"),\n+ LeftAndRightSidewalk(Sidewalk.YES, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"sidewalk:left\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:both\", \"some invalid value\"),\n+ StringMapEntryAdd(\"sidewalk:right\", \"some invalid value\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply conflates values`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"sidewalk:left\" to \"yes\",\n+ \"sidewalk:right\" to \"yes\",\n+ ),\n+ LeftAndRightSidewalk(Sidewalk.YES, null),\n+ arrayOf(\n+ StringMapEntryDelete(\"sidewalk:left\", \"yes\"),\n+ StringMapEntryDelete(\"sidewalk:right\", \"yes\"),\n+ StringMapEntryAdd(\"sidewalk\", \"both\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"sidewalk:right\" to \"no\",\n+ ),\n+ LeftAndRightSidewalk(Sidewalk.YES, null),\n+ arrayOf(\n+ StringMapEntryDelete(\"sidewalk:right\", \"no\"),\n+ StringMapEntryAdd(\"sidewalk\", \"left\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"sidewalk:right\" to \"yes\",\n+ ),\n+ LeftAndRightSidewalk(Sidewalk.NO, null),\n+ arrayOf(\n+ StringMapEntryDelete(\"sidewalk:right\", \"yes\"),\n+ StringMapEntryAdd(\"sidewalk\", \"right\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"sidewalk:right\" to \"no\",\n+ ),\n+ LeftAndRightSidewalk(Sidewalk.NO, null),\n+ arrayOf(\n+ StringMapEntryDelete(\"sidewalk:right\", \"no\"),\n+ StringMapEntryAdd(\"sidewalk\", \"no\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply does not conflate values non-yes-no-values`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"sidewalk:right\" to \"separate\",\n+ ),\n+ LeftAndRightSidewalk(Sidewalk.SEPARATE, null),\n+ arrayOf(\n+ StringMapEntryDelete(\"sidewalk:right\", \"separate\"),\n+ StringMapEntryAdd(\"sidewalk:both\", \"separate\"),\n+ )\n+ )\n+ }\n+\n+ @Test(expected = IllegalArgumentException::class)\n+ fun `applying invalid left throws exception`() {\n+ LeftAndRightSidewalk(Sidewalk.INVALID, null).applyTo(StringMapChangesBuilder(mapOf()))\n+ }\n+\n+ @Test(expected = IllegalArgumentException::class)\n+ fun `applying invalid right throws exception`() {\n+ LeftAndRightSidewalk(null, Sidewalk.INVALID).applyTo(StringMapChangesBuilder(mapOf()))\n+ }\n+}\n+\n+private fun verifyAnswer(tags: Map, answer: LeftAndRightSidewalk, expectedChanges: Array) {\n+ val cb = StringMapChangesBuilder(tags)\n+ answer.applyTo(cb)\n+ val changes = cb.create().changes\n+ Assertions.assertThat(changes).containsExactlyInAnyOrder(*expectedChanges)\n+}\ndiff --git a/app/src/test/java/de/westnordost/streetcomplete/osm/sidewalk/SidewalkKtTest.kt b/app/src/test/java/de/westnordost/streetcomplete/osm/sidewalk/SidewalkKtTest.kt\nindex dd2eb346626..5624f4e83c5 100644\n--- a/app/src/test/java/de/westnordost/streetcomplete/osm/sidewalk/SidewalkKtTest.kt\n+++ b/app/src/test/java/de/westnordost/streetcomplete/osm/sidewalk/SidewalkKtTest.kt\n@@ -1,151 +1,9 @@\n package de.westnordost.streetcomplete.osm.sidewalk\n \n-import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapChangesBuilder\n-import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAdd\n-import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryChange\n-import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDelete\n-import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify\n-import de.westnordost.streetcomplete.osm.nowAsCheckDateString\n-import org.assertj.core.api.Assertions\n import org.junit.Assert.assertEquals\n import org.junit.Test\n \n class SidewalkKtTest {\n- @Test fun `apply simple values`() {\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightSidewalk(Sidewalk.YES, Sidewalk.YES),\n- arrayOf(StringMapEntryAdd(\"sidewalk\", \"both\"))\n- )\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightSidewalk(Sidewalk.NO, Sidewalk.NO),\n- arrayOf(StringMapEntryAdd(\"sidewalk\", \"no\"))\n- )\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightSidewalk(Sidewalk.YES, Sidewalk.NO),\n- arrayOf(StringMapEntryAdd(\"sidewalk\", \"left\"))\n- )\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightSidewalk(Sidewalk.NO, Sidewalk.YES),\n- arrayOf(StringMapEntryAdd(\"sidewalk\", \"right\"))\n- )\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightSidewalk(Sidewalk.SEPARATE, Sidewalk.SEPARATE),\n- arrayOf(StringMapEntryAdd(\"sidewalk\", \"separate\"))\n- )\n- }\n-\n- @Test fun `apply value when each side differs`() {\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightSidewalk(Sidewalk.YES, Sidewalk.SEPARATE),\n- arrayOf(\n- StringMapEntryAdd(\"sidewalk:left\", \"yes\"),\n- StringMapEntryAdd(\"sidewalk:right\", \"separate\")\n- )\n- )\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightSidewalk(Sidewalk.SEPARATE, Sidewalk.NO),\n- arrayOf(\n- StringMapEntryAdd(\"sidewalk:left\", \"separate\"),\n- StringMapEntryAdd(\"sidewalk:right\", \"no\")\n- )\n- )\n- }\n-\n- @Test fun `clean up previous tagging when applying simple values`() {\n- verifyAnswer(\n- mapOf(\n- \"sidewalk:left\" to \"yes\",\n- \"sidewalk:right\" to \"separate\",\n- \"sidewalk:both\" to \"yes and separate ;-)\",\n- \"sidewalk:left:surface\" to \"jello\",\n- \"sidewalk:both:oneway\" to \"yes\"\n- ),\n- LeftAndRightSidewalk(Sidewalk.SEPARATE, Sidewalk.SEPARATE),\n- arrayOf(\n- StringMapEntryAdd(\"sidewalk\", \"separate\"),\n- StringMapEntryDelete(\"sidewalk:left\", \"yes\"),\n- StringMapEntryDelete(\"sidewalk:right\", \"separate\"),\n- StringMapEntryDelete(\"sidewalk:both\", \"yes and separate ;-)\"),\n- StringMapEntryDelete(\"sidewalk:left:surface\", \"jello\"),\n- StringMapEntryDelete(\"sidewalk:both:oneway\", \"yes\"),\n- )\n- )\n- }\n-\n- @Test fun `clean up previous tagging when applying value for each side`() {\n- verifyAnswer(\n- mapOf(\n- \"sidewalk\" to \"both\",\n- \"sidewalk:both\" to \"yes\",\n- \"sidewalk:left:surface\" to \"jello\",\n- \"sidewalk:both:oneway\" to \"yes\"\n- ),\n- LeftAndRightSidewalk(Sidewalk.SEPARATE, Sidewalk.YES),\n- arrayOf(\n- StringMapEntryAdd(\"sidewalk:left\", \"separate\"),\n- StringMapEntryAdd(\"sidewalk:right\", \"yes\"),\n- StringMapEntryDelete(\"sidewalk\", \"both\"),\n- StringMapEntryDelete(\"sidewalk:both\", \"yes\"),\n- StringMapEntryDelete(\"sidewalk:left:surface\", \"jello\"),\n- StringMapEntryDelete(\"sidewalk:both:oneway\", \"yes\"),\n- )\n- )\n- }\n-\n- @Test fun `updates check date`() {\n- verifyAnswer(\n- mapOf(\"sidewalk\" to \"both\"),\n- LeftAndRightSidewalk(Sidewalk.YES, Sidewalk.YES),\n- arrayOf(\n- StringMapEntryModify(\"sidewalk\", \"both\", \"both\"),\n- StringMapEntryAdd(\"check_date:sidewalk\", nowAsCheckDateString())\n- )\n- )\n- verifyAnswer(\n- mapOf(\"sidewalk:left\" to \"separate\", \"sidewalk:right\" to \"no\"),\n- LeftAndRightSidewalk(Sidewalk.SEPARATE, Sidewalk.NO),\n- arrayOf(\n- StringMapEntryModify(\"sidewalk:left\", \"separate\", \"separate\"),\n- StringMapEntryModify(\"sidewalk:right\", \"no\", \"no\"),\n- StringMapEntryAdd(\"check_date:sidewalk\", nowAsCheckDateString())\n- )\n- )\n- }\n-\n- @Test fun `apply value only for one side`() {\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightSidewalk(Sidewalk.YES, null),\n- arrayOf(\n- StringMapEntryAdd(\"sidewalk:left\", \"yes\")\n- )\n- )\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightSidewalk(null, Sidewalk.NO),\n- arrayOf(\n- StringMapEntryAdd(\"sidewalk:right\", \"no\")\n- )\n- )\n- }\n-\n- @Test(expected = IllegalArgumentException::class)\n- fun `applying invalid left throws exception`() {\n- LeftAndRightSidewalk(Sidewalk.INVALID, null).applyTo(StringMapChangesBuilder(mapOf()))\n- }\n-\n- @Test(expected = IllegalArgumentException::class)\n- fun `applying invalid right throws exception`() {\n- LeftAndRightSidewalk(null, Sidewalk.INVALID).applyTo(StringMapChangesBuilder(mapOf()))\n- }\n-\n @Test fun validOrNullValues() {\n assertEquals(\n LeftAndRightSidewalk(null, null),\n@@ -161,10 +19,3 @@ class SidewalkKtTest {\n )\n }\n }\n-\n-private fun verifyAnswer(tags: Map, answer: LeftAndRightSidewalk, expectedChanges: Array) {\n- val cb = StringMapChangesBuilder(tags)\n- answer.applyTo(cb)\n- val changes = cb.create().changes\n- Assertions.assertThat(changes).containsExactlyInAnyOrder(*expectedChanges)\n-}\ndiff --git a/app/src/test/java/de/westnordost/streetcomplete/osm/street_parking/StreetParkingCreatorKtTest.kt b/app/src/test/java/de/westnordost/streetcomplete/osm/street_parking/StreetParkingCreatorKtTest.kt\nnew file mode 100644\nindex 00000000000..2b282b4b730\n--- /dev/null\n+++ b/app/src/test/java/de/westnordost/streetcomplete/osm/street_parking/StreetParkingCreatorKtTest.kt\n@@ -0,0 +1,291 @@\n+package de.westnordost.streetcomplete.osm.street_parking\n+\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapChangesBuilder\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAdd\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryChange\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDelete\n+import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify\n+import de.westnordost.streetcomplete.osm.nowAsCheckDateString\n+import org.assertj.core.api.Assertions\n+import org.junit.Test\n+\n+class StreetParkingCreatorKtTest {\n+\n+ @Test fun `apply nothing applies nothing`() {\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightStreetParking(null, null),\n+ arrayOf()\n+ )\n+ }\n+\n+ @Test fun `apply no parking`() {\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightStreetParking(NoStreetParking, NoStreetParking),\n+ arrayOf(StringMapEntryAdd(\"parking:lane:both\", \"no\"))\n+ )\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightStreetParking(NoStreetParking, null),\n+ arrayOf(StringMapEntryAdd(\"parking:lane:left\", \"no\"))\n+ )\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightStreetParking(null, NoStreetParking),\n+ arrayOf(StringMapEntryAdd(\"parking:lane:right\", \"no\"))\n+ )\n+ }\n+\n+ @Test fun `apply separate parking answer`() {\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightStreetParking(StreetParkingSeparate, StreetParkingSeparate),\n+ arrayOf(StringMapEntryAdd(\"parking:lane:both\", \"separate\"))\n+ )\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightStreetParking(StreetParkingSeparate, null),\n+ arrayOf(StringMapEntryAdd(\"parking:lane:left\", \"separate\"))\n+ )\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightStreetParking(null, StreetParkingSeparate),\n+ arrayOf(StringMapEntryAdd(\"parking:lane:right\", \"separate\"))\n+ )\n+ }\n+\n+ @Test fun `apply parallel parking answer on both sides`() {\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightStreetParking(\n+ StreetParkingPositionAndOrientation(ParkingOrientation.PARALLEL, ParkingPosition.HALF_ON_KERB),\n+ StreetParkingPositionAndOrientation(ParkingOrientation.PARALLEL, ParkingPosition.HALF_ON_KERB)\n+ ),\n+ arrayOf(\n+ StringMapEntryAdd(\"parking:lane:both\", \"parallel\"),\n+ StringMapEntryAdd(\"parking:lane:both:parallel\", \"half_on_kerb\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply parallel parking answer with different positions on sides`() {\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightStreetParking(\n+ StreetParkingPositionAndOrientation(ParkingOrientation.PARALLEL, ParkingPosition.ON_STREET),\n+ StreetParkingPositionAndOrientation(ParkingOrientation.PARALLEL, ParkingPosition.HALF_ON_KERB)\n+ ),\n+ arrayOf(\n+ StringMapEntryAdd(\"parking:lane:both\", \"parallel\"),\n+ StringMapEntryAdd(\"parking:lane:left:parallel\", \"on_street\"),\n+ StringMapEntryAdd(\"parking:lane:right:parallel\", \"half_on_kerb\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply street side parking answer with different orientations on sides`() {\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightStreetParking(\n+ StreetParkingPositionAndOrientation(ParkingOrientation.PERPENDICULAR, ParkingPosition.STREET_SIDE),\n+ StreetParkingPositionAndOrientation(ParkingOrientation.PARALLEL, ParkingPosition.STREET_SIDE)\n+ ),\n+ arrayOf(\n+ StringMapEntryAdd(\"parking:lane:left\", \"perpendicular\"),\n+ StringMapEntryAdd(\"parking:lane:right\", \"parallel\"),\n+ StringMapEntryAdd(\"parking:lane:left:perpendicular\", \"street_side\"),\n+ StringMapEntryAdd(\"parking:lane:right:parallel\", \"street_side\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply different parking positions and orientations on sides`() {\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightStreetParking(\n+ StreetParkingPositionAndOrientation(ParkingOrientation.DIAGONAL, ParkingPosition.STREET_SIDE),\n+ StreetParkingPositionAndOrientation(ParkingOrientation.PERPENDICULAR, ParkingPosition.PAINTED_AREA_ONLY)\n+ ),\n+ arrayOf(\n+ StringMapEntryAdd(\"parking:lane:left\", \"diagonal\"),\n+ StringMapEntryAdd(\"parking:lane:left:diagonal\", \"street_side\"),\n+ StringMapEntryAdd(\"parking:lane:right\", \"perpendicular\"),\n+ StringMapEntryAdd(\"parking:lane:right:perpendicular\", \"painted_area_only\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `applying one side combines with previous tagging of the other side to both-tag`() {\n+ verifyAnswer(\n+ mapOf(\"parking:lane:left\" to \"separate\"),\n+ LeftAndRightStreetParking(null, StreetParkingSeparate),\n+ arrayOf(\n+ StringMapEntryAdd(\"parking:lane:both\", \"separate\"),\n+ StringMapEntryDelete(\"parking:lane:left\", \"separate\"),\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"parking:lane:right\" to \"separate\"),\n+ LeftAndRightStreetParking(StreetParkingSeparate, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"parking:lane:both\", \"separate\"),\n+ StringMapEntryDelete(\"parking:lane:right\", \"separate\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply for one side does not touch the other side`() {\n+ verifyAnswer(\n+ mapOf(\"parking:lane:left\" to \"separate\"),\n+ LeftAndRightStreetParking(null, NoStreetParking),\n+ arrayOf(\n+ StringMapEntryAdd(\"parking:lane:right\", \"no\")\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"parking:lane:right\" to \"no\"),\n+ LeftAndRightStreetParking(StreetParkingSeparate, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"parking:lane:left\", \"separate\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply for one side does not touch the other side even if it is invalid`() {\n+ verifyAnswer(\n+ mapOf(\"parking:lane:left\" to \"narrow\"),\n+ LeftAndRightStreetParking(null, NoStreetParking),\n+ arrayOf(\n+ StringMapEntryAdd(\"parking:lane:right\", \"no\")\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\"parking:lane:right\" to \"narrow\"),\n+ LeftAndRightStreetParking(StreetParkingSeparate, null),\n+ arrayOf(\n+ StringMapEntryAdd(\"parking:lane:left\", \"separate\")\n+ )\n+ )\n+ }\n+\n+ @Test fun `apply for one side does not change values for the other side even if it was defined for both sides before and invalid`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"parking:lane\" to \"hexagonal\",\n+ \"parking:lane:diagonal\" to \"on_kerb\",\n+ ),\n+ LeftAndRightStreetParking(null, NoStreetParking),\n+ arrayOf(\n+ StringMapEntryAdd(\"parking:lane:right\", \"no\"),\n+ StringMapEntryDelete(\"parking:lane\", \"hexagonal\"),\n+ StringMapEntryDelete(\"parking:lane:diagonal\", \"on_kerb\"),\n+ StringMapEntryAdd(\"parking:lane:left\", \"hexagonal\"),\n+ StringMapEntryAdd(\"parking:lane:left:diagonal\", \"on_kerb\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `updates check date`() {\n+ verifyAnswer(\n+ mapOf(\"parking:lane:both\" to \"no\"),\n+ LeftAndRightStreetParking(NoStreetParking, NoStreetParking),\n+ arrayOf(\n+ StringMapEntryModify(\"parking:lane:both\", \"no\", \"no\"),\n+ StringMapEntryAdd(\"check_date:parking:lane\", nowAsCheckDateString())\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(\n+ \"parking:lane:both\" to \"parallel\",\n+ \"parking:lane:left:parallel\" to \"half_on_kerb\",\n+ \"parking:lane:right:parallel\" to \"on_kerb\",\n+ \"parking:condition:left\" to \"free\",\n+ ),\n+ LeftAndRightStreetParking(\n+ StreetParkingPositionAndOrientation(ParkingOrientation.PARALLEL, ParkingPosition.HALF_ON_KERB),\n+ StreetParkingPositionAndOrientation(ParkingOrientation.PARALLEL, ParkingPosition.ON_KERB)\n+ ),\n+ arrayOf(\n+ StringMapEntryModify(\"parking:lane:both\", \"parallel\", \"parallel\"),\n+ StringMapEntryModify(\"parking:lane:left:parallel\", \"half_on_kerb\", \"half_on_kerb\"),\n+ StringMapEntryModify(\"parking:lane:right:parallel\", \"on_kerb\", \"on_kerb\"),\n+ StringMapEntryAdd(\"check_date:parking:lane\", nowAsCheckDateString())\n+ )\n+ )\n+ }\n+\n+ @Test fun `clean up previous tagging when applying value for each side`() {\n+ verifyAnswer(\n+ mapOf(\n+ \"parking:lane:both\" to \"parallel\",\n+ \"parking:lane:left:parallel\" to \"half_on_kerb\",\n+ \"parking:lane:right:parallel\" to \"on_kerb\",\n+ ),\n+ LeftAndRightStreetParking(\n+ StreetParkingPositionAndOrientation(ParkingOrientation.PARALLEL, ParkingPosition.ON_STREET),\n+ StreetParkingPositionAndOrientation(ParkingOrientation.DIAGONAL, ParkingPosition.ON_STREET)\n+ ),\n+ arrayOf(\n+ StringMapEntryDelete(\"parking:lane:both\", \"parallel\"),\n+ StringMapEntryAdd(\"parking:lane:left\", \"parallel\"),\n+ StringMapEntryAdd(\"parking:lane:right\", \"diagonal\"),\n+ StringMapEntryModify(\"parking:lane:left:parallel\", \"half_on_kerb\", \"on_street\"),\n+ StringMapEntryDelete(\"parking:lane:right:parallel\", \"on_kerb\"),\n+ StringMapEntryAdd(\"parking:lane:right:diagonal\", \"on_street\"),\n+ )\n+ )\n+ }\n+\n+ @Test fun `tag only on one side`() {\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightStreetParking(\n+ null,\n+ StreetParkingPositionAndOrientation(ParkingOrientation.DIAGONAL, ParkingPosition.ON_STREET)\n+ ),\n+ arrayOf(\n+ StringMapEntryAdd(\"parking:lane:right\", \"diagonal\"),\n+ StringMapEntryAdd(\"parking:lane:right:diagonal\", \"on_street\")\n+ )\n+ )\n+ verifyAnswer(\n+ mapOf(),\n+ LeftAndRightStreetParking(\n+ StreetParkingPositionAndOrientation(ParkingOrientation.DIAGONAL, ParkingPosition.ON_STREET),\n+ null\n+ ),\n+ arrayOf(\n+ StringMapEntryAdd(\"parking:lane:left\", \"diagonal\"),\n+ StringMapEntryAdd(\"parking:lane:left:diagonal\", \"on_street\")\n+ )\n+ )\n+ }\n+\n+ @Test(expected = IllegalArgumentException::class)\n+ fun `applying incomplete left throws exception`() {\n+ LeftAndRightStreetParking(IncompleteStreetParking, null).applyTo(StringMapChangesBuilder(mapOf()))\n+ }\n+\n+ @Test(expected = IllegalArgumentException::class)\n+ fun `applying incomplete right throws exception`() {\n+ LeftAndRightStreetParking(null, IncompleteStreetParking).applyTo(StringMapChangesBuilder(mapOf()))\n+ }\n+\n+ @Test(expected = IllegalArgumentException::class)\n+ fun `applying unknown left throws exception`() {\n+ LeftAndRightStreetParking(UnknownStreetParking, null).applyTo(StringMapChangesBuilder(mapOf()))\n+ }\n+\n+ @Test(expected = IllegalArgumentException::class)\n+ fun `applying unknown right throws exception`() {\n+ LeftAndRightStreetParking(null, UnknownStreetParking).applyTo(StringMapChangesBuilder(mapOf()))\n+ }\n+}\n+\n+private fun verifyAnswer(tags: Map, answer: LeftAndRightStreetParking, expectedChanges: Array) {\n+ val cb = StringMapChangesBuilder(tags)\n+ answer.applyTo(cb)\n+ val changes = cb.create().changes\n+ Assertions.assertThat(changes).containsExactlyInAnyOrder(*expectedChanges)\n+}\ndiff --git a/app/src/test/java/de/westnordost/streetcomplete/osm/street_parking/StreetParkingKtTest.kt b/app/src/test/java/de/westnordost/streetcomplete/osm/street_parking/StreetParkingKtTest.kt\nindex 0dd2cb67b6d..4ecd92dbcf9 100644\n--- a/app/src/test/java/de/westnordost/streetcomplete/osm/street_parking/StreetParkingKtTest.kt\n+++ b/app/src/test/java/de/westnordost/streetcomplete/osm/street_parking/StreetParkingKtTest.kt\n@@ -1,241 +1,9 @@\n package de.westnordost.streetcomplete.osm.street_parking\n \n-import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapChangesBuilder\n-import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAdd\n-import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryChange\n-import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDelete\n-import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify\n-import de.westnordost.streetcomplete.osm.nowAsCheckDateString\n-import org.assertj.core.api.Assertions\n import org.junit.Assert.assertEquals\n import org.junit.Test\n \n class StreetParkingTest {\n-\n- @Test fun `apply no parking`() {\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightStreetParking(NoStreetParking, NoStreetParking),\n- arrayOf(StringMapEntryAdd(\"parking:lane:both\", \"no\"))\n- )\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightStreetParking(NoStreetParking, null),\n- arrayOf(StringMapEntryAdd(\"parking:lane:left\", \"no\"))\n- )\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightStreetParking(null, NoStreetParking),\n- arrayOf(StringMapEntryAdd(\"parking:lane:right\", \"no\"))\n- )\n- }\n-\n- @Test fun `apply separate parking answer`() {\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightStreetParking(StreetParkingSeparate, StreetParkingSeparate),\n- arrayOf(StringMapEntryAdd(\"parking:lane:both\", \"separate\"))\n- )\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightStreetParking(StreetParkingSeparate, null),\n- arrayOf(StringMapEntryAdd(\"parking:lane:left\", \"separate\"))\n- )\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightStreetParking(null, StreetParkingSeparate),\n- arrayOf(StringMapEntryAdd(\"parking:lane:right\", \"separate\"))\n- )\n- }\n-\n- @Test fun `apply parallel parking answer on both sides`() {\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightStreetParking(\n- StreetParkingPositionAndOrientation(ParkingOrientation.PARALLEL, ParkingPosition.HALF_ON_KERB),\n- StreetParkingPositionAndOrientation(ParkingOrientation.PARALLEL, ParkingPosition.HALF_ON_KERB)\n- ),\n- arrayOf(\n- StringMapEntryAdd(\"parking:lane:both\", \"parallel\"),\n- StringMapEntryAdd(\"parking:lane:both:parallel\", \"half_on_kerb\"),\n- )\n- )\n- }\n-\n- @Test fun `apply parallel parking answer with different positions on sides`() {\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightStreetParking(\n- StreetParkingPositionAndOrientation(ParkingOrientation.PARALLEL, ParkingPosition.ON_STREET),\n- StreetParkingPositionAndOrientation(ParkingOrientation.PARALLEL, ParkingPosition.HALF_ON_KERB)\n- ),\n- arrayOf(\n- StringMapEntryAdd(\"parking:lane:both\", \"parallel\"),\n- StringMapEntryAdd(\"parking:lane:left:parallel\", \"on_street\"),\n- StringMapEntryAdd(\"parking:lane:right:parallel\", \"half_on_kerb\"),\n- )\n- )\n- }\n-\n- @Test fun `apply street side parking answer with different orientations on sides`() {\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightStreetParking(\n- StreetParkingPositionAndOrientation(ParkingOrientation.PERPENDICULAR, ParkingPosition.STREET_SIDE),\n- StreetParkingPositionAndOrientation(ParkingOrientation.PARALLEL, ParkingPosition.STREET_SIDE)\n- ),\n- arrayOf(\n- StringMapEntryAdd(\"parking:lane:left\", \"perpendicular\"),\n- StringMapEntryAdd(\"parking:lane:right\", \"parallel\"),\n- StringMapEntryAdd(\"parking:lane:left:perpendicular\", \"street_side\"),\n- StringMapEntryAdd(\"parking:lane:right:parallel\", \"street_side\"),\n- )\n- )\n- }\n-\n- @Test fun `apply different parking positions and orientations on sides`() {\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightStreetParking(\n- StreetParkingPositionAndOrientation(ParkingOrientation.DIAGONAL, ParkingPosition.STREET_SIDE),\n- StreetParkingPositionAndOrientation(ParkingOrientation.PERPENDICULAR, ParkingPosition.PAINTED_AREA_ONLY)\n- ),\n- arrayOf(\n- StringMapEntryAdd(\"parking:lane:left\", \"diagonal\"),\n- StringMapEntryAdd(\"parking:lane:left:diagonal\", \"street_side\"),\n- StringMapEntryAdd(\"parking:lane:right\", \"perpendicular\"),\n- StringMapEntryAdd(\"parking:lane:right:perpendicular\", \"painted_area_only\"),\n- )\n- )\n- }\n-\n- @Test fun `applying one side combines with previous tagging of the other side to both-tag`() {\n- verifyAnswer(\n- mapOf(\"parking:lane:left\" to \"separate\"),\n- LeftAndRightStreetParking(null, StreetParkingSeparate),\n- arrayOf(\n- StringMapEntryAdd(\"parking:lane:both\", \"separate\"),\n- StringMapEntryDelete(\"parking:lane:left\", \"separate\"),\n- )\n- )\n- verifyAnswer(\n- mapOf(\"parking:lane:right\" to \"separate\"),\n- LeftAndRightStreetParking(StreetParkingSeparate, null),\n- arrayOf(\n- StringMapEntryAdd(\"parking:lane:both\", \"separate\"),\n- StringMapEntryDelete(\"parking:lane:right\", \"separate\"),\n- )\n- )\n- }\n-\n- @Test fun `changing one side replaces both-tag`() {\n- verifyAnswer(\n- mapOf(\"parking:lane:both\" to \"separate\"),\n- LeftAndRightStreetParking(null, NoStreetParking),\n- arrayOf(\n- StringMapEntryAdd(\"parking:lane:left\", \"separate\"),\n- StringMapEntryAdd(\"parking:lane:right\", \"no\"),\n- StringMapEntryDelete(\"parking:lane:both\", \"separate\"),\n- )\n- )\n- }\n-\n- @Test fun `updates check date`() {\n- verifyAnswer(\n- mapOf(\"parking:lane:both\" to \"no\"),\n- LeftAndRightStreetParking(NoStreetParking, NoStreetParking),\n- arrayOf(\n- StringMapEntryModify(\"parking:lane:both\", \"no\", \"no\"),\n- StringMapEntryAdd(\"check_date:parking:lane\", nowAsCheckDateString())\n- )\n- )\n- verifyAnswer(\n- mapOf(\n- \"parking:lane:both\" to \"parallel\",\n- \"parking:lane:left:parallel\" to \"half_on_kerb\",\n- \"parking:lane:right:parallel\" to \"on_kerb\",\n- \"parking:condition:left\" to \"free\",\n- ),\n- LeftAndRightStreetParking(\n- StreetParkingPositionAndOrientation(ParkingOrientation.PARALLEL, ParkingPosition.HALF_ON_KERB),\n- StreetParkingPositionAndOrientation(ParkingOrientation.PARALLEL, ParkingPosition.ON_KERB)\n- ),\n- arrayOf(\n- StringMapEntryModify(\"parking:lane:both\", \"parallel\", \"parallel\"),\n- StringMapEntryModify(\"parking:lane:left:parallel\", \"half_on_kerb\", \"half_on_kerb\"),\n- StringMapEntryModify(\"parking:lane:right:parallel\", \"on_kerb\", \"on_kerb\"),\n- StringMapEntryAdd(\"check_date:parking:lane\", nowAsCheckDateString())\n- )\n- )\n- }\n-\n- @Test fun `clean up previous tagging when applying value for each side`() {\n- verifyAnswer(\n- mapOf(\n- \"parking:lane:both\" to \"parallel\",\n- \"parking:lane:left:parallel\" to \"half_on_kerb\",\n- \"parking:lane:right:parallel\" to \"on_kerb\",\n- ),\n- LeftAndRightStreetParking(\n- StreetParkingPositionAndOrientation(ParkingOrientation.PARALLEL, ParkingPosition.ON_STREET),\n- StreetParkingPositionAndOrientation(ParkingOrientation.DIAGONAL, ParkingPosition.ON_STREET)\n- ),\n- arrayOf(\n- StringMapEntryDelete(\"parking:lane:both\", \"parallel\"),\n- StringMapEntryAdd(\"parking:lane:left\", \"parallel\"),\n- StringMapEntryAdd(\"parking:lane:right\", \"diagonal\"),\n- StringMapEntryModify(\"parking:lane:left:parallel\", \"half_on_kerb\", \"on_street\"),\n- StringMapEntryDelete(\"parking:lane:right:parallel\", \"on_kerb\"),\n- StringMapEntryAdd(\"parking:lane:right:diagonal\", \"on_street\"),\n- )\n- )\n- }\n-\n- @Test fun `tag only on one side`() {\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightStreetParking(\n- null,\n- StreetParkingPositionAndOrientation(ParkingOrientation.DIAGONAL, ParkingPosition.ON_STREET)\n- ),\n- arrayOf(\n- StringMapEntryAdd(\"parking:lane:right\", \"diagonal\"),\n- StringMapEntryAdd(\"parking:lane:right:diagonal\", \"on_street\")\n- )\n- )\n- verifyAnswer(\n- mapOf(),\n- LeftAndRightStreetParking(\n- StreetParkingPositionAndOrientation(ParkingOrientation.DIAGONAL, ParkingPosition.ON_STREET),\n- null\n- ),\n- arrayOf(\n- StringMapEntryAdd(\"parking:lane:left\", \"diagonal\"),\n- StringMapEntryAdd(\"parking:lane:left:diagonal\", \"on_street\")\n- )\n- )\n- }\n-\n- @Test(expected = IllegalArgumentException::class)\n- fun `applying incomplete left throws exception`() {\n- LeftAndRightStreetParking(IncompleteStreetParking, null).applyTo(StringMapChangesBuilder(mapOf()))\n- }\n-\n- @Test(expected = IllegalArgumentException::class)\n- fun `applying incomplete right throws exception`() {\n- LeftAndRightStreetParking(null, IncompleteStreetParking).applyTo(StringMapChangesBuilder(mapOf()))\n- }\n-\n- @Test(expected = IllegalArgumentException::class)\n- fun `applying unknown left throws exception`() {\n- LeftAndRightStreetParking(UnknownStreetParking, null).applyTo(StringMapChangesBuilder(mapOf()))\n- }\n-\n- @Test(expected = IllegalArgumentException::class)\n- fun `applying unknown right throws exception`() {\n- LeftAndRightStreetParking(null, UnknownStreetParking).applyTo(StringMapChangesBuilder(mapOf()))\n- }\n-\n @Test fun validOrNullValues() {\n for (invalidParking in listOf(IncompleteStreetParking, UnknownStreetParking)) {\n assertEquals(\n@@ -253,10 +21,3 @@ class StreetParkingTest {\n }\n }\n }\n-\n-private fun verifyAnswer(tags: Map, answer: LeftAndRightStreetParking, expectedChanges: Array) {\n- val cb = StringMapChangesBuilder(tags)\n- answer.applyTo(cb)\n- val changes = cb.create().changes\n- Assertions.assertThat(changes).containsExactlyInAnyOrder(*expectedChanges)\n-}\ndiff --git a/app/src/test/java/de/westnordost/streetcomplete/quests/OsmElementQuestType.kt b/app/src/test/java/de/westnordost/streetcomplete/quests/OsmElementQuestType.kt\nindex 380c7ef6067..6342f49edde 100644\n--- a/app/src/test/java/de/westnordost/streetcomplete/quests/OsmElementQuestType.kt\n+++ b/app/src/test/java/de/westnordost/streetcomplete/quests/OsmElementQuestType.kt\n@@ -2,12 +2,14 @@ package de.westnordost.streetcomplete.quests\n \n import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapChangesBuilder\n import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryChange\n+import de.westnordost.streetcomplete.data.osm.geometry.ElementPointGeometry\n+import de.westnordost.streetcomplete.data.osm.mapdata.LatLon\n import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType\n import org.assertj.core.api.Assertions.assertThat\n \n fun OsmElementQuestType.verifyAnswer(tags: Map, answer: T, vararg expectedChanges: StringMapEntryChange) {\n val cb = StringMapChangesBuilder(tags)\n- this.applyAnswerTo(answer, cb, 0)\n+ this.applyAnswerTo(answer, cb, ElementPointGeometry(LatLon(0.0, 0.0)), 0)\n val changes = cb.create().changes\n assertThat(changes).containsExactlyInAnyOrder(*expectedChanges)\n }\ndiff --git a/app/src/test/java/de/westnordost/streetcomplete/quests/cycleway/AddCyclewayTest.kt b/app/src/test/java/de/westnordost/streetcomplete/quests/cycleway/AddCyclewayTest.kt\nindex a1dfb7ba841..40b8f7f54f1 100644\n--- a/app/src/test/java/de/westnordost/streetcomplete/quests/cycleway/AddCyclewayTest.kt\n+++ b/app/src/test/java/de/westnordost/streetcomplete/quests/cycleway/AddCyclewayTest.kt\n@@ -4,26 +4,8 @@ import de.westnordost.countryboundaries.CountryBoundaries\n import de.westnordost.streetcomplete.data.meta.CountryInfo\n import de.westnordost.streetcomplete.data.meta.CountryInfos\n import de.westnordost.streetcomplete.data.meta.getByLocation\n-import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAdd\n-import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDelete\n-import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify\n import de.westnordost.streetcomplete.data.osm.geometry.ElementPolylinesGeometry\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.ADVISORY_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.BUSWAY\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.DUAL_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.DUAL_TRACK\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.EXCLUSIVE_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.NONE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.PICTOGRAMS\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.SEPARATE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.SIDEWALK_EXPLICIT\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.SUGGESTION_LANE\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.TRACK\n-import de.westnordost.streetcomplete.osm.cycleway.Cycleway.UNSPECIFIED_LANE\n-import de.westnordost.streetcomplete.osm.nowAsCheckDateString\n import de.westnordost.streetcomplete.quests.TestMapDataWithGeometry\n-import de.westnordost.streetcomplete.quests.verifyAnswer\n import de.westnordost.streetcomplete.testutils.mock\n import de.westnordost.streetcomplete.testutils.on\n import de.westnordost.streetcomplete.testutils.p\n@@ -223,8 +205,8 @@ class AddCyclewayTest {\n @Test fun `not applicable to road with cycleway that is tagged with an unknown + invalid value`() {\n val way = way(1L, listOf(1, 2, 3), mapOf(\n \"highway\" to \"primary\",\n- \"cycleway:left\" to \"yes\",\n- \"cycleway:right\" to \"doorzone\",\n+ \"cycleway:left\" to \"yes\", // invalid\n+ \"cycleway:right\" to \"doorzone2\", // unknown\n ))\n val mapData = TestMapDataWithGeometry(listOf(way))\n \n@@ -284,344 +266,4 @@ class AddCyclewayTest {\n // because we don't know if we are in Belgium\n assertNull(questType.isApplicableTo(way))\n }\n-\n- @Test fun `apply cycleway lane answer`() {\n- questType.verifyAnswer(\n- bothSidesAnswer(EXCLUSIVE_LANE),\n- StringMapEntryAdd(\"cycleway:both\", \"lane\"),\n- StringMapEntryAdd(\"cycleway:both:lane\", \"exclusive\")\n- )\n- }\n-\n- @Test fun `apply advisory lane answer`() {\n- questType.verifyAnswer(\n- bothSidesAnswer(ADVISORY_LANE),\n- StringMapEntryAdd(\"cycleway:both\", \"lane\"),\n- StringMapEntryAdd(\"cycleway:both:lane\", \"advisory\")\n- )\n- }\n-\n- @Test fun `apply cycleway track answer`() {\n- questType.verifyAnswer(\n- bothSidesAnswer(TRACK),\n- StringMapEntryAdd(\"cycleway:both\", \"track\")\n- )\n- }\n-\n- @Test fun `apply unspecified cycle lane answer`() {\n- questType.verifyAnswer(\n- bothSidesAnswer(UNSPECIFIED_LANE),\n- StringMapEntryAdd(\"cycleway:both\", \"lane\")\n- )\n- }\n-\n- @Test fun `apply bus lane answer`() {\n- questType.verifyAnswer(\n- bothSidesAnswer(BUSWAY),\n- StringMapEntryAdd(\"cycleway:both\", \"share_busway\")\n- )\n- }\n-\n- @Test fun `apply pictogram lane answer`() {\n- questType.verifyAnswer(\n- bothSidesAnswer(PICTOGRAMS),\n- StringMapEntryAdd(\"cycleway:both\", \"shared_lane\"),\n- StringMapEntryAdd(\"cycleway:both:lane\", \"pictogram\")\n- )\n- }\n-\n- @Test fun `apply suggestion lane answer`() {\n- questType.verifyAnswer(\n- bothSidesAnswer(PICTOGRAMS),\n- StringMapEntryAdd(\"cycleway:both\", \"shared_lane\"),\n- StringMapEntryAdd(\"cycleway:both:lane\", \"pictogram\")\n- )\n- }\n-\n- @Test fun `apply no cycleway answer`() {\n- questType.verifyAnswer(\n- bothSidesAnswer(NONE),\n- StringMapEntryAdd(\"cycleway:both\", \"no\")\n- )\n- }\n-\n- @Test fun `apply cycleway on sidewalk answer`() {\n- questType.verifyAnswer(\n- bothSidesAnswer(SIDEWALK_EXPLICIT),\n- StringMapEntryAdd(\"cycleway:both\", \"track\"),\n- StringMapEntryAdd(\"sidewalk\", \"both\"),\n- StringMapEntryAdd(\"cycleway:both:segregated\", \"no\")\n- )\n- }\n-\n- @Test fun `apply cycleway on sidewalk answer only on one side`() {\n- questType.verifyAnswer(\n- CyclewayAnswer(CyclewaySide(SIDEWALK_EXPLICIT), CyclewaySide(NONE)),\n- StringMapEntryAdd(\"cycleway:left\", \"track\"),\n- StringMapEntryAdd(\"cycleway:right\", \"no\"),\n- // not this: StringMapEntryAdd(\"sidewalk\", \"both\"),\n- StringMapEntryAdd(\"cycleway:left:segregated\", \"no\")\n- )\n- }\n-\n- private fun bothSidesAnswer(bothSides: Cycleway): CyclewayAnswer {\n- val side = CyclewaySide(bothSides)\n- return CyclewayAnswer(side, side)\n- }\n-\n- @Test fun `apply separate cycleway answer`() {\n- questType.verifyAnswer(\n- bothSidesAnswer(SEPARATE),\n- StringMapEntryAdd(\"cycleway:both\", \"separate\")\n- )\n- }\n-\n- @Test fun `apply dual cycle track answer`() {\n- questType.verifyAnswer(\n- bothSidesAnswer(DUAL_TRACK),\n- StringMapEntryAdd(\"cycleway:both\", \"track\"),\n- StringMapEntryAdd(\"cycleway:both:oneway\", \"no\")\n- )\n- }\n-\n- @Test fun `apply dual cycle lane answer`() {\n- questType.verifyAnswer(\n- bothSidesAnswer(DUAL_LANE),\n- StringMapEntryAdd(\"cycleway:both\", \"lane\"),\n- StringMapEntryAdd(\"cycleway:both:oneway\", \"no\"),\n- StringMapEntryAdd(\"cycleway:both:lane\", \"exclusive\")\n- )\n- }\n-\n- @Test fun `apply answer where left and right side are different`() {\n- questType.verifyAnswer(\n- CyclewayAnswer(CyclewaySide(TRACK), CyclewaySide(NONE)),\n- StringMapEntryAdd(\"cycleway:left\", \"track\"),\n- StringMapEntryAdd(\"cycleway:right\", \"no\")\n- )\n- }\n-\n- @Test fun `apply answer where there exists a cycleway in opposite direction of oneway`() {\n- // this would be a street that has tracks on both sides but is oneway=yes (in countries with\n- // right hand traffic)\n- questType.verifyAnswer(\n- CyclewayAnswer(CyclewaySide(TRACK, -1), CyclewaySide(TRACK), true),\n- StringMapEntryAdd(\"cycleway:left\", \"track\"),\n- StringMapEntryAdd(\"cycleway:left:oneway\", \"-1\"),\n- StringMapEntryAdd(\"cycleway:right\", \"track\"),\n- StringMapEntryAdd(\"oneway:bicycle\", \"no\")\n- )\n- }\n-\n- @Test fun `apply answer where there exists a cycleway in opposite direction of backward oneway`() {\n- // this would be a street that has lanes on both sides but is oneway=-1 (in countries with\n- // right hand traffic)\n- questType.verifyAnswer(\n- CyclewayAnswer(CyclewaySide(TRACK, +1), CyclewaySide(TRACK), true),\n- StringMapEntryAdd(\"cycleway:left\", \"track\"),\n- StringMapEntryAdd(\"cycleway:left:oneway\", \"yes\"),\n- StringMapEntryAdd(\"cycleway:right\", \"track\"),\n- StringMapEntryAdd(\"oneway:bicycle\", \"no\")\n- )\n- }\n-\n- @Test fun `apply answer for both deletes any previous answers given for left, right, general`() {\n- questType.verifyAnswer(\n- mapOf(\n- \"cycleway:left\" to \"lane\",\n- \"cycleway:left:lane\" to \"advisory\",\n- \"cycleway:left:segregated\" to \"maybe\",\n- \"cycleway:left:oneway\" to \"yes\",\n- \"sidewalk:left:bicycle\" to \"yes\",\n- \"cycleway:right\" to \"shared_lane\",\n- \"cycleway:right:lane\" to \"pictogram\",\n- \"cycleway:right:segregated\" to \"definitely\",\n- \"cycleway:right:oneway\" to \"yes\",\n- \"sidewalk:right:bicycle\" to \"yes\",\n- \"cycleway\" to \"shared_lane\",\n- \"cycleway:lane\" to \"pictogram\",\n- \"cycleway:segregated\" to \"definitely\",\n- \"cycleway:oneway\" to \"yes\",\n- \"sidewalk:bicycle\" to \"yes\"\n- ),\n- bothSidesAnswer(TRACK),\n- StringMapEntryAdd(\"cycleway:both\", \"track\"),\n- StringMapEntryDelete(\"cycleway:left\", \"lane\"),\n- StringMapEntryDelete(\"cycleway:left:lane\", \"advisory\"),\n- StringMapEntryDelete(\"cycleway:left:segregated\", \"maybe\"),\n- StringMapEntryDelete(\"cycleway:left:oneway\", \"yes\"),\n- StringMapEntryDelete(\"sidewalk:left:bicycle\", \"yes\"),\n- StringMapEntryDelete(\"cycleway:right\", \"shared_lane\"),\n- StringMapEntryDelete(\"cycleway:right:lane\", \"pictogram\"),\n- StringMapEntryDelete(\"cycleway:right:segregated\", \"definitely\"),\n- StringMapEntryDelete(\"cycleway:right:oneway\", \"yes\"),\n- StringMapEntryDelete(\"sidewalk:right:bicycle\", \"yes\"),\n- StringMapEntryDelete(\"cycleway\", \"shared_lane\"),\n- StringMapEntryDelete(\"cycleway:lane\", \"pictogram\"),\n- StringMapEntryDelete(\"cycleway:segregated\", \"definitely\"),\n- StringMapEntryDelete(\"cycleway:oneway\", \"yes\"),\n- StringMapEntryDelete(\"sidewalk:bicycle\", \"yes\")\n- )\n- }\n-\n- @Test fun `apply answer for left, right deletes any previous answers given for both, general`() {\n- questType.verifyAnswer(\n- mapOf(\n- \"cycleway:both\" to \"shared_lane\",\n- \"cycleway:both:lane\" to \"pictogram\",\n- \"cycleway:both:segregated\" to \"definitely\",\n- \"cycleway:both:oneway\" to \"yes\",\n- \"sidewalk:both:bicycle\" to \"yes\",\n- \"cycleway\" to \"shared_lane\",\n- \"cycleway:lane\" to \"pictogram\",\n- \"cycleway:segregated\" to \"definitely\",\n- \"cycleway:oneway\" to \"yes\",\n- \"sidewalk:bicycle\" to \"yes\"\n- ),\n- CyclewayAnswer(CyclewaySide(TRACK), CyclewaySide(NONE), false),\n- StringMapEntryAdd(\"cycleway:left\", \"track\"),\n- StringMapEntryAdd(\"cycleway:right\", \"no\"),\n- StringMapEntryDelete(\"cycleway:both\", \"shared_lane\"),\n- StringMapEntryDelete(\"cycleway:both:lane\", \"pictogram\"),\n- StringMapEntryDelete(\"cycleway:both:segregated\", \"definitely\"),\n- StringMapEntryDelete(\"cycleway:both:oneway\", \"yes\"),\n- StringMapEntryDelete(\"sidewalk:both:bicycle\", \"yes\"),\n- StringMapEntryDelete(\"cycleway\", \"shared_lane\"),\n- StringMapEntryDelete(\"cycleway:lane\", \"pictogram\"),\n- StringMapEntryDelete(\"cycleway:segregated\", \"definitely\"),\n- StringMapEntryDelete(\"cycleway:oneway\", \"yes\"),\n- StringMapEntryDelete(\"sidewalk:bicycle\", \"yes\")\n- )\n- }\n-\n- @Test fun `deletes lane subkey when new answer is not a lane`() {\n- questType.verifyAnswer(\n- mapOf(\n- \"cycleway:both\" to \"lane\",\n- \"cycleway:both:lane\" to \"exclusive\"\n- ),\n- bothSidesAnswer(TRACK),\n- StringMapEntryModify(\"cycleway:both\", \"lane\", \"track\"),\n- StringMapEntryDelete(\"cycleway:both:lane\", \"exclusive\")\n- )\n- }\n-\n- @Test fun `deletes shared lane subkey when new answer is not a lane`() {\n- questType.verifyAnswer(\n- mapOf(\n- \"cycleway:both\" to \"shared_lane\",\n- \"cycleway:both:lane\" to \"pictogram\"\n- ),\n- bothSidesAnswer(TRACK),\n- StringMapEntryModify(\"cycleway:both\", \"shared_lane\", \"track\"),\n- StringMapEntryDelete(\"cycleway:both:lane\", \"pictogram\")\n- )\n- }\n-\n- @Test fun `deletes dual lane tag when new answer is not a dual lane`() {\n- questType.verifyAnswer(\n- mapOf(\n- \"cycleway:both\" to \"lane\",\n- \"cycleway:both:lane\" to \"exclusive\",\n- \"cycleway:both:oneway\" to \"no\"\n- ),\n- bothSidesAnswer(EXCLUSIVE_LANE),\n- StringMapEntryModify(\"cycleway:both\", \"lane\", \"lane\"),\n- StringMapEntryModify(\"cycleway:both:lane\", \"exclusive\", \"exclusive\"),\n- StringMapEntryDelete(\"cycleway:both:oneway\", \"no\")\n- )\n- }\n-\n- @Test fun `modifies lane subkey when new answer is different lane`() {\n- questType.verifyAnswer(\n- mapOf(\n- \"cycleway:both\" to \"shared_lane\",\n- \"cycleway:both:lane\" to \"pictogram\"\n- ),\n- bothSidesAnswer(SUGGESTION_LANE),\n- StringMapEntryModify(\"cycleway:both\", \"shared_lane\", \"shared_lane\"),\n- StringMapEntryModify(\"cycleway:both:lane\", \"pictogram\", \"advisory\")\n- )\n- }\n-\n- @Test fun `deletes dual track tag when new answer is not a dual track`() {\n- questType.verifyAnswer(\n- mapOf(\n- \"cycleway:both\" to \"track\",\n- \"cycleway:both:oneway\" to \"no\"\n- ),\n- bothSidesAnswer(TRACK),\n- StringMapEntryModify(\"cycleway:both\", \"track\", \"track\"),\n- StringMapEntryDelete(\"cycleway:both:oneway\", \"no\")\n- )\n- }\n-\n- @Test fun `modify segregated tag if new answer is now segregated`() {\n- questType.verifyAnswer(\n- mapOf(\n- \"cycleway:both\" to \"track\",\n- \"cycleway:both:segregated\" to \"no\"\n- ),\n- bothSidesAnswer(TRACK),\n- StringMapEntryModify(\"cycleway:both\", \"track\", \"track\"),\n- StringMapEntryModify(\"cycleway:both:segregated\", \"no\", \"yes\")\n- )\n- }\n-\n- @Test fun `modify segregated tag if new answer is now not segregated`() {\n- questType.verifyAnswer(\n- mapOf(\n- \"sidewalk\" to \"both\",\n- \"cycleway:both\" to \"track\",\n- \"cycleway:both:segregated\" to \"yes\"\n- ),\n- bothSidesAnswer(SIDEWALK_EXPLICIT),\n- StringMapEntryModify(\"cycleway:both\", \"track\", \"track\"),\n- StringMapEntryModify(\"sidewalk\", \"both\", \"both\"),\n- StringMapEntryModify(\"cycleway:both:segregated\", \"yes\", \"no\")\n- )\n- }\n-\n- @Test fun `delete segregated tag if new answer is not a track or on sidewalk`() {\n- questType.verifyAnswer(\n- mapOf(\n- \"cycleway:both\" to \"track\",\n- \"cycleway:both:segregated\" to \"no\"\n- ),\n- bothSidesAnswer(BUSWAY),\n- StringMapEntryModify(\"cycleway:both\", \"track\", \"share_busway\"),\n- StringMapEntryDelete(\"cycleway:both:segregated\", \"no\")\n- )\n- }\n-\n- @Test fun `sets check date if nothing changed`() {\n- questType.verifyAnswer(\n- mapOf(\"cycleway:both\" to \"track\"),\n- bothSidesAnswer(TRACK),\n- StringMapEntryModify(\"cycleway:both\", \"track\", \"track\"),\n- StringMapEntryAdd(\"check_date:cycleway\", nowAsCheckDateString())\n- )\n- }\n-\n- @Test fun `updates check date if nothing changed`() {\n- questType.verifyAnswer(\n- mapOf(\"cycleway:both\" to \"track\", \"check_date:cycleway\" to \"2000-11-11\"),\n- bothSidesAnswer(TRACK),\n- StringMapEntryModify(\"cycleway:both\", \"track\", \"track\"),\n- StringMapEntryModify(\"check_date:cycleway\", \"2000-11-11\", nowAsCheckDateString())\n- )\n- }\n-\n- @Test fun `remove oneway bicycle no tag if road is also a oneway for bicycles now`() {\n- questType.verifyAnswer(\n- mapOf(\n- \"cycleway:both\" to \"no\",\n- \"oneway\" to \"yes\",\n- \"oneway:bicycle\" to \"no\"\n- ),\n- bothSidesAnswer(NONE),\n- StringMapEntryModify(\"cycleway:both\", \"no\", \"no\"),\n- StringMapEntryDelete(\"oneway:bicycle\", \"no\")\n- )\n- }\n }\ndiff --git a/app/src/test/java/de/westnordost/streetcomplete/quests/sidewalk/AddSidewalkTest.kt b/app/src/test/java/de/westnordost/streetcomplete/quests/sidewalk/AddSidewalkTest.kt\nindex 3ed12bde718..30a1f1121ca 100644\n--- a/app/src/test/java/de/westnordost/streetcomplete/quests/sidewalk/AddSidewalkTest.kt\n+++ b/app/src/test/java/de/westnordost/streetcomplete/quests/sidewalk/AddSidewalkTest.kt\n@@ -191,68 +191,4 @@ class AddSidewalkTest {\n assertEquals(1, questType.getApplicableElements(mapData).toList().size)\n assertNull(questType.isApplicableTo(road))\n }\n-\n- @Test fun `apply no sidewalk answer`() {\n- questType.verifyAnswer(\n- LeftAndRightSidewalk(left = NO, right = NO),\n- StringMapEntryAdd(\"sidewalk\", \"no\")\n- )\n- }\n-\n- @Test fun `apply sidewalk left answer`() {\n- questType.verifyAnswer(\n- LeftAndRightSidewalk(left = YES, right = NO),\n- StringMapEntryAdd(\"sidewalk\", \"left\")\n- )\n- }\n-\n- @Test fun `apply sidewalk right answer`() {\n- questType.verifyAnswer(\n- LeftAndRightSidewalk(left = NO, right = YES),\n- StringMapEntryAdd(\"sidewalk\", \"right\")\n- )\n- }\n-\n- @Test fun `apply sidewalk on both sides answer`() {\n- questType.verifyAnswer(\n- LeftAndRightSidewalk(left = YES, right = YES),\n- StringMapEntryAdd(\"sidewalk\", \"both\")\n- )\n- }\n-\n- @Test fun `apply separate sidewalk answer`() {\n- questType.verifyAnswer(\n- LeftAndRightSidewalk(left = SEPARATE, right = SEPARATE),\n- StringMapEntryAdd(\"sidewalk\", \"separate\")\n- )\n- }\n-\n- @Test fun `apply separate sidewalk on one side answer`() {\n- questType.verifyAnswer(\n- LeftAndRightSidewalk(left = YES, right = SEPARATE),\n- StringMapEntryAdd(\"sidewalk:left\", \"yes\"),\n- StringMapEntryAdd(\"sidewalk:right\", \"separate\"),\n- )\n-\n- questType.verifyAnswer(\n- LeftAndRightSidewalk(left = SEPARATE, right = NO),\n- StringMapEntryAdd(\"sidewalk:left\", \"separate\"),\n- StringMapEntryAdd(\"sidewalk:right\", \"no\"),\n- )\n- }\n-\n- @Test fun `replace incomplete sidewalk tagging`() {\n- questType.verifyAnswer(\n- mapOf(\"sidewalk:left\" to \"yes\"),\n- LeftAndRightSidewalk(left = YES, right = NO),\n- StringMapEntryAdd(\"sidewalk\", \"left\"),\n- StringMapEntryDelete(\"sidewalk:left\", \"yes\")\n- )\n- questType.verifyAnswer(\n- mapOf(\"sidewalk:left\" to \"yes\"),\n- LeftAndRightSidewalk(left = YES, right = SEPARATE),\n- StringMapEntryModify(\"sidewalk:left\", \"yes\", \"yes\"),\n- StringMapEntryAdd(\"sidewalk:right\", \"separate\"),\n- )\n- }\n }\n", "n2p_tests": {"de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply separate cycleway answer": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest.applicable to road with cycleway that is far away enough": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.busway on both side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.busway on right side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest.not applicable to road with ambiguous + unknown cycleway value": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite unspecified lane (reversed + left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.applying one side combines with previous tagging of the other side to both-tag": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite unspecified dual lane (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayKtTest.forward oneway is oneway for cyclists": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.sidewalk.SidewalkCreatorKtTest.apply conflates values": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive dual lane in oneway (reversed, left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified shared lane on left side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply for one side does not touch the other side even if it is invalid": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.advisory lane on left side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.sidewalk.SidewalkCreatorKtTest.apply nothing applies nothing": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.busway in oneway (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest.applicable to road with cycleway that is tagged with an invalid value": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.shoulder on left side": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none but oneway that isn't a oneway for cyclists": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.track on left side for left-hand-traffic that is not in flow direction": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.suggestion lane": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown shared lane on left side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayKtTest.oneway is no oneway for cyclists when any cycleway goes in contra-flow direction": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.advisory lane on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.dual track in oneway (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown cycle lane on left side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive lane in oneway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply non-designated re-tags cycleway and adds foot=yes if foot was not yes before": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite track": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite exclusive lane (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive dual lane on right side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified shared lane on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.applying incomplete right throws exception": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply cycleway in contraflow of oneway adds cycleway direction": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified shared lane on right side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply segregated removes sidewalk tags": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive lane on right side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.explicitly on sidewalk on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply allowed re-tags cycleway to footway if foot is designated": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.dual track in oneway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply non-designated": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.separate on left side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.dual track on right side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayParserKtTest.parse no cycleway at all": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified shared lane": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown cycle lane on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply pictogram lane answer": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.shoulder": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayParserKtTest.parse no bicyclists allowed on path": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.sidewalk.SidewalkCreatorKtTest.apply for one side does not change values for the other side even if it was defined for both sides before and invalid": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive dual lane on left side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.pictograms in oneway (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.sidewalk.SidewalkCreatorKtTest.applying invalid right throws exception": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.sidewalk.AddSidewalkTest.not applicable to road with sidewalk": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified lane in oneway (reversed, left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply answer where there exists a cycleway in opposite direction of backward oneway": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified lane on right side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.explicitly on sidewalk on both side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply updates oneway not for cyclists": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite exclusive dual lane (reversed + left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.track right": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.OnewayKtTest.not oneway for cyclists (modern tagging)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.busway in oneway (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified dual lane on right side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayParserKtTest.parse cyclists on exclusive path": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.pictograms on right side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayParserKtTest.parse cycleway with sidewalk": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest.applicable to small road with cycleway that is far away enough": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified dual lane on left side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply for one side does not change values for the other side even if it was defined for both sides before and invalid": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown cycle lane in oneway (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none on left side but oneway that isn't a oneway for cyclists (reversed + left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.suggestion lane in oneway (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown shared lane in oneway (reversed, left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown in oneway (reversed, left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified dual lane on both side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive lane": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.track left opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply dual cycle lane answer": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.sidewalk.SidewalkCreatorKtTest.apply does not conflate values non-yes-no-values": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.dual track on right side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayKtTest.not a oneway is no oneway for cyclists": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none on both sides but oneway that isn't a oneway for cyclists (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayKtTest.was no oneway for cyclists but now it is": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified lane in oneway (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.applying incomplete left throws exception": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.advisory lane on right side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.dual track on left side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.modifies lane subkey when new answer is different lane": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.applying invalid right throws exception": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply non-segregated": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite track (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply suggestion lane answer": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.dual track on left side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.invalid": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.sidewalk.SidewalkCreatorKtTest.applying invalid left throws exception": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.explicitly on sidewalk in oneway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none on right side but oneway that isn't a oneway for cyclists": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.sidewalk.AddSidewalkTest.applicable to motorways marked as legally accessible to pedestrians": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown cycle lane in oneway (reversed, left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite advisory lane (reversed + left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown in oneway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite dual track": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none but oneway that isn't a oneway for cyclists (reversed + left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.updates check date": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.shoulder on right side": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.suggestion lane in oneway (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none on right side but oneway that isn't a oneway for cyclists (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.track in oneway (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.shoulder in oneway": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.sidewalk.SidewalkCreatorKtTest.apply for one side does not touch the other side": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown cycle lane on right side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.OnewayKtTest.not oneway for cyclists (old tagging)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none on left side but oneway that isn't a oneway for cyclists (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.track": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.deletes shared lane subkey when new answer is not a lane": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.sidewalk.SidewalkCreatorKtTest.clean up previous tagging when applying value for each side": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.applying unknown right throws exception": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.modify segregated tag if new answer is now not segregated": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.right opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified dual lane": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply unspecified cycle lane answer does not remove previous specific lane answer": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply cycleway track answer updates segregated key": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown shared lane in oneway (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply dual cycle track answer": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.advisory lane in oneway (reversed, left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayKtTest.reverse oneway is oneway for cyclists": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest.not applicable to road with cycleway that is not old enough": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.sidewalk.AddSidewalkTest.applicable to road with footway that is far away enough": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite dual track (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply none re-tags cycleway and adds foot=yes if foot was not yes before": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.don't parse opposite-tagging on non oneways": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.explicitly on sidewalk in oneway (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply unspecified cycle lane answer": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply none re-tags cycleway to footway if foot is designated": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown cycle lane": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite unspecified lane (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.dual track in oneway (reversed, left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.tag only on one side": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.modifies oneway tag tag when new answer is not a dual lane": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.shoulder on both sides": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.pictograms on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.sidewalk.SidewalkCreatorKtTest.apply value when each side differs": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.dual track in oneway (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite exclusive dual lane (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.modifies oneway tag when new answer is not a dual track": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified lane in oneway (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.busway on right side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply none removes sidewalk and segregated tags": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.fall back to bicycle=use_sidepath with forward or backward": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.advisory lane on left side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite track (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.explicitly on sidewalk on right side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.fall back to bicycle=use_sidepath": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown shared lane in oneway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply cycleway on sidewalk answer on one side only": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.explicitly on sidewalk in oneway (reversed, left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive dual lane in oneway (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayParserKtTest.parse bicyclists allowed on path": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite exclusive lane (reversed + left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.track left": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.advisory lane in oneway (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply nothing": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite unspecified dual lane (reversed + left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.explicitly on sidewalk on left side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.sidewalk.SidewalkCreatorKtTest.apply value only for one side": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.remove oneway bicycle no tag if road is also a oneway for bicycles now": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply advisory lane answer": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest.applicable to road with cycleway that is old enough": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.pictograms in oneway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.apply for one side does not change values for the other side even if it was defined for both sides before and invalid": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply dual cycle track answer in oneway": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply exclusive with sidewalk does not touch sidewalk tags if a sidewalk is already tagged": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown on left side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified lane in oneway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.advisory lane on right side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified lane on both side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.explicitly on sidewalk on left side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none on right side but oneway that isn't a oneway for cyclists (reversed + left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest.applicable to road with ambiguous cycle lane not in Belgium": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.explicitly on sidewalk on right side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply cycleway on sidewalk answer": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply allowed re-tags cycleway and adds foot=yes if foot was not yes before": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown shared lane": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply exclusive": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply segregated": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.deletes lane subkey when new answer is not a lane": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.sidewalk.SidewalkCreatorKtTest.apply for one side does not touch the other side even if it is invalid": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.track on right side that is not in flow direction": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.updates check date if nothing changed": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified shared lane in oneway (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite (reversed + left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive lane on left side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.advisory lane in oneway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply answer where left and right side are different": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.explicitly on sidewalk in oneway (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.apply for one side does not touch the other side even if it is invalid": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply none": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown in oneway (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.apply separate parking answer": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply conflates values": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.sidewalk.AddSidewalkTest.not applicable to road with nearby footway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite advisory lane (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.fixed directions": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive dual lane on right side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.right opposite (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply non-segregated removes sidewalk tags": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite busway (reversed + left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite unspecified lane": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none on left side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown cycle lane in oneway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.default directions": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite busway (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.apply parallel parking answer with different positions on sides": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.busway on left side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.clean up previous tagging when applying value for each side": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.suggestion lane on right side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.OnewayKtTest.not oneway for cyclists (old per-side tagging)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none on right side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite exclusive lane (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.busway in oneway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.track on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest.not applicable to road with cycleway=separate": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive lane on right side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.apply different parking positions and orientations on sides": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive lane in oneway (reversed, left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.apply nothing applies nothing": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.busway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply exclusive removes sidewalk and segregated tags": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none on left side but oneway that isn't a oneway for cyclists (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.busway in oneway (reversed, left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.applying unknown left throws exception": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.pictograms in oneway (reversed, left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive dual lane in oneway (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.apply parallel parking answer on both sides": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified lane on left side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.applying invalid left throws exception": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.sidewalk.SidewalkKtTest.validOrNullValues": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.track on left side that is not in contraflow direction": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite track (reversed + left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive dual lane on left side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply for one side does not touch the other side": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply answer where there exists a cycleway in opposite direction of oneway": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.track on right side for left-hand-traffic that is not in contraflow direction": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.track in oneway (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply dual cycle lane answer in oneway": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest.not applicable to road with cycleway that is old enough but has unknown cycleway tagging": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.dual track on both side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.apply for one side does not touch the other side": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest.applicable to road with ambiguous cycleway value": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.suggestion lane in oneway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply non-designated does not change bicycle tag unless it is designated": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.bicycle_boulevard.BicycleBoulevardKtTest.create": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified shared lane in oneway (reversed, left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.separate on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.track in oneway (reversed, left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.delete segregated tag if new answer is not a track or on sidewalk": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive lane on left side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive dual lane on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayKtTest.was no oneway for cyclists and still is": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown in oneway (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.left opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.apply no parking": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.sidewalk.AddSidewalkTest.not applicable to motorways": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified dual lane on right side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite exclusive lane": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.track right opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.suggestion lane on left side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite busway (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified dual lane on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown cycle lane in oneway (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply no cycleway answer": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.street_parking.StreetParkingCreatorKtTest.apply street side parking answer with different orientations on sides": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.bicycle_boulevard.BicycleBoulevardKtTest.apply yes when it was not tagged before": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.bicycle_boulevard.BicycleBoulevardKtTest.apply no": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.pictograms on left side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified lane on right side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.sidewalk.AddSidewalkTest.applicable to motorways marked as legally accessible to pedestrians and with tagged speed limit": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.sidewalk.AddSidewalkTest.applicable to road with invalid sidewalk tagging": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply allowed": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.sidewalk.SidewalkCreatorKtTest.clean up previous tagging": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayKtTest.oneway is no oneway for cyclists when there is a dual track": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.separate on right side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply non-designated re-tags cycleway to footway if foot is designated": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayParserKtTest.parse cyclists on segregated path": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown shared lane in oneway (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply allowed removes sidewalk and segregated tags": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.advisory lane in oneway (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.OnewayKtTest.is in contraflow of oneway": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.do not interpret non-oneway for bicycles as NONE_NO_ONEWAY if the cycleway on the other side is not a oneway": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply no cycleway deletes cycleway direction": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.advisory lane on both side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayKtTest.was oneway for cyclists and still is": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.sidewalk.SidewalkCreatorKtTest.apply simple values": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.sidewalk.AddSidewalkTest.applicable to road with overloaded sidewalk tagging": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified shared lane in oneway (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest.applicable to road with nearby cycleway that is not aligned to the road": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified lane on left side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive lane on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive lane on both side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.busway on left side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none on both sides but oneway that isn't a oneway for cyclists": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest.unspecified cycle lane is not ambiguous in Belgium": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite dual track (reversed + left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.dual track": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none but oneway that isn't a oneway for cyclists (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.modify segregated tag if new answer is now segregated": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.explicitly on sidewalk": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply bus lane answer": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply exclusive with sidewalk removes segregated tags": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest.applicable to road with missing cycleway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.track both opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.bicycle_boulevard.BicycleBoulevardKtTest.apply yes when it was tagged before": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply cycleway track answer": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown shared lane on right side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.sets check date if nothing changed": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite exclusive dual lane": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest.not applicable to non-road": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none on both sides but oneway that isn't a oneway for cyclists (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown shared lane on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive lane in oneway (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayKtTest.oneway is oneway for cyclists when no cycleway goes in contra-flow direction": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.busway on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive dual lane on both side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none on left side but oneway that isn't a oneway for cyclists": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none on both sides but oneway that isn't a oneway for cyclists (reversed + left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite unspecified dual lane (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.sidewalk.AddSidewalkTest.applicable to road with missing sidewalk": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.separate": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.pictograms": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite advisory lane": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply value only for one side": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none on right side but oneway that isn't a oneway for cyclists (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive dual lane in oneway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite exclusive dual lane (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified shared lane in oneway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply non-designated removes sidewalk and segregated tags": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply answer for both deletes any previous answers given for left, right, general": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply cycleway lane answer": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.pictograms in oneway (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite advisory lane (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.left opposite (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.sidewalk.AddSidewalkTest.applicable to road with incomplete sidewalk tagging": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.suggestion lane in oneway (reversed, left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite unspecified lane (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest.not applicable to road with nearby cycleway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.sidewalk.SidewalkCreatorKtTest.updates check date": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.dual track on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.sidewalk.AddSidewalkTest.applicable to road with nearby footway that is not aligned to the road": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.suggestion lane on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified lane": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive lane in oneway (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unknown on right side": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayCreatorKtTest.apply exclusive with sidewalk": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite busway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.track in oneway": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply answer for left, right deletes any previous answers given for both, general": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.advisory lane": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite unspecified dual lane": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.exclusive dual lane": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.cycleway opposite dual track (left hand traffic)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayKtTest.was oneway for cyclists and is not anymore": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.none but oneway that isn't a oneway for cyclists (reversed)": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified dual lane on left side opposite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayParserKtTest.unspecified lane on both sides": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway.CyclewayCreatorKtTest.apply cycleway with non-standard direction adds cycleway direction": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.quests.cycleway.AddCyclewayTest.not applicable to road with cycleway that is tagged with an unknown + invalid value": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "de.westnordost.streetcomplete.osm.cycleway_separate.SeparateCyclewayParserKtTest.parse cyclists on non-segregated path": {"run": "NONE", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "thunderbird__thunderbird-android-5859", "org": "thunderbird", "repo": "thunderbird-android", "number": 5859, "state": "closed", "title": "Be more selective when removing notifications", "body": "- When opening a message for viewing, only the notification for that particular message is removed.\r\n- When displaying the Unified Inbox, notifications for messages in the Unified Inbox are removed.\r\n- When displaying the \"new messages\" list, notifications for all messages in that account are removed.\r\n- When displaying the message list of a single folder, notifications for messages in that folder are removed.\r\n\r\nFixes #1664", "base": {"label": "thunderbird:main", "ref": "main", "sha": "88e823d6859697b85a076d1e3743a094c3d0a7ca"}, "resolved_issues": [{"number": 1664, "title": "Notifications removed", "body": "### Expected behavior\n\nIf there are multiple notifications for mails, the user expands the multiline 'compressed' notification and clicks on one of the mails, this mail should be opened in K-9 and should be removed from the notifications. The other mails should stay in the notifications.\n### Actual behavior\n\nIf I open one mail from the notification bar, K-9 opens this mail but all mails are removed from the notifications.\n### Steps to reproduce\n1. Get multiple new mails (=notifications)\n2. Expand the summarized notification to get all mails\n3. Klick on one mail\n### Environment\n\nK-9 Mail version: 5.111\n\nAndroid version: 7.0 (Nexus 5X)\n\nAccount type (IMAP, POP3, WebDAV/Exchange): IMAP\n"}], "lang": "kotlin", "problem_statement": "Notifications removed\n### Expected behavior\n\nIf there are multiple notifications for mails, the user expands the multiline 'compressed' notification and clicks on one of the mails, this mail should be opened in K-9 and should be removed from the notifications. The other mails should stay in the notifications.\n### Actual behavior\n\nIf I open one mail from the notification bar, K-9 opens this mail but all mails are removed from the notifications.\n### Steps to reproduce\n1. Get multiple new mails (=notifications)\n2. Expand the summarized notification to get all mails\n3. Klick on one mail\n### Environment\n\nK-9 Mail version: 5.111\n\nAndroid version: 7.0 (Nexus 5X)\n\nAccount type (IMAP, POP3, WebDAV/Exchange): IMAP\n\n", "hints": "Possibly this is an enhancement. There is a difference of opinion as to whether notifications should clear:\n- On opening the app\n- On viewing the unified inbox / inbox for that account\n- On viewing the message itself\n\nWe may need a setting for this.\n\nYes, I am totally with you. I also think a setting would be very helpful.\n", "pull_url": "https://github.com/thunderbird/thunderbird-android/pull/5859", "issue_urls": ["https://github.com/thunderbird/thunderbird-android/issues/1664"], "test_command": "./gradlew :app:core:testDebugUnitTest --tests \"com.fsck.k9.notification.NotificationDataStoreTest\" --tests \"com.fsck.k9.notification.NewMailNotificationManagerTest\"", "fix_patch": "diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java\nindex ba4ca011e00..341a4bf038e 100644\n--- a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java\n+++ b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java\n@@ -127,6 +127,7 @@ public class MessagingController {\n private final MemorizingMessagingListener memorizingMessagingListener = new MemorizingMessagingListener();\n private final MessageCountsProvider messageCountsProvider;\n private final DraftOperations draftOperations;\n+ private final NotificationOperations notificationOperations;\n \n \n private MessagingListener checkMailListener = null;\n@@ -166,6 +167,7 @@ public void run() {\n initializeControllerExtensions(controllerExtensions);\n \n draftOperations = new DraftOperations(this, messageStoreManager, saveMessageDataCreator);\n+ notificationOperations = new NotificationOperations(notificationController, preferences, messageStoreManager);\n }\n \n private void initializeControllerExtensions(List controllerExtensions) {\n@@ -2553,9 +2555,9 @@ public void setCheckMailListener(MessagingListener checkMailListener) {\n }\n }\n \n- public void removeNotificationsForAccount(Account account) {\n- put(\"removeNotificationsForAccount\", null, () -> {\n- notificationController.clearNewMailNotifications(account, false);\n+ public void clearNotifications(LocalSearch search) {\n+ put(\"clearNotifications\", null, () -> {\n+ notificationOperations.clearNotifications(search);\n });\n }\n \ndiff --git a/app/core/src/main/java/com/fsck/k9/controller/NotificationOperations.kt b/app/core/src/main/java/com/fsck/k9/controller/NotificationOperations.kt\nnew file mode 100644\nindex 00000000000..8ab0a7f4485\n--- /dev/null\n+++ b/app/core/src/main/java/com/fsck/k9/controller/NotificationOperations.kt\n@@ -0,0 +1,63 @@\n+package com.fsck.k9.controller\n+\n+import com.fsck.k9.Account\n+import com.fsck.k9.Preferences\n+import com.fsck.k9.mailstore.MessageStoreManager\n+import com.fsck.k9.notification.NotificationController\n+import com.fsck.k9.search.LocalSearch\n+import com.fsck.k9.search.isNewMessages\n+import com.fsck.k9.search.isSingleFolder\n+import com.fsck.k9.search.isUnifiedInbox\n+\n+internal class NotificationOperations(\n+ private val notificationController: NotificationController,\n+ private val preferences: Preferences,\n+ private val messageStoreManager: MessageStoreManager\n+) {\n+ fun clearNotifications(search: LocalSearch) {\n+ if (search.isUnifiedInbox) {\n+ clearUnifiedInboxNotifications()\n+ } else if (search.isNewMessages) {\n+ clearAllNotifications()\n+ } else if (search.isSingleFolder) {\n+ val account = search.firstAccount() ?: return\n+ val folderId = search.folderIds.first()\n+ clearNotifications(account, folderId)\n+ } else {\n+ // TODO: Remove notifications when updating the message list. That way we can easily remove only\n+ // notifications for messages that are currently displayed in the list.\n+ }\n+ }\n+\n+ private fun clearUnifiedInboxNotifications() {\n+ for (account in preferences.accounts) {\n+ val messageStore = messageStoreManager.getMessageStore(account)\n+\n+ val folderIds = messageStore.getFolders(excludeLocalOnly = true) { folderDetails ->\n+ if (folderDetails.isIntegrate) folderDetails.id else null\n+ }.filterNotNull().toSet()\n+\n+ if (folderIds.isNotEmpty()) {\n+ notificationController.clearNewMailNotifications(account) { messageReferences ->\n+ messageReferences.filter { messageReference -> messageReference.folderId in folderIds }\n+ }\n+ }\n+ }\n+ }\n+\n+ private fun clearAllNotifications() {\n+ for (account in preferences.accounts) {\n+ notificationController.clearNewMailNotifications(account, clearNewMessageState = false)\n+ }\n+ }\n+\n+ private fun clearNotifications(account: Account, folderId: Long) {\n+ notificationController.clearNewMailNotifications(account) { messageReferences ->\n+ messageReferences.filter { messageReference -> messageReference.folderId == folderId }\n+ }\n+ }\n+\n+ private fun LocalSearch.firstAccount(): Account? {\n+ return preferences.getAccount(accountUuids.first())\n+ }\n+}\ndiff --git a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt\nindex 9040c686aaf..19014486211 100644\n--- a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt\n+++ b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt\n@@ -30,8 +30,16 @@ internal class NewMailNotificationController(\n processNewMailNotificationData(notificationData)\n }\n \n- fun removeNewMailNotification(account: Account, messageReference: MessageReference) {\n- val notificationData = newMailNotificationManager.removeNewMailNotification(account, messageReference)\n+ fun removeNewMailNotifications(\n+ account: Account,\n+ clearNewMessageState: Boolean,\n+ selector: (List) -> List\n+ ) {\n+ val notificationData = newMailNotificationManager.removeNewMailNotifications(\n+ account,\n+ clearNewMessageState,\n+ selector\n+ )\n \n if (notificationData != null) {\n processNewMailNotificationData(notificationData)\ndiff --git a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt\nindex fbdaedc295d..8e1a8c3fe26 100644\n--- a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt\n+++ b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt\n@@ -63,39 +63,36 @@ internal class NewMailNotificationManager(\n )\n }\n \n- fun removeNewMailNotification(account: Account, messageReference: MessageReference): NewMailNotificationData? {\n- val result = notificationRepository.removeNotification(account, messageReference) ?: return null\n+ fun removeNewMailNotifications(\n+ account: Account,\n+ clearNewMessageState: Boolean,\n+ selector: (List) -> List\n+ ): NewMailNotificationData? {\n+ val result = notificationRepository.removeNotifications(account, clearNewMessageState, selector) ?: return null\n \n val cancelNotificationIds = when {\n- result.shouldCancelNotification && result.notificationData.isEmpty() -> {\n- listOf(NotificationIds.getNewMailSummaryNotificationId(account), result.cancelNotificationId)\n- }\n- result.shouldCancelNotification -> {\n- listOf(result.cancelNotificationId)\n+ result.notificationData.isEmpty() -> {\n+ result.cancelNotificationIds + NotificationIds.getNewMailSummaryNotificationId(account)\n }\n else -> {\n- emptyList()\n+ result.cancelNotificationIds\n }\n }\n \n- val singleNotificationDataList = if (result.shouldCreateNotification) {\n- listOf(\n- createSingleNotificationData(\n- account = account,\n- notificationId = result.notificationHolder.notificationId,\n- content = result.notificationHolder.content,\n- timestamp = result.notificationHolder.timestamp,\n- addLockScreenNotification = result.notificationData.isSingleMessageNotification\n- )\n+ val singleNotificationData = result.notificationHolders.map { notificationHolder ->\n+ createSingleNotificationData(\n+ account = account,\n+ notificationId = notificationHolder.notificationId,\n+ content = notificationHolder.content,\n+ timestamp = notificationHolder.timestamp,\n+ addLockScreenNotification = result.notificationData.isSingleMessageNotification\n )\n- } else {\n- emptyList()\n }\n \n return NewMailNotificationData(\n cancelNotificationIds = cancelNotificationIds,\n baseNotificationData = createBaseNotificationData(result.notificationData),\n- singleNotificationData = singleNotificationDataList,\n+ singleNotificationData = singleNotificationData,\n summaryNotificationData = createSummaryNotificationData(result.notificationData, silent = true)\n )\n }\ndiff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt\nindex ddf27daf696..fe0144108e8 100644\n--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt\n+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt\n@@ -65,7 +65,13 @@ class NotificationController internal constructor(\n }\n \n fun removeNewMailNotification(account: Account, messageReference: MessageReference) {\n- newMailNotificationController.removeNewMailNotification(account, messageReference)\n+ newMailNotificationController.removeNewMailNotifications(account, clearNewMessageState = true) {\n+ listOf(messageReference)\n+ }\n+ }\n+\n+ fun clearNewMailNotifications(account: Account, selector: (List) -> List) {\n+ newMailNotificationController.removeNewMailNotifications(account, clearNewMessageState = false, selector)\n }\n \n fun clearNewMailNotifications(account: Account, clearNewMessageState: Boolean) {\ndiff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt\nindex 89b6f217f3b..c50985022b2 100644\n--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt\n+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt\n@@ -1,6 +1,7 @@\n package com.fsck.k9.notification\n \n import com.fsck.k9.Account\n+import com.fsck.k9.controller.MessageReference\n \n /**\n * Holds information about active and inactive new message notifications of an account.\n@@ -16,6 +17,19 @@ internal data class NotificationData(\n val isSingleMessageNotification: Boolean\n get() = activeNotifications.size == 1\n \n+ @OptIn(ExperimentalStdlibApi::class)\n+ val messageReferences: List\n+ get() {\n+ return buildList(capacity = newMessagesCount) {\n+ for (activeNotification in activeNotifications) {\n+ add(activeNotification.content.messageReference)\n+ }\n+ for (inactiveNotification in inactiveNotifications) {\n+ add(inactiveNotification.content.messageReference)\n+ }\n+ }\n+ }\n+\n fun isEmpty() = activeNotifications.isEmpty()\n \n companion object {\ndiff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt\nindex 41b31adfdb4..51372b0a939 100644\n--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt\n+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt\n@@ -69,62 +69,76 @@ internal class NotificationDataStore {\n }\n \n @Synchronized\n- fun removeNotification(account: Account, messageReference: MessageReference): RemoveNotificationResult? {\n+ fun removeNotifications(\n+ account: Account,\n+ selector: (List) -> List\n+ ): RemoveNotificationsResult? {\n val notificationData = getNotificationData(account)\n if (notificationData.isEmpty()) return null\n \n- val notificationHolder = notificationData.activeNotifications.firstOrNull {\n- it.content.messageReference == messageReference\n- }\n+ val removeMessageReferences = selector.invoke(notificationData.messageReferences)\n \n- return if (notificationHolder == null) {\n- val inactiveNotificationHolder = notificationData.inactiveNotifications.firstOrNull {\n- it.content.messageReference == messageReference\n- } ?: return null\n+ val operations = mutableListOf()\n+ val newNotificationHolders = mutableListOf()\n+ val cancelNotificationIds = mutableListOf()\n \n- val operations = listOf(\n- NotificationStoreOperation.Remove(messageReference)\n- )\n+ for (messageReference in removeMessageReferences) {\n+ val notificationHolder = notificationData.activeNotifications.firstOrNull {\n+ it.content.messageReference == messageReference\n+ }\n \n- val newNotificationData = notificationData.copy(\n- inactiveNotifications = notificationData.inactiveNotifications - inactiveNotificationHolder\n- )\n- notificationDataMap[account.uuid] = newNotificationData\n+ if (notificationHolder == null) {\n+ val inactiveNotificationHolder = notificationData.inactiveNotifications.firstOrNull {\n+ it.content.messageReference == messageReference\n+ } ?: continue\n \n- RemoveNotificationResult.recreateSummaryNotification(newNotificationData, operations)\n- } else if (notificationData.inactiveNotifications.isNotEmpty()) {\n- val newNotificationHolder = notificationData.inactiveNotifications.first()\n- .toNotificationHolder(notificationHolder.notificationId)\n+ operations.add(NotificationStoreOperation.Remove(messageReference))\n \n- val operations = listOf(\n- NotificationStoreOperation.Remove(messageReference),\n- NotificationStoreOperation.ChangeToActive(\n- newNotificationHolder.content.messageReference,\n- newNotificationHolder.notificationId\n+ val newNotificationData = notificationData.copy(\n+ inactiveNotifications = notificationData.inactiveNotifications - inactiveNotificationHolder\n+ )\n+ notificationDataMap[account.uuid] = newNotificationData\n+ } else if (notificationData.inactiveNotifications.isNotEmpty()) {\n+ val newNotificationHolder = notificationData.inactiveNotifications.first()\n+ .toNotificationHolder(notificationHolder.notificationId)\n+\n+ newNotificationHolders.add(newNotificationHolder)\n+ cancelNotificationIds.add(notificationHolder.notificationId)\n+\n+ operations.add(NotificationStoreOperation.Remove(messageReference))\n+ operations.add(\n+ NotificationStoreOperation.ChangeToActive(\n+ newNotificationHolder.content.messageReference,\n+ newNotificationHolder.notificationId\n+ )\n )\n- )\n \n- val newNotificationData = notificationData.copy(\n- activeNotifications = notificationData.activeNotifications - notificationHolder + newNotificationHolder,\n- inactiveNotifications = notificationData.inactiveNotifications.drop(1)\n- )\n- notificationDataMap[account.uuid] = newNotificationData\n+ val newNotificationData = notificationData.copy(\n+ activeNotifications = notificationData.activeNotifications - notificationHolder +\n+ newNotificationHolder,\n+ inactiveNotifications = notificationData.inactiveNotifications.drop(1)\n+ )\n+ notificationDataMap[account.uuid] = newNotificationData\n+ } else {\n+ cancelNotificationIds.add(notificationHolder.notificationId)\n \n- RemoveNotificationResult.replaceNotification(newNotificationData, operations, newNotificationHolder)\n- } else {\n- val operations = listOf(\n- NotificationStoreOperation.Remove(messageReference),\n- )\n+ operations.add(NotificationStoreOperation.Remove(messageReference))\n \n- val newNotificationData = notificationData.copy(\n- activeNotifications = notificationData.activeNotifications - notificationHolder\n- )\n- notificationDataMap[account.uuid] = newNotificationData\n+ val newNotificationData = notificationData.copy(\n+ activeNotifications = notificationData.activeNotifications - notificationHolder\n+ )\n+ notificationDataMap[account.uuid] = newNotificationData\n+ }\n+ }\n \n- RemoveNotificationResult.cancelNotification(\n- newNotificationData,\n- operations,\n- notificationHolder.notificationId\n+ return if (operations.isEmpty()) {\n+ null\n+ } else {\n+ RemoveNotificationsResult(\n+ notificationData = getNotificationData(account),\n+ notificationStoreOperations = operations,\n+ notificationHolders = newNotificationHolders,\n+ cancelNotificationIds = cancelNotificationIds\n )\n }\n }\ndiff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt\nindex 5ac77e94047..b18f3686aa7 100644\n--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt\n+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt\n@@ -44,9 +44,15 @@ internal class NotificationRepository(\n }\n \n @Synchronized\n- fun removeNotification(account: Account, messageReference: MessageReference): RemoveNotificationResult? {\n- return notificationDataStore.removeNotification(account, messageReference)?.also { result ->\n- persistNotificationDataStoreChanges(account, result.notificationStoreOperations)\n+ fun removeNotifications(\n+ account: Account,\n+ clearNewMessageState: Boolean = true,\n+ selector: (List) -> List\n+ ): RemoveNotificationsResult? {\n+ return notificationDataStore.removeNotifications(account, selector)?.also { result ->\n+ if (clearNewMessageState) {\n+ persistNotificationDataStoreChanges(account, result.notificationStoreOperations)\n+ }\n }\n }\n \ndiff --git a/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationResult.kt b/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationResult.kt\ndeleted file mode 100644\nindex cfad5cfa1be..00000000000\n--- a/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationResult.kt\n+++ /dev/null\n@@ -1,60 +0,0 @@\n-package com.fsck.k9.notification\n-\n-internal class RemoveNotificationResult private constructor(\n- val notificationData: NotificationData,\n- val notificationStoreOperations: List,\n- private val holder: NotificationHolder?,\n- private val notificationId: Int?\n-) {\n- val shouldCreateNotification: Boolean\n- get() = holder != null\n-\n- val notificationHolder: NotificationHolder\n- get() = holder ?: error(\"shouldCreateNotification == false\")\n-\n- val shouldCancelNotification: Boolean\n- get() = notificationId != null\n-\n- val cancelNotificationId: Int\n- get() = notificationId ?: error(\"shouldCancelNotification == false\")\n-\n- companion object {\n- fun cancelNotification(\n- notificationData: NotificationData,\n- notificationStoreOperations: List,\n- notificationId: Int\n- ): RemoveNotificationResult {\n- return RemoveNotificationResult(\n- notificationData = notificationData,\n- notificationStoreOperations = notificationStoreOperations,\n- holder = null,\n- notificationId = notificationId\n- )\n- }\n-\n- fun replaceNotification(\n- notificationData: NotificationData,\n- notificationStoreOperations: List,\n- notificationHolder: NotificationHolder\n- ): RemoveNotificationResult {\n- return RemoveNotificationResult(\n- notificationData = notificationData,\n- notificationStoreOperations = notificationStoreOperations,\n- holder = notificationHolder,\n- notificationId = notificationHolder.notificationId\n- )\n- }\n-\n- fun recreateSummaryNotification(\n- notificationData: NotificationData,\n- notificationStoreOperations: List\n- ): RemoveNotificationResult {\n- return RemoveNotificationResult(\n- notificationData = notificationData,\n- notificationStoreOperations = notificationStoreOperations,\n- holder = null,\n- notificationId = null\n- )\n- }\n- }\n-}\ndiff --git a/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt b/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt\nnew file mode 100644\nindex 00000000000..f3c2d44bffa\n--- /dev/null\n+++ b/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt\n@@ -0,0 +1,8 @@\n+package com.fsck.k9.notification\n+\n+internal data class RemoveNotificationsResult(\n+ val notificationData: NotificationData,\n+ val notificationStoreOperations: List,\n+ val notificationHolders: List,\n+ val cancelNotificationIds: List\n+)\ndiff --git a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt\nindex fefe5c7d151..77e12728265 100644\n--- a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt\n+++ b/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt\n@@ -2,7 +2,6 @@ package com.fsck.k9.notification\n \n import com.fsck.k9.Account\n import com.fsck.k9.K9\n-import com.fsck.k9.controller.MessageReference\n \n private const val MAX_NUMBER_OF_MESSAGES_FOR_SUMMARY_NOTIFICATION = 5\n \n@@ -92,17 +91,4 @@ internal class SummaryNotificationDataCreator(\n \n private val NotificationData.additionalMessagesCount: Int\n get() = (newMessagesCount - MAX_NUMBER_OF_MESSAGES_FOR_SUMMARY_NOTIFICATION).coerceAtLeast(0)\n-\n- @OptIn(ExperimentalStdlibApi::class)\n- private val NotificationData.messageReferences: List\n- get() {\n- return buildList(capacity = newMessagesCount) {\n- for (activeNotification in activeNotifications) {\n- add(activeNotification.content.messageReference)\n- }\n- for (inactiveNotification in inactiveNotifications) {\n- add(inactiveNotification.content.messageReference)\n- }\n- }\n- }\n }\ndiff --git a/app/core/src/main/java/com/fsck/k9/search/LocalSearchExtensions.kt b/app/core/src/main/java/com/fsck/k9/search/LocalSearchExtensions.kt\nindex 8e49538dac5..d528446987b 100644\n--- a/app/core/src/main/java/com/fsck/k9/search/LocalSearchExtensions.kt\n+++ b/app/core/src/main/java/com/fsck/k9/search/LocalSearchExtensions.kt\n@@ -5,6 +5,18 @@ package com.fsck.k9.search\n import com.fsck.k9.Account\n import com.fsck.k9.Preferences\n \n+val LocalSearch.isUnifiedInbox: Boolean\n+ get() = id == SearchAccount.UNIFIED_INBOX\n+\n+val LocalSearch.isNewMessages: Boolean\n+ get() = id == SearchAccount.NEW_MESSAGES\n+\n+val LocalSearch.isSingleAccount: Boolean\n+ get() = accountUuids.size == 1\n+\n+val LocalSearch.isSingleFolder: Boolean\n+ get() = isSingleAccount && folderIds.size == 1\n+\n @JvmName(\"getAccountsFromLocalSearch\")\n fun LocalSearch.getAccounts(preferences: Preferences): List {\n val accounts = preferences.accounts\ndiff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt\nindex a027d0482b9..510982e817e 100644\n--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt\n+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt\n@@ -32,6 +32,7 @@ import com.fsck.k9.Preferences\n import com.fsck.k9.account.BackgroundAccountRemover\n import com.fsck.k9.activity.compose.MessageActions\n import com.fsck.k9.controller.MessageReference\n+import com.fsck.k9.controller.MessagingController\n import com.fsck.k9.fragment.MessageListFragment\n import com.fsck.k9.fragment.MessageListFragment.MessageListFragmentListener\n import com.fsck.k9.helper.Contacts\n@@ -44,6 +45,7 @@ import com.fsck.k9.search.SearchAccount\n import com.fsck.k9.search.SearchSpecification\n import com.fsck.k9.search.SearchSpecification.SearchCondition\n import com.fsck.k9.search.SearchSpecification.SearchField\n+import com.fsck.k9.search.isUnifiedInbox\n import com.fsck.k9.ui.BuildConfig\n import com.fsck.k9.ui.K9Drawer\n import com.fsck.k9.ui.R\n@@ -92,6 +94,7 @@ open class MessageList :\n private val defaultFolderProvider: DefaultFolderProvider by inject()\n private val accountRemover: BackgroundAccountRemover by inject()\n private val generalSettingsManager: GeneralSettingsManager by inject()\n+ private val messagingController: MessagingController by inject()\n \n private val permissionUiHelper: PermissionUiHelper = K9PermissionUiHelper(this)\n \n@@ -347,6 +350,7 @@ open class MessageList :\n }\n }\n setDrawerLockState()\n+ onMessageListDisplayed()\n }\n }\n }\n@@ -541,6 +545,10 @@ open class MessageList :\n recreate()\n }\n \n+ if (displayMode != DisplayMode.MESSAGE_VIEW) {\n+ onMessageListDisplayed()\n+ }\n+\n if (this !is Search) {\n // necessary b/c no guarantee Search.onStop will be called before MessageList.onResume\n // when returning from search results\n@@ -613,6 +621,8 @@ open class MessageList :\n search.addAllowedFolder(folderId)\n \n performSearch(search)\n+\n+ onMessageListDisplayed()\n }\n \n private fun openFolderImmediately(folderId: Long) {\n@@ -1462,6 +1472,8 @@ open class MessageList :\n \n showDefaultTitleView()\n configureMenu(menu)\n+\n+ onMessageListDisplayed()\n }\n \n private fun setDrawerLockState() {\n@@ -1519,6 +1531,14 @@ open class MessageList :\n }\n }\n \n+ private fun onMessageListDisplayed() {\n+ clearNotifications()\n+ }\n+\n+ private fun clearNotifications() {\n+ messagingController.clearNotifications(search)\n+ }\n+\n override fun startIntentSenderForResult(\n intent: IntentSender,\n requestCode: Int,\n@@ -1591,9 +1611,6 @@ open class MessageList :\n }\n }\n \n- private val LocalSearch.isUnifiedInbox: Boolean\n- get() = id == SearchAccount.UNIFIED_INBOX\n-\n private fun MessageReference.toLocalSearch(): LocalSearch {\n return LocalSearch().apply {\n addAccountUuid(accountUuid)\ndiff --git a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.kt\nindex 9d6ead01099..ecc400c3e98 100644\n--- a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.kt\n+++ b/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.kt\n@@ -475,11 +475,6 @@ class MessageListFragment :\n \n messagingController.addListener(activityListener)\n \n- for (account in localSearch.getAccounts(preferences)) {\n- // TODO: Only remove notifications for messages in the currently displayed message list\n- messagingController.removeNotificationsForAccount(account)\n- }\n-\n updateTitle()\n }\n \n", "test_patch": "diff --git a/app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt b/app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt\nindex 7393229c32f..873dd7cb5f7 100644\n--- a/app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt\n+++ b/app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt\n@@ -128,7 +128,9 @@ class NewMailNotificationManagerTest {\n \n @Test\n fun `remove notification when none was added before should return null`() {\n- val result = manager.removeNewMailNotification(account, createMessageReference(\"any\"))\n+ val result = manager.removeNewMailNotifications(account, clearNewMessageState = true) {\n+ listOf(createMessageReference(\"any\"))\n+ }\n \n assertThat(result).isNull()\n }\n@@ -144,7 +146,9 @@ class NewMailNotificationManagerTest {\n )\n manager.addNewMailNotification(account, message, silent = false)\n \n- val result = manager.removeNewMailNotification(account, createMessageReference(\"untracked\"))\n+ val result = manager.removeNewMailNotifications(account, clearNewMessageState = true) {\n+ listOf(createMessageReference(\"untracked\"))\n+ }\n \n assertThat(result).isNull()\n }\n@@ -160,7 +164,9 @@ class NewMailNotificationManagerTest {\n )\n manager.addNewMailNotification(account, message, silent = false)\n \n- val result = manager.removeNewMailNotification(account, createMessageReference(\"msg-1\"))\n+ val result = manager.removeNewMailNotifications(account, clearNewMessageState = true) {\n+ listOf(createMessageReference(\"msg-1\"))\n+ }\n \n assertNotNull(result) { data ->\n assertThat(data.cancelNotificationIds).containsExactly(\n@@ -200,7 +206,9 @@ class NewMailNotificationManagerTest {\n )\n manager.addNewMailNotification(account, messageThree, silent = true)\n \n- val result = manager.removeNewMailNotification(account, createMessageReference(\"msg-2\"))\n+ val result = manager.removeNewMailNotifications(account, clearNewMessageState = true) {\n+ listOf(createMessageReference(\"msg-2\"))\n+ }\n \n assertNotNull(result) { data ->\n assertThat(data.cancelNotificationIds).isEqualTo(listOf(notificationIdTwo))\n@@ -230,7 +238,9 @@ class NewMailNotificationManagerTest {\n manager.addNewMailNotification(account, message, silent = false)\n addMaximumNumberOfNotifications()\n \n- val result = manager.removeNewMailNotification(account, createMessageReference(\"msg-1\"))\n+ val result = manager.removeNewMailNotifications(account, clearNewMessageState = true) {\n+ listOf(createMessageReference(\"msg-1\"))\n+ }\n \n assertNotNull(result) { data ->\n assertThat(data.cancelNotificationIds).hasSize(1)\ndiff --git a/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt b/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt\nindex 082902a2486..9bb2c110bb2 100644\n--- a/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt\n+++ b/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt\n@@ -53,12 +53,12 @@ class NotificationDataStoreTest : RobolectricTest() {\n val content = createNotificationContent(\"1\")\n notificationDataStore.addNotification(account, content, TIMESTAMP)\n \n- val result = notificationDataStore.removeNotification(account, content.messageReference)\n+ val result = notificationDataStore.removeNotifications(account) { listOf(content.messageReference) }\n \n assertNotNull(result) { removeResult ->\n- assertThat(removeResult.cancelNotificationId)\n- .isEqualTo(NotificationIds.getSingleMessageNotificationId(account, 0))\n- assertThat(removeResult.shouldCreateNotification).isFalse()\n+ assertThat(removeResult.cancelNotificationIds)\n+ .containsExactly(NotificationIds.getSingleMessageNotificationId(account, 0))\n+ assertThat(removeResult.notificationHolders).isEmpty()\n }\n }\n \n@@ -77,16 +77,16 @@ class NotificationDataStoreTest : RobolectricTest() {\n val latestContent = createNotificationContent(\"10\")\n notificationDataStore.addNotification(account, latestContent, TIMESTAMP)\n \n- val result = notificationDataStore.removeNotification(account, latestContent.messageReference)\n+ val result = notificationDataStore.removeNotifications(account) { listOf(latestContent.messageReference) }\n \n assertNotNull(result) { removeResult ->\n- assertThat(removeResult.cancelNotificationId)\n- .isEqualTo(NotificationIds.getSingleMessageNotificationId(account, 1))\n- assertThat(removeResult.shouldCreateNotification).isTrue()\n- assertNotNull(removeResult.notificationHolder) { holder ->\n- assertThat(holder.notificationId).isEqualTo(NotificationIds.getSingleMessageNotificationId(account, 1))\n- assertThat(holder.content).isEqualTo(content)\n- }\n+ assertThat(removeResult.cancelNotificationIds)\n+ .containsExactly(NotificationIds.getSingleMessageNotificationId(account, 1))\n+ assertThat(removeResult.notificationHolders).hasSize(1)\n+\n+ val holder = removeResult.notificationHolders.first()\n+ assertThat(holder.notificationId).isEqualTo(NotificationIds.getSingleMessageNotificationId(account, 1))\n+ assertThat(holder.content).isEqualTo(content)\n }\n }\n \n@@ -95,7 +95,7 @@ class NotificationDataStoreTest : RobolectricTest() {\n for (i in 1..MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS + 1) {\n val content = createNotificationContent(i.toString())\n notificationDataStore.addNotification(account, content, TIMESTAMP)\n- notificationDataStore.removeNotification(account, content.messageReference)\n+ notificationDataStore.removeNotifications(account) { listOf(content.messageReference) }\n }\n }\n \n", "n2p_tests": {"com.fsck.k9.notification.NewMailNotificationManagerTest.remove notification when additional notifications are available": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.notification.NewMailNotificationManagerTest.restore notifications with one inactive persisted notification": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.notification.NewMailNotificationManagerTest.restore notifications without persisted notifications": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.notification.NewMailNotificationManagerTest.remove notification with untracked notification ID should return null": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.notification.NewMailNotificationManagerTest.remove one of three notifications": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.notification.NewMailNotificationManagerTest.add one more notification when already displaying the maximum number of notifications": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.notification.NewMailNotificationManagerTest.remove last remaining notification": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.notification.NewMailNotificationManagerTest.restore notifications with single persisted notification": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.notification.NewMailNotificationManagerTest.add first notification": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.notification.NewMailNotificationManagerTest.add second notification": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.notification.NewMailNotificationManagerTest.remove notification when none was added before should return null": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "thunderbird__thunderbird-android-7008", "org": "thunderbird", "repo": "thunderbird-android", "number": 7008, "state": "closed", "title": "Fetch `List-Post` header when downloading partial message", "body": "`ReplyToParser` currently checks the `List-Post` header to figure out which email address to use as recipient when replying. With this change we make sure the `List-Post` header is always available, i.e. we explicitly fetch it when downloading a partial message.\r\n\r\nFixes #6414", "base": {"label": "thunderbird:main", "ref": "main", "sha": "f72bd24fbd0b88dbf4d32e4a31de9f90f4ed297e"}, "resolved_issues": [{"number": 6414, "title": "Problematic behavior with mailing lists", "body": "### Checklist\n\n- [X] I have used the search function to see if someone else has already submitted the same bug report.\n- [X] I will describe the problem with as much detail as possible.\n\n### App version\n\n6.305\n\n### Where did you get the app from?\n\nOther\n\n### Android version\n\nAndroid 11 custom ROM\n\n### Device model\n\nCrosscall Core X4\n\n### Steps to reproduce\n\nHello,\r\n\r\nWhen I receive an email with a mailing list (known and not local) as recipient, I have the following behavior :\r\n**Incomplete mail :** \r\n_Answer :_ just mail author (label)(normal behavior)\r\n_Answer all :_ mail author (label) + list (label)(normal behavior)\r\n**Complete mail :**\r\n_Answer :_ list (mail without label) (abnormal behavior)\r\n_Answer all :_ mail author (label)+ list twice (one with label, one without) (abnormal behavior)\n\n### Expected behavior\n\nSee steps to reproduce\n\n### Actual behavior\n\nSee steps to reproduce\n\n### Logs\n\n_No response_"}], "lang": "kotlin", "problem_statement": "Problematic behavior with mailing lists\n### Checklist\n\n- [X] I have used the search function to see if someone else has already submitted the same bug report.\n- [X] I will describe the problem with as much detail as possible.\n\n### App version\n\n6.305\n\n### Where did you get the app from?\n\nOther\n\n### Android version\n\nAndroid 11 custom ROM\n\n### Device model\n\nCrosscall Core X4\n\n### Steps to reproduce\n\nHello,\r\n\r\nWhen I receive an email with a mailing list (known and not local) as recipient, I have the following behavior :\r\n**Incomplete mail :** \r\n_Answer :_ just mail author (label)(normal behavior)\r\n_Answer all :_ mail author (label) + list (label)(normal behavior)\r\n**Complete mail :**\r\n_Answer :_ list (mail without label) (abnormal behavior)\r\n_Answer all :_ mail author (label)+ list twice (one with label, one without) (abnormal behavior)\n\n### Expected behavior\n\nSee steps to reproduce\n\n### Actual behavior\n\nSee steps to reproduce\n\n### Logs\n\n_No response_\n", "hints": "Hello @SvSky \r\nI have been trying to reproduce the issue you described ((in Samsung A32, Android 13)), but I am having difficulty doing so. I was wondering if you could provide me with more information on the scenario you experienced in order to help us resolve the issue. you say the same word in expected behavior and actual behavior.\r\ncould you attach a picture or video for this scenario?\r\n\r\nYour assistance in this matter would be greatly appreciated.\nHello,\r\nI'm sorry, i tried to describe as well as possible but my english is far from good.\r\nI temporarily solved by modifying the following code :\r\n\r\n if (replyToAddresses.length > 0) {\r\n candidateAddress = replyToAddresses;\r\n } else if (listPostAddresses.length > 0) {\r\n candidateAddress = listPostAddresses;\r\n } else {\r\n candidateAddress = fromAddresses;\r\n }\r\n \r\nby :\r\n\r\n// if (replyToAddresses.length > 0) {\r\n// candidateAddress = replyToAddresses;\r\n// } else if (listPostAddresses.length > 0) {\r\n// candidateAddress = listPostAddresses;\r\n// } else {\r\n candidateAddress = fromAddresses;\r\n// }\r\n\r\nin ReplyToParser.java\r\n\r\nI didn't want to commit because it was a really specific problem and I didn't know the reasons for the order inside \"if\"\r\n\r\n\r\nI can give you the example of my case to understand what was my problem.\r\nMy secretary sent an email (to a list with all the staff) asking for medical data.\r\nWhen replying from k9, we fall into the case where \"listPostAddresses\" is not empty (which was the case), and that sent an email (from one of the people on the list) to the whole list, instead of sending it in reply to the secretary (person in \"fromAddresses\")\r\n\r\nI hope I was able to shed some light on the problem I had", "pull_url": "https://github.com/thunderbird/thunderbird-android/pull/7008", "issue_urls": ["https://github.com/thunderbird/thunderbird-android/issues/6414"], "test_command": "./gradlew :mail:protocols:imap:test --tests \"com.fsck.k9.mail.store.imap.RealImapFolderTest\"", "fix_patch": "diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt\nindex 6746d890520..26ff4103d48 100644\n--- a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt\n+++ b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt\n@@ -543,7 +543,7 @@ internal class RealImapFolder(\n fetchFields.add(\"RFC822.SIZE\")\n fetchFields.add(\n \"BODY.PEEK[HEADER.FIELDS (date subject from content-type to cc bcc \" +\n- \"reply-to message-id references in-reply-to list-unsubscribe sender \" +\n+ \"reply-to message-id references in-reply-to list-post list-unsubscribe sender \" +\n K9MailLib.IDENTITY_HEADER + \" \" + K9MailLib.CHAT_HEADER + \")]\",\n )\n }\n", "test_patch": "diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt\nindex 27225051ea0..c87615f2c8d 100644\n--- a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt\n+++ b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt\n@@ -673,7 +673,7 @@ class RealImapFolderTest {\n verify(imapConnection).sendCommand(\n \"UID FETCH 1 (UID INTERNALDATE RFC822.SIZE BODY.PEEK[HEADER.FIELDS \" +\n \"(date subject from content-type to cc bcc reply-to message-id references in-reply-to \" +\n- \"list-unsubscribe sender X-K9mail-Identity Chat-Version)])\",\n+ \"list-post list-unsubscribe sender X-K9mail-Identity Chat-Version)])\",\n false,\n )\n }\n", "n2p_tests": {"com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch_withBodyFetchProfileAndNoMaximumDownloadSize_shouldIssueRespectiveCommand": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getMessagesFromUids": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.moveMessages_withEmptyMessageList_shouldReturnNull": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.open_calledTwice_shouldReuseSameImapConnection": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getUnreadMessageCount_connectionThrowsIOException_shouldThrowMessagingException": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.moveMessages_shouldDeleteMessagesFromSourceFolder": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch() with simple content type parameter": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getHighestUid": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getMessages_withEndArgumentSmallerThanStartArgument_shouldThrow": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.areMoreMessagesAvailable_withoutAdditionalMessages_shouldIssueSearchCommandsUntilAllMessagesSearched": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.open_withConnectionThrowingOnReUse_shouldCreateNewImapConnection": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.exists_withClosedFolder_shouldOpenConnectionAndIssueStatusCommand": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.search_withFullTextSearchDisabled_shouldIssueRespectiveCommand": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch_withBodySaneFetchProfile_shouldIssueRespectiveCommand": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.expungeUids_withUidPlus_shouldIssueUidExpungeCommand": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.expunge_shouldIssueExpungeCommand": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getHighestUid_imapConnectionThrowsIOException_shouldThrowMessagingException": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.setFlags_shouldIssueUidStoreCommand": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch_withFlagsFetchProfile_shouldSetFlags": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch() with RFC 2231 encoded content disposition parameter": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.create_withNegativeImapResponse_shouldReturnFalse": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getMessages_sequenceNumbers_withClosedFolder_shouldThrow": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getMessages_withClosedFolder_shouldThrow": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch() with content disposition parameter that needs to be a quoted string": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.create_withClosedFolder_shouldOpenConnectionAndIssueCreateCommand": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getMessages_sequenceNumbers": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.close_shouldCloseImapFolder": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.open_readWrite_shouldMakeGetModeReturnReadWrite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getHighestUid_imapConnectionThrowsNegativesResponse_shouldReturnMinusOne": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getMessagesFromUids_withClosedFolder_shouldThrow": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.areMoreMessagesAvailable_withAdditionalMessages_shouldReturnTrue": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch_withStructureFetchProfile_shouldIssueRespectiveCommand": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.open_shouldFetchMessageCount": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.exists_withNegativeImapResponse_shouldReturnFalse": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch_withEmptyMessageListArgument_shouldDoNothing": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.expungeUids_withoutUidPlus_shouldIssueExpungeCommand": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getMessages_withoutDateConstraint": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch() with RFC 2231 encoded content type parameter": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getFlaggedMessageCount_withClosedFolder_shouldThrow": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch() with simple content disposition parameter": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch() with UTF-8 encoded content disposition parameter": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.create_withoutNegativeImapResponse_shouldReturnTrue": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.open_readOnly_shouldOpenFolder": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getMessages_withInvalidStartArgument_shouldThrow": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.open_readOnly_shouldMakeGetModeReturnReadOnly": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch_withBodySaneFetchProfileAndNoMaximumDownloadSize_shouldIssueRespectiveCommand": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getUidFromMessageId": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch() with content type parameter that needs to be a quoted string": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getUnreadMessageCount": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getMessages_withListener_shouldCallListener": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch_withStructureFetchProfile_shouldSetContentType": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getMessages_withDateConstraint": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.moveMessages_shouldCopyMessages": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getMessages_sequenceNumbers_withListener_shouldCallListener": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.areMoreMessagesAvailable_withoutAdditionalMessages_shouldReturnFalse": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.exists_withoutNegativeImapResponse_shouldReturnTrue": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.appendMessages_withNegativeResponse_shouldThrow": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch() with UTF-8 encoded content type parameter": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.search_withFullTextSearchEnabled_shouldIssueRespectiveCommand": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetchPart_withTextSection_shouldProcessImapResponses": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch_withFlagsFetchProfile_shouldIssueRespectiveCommand": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getFlaggedMessageCount": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch() with content type parameter that needs to be a quoted string with escaped characters": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetchPart_withTextSection_shouldIssueRespectiveCommand": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch() with content disposition parameter that needs to be a quoted string with escaped characters": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.copyMessages_withClosedFolder_shouldThrow": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetchPart_withNonTextSection_shouldIssueRespectiveCommand": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.open_withoutExistsResponse_shouldThrowMessagingException": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.fetch_withEnvelopeFetchProfile_shouldIssueRespectiveCommand": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.areMoreMessagesAvailable_withClosedFolder_shouldThrow": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getMessageByUid_returnsNewImapMessageWithUid": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {"com.fsck.k9.mail.store.imap.RealImapFolderTest.open_readWrite_shouldOpenFolder": {"run": "PASS", "test": "FAIL", "fix": "PASS"}}, "p2p_tests": {"com.fsck.k9.mail.store.imap.RealImapFolderTest.getUidFromMessageId_withMessageIdHeader_shouldIssueUidSearchCommand": {"run": "PASS", "test": "PASS", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.open_withMessagingException_shouldThrowMessagingException": {"run": "PASS", "test": "PASS", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.open_shouldMakeExistReturnTrueWithoutExecutingAdditionalCommands": {"run": "PASS", "test": "PASS", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.open_withIoException_shouldThrowMessagingException": {"run": "PASS", "test": "PASS", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.copyMessages": {"run": "PASS", "test": "PASS", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getUnreadMessageCount_withClosedFolder_shouldThrow": {"run": "PASS", "test": "PASS", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.appendMessages_shouldIssueRespectiveCommand": {"run": "PASS", "test": "PASS", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.copyMessages_withEmptyMessageList_shouldReturnNull": {"run": "PASS", "test": "PASS", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.areMoreMessagesAvailable_withIndexOfOne_shouldReturnFalseWithoutPerformingSearch": {"run": "PASS", "test": "PASS", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.appendMessages_withBadResponse_shouldThrow": {"run": "PASS", "test": "PASS", "fix": "PASS"}, "com.fsck.k9.mail.store.imap.RealImapFolderTest.getMessages_withInvalidEndArgument_shouldThrow": {"run": "PASS", "test": "PASS", "fix": "PASS"}}, "s2p_tests": {}} {"instance_id": "thunderbird__thunderbird-android-8136", "org": "thunderbird", "repo": "thunderbird-android", "number": 8136, "state": "closed", "title": "Add drawer account view", "body": "Add new drawer `AccountView`.\r\n\r\n![AccountView](https://github.com/user-attachments/assets/a498675b-d92c-4871-a55c-f0c6b78208cb)\r\n\r\nResolves #8120 \r\n", "base": {"label": "thunderbird:main", "ref": "main", "sha": "a58a0520826fd3ba16f27cd6aea575167df9e800"}, "resolved_issues": [{"number": 8120, "title": "Add account top view", "body": "Implement the account top view highlighted in this design:\n\n![Image](https://github.com/user-attachments/assets/2deb4b6e-37f4-4d29-8721-28847601ab37)\n\n"}], "lang": "kotlin", "problem_statement": "Add account top view\nImplement the account top view highlighted in this design:\n\n![Image](https://github.com/user-attachments/assets/2deb4b6e-37f4-4d29-8721-28847601ab37)\n\n\n", "pull_url": "https://github.com/thunderbird/thunderbird-android/pull/8136", "issue_urls": ["https://github.com/thunderbird/thunderbird-android/issues/8120"], "test_command": "./gradlew :feature:navigation:drawer:testDebugUnitTest --tests \"app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest\"", "fix_patch": "diff --git a/core/ui/compose/theme2/common/src/main/kotlin/app/k9mail/core/ui/compose/theme2/SelectThemeColorScheme.kt b/core/ui/compose/theme2/common/src/main/kotlin/app/k9mail/core/ui/compose/theme2/SelectThemeColorScheme.kt\nindex ee9b3519cba..d1f44da6d8a 100644\n--- a/core/ui/compose/theme2/common/src/main/kotlin/app/k9mail/core/ui/compose/theme2/SelectThemeColorScheme.kt\n+++ b/core/ui/compose/theme2/common/src/main/kotlin/app/k9mail/core/ui/compose/theme2/SelectThemeColorScheme.kt\n@@ -113,4 +113,4 @@ private fun ColorScheme.toDynamicThemeColorScheme(\n )\n }\n \n-private fun Color.toHarmonizedColor(target: Color) = Color(MaterialColors.harmonize(toArgb(), target.toArgb()))\n+fun Color.toHarmonizedColor(target: Color) = Color(MaterialColors.harmonize(toArgb(), target.toArgb()))\ndiff --git a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContentPreview.kt b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContentPreview.kt\nindex b3c598e25d3..0d377461317 100644\n--- a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContentPreview.kt\n+++ b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContentPreview.kt\n@@ -3,11 +3,30 @@ package app.k9mail.feature.navigation.drawer.ui\n import androidx.compose.runtime.Composable\n import androidx.compose.ui.tooling.preview.Preview\n import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme\n+import app.k9mail.feature.navigation.drawer.ui.account.FakeData.DISPLAY_ACCOUNT\n \n @Composable\n @Preview(showBackground = true)\n internal fun DrawerContentPreview() {\n PreviewWithTheme {\n- DrawerContent()\n+ DrawerContent(\n+ state = DrawerContract.State(\n+ accounts = emptyList(),\n+ currentAccount = null,\n+ ),\n+ )\n+ }\n+}\n+\n+@Composable\n+@Preview(showBackground = true)\n+fun DrawerContentWithAccountPreview() {\n+ PreviewWithTheme {\n+ DrawerContent(\n+ state = DrawerContract.State(\n+ accounts = listOf(DISPLAY_ACCOUNT),\n+ currentAccount = DISPLAY_ACCOUNT,\n+ ),\n+ )\n }\n }\ndiff --git a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountIndicatorPreview.kt b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountIndicatorPreview.kt\nnew file mode 100644\nindex 00000000000..dd9930c2123\n--- /dev/null\n+++ b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountIndicatorPreview.kt\n@@ -0,0 +1,43 @@\n+package app.k9mail.feature.navigation.drawer.ui.account\n+\n+import androidx.compose.foundation.layout.height\n+import androidx.compose.runtime.Composable\n+import androidx.compose.ui.Modifier\n+import androidx.compose.ui.graphics.Color\n+import androidx.compose.ui.graphics.toArgb\n+import androidx.compose.ui.tooling.preview.Preview\n+import app.k9mail.core.ui.compose.designsystem.PreviewWithThemes\n+import app.k9mail.core.ui.compose.theme2.MainTheme\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun AccountIndicatorPreview() {\n+ PreviewWithThemes {\n+ AccountIndicator(\n+ accountColor = 0,\n+ modifier = Modifier.height(MainTheme.spacings.double),\n+ )\n+ }\n+}\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun AccountIndicatorPreviewWithYellowAccountColor() {\n+ PreviewWithThemes {\n+ AccountIndicator(\n+ accountColor = Color.Yellow.toArgb(),\n+ modifier = Modifier.height(MainTheme.spacings.double),\n+ )\n+ }\n+}\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun AccountIndicatorPreviewWithGrayAccountColor() {\n+ PreviewWithThemes {\n+ AccountIndicator(\n+ accountColor = Color.Gray.toArgb(),\n+ modifier = Modifier.height(MainTheme.spacings.double),\n+ )\n+ }\n+}\ndiff --git a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountViewPreview.kt b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountViewPreview.kt\nnew file mode 100644\nindex 00000000000..b268f894894\n--- /dev/null\n+++ b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountViewPreview.kt\n@@ -0,0 +1,56 @@\n+package app.k9mail.feature.navigation.drawer.ui.account\n+\n+import androidx.compose.runtime.Composable\n+import androidx.compose.ui.tooling.preview.Preview\n+import app.k9mail.core.ui.compose.designsystem.PreviewWithThemes\n+import app.k9mail.feature.navigation.drawer.ui.account.FakeData.DISPLAY_NAME\n+import app.k9mail.feature.navigation.drawer.ui.account.FakeData.EMAIL_ADDRESS\n+import app.k9mail.feature.navigation.drawer.ui.account.FakeData.LONG_TEXT\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun AccountViewPreview() {\n+ PreviewWithThemes {\n+ AccountView(\n+ displayName = DISPLAY_NAME,\n+ emailAddress = EMAIL_ADDRESS,\n+ accountColor = 0,\n+ )\n+ }\n+}\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun AccountViewWithColorPreview() {\n+ PreviewWithThemes {\n+ AccountView(\n+ displayName = DISPLAY_NAME,\n+ emailAddress = EMAIL_ADDRESS,\n+ accountColor = 0xFF0000,\n+ )\n+ }\n+}\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun AccountViewWithLongDisplayName() {\n+ PreviewWithThemes {\n+ AccountView(\n+ displayName = \"$LONG_TEXT $DISPLAY_NAME\",\n+ emailAddress = EMAIL_ADDRESS,\n+ accountColor = 0,\n+ )\n+ }\n+}\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun AccountViewWithLongEmailPreview() {\n+ PreviewWithThemes {\n+ AccountView(\n+ displayName = DISPLAY_NAME,\n+ emailAddress = \"$LONG_TEXT@example.com\",\n+ accountColor = 0,\n+ )\n+ }\n+}\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/NavigationDrawerModule.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/NavigationDrawerModule.kt\nindex 0c17eb6c327..edb1f961952 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/NavigationDrawerModule.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/NavigationDrawerModule.kt\n@@ -39,5 +39,9 @@ val navigationDrawerModule: Module = module {\n )\n }\n \n- viewModel { DrawerViewModel() }\n+ viewModel {\n+ DrawerViewModel(\n+ getDisplayAccounts = get(),\n+ )\n+ }\n }\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/DomainContract.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/DomainContract.kt\nindex 61d6fcc9bd1..dec8f13f825 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/DomainContract.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/DomainContract.kt\n@@ -7,7 +7,7 @@ interface DomainContract {\n \n interface UseCase {\n fun interface GetDisplayAccounts {\n- fun execute(): Flow>\n+ operator fun invoke(): Flow>\n }\n }\n }\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/usecase/GetDisplayAccounts.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/usecase/GetDisplayAccounts.kt\nindex 7327e90c478..17e1435a003 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/usecase/GetDisplayAccounts.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/usecase/GetDisplayAccounts.kt\n@@ -27,7 +27,7 @@ class GetDisplayAccounts(\n ) : UseCase.GetDisplayAccounts {\n \n @OptIn(ExperimentalCoroutinesApi::class)\n- override fun execute(): Flow> {\n+ override fun invoke(): Flow> {\n return accountManager.getAccountsFlow()\n .flatMapLatest { accounts ->\n val messageCountsFlows: List> = accounts.map { account ->\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/legacy/AccountsViewModel.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/legacy/AccountsViewModel.kt\nindex ca630d6baba..351a9107d0c 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/legacy/AccountsViewModel.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/legacy/AccountsViewModel.kt\n@@ -9,5 +9,5 @@ import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccount\n class AccountsViewModel(\n getDisplayAccounts: UseCase.GetDisplayAccounts,\n ) : ViewModel() {\n- val displayAccountsLiveData: LiveData> = getDisplayAccounts.execute().asLiveData()\n+ val displayAccountsLiveData: LiveData> = getDisplayAccounts().asLiveData()\n }\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContent.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContent.kt\nindex b0319911310..fd765cacfee 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContent.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContent.kt\n@@ -1,17 +1,23 @@\n package app.k9mail.feature.navigation.drawer.ui\n \n+import androidx.compose.foundation.layout.Arrangement\n+import androidx.compose.foundation.layout.Column\n import androidx.compose.foundation.layout.fillMaxSize\n import androidx.compose.foundation.layout.padding\n import androidx.compose.foundation.lazy.LazyColumn\n import androidx.compose.runtime.Composable\n import androidx.compose.ui.Modifier\n import androidx.compose.ui.platform.testTag\n+import app.k9mail.core.ui.compose.designsystem.atom.DividerHorizontal\n import app.k9mail.core.ui.compose.designsystem.atom.Surface\n import app.k9mail.core.ui.compose.designsystem.organism.drawer.NavigationDrawerItem\n import app.k9mail.core.ui.compose.theme2.MainTheme\n+import app.k9mail.feature.navigation.drawer.ui.DrawerContract.State\n+import app.k9mail.feature.navigation.drawer.ui.account.AccountView\n \n @Composable\n fun DrawerContent(\n+ state: State,\n modifier: Modifier = Modifier,\n ) {\n Surface(\n@@ -19,33 +25,48 @@ fun DrawerContent(\n .fillMaxSize()\n .testTag(\"DrawerContent\"),\n ) {\n- LazyColumn(\n+ Column(\n modifier = Modifier\n .fillMaxSize()\n .padding(\n vertical = MainTheme.spacings.oneHalf,\n ),\n+ verticalArrangement = Arrangement.spacedBy(MainTheme.spacings.default),\n ) {\n- item {\n- NavigationDrawerItem(\n- label = \"Folder1\",\n- selected = true,\n- onClick = {},\n- )\n- }\n- item {\n- NavigationDrawerItem(\n- label = \"Folder2\",\n- selected = false,\n- onClick = {},\n+ state.currentAccount?.let {\n+ AccountView(\n+ displayName = it.account.displayName,\n+ emailAddress = it.account.email,\n+ accountColor = it.account.chipColor,\n )\n+\n+ DividerHorizontal()\n }\n- item {\n- NavigationDrawerItem(\n- label = \"Folder3\",\n- selected = false,\n- onClick = {},\n- )\n+ LazyColumn(\n+ modifier = Modifier\n+ .fillMaxSize(),\n+ ) {\n+ item {\n+ NavigationDrawerItem(\n+ label = \"Folder1\",\n+ selected = true,\n+ onClick = {},\n+ )\n+ }\n+ item {\n+ NavigationDrawerItem(\n+ label = \"Folder2\",\n+ selected = false,\n+ onClick = {},\n+ )\n+ }\n+ item {\n+ NavigationDrawerItem(\n+ label = \"Folder3\",\n+ selected = false,\n+ onClick = {},\n+ )\n+ }\n }\n }\n }\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContract.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContract.kt\nindex d06a981cd02..3f1cf11f9e8 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContract.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContract.kt\n@@ -1,12 +1,15 @@\n package app.k9mail.feature.navigation.drawer.ui\n \n import app.k9mail.core.ui.compose.common.mvi.UnidirectionalViewModel\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccount\n \n interface DrawerContract {\n \n interface ViewModel : UnidirectionalViewModel\n \n data class State(\n+ val currentAccount: DisplayAccount? = null,\n+ val accounts: List = emptyList(),\n val isLoading: Boolean = false,\n )\n \ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerView.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerView.kt\nindex 22411299d59..01a4b5b6ce0 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerView.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerView.kt\n@@ -15,6 +15,8 @@ fun DrawerView(\n isRefreshing = state.value.isLoading,\n onRefresh = { dispatch(DrawerContract.Event.OnRefresh) },\n ) {\n- DrawerContent()\n+ DrawerContent(\n+ state = state.value,\n+ )\n }\n }\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewModel.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewModel.kt\nindex 945e20eac8e..65b43bb4740 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewModel.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewModel.kt\n@@ -2,6 +2,8 @@ package app.k9mail.feature.navigation.drawer.ui\n \n import androidx.lifecycle.viewModelScope\n import app.k9mail.core.ui.compose.common.mvi.BaseViewModel\n+import app.k9mail.feature.navigation.drawer.domain.DomainContract.UseCase\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccount\n import app.k9mail.feature.navigation.drawer.ui.DrawerContract.Effect\n import app.k9mail.feature.navigation.drawer.ui.DrawerContract.Event\n import app.k9mail.feature.navigation.drawer.ui.DrawerContract.State\n@@ -11,12 +13,35 @@ import kotlinx.coroutines.launch\n \n @Suppress(\"MagicNumber\")\n class DrawerViewModel(\n+ private val getDisplayAccounts: UseCase.GetDisplayAccounts,\n initialState: State = State(),\n ) : BaseViewModel(\n initialState = initialState,\n ),\n ViewModel {\n \n+ init {\n+ viewModelScope.launch {\n+ getDisplayAccounts().collect { accounts -> updateAccounts(accounts) }\n+ }\n+ }\n+\n+ private fun updateAccounts(accounts: List) {\n+ val currentAccountUuid = state.value.currentAccount?.account?.uuid\n+ val isCurrentAccountAvailable = accounts.any { currentAccountUuid == it.account.uuid }\n+\n+ updateState {\n+ if (isCurrentAccountAvailable) {\n+ it.copy(accounts = accounts)\n+ } else {\n+ it.copy(\n+ currentAccount = accounts.firstOrNull(),\n+ accounts = accounts,\n+ )\n+ }\n+ }\n+ }\n+\n override fun event(event: Event) {\n when (event) {\n Event.OnRefresh -> refresh()\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountIndicator.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountIndicator.kt\nnew file mode 100644\nindex 00000000000..fadd7734756\n--- /dev/null\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountIndicator.kt\n@@ -0,0 +1,32 @@\n+package app.k9mail.feature.navigation.drawer.ui.account\n+\n+import androidx.compose.foundation.layout.defaultMinSize\n+import androidx.compose.foundation.layout.width\n+import androidx.compose.runtime.Composable\n+import androidx.compose.ui.Modifier\n+import androidx.compose.ui.graphics.Color\n+import app.k9mail.core.ui.compose.designsystem.atom.Surface\n+import app.k9mail.core.ui.compose.theme2.MainTheme\n+import app.k9mail.core.ui.compose.theme2.toHarmonizedColor\n+\n+@Composable\n+fun AccountIndicator(\n+ accountColor: Int,\n+ modifier: Modifier = Modifier,\n+) {\n+ val color = if (accountColor == 0) {\n+ MainTheme.colors.primary\n+ } else {\n+ Color(accountColor).toHarmonizedColor(MainTheme.colors.surface)\n+ }\n+\n+ Surface(\n+ modifier = modifier\n+ .width(MainTheme.spacings.half)\n+ .defaultMinSize(\n+ minHeight = MainTheme.spacings.default,\n+ ),\n+ color = color,\n+ shape = MainTheme.shapes.medium,\n+ ) {}\n+}\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountView.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountView.kt\nnew file mode 100644\nindex 00000000000..d4d16d78894\n--- /dev/null\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountView.kt\n@@ -0,0 +1,58 @@\n+package app.k9mail.feature.navigation.drawer.ui.account\n+\n+import androidx.compose.foundation.layout.Arrangement\n+import androidx.compose.foundation.layout.Column\n+import androidx.compose.foundation.layout.IntrinsicSize\n+import androidx.compose.foundation.layout.Row\n+import androidx.compose.foundation.layout.fillMaxHeight\n+import androidx.compose.foundation.layout.fillMaxWidth\n+import androidx.compose.foundation.layout.height\n+import androidx.compose.foundation.layout.padding\n+import androidx.compose.runtime.Composable\n+import androidx.compose.ui.Alignment\n+import androidx.compose.ui.Modifier\n+import app.k9mail.core.ui.compose.designsystem.atom.text.TextBodyLarge\n+import app.k9mail.core.ui.compose.designsystem.atom.text.TextBodyMedium\n+import app.k9mail.core.ui.compose.theme2.MainTheme\n+\n+@Composable\n+fun AccountView(\n+ displayName: String,\n+ emailAddress: String,\n+ accountColor: Int,\n+ modifier: Modifier = Modifier,\n+) {\n+ Row(\n+ modifier = modifier\n+ .fillMaxWidth()\n+ .height(intrinsicSize = IntrinsicSize.Max)\n+ .padding(\n+ top = MainTheme.spacings.default,\n+ start = MainTheme.spacings.double,\n+ end = MainTheme.spacings.triple,\n+ bottom = MainTheme.spacings.oneHalf,\n+ ),\n+ verticalAlignment = Alignment.CenterVertically,\n+ ) {\n+ AccountIndicator(\n+ accountColor = accountColor,\n+ modifier = Modifier\n+ .fillMaxHeight()\n+ .padding(\n+ end = MainTheme.spacings.default,\n+ ),\n+ )\n+ Column(\n+ verticalArrangement = Arrangement.spacedBy(MainTheme.spacings.half),\n+ ) {\n+ TextBodyLarge(\n+ text = displayName,\n+ color = MainTheme.colors.onSurface,\n+ )\n+ TextBodyMedium(\n+ text = emailAddress,\n+ color = MainTheme.colors.onSurfaceVariant,\n+ )\n+ }\n+ }\n+}\n", "test_patch": "diff --git a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/FakeData.kt b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/FakeData.kt\nnew file mode 100644\nindex 00000000000..3bcbd017480\n--- /dev/null\n+++ b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/FakeData.kt\n@@ -0,0 +1,37 @@\n+package app.k9mail.feature.navigation.drawer.ui.account\n+\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccount\n+import app.k9mail.legacy.account.Account\n+import app.k9mail.legacy.account.Identity\n+\n+internal object FakeData {\n+\n+ const val ACCOUNT_UUID = \"uuid\"\n+ const val DISPLAY_NAME = \"Account Name\"\n+ const val EMAIL_ADDRESS = \"test@example.com\"\n+\n+ const val LONG_TEXT = \"loremipsumdolorsitametconsetetursadipscingelitr\" +\n+ \"seddiamnonumyeirmodtemporinviduntutlaboreetdoloremagnaaliquyameratseddiamvoluptua\"\n+\n+ val ACCOUNT = Account(\n+ uuid = ACCOUNT_UUID,\n+ ).apply {\n+ identities = ArrayList()\n+\n+ val identity = Identity(\n+ signatureUse = false,\n+ signature = \"\",\n+ description = \"\",\n+ )\n+ identities.add(identity)\n+\n+ name = DISPLAY_NAME\n+ email = EMAIL_ADDRESS\n+ }\n+\n+ val DISPLAY_ACCOUNT = DisplayAccount(\n+ account = ACCOUNT,\n+ unreadMessageCount = 0,\n+ starredMessageCount = 0,\n+ )\n+}\ndiff --git a/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewModelTest.kt b/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewModelTest.kt\nindex a0f39c6bfab..c1d0725bc4f 100644\n--- a/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewModelTest.kt\n+++ b/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewModelTest.kt\n@@ -2,12 +2,18 @@ package app.k9mail.feature.navigation.drawer.ui\n \n import app.k9mail.core.ui.compose.testing.MainDispatcherRule\n import app.k9mail.core.ui.compose.testing.mvi.eventStateTest\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccount\n import app.k9mail.feature.navigation.drawer.ui.DrawerContract.Event\n import app.k9mail.feature.navigation.drawer.ui.DrawerContract.State\n+import app.k9mail.legacy.account.Account\n+import app.k9mail.legacy.account.Identity\n import assertk.assertThat\n import assertk.assertions.isEqualTo\n import kotlin.test.Test\n import kotlinx.coroutines.ExperimentalCoroutinesApi\n+import kotlinx.coroutines.flow.Flow\n+import kotlinx.coroutines.flow.MutableStateFlow\n+import kotlinx.coroutines.flow.flow\n import kotlinx.coroutines.test.advanceUntilIdle\n import kotlinx.coroutines.test.runTest\n import org.junit.Rule\n@@ -18,10 +24,10 @@ class DrawerViewModelTest {\n @get:Rule\n val mainDispatcherRule = MainDispatcherRule()\n \n- private val testSubject = DrawerViewModel()\n-\n @Test\n fun `should change loading state when OnRefresh event is received`() = runTest {\n+ val testSubject = createTestSubject()\n+\n eventStateTest(\n viewModel = testSubject,\n initialState = State(isLoading = false),\n@@ -34,4 +40,98 @@ class DrawerViewModelTest {\n \n assertThat(testSubject.state.value.isLoading).isEqualTo(false)\n }\n+\n+ @Test\n+ fun `should collect display accounts when created and select first as current`() = runTest {\n+ val displayAccounts = createDisplayAccountList(3)\n+ val getDisplayAccountsFlow = MutableStateFlow(displayAccounts)\n+ val testSubject = createTestSubject(\n+ getDisplayAccountsFlow = getDisplayAccountsFlow,\n+ )\n+\n+ advanceUntilIdle()\n+\n+ assertThat(testSubject.state.value.accounts.size).isEqualTo(displayAccounts.size)\n+ assertThat(testSubject.state.value.accounts).isEqualTo(displayAccounts)\n+ assertThat(testSubject.state.value.currentAccount).isEqualTo(displayAccounts.first())\n+ }\n+\n+ @Test\n+ fun `should reselect current account when old not present anymore`() = runTest {\n+ val displayAccounts = createDisplayAccountList(3)\n+ val getDisplayAccountsFlow = MutableStateFlow(displayAccounts)\n+ val testSubject = createTestSubject(\n+ getDisplayAccountsFlow = getDisplayAccountsFlow,\n+ )\n+\n+ advanceUntilIdle()\n+\n+ val newDisplayAccounts = displayAccounts.drop(1)\n+ getDisplayAccountsFlow.emit(newDisplayAccounts)\n+\n+ advanceUntilIdle()\n+\n+ assertThat(testSubject.state.value.accounts.size).isEqualTo(newDisplayAccounts.size)\n+ assertThat(testSubject.state.value.accounts).isEqualTo(newDisplayAccounts)\n+ assertThat(testSubject.state.value.currentAccount).isEqualTo(newDisplayAccounts.first())\n+ }\n+\n+ @Test\n+ fun `should set current account to null when no accounts are present`() = runTest {\n+ val getDisplayAccountsFlow = MutableStateFlow(emptyList())\n+ val testSubject = createTestSubject(\n+ getDisplayAccountsFlow = getDisplayAccountsFlow,\n+ )\n+\n+ advanceUntilIdle()\n+\n+ assertThat(testSubject.state.value.accounts.size).isEqualTo(0)\n+ assertThat(testSubject.state.value.currentAccount).isEqualTo(null)\n+ }\n+\n+ private fun createTestSubject(\n+ getDisplayAccountsFlow: Flow> = flow { emit(emptyList()) },\n+ ): DrawerViewModel {\n+ return DrawerViewModel(\n+ getDisplayAccounts = { getDisplayAccountsFlow },\n+ )\n+ }\n+\n+ private fun createDisplayAccount(\n+ uuid: String = \"uuid\",\n+ name: String = \"name\",\n+ email: String = \"test@example.com\",\n+ unreadCount: Int = 0,\n+ starredCount: Int = 0,\n+ ): DisplayAccount {\n+ val account = Account(\n+ uuid = uuid,\n+ ).also {\n+ it.identities = ArrayList()\n+\n+ val identity = Identity(\n+ signatureUse = false,\n+ signature = \"\",\n+ description = \"\",\n+ )\n+ it.identities.add(identity)\n+\n+ it.name = name\n+ it.email = email\n+ }\n+\n+ return DisplayAccount(\n+ account = account,\n+ unreadMessageCount = unreadCount,\n+ starredMessageCount = starredCount,\n+ )\n+ }\n+\n+ private fun createDisplayAccountList(count: Int): List {\n+ return List(count) { index ->\n+ createDisplayAccount(\n+ uuid = \"uuid-$index\",\n+ )\n+ }\n+ }\n }\n", "n2p_tests": {"app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should collect display accounts when created and select first as current": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should set current account to null when no accounts are present": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should reselect current account when old not present anymore": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should change loading state when OnRefresh event is received": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "thunderbird__thunderbird-android-8155", "org": "thunderbird", "repo": "thunderbird-android", "number": 8155, "state": "closed", "title": "Add drawer unified folder support", "body": "Added the unified folder support for the drawer. The default selection has not been implemented as it requires state information from the MessageList properly propagated: #8142\r\n\r\n![drawer with unified folder support](https://github.com/user-attachments/assets/94502a0b-45d9-4a78-8e83-aa908531289c)\r\n\r\nDepends on #8151\r\n\r\nResolves #8121 \r\n", "base": {"label": "thunderbird:main", "ref": "main", "sha": "0bde0aecc707f0e78b549356fbb4200056a94206"}, "resolved_issues": [{"number": 8121, "title": "Add the unified folder list section", "body": "Implement the unified folders highlighted in this design:\n\n![Image](https://github.com/user-attachments/assets/816bd591-edb4-43d3-9575-33da2e7b60aa)\n\n"}], "lang": "kotlin", "problem_statement": "Add the unified folder list section\nImplement the unified folders highlighted in this design:\n\n![Image](https://github.com/user-attachments/assets/816bd591-edb4-43d3-9575-33da2e7b60aa)\n\n\n", "pull_url": "https://github.com/thunderbird/thunderbird-android/pull/8155", "issue_urls": ["https://github.com/thunderbird/thunderbird-android/issues/8121"], "test_command": "./gradlew :feature:navigation:drawer:testDebugUnitTest --tests \"app.k9mail.feature.navigation.drawer.domain.usecase.GetDrawerConfigTest\" --tests \"app.k9mail.feature.navigation.drawer.ui.DrawerStateTest\" --tests \"app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest\" --tests \"app.k9mail.feature.navigation.drawer.ui.DrawerViewKtTest\" :feature:widget:unread:testDebugUnitTest --tests \"app.k9mail.feature.widget.unread.UnreadWidgetDataProviderTest\"", "fix_patch": "diff --git a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/icon/Icons.kt b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/icon/Icons.kt\nindex 592c561be6a..5e4a5861902 100644\n--- a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/icon/Icons.kt\n+++ b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/icon/Icons.kt\n@@ -8,6 +8,7 @@ import androidx.compose.material.icons.filled.Outbox\n import androidx.compose.material.icons.filled.Star\n import androidx.compose.material.icons.filled.VisibilityOff\n import androidx.compose.material.icons.outlined.AccountCircle\n+import androidx.compose.material.icons.outlined.AllInbox\n import androidx.compose.material.icons.outlined.Archive\n import androidx.compose.material.icons.outlined.Check\n import androidx.compose.material.icons.outlined.ChevronLeft\n@@ -50,6 +51,9 @@ object Icons {\n val AccountCircle: ImageVector\n get() = MaterialIcons.Outlined.AccountCircle\n \n+ val AllInbox: ImageVector\n+ get() = MaterialIcons.Outlined.AllInbox\n+\n val Archive: ImageVector\n get() = MaterialIcons.Outlined.Archive\n \ndiff --git a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContentPreview.kt b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContentPreview.kt\nindex 4b7398034d5..c853fb01ec5 100644\n--- a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContentPreview.kt\n+++ b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContentPreview.kt\n@@ -4,6 +4,8 @@ import androidx.compose.runtime.Composable\n import androidx.compose.ui.tooling.preview.Preview\n import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme\n import app.k9mail.feature.navigation.drawer.ui.FakeData.DISPLAY_ACCOUNT\n+import app.k9mail.feature.navigation.drawer.ui.FakeData.DISPLAY_FOLDER\n+import app.k9mail.feature.navigation.drawer.ui.FakeData.UNIFIED_FOLDER\n import kotlinx.collections.immutable.persistentListOf\n \n @Composable\n@@ -23,7 +25,7 @@ internal fun DrawerContentPreview() {\n \n @Composable\n @Preview(showBackground = true)\n-fun DrawerContentWithAccountPreview() {\n+internal fun DrawerContentWithAccountPreview() {\n PreviewWithTheme {\n DrawerContent(\n state = DrawerContract.State(\n@@ -35,3 +37,44 @@ fun DrawerContentWithAccountPreview() {\n )\n }\n }\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun DrawerContentWithFoldersPreview() {\n+ PreviewWithTheme {\n+ DrawerContent(\n+ state = DrawerContract.State(\n+ accounts = persistentListOf(\n+ DISPLAY_ACCOUNT,\n+ ),\n+ selectedAccount = null,\n+ folders = persistentListOf(\n+ UNIFIED_FOLDER,\n+ DISPLAY_FOLDER,\n+ ),\n+ ),\n+ onEvent = {},\n+ )\n+ }\n+}\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun DrawerContentWithSelectedFolderPreview() {\n+ PreviewWithTheme {\n+ DrawerContent(\n+ state = DrawerContract.State(\n+ accounts = persistentListOf(\n+ DISPLAY_ACCOUNT,\n+ ),\n+ selectedAccount = DISPLAY_ACCOUNT,\n+ folders = persistentListOf(\n+ UNIFIED_FOLDER,\n+ DISPLAY_FOLDER,\n+ ),\n+ selectedFolder = DISPLAY_FOLDER,\n+ ),\n+ onEvent = {},\n+ )\n+ }\n+}\ndiff --git a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountAvatarPreview.kt b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountAvatarPreview.kt\nindex 106a27621e7..3f4d0533fbb 100644\n--- a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountAvatarPreview.kt\n+++ b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountAvatarPreview.kt\n@@ -7,7 +7,7 @@ import app.k9mail.feature.navigation.drawer.ui.FakeData.DISPLAY_ACCOUNT\n \n @Composable\n @Preview(showBackground = true)\n-fun AccountAvatarPreview() {\n+internal fun AccountAvatarPreview() {\n PreviewWithThemes {\n AccountAvatar(\n account = DISPLAY_ACCOUNT,\ndiff --git a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountListItemPreview.kt b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountListItemPreview.kt\nindex 8c3588764eb..f4666c0d487 100644\n--- a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountListItemPreview.kt\n+++ b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountListItemPreview.kt\n@@ -7,7 +7,7 @@ import app.k9mail.feature.navigation.drawer.ui.FakeData.DISPLAY_ACCOUNT\n \n @Composable\n @Preview(showBackground = true)\n-fun AccountListItemPreview() {\n+internal fun AccountListItemPreview() {\n PreviewWithThemes {\n AccountListItem(\n account = DISPLAY_ACCOUNT,\ndiff --git a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountListPreview.kt b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountListPreview.kt\nindex 1a1aa916b9c..81c688f2dbf 100644\n--- a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountListPreview.kt\n+++ b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/account/AccountListPreview.kt\n@@ -8,7 +8,7 @@ import kotlinx.collections.immutable.persistentListOf\n \n @Composable\n @Preview(showBackground = true)\n-fun AccountListPreview() {\n+internal fun AccountListPreview() {\n PreviewWithTheme {\n AccountList(\n accounts = persistentListOf(\n@@ -23,7 +23,7 @@ fun AccountListPreview() {\n \n @Composable\n @Preview(showBackground = true)\n-fun AccountListWithSelectedPreview() {\n+internal fun AccountListWithSelectedPreview() {\n PreviewWithTheme {\n AccountList(\n accounts = persistentListOf(\ndiff --git a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderListItemPreview.kt b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderListItemPreview.kt\nindex 18835b183b2..e502e974df9 100644\n--- a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderListItemPreview.kt\n+++ b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderListItemPreview.kt\n@@ -1,66 +1,73 @@\n package app.k9mail.feature.navigation.drawer.ui.folder\n \n import androidx.compose.runtime.Composable\n+import androidx.compose.ui.platform.LocalContext\n import androidx.compose.ui.tooling.preview.Preview\n import app.k9mail.core.mail.folder.api.FolderType\n import app.k9mail.core.ui.compose.designsystem.PreviewWithThemes\n import app.k9mail.feature.navigation.drawer.ui.FakeData.DISPLAY_FOLDER\n+import app.k9mail.feature.navigation.drawer.ui.FakeData.UNIFIED_FOLDER\n+import app.k9mail.legacy.ui.folder.FolderNameFormatter\n \n @Composable\n @Preview(showBackground = true)\n-fun FolderListItemPreview() {\n+internal fun FolderListItemPreview() {\n PreviewWithThemes {\n FolderListItem(\n displayFolder = DISPLAY_FOLDER,\n selected = false,\n showStarredCount = false,\n onClick = {},\n+ folderNameFormatter = FolderNameFormatter(LocalContext.current.resources),\n )\n }\n }\n \n @Composable\n @Preview(showBackground = true)\n-fun FolderListItemSelectedPreview() {\n+internal fun FolderListItemSelectedPreview() {\n PreviewWithThemes {\n FolderListItem(\n displayFolder = DISPLAY_FOLDER,\n selected = true,\n showStarredCount = false,\n onClick = {},\n+ folderNameFormatter = FolderNameFormatter(LocalContext.current.resources),\n )\n }\n }\n \n @Composable\n @Preview(showBackground = true)\n-fun FolderListItemWithStarredPreview() {\n+internal fun FolderListItemWithStarredPreview() {\n PreviewWithThemes {\n FolderListItem(\n displayFolder = DISPLAY_FOLDER,\n selected = false,\n showStarredCount = true,\n onClick = {},\n+ folderNameFormatter = FolderNameFormatter(LocalContext.current.resources),\n )\n }\n }\n \n @Composable\n @Preview(showBackground = true)\n-fun FolderListItemWithStarredSelectedPreview() {\n+internal fun FolderListItemWithStarredSelectedPreview() {\n PreviewWithThemes {\n FolderListItem(\n displayFolder = DISPLAY_FOLDER,\n selected = true,\n showStarredCount = true,\n onClick = {},\n+ folderNameFormatter = FolderNameFormatter(LocalContext.current.resources),\n )\n }\n }\n \n @Composable\n @Preview(showBackground = true)\n-fun FolderListItemWithInboxFolderPreview() {\n+internal fun FolderListItemWithInboxFolderPreview() {\n PreviewWithThemes {\n FolderListItem(\n displayFolder = DISPLAY_FOLDER.copy(\n@@ -71,6 +78,21 @@ fun FolderListItemWithInboxFolderPreview() {\n selected = false,\n showStarredCount = true,\n onClick = {},\n+ folderNameFormatter = FolderNameFormatter(LocalContext.current.resources),\n+ )\n+ }\n+}\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun FolderListItemWithUnifiedFolderPreview() {\n+ PreviewWithThemes {\n+ FolderListItem(\n+ displayFolder = UNIFIED_FOLDER,\n+ selected = false,\n+ showStarredCount = false,\n+ onClick = {},\n+ folderNameFormatter = FolderNameFormatter(LocalContext.current.resources),\n )\n }\n }\ndiff --git a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderListPreview.kt b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderListPreview.kt\nnew file mode 100644\nindex 00000000000..7ecfcef883f\n--- /dev/null\n+++ b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderListPreview.kt\n@@ -0,0 +1,54 @@\n+package app.k9mail.feature.navigation.drawer.ui.folder\n+\n+import androidx.compose.runtime.Composable\n+import androidx.compose.ui.tooling.preview.Preview\n+import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme\n+import app.k9mail.feature.navigation.drawer.ui.FakeData.DISPLAY_FOLDER\n+import app.k9mail.feature.navigation.drawer.ui.FakeData.UNIFIED_FOLDER\n+import kotlinx.collections.immutable.persistentListOf\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun FolderListPreview() {\n+ PreviewWithTheme {\n+ FolderList(\n+ folders = persistentListOf(\n+ DISPLAY_FOLDER,\n+ ),\n+ selectedFolder = null,\n+ onFolderClick = {},\n+ showStarredCount = false,\n+ )\n+ }\n+}\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun FolderListPreviewSelected() {\n+ PreviewWithTheme {\n+ FolderList(\n+ folders = persistentListOf(\n+ DISPLAY_FOLDER,\n+ ),\n+ selectedFolder = DISPLAY_FOLDER,\n+ onFolderClick = {},\n+ showStarredCount = false,\n+ )\n+ }\n+}\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun FolderListWithUnifiedFolderPreview() {\n+ PreviewWithTheme {\n+ FolderList(\n+ folders = persistentListOf(\n+ UNIFIED_FOLDER,\n+ DISPLAY_FOLDER,\n+ ),\n+ selectedFolder = DISPLAY_FOLDER,\n+ onFolderClick = {},\n+ showStarredCount = false,\n+ )\n+ }\n+}\ndiff --git a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/setting/SettingItemPreview.kt b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/setting/SettingItemPreview.kt\nindex f3b3adc32e4..cfd63708628 100644\n--- a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/setting/SettingItemPreview.kt\n+++ b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/setting/SettingItemPreview.kt\n@@ -6,7 +6,7 @@ import app.k9mail.core.ui.compose.designsystem.PreviewWithThemes\n \n @Composable\n @Preview(showBackground = true)\n-fun SettingItemPreview() {\n+internal fun SettingItemPreview() {\n PreviewWithThemes {\n SettingItem(\n label = \"Setting\",\ndiff --git a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/setting/SettingListItemPreview.kt b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/setting/SettingListItemPreview.kt\nindex 0ea943319f8..a5e16ecbaf5 100644\n--- a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/setting/SettingListItemPreview.kt\n+++ b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/setting/SettingListItemPreview.kt\n@@ -7,7 +7,7 @@ import app.k9mail.core.ui.compose.designsystem.atom.icon.Icons\n \n @Composable\n @Preview(showBackground = true)\n-fun SettingListItemPreview() {\n+internal fun SettingListItemPreview() {\n PreviewWithThemes {\n SettingListItem(\n label = \"Settings\",\ndiff --git a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/setting/SettingListPreview.kt b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/setting/SettingListPreview.kt\nindex 34a2659c59e..a9587eaff76 100644\n--- a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/setting/SettingListPreview.kt\n+++ b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/setting/SettingListPreview.kt\n@@ -6,7 +6,7 @@ import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme\n \n @Composable\n @Preview(showBackground = true)\n-fun SettingListPreview() {\n+internal fun SettingListPreview() {\n PreviewWithTheme {\n SettingList(\n onAccountSelectorClick = {},\n@@ -18,7 +18,7 @@ fun SettingListPreview() {\n \n @Composable\n @Preview(showBackground = true)\n-fun SettingListShowAccountSelectorPreview() {\n+internal fun SettingListShowAccountSelectorPreview() {\n PreviewWithTheme {\n SettingList(\n onAccountSelectorClick = {},\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/FolderDrawer.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/FolderDrawer.kt\nindex abde0ffd0dd..c1fabae908f 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/FolderDrawer.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/FolderDrawer.kt\n@@ -17,6 +17,7 @@ class FolderDrawer(\n override val parent: AppCompatActivity,\n private val openAccount: (account: Account) -> Unit,\n private val openFolder: (folderId: Long) -> Unit,\n+ private val openUnifiedFolder: () -> Unit,\n private val openManageFolders: () -> Unit,\n private val openSettings: () -> Unit,\n createDrawerListener: () -> DrawerLayout.DrawerListener,\n@@ -40,6 +41,7 @@ class FolderDrawer(\n DrawerView(\n openAccount = openAccount,\n openFolder = openFolder,\n+ openUnifiedFolder = openUnifiedFolder,\n openManageFolders = openManageFolders,\n openSettings = openSettings,\n closeDrawer = { close() },\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/NavigationDrawerModule.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/NavigationDrawerModule.kt\nindex 5d751563bbe..a69724638f3 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/NavigationDrawerModule.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/NavigationDrawerModule.kt\n@@ -33,6 +33,7 @@ val navigationDrawerModule: Module = module {\n single {\n GetDisplayFoldersForAccount(\n repository = get(),\n+ messageCountsProvider = get(),\n )\n }\n \ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/DomainContract.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/DomainContract.kt\nindex ed9eec44337..be741190c3e 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/DomainContract.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/DomainContract.kt\n@@ -1,7 +1,7 @@\n package app.k9mail.feature.navigation.drawer.domain\n \n import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccount\n-import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccountFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayFolder\n import app.k9mail.feature.navigation.drawer.domain.entity.DrawerConfig\n import app.k9mail.legacy.account.Account\n import kotlinx.coroutines.flow.Flow\n@@ -18,7 +18,7 @@ interface DomainContract {\n }\n \n fun interface GetDisplayFoldersForAccount {\n- operator fun invoke(accountUuid: String): Flow>\n+ operator fun invoke(accountUuid: String, includeUnifiedFolders: Boolean): Flow>\n }\n \n /**\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DisplayAccountFolder.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DisplayAccountFolder.kt\nindex f5f561d1df2..7c94d3112d6 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DisplayAccountFolder.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DisplayAccountFolder.kt\n@@ -6,6 +6,8 @@ data class DisplayAccountFolder(\n val accountUuid: String,\n val folder: Folder,\n val isInTopGroup: Boolean,\n- val unreadMessageCount: Int,\n- val starredMessageCount: Int,\n-)\n+ override val unreadMessageCount: Int,\n+ override val starredMessageCount: Int,\n+) : DisplayFolder {\n+ override val id: String = accountUuid + folder.id\n+}\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DisplayFolder.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DisplayFolder.kt\nnew file mode 100644\nindex 00000000000..7caaf35da2d\n--- /dev/null\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DisplayFolder.kt\n@@ -0,0 +1,7 @@\n+package app.k9mail.feature.navigation.drawer.domain.entity\n+\n+interface DisplayFolder {\n+ val id: String\n+ val unreadMessageCount: Int\n+ val starredMessageCount: Int\n+}\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DisplayUnifiedFolder.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DisplayUnifiedFolder.kt\nnew file mode 100644\nindex 00000000000..5c48169df86\n--- /dev/null\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DisplayUnifiedFolder.kt\n@@ -0,0 +1,8 @@\n+package app.k9mail.feature.navigation.drawer.domain.entity\n+\n+data class DisplayUnifiedFolder(\n+ override val id: String,\n+ val unifiedType: DisplayUnifiedFolderType,\n+ override val unreadMessageCount: Int,\n+ override val starredMessageCount: Int,\n+) : DisplayFolder\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DisplayUnifiedFolderType.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DisplayUnifiedFolderType.kt\nnew file mode 100644\nindex 00000000000..2c510766a65\n--- /dev/null\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DisplayUnifiedFolderType.kt\n@@ -0,0 +1,5 @@\n+package app.k9mail.feature.navigation.drawer.domain.entity\n+\n+enum class DisplayUnifiedFolderType {\n+ INBOX,\n+}\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DrawerConfig.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DrawerConfig.kt\nindex 07c6168016b..1fe2a96bd9d 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DrawerConfig.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/entity/DrawerConfig.kt\n@@ -1,6 +1,6 @@\n package app.k9mail.feature.navigation.drawer.domain.entity\n \n data class DrawerConfig(\n- val showUnifiedInbox: Boolean,\n+ val showUnifiedFolders: Boolean,\n val showStarredCount: Boolean,\n )\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/usecase/GetDisplayFoldersForAccount.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/usecase/GetDisplayFoldersForAccount.kt\nindex df5449c4b09..a853a8d4603 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/usecase/GetDisplayFoldersForAccount.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/domain/usecase/GetDisplayFoldersForAccount.kt\n@@ -2,14 +2,22 @@ package app.k9mail.feature.navigation.drawer.domain.usecase\n \n import app.k9mail.feature.navigation.drawer.domain.DomainContract.UseCase\n import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccountFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayUnifiedFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayUnifiedFolderType\n+import app.k9mail.legacy.message.controller.MessageCountsProvider\n+import app.k9mail.legacy.search.LocalSearch\n+import app.k9mail.legacy.search.api.SearchAttribute\n+import app.k9mail.legacy.search.api.SearchField\n import app.k9mail.legacy.ui.folder.DisplayFolderRepository\n import kotlinx.coroutines.flow.Flow\n import kotlinx.coroutines.flow.map\n \n class GetDisplayFoldersForAccount(\n private val repository: DisplayFolderRepository,\n+ private val messageCountsProvider: MessageCountsProvider,\n ) : UseCase.GetDisplayFoldersForAccount {\n- override fun invoke(accountUuid: String): Flow> {\n+ override fun invoke(accountUuid: String, includeUnifiedFolders: Boolean): Flow> {\n return repository.getDisplayFoldersFlow(accountUuid).map { displayFolders ->\n displayFolders.map { displayFolder ->\n DisplayAccountFolder(\n@@ -20,6 +28,41 @@ class GetDisplayFoldersForAccount(\n starredMessageCount = displayFolder.starredMessageCount,\n )\n }\n+ }.map { displayFolders ->\n+ if (includeUnifiedFolders) {\n+ createDisplayUnifiedFolders() + displayFolders\n+ } else {\n+ displayFolders\n+ }\n }\n }\n+\n+ private fun createDisplayUnifiedFolders(): List {\n+ return listOf(\n+ createUnifiedInboxFolder(),\n+ )\n+ }\n+\n+ private fun createUnifiedInboxFolder(): DisplayUnifiedFolder {\n+ val search = getUnifiedInboxSearch()\n+ val messageCounts = messageCountsProvider.getMessageCounts(search)\n+\n+ return DisplayUnifiedFolder(\n+ id = UNIFIED_INBOX_ID,\n+ unifiedType = DisplayUnifiedFolderType.INBOX,\n+ unreadMessageCount = messageCounts.unread,\n+ starredMessageCount = messageCounts.starred,\n+ )\n+ }\n+\n+ private fun getUnifiedInboxSearch(): LocalSearch {\n+ return LocalSearch().apply {\n+ id = UNIFIED_INBOX_ID\n+ and(SearchField.INTEGRATE, \"1\", SearchAttribute.EQUALS)\n+ }\n+ }\n+\n+ companion object {\n+ private const val UNIFIED_INBOX_ID = \"unified_inbox\"\n+ }\n }\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContract.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContract.kt\nindex 2ed1086827c..a7066ef50f7 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContract.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerContract.kt\n@@ -3,7 +3,7 @@ package app.k9mail.feature.navigation.drawer.ui\n import androidx.compose.runtime.Stable\n import app.k9mail.core.ui.compose.common.mvi.UnidirectionalViewModel\n import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccount\n-import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccountFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayFolder\n import app.k9mail.feature.navigation.drawer.domain.entity.DrawerConfig\n import app.k9mail.legacy.account.Account\n import kotlinx.collections.immutable.ImmutableList\n@@ -16,13 +16,13 @@ interface DrawerContract {\n @Stable\n data class State(\n val config: DrawerConfig = DrawerConfig(\n- showUnifiedInbox = false,\n+ showUnifiedFolders = false,\n showStarredCount = false,\n ),\n val accounts: ImmutableList = persistentListOf(),\n val selectedAccount: DisplayAccount? = null,\n- val folders: ImmutableList = persistentListOf(),\n- val selectedFolder: DisplayAccountFolder? = null,\n+ val folders: ImmutableList = persistentListOf(),\n+ val selectedFolder: DisplayFolder? = null,\n val showAccountSelector: Boolean = false,\n val isLoading: Boolean = false,\n )\n@@ -30,7 +30,7 @@ interface DrawerContract {\n sealed interface Event {\n data class OnAccountClick(val account: DisplayAccount) : Event\n data class OnAccountViewClick(val account: DisplayAccount) : Event\n- data class OnFolderClick(val folder: DisplayAccountFolder) : Event\n+ data class OnFolderClick(val folder: DisplayFolder) : Event\n data object OnAccountSelectorClick : Event\n data object OnManageFoldersClick : Event\n data object OnSettingsClick : Event\n@@ -40,6 +40,7 @@ interface DrawerContract {\n sealed interface Effect {\n data class OpenAccount(val account: Account) : Effect\n data class OpenFolder(val folderId: Long) : Effect\n+ data object OpenUnifiedFolder : Effect\n data object OpenManageFolders : Effect\n data object OpenSettings : Effect\n data object CloseDrawer : Effect\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerView.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerView.kt\nindex 9865a500cd6..04e4d607fbb 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerView.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerView.kt\n@@ -13,6 +13,7 @@ import org.koin.androidx.compose.koinViewModel\n fun DrawerView(\n openAccount: (account: Account) -> Unit,\n openFolder: (folderId: Long) -> Unit,\n+ openUnifiedFolder: () -> Unit,\n openManageFolders: () -> Unit,\n openSettings: () -> Unit,\n closeDrawer: () -> Unit,\n@@ -22,6 +23,7 @@ fun DrawerView(\n when (effect) {\n is Effect.OpenAccount -> openAccount(effect.account)\n is Effect.OpenFolder -> openFolder(effect.folderId)\n+ Effect.OpenUnifiedFolder -> openUnifiedFolder()\n is Effect.OpenManageFolders -> openManageFolders()\n is Effect.OpenSettings -> openSettings()\n Effect.CloseDrawer -> closeDrawer()\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewModel.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewModel.kt\nindex 86294e8e049..7af317d529b 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewModel.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewModel.kt\n@@ -5,6 +5,8 @@ import app.k9mail.core.ui.compose.common.mvi.BaseViewModel\n import app.k9mail.feature.navigation.drawer.domain.DomainContract.UseCase\n import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccount\n import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccountFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayUnifiedFolder\n import app.k9mail.feature.navigation.drawer.ui.DrawerContract.Effect\n import app.k9mail.feature.navigation.drawer.ui.DrawerContract.Event\n import app.k9mail.feature.navigation.drawer.ui.DrawerContract.State\n@@ -16,8 +18,9 @@ import kotlinx.coroutines.delay\n import kotlinx.coroutines.flow.collect\n import kotlinx.coroutines.flow.collectLatest\n import kotlinx.coroutines.flow.distinctUntilChanged\n+import kotlinx.coroutines.flow.filterNotNull\n import kotlinx.coroutines.flow.flatMapLatest\n-import kotlinx.coroutines.flow.mapNotNull\n+import kotlinx.coroutines.flow.map\n import kotlinx.coroutines.launch\n \n @Suppress(\"MagicNumber\")\n@@ -70,19 +73,22 @@ class DrawerViewModel(\n \n @OptIn(ExperimentalCoroutinesApi::class)\n private suspend fun loadFolders() {\n- state.mapNotNull { it.selectedAccount?.account?.uuid }\n+ state.map {\n+ it.selectedAccount?.let { selectAccount ->\n+ Pair(selectAccount.account.uuid, it.config.showUnifiedFolders)\n+ }\n+ }.filterNotNull()\n .distinctUntilChanged()\n- .flatMapLatest { accountUuid ->\n- getDisplayFoldersForAccount(accountUuid)\n+ .flatMapLatest { (accountUuid, showUnifiedInbox) ->\n+ getDisplayFoldersForAccount(accountUuid, showUnifiedInbox)\n }.collectLatest { folders ->\n updateFolders(folders)\n }\n }\n \n- private fun updateFolders(displayFolders: List) {\n+ private fun updateFolders(displayFolders: List) {\n val selectedFolder = displayFolders.find {\n- it.accountUuid == state.value.selectedAccount?.account?.uuid &&\n- it.folder.id == state.value.selectedFolder?.folder?.id\n+ it.id == state.value.selectedFolder?.id\n } ?: displayFolders.firstOrNull()\n \n updateState {\n@@ -133,11 +139,16 @@ class DrawerViewModel(\n }\n }\n \n- private fun selectFolder(folder: DisplayAccountFolder) {\n+ private fun selectFolder(folder: DisplayFolder) {\n updateState {\n it.copy(selectedFolder = folder)\n }\n- emitEffect(Effect.OpenFolder(folder.folder.id))\n+\n+ if (folder is DisplayAccountFolder) {\n+ emitEffect(Effect.OpenFolder(folder.folder.id))\n+ } else if (folder is DisplayUnifiedFolder) {\n+ emitEffect(Effect.OpenUnifiedFolder)\n+ }\n \n viewModelScope.launch {\n delay(DRAWER_CLOSE_DELAY)\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderList.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderList.kt\nindex 332d03a3619..e8fbb445901 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderList.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderList.kt\n@@ -2,34 +2,57 @@ package app.k9mail.feature.navigation.drawer.ui.folder\n \n import androidx.compose.foundation.layout.PaddingValues\n import androidx.compose.foundation.layout.fillMaxWidth\n+import androidx.compose.foundation.layout.padding\n import androidx.compose.foundation.lazy.LazyColumn\n import androidx.compose.foundation.lazy.items\n import androidx.compose.runtime.Composable\n+import androidx.compose.runtime.remember\n import androidx.compose.ui.Modifier\n+import androidx.compose.ui.platform.LocalContext\n+import app.k9mail.core.ui.compose.designsystem.atom.DividerHorizontal\n import app.k9mail.core.ui.compose.theme2.MainTheme\n-import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccountFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayUnifiedFolder\n+import app.k9mail.legacy.ui.folder.FolderNameFormatter\n import kotlinx.collections.immutable.ImmutableList\n \n @Composable\n fun FolderList(\n- folders: ImmutableList,\n- selectedFolder: DisplayAccountFolder?,\n- onFolderClick: (DisplayAccountFolder) -> Unit,\n+ folders: ImmutableList,\n+ selectedFolder: DisplayFolder?,\n+ onFolderClick: (DisplayFolder) -> Unit,\n showStarredCount: Boolean,\n modifier: Modifier = Modifier,\n ) {\n+ val resources = LocalContext.current.resources\n+ val folderNameFormatter = remember { FolderNameFormatter(resources) }\n+\n LazyColumn(\n modifier = modifier\n .fillMaxWidth(),\n contentPadding = PaddingValues(vertical = MainTheme.spacings.default),\n ) {\n- items(folders) { folder ->\n+ items(\n+ items = folders,\n+ key = { it.id },\n+ ) { folder ->\n FolderListItem(\n displayFolder = folder,\n selected = folder == selectedFolder,\n showStarredCount = showStarredCount,\n onClick = onFolderClick,\n+ folderNameFormatter = folderNameFormatter,\n )\n+ if (folder is DisplayUnifiedFolder) {\n+ DividerHorizontal(\n+ modifier = Modifier\n+ .fillMaxWidth()\n+ .padding(\n+ vertical = MainTheme.spacings.default,\n+ horizontal = MainTheme.spacings.triple,\n+ ),\n+ )\n+ }\n }\n }\n }\ndiff --git a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderListItem.kt b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderListItem.kt\nindex 978db3ba5d3..60c84e74272 100644\n--- a/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderListItem.kt\n+++ b/feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/ui/folder/FolderListItem.kt\n@@ -3,28 +3,35 @@ package app.k9mail.feature.navigation.drawer.ui.folder\n import androidx.compose.runtime.Composable\n import androidx.compose.ui.Modifier\n import androidx.compose.ui.graphics.vector.ImageVector\n+import androidx.compose.ui.res.stringResource\n import app.k9mail.core.mail.folder.api.FolderType\n import app.k9mail.core.ui.compose.designsystem.atom.icon.Icon\n import app.k9mail.core.ui.compose.designsystem.atom.icon.Icons\n import app.k9mail.core.ui.compose.designsystem.organism.drawer.NavigationDrawerItem\n+import app.k9mail.feature.navigation.drawer.R\n import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccountFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayUnifiedFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayUnifiedFolderType\n+import app.k9mail.legacy.ui.folder.FolderNameFormatter\n \n @Composable\n fun FolderListItem(\n- displayFolder: DisplayAccountFolder,\n+ displayFolder: DisplayFolder,\n selected: Boolean,\n- onClick: (DisplayAccountFolder) -> Unit,\n+ onClick: (DisplayFolder) -> Unit,\n showStarredCount: Boolean,\n+ folderNameFormatter: FolderNameFormatter,\n modifier: Modifier = Modifier,\n ) {\n NavigationDrawerItem(\n- label = displayFolder.folder.name,\n+ label = mapFolderName(displayFolder, folderNameFormatter),\n selected = selected,\n onClick = { onClick(displayFolder) },\n modifier = modifier,\n icon = {\n Icon(\n- imageVector = mapFolderIcon(displayFolder.folder.type),\n+ imageVector = mapFolderIcon(displayFolder),\n )\n },\n badge = {\n@@ -37,8 +44,35 @@ fun FolderListItem(\n )\n }\n \n-private fun mapFolderIcon(type: FolderType): ImageVector {\n- return when (type) {\n+@Composable\n+private fun mapFolderName(\n+ displayFolder: DisplayFolder,\n+ folderNameFormatter: FolderNameFormatter,\n+): String {\n+ return when (displayFolder) {\n+ is DisplayAccountFolder -> folderNameFormatter.displayName(displayFolder.folder)\n+ is DisplayUnifiedFolder -> mapUnifiedFolderName(displayFolder)\n+ else -> throw IllegalArgumentException(\"Unknown display folder: $displayFolder\")\n+ }\n+}\n+\n+@Composable\n+private fun mapUnifiedFolderName(folder: DisplayUnifiedFolder): String {\n+ return when (folder.unifiedType) {\n+ DisplayUnifiedFolderType.INBOX -> stringResource(R.string.navigation_drawer_unified_inbox_title)\n+ }\n+}\n+\n+private fun mapFolderIcon(folder: DisplayFolder): ImageVector {\n+ return when (folder) {\n+ is DisplayAccountFolder -> mapDisplayAccountFolderIcon(folder)\n+ is DisplayUnifiedFolder -> mapDisplayUnifiedFolderIcon(folder)\n+ else -> throw IllegalArgumentException(\"Unknown display folder type: $folder\")\n+ }\n+}\n+\n+private fun mapDisplayAccountFolderIcon(folder: DisplayAccountFolder): ImageVector {\n+ return when (folder.folder.type) {\n FolderType.INBOX -> Icons.Outlined.Inbox\n FolderType.OUTBOX -> Icons.Outlined.Outbox\n FolderType.SENT -> Icons.Outlined.Send\n@@ -49,3 +83,9 @@ private fun mapFolderIcon(type: FolderType): ImageVector {\n FolderType.REGULAR -> Icons.Outlined.Folder\n }\n }\n+\n+private fun mapDisplayUnifiedFolderIcon(folder: DisplayUnifiedFolder): ImageVector {\n+ when (folder.unifiedType) {\n+ DisplayUnifiedFolderType.INBOX -> return Icons.Outlined.AllInbox\n+ }\n+}\ndiff --git a/legacy/common/src/main/java/com/fsck/k9/feature/NavigationDrawerConfigLoader.kt b/legacy/common/src/main/java/com/fsck/k9/feature/NavigationDrawerConfigLoader.kt\nindex fb8fb70ff64..14dd1dcb19b 100644\n--- a/legacy/common/src/main/java/com/fsck/k9/feature/NavigationDrawerConfigLoader.kt\n+++ b/legacy/common/src/main/java/com/fsck/k9/feature/NavigationDrawerConfigLoader.kt\n@@ -7,7 +7,7 @@ import com.fsck.k9.K9\n class NavigationDrawerConfigLoader : DrawerConfigLoader {\n override fun loadDrawerConfig(): DrawerConfig {\n return DrawerConfig(\n- showUnifiedInbox = K9.isShowUnifiedInbox,\n+ showUnifiedFolders = K9.isShowUnifiedInbox,\n showStarredCount = K9.isShowStarredCount,\n )\n }\ndiff --git a/legacy/core/src/main/java/com/fsck/k9/controller/DefaultMessageCountsProvider.kt b/legacy/core/src/main/java/com/fsck/k9/controller/DefaultMessageCountsProvider.kt\nindex c5c7d073961..8553cdadaae 100644\n--- a/legacy/core/src/main/java/com/fsck/k9/controller/DefaultMessageCountsProvider.kt\n+++ b/legacy/core/src/main/java/com/fsck/k9/controller/DefaultMessageCountsProvider.kt\n@@ -27,7 +27,10 @@ internal class DefaultMessageCountsProvider(\n }\n \n override fun getMessageCounts(searchAccount: SearchAccount): MessageCounts {\n- val search = searchAccount.relatedSearch\n+ return getMessageCounts(searchAccount.relatedSearch)\n+ }\n+\n+ override fun getMessageCounts(search: LocalSearch): MessageCounts {\n val accounts = search.getAccounts(accountManager)\n \n var unreadCount = 0\ndiff --git a/legacy/message/src/main/java/app/k9mail/legacy/message/controller/MessageCountsProvider.kt b/legacy/message/src/main/java/app/k9mail/legacy/message/controller/MessageCountsProvider.kt\nindex ccc7d8b50a0..0c27cc4b3e5 100644\n--- a/legacy/message/src/main/java/app/k9mail/legacy/message/controller/MessageCountsProvider.kt\n+++ b/legacy/message/src/main/java/app/k9mail/legacy/message/controller/MessageCountsProvider.kt\n@@ -1,11 +1,13 @@\n package app.k9mail.legacy.message.controller\n \n import app.k9mail.legacy.account.Account\n+import app.k9mail.legacy.search.LocalSearch\n import app.k9mail.legacy.search.SearchAccount\n \n interface MessageCountsProvider {\n fun getMessageCounts(account: Account): MessageCounts\n fun getMessageCounts(searchAccount: SearchAccount): MessageCounts\n+ fun getMessageCounts(search: LocalSearch): MessageCounts\n fun getUnreadMessageCount(account: Account, folderId: Long): Int\n }\n \ndiff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt\nindex a92682556ad..b611011469e 100644\n--- a/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt\n+++ b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt\n@@ -610,6 +610,7 @@ open class MessageList :\n parent = this,\n openAccount = { account -> openRealAccount(account) },\n openFolder = { folderId -> openFolder(folderId) },\n+ openUnifiedFolder = { openUnifiedInbox() },\n openManageFolders = { launchManageFoldersScreen() },\n openSettings = { SettingsActivity.launch(this) },\n createDrawerListener = { createDrawerListener() },\n", "test_patch": "diff --git a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/FakeData.kt b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/FakeData.kt\nindex cb847e0c1ea..7ab5cde18f6 100644\n--- a/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/FakeData.kt\n+++ b/feature/navigation/drawer/src/debug/kotlin/app/k9mail/feature/navigation/drawer/ui/FakeData.kt\n@@ -4,6 +4,8 @@ import app.k9mail.core.mail.folder.api.Folder\n import app.k9mail.core.mail.folder.api.FolderType\n import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccount\n import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccountFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayUnifiedFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayUnifiedFolderType\n import app.k9mail.legacy.account.Account\n import app.k9mail.legacy.account.Identity\n \n@@ -52,4 +54,11 @@ internal object FakeData {\n unreadMessageCount = 14,\n starredMessageCount = 5,\n )\n+\n+ val UNIFIED_FOLDER = DisplayUnifiedFolder(\n+ id = \"unified_inbox\",\n+ unifiedType = DisplayUnifiedFolderType.INBOX,\n+ unreadMessageCount = 123,\n+ starredMessageCount = 567,\n+ )\n }\ndiff --git a/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/domain/usecase/GetDrawerConfigTest.kt b/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/domain/usecase/GetDrawerConfigTest.kt\nindex 60cb138c812..6f3c9dc680a 100644\n--- a/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/domain/usecase/GetDrawerConfigTest.kt\n+++ b/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/domain/usecase/GetDrawerConfigTest.kt\n@@ -12,7 +12,7 @@ class GetDrawerConfigTest {\n @Test\n fun `should get drawer config`() = runTest {\n val drawerConfig = DrawerConfig(\n- showUnifiedInbox = true,\n+ showUnifiedFolders = true,\n showStarredCount = true,\n )\n \n@@ -24,7 +24,7 @@ class GetDrawerConfigTest {\n \n assertThat(result).isEqualTo(\n DrawerConfig(\n- showUnifiedInbox = true,\n+ showUnifiedFolders = true,\n showStarredCount = true,\n ),\n )\ndiff --git a/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerStateTest.kt b/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerStateTest.kt\nindex 60dfcfa2ee7..05e74a855b6 100644\n--- a/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerStateTest.kt\n+++ b/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerStateTest.kt\n@@ -16,7 +16,7 @@ class DrawerStateTest {\n assertThat(state).isEqualTo(\n State(\n config = DrawerConfig(\n- showUnifiedInbox = false,\n+ showUnifiedFolders = false,\n showStarredCount = false,\n ),\n accounts = persistentListOf(),\ndiff --git a/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewKtTest.kt b/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewKtTest.kt\nindex 70169ffa27d..1f249cb837a 100644\n--- a/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewKtTest.kt\n+++ b/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewKtTest.kt\n@@ -18,68 +18,42 @@ class DrawerViewKtTest : ComposeTest() {\n fun `should delegate effects`() = runTest {\n val initialState = State()\n val viewModel = FakeDrawerViewModel(initialState)\n- var openAccountCounter = 0\n- var openFolderCounter = 0\n- var openManageFoldersCounter = 0\n- var openSettingsCounter = 0\n- var closeDrawerCounter = 0\n+ val counter = Counter()\n+ val verifyCounter = Counter()\n \n setContentWithTheme {\n DrawerView(\n- openAccount = { openAccountCounter++ },\n- openFolder = { openFolderCounter++ },\n- openManageFolders = { openManageFoldersCounter++ },\n- openSettings = { openSettingsCounter++ },\n- closeDrawer = { closeDrawerCounter++ },\n+ openAccount = { counter.openAccountCount++ },\n+ openFolder = { counter.openFolderCount++ },\n+ openUnifiedFolder = { counter.openUnifiedFolderCount++ },\n+ openManageFolders = { counter.openManageFoldersCount++ },\n+ openSettings = { counter.openSettingsCount++ },\n+ closeDrawer = { counter.closeDrawerCount++ },\n viewModel = viewModel,\n )\n }\n \n- assertThat(openAccountCounter).isEqualTo(0)\n- assertThat(openFolderCounter).isEqualTo(0)\n- assertThat(openManageFoldersCounter).isEqualTo(0)\n- assertThat(openSettingsCounter).isEqualTo(0)\n- assertThat(closeDrawerCounter).isEqualTo(0)\n+ assertThat(counter).isEqualTo(verifyCounter)\n \n viewModel.effect(Effect.OpenAccount(FakeData.ACCOUNT))\n \n- assertThat(openAccountCounter).isEqualTo(1)\n- assertThat(openFolderCounter).isEqualTo(0)\n- assertThat(openManageFoldersCounter).isEqualTo(0)\n- assertThat(openSettingsCounter).isEqualTo(0)\n- assertThat(closeDrawerCounter).isEqualTo(0)\n+ verifyCounter.openAccountCount++\n+ assertThat(counter).isEqualTo(verifyCounter)\n \n+ verifyCounter.openFolderCount++\n viewModel.effect(Effect.OpenFolder(1))\n \n- assertThat(openAccountCounter).isEqualTo(1)\n- assertThat(openFolderCounter).isEqualTo(1)\n- assertThat(openManageFoldersCounter).isEqualTo(0)\n- assertThat(openSettingsCounter).isEqualTo(0)\n- assertThat(closeDrawerCounter).isEqualTo(0)\n+ verifyCounter.openUnifiedFolderCount++\n+ viewModel.effect(Effect.OpenUnifiedFolder)\n \n+ verifyCounter.openManageFoldersCount++\n viewModel.effect(Effect.OpenManageFolders)\n \n- assertThat(openAccountCounter).isEqualTo(1)\n- assertThat(openFolderCounter).isEqualTo(1)\n- assertThat(openManageFoldersCounter).isEqualTo(1)\n- assertThat(openSettingsCounter).isEqualTo(0)\n- assertThat(closeDrawerCounter).isEqualTo(0)\n-\n+ verifyCounter.openSettingsCount++\n viewModel.effect(Effect.OpenSettings)\n \n- assertThat(openAccountCounter).isEqualTo(1)\n- assertThat(openFolderCounter).isEqualTo(1)\n- assertThat(openManageFoldersCounter).isEqualTo(1)\n- assertThat(openSettingsCounter).isEqualTo(1)\n- assertThat(closeDrawerCounter).isEqualTo(0)\n-\n+ verifyCounter.closeDrawerCount++\n viewModel.effect(Effect.CloseDrawer)\n-\n- assertThat(openAccountCounter).isEqualTo(1)\n- assertThat(openFolderCounter).isEqualTo(1)\n- assertThat(openManageFoldersCounter).isEqualTo(1)\n- assertThat(openSettingsCounter).isEqualTo(1)\n- assertThat(closeDrawerCounter).isEqualTo(1)\n }\n \n @Test\n@@ -93,6 +67,7 @@ class DrawerViewKtTest : ComposeTest() {\n DrawerView(\n openAccount = {},\n openFolder = {},\n+ openUnifiedFolder = {},\n openManageFolders = {},\n openSettings = {},\n closeDrawer = {},\n@@ -120,4 +95,14 @@ class DrawerViewKtTest : ComposeTest() {\n .printToString()\n .contains(\"ProgressBarRangeInfo(current=0.0, range=0.0..1.0, steps=0)\")\n }\n+\n+ @Suppress(\"DataClassShouldBeImmutable\")\n+ private data class Counter(\n+ var openAccountCount: Int = 0,\n+ var openFolderCount: Int = 0,\n+ var openUnifiedFolderCount: Int = 0,\n+ var openManageFoldersCount: Int = 0,\n+ var openSettingsCount: Int = 0,\n+ var closeDrawerCount: Int = 0,\n+ )\n }\ndiff --git a/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewModelTest.kt b/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewModelTest.kt\nindex 461a28e0364..7fc83ca2a08 100644\n--- a/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewModelTest.kt\n+++ b/feature/navigation/drawer/src/test/kotlin/app/k9mail/feature/navigation/drawer/ui/DrawerViewModelTest.kt\n@@ -9,6 +9,9 @@ import app.k9mail.core.ui.compose.testing.mvi.eventStateTest\n import app.k9mail.core.ui.compose.testing.mvi.turbinesWithInitialStateCheck\n import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccount\n import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccountFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayUnifiedFolder\n+import app.k9mail.feature.navigation.drawer.domain.entity.DisplayUnifiedFolderType\n import app.k9mail.feature.navigation.drawer.domain.entity.DrawerConfig\n import app.k9mail.feature.navigation.drawer.ui.DrawerContract.Effect\n import app.k9mail.feature.navigation.drawer.ui.DrawerContract.Event\n@@ -201,7 +204,7 @@ class DrawerViewModelTest {\n }\n \n @Test\n- fun `should set selected folder when OnFolderClick event is received`() = runTest {\n+ fun `should set selected folder and emit OpenFolder when OnFolderClick event is received`() = runTest {\n val displayAccounts = createDisplayAccountList(3)\n val getDisplayAccountsFlow = MutableStateFlow(displayAccounts)\n val displayFoldersMap = mapOf(\n@@ -234,6 +237,42 @@ class DrawerViewModelTest {\n }\n }\n \n+ @Test\n+ fun `should set selected folder emit OpenUnifiedFolder when OnFolderClick event for unified folder is received`() =\n+ runTest {\n+ val displayAccounts = createDisplayAccountList(1)\n+ val getDisplayAccountsFlow = MutableStateFlow(displayAccounts)\n+ val displayFoldersMap = mapOf(\n+ displayAccounts[0].account.uuid to\n+ createDisplayFolderList(1) + listOf(createDisplayUnifiedFolder()),\n+ )\n+ val displayFoldersFlow = MutableStateFlow(displayFoldersMap)\n+ val initialState = State(\n+ accounts = displayAccounts.toImmutableList(),\n+ selectedAccount = displayAccounts[0],\n+ folders = displayFoldersMap[displayAccounts[0].account.uuid]!!.toImmutableList(),\n+ selectedFolder = displayFoldersMap[displayAccounts[0].account.uuid]!![0],\n+ )\n+ val testSubject = createTestSubject(\n+ displayAccountsFlow = getDisplayAccountsFlow,\n+ displayFoldersFlow = displayFoldersFlow,\n+ )\n+ val turbines = turbinesWithInitialStateCheck(testSubject, initialState)\n+\n+ advanceUntilIdle()\n+\n+ val displayFolders = displayFoldersMap[displayAccounts[0].account.uuid] ?: emptyList()\n+ testSubject.event(Event.OnFolderClick(displayFolders[1]))\n+\n+ assertThat(turbines.awaitStateItem().selectedFolder).isEqualTo(displayFolders[1])\n+\n+ assertThat(turbines.awaitEffectItem()).isEqualTo(Effect.OpenUnifiedFolder)\n+\n+ turbines.assertThatAndEffectTurbineConsumed {\n+ isEqualTo(Effect.CloseDrawer)\n+ }\n+ }\n+\n @Test\n fun `should change state when OnAccountSelectorClick event is received`() = runTest {\n val testSubject = createTestSubject()\n@@ -277,13 +316,13 @@ class DrawerViewModelTest {\n private fun createTestSubject(\n drawerConfigFlow: Flow = flow { emit(createDrawerConfig()) },\n displayAccountsFlow: Flow> = flow { emit(emptyList()) },\n- displayFoldersFlow: Flow>> = flow { emit(emptyMap()) },\n+ displayFoldersFlow: Flow>> = flow { emit(emptyMap()) },\n syncMailFlow: Flow> = flow { emit(Result.success(Unit)) },\n ): DrawerViewModel {\n return DrawerViewModel(\n getDrawerConfig = { drawerConfigFlow },\n getDisplayAccounts = { displayAccountsFlow },\n- getDisplayFoldersForAccount = { accountUuid ->\n+ getDisplayFoldersForAccount = { accountUuid, _ ->\n displayFoldersFlow.map { it[accountUuid] ?: emptyList() }\n },\n syncMail = { syncMailFlow },\n@@ -295,7 +334,7 @@ class DrawerViewModelTest {\n showStarredCount: Boolean = false,\n ): DrawerConfig {\n return DrawerConfig(\n- showUnifiedInbox = showUnifiedInbox,\n+ showUnifiedFolders = showUnifiedInbox,\n showStarredCount = showStarredCount,\n )\n }\n@@ -369,4 +408,18 @@ class DrawerViewModelTest {\n )\n }\n }\n+\n+ private fun createDisplayUnifiedFolder(\n+ id: String = \"unified_inbox\",\n+ unifiedType: DisplayUnifiedFolderType = DisplayUnifiedFolderType.INBOX,\n+ unreadCount: Int = 0,\n+ starredCount: Int = 0,\n+ ): DisplayUnifiedFolder {\n+ return DisplayUnifiedFolder(\n+ id = id,\n+ unifiedType = unifiedType,\n+ unreadMessageCount = unreadCount,\n+ starredMessageCount = starredCount,\n+ )\n+ }\n }\ndiff --git a/feature/widget/unread/src/test/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetDataProviderTest.kt b/feature/widget/unread/src/test/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetDataProviderTest.kt\nindex c8b0e93cc28..d770889aaab 100644\n--- a/feature/widget/unread/src/test/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetDataProviderTest.kt\n+++ b/feature/widget/unread/src/test/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetDataProviderTest.kt\n@@ -7,6 +7,7 @@ import app.k9mail.legacy.account.Account\n import app.k9mail.legacy.mailstore.FolderRepository\n import app.k9mail.legacy.message.controller.MessageCounts\n import app.k9mail.legacy.message.controller.MessageCountsProvider\n+import app.k9mail.legacy.search.LocalSearch\n import app.k9mail.legacy.search.SearchAccount\n import app.k9mail.legacy.ui.folder.FolderNameFormatter\n import assertk.assertThat\n@@ -136,6 +137,10 @@ class UnreadWidgetDataProviderTest : AutoCloseKoinTest() {\n return MessageCounts(unread = SEARCH_ACCOUNT_UNREAD_COUNT, starred = 0)\n }\n \n+ override fun getMessageCounts(search: LocalSearch): MessageCounts {\n+ throw UnsupportedOperationException()\n+ }\n+\n override fun getUnreadMessageCount(account: Account, folderId: Long): Int {\n return FOLDER_UNREAD_COUNT\n }\n", "n2p_tests": {"app.k9mail.feature.widget.unread.UnreadWidgetDataProviderTest.nonExistentAccount_shouldReturnNull": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewKtTest.pull refresh should listen to view model state": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.widget.unread.UnreadWidgetDataProviderTest.unifiedInbox": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should collect display accounts when created and select first as selected": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should set selected account to null when no accounts are present": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should collect display folders for selected account": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should change state when OnAccountSelectorClick event is received": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerStateTest.should set default values": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should set selected folder emit OpenUnifiedFolder when OnFolderClick event for unified folder is received": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.widget.unread.UnreadWidgetDataProviderTest.folder": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.widget.unread.UnreadWidgetDataProviderTest.regularAccount": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should collect drawer config": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should set selected account when OnAccountClick event is received": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewKtTest.should delegate effects": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should reselect selected account when old not present anymore": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should emit OpenManageFolders effect when OnManageFoldersClick event is received": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should change loading state when OnRefresh event is received": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.domain.usecase.GetDrawerConfigTest.should get drawer config": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should collect display folders when selected account is changed": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should set selected folder and emit OpenFolder when OnFolderClick event is received": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.navigation.drawer.ui.DrawerViewModelTest.should emit OpenSettings effect when OnSettingsClick event is received": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "thunderbird__thunderbird-android-8329", "org": "thunderbird", "repo": "thunderbird-android", "number": 8329, "state": "closed", "title": "Add funding UI - part 5", "body": "This finishes adding the main UI parts. Integration with the actual billing manager will be in a separate pull-request. Given the time constraints, it doesn't include fake data to render the contribution items.\r\n\r\n![Contribution Screen](https://github.com/user-attachments/assets/2e5a9a32-c27e-4a30-82d9-dfdf45dbc6a0)\r\n\r\nResolves #8163", "base": {"label": "thunderbird:main", "ref": "main", "sha": "3289bcdfb158c1eddf8d9457fc6dafbbb86bb956"}, "resolved_issues": [{"number": 8163, "title": "Implement subscription ui flow", "body": "Design:\r\n\r\n![Support -_ Choose amount v01 1](https://github.com/user-attachments/assets/bcf35dc3-ac5c-4ffa-a8d5-530918771509)\r\n"}], "lang": "kotlin", "problem_statement": "Implement subscription ui flow\nDesign:\r\n\r\n![Support -_ Choose amount v01 1](https://github.com/user-attachments/assets/bcf35dc3-ac5c-4ffa-a8d5-530918771509)\r\n\n", "hints": "Will this also be enabled for first time installs like the desktop version of Thunderbird does? And will it pop up regularly or will it just be there?\nWe haven't worked out the cadence yet, but the first time install might be a bit too early. Folks need to have a chance to use the app before they make this decision. On desktop it works because there is more screen space and the message does not get in the way.", "pull_url": "https://github.com/thunderbird/thunderbird-android/pull/8329", "issue_urls": ["https://github.com/thunderbird/thunderbird-android/issues/8163"], "test_command": "./gradlew :feature:funding:googleplay:testDebugUnitTest --tests \"app.k9mail.feature.funding.googleplay.ui.contribution.ContributionScreenKtTest\" --tests \"app.k9mail.feature.funding.googleplay.ui.contribution.ContributionViewModelTest\"", "fix_patch": "diff --git a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/organism/TopAppBar.kt b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/organism/TopAppBar.kt\nindex ae78238d63b..3d39d176cea 100644\n--- a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/organism/TopAppBar.kt\n+++ b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/organism/TopAppBar.kt\n@@ -5,6 +5,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api\n import androidx.compose.material3.TopAppBarDefaults.topAppBarColors\n import androidx.compose.runtime.Composable\n import androidx.compose.ui.Modifier\n+import androidx.compose.ui.platform.testTag\n import app.k9mail.core.ui.compose.designsystem.atom.button.ButtonIcon\n import app.k9mail.core.ui.compose.designsystem.atom.icon.Icons\n import app.k9mail.core.ui.compose.designsystem.atom.text.TextTitleLarge\n@@ -44,6 +45,7 @@ fun TopAppBarWithMenuButton(\n ButtonIcon(\n onClick = onMenuClick,\n imageVector = Icons.Outlined.Menu,\n+ modifier = Modifier.testTag(\"TopAppBarMenuButton\"),\n )\n },\n actions = actions,\n@@ -64,6 +66,7 @@ fun TopAppBarWithBackButton(\n ButtonIcon(\n onClick = onBackClick,\n imageVector = Icons.Outlined.ArrowBack,\n+ modifier = Modifier.testTag(\"TopAppBarBackButton\"),\n )\n },\n actions = actions,\ndiff --git a/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionContentPreview.kt b/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionContentPreview.kt\nnew file mode 100644\nindex 00000000000..d0f1a72aaf0\n--- /dev/null\n+++ b/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionContentPreview.kt\n@@ -0,0 +1,36 @@\n+package app.k9mail.feature.funding.googleplay.ui.contribution\n+\n+import androidx.compose.foundation.layout.PaddingValues\n+import androidx.compose.runtime.Composable\n+import androidx.compose.ui.tooling.preview.Preview\n+import app.k9mail.core.ui.compose.common.annotation.PreviewDevicesWithBackground\n+import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme\n+import app.k9mail.feature.funding.googleplay.ui.contribution.ContributionContract.State\n+\n+@Composable\n+@PreviewDevicesWithBackground\n+fun ContributionContentPreview() {\n+ PreviewWithTheme {\n+ ContributionContent(\n+ state = State(\n+ recurringContributions = FakeData.recurringContributions,\n+ oneTimeContributions = FakeData.oneTimeContributions,\n+ selectedContribution = FakeData.recurringContributions.first(),\n+ ),\n+ onEvent = {},\n+ contentPadding = PaddingValues(),\n+ )\n+ }\n+}\n+\n+@Composable\n+@Preview(showBackground = true)\n+fun ContributionContentEmptyPreview() {\n+ PreviewWithTheme {\n+ ContributionContent(\n+ state = State(),\n+ onEvent = {},\n+ contentPadding = PaddingValues(),\n+ )\n+ }\n+}\ndiff --git a/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionFooterPreview.kt b/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionFooterPreview.kt\nindex 75b41c6f202..d991d8bc5a9 100644\n--- a/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionFooterPreview.kt\n+++ b/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionFooterPreview.kt\n@@ -9,7 +9,9 @@ import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme\n fun ContributionFooterPreview() {\n PreviewWithTheme {\n ContributionFooter(\n- onClick = {},\n+ onPurchaseClick = {},\n+ onManagePurchaseClick = {},\n+ purchasedContribution = null,\n isPurchaseEnabled = true,\n )\n }\n@@ -20,8 +22,23 @@ fun ContributionFooterPreview() {\n fun ContributionFooterDisabledPreview() {\n PreviewWithTheme {\n ContributionFooter(\n- onClick = {},\n+ onPurchaseClick = {},\n+ onManagePurchaseClick = {},\n+ purchasedContribution = null,\n isPurchaseEnabled = false,\n )\n }\n }\n+\n+@Composable\n+@Preview(showBackground = true)\n+fun ContributionFooterWithRecurringContributionPreview() {\n+ PreviewWithTheme {\n+ ContributionFooter(\n+ onPurchaseClick = {},\n+ onManagePurchaseClick = {},\n+ purchasedContribution = FakeData.recurringContribution,\n+ isPurchaseEnabled = true,\n+ )\n+ }\n+}\ndiff --git a/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionHeaderPreview.kt b/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionHeaderPreview.kt\nindex 3d3955700b9..e95de64aeed 100644\n--- a/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionHeaderPreview.kt\n+++ b/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionHeaderPreview.kt\n@@ -8,6 +8,26 @@ import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme\n @Preview(showBackground = true)\n internal fun ContributionHeaderPreview() {\n PreviewWithTheme {\n- ContributionHeader()\n+ ContributionHeader(purchasedContribution = null)\n+ }\n+}\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun ContributionHeaderWithPurchasedOneTimeContributionPreview() {\n+ PreviewWithTheme {\n+ ContributionHeader(\n+ purchasedContribution = FakeData.oneTimeContribution,\n+ )\n+ }\n+}\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun ContributionHeaderWithPurchasedRecurringContributionPreview() {\n+ PreviewWithTheme {\n+ ContributionHeader(\n+ purchasedContribution = FakeData.recurringContribution,\n+ )\n }\n }\ndiff --git a/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionListPreview.kt b/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionListPreview.kt\nindex 9d12de47ce7..5c231bbe86e 100644\n--- a/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionListPreview.kt\n+++ b/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionListPreview.kt\n@@ -3,13 +3,15 @@ package app.k9mail.feature.funding.googleplay.ui.contribution\n import androidx.compose.runtime.Composable\n import androidx.compose.ui.tooling.preview.Preview\n import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme\n+import kotlinx.collections.immutable.persistentListOf\n \n @Composable\n @Preview(showBackground = true)\n internal fun ContributionListPreview() {\n PreviewWithTheme {\n ContributionList(\n- contributions = FakeData.recurringContributions,\n+ oneTimeContributions = FakeData.oneTimeContributions,\n+ recurringContributions = FakeData.recurringContributions,\n isRecurringContributionSelected = true,\n selectedItem = FakeData.recurringContributions.first(),\n onOneTimeContributionTypeClick = {},\n@@ -24,7 +26,8 @@ internal fun ContributionListPreview() {\n internal fun ContributionListRecurringPreview() {\n PreviewWithTheme {\n ContributionList(\n- contributions = FakeData.oneTimeContributions,\n+ oneTimeContributions = FakeData.oneTimeContributions,\n+ recurringContributions = FakeData.recurringContributions,\n selectedItem = FakeData.oneTimeContributions.last(),\n isRecurringContributionSelected = false,\n onOneTimeContributionTypeClick = {},\n@@ -33,3 +36,51 @@ internal fun ContributionListRecurringPreview() {\n )\n }\n }\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun ContributionListOneTimeOnlyPreview() {\n+ PreviewWithTheme {\n+ ContributionList(\n+ oneTimeContributions = FakeData.oneTimeContributions,\n+ recurringContributions = persistentListOf(),\n+ selectedItem = null,\n+ isRecurringContributionSelected = false,\n+ onOneTimeContributionTypeClick = {},\n+ onRecurringContributionTypeClick = {},\n+ onItemClick = {},\n+ )\n+ }\n+}\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun ContributionListRecurringOnlyPreview() {\n+ PreviewWithTheme {\n+ ContributionList(\n+ oneTimeContributions = persistentListOf(),\n+ recurringContributions = FakeData.recurringContributions,\n+ selectedItem = null,\n+ isRecurringContributionSelected = true,\n+ onOneTimeContributionTypeClick = {},\n+ onRecurringContributionTypeClick = {},\n+ onItemClick = {},\n+ )\n+ }\n+}\n+\n+@Composable\n+@Preview(showBackground = true)\n+internal fun ContributionListEmptyPreview() {\n+ PreviewWithTheme {\n+ ContributionList(\n+ oneTimeContributions = persistentListOf(),\n+ recurringContributions = persistentListOf(),\n+ selectedItem = null,\n+ isRecurringContributionSelected = false,\n+ onOneTimeContributionTypeClick = {},\n+ onRecurringContributionTypeClick = {},\n+ onItemClick = {},\n+ )\n+ }\n+}\ndiff --git a/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionScreenPreview.kt b/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionScreenPreview.kt\nnew file mode 100644\nindex 00000000000..ee68ac75b63\n--- /dev/null\n+++ b/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionScreenPreview.kt\n@@ -0,0 +1,23 @@\n+package app.k9mail.feature.funding.googleplay.ui.contribution\n+\n+import androidx.compose.runtime.Composable\n+import app.k9mail.core.ui.compose.common.annotation.PreviewDevicesWithBackground\n+import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme\n+import app.k9mail.feature.funding.googleplay.ui.contribution.ContributionContract.State\n+\n+@Composable\n+@PreviewDevicesWithBackground\n+fun ContributionScreenPreview() {\n+ PreviewWithTheme {\n+ ContributionScreen(\n+ onBack = {},\n+ viewModel = FakeContributionViewModel(\n+ initialState = State(\n+ recurringContributions = FakeData.recurringContributions,\n+ oneTimeContributions = FakeData.oneTimeContributions,\n+ selectedContribution = FakeData.recurringContributions.first(),\n+ ),\n+ ),\n+ )\n+ }\n+}\ndiff --git a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/domain/entity/Contribution.kt b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/domain/entity/Contribution.kt\nindex 9db4befb318..9d94655846b 100644\n--- a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/domain/entity/Contribution.kt\n+++ b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/domain/entity/Contribution.kt\n@@ -3,5 +3,7 @@ package app.k9mail.feature.funding.googleplay.domain.entity\n interface Contribution {\n val id: String\n val title: String\n- val price: String\n+ val description: String\n+ val price: Long\n+ val priceFormatted: String\n }\ndiff --git a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/domain/entity/OneTimeContribution.kt b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/domain/entity/OneTimeContribution.kt\nindex 09149262a32..26b951c83b6 100644\n--- a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/domain/entity/OneTimeContribution.kt\n+++ b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/domain/entity/OneTimeContribution.kt\n@@ -3,5 +3,7 @@ package app.k9mail.feature.funding.googleplay.domain.entity\n class OneTimeContribution(\n override val id: String,\n override val title: String,\n- override val price: String,\n+ override val description: String,\n+ override val price: Long,\n+ override val priceFormatted: String,\n ) : Contribution\ndiff --git a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/domain/entity/RecurringContribution.kt b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/domain/entity/RecurringContribution.kt\nindex 24f02b22347..1c63a9e146d 100644\n--- a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/domain/entity/RecurringContribution.kt\n+++ b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/domain/entity/RecurringContribution.kt\n@@ -3,5 +3,7 @@ package app.k9mail.feature.funding.googleplay.domain.entity\n data class RecurringContribution(\n override val id: String,\n override val title: String,\n- override val price: String,\n+ override val description: String,\n+ override val price: Long,\n+ override val priceFormatted: String,\n ) : Contribution\ndiff --git a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionContent.kt b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionContent.kt\nindex 21bcdd815b3..931f0a2affb 100644\n--- a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionContent.kt\n+++ b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionContent.kt\n@@ -1,14 +1,19 @@\n package app.k9mail.feature.funding.googleplay.ui.contribution\n \n-import androidx.compose.foundation.clickable\n+import androidx.compose.foundation.layout.Arrangement\n import androidx.compose.foundation.layout.Column\n import androidx.compose.foundation.layout.PaddingValues\n import androidx.compose.foundation.layout.fillMaxSize\n import androidx.compose.foundation.layout.padding\n+import androidx.compose.foundation.rememberScrollState\n+import androidx.compose.foundation.verticalScroll\n import androidx.compose.runtime.Composable\n+import androidx.compose.ui.Alignment\n import androidx.compose.ui.Modifier\n-import app.k9mail.core.ui.compose.designsystem.atom.text.TextBodyMedium\n-import app.k9mail.core.ui.compose.designsystem.atom.text.TextTitleLarge\n+import androidx.compose.ui.platform.testTag\n+import app.k9mail.core.ui.compose.common.activity.LocalActivity\n+import app.k9mail.core.ui.compose.designsystem.template.ResponsiveWidthContainer\n+import app.k9mail.core.ui.compose.theme2.MainTheme\n import app.k9mail.feature.funding.googleplay.ui.contribution.ContributionContract.Event\n import app.k9mail.feature.funding.googleplay.ui.contribution.ContributionContract.State\n \n@@ -19,18 +24,48 @@ internal fun ContributionContent(\n contentPadding: PaddingValues,\n modifier: Modifier = Modifier,\n ) {\n- Column(\n- modifier = modifier.fillMaxSize()\n- .padding(contentPadding)\n- .clickable(\n- enabled = false,\n- onClick = { onEvent(Event.OnPurchaseClicked) },\n- ),\n+ ResponsiveWidthContainer(\n+ modifier = modifier\n+ .testTag(\"ContributionContent\")\n+ .padding(contentPadding),\n ) {\n- TextTitleLarge(\n- text = \"ContributionScreen\",\n- )\n+ val activity = LocalActivity.current\n+ val scrollState = rememberScrollState()\n \n- TextBodyMedium(text = \"is recurring selected: ${state.isRecurringContributionSelected}\")\n+ Column(\n+ modifier = Modifier\n+ .fillMaxSize()\n+ .padding(horizontal = MainTheme.spacings.quadruple)\n+ .verticalScroll(scrollState),\n+ horizontalAlignment = Alignment.Start,\n+ verticalArrangement = Arrangement.spacedBy(MainTheme.spacings.triple),\n+ ) {\n+ ContributionHeader(\n+ purchasedContribution = state.purchasedContribution,\n+ )\n+\n+ ContributionList(\n+ oneTimeContributions = state.oneTimeContributions,\n+ recurringContributions = state.recurringContributions,\n+ selectedItem = state.selectedContribution,\n+ isRecurringContributionSelected = state.isRecurringContributionSelected,\n+ onOneTimeContributionTypeClick = {\n+ onEvent(Event.OnOneTimeContributionSelected)\n+ },\n+ onRecurringContributionTypeClick = {\n+ onEvent(Event.OnRecurringContributionSelected)\n+ },\n+ onItemClick = {\n+ onEvent(Event.OnContributionItemClicked(it))\n+ },\n+ )\n+\n+ ContributionFooter(\n+ onPurchaseClick = { onEvent(Event.OnPurchaseClicked(activity)) },\n+ onManagePurchaseClick = { onEvent(Event.OnManagePurchaseClicked(it)) },\n+ purchasedContribution = state.purchasedContribution,\n+ isPurchaseEnabled = state.selectedContribution != null,\n+ )\n+ }\n }\n }\ndiff --git a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionContract.kt b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionContract.kt\nindex 2475d08815c..bcd8604b459 100644\n--- a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionContract.kt\n+++ b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionContract.kt\n@@ -1,5 +1,6 @@\n package app.k9mail.feature.funding.googleplay.ui.contribution\n \n+import android.app.Activity\n import androidx.compose.runtime.Stable\n import app.k9mail.core.ui.compose.common.mvi.UnidirectionalViewModel\n import app.k9mail.feature.funding.googleplay.domain.entity.Contribution\n@@ -14,16 +15,27 @@ internal class ContributionContract {\n \n @Stable\n data class State(\n- val recurringContributions: ImmutableList = persistentListOf(),\n val oneTimeContributions: ImmutableList = persistentListOf(),\n+ val recurringContributions: ImmutableList = persistentListOf(),\n+ val purchasedContribution: Contribution? = null,\n val selectedContribution: Contribution? = null,\n val isRecurringContributionSelected: Boolean = false,\n )\n \n sealed interface Event {\n- data object OnOneTimeContributionClicked : Event\n- data object OnRecurringContributionClicked : Event\n- data class OnContributionClicked(val item: Contribution) : Event\n- data object OnPurchaseClicked : Event\n+ data object OnOneTimeContributionSelected : Event\n+ data object OnRecurringContributionSelected : Event\n+\n+ data class OnContributionItemClicked(\n+ val item: Contribution,\n+ ) : Event\n+\n+ data class OnPurchaseClicked(\n+ val activity: Activity,\n+ ) : Event\n+\n+ data class OnManagePurchaseClicked(\n+ val contribution: Contribution,\n+ ) : Event\n }\n }\ndiff --git a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionFooter.kt b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionFooter.kt\nindex 54670bbdfd7..150641aa869 100644\n--- a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionFooter.kt\n+++ b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionFooter.kt\n@@ -1,29 +1,43 @@\n package app.k9mail.feature.funding.googleplay.ui.contribution\n \n-import androidx.compose.foundation.layout.Row\n+import androidx.compose.foundation.layout.Column\n import androidx.compose.foundation.layout.fillMaxWidth\n import androidx.compose.runtime.Composable\n import androidx.compose.ui.Modifier\n import androidx.compose.ui.res.stringResource\n import app.k9mail.core.ui.compose.designsystem.atom.button.ButtonFilled\n import app.k9mail.feature.funding.googleplay.R\n+import app.k9mail.feature.funding.googleplay.domain.entity.Contribution\n+import app.k9mail.feature.funding.googleplay.domain.entity.RecurringContribution\n \n @Composable\n internal fun ContributionFooter(\n- onClick: () -> Unit,\n+ purchasedContribution: Contribution?,\n+ onPurchaseClick: () -> Unit,\n+ onManagePurchaseClick: (Contribution) -> Unit,\n isPurchaseEnabled: Boolean,\n modifier: Modifier = Modifier,\n ) {\n- Row(\n+ Column(\n modifier = modifier,\n ) {\n- ButtonFilled(\n- text = stringResource(\n- R.string.funding_googleplay_contribution_footer_payment_button,\n- ),\n- onClick = onClick,\n- enabled = isPurchaseEnabled,\n- modifier = Modifier.fillMaxWidth(),\n- )\n+ if (purchasedContribution != null && purchasedContribution is RecurringContribution) {\n+ ButtonFilled(\n+ text = stringResource(\n+ R.string.funding_googleplay_contribution_footer_manage_button,\n+ ),\n+ onClick = { onManagePurchaseClick(purchasedContribution) },\n+ modifier = Modifier.fillMaxWidth(),\n+ )\n+ } else {\n+ ButtonFilled(\n+ text = stringResource(\n+ R.string.funding_googleplay_contribution_footer_payment_button,\n+ ),\n+ onClick = onPurchaseClick,\n+ enabled = isPurchaseEnabled,\n+ modifier = Modifier.fillMaxWidth(),\n+ )\n+ }\n }\n }\ndiff --git a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionHeader.kt b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionHeader.kt\nindex 260a6f39a5b..2e87bbf4552 100644\n--- a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionHeader.kt\n+++ b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionHeader.kt\n@@ -10,15 +10,19 @@ import androidx.compose.runtime.Composable\n import androidx.compose.ui.Alignment\n import androidx.compose.ui.Modifier\n import androidx.compose.ui.res.stringResource\n+import androidx.compose.ui.text.style.TextAlign\n import app.k9mail.core.ui.compose.designsystem.atom.image.FixedScaleImage\n import app.k9mail.core.ui.compose.designsystem.atom.text.TextBodyMedium\n import app.k9mail.core.ui.compose.designsystem.atom.text.TextHeadlineSmall\n import app.k9mail.core.ui.compose.theme2.MainTheme\n import app.k9mail.feature.funding.googleplay.R\n+import app.k9mail.feature.funding.googleplay.domain.entity.Contribution\n+import app.k9mail.feature.funding.googleplay.ui.contribution.image.GoldenHearthSunburst\n import app.k9mail.feature.funding.googleplay.ui.contribution.image.HearthSunburst\n \n @Composable\n internal fun ContributionHeader(\n+ purchasedContribution: Contribution?,\n modifier: Modifier = Modifier,\n ) {\n Column(\n@@ -33,7 +37,7 @@ internal fun ContributionHeader(\n .height(MainTheme.sizes.large),\n ) {\n FixedScaleImage(\n- imageVector = HearthSunburst,\n+ imageVector = if (purchasedContribution != null) GoldenHearthSunburst else HearthSunburst,\n contentDescription = null,\n alignment = Alignment.TopCenter,\n allowOverflow = true,\n@@ -41,12 +45,15 @@ internal fun ContributionHeader(\n }\n \n TextHeadlineSmall(\n- text = stringResource(R.string.funding_googleplay_contribution_header_title),\n+ text = purchasedContribution?.title\n+ ?: stringResource(R.string.funding_googleplay_contribution_header_title),\n color = MainTheme.colors.primary,\n+ textAlign = TextAlign.Center,\n )\n \n TextBodyMedium(\n- text = stringResource(R.string.funding_googleplay_contribution_header_description),\n+ text = purchasedContribution?.description\n+ ?: stringResource(R.string.funding_googleplay_contribution_header_description),\n )\n }\n }\ndiff --git a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionList.kt b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionList.kt\nindex 0c90e5c97e6..31bd2e27574 100644\n--- a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionList.kt\n+++ b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionList.kt\n@@ -16,12 +16,14 @@ import app.k9mail.core.ui.compose.designsystem.atom.text.TextLabelLarge\n import app.k9mail.core.ui.compose.theme2.MainTheme\n import app.k9mail.feature.funding.googleplay.R\n import app.k9mail.feature.funding.googleplay.domain.entity.Contribution\n+import app.k9mail.feature.funding.googleplay.domain.entity.OneTimeContribution\n+import app.k9mail.feature.funding.googleplay.domain.entity.RecurringContribution\n import kotlinx.collections.immutable.ImmutableList\n \n-@OptIn(ExperimentalLayoutApi::class)\n @Composable\n internal fun ContributionList(\n- contributions: ImmutableList,\n+ oneTimeContributions: ImmutableList,\n+ recurringContributions: ImmutableList,\n selectedItem: Contribution?,\n isRecurringContributionSelected: Boolean,\n onOneTimeContributionTypeClick: () -> Unit,\n@@ -42,18 +44,61 @@ internal fun ContributionList(\n TextLabelLarge(\n text = stringResource(R.string.funding_googleplay_contribution_list_title),\n )\n- Row(\n- modifier = Modifier\n- .fillMaxWidth()\n- .padding(top = MainTheme.spacings.default),\n- horizontalArrangement = Arrangement.spacedBy(MainTheme.spacings.default),\n- ) {\n+\n+ TypeSelectionRow(\n+ oneTimeContributions = oneTimeContributions,\n+ recurringContributions = recurringContributions,\n+ isRecurringContributionSelected = isRecurringContributionSelected,\n+ onOneTimeContributionTypeClick = onOneTimeContributionTypeClick,\n+ onRecurringContributionTypeClick = onRecurringContributionTypeClick,\n+ )\n+\n+ ChoicesRow(\n+ contributions = if (isRecurringContributionSelected) recurringContributions else oneTimeContributions,\n+ selectedItem = selectedItem,\n+ onItemClick = onItemClick,\n+ )\n+\n+ TextBodyMedium(\n+ text = stringResource(R.string.funding_googleplay_contribution_list_disclaimer),\n+ modifier = Modifier.padding(top = MainTheme.spacings.default),\n+ )\n+ }\n+ }\n+}\n+\n+@Composable\n+private fun TypeSelectionRow(\n+ oneTimeContributions: ImmutableList,\n+ recurringContributions: ImmutableList,\n+ isRecurringContributionSelected: Boolean,\n+ onOneTimeContributionTypeClick: () -> Unit,\n+ onRecurringContributionTypeClick: () -> Unit,\n+ modifier: Modifier = Modifier,\n+) {\n+ Row(\n+ modifier = modifier\n+ .fillMaxWidth()\n+ .padding(top = MainTheme.spacings.default),\n+ horizontalArrangement = Arrangement.spacedBy(MainTheme.spacings.default),\n+ ) {\n+ if (oneTimeContributions.isEmpty() && recurringContributions.isEmpty()) {\n+ ContributionListItem(\n+ text = stringResource(R.string.funding_googleplay_contribution_list_type_none_available),\n+ onClick = {},\n+ isSelected = true,\n+ modifier = Modifier.weight(1f),\n+ )\n+ } else {\n+ if (oneTimeContributions.isNotEmpty()) {\n ContributionListItem(\n text = stringResource(R.string.funding_googleplay_contribution_list_type_one_time),\n onClick = onOneTimeContributionTypeClick,\n isSelected = !isRecurringContributionSelected,\n modifier = Modifier.weight(1f),\n )\n+ }\n+ if (recurringContributions.isNotEmpty()) {\n ContributionListItem(\n text = stringResource(R.string.funding_googleplay_contribution_list_type_recurring),\n onClick = onRecurringContributionTypeClick,\n@@ -61,24 +106,29 @@ internal fun ContributionList(\n modifier = Modifier.weight(1f),\n )\n }\n+ }\n+ }\n+}\n \n- FlowRow(\n- horizontalArrangement = Arrangement.spacedBy(MainTheme.spacings.default),\n- verticalArrangement = Arrangement.spacedBy(MainTheme.spacings.default),\n- ) {\n- contributions.forEach {\n- ContributionListItem(\n- text = it.price,\n- onClick = { onItemClick(it) },\n- isSelected = it == selectedItem,\n- modifier = Modifier.weight(1f),\n- )\n- }\n- }\n-\n- TextBodyMedium(\n- text = stringResource(R.string.funding_googleplay_contribution_list_disclaimer),\n- modifier = Modifier.padding(top = MainTheme.spacings.default),\n+@OptIn(ExperimentalLayoutApi::class)\n+@Composable\n+private fun ChoicesRow(\n+ contributions: ImmutableList,\n+ onItemClick: (Contribution) -> Unit,\n+ selectedItem: Contribution?,\n+ modifier: Modifier = Modifier,\n+) {\n+ FlowRow(\n+ horizontalArrangement = Arrangement.spacedBy(MainTheme.spacings.default),\n+ verticalArrangement = Arrangement.spacedBy(MainTheme.spacings.default),\n+ modifier = modifier,\n+ ) {\n+ contributions.forEach {\n+ ContributionListItem(\n+ text = it.priceFormatted,\n+ onClick = { onItemClick(it) },\n+ isSelected = it == selectedItem,\n+ modifier = Modifier.weight(1f),\n )\n }\n }\ndiff --git a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionScreen.kt b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionScreen.kt\nindex ce8d76b3ed7..1be57894164 100644\n--- a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionScreen.kt\n+++ b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionScreen.kt\n@@ -3,8 +3,11 @@ package app.k9mail.feature.funding.googleplay.ui.contribution\n import androidx.activity.compose.BackHandler\n import androidx.compose.runtime.Composable\n import androidx.compose.ui.Modifier\n+import androidx.compose.ui.res.stringResource\n import app.k9mail.core.ui.compose.common.mvi.observe\n+import app.k9mail.core.ui.compose.designsystem.organism.TopAppBarWithBackButton\n import app.k9mail.core.ui.compose.designsystem.template.Scaffold\n+import app.k9mail.feature.funding.googleplay.R\n import app.k9mail.feature.funding.googleplay.ui.contribution.ContributionContract.ViewModel\n import org.koin.androidx.compose.koinViewModel\n \n@@ -22,6 +25,12 @@ internal fun ContributionScreen(\n \n Scaffold(\n modifier = modifier,\n+ topBar = {\n+ TopAppBarWithBackButton(\n+ title = stringResource(R.string.funding_googleplay_contribution_title),\n+ onBackClick = onBack,\n+ )\n+ },\n ) { innerPadding ->\n ContributionContent(\n state = state.value,\ndiff --git a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionViewModel.kt b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionViewModel.kt\nindex 4585a9ee771..fc964212534 100644\n--- a/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionViewModel.kt\n+++ b/feature/funding/googleplay/src/main/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionViewModel.kt\n@@ -1,6 +1,8 @@\n package app.k9mail.feature.funding.googleplay.ui.contribution\n \n+import android.app.Activity\n import app.k9mail.core.ui.compose.common.mvi.BaseViewModel\n+import app.k9mail.feature.funding.googleplay.domain.entity.Contribution\n import app.k9mail.feature.funding.googleplay.ui.contribution.ContributionContract.Event\n import app.k9mail.feature.funding.googleplay.ui.contribution.ContributionContract.State\n import app.k9mail.feature.funding.googleplay.ui.contribution.ContributionContract.ViewModel\n@@ -12,14 +14,47 @@ internal class ContributionViewModel(\n \n override fun event(event: Event) {\n when (event) {\n- is Event.OnContributionClicked -> TODO()\n+ Event.OnOneTimeContributionSelected -> onOneTimeContributionSelected()\n+ Event.OnRecurringContributionSelected -> onRecurringContributionSelected()\n+ is Event.OnContributionItemClicked -> onContributionItemClicked(event.item)\n+ is Event.OnPurchaseClicked -> onPurchaseClicked(event.activity)\n+ is Event.OnManagePurchaseClicked -> onManagePurchaseClicked(event.contribution)\n+ }\n+ }\n \n- Event.OnOneTimeContributionClicked -> TODO()\n- Event.OnPurchaseClicked -> {\n- // TODO\n- }\n+ private fun onOneTimeContributionSelected() {\n+ updateState {\n+ it.copy(\n+ isRecurringContributionSelected = false,\n+ selectedContribution = it.oneTimeContributions.firstOrNull(),\n+ )\n+ }\n+ }\n \n- Event.OnRecurringContributionClicked -> TODO()\n+ private fun onRecurringContributionSelected() {\n+ updateState {\n+ it.copy(\n+ isRecurringContributionSelected = true,\n+ selectedContribution = it.recurringContributions.firstOrNull(),\n+ )\n }\n }\n+\n+ private fun onContributionItemClicked(item: Contribution) {\n+ updateState {\n+ it.copy(\n+ selectedContribution = item,\n+ )\n+ }\n+ }\n+\n+ @Suppress(\"UnusedParameter\")\n+ private fun onPurchaseClicked(activity: Activity) {\n+ // TODO: Implement purchase logic\n+ }\n+\n+ @Suppress(\"UnusedParameter\")\n+ private fun onManagePurchaseClicked(contribution: Contribution) {\n+ // TODO: Implement manage purchase logic\n+ }\n }\ndiff --git a/feature/funding/googleplay/src/main/res/values/strings.xml b/feature/funding/googleplay/src/main/res/values/strings.xml\nindex c96668dfb46..6e1f72faa22 100644\n--- a/feature/funding/googleplay/src/main/res/values/strings.xml\n+++ b/feature/funding/googleplay/src/main/res/values/strings.xml\n@@ -1,13 +1,17 @@\n \n \n+ Settings\n+\n Support Thunderbird\n We never show advertisements or sell your data. We are fully funded by financial contributions from our users. If you\u2019re enjoying Thunderbird, please help support it. We can\u2019t do this without you!\n \n Secure contribution\n Give once\n Monthly\n+ None available\n \n Contributions are not tax-deductible as charitable donations.\n \n Continue to payment\n+ Modify monthly payment\n \n", "test_patch": "diff --git a/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/FakeContributionViewModel.kt b/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/FakeContributionViewModel.kt\nnew file mode 100644\nindex 00000000000..62da2560890\n--- /dev/null\n+++ b/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/FakeContributionViewModel.kt\n@@ -0,0 +1,21 @@\n+package app.k9mail.feature.funding.googleplay.ui.contribution\n+\n+import app.k9mail.core.ui.compose.common.mvi.BaseViewModel\n+import app.k9mail.feature.funding.googleplay.ui.contribution.ContributionContract.Event\n+import app.k9mail.feature.funding.googleplay.ui.contribution.ContributionContract.State\n+import app.k9mail.feature.funding.googleplay.ui.contribution.ContributionContract.ViewModel\n+\n+internal class FakeContributionViewModel(\n+ initialState: State,\n+) : BaseViewModel(initialState = initialState), ViewModel {\n+\n+ val events = mutableListOf()\n+\n+ override fun event(event: Event) {\n+ events.add(event)\n+ }\n+\n+ fun applyState(state: State) {\n+ updateState { state }\n+ }\n+}\ndiff --git a/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/FakeData.kt b/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/FakeData.kt\nindex 904dbc29e79..e125a6cfa0f 100644\n--- a/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/FakeData.kt\n+++ b/feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/FakeData.kt\n@@ -6,69 +6,109 @@ import kotlinx.collections.immutable.persistentListOf\n \n internal object FakeData {\n \n+ val recurringContribution = RecurringContribution(\n+ id = \"monthly_subscription_50\",\n+ title = \"Monthly subscription: $50\",\n+ description = \"Monthly subscription for $50\",\n+ price = 5000L,\n+ priceFormatted = \"50 $\",\n+ )\n+\n val recurringContributions = persistentListOf(\n RecurringContribution(\n id = \"monthly_subscription_250\",\n title = \"Monthly subscription: $250\",\n- price = \"$250\",\n+ description = \"Monthly subscription for $250\",\n+ price = 25000L,\n+ priceFormatted = \"250 $\",\n ),\n RecurringContribution(\n id = \"monthly_subscription_140\",\n title = \"Monthly subscription: $140\",\n- price = \"$140\",\n+ description = \"Monthly subscription for $140\",\n+ price = 14000L,\n+ priceFormatted = \"140 $\",\n ),\n RecurringContribution(\n id = \"monthly_subscription_80\",\n title = \"Monthly subscription: $80\",\n- price = \"$80\",\n+ description = \"Monthly subscription for $80\",\n+ price = 8000L,\n+ priceFormatted = \"80 $\",\n ),\n RecurringContribution(\n id = \"monthly_subscription_50\",\n title = \"Monthly subscription: $50\",\n- price = \"$50\",\n+ description = \"Monthly subscription for $50\",\n+ price = 5000L,\n+ priceFormatted = \"50 $\",\n ),\n RecurringContribution(\n id = \"monthly_subscription_25\",\n title = \"Monthly subscription: $25\",\n- price = \"$25\",\n+ description = \"Monthly subscription for $25\",\n+ price = 2500L,\n+ priceFormatted = \"25 $\",\n ),\n RecurringContribution(\n id = \"monthly_subscription_15\",\n title = \"Monthly subscription: $15\",\n- price = \"$15\",\n+ description = \"Monthly subscription for $15\",\n+ price = 1500L,\n+ priceFormatted = \"15 $\",\n ),\n )\n \n+ val oneTimeContribution = OneTimeContribution(\n+ id = \"one_time_payment_50\",\n+ title = \"One time payment: $50\",\n+ description = \"One time payment for $50\",\n+ price = 5000L,\n+ priceFormatted = \"50 $\",\n+ )\n+\n val oneTimeContributions = persistentListOf(\n OneTimeContribution(\n id = \"one_time_payment_250\",\n title = \"One time payment: $250\",\n- price = \"$250\",\n+ description = \"One time payment for $250\",\n+ price = 25000L,\n+ priceFormatted = \"250 $\",\n ),\n OneTimeContribution(\n id = \"one_time_payment_140\",\n title = \"One time payment: $140\",\n- price = \"$140\",\n+ description = \"One time payment for $140\",\n+ price = 14000L,\n+ priceFormatted = \"140 $\",\n ),\n OneTimeContribution(\n id = \"one_time_payment_80\",\n title = \"One time payment: $80\",\n- price = \"$80\",\n+ description = \"One time payment for $80\",\n+ price = 8000L,\n+ priceFormatted = \"80 $\",\n ),\n OneTimeContribution(\n id = \"one_time_payment_50\",\n title = \"One time payment: $50\",\n- price = \"$50\",\n+ description = \"One time payment for $50\",\n+ price = 5000L,\n+ priceFormatted = \"50 $\",\n ),\n OneTimeContribution(\n id = \"one_time_payment_25\",\n title = \"One time payment: $25\",\n- price = \"$25\",\n+ description = \"One time payment for $25\",\n+ price = 2500L,\n+ priceFormatted = \"25 $\",\n ),\n OneTimeContribution(\n id = \"one_time_payment_15\",\n title = \"One time payment: $15\",\n- price = \"$15\",\n+ description = \"One time payment for $15\",\n+ price = 1500L,\n+ priceFormatted = \"15 $\",\n ),\n )\n }\ndiff --git a/feature/funding/googleplay/src/test/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionScreenKtTest.kt b/feature/funding/googleplay/src/test/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionScreenKtTest.kt\nindex 7d525ff92ab..02c978b15ee 100644\n--- a/feature/funding/googleplay/src/test/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionScreenKtTest.kt\n+++ b/feature/funding/googleplay/src/test/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionScreenKtTest.kt\n@@ -1,6 +1,10 @@\n package app.k9mail.feature.funding.googleplay.ui.contribution\n \n+import androidx.compose.runtime.CompositionLocalProvider\n+import androidx.compose.ui.test.performClick\n+import app.k9mail.core.ui.compose.common.activity.LocalActivity\n import app.k9mail.core.ui.compose.testing.ComposeTest\n+import app.k9mail.core.ui.compose.testing.onNodeWithTag\n import app.k9mail.core.ui.compose.testing.pressBack\n import app.k9mail.core.ui.compose.testing.setContentWithTheme\n import app.k9mail.feature.funding.googleplay.ui.contribution.ContributionContract.State\n@@ -8,20 +12,23 @@ import assertk.assertThat\n import assertk.assertions.isEqualTo\n import kotlin.test.Test\n import kotlinx.coroutines.test.runTest\n+import org.mockito.Mockito.mock\n \n internal class ContributionScreenKtTest : ComposeTest() {\n \n @Test\n- fun `should observe state and send events to view model`() = runTest {\n+ fun `should call onBack when back button is pressed`() = runTest {\n val initialState = State()\n val viewModel = FakeContributionViewModel(initialState)\n var onBackCounter = 0\n \n setContentWithTheme {\n- ContributionScreen(\n- onBack = { onBackCounter++ },\n- viewModel = viewModel,\n- )\n+ CompositionLocalProvider(LocalActivity provides mock()) {\n+ ContributionScreen(\n+ onBack = { onBackCounter++ },\n+ viewModel = viewModel,\n+ )\n+ }\n }\n \n assertThat(onBackCounter).isEqualTo(0)\n@@ -29,5 +36,9 @@ internal class ContributionScreenKtTest : ComposeTest() {\n pressBack()\n \n assertThat(onBackCounter).isEqualTo(1)\n+\n+ onNodeWithTag(\"TopAppBarBackButton\").performClick()\n+\n+ assertThat(onBackCounter).isEqualTo(2)\n }\n }\ndiff --git a/feature/funding/googleplay/src/test/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionViewModelTest.kt b/feature/funding/googleplay/src/test/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionViewModelTest.kt\nnew file mode 100644\nindex 00000000000..5bb02a5b7f9\n--- /dev/null\n+++ b/feature/funding/googleplay/src/test/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionViewModelTest.kt\n@@ -0,0 +1,118 @@\n+package app.k9mail.feature.funding.googleplay.ui.contribution\n+\n+import app.k9mail.core.ui.compose.testing.MainDispatcherRule\n+import app.k9mail.core.ui.compose.testing.mvi.MviContext\n+import app.k9mail.core.ui.compose.testing.mvi.MviTurbines\n+import app.k9mail.core.ui.compose.testing.mvi.runMviTest\n+import app.k9mail.core.ui.compose.testing.mvi.turbinesWithInitialStateCheck\n+import app.k9mail.feature.funding.googleplay.domain.entity.Contribution\n+import app.k9mail.feature.funding.googleplay.ui.contribution.ContributionContract.Event\n+import app.k9mail.feature.funding.googleplay.ui.contribution.ContributionContract.State\n+import assertk.assertThat\n+import assertk.assertions.isEqualTo\n+import kotlin.test.Test\n+import org.junit.Rule\n+\n+class ContributionViewModelTest {\n+\n+ @get:Rule\n+ val mainDispatcherRule = MainDispatcherRule()\n+\n+ @Test\n+ fun `should change selected contribution and selected type when on time contribution selected`() = runMviTest {\n+ val initialState = State(\n+ isRecurringContributionSelected = true,\n+ oneTimeContributions = FakeData.oneTimeContributions,\n+ )\n+\n+ contributionRobot(initialState) {\n+ selectOneTimeContribution()\n+ verifyOneTimeContributionSelected()\n+ }\n+ }\n+\n+ @Test\n+ fun `should change selected contribution and selected type when recurring contribution selected`() = runMviTest {\n+ val initialState = State(\n+ isRecurringContributionSelected = false,\n+ recurringContributions = FakeData.recurringContributions,\n+ )\n+\n+ contributionRobot(initialState) {\n+ selectRecurringContribution()\n+ verifyRecurringContributionSelected()\n+ }\n+ }\n+\n+ @Test\n+ fun `should change selected contribution when contribution item clicked`() = runMviTest {\n+ val initialState = State(\n+ isRecurringContributionSelected = true,\n+ recurringContributions = FakeData.recurringContributions,\n+ )\n+ val selectedContribution = FakeData.recurringContributions[2]\n+\n+ contributionRobot(initialState) {\n+ selectContributionItem(selectedContribution)\n+ verifyContributionItemSelected(selectedContribution)\n+ }\n+ }\n+}\n+\n+private suspend fun MviContext.contributionRobot(\n+ initialState: State = State(),\n+ interaction: suspend ContributionRobot.() -> Unit,\n+) = ContributionRobot(this, initialState).apply {\n+ initialize()\n+ interaction()\n+}\n+\n+private class ContributionRobot(\n+ private val mviContext: MviContext,\n+ private val initialState: State = State(),\n+) {\n+ private val viewModel = ContributionViewModel(initialState)\n+ private lateinit var turbines: MviTurbines\n+\n+ suspend fun initialize() {\n+ turbines = mviContext.turbinesWithInitialStateCheck(viewModel, initialState)\n+ }\n+\n+ fun selectOneTimeContribution() {\n+ viewModel.event(Event.OnOneTimeContributionSelected)\n+ }\n+\n+ suspend fun verifyOneTimeContributionSelected() {\n+ assertThat(turbines.awaitStateItem()).isEqualTo(\n+ initialState.copy(\n+ isRecurringContributionSelected = false,\n+ selectedContribution = initialState.oneTimeContributions.first(),\n+ ),\n+ )\n+ }\n+\n+ fun selectRecurringContribution() {\n+ viewModel.event(Event.OnRecurringContributionSelected)\n+ }\n+\n+ suspend fun verifyRecurringContributionSelected() {\n+ assertThat(turbines.awaitStateItem()).isEqualTo(\n+ initialState.copy(\n+ isRecurringContributionSelected = true,\n+ selectedContribution = initialState.recurringContributions.first(),\n+ ),\n+ )\n+ }\n+\n+ fun selectContributionItem(item: Contribution) {\n+ viewModel.event(Event.OnContributionItemClicked(item))\n+ }\n+\n+ suspend fun verifyContributionItemSelected(item: Contribution) {\n+ assertThat(turbines.awaitStateItem()).isEqualTo(\n+ initialState.copy(\n+ selectedContribution = item,\n+ ),\n+ )\n+ }\n+}\n", "n2p_tests": {"app.k9mail.feature.funding.googleplay.ui.contribution.ContributionViewModelTest.should change selected contribution and selected type when on time contribution selected": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.funding.googleplay.ui.contribution.ContributionScreenKtTest.should call onBack when back button is pressed": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.funding.googleplay.ui.contribution.ContributionViewModelTest.should change selected contribution when contribution item clicked": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "app.k9mail.feature.funding.googleplay.ui.contribution.ContributionViewModelTest.should change selected contribution and selected type when recurring contribution selected": {"run": "NONE", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "thunderbird__thunderbird-android-9634", "org": "thunderbird", "repo": "thunderbird-android", "number": 9634, "state": "closed", "title": "fix(logs): debug logs ignored when user enable it", "body": "Fixes #9561.\r\n\r\n- Fixes the \"Enable debug logging\" preference not logging any useful data outside debuggable builds\r\n- Refactor:\r\n - Move `CompositeLogSinkManager` to `:core:logging:api`\r\n - Replaced hardcoded string qualifier `syncDebug` with the `LogSync.Qualifier.SyncDebug` enum qualifier for improved discoverability.", "base": {"label": "thunderbird:main", "ref": "main", "sha": "b71249d539bf54a7913f2072204e967a528a529a"}, "resolved_issues": [{"number": 9561, "title": "Debug logging does not include IMAP/POP3 commands in beta versions", "body": "### Checklist\n\n- [x] I have used the search function to see if someone else has already submitted the same bug report.\n- [x] I will describe the problem with as much detail as possible.\n\n### App\n\nThunderbird for Android\n\n### App version\n\n12.0b4\n\n### Where did you get the app from?\n\nOther\n\n### Android version\n\n13 (xiaomi.eu 14.0.3.0.TJUMIXM)\n\n### Device model\n\nXiaomi POCO X3 Pro (global)\n\n### Steps to reproduce\n\n1. Go to Settings -> \"General settings\" -> Debugging\n2. Enable all options (debug logging, sync debug logging, log sensitive information)\n3. Refresh a folder\n4. Export logs or observe logcat output\n\n### Expected behavior\n\nLogs include IMAP/POP3 commands sent to the mail server and received responses, as well as other debugging information (number of unsynced messages, etc.)\n\n### Actual behavior\n\nThere is no useful debugging information in debug logs (see below for an example). This makes debugging problems with message synchronisation much harder.\n\nThis problem does not exist in debug builds, but most people who submit bug reports will most likely run a release version. In my case a debug build (from beta branch) synchronises correctly, but the release (12.0b4) downloaded from archive.mozilla.org doesn't, so I only have debug logs from a version where everything is ok...\n\n#9250 introduced logging changes that prevented messages with level lower than INFO (VERBOSE and DEBUG) from being logged at all. #9359 changed the minimum log level to VERBOSE, but only for debug builds. Most log messages enabled by the \"Enable debug logging\" option are DEBUG or VERBOSE, so enabling this option does almost nothing.\n\n### Logs\n\n```\n08-04 14:22:58.350 32664 14487 I MessagingController: Running command 'synchronizeMailbox', seq = 119 (background priority)\n08-04 14:22:58.352 32664 14487 I ImapSync: Synchronizing folder konto.pl:INBOX\n08-04 14:22:58.731 32664 14458 I rd.android.beta: This is non sticky GC, maxfree is 8388608 minfree is 2097152\n08-04 14:23:03.167 32664 14458 I rd.android.beta: This is sticky GC, maxfree is 8388608 minfree is 2097152\n08-04 14:23:03.668 32664 14487 I ImapSync: Done synchronizing folder konto.pl:INBOX\n08-04 14:23:03.668 32664 14487 I MessagingController: Command 'synchronizeMailbox' completed\n08-04 14:23:03.668 32664 14487 I MessagingController: Running command 'sendPendingMessages', seq = 120 (background priority)\n08-04 14:23:03.669 32664 14487 I MessagingController: Command 'sendPendingMessages' completed\n```"}], "lang": "kotlin", "problem_statement": "Debug logging does not include IMAP/POP3 commands in beta versions\n### Checklist\n\n- [x] I have used the search function to see if someone else has already submitted the same bug report.\n- [x] I will describe the problem with as much detail as possible.\n\n### App\n\nThunderbird for Android\n\n### App version\n\n12.0b4\n\n### Where did you get the app from?\n\nOther\n\n### Android version\n\n13 (xiaomi.eu 14.0.3.0.TJUMIXM)\n\n### Device model\n\nXiaomi POCO X3 Pro (global)\n\n### Steps to reproduce\n\n1. Go to Settings -> \"General settings\" -> Debugging\n2. Enable all options (debug logging, sync debug logging, log sensitive information)\n3. Refresh a folder\n4. Export logs or observe logcat output\n\n### Expected behavior\n\nLogs include IMAP/POP3 commands sent to the mail server and received responses, as well as other debugging information (number of unsynced messages, etc.)\n\n### Actual behavior\n\nThere is no useful debugging information in debug logs (see below for an example). This makes debugging problems with message synchronisation much harder.\n\nThis problem does not exist in debug builds, but most people who submit bug reports will most likely run a release version. In my case a debug build (from beta branch) synchronises correctly, but the release (12.0b4) downloaded from archive.mozilla.org doesn't, so I only have debug logs from a version where everything is ok...\n\n#9250 introduced logging changes that prevented messages with level lower than INFO (VERBOSE and DEBUG) from being logged at all. #9359 changed the minimum log level to VERBOSE, but only for debug builds. Most log messages enabled by the \"Enable debug logging\" option are DEBUG or VERBOSE, so enabling this option does almost nothing.\n\n### Logs\n\n```\n08-04 14:22:58.350 32664 14487 I MessagingController: Running command 'synchronizeMailbox', seq = 119 (background priority)\n08-04 14:22:58.352 32664 14487 I ImapSync: Synchronizing folder konto.pl:INBOX\n08-04 14:22:58.731 32664 14458 I rd.android.beta: This is non sticky GC, maxfree is 8388608 minfree is 2097152\n08-04 14:23:03.167 32664 14458 I rd.android.beta: This is sticky GC, maxfree is 8388608 minfree is 2097152\n08-04 14:23:03.668 32664 14487 I ImapSync: Done synchronizing folder konto.pl:INBOX\n08-04 14:23:03.668 32664 14487 I MessagingController: Command 'synchronizeMailbox' completed\n08-04 14:23:03.668 32664 14487 I MessagingController: Running command 'sendPendingMessages', seq = 120 (background priority)\n08-04 14:23:03.669 32664 14487 I MessagingController: Command 'sendPendingMessages' completed\n```\n", "pull_url": "https://github.com/thunderbird/thunderbird-android/pull/9634", "issue_urls": ["https://github.com/thunderbird/thunderbird-android/issues/9561"], "test_command": "./gradlew :core:logging:impl-composite:testDebugUnitTest --tests \"net.thunderbird.core.logging.composite.DefaultCompositeLogSinkTest\"", "fix_patch": "diff --git a/app-common/src/main/kotlin/net/thunderbird/app/common/core/AppCommonCoreModule.kt b/app-common/src/main/kotlin/net/thunderbird/app/common/core/AppCommonCoreModule.kt\nindex 92e1c60d6b3..c9d1d85c7d9 100644\n--- a/app-common/src/main/kotlin/net/thunderbird/app/common/core/AppCommonCoreModule.kt\n+++ b/app-common/src/main/kotlin/net/thunderbird/app/common/core/AppCommonCoreModule.kt\n@@ -2,9 +2,13 @@ package net.thunderbird.app.common.core\n \n import android.content.Context\n import kotlin.time.ExperimentalTime\n-import net.thunderbird.app.common.BuildConfig\n+import net.thunderbird.app.common.core.logging.DefaultLogLevelManager\n+import net.thunderbird.core.common.inject.getList\n+import net.thunderbird.core.common.inject.singleListOf\n import net.thunderbird.core.logging.DefaultLogger\n import net.thunderbird.core.logging.LogLevel\n+import net.thunderbird.core.logging.LogLevelManager\n+import net.thunderbird.core.logging.LogLevelProvider\n import net.thunderbird.core.logging.LogSink\n import net.thunderbird.core.logging.Logger\n import net.thunderbird.core.logging.composite.CompositeLogSink\n@@ -13,25 +17,22 @@ import net.thunderbird.core.logging.file.AndroidFileSystemManager\n import net.thunderbird.core.logging.file.FileLogSink\n import org.koin.core.module.Module\n import org.koin.core.qualifier.named\n+import org.koin.dsl.bind\n import org.koin.dsl.module\n \n val appCommonCoreModule: Module = module {\n- single {\n- if (BuildConfig.DEBUG) LogLevel.VERBOSE else LogLevel.INFO\n- }\n+ single {\n+ DefaultLogLevelManager()\n+ }.bind()\n \n- single> {\n- listOf(\n- ConsoleLogSink(\n- level = get(),\n- ),\n- )\n- }\n+ singleListOf(\n+ { ConsoleLogSink(level = LogLevel.VERBOSE) },\n+ )\n \n single {\n CompositeLogSink(\n- level = get(),\n- sinks = get(),\n+ logLevelProvider = get(),\n+ sinks = getList(),\n )\n }\n \n@@ -44,8 +45,8 @@ val appCommonCoreModule: Module = module {\n \n single(named(SYNC_DEBUG_LOG)) {\n CompositeLogSink(\n- level = get(),\n- sinks = get(),\n+ logLevelProvider = get(),\n+ sinks = getList(),\n )\n }\n \n@@ -58,7 +59,7 @@ val appCommonCoreModule: Module = module {\n )\n }\n \n- single (named(SYNC_DEBUG_LOG)) {\n+ single(named(SYNC_DEBUG_LOG)) {\n @OptIn(ExperimentalTime::class)\n DefaultLogger(\n sink = get(named(SYNC_DEBUG_LOG)),\ndiff --git a/app-common/src/main/kotlin/net/thunderbird/app/common/core/logging/DefaultLogLevelManager.kt b/app-common/src/main/kotlin/net/thunderbird/app/common/core/logging/DefaultLogLevelManager.kt\nnew file mode 100644\nindex 00000000000..9dc4951226b\n--- /dev/null\n+++ b/app-common/src/main/kotlin/net/thunderbird/app/common/core/logging/DefaultLogLevelManager.kt\n@@ -0,0 +1,22 @@\n+package net.thunderbird.app.common.core.logging\n+\n+import kotlinx.coroutines.flow.MutableStateFlow\n+import kotlinx.coroutines.flow.update\n+import net.thunderbird.app.common.BuildConfig\n+import net.thunderbird.core.logging.LogLevel\n+import net.thunderbird.core.logging.LogLevelManager\n+\n+class DefaultLogLevelManager : LogLevelManager {\n+ private val defaultLevel = if (BuildConfig.DEBUG) LogLevel.VERBOSE else LogLevel.INFO\n+ private val logLevel = MutableStateFlow(defaultLevel)\n+\n+ override fun override(level: LogLevel) {\n+ logLevel.update { level }\n+ }\n+\n+ override fun restoreDefault() {\n+ override(defaultLevel)\n+ }\n+\n+ override fun current(): LogLevel = logLevel.value\n+}\ndiff --git a/core/common/src/commonMain/kotlin/net/thunderbird/core/common/inject/KoinMultibindingCollection.kt b/core/common/src/commonMain/kotlin/net/thunderbird/core/common/inject/KoinMultibindingCollection.kt\nnew file mode 100644\nindex 00000000000..4263f311885\n--- /dev/null\n+++ b/core/common/src/commonMain/kotlin/net/thunderbird/core/common/inject/KoinMultibindingCollection.kt\n@@ -0,0 +1,64 @@\n+package net.thunderbird.core.common.inject\n+\n+import org.koin.core.definition.Definition\n+import org.koin.core.module.KoinDslMarker\n+import org.koin.core.module.Module\n+import org.koin.core.parameter.parametersOf\n+import org.koin.core.qualifier.Qualifier\n+import org.koin.core.qualifier.named\n+import org.koin.core.scope.Scope\n+\n+// This file must be deleted once https://github.com/InsertKoinIO/koin/pull/1951 is merged to\n+// Koin and released on 4.2.0\n+\n+/**\n+ * Defines a singleton list of elements of type [T].\n+ *\n+ * This function creates a singleton definition for a mutable list of elements.\n+ * Each element in the list is resolved from the provided [items] definitions.\n+ *\n+ * @param T The type of elements in the list.\n+ * @param items Vararg of [Definition]s that will be resolved and added to the list.\n+ * @param qualifier Optional [Qualifier] to distinguish this list from others of the same type.\n+ * If null, a default qualifier based on the type [T] will be used.\n+ */\n+@KoinDslMarker\n+inline fun Module.singleListOf(vararg items: Definition, qualifier: Qualifier? = null) {\n+ single(qualifier ?: defaultListQualifier(), createdAtStart = true) {\n+ items.map { definition -> definition(this, parametersOf()) }\n+ }\n+}\n+\n+/**\n+ * Resolves a [List] of instances of type [T].\n+ * This is a helper function for Koin's multibinding feature.\n+ *\n+ * It uses the [defaultListQualifier] if no [qualifier] is provided.\n+ *\n+ * @param T The type of instances in the list.\n+ * @param qualifier An optional [Qualifier] to distinguish between different lists of the same type.\n+ * @return The resolved [MutableList] of instances of type [T].\n+ */\n+inline fun Scope.getList(qualifier: Qualifier? = null) =\n+ get>(qualifier ?: defaultListQualifier())\n+\n+/**\n+ * Creates a qualifier for a set of a specific type.\n+ *\n+ * This is used to differentiate between different sets of the same type when injecting dependencies.\n+ *\n+ * @param T The type of the elements in the set.\n+ * @return A qualifier for the set.\n+ */\n+inline fun defaultListQualifier() =\n+ defaultCollectionQualifier, T>()\n+\n+/**\n+ * Creates a default [Qualifier] for a collection binding.\n+ *\n+ * @param TCollection The type of the collection (e.g., `List`, `List`).\n+ * @param T The type of the elements in the collection.\n+ * @return A [Qualifier] that can be used to identify the specific collection binding.\n+ */\n+inline fun , reified T> defaultCollectionQualifier() =\n+ named(\"${TCollection::class.qualifiedName}<${T::class.qualifiedName}>\")\ndiff --git a/core/logging/api/src/commonMain/kotlin/net/thunderbird/core/logging/LogLevelManager.kt b/core/logging/api/src/commonMain/kotlin/net/thunderbird/core/logging/LogLevelManager.kt\nnew file mode 100644\nindex 00000000000..1391f4352b6\n--- /dev/null\n+++ b/core/logging/api/src/commonMain/kotlin/net/thunderbird/core/logging/LogLevelManager.kt\n@@ -0,0 +1,28 @@\n+package net.thunderbird.core.logging\n+\n+/**\n+ * Manages the log level for the application.\n+ *\n+ * This interface provides a way to update the log level dynamically.\n+ * Implementations of this interface are responsible for persisting the log level\n+ * and notifying listeners of changes.\n+ */\n+interface LogLevelManager : LogLevelProvider {\n+ /**\n+ * Overrides the current log level.\n+ *\n+ * This function allows for a temporary change in the log level,\n+ * typically for debugging or specific operational needs.\n+ * The original log level can be restored by calling [restoreDefault] function\n+ *\n+ * @param level The new log level to set\n+ */\n+ fun override(level: LogLevel)\n+\n+ /**\n+ * Restores the log level to its default value.\n+ *\n+ * The default log level is defined by the specific implementation of this interface.\n+ */\n+ fun restoreDefault()\n+}\ndiff --git a/core/logging/api/src/commonMain/kotlin/net/thunderbird/core/logging/LogLevelProvider.kt b/core/logging/api/src/commonMain/kotlin/net/thunderbird/core/logging/LogLevelProvider.kt\nnew file mode 100644\nindex 00000000000..34e46be9272\n--- /dev/null\n+++ b/core/logging/api/src/commonMain/kotlin/net/thunderbird/core/logging/LogLevelProvider.kt\n@@ -0,0 +1,15 @@\n+package net.thunderbird.core.logging\n+\n+/**\n+ * Provides the current [LogLevel].\n+ *\n+ * This can be used to dynamically change the log level during runtime.\n+ */\n+fun interface LogLevelProvider {\n+ /**\n+ * Gets the current log level.\n+ *\n+ * @return The current log level.\n+ */\n+ fun current(): LogLevel\n+}\ndiff --git a/core/logging/impl-composite/src/commonMain/kotlin/net/thunderbird/core/logging/composite/CompositeLogSink.kt b/core/logging/impl-composite/src/commonMain/kotlin/net/thunderbird/core/logging/composite/CompositeLogSink.kt\nindex 5db2a7ba766..77b981daa68 100644\n--- a/core/logging/impl-composite/src/commonMain/kotlin/net/thunderbird/core/logging/composite/CompositeLogSink.kt\n+++ b/core/logging/impl-composite/src/commonMain/kotlin/net/thunderbird/core/logging/composite/CompositeLogSink.kt\n@@ -1,6 +1,7 @@\n package net.thunderbird.core.logging.composite\n \n import net.thunderbird.core.logging.LogLevel\n+import net.thunderbird.core.logging.LogLevelProvider\n import net.thunderbird.core.logging.LogSink\n \n /**\n@@ -22,15 +23,15 @@ interface CompositeLogSink : LogSink {\n /**\n * Creates a [CompositeLogSink] with the specified log level and manager.\n *\n- * @param level The minimum [LogLevel] for messages to be logged.\n+ * @param logLevelProvider The minimum [LogLevel] for messages to be logged.\n * @param manager The [CompositeLogSinkManager] that manages the collection of sinks.\n * @param sinks A list of [LogSink] instances to be managed by this composite sink.\n * @return A new instance of [CompositeLogSink].\n */\n fun CompositeLogSink(\n- level: LogLevel,\n+ logLevelProvider: LogLevelProvider,\n manager: CompositeLogSinkManager = DefaultLogSinkManager(),\n sinks: List = emptyList(),\n ): CompositeLogSink {\n- return DefaultCompositeLogSink(level, manager, sinks)\n+ return DefaultCompositeLogSink(logLevelProvider, manager, sinks)\n }\ndiff --git a/core/logging/impl-composite/src/commonMain/kotlin/net/thunderbird/core/logging/composite/DefaultCompositeLogSink.kt b/core/logging/impl-composite/src/commonMain/kotlin/net/thunderbird/core/logging/composite/DefaultCompositeLogSink.kt\nindex 481cc27e51f..5f398aed402 100644\n--- a/core/logging/impl-composite/src/commonMain/kotlin/net/thunderbird/core/logging/composite/DefaultCompositeLogSink.kt\n+++ b/core/logging/impl-composite/src/commonMain/kotlin/net/thunderbird/core/logging/composite/DefaultCompositeLogSink.kt\n@@ -2,13 +2,15 @@ package net.thunderbird.core.logging.composite\n \n import net.thunderbird.core.logging.LogEvent\n import net.thunderbird.core.logging.LogLevel\n+import net.thunderbird.core.logging.LogLevelProvider\n import net.thunderbird.core.logging.LogSink\n \n internal class DefaultCompositeLogSink(\n- override val level: LogLevel,\n+ private val logLevelProvider: LogLevelProvider,\n override val manager: CompositeLogSinkManager = DefaultLogSinkManager(),\n sinks: List = emptyList(),\n ) : CompositeLogSink {\n+ override val level: LogLevel get() = logLevelProvider.current()\n \n init {\n manager.addAll(sinks)\ndiff --git a/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/debugging/DefaultDebuggingSettingsPreferenceManager.kt b/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/debugging/DefaultDebuggingSettingsPreferenceManager.kt\nindex 44756a57923..77cb628c942 100644\n--- a/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/debugging/DefaultDebuggingSettingsPreferenceManager.kt\n+++ b/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/debugging/DefaultDebuggingSettingsPreferenceManager.kt\n@@ -10,6 +10,8 @@ import kotlinx.coroutines.flow.update\n import kotlinx.coroutines.launch\n import kotlinx.coroutines.sync.Mutex\n import kotlinx.coroutines.sync.withLock\n+import net.thunderbird.core.logging.LogLevel\n+import net.thunderbird.core.logging.LogLevelManager\n import net.thunderbird.core.logging.Logger\n import net.thunderbird.core.preference.storage.Storage\n import net.thunderbird.core.preference.storage.StorageEditor\n@@ -20,6 +22,7 @@ class DefaultDebuggingSettingsPreferenceManager(\n private val logger: Logger,\n private val storage: Storage,\n private val storageEditor: StorageEditor,\n+ private val logLevelManager: LogLevelManager,\n private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,\n private var scope: CoroutineScope = CoroutineScope(SupervisorJob()),\n ) : DebuggingSettingsPreferenceManager {\n@@ -32,7 +35,7 @@ class DefaultDebuggingSettingsPreferenceManager(\n override fun save(config: DebuggingSettings) {\n logger.debug(TAG) { \"save() called with: config = $config\" }\n writeConfig(config)\n- configState.update { config }\n+ configState.update { config.also(::updateDebugLogLevel) }\n }\n \n private fun loadConfig(): DebuggingSettings = DebuggingSettings(\n@@ -44,7 +47,7 @@ class DefaultDebuggingSettingsPreferenceManager(\n KEY_ENABLE_SYNC_DEBUG_LOGGING,\n DEBUGGING_SETTINGS_DEFAULT_IS_SYNC_LOGGING_ENABLED,\n ),\n- )\n+ ).also(::updateDebugLogLevel)\n \n private fun writeConfig(config: DebuggingSettings) {\n logger.debug(TAG) { \"writeConfig() called with: config = $config\" }\n@@ -58,4 +61,12 @@ class DefaultDebuggingSettingsPreferenceManager(\n }\n }\n }\n+\n+ private fun updateDebugLogLevel(config: DebuggingSettings) {\n+ if (config.isDebugLoggingEnabled) {\n+ logLevelManager.override(LogLevel.DEBUG)\n+ } else {\n+ logLevelManager.restoreDefault()\n+ }\n+ }\n }\ndiff --git a/legacy/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt\nindex 2cda0b84a69..52c4d1fc170 100644\n--- a/legacy/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt\n+++ b/legacy/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt\n@@ -71,6 +71,7 @@ val preferencesModule = module {\n logger = get(),\n storage = get().storage,\n storageEditor = get().createStorageEditor(),\n+ logLevelManager = get(),\n )\n }\n single {\n", "test_patch": "diff --git a/core/logging/impl-composite/src/commonTest/kotlin/net/thunderbird/core/logging/composite/DefaultCompositeLogSinkTest.kt b/core/logging/impl-composite/src/commonTest/kotlin/net/thunderbird/core/logging/composite/DefaultCompositeLogSinkTest.kt\nindex ec3fed6ff8d..7b2f8aae487 100644\n--- a/core/logging/impl-composite/src/commonTest/kotlin/net/thunderbird/core/logging/composite/DefaultCompositeLogSinkTest.kt\n+++ b/core/logging/impl-composite/src/commonTest/kotlin/net/thunderbird/core/logging/composite/DefaultCompositeLogSinkTest.kt\n@@ -19,7 +19,7 @@ class DefaultCompositeLogSinkTest {\n \n // Act\n DefaultCompositeLogSink(\n- level = LogLevel.INFO,\n+ logLevelProvider = { LogLevel.INFO },\n manager = sinkManager,\n sinks = listOf(sink1, sink2),\n )\n@@ -38,7 +38,7 @@ class DefaultCompositeLogSinkTest {\n val sinkManager = FakeCompositeLogSinkManager(mutableListOf(sink1, sink2))\n \n val testSubject = DefaultCompositeLogSink(\n- level = LogLevel.INFO,\n+ logLevelProvider = { LogLevel.INFO },\n manager = sinkManager,\n )\n \n@@ -60,7 +60,7 @@ class DefaultCompositeLogSinkTest {\n val sinkManager = FakeCompositeLogSinkManager(mutableListOf(sink1, sink2))\n \n val testSubject = DefaultCompositeLogSink(\n- level = LogLevel.WARN,\n+ logLevelProvider = { LogLevel.WARN },\n manager = sinkManager,\n )\n \n@@ -80,7 +80,7 @@ class DefaultCompositeLogSinkTest {\n val sinkManager = FakeCompositeLogSinkManager(mutableListOf(sink1, sink2))\n \n val testSubject = DefaultCompositeLogSink(\n- level = LogLevel.INFO,\n+ logLevelProvider = { LogLevel.INFO },\n manager = sinkManager,\n )\n \ndiff --git a/core/logging/testing/src/commonMain/kotlin/net/thunderbird/core/logging/testing/TestLogLevelManager.kt b/core/logging/testing/src/commonMain/kotlin/net/thunderbird/core/logging/testing/TestLogLevelManager.kt\nnew file mode 100644\nindex 00000000000..97b73330fe2\n--- /dev/null\n+++ b/core/logging/testing/src/commonMain/kotlin/net/thunderbird/core/logging/testing/TestLogLevelManager.kt\n@@ -0,0 +1,17 @@\n+package net.thunderbird.core.logging.testing\n+\n+import net.thunderbird.core.logging.LogLevel\n+import net.thunderbird.core.logging.LogLevelManager\n+\n+class TestLogLevelManager : LogLevelManager {\n+ var logLevel = LogLevel.VERBOSE\n+ override fun override(level: LogLevel) {\n+ logLevel = level\n+ }\n+\n+ override fun restoreDefault() {\n+ logLevel = LogLevel.VERBOSE\n+ }\n+\n+ override fun current(): LogLevel = logLevel\n+}\ndiff --git a/legacy/core/src/test/java/com/fsck/k9/TestApp.kt b/legacy/core/src/test/java/com/fsck/k9/TestApp.kt\nindex c3772111eae..5d005e62b95 100644\n--- a/legacy/core/src/test/java/com/fsck/k9/TestApp.kt\n+++ b/legacy/core/src/test/java/com/fsck/k9/TestApp.kt\n@@ -17,15 +17,19 @@ import net.thunderbird.core.featureflag.FeatureFlag\n import net.thunderbird.core.featureflag.FeatureFlagProvider\n import net.thunderbird.core.featureflag.InMemoryFeatureFlagProvider\n import net.thunderbird.core.logging.LogLevel\n+import net.thunderbird.core.logging.LogLevelManager\n+import net.thunderbird.core.logging.LogLevelProvider\n import net.thunderbird.core.logging.Logger\n import net.thunderbird.core.logging.composite.CompositeLogSink\n import net.thunderbird.core.logging.composite.CompositeLogSinkManager\n import net.thunderbird.core.logging.file.FileLogSink\n import net.thunderbird.core.logging.legacy.Log\n+import net.thunderbird.core.logging.testing.TestLogLevelManager\n import net.thunderbird.core.logging.testing.TestLogger\n import net.thunderbird.core.preference.storage.StoragePersister\n import net.thunderbird.legacy.core.FakeAccountDefaultsProvider\n import org.koin.core.qualifier.named\n+import org.koin.dsl.bind\n import org.koin.dsl.module\n import org.mockito.kotlin.mock\n \n@@ -52,7 +56,7 @@ class TestApp : Application() {\n val fileSink: FileLogSink = mock()\n \n val compositeSink: CompositeLogSink = CompositeLogSink(\n- level = LogLevel.DEBUG,\n+ logLevelProvider = { LogLevel.DEBUG },\n manager = sinkManager,\n sinks = listOf(fileSink),\n )\n@@ -61,6 +65,7 @@ class TestApp : Application() {\n \n val testModule = module {\n single { TestApp.logger }\n+ single { TestLogLevelManager() }.bind()\n single(named(\"syncDebug\")) { TestApp.logger }\n single(named(\"syncDebug\")) { TestApp.compositeSink }\n single(named(\"syncDebug\")) { TestApp.fileSink }\ndiff --git a/legacy/storage/src/test/java/com/fsck/k9/storage/TestApp.kt b/legacy/storage/src/test/java/com/fsck/k9/storage/TestApp.kt\nindex f7f9bf7d323..943cc1be6e1 100644\n--- a/legacy/storage/src/test/java/com/fsck/k9/storage/TestApp.kt\n+++ b/legacy/storage/src/test/java/com/fsck/k9/storage/TestApp.kt\n@@ -17,14 +17,18 @@ import net.thunderbird.core.featureflag.FeatureFlag\n import net.thunderbird.core.featureflag.FeatureFlagProvider\n import net.thunderbird.core.featureflag.InMemoryFeatureFlagProvider\n import net.thunderbird.core.logging.LogLevel\n+import net.thunderbird.core.logging.LogLevelManager\n+import net.thunderbird.core.logging.LogLevelProvider\n import net.thunderbird.core.logging.Logger\n import net.thunderbird.core.logging.composite.CompositeLogSink\n import net.thunderbird.core.logging.composite.CompositeLogSinkManager\n import net.thunderbird.core.logging.file.FileLogSink\n import net.thunderbird.core.logging.legacy.Log\n+import net.thunderbird.core.logging.testing.TestLogLevelManager\n import net.thunderbird.core.logging.testing.TestLogger\n import net.thunderbird.core.preference.storage.StoragePersister\n import org.koin.core.qualifier.named\n+import org.koin.dsl.bind\n import org.koin.dsl.module\n import org.mockito.kotlin.mock\n \n@@ -50,7 +54,7 @@ class TestApp : Application() {\n val fileSink: FileLogSink = mock()\n \n val compositeSink: CompositeLogSink = CompositeLogSink(\n- level = LogLevel.DEBUG,\n+ logLevelProvider = { LogLevel.DEBUG },\n manager = sinkManager,\n sinks = listOf(fileSink),\n )\n@@ -59,6 +63,7 @@ class TestApp : Application() {\n \n val testModule = module {\n single { TestApp.logger }\n+ single { TestLogLevelManager() }.bind()\n single(named(\"syncDebug\")) { TestApp.logger }\n single(named(\"syncDebug\")) { TestApp.compositeSink }\n single(named(\"syncDebug\")) { TestApp.fileSink }\ndiff --git a/legacy/ui/legacy/src/test/java/com/fsck/k9/TestApp.kt b/legacy/ui/legacy/src/test/java/com/fsck/k9/TestApp.kt\nindex 644112cd9ae..1fb618518ca 100644\n--- a/legacy/ui/legacy/src/test/java/com/fsck/k9/TestApp.kt\n+++ b/legacy/ui/legacy/src/test/java/com/fsck/k9/TestApp.kt\n@@ -10,14 +10,18 @@ import net.thunderbird.core.featureflag.FeatureFlag\n import net.thunderbird.core.featureflag.FeatureFlagProvider\n import net.thunderbird.core.featureflag.InMemoryFeatureFlagProvider\n import net.thunderbird.core.logging.LogLevel\n+import net.thunderbird.core.logging.LogLevelManager\n+import net.thunderbird.core.logging.LogLevelProvider\n import net.thunderbird.core.logging.Logger\n import net.thunderbird.core.logging.composite.CompositeLogSink\n import net.thunderbird.core.logging.composite.CompositeLogSinkManager\n import net.thunderbird.core.logging.file.FileLogSink\n import net.thunderbird.core.logging.legacy.Log\n+import net.thunderbird.core.logging.testing.TestLogLevelManager\n import net.thunderbird.core.logging.testing.TestLogger\n import net.thunderbird.core.preference.storage.StoragePersister\n import org.koin.core.qualifier.named\n+import org.koin.dsl.bind\n import org.koin.dsl.module\n import org.mockito.Mockito.mock\n \n@@ -44,7 +48,7 @@ class TestApp : Application() {\n val fileSink: FileLogSink = org.mockito.kotlin.mock()\n \n val compositeSink: CompositeLogSink = CompositeLogSink(\n- level = LogLevel.DEBUG,\n+ logLevelProvider = { LogLevel.DEBUG },\n manager = sinkManager,\n sinks = listOf(fileSink),\n )\n@@ -53,6 +57,7 @@ class TestApp : Application() {\n \n val testModule = module {\n single { TestApp.logger }\n+ single { TestLogLevelManager() }.bind()\n single(named(\"syncDebug\")) { TestApp.logger }\n single(named(\"syncDebug\")) { TestApp.compositeSink }\n single(named(\"syncDebug\")) { TestApp.fileSink }\n", "n2p_tests": {"net.thunderbird.core.logging.composite.DefaultCompositeLogSinkTest.log should log to all sinks": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "net.thunderbird.core.logging.composite.DefaultCompositeLogSinkTest.log should not log if level is below threshold": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "net.thunderbird.core.logging.composite.DefaultCompositeLogSinkTest.log should not log if sink level is below threshold": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "net.thunderbird.core.logging.composite.DefaultCompositeLogSinkTest.init should set initial sinks": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "wordpress-mobile__WordPress-Android-18967", "org": "wordpress-mobile", "repo": "WordPress-Android", "number": 18967, "state": "closed", "title": "[Jetpack Social] Hide Jetpack Social container if PostStatus is PRIVATE", "body": "Fixes #18927\r\n\r\nTo test:\r\nYou should not be able to reproduce the bug anymore. Steps to reproduce can be found in https://github.com/wordpress-mobile/WordPress-Android/issues/18927\r\n\r\n## Regression Notes\r\n1. Potential unintended areas of impact\r\nJetpack Social containers should continue to work as expected.\r\n\r\n2. What I did to test those areas of impact (or what existing automated tests I relied on)\r\nManual testing + unit testing.\r\n\r\n3. What automated tests I added (or what prevented me from doing so)\r\nUpdated `EditorJetpackSocialViewModelTest.kt`.\r\n\r\nPR submission checklist:\r\n\r\n- [x] I have completed the Regression Notes.\r\n- [x] I have considered adding accessibility improvements for my changes.\r\n- [x] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.\r\n\r\nUI Changes testing checklist:\r\n\r\n- [ ] Portrait and landscape orientations.\r\n- [ ] Light and dark modes.\r\n- [ ] Fonts: Larger, smaller and bold text.\r\n- [ ] High contrast.\r\n- [ ] Talkback.\r\n- [ ] Languages with large words or with letters/accents not frequently used in English.\r\n- [ ] Right-to-left languages. (Even if translation isn\u2019t complete, formatting should still respect the right-to-left layout)\r\n- [ ] Large and small screen sizes. (Tablet and smaller phones)\r\n- [ ] Multi-tasking: Split screen and Pop-up view. (Android 10 or higher)\r\n", "base": {"label": "wordpress-mobile:trunk", "ref": "trunk", "sha": "cfb329ae952a18c517e71c9f66efb257da1fe136"}, "resolved_issues": [{"number": 18927, "title": "Jetpack Social section is visible on private posts", "body": "Refs pctCYC-W4-p2#comment-989\n\n### Expected behavior\nThe Jetpack Social section should be hidden from the pre-publishing sheet and post settings when the post is set to private.\n\n### Actual behavior\nThe Jetpack Social section is shown for private posts, but the post is not auto-shared.\n\n### Steps to reproduce the behavior\n\n- Launch the Jetpack app.\n- Create a new blog post.\n- Set it to private.\n- Observe that the Jetpack Social section is visible in post settings and pre-publishing sheet.\n\n##### Tested on Jetpack Android 23.0-rc-1"}], "lang": "kotlin", "problem_statement": "Jetpack Social section is visible on private posts\nRefs pctCYC-W4-p2#comment-989\n\n### Expected behavior\nThe Jetpack Social section should be hidden from the pre-publishing sheet and post settings when the post is set to private.\n\n### Actual behavior\nThe Jetpack Social section is shown for private posts, but the post is not auto-shared.\n\n### Steps to reproduce the behavior\n\n- Launch the Jetpack app.\n- Create a new blog post.\n- Set it to private.\n- Observe that the Jetpack Social section is visible in post settings and pre-publishing sheet.\n\n##### Tested on Jetpack Android 23.0-rc-1\n", "pull_url": "https://github.com/wordpress-mobile/WordPress-Android/pull/18967", "issue_urls": ["https://github.com/wordpress-mobile/WordPress-Android/issues/18927"], "test_command": "./gradlew :WordPress:testWordpressVanillaDebugUnitTest --tests \"org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest\"", "fix_patch": "diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostSettingsFragment.java\nindex fcc44f840f07..17a68c9c050c 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostSettingsFragment.java\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostSettingsFragment.java\n@@ -938,6 +938,7 @@ void updatePostStatus(PostStatus postStatus) {\n postImmutableModel -> {\n updatePostStatusRelatedViews(postImmutableModel);\n updateSaveButton();\n+ mJetpackSocialViewModel.onPostStatusChanged();\n return null;\n });\n }\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditorJetpackSocialViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditorJetpackSocialViewModel.kt\nindex a2eaf0135a5e..8716b4e72dff 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditorJetpackSocialViewModel.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditorJetpackSocialViewModel.kt\n@@ -85,7 +85,11 @@ class EditorJetpackSocialViewModel @Inject constructor(\n this.siteModel = siteModel\n this.editPostRepository = editPostRepository\n \n- if (jetpackSocialFeatureConfig.isEnabled() && !editPostRepository.isPage) {\n+ startJetpackSocial()\n+ }\n+\n+ private fun startJetpackSocial() {\n+ if (shouldShowJetpackSocial()) {\n launch {\n shareLimit = getJetpackSocialShareLimitStatusUseCase.execute(siteModel)\n loadConnections()\n@@ -164,8 +168,7 @@ class EditorJetpackSocialViewModel @Inject constructor(\n }\n \n private suspend fun loadJetpackSocialIfSupported() {\n- val showJetpackSocial = jetpackSocialFeatureConfig.isEnabled() && siteModel.supportsPublicize()\n- if (!showJetpackSocial) {\n+ if (!shouldShowJetpackSocial()) {\n _jetpackSocialContainerVisibility.postValue(JetpackSocialContainerVisibility.ALL_HIDDEN)\n return\n }\n@@ -187,6 +190,11 @@ class EditorJetpackSocialViewModel @Inject constructor(\n }\n }\n \n+ private fun shouldShowJetpackSocial() = jetpackSocialFeatureConfig.isEnabled()\n+ && !editPostRepository.isPage\n+ && siteModel.supportsPublicize()\n+ && currentPost?.status != PostStatus.PRIVATE.toString()\n+\n private suspend fun mapLoaded(): JetpackSocialUiState.Loaded {\n val shareMessage = jetpackSocialShareMessage.ifEmpty {\n getJetpackSocialShareMessageUseCase.execute(currentPost?.id ?: -1)\n@@ -383,6 +391,10 @@ class EditorJetpackSocialViewModel @Inject constructor(\n if (trackEvent) jetpackSocialSharingTracker.trackAddConnectionCtaDisplayed(jetpackSocialFlow)\n }\n \n+ fun onPostStatusChanged() {\n+ startJetpackSocial()\n+ }\n+\n data class JetpackSocialContainerVisibility(\n val showInPrepublishingSheet: Boolean,\n val showInPostSettings: Boolean,\n", "test_patch": "diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/EditorJetpackSocialViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/EditorJetpackSocialViewModelTest.kt\nindex 68e92a6e3a22..1e05b7d4f486 100644\n--- a/WordPress/src/test/java/org/wordpress/android/ui/posts/EditorJetpackSocialViewModelTest.kt\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/EditorJetpackSocialViewModelTest.kt\n@@ -16,7 +16,9 @@ import org.wordpress.android.R\n import org.wordpress.android.datasets.wrappers.PublicizeTableWrapper\n import org.wordpress.android.fluxc.Dispatcher\n import org.wordpress.android.fluxc.model.AccountModel\n+import org.wordpress.android.fluxc.model.PostModel\n import org.wordpress.android.fluxc.model.SiteModel\n+import org.wordpress.android.fluxc.model.post.PostStatus\n import org.wordpress.android.fluxc.store.AccountStore\n import org.wordpress.android.fluxc.store.SiteStore\n import org.wordpress.android.models.PublicizeConnection\n@@ -116,6 +118,27 @@ class EditorJetpackSocialViewModelTest : BaseUnitTest() {\n verify(getPublicizeConnectionsForUserUseCase, never()).execute(any(), any(), any())\n }\n \n+ @Test\n+ fun `Should NOT load jetpack social if post is page`() = test {\n+ whenever(jetpackSocialFeatureConfig.isEnabled())\n+ .thenReturn(true)\n+ whenever(editPostRepository.isPage).thenReturn(true)\n+ classToTest.start(FAKE_SITE_MODEL, editPostRepository)\n+ verify(getPublicizeConnectionsForUserUseCase, never()).execute(any(), any(), any())\n+ }\n+\n+ @Test\n+ fun `Should NOT load jetpack social if PostStatus is PRIVATE`() = test {\n+ whenever(jetpackSocialFeatureConfig.isEnabled())\n+ .thenReturn(true)\n+ whenever(editPostRepository.isPage).thenReturn(false)\n+ whenever(editPostRepository.getPost()).thenReturn(PostModel().apply {\n+ setStatus(PostStatus.PRIVATE.toString())\n+ })\n+ classToTest.start(FAKE_SITE_MODEL, editPostRepository)\n+ verify(getPublicizeConnectionsForUserUseCase, never()).execute(any(), any(), any())\n+ }\n+\n @Test\n fun `Should hide jetpack social container if FF is disabled`() = test {\n whenever(jetpackSocialFeatureConfig.isEnabled())\n@@ -525,6 +548,12 @@ class EditorJetpackSocialViewModelTest : BaseUnitTest() {\n verify(jetpackSocialSharingTracker).trackConnectionToggled(JetpackSocialFlow.PRE_PUBLISHING, false)\n }\n \n+ @Test\n+ fun `Should start jetpack social if onPostVisibilityChanged is called`() {\n+ classToTest.onPostStatusChanged()\n+ verify(showJetpackSocialContainerObserver).onChanged(any())\n+ }\n+\n private fun fakeSiteModel(supportsPublicize: Boolean = false): SiteModel = FAKE_SITE_MODEL.apply {\n siteId = FAKE_REMOTE_SITE_ID\n url = \"mysite.blog\"\n", "n2p_tests": {"org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should show jetpack social container if FF is enabled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should track SHARING_CONNECTION_TOGGLED when connection item is clicked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should track ADD_CONNECTION_DISMISSED when not now button is clicked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should not track SHARE_LIMIT_DISPLAYED on screen shown for site with share limit UI not visible": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should track ADD_CONNECTION_TAPPED when connect profiles button is clicked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should emit loaded UI state if connections list is NOT empty and jetpack social FF is enabled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should track UPGRADE_LINK_TAPPED when subscribe button is clicked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should track ADD_CONNECTION_CTA_DISPLAYED on screen shown with NoConnection state": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should get publicize connections for user if jetpack social FF is enabled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should hide jetpack social container if FF is disabled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should emit no connections UI if connections are empty, FF is enabled and never dismissed by user": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should hide social sharing container if connections are empty but no connections dismissed by user": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should NOT load jetpack social if FF is disabled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should start jetpack social if onPostVisibilityChanged is called": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should reload jetpack social on screen shown if last emitted action was OpenSocialConnectionsList": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should get jetpack social share limit status if jetpack social FF is enabled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should not track ADD_CONNECTION_CTA_DISPLAYED on screen shown when NoConnection state was dismissed": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should track SHARE_LIMIT_DISPLAYED on screen shown for site with share limit UI visible": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should NOT load jetpack social if PostStatus is PRIVATE": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should emit OpenSocialConnectionList when onJetpackSocialConnectProfilesClick is called": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should map no connections UI if connections are empty, FF is enabled and never dismissed by user": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should map loaded UI state if connections list is NOT empty and jetpack social FF is enabled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should NOT reload jetpack social on screen shown if last emitted action was NOT OpenSocialConnectionsList": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.posts.EditorJetpackSocialViewModelTest.Should NOT load jetpack social if post is page": {"run": "NONE", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "wordpress-mobile__WordPress-Android-19091", "org": "wordpress-mobile", "repo": "WordPress-Android", "number": 19091, "state": "closed", "title": "Dashboard Personalization: Post cards more menu tracking", "body": "Closes #18945 & #18946\r\n\r\nThis PR adds track events for the more menu actions of the Scheduled and Draft post cards. This PR also removes post card footer action tracking events.\r\n\r\n**Merge Instructions**\r\n- Ensure #19075, #19089, and #19090 have been merged\r\n- Ensure the parent branch is set to `feature/dashboard-personalization`\r\n- Remove the Not Ready for Merge label\r\n- Merge as normal\r\n- \r\n## To Test\r\n- Login to the app \r\n- Select a site in which that has both drafts and scheduled posts\r\n- Enable log collection\r\n\r\n**Draft Post Tracking**\r\n- Go to Draft Posts Card > Tap on more menu \r\n- \u2705 Verify the log contains \ud83d\udd35 Tracked: my_site_dashboard_contextual_menu_accessed, Properties: {\"card\":\"draft_posts\"}\r\n- Tap on the \" View all drafts\" menu item\r\n- \u2705 Verify the log contains \ud83d\udd35 Tracked: my_site_dashboard_card_menu_item_tapped, Properties: {\"card\":\"draft_posts\",\"item\":\"view_all_drafts\"}\r\n- Navigate back to dashboard\r\n- Go to Draft Posts Card > Tap on more menu \r\n- Tap on the Hide this item \r\n- \u2705 Verify the log contains \ud83d\udd35 Tracked: my_site_dashboard_card_menu_item_tapped, Properties: {\"card\":\"draft_posts\",\"item\":\"hide_this\"}\r\n\r\n**Scheduled Posts Tracking**\r\n- Go to Scheduled Posts Card > Tap on more menu \r\n- \u2705 Verify the log contains \ud83d\udd35 Tracked: my_site_dashboard_contextual_menu_accessed, Properties: {\"card\":\"scheduled_posts\"}\r\n- Tap on the \" View all drafts\" menu item\r\n- \u2705 Verify the log contains \ud83d\udd35 Tracked: my_site_dashboard_card_menu_item_tapped, Properties: {\"card\":\"scheduled_posts\",\"item\":\"view_all_scheduled_posts\"}\r\n- Navigate back to dashboard\r\n- Go to Draft Card > Tap on more menu \r\n- Tap on the Hide this item \r\n- \u2705 Verify the log contains \ud83d\udd35 Tracked: my_site_dashboard_card_menu_item_tapped, Properties: {\"card\":\"scheduled_posts\",\"item\":\"hide_this\"}\r\n\r\n\r\n\r\n## Regression Notes\r\n1. Potential unintended areas of impact\r\nEvents are not tracked\r\n\r\n2. What I did to test those areas of impact (or what existing automated tests I relied on)\r\nManual and unit tests\r\n\r\n3. What automated tests I added (or what prevented me from doing so)\r\n\r\nPR submission checklist:\r\n\r\n- [x] I have completed the Regression Notes.\r\n- [x] I have considered adding accessibility improvements for my changes.\r\n- [x] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.\r\n\r\nUI Changes testing checklist: N/A\r\n", "base": {"label": "wordpress-mobile:feature/dashboard-personalization", "ref": "feature/dashboard-personalization", "sha": "498bb68e1ee31f8e9c3e4b5425b382858b0b0d43"}, "resolved_issues": [{"number": 18945, "title": "Dashboard Personalization: Add more menu to Draft Posts card", "body": "Draft Posts card\r\n\r\n\r\n```[tasklist]\r\n### Tasks\r\n- [x] Add more menu with options **View all drafts** and **Hide this**\r\n- [x] Implement action for Hide This -> Turn the draft posts preference to hide\r\n- [x] Implement action for View All Drafts -> navigate to drafts tab of posts list view\r\n- [x] Remove Go-to footer\r\n- [x] Add track events (see below)\r\n- [x] Remove tracking events for footer CTA (if needed)\r\n- [x] Create viewModelSlice (overlaps with scheduled posts card)\r\n```\r\n\r\n**Tracking Events**\r\n
\r\n\r\nAction | Event | Property\r\n-- | -- | --\r\nTap More | my_site_dashboard_contextual_menu_accessed | card: draft_posts\r\nTap More > View all drafts | my_site_dashboard_card_menu_item_tapped | card: draft_posts item:view_all_drafts\r\nTap > Hide This | my_site_dashboard_card_menu_item_tapped | card: draft_posts item:hide_this\r\n\r\n
"}], "lang": "kotlin", "problem_statement": "Dashboard Personalization: Add more menu to Draft Posts card\nDraft Posts card\r\n\r\n\r\n```[tasklist]\r\n### Tasks\r\n- [x] Add more menu with options **View all drafts** and **Hide this**\r\n- [x] Implement action for Hide This -> Turn the draft posts preference to hide\r\n- [x] Implement action for View All Drafts -> navigate to drafts tab of posts list view\r\n- [x] Remove Go-to footer\r\n- [x] Add track events (see below)\r\n- [x] Remove tracking events for footer CTA (if needed)\r\n- [x] Create viewModelSlice (overlaps with scheduled posts card)\r\n```\r\n\r\n**Tracking Events**\r\n
\r\n\r\nAction | Event | Property\r\n-- | -- | --\r\nTap More | my_site_dashboard_contextual_menu_accessed | card: draft_posts\r\nTap More > View all drafts | my_site_dashboard_card_menu_item_tapped | card: draft_posts item:view_all_drafts\r\nTap > Hide This | my_site_dashboard_card_menu_item_tapped | card: draft_posts item:hide_this\r\n\r\n
\n", "pull_url": "https://github.com/wordpress-mobile/WordPress-Android/pull/19091", "issue_urls": ["https://github.com/wordpress-mobile/WordPress-Android/issues/18945"], "test_command": "./gradlew :WordPress:testWordpressVanillaDebugUnitTest --tests \"org.wordpress.android.ui.mysite.cards.dashboard.posts.PostsCardViewModelSliceTest\" --tests \"org.wordpress.android.ui.mysite.cards.dashboard.CardsTrackerTest\"", "fix_patch": "diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsTracker.kt\nindex 4516b1ae3f27..6fa114b0d9c0 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsTracker.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsTracker.kt\n@@ -72,14 +72,6 @@ class CardsTracker @Inject constructor(\n trackCardItemClicked(Type.QUICK_START.label, quickStartTaskType.toSubtypeValue().label)\n }\n \n- fun trackPostCardFooterLinkClicked(postCardType: PostCardType) {\n- trackCardFooterLinkClicked(Type.POST.label, postCardType.toSubtypeValue().label)\n- }\n-\n- fun trackPostItemClicked(postCardType: PostCardType) {\n- trackCardItemClicked(Type.POST.label, postCardType.toSubtypeValue().label)\n- }\n-\n fun trackActivityCardItemClicked() {\n trackCardItemClicked(Type.ACTIVITY.label, ActivityLogSubtype.ACTIVITY_LOG.label)\n }\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/posts/PostsCardViewModelSlice.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/posts/PostsCardViewModelSlice.kt\nindex f9aa84e99e96..7f537705dd9f 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/posts/PostsCardViewModelSlice.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/posts/PostsCardViewModelSlice.kt\n@@ -1,12 +1,12 @@\n package org.wordpress.android.ui.mysite.cards.dashboard.posts\n \n-import android.util.Log\n import androidx.lifecycle.MutableLiveData\n import org.wordpress.android.fluxc.model.dashboard.CardModel.PostsCardModel\n import org.wordpress.android.ui.mysite.MySiteCardAndItemBuilderParams.PostCardBuilderParams\n import org.wordpress.android.ui.mysite.SelectedSiteRepository\n import org.wordpress.android.ui.mysite.SiteNavigationAction\n import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker\n+import org.wordpress.android.ui.mysite.cards.dashboard.toSubtypeValue\n import org.wordpress.android.ui.prefs.AppPrefsWrapper\n import org.wordpress.android.viewmodel.Event\n import javax.inject.Inject\n@@ -35,12 +35,14 @@ class PostsCardViewModelSlice @Inject constructor(\n }\n \n private fun onMoreMenuClick(postCardType: PostCardType) {\n- // todo: annmarie implement cards tracker\n- Log.i(javaClass.simpleName, \"***=> onMoreMenuClick $postCardType\")\n+ cardsTracker.trackCardMoreMenuClicked(postCardType.toPostMenuCardValue().label)\n }\n \n private fun onHideThisMenuItemClick(postCardType: PostCardType) {\n- // todo: annmarie implement cards tracker\n+ cardsTracker.trackCardMoreMenuItemClicked(\n+ postCardType.toPostMenuCardValue().label,\n+ PostMenuItemType.HIDE_THIS.label\n+ )\n appPrefsWrapper.setShouldHidePostDashboardCard(\n selectedSiteRepository.getSelectedSite()!!.siteId,\n postCardType.name,\n@@ -50,13 +52,19 @@ class PostsCardViewModelSlice @Inject constructor(\n }\n \n private fun onViewPostsMenuItemClick(postCardType: PostCardType) {\n+ cardsTracker.trackCardMoreMenuItemClicked(\n+ card = postCardType.toPostMenuCardValue().label,\n+ item = when (postCardType) {\n+ PostCardType.DRAFT -> PostMenuItemType.VIEW_ALL_DRAFTS.label\n+ PostCardType.SCHEDULED -> PostMenuItemType.VIEW_ALL_SCHEDULED_POSTS.label\n+ }\n+ )\n onPostCardViewAllClick(postCardType)\n- // todo: annmarie implement cards tracker\n }\n \n private fun onPostItemClick(params: PostCardBuilderParams.PostItemClickParams) {\n selectedSiteRepository.getSelectedSite()?.let { site ->\n- cardsTracker.trackPostItemClicked(params.postCardType)\n+ trackPostItemClicked(params.postCardType)\n when (params.postCardType) {\n PostCardType.DRAFT -> _onNavigation.value =\n Event(SiteNavigationAction.EditDraftPost(site, params.postId))\n@@ -69,11 +77,32 @@ class PostsCardViewModelSlice @Inject constructor(\n \n private fun onPostCardViewAllClick(postCardType: PostCardType) {\n selectedSiteRepository.getSelectedSite()?.let { site ->\n- // todo: annmarie implement tracking cardsTracker.trackPostCardFooterLinkClicked(postCardType)\n _onNavigation.value = when (postCardType) {\n PostCardType.DRAFT -> Event(SiteNavigationAction.OpenDraftsPosts(site))\n PostCardType.SCHEDULED -> Event(SiteNavigationAction.OpenScheduledPosts(site))\n }\n }\n }\n+\n+ private fun trackPostItemClicked(postCardType: PostCardType) {\n+ cardsTracker.trackCardItemClicked(CardsTracker.Type.POST.label, postCardType.toSubtypeValue().label)\n+ }\n+\n+ enum class PostMenuItemType(val label: String) {\n+ VIEW_ALL_DRAFTS(\"view_all_drafts\"),\n+ VIEW_ALL_SCHEDULED_POSTS(\"view_all_scheduled_posts\"),\n+ HIDE_THIS(\"hide_this\")\n+ }\n+\n+ enum class PostMenuCard(val label: String) {\n+ DRAFT_POSTS(\"draft_posts\"),\n+ SCHEDULED_POSTS(\"scheduled_posts\")\n+ }\n+\n+ private fun PostCardType.toPostMenuCardValue(): PostMenuCard {\n+ return when (this) {\n+ PostCardType.DRAFT -> PostMenuCard.DRAFT_POSTS\n+ PostCardType.SCHEDULED -> PostMenuCard.SCHEDULED_POSTS\n+ }\n+ }\n }\n", "test_patch": "diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsTrackerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsTrackerTest.kt\nindex e6522f993f3f..cd7987188d0e 100644\n--- a/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsTrackerTest.kt\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsTrackerTest.kt\n@@ -10,10 +10,8 @@ import org.wordpress.android.analytics.AnalyticsTracker.Stat\n import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType\n import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker.ActivityLogSubtype\n import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker.MenuItemType\n-import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker.PostSubtype\n import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker.QuickStartSubtype\n import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker.Type\n-import org.wordpress.android.ui.mysite.cards.dashboard.posts.PostCardType\n import org.wordpress.android.ui.quickstart.QuickStartTracker\n import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper\n \n@@ -55,35 +53,6 @@ class CardsTrackerTest {\n verifyQuickStartCardItemClickedTracked(QuickStartSubtype.CUSTOMIZE.label)\n }\n \n- /* POST CARDS */\n- @Test\n- fun `when post draft footer link is clicked, then post draft event is tracked`() {\n- cardsTracker.trackPostCardFooterLinkClicked(PostCardType.DRAFT)\n-\n- verifyFooterLinkClickedTracked(Type.POST, PostSubtype.DRAFT.label)\n- }\n-\n- @Test\n- fun `when post scheduled footer link is clicked, then post scheduled event is tracked`() {\n- cardsTracker.trackPostCardFooterLinkClicked(PostCardType.SCHEDULED)\n-\n- verifyFooterLinkClickedTracked(Type.POST, PostSubtype.SCHEDULED.label)\n- }\n-\n- @Test\n- fun `when post draft item is clicked, then post item event is tracked`() {\n- cardsTracker.trackPostItemClicked(PostCardType.DRAFT)\n-\n- verifyCardItemClickedTracked(Type.POST, PostSubtype.DRAFT.label)\n- }\n-\n- @Test\n- fun `when post scheduled item is clicked, then post item event is tracked`() {\n- cardsTracker.trackPostItemClicked(PostCardType.SCHEDULED)\n-\n- verifyCardItemClickedTracked(Type.POST, PostSubtype.SCHEDULED.label)\n- }\n-\n @Test\n fun `when activity log item is clicked, then activity card item event is tracked`() {\n cardsTracker.trackActivityCardItemClicked()\ndiff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/posts/PostsCardViewModelSliceTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/posts/PostsCardViewModelSliceTest.kt\nindex 440392eb3f71..ac985a8ccc17 100644\n--- a/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/posts/PostsCardViewModelSliceTest.kt\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/posts/PostsCardViewModelSliceTest.kt\n@@ -17,6 +17,8 @@ import org.wordpress.android.ui.mysite.SelectedSiteRepository\n import org.wordpress.android.ui.mysite.SiteNavigationAction\n import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker\n import org.wordpress.android.ui.prefs.AppPrefsWrapper\n+import org.wordpress.android.ui.mysite.cards.dashboard.posts.PostsCardViewModelSlice.PostMenuItemType\n+import org.wordpress.android.ui.mysite.cards.dashboard.posts.PostsCardViewModelSlice.PostMenuCard\n \n @ExperimentalCoroutinesApi\n @RunWith(MockitoJUnitRunner::class)\n@@ -77,6 +79,10 @@ class PostsCardViewModelSliceTest : BaseUnitTest() {\n )\n \n assertThat(navigationActions).containsOnly(SiteNavigationAction.EditDraftPost(site, postId))\n+ verify(cardsTracker).trackCardItemClicked(\n+ CardsTracker.Type.POST.label,\n+ CardsTracker.PostSubtype.DRAFT.label\n+ )\n }\n \n @Test\n@@ -92,6 +98,10 @@ class PostsCardViewModelSliceTest : BaseUnitTest() {\n )\n \n assertThat(navigationActions).containsOnly(SiteNavigationAction.EditScheduledPost(site, postId))\n+ verify(cardsTracker).trackCardItemClicked(\n+ CardsTracker.Type.POST.label,\n+ CardsTracker.PostSubtype.SCHEDULED.label\n+ )\n }\n \n @Test\n@@ -105,7 +115,10 @@ class PostsCardViewModelSliceTest : BaseUnitTest() {\n )\n )\n \n- verify(cardsTracker).trackPostItemClicked(PostCardType.SCHEDULED)\n+ verify(cardsTracker).trackCardItemClicked(\n+ CardsTracker.Type.POST.label,\n+ CardsTracker.PostSubtype.SCHEDULED.label\n+ )\n }\n \n @Test\n@@ -119,7 +132,7 @@ class PostsCardViewModelSliceTest : BaseUnitTest() {\n )\n )\n \n- verify(cardsTracker).trackPostItemClicked(PostCardType.DRAFT)\n+ verify(cardsTracker).trackCardItemClicked(CardsTracker.Type.POST.label, CardsTracker.PostSubtype.DRAFT.label)\n }\n \n @Test\n@@ -129,7 +142,10 @@ class PostsCardViewModelSliceTest : BaseUnitTest() {\n params.moreMenuClickParams.onViewPostsMenuItemClick(PostCardType.DRAFT)\n \n assertThat(navigationActions).containsOnly(SiteNavigationAction.OpenDraftsPosts(site))\n- // verify(cardsTracker).trackPostCardFooterLinkClicked(PostCardType.DRAFT)\n+ verify(cardsTracker).trackCardMoreMenuItemClicked(\n+ PostMenuCard.DRAFT_POSTS.label,\n+ PostMenuItemType.VIEW_ALL_DRAFTS.label\n+ )\n }\n \n @Test\n@@ -140,6 +156,10 @@ class PostsCardViewModelSliceTest : BaseUnitTest() {\n params.moreMenuClickParams.onViewPostsMenuItemClick(PostCardType.SCHEDULED)\n \n assertThat(navigationActions).containsOnly(SiteNavigationAction.OpenScheduledPosts(site))\n+ verify(cardsTracker).trackCardMoreMenuItemClicked(\n+ PostMenuCard.SCHEDULED_POSTS.label,\n+ PostMenuItemType.VIEW_ALL_SCHEDULED_POSTS.label\n+ )\n }\n \n @Test\n@@ -156,6 +176,21 @@ class PostsCardViewModelSliceTest : BaseUnitTest() {\n assertThat(refreshEvents).containsOnly(true)\n }\n \n+ @Test\n+ fun `given drafts post card, when more menu item hide this is accessed, then hide card is tracked`() = test {\n+ val siteId = 1L\n+ whenever(selectedSiteRepository.getSelectedSite()?.siteId).thenReturn(siteId)\n+\n+ val params = postsCardViewModelSlice.getPostsCardBuilderParams(mock())\n+\n+ params.moreMenuClickParams.onHideThisMenuItemClick.invoke(PostCardType.DRAFT)\n+\n+ verify(cardsTracker).trackCardMoreMenuItemClicked(\n+ PostMenuCard.DRAFT_POSTS.label,\n+ PostMenuItemType.HIDE_THIS.label\n+ )\n+ }\n+\n @Test\n fun `given scheduled post card, when more menu item hide this is accessed, then hide card is invoked`() = test {\n val siteId = 1L\n@@ -169,4 +204,19 @@ class PostsCardViewModelSliceTest : BaseUnitTest() {\n \n assertThat(refreshEvents).containsOnly(true)\n }\n+\n+ @Test\n+ fun `given scheduled post card, when more menu item hide this is accessed, then hide card is tracked`() = test {\n+ val siteId = 1L\n+ whenever(selectedSiteRepository.getSelectedSite()?.siteId).thenReturn(siteId)\n+\n+ val params = postsCardViewModelSlice.getPostsCardBuilderParams(mock())\n+\n+ params.moreMenuClickParams.onHideThisMenuItemClick.invoke(PostCardType.SCHEDULED)\n+\n+ verify(cardsTracker).trackCardMoreMenuItemClicked(\n+ PostMenuCard.SCHEDULED_POSTS.label,\n+ PostMenuItemType.HIDE_THIS.label\n+ )\n+ }\n }\n", "n2p_tests": {"org.wordpress.android.ui.mysite.cards.dashboard.posts.PostsCardViewModelSliceTest.given drafts post card, when more menu item hide this is accessed, then hide card is tracked": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.dashboard.CardsTrackerTest.when activity log item is clicked, then activity card item event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.dashboard.posts.PostsCardViewModelSliceTest.given scheduled post card, when item is clicked, then event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.dashboard.CardsTrackerTest.when activity card more menu is clicked, then activity more menu event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.dashboard.posts.PostsCardViewModelSliceTest.given draft post card, when post item is clicked, then post is opened for edit draft": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.dashboard.posts.PostsCardViewModelSliceTest.given draft post card, when item is clicked, then event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.dashboard.CardsTrackerTest.when quick start card grow item is clicked, then quick start card item tapped event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.dashboard.posts.PostsCardViewModelSliceTest.given scheduled post card, when view all scheduled posts is clicked, then scheduled posts screen is opened": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.dashboard.CardsTrackerTest.when activity card all activity menu item is clicked, then all activity this event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.dashboard.posts.PostsCardViewModelSliceTest.given scheduled post card, when more menu item hide this is accessed, then hide card is tracked": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.dashboard.posts.PostsCardViewModelSliceTest.given drafts post card, when more menu item hide this is accessed, then hide card is invoked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.dashboard.CardsTrackerTest.when activity card footer link is clicked, then footer link clicked is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.dashboard.posts.PostsCardViewModelSliceTest.given scheduled post card, when more menu item hide this is accessed, then hide card is invoked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.dashboard.posts.PostsCardViewModelSliceTest.given scheduled post card, when post item is clicked, then post is opened for edit scheduled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.dashboard.posts.PostsCardViewModelSliceTest.given draft post card, when view all drafts posts is clicked, then draft posts screen is opened": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.dashboard.CardsTrackerTest.when activity card hide this menu item is clicked, then hide this event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.dashboard.CardsTrackerTest.when quick start card customize item is clicked, then quick start card item tapped event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "wordpress-mobile__WordPress-Android-19115", "org": "wordpress-mobile", "repo": "WordPress-Android", "number": 19115, "state": "closed", "title": "Fixes: My site dashboard menu items tracking ", "body": "Fixes #19114\n\n## Description\nThis PR implements the tracking on clicking menu items in MySiteDashboard\n\n## To test:\n1. Login to the app\n2. Go to Menu\n3. Tap on menu item posts|stats\n4. Verify that the tracking is present\n5. \ud83d\udd35 Tracked: my_site_menu_item_tapped, Properties: {\"type\":\"posts|stats\"}\n5. Tap on any other item\n6. Verify that following tracking is present\n7. \ud83d\udd35 Tracked: my_site_menu_item_tapped, Properties: {\"type\":\"MENU_LABEL\"}\n\n## Regression Notes\n1. Potential unintended areas of impact\nIncorrect tracking \n\n2. What I did to test those areas of impact (or what existing automated tests I relied on)\nManual testing and Unit testing\n\n3. What automated tests I added (or what prevented me from doing so)\nUnit tests\n\nPR submission checklist:\n- [x] I have completed the Regression Notes.\n- [x] I have considered adding accessibility improvements for my changes.\n- [x] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.\n\nUI Changes testing checklist:\n- [x] Portrait and landscape orientations.\n- [x] Light and dark modes.\n- [x] Fonts: Larger, smaller and bold text.\n- [x] High contrast.\n- [x] Talkback.\n- [x] Languages with large words or with letters/accents not frequently used in English.\n- [x] Right-to-left languages. (Even if translation isn\u2019t complete, formatting should still respect the right-to-left layout)\n- [x] Large and small screen sizes. (Tablet and smaller phones)\n- [x] Multi-tasking: Split screen and Pop-up view. (Android 10 or higher)", "base": {"label": "wordpress-mobile:trunk", "ref": "trunk", "sha": "db8a917509f4ca9163b5e6c4b5afce89cee33678"}, "resolved_issues": [{"number": 19114, "title": "Missing tracking of Menu items in MySiteDashboard", "body": "### Expected behavior\r\nOn clicking menu items in MySiteDashboard the following event should be triggered for all the items \r\n- \ud83d\udd35 Tracked: my_site_menu_item_tapped, Properties: {\"type\":\"MENU_ITEM_LABEL\"}\r\n\r\n### Actual behavior\r\nThe tracking is present only for Posts and Stats Menu item \r\n\r\n### Steps to reproduce the behavior\r\n1. Login to the app \r\n2. Go to Menu \r\n3. Tap on menu item posts|stats\r\n4. Verify that the tracking is present \r\n5. Tap on any other item \r\n6. Notice that no tracking is present\r\n\r\n##### Tested on [device], Android [version], JPAndroid / WPAndroid [version]\r\nPixel 6, Android 13, version 23.1\r\n"}], "lang": "kotlin", "problem_statement": "Missing tracking of Menu items in MySiteDashboard\n### Expected behavior\r\nOn clicking menu items in MySiteDashboard the following event should be triggered for all the items \r\n- \ud83d\udd35 Tracked: my_site_menu_item_tapped, Properties: {\"type\":\"MENU_ITEM_LABEL\"}\r\n\r\n### Actual behavior\r\nThe tracking is present only for Posts and Stats Menu item \r\n\r\n### Steps to reproduce the behavior\r\n1. Login to the app \r\n2. Go to Menu \r\n3. Tap on menu item posts|stats\r\n4. Verify that the tracking is present \r\n5. Tap on any other item \r\n6. Notice that no tracking is present\r\n\r\n##### Tested on [device], Android [version], JPAndroid / WPAndroid [version]\r\nPixel 6, Android 13, version 23.1\r\n\n", "pull_url": "https://github.com/wordpress-mobile/WordPress-Android/pull/19115", "issue_urls": ["https://github.com/wordpress-mobile/WordPress-Android/issues/19114"], "test_command": "./gradlew :WordPress:testWordpressVanillaDebugUnitTest --tests \"org.wordpress.android.ui.mysite.MySiteViewModelTest\" --tests \"org.wordpress.android.ui.mysite.items.SiteItemsTrackerTest\"", "fix_patch": "diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt\nindex 00af915c6a45..75d903da827c 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt\n@@ -106,7 +106,6 @@ import org.wordpress.android.ui.mysite.cards.quickstart.QuickStartRepository.Qui\n import org.wordpress.android.ui.mysite.cards.quickstart.QuickStartRepository.QuickStartTabStep\n import org.wordpress.android.ui.mysite.cards.siteinfo.SiteInfoHeaderCardBuilder\n import org.wordpress.android.ui.mysite.items.SiteItemsBuilder\n-import org.wordpress.android.ui.mysite.items.SiteItemsTracker\n import org.wordpress.android.ui.mysite.items.listitem.ListItemAction\n import org.wordpress.android.ui.mysite.tabs.MySiteTabType\n import org.wordpress.android.ui.pages.SnackbarMessageHolder\n@@ -181,7 +180,6 @@ class MySiteViewModel @Inject constructor(\n private val landOnTheEditorFeatureConfig: LandOnTheEditorFeatureConfig,\n private val mySiteSourceManager: MySiteSourceManager,\n private val cardsTracker: CardsTracker,\n- private val siteItemsTracker: SiteItemsTracker,\n private val domainRegistrationCardShownTracker: DomainRegistrationCardShownTracker,\n private val buildConfigWrapper: BuildConfigWrapper,\n mySiteDashboardTabsFeatureConfig: MySiteDashboardTabsFeatureConfig,\n@@ -914,7 +912,7 @@ class MySiteViewModel @Inject constructor(\n @Suppress(\"ComplexMethod\")\n private fun onItemClick(action: ListItemAction) {\n selectedSiteRepository.getSelectedSite()?.let { selectedSite ->\n- siteItemsTracker.trackSiteItemClicked(action)\n+ analyticsTrackerWrapper.track(Stat.MY_SITE_MENU_ITEM_TAPPED, mapOf(TYPE to action.trackingLabel))\n val navigationAction = when (action) {\n ListItemAction.ACTIVITY_LOG -> SiteNavigationAction.OpenActivityLog(selectedSite)\n ListItemAction.BACKUP -> SiteNavigationAction.OpenBackup(selectedSite)\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/items/SiteItemsTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/items/SiteItemsTracker.kt\ndeleted file mode 100644\nindex 552b676db0d1..000000000000\n--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/items/SiteItemsTracker.kt\n+++ /dev/null\n@@ -1,35 +0,0 @@\n-package org.wordpress.android.ui.mysite.items\n-\n-import org.wordpress.android.analytics.AnalyticsTracker.Stat\n-import org.wordpress.android.ui.mysite.items.listitem.ListItemAction\n-import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper\n-import javax.inject.Inject\n-\n-class SiteItemsTracker @Inject constructor(\n- private val analyticsTrackerWrapper: AnalyticsTrackerWrapper\n-) {\n- enum class Type(val label: String) {\n- POSTS(\"posts\"),\n- STATS(\"stats\")\n- }\n-\n- fun trackSiteItemClicked(listItemAction: ListItemAction) = trackSiteItemClicked(listItemAction.toTypeValue())\n-\n- private fun trackSiteItemClicked(type: Type?) {\n- type?.let {\n- analyticsTrackerWrapper.track(Stat.MY_SITE_MENU_ITEM_TAPPED, mapOf(TYPE to it.label))\n- }\n- }\n-\n- private fun ListItemAction.toTypeValue(): Type? {\n- return when (this) {\n- ListItemAction.POSTS -> Type.POSTS\n- ListItemAction.STATS -> Type.STATS\n- else -> null\n- }\n- }\n-\n- companion object {\n- private const val TYPE = \"type\"\n- }\n-}\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/items/listitem/ListItemAction.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/items/listitem/ListItemAction.kt\nindex 1cf63b3dd10d..b56aa26bc32f 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/items/listitem/ListItemAction.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/items/listitem/ListItemAction.kt\n@@ -1,24 +1,24 @@\n package org.wordpress.android.ui.mysite.items.listitem\n \n-enum class ListItemAction {\n- ACTIVITY_LOG,\n- BACKUP,\n- SCAN,\n- JETPACK_SETTINGS,\n- PLAN,\n- POSTS,\n- PAGES,\n- ADMIN,\n- PEOPLE,\n- SHARING,\n- DOMAINS,\n- SITE_SETTINGS,\n- THEMES,\n- PLUGINS,\n- STATS,\n- MEDIA,\n- COMMENTS,\n- VIEW_SITE,\n- BLAZE,\n- ME\n+enum class ListItemAction (val trackingLabel: String) {\n+ ACTIVITY_LOG(\"activity_log\"),\n+ BACKUP(\"backup\"),\n+ SCAN(\"scan\"),\n+ JETPACK_SETTINGS(\"jetpack_settings\"),\n+ PLAN(\"plan\"),\n+ POSTS(\"posts\"),\n+ PAGES(\"pages\"),\n+ ADMIN(\"admin\"),\n+ PEOPLE(\"people\"),\n+ SHARING(\"sharing\"),\n+ DOMAINS(\"domains\"),\n+ SITE_SETTINGS(\"site_settings\"),\n+ THEMES(\"themes\"),\n+ PLUGINS(\"plugins\"),\n+ STATS(\"stats\"),\n+ MEDIA(\"media\"),\n+ COMMENTS(\"comments\"),\n+ VIEW_SITE(\"view_site\"),\n+ BLAZE(\"blaze\"),\n+ ME(\"me\"),\n }\n", "test_patch": "diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteViewModelTest.kt\nindex 55323820a635..9b529e23026a 100644\n--- a/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteViewModelTest.kt\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteViewModelTest.kt\n@@ -126,7 +126,6 @@ import org.wordpress.android.ui.mysite.cards.quickstart.QuickStartRepository.Qui\n import org.wordpress.android.ui.mysite.cards.quickstart.QuickStartRepository.QuickStartTabStep\n import org.wordpress.android.ui.mysite.cards.siteinfo.SiteInfoHeaderCardBuilder\n import org.wordpress.android.ui.mysite.items.SiteItemsBuilder\n-import org.wordpress.android.ui.mysite.items.SiteItemsTracker\n import org.wordpress.android.ui.mysite.items.listitem.ListItemAction\n import org.wordpress.android.ui.mysite.tabs.MySiteTabType\n import org.wordpress.android.ui.pages.SnackbarMessageHolder\n@@ -232,9 +231,6 @@ class MySiteViewModelTest : BaseUnitTest() {\n @Mock\n lateinit var cardsTracker: CardsTracker\n \n- @Mock\n- lateinit var siteItemsTracker: SiteItemsTracker\n-\n @Mock\n lateinit var domainRegistrationCardShownTracker: DomainRegistrationCardShownTracker\n \n@@ -523,7 +519,6 @@ class MySiteViewModelTest : BaseUnitTest() {\n landOnTheEditorFeatureConfig,\n mySiteSourceManager,\n cardsTracker,\n- siteItemsTracker,\n domainRegistrationCardShownTracker,\n buildConfigWrapper,\n mySiteDashboardTabsFeatureConfig,\n@@ -2342,7 +2337,10 @@ class MySiteViewModelTest : BaseUnitTest() {\n fun `when site item is clicked, then event is tracked`() = test {\n invokeItemClickAction(ListItemAction.POSTS)\n \n- verify(siteItemsTracker).trackSiteItemClicked(ListItemAction.POSTS)\n+ verify(analyticsTrackerWrapper).track(\n+ Stat.MY_SITE_MENU_ITEM_TAPPED,\n+ mapOf(\"type\" to ListItemAction.POSTS.trackingLabel)\n+ )\n }\n \n @Test\ndiff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/items/SiteItemsTrackerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/items/SiteItemsTrackerTest.kt\ndeleted file mode 100644\nindex 45611d887247..000000000000\n--- a/WordPress/src/test/java/org/wordpress/android/ui/mysite/items/SiteItemsTrackerTest.kt\n+++ /dev/null\n@@ -1,53 +0,0 @@\n-package org.wordpress.android.ui.mysite.items\n-\n-import org.junit.Before\n-import org.junit.Test\n-import org.junit.runner.RunWith\n-import org.mockito.Mock\n-import org.mockito.junit.MockitoJUnitRunner\n-import org.mockito.kotlin.any\n-import org.mockito.kotlin.times\n-import org.mockito.kotlin.verify\n-import org.wordpress.android.analytics.AnalyticsTracker.Stat\n-import org.wordpress.android.ui.mysite.items.SiteItemsTracker.Type\n-import org.wordpress.android.ui.mysite.items.listitem.ListItemAction\n-import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper\n-\n-private const val TYPE = \"type\"\n-\n-@RunWith(MockitoJUnitRunner::class)\n-class SiteItemsTrackerTest {\n- @Mock\n- lateinit var analyticsTracker: AnalyticsTrackerWrapper\n- private lateinit var siteItemsTracker: SiteItemsTracker\n-\n- @Before\n- fun setUp() {\n- siteItemsTracker = SiteItemsTracker(analyticsTracker)\n- }\n-\n- @Test\n- fun `when site item posts is clicked, then menu item tapped posts is tracked`() {\n- siteItemsTracker.trackSiteItemClicked(ListItemAction.POSTS)\n-\n- verifySiteItemClickedTracked(Type.POSTS)\n- }\n-\n- @Test\n- fun `when site item stats is clicked, then menu item tapped stats is tracked`() {\n- siteItemsTracker.trackSiteItemClicked(ListItemAction.STATS)\n-\n- verifySiteItemClickedTracked(Type.STATS)\n- }\n-\n- @Test\n- fun `given not tracking site item, when site item is clicked, then click is not tracked`() {\n- siteItemsTracker.trackSiteItemClicked(ListItemAction.VIEW_SITE)\n-\n- verify(analyticsTracker, times(0)).track(any())\n- }\n-\n- private fun verifySiteItemClickedTracked(typeValue: Type) {\n- verify(analyticsTracker).track(Stat.MY_SITE_MENU_ITEM_TAPPED, mapOf(TYPE to typeValue.label))\n- }\n-}\n", "n2p_tests": {"org.wordpress.android.ui.mysite.MySiteViewModelTest.given remove undo snackbar, when undo is clicked, then it updates setting and refresh prompts": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given post card, when footer link is clicked, then event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given todays stat card, when get more views url is clicked, then external link is opened": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when remove next steps dialog positive btn clicked, then QS is skipped": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when domain registration card is shown, then card shown event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given blogging prompt card, when answer button is clicked, answer action is called": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.site info card icon click shows snackbar when upload files not allowed and site does not have icon": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given shouldShowJetpackBranding is true, then the Jetpack badge is visible last": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.domain registration item click opens domain registration": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.site info card icon click shows add icon dialog when site doesn't have icon": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given blogging prompt card, when resuming dashboard, then tracker helper called as expected": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs enabled + initial screen is site_menu, when site is selected, then default tab is site menu": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when quick start menu step is triggered, then dashboard tab has quick start focus point": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.site info card switch click opens site picker": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given self-hosted site, when quick link ribbon stats click, then shows connect jetpack screen": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given new site QS View Site task, when site info url clicked, site opened + View Site task completed": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given activity card, when footer clicked, then event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given activity card, when footer is clicked, then trigger navigate to activity log list": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when Jetpack feature card learn more is clicked, then learn more is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs are enabled, when quick link stats tapped, then track with tab source is requested": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when clear active quick start task is triggered, then clear active quick start task": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.site info card icon click shows change icon dialog when site has icon": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given empty site view, when add new site is tapped, then navigated to AddNewSite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given scheduled post card, when footer link is clicked, then scheduled posts screen is opened": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given blogging prompt card, when remove button is clicked, prompt is removed and notifies card was removed": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given draft page card, when page item is clicked, then navigate to page list draft tab": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when onActionableEmptyViewVisible is invoked then show jetpack individual plugin overlay": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when vm cleared() is invoked, then MySiteSource clear() is invoked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given my site tabs build config with flag enabled, when site is selected, then tabs are visible": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.model is empty with no selected site": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when quick start task is clicked, then task is set as active task": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when feature card criteria is met + show at bottom, then items do contain feature card": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given draft post card, when post item is clicked, then post is opened for edit draft": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given no blogging prompt card, when resuming dashboard, then tracker helper called as expected": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given selected site, when site menu cards and items, then dashboard cards not exist": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs are disabled, when pull to refresh invoked, then pull-to-refresh is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when start QS is triggered, then QS request dialog positive tapped is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.admin item click emits OpenAdmin navigation event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when quick link ribbon media click, then media screen is shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs are enabled, when quick link posts tapped, then track with tab source is requested": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given selected site, when site menu cards and items, then list items exist": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given published page card, when page item is clicked, then event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given my site tabs build, when site is selected, then site header is visible": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given blogging prompt card, when prompts social FF is ON, view answers action is shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given dashboard tab, when quick start card item clicked, then quick start card item tapped is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when change site icon dialog is dismissed, then check and show quick start notice": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given selected site, when site menu cards and items, then site info header has updates": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs enabled + initial screen is home, when site is selected, then default tab is dashboard": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when site chooser is dismissed, then check and show quick start notice": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when quick link ribbon pages click, then pages screen is shown and completes REVIEW_PAGES task": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given blogging prompt card, when prompts enhancements FF is ON, remove action is shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when no site is selected, then tabs are not visible": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given published page card, when page item is clicked, then navigate to page list published tab": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given IS NOT Jetpack app, migration success card SHOULD NOT be shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.quick action pages click opens pages screen": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.site info card icon click shows snackbar when upload files not allowed and site doesn't have Jetpack": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given selected site with domain credit, when dashboard cards + items, then domain reg card exists": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when jetpack feature card is shown, then jetpack feature card shown is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs enabled + site menu default tab variant, when site menu cards and items, then qs card exists": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.backup menu item is NOT visible, when getJetpackMenuItemsVisibility is false": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.account avatar url value is emitted and updated from the source": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given refresh, when not invoked as PTR, then pull-to-refresh request is not tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when Jetpack feature card is clicked, then jetpack feature card clicked is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs enabled + site menu default tab variant, when dashboard cards items, then qs card not exists": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given QS is not available for existing site, when check and start QS is triggered, then QSP is not shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs are disabled, when quick link pages tapped, then track with tab source is not requested": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.snackbar is shown and event is tracked when handling successful domain registration result without email": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given existing site QS stats task, when stats item clicked, then CHECK_STATS task completed": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when Jetpack feature card menu is clicked, then menu clicked is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.backup menu item is visible, when getJetpackMenuItemsVisibility is true": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given blogging prompt card, when view answers is clicked, view more action is called": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given first resume, when on resume is triggered, then mySiteSourceManager onResume is invoked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when change site icon dialog negative button is clicked, then check and show quick start notice": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when first onResume is triggered, then checkAndShowQuickStartNotice is invoked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs enabled + dashboard variant, when dashboard cards items, then qs card exists": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given wp app, when no site is selected and screen height is higher than 600 pixels, show empty view image": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when blogging prompt answer is uploaded, refresh prompt card": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given my site tabs feature flag not enabled, when site is selected, then tabs are not visible": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.activity item click emits OpenActivity navigation event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs are disabled, when quick link media tapped, then track with tab source is not requested": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given site is Jetpack, when quick link ribbon stats click, then stats screen is shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given skip undo snackbar, when undo is clicked, then undo skip action and refresh prompt": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given info item exist, when cardAndItems list is ordered, then info item succeeds site info card": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when feature card criteria is not met, then items does not contain feature card": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given activity card, when activity item is clicked, then navigate to activity detail": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when quick link ribbon posts click, then posts screen is shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs are disabled, when pull to refresh invoked, then track with tab source is not requested": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when onBloggingPromptsLearnMoreClicked should post value on onBloggingPromptsLearnMore": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when change site icon dialog +ve btn clicked, then upload site icon task marked complete without refresh": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when remove next steps dialog positive btn clicked, then QS active task cleared": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given dashboard tab has qs focus point, when tab is changed, then dashboard pending task is active": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given blogging prompt card, when prompts social FF is OFF, view answers action is not shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given show stale msg in cards update, when dashboard cards updated, then info item shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.stats item click emits OpenStats navigation event if site is WPCom and has access token": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given blogging prompt card, when share button is clicked, share action is called": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given show snackbar in cards update, when dashboard cards updated, then dashboard snackbar shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given activity card, when activity item is clicked, then event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given site select exists, then cardAndItem lists are not empty": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given show snackbar not in cards update, when dashboard cards updated, then dashboard snackbar not shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when check and show quick start notice is triggered, then check and show quick start notice": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given site menu tab, when quick start card item is clicked, then quick start tapped is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given scheduled page card, when page item is clicked, then event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when change site icon dialog -ve btn is clicked, then upload site icon task marked complete no refresh": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.stats item click emits ConnectJetpackForStats if neither Jetpack, nor WPCom and no access token": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.quick action pages click opens pages screen and completes REVIEW_PAGES task": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when remove next steps dialog negative btn clicked, then QS is not skipped": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given not first resume, when on resume is triggered, then mySiteSourceManager onResume is invoked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.avatar press opens me screen": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when selected site is changed, then cardShownTracker is reset": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.site info card title click shows input dialog when editing allowed": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given the land on the editor feature is not enabled, then the home page editor is not shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when sources are refreshing, then refresh indicator should show": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs are enabled, when quick link ribbon stats tapped, then track with tab source is requested": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given draft page card, when page item is clicked, then event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.stats item click emits OpenStats navigation event if site is Jetpack and has access token": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.quick action stats click opens connect jetpack screen when user is logged in and site is self-hosted": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when add site icon dialog +ve btn is clicked, then upload site icon task marked complete without refresh": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when quick start task type item is clicked, then quick start active task is cleared": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.JP migration success card should have the correct text": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given blogging prompt card, when prompts list FF is ON, view more action is shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs are enabled, when quick link ribbon pages tapped, then track with tab source is requested": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when quick start task type item is clicked, then quick start full screen dialog is opened": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.quick action posts click opens posts screen": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.site info card title click shows snackbar message when origin not ORIGIN_WPCOM_REST": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when feature card criteria is met + show at top, then items do contain feature card": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when Jetpack feature card hide this is clicked, then hide is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.quick action stats click starts login when user is not logged in and site is Jetpack": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when ignore QS is triggered, then QS request dialog negative tapped is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.blogging prompt card is not added to the dashboard when FF is OFF": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given jp app, when no site is selected, hide empty view image": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.quick action stats click opens connect jetpack screen when user is not logged in and site is self-hosted": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given remove undo snackbar, when undo is clicked, then it tracks undo event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given blogging prompt card, when prompts list FF is OFF, view more action is not shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given selected site with tabs disabled, when all cards and items, then qs card exists": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when quick link ribbon pages click, then pages screen is shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.JP migration success card should have the correct image": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given selected site, when dashboard cards and items, then dashboard cards exists": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when Jetpack feature card remind later is clicked, then remind later is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given scheduled post card, when post item is clicked, then post is opened for edit scheduled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given site using wpcom rest api, when site is selected, then tabs are visible": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when non blogging prompt answer is uploaded, prompt card is not refreshed": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.posts item click emits OpenPosts navigation event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs are enabled, when quick link ribbon posts tapped, then track with tab source is requested": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.blogging prompt card is added to the dashboard when FF is ON": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given my site tabs build config not enabled, when site is selected, then tabs are not visible": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.view site item click emits OpenSite navigation event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs are enabled, when quick link media tapped, then track with tab source is requested": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs are disabled, when quick link stats tapped, then track with tab source is not requested": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given user is not logged in jetpack site, when quick link ribbon stats click, then login screen is shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.themes item click emits OpenThemes navigation event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when onActionableEmptyViewVisible is invoked then don't show jetpack individual plugin overlay": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when selected site is changed, then cardTracker is reset": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when QS remove menu item is clicked, then remove next steps dialog shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.quick action media click opens media screen": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given new site, when check and start QS is triggered, then QSP is shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs not enabled, when site is selected, then default tab is not set": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs enabled, when site is created, then default tab is set": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given todays stat card, when footer link is clicked, then stats page is opened": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when add site icon dialog -ve btn is clicked, then upload site icon task marked complete without refresh": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when create new pages card is clicked, then trigger create page flow": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.pages item click emits OpenPages navigation event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.plugins item click emits OpenPlugins navigation event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.quick action stats click opens stats screen when user is logged in and site is WPCOM": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given new site QS, when quick action stats clicked, then CHECK_STATS task completes": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.scan menu item is NOT visible, when getJetpackMenuItemsVisibility is false": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given existing site, when check and start QS is triggered, then QSP is shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given existing site QS View Site task, when site info url clicked, site opened + View Site task completed": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when add site icon dialog is dismissed, then check and show quick start notice": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given the land on the editor feature is enabled, then the home page editor is shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs are disabled, when quick link posts tapped, then track with tab source is not requested": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given show stale msg not in cards update, when dashboard cards updated, then info item not shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given selected site, when dashboard cards and items, then list items not exist": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when remove next steps dialog positive btn clicked, then QS repo refreshed": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.media item click emits OpenMedia navigation event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given todays stat card, when card item is clicked, then stats page is opened": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.comments item click emits OpenUnifiedComments navigation event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.site info card title click shows snackbar message when network not available": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given QS is not available for new site, when check and start QS is triggered, then QSP is not shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.quick actions does not show pages button when site doesn't have the required capability": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when QS fullscreen dialog dismiss is triggered, then quick start repository is refreshed": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.plan item click emits OpenPlan navigation event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs enabled + dashboard default tab variant, when site menu cards + items, then qs card not exists": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given shouldShowJetpackBranding is false, then no Jetpack badge is visible": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given WordPress app IS NOT installed, migration success card SHOULD NOT be shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs are enabled, when quick link ribbon media tapped, then track with tab source is requested": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given dashboard tab is selected, when tab is changed, then dashboard events are tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.model contains header of selected site": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.stats item click emits StartWPComLoginForJetpackStats if site is Jetpack and doesn't have access token": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.on site name chosen updates title if network available": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given draft post card, when item is clicked, then event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs are enabled, when quick link pages tapped, then track with tab source is requested": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when add site icon dialog positive button is clicked, then media picker is opened": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given site not using wpcom rest api, when site is selected, then tabs are not visible": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given blogging prompt card, when skip button is clicked, prompt is skipped and undo snackbar displayed": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.site info card icon click shows snackbar when upload files not allowed and site has icon": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given site menu tab is selected, when tab is changed, then site menu events are tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given draft post card, when footer link is clicked, then draft posts screen is opened": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when add site icon dialog negative button is clicked, then check and show quick start notice": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.sharing item click emits OpenSharing navigation event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given skip undo snackbar, when undo is clicked, then it tracks undo event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given tabs are enabled, when pull to refresh invoked, then track with tab source is requested": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given wp app, when no site is selected and screen height is lower than 600 pixels, hide empty view image": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given blogging prompt card, when resuming menu, then tracker helper called as expected": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given blogging prompt card, when view more button is clicked, view more action is called": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given selected site with domain credit, when site menu cards and items, then domain reg card doesn't exist": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given blogging prompt card, when prompts enhancements FF is OFF, remove action is not shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.JP migration success card click should be tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.quick action stats click opens stats screen when user is logged in and site is Jetpack": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.site info card title click shows snackbar message when hasCapabilityManageOptions is false": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.scan menu item is visible, when getJetpackMenuItemsVisibility is true": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.on site name chosen shows snackbar if network not available": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given site is WPCOM, when quick link ribbon stats click, then stats screen is shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given new site QS stats task, when stats item clicked, then CHECK_STATS task completed": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when sources are not refreshing, then refresh indicator should not show": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.handling successful login result opens stats screen": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given scheduled page card, when page item is clicked, then navigate to page list scheduled tab": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when site item is clicked, then event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given no selected site, then site info header is not visible": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when blaze item click, then event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when site icon dialog is dismissed, then upload site icon task is marked complete without refresh": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given no selected site, when check and start QS is triggered, then QSP is not shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given IS JP app, migration IS complete and WP app IS installed, migration success card SHOULD be shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given blogging prompt card, when view answers is clicked, the action is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when dashboard cards are shown, then card shown event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when start QS is triggered, then QS starts": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given error dashboard card, when retry is clicked, then refresh is triggered": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.snackbar is shown and event is tracked when handling successful domain registration result with email": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.scan item click emits OpenScan navigation event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.when change site icon dialog positive button is clicked, then media picker is opened": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given dashboard tab has qs focus point, when tab is changed, then qs focus point is cleared": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given migration IS NOT completed, migration success card SHOULD NOT be shown": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.given scheduled post card, when item is clicked, then event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.MySiteViewModelTest.site settings item click emits OpenSiteSettings navigation event": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "wordpress-mobile__WordPress-Android-19175", "org": "wordpress-mobile", "repo": "WordPress-Android", "number": 19175, "state": "closed", "title": "Dashboard Personalization: Personalize card navigation, tracking and unit testing", "body": "Closes #18937 \r\n\r\nThis PR adds the following for the personalize card\r\n- Navigation event for onclick\r\n- Tracking for card shown and tapped\r\n- Add unit tests\r\n\r\n**To test:**\r\n- Install the app and login\r\n- Navigate to Me > Debug Settings > enable `dashboard_personalization` and restart the app\r\n- Navigate to the My Site tab\r\n- \u2705 Verify log contains: \ud83d\udd35 Tracked: my_site_dashboard_card_shown, Properties: {\"type\":\"personalize\",\"subtype\":\"personalize\"}\r\n- Tap on the personalize card\r\n- \u2705 Verify log contains: \ud83d\udd35 Tracked: my_site_dashboard_card_item_tapped, Properties: {\"type\":\"personalize\",\"subtype\":\"personalize\"}\r\n\r\n## Regression Notes\r\n1. Potential unintended areas of impact\r\nPersonalize card tracking and events do not work correctly\r\n\r\n2. What I did to test those areas of impact (or what existing automated tests I relied on)\r\nManual testing and new unit tests `PersonalizeCardViewModelSliceTest` and `PersonalizeCardBuilderTest`\r\n\r\n3. What automated tests I added (or what prevented me from doing so) N/A\r\n\r\nPR submission checklist:\r\n\r\n- [x] I have completed the Regression Notes.\r\n- [x] I have considered adding accessibility improvements for my changes.\r\n- [x] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.\r\n\r\nUI Changes testing checklist: N/A\r\n", "base": {"label": "wordpress-mobile:trunk", "ref": "trunk", "sha": "6eab5e2e728ef475a16e98a45840f407218c77e0"}, "resolved_issues": [{"number": 18937, "title": "Dashboard Personalization: Create Personalize Your Home Tab Card", "body": "Create the **Personalize Home Tab** card \r\n\r\n![Image](https://github.com/wordpress-mobile/WordPress-Android/assets/506707/5624c751-af13-40bb-9100-f02a14d6c0de)\r\n\r\n\r\n```[tasklist]\n### Tasks\n- [x] Guard with `dashboard_personalization` feature flag\n- [x] Create compose UI, viewmodel, builder, etc\n- [x] Slot as last card on the dashboard\n- [x] On card tap: navigate to Personalize Home Tab View (Add new navigation event)\n- [x] On card tap: track `my_site_dashboard_card_item_tapped` with property `type:personalize`\n- [x] On card shown: track `my_site_dashboard_card_shown` with property `type:personalize`\n```\r\n"}], "lang": "kotlin", "problem_statement": "Dashboard Personalization: Create Personalize Your Home Tab Card\nCreate the **Personalize Home Tab** card \r\n\r\n![Image](https://github.com/wordpress-mobile/WordPress-Android/assets/506707/5624c751-af13-40bb-9100-f02a14d6c0de)\r\n\r\n\r\n```[tasklist]\n### Tasks\n- [x] Guard with `dashboard_personalization` feature flag\n- [x] Create compose UI, viewmodel, builder, etc\n- [x] Slot as last card on the dashboard\n- [x] On card tap: navigate to Personalize Home Tab View (Add new navigation event)\n- [x] On card tap: track `my_site_dashboard_card_item_tapped` with property `type:personalize`\n- [x] On card shown: track `my_site_dashboard_card_shown` with property `type:personalize`\n```\r\n\n", "pull_url": "https://github.com/wordpress-mobile/WordPress-Android/pull/19175", "issue_urls": ["https://github.com/wordpress-mobile/WordPress-Android/issues/18937"], "test_command": "./gradlew :WordPress:testWordpressVanillaDebugUnitTest --tests \"org.wordpress.android.ui.mysite.cards.personalize.PersonalizeCardViewModelSliceTest\" --tests \"org.wordpress.android.ui.mysite.cards.personalize.PersonalizeCardBuilderTest\"", "fix_patch": "diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ActivityNavigator.kt b/WordPress/src/main/java/org/wordpress/android/ui/ActivityNavigator.kt\nindex 16406fd9a874..d6aa4ad91098 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/ActivityNavigator.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/ActivityNavigator.kt\n@@ -11,6 +11,7 @@ import org.wordpress.android.ui.blaze.blazecampaigns.campaignlisting.CampaignLis\n import org.wordpress.android.ui.blaze.blazepromote.ARG_BLAZE_FLOW_SOURCE\n import org.wordpress.android.ui.blaze.blazepromote.ARG_BLAZE_SHOULD_SHOW_OVERLAY\n import org.wordpress.android.ui.blaze.blazepromote.BlazePromoteParentActivity\n+import org.wordpress.android.ui.mysite.personalisation.PersonalisationActivity\n import javax.inject.Inject\n import javax.inject.Singleton\n \n@@ -59,4 +60,8 @@ class ActivityNavigator @Inject constructor() {\n ) {\n WPWebViewActivity.openUrlByUsingGlobalWPCOMCredentials(context, url)\n }\n+\n+ fun openDashboardPersonalization(context: Context) {\n+ context.startActivity(Intent(context, PersonalisationActivity::class.java))\n+ }\n }\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt\nindex fa8e2107a96e..1cfcf073ea66 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt\n@@ -282,7 +282,8 @@ class MySiteViewModel @Inject constructor(\n postsCardViewModelSlice.onNavigation,\n activityLogCardViewModelSlice.onNavigation,\n siteItemsViewModelSlice.onNavigation,\n- bloggingPromptCardViewModelSlice.onNavigation\n+ bloggingPromptCardViewModelSlice.onNavigation,\n+ personalizeCardViewModelSlice.onNavigation\n )\n val onMediaUpload = _onMediaUpload as LiveData>\n val onUploadedItem = siteIconUploadHandler.onUploadedItem\n@@ -1364,6 +1365,8 @@ class MySiteViewModel @Inject constructor(\n siteSelected.cardAndItems.filterIsInstance()\n .forEach { jetpackInstallFullPluginShownTracker.trackShown(it.type, quickStartRepository.currentTab) }\n dashboardCardPlansUtils.trackCardShown(viewModelScope, siteSelected)\n+ siteSelected.dashboardCardsAndItems.filterIsInstance()\n+ .forEach { personalizeCardViewModelSlice.trackShown(it.type) }\n }\n \n private fun resetShownTrackers() {\n@@ -1372,6 +1375,7 @@ class MySiteViewModel @Inject constructor(\n quickStartTracker.resetShown()\n jetpackFeatureCardShownTracker.resetShown()\n jetpackInstallFullPluginShownTracker.resetShown()\n+ personalizeCardViewModelSlice.resetShown()\n }\n \n private fun trackTabChanged(isSiteMenu: Boolean) {\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteNavigationAction.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteNavigationAction.kt\nindex 6ca47cf0eb8a..10fed8d798d3 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteNavigationAction.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteNavigationAction.kt\n@@ -104,6 +104,7 @@ sealed class SiteNavigationAction {\n SiteNavigationAction()\n \n data class OpenDomainTransferPage(val url: String) : SiteNavigationAction()\n+ object OpenDashboardPersonalization : SiteNavigationAction()\n }\n \n sealed class BloggingPromptCardNavigationAction: SiteNavigationAction() {\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsTracker.kt\nindex 41fe5f1eda5e..80ce6b0a7f39 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsTracker.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsTracker.kt\n@@ -30,6 +30,7 @@ class CardsTracker @Inject constructor(\n ACTIVITY(\"activity_log\"),\n DASHBOARD_CARD_PLANS(\"dashboard_card_plans\"),\n DASHBOARD_CARD_DOMAIN_TRANSFER(\"dashboard_card_domain_transfer\"),\n+ PERSONALIZE_CARD(\"personalize\")\n }\n \n enum class QuickStartSubtype(val label: String) {\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/personalize/PersonalizeCardShownTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/personalize/PersonalizeCardShownTracker.kt\nnew file mode 100644\nindex 000000000000..cf94d65d7e28\n--- /dev/null\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/personalize/PersonalizeCardShownTracker.kt\n@@ -0,0 +1,32 @@\n+package org.wordpress.android.ui.mysite.cards.personalize\n+\n+import org.wordpress.android.analytics.AnalyticsTracker\n+import org.wordpress.android.ui.mysite.MySiteCardAndItem\n+import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker\n+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper\n+import javax.inject.Inject\n+\n+class PersonalizeCardShownTracker @Inject constructor(\n+ private val analyticsTrackerWrapper: AnalyticsTrackerWrapper\n+) {\n+ private val cardsShownTracked = mutableListOf()\n+\n+ fun resetShown() {\n+ cardsShownTracked.clear()\n+ }\n+\n+ fun trackShown(itemType: MySiteCardAndItem.Type) {\n+ if (itemType == MySiteCardAndItem.Type.PERSONALIZE_CARD) {\n+ if (!cardsShownTracked.contains(itemType)) {\n+ cardsShownTracked.add(itemType)\n+ analyticsTrackerWrapper.track(\n+ AnalyticsTracker.Stat.MY_SITE_DASHBOARD_CARD_SHOWN,\n+ mapOf(\n+ CardsTracker.TYPE to CardsTracker.Type.PERSONALIZE_CARD.label,\n+ CardsTracker.SUBTYPE to CardsTracker.Type.PERSONALIZE_CARD.label\n+ )\n+ )\n+ }\n+ }\n+ }\n+}\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/personalize/PersonalizeCardViewModelSlice.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/personalize/PersonalizeCardViewModelSlice.kt\nindex beabb56b3fe8..8936960986b2 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/personalize/PersonalizeCardViewModelSlice.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/personalize/PersonalizeCardViewModelSlice.kt\n@@ -1,15 +1,37 @@\n package org.wordpress.android.ui.mysite.cards.personalize\n \n+import androidx.lifecycle.LiveData\n+import androidx.lifecycle.MutableLiveData\n+import org.wordpress.android.ui.mysite.MySiteCardAndItem\n+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenDashboardPersonalization\n import org.wordpress.android.ui.mysite.MySiteCardAndItemBuilderParams.PersonalizeCardBuilderParams\n+import org.wordpress.android.ui.mysite.SiteNavigationAction\n+import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker\n+import org.wordpress.android.viewmodel.Event\n import javax.inject.Inject\n-import javax.inject.Singleton\n \n-@Singleton\n-class PersonalizeCardViewModelSlice@Inject constructor(\n+class PersonalizeCardViewModelSlice @Inject constructor(\n+ private val cardsTracker: CardsTracker,\n+ private val personalizeCardShownTracker: PersonalizeCardShownTracker\n ) {\n+ private val _onNavigation = MutableLiveData>()\n+ val onNavigation = _onNavigation as LiveData>\n+\n fun getBuilderParams() = PersonalizeCardBuilderParams(onClick = this::onCardClick)\n \n fun onCardClick() {\n- // todo: implement\n+ cardsTracker.trackCardItemClicked(\n+ CardsTracker.Type.PERSONALIZE_CARD.label,\n+ CardsTracker.Type.PERSONALIZE_CARD.label\n+ )\n+ _onNavigation.value = Event(OpenDashboardPersonalization)\n+ }\n+\n+ fun trackShown(itemType: MySiteCardAndItem.Type) {\n+ personalizeCardShownTracker.trackShown(itemType)\n+ }\n+\n+ fun resetShown() {\n+ personalizeCardShownTracker.resetShown()\n }\n }\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/personalisation/PersonalisationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/personalisation/PersonalisationActivity.kt\nindex 851a93f591c3..ab8b14e5d88c 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/personalisation/PersonalisationActivity.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/personalisation/PersonalisationActivity.kt\n@@ -28,11 +28,13 @@ import androidx.compose.ui.tooling.preview.Preview\n import androidx.compose.ui.unit.dp\n import androidx.compose.ui.unit.sp\n import androidx.lifecycle.LiveData\n+import dagger.hilt.android.AndroidEntryPoint\n import org.wordpress.android.R\n import org.wordpress.android.ui.compose.components.MainTopAppBar\n import org.wordpress.android.ui.compose.components.NavigationIcons\n import org.wordpress.android.ui.compose.theme.AppTheme\n \n+@AndroidEntryPoint\n class PersonalisationActivity : ComponentActivity() {\n private val viewModel: PersonalisationViewModel by viewModels()\n \ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/tabs/MySiteTabFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/tabs/MySiteTabFragment.kt\nindex 9068667cf5c1..c3d0611f2ca4 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/tabs/MySiteTabFragment.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/tabs/MySiteTabFragment.kt\n@@ -437,6 +437,10 @@ class MySiteTabFragment : Fragment(R.layout.my_site_tab_fragment),\n )\n \n is BloggingPromptCardNavigationAction -> handleNavigation(action)\n+\n+ is SiteNavigationAction.OpenDashboardPersonalization -> activityNavigator.openDashboardPersonalization(\n+ requireActivity()\n+ )\n }\n \n private fun handleNavigation(action: BloggingPromptCardNavigationAction) {\n", "test_patch": "diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/personalize/PersonalizeCardBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/personalize/PersonalizeCardBuilderTest.kt\nnew file mode 100644\nindex 000000000000..1c24cd8b2cbe\n--- /dev/null\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/personalize/PersonalizeCardBuilderTest.kt\n@@ -0,0 +1,46 @@\n+package org.wordpress.android.ui.mysite.cards.personalize\n+\n+import org.junit.Before\n+import org.junit.Test\n+import org.junit.runner.RunWith\n+import org.mockito.Mock\n+import org.mockito.junit.MockitoJUnitRunner\n+import org.assertj.core.api.Assertions.assertThat\n+import org.mockito.kotlin.mock\n+import org.mockito.kotlin.whenever\n+import org.wordpress.android.ui.mysite.MySiteCardAndItemBuilderParams\n+import org.wordpress.android.util.config.DashboardPersonalizationFeatureConfig\n+\n+@RunWith(MockitoJUnitRunner::class)\n+class PersonalizeCardBuilderTest {\n+ @Mock\n+ lateinit var featureConfig: DashboardPersonalizationFeatureConfig\n+\n+ private lateinit var builder: PersonalizeCardBuilder\n+\n+ @Before\n+ fun setUp() {\n+ builder = PersonalizeCardBuilder(featureConfig)\n+ }\n+\n+ @Test\n+ fun `given flag is enabled, when build requested, then model is built`() {\n+ whenever(featureConfig.isEnabled()).thenReturn(true)\n+\n+ val result = builder.build(getParams())\n+\n+ assertThat(result).isNotNull\n+ }\n+\n+ @Test\n+ fun `given flag is disabled, when build requested, then model is not built`() {\n+ whenever(featureConfig.isEnabled()).thenReturn(false)\n+\n+ val result = builder.build(getParams())\n+\n+ assertThat(result).isNull()\n+ }\n+\n+ private fun getParams() =\n+ MySiteCardAndItemBuilderParams.PersonalizeCardBuilderParams(mock())\n+}\ndiff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/personalize/PersonalizeCardViewModelSliceTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/personalize/PersonalizeCardViewModelSliceTest.kt\nnew file mode 100644\nindex 000000000000..19798dea39a8\n--- /dev/null\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/personalize/PersonalizeCardViewModelSliceTest.kt\n@@ -0,0 +1,79 @@\n+package org.wordpress.android.ui.mysite.cards.personalize\n+\n+import kotlinx.coroutines.ExperimentalCoroutinesApi\n+import org.junit.Before\n+import org.junit.Test\n+import org.junit.runner.RunWith\n+import org.mockito.Mock\n+import org.assertj.core.api.Assertions.assertThat\n+import org.mockito.junit.MockitoJUnitRunner\n+import org.mockito.kotlin.verify\n+import org.wordpress.android.BaseUnitTest\n+import org.wordpress.android.ui.mysite.MySiteCardAndItem\n+import org.wordpress.android.ui.mysite.SiteNavigationAction\n+import org.wordpress.android.ui.mysite.cards.dashboard.CardsTracker\n+\n+@ExperimentalCoroutinesApi\n+@RunWith(MockitoJUnitRunner::class)\n+class PersonalizeCardViewModelSliceTest : BaseUnitTest() {\n+ @Mock\n+ lateinit var cardsTracker: CardsTracker\n+\n+ @Mock\n+ lateinit var personalizeCardShownTracker: PersonalizeCardShownTracker\n+\n+ private lateinit var viewModelSlice: PersonalizeCardViewModelSlice\n+\n+ private lateinit var navigationActions: MutableList\n+\n+ @Before\n+ fun setUp() {\n+ viewModelSlice = PersonalizeCardViewModelSlice(\n+ cardsTracker,\n+ personalizeCardShownTracker\n+ )\n+ navigationActions = mutableListOf()\n+ viewModelSlice.onNavigation.observeForever { event ->\n+ event?.getContentIfNotHandled()?.let {\n+ navigationActions.add(it)\n+ }\n+ }\n+ }\n+\n+ @Test\n+ fun `given personalize card, when card item is clicked, then event is tracked`() =\n+ test {\n+ val params = viewModelSlice.getBuilderParams()\n+\n+ params.onClick()\n+\n+ verify(cardsTracker).trackCardItemClicked(\n+ CardsTracker.Type.PERSONALIZE_CARD.label, CardsTracker.Type.PERSONALIZE_CARD.label)\n+ }\n+\n+ @Test\n+ fun `given personalize card, when card item is clicked, then open personalize event is raised`() =\n+ test {\n+ val params = viewModelSlice.getBuilderParams()\n+\n+ params.onClick()\n+\n+ assertThat(navigationActions).containsOnly(SiteNavigationAction.OpenDashboardPersonalization)\n+ }\n+\n+ @Test\n+ fun `given personalize card, when card shown track requested, then track card shown`() =\n+ test {\n+ viewModelSlice.trackShown(MySiteCardAndItem.Type.PERSONALIZE_CARD)\n+\n+ verify(personalizeCardShownTracker).trackShown(MySiteCardAndItem.Type.PERSONALIZE_CARD)\n+ }\n+\n+ @Test\n+ fun `given personalize card, when reset shown tracker requested, then track card shown is reset`() =\n+ test {\n+ viewModelSlice.resetShown()\n+\n+ verify(personalizeCardShownTracker).resetShown()\n+ }\n+}\n", "n2p_tests": {"org.wordpress.android.ui.mysite.cards.personalize.PersonalizeCardViewModelSliceTest.given personalize card, when card item is clicked, then open personalize event is raised": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.personalize.PersonalizeCardViewModelSliceTest.given personalize card, when reset shown tracker requested, then track card shown is reset": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.personalize.PersonalizeCardBuilderTest.given flag is disabled, when build requested, then model is not built": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.personalize.PersonalizeCardBuilderTest.given flag is enabled, when build requested, then model is built": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.personalize.PersonalizeCardViewModelSliceTest.given personalize card, when card item is clicked, then event is tracked": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.cards.personalize.PersonalizeCardViewModelSliceTest.given personalize card, when card shown track requested, then track card shown": {"run": "NONE", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "wordpress-mobile__WordPress-Android-19253", "org": "wordpress-mobile", "repo": "WordPress-Android", "number": 19253, "state": "closed", "title": "Plans in site creation: Remove site domains feature flag", "body": "Fixes #19252 \r\n\r\nRemoving the site domains feature flag as it a stable feature\r\n\r\n\r\n\r\n\r\nTo test:\r\n\r\n- Launch JP app\r\n- `Go` to Debug settings (Me -> Debug settings)\r\n- `Verify` `site_domains_remote_field` as shown above is not present\r\n- `Switch` to `Menu` tab on `My Site` \r\n- `Verify` menu item `Domains` is present under Manage\r\n- `Tap` on `Domains`\r\n- `Verify` it opens domains screen\r\n\r\n## Regression Notes\r\n1. Potential unintended areas of impact\r\nNone\r\n\r\n2. What I did to test those areas of impact (or what existing automated tests I relied on)\r\nManual testing\r\n\r\n3. What automated tests I added (or what prevented me from doing so)\r\nUpdated unit tests\r\n\r\nPR submission checklist:\r\n\r\n- [x] I have completed the Regression Notes.\r\n- [x] I have considered adding accessibility improvements for my changes.\r\n- [x] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.", "base": {"label": "wordpress-mobile:trunk", "ref": "trunk", "sha": "274107bedb8009dad7dba7cef334f761790896c5"}, "resolved_issues": [{"number": 19252, "title": "Plans in Site Creation: Remove SITE_DOMAINS Feature Flag", "body": "There's an old site domains feature flag done almost two years ago that needs to be removed"}], "lang": "kotlin", "problem_statement": "Plans in Site Creation: Remove SITE_DOMAINS Feature Flag\nThere's an old site domains feature flag done almost two years ago that needs to be removed\n", "hints": "\n\n\n\n \n \n \n \n \n \n \n \n \n \n \n
Fails
:no_entry_sign:\n\n Please add a type label to this issue. e.g. '[Type] Enhancement'\n
\n\n\n\n\n

\n Generated by :no_entry_sign: dangerJS\n

\n", "pull_url": "https://github.com/wordpress-mobile/WordPress-Android/pull/19253", "issue_urls": ["https://github.com/wordpress-mobile/WordPress-Android/issues/19252"], "test_command": "./gradlew :WordPress:testWordpressVanillaDebugUnitTest --tests \"org.wordpress.android.ui.mysite.items.listitem.SiteListItemBuilderTest\" --tests \"org.wordpress.android.ui.domains.DomainSuggestionsViewModelTest\"", "fix_patch": "diff --git a/WordPress/build.gradle b/WordPress/build.gradle\nindex a2656512789b..a5e47e4cf5f1 100644\n--- a/WordPress/build.gradle\n+++ b/WordPress/build.gradle\n@@ -108,7 +108,6 @@ android {\n buildConfigField \"boolean\", \"MANAGE_CATEGORIES\", \"false\"\n buildConfigField \"boolean\", \"GLOBAL_STYLE_SUPPORT\", \"true\"\n buildConfigField \"boolean\", \"QUICK_START_DYNAMIC_CARDS\", \"false\"\n- buildConfigField \"boolean\", \"SITE_DOMAINS\", \"false\"\n buildConfigField \"boolean\", \"RECOMMEND_THE_APP\", \"false\"\n buildConfigField \"boolean\", \"UNIFIED_COMMENTS_COMMENT_EDIT\", \"false\"\n buildConfigField \"boolean\", \"MY_SITE_DASHBOARD_TABS\", \"false\"\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainSuggestionsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainSuggestionsViewModel.kt\nindex 951ff2a23d6d..1b8e9d52b93e 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainSuggestionsViewModel.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainSuggestionsViewModel.kt\n@@ -24,7 +24,6 @@ import org.wordpress.android.ui.domains.usecases.CreateCartUseCase\n import org.wordpress.android.util.AppLog\n import org.wordpress.android.util.AppLog.T\n import org.wordpress.android.util.SiteUtils\n-import org.wordpress.android.util.config.SiteDomainsFeatureConfig\n import org.wordpress.android.util.extensions.isOnSale\n import org.wordpress.android.util.helpers.Debouncer\n import org.wordpress.android.viewmodel.Event\n@@ -39,7 +38,6 @@ class DomainSuggestionsViewModel @Inject constructor(\n private val domainsRegistrationTracker: DomainsRegistrationTracker,\n private val dispatcher: Dispatcher,\n private val debouncer: Debouncer,\n- private val siteDomainsFeatureConfig: SiteDomainsFeatureConfig,\n private val createCartUseCase: CreateCartUseCase,\n @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher\n ) : ScopedViewModel(bgDispatcher) {\n@@ -197,7 +195,7 @@ class DomainSuggestionsViewModel @Inject constructor(\n vendor = it.vendor,\n relevance = it.relevance,\n isSelected = _selectedSuggestion.value?.domainName == it.domain_name,\n- isCostVisible = siteDomainsFeatureConfig.isEnabled(),\n+ isCostVisible = true,\n isFreeWithCredits = domainRegistrationPurpose(),\n isEnabled = true\n )\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/items/listitem/SiteListItemBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/items/listitem/SiteListItemBuilder.kt\nindex b3e24887f2ec..0b5a532f7ac5 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/items/listitem/SiteListItemBuilder.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/items/listitem/SiteListItemBuilder.kt\n@@ -29,7 +29,6 @@ import org.wordpress.android.ui.utils.UiString.UiStringText\n import org.wordpress.android.util.BuildConfigWrapper\n import org.wordpress.android.util.DateTimeUtils\n import org.wordpress.android.util.SiteUtilsWrapper\n-import org.wordpress.android.util.config.SiteDomainsFeatureConfig\n import java.util.GregorianCalendar\n import java.util.TimeZone\n import javax.inject.Inject\n@@ -40,7 +39,6 @@ class SiteListItemBuilder @Inject constructor(\n private val siteUtilsWrapper: SiteUtilsWrapper,\n private val buildConfigWrapper: BuildConfigWrapper,\n private val themeBrowserUtils: ThemeBrowserUtils,\n- private val siteDomainsFeatureConfig: SiteDomainsFeatureConfig,\n private val jetpackFeatureRemovalPhaseHelper: JetpackFeatureRemovalPhaseHelper\n ) {\n fun buildActivityLogItemIfAvailable(site: SiteModel, onClick: (ListItemAction) -> Unit): ListItem? {\n@@ -162,7 +160,6 @@ class SiteListItemBuilder @Inject constructor(\n fun buildDomainsItemIfAvailable(site: SiteModel, onClick: (ListItemAction) -> Unit): ListItem? {\n return if (\n buildConfigWrapper.isJetpackApp &&\n- siteDomainsFeatureConfig.isEnabled() &&\n site.hasCapabilityManageOptions\n ) {\n ListItem(\ndiff --git a/WordPress/src/main/java/org/wordpress/android/util/config/SiteDomainsFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/SiteDomainsFeatureConfig.kt\ndeleted file mode 100644\nindex 40b710d34a6a..000000000000\n--- a/WordPress/src/main/java/org/wordpress/android/util/config/SiteDomainsFeatureConfig.kt\n+++ /dev/null\n@@ -1,17 +0,0 @@\n-package org.wordpress.android.util.config\n-\n-import org.wordpress.android.BuildConfig\n-import org.wordpress.android.annotation.Feature\n-import javax.inject.Inject\n-\n-@Feature(SiteDomainsFeatureConfig.SITE_DOMAINS_REMOTE_FIELD, true)\n-class SiteDomainsFeatureConfig\n-@Inject constructor(appConfig: AppConfig) : FeatureConfig(\n- appConfig,\n- BuildConfig.SITE_DOMAINS,\n- SITE_DOMAINS_REMOTE_FIELD\n-) {\n- companion object {\n- const val SITE_DOMAINS_REMOTE_FIELD = \"site_domains_remote_field\"\n- }\n-}\n", "test_patch": "diff --git a/WordPress/src/test/java/org/wordpress/android/ui/domains/DomainSuggestionsViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/domains/DomainSuggestionsViewModelTest.kt\nindex fea1061fe04e..d968c4ac9dfd 100644\n--- a/WordPress/src/test/java/org/wordpress/android/ui/domains/DomainSuggestionsViewModelTest.kt\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/domains/DomainSuggestionsViewModelTest.kt\n@@ -31,7 +31,6 @@ import org.wordpress.android.ui.domains.DomainRegistrationActivity.DomainRegistr\n import org.wordpress.android.ui.domains.DomainRegistrationActivity.DomainRegistrationPurpose.DOMAIN_PURCHASE\n import org.wordpress.android.ui.domains.usecases.CreateCartUseCase\n import org.wordpress.android.ui.plans.PlansConstants\n-import org.wordpress.android.util.config.SiteDomainsFeatureConfig\n import org.wordpress.android.util.helpers.Debouncer\n \n @ExperimentalCoroutinesApi\n@@ -45,9 +44,6 @@ class DomainSuggestionsViewModelTest : BaseUnitTest() {\n @Mock\n lateinit var tracker: DomainsRegistrationTracker\n \n- @Mock\n- lateinit var siteDomainsFeatureConfig: SiteDomainsFeatureConfig\n-\n @Mock\n lateinit var createCartUseCase: CreateCartUseCase\n \n@@ -66,7 +62,6 @@ class DomainSuggestionsViewModelTest : BaseUnitTest() {\n tracker,\n dispatcher,\n debouncer,\n- siteDomainsFeatureConfig,\n createCartUseCase,\n testDispatcher()\n )\ndiff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/items/listitem/SiteListItemBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/items/listitem/SiteListItemBuilderTest.kt\nindex c31b22b6842f..12f5777b438a 100644\n--- a/WordPress/src/test/java/org/wordpress/android/ui/mysite/items/listitem/SiteListItemBuilderTest.kt\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/items/listitem/SiteListItemBuilderTest.kt\n@@ -28,7 +28,6 @@ import org.wordpress.android.ui.plugins.PluginUtilsWrapper\n import org.wordpress.android.ui.themes.ThemeBrowserUtils\n import org.wordpress.android.util.BuildConfigWrapper\n import org.wordpress.android.util.SiteUtilsWrapper\n-import org.wordpress.android.util.config.SiteDomainsFeatureConfig\n \n @RunWith(MockitoJUnitRunner::class)\n class SiteListItemBuilderTest {\n@@ -53,8 +52,6 @@ class SiteListItemBuilderTest {\n @Mock\n lateinit var jetpackFeatureRemovalPhaseHelper: JetpackFeatureRemovalPhaseHelper\n \n- @Mock\n- lateinit var siteDomainsFeatureConfig: SiteDomainsFeatureConfig\n private lateinit var siteListItemBuilder: SiteListItemBuilder\n \n @Before\n@@ -65,7 +62,6 @@ class SiteListItemBuilderTest {\n siteUtilsWrapper,\n buildConfigWrapper,\n themeBrowserUtils,\n- siteDomainsFeatureConfig,\n jetpackFeatureRemovalPhaseHelper\n )\n }\n", "n2p_tests": {"org.wordpress.android.ui.domains.DomainSuggestionsViewModelTest.intro is visible at start": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainSuggestionsViewModelTest.site on blogger plan is requesting only dot blog domain suggestions": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainSuggestionsViewModelTest.intro is hidden when search query is not empty": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainSuggestionsViewModelTest.intro is visible when search query is empty": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainSuggestionsViewModelTest.domain products are fetched only at first start": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainSuggestionsViewModelTest.redirect message is visible when purchasing a domain at start": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainSuggestionsViewModelTest.clicking select domain button for credit redemption emits selected domain": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.items.listitem.SiteListItemBuilderTest.backup item built if backup is available": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainSuggestionsViewModelTest.site on non blogger plan is requesting all possible domain suggestions": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainSuggestionsViewModelTest.clicking select domain button for purchase calls cart creation use case and emits selected domain": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "wordpress-mobile__WordPress-Android-19262", "org": "wordpress-mobile", "repo": "WordPress-Android", "number": 19262, "state": "closed", "title": "Plans in site creation: Remove domain purchasing feature flag", "body": "Fixes #19230 \r\n\r\nThis PR removes domain purchasing in site creation feature flag, and replaces it with plans in site creation feature flag.\r\n\r\n\r\nTo test:\r\n\r\nTest 1\r\n\r\n- `Launch` JP app\r\n- `Go` to Me-> Debug settings\r\n- `Switch` to `Features in Development` tab\r\n- `Verify` there's no `SiteCreationDomainPurchasing` feature flag is listed there\r\n- `Switch` to `Remote Feature` tab, find `plans_in_site_creation` and enable it\r\n\r\nTest 2\r\n\r\n- `Go` to **My Site** tab\r\n- `Tap` the down arrow to the right of the site name on the My Site screen\r\n- `Tap` the + icon at the top right on the Site picker screen\r\n- `Select` \u2295 **Create WordPress.com site** on the modal dialog\r\n- `Tap` Skip at top right on the first step (topic screen)\r\n- `Tap` Skip at top right on the next step (theme screen)\r\n- `Enter` a search query (whatever you want here)\r\n- `Verify` that result domains have either `Free` or `Price are no prices or \"free\" listed next to the domains on the right side\r\n\r\n>**Note**\r\n> Selecting a custom domain (with price) will launch, site assembly followed by checkout\r\n> Selecting a free domain will launch site assembly an done\r\n\r\n## Regression Notes\r\n1. Potential unintended areas of impact\r\nN/A\r\n\r\n2. What I did to test those areas of impact (or what existing automated tests I relied on)\r\nManual and unit tests\r\n\r\n3. What automated tests I added (or what prevented me from doing so)\r\nUpdate existing unit tests\r\n\r\nPR submission checklist:\r\n\r\n- [x] I have completed the Regression Notes.\r\n- [x] I have considered adding accessibility improvements for my changes.\r\n- [x] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.\r\n", "base": {"label": "wordpress-mobile:trunk", "ref": "trunk", "sha": "d7a5a3231954294ade35f515ed07a7b962bed792"}, "resolved_issues": [{"number": 19230, "title": "Plans in Site Creation: Remove DOMAIN_PURCHASING feature flag", "body": "There is a local only feature flag for domain purchasing in the site creation feature. Since we bind domain purchasing feature into \"Plans in Site Creation\" project, we should remove [SiteCreationDomainPurchasing](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/WordPress/src/main/java/org/wordpress/android/util/config/SiteCreationDomainPurchasingFeatureConfig.kt) flag."}], "lang": "kotlin", "problem_statement": "Plans in Site Creation: Remove DOMAIN_PURCHASING feature flag\nThere is a local only feature flag for domain purchasing in the site creation feature. Since we bind domain purchasing feature into \"Plans in Site Creation\" project, we should remove [SiteCreationDomainPurchasing](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/WordPress/src/main/java/org/wordpress/android/util/config/SiteCreationDomainPurchasingFeatureConfig.kt) flag.\n", "pull_url": "https://github.com/wordpress-mobile/WordPress-Android/pull/19262", "issue_urls": ["https://github.com/wordpress-mobile/WordPress-Android/issues/19230"], "test_command": "./gradlew :WordPress:testWordpressVanillaDebugUnitTest --tests \"org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest\"", "fix_patch": "diff --git a/WordPress/build.gradle b/WordPress/build.gradle\nindex 0036a3717d78..23921af71fd4 100644\n--- a/WordPress/build.gradle\n+++ b/WordPress/build.gradle\n@@ -158,7 +158,6 @@ android {\n buildConfigField \"boolean\", \"ENABLE_MY_SITE_DASHBOARD_TABS\", \"true\"\n buildConfigField \"boolean\", \"ENABLE_QRCODE_AUTH_FLOW\", \"true\"\n buildConfigField \"boolean\", \"ENABLE_OPEN_WEB_LINKS_WITH_JP_FLOW\", \"true\"\n- buildConfigField \"boolean\", \"ENABLE_SITE_CREATION_DOMAIN_PURCHASING\", \"false\"\n buildConfigField \"boolean\", \"BLAZE_MANAGE_CAMPAIGNS\", \"false\"\n buildConfigField \"boolean\", \"DASHBOARD_PERSONALIZATION\", \"false\"\n \n@@ -187,7 +186,6 @@ android {\n buildConfigField \"String\", \"PUSH_NOTIFICATIONS_APP_KEY\", '\"org.wordpress.android\"'\n buildConfigField \"boolean\", \"ENABLE_QRCODE_AUTH_FLOW\", \"false\"\n buildConfigField \"boolean\", \"ENABLE_OPEN_WEB_LINKS_WITH_JP_FLOW\", \"true\"\n- buildConfigField \"boolean\", \"ENABLE_SITE_CREATION_DOMAIN_PURCHASING\", \"false\"\n \n manifestPlaceholders = [magicLinkScheme:\"wordpress\"]\n }\n@@ -209,7 +207,6 @@ android {\n buildConfigField \"String\", \"PUSH_NOTIFICATIONS_APP_KEY\", '\"com.jetpack.android\"'\n buildConfigField \"boolean\", \"ENABLE_QRCODE_AUTH_FLOW\", \"true\"\n buildConfigField \"boolean\", \"ENABLE_OPEN_WEB_LINKS_WITH_JP_FLOW\", \"false\"\n- buildConfigField \"boolean\", \"ENABLE_SITE_CREATION_DOMAIN_PURCHASING\", \"false\"\n \n manifestPlaceholders = [magicLinkScheme:\"jetpack\"]\n \ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainsRegistrationTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainsRegistrationTracker.kt\nindex a65e18a75ccf..a246a5d2d2ff 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainsRegistrationTracker.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainsRegistrationTracker.kt\n@@ -3,14 +3,14 @@ package org.wordpress.android.ui.domains\n import org.wordpress.android.analytics.AnalyticsTracker\n import org.wordpress.android.fluxc.model.SiteModel\n import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper\n-import org.wordpress.android.util.config.SiteCreationDomainPurchasingFeatureConfig\n+import org.wordpress.android.util.config.PlansInSiteCreationFeatureConfig\n import javax.inject.Inject\n import javax.inject.Singleton\n \n @Singleton\n class DomainsRegistrationTracker @Inject constructor(\n val tracker: AnalyticsTrackerWrapper,\n- private val purchasingFeatureConfig: SiteCreationDomainPurchasingFeatureConfig,\n+ private val plansInSiteCreationFeatureConfig: PlansInSiteCreationFeatureConfig\n ) {\n private enum class PROPERTY(val key: String) {\n ORIGIN(\"origin\"),\n@@ -22,7 +22,7 @@ class DomainsRegistrationTracker @Inject constructor(\n }\n \n fun trackDomainsPurchaseWebviewViewed(site: SiteModel?, isSiteCreation: Boolean) {\n- if (purchasingFeatureConfig.isEnabledOrManuallyOverridden()) {\n+ if (plansInSiteCreationFeatureConfig.isEnabled()) {\n val origin = if (isSiteCreation) VALUE.ORIGIN_SITE_CREATION.key else VALUE.ORIGIN_MENU.key\n tracker.track(\n AnalyticsTracker.Stat.DOMAINS_PURCHASE_WEBVIEW_VIEWED, site, mutableMapOf(PROPERTY.ORIGIN.key to origin)\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt\nindex 8fad81d3aaf5..5143e65b36c6 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt\n@@ -47,7 +47,7 @@ import org.wordpress.android.ui.utils.UiString.UiStringRes\n import org.wordpress.android.ui.utils.UiString.UiStringText\n import org.wordpress.android.util.AppLog\n import org.wordpress.android.util.NetworkUtilsWrapper\n-import org.wordpress.android.util.config.SiteCreationDomainPurchasingFeatureConfig\n+import org.wordpress.android.util.config.PlansInSiteCreationFeatureConfig\n import org.wordpress.android.util.extensions.isOnSale\n import org.wordpress.android.viewmodel.SingleLiveEvent\n import javax.inject.Inject\n@@ -65,7 +65,7 @@ class SiteCreationDomainsViewModel @Inject constructor(\n private val domainSanitizer: SiteCreationDomainSanitizer,\n private val fetchDomainsUseCase: FetchDomainsUseCase,\n private val productsStore: ProductsStore,\n- private val purchasingFeatureConfig: SiteCreationDomainPurchasingFeatureConfig,\n+ private val plansInSiteCreationFeatureConfig: PlansInSiteCreationFeatureConfig,\n private val tracker: SiteCreationTracker,\n @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,\n @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher\n@@ -111,7 +111,7 @@ class SiteCreationDomainsViewModel @Inject constructor(\n isStarted = true\n tracker.trackDomainsAccessed()\n resetUiState()\n- if (purchasingFeatureConfig.isEnabledOrManuallyOverridden()) fetchAndCacheProducts()\n+ if (plansInSiteCreationFeatureConfig.isEnabled()) fetchAndCacheProducts()\n }\n \n private fun fetchAndCacheProducts() {\n@@ -178,7 +178,7 @@ class SiteCreationDomainsViewModel @Inject constructor(\n }\n \n private suspend fun fetchDomainsByPurchasingFeatureConfig(query: String): OnSuggestedDomains {\n- val onlyWordpressCom = !purchasingFeatureConfig.isEnabledOrManuallyOverridden()\n+ val onlyWordpressCom = !plansInSiteCreationFeatureConfig.isEnabled()\n val vendor = if (onlyWordpressCom) FETCH_DOMAINS_VENDOR_DOT else FETCH_DOMAINS_VENDOR_MOBILE\n \n return fetchDomainsUseCase.fetchDomains(query, vendor, onlyWordpressCom)\n@@ -252,7 +252,7 @@ class SiteCreationDomainsViewModel @Inject constructor(\n }\n \n private fun getCreateSiteButtonState() = selectedDomain?.run {\n- when (purchasingFeatureConfig.isEnabledOrManuallyOverridden()) {\n+ when (plansInSiteCreationFeatureConfig.isEnabled()) {\n true -> if (isFree) CreateSiteButtonState.Free else CreateSiteButtonState.Paid\n else -> CreateSiteButtonState.Old\n }\n@@ -276,7 +276,7 @@ class SiteCreationDomainsViewModel @Inject constructor(\n return if (items.isEmpty()) {\n if (isNonEmptyUserQuery(query) && (state is Success || state is Ready)) {\n DomainsUiContentState.Empty(emptyListMessage)\n- } else DomainsUiContentState.Initial(purchasingFeatureConfig.isEnabledOrManuallyOverridden())\n+ } else DomainsUiContentState.Initial(plansInSiteCreationFeatureConfig.isEnabled())\n } else {\n DomainsUiContentState.VisibleItems(items)\n }\n@@ -313,7 +313,7 @@ class SiteCreationDomainsViewModel @Inject constructor(\n }\n \n private fun createAvailableItemUiState(domain: DomainModel, index: Int): ListItemUiState {\n- return when (purchasingFeatureConfig.isEnabledOrManuallyOverridden()) {\n+ return when (plansInSiteCreationFeatureConfig.isEnabled()) {\n true -> {\n val product = products[domain.productId]\n New.DomainUiState(\n@@ -353,7 +353,7 @@ class SiteCreationDomainsViewModel @Inject constructor(\n domains: List\n ): ListItemUiState? {\n if (domains.isEmpty()) return null\n- if (purchasingFeatureConfig.isEnabledOrManuallyOverridden()) return null // TODO: Add FQDN availability check\n+ if (plansInSiteCreationFeatureConfig.isEnabled()) return null // TODO: Add FQDN availability check\n val sanitizedQuery = domainSanitizer.sanitizeDomainQuery(query)\n val isDomainUnavailable = domains.none { it.domainName.startsWith(\"$sanitizedQuery.\") }\n return if (isDomainUnavailable) {\n@@ -366,15 +366,13 @@ class SiteCreationDomainsViewModel @Inject constructor(\n }\n \n private fun createHeaderUiState(isVisible: Boolean) = if (!isVisible) null else\n- purchasingFeatureConfig.isEnabledOrManuallyOverridden().let { isPurchasingEnabled ->\n- SiteCreationHeaderUiState(\n- title = UiStringRes(R.string.new_site_creation_domain_header_title),\n- subtitle = UiStringRes(\n- if (isPurchasingEnabled) R.string.site_creation_domain_header_subtitle\n- else R.string.new_site_creation_domain_header_subtitle,\n- ),\n- )\n- }\n+ SiteCreationHeaderUiState(\n+ title = UiStringRes(R.string.new_site_creation_domain_header_title),\n+ subtitle = UiStringRes(\n+ if (plansInSiteCreationFeatureConfig.isEnabled()) R.string.site_creation_domain_header_subtitle\n+ else R.string.new_site_creation_domain_header_subtitle,\n+ ),\n+ )\n \n private fun createSearchInputUiState(\n showProgress: Boolean,\n@@ -382,7 +380,7 @@ private fun createSearchInputUiState(\n showDivider: Boolean,\n ): SiteCreationSearchInputUiState {\n val hint = UiStringRes(\n- if (purchasingFeatureConfig.isEnabledOrManuallyOverridden())\n+ if (plansInSiteCreationFeatureConfig.isEnabled())\n R.string.site_creation_domain_search_input_hint\n else\n R.string.new_site_creation_search_domain_input_hint\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SiteCreationTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SiteCreationTracker.kt\nindex af0ecc0741a3..d33852fc0007 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SiteCreationTracker.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SiteCreationTracker.kt\n@@ -16,7 +16,7 @@ import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.T\n import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.THUMBNAIL_MODE\n import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.VERTICAL_SLUG\n import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper\n-import org.wordpress.android.util.config.SiteCreationDomainPurchasingFeatureConfig\n+import org.wordpress.android.util.config.PlansInSiteCreationFeatureConfig\n import javax.inject.Inject\n import javax.inject.Singleton\n \n@@ -32,7 +32,7 @@ private const val SITE_CREATION_SOURCE = \"source\"\n @Singleton\n class SiteCreationTracker @Inject constructor(\n val tracker: AnalyticsTrackerWrapper,\n- private val purchasingFeatureConfig: SiteCreationDomainPurchasingFeatureConfig,\n+ private val plansInSiteCreationFeatureConfig: PlansInSiteCreationFeatureConfig\n ) : LayoutPickerTracker {\n private enum class PROPERTY(val key: String) {\n TEMPLATE(\"template\"),\n@@ -63,7 +63,7 @@ class SiteCreationTracker @Inject constructor(\n }\n \n fun trackDomainSelected(chosenDomain: String, searchTerm: String, domainCost: String = \"free\") {\n- if(purchasingFeatureConfig.isEnabledOrManuallyOverridden()) {\n+ if(plansInSiteCreationFeatureConfig.isEnabled()) {\n tracker.track(\n AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_DOMAINS_SELECTED,\n mapOf(\ndiff --git a/WordPress/src/main/java/org/wordpress/android/util/config/SiteCreationDomainPurchasingFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/SiteCreationDomainPurchasingFeatureConfig.kt\ndeleted file mode 100644\nindex da13b7b00260..000000000000\n--- a/WordPress/src/main/java/org/wordpress/android/util/config/SiteCreationDomainPurchasingFeatureConfig.kt\n+++ /dev/null\n@@ -1,17 +0,0 @@\n-package org.wordpress.android.util.config\n-\n-import org.wordpress.android.BuildConfig\n-import org.wordpress.android.annotation.FeatureInDevelopment\n-import org.wordpress.android.util.config.AppConfig.FeatureState.ManuallyOverriden\n-import javax.inject.Inject\n-\n-@FeatureInDevelopment\n-class SiteCreationDomainPurchasingFeatureConfig\n-@Inject constructor(\n- appConfig: AppConfig,\n-) : FeatureConfig(\n- appConfig,\n- BuildConfig.ENABLE_SITE_CREATION_DOMAIN_PURCHASING,\n-) {\n- fun isEnabledOrManuallyOverridden() = (featureState() as? ManuallyOverriden)?.isEnabled ?: isEnabled()\n-}\n", "test_patch": "diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModelTest.kt\nindex 6d43f782cbab..e761a7ee74b3 100644\n--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModelTest.kt\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModelTest.kt\n@@ -45,7 +45,7 @@ import org.wordpress.android.ui.sitecreation.usecases.FETCH_DOMAINS_VENDOR_MOBIL\n import org.wordpress.android.ui.sitecreation.usecases.FetchDomainsUseCase\n import org.wordpress.android.ui.utils.UiString.UiStringRes\n import org.wordpress.android.util.NetworkUtilsWrapper\n-import org.wordpress.android.util.config.SiteCreationDomainPurchasingFeatureConfig\n+import org.wordpress.android.util.config.PlansInSiteCreationFeatureConfig\n import kotlin.test.assertIs\n \n private const val MULTI_RESULT_DOMAIN_FETCH_RESULT_SIZE = 20\n@@ -66,7 +66,7 @@ class SiteCreationDomainsViewModelTest : BaseUnitTest() {\n private lateinit var productsStore: ProductsStore\n \n @Mock\n- lateinit var purchasingFeatureConfig: SiteCreationDomainPurchasingFeatureConfig\n+ lateinit var plansInSiteCreationFeatureConfig: PlansInSiteCreationFeatureConfig\n \n @Mock\n private lateinit var tracker: SiteCreationTracker\n@@ -99,7 +99,7 @@ class SiteCreationDomainsViewModelTest : BaseUnitTest() {\n dispatcher = dispatcher,\n fetchDomainsUseCase = fetchDomainsUseCase,\n productsStore = productsStore,\n- purchasingFeatureConfig = purchasingFeatureConfig,\n+ plansInSiteCreationFeatureConfig = plansInSiteCreationFeatureConfig,\n tracker = tracker,\n bgDispatcher = testDispatcher(),\n mainDispatcher = testDispatcher()\n@@ -353,7 +353,7 @@ class SiteCreationDomainsViewModelTest : BaseUnitTest() {\n // region New UI\n \n private fun testNewUi(block: suspend CoroutineScope.() -> Unit) = test {\n- whenever(purchasingFeatureConfig.isEnabledOrManuallyOverridden()).thenReturn(true)\n+ whenever(plansInSiteCreationFeatureConfig.isEnabled()).thenReturn(true)\n whenever(productsStore.fetchProducts(any())).thenReturn(mock())\n block()\n }\n", "n2p_tests": {"org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verify cost of sale domain results from api is 'OnSale'": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verify only 1st domain result from api is 'Recommended'": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verifyFetchFreeDomainsWhenPurchasingFeatureConfigIsDisabled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.click on the create site button tracks the selected paid domain": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verify create site button text changes when selecting a non-free domain": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verify only 2nd domain result from api is 'BestAlternative'": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verifyOnClearBtnClickedPropagated": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verifyDomainUnavailableUiStateAfterResponseWithMultipleResults": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verifyNonEmptyUpdateQueryUiStateAfterResponseWithMultipleResults": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verifyEmptyTitleQueryUiState": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verify all domain results from api are visible": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verifyNonEmptyUpdateQueryUiStateAfterErrorResponse": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verifyNonEmptyUpdateQueryInitialUiState": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verify domain products are fetched only at first start": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verify cost of paid domain results from api is 'Paid'": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verifyNonEmptyUpdateQueryUiStateAfterResponseWithEmptyResults": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verifyFetchFreeAndPaidDomainsWhenPurchasingFeatureConfigIsEnabled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verify cost of free domain results from api is 'Free'": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verify create site button text is not changed when purchasing feature is OFF": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verify click on the create site button emits the selected domain": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.click on the create site button tracks the selected free domain": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verify selected domain is propagated to UI on click": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verifyClearQueryWithEmptyTitleInitialState": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verifyOnHelpClickedPropagated": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verify sale domain results from api have tag 'Sale'": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verify create site button text changes when selecting a free domain": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModelTest.verifyNonEmptyUpdateQueryUiStateAfterErrorResponseOfTypeInvalidQuery": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "wordpress-mobile__WordPress-Android-19303", "org": "wordpress-mobile", "repo": "WordPress-Android", "number": 19303, "state": "closed", "title": "Plans in Site Creation: Create functionality to add domain with a plan to a cart", "body": "Fixes #19265\r\n\r\n- [x] Merge https://github.com/wordpress-mobile/WordPress-FluxC-Android/pull/2864\r\n- [x] Update FluxC reference to `trunk` \r\n\r\nThis makes the project compatible with the FluxC change. `CreateShoppingCartPayload` was deprecated in the FluxC PR, and this PR changes it with `CreateShoppingCartWithDomainAndPlanPayload`.\r\n\r\nThis PR shouldn't introduce any behavior change. This only adds the ability to add plans to the cart, but the plan selection screen will be added with another PR.\r\n\r\nTo test:\r\n### Regression test for domain purchasing\r\n1. Enable Plans in Site Creation feature flag\r\n2. Select Site Picker\r\n3. Create new WordPress.com site\r\n4. Select a paid domain\r\n5. Finish creating a site\r\n6. Confirm that the domain exists in the cart\r\n\r\n### Test the FluxC change (adding plans to the cart)\r\n- Manually add `planProductId = 1009` into [createCartUseCase.execute(...](https://github.com/wordpress-mobile/WordPress-Android/blob/d7ef92147051ff914261550cbd6df9ceb7a4d636/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/progress/SiteCreationProgressViewModel.kt#L204) in `SiteCreationProgressViewModel`.\r\n1. Enable Plans in Site Creation feature flag\r\n2. Select Site Picker\r\n4. Create new WordPress.com site\r\n5. Select a free or paid domain\r\n6. Finish creating a site\r\n7. Confirm that plan exists in the cart (Notice that the personal plan was added to the cart in the video below)\r\n\r\nhttps://github.com/wordpress-mobile/WordPress-Android/assets/2471769/4d55da75-214e-4ad1-8775-74ff66d1629b\r\n\r\n## Regression Notes\r\n1. Potential unintended areas of impact\r\nCurrent domain purchasing feature.\r\n\r\n2. What I did to test those areas of impact (or what existing automated tests I relied on)\r\nTested manually.\r\n\r\n3. What automated tests I added (or what prevented me from doing so)\r\nNone. Because this doesn't introduce a new behavior.\r\n\r\nPR submission checklist:\r\n\r\n- [x] I have completed the Regression Notes.\r\n- [x] I have considered adding accessibility improvements for my changes.\r\n- [x] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.\r\n\r\nUI Changes testing checklist:\r\n\r\n- [ ] Portrait and landscape orientations.\r\n- [ ] Light and dark modes.\r\n- [ ] Fonts: Larger, smaller and bold text.\r\n- [ ] High contrast.\r\n- [ ] Talkback.\r\n- [ ] Languages with large words or with letters/accents not frequently used in English.\r\n- [ ] Right-to-left languages. (Even if translation isn\u2019t complete, formatting should still respect the right-to-left layout)\r\n- [ ] Large and small screen sizes. (Tablet and smaller phones)\r\n- [ ] Multi-tasking: Split screen and Pop-up view. (Android 10 or higher)\r\n", "base": {"label": "wordpress-mobile:trunk", "ref": "trunk", "sha": "a5e5a941d9c8f3846a9c4622fef89820126d94a4"}, "resolved_issues": [{"number": 19265, "title": "Plans in Site Creation: Create functionality to add domain with a plan to a cart", "body": "Create functionality to add domain together with a plan via `me/shopping-cart/siteID` endpoint.\r\n\r\nWe can pass a plan and a domain objects to a `products` parameter in this format:\r\n\r\n```\r\nproducts: [\r\n {\r\n product_id: 1003\r\n },\r\n {\r\n product_id: 6\r\n meta: \"someDomain.com\"\r\n },\r\n]\r\n```\r\n\r\nSee iOS issue for more details: https://github.com/wordpress-mobile/WordPress-iOS/issues/21636"}], "lang": "kotlin", "problem_statement": "Plans in Site Creation: Create functionality to add domain with a plan to a cart\nCreate functionality to add domain together with a plan via `me/shopping-cart/siteID` endpoint.\r\n\r\nWe can pass a plan and a domain objects to a `products` parameter in this format:\r\n\r\n```\r\nproducts: [\r\n {\r\n product_id: 1003\r\n },\r\n {\r\n product_id: 6\r\n meta: \"someDomain.com\"\r\n },\r\n]\r\n```\r\n\r\nSee iOS issue for more details: https://github.com/wordpress-mobile/WordPress-iOS/issues/21636\n", "pull_url": "https://github.com/wordpress-mobile/WordPress-Android/pull/19303", "issue_urls": ["https://github.com/wordpress-mobile/WordPress-Android/issues/19265"], "test_command": "./gradlew :WordPress:testWordpressVanillaDebugUnitTest --tests \"org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest\" --tests \"org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest\"", "fix_patch": "diff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModel.kt\nindex 98d36051a627..bf5d598e19ea 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModel.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModel.kt\n@@ -24,7 +24,6 @@ import org.wordpress.android.fluxc.store.SiteStore.OnDomainSupportedStatesFetche\n import org.wordpress.android.fluxc.store.SiteStore.OnPrimaryDomainDesignated\n import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged\n import org.wordpress.android.fluxc.store.TransactionsStore\n-import org.wordpress.android.fluxc.store.TransactionsStore.CreateShoppingCartPayload\n import org.wordpress.android.fluxc.store.TransactionsStore.OnShoppingCartCreated\n import org.wordpress.android.fluxc.store.TransactionsStore.OnShoppingCartRedeemed\n import org.wordpress.android.fluxc.store.TransactionsStore.OnSupportedCountriesFetched\n@@ -326,8 +325,8 @@ class DomainRegistrationDetailsViewModel @Inject constructor(\n state = uiState.value?.selectedState?.code\n )\n dispatcher.dispatch(\n- TransactionActionBuilder.newCreateShoppingCartAction(\n- CreateShoppingCartPayload(\n+ TransactionActionBuilder.newCreateShoppingCartWithDomainAndPlanAction(\n+ TransactionsStore.CreateShoppingCartWithDomainAndPlanPayload(\n site,\n domainProductDetails.productId,\n domainProductDetails.domainName,\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/usecases/CreateCartUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/usecases/CreateCartUseCase.kt\nindex 362e94696e4e..e1fe40165076 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/domains/usecases/CreateCartUseCase.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/usecases/CreateCartUseCase.kt\n@@ -5,7 +5,6 @@ import org.wordpress.android.fluxc.Dispatcher\n import org.wordpress.android.fluxc.generated.TransactionActionBuilder\n import org.wordpress.android.fluxc.model.SiteModel\n import org.wordpress.android.fluxc.store.TransactionsStore\n-import org.wordpress.android.fluxc.store.TransactionsStore.CreateShoppingCartPayload\n import org.wordpress.android.fluxc.store.TransactionsStore.OnShoppingCartCreated\n import javax.inject.Inject\n import kotlin.coroutines.Continuation\n@@ -32,18 +31,26 @@ class CreateCartUseCase @Inject constructor(\n @Suppress(\"UseCheckOrError\")\n suspend fun execute(\n site: SiteModel,\n- productId: Int,\n+ domainProductId: Int,\n domainName: String,\n- isPrivacyEnabled: Boolean,\n- isTemporary: Boolean\n+ isDomainPrivacyEnabled: Boolean,\n+ isTemporary: Boolean,\n+ planProductId: Int? = null\n ): OnShoppingCartCreated {\n if (continuation != null) {\n throw IllegalStateException(\"Cart creation is already in progress!\")\n }\n return suspendCoroutine {\n continuation = it\n- val payload = CreateShoppingCartPayload(site, productId, domainName, isPrivacyEnabled, isTemporary)\n- dispatcher.dispatch(TransactionActionBuilder.newCreateShoppingCartAction(payload))\n+ val payload = TransactionsStore.CreateShoppingCartWithDomainAndPlanPayload(\n+ site,\n+ domainProductId,\n+ domainName,\n+ isDomainPrivacyEnabled,\n+ planProductId,\n+ isTemporary\n+ )\n+ dispatcher.dispatch(TransactionActionBuilder.newCreateShoppingCartWithDomainAndPlanAction(payload))\n }\n }\n \ndiff --git a/build.gradle b/build.gradle\nindex a98e8623b87c..2e47034981c5 100644\n--- a/build.gradle\n+++ b/build.gradle\n@@ -22,7 +22,7 @@ ext {\n automatticTracksVersion = '3.3.0'\n gutenbergMobileVersion = 'v1.105.0'\n wordPressAztecVersion = 'v1.8.0'\n- wordPressFluxCVersion = 'trunk-55122d0f327b24441003653dcfe7d3cd03bc7972'\n+ wordPressFluxCVersion = 'trunk-f3ba57a9f1d9be24a4f43f929c6d98bfd8539df2'\n wordPressLoginVersion = '1.6.0'\n wordPressPersistentEditTextVersion = '1.0.2'\n wordPressUtilsVersion = '3.10.0'\n", "test_patch": "diff --git a/WordPress/src/test/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModelTest.kt\nindex 6bbe25cc3b7a..8d71993756e9 100644\n--- a/WordPress/src/test/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModelTest.kt\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModelTest.kt\n@@ -46,7 +46,7 @@ import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType\n import org.wordpress.android.fluxc.store.TransactionsStore\n import org.wordpress.android.fluxc.store.TransactionsStore.CreateCartErrorType.GENERIC_ERROR\n import org.wordpress.android.fluxc.store.TransactionsStore.CreateShoppingCartError\n-import org.wordpress.android.fluxc.store.TransactionsStore.CreateShoppingCartPayload\n+import org.wordpress.android.fluxc.store.TransactionsStore.CreateShoppingCartWithDomainAndPlanPayload\n import org.wordpress.android.fluxc.store.TransactionsStore.FetchSupportedCountriesError\n import org.wordpress.android.fluxc.store.TransactionsStore.FetchSupportedCountriesErrorType\n import org.wordpress.android.fluxc.store.TransactionsStore.OnShoppingCartCreated\n@@ -702,7 +702,7 @@ class DomainRegistrationDetailsViewModelTest : BaseUnitTest() {\n OnShoppingCartCreated(createShoppingCartResponse)\n }\n whenever(dispatcher.dispatch(argWhere> {\n- it.type == TransactionAction.CREATE_SHOPPING_CART\n+ it.type == TransactionAction.CREATE_SHOPPING_CART_WITH_DOMAIN_AND_PLAN\n })).then {\n viewModel.onShoppingCartCreated(event)\n }\n@@ -759,15 +759,15 @@ class DomainRegistrationDetailsViewModelTest : BaseUnitTest() {\n }\n \n private fun validateCreateCartAction(action: Action<*>) {\n- assertThat(action.type).isEqualTo(TransactionAction.CREATE_SHOPPING_CART)\n+ assertThat(action.type).isEqualTo(TransactionAction.CREATE_SHOPPING_CART_WITH_DOMAIN_AND_PLAN)\n assertThat(action.payload).isNotNull\n- assertThat(action.payload).isInstanceOf(CreateShoppingCartPayload::class.java)\n+ assertThat(action.payload).isInstanceOf(CreateShoppingCartWithDomainAndPlanPayload::class.java)\n \n- val createShoppingCartPayload = action.payload as CreateShoppingCartPayload\n+ val createShoppingCartPayload = action.payload as CreateShoppingCartWithDomainAndPlanPayload\n assertThat(createShoppingCartPayload.site).isEqualTo(site)\n assertThat(createShoppingCartPayload.domainName).isEqualTo(testDomainName)\n- assertThat(createShoppingCartPayload.productId).isEqualTo(productId)\n- assertThat(createShoppingCartPayload.isPrivacyEnabled).isEqualTo(true)\n+ assertThat(createShoppingCartPayload.domainProductId).isEqualTo(productId)\n+ assertThat(createShoppingCartPayload.isDomainPrivacyEnabled).isEqualTo(true)\n }\n \n private fun validateRedeemCartAction(action: Action<*>) {\ndiff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/progress/SiteCreationProgressViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/progress/SiteCreationProgressViewModelTest.kt\nindex 6b3a33ae7d9e..2be76a5a723c 100644\n--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/progress/SiteCreationProgressViewModelTest.kt\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/progress/SiteCreationProgressViewModelTest.kt\n@@ -9,6 +9,7 @@ import org.assertj.core.api.Assertions.assertThat\n import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n+import org.mockito.ArgumentMatchers.nullable\n import org.mockito.junit.MockitoJUnitRunner\n import org.mockito.kotlin.any\n import org.mockito.kotlin.argThat\n@@ -168,7 +169,7 @@ class SiteCreationProgressViewModelTest : BaseUnitTest() {\n startViewModel(SITE_CREATION_STATE.copy(domain = PAID_DOMAIN))\n viewModel.onSiteCreationServiceStateUpdated(SERVICE_SUCCESS)\n viewModel.retry()\n- verify(createCartUseCase, times(2)).execute(any(), any(), any(), any(), eq(false))\n+ verify(createCartUseCase, times(2)).execute(any(), any(), any(), any(), eq(false), nullable(Int::class.java))\n }\n \n @Test\n@@ -205,6 +206,7 @@ class SiteCreationProgressViewModelTest : BaseUnitTest() {\n eq(PAID_DOMAIN.domainName),\n eq(PAID_DOMAIN.supportsPrivacy),\n any(),\n+ nullable(Int::class.java)\n )\n }\n \n@@ -248,7 +250,8 @@ class SiteCreationProgressViewModelTest : BaseUnitTest() {\n eq(PAID_DOMAIN.productId),\n eq(PAID_DOMAIN.domainName),\n eq(PAID_DOMAIN.supportsPrivacy),\n- any()\n+ any(),\n+ nullable(Int::class.java)\n )\n }\n \n@@ -288,7 +291,16 @@ class SiteCreationProgressViewModelTest : BaseUnitTest() {\n \n // region Helpers\n private fun testWith(response: OnShoppingCartCreated, block: suspend CoroutineScope.() -> Unit) = test {\n- whenever(createCartUseCase.execute(any(), any(), any(), any(), any())).thenReturn(response)\n+ whenever(\n+ createCartUseCase.execute(\n+ any(),\n+ any(),\n+ any(),\n+ any(),\n+ any(),\n+ nullable(Int::class.java)\n+ )\n+ ).thenReturn(response)\n block()\n }\n \n", "n2p_tests": {"org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.onSameCountrySelected": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on service success for paid domain creates cart": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.onRegisterDomainButtonClicked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on help click is propagated": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on restart with same free domain reuses it": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on restart with free domain emits service event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on cart failure shows cart error": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.errorFetchingStatesDuringPreload": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.phoneNumberPrefixIsNotPrefiledWhenCountryCodeIsMissingDuringPreload": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.errorFetchingDomainContactInformationDuringPreload": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.mappingOfDomainContactDetailModels": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on start shows progress": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.errorFetchingCountriesDuringPreload": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.onErrorRedeemingCart": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.contactDetailsPreload": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on retry click after cart error retries to create cart": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on restart with same paid domain reuses previous blog to create new cart": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on start shows first loading text without animation": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on retry click after service error emits service event with the previous result": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.onStateSelectorClicked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.onCountrySelectorClicked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on start emits service event for free domains with isFree true": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on start emits service event for paid domains with isFree false": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.onTosLinkClicked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on start shows error when network is not available": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.onStateSelected": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.onErrorFetchingSite": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.onErrorCreatingCart": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.onDomainContactDetailsChanged": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on start emits service event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on service failure shows generic error": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on start changes the loading text with animation after delay 4 times": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on retry click after network error restarts site creation service": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on service success propagates site": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on cancel wizard click is propagated": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.togglePrivacyProtection": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on restart with different paid domain emits service event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.onCountrySelected": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on start changes the loading text with animation after delay": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.DomainRegistrationDetailsViewModelTest.phoneNumberPrefixIsPrefilledDuringPreload": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.sitecreation.progress.SiteCreationProgressViewModelTest.on cart success propagates checkout details": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "wordpress-mobile__WordPress-Android-19469", "org": "wordpress-mobile", "repo": "WordPress-Android", "number": 19469, "state": "closed", "title": "Fixes: In eligible cards shown in Personalization Screen ", "body": "## Fixes \r\n#19467\r\n\r\n## Description\r\nThis PR fixes the scenario in which the in eligible feature cards were shown in the personalization screen This PR adds a check before adding the visibility options for a feature card in personalization screen. \r\n\r\nNote: the shortcuts personalization already was checking whether a feature is available for a site before showing it on the screen\r\n\r\n| Before | After | \r\n|---|---|\r\n| | \"Screenshot | \r\n\r\n## To test:\r\n### Blaze feature is shown/hidden \r\n1. Login to the jetpack app with a site which doesn't have blaze capability - \r\n2. Go to Dashboard\r\n3. Click on Personalize your Home Card \r\n4. Go to Dashboard Cards\r\n5. Verify that blaze card visibility toggle is not shown \r\n6. Login to the Jetpack app with site having blaze capability\r\n7. Follow steps 2-4\r\n8. Verify that blaze card visibility toggle is shown\r\n\r\n### Activity log card toggle is shown/hidden \r\n1. Login to the jetpack app with a site which doesn't have Activity log capability\r\n2. Go to Dashboard\r\n3. Click on Personalize your Home Card \r\n4. Go to Dashboard Cards\r\n5. Verify that Activity log visibility toggle is not shown \r\n6. Login to the Jetpack app with site having activity log card capability - (manage content/admin)\r\n7. Follow steps 2-4\r\n8. Verify that Activity log visibility toggle is shown\r\n\r\n### Pages Card toggle is shown/hidden\r\n\r\n### Pages card role logic\r\n\r\n| Role | Can see pages card | \r\n|---|---|\r\n| Subscriber | N | \r\n| Contributor | N | \r\n| Author | N | \r\n| Editor | Y | \r\n| Administrator | Y | \r\n| Super Admin | Y | \r\n\r\n1. Login to the jetpack app with a site which doesn't have Pages capability\r\n2. Go to Dashboard\r\n3. Click on Personalize your Home Card \r\n4. Go to Dashboard Cards\r\n5. Verify that Pages card visibility toggle is not shown \r\n6. Login to the Jetpack app with site having Pages capability - see the table above\r\n7. Follow steps 2-4\r\n8. Verify that Pages card visibility toggle is shown\r\n\r\n## Regression Notes\r\n1. Potential unintended areas of impact\r\n\r\n2. What I did to test those areas of impact (or what existing automated tests I relied on)\r\n\r\n3. What automated tests I added (or what prevented me from doing so)\r\n\r\nPR submission checklist:\r\n- [x] I have completed the Regression Notes.\r\n- [x] I have considered adding accessibility improvements for my changes.\r\n- [x] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.\r\n\r\nUI Changes testing checklist:\r\n- [x] Portrait and landscape orientations.\r\n- [x] Light and dark modes.\r\n- [x] Fonts: Larger, smaller and bold text.\r\n- [x] High contrast.\r\n- [x] Talkback.\r\n- [x] Languages with large words or with letters/accents not frequently used in English.\r\n- [x] Right-to-left languages. (Even if translation isn\u2019t complete, formatting should still respect the right-to-left layout)\r\n- [x] Large and small screen sizes. (Tablet and smaller phones)\r\n- [x] Multi-tasking: Split screen and Pop-up view. (Android 10 or higher)\r\n", "base": {"label": "wordpress-mobile:trunk", "ref": "trunk", "sha": "88afc7687e1739482bf07d66fe6566b8007284a0"}, "resolved_issues": [{"number": 19467, "title": "Dashboard Cards Personalization shows in eligible cards ", "body": "### Expected behavior\r\nFor a site or user not having the capability of a feature, the card personalization for that card should not be shown \r\n\r\n### Actual behavior\r\nThe ability to hide/show a card of a feature that isn't available for the user is shown in the dashboard personalization screen\r\n\r\nFor example, the below screen shows blaze card hide/show ability but the feature is not available on the site\r\n\r\n\r\n\r\n### Steps to reproduce the behavior\r\n- Go to Jetpack app and login to an account without having Blaze, Activity log or Post edit capability\r\n- Go to Dashboard \r\n- Click on Personalize your Home tab \r\n- Notice that Blaze or Activity Log card hide/show toggle is shown\r\n\r\n##### Tested on [device], Android [version], JPAndroid / WPAndroid [version]\r\nPixel 4a, Android 13\r\n"}], "lang": "kotlin", "problem_statement": "Dashboard Cards Personalization shows in eligible cards \n### Expected behavior\r\nFor a site or user not having the capability of a feature, the card personalization for that card should not be shown \r\n\r\n### Actual behavior\r\nThe ability to hide/show a card of a feature that isn't available for the user is shown in the dashboard personalization screen\r\n\r\nFor example, the below screen shows blaze card hide/show ability but the feature is not available on the site\r\n\r\n\r\n\r\n### Steps to reproduce the behavior\r\n- Go to Jetpack app and login to an account without having Blaze, Activity log or Post edit capability\r\n- Go to Dashboard \r\n- Click on Personalize your Home tab \r\n- Notice that Blaze or Activity Log card hide/show toggle is shown\r\n\r\n##### Tested on [device], Android [version], JPAndroid / WPAndroid [version]\r\nPixel 4a, Android 13\r\n\n", "pull_url": "https://github.com/wordpress-mobile/WordPress-Android/pull/19469", "issue_urls": ["https://github.com/wordpress-mobile/WordPress-Android/issues/19467"], "test_command": "./gradlew :WordPress:testWordpressVanillaDebugUnitTest --tests \"org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest\"", "fix_patch": "diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/personalization/DashboardCardPersonalizationViewModelSlice.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/personalization/DashboardCardPersonalizationViewModelSlice.kt\nindex 62149c0368bd..8d25b5d32a73 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/personalization/DashboardCardPersonalizationViewModelSlice.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/personalization/DashboardCardPersonalizationViewModelSlice.kt\n@@ -9,8 +9,11 @@ import kotlinx.coroutines.flow.firstOrNull\n import kotlinx.coroutines.launch\n import org.wordpress.android.R\n import org.wordpress.android.analytics.AnalyticsTracker\n+import org.wordpress.android.fluxc.model.SiteModel\n import org.wordpress.android.fluxc.store.BloggingRemindersStore\n import org.wordpress.android.modules.BG_THREAD\n+import org.wordpress.android.ui.blaze.BlazeFeatureUtils\n+import org.wordpress.android.ui.bloggingprompts.BloggingPromptsSettingsHelper\n import org.wordpress.android.ui.mysite.SelectedSiteRepository\n import org.wordpress.android.ui.mysite.cards.dashboard.posts.PostCardType\n import org.wordpress.android.ui.prefs.AppPrefsWrapper\n@@ -24,6 +27,8 @@ class DashboardCardPersonalizationViewModelSlice @Inject constructor(\n private val selectedSiteRepository: SelectedSiteRepository,\n private val bloggingRemindersStore: BloggingRemindersStore,\n private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,\n+ private val blazeFeatureUtils: BlazeFeatureUtils,\n+ private val bloggingPromptsSettingsHelper: BloggingPromptsSettingsHelper\n ) {\n private val _uiState = MutableLiveData>()\n val uiState: LiveData> = _uiState\n@@ -41,52 +46,90 @@ class DashboardCardPersonalizationViewModelSlice @Inject constructor(\n }\n \n private suspend fun getCardStates(siteId: Long): List {\n- return listOf(\n- DashboardCardState(\n- title = R.string.personalization_screen_stats_card_title,\n- description = R.string.personalization_screen_stats_card_description,\n- enabled = isStatsCardShown(siteId),\n- cardType = CardType.STATS\n- ),\n- DashboardCardState(\n- title = R.string.personalization_screen_draft_posts_card_title,\n- description = R.string.personalization_screen_draft_posts_card_description,\n- enabled = isDraftPostsCardShown(siteId),\n- cardType = CardType.DRAFT_POSTS\n- ),\n- DashboardCardState(\n- title = R.string.personalization_screen_scheduled_posts_card_title,\n- description = R.string.personalization_screen_scheduled_posts_card_description,\n- enabled = isScheduledPostsCardShown(siteId),\n- cardType = CardType.SCHEDULED_POSTS\n- ),\n- DashboardCardState(\n- title = R.string.personalization_screen_pages_card_title,\n- description = R.string.personalization_screen_pages_card_description,\n- enabled = isPagesCardShown(siteId),\n- cardType = CardType.PAGES\n- ),\n- DashboardCardState(\n- title = R.string.personalization_screen_activity_log_card_title,\n- description = R.string.personalization_screen_activity_log_card_description,\n- enabled = isActivityLogCardShown(siteId),\n- cardType = CardType.ACTIVITY_LOG\n- ),\n+ val selectedSite = selectedSiteRepository.getSelectedSite()\n+ val dashboardCardStates = mutableListOf()\n+ dashboardCardStates.add(statsCard(siteId))\n+ dashboardCardStates.add(draftPostsCard(siteId))\n+ dashboardCardStates.add(getScheduledPostsCard(siteId))\n+ selectedSite?.let {\n+ getPagesCardState(siteId, selectedSite)?.let { dashboardCardStates.add(it) }\n+ getActivityLogCard(siteId, selectedSite)?.let { dashboardCardStates.add(it) }\n+ getBlazeCardState(siteId, selectedSite)?.let { dashboardCardStates.add(it) }\n+ }\n+ getBloggingPromptCardState()?.let { dashboardCardStates.add(it) }\n+ return dashboardCardStates.toList()\n+ }\n+\n+ private suspend fun getBloggingPromptCardState(): DashboardCardState? {\n+ return if (bloggingPromptsSettingsHelper.shouldShowPromptsFeature()) {\n DashboardCardState(\n+ title = R.string.personalization_screen_blogging_prompts_card_title,\n+ description = R.string.personalization_screen_blogging_prompts_card_description,\n+ enabled = isPromptsSettingEnabled(selectedSiteRepository.getSelectedSiteLocalId()),\n+ cardType = CardType.BLOGGING_PROMPTS\n+ )\n+ } else null\n+ }\n+\n+ private fun getBlazeCardState(siteId: Long, selectedSite: SiteModel): DashboardCardState? {\n+ if (blazeFeatureUtils.isSiteBlazeEligible(selectedSite)) {\n+ return DashboardCardState(\n title = R.string.personalization_screen_blaze_card_title,\n description = R.string.personalization_screen_blaze_card_description,\n enabled = isBlazeCardShown(siteId),\n cardType = CardType.BLAZE\n- ),\n+ )\n+ }\n+ return null\n+ }\n+\n+ private fun getActivityLogCard(siteId: Long, selectedSite: SiteModel): DashboardCardState? {\n+ if (selectedSite.hasCapabilityManageOptions && !selectedSite.isWpForTeamsSite) {\n+ return DashboardCardState(\n+ title = R.string.personalization_screen_activity_log_card_title,\n+ description = R.string.personalization_screen_activity_log_card_description,\n+ enabled = isActivityLogCardShown(siteId),\n+ cardType = CardType.ACTIVITY_LOG\n+ )\n+ }\n+ return null\n+ }\n+\n+ private fun getScheduledPostsCard(siteId: Long) = DashboardCardState(\n+ title = R.string.personalization_screen_scheduled_posts_card_title,\n+ description = R.string.personalization_screen_scheduled_posts_card_description,\n+ enabled = isScheduledPostsCardShown(siteId),\n+ cardType = CardType.SCHEDULED_POSTS\n+ )\n+\n+ private fun draftPostsCard(siteId: Long) = DashboardCardState(\n+ title = R.string.personalization_screen_draft_posts_card_title,\n+ description = R.string.personalization_screen_draft_posts_card_description,\n+ enabled = isDraftPostsCardShown(siteId),\n+ cardType = CardType.DRAFT_POSTS\n+ )\n+\n+ private fun statsCard(siteId: Long) = DashboardCardState(\n+ title = R.string.personalization_screen_stats_card_title,\n+ description = R.string.personalization_screen_stats_card_description,\n+ enabled = isStatsCardShown(siteId),\n+ cardType = CardType.STATS\n+ )\n+\n+ private fun getPagesCardState(siteId: Long, selectedSite: SiteModel): DashboardCardState? {\n+ return if (selectedSite.hasCapabilityEditPages || selectedSite.isSelfHostedAdmin) {\n DashboardCardState(\n- title = R.string.personalization_screen_blogging_prompts_card_title,\n- description = R.string.personalization_screen_blogging_prompts_card_description,\n- enabled = isPromptsSettingEnabled(selectedSiteRepository.getSelectedSiteLocalId()),\n- cardType = CardType.BLOGGING_PROMPTS\n+ title = R.string.personalization_screen_pages_card_title,\n+ description = R.string.personalization_screen_pages_card_description,\n+ enabled = isPagesCardShown(siteId),\n+ cardType = CardType.PAGES\n )\n- )\n+ } else {\n+ null\n+ }\n }\n \n+\n fun onCardToggled(cardType: CardType, enabled: Boolean) {\n val siteId = selectedSiteRepository.getSelectedSite()!!.siteId\n scope.launch(bgDispatcher) {\n@@ -154,6 +197,7 @@ class DashboardCardPersonalizationViewModelSlice @Inject constructor(\n private fun isActivityLogCardShown(siteId: Long) = !appPrefsWrapper.getShouldHideActivityDashboardCard(siteId)\n \n private fun isBlazeCardShown(siteId: Long) = !appPrefsWrapper.hideBlazeCard(siteId)\n+\n private suspend fun isPromptsSettingEnabled(\n siteId: Int\n ): Boolean = bloggingRemindersStore\n", "test_patch": "diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/personalization/DashboardCardPersonalizationViewModelSliceTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/personalization/DashboardCardPersonalizationViewModelSliceTest.kt\nindex c6074d3d76fa..6e2530ccf16c 100644\n--- a/WordPress/src/test/java/org/wordpress/android/ui/mysite/personalization/DashboardCardPersonalizationViewModelSliceTest.kt\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/personalization/DashboardCardPersonalizationViewModelSliceTest.kt\n@@ -16,6 +16,8 @@ import org.wordpress.android.analytics.AnalyticsTracker\n import org.wordpress.android.fluxc.model.BloggingRemindersModel\n import org.wordpress.android.fluxc.model.SiteModel\n import org.wordpress.android.fluxc.store.BloggingRemindersStore\n+import org.wordpress.android.ui.blaze.BlazeFeatureUtils\n+import org.wordpress.android.ui.bloggingprompts.BloggingPromptsSettingsHelper\n import org.wordpress.android.ui.mysite.SelectedSiteRepository\n import org.wordpress.android.ui.mysite.cards.dashboard.posts.PostCardType\n import org.wordpress.android.ui.prefs.AppPrefsWrapper\n@@ -36,6 +38,12 @@ class DashboardCardPersonalizationViewModelSliceTest : BaseUnitTest() {\n @Mock\n lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper\n \n+ @Mock\n+ lateinit var blazeFeatureUtils: BlazeFeatureUtils\n+\n+ @Mock\n+ lateinit var bloggingPromptsSettingsHelper: BloggingPromptsSettingsHelper\n+\n private lateinit var viewModelSlice: DashboardCardPersonalizationViewModelSlice\n \n private val site = SiteModel().apply { siteId = 123L }\n@@ -54,12 +62,19 @@ class DashboardCardPersonalizationViewModelSliceTest : BaseUnitTest() {\n whenever(bloggingRemindersStore.bloggingRemindersModel(localSiteId))\n .thenReturn(flowOf(userSetBloggingRemindersModel))\n \n+ whenever(blazeFeatureUtils.isSiteBlazeEligible(site)).thenReturn(true)\n+ test {\n+ whenever(bloggingPromptsSettingsHelper.shouldShowPromptsFeature()).thenReturn(true)\n+ }\n+\n viewModelSlice = DashboardCardPersonalizationViewModelSlice(\n bgDispatcher = testDispatcher(),\n appPrefsWrapper = appPrefsWrapper,\n selectedSiteRepository = selectedSiteRepository,\n bloggingRemindersStore = bloggingRemindersStore,\n- analyticsTrackerWrapper = analyticsTrackerWrapper\n+ analyticsTrackerWrapper = analyticsTrackerWrapper,\n+ blazeFeatureUtils = blazeFeatureUtils,\n+ bloggingPromptsSettingsHelper = bloggingPromptsSettingsHelper\n )\n \n viewModelSlice.uiState.observeForever {\n@@ -103,6 +118,8 @@ class DashboardCardPersonalizationViewModelSliceTest : BaseUnitTest() {\n @Test\n fun `given pages card is not hidden, when cards are fetched, then state is checked`() {\n whenever(appPrefsWrapper.getShouldHidePagesDashboardCard(123L)).thenReturn(false)\n+ site.hasCapabilityEditPages = true\n+ site.setIsSelfHostedAdmin(true)\n \n viewModelSlice.start(123L)\n val statsCardState = uiStateList.last().find { it.cardType == CardType.PAGES }\n@@ -113,6 +130,8 @@ class DashboardCardPersonalizationViewModelSliceTest : BaseUnitTest() {\n @Test\n fun `given activity log card is not hidden, when cards are fetched, then state is checked`() {\n whenever(appPrefsWrapper.getShouldHideActivityDashboardCard(123L)).thenReturn(false)\n+ site.hasCapabilityManageOptions = true\n+ site.setIsWpForTeamsSite(false)\n \n viewModelSlice.start(123L)\n val statsCardState = uiStateList.last().find { it.cardType == CardType.ACTIVITY_LOG }\n@@ -124,6 +143,7 @@ class DashboardCardPersonalizationViewModelSliceTest : BaseUnitTest() {\n fun `given blaze card is not hidden, when cards are fetched, then state is checked`() {\n whenever(appPrefsWrapper.hideBlazeCard(123L)).thenReturn(false)\n \n+\n viewModelSlice.start(123L)\n val statsCardState = uiStateList.last().find { it.cardType == CardType.BLAZE }\n \n", "n2p_tests": {"org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.when draft posts card state is toggled, then pref is updated": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.given card enabled, when card state is toggled, then event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.given card is disabled, when card is toggled, then card is enabled": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.given pages card is not hidden, when cards are fetched, then state is checked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.when scheduled posts card state is toggled, then pref is updated": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.given card disabled, when card state is toggled, then event is tracked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.given blaze card is not hidden, when cards are fetched, then state is checked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.when blaze card state is toggled, then pref is updated": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.when blogging prompts card state is toggled, then pref is updated": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.given stats card is not hidden, when cards are fetched, then state is checked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.given blogging prompts card is hidden, when cards are fetched, then state is checked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.given activity log card is not hidden, when cards are fetched, then state is checked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.when activity log card state is toggled, then pref is updated": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.given scheduled post card is not hidden, when cards are fetched, then state is checked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.when pages card state is toggled, then pref is updated": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.given draft post card is not hidden, when cards are fetched, then state is checked": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.personalization.DashboardCardPersonalizationViewModelSliceTest.when stats card state is toggled, then pref is updated": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "wordpress-mobile__WordPress-Android-19510", "org": "wordpress-mobile", "repo": "WordPress-Android", "number": 19510, "state": "closed", "title": "Attach Purchase Domain screen to Domain Search flow", "body": "Fixes #19502\r\n\r\nThe PR adds the Purchase Domain screen to the existing flow. \r\n\r\nNote: I also converted `PurchaseDomainViewModel` to assisted injection-friendly implementation for passing domain id to the viewmodel's parameters, which makes the class easily testable. I wasn't sure if we needed the entire `ProposedDomain` entity for passing a selected domain through the further steps, but it should be easy to replace an ID with an entire `ProposedDomain` entity if needed.\r\n\r\nTo test:\r\n- Make sure you have enabled domain_management feature flag\r\n- Go to \"Me\" tab -> Domains -> Plus (+) button\r\n- On the \"Search for a domain\" screen type any query to the text input\r\n- Tap on any domain suggestion\r\n- [x] Make sure you are navigated to the \"Purchase Domain\" screen\r\n\r\nhttps://github.com/wordpress-mobile/WordPress-Android/assets/16563318/ed0a8b2a-d25b-4dd7-892c-f89323652f29\r\n\r\n## Regression Notes\r\n1. Potential unintended areas of impact\r\nPurchase Domain screen since modified the ViewModel implementation\r\n\r\n2. What I did to test those areas of impact (or what existing automated tests I relied on)\r\nManual testing\r\n\r\n3. What automated tests I added (or what prevented me from doing so)\r\nN/A\r\n\r\nPR submission checklist:\r\n\r\n- [x] I have completed the Regression Notes.\r\n- [x] I have considered adding accessibility improvements for my changes.\r\n- [x] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.\r\n\r\nUI Changes testing checklist:\r\n\r\n- [ ] Portrait and landscape orientations.\r\n- [ ] Light and dark modes.\r\n- [ ] Fonts: Larger, smaller and bold text.\r\n- [ ] High contrast.\r\n- [ ] Talkback.\r\n- [ ] Languages with large words or with letters/accents not frequently used in English.\r\n- [ ] Right-to-left languages. (Even if translation isn\u2019t complete, formatting should still respect the right-to-left layout)\r\n- [ ] Large and small screen sizes. (Tablet and smaller phones)\r\n- [ ] Multi-tasking: Split screen and Pop-up view. (Android 10 or higher)\r\n", "base": {"label": "wordpress-mobile:trunk", "ref": "trunk", "sha": "d36116b1a261a2a376777148d0b7672cbd6fb153"}, "resolved_issues": [{"number": 19502, "title": "\ud83e\udd16 Link up the purchase domain screen to the flow", "body": "Link up the implemented \"Purchase Domain\" screen UI https://github.com/wordpress-mobile/WordPress-Android/pull/19332 to the flow"}], "lang": "kotlin", "problem_statement": "\ud83e\udd16 Link up the purchase domain screen to the flow\nLink up the implemented \"Purchase Domain\" screen UI https://github.com/wordpress-mobile/WordPress-Android/pull/19332 to the flow\n", "pull_url": "https://github.com/wordpress-mobile/WordPress-Android/pull/19510", "issue_urls": ["https://github.com/wordpress-mobile/WordPress-Android/issues/19502"], "test_command": "./gradlew :WordPress:testWordpressVanillaDebugUnitTest --tests \"org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainViewModelTest\" --tests \"org.wordpress.android.ui.domains.management.newdomainsearch.domainsfetcher.NewDomainsSearchRepositoryTest\" --tests \"org.wordpress.android.ui.domains.management.newdomainsearch.NewDomainSearchViewModelTest\"", "fix_patch": "diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ActivityNavigator.kt b/WordPress/src/main/java/org/wordpress/android/ui/ActivityNavigator.kt\nindex 9ae93dd4e3b6..c6e3cc7aea9e 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/ActivityNavigator.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/ActivityNavigator.kt\n@@ -11,6 +11,10 @@ import org.wordpress.android.ui.blaze.blazecampaigns.campaignlisting.CampaignLis\n import org.wordpress.android.ui.blaze.blazepromote.ARG_BLAZE_FLOW_SOURCE\n import org.wordpress.android.ui.blaze.blazepromote.ARG_BLAZE_SHOULD_SHOW_OVERLAY\n import org.wordpress.android.ui.blaze.blazepromote.BlazePromoteParentActivity\n+import org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainActivity\n+import org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainActivity.Companion.PICKED_DOMAIN_KEY\n+import org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainActivity.Companion.PICKED_DOMAIN_PRIVACY\n+import org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainActivity.Companion.PICKED_PRODUCT_ID\n import org.wordpress.android.ui.mysite.menu.KEY_QUICK_START_EVENT\n import org.wordpress.android.ui.mysite.menu.MenuActivity\n import org.wordpress.android.ui.mysite.personalization.PersonalizationActivity\n@@ -79,4 +83,13 @@ class ActivityNavigator @Inject constructor() {\n }\n context.startActivity(Intent(context, MenuActivity::class.java))\n }\n+\n+ fun openPurchaseDomain(context: Context, productId: Int, domainName: String, domainSupportsPrivacy: Boolean) {\n+ context.startActivity(\n+ Intent(context, PurchaseDomainActivity::class.java)\n+ .putExtra(PICKED_PRODUCT_ID, productId)\n+ .putExtra(PICKED_DOMAIN_KEY, domainName)\n+ .putExtra(PICKED_DOMAIN_PRIVACY, domainSupportsPrivacy)\n+ )\n+ }\n }\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/NewDomainSearchActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/NewDomainSearchActivity.kt\nindex fc37ca4006f7..ceab64625fb9 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/NewDomainSearchActivity.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/NewDomainSearchActivity.kt\n@@ -45,8 +45,9 @@ class NewDomainSearchActivity : AppCompatActivity() {\n \n private fun handleActionEvents(actionEvent: NewDomainSearchViewModel.ActionEvent) {\n when (actionEvent) {\n- is NewDomainSearchViewModel.ActionEvent.PurchaseDomain -> { /* TODO */\n- }\n+ is NewDomainSearchViewModel.ActionEvent.PurchaseDomain -> activityNavigator.openPurchaseDomain(\n+ this, actionEvent.productId, actionEvent.domain, actionEvent.supportsPrivacy\n+ )\n \n is NewDomainSearchViewModel.ActionEvent.TransferDomain -> activityNavigator.openDomainTransfer(\n this, actionEvent.url\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/NewDomainSearchViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/NewDomainSearchViewModel.kt\nindex 2c6711efb4c8..9c79f4b6a217 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/NewDomainSearchViewModel.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/NewDomainSearchViewModel.kt\n@@ -77,7 +77,13 @@ class NewDomainSearchViewModel @Inject constructor(\n mapOf(\"domain_name\" to domain.domain)\n )\n launch {\n- _actionEvents.emit(ActionEvent.PurchaseDomain(domain))\n+ _actionEvents.emit(\n+ ActionEvent.PurchaseDomain(\n+ productId = domain.productId,\n+ domain = domain.domain,\n+ supportsPrivacy = domain.supportsPrivacy\n+ )\n+ )\n }\n }\n \n@@ -88,7 +94,11 @@ class NewDomainSearchViewModel @Inject constructor(\n }\n \n sealed class ActionEvent {\n- data class PurchaseDomain(val domain: ProposedDomain) : ActionEvent()\n+ data class PurchaseDomain(\n+ val productId: Int,\n+ val domain: String,\n+ val supportsPrivacy: Boolean\n+ ) : ActionEvent()\n data class TransferDomain(val url: String) : ActionEvent()\n object GoBack : ActionEvent()\n }\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/composable/NewDomainSearchScreen.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/composable/NewDomainSearchScreen.kt\nindex de67eab60f6e..09c92a4ecabe 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/composable/NewDomainSearchScreen.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/composable/NewDomainSearchScreen.kt\n@@ -231,12 +231,14 @@ fun NewDomainSearchScreenPreview() {\n domain = \"example.com\",\n price = \"USD 100\",\n salePrice = \"USD 30\",\n+ supportsPrivacy = true,\n ),\n ProposedDomain(\n productId = 0,\n domain = \"example.blog\",\n price = \"USD 100\",\n salePrice = null,\n+ supportsPrivacy = true,\n ),\n )\n ),\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/domainsfetcher/NewDomainsSearchRepository.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/domainsfetcher/NewDomainsSearchRepository.kt\nindex 5d2400a8fb98..cdfcb1589a03 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/domainsfetcher/NewDomainsSearchRepository.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/domainsfetcher/NewDomainsSearchRepository.kt\n@@ -50,6 +50,7 @@ class NewDomainsSearchRepository @Inject constructor(\n domain = domain.domain_name,\n price = domain.cost,\n salePrice = product?.combinedSaleCostDisplay,\n+ supportsPrivacy = domain.supports_privacy\n )\n }\n DomainsResult.Success(suggestions)\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/domainsfetcher/ProposedDomain.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/domainsfetcher/ProposedDomain.kt\nindex dfaa01a83e8b..61971ac1ccd8 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/domainsfetcher/ProposedDomain.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/newdomainsearch/domainsfetcher/ProposedDomain.kt\n@@ -4,7 +4,8 @@ data class ProposedDomain(\n val productId: Int,\n val domain: String,\n val price: String,\n- val salePrice: String?\n+ val salePrice: String?,\n+ val supportsPrivacy: Boolean,\n ) {\n val domainSuffix: String\n get() = domain.split('.').last()\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/purchasedomain/PurchaseDomainActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/purchasedomain/PurchaseDomainActivity.kt\nindex f1a1856f921e..cd1d0a6502cf 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/purchasedomain/PurchaseDomainActivity.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/purchasedomain/PurchaseDomainActivity.kt\n@@ -11,14 +11,26 @@ import kotlinx.coroutines.flow.onEach\n import org.wordpress.android.ui.domains.management.M3Theme\n import org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainViewModel.ActionEvent.GoBack\n import org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainViewModel.ActionEvent.GoToDomainPurchasing\n-import org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainViewModel.ActionEvent.GoToExistingDomain\n+import org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainViewModel.ActionEvent.GoToExistingSite\n import org.wordpress.android.ui.domains.management.purchasedomain.composable.PurchaseDomainScreen\n+import javax.inject.Inject\n \n private typealias NotImplemented = Unit\n \n @AndroidEntryPoint\n class PurchaseDomainActivity : AppCompatActivity() {\n- private val viewModel: PurchaseDomainViewModel by viewModels()\n+ @Inject\n+ lateinit var viewModelFactory: PurchaseDomainViewModel.Factory\n+\n+ private val viewModel: PurchaseDomainViewModel by viewModels {\n+ PurchaseDomainViewModel.provideFactory(viewModelFactory, productArg, domainArg, privacyArg)\n+ }\n+\n+ private val productArg: Int get() = intent.getIntExtra(PICKED_PRODUCT_ID, 0)\n+\n+ private val domainArg: String get() = intent.getStringExtra(PICKED_DOMAIN_KEY) ?: error(\"Domain cannot be null.\")\n+\n+ private val privacyArg: Boolean get() = intent.getBooleanExtra(PICKED_DOMAIN_PRIVACY, false)\n \n override fun onCreate(savedInstanceState: Bundle?) {\n super.onCreate(savedInstanceState)\n@@ -26,7 +38,7 @@ class PurchaseDomainActivity : AppCompatActivity() {\n M3Theme {\n PurchaseDomainScreen(\n onNewDomainCardSelected = viewModel::onNewDomainSelected,\n- onExistingDomainCardSelected = viewModel::onExistingDomainSelected,\n+ onExistingSiteCardSelected = viewModel::onExistingSiteSelected,\n onBackPressed = viewModel::onBackPressed,\n )\n }\n@@ -40,9 +52,15 @@ class PurchaseDomainActivity : AppCompatActivity() {\n \n private fun handleActionEvents(actionEvent: PurchaseDomainViewModel.ActionEvent) {\n when (actionEvent) {\n+ is GoToDomainPurchasing -> NotImplemented\n+ is GoToExistingSite -> NotImplemented\n GoBack -> onBackPressedDispatcher.onBackPressed()\n- GoToDomainPurchasing -> NotImplemented\n- GoToExistingDomain -> NotImplemented\n }\n }\n+\n+ companion object {\n+ const val PICKED_PRODUCT_ID: String = \"picked_product_id\"\n+ const val PICKED_DOMAIN_KEY: String = \"picked_domain_key\"\n+ const val PICKED_DOMAIN_PRIVACY: String = \"picked_domain_privacy\"\n+ }\n }\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/purchasedomain/PurchaseDomainViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/purchasedomain/PurchaseDomainViewModel.kt\nindex ded1ed2d991e..57446e99e186 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/purchasedomain/PurchaseDomainViewModel.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/purchasedomain/PurchaseDomainViewModel.kt\n@@ -1,6 +1,10 @@\n package org.wordpress.android.ui.domains.management.purchasedomain\n \n-import dagger.hilt.android.lifecycle.HiltViewModel\n+import androidx.lifecycle.ViewModel\n+import androidx.lifecycle.ViewModelProvider\n+import dagger.assisted.Assisted\n+import dagger.assisted.AssistedFactory\n+import dagger.assisted.AssistedInject\n import kotlinx.coroutines.CoroutineDispatcher\n import kotlinx.coroutines.flow.Flow\n import kotlinx.coroutines.flow.MutableSharedFlow\n@@ -8,13 +12,14 @@ import org.wordpress.android.analytics.AnalyticsTracker.Stat\n import org.wordpress.android.modules.UI_THREAD\n import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper\n import org.wordpress.android.viewmodel.ScopedViewModel\n-import javax.inject.Inject\n import javax.inject.Named\n \n-@HiltViewModel\n-class PurchaseDomainViewModel @Inject constructor(\n+class PurchaseDomainViewModel @AssistedInject constructor(\n @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,\n- private val analyticsTracker: AnalyticsTrackerWrapper\n+ private val analyticsTracker: AnalyticsTrackerWrapper,\n+ @Assisted private val productId: Int,\n+ @Assisted private val domain: String,\n+ @Assisted private val privacy: Boolean,\n ) : ScopedViewModel(mainDispatcher) {\n private val _actionEvents = MutableSharedFlow()\n val actionEvents: Flow = _actionEvents\n@@ -26,14 +31,14 @@ class PurchaseDomainViewModel @Inject constructor(\n fun onNewDomainSelected() {\n analyticsTracker.track(Stat.DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_NEW_DOMAIN_TAPPED)\n launch {\n- _actionEvents.emit(ActionEvent.GoToDomainPurchasing)\n+ _actionEvents.emit(ActionEvent.GoToDomainPurchasing(domain = domain))\n }\n }\n \n- fun onExistingDomainSelected() {\n- analyticsTracker.track(Stat.DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_EXISTING_DOMAIN_TAPPED)\n+ fun onExistingSiteSelected() {\n+ analyticsTracker.track(Stat.DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_EXISTING_SITE_TAPPED)\n launch {\n- _actionEvents.emit(ActionEvent.GoToExistingDomain)\n+ _actionEvents.emit(ActionEvent.GoToExistingSite(domain = domain))\n }\n }\n \n@@ -45,7 +50,21 @@ class PurchaseDomainViewModel @Inject constructor(\n \n sealed class ActionEvent {\n object GoBack : ActionEvent()\n- object GoToDomainPurchasing : ActionEvent()\n- object GoToExistingDomain : ActionEvent()\n+ data class GoToDomainPurchasing(val domain: String) : ActionEvent()\n+ data class GoToExistingSite(val domain: String) : ActionEvent()\n+ }\n+\n+ @AssistedFactory\n+ interface Factory {\n+ fun create(productId: Int, domain: String, privacy: Boolean): PurchaseDomainViewModel\n+ }\n+\n+ companion object {\n+ fun provideFactory(assistedFactory: Factory, productId: Int, domain: String, privacy: Boolean) =\n+ object : ViewModelProvider.Factory {\n+ @Suppress(\"UNCHECKED_CAST\")\n+ override fun create(modelClass: Class): T =\n+ assistedFactory.create(productId, domain, privacy) as T\n+ }\n }\n }\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/purchasedomain/composable/PurchaseDomainScreen.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/purchasedomain/composable/PurchaseDomainScreen.kt\nindex 9b79768d7f9b..892229fde584 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/domains/management/purchasedomain/composable/PurchaseDomainScreen.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/management/purchasedomain/composable/PurchaseDomainScreen.kt\n@@ -44,7 +44,7 @@ import org.wordpress.android.ui.domains.management.success\n @Composable\n fun PurchaseDomainScreen(\n onNewDomainCardSelected: () -> Unit,\n- onExistingDomainCardSelected: () -> Unit,\n+ onExistingSiteCardSelected: () -> Unit,\n onBackPressed: () -> Unit,\n modifier: Modifier = Modifier\n ) {\n@@ -80,7 +80,7 @@ fun PurchaseDomainScreen(\n ) {\n ScreenHeader()\n ScreenDescription()\n- DomainCards(onNewDomainCardSelected, onExistingDomainCardSelected)\n+ DomainCards(onNewDomainCardSelected, onExistingSiteCardSelected)\n DiscountNotice()\n }\n }\n@@ -91,7 +91,7 @@ fun PurchaseDomainScreen(\n @Composable\n private fun DomainCards(\n onNewDomainCardSelected: () -> Unit,\n- onExistingDomainCardSelected: () -> Unit,\n+ onExistingSiteCardSelected: () -> Unit,\n modifier: Modifier = Modifier,\n ) {\n Box(modifier = modifier.padding(top = 24.dp)) {\n@@ -99,12 +99,12 @@ private fun DomainCards(\n if (isPortrait) {\n Column(verticalArrangement = arrangement) {\n NewDomainCard(onNewDomainCardSelected)\n- ExistingDomainCard(onExistingDomainCardSelected)\n+ ExistingSiteCard(onExistingSiteCardSelected)\n }\n } else {\n Row(horizontalArrangement = arrangement) {\n NewDomainCard(onNewDomainCardSelected, modifier = Modifier.weight(1f))\n- ExistingDomainCard(onExistingDomainCardSelected, modifier = Modifier.weight(1f))\n+ ExistingSiteCard(onExistingSiteCardSelected, modifier = Modifier.weight(1f))\n }\n }\n }\n@@ -163,8 +163,8 @@ private fun NewDomainCard(\n }\n \n @Composable\n-private fun ExistingDomainCard(\n- onExistingDomainCardSelected: () -> Unit,\n+private fun ExistingSiteCard(\n+ onExistingSiteCardSelected: () -> Unit,\n modifier: Modifier = Modifier\n ) {\n DomainOptionCard(\n@@ -172,7 +172,7 @@ private fun ExistingDomainCard(\n title = R.string.purchase_domain_screen_existing_domain_card_title,\n description = R.string.purchase_domain_screen_existing_domain_card_description,\n button = R.string.purchase_domain_screen_existing_domain_card_button,\n- onOptionSelected = onExistingDomainCardSelected,\n+ onOptionSelected = onExistingSiteCardSelected,\n modifier = modifier,\n )\n }\ndiff --git a/libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java\nindex 20bfd1f1b708..514c5c1df83d 100644\n--- a/libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java\n+++ b/libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java\n@@ -1079,7 +1079,7 @@ public enum Stat {\n MORE_MENU_ITEM_TAPPED,\n DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_SHOWN,\n DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_NEW_DOMAIN_TAPPED,\n- DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_EXISTING_DOMAIN_TAPPED,\n+ DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_EXISTING_SITE_TAPPED,\n DOMAIN_MANAGEMENT_SEARCH_FOR_A_DOMAIN_SCREEN_SHOWN,\n DOMAIN_MANAGEMENT_SEARCH_DOMAIN_TAPPED,\n DOMAIN_MANAGEMENT_TRANSFER_DOMAIN_TAPPED,\ndiff --git a/libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java b/libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java\nindex a0c4889ccb00..23fee7eb0bc7 100644\n--- a/libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java\n+++ b/libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java\n@@ -2643,8 +2643,8 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {\n return \"domain_management_purchase_domain_screen_shown\";\n case DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_NEW_DOMAIN_TAPPED:\n return \"domain_management_purchase_domain_screen_new_domain_tapped\";\n- case DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_EXISTING_DOMAIN_TAPPED:\n- return \"domain_management_purchase_domain_screen_existing_domain_tapped\";\n+ case DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_EXISTING_SITE_TAPPED:\n+ return \"domain_management_purchase_domain_screen_existing_site_tapped\";\n case DOMAIN_MANAGEMENT_SEARCH_FOR_A_DOMAIN_SCREEN_SHOWN:\n return \"domain_management_search_for_a_domain_screen_shown\";\n case DOMAIN_MANAGEMENT_SEARCH_DOMAIN_TAPPED:\n", "test_patch": "diff --git a/WordPress/src/test/java/org/wordpress/android/ui/domains/management/newdomainsearch/NewDomainSearchViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/domains/management/newdomainsearch/NewDomainSearchViewModelTest.kt\nindex 123966533a6d..6298a2ee56d5 100644\n--- a/WordPress/src/test/java/org/wordpress/android/ui/domains/management/newdomainsearch/NewDomainSearchViewModelTest.kt\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/domains/management/newdomainsearch/NewDomainSearchViewModelTest.kt\n@@ -53,17 +53,17 @@ class NewDomainSearchViewModelTest : BaseUnitTest() {\n \n @Test\n fun `WHEN a domain is tapped THEN send PurchaseDomain action event`() = testWithActionEvents { events ->\n- val domain = ProposedDomain(1, \"test.com\", \"1\", null)\n+ val domain = ProposedDomain(1, \"test.com\", \"1\", null, true)\n viewModel.onDomainTapped(domain)\n advanceUntilIdle()\n \n- val expectedEvent = ActionEvent.PurchaseDomain(domain)\n+ val expectedEvent = ActionEvent.PurchaseDomain(domain.productId, domain.domain, domain.supportsPrivacy)\n assertThat(events.last()).isEqualTo(expectedEvent)\n }\n \n @Test\n fun `WHEN a domain is tapped THEN track DOMAIN_MANAGEMENT_SEARCH_DOMAIN_TAPPED event`() = test {\n- val domain = ProposedDomain(1, \"test.com\", \"1\", null)\n+ val domain = ProposedDomain(1, \"test.com\", \"1\", null, true)\n viewModel.onDomainTapped(domain)\n advanceUntilIdle()\n \n@@ -149,7 +149,8 @@ class NewDomainSearchViewModelTest : BaseUnitTest() {\n productId = 0,\n domain = \"domain.com\",\n price = \"USD 100\",\n- salePrice = null\n+ salePrice = null,\n+ supportsPrivacy = true\n )\n )\n val result = DomainsResult.Success(domains)\ndiff --git a/WordPress/src/test/java/org/wordpress/android/ui/domains/management/newdomainsearch/domainsfetcher/NewDomainsSearchRepositoryTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/domains/management/newdomainsearch/domainsfetcher/NewDomainsSearchRepositoryTest.kt\nindex 7375e9080d3e..f2ecdee912b8 100644\n--- a/WordPress/src/test/java/org/wordpress/android/ui/domains/management/newdomainsearch/domainsfetcher/NewDomainsSearchRepositoryTest.kt\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/domains/management/newdomainsearch/domainsfetcher/NewDomainsSearchRepositoryTest.kt\n@@ -47,7 +47,8 @@ class NewDomainsSearchRepositoryTest : BaseUnitTest() {\n productId = 0,\n domain = \"example.com\",\n price = \"USD 50\",\n- salePrice = \"USD 10\"\n+ salePrice = \"USD 10\",\n+ supportsPrivacy = true\n )\n )\n )\n@@ -69,13 +70,15 @@ class NewDomainsSearchRepositoryTest : BaseUnitTest() {\n productId = 0,\n domain = \"example.com\",\n price = \"USD 50\",\n- salePrice = null\n+ salePrice = null,\n+ supportsPrivacy = true\n )\n )\n )\n )\n }\n \n+ @Suppress(\"LongMethod\")\n @Test\n fun `GIVEN few domains with different relevance WHEN searchForDomains THEN sort domains by descending by relevance`() =\n test {\n@@ -90,6 +93,7 @@ class NewDomainsSearchRepositoryTest : BaseUnitTest() {\n is_free = false\n relevance = 1f\n cost = \"USD 30\"\n+ supports_privacy = true\n },\n DomainSuggestionResponse().apply {\n product_id = 1\n@@ -97,6 +101,7 @@ class NewDomainsSearchRepositoryTest : BaseUnitTest() {\n is_free = false\n relevance = 2f\n cost = \"USD 40\"\n+ supports_privacy = true\n },\n DomainSuggestionResponse().apply {\n product_id = 2\n@@ -104,6 +109,7 @@ class NewDomainsSearchRepositoryTest : BaseUnitTest() {\n is_free = false\n relevance = 0f\n cost = \"USD 50\"\n+ supports_privacy = true\n },\n )\n )\n@@ -118,19 +124,21 @@ class NewDomainsSearchRepositoryTest : BaseUnitTest() {\n productId = 1,\n domain = \"second.com\",\n price = \"USD 40\",\n- salePrice = null\n+ salePrice = null,\n+ supportsPrivacy = true\n ),\n ProposedDomain(\n productId = 0,\n domain = \"first.com\",\n price = \"USD 30\",\n- salePrice = null\n+ salePrice = null,\n+ supportsPrivacy = true\n ),\n- ProposedDomain(\n- productId = 2,\n+ ProposedDomain(productId = 2,\n domain = \"third.com\",\n price = \"USD 50\",\n- salePrice = null\n+ salePrice = null,\n+ supportsPrivacy = true\n ),\n )\n )\n@@ -151,6 +159,7 @@ class NewDomainsSearchRepositoryTest : BaseUnitTest() {\n is_free = false\n relevance = 1f\n cost = \"USD 30\"\n+ supports_privacy = true\n },\n DomainSuggestionResponse().apply {\n product_id = 1\n@@ -158,6 +167,7 @@ class NewDomainsSearchRepositoryTest : BaseUnitTest() {\n is_free = false\n relevance = 2f\n cost = \"USD 40\"\n+ supports_privacy = true\n },\n DomainSuggestionResponse().apply {\n product_id = 2\n@@ -165,6 +175,7 @@ class NewDomainsSearchRepositoryTest : BaseUnitTest() {\n is_free = true\n relevance = 0f\n cost = \"USD 50\"\n+ supports_privacy = true\n },\n )\n )\n@@ -179,13 +190,15 @@ class NewDomainsSearchRepositoryTest : BaseUnitTest() {\n productId = 1,\n domain = \"second.com\",\n price = \"USD 40\",\n- salePrice = null\n+ salePrice = null,\n+ supportsPrivacy = true\n ),\n ProposedDomain(\n productId = 0,\n domain = \"first.com\",\n price = \"USD 30\",\n- salePrice = null\n+ salePrice = null,\n+ supportsPrivacy = true\n ),\n )\n )\n@@ -207,7 +220,8 @@ class NewDomainsSearchRepositoryTest : BaseUnitTest() {\n productId = 0,\n domain = \"example.com\",\n price = \"USD 50\",\n- salePrice = null\n+ salePrice = null,\n+ supportsPrivacy = true\n )\n )\n )\n@@ -251,7 +265,7 @@ class NewDomainsSearchRepositoryTest : BaseUnitTest() {\n private suspend fun mockProductWithSaleResponse(productId: Int = 0) {\n whenever(productsStore.fetchProducts(Constants.TYPE_DOMAINS_PRODUCT)).thenReturn(\n ProductsStore.OnProductsFetched(\n- products = listOf(Product(productId = productId, combinedSaleCostDisplay = \"USD 10\"))\n+ products = listOf(Product(productId = productId, combinedSaleCostDisplay = \"USD 10\",))\n )\n )\n }\n@@ -278,6 +292,7 @@ class NewDomainsSearchRepositoryTest : BaseUnitTest() {\n is_free = isFree\n relevance = 0f\n cost = \"USD 50\"\n+ supports_privacy = true\n }\n )\n )\ndiff --git a/WordPress/src/test/java/org/wordpress/android/ui/domains/management/purchasedomain/PurchaseDomainViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/domains/management/purchasedomain/PurchaseDomainViewModelTest.kt\nindex b375dbe69e84..2d66066b0e2f 100644\n--- a/WordPress/src/test/java/org/wordpress/android/ui/domains/management/purchasedomain/PurchaseDomainViewModelTest.kt\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/domains/management/purchasedomain/PurchaseDomainViewModelTest.kt\n@@ -11,19 +11,23 @@ import org.mockito.Mock\n import org.mockito.MockitoAnnotations\n import org.mockito.kotlin.verify\n import org.wordpress.android.BaseUnitTest\n-import org.wordpress.android.analytics.AnalyticsTracker.Stat.DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_EXISTING_DOMAIN_TAPPED\n+import org.wordpress.android.analytics.AnalyticsTracker.Stat.DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_EXISTING_SITE_TAPPED\n import org.wordpress.android.analytics.AnalyticsTracker.Stat.DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_NEW_DOMAIN_TAPPED\n import org.wordpress.android.analytics.AnalyticsTracker.Stat.DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_SHOWN\n import org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainViewModel.ActionEvent\n import org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainViewModel.ActionEvent.GoBack\n import org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainViewModel.ActionEvent.GoToDomainPurchasing\n-import org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainViewModel.ActionEvent.GoToExistingDomain\n+import org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainViewModel.ActionEvent.GoToExistingSite\n import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper\n \n @ExperimentalCoroutinesApi\n class PurchaseDomainViewModelTest : BaseUnitTest() {\n @Mock\n private lateinit var analyticsTracker: AnalyticsTrackerWrapper\n+ private val productId = 8\n+ private val domain = \"domain.com\"\n+ private val supportsPrivacy = true\n+\n private lateinit var viewModel: PurchaseDomainViewModel\n \n @Before\n@@ -31,7 +35,10 @@ class PurchaseDomainViewModelTest : BaseUnitTest() {\n MockitoAnnotations.openMocks(this)\n viewModel = PurchaseDomainViewModel(\n mainDispatcher = testDispatcher(),\n- analyticsTracker = analyticsTracker\n+ analyticsTracker = analyticsTracker,\n+ productId = productId,\n+ domain = domain,\n+ privacy = supportsPrivacy,\n )\n }\n \n@@ -49,8 +56,8 @@ class PurchaseDomainViewModelTest : BaseUnitTest() {\n @Test\n @Suppress(\"MaxLineLength\")\n fun `WHEN existing domain selected THEN track DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_EXISTING_DOMAIN_TAPPED event`() {\n- viewModel.onExistingDomainSelected()\n- verify(analyticsTracker).track(DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_EXISTING_DOMAIN_TAPPED)\n+ viewModel.onExistingSiteSelected()\n+ verify(analyticsTracker).track(DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_EXISTING_SITE_TAPPED)\n }\n \n @Test\n@@ -58,15 +65,15 @@ class PurchaseDomainViewModelTest : BaseUnitTest() {\n viewModel.onNewDomainSelected()\n advanceUntilIdle()\n \n- assertThat(events.last()).isEqualTo(GoToDomainPurchasing)\n+ assertThat(events.last()).isEqualTo(GoToDomainPurchasing(domain))\n }\n \n @Test\n- fun `WHEN existing domain selected THEN send GoToExistingDomain action event`() = testWithActionEvents { events ->\n- viewModel.onExistingDomainSelected()\n+ fun `WHEN existing site selected THEN send GoToExistingSite action event`() = testWithActionEvents { events ->\n+ viewModel.onExistingSiteSelected()\n advanceUntilIdle()\n \n- assertThat(events.last()).isEqualTo(GoToExistingDomain)\n+ assertThat(events.last()).isEqualTo(GoToExistingSite(domain))\n }\n \n @Test\n", "n2p_tests": {"org.wordpress.android.ui.domains.management.newdomainsearch.NewDomainSearchViewModelTest.WHEN back button pressed THEN send GoBack action event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.NewDomainSearchViewModelTest.WHEN a domain is tapped THEN send PurchaseDomain action event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainViewModelTest.WHEN back button pressed THEN send GoBack action event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainViewModelTest.WHEN new domain selected THEN send GoToDomainPurchasing action event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.domainsfetcher.NewDomainsSearchRepositoryTest.GIVEN successfully fetched products with sale price available and suggestions WHEN searchForDomains THEN return DomainsResult Success with suggestions": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.NewDomainSearchViewModelTest.GIVEN repeated queries with redundant blank symbols WHEN onSearchQueryChanged THEN fetch domains only once": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.NewDomainSearchViewModelTest.WHEN a domain is tapped THEN track DOMAIN_MANAGEMENT_SEARCH_DOMAIN_TAPPED event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.NewDomainSearchViewModelTest.GIVEN error search for domain result WHEN onSearchQueryChanged THEN emit error UI state": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.NewDomainSearchViewModelTest.WHEN transfer domain button pressed THEN track DOMAIN_MANAGEMENT_TRANSFER_DOMAIN_TAPPED event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainViewModelTest.WHEN ViewModel initialized THEN track DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_SHOWN event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.domainsfetcher.NewDomainsSearchRepositoryTest.GIVEN few domains with different relevance WHEN searchForDomains THEN sort domains by descending by relevance": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.NewDomainSearchViewModelTest.GIVEN few queries requested within 250 ms query delay WHEN onSearchQueryChanged THEN search for domains with the last query only": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainViewModelTest.WHEN new domain selected THEN track DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_NEW_DOMAIN_TAPPED event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.domainsfetcher.NewDomainsSearchRepositoryTest.GIVEN product with sale does not appear in domains fetch response WHEN searchForDomains THEN return DomainsResult Success with suggestions with no sale": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.domainsfetcher.NewDomainsSearchRepositoryTest.GIVEN product fetch with error and suggestions with error WHEN searchForDomains THEN return DomainsResult Error": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.domainsfetcher.NewDomainsSearchRepositoryTest.GIVEN product fetch with error and successful suggestions response WHEN searchForDomains THEN return DomainsResult Success with suggestions with no sale": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.domainsfetcher.NewDomainsSearchRepositoryTest.GIVEN event query is not equal to onDomainSuggestionFetched query argument WHEN searchForDomains THEN return error": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.NewDomainSearchViewModelTest.WHEN transfer domain button pressed THEN send TransferDomain action event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.domainsfetcher.NewDomainsSearchRepositoryTest.GIVEN two search calls WHEN searchForDomains THEN fetch products only once": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainViewModelTest.WHEN existing domain selected THEN track DOMAIN_MANAGEMENT_PURCHASE_DOMAIN_SCREEN_EXISTING_DOMAIN_TAPPED event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.NewDomainSearchViewModelTest.WHEN ViewModel initialized THEN track DOMAIN_MANAGEMENT_SEARCH_FOR_A_DOMAIN_SCREEN_SHOWN event": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.domainsfetcher.NewDomainsSearchRepositoryTest.GIVEN few domains with a free domain WHEN searchForDomains THEN filter out free domains": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.NewDomainSearchViewModelTest.GIVEN successful search for domain result WHEN onSearchQueryChanged THEN emit populated domains UI state": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.NewDomainSearchViewModelTest.GIVEN blank and empty queries WHEN onSearchQueryChanged THEN do not fetch domains": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.newdomainsearch.NewDomainSearchViewModelTest.GIVEN few queries requested outside 250 ms delay WHEN onSearchQueryChanged THEN search for domains with all the queries": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.domains.management.purchasedomain.PurchaseDomainViewModelTest.WHEN existing site selected THEN send GoToExistingSite action event": {"run": "NONE", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "wordpress-mobile__WordPress-Android-19524", "org": "wordpress-mobile", "repo": "WordPress-Android", "number": 19524, "state": "closed", "title": "Fix Null Pointer Exception on getSelectedSite ", "body": "Fixes #19520 \r\nSentry [JETPACK-ANDROID-E2J](https://a8c.sentry.io/issues/4592008344/?referrer=github_integration)\r\n\r\nThis PR prevents a crash when siteRepository.getSelectedSite returns a null. If there is no site, we can continue.\r\nNote: I could not reproduce this crash, so this a preventative measure\r\n\r\n**To test:**\r\n- Install the app\r\n- Login and select a site\r\n- Navigate to My Site > More\r\n- \u2705 Verify the more menu is shown\r\n- Navigate around to different options and verify that the menu continues to respond\r\n\r\n \r\n## Regression Notes\r\n1. Potential unintended areas of impact\r\nThe app crashes when the more menu is accessed\r\n\r\n2. What I did to test those areas of impact (or what existing automated tests I relied on)\r\nAdded a test to `MenuViewModelTest`\r\n\r\n3. What automated tests I added (or what prevented me from doing so) N/A\r\n\r\nPR submission checklist:\r\n- [X] I have completed the Regression Notes.\r\n- [X] I have considered adding accessibility improvements for my changes.\r\n- [X] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.\r\n\r\nUI Changes testing checklist: N/A\r\n\r\n", "base": {"label": "wordpress-mobile:release/23.6", "ref": "release/23.6", "sha": "e265e8d9e6027ba36f26773486c46f652dfcc0fc"}, "resolved_issues": [{"number": 19520, "title": "NullPointerException", "body": "Sentry Issue: [JETPACK-ANDROID-E2J](https://a8c.sentry.io/issues/4592008344/?referrer=github_integration)\n\n```\nNullPointerException: None\n at org.wordpress.android.ui.mysite.menu.MenuViewModel.start(MenuViewModel.kt:89)\n at org.wordpress.android.ui.mysite.menu.MenuActivity$onCreate$1$1$2.invoke(MenuActivity.kt:99)\n at org.wordpress.android.ui.mysite.menu.MenuActivity$onCreate$1$1$2.invoke(MenuActivity.kt:99)\n at org.wordpress.android.ui.mysite.menu.MenuActivity$onCreate$1$1$2.invoke(MenuActivity.kt:98)\n at androidx.compose.runtime.internal.ComposableLambdaImpl.invoke(ComposableLambda.jvm.kt:108)\n...\n(168 additional frame(s) were not displayed)\n```"}], "lang": "kotlin", "problem_statement": "NullPointerException\nSentry Issue: [JETPACK-ANDROID-E2J](https://a8c.sentry.io/issues/4592008344/?referrer=github_integration)\n\n```\nNullPointerException: None\n at org.wordpress.android.ui.mysite.menu.MenuViewModel.start(MenuViewModel.kt:89)\n at org.wordpress.android.ui.mysite.menu.MenuActivity$onCreate$1$1$2.invoke(MenuActivity.kt:99)\n at org.wordpress.android.ui.mysite.menu.MenuActivity$onCreate$1$1$2.invoke(MenuActivity.kt:99)\n at org.wordpress.android.ui.mysite.menu.MenuActivity$onCreate$1$1$2.invoke(MenuActivity.kt:98)\n at androidx.compose.runtime.internal.ComposableLambdaImpl.invoke(ComposableLambda.jvm.kt:108)\n...\n(168 additional frame(s) were not displayed)\n```\n", "hints": "From logs, I can say the crash is related to https://github.com/wordpress-mobile/WordPress-Android/pull/19244", "pull_url": "https://github.com/wordpress-mobile/WordPress-Android/pull/19524", "issue_urls": ["https://github.com/wordpress-mobile/WordPress-Android/issues/19520"], "test_command": "./gradlew :WordPress:testWordpressVanillaDebugUnitTest --tests \"org.wordpress.android.ui.mysite.menu.MenuViewModelTest\"", "fix_patch": "diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuActivity.kt\nindex 00b4f5e1a0d0..cf26a9e7c87c 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuActivity.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuActivity.kt\n@@ -107,6 +107,7 @@ class MenuActivity : AppCompatActivity() {\n viewModel.navigation.observe(this) { handleNavigationAction(it.getContentIfNotHandled()) }\n viewModel.onSnackbarMessage.observe(this) { showSnackbar(it.getContentIfNotHandled()) }\n viewModel.onQuickStartMySitePrompts.observe(this) { handleActiveTutorialPrompt(it.getContentIfNotHandled()) }\n+ viewModel.onSelectedSiteMissing.observe(this) { finish() }\n \n // Set the Compose callback for SnackbarSequencer\n snackbarSequencer.setComposeSnackbarCallback { item ->\ndiff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuViewModel.kt\nindex 68ddc709d560..72bd0607643f 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuViewModel.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuViewModel.kt\n@@ -75,6 +75,10 @@ class MenuViewModel @Inject constructor(\n private val _snackbar = MutableSharedFlow()\n val snackBar = _snackbar.asSharedFlow()\n \n+\n+ private val _onSelectedSiteMissing = MutableLiveData()\n+ val onSelectedSiteMissing = _onSelectedSiteMissing as LiveData\n+\n private var quickStartEvent: QuickStartEvent? = null\n private var isStarted = false\n \n@@ -86,7 +90,13 @@ class MenuViewModel @Inject constructor(\n if (isStarted) {\n return\n }\n- val site = selectedSiteRepository.getSelectedSite()!!\n+\n+ val site = selectedSiteRepository.getSelectedSite()\n+ if (site == null) {\n+ _onSelectedSiteMissing.value = Unit\n+ return\n+ }\n+\n this.quickStartEvent = quickStartEvent\n if (quickStartEvent != null) {\n quickStartRepository.setActiveTask(quickStartEvent.task, true)\n", "test_patch": "diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/menu/MenuViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/menu/MenuViewModelTest.kt\nindex 7889c673f1b3..8a0f8f58fdb1 100644\n--- a/WordPress/src/test/java/org/wordpress/android/ui/mysite/menu/MenuViewModelTest.kt\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/menu/MenuViewModelTest.kt\n@@ -165,6 +165,20 @@ class MenuViewModelTest : BaseUnitTest() {\n }\n }\n \n+ @Test\n+ fun `given vm start, when selected site is null, then site is missing event is raised`() = test {\n+ whenever(selectedSiteRepository.getSelectedSite()).thenReturn(null)\n+\n+ val observer = mutableListOf()\n+ viewModel.onSelectedSiteMissing.observeForever { event ->\n+ observer.add(event)\n+ }\n+\n+ viewModel.start()\n+\n+ assert(observer.isNotEmpty())\n+ }\n+\n private fun findBackupListItem(items: List) =\n items.filterIsInstance(MenuItemState.MenuListItem::class.java)\n .firstOrNull { it.listItemAction == ListItemAction.BACKUP }\n", "n2p_tests": {"org.wordpress.android.ui.mysite.menu.MenuViewModelTest.given vm start, when jetpack capabilities includes scan, then scan menu item is visible": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.menu.MenuViewModelTest.when vm, when init, then uiState should contain empty list": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.menu.MenuViewModelTest.given vm start, when jetpack capabilities excludes backup, then backup menu item is NOT visible": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.menu.MenuViewModelTest.given vm start, when jetpack capabilities excludes scan, then scan menu item is NOT visible": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.menu.MenuViewModelTest.given vm start, when selected site is null, then site is missing event is raised": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.menu.MenuViewModelTest.given vm, when started, then list contains list of items": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.mysite.menu.MenuViewModelTest.given vm start, when jetpack capabilities includes backup, then backup menu item is visible": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "wordpress-mobile__WordPress-Android-20074", "org": "wordpress-mobile", "repo": "WordPress-Android", "number": 20074, "state": "closed", "title": "Stats Traffic: Today card", "body": "Fixes #19950 \r\n\r\n-----\r\n\r\n\r\n\r\n\r\n## To Test:\r\nTest 1:\r\n- Enable `stats_traffic_tab` feature flag (Me -> Debug settings - Remote Features)\r\n- Go to Stats\r\n- `Verify` only Traffic tab, and Insights tabs are shown as in after column \r\n- `Switch` to Traffic tab if not on it already\r\n- `Verify` that Today card is shown in the image above\r\n> [!NOTE] \r\n> Traffic tab is set to show Days tab for the time being since except for the first card with graph, the rest of the cards remain same.\r\n> Card is not hooked up to the Spinner or Date. Waiting for that.\r\n> Styling may need update later on\r\n\r\nTest 2:\r\n\r\n- Disable feature flag\r\n- `Verify` Stats tabs all show up as in before column, and work as before\r\n-----\r\n\r\n## Regression Notes\r\n\r\n1. Potential unintended areas of impact\r\n\r\n - Tested various combinations\r\n\r\n2. What I did to test those areas of impact (or what existing automated tests I relied on)\r\n\r\n - Tested manually\r\n\r\n3. What automated tests I added (or what prevented me from doing so)\r\n\r\n - Existing unit tests\r\n\r\n-----\r\n\r\n## PR Submission Checklist:\r\n\r\n- [x] I have completed the Regression Notes.\r\n- [x] I have considered adding accessibility improvements for my changes.\r\n- [x] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.\r\n\r\n-----\r\n\r\n## UI Changes Testing Checklist:\r\n\r\n- [ ] Portrait and landscape orientations.\r\n- [x] Light and dark modes.\r\n- [ ] Fonts: Larger, smaller and bold text.\r\n- [ ] High contrast.\r\n- [ ] Talkback.\r\n- [ ] Languages with large words or with letters/accents not frequently used in English.\r\n- [ ] Right-to-left languages. (Even if translation isn\u2019t complete, formatting should still respect the right-to-left layout)\r\n- [ ] Large and small screen sizes. (Tablet and smaller phones)\r\n- [ ] Multi-tasking: Split screen and Pop-up view. (Android 10 or higher)\r\n", "base": {"label": "wordpress-mobile:trunk", "ref": "trunk", "sha": "e0e84ab29aea3d6907639543761f6dab40152aae"}, "resolved_issues": [{"number": 19950, "title": "Stats Traffic: By day card (Today card)", "body": "Refer to #19973, to reuse the card in this when date picker strip is ready \n\nParent: https://github.com/wordpress-mobile/jetpack-issue-repo/issues/1\n![Image](https://github.com/wordpress-mobile/WordPress-iOS/assets/4062343/a00e6335-235a-4067-9bed-af657c1c9b83)"}], "lang": "kotlin", "problem_statement": "Stats Traffic: By day card (Today card)\nRefer to #19973, to reuse the card in this when date picker strip is ready \n\nParent: https://github.com/wordpress-mobile/jetpack-issue-repo/issues/1\n![Image](https://github.com/wordpress-mobile/WordPress-iOS/assets/4062343/a00e6335-235a-4067-9bed-af657c1c9b83)\n", "pull_url": "https://github.com/wordpress-mobile/WordPress-Android/pull/20074", "issue_urls": ["https://github.com/wordpress-mobile/WordPress-Android/issues/19950"], "test_command": "./gradlew :WordPress:testWordpressVanillaDebugUnitTest --tests \"org.wordpress.android.ui.stats.refresh.lists.sections.granular.usecases.OverviewUseCaseTest\"", "fix_patch": "diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCase.kt\nindex 46d2a1ce3a39..ef7b192d6ba7 100644\n--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCase.kt\n+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCase.kt\n@@ -14,6 +14,8 @@ import org.wordpress.android.modules.BG_THREAD\n import org.wordpress.android.modules.UI_THREAD\n import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase\n import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem\n+import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.QuickScanItem\n+import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.QuickScanItem.Column\n import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ValueItem\n import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularUseCaseFactory\n import org.wordpress.android.ui.stats.refresh.lists.sections.granular.SelectedDateProvider\n@@ -21,12 +23,14 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.granular.usecases.O\n import org.wordpress.android.ui.stats.refresh.lists.widget.WidgetUpdater.StatsWidgetUpdaters\n import org.wordpress.android.ui.stats.refresh.utils.StatsDateFormatter\n import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider\n+import org.wordpress.android.ui.stats.refresh.utils.StatsUtils\n import org.wordpress.android.ui.stats.refresh.utils.toStatsSection\n import org.wordpress.android.ui.stats.refresh.utils.trackGranular\n import org.wordpress.android.util.AppLog\n import org.wordpress.android.util.AppLog.T\n import org.wordpress.android.util.LocaleManagerWrapper\n import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper\n+import org.wordpress.android.util.config.StatsTrafficTabFeatureConfig\n import org.wordpress.android.viewmodel.ResourceProvider\n import java.util.Calendar\n import javax.inject.Inject\n@@ -48,7 +52,9 @@ class OverviewUseCase constructor(\n private val analyticsTracker: AnalyticsTrackerWrapper,\n private val statsWidgetUpdaters: StatsWidgetUpdaters,\n private val localeManagerWrapper: LocaleManagerWrapper,\n- private val resourceProvider: ResourceProvider\n+ private val resourceProvider: ResourceProvider,\n+ private val statsUtils: StatsUtils,\n+ private val trafficTabFeatureConfig: StatsTrafficTabFeatureConfig\n ) : BaseStatsUseCase(\n OVERVIEW,\n mainDispatcher,\n@@ -144,6 +150,120 @@ class OverviewUseCase constructor(\n domainModel: VisitsAndViewsModel,\n uiState: UiState\n ): List {\n+ return if (trafficTabFeatureConfig.isEnabled()) {\n+ buildTrafficOverview(domainModel, uiState)\n+ } else {\n+ buildGranularOverview(domainModel, uiState)\n+ }\n+ }\n+\n+ private fun buildTrafficOverview(domainModel: VisitsAndViewsModel, uiState: UiState): List {\n+ val items = mutableListOf()\n+ if (domainModel.dates.isNotEmpty()) {\n+ val dateFromProvider = selectedDateProvider.getSelectedDate(statsGranularity)\n+ val visibleBarCount = uiState.visibleBarCount ?: domainModel.dates.size\n+ val availableDates = domainModel.dates.map {\n+ statsDateFormatter.parseStatsDate(\n+ statsGranularity,\n+ it.period\n+ )\n+ }\n+ val selectedDate = dateFromProvider ?: availableDates.last()\n+ val index = availableDates.indexOf(selectedDate)\n+\n+ selectedDateProvider.selectDate(\n+ selectedDate,\n+ availableDates.takeLast(visibleBarCount),\n+ statsGranularity\n+ )\n+ val selectedItem = domainModel.dates.getOrNull(index) ?: domainModel.dates.last()\n+ val previousItem = domainModel.dates.getOrNull(domainModel.dates.indexOf(selectedItem) - 1)\n+\n+ if (statsGranularity == StatsGranularity.DAYS) {\n+ buildTodayCard(selectedItem,items)\n+ } else {\n+ buildGranularChart(domainModel, uiState, items, selectedItem, previousItem)\n+ }\n+ } else {\n+ selectedDateProvider.onDateLoadingFailed(statsGranularity)\n+ AppLog.e(T.STATS, \"There is no data to be shown in the overview block\")\n+ }\n+ return items\n+ }\n+\n+ private fun buildTodayCard(\n+ selectedItem: VisitsAndViewsModel.PeriodData?,\n+ items: MutableList\n+ ) {\n+ val views = selectedItem?.views ?: 0\n+ val visitors = selectedItem?.visitors ?: 0\n+ val likes = selectedItem?.likes ?: 0\n+ val comments = selectedItem?.comments ?: 0\n+\n+ items.add(BlockListItem.Title(R.string.stats_timeframe_today))\n+ items.add(\n+ QuickScanItem(\n+ Column(\n+ R.string.stats_views,\n+ statsUtils.toFormattedString(views)\n+ ),\n+ Column(\n+ R.string.stats_visitors,\n+ statsUtils.toFormattedString(visitors)\n+ )\n+ )\n+ )\n+\n+ items.add(\n+ QuickScanItem(\n+ Column(\n+ R.string.stats_likes,\n+ statsUtils.toFormattedString(likes)\n+ ),\n+ Column(\n+ R.string.stats_comments,\n+ statsUtils.toFormattedString(comments)\n+ )\n+ )\n+ )\n+ }\n+\n+ private fun buildGranularChart(\n+ domainModel: VisitsAndViewsModel,\n+ uiState: UiState,\n+ items: MutableList,\n+ selectedItem: VisitsAndViewsModel.PeriodData,\n+ previousItem: VisitsAndViewsModel.PeriodData?\n+ ) {\n+ items.add(\n+ overviewMapper.buildTitle(\n+ selectedItem,\n+ previousItem,\n+ uiState.selectedPosition,\n+ isLast = selectedItem == domainModel.dates.last(),\n+ statsGranularity = statsGranularity\n+ )\n+ )\n+ items.addAll(\n+ overviewMapper.buildChart(\n+ domainModel.dates,\n+ statsGranularity,\n+ this::onBarSelected,\n+ this::onBarChartDrawn,\n+ uiState.selectedPosition,\n+ selectedItem.period\n+ )\n+ )\n+ items.add(\n+ overviewMapper.buildColumns(\n+ selectedItem,\n+ this::onColumnSelected,\n+ uiState.selectedPosition\n+ )\n+ )\n+ }\n+\n+ private fun buildGranularOverview(domainModel: VisitsAndViewsModel, uiState: UiState): List {\n val items = mutableListOf()\n if (domainModel.dates.isNotEmpty()) {\n val dateFromProvider = selectedDateProvider.getSelectedDate(statsGranularity)\n@@ -237,7 +357,9 @@ class OverviewUseCase constructor(\n private val analyticsTracker: AnalyticsTrackerWrapper,\n private val statsWidgetUpdaters: StatsWidgetUpdaters,\n private val localeManagerWrapper: LocaleManagerWrapper,\n- private val resourceProvider: ResourceProvider\n+ private val resourceProvider: ResourceProvider,\n+ private val statsUtils: StatsUtils,\n+ private val trafficTabFeatureConfig: StatsTrafficTabFeatureConfig\n ) : GranularUseCaseFactory {\n override fun build(granularity: StatsGranularity, useCaseMode: UseCaseMode) =\n OverviewUseCase(\n@@ -252,7 +374,9 @@ class OverviewUseCase constructor(\n analyticsTracker,\n statsWidgetUpdaters,\n localeManagerWrapper,\n- resourceProvider\n+ resourceProvider,\n+ statsUtils,\n+ trafficTabFeatureConfig\n )\n }\n }\n", "test_patch": "diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCaseTest.kt\nindex 3757b6c82b41..d0206175cee8 100644\n--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCaseTest.kt\n+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCaseTest.kt\n@@ -35,8 +35,10 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.granular.SelectedDa\n import org.wordpress.android.ui.stats.refresh.lists.widget.WidgetUpdater.StatsWidgetUpdaters\n import org.wordpress.android.ui.stats.refresh.utils.StatsDateFormatter\n import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider\n+import org.wordpress.android.ui.stats.refresh.utils.StatsUtils\n import org.wordpress.android.util.LocaleManagerWrapper\n import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper\n+import org.wordpress.android.util.config.StatsTrafficTabFeatureConfig\n import org.wordpress.android.viewmodel.ResourceProvider\n import java.util.Calendar\n \n@@ -77,6 +79,13 @@ class OverviewUseCaseTest : BaseUnitTest() {\n \n @Mock\n lateinit var localeManagerWrapper: LocaleManagerWrapper\n+\n+ @Mock\n+ lateinit var statsUtils: StatsUtils\n+\n+ @Mock\n+ lateinit var trafficTabFeatureConfig: StatsTrafficTabFeatureConfig\n+\n private lateinit var useCase: OverviewUseCase\n private val site = SiteModel()\n private val siteId = 1L\n@@ -100,7 +109,9 @@ class OverviewUseCaseTest : BaseUnitTest() {\n analyticsTrackerWrapper,\n statsWidgetUpdaters,\n localeManagerWrapper,\n- resourceProvider\n+ resourceProvider,\n+ statsUtils,\n+ trafficTabFeatureConfig\n )\n site.siteId = siteId\n whenever(statsSiteProvider.siteModel).thenReturn(site)\n", "n2p_tests": {"org.wordpress.android.ui.stats.refresh.lists.sections.granular.usecases.OverviewUseCaseTest.maps domain model to UI model": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.stats.refresh.lists.sections.granular.usecases.OverviewUseCaseTest.does not track incorrect data when the last stats item is less than 2 days old": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.stats.refresh.lists.sections.granular.usecases.OverviewUseCaseTest.maps error item to UI model": {"run": "PASS", "test": "NONE", "fix": "PASS"}, "org.wordpress.android.ui.stats.refresh.lists.sections.granular.usecases.OverviewUseCaseTest.tracks incorrect data when the last stats item is at least 2 days old": {"run": "PASS", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "NMF-earth__nmf-app-424", "org": "NMF-earth", "repo": "nmf-app", "number": 424, "state": "closed", "title": "chore: upgrade to Expo SDK 55", "body": "\r\n\r\n\r\n\r\n\u2705 I have read the [contributing file](https://github.com/NMF-earth/nmf-app/blob/main/contributing.md)\r\n\r\n## Summary\r\n\r\nFixes #420\r\n\r\n\r\n## Changelog\r\n\r\n- Upgrade expo to ^55.0.0, react to 19.2.0, react-native to 0.83.2\r\n- Enable React Compiler (experiments.reactCompiler: true)\r\n- Remove redundant config: newArchEnabled, jsEngine (both are defaults)\r\n- Remove implicit deps: @babel/core, babel-preset-expo, expo-constants\r\n- Replace legacy sentry-expo hook with @sentry/react-native/expo plugin\r\n- Add required config plugins: datetimepicker, sentry, expo-sharing\r\n- Update safe deps: moment, react-native-collapsible, eslint-plugin-react, eslint-plugin-import, @types/react-native-vector-icons, @types/webpack-env\r\n\r\n## Demo\r\n\r\nBased on brief local run ios seems to work as expected. No demo video if need i can add\r\n", "base": {"label": "NMF-earth:main", "ref": "main", "sha": "47d489a3da2e23930c3462a692e4fa5500b80336"}, "resolved_issues": [{"number": 420, "title": "Update to Expo SDK 55", "body": "#### Summary\nExpo SDK 55 is available in Bete https://expo.dev/changelog/sdk-55-beta\nand soon will have stable release. Till then we will have this logged.\n\n\n"}], "lang": "typescript", "problem_statement": "Update to Expo SDK 55\n#### Summary\nExpo SDK 55 is available in Bete https://expo.dev/changelog/sdk-55-beta\nand soon will have stable release. Till then we will have this logged.\n\n\n\n", "hints": "\n@PierreBresson before we do this it will be nice to have a build pushed to sentry with current stable master so that when we do a release of SDK 55 we can compare the gains vs SDK 54\n\nmay need some setup as per https://docs.sentry.io/platforms/react-native/size-analysis/\nSounds like a good plan. New build is being reviewed by google/apple :)\n@PierreBresson to get the size analysis it seems like we need to follow this \nhttps://docs.sentry.io/platforms/react-native/size-analysis/#uploading-ios-builds-with-the-sentry-cli\nand manually push the build from you machine using the cli\nv0.11.0 is released\n> [@PierreBresson](https://github.com/PierreBresson) to get the size analysis it seems like we need to follow this https://docs.sentry.io/platforms/react-native/size-analysis/#uploading-ios-builds-with-the-sentry-cli and manually push the build from you machine using the cli\n\n@PierreBresson thanks downloaded the updated app. tab bar with liquid glass is looking great.\n\nare you able to push the build to sentry as per the doc above?\n\n\nYes, I've just pushed the build :)\ncool just saw 55 is out https://expo.dev/changelog/sdk-55\nwill push a pr soon ", "pull_url": "https://github.com/NMF-earth/nmf-app/pull/424", "issue_urls": ["https://github.com/NMF-earth/nmf-app/issues/420"], "test_command": "NODE_OPTIONS='--experimental-vm-modules --max-old-space-size=4096' npx --no-install jest app/components/NoEmission/__tests__/NoEmissions.test.tsx --passWithNoTests 2>&1", "fix_patch": "diff --git a/app.config.js b/app.config.js\nindex 6dedbe7b..c119b43b 100644\n--- a/app.config.js\n+++ b/app.config.js\n@@ -17,9 +17,14 @@ module.exports = () => {\n \"microphonePermission\": \"Allow $(PRODUCT_NAME) to access your microphone\",\n \"recordAudioAndroid\": true\n }\n- ]\n+ ],\n+ \"@react-native-community/datetimepicker\",\n+ [\"@sentry/react-native/expo\", {\n+ \"organization\": process.env.SENTRY_ORG || \"nmf\",\n+ \"project\": process.env.SENTRY_PROJECT || \"nmf-earth\",\n+ }],\n+ \"expo-sharing\"\n ],\n- newArchEnabled: true,\n slug: \"not-my-fault-earth\",\n privacy: \"public\",\n platforms: [\"ios\", \"android\"],\n@@ -34,7 +39,6 @@ module.exports = () => {\n fallbackToCacheTimeout: 0,\n },\n assetBundlePatterns: [\"**/*\"],\n- jsEngine: \"hermes\",\n ios: {\n icon: \"./assets/images/ios.icon.png\",\n bundleIdentifier: \"nmf.earth\",\n@@ -46,21 +50,14 @@ module.exports = () => {\n package: \"nmf.earth\",\n versionCode: buildNumber,\n },\n- hooks: {\n- postPublish: [\n- {\n- file: \"sentry-expo/upload-sourcemaps\",\n- config: {\n- organization: \"nmf\",\n- project: \"nmf-earth\",\n- },\n- },\n- ],\n- },\n+\n extra: {\n eas: {\n projectId: \"9e1873d6-966a-49a3-83bc-10254ac6fb27\"\n }\n+ },\n+ experiments: {\n+ reactCompiler: true\n }\n };\n };\ndiff --git a/app/components/NoEmission/NoEmission.tsx b/app/components/NoEmission/NoEmission.tsx\nindex 24d5db47..89407a32 100644\n--- a/app/components/NoEmission/NoEmission.tsx\n+++ b/app/components/NoEmission/NoEmission.tsx\n@@ -4,6 +4,7 @@ import { useNavigation } from \"@react-navigation/native\";\n \n import { t } from \"utils\";\n import { navigate } from \"navigation\";\n+import { useTabBarBottomPadding } from \"hooks/useTabBarBottomPadding\";\n \n import Text from \"../Text\";\n import StickersImage from \"../StickersImage\";\n@@ -13,9 +14,14 @@ import styles from \"./NoEmission.styles\";\n const NoEmission: React.FC = () => {\n const navigation = useNavigation();\n const navigator = navigate(navigation);\n+ const bottomPadding = useTabBarBottomPadding();\n \n return (\n- \n+ \n \n \n {t(\"NO_EMISSION_COMPONENT_TITLE\")}\ndiff --git a/package.json b/package.json\nindex 3f5e56da..8515d364 100644\n--- a/package.json\n+++ b/package.json\n@@ -29,8 +29,8 @@\n \"@expo/vector-icons\": \"^15.0.3\",\n \"@native-html/render\": \"^1.0.0-alpha.0\",\n \"@react-native-async-storage/async-storage\": \"2.2.0\",\n- \"@react-native-community/datetimepicker\": \"8.4.4\",\n- \"@react-native-community/slider\": \"5.0.1\",\n+ \"@react-native-community/datetimepicker\": \"8.6.0\",\n+ \"@react-native-community/slider\": \"5.1.2\",\n \"@react-native-masked-view/masked-view\": \"0.3.2\",\n \"@react-navigation/bottom-tabs\": \"^7.8.12\",\n \"@react-navigation/material-top-tabs\": \"^7.4.10\",\n@@ -38,45 +38,45 @@\n \"@react-navigation/native-stack\": \"^7.2.0\",\n \"@react-navigation/stack\": \"^7.6.12\",\n \"@reduxjs/toolkit\": \"1.8.6\",\n- \"@sentry/react-native\": \"~7.2.0\",\n+ \"@sentry/react-native\": \"~7.11.0\",\n \"babel-plugin-module-resolver\": \"^5.0.2\",\n \"carbon-footprint\": \"1.6.0\",\n- \"expo\": \"~54.0.29\",\n- \"expo-application\": \"~7.0.8\",\n- \"expo-asset\": \"~12.0.11\",\n- \"expo-camera\": \"~17.0.10\",\n- \"expo-constants\": \"~18.0.12\",\n- \"expo-device\": \"~8.0.10\",\n- \"expo-document-picker\": \"~14.0.8\",\n- \"expo-file-system\": \"~19.0.21\",\n- \"expo-font\": \"~14.0.10\",\n- \"expo-linking\": \"~8.0.10\",\n- \"expo-localization\": \"~17.0.8\",\n- \"expo-notifications\": \"~0.32.15\",\n- \"expo-sharing\": \"~14.0.8\",\n- \"expo-status-bar\": \"~3.0.9\",\n- \"expo-store-review\": \"~9.0.9\",\n- \"expo-updates\": \"~29.0.15\",\n- \"expo-web-browser\": \"~15.0.10\",\n+ \"expo\": \"^55.0.0\",\n+ \"expo-application\": \"~55.0.8\",\n+ \"expo-asset\": \"~55.0.8\",\n+ \"expo-camera\": \"~55.0.9\",\n+ \"expo-device\": \"~55.0.9\",\n+ \"expo-document-picker\": \"~55.0.8\",\n+ \"expo-file-system\": \"~55.0.10\",\n+ \"expo-font\": \"~55.0.4\",\n+ \"expo-linking\": \"~55.0.7\",\n+ \"expo-localization\": \"~55.0.8\",\n+ \"expo-notifications\": \"~55.0.10\",\n+ \"expo-sharing\": \"~55.0.11\",\n+ \"expo-status-bar\": \"~55.0.4\",\n+ \"expo-store-review\": \"~55.0.8\",\n+ \"expo-updates\": \"~55.0.12\",\n+ \"expo-web-browser\": \"~55.0.9\",\n \"i18n-js\": \"3.5.1\",\n \"lodash.throttle\": \"4.1.1\",\n- \"moment\": \"2.24.0\",\n+ \"moment\": \"2.30.1\",\n \"ramda\": \"0.27.0\",\n- \"react\": \"19.1.0\",\n- \"react-dom\": \"19.1.0\",\n- \"react-native\": \"0.81.5\",\n- \"react-native-collapsible\": \"1.5.2\",\n- \"react-native-gesture-handler\": \"~2.28.0\",\n+ \"react\": \"19.2.0\",\n+ \"react-dom\": \"19.2.0\",\n+ \"react-native\": \"0.83.2\",\n+ \"react-native-collapsible\": \"1.6.2\",\n+ \"react-native-gesture-handler\": \"~2.30.0\",\n \"react-native-globalize\": \"4.5.1\",\n \"react-native-keyboard-aware-scroll-view\": \"0.9.5\",\n \"react-native-modal-datetime-picker\": \"14.0.1\",\n- \"react-native-pager-view\": \"6.9.1\",\n+ \"react-native-pager-view\": \"8.0.0\",\n \"react-native-progress\": \"5.0.1\",\n- \"react-native-reanimated\": \"~4.1.1\",\n+ \"react-native-reanimated\": \"4.2.1\",\n+ \"react-native-render-html\": \"^6.3.4\",\n \"react-native-safe-area-context\": \"~5.6.0\",\n- \"react-native-screens\": \"4.19.0\",\n- \"react-native-svg\": \"15.12.1\",\n- \"react-native-worklets\": \"0.5.1\",\n+ \"react-native-screens\": \"~4.23.0\",\n+ \"react-native-svg\": \"15.15.3\",\n+ \"react-native-worklets\": \"0.7.2\",\n \"react-redux\": \"8.0.4\",\n \"redux\": \"4.2.0\",\n \"redux-persist\": \"6.0.0\",\n@@ -84,34 +84,32 @@\n \"uuid\": \"3.4.0\"\n },\n \"devDependencies\": {\n- \"@babel/core\": \"7.26.0\",\n \"@testing-library/react-native\": \"14.0.0-alpha.1\",\n \"@types/i18n-js\": \"3.0.2\",\n \"@types/jest\": \"29.5.14\",\n \"@types/node\": \"18.11.7\",\n \"@types/ramda\": \"0.26.39\",\n- \"@types/react\": \"~19.1.10\",\n+ \"@types/react\": \"~19.2.10\",\n \"@types/react-dom\": \"~19.1.7\",\n- \"@types/react-native-vector-icons\": \"6.4.6\",\n+ \"@types/react-native-vector-icons\": \"6.4.18\",\n \"@types/uuid\": \"3.4.6\",\n- \"@types/webpack-env\": \"1.18.0\",\n+ \"@types/webpack-env\": \"1.18.8\",\n \"@typescript-eslint/eslint-plugin\": \"^8.49.0\",\n \"@typescript-eslint/parser\": \"^8.49.0\",\n- \"babel-preset-expo\": \"~54.0.0\",\n \"dotenv\": \"16.0.3\",\n \"eslint\": \"^8.57.0\",\n \"eslint-config-prettier\": \"8.5.0\",\n \"eslint-import-resolver-typescript\": \"3.5.2\",\n- \"eslint-plugin-import\": \"2.26.0\",\n+ \"eslint-plugin-import\": \"2.32.0\",\n \"eslint-plugin-jest\": \"27.1.3\",\n \"eslint-plugin-prettier\": \"4.2.1\",\n- \"eslint-plugin-react\": \"7.31.10\",\n+ \"eslint-plugin-react\": \"7.37.5\",\n \"eslint-plugin-react-hooks\": \"4.6.0\",\n \"front-matter\": \"3.1.0\",\n \"glob\": \"7.1.6\",\n \"husky\": \"4.2.5\",\n \"jest\": \"~29.7.0\",\n- \"jest-expo\": \"~54.0.16\",\n+ \"jest-expo\": \"~55.0.9\",\n \"markdown-it\": \"10.0.0\",\n \"mockdate\": \"3.0.5\",\n \"prettier\": \"2.1.2\",\ndiff --git a/yarn.lock b/yarn.lock\nindex 5afd0034..f2345beb 100644\n--- a/yarn.lock\n+++ b/yarn.lock\n@@ -2,75 +2,34 @@\n # yarn lockfile v1\n \n \n-\"@0no-co/graphql.web@^1.0.13\", \"@0no-co/graphql.web@^1.0.8\":\n- version \"1.2.0\"\n- resolved \"https://registry.yarnpkg.com/@0no-co/graphql.web/-/graphql.web-1.2.0.tgz#296d00581bfaaabfda1e976849d927824aaea81b\"\n- integrity sha512-/1iHy9TTr63gE1YcR5idjx8UREz1s0kFhydf3bBLCXyqjhkIc6igAzTOx3zPifCwFR87tsh/4Pa9cNts6d2otw==\n-\n-\"@ampproject/remapping@^2.2.0\":\n- version \"2.3.0\"\n- resolved \"https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4\"\n- integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==\n- dependencies:\n- \"@jridgewell/gen-mapping\" \"^0.3.5\"\n- \"@jridgewell/trace-mapping\" \"^0.3.24\"\n-\n-\"@babel/code-frame@7.10.4\", \"@babel/code-frame@~7.10.4\":\n- version \"7.10.4\"\n- resolved \"https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a\"\n- integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==\n+\"@babel/code-frame@^7.0.0\", \"@babel/code-frame@^7.12.13\", \"@babel/code-frame@^7.20.0\", \"@babel/code-frame@^7.24.7\", \"@babel/code-frame@^7.28.6\", \"@babel/code-frame@^7.29.0\":\n+ version \"7.29.0\"\n+ resolved \"https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.29.0.tgz#7cd7a59f15b3cc0dcd803038f7792712a7d0b15c\"\n+ integrity sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==\n dependencies:\n- \"@babel/highlight\" \"^7.10.4\"\n-\n-\"@babel/code-frame@^7.0.0\", \"@babel/code-frame@^7.12.13\", \"@babel/code-frame@^7.20.0\", \"@babel/code-frame@^7.24.7\", \"@babel/code-frame@^7.26.0\", \"@babel/code-frame@^7.27.1\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.27.1.tgz#200f715e66d52a23b221a9435534a91cc13ad5be\"\n- integrity sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==\n- dependencies:\n- \"@babel/helper-validator-identifier\" \"^7.27.1\"\n+ \"@babel/helper-validator-identifier\" \"^7.28.5\"\n js-tokens \"^4.0.0\"\n picocolors \"^1.1.1\"\n \n-\"@babel/compat-data@^7.27.2\", \"@babel/compat-data@^7.27.7\":\n- version \"7.28.5\"\n- resolved \"https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.28.5.tgz#a8a4962e1567121ac0b3b487f52107443b455c7f\"\n- integrity sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==\n-\n-\"@babel/core@7.26.0\":\n- version \"7.26.0\"\n- resolved \"https://registry.yarnpkg.com/@babel/core/-/core-7.26.0.tgz#d78b6023cc8f3114ccf049eb219613f74a747b40\"\n- integrity sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==\n- dependencies:\n- \"@ampproject/remapping\" \"^2.2.0\"\n- \"@babel/code-frame\" \"^7.26.0\"\n- \"@babel/generator\" \"^7.26.0\"\n- \"@babel/helper-compilation-targets\" \"^7.25.9\"\n- \"@babel/helper-module-transforms\" \"^7.26.0\"\n- \"@babel/helpers\" \"^7.26.0\"\n- \"@babel/parser\" \"^7.26.0\"\n- \"@babel/template\" \"^7.25.9\"\n- \"@babel/traverse\" \"^7.25.9\"\n- \"@babel/types\" \"^7.26.0\"\n- convert-source-map \"^2.0.0\"\n- debug \"^4.1.0\"\n- gensync \"^1.0.0-beta.2\"\n- json5 \"^2.2.3\"\n- semver \"^6.3.1\"\n+\"@babel/compat-data@^7.28.6\":\n+ version \"7.29.0\"\n+ resolved \"https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.29.0.tgz#00d03e8c0ac24dd9be942c5370990cbe1f17d88d\"\n+ integrity sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==\n \n \"@babel/core@^7.11.6\", \"@babel/core@^7.12.3\", \"@babel/core@^7.20.0\", \"@babel/core@^7.23.9\", \"@babel/core@^7.25.2\":\n- version \"7.28.5\"\n- resolved \"https://registry.yarnpkg.com/@babel/core/-/core-7.28.5.tgz#4c81b35e51e1b734f510c99b07dfbc7bbbb48f7e\"\n- integrity sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==\n- dependencies:\n- \"@babel/code-frame\" \"^7.27.1\"\n- \"@babel/generator\" \"^7.28.5\"\n- \"@babel/helper-compilation-targets\" \"^7.27.2\"\n- \"@babel/helper-module-transforms\" \"^7.28.3\"\n- \"@babel/helpers\" \"^7.28.4\"\n- \"@babel/parser\" \"^7.28.5\"\n- \"@babel/template\" \"^7.27.2\"\n- \"@babel/traverse\" \"^7.28.5\"\n- \"@babel/types\" \"^7.28.5\"\n+ version \"7.29.0\"\n+ resolved \"https://registry.yarnpkg.com/@babel/core/-/core-7.29.0.tgz#5286ad785df7f79d656e88ce86e650d16ca5f322\"\n+ integrity sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==\n+ dependencies:\n+ \"@babel/code-frame\" \"^7.29.0\"\n+ \"@babel/generator\" \"^7.29.0\"\n+ \"@babel/helper-compilation-targets\" \"^7.28.6\"\n+ \"@babel/helper-module-transforms\" \"^7.28.6\"\n+ \"@babel/helpers\" \"^7.28.6\"\n+ \"@babel/parser\" \"^7.29.0\"\n+ \"@babel/template\" \"^7.28.6\"\n+ \"@babel/traverse\" \"^7.29.0\"\n+ \"@babel/types\" \"^7.29.0\"\n \"@jridgewell/remapping\" \"^2.3.5\"\n convert-source-map \"^2.0.0\"\n debug \"^4.1.0\"\n@@ -78,13 +37,13 @@\n json5 \"^2.2.3\"\n semver \"^6.3.1\"\n \n-\"@babel/generator@^7.20.5\", \"@babel/generator@^7.25.0\", \"@babel/generator@^7.26.0\", \"@babel/generator@^7.28.5\", \"@babel/generator@^7.7.2\":\n- version \"7.28.5\"\n- resolved \"https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.5.tgz#712722d5e50f44d07bc7ac9fe84438742dd61298\"\n- integrity sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==\n+\"@babel/generator@^7.20.5\", \"@babel/generator@^7.25.0\", \"@babel/generator@^7.29.0\", \"@babel/generator@^7.29.1\", \"@babel/generator@^7.7.2\":\n+ version \"7.29.1\"\n+ resolved \"https://registry.yarnpkg.com/@babel/generator/-/generator-7.29.1.tgz#d09876290111abbb00ef962a7b83a5307fba0d50\"\n+ integrity sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==\n dependencies:\n- \"@babel/parser\" \"^7.28.5\"\n- \"@babel/types\" \"^7.28.5\"\n+ \"@babel/parser\" \"^7.29.0\"\n+ \"@babel/types\" \"^7.29.0\"\n \"@jridgewell/gen-mapping\" \"^0.3.12\"\n \"@jridgewell/trace-mapping\" \"^0.3.28\"\n jsesc \"^3.0.2\"\n@@ -96,31 +55,31 @@\n dependencies:\n \"@babel/types\" \"^7.27.3\"\n \n-\"@babel/helper-compilation-targets@^7.25.9\", \"@babel/helper-compilation-targets@^7.27.1\", \"@babel/helper-compilation-targets@^7.27.2\":\n- version \"7.27.2\"\n- resolved \"https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz#46a0f6efab808d51d29ce96858dd10ce8732733d\"\n- integrity sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==\n+\"@babel/helper-compilation-targets@^7.27.1\", \"@babel/helper-compilation-targets@^7.27.2\", \"@babel/helper-compilation-targets@^7.28.6\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz#32c4a3f41f12ed1532179b108a4d746e105c2b25\"\n+ integrity sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==\n dependencies:\n- \"@babel/compat-data\" \"^7.27.2\"\n+ \"@babel/compat-data\" \"^7.28.6\"\n \"@babel/helper-validator-option\" \"^7.27.1\"\n browserslist \"^4.24.0\"\n lru-cache \"^5.1.1\"\n semver \"^6.3.1\"\n \n-\"@babel/helper-create-class-features-plugin@^7.27.1\", \"@babel/helper-create-class-features-plugin@^7.28.3\", \"@babel/helper-create-class-features-plugin@^7.28.5\":\n- version \"7.28.5\"\n- resolved \"https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.5.tgz#472d0c28028850968979ad89f173594a6995da46\"\n- integrity sha512-q3WC4JfdODypvxArsJQROfupPBq9+lMwjKq7C33GhbFYJsufD0yd/ziwD+hJucLeWsnFPWZjsU2DNFqBPE7jwQ==\n+\"@babel/helper-create-class-features-plugin@^7.27.1\", \"@babel/helper-create-class-features-plugin@^7.28.6\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.6.tgz#611ff5482da9ef0db6291bcd24303400bca170fb\"\n+ integrity sha512-dTOdvsjnG3xNT9Y0AUg1wAl38y+4Rl4sf9caSQZOXdNqVn+H+HbbJ4IyyHaIqNR6SW9oJpA/RuRjsjCw2IdIow==\n dependencies:\n \"@babel/helper-annotate-as-pure\" \"^7.27.3\"\n \"@babel/helper-member-expression-to-functions\" \"^7.28.5\"\n \"@babel/helper-optimise-call-expression\" \"^7.27.1\"\n- \"@babel/helper-replace-supers\" \"^7.27.1\"\n+ \"@babel/helper-replace-supers\" \"^7.28.6\"\n \"@babel/helper-skip-transparent-expression-wrappers\" \"^7.27.1\"\n- \"@babel/traverse\" \"^7.28.5\"\n+ \"@babel/traverse\" \"^7.28.6\"\n semver \"^6.3.1\"\n \n-\"@babel/helper-create-regexp-features-plugin@^7.27.1\":\n+\"@babel/helper-create-regexp-features-plugin@^7.27.1\", \"@babel/helper-create-regexp-features-plugin@^7.28.5\":\n version \"7.28.5\"\n resolved \"https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.28.5.tgz#7c1ddd64b2065c7f78034b25b43346a7e19ed997\"\n integrity sha512-N1EhvLtHzOvj7QQOUCCS3NrPJP8c5W6ZXCHDn7Yialuy1iu4r5EmIYkXlKNqT99Ciw+W0mDqWoR6HWMZlFP3hw==\n@@ -129,23 +88,23 @@\n regexpu-core \"^6.3.1\"\n semver \"^6.3.1\"\n \n-\"@babel/helper-define-polyfill-provider@^0.6.5\":\n- version \"0.6.5\"\n- resolved \"https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.5.tgz#742ccf1cb003c07b48859fc9fa2c1bbe40e5f753\"\n- integrity sha512-uJnGFcPsWQK8fvjgGP5LZUZZsYGIoPeRjSF5PGwrelYgq7Q15/Ft9NGFp1zglwgIv//W0uG4BevRuSJRyylZPg==\n+\"@babel/helper-define-polyfill-provider@^0.6.5\", \"@babel/helper-define-polyfill-provider@^0.6.6\":\n+ version \"0.6.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.6.tgz#714dfe33d8bd710f556df59953720f6eeb6c1a14\"\n+ integrity sha512-mOAsxeeKkUKayvZR3HeTYD/fICpCPLJrU5ZjelT/PA6WHtNDBOE436YiaEUvHN454bRM3CebhDsIpieCc4texA==\n dependencies:\n- \"@babel/helper-compilation-targets\" \"^7.27.2\"\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n- debug \"^4.4.1\"\n+ \"@babel/helper-compilation-targets\" \"^7.28.6\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n+ debug \"^4.4.3\"\n lodash.debounce \"^4.0.8\"\n- resolve \"^1.22.10\"\n+ resolve \"^1.22.11\"\n \n \"@babel/helper-globals@^7.28.0\":\n version \"7.28.0\"\n resolved \"https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.28.0.tgz#b9430df2aa4e17bc28665eadeae8aa1d985e6674\"\n integrity sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==\n \n-\"@babel/helper-member-expression-to-functions@^7.27.1\", \"@babel/helper-member-expression-to-functions@^7.28.5\":\n+\"@babel/helper-member-expression-to-functions@^7.28.5\":\n version \"7.28.5\"\n resolved \"https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.28.5.tgz#f3e07a10be37ed7a63461c63e6929575945a6150\"\n integrity sha512-cwM7SBRZcPCLgl8a7cY0soT1SptSzAlMH39vwiRpOQkJlh53r5hdHwLSCZpQdVLT39sZt+CRpNwYG4Y2v77atg==\n@@ -153,22 +112,22 @@\n \"@babel/traverse\" \"^7.28.5\"\n \"@babel/types\" \"^7.28.5\"\n \n-\"@babel/helper-module-imports@^7.25.9\", \"@babel/helper-module-imports@^7.27.1\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz#7ef769a323e2655e126673bb6d2d6913bbead204\"\n- integrity sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==\n+\"@babel/helper-module-imports@^7.25.9\", \"@babel/helper-module-imports@^7.28.6\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz#60632cbd6ffb70b22823187201116762a03e2d5c\"\n+ integrity sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==\n dependencies:\n- \"@babel/traverse\" \"^7.27.1\"\n- \"@babel/types\" \"^7.27.1\"\n+ \"@babel/traverse\" \"^7.28.6\"\n+ \"@babel/types\" \"^7.28.6\"\n \n-\"@babel/helper-module-transforms@^7.26.0\", \"@babel/helper-module-transforms@^7.27.1\", \"@babel/helper-module-transforms@^7.28.3\":\n- version \"7.28.3\"\n- resolved \"https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz#a2b37d3da3b2344fe085dab234426f2b9a2fa5f6\"\n- integrity sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==\n+\"@babel/helper-module-transforms@^7.28.6\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz#9312d9d9e56edc35aeb6e95c25d4106b50b9eb1e\"\n+ integrity sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==\n dependencies:\n- \"@babel/helper-module-imports\" \"^7.27.1\"\n- \"@babel/helper-validator-identifier\" \"^7.27.1\"\n- \"@babel/traverse\" \"^7.28.3\"\n+ \"@babel/helper-module-imports\" \"^7.28.6\"\n+ \"@babel/helper-validator-identifier\" \"^7.28.5\"\n+ \"@babel/traverse\" \"^7.28.6\"\n \n \"@babel/helper-optimise-call-expression@^7.27.1\":\n version \"7.27.1\"\n@@ -177,10 +136,10 @@\n dependencies:\n \"@babel/types\" \"^7.27.1\"\n \n-\"@babel/helper-plugin-utils@^7.0.0\", \"@babel/helper-plugin-utils@^7.10.4\", \"@babel/helper-plugin-utils@^7.12.13\", \"@babel/helper-plugin-utils@^7.14.5\", \"@babel/helper-plugin-utils@^7.27.1\", \"@babel/helper-plugin-utils@^7.8.0\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz#ddb2f876534ff8013e6c2b299bf4d39b3c51d44c\"\n- integrity sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==\n+\"@babel/helper-plugin-utils@^7.0.0\", \"@babel/helper-plugin-utils@^7.10.4\", \"@babel/helper-plugin-utils@^7.12.13\", \"@babel/helper-plugin-utils@^7.14.5\", \"@babel/helper-plugin-utils@^7.27.1\", \"@babel/helper-plugin-utils@^7.28.6\", \"@babel/helper-plugin-utils@^7.8.0\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz#6f13ea251b68c8532e985fd532f28741a8af9ac8\"\n+ integrity sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==\n \n \"@babel/helper-remap-async-to-generator@^7.27.1\":\n version \"7.27.1\"\n@@ -191,14 +150,14 @@\n \"@babel/helper-wrap-function\" \"^7.27.1\"\n \"@babel/traverse\" \"^7.27.1\"\n \n-\"@babel/helper-replace-supers@^7.27.1\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.27.1.tgz#b1ed2d634ce3bdb730e4b52de30f8cccfd692bc0\"\n- integrity sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==\n+\"@babel/helper-replace-supers@^7.27.1\", \"@babel/helper-replace-supers@^7.28.6\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.28.6.tgz#94aa9a1d7423a00aead3f204f78834ce7d53fe44\"\n+ integrity sha512-mq8e+laIk94/yFec3DxSjCRD2Z0TAjhVbEJY3UQrlwVo15Lmt7C2wAUbK4bjnTs4APkwsYLTahXRraQXhb1WCg==\n dependencies:\n- \"@babel/helper-member-expression-to-functions\" \"^7.27.1\"\n+ \"@babel/helper-member-expression-to-functions\" \"^7.28.5\"\n \"@babel/helper-optimise-call-expression\" \"^7.27.1\"\n- \"@babel/traverse\" \"^7.27.1\"\n+ \"@babel/traverse\" \"^7.28.6\"\n \n \"@babel/helper-skip-transparent-expression-wrappers@^7.27.1\":\n version \"7.27.1\"\n@@ -213,7 +172,7 @@\n resolved \"https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687\"\n integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==\n \n-\"@babel/helper-validator-identifier@^7.25.9\", \"@babel/helper-validator-identifier@^7.27.1\", \"@babel/helper-validator-identifier@^7.28.5\":\n+\"@babel/helper-validator-identifier@^7.28.5\":\n version \"7.28.5\"\n resolved \"https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4\"\n integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==\n@@ -224,47 +183,37 @@\n integrity sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==\n \n \"@babel/helper-wrap-function@^7.27.1\":\n- version \"7.28.3\"\n- resolved \"https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.28.3.tgz#fe4872092bc1438ffd0ce579e6f699609f9d0a7a\"\n- integrity sha512-zdf983tNfLZFletc0RRXYrHrucBEg95NIFMkn6K9dbeMYnsgHaSBGcQqdsCSStG2PYwRre0Qc2NNSCXbG+xc6g==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.28.6.tgz#4e349ff9222dab69a93a019cc296cdd8442e279a\"\n+ integrity sha512-z+PwLziMNBeSQJonizz2AGnndLsP2DeGHIxDAn+wdHOGuo4Fo1x1HBPPXeE9TAOPHNNWQKCSlA2VZyYyyibDnQ==\n dependencies:\n- \"@babel/template\" \"^7.27.2\"\n- \"@babel/traverse\" \"^7.28.3\"\n- \"@babel/types\" \"^7.28.2\"\n+ \"@babel/template\" \"^7.28.6\"\n+ \"@babel/traverse\" \"^7.28.6\"\n+ \"@babel/types\" \"^7.28.6\"\n \n-\"@babel/helpers@^7.26.0\", \"@babel/helpers@^7.28.4\":\n- version \"7.28.4\"\n- resolved \"https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.28.4.tgz#fe07274742e95bdf7cf1443593eeb8926ab63827\"\n- integrity sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==\n+\"@babel/helpers@^7.28.6\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.28.6.tgz#fca903a313ae675617936e8998b814c415cbf5d7\"\n+ integrity sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==\n dependencies:\n- \"@babel/template\" \"^7.27.2\"\n- \"@babel/types\" \"^7.28.4\"\n-\n-\"@babel/highlight@^7.10.4\":\n- version \"7.25.9\"\n- resolved \"https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.25.9.tgz#8141ce68fc73757946f983b343f1231f4691acc6\"\n- integrity sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==\n- dependencies:\n- \"@babel/helper-validator-identifier\" \"^7.25.9\"\n- chalk \"^2.4.2\"\n- js-tokens \"^4.0.0\"\n- picocolors \"^1.0.0\"\n+ \"@babel/template\" \"^7.28.6\"\n+ \"@babel/types\" \"^7.28.6\"\n \n-\"@babel/parser@^7.1.0\", \"@babel/parser@^7.14.7\", \"@babel/parser@^7.20.7\", \"@babel/parser@^7.23.9\", \"@babel/parser@^7.25.3\", \"@babel/parser@^7.26.0\", \"@babel/parser@^7.27.2\", \"@babel/parser@^7.28.5\":\n- version \"7.28.5\"\n- resolved \"https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.5.tgz#0b0225ee90362f030efd644e8034c99468893b08\"\n- integrity sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==\n+\"@babel/parser@^7.1.0\", \"@babel/parser@^7.14.7\", \"@babel/parser@^7.20.7\", \"@babel/parser@^7.23.9\", \"@babel/parser@^7.25.3\", \"@babel/parser@^7.28.6\", \"@babel/parser@^7.29.0\":\n+ version \"7.29.0\"\n+ resolved \"https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.0.tgz#669ef345add7d057e92b7ed15f0bac07611831b6\"\n+ integrity sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==\n dependencies:\n- \"@babel/types\" \"^7.28.5\"\n+ \"@babel/types\" \"^7.29.0\"\n \n \"@babel/plugin-proposal-decorators@^7.12.9\":\n- version \"7.28.0\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.28.0.tgz#419c8acc31088e05a774344c021800f7ddc39bf0\"\n- integrity sha512-zOiZqvANjWDUaUS9xMxbMcK/Zccztbe/6ikvUXaG9nsPH3w6qh5UaPGAnirI/WhIbZ8m3OHU0ReyPrknG+ZKeg==\n+ version \"7.29.0\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.29.0.tgz#d159f26f78740e47bf3ef075882b155b2d54ca81\"\n+ integrity sha512-CVBVv3VY/XRMxRYq5dwr2DS7/MvqPm23cOCjbwNnVrfOqcWlnefua1uUs0sjdKOGjvPUG633o07uWzJq4oI6dA==\n dependencies:\n- \"@babel/helper-create-class-features-plugin\" \"^7.27.1\"\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n- \"@babel/plugin-syntax-decorators\" \"^7.27.1\"\n+ \"@babel/helper-create-class-features-plugin\" \"^7.28.6\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n+ \"@babel/plugin-syntax-decorators\" \"^7.28.6\"\n \n \"@babel/plugin-proposal-export-default-from@^7.24.7\":\n version \"7.27.1\"\n@@ -301,12 +250,12 @@\n dependencies:\n \"@babel/helper-plugin-utils\" \"^7.14.5\"\n \n-\"@babel/plugin-syntax-decorators@^7.27.1\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.27.1.tgz#ee7dd9590aeebc05f9d4c8c0560007b05979a63d\"\n- integrity sha512-YMq8Z87Lhl8EGkmb0MwYkt36QnxC+fzCgrl66ereamPlYToRpIk5nUjKUY3QKLWq8mwUB1BgbeXcTJhZOCDg5A==\n+\"@babel/plugin-syntax-decorators@^7.28.6\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.28.6.tgz#8c3293a0fef033e4c786b35ce1e159fc1d676153\"\n+ integrity sha512-71EYI0ONURHJBL4rSFXnITXqXrrY8q4P0q006DPfN+Rk+ASM+++IBXem/ruokgBZR8YNEWZ8R6B+rCb8VcUTqA==\n dependencies:\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \n \"@babel/plugin-syntax-dynamic-import@^7.8.3\":\n version \"7.8.3\"\n@@ -316,25 +265,25 @@\n \"@babel/helper-plugin-utils\" \"^7.8.0\"\n \n \"@babel/plugin-syntax-export-default-from@^7.24.7\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.27.1.tgz#8efed172e79ab657c7fa4d599224798212fb7e18\"\n- integrity sha512-eBC/3KSekshx19+N40MzjWqJd7KTEdOoLesAfa4IDFI8eRz5a47i5Oszus6zG/cwIXN63YhgLOMSSNJx49sENg==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.28.6.tgz#8e19047560a8a48b11f1f5b46881f445f8692830\"\n+ integrity sha512-Svlx1fjJFnNz0LZeUaybRukSxZI3KkpApUmIRzEdXC5k8ErTOz0OD0kNrICi5Vc3GlpP5ZCeRyRO+mfWTSz+iQ==\n dependencies:\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \n \"@babel/plugin-syntax-flow@^7.12.1\", \"@babel/plugin-syntax-flow@^7.27.1\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.27.1.tgz#6c83cf0d7d635b716827284b7ecd5aead9237662\"\n- integrity sha512-p9OkPbZ5G7UT1MofwYFigGebnrzGJacoBSQM0/6bi/PUMVE+qlWDD/OalvQKbwgQzU6dl0xAv6r4X7Jme0RYxA==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.28.6.tgz#447559a225e66c4cd477a3ffb1a74d8c1fe25a62\"\n+ integrity sha512-D+OrJumc9McXNEBI/JmFnc/0uCM2/Y3PEBG3gfV3QIYkKv5pvnpzFrl1kYCrcHJP8nOeFB/SHi1IHz29pNGuew==\n dependencies:\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \n \"@babel/plugin-syntax-import-attributes@^7.24.7\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz#34c017d54496f9b11b61474e7ea3dfd5563ffe07\"\n- integrity sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.28.6.tgz#b71d5914665f60124e133696f17cd7669062c503\"\n+ integrity sha512-jiLC0ma9XkQT3TKJ9uYvlakm66Pamywo+qwL+oL8HJOvc6TWdZXVfhqJr8CCzbSGUAbDOzlGHJC1U+vRfLQDvw==\n dependencies:\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \n \"@babel/plugin-syntax-import-meta@^7.10.4\":\n version \"7.10.4\"\n@@ -350,12 +299,12 @@\n dependencies:\n \"@babel/helper-plugin-utils\" \"^7.8.0\"\n \n-\"@babel/plugin-syntax-jsx@^7.27.1\", \"@babel/plugin-syntax-jsx@^7.7.2\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz#2f9beb5eff30fa507c5532d107daac7b888fa34c\"\n- integrity sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==\n+\"@babel/plugin-syntax-jsx@^7.27.1\", \"@babel/plugin-syntax-jsx@^7.28.6\", \"@babel/plugin-syntax-jsx@^7.7.2\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.28.6.tgz#f8ca28bbd84883b5fea0e447c635b81ba73997ee\"\n+ integrity sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==\n dependencies:\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \n \"@babel/plugin-syntax-logical-assignment-operators@^7.10.4\":\n version \"7.10.4\"\n@@ -413,14 +362,14 @@\n dependencies:\n \"@babel/helper-plugin-utils\" \"^7.14.5\"\n \n-\"@babel/plugin-syntax-typescript@^7.27.1\", \"@babel/plugin-syntax-typescript@^7.7.2\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz#5147d29066a793450f220c63fa3a9431b7e6dd18\"\n- integrity sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==\n+\"@babel/plugin-syntax-typescript@^7.28.6\", \"@babel/plugin-syntax-typescript@^7.7.2\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.28.6.tgz#c7b2ddf1d0a811145b1de800d1abd146af92e3a2\"\n+ integrity sha512-+nDNmQye7nlnuuHDboPbGm00Vqg3oO8niRRL27/4LYHUsHYh0zJ1xWOz0uRwNFmM1Avzk8wZbc6rdiYhomzv/A==\n dependencies:\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \n-\"@babel/plugin-transform-arrow-functions@^7.0.0-0\", \"@babel/plugin-transform-arrow-functions@^7.24.7\":\n+\"@babel/plugin-transform-arrow-functions@7.27.1\", \"@babel/plugin-transform-arrow-functions@^7.24.7\":\n version \"7.27.1\"\n resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz#6e2061067ba3ab0266d834a9f94811196f2aba9a\"\n integrity sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==\n@@ -428,31 +377,31 @@\n \"@babel/helper-plugin-utils\" \"^7.27.1\"\n \n \"@babel/plugin-transform-async-generator-functions@^7.25.4\":\n- version \"7.28.0\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.28.0.tgz#1276e6c7285ab2cd1eccb0bc7356b7a69ff842c2\"\n- integrity sha512-BEOdvX4+M765icNPZeidyADIvQ1m1gmunXufXxvRESy/jNNyfovIqUyE7MVgGBjWktCoJlzvFA1To2O4ymIO3Q==\n+ version \"7.29.0\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.29.0.tgz#63ed829820298f0bf143d5a4a68fb8c06ffd742f\"\n+ integrity sha512-va0VdWro4zlBr2JsXC+ofCPB2iG12wPtVGTWFx2WLDOM3nYQZZIGP82qku2eW/JR83sD+k2k+CsNtyEbUqhU6w==\n dependencies:\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \"@babel/helper-remap-async-to-generator\" \"^7.27.1\"\n- \"@babel/traverse\" \"^7.28.0\"\n+ \"@babel/traverse\" \"^7.29.0\"\n \n \"@babel/plugin-transform-async-to-generator@^7.24.7\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.27.1.tgz#9a93893b9379b39466c74474f55af03de78c66e7\"\n- integrity sha512-NREkZsZVJS4xmTr8qzE5y8AfIPqsdQfRuUiLRTEzb7Qii8iFWCyDKaUV2c0rCuh4ljDZ98ALHP/PetiBV2nddA==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.28.6.tgz#bd97b42237b2d1bc90d74bcb486c39be5b4d7e77\"\n+ integrity sha512-ilTRcmbuXjsMmcZ3HASTe4caH5Tpo93PkTxF9oG2VZsSWsahydmcEHhix9Ik122RcTnZnUzPbmux4wh1swfv7g==\n dependencies:\n- \"@babel/helper-module-imports\" \"^7.27.1\"\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-module-imports\" \"^7.28.6\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \"@babel/helper-remap-async-to-generator\" \"^7.27.1\"\n \n \"@babel/plugin-transform-block-scoping@^7.25.0\":\n- version \"7.28.5\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.5.tgz#e0d3af63bd8c80de2e567e690a54e84d85eb16f6\"\n- integrity sha512-45DmULpySVvmq9Pj3X9B+62Xe+DJGov27QravQJU1LLcapR6/10i+gYVAucGGJpHBp5mYxIMK4nDAT/QDLr47g==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.6.tgz#e1ef5633448c24e76346125c2534eeb359699a99\"\n+ integrity sha512-tt/7wOtBmwHPNMPu7ax4pdPz6shjFrmHDghvNC+FG9Qvj7D6mJcoRQIF5dy4njmxR941l6rgtvfSB2zX3VlUIw==\n dependencies:\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \n-\"@babel/plugin-transform-class-properties@^7.0.0-0\", \"@babel/plugin-transform-class-properties@^7.25.4\":\n+\"@babel/plugin-transform-class-properties@7.27.1\":\n version \"7.27.1\"\n resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.27.1.tgz#dd40a6a370dfd49d32362ae206ddaf2bb082a925\"\n integrity sha512-D0VcalChDMtuRvJIu3U/fwWjf8ZMykz5iZsg77Nuj821vCKI3zCyRLwRdWbsuJ/uRwZhZ002QtCqIkwC/ZkvbA==\n@@ -460,15 +409,23 @@\n \"@babel/helper-create-class-features-plugin\" \"^7.27.1\"\n \"@babel/helper-plugin-utils\" \"^7.27.1\"\n \n+\"@babel/plugin-transform-class-properties@^7.25.4\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.28.6.tgz#d274a4478b6e782d9ea987fda09bdb6d28d66b72\"\n+ integrity sha512-dY2wS3I2G7D697VHndN91TJr8/AAfXQNt5ynCTI/MpxMsSzHp+52uNivYT5wCPax3whc47DR8Ba7cmlQMg24bw==\n+ dependencies:\n+ \"@babel/helper-create-class-features-plugin\" \"^7.28.6\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n+\n \"@babel/plugin-transform-class-static-block@^7.27.1\":\n- version \"7.28.3\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.3.tgz#d1b8e69b54c9993bc558203e1f49bfc979bfd852\"\n- integrity sha512-LtPXlBbRoc4Njl/oh1CeD/3jC+atytbnf/UqLoqTDcEYGUPj022+rvfkbDYieUrSj3CaV4yHDByPE+T2HwfsJg==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.6.tgz#1257491e8259c6d125ac4d9a6f39f9d2bf3dba70\"\n+ integrity sha512-rfQ++ghVwTWTqQ7w8qyDxL1XGihjBss4CmTgGRCTAC9RIbhVpyp4fOeZtta0Lbf+dTNIVJer6ych2ibHwkZqsQ==\n dependencies:\n- \"@babel/helper-create-class-features-plugin\" \"^7.28.3\"\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-create-class-features-plugin\" \"^7.28.6\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \n-\"@babel/plugin-transform-classes@^7.0.0-0\", \"@babel/plugin-transform-classes@^7.25.4\":\n+\"@babel/plugin-transform-classes@7.28.4\":\n version \"7.28.4\"\n resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.4.tgz#75d66175486788c56728a73424d67cbc7473495c\"\n integrity sha512-cFOlhIYPBv/iBoc+KS3M6et2XPtbT2HiCRfBXWtfpc9OAyostldxIf9YAYB6ypURBBbx+Qv6nyrLzASfJe+hBA==\n@@ -480,15 +437,27 @@\n \"@babel/helper-replace-supers\" \"^7.27.1\"\n \"@babel/traverse\" \"^7.28.4\"\n \n+\"@babel/plugin-transform-classes@^7.25.4\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.6.tgz#8f6fb79ba3703978e701ce2a97e373aae7dda4b7\"\n+ integrity sha512-EF5KONAqC5zAqT783iMGuM2ZtmEBy+mJMOKl2BCvPZ2lVrwvXnB6o+OBWCS+CoeCCpVRF2sA2RBKUxvT8tQT5Q==\n+ dependencies:\n+ \"@babel/helper-annotate-as-pure\" \"^7.27.3\"\n+ \"@babel/helper-compilation-targets\" \"^7.28.6\"\n+ \"@babel/helper-globals\" \"^7.28.0\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n+ \"@babel/helper-replace-supers\" \"^7.28.6\"\n+ \"@babel/traverse\" \"^7.28.6\"\n+\n \"@babel/plugin-transform-computed-properties@^7.24.7\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.27.1.tgz#81662e78bf5e734a97982c2b7f0a793288ef3caa\"\n- integrity sha512-lj9PGWvMTVksbWiDT2tW68zGS/cyo4AkZ/QTp0sQT0mjPopCmrSkzxeXkznjqBxzDI6TclZhOJbBmbBLjuOZUw==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.28.6.tgz#936824fc71c26cb5c433485776d79c8e7b0202d2\"\n+ integrity sha512-bcc3k0ijhHbc2lEfpFHgx7eYw9KNXqOerKWfzbxEHUGKnS3sz9C4CNL9OiFN1297bDNfUiSO7DaLzbvHQQQ1BQ==\n dependencies:\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n- \"@babel/template\" \"^7.27.1\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n+ \"@babel/template\" \"^7.28.6\"\n \n-\"@babel/plugin-transform-destructuring@^7.24.8\", \"@babel/plugin-transform-destructuring@^7.28.0\":\n+\"@babel/plugin-transform-destructuring@^7.24.8\", \"@babel/plugin-transform-destructuring@^7.28.5\":\n version \"7.28.5\"\n resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.5.tgz#b8402764df96179a2070bb7b501a1586cf8ad7a7\"\n integrity sha512-Kl9Bc6D0zTUcFUvkNuQh4eGXPKKNDOJQXVyyM4ZAQPMveniJdxi8XMJwLo+xSoW3MIq81bD33lcUe9kZpl0MCw==\n@@ -536,66 +505,81 @@\n \"@babel/helper-plugin-utils\" \"^7.27.1\"\n \n \"@babel/plugin-transform-logical-assignment-operators@^7.24.7\":\n- version \"7.28.5\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.28.5.tgz#d028fd6db8c081dee4abebc812c2325e24a85b0e\"\n- integrity sha512-axUuqnUTBuXyHGcJEVVh9pORaN6wC5bYfE7FGzPiaWa3syib9m7g+/IT/4VgCOe2Upef43PHzeAvcrVek6QuuA==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.28.6.tgz#53028a3d77e33c50ef30a8fce5ca17065936e605\"\n+ integrity sha512-+anKKair6gpi8VsM/95kmomGNMD0eLz1NQ8+Pfw5sAwWH9fGYXT50E55ZpV0pHUHWf6IUTWPM+f/7AAff+wr9A==\n dependencies:\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \n \"@babel/plugin-transform-modules-commonjs@^7.24.8\", \"@babel/plugin-transform-modules-commonjs@^7.27.1\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz#8e44ed37c2787ecc23bdc367f49977476614e832\"\n- integrity sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.28.6.tgz#c0232e0dfe66a734cc4ad0d5e75fc3321b6fdef1\"\n+ integrity sha512-jppVbf8IV9iWWwWTQIxJMAJCWBuuKx71475wHwYytrRGQ2CWiDvYlADQno3tcYpS/T2UUWFQp3nVtYfK/YBQrA==\n dependencies:\n- \"@babel/helper-module-transforms\" \"^7.27.1\"\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-module-transforms\" \"^7.28.6\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \n \"@babel/plugin-transform-named-capturing-groups-regex@^7.24.7\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.27.1.tgz#f32b8f7818d8fc0cc46ee20a8ef75f071af976e1\"\n- integrity sha512-SstR5JYy8ddZvD6MhV0tM/j16Qds4mIpJTOd1Yu9J9pJjH93bxHECF7pgtc28XvkzTD6Pxcm/0Z73Hvk7kb3Ng==\n+ version \"7.29.0\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.29.0.tgz#a26cd51e09c4718588fc4cce1c5d1c0152102d6a\"\n+ integrity sha512-1CZQA5KNAD6ZYQLPw7oi5ewtDNxH/2vuCh+6SmvgDfhumForvs8a1o9n0UrEoBD8HU4djO2yWngTQlXl1NDVEQ==\n dependencies:\n- \"@babel/helper-create-regexp-features-plugin\" \"^7.27.1\"\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-create-regexp-features-plugin\" \"^7.28.5\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \n-\"@babel/plugin-transform-nullish-coalescing-operator@^7.0.0-0\", \"@babel/plugin-transform-nullish-coalescing-operator@^7.24.7\":\n+\"@babel/plugin-transform-nullish-coalescing-operator@7.27.1\":\n version \"7.27.1\"\n resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.27.1.tgz#4f9d3153bf6782d73dd42785a9d22d03197bc91d\"\n integrity sha512-aGZh6xMo6q9vq1JGcw58lZ1Z0+i0xB2x0XaauNIUXd6O1xXc3RwoWEBlsTQrY4KQ9Jf0s5rgD6SiNkaUdJegTA==\n dependencies:\n \"@babel/helper-plugin-utils\" \"^7.27.1\"\n \n+\"@babel/plugin-transform-nullish-coalescing-operator@^7.24.7\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.28.6.tgz#9bc62096e90ab7a887f3ca9c469f6adec5679757\"\n+ integrity sha512-3wKbRgmzYbw24mDJXT7N+ADXw8BC/imU9yo9c9X9NKaLF1fW+e5H1U5QjMUBe4Qo4Ox/o++IyUkl1sVCLgevKg==\n+ dependencies:\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n+\n \"@babel/plugin-transform-numeric-separator@^7.24.7\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.27.1.tgz#614e0b15cc800e5997dadd9bd6ea524ed6c819c6\"\n- integrity sha512-fdPKAcujuvEChxDBJ5c+0BTaS6revLV7CJL08e4m3de8qJfNIuCc2nc7XJYOjBoTMJeqSmwXJ0ypE14RCjLwaw==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.28.6.tgz#1310b0292762e7a4a335df5f580c3320ee7d9e9f\"\n+ integrity sha512-SJR8hPynj8outz+SlStQSwvziMN4+Bq99it4tMIf5/Caq+3iOc0JtKyse8puvyXkk3eFRIA5ID/XfunGgO5i6w==\n dependencies:\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \n \"@babel/plugin-transform-object-rest-spread@^7.24.7\":\n- version \"7.28.4\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.4.tgz#9ee1ceca80b3e6c4bac9247b2149e36958f7f98d\"\n- integrity sha512-373KA2HQzKhQCYiRVIRr+3MjpCObqzDlyrM6u4I201wL8Mp2wHf7uB8GhDwis03k2ti8Zr65Zyyqs1xOxUF/Ew==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.6.tgz#fdd4bc2d72480db6ca42aed5c051f148d7b067f7\"\n+ integrity sha512-5rh+JR4JBC4pGkXLAcYdLHZjXudVxWMXbB6u6+E9lRL5TrGVbHt1TjxGbZ8CkmYw9zjkB7jutzOROArsqtncEA==\n dependencies:\n- \"@babel/helper-compilation-targets\" \"^7.27.2\"\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n- \"@babel/plugin-transform-destructuring\" \"^7.28.0\"\n+ \"@babel/helper-compilation-targets\" \"^7.28.6\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n+ \"@babel/plugin-transform-destructuring\" \"^7.28.5\"\n \"@babel/plugin-transform-parameters\" \"^7.27.7\"\n- \"@babel/traverse\" \"^7.28.4\"\n+ \"@babel/traverse\" \"^7.28.6\"\n \n \"@babel/plugin-transform-optional-catch-binding@^7.24.7\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.28.6.tgz#75107be14c78385978201a49c86414a150a20b4c\"\n+ integrity sha512-R8ja/Pyrv0OGAvAXQhSTmWyPJPml+0TMqXlO5w+AsMEiwb2fg3WkOvob7UxFSL3OIttFSGSRFKQsOhJ/X6HQdQ==\n+ dependencies:\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n+\n+\"@babel/plugin-transform-optional-chaining@7.27.1\":\n version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.27.1.tgz#84c7341ebde35ccd36b137e9e45866825072a30c\"\n- integrity sha512-txEAEKzYrHEX4xSZN4kJ+OfKXFVSWKB2ZxM9dpcE3wT7smwkNmXo5ORRlVzMVdJbD+Q8ILTgSD7959uj+3Dm3Q==\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz#874ce3c4f06b7780592e946026eb76a32830454f\"\n+ integrity sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==\n dependencies:\n \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-skip-transparent-expression-wrappers\" \"^7.27.1\"\n \n-\"@babel/plugin-transform-optional-chaining@^7.0.0-0\", \"@babel/plugin-transform-optional-chaining@^7.24.8\":\n- version \"7.28.5\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.28.5.tgz#8238c785f9d5c1c515a90bf196efb50d075a4b26\"\n- integrity sha512-N6fut9IZlPnjPwgiQkXNhb+cT8wQKFlJNqcZkWlcTqkcqx6/kU4ynGmLFoa4LViBSirn05YAwk+sQBbPfxtYzQ==\n+\"@babel/plugin-transform-optional-chaining@^7.24.8\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.28.6.tgz#926cf150bd421fc8362753e911b4a1b1ce4356cd\"\n+ integrity sha512-A4zobikRGJTsX9uqVFdafzGkqD30t26ck2LmOzAuLL8b2x6k3TIqRiT2xVvA9fNmFeTX484VpsdgmKNA0bS23w==\n dependencies:\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \"@babel/helper-skip-transparent-expression-wrappers\" \"^7.27.1\"\n \n \"@babel/plugin-transform-parameters@^7.24.7\", \"@babel/plugin-transform-parameters@^7.27.7\":\n@@ -606,21 +590,21 @@\n \"@babel/helper-plugin-utils\" \"^7.27.1\"\n \n \"@babel/plugin-transform-private-methods@^7.24.7\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.27.1.tgz#fdacbab1c5ed81ec70dfdbb8b213d65da148b6af\"\n- integrity sha512-10FVt+X55AjRAYI9BrdISN9/AQWHqldOeZDUoLyif1Kn05a56xVBXb8ZouL8pZ9jem8QpXaOt8TS7RHUIS+GPA==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.28.6.tgz#c76fbfef3b86c775db7f7c106fff544610bdb411\"\n+ integrity sha512-piiuapX9CRv7+0st8lmuUlRSmX6mBcVeNQ1b4AYzJxfCMuBfB0vBXDiGSmm03pKJw1v6cZ8KSeM+oUnM6yAExg==\n dependencies:\n- \"@babel/helper-create-class-features-plugin\" \"^7.27.1\"\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-create-class-features-plugin\" \"^7.28.6\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \n \"@babel/plugin-transform-private-property-in-object@^7.24.7\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.27.1.tgz#4dbbef283b5b2f01a21e81e299f76e35f900fb11\"\n- integrity sha512-5J+IhqTi1XPa0DXF83jYOaARrX+41gOewWbkPyjMNRDqgOCqdffGh8L3f/Ek5utaEBZExjSAzcyjmV9SSAWObQ==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.28.6.tgz#4fafef1e13129d79f1d75ac180c52aafefdb2811\"\n+ integrity sha512-b97jvNSOb5+ehyQmBpmhOCiUC5oVK4PMnpRvO7+ymFBoqYjeDHIU9jnrNUuwHOiL9RpGDoKBpSViarV+BU+eVA==\n dependencies:\n- \"@babel/helper-annotate-as-pure\" \"^7.27.1\"\n- \"@babel/helper-create-class-features-plugin\" \"^7.27.1\"\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-annotate-as-pure\" \"^7.27.3\"\n+ \"@babel/helper-create-class-features-plugin\" \"^7.28.6\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \n \"@babel/plugin-transform-react-display-name@^7.24.7\", \"@babel/plugin-transform-react-display-name@^7.28.0\":\n version \"7.28.0\"\n@@ -651,15 +635,15 @@\n \"@babel/helper-plugin-utils\" \"^7.27.1\"\n \n \"@babel/plugin-transform-react-jsx@^7.25.2\", \"@babel/plugin-transform-react-jsx@^7.27.1\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.27.1.tgz#1023bc94b78b0a2d68c82b5e96aed573bcfb9db0\"\n- integrity sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.28.6.tgz#f51cb70a90b9529fbb71ee1f75ea27b7078eed62\"\n+ integrity sha512-61bxqhiRfAACulXSLd/GxqmAedUSrRZIu/cbaT18T1CetkTmtDN15it7i80ru4DVqRK1WMxQhXs+Lf9kajm5Ow==\n dependencies:\n- \"@babel/helper-annotate-as-pure\" \"^7.27.1\"\n- \"@babel/helper-module-imports\" \"^7.27.1\"\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n- \"@babel/plugin-syntax-jsx\" \"^7.27.1\"\n- \"@babel/types\" \"^7.27.1\"\n+ \"@babel/helper-annotate-as-pure\" \"^7.27.3\"\n+ \"@babel/helper-module-imports\" \"^7.28.6\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n+ \"@babel/plugin-syntax-jsx\" \"^7.28.6\"\n+ \"@babel/types\" \"^7.28.6\"\n \n \"@babel/plugin-transform-react-pure-annotations@^7.27.1\":\n version \"7.27.1\"\n@@ -670,25 +654,25 @@\n \"@babel/helper-plugin-utils\" \"^7.27.1\"\n \n \"@babel/plugin-transform-regenerator@^7.24.7\":\n- version \"7.28.4\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.4.tgz#9d3fa3bebb48ddd0091ce5729139cd99c67cea51\"\n- integrity sha512-+ZEdQlBoRg9m2NnzvEeLgtvBMO4tkFBw5SQIUgLICgTrumLoU7lr+Oghi6km2PFj+dbUt2u1oby2w3BDO9YQnA==\n+ version \"7.29.0\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.0.tgz#dec237cec1b93330876d6da9992c4abd42c9d18b\"\n+ integrity sha512-FijqlqMA7DmRdg/aINBSs04y8XNTYw/lr1gJ2WsmBnnaNw1iS43EPkJW+zK7z65auG3AWRFXWj+NcTQwYptUog==\n dependencies:\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \n \"@babel/plugin-transform-runtime@^7.24.7\":\n- version \"7.28.5\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.28.5.tgz#ae3e21fbefe2831ebac04dfa6b463691696afe17\"\n- integrity sha512-20NUVgOrinudkIBzQ2bNxP08YpKprUkRTiRSd2/Z5GOdPImJGkoN4Z7IQe1T5AdyKI1i5L6RBmluqdSzvaq9/w==\n+ version \"7.29.0\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.29.0.tgz#a5fded13cc656700804bfd6e5ebd7fffd5266803\"\n+ integrity sha512-jlaRT5dJtMaMCV6fAuLbsQMSwz/QkvaHOHOSXRitGGwSpR1blCY4KUKoyP2tYO8vJcqYe8cEj96cqSztv3uF9w==\n dependencies:\n- \"@babel/helper-module-imports\" \"^7.27.1\"\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-module-imports\" \"^7.28.6\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n babel-plugin-polyfill-corejs2 \"^0.4.14\"\n babel-plugin-polyfill-corejs3 \"^0.13.0\"\n babel-plugin-polyfill-regenerator \"^0.6.5\"\n semver \"^6.3.1\"\n \n-\"@babel/plugin-transform-shorthand-properties@^7.0.0-0\", \"@babel/plugin-transform-shorthand-properties@^7.24.7\":\n+\"@babel/plugin-transform-shorthand-properties@7.27.1\", \"@babel/plugin-transform-shorthand-properties@^7.24.7\":\n version \"7.27.1\"\n resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.27.1.tgz#532abdacdec87bfee1e0ef8e2fcdee543fe32b90\"\n integrity sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==\n@@ -696,11 +680,11 @@\n \"@babel/helper-plugin-utils\" \"^7.27.1\"\n \n \"@babel/plugin-transform-spread@^7.24.7\":\n- version \"7.27.1\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.27.1.tgz#1a264d5fc12750918f50e3fe3e24e437178abb08\"\n- integrity sha512-kpb3HUqaILBJcRFVhFUs6Trdd4mkrzcGXss+6/mxUd273PfbWqSDHRzMT2234gIg2QYfAjvXLSquP1xECSg09Q==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.28.6.tgz#40a2b423f6db7b70f043ad027a58bcb44a9757b6\"\n+ integrity sha512-9U4QObUC0FtJl05AsUcodau/RWDytrU6uKgkxu09mLR9HLDAtUMoPuuskm5huQsoktmsYpI+bGmq+iapDcriKA==\n dependencies:\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \"@babel/helper-skip-transparent-expression-wrappers\" \"^7.27.1\"\n \n \"@babel/plugin-transform-sticky-regex@^7.24.7\":\n@@ -710,25 +694,25 @@\n dependencies:\n \"@babel/helper-plugin-utils\" \"^7.27.1\"\n \n-\"@babel/plugin-transform-template-literals@^7.0.0-0\":\n+\"@babel/plugin-transform-template-literals@7.27.1\":\n version \"7.27.1\"\n resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.27.1.tgz#1a0eb35d8bb3e6efc06c9fd40eb0bcef548328b8\"\n integrity sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==\n dependencies:\n \"@babel/helper-plugin-utils\" \"^7.27.1\"\n \n-\"@babel/plugin-transform-typescript@^7.25.2\", \"@babel/plugin-transform-typescript@^7.28.5\":\n- version \"7.28.5\"\n- resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.28.5.tgz#441c5f9a4a1315039516c6c612fc66d5f4594e72\"\n- integrity sha512-x2Qa+v/CuEoX7Dr31iAfr0IhInrVOWZU/2vJMJ00FOR/2nM0BcBEclpaf9sWCDc+v5e9dMrhSH8/atq/kX7+bA==\n+\"@babel/plugin-transform-typescript@^7.25.2\", \"@babel/plugin-transform-typescript@^7.27.1\", \"@babel/plugin-transform-typescript@^7.28.5\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.28.6.tgz#1e93d96da8adbefdfdade1d4956f73afa201a158\"\n+ integrity sha512-0YWL2RFxOqEm9Efk5PvreamxPME8OyY0wM5wh5lHjF+VtVhdneCWGzZeSqzOfiobVqQaNCd2z0tQvnI9DaPWPw==\n dependencies:\n \"@babel/helper-annotate-as-pure\" \"^7.27.3\"\n- \"@babel/helper-create-class-features-plugin\" \"^7.28.5\"\n- \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-create-class-features-plugin\" \"^7.28.6\"\n+ \"@babel/helper-plugin-utils\" \"^7.28.6\"\n \"@babel/helper-skip-transparent-expression-wrappers\" \"^7.27.1\"\n- \"@babel/plugin-syntax-typescript\" \"^7.27.1\"\n+ \"@babel/plugin-syntax-typescript\" \"^7.28.6\"\n \n-\"@babel/plugin-transform-unicode-regex@^7.0.0-0\", \"@babel/plugin-transform-unicode-regex@^7.24.7\":\n+\"@babel/plugin-transform-unicode-regex@7.27.1\", \"@babel/plugin-transform-unicode-regex@^7.24.7\":\n version \"7.27.1\"\n resolved \"https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.27.1.tgz#25948f5c395db15f609028e370667ed8bae9af97\"\n integrity sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw==\n@@ -748,7 +732,18 @@\n \"@babel/plugin-transform-react-jsx-development\" \"^7.27.1\"\n \"@babel/plugin-transform-react-pure-annotations\" \"^7.27.1\"\n \n-\"@babel/preset-typescript@^7.16.7\", \"@babel/preset-typescript@^7.23.0\":\n+\"@babel/preset-typescript@7.27.1\":\n+ version \"7.27.1\"\n+ resolved \"https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.27.1.tgz#190742a6428d282306648a55b0529b561484f912\"\n+ integrity sha512-l7WfQfX0WK4M0v2RudjuQK4u99BS6yLHYEmdtVPP7lKV013zr9DygFuWNlnbvQ9LR+LS0Egz/XAvGx5U9MX0fQ==\n+ dependencies:\n+ \"@babel/helper-plugin-utils\" \"^7.27.1\"\n+ \"@babel/helper-validator-option\" \"^7.27.1\"\n+ \"@babel/plugin-syntax-jsx\" \"^7.27.1\"\n+ \"@babel/plugin-transform-modules-commonjs\" \"^7.27.1\"\n+ \"@babel/plugin-transform-typescript\" \"^7.27.1\"\n+\n+\"@babel/preset-typescript@^7.23.0\":\n version \"7.28.5\"\n resolved \"https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.28.5.tgz#540359efa3028236958466342967522fd8f2a60c\"\n integrity sha512-+bQy5WOI2V6LJZpPVxY+yp66XdZ2yifu0Mc1aP5CQKgjn4QM5IN2i5fAZ4xKop47pr8rpVhiAeu+nDQa12C8+g==\n@@ -760,49 +755,49 @@\n \"@babel/plugin-transform-typescript\" \"^7.28.5\"\n \n \"@babel/runtime@^7.12.1\", \"@babel/runtime@^7.20.0\", \"@babel/runtime@^7.25.0\", \"@babel/runtime@^7.9.2\":\n- version \"7.28.4\"\n- resolved \"https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326\"\n- integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.6.tgz#d267a43cb1836dc4d182cce93ae75ba954ef6d2b\"\n+ integrity sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==\n \n-\"@babel/template@^7.25.0\", \"@babel/template@^7.25.9\", \"@babel/template@^7.27.1\", \"@babel/template@^7.27.2\", \"@babel/template@^7.3.3\":\n- version \"7.27.2\"\n- resolved \"https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d\"\n- integrity sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==\n+\"@babel/template@^7.25.0\", \"@babel/template@^7.28.6\", \"@babel/template@^7.3.3\":\n+ version \"7.28.6\"\n+ resolved \"https://registry.yarnpkg.com/@babel/template/-/template-7.28.6.tgz#0e7e56ecedb78aeef66ce7972b082fce76a23e57\"\n+ integrity sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==\n dependencies:\n- \"@babel/code-frame\" \"^7.27.1\"\n- \"@babel/parser\" \"^7.27.2\"\n- \"@babel/types\" \"^7.27.1\"\n+ \"@babel/code-frame\" \"^7.28.6\"\n+ \"@babel/parser\" \"^7.28.6\"\n+ \"@babel/types\" \"^7.28.6\"\n \n \"@babel/traverse--for-generate-function-map@npm:@babel/traverse@^7.25.3\":\n- version \"7.28.5\"\n- resolved \"https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.5.tgz#450cab9135d21a7a2ca9d2d35aa05c20e68c360b\"\n- integrity sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==\n+ version \"7.29.0\"\n+ resolved \"https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.29.0.tgz#f323d05001440253eead3c9c858adbe00b90310a\"\n+ integrity sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==\n dependencies:\n- \"@babel/code-frame\" \"^7.27.1\"\n- \"@babel/generator\" \"^7.28.5\"\n+ \"@babel/code-frame\" \"^7.29.0\"\n+ \"@babel/generator\" \"^7.29.0\"\n \"@babel/helper-globals\" \"^7.28.0\"\n- \"@babel/parser\" \"^7.28.5\"\n- \"@babel/template\" \"^7.27.2\"\n- \"@babel/types\" \"^7.28.5\"\n+ \"@babel/parser\" \"^7.29.0\"\n+ \"@babel/template\" \"^7.28.6\"\n+ \"@babel/types\" \"^7.29.0\"\n debug \"^4.3.1\"\n \n-\"@babel/traverse@^7.25.3\", \"@babel/traverse@^7.25.9\", \"@babel/traverse@^7.27.1\", \"@babel/traverse@^7.28.0\", \"@babel/traverse@^7.28.3\", \"@babel/traverse@^7.28.4\", \"@babel/traverse@^7.28.5\":\n- version \"7.28.5\"\n- resolved \"https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.5.tgz#450cab9135d21a7a2ca9d2d35aa05c20e68c360b\"\n- integrity sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==\n+\"@babel/traverse@^7.25.3\", \"@babel/traverse@^7.27.1\", \"@babel/traverse@^7.28.4\", \"@babel/traverse@^7.28.5\", \"@babel/traverse@^7.28.6\", \"@babel/traverse@^7.29.0\":\n+ version \"7.29.0\"\n+ resolved \"https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.29.0.tgz#f323d05001440253eead3c9c858adbe00b90310a\"\n+ integrity sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==\n dependencies:\n- \"@babel/code-frame\" \"^7.27.1\"\n- \"@babel/generator\" \"^7.28.5\"\n+ \"@babel/code-frame\" \"^7.29.0\"\n+ \"@babel/generator\" \"^7.29.0\"\n \"@babel/helper-globals\" \"^7.28.0\"\n- \"@babel/parser\" \"^7.28.5\"\n- \"@babel/template\" \"^7.27.2\"\n- \"@babel/types\" \"^7.28.5\"\n+ \"@babel/parser\" \"^7.29.0\"\n+ \"@babel/template\" \"^7.28.6\"\n+ \"@babel/types\" \"^7.29.0\"\n debug \"^4.3.1\"\n \n-\"@babel/types@^7.0.0\", \"@babel/types@^7.20.7\", \"@babel/types@^7.25.2\", \"@babel/types@^7.26.0\", \"@babel/types@^7.27.1\", \"@babel/types@^7.27.3\", \"@babel/types@^7.28.2\", \"@babel/types@^7.28.4\", \"@babel/types@^7.28.5\", \"@babel/types@^7.3.3\":\n- version \"7.28.5\"\n- resolved \"https://registry.yarnpkg.com/@babel/types/-/types-7.28.5.tgz#10fc405f60897c35f07e85493c932c7b5ca0592b\"\n- integrity sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==\n+\"@babel/types@^7.0.0\", \"@babel/types@^7.20.7\", \"@babel/types@^7.25.2\", \"@babel/types@^7.26.0\", \"@babel/types@^7.27.1\", \"@babel/types@^7.27.3\", \"@babel/types@^7.28.2\", \"@babel/types@^7.28.5\", \"@babel/types@^7.28.6\", \"@babel/types@^7.29.0\", \"@babel/types@^7.3.3\":\n+ version \"7.29.0\"\n+ resolved \"https://registry.yarnpkg.com/@babel/types/-/types-7.29.0.tgz#9f5b1e838c446e72cf3cd4b918152b8c605e37c7\"\n+ integrity sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==\n dependencies:\n \"@babel/helper-string-parser\" \"^7.27.1\"\n \"@babel/helper-validator-identifier\" \"^7.28.5\"\n@@ -819,14 +814,14 @@\n dependencies:\n \"@types/hammerjs\" \"^2.0.36\"\n \n-\"@eslint-community/eslint-utils@^4.2.0\", \"@eslint-community/eslint-utils@^4.7.0\":\n- version \"4.9.0\"\n- resolved \"https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz#7308df158e064f0dd8b8fdb58aa14fa2a7f913b3\"\n- integrity sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==\n+\"@eslint-community/eslint-utils@^4.2.0\", \"@eslint-community/eslint-utils@^4.9.1\":\n+ version \"4.9.1\"\n+ resolved \"https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz#4e90af67bc51ddee6cdef5284edf572ec376b595\"\n+ integrity sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==\n dependencies:\n eslint-visitor-keys \"^3.4.3\"\n \n-\"@eslint-community/regexpp@^4.10.0\", \"@eslint-community/regexpp@^4.6.1\":\n+\"@eslint-community/regexpp@^4.12.2\", \"@eslint-community/regexpp@^4.6.1\":\n version \"4.12.2\"\n resolved \"https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz#bccdf615bcf7b6e8db830ec0b8d21c9a25de597b\"\n integrity sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==\n@@ -851,32 +846,32 @@\n resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2\"\n integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==\n \n-\"@expo/cli@54.0.19\":\n- version \"54.0.19\"\n- resolved \"https://registry.yarnpkg.com/@expo/cli/-/cli-54.0.19.tgz#42f3e99a507717c5238c35f8005fd6beee271ea0\"\n- integrity sha512-Za+Ena29uYkq2c1Lbh+r3VrooR/mW7c9dahoH4WvL1T9ttbfAeu7sJmCuWZo88bZ4bFsOpE5fYne71DK11iSrQ==\n+\"@expo/cli@55.0.14\":\n+ version \"55.0.14\"\n+ resolved \"https://registry.yarnpkg.com/@expo/cli/-/cli-55.0.14.tgz#84654dae7b042f83720a4d001241bb5e806265cc\"\n+ integrity sha512-glXPSjjLCIz+KX/ezqLTGIF9eTE1lexiCxunvB3loRZNnGeBDGW3eF++cuPKudW26jeC6bqZkcqBG7Lp0Sp9qg==\n dependencies:\n- \"@0no-co/graphql.web\" \"^1.0.8\"\n- \"@expo/code-signing-certificates\" \"^0.0.5\"\n- \"@expo/config\" \"~12.0.12\"\n- \"@expo/config-plugins\" \"~54.0.3\"\n+ \"@expo/code-signing-certificates\" \"^0.0.6\"\n+ \"@expo/config\" \"~55.0.8\"\n+ \"@expo/config-plugins\" \"~55.0.6\"\n \"@expo/devcert\" \"^1.2.1\"\n- \"@expo/env\" \"~2.0.8\"\n- \"@expo/image-utils\" \"^0.8.8\"\n- \"@expo/json-file\" \"^10.0.8\"\n- \"@expo/metro\" \"~54.1.0\"\n- \"@expo/metro-config\" \"~54.0.11\"\n- \"@expo/osascript\" \"^2.3.8\"\n- \"@expo/package-manager\" \"^1.9.9\"\n- \"@expo/plist\" \"^0.4.8\"\n- \"@expo/prebuild-config\" \"^54.0.7\"\n- \"@expo/schema-utils\" \"^0.1.8\"\n+ \"@expo/env\" \"~2.1.1\"\n+ \"@expo/image-utils\" \"^0.8.12\"\n+ \"@expo/json-file\" \"^10.0.12\"\n+ \"@expo/log-box\" \"55.0.7\"\n+ \"@expo/metro\" \"~54.2.0\"\n+ \"@expo/metro-config\" \"~55.0.9\"\n+ \"@expo/osascript\" \"^2.4.2\"\n+ \"@expo/package-manager\" \"^1.10.3\"\n+ \"@expo/plist\" \"^0.5.2\"\n+ \"@expo/prebuild-config\" \"^55.0.8\"\n+ \"@expo/require-utils\" \"^55.0.2\"\n+ \"@expo/router-server\" \"^55.0.9\"\n+ \"@expo/schema-utils\" \"^55.0.2\"\n \"@expo/spawn-async\" \"^1.7.2\"\n \"@expo/ws-tunnel\" \"^1.0.1\"\n- \"@expo/xcpretty\" \"^4.3.0\"\n- \"@react-native/dev-middleware\" \"0.81.5\"\n- \"@urql/core\" \"^5.0.6\"\n- \"@urql/exchange-retry\" \"^1.3.0\"\n+ \"@expo/xcpretty\" \"^4.4.0\"\n+ \"@react-native/dev-middleware\" \"0.83.2\"\n accepts \"^1.3.8\"\n arg \"^5.0.2\"\n better-opn \"~3.0.2\"\n@@ -887,55 +882,48 @@\n compression \"^1.7.4\"\n connect \"^3.7.0\"\n debug \"^4.3.4\"\n- env-editor \"^0.4.1\"\n- expo-server \"^1.0.5\"\n- freeport-async \"^2.0.0\"\n+ dnssd-advertise \"^1.1.3\"\n+ expo-server \"^55.0.6\"\n+ fetch-nodeshim \"^0.4.6\"\n getenv \"^2.0.0\"\n glob \"^13.0.0\"\n- lan-network \"^0.1.6\"\n- minimatch \"^9.0.0\"\n- node-forge \"^1.3.1\"\n+ lan-network \"^0.2.0\"\n+ multitars \"^0.2.3\"\n+ node-forge \"^1.3.3\"\n npm-package-arg \"^11.0.0\"\n ora \"^3.4.0\"\n- picomatch \"^3.0.1\"\n- pretty-bytes \"^5.6.0\"\n+ picomatch \"^4.0.3\"\n pretty-format \"^29.7.0\"\n progress \"^2.0.3\"\n prompts \"^2.3.2\"\n- qrcode-terminal \"0.11.0\"\n- require-from-string \"^2.0.2\"\n- requireg \"^0.2.2\"\n- resolve \"^1.22.2\"\n resolve-from \"^5.0.0\"\n- resolve.exports \"^2.0.3\"\n semver \"^7.6.0\"\n send \"^0.19.0\"\n slugify \"^1.3.4\"\n source-map-support \"~0.5.21\"\n stacktrace-parser \"^0.1.10\"\n structured-headers \"^0.4.1\"\n- tar \"^7.5.2\"\n terminal-link \"^2.1.1\"\n- undici \"^6.18.2\"\n+ toqr \"^0.1.1\"\n wrap-ansi \"^7.0.0\"\n ws \"^8.12.1\"\n+ zod \"^3.25.76\"\n \n-\"@expo/code-signing-certificates@0.0.5\", \"@expo/code-signing-certificates@^0.0.5\":\n- version \"0.0.5\"\n- resolved \"https://registry.yarnpkg.com/@expo/code-signing-certificates/-/code-signing-certificates-0.0.5.tgz#a693ff684fb20c4725dade4b88a6a9f96b02496c\"\n- integrity sha512-BNhXkY1bblxKZpltzAx98G2Egj9g1Q+JRcvR7E99DOj862FTCX+ZPsAUtPTr7aHxwtrL7+fL3r0JSmM9kBm+Bw==\n+\"@expo/code-signing-certificates@^0.0.6\":\n+ version \"0.0.6\"\n+ resolved \"https://registry.yarnpkg.com/@expo/code-signing-certificates/-/code-signing-certificates-0.0.6.tgz#6b7b22830cb69c77a45e357c2f3aa7ab436ac772\"\n+ integrity sha512-iNe0puxwBNEcuua9gmTGzq+SuMDa0iATai1FlFTMHJ/vUmKvN/V//drXoLJkVb5i5H3iE/n/qIJxyoBnXouD0w==\n dependencies:\n- node-forge \"^1.2.1\"\n- nullthrows \"^1.1.1\"\n+ node-forge \"^1.3.3\"\n \n-\"@expo/config-plugins@~54.0.3\", \"@expo/config-plugins@~54.0.4\":\n- version \"54.0.4\"\n- resolved \"https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-54.0.4.tgz#b31cb16f6651342abcdafba600118245ecd9fb00\"\n- integrity sha512-g2yXGICdoOw5i3LkQSDxl2Q5AlQCrG7oniu0pCPPO+UxGb7He4AFqSvPSy8HpRUj55io17hT62FTjYRD+d6j3Q==\n+\"@expo/config-plugins@^55.0.6\", \"@expo/config-plugins@~55.0.6\":\n+ version \"55.0.6\"\n+ resolved \"https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-55.0.6.tgz#fcc5d6e2bfe9d48861d219fa8d2fe88116e6a7cb\"\n+ integrity sha512-cIox6FjZlFaaX40rbQ3DvP9e87S5X85H9uw+BAxJE5timkMhuByy3GAlOsj1h96EyzSiol7Q6YIGgY1Jiz4M+A==\n dependencies:\n- \"@expo/config-types\" \"^54.0.10\"\n- \"@expo/json-file\" \"~10.0.8\"\n- \"@expo/plist\" \"^0.4.8\"\n+ \"@expo/config-types\" \"^55.0.5\"\n+ \"@expo/json-file\" \"~10.0.12\"\n+ \"@expo/plist\" \"^0.5.2\"\n \"@expo/sdk-runtime-versions\" \"^1.0.0\"\n chalk \"^4.1.2\"\n debug \"^4.3.5\"\n@@ -943,34 +931,31 @@\n glob \"^13.0.0\"\n resolve-from \"^5.0.0\"\n semver \"^7.5.4\"\n- slash \"^3.0.0\"\n slugify \"^1.6.6\"\n xcode \"^3.0.1\"\n xml2js \"0.6.0\"\n \n-\"@expo/config-types@^54.0.10\", \"@expo/config-types@^54.0.9\":\n- version \"54.0.10\"\n- resolved \"https://registry.yarnpkg.com/@expo/config-types/-/config-types-54.0.10.tgz#688f4338255d2fdea970f44e2dfd8e8d37dec292\"\n- integrity sha512-/J16SC2an1LdtCZ67xhSkGXpALYUVUNyZws7v+PVsFZxClYehDSoKLqyRaGkpHlYrCc08bS0RF5E0JV6g50psA==\n+\"@expo/config-types@^55.0.5\":\n+ version \"55.0.5\"\n+ resolved \"https://registry.yarnpkg.com/@expo/config-types/-/config-types-55.0.5.tgz#731ce3e95866254e18977c0026ebab8a00dd6e10\"\n+ integrity sha512-sCmSUZG4mZ/ySXvfyyBdhjivz8Q539X1NondwDdYG7s3SBsk+wsgPJzYsqgAG/P9+l0xWjUD2F+kQ1cAJ6NNLg==\n \n-\"@expo/config@~12.0.11\", \"@expo/config@~12.0.12\":\n- version \"12.0.12\"\n- resolved \"https://registry.yarnpkg.com/@expo/config/-/config-12.0.12.tgz#5e26390ec209ee56432e980451c08b361e0f07dd\"\n- integrity sha512-X2MW86+ulLpMGvdgfvpl2EOBAKUlwvnvoPwdaZeeyWufGopn1nTUeh4C9gMsplDaP1kXv9sLXVhOoUoX6g9PvQ==\n+\"@expo/config@~55.0.8\":\n+ version \"55.0.8\"\n+ resolved \"https://registry.yarnpkg.com/@expo/config/-/config-55.0.8.tgz#170e1cd109cc755ec7c19e52f61feea35bbcbd9a\"\n+ integrity sha512-D7RYYHfErCgEllGxNwdYdkgzLna7zkzUECBV3snbUpf7RvIpB5l1LpCgzuVoc5KVew5h7N1Tn4LnT/tBSUZsQg==\n dependencies:\n- \"@babel/code-frame\" \"~7.10.4\"\n- \"@expo/config-plugins\" \"~54.0.3\"\n- \"@expo/config-types\" \"^54.0.10\"\n- \"@expo/json-file\" \"^10.0.8\"\n+ \"@expo/config-plugins\" \"~55.0.6\"\n+ \"@expo/config-types\" \"^55.0.5\"\n+ \"@expo/json-file\" \"^10.0.12\"\n+ \"@expo/require-utils\" \"^55.0.2\"\n deepmerge \"^4.3.1\"\n getenv \"^2.0.0\"\n glob \"^13.0.0\"\n- require-from-string \"^2.0.2\"\n resolve-from \"^5.0.0\"\n resolve-workspace-root \"^2.0.0\"\n semver \"^7.6.0\"\n slugify \"^1.3.4\"\n- sucrase \"~3.35.1\"\n \n \"@expo/devcert@^1.2.1\":\n version \"1.2.1\"\n@@ -980,29 +965,33 @@\n \"@expo/sudo-prompt\" \"^9.3.1\"\n debug \"^3.1.0\"\n \n-\"@expo/devtools@0.1.8\":\n- version \"0.1.8\"\n- resolved \"https://registry.yarnpkg.com/@expo/devtools/-/devtools-0.1.8.tgz#bc5b297698f78b3b67037f04593a31e688330a7a\"\n- integrity sha512-SVLxbuanDjJPgc0sy3EfXUMLb/tXzp6XIHkhtPVmTWJAp+FOr6+5SeiCfJrCzZFet0Ifyke2vX3sFcKwEvCXwQ==\n+\"@expo/devtools@55.0.2\":\n+ version \"55.0.2\"\n+ resolved \"https://registry.yarnpkg.com/@expo/devtools/-/devtools-55.0.2.tgz#ef3a6d4beda23d7a503a43155f14f2d2fb95bee6\"\n+ integrity sha512-4VsFn9MUriocyuhyA+ycJP3TJhUsOFHDc270l9h3LhNpXMf6wvIdGcA0QzXkZtORXmlDybWXRP2KT1k36HcQkA==\n dependencies:\n chalk \"^4.1.2\"\n \n-\"@expo/env@~2.0.8\":\n- version \"2.0.8\"\n- resolved \"https://registry.yarnpkg.com/@expo/env/-/env-2.0.8.tgz#2aea906eed3d297b2e19608dc1a800fba0a3fe03\"\n- integrity sha512-5VQD6GT8HIMRaSaB5JFtOXuvfDVU80YtZIuUT/GDhUF782usIXY13Tn3IdDz1Tm/lqA9qnRZQ1BF4t7LlvdJPA==\n+\"@expo/dom-webview@^55.0.3\":\n+ version \"55.0.3\"\n+ resolved \"https://registry.yarnpkg.com/@expo/dom-webview/-/dom-webview-55.0.3.tgz#97dfe2ede4a17eb05a44ba65487724192f07a6cf\"\n+ integrity sha512-bY4/rfcZ0f43DvOtMn8/kmPlmo01tex5hRoc5hKbwBwQjqWQuQt0ACwu7akR9IHI4j0WNG48eL6cZB6dZUFrzg==\n+\n+\"@expo/env@^2.0.11\", \"@expo/env@~2.1.1\":\n+ version \"2.1.1\"\n+ resolved \"https://registry.yarnpkg.com/@expo/env/-/env-2.1.1.tgz#95c047b69dee14a6ebaaa0415c4896ac69f1bf0d\"\n+ integrity sha512-rVvHC4I6xlPcg+mAO09ydUi2Wjv1ZytpLmHOSzvXzBAz9mMrJggqCe4s4dubjJvi/Ino/xQCLhbaLCnTtLpikg==\n dependencies:\n chalk \"^4.0.0\"\n debug \"^4.3.4\"\n- dotenv \"~16.4.5\"\n- dotenv-expand \"~11.0.6\"\n getenv \"^2.0.0\"\n \n-\"@expo/fingerprint@0.15.4\":\n- version \"0.15.4\"\n- resolved \"https://registry.yarnpkg.com/@expo/fingerprint/-/fingerprint-0.15.4.tgz#578bd1e1179a13313f7de682ebaaacb703b2b7ac\"\n- integrity sha512-eYlxcrGdR2/j2M6pEDXo9zU9KXXF1vhP+V+Tl+lyY+bU8lnzrN6c637mz6Ye3em2ANy8hhUR03Raf8VsT9Ogng==\n+\"@expo/fingerprint@0.16.5\":\n+ version \"0.16.5\"\n+ resolved \"https://registry.yarnpkg.com/@expo/fingerprint/-/fingerprint-0.16.5.tgz#20fc4e48612e3d7b5c3538fcccab58a4f74dbea3\"\n+ integrity sha512-mLrcymtgkW9IJ/G1e8MH1Xt2VIb1MOS86ePY0ePcnV3nVyJqm7gfa/AXD1Hk+eZXvf8XhioYz6QZaamBdEzR3A==\n dependencies:\n+ \"@expo/env\" \"^2.0.11\"\n \"@expo/spawn-async\" \"^1.7.2\"\n arg \"^5.0.2\"\n chalk \"^4.1.2\"\n@@ -1010,15 +999,14 @@\n getenv \"^2.0.0\"\n glob \"^13.0.0\"\n ignore \"^5.3.1\"\n- minimatch \"^9.0.0\"\n- p-limit \"^3.1.0\"\n+ minimatch \"^10.2.2\"\n resolve-from \"^5.0.0\"\n semver \"^7.6.0\"\n \n-\"@expo/image-utils@^0.8.8\":\n- version \"0.8.8\"\n- resolved \"https://registry.yarnpkg.com/@expo/image-utils/-/image-utils-0.8.8.tgz#db5d460fd0c7101b10e9d027ffbe42f9cf115248\"\n- integrity sha512-HHHaG4J4nKjTtVa1GG9PCh763xlETScfEyNxxOvfTRr8IKPJckjTyqSLEtdJoFNJ1vqiABEjW7tqGhqGibZLeA==\n+\"@expo/image-utils@^0.8.12\":\n+ version \"0.8.12\"\n+ resolved \"https://registry.yarnpkg.com/@expo/image-utils/-/image-utils-0.8.12.tgz#56e34b9555745ad4d11c972fe0d1ce71c7c64c41\"\n+ integrity sha512-3KguH7kyKqq7pNwLb9j6BBdD/bjmNwXZG/HPWT6GWIXbwrvAJt2JNyYTP5agWJ8jbbuys1yuCzmkX+TU6rmI7A==\n dependencies:\n \"@expo/spawn-async\" \"^1.7.2\"\n chalk \"^4.0.0\"\n@@ -1026,113 +1014,142 @@\n jimp-compact \"0.16.1\"\n parse-png \"^2.1.0\"\n resolve-from \"^5.0.0\"\n- resolve-global \"^1.0.0\"\n semver \"^7.6.0\"\n- temp-dir \"~2.0.0\"\n- unique-string \"~2.0.0\"\n \n-\"@expo/json-file@^10.0.8\", \"@expo/json-file@~10.0.8\":\n- version \"10.0.8\"\n- resolved \"https://registry.yarnpkg.com/@expo/json-file/-/json-file-10.0.8.tgz#05e524d1ecc0011db0a6d66b525ea2f58cfe6d43\"\n- integrity sha512-9LOTh1PgKizD1VXfGQ88LtDH0lRwq9lsTb4aichWTWSWqy3Ugfkhfm3BhzBIkJJfQQ5iJu3m/BoRlEIjoCGcnQ==\n+\"@expo/json-file@^10.0.12\", \"@expo/json-file@~10.0.12\":\n+ version \"10.0.12\"\n+ resolved \"https://registry.yarnpkg.com/@expo/json-file/-/json-file-10.0.12.tgz#411216996ab6df6765d463de22283b3f30e49ccb\"\n+ integrity sha512-inbDycp1rMAelAofg7h/mMzIe+Owx6F7pur3XdQ3EPTy00tme+4P6FWgHKUcjN8dBSrnbRNpSyh5/shzHyVCyQ==\n dependencies:\n- \"@babel/code-frame\" \"~7.10.4\"\n+ \"@babel/code-frame\" \"^7.20.0\"\n json5 \"^2.2.3\"\n \n-\"@expo/metro-config@54.0.11\", \"@expo/metro-config@~54.0.11\":\n- version \"54.0.11\"\n- resolved \"https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-54.0.11.tgz#a4fa797f288a9ec037cdd5139956a9fcfa8fb3d8\"\n- integrity sha512-Bmht6VW9w6Wk49EFqkMzYpICV++Q3Kuqh2KygjH/e5mj/9wHSCWLkmJYmUn0XaOo4bm6BwOp/hO3r5YNKP3AeQ==\n+\"@expo/local-build-cache-provider@55.0.6\":\n+ version \"55.0.6\"\n+ resolved \"https://registry.yarnpkg.com/@expo/local-build-cache-provider/-/local-build-cache-provider-55.0.6.tgz#340952aa86720e54cbafeefa48818f8a78bf5703\"\n+ integrity sha512-4kfdv48sKzokijMqi07fINYA9/XprshmPgSLf8i69XgzIv2YdRyBbb70SzrufB7PDneFoltz8N83icW8gOOj1g==\n+ dependencies:\n+ \"@expo/config\" \"~55.0.8\"\n+ chalk \"^4.1.2\"\n+\n+\"@expo/log-box@55.0.7\":\n+ version \"55.0.7\"\n+ resolved \"https://registry.yarnpkg.com/@expo/log-box/-/log-box-55.0.7.tgz#c845e2695bef4e3409bea939d2028e70c389c266\"\n+ integrity sha512-m7V1k2vlMp4NOj3fopjOg4zl/ANXyTRF3HMTMep2GZAKsPiDzgOQ41nm8CaU50/HlDIGXlCObss07gOn20UpHQ==\n+ dependencies:\n+ \"@expo/dom-webview\" \"^55.0.3\"\n+ anser \"^1.4.9\"\n+ stacktrace-parser \"^0.1.10\"\n+\n+\"@expo/metro-config@55.0.9\", \"@expo/metro-config@~55.0.9\":\n+ version \"55.0.9\"\n+ resolved \"https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-55.0.9.tgz#08be54522536ba34354b51f2d41d801aa13cc828\"\n+ integrity sha512-ZJFEfat/+dLUhFyFFWrzMjAqAwwUaJ3RD42QNqR7jh+RVYkAf6XYLynb5qrKJTHI1EcOx4KoO1717yXYYRFDBA==\n dependencies:\n \"@babel/code-frame\" \"^7.20.0\"\n \"@babel/core\" \"^7.20.0\"\n \"@babel/generator\" \"^7.20.5\"\n- \"@expo/config\" \"~12.0.12\"\n- \"@expo/env\" \"~2.0.8\"\n- \"@expo/json-file\" \"~10.0.8\"\n- \"@expo/metro\" \"~54.1.0\"\n+ \"@expo/config\" \"~55.0.8\"\n+ \"@expo/env\" \"~2.1.1\"\n+ \"@expo/json-file\" \"~10.0.12\"\n+ \"@expo/metro\" \"~54.2.0\"\n \"@expo/spawn-async\" \"^1.7.2\"\n browserslist \"^4.25.0\"\n chalk \"^4.1.0\"\n debug \"^4.3.2\"\n- dotenv \"~16.4.5\"\n- dotenv-expand \"~11.0.6\"\n getenv \"^2.0.0\"\n glob \"^13.0.0\"\n- hermes-parser \"^0.29.1\"\n+ hermes-parser \"^0.32.0\"\n jsc-safe-url \"^0.2.4\"\n lightningcss \"^1.30.1\"\n- minimatch \"^9.0.0\"\n+ picomatch \"^4.0.3\"\n postcss \"~8.4.32\"\n resolve-from \"^5.0.0\"\n \n-\"@expo/metro@~54.1.0\":\n- version \"54.1.0\"\n- resolved \"https://registry.yarnpkg.com/@expo/metro/-/metro-54.1.0.tgz#27765ef2c342c39086a2f5c9f932a375dc2ccad3\"\n- integrity sha512-MgdeRNT/LH0v1wcO0TZp9Qn8zEF0X2ACI0wliPtv5kXVbXWI+yK9GyrstwLAiTXlULKVIg3HVSCCvmLu0M3tnw==\n- dependencies:\n- metro \"0.83.2\"\n- metro-babel-transformer \"0.83.2\"\n- metro-cache \"0.83.2\"\n- metro-cache-key \"0.83.2\"\n- metro-config \"0.83.2\"\n- metro-core \"0.83.2\"\n- metro-file-map \"0.83.2\"\n- metro-resolver \"0.83.2\"\n- metro-runtime \"0.83.2\"\n- metro-source-map \"0.83.2\"\n- metro-transform-plugins \"0.83.2\"\n- metro-transform-worker \"0.83.2\"\n-\n-\"@expo/osascript@^2.3.8\":\n- version \"2.3.8\"\n- resolved \"https://registry.yarnpkg.com/@expo/osascript/-/osascript-2.3.8.tgz#6b376f09650e6476991f707356be54b5ea53d89e\"\n- integrity sha512-/TuOZvSG7Nn0I8c+FcEaoHeBO07yu6vwDgk7rZVvAXoeAK5rkA09jRyjYsZo+0tMEFaToBeywA6pj50Mb3ny9w==\n+\"@expo/metro@~54.2.0\":\n+ version \"54.2.0\"\n+ resolved \"https://registry.yarnpkg.com/@expo/metro/-/metro-54.2.0.tgz#6ecf4a77ae7553b73daca4206854728de76c854d\"\n+ integrity sha512-h68TNZPGsk6swMmLm9nRSnE2UXm48rWwgcbtAHVMikXvbxdS41NDHHeqg1rcQ9AbznDRp6SQVC2MVpDnsRKU1w==\n+ dependencies:\n+ metro \"0.83.3\"\n+ metro-babel-transformer \"0.83.3\"\n+ metro-cache \"0.83.3\"\n+ metro-cache-key \"0.83.3\"\n+ metro-config \"0.83.3\"\n+ metro-core \"0.83.3\"\n+ metro-file-map \"0.83.3\"\n+ metro-minify-terser \"0.83.3\"\n+ metro-resolver \"0.83.3\"\n+ metro-runtime \"0.83.3\"\n+ metro-source-map \"0.83.3\"\n+ metro-symbolicate \"0.83.3\"\n+ metro-transform-plugins \"0.83.3\"\n+ metro-transform-worker \"0.83.3\"\n+\n+\"@expo/osascript@^2.4.2\":\n+ version \"2.4.2\"\n+ resolved \"https://registry.yarnpkg.com/@expo/osascript/-/osascript-2.4.2.tgz#fe341cff1eb2c939da43cf58ade5504c8a5d77ca\"\n+ integrity sha512-/XP7PSYF2hzOZzqfjgkoWtllyeTN8dW3aM4P6YgKcmmPikKL5FdoyQhti4eh6RK5a5VrUXJTOlTNIpIHsfB5Iw==\n dependencies:\n \"@expo/spawn-async\" \"^1.7.2\"\n- exec-async \"^2.2.0\"\n \n-\"@expo/package-manager@^1.9.9\":\n- version \"1.9.9\"\n- resolved \"https://registry.yarnpkg.com/@expo/package-manager/-/package-manager-1.9.9.tgz#dd030d2bccebd095e02bfb6976852afaddcd122a\"\n- integrity sha512-Nv5THOwXzPprMJwbnXU01iXSrCp3vJqly9M4EJ2GkKko9Ifer2ucpg7x6OUsE09/lw+npaoUnHMXwkw7gcKxlg==\n+\"@expo/package-manager@^1.10.3\":\n+ version \"1.10.3\"\n+ resolved \"https://registry.yarnpkg.com/@expo/package-manager/-/package-manager-1.10.3.tgz#151fafc1c30de3e75df78f7c0424915210779288\"\n+ integrity sha512-ZuXiK/9fCrIuLjPSe1VYmfp0Sa85kCMwd8QQpgyi5ufppYKRtLBg14QOgUqj8ZMbJTxE0xqzd0XR7kOs3vAK9A==\n dependencies:\n- \"@expo/json-file\" \"^10.0.8\"\n+ \"@expo/json-file\" \"^10.0.12\"\n \"@expo/spawn-async\" \"^1.7.2\"\n chalk \"^4.0.0\"\n npm-package-arg \"^11.0.0\"\n ora \"^3.4.0\"\n resolve-workspace-root \"^2.0.0\"\n \n-\"@expo/plist@^0.4.8\":\n- version \"0.4.8\"\n- resolved \"https://registry.yarnpkg.com/@expo/plist/-/plist-0.4.8.tgz#e014511a4a5008cf2b832b91caa8e9f2704127cc\"\n- integrity sha512-pfNtErGGzzRwHP+5+RqswzPDKkZrx+Cli0mzjQaus1ZWFsog5ibL+nVT3NcporW51o8ggnt7x813vtRbPiyOrQ==\n+\"@expo/plist@^0.5.2\":\n+ version \"0.5.2\"\n+ resolved \"https://registry.yarnpkg.com/@expo/plist/-/plist-0.5.2.tgz#5bfc81cf09c1c0513a31d7e5cabf85b2ac4d1d71\"\n+ integrity sha512-o4xdVdBpe4aTl3sPMZ2u3fJH4iG1I768EIRk1xRZP+GaFI93MaR3JvoFibYqxeTmLQ1p1kNEVqylfUjezxx45g==\n dependencies:\n \"@xmldom/xmldom\" \"^0.8.8\"\n- base64-js \"^1.2.3\"\n+ base64-js \"^1.5.1\"\n xmlbuilder \"^15.1.1\"\n \n-\"@expo/prebuild-config@^54.0.7\":\n- version \"54.0.7\"\n- resolved \"https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-54.0.7.tgz#b8b0769baca750495abc936c00670a5e37a1780d\"\n- integrity sha512-cKqBsiwcFFzpDWgtvemrCqJULJRLDLKo2QMF74NusoGNpfPI3vQVry1iwnYLeGht02AeD3dvfhpqBczD3wchxA==\n- dependencies:\n- \"@expo/config\" \"~12.0.11\"\n- \"@expo/config-plugins\" \"~54.0.3\"\n- \"@expo/config-types\" \"^54.0.9\"\n- \"@expo/image-utils\" \"^0.8.8\"\n- \"@expo/json-file\" \"^10.0.8\"\n- \"@react-native/normalize-colors\" \"0.81.5\"\n+\"@expo/prebuild-config@^55.0.8\":\n+ version \"55.0.8\"\n+ resolved \"https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-55.0.8.tgz#4db5d7d52818bac854da4f28851c3b4e97f14094\"\n+ integrity sha512-VJNJiOmmZgyDnR7JMmc3B8Z0ZepZ17I8Wtw+wAH/2+UCUsFg588XU+bwgYcFGw+is28kwGjY46z43kfufpxOnA==\n+ dependencies:\n+ \"@expo/config\" \"~55.0.8\"\n+ \"@expo/config-plugins\" \"~55.0.6\"\n+ \"@expo/config-types\" \"^55.0.5\"\n+ \"@expo/image-utils\" \"^0.8.12\"\n+ \"@expo/json-file\" \"^10.0.12\"\n+ \"@react-native/normalize-colors\" \"0.83.2\"\n debug \"^4.3.1\"\n resolve-from \"^5.0.0\"\n semver \"^7.6.0\"\n xml2js \"0.6.0\"\n \n-\"@expo/schema-utils@^0.1.8\":\n- version \"0.1.8\"\n- resolved \"https://registry.yarnpkg.com/@expo/schema-utils/-/schema-utils-0.1.8.tgz#8b9543d77fc4ac4954196e3fa00f8fcedd71426a\"\n- integrity sha512-9I6ZqvnAvKKDiO+ZF8BpQQFYWXOJvTAL5L/227RUbWG1OVZDInFifzCBiqAZ3b67NRfeAgpgvbA7rejsqhY62A==\n+\"@expo/require-utils@^55.0.2\":\n+ version \"55.0.2\"\n+ resolved \"https://registry.yarnpkg.com/@expo/require-utils/-/require-utils-55.0.2.tgz#ca21b841aa5d450852fb3387e0ff7acd8d5dc247\"\n+ integrity sha512-dV5oCShQ1umKBKagMMT4B/N+SREsQe3lU4Zgmko5AO0rxKV0tynZT6xXs+e2JxuqT4Rz997atg7pki0BnZb4uw==\n+ dependencies:\n+ \"@babel/code-frame\" \"^7.20.0\"\n+ \"@babel/core\" \"^7.25.2\"\n+ \"@babel/plugin-transform-modules-commonjs\" \"^7.24.8\"\n+\n+\"@expo/router-server@^55.0.9\":\n+ version \"55.0.9\"\n+ resolved \"https://registry.yarnpkg.com/@expo/router-server/-/router-server-55.0.9.tgz#bbf27e7f48b02e960a688baadc3ed184f0ac7a80\"\n+ integrity sha512-LcCFi+P1qfZOsw0DO4JwNKRxtWt4u2bjTYj0PUe4WVf9NVG/NfUetAXYRbBS6P+gupfM6SC+/bdzdqCWQh7j8g==\n+ dependencies:\n+ debug \"^4.3.4\"\n+\n+\"@expo/schema-utils@^55.0.2\":\n+ version \"55.0.2\"\n+ resolved \"https://registry.yarnpkg.com/@expo/schema-utils/-/schema-utils-55.0.2.tgz#f45be98fe57e4dc87c4fc36c7ac532672e0ecf86\"\n+ integrity sha512-QZ5WKbJOWkCrMq0/kfhV9ry8te/OaS34YgLVpG8u9y2gix96TlpRTbxM/YATjNcUR2s4fiQmPCOxkGtog4i37g==\n \n \"@expo/sdk-runtime-versions@^1.0.0\":\n version \"1.0.0\"\n@@ -1151,24 +1168,23 @@\n resolved \"https://registry.yarnpkg.com/@expo/sudo-prompt/-/sudo-prompt-9.3.2.tgz#0fd2813402a42988e49145cab220e25bea74b308\"\n integrity sha512-HHQigo3rQWKMDzYDLkubN5WQOYXJJE2eNqIQC2axC2iO3mHdwnIR7FgZVvHWtBwAdzBgAP0ECp8KqS8TiMKvgw==\n \n-\"@expo/vector-icons@^15.0.3\":\n- version \"15.0.3\"\n- resolved \"https://registry.yarnpkg.com/@expo/vector-icons/-/vector-icons-15.0.3.tgz#12c38d4e6cc927dd0500e4591ac00672a8909748\"\n- integrity sha512-SBUyYKphmlfUBqxSfDdJ3jAdEVSALS2VUPOUyqn48oZmb2TL/O7t7/PQm5v4NQujYEPLPMTLn9KVw6H7twwbTA==\n+\"@expo/vector-icons@^15.0.2\", \"@expo/vector-icons@^15.0.3\":\n+ version \"15.1.1\"\n+ resolved \"https://registry.yarnpkg.com/@expo/vector-icons/-/vector-icons-15.1.1.tgz#4b1d2c60493c0b0536972f0a5babd5f5c85b48f4\"\n+ integrity sha512-Iu2VkcoI5vygbtYngm7jb4ifxElNVXQYdDrYkT7UCEIiKLeWnQY0wf2ZhHZ+Wro6Sc5TaumpKUOqDRpLi5rkvw==\n \n \"@expo/ws-tunnel@^1.0.1\":\n version \"1.0.6\"\n resolved \"https://registry.yarnpkg.com/@expo/ws-tunnel/-/ws-tunnel-1.0.6.tgz#92b70e7264ad42ea07f28a20f2f540b91d07bdd9\"\n integrity sha512-nDRbLmSrJar7abvUjp3smDwH8HcbZcoOEa5jVPUv9/9CajgmWw20JNRwTuBRzWIWIkEJDkz20GoNA+tSwUqk0Q==\n \n-\"@expo/xcpretty@^4.3.0\":\n- version \"4.3.2\"\n- resolved \"https://registry.yarnpkg.com/@expo/xcpretty/-/xcpretty-4.3.2.tgz#12dba1295167a9c8dde4be783d74f7e81648ca5d\"\n- integrity sha512-ReZxZ8pdnoI3tP/dNnJdnmAk7uLT4FjsKDGW7YeDdvdOMz2XCQSmSCM9IWlrXuWtMF9zeSB6WJtEhCQ41gQOfw==\n+\"@expo/xcpretty@^4.4.0\":\n+ version \"4.4.1\"\n+ resolved \"https://registry.yarnpkg.com/@expo/xcpretty/-/xcpretty-4.4.1.tgz#dcd41f886f8a0474c217adaef84f4733e44625c9\"\n+ integrity sha512-KZNxZvnGCtiM2aYYZ6Wz0Ix5r47dAvpNLApFtZWnSoERzAdOMzVBOPysBoM0JlF6FKWZ8GPqgn6qt3dV/8Zlpg==\n dependencies:\n- \"@babel/code-frame\" \"7.10.4\"\n+ \"@babel/code-frame\" \"^7.20.0\"\n chalk \"^4.1.0\"\n- find-up \"^5.0.0\"\n js-yaml \"^4.1.0\"\n \n \"@humanwhocodes/config-array@^0.13.0\":\n@@ -1190,30 +1206,6 @@\n resolved \"https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3\"\n integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==\n \n-\"@ide/backoff@^1.0.0\":\n- version \"1.0.0\"\n- resolved \"https://registry.yarnpkg.com/@ide/backoff/-/backoff-1.0.0.tgz#466842c25bd4a4833e0642fab41ccff064010176\"\n- integrity sha512-F0YfUDjvT+Mtt/R4xdl2X0EYCHMMiJqNLdxHD++jDT5ydEFIyqbCHh51Qx2E211dgZprPKhV7sHmnXKpLuvc5g==\n-\n-\"@isaacs/balanced-match@^4.0.1\":\n- version \"4.0.1\"\n- resolved \"https://registry.yarnpkg.com/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz#3081dadbc3460661b751e7591d7faea5df39dd29\"\n- integrity sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==\n-\n-\"@isaacs/brace-expansion@^5.0.0\":\n- version \"5.0.0\"\n- resolved \"https://registry.yarnpkg.com/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz#4b3dabab7d8e75a429414a96bd67bf4c1d13e0f3\"\n- integrity sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==\n- dependencies:\n- \"@isaacs/balanced-match\" \"^4.0.1\"\n-\n-\"@isaacs/fs-minipass@^4.0.0\":\n- version \"4.0.1\"\n- resolved \"https://registry.yarnpkg.com/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz#2d59ae3ab4b38fb4270bfa23d30f8e2e86c7fe32\"\n- integrity sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==\n- dependencies:\n- minipass \"^7.0.4\"\n-\n \"@isaacs/ttlcache@^1.4.1\":\n version \"1.4.1\"\n resolved \"https://registry.yarnpkg.com/@isaacs/ttlcache/-/ttlcache-1.4.1.tgz#21fb23db34e9b6220c6ba023a0118a2dd3461ea2\"\n@@ -1434,7 +1426,7 @@\n \"@types/yargs\" \"^17.0.8\"\n chalk \"^4.0.0\"\n \n-\"@jridgewell/gen-mapping@^0.3.12\", \"@jridgewell/gen-mapping@^0.3.2\", \"@jridgewell/gen-mapping@^0.3.5\":\n+\"@jridgewell/gen-mapping@^0.3.12\", \"@jridgewell/gen-mapping@^0.3.5\":\n version \"0.3.13\"\n resolved \"https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f\"\n integrity sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==\n@@ -1476,16 +1468,24 @@\n \"@jridgewell/resolve-uri\" \"^3.1.0\"\n \"@jridgewell/sourcemap-codec\" \"^1.4.14\"\n \n-\"@jsamr/counter-style@^2.0.2\":\n+\"@jsamr/counter-style@^2.0.1\", \"@jsamr/counter-style@^2.0.2\":\n version \"2.0.2\"\n resolved \"https://registry.yarnpkg.com/@jsamr/counter-style/-/counter-style-2.0.2.tgz#6f08cfa98e1f0416dc1d7f2d8ac38a8cdb004c5d\"\n integrity sha512-2mXudGVtSzVxWEA7B9jZLKjoXUeUFYDDtFrQoC0IFX9/Dszz4t1vZOmafi3JSw/FxD+udMQ+4TAFR8Qs0J3URQ==\n \n-\"@jsamr/react-native-li@^2.3.1\":\n+\"@jsamr/react-native-li@^2.3.0\", \"@jsamr/react-native-li@^2.3.1\":\n version \"2.3.1\"\n resolved \"https://registry.yarnpkg.com/@jsamr/react-native-li/-/react-native-li-2.3.1.tgz#12a5b5f6e3971cec77b96bee58104eed0ae9314a\"\n integrity sha512-Qbo4NEj48SQ4k8FZJHFE2fgZDKTWaUGmVxcIQh3msg5JezLdTMMHuRRDYctfdHI6L0FZGObmEv3haWbIvmol8w==\n \n+\"@native-html/css-processor@1.11.0\":\n+ version \"1.11.0\"\n+ resolved \"https://registry.yarnpkg.com/@native-html/css-processor/-/css-processor-1.11.0.tgz#27d02e5123b0849f4986d44060ba3f235a15f552\"\n+ integrity sha512-NnhBEbJX5M2gBGltPKOetiLlKhNf3OHdRafc8//e2ZQxXN8JaSW/Hy8cm94pnIckQxwaMKxrtaNT3x4ZcffoNQ==\n+ dependencies:\n+ css-to-react-native \"^3.0.0\"\n+ csstype \"^3.0.8\"\n+\n \"@native-html/css-processor@2.0.0-alpha.0\":\n version \"2.0.0-alpha.0\"\n resolved \"https://registry.yarnpkg.com/@native-html/css-processor/-/css-processor-2.0.0-alpha.0.tgz#05512c1da9efe7ac84dddaa9a02ac2f333f3d5d3\"\n@@ -1509,6 +1509,20 @@\n stringify-entities \"^4.0.4\"\n urijs \"^1.19.11\"\n \n+\"@native-html/transient-render-engine@11.2.3\":\n+ version \"11.2.3\"\n+ resolved \"https://registry.yarnpkg.com/@native-html/transient-render-engine/-/transient-render-engine-11.2.3.tgz#e4de0e7c8c023224a2dc27f3bd2b30d3984d94a4\"\n+ integrity sha512-zXwgA3gPUEmFs3I3syfnvDvS6WiUHXEE6jY09OBzK+trq7wkweOSFWIoyXiGkbXrozGYG0KY90YgPyr8Tg8Uyg==\n+ dependencies:\n+ \"@native-html/css-processor\" \"1.11.0\"\n+ \"@types/ramda\" \"^0.27.44\"\n+ csstype \"^3.0.9\"\n+ domelementtype \"^2.2.0\"\n+ domhandler \"^4.2.2\"\n+ domutils \"^2.8.0\"\n+ htmlparser2 \"^7.1.2\"\n+ ramda \"^0.27.2\"\n+\n \"@native-html/transient-render-engine@12.0.0-alpha.0\":\n version \"12.0.0-alpha.0\"\n resolved \"https://registry.yarnpkg.com/@native-html/transient-render-engine/-/transient-render-engine-12.0.0-alpha.0.tgz#9c4b905139154616f75a366af05b3b190ecfc460\"\n@@ -1555,45 +1569,40 @@\n dependencies:\n merge-options \"^3.0.4\"\n \n-\"@react-native-community/datetimepicker@8.4.4\":\n- version \"8.4.4\"\n- resolved \"https://registry.yarnpkg.com/@react-native-community/datetimepicker/-/datetimepicker-8.4.4.tgz#2160a808b596e85240cee2415be2eb2bd80d2e92\"\n- integrity sha512-bc4ZixEHxZC9/qf5gbdYvIJiLZ5CLmEsC3j+Yhe1D1KC/3QhaIfGDVdUcid0PdlSoGOSEq4VlB93AWyetEyBSQ==\n+\"@react-native-community/datetimepicker@8.6.0\":\n+ version \"8.6.0\"\n+ resolved \"https://registry.yarnpkg.com/@react-native-community/datetimepicker/-/datetimepicker-8.6.0.tgz#1c4318a8bc1d5bfd111d782a87cf0b729f718e79\"\n+ integrity sha512-yxPSqNfxgpGaqHQIpatqe6ykeBdU/1pdsk/G3x01mY2bpTflLpmVTLqFSJYd3MiZzxNZcMs/j1dQakUczSjcYA==\n dependencies:\n invariant \"^2.2.4\"\n \n-\"@react-native-community/slider@5.0.1\":\n- version \"5.0.1\"\n- resolved \"https://registry.yarnpkg.com/@react-native-community/slider/-/slider-5.0.1.tgz#478789e526af31e0660c6f49fa5c5429d8d4287b\"\n- integrity sha512-K3JRWkIW4wQ79YJ6+BPZzp1SamoikxfPRw7Yw4B4PElEQmqZFrmH9M5LxvIo460/3QSrZF/wCgi3qizJt7g/iw==\n+\"@react-native-community/slider@5.1.2\":\n+ version \"5.1.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-native-community/slider/-/slider-5.1.2.tgz#b7255c27b52d74440bcf146a05dcf13c94e7d91c\"\n+ integrity sha512-UV/MjCyCtSjS5BQDrrGIMmCXm309xEG6XbR0Dj65kzTraJSVDxSjQS2uBUXgX+5SZUOCzCxzv3OufOZBdtQY4w==\n \n \"@react-native-masked-view/masked-view@0.3.2\":\n version \"0.3.2\"\n resolved \"https://registry.yarnpkg.com/@react-native-masked-view/masked-view/-/masked-view-0.3.2.tgz#7064533a573e3539ec912f59c1f457371bf49dd9\"\n integrity sha512-XwuQoW7/GEgWRMovOQtX3A4PrXhyaZm0lVUiY8qJDvdngjLms9Cpdck6SmGAUNqQwcj2EadHC1HwL0bEyoa/SQ==\n \n-\"@react-native/assets-registry@0.81.5\":\n- version \"0.81.5\"\n- resolved \"https://registry.yarnpkg.com/@react-native/assets-registry/-/assets-registry-0.81.5.tgz#d22c924fa6f6d4a463c5af34ce91f38756c0fa7d\"\n- integrity sha512-705B6x/5Kxm1RKRvSv0ADYWm5JOnoiQ1ufW7h8uu2E6G9Of/eE6hP/Ivw3U5jI16ERqZxiKQwk34VJbB0niX9w==\n-\n-\"@react-native/assets-registry@0.83.0\":\n- version \"0.83.0\"\n- resolved \"https://registry.yarnpkg.com/@react-native/assets-registry/-/assets-registry-0.83.0.tgz#81a4a3c48069f4e2e4e9d55dbd4fbcb8102246be\"\n- integrity sha512-EmGSKDvmnEnBrTK75T+0Syt6gy/HACOTfziw5+392Kr1Bb28Rv26GyOIkvptnT+bb2VDHU0hx9G0vSy5/S3rmQ==\n+\"@react-native/assets-registry@0.83.2\":\n+ version \"0.83.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-native/assets-registry/-/assets-registry-0.83.2.tgz#485d4b085f360c3b4254cca382413b9ca609edb1\"\n+ integrity sha512-9I5l3pGAKnlpQ15uVkeB9Mgjvt3cZEaEc8EDtdexvdtZvLSjtwBzgourrOW4yZUijbjJr8h3YO2Y0q+THwUHTA==\n \n-\"@react-native/babel-plugin-codegen@0.81.5\":\n- version \"0.81.5\"\n- resolved \"https://registry.yarnpkg.com/@react-native/babel-plugin-codegen/-/babel-plugin-codegen-0.81.5.tgz#328d03f42c32b5a8cc2dee1aa84a7c48dddc5f18\"\n- integrity sha512-oF71cIH6je3fSLi6VPjjC3Sgyyn57JLHXs+mHWc9MoCiJJcM4nqsS5J38zv1XQ8d3zOW2JtHro+LF0tagj2bfQ==\n+\"@react-native/babel-plugin-codegen@0.83.2\":\n+ version \"0.83.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-native/babel-plugin-codegen/-/babel-plugin-codegen-0.83.2.tgz#511b9427cfaae8b110a5f50ac2c88bfc752f7c0b\"\n+ integrity sha512-XbcN/BEa64pVlb0Hb/E/Ph2SepjVN/FcNKrJcQvtaKZA6mBSO8pW8Eircdlr61/KBH94LihHbQoQDzkQFpeaTg==\n dependencies:\n \"@babel/traverse\" \"^7.25.3\"\n- \"@react-native/codegen\" \"0.81.5\"\n+ \"@react-native/codegen\" \"0.83.2\"\n \n-\"@react-native/babel-preset@0.81.5\":\n- version \"0.81.5\"\n- resolved \"https://registry.yarnpkg.com/@react-native/babel-preset/-/babel-preset-0.81.5.tgz#e8b7969d21f87ef4e41e603248e8a70c44b4a5bb\"\n- integrity sha512-UoI/x/5tCmi+pZ3c1+Ypr1DaRMDLI3y+Q70pVLLVgrnC3DHsHRIbHcCHIeG/IJvoeFqFM2sTdhSOLJrf8lOPrA==\n+\"@react-native/babel-preset@0.83.2\":\n+ version \"0.83.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-native/babel-preset/-/babel-preset-0.83.2.tgz#e449d4dedafed3c3000f6fa34c30d167653a9e27\"\n+ integrity sha512-X/RAXDfe6W+om/Fw1i6htTxQXFhBJ2jgNOWx3WpI3KbjeIWbq7ib6vrpTeIAW2NUMg+K3mML1NzgD4dpZeqdjA==\n dependencies:\n \"@babel/core\" \"^7.25.2\"\n \"@babel/plugin-proposal-export-default-from\" \"^7.24.7\"\n@@ -1636,28 +1645,15 @@\n \"@babel/plugin-transform-typescript\" \"^7.25.2\"\n \"@babel/plugin-transform-unicode-regex\" \"^7.24.7\"\n \"@babel/template\" \"^7.25.0\"\n- \"@react-native/babel-plugin-codegen\" \"0.81.5\"\n- babel-plugin-syntax-hermes-parser \"0.29.1\"\n+ \"@react-native/babel-plugin-codegen\" \"0.83.2\"\n+ babel-plugin-syntax-hermes-parser \"0.32.0\"\n babel-plugin-transform-flow-enums \"^0.0.2\"\n react-refresh \"^0.14.0\"\n \n-\"@react-native/codegen@0.81.5\":\n- version \"0.81.5\"\n- resolved \"https://registry.yarnpkg.com/@react-native/codegen/-/codegen-0.81.5.tgz#d4dec668c94b9d58a5c2dbdbf026db331e1b6b27\"\n- integrity sha512-a2TDA03Up8lpSa9sh5VRGCQDXgCTOyDOFH+aqyinxp1HChG8uk89/G+nkJ9FPd0rqgi25eCTR16TWdS3b+fA6g==\n- dependencies:\n- \"@babel/core\" \"^7.25.2\"\n- \"@babel/parser\" \"^7.25.3\"\n- glob \"^7.1.1\"\n- hermes-parser \"0.29.1\"\n- invariant \"^2.2.4\"\n- nullthrows \"^1.1.1\"\n- yargs \"^17.6.2\"\n-\n-\"@react-native/codegen@0.83.0\":\n- version \"0.83.0\"\n- resolved \"https://registry.yarnpkg.com/@react-native/codegen/-/codegen-0.83.0.tgz#7741f906892c257d5a35bfea38e45d68faa869de\"\n- integrity sha512-3fvMi/pSJHhikjwMZQplU4Ar9ANoR2GSBxotbkKIMI6iNduh+ln1FTvB2me69FA68aHtVZOO+cO+QpGCcvgaMA==\n+\"@react-native/codegen@0.83.2\":\n+ version \"0.83.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-native/codegen/-/codegen-0.83.2.tgz#ec80c189480e800af04c078fce7531caef7cc62e\"\n+ integrity sha512-9uK6X1miCXqtL4c759l74N/XbQeneWeQVjoV7SD2CGJuW7ZefxaoYenwGPs7rMoCdtS6wuIyR3hXQ+uWEBGYXA==\n dependencies:\n \"@babel/core\" \"^7.25.2\"\n \"@babel/parser\" \"^7.25.3\"\n@@ -1667,25 +1663,12 @@\n nullthrows \"^1.1.1\"\n yargs \"^17.6.2\"\n \n-\"@react-native/community-cli-plugin@0.81.5\":\n- version \"0.81.5\"\n- resolved \"https://registry.yarnpkg.com/@react-native/community-cli-plugin/-/community-cli-plugin-0.81.5.tgz#617789cda4da419d03dda00e2a78c36188b4391e\"\n- integrity sha512-yWRlmEOtcyvSZ4+OvqPabt+NS36vg0K/WADTQLhrYrm9qdZSuXmq8PmdJWz/68wAqKQ+4KTILiq2kjRQwnyhQw==\n- dependencies:\n- \"@react-native/dev-middleware\" \"0.81.5\"\n- debug \"^4.4.0\"\n- invariant \"^2.2.4\"\n- metro \"^0.83.1\"\n- metro-config \"^0.83.1\"\n- metro-core \"^0.83.1\"\n- semver \"^7.1.3\"\n-\n-\"@react-native/community-cli-plugin@0.83.0\":\n- version \"0.83.0\"\n- resolved \"https://registry.yarnpkg.com/@react-native/community-cli-plugin/-/community-cli-plugin-0.83.0.tgz#f33388646eb4109f2572c715fb341695369dc48c\"\n- integrity sha512-bJD5pLURgKY2YK0R6gUsFWHiblSAFt1Xyc2fsyCL8XBnB7kJfVhLAKGItk6j1QZbwm1Io41ekZxBmZdyQqIDrg==\n+\"@react-native/community-cli-plugin@0.83.2\":\n+ version \"0.83.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-native/community-cli-plugin/-/community-cli-plugin-0.83.2.tgz#034b4bc5bfecf4e52b7726ce328fa57a2b3ae76a\"\n+ integrity sha512-sTEF0eiUKtmImEP07Qo5c3Khvm1LIVX1Qyb6zWUqPL6W3MqFiXutZvKBjqLz6p49Szx8cplQLoXfLHT0bcDXKg==\n dependencies:\n- \"@react-native/dev-middleware\" \"0.83.0\"\n+ \"@react-native/dev-middleware\" \"0.83.2\"\n debug \"^4.4.0\"\n invariant \"^2.2.4\"\n metro \"^0.83.3\"\n@@ -1693,49 +1676,27 @@\n metro-core \"^0.83.3\"\n semver \"^7.1.3\"\n \n-\"@react-native/debugger-frontend@0.81.5\":\n- version \"0.81.5\"\n- resolved \"https://registry.yarnpkg.com/@react-native/debugger-frontend/-/debugger-frontend-0.81.5.tgz#82ece0181e9a7a3dcbdfa86cf9decd654e13f81f\"\n- integrity sha512-bnd9FSdWKx2ncklOetCgrlwqSGhMHP2zOxObJbOWXoj7GHEmih4MKarBo5/a8gX8EfA1EwRATdfNBQ81DY+h+w==\n-\n-\"@react-native/debugger-frontend@0.83.0\":\n- version \"0.83.0\"\n- resolved \"https://registry.yarnpkg.com/@react-native/debugger-frontend/-/debugger-frontend-0.83.0.tgz#1ce22e0699ebf80e0737ff5471e47107b97b345d\"\n- integrity sha512-7XVbkH8nCjLKLe8z5DS37LNP62/QNNya/YuLlVoLfsiB54nR/kNZij5UU7rS0npAZ3WN7LR0anqLlYnzDd0JHA==\n+\"@react-native/debugger-frontend@0.83.2\":\n+ version \"0.83.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-native/debugger-frontend/-/debugger-frontend-0.83.2.tgz#80839f9b53ab3b70f2a4a530dcc6e23e1928f463\"\n+ integrity sha512-t4fYfa7xopbUF5S4+ihNEwgaq4wLZLKLY0Ms8z72lkMteVd3bOX2Foxa8E2wTfRvdhPOkSpOsTeNDmD8ON4DoQ==\n \n-\"@react-native/debugger-shell@0.83.0\":\n- version \"0.83.0\"\n- resolved \"https://registry.yarnpkg.com/@react-native/debugger-shell/-/debugger-shell-0.83.0.tgz#879f34a7e6c3adc4be8a73a506ea2dba8281b5c8\"\n- integrity sha512-rJJxRRLLsKW+cqd0ALSBoqwL5SQTmwpd5SGl6rq9sY+fInCUKfkLEIc5HWQ0ppqoPyDteQVWbQ3a5VN84aJaNg==\n+\"@react-native/debugger-shell@0.83.2\":\n+ version \"0.83.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-native/debugger-shell/-/debugger-shell-0.83.2.tgz#bbe51b4e6dee8db259ec16587b62a0c5a3e83b74\"\n+ integrity sha512-z9go6NJMsLSDJT5MW6VGugRsZHjYvUTwxtsVc3uLt4U9W6T3J6FWI2wHpXIzd2dUkXRfAiRQ3Zi8ZQQ8fRFg9A==\n dependencies:\n cross-spawn \"^7.0.6\"\n fb-dotslash \"0.5.8\"\n \n-\"@react-native/dev-middleware@0.81.5\":\n- version \"0.81.5\"\n- resolved \"https://registry.yarnpkg.com/@react-native/dev-middleware/-/dev-middleware-0.81.5.tgz#81e8ac545d7736ef6ebb2e59fdbaebc5cf9aedec\"\n- integrity sha512-WfPfZzboYgo/TUtysuD5xyANzzfka8Ebni6RIb2wDxhb56ERi7qDrE4xGhtPsjCL4pQBXSVxyIlCy0d8I6EgGA==\n- dependencies:\n- \"@isaacs/ttlcache\" \"^1.4.1\"\n- \"@react-native/debugger-frontend\" \"0.81.5\"\n- chrome-launcher \"^0.15.2\"\n- chromium-edge-launcher \"^0.2.0\"\n- connect \"^3.6.5\"\n- debug \"^4.4.0\"\n- invariant \"^2.2.4\"\n- nullthrows \"^1.1.1\"\n- open \"^7.0.3\"\n- serve-static \"^1.16.2\"\n- ws \"^6.2.3\"\n-\n-\"@react-native/dev-middleware@0.83.0\":\n- version \"0.83.0\"\n- resolved \"https://registry.yarnpkg.com/@react-native/dev-middleware/-/dev-middleware-0.83.0.tgz#1b4d3bf261bfd5ef162161d9ac28c2170fb7397d\"\n- integrity sha512-HWn42tbp0h8RWttua6d6PjseaSr3IdwkaoqVxhiM9kVDY7Ro00eO7tdlVgSzZzhIibdVS2b2C3x+sFoWhag1fA==\n+\"@react-native/dev-middleware@0.83.2\":\n+ version \"0.83.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-native/dev-middleware/-/dev-middleware-0.83.2.tgz#c2526be5560451b1300966b3ef9866980dd4e566\"\n+ integrity sha512-Zi4EVaAm28+icD19NN07Gh8Pqg/84QQu+jn4patfWKNkcToRFP5vPEbbp0eLOGWS+BVB1d1Fn5lvMrJsBbFcOg==\n dependencies:\n \"@isaacs/ttlcache\" \"^1.4.1\"\n- \"@react-native/debugger-frontend\" \"0.83.0\"\n- \"@react-native/debugger-shell\" \"0.83.0\"\n+ \"@react-native/debugger-frontend\" \"0.83.2\"\n+ \"@react-native/debugger-shell\" \"0.83.2\"\n chrome-launcher \"^0.15.2\"\n chromium-edge-launcher \"^0.2.0\"\n connect \"^3.6.5\"\n@@ -1746,67 +1707,44 @@\n serve-static \"^1.16.2\"\n ws \"^7.5.10\"\n \n-\"@react-native/gradle-plugin@0.81.5\":\n- version \"0.81.5\"\n- resolved \"https://registry.yarnpkg.com/@react-native/gradle-plugin/-/gradle-plugin-0.81.5.tgz#a58830f38789f6254b64449a17fe57455b589d00\"\n- integrity sha512-hORRlNBj+ReNMLo9jme3yQ6JQf4GZpVEBLxmTXGGlIL78MAezDZr5/uq9dwElSbcGmLEgeiax6e174Fie6qPLg==\n-\n-\"@react-native/gradle-plugin@0.83.0\":\n- version \"0.83.0\"\n- resolved \"https://registry.yarnpkg.com/@react-native/gradle-plugin/-/gradle-plugin-0.83.0.tgz#85e00a918a5fd249b4caf1137d0b1a808e510df1\"\n- integrity sha512-BXZRmfsbgPhEPkrRPjk2njA2AzhSelBqhuoklnv3DdLTdxaRjKYW+LW0zpKo1k3qPKj7kG1YGI3miol6l1GB5g==\n-\n-\"@react-native/js-polyfills@0.81.5\":\n- version \"0.81.5\"\n- resolved \"https://registry.yarnpkg.com/@react-native/js-polyfills/-/js-polyfills-0.81.5.tgz#2ca68188c8fff9b951f507b1dec7efe928848274\"\n- integrity sha512-fB7M1CMOCIUudTRuj7kzxIBTVw2KXnsgbQ6+4cbqSxo8NmRRhA0Ul4ZUzZj3rFd3VznTL4Brmocv1oiN0bWZ8w==\n-\n-\"@react-native/js-polyfills@0.83.0\":\n- version \"0.83.0\"\n- resolved \"https://registry.yarnpkg.com/@react-native/js-polyfills/-/js-polyfills-0.83.0.tgz#d45123c150286fb179ee00957d2d9e8ca815ab8c\"\n- integrity sha512-cVB9BMqlfbQR0v4Wxi5M2yDhZoKiNqWgiEXpp7ChdZIXI0SEnj8WwLwE3bDkyOfF8tCHdytpInXyg/al2O+dLQ==\n-\n-\"@react-native/normalize-colors@0.81.5\":\n- version \"0.81.5\"\n- resolved \"https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.81.5.tgz#1ca6cb6772bb7324df2b11aab35227eacd6bdfe7\"\n- integrity sha512-0HuJ8YtqlTVRXGZuGeBejLE04wSQsibpTI+RGOyVqxZvgtlLLC/Ssw0UmbHhT4lYMp2fhdtvKZSs5emWB1zR/g==\n-\n-\"@react-native/normalize-colors@0.83.0\":\n- version \"0.83.0\"\n- resolved \"https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.83.0.tgz#3aeb8967552b95400ee6ae1d95f4d11f289e409b\"\n- integrity sha512-DG1ELOqQ6RS82R1zEUGTWa/pfSPOf+vwAnQB7Ao1vRuhW/xdd2OPQJyqx5a5QWMYpGrlkCb7ERxEVX6p2QODCA==\n-\n-\"@react-native/virtualized-lists@0.81.5\":\n- version \"0.81.5\"\n- resolved \"https://registry.yarnpkg.com/@react-native/virtualized-lists/-/virtualized-lists-0.81.5.tgz#24123fded16992d7e46ecc4ccd473be939ea8c1b\"\n- integrity sha512-UVXgV/db25OPIvwZySeToXD/9sKKhOdkcWmmf4Jh8iBZuyfML+/5CasaZ1E7Lqg6g3uqVQq75NqIwkYmORJMPw==\n- dependencies:\n- invariant \"^2.2.4\"\n- nullthrows \"^1.1.1\"\n+\"@react-native/gradle-plugin@0.83.2\":\n+ version \"0.83.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-native/gradle-plugin/-/gradle-plugin-0.83.2.tgz#aa23c97f6bea9a252fee55916d70e19714669788\"\n+ integrity sha512-PqN11fXRAU+uJ0inZY1HWYlwJOXHOhF4SPyeHBBxjajKpm2PGunmvFWwkmBjmmUkP/CNO0ezTUudV0oj+2wiHQ==\n+\n+\"@react-native/js-polyfills@0.83.2\":\n+ version \"0.83.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-native/js-polyfills/-/js-polyfills-0.83.2.tgz#139809ded867cf3f90c22ca5fce0f5b19d2f7469\"\n+ integrity sha512-dk6fIY2OrKW/2Nk2HydfYNrQau8g6LOtd7NVBrgaqa+lvuRyIML5iimShP5qPqQnx2ofHuzjFw+Ya0b5Q7nDbA==\n \n-\"@react-native/virtualized-lists@0.83.0\":\n- version \"0.83.0\"\n- resolved \"https://registry.yarnpkg.com/@react-native/virtualized-lists/-/virtualized-lists-0.83.0.tgz#f65f70d9a5fe744aeb3c9ea6b8c21b39cf849716\"\n- integrity sha512-AVnDppwPidQrPrzA4ETr4o9W+40yuijg3EVgFt2hnMldMZkqwPRrgJL2GSreQjCYe1NfM5Yn4Egyy4Kd0yp4Lw==\n+\"@react-native/normalize-colors@0.83.2\":\n+ version \"0.83.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.83.2.tgz#bcfede4a5bdc1c148c33fe7b7ce0fa0e2810bfb4\"\n+ integrity sha512-gkZAb9LoVVzNuYzzOviH7DiPTXQoZPHuiTH2+O2+VWNtOkiznjgvqpwYAhg58a5zfRq5GXlbBdf5mzRj5+3Y5Q==\n+\n+\"@react-native/virtualized-lists@0.83.2\":\n+ version \"0.83.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-native/virtualized-lists/-/virtualized-lists-0.83.2.tgz#a788b33902b2f543b856d4f7fea8055555e70087\"\n+ integrity sha512-N7mRjHLW/+KWxMp9IHRWyE3VIkeG1m3PnZJAGEFLCN8VFb7e4VfI567o7tE/HYcdcXCylw+Eqhlciz8gDeQ71g==\n dependencies:\n invariant \"^2.2.4\"\n nullthrows \"^1.1.1\"\n \n \"@react-navigation/bottom-tabs@^7.8.12\":\n- version \"7.8.12\"\n- resolved \"https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-7.8.12.tgz#22863a5a26e73714075f5966a80ea18d7eaceb84\"\n- integrity sha512-efVt5ydHK+b4ZtjmN81iduaO5dPCmzhLBFwjCR8pV4x4VzUfJmtUJizLqTXpT3WatHdeon2gDPwhhoelsvu/JA==\n+ version \"7.15.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-7.15.2.tgz#8772e62eb81bf9516ff47f6eb00a5cd71adece6c\"\n+ integrity sha512-xaSumZWE97P3j33guO7bh5dJ5IqR1bWiT+i17SUjsXxoI9xnNXWDm4dkTjzGuuT0BHcUVkzei0tjjCQmNg9cIQ==\n dependencies:\n- \"@react-navigation/elements\" \"^2.9.2\"\n+ \"@react-navigation/elements\" \"^2.9.8\"\n color \"^4.2.3\"\n sf-symbols-typescript \"^2.1.0\"\n \n-\"@react-navigation/core@^7.13.6\":\n- version \"7.13.6\"\n- resolved \"https://registry.yarnpkg.com/@react-navigation/core/-/core-7.13.6.tgz#6ab2ef784c1d2194cc265d22a7cb5b65e4878109\"\n- integrity sha512-7QG29HAWOR8wYuPkfTN8L2Po+kE1xn3nsi2sS35sGngq8HYZRHfXvxrhrAZYfFnFq2hUtOhcXnSS6vEWU/5rmA==\n+\"@react-navigation/core@^7.15.1\":\n+ version \"7.15.1\"\n+ resolved \"https://registry.yarnpkg.com/@react-navigation/core/-/core-7.15.1.tgz#c40ddec61e5b1194db3100f871ba45a8f1480c27\"\n+ integrity sha512-Fqr6qxfZJIC4ewho7LtTa9zz6hcOzohX7D1lcDfrkGaYkS5xBwEZViGNxCJK/czUc74ua8NThyrObQFjB6Q/RQ==\n dependencies:\n- \"@react-navigation/routers\" \"^7.5.2\"\n+ \"@react-navigation/routers\" \"^7.5.3\"\n escape-string-regexp \"^4.0.0\"\n fast-deep-equal \"^3.1.3\"\n nanoid \"^3.3.11\"\n@@ -1815,55 +1753,46 @@\n use-latest-callback \"^0.2.4\"\n use-sync-external-store \"^1.5.0\"\n \n-\"@react-navigation/elements@^2.9.2\":\n- version \"2.9.2\"\n- resolved \"https://registry.yarnpkg.com/@react-navigation/elements/-/elements-2.9.2.tgz#0ee330ff9b82f748f05630616ada9426b1f07911\"\n- integrity sha512-J1GltOAGowNLznEphV/kr4zs0U7mUBO1wVA2CqpkN8ePBsoxrAmsd+T5sEYUCXN9KgTDFvc6IfcDqrGSQngd/g==\n- dependencies:\n- color \"^4.2.3\"\n- use-latest-callback \"^0.2.4\"\n- use-sync-external-store \"^1.5.0\"\n-\n-\"@react-navigation/elements@^2.9.3\":\n- version \"2.9.3\"\n- resolved \"https://registry.yarnpkg.com/@react-navigation/elements/-/elements-2.9.3.tgz#505ae38af347a0bc5326155318a3d9a54e2071e3\"\n- integrity sha512-3+eyvWiVPIEf6tN9UdduhOEHcTuNe3R5WovgiVkfH9+jApHMTZDc2loePTpY/i2HDJhObhhChpJzO6BVjrpdYQ==\n+\"@react-navigation/elements@^2.9.8\":\n+ version \"2.9.8\"\n+ resolved \"https://registry.yarnpkg.com/@react-navigation/elements/-/elements-2.9.8.tgz#88833bc7a73e1f022302ea99171cbbb8fe509a9b\"\n+ integrity sha512-3gpwUmVnDJYvK9nFmAA/YXw0hmT/C/lZx8RkRMK+ux9l1T+32EWnQFnn34Wa1BMDX8HN2r64yrlW93DIzKI7Uw==\n dependencies:\n color \"^4.2.3\"\n use-latest-callback \"^0.2.4\"\n use-sync-external-store \"^1.5.0\"\n \n \"@react-navigation/material-top-tabs@^7.4.10\":\n- version \"7.4.10\"\n- resolved \"https://registry.yarnpkg.com/@react-navigation/material-top-tabs/-/material-top-tabs-7.4.10.tgz#413bd97ff3861da19117dbad21988e65fa06020e\"\n- integrity sha512-sLR7ctxvqhszJwaBmbZa3lPHL++c0LNFiValMnJ39m3JdfpEsahPUXsbsoT4sqBaU7lpm1uYzRsAyfJEci7DrQ==\n+ version \"7.4.16\"\n+ resolved \"https://registry.yarnpkg.com/@react-navigation/material-top-tabs/-/material-top-tabs-7.4.16.tgz#575be439c2cb1ba458068ffa8eb58104e62e03ea\"\n+ integrity sha512-Wy/NP17O948/4uUvzpPs5FkvhOCvojBJ320FxW5kUiUbaxde11LUJf9yhDJhScQ7pjHeT0NsMSc1uhbF8O1oFg==\n dependencies:\n- \"@react-navigation/elements\" \"^2.9.2\"\n+ \"@react-navigation/elements\" \"^2.9.8\"\n color \"^4.2.3\"\n- react-native-tab-view \"^4.2.1\"\n+ react-native-tab-view \"^4.2.2\"\n \n \"@react-navigation/native-stack@^7.2.0\":\n- version \"7.9.0\"\n- resolved \"https://registry.yarnpkg.com/@react-navigation/native-stack/-/native-stack-7.9.0.tgz#4fcd08a403ff86c465a908f3b49f86ab3f66d06a\"\n- integrity sha512-C/mNPhI0Pnerl7C2cB+6fAkdgSmfKECMERrbyfjx3P6JmEuTC54o+GV1c62FUmlRaRUassVHbtw4EeaY2uLh0g==\n+ version \"7.14.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-navigation/native-stack/-/native-stack-7.14.2.tgz#904f925c77bbb84c7d4b399cc942c263542c2b2a\"\n+ integrity sha512-/nKxFAFSUSGV+NSXrXXcWEcGAHdyp8RyWjoGMDzVPdBhjCLblVSgHWx5y4mm+k0de9V1pkjsftUaroP7rQckzw==\n dependencies:\n- \"@react-navigation/elements\" \"^2.9.3\"\n+ \"@react-navigation/elements\" \"^2.9.8\"\n color \"^4.2.3\"\n sf-symbols-typescript \"^2.1.0\"\n warn-once \"^0.1.1\"\n \n \"@react-navigation/native@^7.1.25\":\n- version \"7.1.25\"\n- resolved \"https://registry.yarnpkg.com/@react-navigation/native/-/native-7.1.25.tgz#48a267d5ab260d98edca63fab897d8fce244c665\"\n- integrity sha512-zQeWK9txDePWbYfqTs0C6jeRdJTm/7VhQtW/1IbJNDi9/rFIRzZule8bdQPAnf8QWUsNujRmi1J9OG/hhfbalg==\n+ version \"7.1.31\"\n+ resolved \"https://registry.yarnpkg.com/@react-navigation/native/-/native-7.1.31.tgz#0a659f235df6494c94792e1f6f865929597fbd79\"\n+ integrity sha512-+YCUwtfDgsux59Q0LDHc3Zid9ih93ecUCFWZOH6/+eNoUGnWx77wjS6ZfvBO/7E+EiIup11IVShDzCHR4of8hw==\n dependencies:\n- \"@react-navigation/core\" \"^7.13.6\"\n+ \"@react-navigation/core\" \"^7.15.1\"\n escape-string-regexp \"^4.0.0\"\n fast-deep-equal \"^3.1.3\"\n nanoid \"^3.3.11\"\n use-latest-callback \"^0.2.4\"\n \n-\"@react-navigation/routers@^7.5.2\":\n+\"@react-navigation/routers@^7.5.3\":\n version \"7.5.3\"\n resolved \"https://registry.yarnpkg.com/@react-navigation/routers/-/routers-7.5.3.tgz#8002930ef5f62351be2475d0dffde3ffaee174d7\"\n integrity sha512-1tJHg4KKRJuQ1/EvJxatrMef3NZXEPzwUIUZ3n1yJ2t7Q97siwRtbynRpQG9/69ebbtiZ8W3ScOZF/OmhvM4Rg==\n@@ -1871,11 +1800,11 @@\n nanoid \"^3.3.11\"\n \n \"@react-navigation/stack@^7.6.12\":\n- version \"7.6.12\"\n- resolved \"https://registry.yarnpkg.com/@react-navigation/stack/-/stack-7.6.12.tgz#c31682981696cfa85a982c3ec93d3616e3858e07\"\n- integrity sha512-hq5d+lWUwBnwPcBNyUYHiirzRuiD5YhQDIgZWzRConfcRwI/qwFW5+5bCCJ3fQZnNlP05UA4ZlI6r1ysU6y6ww==\n+ version \"7.8.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-navigation/stack/-/stack-7.8.2.tgz#d5592c8b8fca274c5f06421e4e012184a959437e\"\n+ integrity sha512-M91rWznv8mV1IvoBF9MJS3952gZAAYKnd5WcZdXqQDuA/Ol2eeXXoeRdlrapxULaEVdtbFv+6eeabG9QwWdr6A==\n dependencies:\n- \"@react-navigation/elements\" \"^2.9.2\"\n+ \"@react-navigation/elements\" \"^2.9.8\"\n color \"^4.2.3\"\n use-latest-callback \"^0.2.4\"\n \n@@ -1889,96 +1818,101 @@\n redux-thunk \"^2.4.1\"\n reselect \"^4.1.5\"\n \n-\"@sentry-internal/browser-utils@10.12.0\":\n- version \"10.12.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-10.12.0.tgz#aa3a05653e530d2693e307c0131571ee8a97b60d\"\n- integrity sha512-dozbx389jhKynj0d657FsgbBVOar7pX3mb6GjqCxslXF0VKpZH2Xks0U32RgDY/nK27O+o095IWz7YvjVmPkDw==\n- dependencies:\n- \"@sentry/core\" \"10.12.0\"\n-\n-\"@sentry-internal/feedback@10.12.0\":\n- version \"10.12.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-10.12.0.tgz#a48039507f37fe62e19566128a894661a724ef0d\"\n- integrity sha512-0+7ceO6yQPPqfxRc9ue/xoPHKcnB917ezPaehGQNfAFNQB9PNTG1y55+8mRu0Fw+ANbZeCt/HyoCmXuRdxmkpg==\n- dependencies:\n- \"@sentry/core\" \"10.12.0\"\n-\n-\"@sentry-internal/replay-canvas@10.12.0\":\n- version \"10.12.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-10.12.0.tgz#f79dde92bcba67b4f706db6c217467e14d6348c5\"\n- integrity sha512-W/z1/+69i3INNfPjD1KuinSNaRQaApjzwb37IFmiyF440F93hxmEYgXHk3poOlYYaigl2JMYbysGPWOiXnqUXA==\n- dependencies:\n- \"@sentry-internal/replay\" \"10.12.0\"\n- \"@sentry/core\" \"10.12.0\"\n-\n-\"@sentry-internal/replay@10.12.0\":\n- version \"10.12.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-10.12.0.tgz#47ca89acdc621217991c7ed1d133fd37915a512d\"\n- integrity sha512-/1093gSNGN5KlOBsuyAl33JkzGiG38kCnxswQLZWpPpR6LBbR1Ddb18HjhDpoQNNEZybJBgJC3a5NKl43C2TSQ==\n- dependencies:\n- \"@sentry-internal/browser-utils\" \"10.12.0\"\n- \"@sentry/core\" \"10.12.0\"\n-\n-\"@sentry/babel-plugin-component-annotate@4.3.0\":\n- version \"4.3.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-4.3.0.tgz#c5b6cbb986952596d3ad233540a90a1fd18bad80\"\n- integrity sha512-OuxqBprXRyhe8Pkfyz/4yHQJc5c3lm+TmYWSSx8u48g5yKewSQDOxkiLU5pAk3WnbLPy8XwU/PN+2BG0YFU9Nw==\n-\n-\"@sentry/browser@10.12.0\":\n- version \"10.12.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry/browser/-/browser-10.12.0.tgz#79dffc88e1f9241b9fdb5def5a7c6809f41230b3\"\n- integrity sha512-lKyaB2NFmr7SxPjmMTLLhQ7xfxaY3kdkMhpzuRI5qwOngtKt4+FtvNYHRuz+PTtEFv4OaHhNNbRn6r91gWguQg==\n- dependencies:\n- \"@sentry-internal/browser-utils\" \"10.12.0\"\n- \"@sentry-internal/feedback\" \"10.12.0\"\n- \"@sentry-internal/replay\" \"10.12.0\"\n- \"@sentry-internal/replay-canvas\" \"10.12.0\"\n- \"@sentry/core\" \"10.12.0\"\n-\n-\"@sentry/cli-darwin@2.55.0\":\n- version \"2.55.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.55.0.tgz#79513547d15223d51905e94d8c1e2bc7377cfdf1\"\n- integrity sha512-jGHE7SHHzqXUmnsmRLgorVH6nmMmTjQQXdPZbSL5tRtH8d3OIYrVNr5D72DSgD26XAPBDMV0ibqOQ9NKoiSpfA==\n-\n-\"@sentry/cli-linux-arm64@2.55.0\":\n- version \"2.55.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.55.0.tgz#5a2e8ea6e088f4884cbe272525f0781f8c748ff3\"\n- integrity sha512-jNB/0/gFcOuDCaY/TqeuEpsy/k52dwyk1SOV3s1ku4DUsln6govTppeAGRewY3T1Rj9B2vgIWTrnB8KVh9+Rgg==\n-\n-\"@sentry/cli-linux-arm@2.55.0\":\n- version \"2.55.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.55.0.tgz#54c330471c4b23ff6769bfd886f092afba3380ce\"\n- integrity sha512-ATjU0PsiWADSPLF/kZroLZ7FPKd5W9TDWHVkKNwIUNTei702LFgTjNeRwOIzTgSvG3yTmVEqtwFQfFN/7hnVXQ==\n-\n-\"@sentry/cli-linux-i686@2.55.0\":\n- version \"2.55.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.55.0.tgz#12c64453ef7014ba89c885497e3c9764a5f3e0a0\"\n- integrity sha512-8LZjo6PncTM6bWdaggscNOi5r7F/fqRREsCwvd51dcjGj7Kp1plqo9feEzYQ+jq+KUzVCiWfHrUjddFmYyZJrg==\n-\n-\"@sentry/cli-linux-x64@2.55.0\":\n- version \"2.55.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.55.0.tgz#c640464fe533fe87e57d0ca5585e0c504e0ef5b3\"\n- integrity sha512-5LUVvq74Yj2cZZy5g5o/54dcWEaX4rf3myTHy73AKhRj1PABtOkfexOLbF9xSrZy95WXWaXyeH+k5n5z/vtHfA==\n-\n-\"@sentry/cli-win32-arm64@2.55.0\":\n- version \"2.55.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry/cli-win32-arm64/-/cli-win32-arm64-2.55.0.tgz#da1e8ba13083c281fcdf72d1dd35255df7fdb5c5\"\n- integrity sha512-cWIQdzm1pfLwPARsV6dUb8TVd6Y3V1A2VWxjTons3Ift6GvtVmiAe0OWL8t2Yt95i8v61kTD/6Tq21OAaogqzA==\n-\n-\"@sentry/cli-win32-i686@2.55.0\":\n- version \"2.55.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.55.0.tgz#c2eae0a75fc55f101c31de0999214d7e613d65c4\"\n- integrity sha512-ldepCn2t9r4I0wvgk7NRaA7coJyy4rTQAzM66u9j5nTEsUldf66xym6esd5ZZRAaJUjffqvHqUIr/lrieTIrVg==\n-\n-\"@sentry/cli-win32-x64@2.55.0\":\n- version \"2.55.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.55.0.tgz#499e6697663a3e1453ff2e921bf3876f774520b5\"\n- integrity sha512-4hPc/I/9tXx+HLTdTGwlagtAfDSIa2AoTUP30tl32NAYQhx9a6niUbPAemK2qfxesiufJ7D2djX83rCw6WnJVA==\n-\n-\"@sentry/cli@2.55.0\":\n- version \"2.55.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry/cli/-/cli-2.55.0.tgz#c22d2edbd320242e7881c15ecf89649378c05387\"\n- integrity sha512-cynvcIM2xL8ddwELyFRSpZQw4UtFZzoM2rId2l9vg7+wDREPDocMJB9lEQpBIo3eqhp9JswqUT037yjO6iJ5Sw==\n+\"@rtsao/scc@^1.1.0\":\n+ version \"1.1.0\"\n+ resolved \"https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8\"\n+ integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==\n+\n+\"@sentry-internal/browser-utils@10.37.0\":\n+ version \"10.37.0\"\n+ resolved \"https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-10.37.0.tgz#18271f3d56dad87bc65e9e8042d966bf752a3a98\"\n+ integrity sha512-rqdESYaVio9Ktz55lhUhtBsBUCF3wvvJuWia5YqoHDd+egyIfwWxITTAa0TSEyZl7283A4WNHNl0hyeEMblmfA==\n+ dependencies:\n+ \"@sentry/core\" \"10.37.0\"\n+\n+\"@sentry-internal/feedback@10.37.0\":\n+ version \"10.37.0\"\n+ resolved \"https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-10.37.0.tgz#c416bb1725a096b7a5bb454356f837150ee30fdb\"\n+ integrity sha512-P0PVlfrDvfvCYg2KPIS7YUG/4i6ZPf8z1MicXx09C9Cz9W9UhSBh/nii13eBdDtLav2BFMKhvaFMcghXHX03Hw==\n+ dependencies:\n+ \"@sentry/core\" \"10.37.0\"\n+\n+\"@sentry-internal/replay-canvas@10.37.0\":\n+ version \"10.37.0\"\n+ resolved \"https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-10.37.0.tgz#58c578e15607dc272fba9a119b920993b2afaf5e\"\n+ integrity sha512-PyIYSbjLs+L5essYV0MyIsh4n5xfv2eV7l0nhUoPJv9Bak3kattQY3tholOj0EP3SgKgb+8HSZnmazgF++Hbog==\n+ dependencies:\n+ \"@sentry-internal/replay\" \"10.37.0\"\n+ \"@sentry/core\" \"10.37.0\"\n+\n+\"@sentry-internal/replay@10.37.0\":\n+ version \"10.37.0\"\n+ resolved \"https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-10.37.0.tgz#1b60a8ee5eb2ff4af3137fa395cd8754dd61c434\"\n+ integrity sha512-snuk12ZaDerxesSnetNIwKoth/51R0y/h3eXD/bGtXp+hnSkeXN5HanI/RJl297llRjn4zJYRShW9Nx86Ay0Dw==\n+ dependencies:\n+ \"@sentry-internal/browser-utils\" \"10.37.0\"\n+ \"@sentry/core\" \"10.37.0\"\n+\n+\"@sentry/babel-plugin-component-annotate@4.8.0\":\n+ version \"4.8.0\"\n+ resolved \"https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-4.8.0.tgz#6705126a7726bd248f93acc79b8f3c8921b1c385\"\n+ integrity sha512-cy/9Eipkv23MsEJ4IuB4dNlVwS9UqOzI3Eu+QPake5BVFgPYCX0uP0Tr3Z43Ime6Rb+BiDnWC51AJK9i9afHYw==\n+\n+\"@sentry/browser@10.37.0\":\n+ version \"10.37.0\"\n+ resolved \"https://registry.yarnpkg.com/@sentry/browser/-/browser-10.37.0.tgz#2e084a5f351c9fc485d6380b420bcf0fb1786cec\"\n+ integrity sha512-kheqJNqGZP5TSBCPv4Vienv1sfZwXKHQDYR+xrdHHYdZqwWuZMJJW/cLO9XjYAe+B9NnJ4UwJOoY4fPvU+HQ1Q==\n+ dependencies:\n+ \"@sentry-internal/browser-utils\" \"10.37.0\"\n+ \"@sentry-internal/feedback\" \"10.37.0\"\n+ \"@sentry-internal/replay\" \"10.37.0\"\n+ \"@sentry-internal/replay-canvas\" \"10.37.0\"\n+ \"@sentry/core\" \"10.37.0\"\n+\n+\"@sentry/cli-darwin@2.58.4\":\n+ version \"2.58.4\"\n+ resolved \"https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.58.4.tgz#5e3005c1f845acac243e8dcb23bef17337924768\"\n+ integrity sha512-kbTD+P4X8O+nsNwPxCywtj3q22ecyRHWff98rdcmtRrvwz8CKi/T4Jxn/fnn2i4VEchy08OWBuZAqaA5Kh2hRQ==\n+\n+\"@sentry/cli-linux-arm64@2.58.4\":\n+ version \"2.58.4\"\n+ resolved \"https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.58.4.tgz#69da57656fda863f255d92123c3a3437e470408e\"\n+ integrity sha512-0g0KwsOozkLtzN8/0+oMZoOuQ0o7W6O+hx+ydVU1bktaMGKEJLMAWxOQNjsh1TcBbNIXVOKM/I8l0ROhaAb8Ig==\n+\n+\"@sentry/cli-linux-arm@2.58.4\":\n+ version \"2.58.4\"\n+ resolved \"https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.58.4.tgz#869ddab30f0dcebc0e61cff2f3ff47dcd40f8abe\"\n+ integrity sha512-rdQ8beTwnN48hv7iV7e7ZKucPec5NJkRdrrycMJMZlzGBPi56LqnclgsHySJ6Kfq506A2MNuQnKGaf/sBC9REA==\n+\n+\"@sentry/cli-linux-i686@2.58.4\":\n+ version \"2.58.4\"\n+ resolved \"https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.58.4.tgz#e30ca6b897147b3fb7b2e8684b139183d55e21c6\"\n+ integrity sha512-NseoIQAFtkziHyjZNPTu1Gm1opeQHt7Wm1LbLrGWVIRvUOzlslO9/8i6wETUZ6TjlQxBVRgd3Q0lRBG2A8rFYA==\n+\n+\"@sentry/cli-linux-x64@2.58.4\":\n+ version \"2.58.4\"\n+ resolved \"https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.58.4.tgz#f667e1fcaf0860f15401af8e0ee72f5013d84458\"\n+ integrity sha512-d3Arz+OO/wJYTqCYlSN3Ktm+W8rynQ/IMtSZLK8nu0ryh5mJOh+9XlXY6oDXw4YlsM8qCRrNquR8iEI1Y/IH+Q==\n+\n+\"@sentry/cli-win32-arm64@2.58.4\":\n+ version \"2.58.4\"\n+ resolved \"https://registry.yarnpkg.com/@sentry/cli-win32-arm64/-/cli-win32-arm64-2.58.4.tgz#f612c5788954e2a97b6626e9e46fa9a41cb049c1\"\n+ integrity sha512-bqYrF43+jXdDBh0f8HIJU3tbvlOFtGyRjHB8AoRuMQv9TEDUfENZyCelhdjA+KwDKYl48R1Yasb4EHNzsoO83w==\n+\n+\"@sentry/cli-win32-i686@2.58.4\":\n+ version \"2.58.4\"\n+ resolved \"https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.58.4.tgz#5611c05499f1b959d23e37650d0621d299c49cfc\"\n+ integrity sha512-3triFD6jyvhVcXOmGyttf+deKZcC1tURdhnmDUIBkiDPJKGT/N5xa4qAtHJlAB/h8L9jgYih9bvJnvvFVM7yug==\n+\n+\"@sentry/cli-win32-x64@2.58.4\":\n+ version \"2.58.4\"\n+ resolved \"https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.58.4.tgz#3290c59399579e8d484c97246cfa720171241061\"\n+ integrity sha512-cSzN4PjM1RsCZ4pxMjI0VI7yNCkxiJ5jmWncyiwHXGiXrV1eXYdQ3n1LhUYLZ91CafyprR0OhDcE+RVZ26Qb5w==\n+\n+\"@sentry/cli@2.58.4\":\n+ version \"2.58.4\"\n+ resolved \"https://registry.yarnpkg.com/@sentry/cli/-/cli-2.58.4.tgz#eb8792600cdf956cc4fe2bf51380ea1682327411\"\n+ integrity sha512-ArDrpuS8JtDYEvwGleVE+FgR+qHaOp77IgdGSacz6SZy6Lv90uX0Nu4UrHCQJz8/xwIcNxSqnN22lq0dH4IqTg==\n dependencies:\n https-proxy-agent \"^5.0.0\"\n node-fetch \"^2.6.7\"\n@@ -1986,52 +1920,51 @@\n proxy-from-env \"^1.1.0\"\n which \"^2.0.2\"\n optionalDependencies:\n- \"@sentry/cli-darwin\" \"2.55.0\"\n- \"@sentry/cli-linux-arm\" \"2.55.0\"\n- \"@sentry/cli-linux-arm64\" \"2.55.0\"\n- \"@sentry/cli-linux-i686\" \"2.55.0\"\n- \"@sentry/cli-linux-x64\" \"2.55.0\"\n- \"@sentry/cli-win32-arm64\" \"2.55.0\"\n- \"@sentry/cli-win32-i686\" \"2.55.0\"\n- \"@sentry/cli-win32-x64\" \"2.55.0\"\n-\n-\"@sentry/core@10.12.0\":\n- version \"10.12.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry/core/-/core-10.12.0.tgz#3f6a0f5c2f63f2c1761e3cf442a986d74adf6403\"\n- integrity sha512-Jrf0Yo7DvmI/ZQcvBnA0xKNAFkJlVC/fMlvcin+5IrFNRcqOToZ2vtF+XqTgjRZymXQNE8s1QTD7IomPHk0TAw==\n-\n-\"@sentry/react-native@~7.2.0\":\n- version \"7.2.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry/react-native/-/react-native-7.2.0.tgz#d29deacc36fd55fc52119ffcf53f61c21cab3600\"\n- integrity sha512-rjqYgEjntPz1sPysud78wi4B9ui7LBVPsG6qr8s/htLMYho9GPGFA5dF+eqsQWqMX8NDReAxNkLTC4+gCNklLQ==\n- dependencies:\n- \"@sentry/babel-plugin-component-annotate\" \"4.3.0\"\n- \"@sentry/browser\" \"10.12.0\"\n- \"@sentry/cli\" \"2.55.0\"\n- \"@sentry/core\" \"10.12.0\"\n- \"@sentry/react\" \"10.12.0\"\n- \"@sentry/types\" \"10.12.0\"\n-\n-\"@sentry/react@10.12.0\":\n- version \"10.12.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry/react/-/react-10.12.0.tgz#c121f37bf582f4851108f67ef492de6a4c8f7a8d\"\n- integrity sha512-TpqgdoYbkf5JynmmW2oQhHQ/h5w+XPYk0cEb/UrsGlvJvnBSR+5tgh0AqxCSi3gvtp82rAXI5w1TyRPBbhLDBw==\n- dependencies:\n- \"@sentry/browser\" \"10.12.0\"\n- \"@sentry/core\" \"10.12.0\"\n- hoist-non-react-statics \"^3.3.2\"\n-\n-\"@sentry/types@10.12.0\":\n- version \"10.12.0\"\n- resolved \"https://registry.yarnpkg.com/@sentry/types/-/types-10.12.0.tgz#86d24346efde7b0757474537af7ae4b3d931d6a8\"\n- integrity sha512-sKGj3l3V8ZKISh2Tu88bHfnm5ztkRtSLdmpZ6TmCeJdSM9pV+RRd6CMJ0RnSEXmYHselPNUod521t2NQFd4W1w==\n- dependencies:\n- \"@sentry/core\" \"10.12.0\"\n+ \"@sentry/cli-darwin\" \"2.58.4\"\n+ \"@sentry/cli-linux-arm\" \"2.58.4\"\n+ \"@sentry/cli-linux-arm64\" \"2.58.4\"\n+ \"@sentry/cli-linux-i686\" \"2.58.4\"\n+ \"@sentry/cli-linux-x64\" \"2.58.4\"\n+ \"@sentry/cli-win32-arm64\" \"2.58.4\"\n+ \"@sentry/cli-win32-i686\" \"2.58.4\"\n+ \"@sentry/cli-win32-x64\" \"2.58.4\"\n+\n+\"@sentry/core@10.37.0\":\n+ version \"10.37.0\"\n+ resolved \"https://registry.yarnpkg.com/@sentry/core/-/core-10.37.0.tgz#21408cdd0d3fae8b9e9e45264e6112164868ff0b\"\n+ integrity sha512-hkRz7S4gkKLgPf+p3XgVjVm7tAfvcEPZxeACCC6jmoeKhGkzN44nXwLiqqshJ25RMcSrhfFvJa/FlBg6zupz7g==\n+\n+\"@sentry/react-native@~7.11.0\":\n+ version \"7.11.0\"\n+ resolved \"https://registry.yarnpkg.com/@sentry/react-native/-/react-native-7.11.0.tgz#099531fbdc9d9f4f74cd6e75dbf4281fcaf470d3\"\n+ integrity sha512-OiDaLCAGpRN18YG/o7IIwLhU0Xpb0tYKQ5QxkGHiwb+L3VHn+MqGCGfITYNdhqr06HHMvu9Lysm+UJxaNmGaJg==\n+ dependencies:\n+ \"@sentry/babel-plugin-component-annotate\" \"4.8.0\"\n+ \"@sentry/browser\" \"10.37.0\"\n+ \"@sentry/cli\" \"2.58.4\"\n+ \"@sentry/core\" \"10.37.0\"\n+ \"@sentry/react\" \"10.37.0\"\n+ \"@sentry/types\" \"10.37.0\"\n+\n+\"@sentry/react@10.37.0\":\n+ version \"10.37.0\"\n+ resolved \"https://registry.yarnpkg.com/@sentry/react/-/react-10.37.0.tgz#4a97806a278ba50d16536bed8647d867b236c4e1\"\n+ integrity sha512-XLnXJOHgsCeVAVBbO+9AuGlZWnCxLQHLOmKxpIr8wjE3g7dHibtug6cv8JLx78O4dd7aoCqv2TTyyKY9FLJ2EQ==\n+ dependencies:\n+ \"@sentry/browser\" \"10.37.0\"\n+ \"@sentry/core\" \"10.37.0\"\n+\n+\"@sentry/types@10.37.0\":\n+ version \"10.37.0\"\n+ resolved \"https://registry.yarnpkg.com/@sentry/types/-/types-10.37.0.tgz#aa05905d42df16a0f36e325f93098729d9640313\"\n+ integrity sha512-umpnUKRC0AAbJrADg6SlFtqN2yzf7NHciCF9lkHau+ax2PIZ/NDmoG4RQujFVflVaVoD60Ly2t+CcPnYIWMPlw==\n+ dependencies:\n+ \"@sentry/core\" \"10.37.0\"\n \n \"@sinclair/typebox@^0.27.8\":\n- version \"0.27.8\"\n- resolved \"https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e\"\n- integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==\n+ version \"0.27.10\"\n+ resolved \"https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.10.tgz#beefe675f1853f73676aecc915b2bd2ac98c4fc6\"\n+ integrity sha512-MTBk/3jGLNB2tVxv6uLlFh1iu64iYOQ2PbdOSK3NW8JZsmlaOh2q6sdtKowBhfw8QFLmYNzTW4/oK4uATIi6ZA==\n \n \"@sinonjs/commons@^3.0.0\":\n version \"3.0.1\"\n@@ -2100,6 +2033,11 @@\n resolved \"https://registry.yarnpkg.com/@types/cldrjs/-/cldrjs-0.4.29.tgz#35cfb0dc7083adf4ced3c8c596ea60a97d5114fc\"\n integrity sha512-urJWrkyM6SGki7VmagwErtOe0UeTqIE8m9WTkS7n54IYCrYTSMg9N5PSZf0i91sAozn5ypc9DzMiguRmIFU7cg==\n \n+\"@types/emscripten@^1.41.5\":\n+ version \"1.41.5\"\n+ resolved \"https://registry.yarnpkg.com/@types/emscripten/-/emscripten-1.41.5.tgz#5670e4b52b098691cb844b84ee48c9176699b68d\"\n+ integrity sha512-cMQm7pxu6BxtHyqJ7mQZ2kXWV5SLmugybFdHCBbJ5eHzOo6VhBckEgAT3//rP5FwPHNPeEiq4SmQ5ucBwsOo4Q==\n+\n \"@types/globalize@^1.5.0\":\n version \"1.5.6\"\n resolved \"https://registry.yarnpkg.com/@types/globalize/-/globalize-1.5.6.tgz#ef4919dfd7954663581c0938e89312481cd5792a\"\n@@ -2178,11 +2116,11 @@\n integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==\n \n \"@types/node@*\":\n- version \"25.0.2\"\n- resolved \"https://registry.yarnpkg.com/@types/node/-/node-25.0.2.tgz#411f9dd6cb2bf5ee46aed7199a9f85ca6b068b4e\"\n- integrity sha512-gWEkeiyYE4vqjON/+Obqcoeffmk0NF15WSBwSs7zwVA2bAbTaE0SJ7P0WNGoJn8uE7fiaV5a7dKYIJriEqOrmA==\n+ version \"25.3.3\"\n+ resolved \"https://registry.yarnpkg.com/@types/node/-/node-25.3.3.tgz#605862544ee7ffd7a936bcbf0135a14012f1e549\"\n+ integrity sha512-DpzbrH7wIcBaJibpKo9nnSQL0MTRdnWttGyE5haGwK86xgMOkFLp7vEyfQPGLOJh5wNYiJ3V9PmUMDhV9u8kkQ==\n dependencies:\n- undici-types \"~7.16.0\"\n+ undici-types \"~7.18.0\"\n \n \"@types/node@18.11.7\":\n version \"18.11.7\"\n@@ -2201,6 +2139,13 @@\n dependencies:\n ts-toolbelt \"^4.12.0\"\n \n+\"@types/ramda@^0.27.40\", \"@types/ramda@^0.27.44\":\n+ version \"0.27.66\"\n+ resolved \"https://registry.yarnpkg.com/@types/ramda/-/ramda-0.27.66.tgz#f1a23d13b0087d806a62e3ff941e5e59b3318999\"\n+ integrity sha512-i2YW+E2U6NfMt3dp0RxNcejox+bxJUNDjB7BpYuRuoHIzv5juPHkJkNgcUOu+YSQEmaWu8cnAo/8r63C0NnuVA==\n+ dependencies:\n+ ts-toolbelt \"^6.15.1\"\n+\n \"@types/ramda@^0.31.1\":\n version \"0.31.1\"\n resolved \"https://registry.yarnpkg.com/@types/ramda/-/ramda-0.31.1.tgz#da637f3110b0677521dbc13d8a86ec7cbbf8e3fe\"\n@@ -2213,35 +2158,28 @@\n resolved \"https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.1.11.tgz#f8146889e837d053d23494ad4be6d168bfe9bdce\"\n integrity sha512-3BKc/yGdNTYQVVw4idqHtSOcFsgGuBbMveKCOgF8wQ5QtrYOc3jDIlzg3jef04zcXFIHLelyGlj0T+BJ8+KN+w==\n \n-\"@types/react-native-vector-icons@6.4.6\":\n- version \"6.4.6\"\n- resolved \"https://registry.yarnpkg.com/@types/react-native-vector-icons/-/react-native-vector-icons-6.4.6.tgz#848e3b14572def56212cafbf5cb1254b445bfb41\"\n- integrity sha512-lAyxNfMd5L1xZvXWsGcJmNegDf61TAp40uL6ashNNWj9W3IrDJO59L9+9inh0Y2MsEZpLTdxzVU8Unb4/0FQng==\n+\"@types/react-native-vector-icons@6.4.18\":\n+ version \"6.4.18\"\n+ resolved \"https://registry.yarnpkg.com/@types/react-native-vector-icons/-/react-native-vector-icons-6.4.18.tgz#18671c617b9d0958747bc959903470dde91a8c79\"\n+ integrity sha512-YGlNWb+k5laTBHd7+uZowB9DpIK3SXUneZqAiKQaj1jnJCZM0x71GDim5JCTMi4IFkhc9m8H/Gm28T5BjyivUw==\n dependencies:\n \"@types/react\" \"*\"\n- \"@types/react-native\" \"*\"\n+ \"@types/react-native\" \"^0.70\"\n \n-\"@types/react-native@*\":\n- version \"0.73.0\"\n- resolved \"https://registry.yarnpkg.com/@types/react-native/-/react-native-0.73.0.tgz#b316be230745779814caa533360262140b0f5984\"\n- integrity sha512-6ZRPQrYM72qYKGWidEttRe6M5DZBEV5F+MHMHqd4TTYx0tfkcdrUFGdef6CCxY0jXU7wldvd/zA/b0A/kTeJmA==\n+\"@types/react-native@^0.70\":\n+ version \"0.70.19\"\n+ resolved \"https://registry.yarnpkg.com/@types/react-native/-/react-native-0.70.19.tgz#b4e651dcf7f49c69ff3a4c3072584cad93155582\"\n+ integrity sha512-c6WbyCgWTBgKKMESj/8b4w+zWcZSsCforson7UdXtXMecG3MxCinYi6ihhrHVPyUrVzORsvEzK8zg32z4pK6Sg==\n dependencies:\n- react-native \"*\"\n+ \"@types/react\" \"*\"\n \n-\"@types/react@*\":\n- version \"19.2.7\"\n- resolved \"https://registry.yarnpkg.com/@types/react/-/react-19.2.7.tgz#84e62c0f23e8e4e5ac2cadcea1ffeacccae7f62f\"\n- integrity sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==\n+\"@types/react@*\", \"@types/react@~19.2.10\":\n+ version \"19.2.14\"\n+ resolved \"https://registry.yarnpkg.com/@types/react/-/react-19.2.14.tgz#39604929b5e3957e3a6fa0001dafb17c7af70bad\"\n+ integrity sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==\n dependencies:\n csstype \"^3.2.2\"\n \n-\"@types/react@~19.1.10\":\n- version \"19.1.17\"\n- resolved \"https://registry.yarnpkg.com/@types/react/-/react-19.1.17.tgz#8be0b9c546cede389b930a98eb3fad1897f209c3\"\n- integrity sha512-Qec1E3mhALmaspIrhWt9jkQMNdw6bReVu64mjvhbhq2NFPftLPVr+l1SZgmw/66WwBNpDh7ao5AT6gF5v41PFA==\n- dependencies:\n- csstype \"^3.0.2\"\n-\n \"@types/semver@^7.3.12\":\n version \"7.7.1\"\n resolved \"https://registry.yarnpkg.com/@types/semver/-/semver-7.7.1.tgz#3ce3af1a5524ef327d2da9e4fd8b6d95c8d70528\"\n@@ -2257,7 +2195,7 @@\n resolved \"https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.5.tgz#cb6e2a691b70cb177c6e3ae9c1d2e8b2ea8cd304\"\n integrity sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==\n \n-\"@types/urijs@^1.19.25\":\n+\"@types/urijs@^1.19.15\", \"@types/urijs@^1.19.25\":\n version \"1.19.26\"\n resolved \"https://registry.yarnpkg.com/@types/urijs/-/urijs-1.19.26.tgz#500fc9912e0ba01d635480970bdc9ba0f45d7bc6\"\n integrity sha512-wkXrVzX5yoqLnndOwFsieJA7oKM8cNkOKJtf/3vVGSUFkWDKZvFHpIl9Pvqb/T9UsawBBFMTTD8xu7sK5MWuvg==\n@@ -2274,10 +2212,10 @@\n dependencies:\n \"@types/node\" \"*\"\n \n-\"@types/webpack-env@1.18.0\":\n- version \"1.18.0\"\n- resolved \"https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.18.0.tgz#ed6ecaa8e5ed5dfe8b2b3d00181702c9925f13fb\"\n- integrity sha512-56/MAlX5WMsPVbOg7tAxnYvNYMMWr/QJiIp6BxVSW3JJXUVzzOn64qW8TzQyMSqSUFM2+PVI4aUHcHOzIz/1tg==\n+\"@types/webpack-env@1.18.8\":\n+ version \"1.18.8\"\n+ resolved \"https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.18.8.tgz#71f083718c094204d7b64443701d32f1db3989e3\"\n+ integrity sha512-G9eAoJRMLjcvN4I08wB5I7YofOb/kaJNd5uoCMX+LbKXTPCF+ZIHuqTnFaK9Jz1rgs035f9JUPUhNFtqgucy/A==\n \n \"@types/yargs-parser@*\":\n version \"21.0.3\"\n@@ -2292,38 +2230,38 @@\n \"@types/yargs-parser\" \"*\"\n \n \"@typescript-eslint/eslint-plugin@^8.49.0\":\n- version \"8.50.0\"\n- resolved \"https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.50.0.tgz#a6ce899690542e2affa9543306d2d3935740abb7\"\n- integrity sha512-O7QnmOXYKVtPrfYzMolrCTfkezCJS9+ljLdKW/+DCvRsc3UAz+sbH6Xcsv7p30+0OwUbeWfUDAQE0vpabZ3QLg==\n- dependencies:\n- \"@eslint-community/regexpp\" \"^4.10.0\"\n- \"@typescript-eslint/scope-manager\" \"8.50.0\"\n- \"@typescript-eslint/type-utils\" \"8.50.0\"\n- \"@typescript-eslint/utils\" \"8.50.0\"\n- \"@typescript-eslint/visitor-keys\" \"8.50.0\"\n- ignore \"^7.0.0\"\n+ version \"8.56.1\"\n+ resolved \"https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.1.tgz#b1ce606d87221daec571e293009675992f0aae76\"\n+ integrity sha512-Jz9ZztpB37dNC+HU2HI28Bs9QXpzCz+y/twHOwhyrIRdbuVDxSytJNDl6z/aAKlaRIwC7y8wJdkBv7FxYGgi0A==\n+ dependencies:\n+ \"@eslint-community/regexpp\" \"^4.12.2\"\n+ \"@typescript-eslint/scope-manager\" \"8.56.1\"\n+ \"@typescript-eslint/type-utils\" \"8.56.1\"\n+ \"@typescript-eslint/utils\" \"8.56.1\"\n+ \"@typescript-eslint/visitor-keys\" \"8.56.1\"\n+ ignore \"^7.0.5\"\n natural-compare \"^1.4.0\"\n- ts-api-utils \"^2.1.0\"\n+ ts-api-utils \"^2.4.0\"\n \n \"@typescript-eslint/parser@^8.49.0\":\n- version \"8.50.0\"\n- resolved \"https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.50.0.tgz#c35b28f686dbe08e81b9d6208ebc08912549f4ba\"\n- integrity sha512-6/cmF2piao+f6wSxUsJLZjck7OQsYyRtcOZS02k7XINSNlz93v6emM8WutDQSXnroG2xwYlEVHJI+cPA7CPM3Q==\n- dependencies:\n- \"@typescript-eslint/scope-manager\" \"8.50.0\"\n- \"@typescript-eslint/types\" \"8.50.0\"\n- \"@typescript-eslint/typescript-estree\" \"8.50.0\"\n- \"@typescript-eslint/visitor-keys\" \"8.50.0\"\n- debug \"^4.3.4\"\n+ version \"8.56.1\"\n+ resolved \"https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.56.1.tgz#21d13b3d456ffb08614c1d68bb9a4f8d9237cdc7\"\n+ integrity sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==\n+ dependencies:\n+ \"@typescript-eslint/scope-manager\" \"8.56.1\"\n+ \"@typescript-eslint/types\" \"8.56.1\"\n+ \"@typescript-eslint/typescript-estree\" \"8.56.1\"\n+ \"@typescript-eslint/visitor-keys\" \"8.56.1\"\n+ debug \"^4.4.3\"\n \n-\"@typescript-eslint/project-service@8.50.0\":\n- version \"8.50.0\"\n- resolved \"https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.50.0.tgz#1422366b7cc11fef8c6d87770884e608093423a4\"\n- integrity sha512-Cg/nQcL1BcoTijEWyx4mkVC56r8dj44bFDvBdygifuS20f3OZCHmFbjF34DPSi07kwlFvqfv/xOLnJ5DquxSGQ==\n+\"@typescript-eslint/project-service@8.56.1\":\n+ version \"8.56.1\"\n+ resolved \"https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.56.1.tgz#65c8d645f028b927bfc4928593b54e2ecd809244\"\n+ integrity sha512-TAdqQTzHNNvlVFfR+hu2PDJrURiwKsUvxFn1M0h95BB8ah5jejas08jUWG4dBA68jDMI988IvtfdAI53JzEHOQ==\n dependencies:\n- \"@typescript-eslint/tsconfig-utils\" \"^8.50.0\"\n- \"@typescript-eslint/types\" \"^8.50.0\"\n- debug \"^4.3.4\"\n+ \"@typescript-eslint/tsconfig-utils\" \"^8.56.1\"\n+ \"@typescript-eslint/types\" \"^8.56.1\"\n+ debug \"^4.4.3\"\n \n \"@typescript-eslint/scope-manager@5.62.0\":\n version \"5.62.0\"\n@@ -2333,39 +2271,39 @@\n \"@typescript-eslint/types\" \"5.62.0\"\n \"@typescript-eslint/visitor-keys\" \"5.62.0\"\n \n-\"@typescript-eslint/scope-manager@8.50.0\":\n- version \"8.50.0\"\n- resolved \"https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.50.0.tgz#e0d6c838dc9044bc679724611b138cb34c81bddf\"\n- integrity sha512-xCwfuCZjhIqy7+HKxBLrDVT5q/iq7XBVBXLn57RTIIpelLtEIZHXAF/Upa3+gaCpeV1NNS5Z9A+ID6jn50VD4A==\n+\"@typescript-eslint/scope-manager@8.56.1\":\n+ version \"8.56.1\"\n+ resolved \"https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.56.1.tgz#254df93b5789a871351335dd23e20bc164060f24\"\n+ integrity sha512-YAi4VDKcIZp0O4tz/haYKhmIDZFEUPOreKbfdAN3SzUDMcPhJ8QI99xQXqX+HoUVq8cs85eRKnD+rne2UAnj2w==\n dependencies:\n- \"@typescript-eslint/types\" \"8.50.0\"\n- \"@typescript-eslint/visitor-keys\" \"8.50.0\"\n+ \"@typescript-eslint/types\" \"8.56.1\"\n+ \"@typescript-eslint/visitor-keys\" \"8.56.1\"\n \n-\"@typescript-eslint/tsconfig-utils@8.50.0\", \"@typescript-eslint/tsconfig-utils@^8.50.0\":\n- version \"8.50.0\"\n- resolved \"https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.50.0.tgz#5c17537ad4c8a13bf6d7393035edaf91a1e13191\"\n- integrity sha512-vxd3G/ybKTSlm31MOA96gqvrRGv9RJ7LGtZCn2Vrc5htA0zCDvcMqUkifcjrWNNKXHUU3WCkYOzzVSFBd0wa2w==\n+\"@typescript-eslint/tsconfig-utils@8.56.1\", \"@typescript-eslint/tsconfig-utils@^8.56.1\":\n+ version \"8.56.1\"\n+ resolved \"https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.1.tgz#1afa830b0fada5865ddcabdc993b790114a879b7\"\n+ integrity sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ==\n \n-\"@typescript-eslint/type-utils@8.50.0\":\n- version \"8.50.0\"\n- resolved \"https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.50.0.tgz#feb6f54f876980a258b14f1cb033f54fc545d37b\"\n- integrity sha512-7OciHT2lKCewR0mFoBrvZJ4AXTMe/sYOe87289WAViOocEmDjjv8MvIOT2XESuKj9jp8u3SZYUSh89QA4S1kQw==\n+\"@typescript-eslint/type-utils@8.56.1\":\n+ version \"8.56.1\"\n+ resolved \"https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.56.1.tgz#7a6c4fabf225d674644931e004302cbbdd2f2e24\"\n+ integrity sha512-yB/7dxi7MgTtGhZdaHCemf7PuwrHMenHjmzgUW1aJpO+bBU43OycnM3Wn+DdvDO/8zzA9HlhaJ0AUGuvri4oGg==\n dependencies:\n- \"@typescript-eslint/types\" \"8.50.0\"\n- \"@typescript-eslint/typescript-estree\" \"8.50.0\"\n- \"@typescript-eslint/utils\" \"8.50.0\"\n- debug \"^4.3.4\"\n- ts-api-utils \"^2.1.0\"\n+ \"@typescript-eslint/types\" \"8.56.1\"\n+ \"@typescript-eslint/typescript-estree\" \"8.56.1\"\n+ \"@typescript-eslint/utils\" \"8.56.1\"\n+ debug \"^4.4.3\"\n+ ts-api-utils \"^2.4.0\"\n \n \"@typescript-eslint/types@5.62.0\":\n version \"5.62.0\"\n resolved \"https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f\"\n integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==\n \n-\"@typescript-eslint/types@8.50.0\", \"@typescript-eslint/types@^8.50.0\":\n- version \"8.50.0\"\n- resolved \"https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.50.0.tgz#ad8f1ad88ae0096f548c9cdf60da9b92832db96e\"\n- integrity sha512-iX1mgmGrXdANhhITbpp2QQM2fGehBse9LbTf0sidWK6yg/NE+uhV5dfU1g6EYPlcReYmkE9QLPq/2irKAmtS9w==\n+\"@typescript-eslint/types@8.56.1\", \"@typescript-eslint/types@^8.56.1\":\n+ version \"8.56.1\"\n+ resolved \"https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.56.1.tgz#975e5942bf54895291337c91b9191f6eb0632ab9\"\n+ integrity sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw==\n \n \"@typescript-eslint/typescript-estree@5.62.0\":\n version \"5.62.0\"\n@@ -2380,30 +2318,30 @@\n semver \"^7.3.7\"\n tsutils \"^3.21.0\"\n \n-\"@typescript-eslint/typescript-estree@8.50.0\":\n- version \"8.50.0\"\n- resolved \"https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.50.0.tgz#2871d36617f81a127db905fa91b16d1a0251411b\"\n- integrity sha512-W7SVAGBR/IX7zm1t70Yujpbk+zdPq/u4soeFSknWFdXIFuWsBGBOUu/Tn/I6KHSKvSh91OiMuaSnYp3mtPt5IQ==\n- dependencies:\n- \"@typescript-eslint/project-service\" \"8.50.0\"\n- \"@typescript-eslint/tsconfig-utils\" \"8.50.0\"\n- \"@typescript-eslint/types\" \"8.50.0\"\n- \"@typescript-eslint/visitor-keys\" \"8.50.0\"\n- debug \"^4.3.4\"\n- minimatch \"^9.0.4\"\n- semver \"^7.6.0\"\n+\"@typescript-eslint/typescript-estree@8.56.1\":\n+ version \"8.56.1\"\n+ resolved \"https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.1.tgz#3b9e57d8129a860c50864c42188f761bdef3eab0\"\n+ integrity sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg==\n+ dependencies:\n+ \"@typescript-eslint/project-service\" \"8.56.1\"\n+ \"@typescript-eslint/tsconfig-utils\" \"8.56.1\"\n+ \"@typescript-eslint/types\" \"8.56.1\"\n+ \"@typescript-eslint/visitor-keys\" \"8.56.1\"\n+ debug \"^4.4.3\"\n+ minimatch \"^10.2.2\"\n+ semver \"^7.7.3\"\n tinyglobby \"^0.2.15\"\n- ts-api-utils \"^2.1.0\"\n+ ts-api-utils \"^2.4.0\"\n \n-\"@typescript-eslint/utils@8.50.0\":\n- version \"8.50.0\"\n- resolved \"https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.50.0.tgz#107f20a5747eab5db988c5f6ad462b59851cdd1f\"\n- integrity sha512-87KgUXET09CRjGCi2Ejxy3PULXna63/bMYv72tCAlDJC3Yqwln0HiFJ3VJMst2+mEtNtZu5oFvX4qJGjKsnAgg==\n+\"@typescript-eslint/utils@8.56.1\":\n+ version \"8.56.1\"\n+ resolved \"https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.56.1.tgz#5a86acaf9f1b4c4a85a42effb217f73059f6deb7\"\n+ integrity sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA==\n dependencies:\n- \"@eslint-community/eslint-utils\" \"^4.7.0\"\n- \"@typescript-eslint/scope-manager\" \"8.50.0\"\n- \"@typescript-eslint/types\" \"8.50.0\"\n- \"@typescript-eslint/typescript-estree\" \"8.50.0\"\n+ \"@eslint-community/eslint-utils\" \"^4.9.1\"\n+ \"@typescript-eslint/scope-manager\" \"8.56.1\"\n+ \"@typescript-eslint/types\" \"8.56.1\"\n+ \"@typescript-eslint/typescript-estree\" \"8.56.1\"\n \n \"@typescript-eslint/utils@^5.10.0\":\n version \"5.62.0\"\n@@ -2427,35 +2365,19 @@\n \"@typescript-eslint/types\" \"5.62.0\"\n eslint-visitor-keys \"^3.3.0\"\n \n-\"@typescript-eslint/visitor-keys@8.50.0\":\n- version \"8.50.0\"\n- resolved \"https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.50.0.tgz#79d1c95474e08f844dbe13370715cfb9b7e21363\"\n- integrity sha512-Xzmnb58+Db78gT/CCj/PVCvK+zxbnsw6F+O1oheYszJbBSdEjVhQi3C/Xttzxgi/GLmpvOggRs1RFpiJ8+c34Q==\n+\"@typescript-eslint/visitor-keys@8.56.1\":\n+ version \"8.56.1\"\n+ resolved \"https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.1.tgz#50e03475c33a42d123dc99e63acf1841c0231f87\"\n+ integrity sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw==\n dependencies:\n- \"@typescript-eslint/types\" \"8.50.0\"\n- eslint-visitor-keys \"^4.2.1\"\n+ \"@typescript-eslint/types\" \"8.56.1\"\n+ eslint-visitor-keys \"^5.0.0\"\n \n \"@ungap/structured-clone@^1.2.0\", \"@ungap/structured-clone@^1.3.0\":\n version \"1.3.0\"\n resolved \"https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8\"\n integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==\n \n-\"@urql/core@^5.0.6\", \"@urql/core@^5.1.2\":\n- version \"5.2.0\"\n- resolved \"https://registry.yarnpkg.com/@urql/core/-/core-5.2.0.tgz#77ee41e192e261fea30c2ca6c2f340410b45d214\"\n- integrity sha512-/n0ieD0mvvDnVAXEQgX/7qJiVcvYvNkOHeBvkwtylfjydar123caCXcl58PXFY11oU1oquJocVXHxLAbtv4x1A==\n- dependencies:\n- \"@0no-co/graphql.web\" \"^1.0.13\"\n- wonka \"^6.3.2\"\n-\n-\"@urql/exchange-retry@^1.3.0\":\n- version \"1.3.2\"\n- resolved \"https://registry.yarnpkg.com/@urql/exchange-retry/-/exchange-retry-1.3.2.tgz#042ff5f3512a062651ec7257f1b07f9db2f6fefd\"\n- integrity sha512-TQMCz2pFJMfpNxmSfX1VSfTjwUIFx/mL+p1bnfM1xjjdla7Z+KnGMW/EhFbpckp3LyWAH4PgOsMwOMnIN+MBFg==\n- dependencies:\n- \"@urql/core\" \"^5.1.2\"\n- wonka \"^6.3.2\"\n-\n \"@xmldom/xmldom@^0.8.8\":\n version \"0.8.11\"\n resolved \"https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.11.tgz#b79de2d67389734c57c52595f7a7305e30c2d608\"\n@@ -2481,6 +2403,14 @@ accepts@^1.3.7, accepts@^1.3.8:\n mime-types \"~2.1.34\"\n negotiator \"0.6.3\"\n \n+accepts@^2.0.0:\n+ version \"2.0.0\"\n+ resolved \"https://registry.yarnpkg.com/accepts/-/accepts-2.0.0.tgz#bbcf4ba5075467f3f2131eab3cffc73c2f5d7895\"\n+ integrity sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==\n+ dependencies:\n+ mime-types \"^3.0.0\"\n+ negotiator \"^1.0.0\"\n+\n acorn-globals@^7.0.0:\n version \"7.0.1\"\n resolved \"https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3\"\n@@ -2495,16 +2425,16 @@ acorn-jsx@^5.3.2:\n integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==\n \n acorn-walk@^8.0.2:\n- version \"8.3.4\"\n- resolved \"https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.4.tgz#794dd169c3977edf4ba4ea47583587c5866236b7\"\n- integrity sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==\n+ version \"8.3.5\"\n+ resolved \"https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.5.tgz#8a6b8ca8fc5b34685af15dabb44118663c296496\"\n+ integrity sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==\n dependencies:\n acorn \"^8.11.0\"\n \n acorn@^8.1.0, acorn@^8.11.0, acorn@^8.15.0, acorn@^8.8.1, acorn@^8.9.0:\n- version \"8.15.0\"\n- resolved \"https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816\"\n- integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==\n+ version \"8.16.0\"\n+ resolved \"https://registry.yarnpkg.com/acorn/-/acorn-8.16.0.tgz#4ce79c89be40afe7afe8f3adb902a1f1ce9ac08a\"\n+ integrity sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==\n \n agent-base@6:\n version \"6.0.2\"\n@@ -2519,9 +2449,9 @@ agent-base@^7.1.2:\n integrity sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==\n \n ajv@^6.12.4:\n- version \"6.12.6\"\n- resolved \"https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4\"\n- integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==\n+ version \"6.14.0\"\n+ resolved \"https://registry.yarnpkg.com/ajv/-/ajv-6.14.0.tgz#fd067713e228210636ebb08c60bd3765d6dbe73a\"\n+ integrity sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==\n dependencies:\n fast-deep-equal \"^3.1.1\"\n fast-json-stable-stringify \"^2.0.0\"\n@@ -2555,7 +2485,7 @@ ansi-regex@^5.0.0, ansi-regex@^5.0.1:\n resolved \"https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304\"\n integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==\n \n-ansi-regex@^6.0.1:\n+ansi-regex@^6.2.2:\n version \"6.2.2\"\n resolved \"https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1\"\n integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==\n@@ -2579,11 +2509,6 @@ ansi-styles@^5.0.0:\n resolved \"https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b\"\n integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==\n \n-any-promise@^1.0.0:\n- version \"1.3.0\"\n- resolved \"https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f\"\n- integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==\n-\n anymatch@^3.0.3:\n version \"3.1.3\"\n resolved \"https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e\"\n@@ -2592,10 +2517,10 @@ anymatch@^3.0.3:\n normalize-path \"^3.0.0\"\n picomatch \"^2.0.4\"\n \n-arg@4.1.0:\n- version \"4.1.0\"\n- resolved \"https://registry.yarnpkg.com/arg/-/arg-4.1.0.tgz#583c518199419e0037abb74062c37f8519e575f0\"\n- integrity sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg==\n+arg@^4.1.0:\n+ version \"4.1.3\"\n+ resolved \"https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089\"\n+ integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==\n \n arg@^5.0.2:\n version \"5.0.2\"\n@@ -2622,7 +2547,7 @@ array-buffer-byte-length@^1.0.1, array-buffer-byte-length@^1.0.2:\n call-bound \"^1.0.3\"\n is-array-buffer \"^3.0.5\"\n \n-array-includes@^3.1.4, array-includes@^3.1.5, array-includes@^3.1.6:\n+array-includes@^3.1.6, array-includes@^3.1.8, array-includes@^3.1.9:\n version \"3.1.9\"\n resolved \"https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.9.tgz#1f0ccaa08e90cdbc3eb433210f903ad0f17c3f3a\"\n integrity sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==\n@@ -2641,7 +2566,32 @@ array-union@^2.1.0:\n resolved \"https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d\"\n integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==\n \n-array.prototype.flat@^1.2.5, array.prototype.flat@^1.3.1:\n+array.prototype.findlast@^1.2.5:\n+ version \"1.2.5\"\n+ resolved \"https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz#3e4fbcb30a15a7f5bf64cf2faae22d139c2e4904\"\n+ integrity sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==\n+ dependencies:\n+ call-bind \"^1.0.7\"\n+ define-properties \"^1.2.1\"\n+ es-abstract \"^1.23.2\"\n+ es-errors \"^1.3.0\"\n+ es-object-atoms \"^1.0.0\"\n+ es-shim-unscopables \"^1.0.2\"\n+\n+array.prototype.findlastindex@^1.2.6:\n+ version \"1.2.6\"\n+ resolved \"https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz#cfa1065c81dcb64e34557c9b81d012f6a421c564\"\n+ integrity sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==\n+ dependencies:\n+ call-bind \"^1.0.8\"\n+ call-bound \"^1.0.4\"\n+ define-properties \"^1.2.1\"\n+ es-abstract \"^1.23.9\"\n+ es-errors \"^1.3.0\"\n+ es-object-atoms \"^1.1.1\"\n+ es-shim-unscopables \"^1.1.0\"\n+\n+array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.3:\n version \"1.3.3\"\n resolved \"https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz#534aaf9e6e8dd79fb6b9a9917f839ef1ec63afe5\"\n integrity sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==\n@@ -2651,7 +2601,7 @@ array.prototype.flat@^1.2.5, array.prototype.flat@^1.3.1:\n es-abstract \"^1.23.5\"\n es-shim-unscopables \"^1.0.2\"\n \n-array.prototype.flatmap@^1.3.0:\n+array.prototype.flatmap@^1.3.3:\n version \"1.3.3\"\n resolved \"https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz#712cc792ae70370ae40586264629e33aab5dd38b\"\n integrity sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==\n@@ -2661,6 +2611,17 @@ array.prototype.flatmap@^1.3.0:\n es-abstract \"^1.23.5\"\n es-shim-unscopables \"^1.0.2\"\n \n+array.prototype.tosorted@^1.1.4:\n+ version \"1.1.4\"\n+ resolved \"https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc\"\n+ integrity sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==\n+ dependencies:\n+ call-bind \"^1.0.7\"\n+ define-properties \"^1.2.1\"\n+ es-abstract \"^1.23.3\"\n+ es-errors \"^1.3.0\"\n+ es-shim-unscopables \"^1.0.2\"\n+\n arraybuffer.prototype.slice@^1.0.4:\n version \"1.0.4\"\n resolved \"https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz#9d760d84dbdd06d0cbf92c8849615a1a7ab3183c\"\n@@ -2679,27 +2640,11 @@ asap@~2.0.6:\n resolved \"https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46\"\n integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==\n \n-assert@^2.0.0:\n- version \"2.1.0\"\n- resolved \"https://registry.yarnpkg.com/assert/-/assert-2.1.0.tgz#6d92a238d05dc02e7427c881fb8be81c8448b2dd\"\n- integrity sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==\n- dependencies:\n- call-bind \"^1.0.2\"\n- is-nan \"^1.3.2\"\n- object-is \"^1.1.5\"\n- object.assign \"^4.1.4\"\n- util \"^0.12.5\"\n-\n async-function@^1.0.0:\n version \"1.0.0\"\n resolved \"https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b\"\n integrity sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==\n \n-async-limiter@~1.0.0:\n- version \"1.0.1\"\n- resolved \"https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd\"\n- integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==\n-\n asynckit@^0.4.0:\n version \"0.4.0\"\n resolved \"https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79\"\n@@ -2758,12 +2703,12 @@ babel-plugin-module-resolver@^5.0.2:\n resolve \"^1.22.8\"\n \n babel-plugin-polyfill-corejs2@^0.4.14:\n- version \"0.4.14\"\n- resolved \"https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.14.tgz#8101b82b769c568835611542488d463395c2ef8f\"\n- integrity sha512-Co2Y9wX854ts6U8gAAPXfn0GmAyctHuK8n0Yhfjd6t30g7yvKjspvvOo9yG+z52PZRgFErt7Ka2pYnXCjLKEpg==\n+ version \"0.4.15\"\n+ resolved \"https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.15.tgz#808fa349686eea4741807cfaaa2aa3aa57ce120a\"\n+ integrity sha512-hR3GwrRwHUfYwGfrisXPIDP3JcYfBrW7wKE7+Au6wDYl7fm/ka1NEII6kORzxNU556JjfidZeBsO10kYvtV1aw==\n dependencies:\n- \"@babel/compat-data\" \"^7.27.7\"\n- \"@babel/helper-define-polyfill-provider\" \"^0.6.5\"\n+ \"@babel/compat-data\" \"^7.28.6\"\n+ \"@babel/helper-define-polyfill-provider\" \"^0.6.6\"\n semver \"^6.3.1\"\n \n babel-plugin-polyfill-corejs3@^0.13.0:\n@@ -2775,11 +2720,11 @@ babel-plugin-polyfill-corejs3@^0.13.0:\n core-js-compat \"^3.43.0\"\n \n babel-plugin-polyfill-regenerator@^0.6.5:\n- version \"0.6.5\"\n- resolved \"https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.5.tgz#32752e38ab6f6767b92650347bf26a31b16ae8c5\"\n- integrity sha512-ISqQ2frbiNU9vIJkzg7dlPpznPZ4jOiUQ1uSmB0fEHeowtN3COYRsXr/xexn64NpU13P06jc/L5TgiJXOgrbEg==\n+ version \"0.6.6\"\n+ resolved \"https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.6.tgz#69f5dd263cab933c42fe5ea05e83443b374bd4bf\"\n+ integrity sha512-hYm+XLYRMvupxiQzrvXUj7YyvFFVfv5gI0R71AJzudg1g2AI2vyCPPIFEBjk162/wFzti3inBHo7isWFuEVS/A==\n dependencies:\n- \"@babel/helper-define-polyfill-provider\" \"^0.6.5\"\n+ \"@babel/helper-define-polyfill-provider\" \"^0.6.6\"\n \n babel-plugin-react-compiler@^1.0.0:\n version \"1.0.0\"\n@@ -2793,13 +2738,6 @@ babel-plugin-react-native-web@~0.21.0:\n resolved \"https://registry.yarnpkg.com/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.21.2.tgz#d2f7fd673278da82577aa583457edb55d9cccbe0\"\n integrity sha512-SPD0J6qjJn8231i0HZhlAGH6NORe+QvRSQM2mwQEzJ2Fb3E4ruWTiiicPlHjmeWShDXLcvoorOCXjeR7k/lyWA==\n \n-babel-plugin-syntax-hermes-parser@0.29.1, babel-plugin-syntax-hermes-parser@^0.29.1:\n- version \"0.29.1\"\n- resolved \"https://registry.yarnpkg.com/babel-plugin-syntax-hermes-parser/-/babel-plugin-syntax-hermes-parser-0.29.1.tgz#09ca9ecb0330eba1ef939b6d3f1f55bb06a9dc33\"\n- integrity sha512-2WFYnoWGdmih1I1J5eIqxATOeycOqRwYxAQBu3cUu/rhwInwHUg7k60AFNbuGjSDL8tje5GDrAnxzRLcu2pYcA==\n- dependencies:\n- hermes-parser \"0.29.1\"\n-\n babel-plugin-syntax-hermes-parser@0.32.0:\n version \"0.32.0\"\n resolved \"https://registry.yarnpkg.com/babel-plugin-syntax-hermes-parser/-/babel-plugin-syntax-hermes-parser-0.32.0.tgz#06f7452bf91adf6cafd7c98e7467404d4eb65cec\"\n@@ -2807,6 +2745,13 @@ babel-plugin-syntax-hermes-parser@0.32.0:\n dependencies:\n hermes-parser \"0.32.0\"\n \n+babel-plugin-syntax-hermes-parser@^0.32.0:\n+ version \"0.32.1\"\n+ resolved \"https://registry.yarnpkg.com/babel-plugin-syntax-hermes-parser/-/babel-plugin-syntax-hermes-parser-0.32.1.tgz#ececc38408d408744bff3091bb1c1379a96c3f02\"\n+ integrity sha512-HgErPZTghW76Rkq9uqn5ESeiD97FbqpZ1V170T1RG2RDp+7pJVQV2pQJs7y5YzN0/gcT6GM5ci9apRnIwuyPdQ==\n+ dependencies:\n+ hermes-parser \"0.32.1\"\n+\n babel-plugin-transform-flow-enums@^0.0.2:\n version \"0.0.2\"\n resolved \"https://registry.yarnpkg.com/babel-plugin-transform-flow-enums/-/babel-plugin-transform-flow-enums-0.0.2.tgz#d1d0cc9bdc799c850ca110d0ddc9f21b9ec3ef25\"\n@@ -2835,11 +2780,12 @@ babel-preset-current-node-syntax@^1.0.0:\n \"@babel/plugin-syntax-private-property-in-object\" \"^7.14.5\"\n \"@babel/plugin-syntax-top-level-await\" \"^7.14.5\"\n \n-babel-preset-expo@~54.0.0, babel-preset-expo@~54.0.8:\n- version \"54.0.8\"\n- resolved \"https://registry.yarnpkg.com/babel-preset-expo/-/babel-preset-expo-54.0.8.tgz#13e084fe0b8259d772037eb18ed5b10af7d34661\"\n- integrity sha512-3ZJ4Q7uQpm8IR/C9xbKhE/IUjGpLm+OIjF8YCedLgqoe/wN1Ns2wLT7HwG6ZXXb6/rzN8IMCiKFQ2F93qlN6GA==\n+babel-preset-expo@~55.0.10:\n+ version \"55.0.10\"\n+ resolved \"https://registry.yarnpkg.com/babel-preset-expo/-/babel-preset-expo-55.0.10.tgz#366f3b90b9a67911a5403545de7390f2f95f0d68\"\n+ integrity sha512-aRtW7qJKohGU2V0LUJ6IeP7py3+kVUo9zcc8+v1Kix8jGGuIvqvpo9S6W1Fmn9VFP2DBwkFDLiyzkCZS85urVA==\n dependencies:\n+ \"@babel/generator\" \"^7.20.5\"\n \"@babel/helper-module-imports\" \"^7.25.9\"\n \"@babel/plugin-proposal-decorators\" \"^7.12.9\"\n \"@babel/plugin-proposal-export-default-from\" \"^7.24.7\"\n@@ -2855,10 +2801,10 @@ babel-preset-expo@~54.0.0, babel-preset-expo@~54.0.8:\n \"@babel/plugin-transform-runtime\" \"^7.24.7\"\n \"@babel/preset-react\" \"^7.22.15\"\n \"@babel/preset-typescript\" \"^7.23.0\"\n- \"@react-native/babel-preset\" \"0.81.5\"\n+ \"@react-native/babel-preset\" \"0.83.2\"\n babel-plugin-react-compiler \"^1.0.0\"\n babel-plugin-react-native-web \"~0.21.0\"\n- babel-plugin-syntax-hermes-parser \"^0.29.1\"\n+ babel-plugin-syntax-hermes-parser \"^0.32.0\"\n babel-plugin-transform-flow-enums \"^0.0.2\"\n debug \"^4.3.4\"\n resolve-from \"^5.0.0\"\n@@ -2881,15 +2827,27 @@ balanced-match@^1.0.0:\n resolved \"https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee\"\n integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==\n \n-base64-js@^1.2.3, base64-js@^1.3.1, base64-js@^1.5.1:\n+balanced-match@^4.0.2:\n+ version \"4.0.4\"\n+ resolved \"https://registry.yarnpkg.com/balanced-match/-/balanced-match-4.0.4.tgz#bfb10662feed8196a2c62e7c68e17720c274179a\"\n+ integrity sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==\n+\n+barcode-detector@^3.0.0:\n+ version \"3.1.0\"\n+ resolved \"https://registry.yarnpkg.com/barcode-detector/-/barcode-detector-3.1.0.tgz#ce340cead9f267951f4c53887ac24b64c21a79c4\"\n+ integrity sha512-aQjGxrgsb/WTlw6pHZwFRO6NhFMhwHGEkd0pzV25fBn8dnRA1PA1G7bLeAzvSea646S/96nW5W3jD8wezQZ1vQ==\n+ dependencies:\n+ zxing-wasm \"3.0.0\"\n+\n+base64-js@^1.5.1:\n version \"1.5.1\"\n resolved \"https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a\"\n integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==\n \n baseline-browser-mapping@^2.9.0:\n- version \"2.9.8\"\n- resolved \"https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.9.8.tgz#04fb5c10ff9c7a1b04ac08cfdfc3b10942a8ac72\"\n- integrity sha512-Y1fOuNDowLfgKOypdc9SPABfoWXuZHBOyCS4cD52IeZBhr4Md6CLLs6atcxVrzRmQ06E7hSlm5bHHApPKR/byA==\n+ version \"2.10.0\"\n+ resolved \"https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.0.tgz#5b09935025bf8a80e29130251e337c6a7fc8cbb9\"\n+ integrity sha512-lIyg0szRfYbiy67j9KN8IyeD7q7hcmqnJ1ddWmNt19ItGpNN64mnllmxUNFIOdOm6by97jlL6wfpTTJrmnjWAA==\n \n better-opn@~3.0.2:\n version \"3.0.2\"\n@@ -2944,6 +2902,13 @@ brace-expansion@^2.0.1:\n dependencies:\n balanced-match \"^1.0.0\"\n \n+brace-expansion@^5.0.2:\n+ version \"5.0.4\"\n+ resolved \"https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-5.0.4.tgz#614daaecd0a688f660bbbc909a8748c3d80d4336\"\n+ integrity sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==\n+ dependencies:\n+ balanced-match \"^4.0.2\"\n+\n braces@^3.0.3:\n version \"3.0.3\"\n resolved \"https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789\"\n@@ -2951,7 +2916,7 @@ braces@^3.0.3:\n dependencies:\n fill-range \"^7.1.1\"\n \n-browserslist@^4.24.0, browserslist@^4.25.0, browserslist@^4.28.0:\n+browserslist@^4.24.0, browserslist@^4.25.0, browserslist@^4.28.1:\n version \"4.28.1\"\n resolved \"https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.1.tgz#7f534594628c53c63101079e27e40de490456a95\"\n integrity sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==\n@@ -2974,14 +2939,6 @@ buffer-from@^1.0.0:\n resolved \"https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5\"\n integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==\n \n-buffer@^5.4.3:\n- version \"5.7.1\"\n- resolved \"https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0\"\n- integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==\n- dependencies:\n- base64-js \"^1.3.1\"\n- ieee754 \"^1.1.13\"\n-\n bytes@3.1.2:\n version \"3.1.2\"\n resolved \"https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5\"\n@@ -2995,7 +2952,7 @@ call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-\n es-errors \"^1.3.0\"\n function-bind \"^1.1.2\"\n \n-call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.7, call-bind@^1.0.8:\n+call-bind@^1.0.7, call-bind@^1.0.8:\n version \"1.0.8\"\n resolved \"https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c\"\n integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==\n@@ -3034,9 +2991,9 @@ camelize@^1.0.0:\n integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==\n \n caniuse-lite@^1.0.30001759:\n- version \"1.0.30001760\"\n- resolved \"https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001760.tgz#bdd1960fafedf8d5f04ff16e81460506ff9b798f\"\n- integrity sha512-7AAMPcueWELt1p3mi13HR/LHH0TJLT11cnwDJEs3xA4+CK/PLKeO9Kl1oru24htkyUKtkGCvAx4ohB0Ttry8Dw==\n+ version \"1.0.30001775\"\n+ resolved \"https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001775.tgz#9572266e3f7f77efee5deac1efeb4795879d1b7f\"\n+ integrity sha512-s3Qv7Lht9zbVKE9XoTyRG6wVDCKdtOFIjBGg3+Yhn6JaytuNKPIjBMTMIY1AnOH3seL5mvF+x33oGAyK3hVt3A==\n \n carbon-footprint@1.6.0:\n version \"1.6.0\"\n@@ -3078,21 +3035,26 @@ char-regex@^2.0.0:\n resolved \"https://registry.yarnpkg.com/char-regex/-/char-regex-2.0.2.tgz#81385bb071af4df774bff8721d0ca15ef29ea0bb\"\n integrity sha512-cbGOjAptfM2LVmWhwRFHEKTPkLwNddVmuqYZQt895yXwAsWsXObCG+YN4DGQ/JBtT4GP1a1lPPdio2z413LmTg==\n \n+character-entities-html4@^1.0.0:\n+ version \"1.1.4\"\n+ resolved \"https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.4.tgz#0e64b0a3753ddbf1fdc044c5fd01d0199a02e125\"\n+ integrity sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==\n+\n character-entities-html4@^2.0.0:\n version \"2.1.0\"\n resolved \"https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-2.1.0.tgz#1f1adb940c971a4b22ba39ddca6b618dc6e56b2b\"\n integrity sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==\n \n+character-entities-legacy@^1.0.0:\n+ version \"1.1.4\"\n+ resolved \"https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1\"\n+ integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==\n+\n character-entities-legacy@^3.0.0:\n version \"3.0.0\"\n resolved \"https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz#76bc83a90738901d7bc223a9e93759fdd560125b\"\n integrity sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==\n \n-chownr@^3.0.0:\n- version \"3.0.0\"\n- resolved \"https://registry.yarnpkg.com/chownr/-/chownr-3.0.0.tgz#9855e64ecd240a9cc4267ce8a4aa5d24a1da15e4\"\n- integrity sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==\n-\n chrome-launcher@^0.15.2:\n version \"0.15.2\"\n resolved \"https://registry.yarnpkg.com/chrome-launcher/-/chrome-launcher-0.15.2.tgz#4e6404e32200095fdce7f6a1e1004f9bd36fa5da\"\n@@ -3228,11 +3190,6 @@ commander@^2.20.0:\n resolved \"https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33\"\n integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==\n \n-commander@^4.0.0:\n- version \"4.1.1\"\n- resolved \"https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068\"\n- integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==\n-\n commander@^7.2.0:\n version \"7.2.0\"\n resolved \"https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7\"\n@@ -3278,17 +3235,17 @@ connect@^3.6.5, connect@^3.7.0:\n parseurl \"~1.3.3\"\n utils-merge \"1.0.1\"\n \n-convert-source-map@^2.0.0:\n+convert-source-map@2.0.0, convert-source-map@^2.0.0:\n version \"2.0.0\"\n resolved \"https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a\"\n integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==\n \n core-js-compat@^3.43.0:\n- version \"3.47.0\"\n- resolved \"https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.47.0.tgz#698224bbdbb6f2e3f39decdda4147b161e3772a3\"\n- integrity sha512-IGfuznZ/n7Kp9+nypamBhvwdwLsW6KC8IOaURw2doAK5e98AG3acVLdh0woOnEqCfUtS+Vu882JE4k/DAm3ItQ==\n+ version \"3.48.0\"\n+ resolved \"https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.48.0.tgz#7efbe1fc1cbad44008190462217cc5558adaeaa6\"\n+ integrity sha512-OM4cAF3D6VtH/WkLtWvyNC56EZVXsZdU3iqaMG2B4WvYrlqU831pc4UtG5yp0sE9z8Y02wVN7PjW5Zf9Gt0f1Q==\n dependencies:\n- browserslist \"^4.28.0\"\n+ browserslist \"^4.28.1\"\n \n cosmiconfig@^6.0.0:\n version \"6.0.0\"\n@@ -3323,11 +3280,6 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3, cross-spawn@^7.0.6:\n shebang-command \"^2.0.0\"\n which \"^2.0.1\"\n \n-crypto-random-string@^2.0.0:\n- version \"2.0.0\"\n- resolved \"https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5\"\n- integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==\n-\n css-color-keywords@^1.0.0:\n version \"1.0.0\"\n resolved \"https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05\"\n@@ -3344,7 +3296,7 @@ css-select@^5.1.0:\n domutils \"^3.0.1\"\n nth-check \"^2.0.1\"\n \n-css-to-react-native@^3.2.0:\n+css-to-react-native@^3.0.0, css-to-react-native@^3.2.0:\n version \"3.2.0\"\n resolved \"https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.2.0.tgz#cdd8099f71024e149e4f6fe17a7d46ecd55f1e32\"\n integrity sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==\n@@ -3383,7 +3335,7 @@ cssstyle@^2.3.0:\n dependencies:\n cssom \"~0.3.6\"\n \n-csstype@^3.0.2, csstype@^3.1.3, csstype@^3.2.2:\n+csstype@^3.0.8, csstype@^3.0.9, csstype@^3.1.3, csstype@^3.2.2:\n version \"3.2.3\"\n resolved \"https://registry.yarnpkg.com/csstype/-/csstype-3.2.3.tgz#ec48c0f3e993e50648c86da559e2610995cf989a\"\n integrity sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==\n@@ -3436,7 +3388,7 @@ debug@2.6.9, debug@^2.6.9:\n dependencies:\n ms \"2.0.0\"\n \n-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.4.0, debug@^4.4.1:\n+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.4.0, debug@^4.4.3:\n version \"4.4.3\"\n resolved \"https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a\"\n integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==\n@@ -3461,14 +3413,9 @@ decode-uri-component@^0.2.2:\n integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==\n \n dedent@^1.0.0:\n- version \"1.7.0\"\n- resolved \"https://registry.yarnpkg.com/dedent/-/dedent-1.7.0.tgz#c1f9445335f0175a96587be245a282ff451446ca\"\n- integrity sha512-HGFtf8yhuhGhqO07SV79tRp+br4MnbdjeVxotpn1QBl30pcLLCQjX5b2295ll0fv8RKDKsmWYrl05usHM9CewQ==\n-\n-deep-extend@^0.6.0:\n- version \"0.6.0\"\n- resolved \"https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac\"\n- integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==\n+ version \"1.7.1\"\n+ resolved \"https://registry.yarnpkg.com/dedent/-/dedent-1.7.1.tgz#364661eea3d73f3faba7089214420ec2f8f13e15\"\n+ integrity sha512-9JmrhGZpOlEgOLdQgSm0zxFaYoQon408V1v49aqTWuXENVlnCuY9JBZcXZiCsZQWDjTm5Qf/nIvAy77mXDAjEg==\n \n deep-is@^0.1.3:\n version \"0.1.4\"\n@@ -3547,6 +3494,11 @@ dir-glob@^3.0.1:\n dependencies:\n path-type \"^4.0.0\"\n \n+dnssd-advertise@^1.1.3:\n+ version \"1.1.3\"\n+ resolved \"https://registry.yarnpkg.com/dnssd-advertise/-/dnssd-advertise-1.1.3.tgz#bf130e5b22f2d76b2b6b33b201e93c68c75b3786\"\n+ integrity sha512-XENsHi3MBzWOCAXif3yZvU1Ah0l+nhJj1sjWL6TnOAYKvGiFhbTx32xHN7+wLMLUOCj7Nr0evADWG4R8JtqCDA==\n+\n doctrine@^2.1.0:\n version \"2.1.0\"\n resolved \"https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d\"\n@@ -3561,6 +3513,15 @@ doctrine@^3.0.0:\n dependencies:\n esutils \"^2.0.2\"\n \n+dom-serializer@^1.0.1:\n+ version \"1.4.1\"\n+ resolved \"https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30\"\n+ integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==\n+ dependencies:\n+ domelementtype \"^2.0.1\"\n+ domhandler \"^4.2.0\"\n+ entities \"^2.0.0\"\n+\n dom-serializer@^2.0.0:\n version \"2.0.0\"\n resolved \"https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53\"\n@@ -3570,7 +3531,7 @@ dom-serializer@^2.0.0:\n domhandler \"^5.0.2\"\n entities \"^4.2.0\"\n \n-domelementtype@^2.3.0:\n+domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0:\n version \"2.3.0\"\n resolved \"https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d\"\n integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==\n@@ -3582,6 +3543,13 @@ domexception@^4.0.0:\n dependencies:\n webidl-conversions \"^7.0.0\"\n \n+domhandler@^4.2.0, domhandler@^4.2.2:\n+ version \"4.3.1\"\n+ resolved \"https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c\"\n+ integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==\n+ dependencies:\n+ domelementtype \"^2.2.0\"\n+\n domhandler@^5.0.2, domhandler@^5.0.3:\n version \"5.0.3\"\n resolved \"https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31\"\n@@ -3589,6 +3557,15 @@ domhandler@^5.0.2, domhandler@^5.0.3:\n dependencies:\n domelementtype \"^2.3.0\"\n \n+domutils@^2.8.0:\n+ version \"2.8.0\"\n+ resolved \"https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135\"\n+ integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==\n+ dependencies:\n+ dom-serializer \"^1.0.1\"\n+ domelementtype \"^2.2.0\"\n+ domhandler \"^4.2.0\"\n+\n domutils@^3.0.1, domutils@^3.2.2:\n version \"3.2.2\"\n resolved \"https://registry.yarnpkg.com/domutils/-/domutils-3.2.2.tgz#edbfe2b668b0c1d97c24baf0f1062b132221bc78\"\n@@ -3598,28 +3575,11 @@ domutils@^3.0.1, domutils@^3.2.2:\n domelementtype \"^2.3.0\"\n domhandler \"^5.0.3\"\n \n-dotenv-expand@~11.0.6:\n- version \"11.0.7\"\n- resolved \"https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-11.0.7.tgz#af695aea007d6fdc84c86cd8d0ad7beb40a0bd08\"\n- integrity sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==\n- dependencies:\n- dotenv \"^16.4.5\"\n-\n dotenv@16.0.3:\n version \"16.0.3\"\n resolved \"https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07\"\n integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==\n \n-dotenv@^16.4.5:\n- version \"16.6.1\"\n- resolved \"https://registry.yarnpkg.com/dotenv/-/dotenv-16.6.1.tgz#773f0e69527a8315c7285d5ee73c4459d20a8020\"\n- integrity sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==\n-\n-dotenv@~16.4.5:\n- version \"16.4.7\"\n- resolved \"https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.7.tgz#0e20c5b82950140aa99be360a8a5f52335f53c26\"\n- integrity sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==\n-\n dunder-proto@^1.0.0, dunder-proto@^1.0.1:\n version \"1.0.1\"\n resolved \"https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a\"\n@@ -3635,9 +3595,9 @@ ee-first@1.1.1:\n integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==\n \n electron-to-chromium@^1.5.263:\n- version \"1.5.267\"\n- resolved \"https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.267.tgz#5d84f2df8cdb6bfe7e873706bb21bd4bfb574dc7\"\n- integrity sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==\n+ version \"1.5.302\"\n+ resolved \"https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.302.tgz#032a5802b31f7119269959c69fe2015d8dad5edb\"\n+ integrity sha512-sM6HAN2LyK82IyPBpznDRqlTQAtuSaO+ShzFiWTvoMJLHyZ+Y39r8VMfHzwbU8MVBzQ4Wdn85+wlZl2TLGIlwg==\n \n emittery@^0.13.1:\n version \"0.13.1\"\n@@ -3660,12 +3620,22 @@ encodeurl@~2.0.0:\n integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==\n \n enhanced-resolve@^5.10.0:\n- version \"5.18.4\"\n- resolved \"https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.4.tgz#c22d33055f3952035ce6a144ce092447c525f828\"\n- integrity sha512-LgQMM4WXU3QI+SYgEc2liRgznaD5ojbmY3sb8LxyguVkIg5FxdpTkvk72te2R38/TGKxH634oLxXRGY6d7AP+Q==\n+ version \"5.20.0\"\n+ resolved \"https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.20.0.tgz#323c2a70d2aa7fb4bdfd6d3c24dfc705c581295d\"\n+ integrity sha512-/ce7+jQ1PQ6rVXwe+jKEg5hW5ciicHwIQUagZkp6IufBoY3YDgdTTY1azVs0qoRgVmvsNB+rbjLJxDAeHHtwsQ==\n dependencies:\n graceful-fs \"^4.2.4\"\n- tapable \"^2.2.0\"\n+ tapable \"^2.3.0\"\n+\n+entities@^2.0.0:\n+ version \"2.2.0\"\n+ resolved \"https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55\"\n+ integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==\n+\n+entities@^3.0.1:\n+ version \"3.0.1\"\n+ resolved \"https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4\"\n+ integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==\n \n entities@^4.2.0:\n version \"4.5.0\"\n@@ -3687,11 +3657,6 @@ entities@~2.0.0:\n resolved \"https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f\"\n integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==\n \n-env-editor@^0.4.1:\n- version \"0.4.2\"\n- resolved \"https://registry.yarnpkg.com/env-editor/-/env-editor-0.4.2.tgz#4e76568d0bd8f5c2b6d314a9412c8fe9aa3ae861\"\n- integrity sha512-ObFo8v4rQJAE59M69QzwloxPZtd33TpYEIjtKD1rrFDcM1Gd7IkDxEBU+HriziN6HSHQnBJi8Dmy+JWkav5HKA==\n-\n error-ex@^1.3.1:\n version \"1.3.4\"\n resolved \"https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.4.tgz#b3a8d8bb6f92eecc1629e3e27d3c8607a8a32414\"\n@@ -3706,7 +3671,7 @@ error-stack-parser@^2.0.6:\n dependencies:\n stackframe \"^1.3.4\"\n \n-es-abstract@^1.23.2, es-abstract@^1.23.5, es-abstract@^1.23.6, es-abstract@^1.23.9, es-abstract@^1.24.0:\n+es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23.5, es-abstract@^1.23.6, es-abstract@^1.23.9, es-abstract@^1.24.0, es-abstract@^1.24.1:\n version \"1.24.1\"\n resolved \"https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.1.tgz#f0c131ed5ea1bb2411134a8dd94def09c46c7899\"\n integrity sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==\n@@ -3776,6 +3741,28 @@ es-errors@^1.3.0:\n resolved \"https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f\"\n integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==\n \n+es-iterator-helpers@^1.2.1:\n+ version \"1.2.2\"\n+ resolved \"https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.2.2.tgz#d979a9f686e2b0b72f88dbead7229924544720bc\"\n+ integrity sha512-BrUQ0cPTB/IwXj23HtwHjS9n7O4h9FX94b4xc5zlTHxeLgTAdzYUDyy6KdExAl9lbN5rtfe44xpjpmj9grxs5w==\n+ dependencies:\n+ call-bind \"^1.0.8\"\n+ call-bound \"^1.0.4\"\n+ define-properties \"^1.2.1\"\n+ es-abstract \"^1.24.1\"\n+ es-errors \"^1.3.0\"\n+ es-set-tostringtag \"^2.1.0\"\n+ function-bind \"^1.1.2\"\n+ get-intrinsic \"^1.3.0\"\n+ globalthis \"^1.0.4\"\n+ gopd \"^1.2.0\"\n+ has-property-descriptors \"^1.0.2\"\n+ has-proto \"^1.2.0\"\n+ has-symbols \"^1.1.0\"\n+ internal-slot \"^1.1.0\"\n+ iterator.prototype \"^1.1.5\"\n+ safe-array-concat \"^1.1.3\"\n+\n es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:\n version \"1.1.1\"\n resolved \"https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1\"\n@@ -3793,7 +3780,7 @@ es-set-tostringtag@^2.1.0:\n has-tostringtag \"^1.0.2\"\n hasown \"^2.0.2\"\n \n-es-shim-unscopables@^1.0.2:\n+es-shim-unscopables@^1.0.2, es-shim-unscopables@^1.1.0:\n version \"1.1.0\"\n resolved \"https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz#438df35520dac5d105f3943d927549ea3b00f4b5\"\n integrity sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==\n@@ -3850,7 +3837,7 @@ eslint-config-prettier@8.5.0:\n resolved \"https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1\"\n integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==\n \n-eslint-import-resolver-node@^0.3.6:\n+eslint-import-resolver-node@^0.3.9:\n version \"0.3.9\"\n resolved \"https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac\"\n integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==\n@@ -3872,31 +3859,37 @@ eslint-import-resolver-typescript@3.5.2:\n is-glob \"^4.0.3\"\n synckit \"^0.8.4\"\n \n-eslint-module-utils@^2.7.3:\n+eslint-module-utils@^2.12.1:\n version \"2.12.1\"\n resolved \"https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz#f76d3220bfb83c057651359295ab5854eaad75ff\"\n integrity sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==\n dependencies:\n debug \"^3.2.7\"\n \n-eslint-plugin-import@2.26.0:\n- version \"2.26.0\"\n- resolved \"https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b\"\n- integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==\n+eslint-plugin-import@2.32.0:\n+ version \"2.32.0\"\n+ resolved \"https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz#602b55faa6e4caeaa5e970c198b5c00a37708980\"\n+ integrity sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==\n dependencies:\n- array-includes \"^3.1.4\"\n- array.prototype.flat \"^1.2.5\"\n- debug \"^2.6.9\"\n+ \"@rtsao/scc\" \"^1.1.0\"\n+ array-includes \"^3.1.9\"\n+ array.prototype.findlastindex \"^1.2.6\"\n+ array.prototype.flat \"^1.3.3\"\n+ array.prototype.flatmap \"^1.3.3\"\n+ debug \"^3.2.7\"\n doctrine \"^2.1.0\"\n- eslint-import-resolver-node \"^0.3.6\"\n- eslint-module-utils \"^2.7.3\"\n- has \"^1.0.3\"\n- is-core-module \"^2.8.1\"\n+ eslint-import-resolver-node \"^0.3.9\"\n+ eslint-module-utils \"^2.12.1\"\n+ hasown \"^2.0.2\"\n+ is-core-module \"^2.16.1\"\n is-glob \"^4.0.3\"\n minimatch \"^3.1.2\"\n- object.values \"^1.1.5\"\n- resolve \"^1.22.0\"\n- tsconfig-paths \"^3.14.1\"\n+ object.fromentries \"^2.0.8\"\n+ object.groupby \"^1.0.3\"\n+ object.values \"^1.2.1\"\n+ semver \"^6.3.1\"\n+ string.prototype.trimend \"^1.0.9\"\n+ tsconfig-paths \"^3.15.0\"\n \n eslint-plugin-jest@27.1.3:\n version \"27.1.3\"\n@@ -3917,25 +3910,29 @@ eslint-plugin-react-hooks@4.6.0:\n resolved \"https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3\"\n integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==\n \n-eslint-plugin-react@7.31.10:\n- version \"7.31.10\"\n- resolved \"https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.10.tgz#6782c2c7fe91c09e715d536067644bbb9491419a\"\n- integrity sha512-e4N/nc6AAlg4UKW/mXeYWd3R++qUano5/o+t+wnWxIf+bLsOaH3a4q74kX3nDjYym3VBN4HyO9nEn1GcAqgQOA==\n+eslint-plugin-react@7.37.5:\n+ version \"7.37.5\"\n+ resolved \"https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz#2975511472bdda1b272b34d779335c9b0e877065\"\n+ integrity sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==\n dependencies:\n- array-includes \"^3.1.5\"\n- array.prototype.flatmap \"^1.3.0\"\n+ array-includes \"^3.1.8\"\n+ array.prototype.findlast \"^1.2.5\"\n+ array.prototype.flatmap \"^1.3.3\"\n+ array.prototype.tosorted \"^1.1.4\"\n doctrine \"^2.1.0\"\n+ es-iterator-helpers \"^1.2.1\"\n estraverse \"^5.3.0\"\n+ hasown \"^2.0.2\"\n jsx-ast-utils \"^2.4.1 || ^3.0.0\"\n minimatch \"^3.1.2\"\n- object.entries \"^1.1.5\"\n- object.fromentries \"^2.0.5\"\n- object.hasown \"^1.1.1\"\n- object.values \"^1.1.5\"\n+ object.entries \"^1.1.9\"\n+ object.fromentries \"^2.0.8\"\n+ object.values \"^1.2.1\"\n prop-types \"^15.8.1\"\n- resolve \"^2.0.0-next.3\"\n- semver \"^6.3.0\"\n- string.prototype.matchall \"^4.0.7\"\n+ resolve \"^2.0.0-next.5\"\n+ semver \"^6.3.1\"\n+ string.prototype.matchall \"^4.0.12\"\n+ string.prototype.repeat \"^1.0.0\"\n \n eslint-scope@^5.1.1:\n version \"5.1.1\"\n@@ -3958,10 +3955,10 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4\n resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800\"\n integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==\n \n-eslint-visitor-keys@^4.2.1:\n- version \"4.2.1\"\n- resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz#4cfea60fe7dd0ad8e816e1ed026c1d5251b512c1\"\n- integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==\n+eslint-visitor-keys@^5.0.0:\n+ version \"5.0.1\"\n+ resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz#9e3c9489697824d2d4ce3a8ad12628f91e9f59be\"\n+ integrity sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==\n \n eslint@^8.57.0:\n version \"8.57.1\"\n@@ -4022,9 +4019,9 @@ esprima@^4.0.0, esprima@^4.0.1:\n integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==\n \n esquery@^1.4.2:\n- version \"1.6.0\"\n- resolved \"https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7\"\n- integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==\n+ version \"1.7.0\"\n+ resolved \"https://registry.yarnpkg.com/esquery/-/esquery-1.7.0.tgz#08d048f261f0ddedb5bae95f46809463d9c9496d\"\n+ integrity sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==\n dependencies:\n estraverse \"^5.1.0\"\n \n@@ -4060,11 +4057,6 @@ event-target-shim@^5.0.0:\n resolved \"https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789\"\n integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==\n \n-exec-async@^2.2.0:\n- version \"2.2.0\"\n- resolved \"https://registry.yarnpkg.com/exec-async/-/exec-async-2.2.0.tgz#c7c5ad2eef3478d38390c6dd3acfe8af0efc8301\"\n- integrity sha512-87OpwcEiMia/DeiKFzaQNBNFeN3XkkpYIh9FyOqq5mS2oKv3CBE67PXoEKcr6nodWdXNogTiQ0jE2NGuoffXPw==\n-\n execa@^5.0.0:\n version \"5.1.1\"\n resolved \"https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd\"\n@@ -4096,210 +4088,213 @@ expect@^29.0.0, expect@^29.7.0:\n jest-message-util \"^29.7.0\"\n jest-util \"^29.7.0\"\n \n-expo-application@~7.0.8:\n- version \"7.0.8\"\n- resolved \"https://registry.yarnpkg.com/expo-application/-/expo-application-7.0.8.tgz#320af0d6c39b331456d3bc833b25763c702d23db\"\n- integrity sha512-qFGyxk7VJbrNOQWBbE09XUuGuvkOgFS9QfToaK2FdagM2aQ+x3CvGV2DuVgl/l4ZxPgIf3b/MNh9xHpwSwn74Q==\n+expo-application@~55.0.8:\n+ version \"55.0.8\"\n+ resolved \"https://registry.yarnpkg.com/expo-application/-/expo-application-55.0.8.tgz#5e216efde0f414d2bb8b3989d47151ba75c461ef\"\n+ integrity sha512-PeZk4Zj8LlzRcRtK3J4ouSPBoi9lroYsRbbz/0HEvx+uB6HIaM1qfzgpcctvjkdJJfnidBQNyieW5BVO/qUQ6w==\n \n-expo-asset@~12.0.11:\n- version \"12.0.11\"\n- resolved \"https://registry.yarnpkg.com/expo-asset/-/expo-asset-12.0.11.tgz#f1905538f35b7e3d6f730efbc633ce596d88f16d\"\n- integrity sha512-pnK/gQ5iritDPBeK54BV35ZpG7yeW5DtgGvJHruIXkyDT9BCoQq3i0AAxfcWG/e4eiRmTzAt5kNVYFJi48uo+A==\n+expo-asset@~55.0.8:\n+ version \"55.0.8\"\n+ resolved \"https://registry.yarnpkg.com/expo-asset/-/expo-asset-55.0.8.tgz#17622c3b19a4ab51a962608492b935f8c8637bb1\"\n+ integrity sha512-yEz2svDX67R0yiW2skx6dJmcE0q7sj9ECpGMcxBExMCbctc+nMoZCnjUuhzPl5vhClUsO5HFFXS5vIGmf1bgHQ==\n dependencies:\n- \"@expo/image-utils\" \"^0.8.8\"\n- expo-constants \"~18.0.11\"\n+ \"@expo/image-utils\" \"^0.8.12\"\n+ expo-constants \"~55.0.7\"\n \n-expo-camera@~17.0.10:\n- version \"17.0.10\"\n- resolved \"https://registry.yarnpkg.com/expo-camera/-/expo-camera-17.0.10.tgz#b3a217f0eb811a6e3522c2aff9f42be578aa6456\"\n- integrity sha512-w1RBw83mAGVk4BPPwNrCZyFop0VLiVSRE3c2V9onWbdFwonpRhzmB4drygG8YOUTl1H3wQvALJHyMPTbgsK1Jg==\n+expo-camera@~55.0.9:\n+ version \"55.0.9\"\n+ resolved \"https://registry.yarnpkg.com/expo-camera/-/expo-camera-55.0.9.tgz#d64d8d88db5693c61321afd89d2b22cdb17e6e3b\"\n+ integrity sha512-ywjmZChGPqyIginN9K1lEJCSTB6M4the37m56tAcvYs3cu0DAUAlTl4n2MY6S7kGdm3iEi0cGmlDpHFyh7rmwg==\n dependencies:\n- invariant \"^2.2.4\"\n+ barcode-detector \"^3.0.0\"\n \n-expo-constants@~18.0.11, expo-constants@~18.0.12:\n- version \"18.0.12\"\n- resolved \"https://registry.yarnpkg.com/expo-constants/-/expo-constants-18.0.12.tgz#3e67f7109ffd03eaa5514c19875a767c39f5a2ca\"\n- integrity sha512-WzcKYMVNRRu4NcSzfIVRD5aUQFnSpTZgXFrlWmm19xJoDa4S3/PQNi6PNTBRc49xz9h8FT7HMxRKaC8lr0gflA==\n+expo-constants@~55.0.7:\n+ version \"55.0.7\"\n+ resolved \"https://registry.yarnpkg.com/expo-constants/-/expo-constants-55.0.7.tgz#c9fcb4b2f2a6eb06a760bdd4f4425ba8f3f937b9\"\n+ integrity sha512-kdcO4TsQRRqt0USvjaY5vgQMO9H52K3kBZ/ejC7F6rz70mv08GoowrZ1CYOr5O4JpPDRlIpQfZJUucaS/c+KWQ==\n dependencies:\n- \"@expo/config\" \"~12.0.12\"\n- \"@expo/env\" \"~2.0.8\"\n+ \"@expo/config\" \"~55.0.8\"\n+ \"@expo/env\" \"~2.1.1\"\n \n-expo-device@~8.0.10:\n- version \"8.0.10\"\n- resolved \"https://registry.yarnpkg.com/expo-device/-/expo-device-8.0.10.tgz#88be854d6de5568392ed814b44dad0e19d1d50f8\"\n- integrity sha512-jd5BxjaF7382JkDMaC+P04aXXknB2UhWaVx5WiQKA05ugm/8GH5uaz9P9ckWdMKZGQVVEOC8MHaUADoT26KmFA==\n+expo-device@~55.0.9:\n+ version \"55.0.9\"\n+ resolved \"https://registry.yarnpkg.com/expo-device/-/expo-device-55.0.9.tgz#e5a4e1d6b5941a746021ad08497d1e9e2ddf4d7d\"\n+ integrity sha512-BzeuL7lwg2jh/tU+HTJ5dxygB1tpfgThaguPPH86K0ujcj/4RBkC27i/i7nhSoWvL1pQIgUqL0L7WTtjcS9t/w==\n dependencies:\n ua-parser-js \"^0.7.33\"\n \n-expo-document-picker@~14.0.8:\n- version \"14.0.8\"\n- resolved \"https://registry.yarnpkg.com/expo-document-picker/-/expo-document-picker-14.0.8.tgz#ca1d99cc432c48e69a6390eb035f3301557e3699\"\n- integrity sha512-3tyQKpPqWWFlI8p9RiMX1+T1Zge5mEKeBuXWp1h8PEItFMUDSiOJbQ112sfdC6Hxt8wSxreV9bCRl/NgBdt+fA==\n+expo-document-picker@~55.0.8:\n+ version \"55.0.8\"\n+ resolved \"https://registry.yarnpkg.com/expo-document-picker/-/expo-document-picker-55.0.8.tgz#e82da1d1dfde109a66f47696cb9df3d798714dcb\"\n+ integrity sha512-p6rYEQ1/h3UqGl3+hzTjv51fsNxoOVfMGSYjHX2/e3cvcy02MWWE+bpj4QEGo9MBwU4RyyIbuv/SCxGtAtG+eA==\n \n-expo-eas-client@~1.0.8:\n- version \"1.0.8\"\n- resolved \"https://registry.yarnpkg.com/expo-eas-client/-/expo-eas-client-1.0.8.tgz#f1fa7cbc6b6000046119466c6ded8a77e5a4b1f8\"\n- integrity sha512-5or11NJhSeDoHHI6zyvQDW2cz/yFyE+1Cz8NTs5NK8JzC7J0JrkUgptWtxyfB6Xs/21YRNifd3qgbBN3hfKVgA==\n+expo-eas-client@~55.0.2:\n+ version \"55.0.2\"\n+ resolved \"https://registry.yarnpkg.com/expo-eas-client/-/expo-eas-client-55.0.2.tgz#d06f721e9dd09e38b2823e308cd0b7cde33b4cb6\"\n+ integrity sha512-fjOgSXaZFBK2Xmzn/uw0DTF3BsYv97JEa4PYXXqVCEvNJPwJB1cV1eX6Xyq6iKGIhMPH9k62sOc+oUdt094WCw==\n \n-expo-file-system@~19.0.21:\n- version \"19.0.21\"\n- resolved \"https://registry.yarnpkg.com/expo-file-system/-/expo-file-system-19.0.21.tgz#e96a68107fb629cf0dd1906fe7b46b566ff13e10\"\n- integrity sha512-s3DlrDdiscBHtab/6W1osrjGL+C2bvoInPJD7sOwmxfJ5Woynv2oc+Fz1/xVXaE/V7HE/+xrHC/H45tu6lZzzg==\n+expo-file-system@~55.0.10:\n+ version \"55.0.10\"\n+ resolved \"https://registry.yarnpkg.com/expo-file-system/-/expo-file-system-55.0.10.tgz#fae0a424f404a456522193346cf07e9e51e2df26\"\n+ integrity sha512-ysFdVdUgtfj2ApY0Cn+pBg+yK4xp+SNwcaH8j2B91JJQ4OXJmnyCSmrNZYz7J4mdYVuv2GzxIP+N/IGlHQG3Yw==\n \n-expo-font@~14.0.10:\n- version \"14.0.10\"\n- resolved \"https://registry.yarnpkg.com/expo-font/-/expo-font-14.0.10.tgz#33fb9f6dc5661729192a6bc8cd6f08bd1a9097cc\"\n- integrity sha512-UqyNaaLKRpj4pKAP4HZSLnuDQqueaO5tB1c/NWu5vh1/LF9ulItyyg2kF/IpeOp0DeOLk0GY0HrIXaKUMrwB+Q==\n+expo-font@~55.0.4:\n+ version \"55.0.4\"\n+ resolved \"https://registry.yarnpkg.com/expo-font/-/expo-font-55.0.4.tgz#3cd0187bb7761dacc05b78e741b760e25f87b128\"\n+ integrity sha512-ZKeGTFffPygvY5dM/9ATM2p7QDkhsaHopH7wFAWgP2lKzqUMS9B/RxCvw5CaObr9Ro7x9YptyeRKX2HmgmMfrg==\n dependencies:\n fontfaceobserver \"^2.1.0\"\n \n-expo-json-utils@~0.15.0:\n- version \"0.15.0\"\n- resolved \"https://registry.yarnpkg.com/expo-json-utils/-/expo-json-utils-0.15.0.tgz#6723574814b9e6b0a90e4e23662be76123ab6ae9\"\n- integrity sha512-duRT6oGl80IDzH2LD2yEFWNwGIC2WkozsB6HF3cDYNoNNdUvFk6uN3YiwsTsqVM/D0z6LEAQ01/SlYvN+Fw0JQ==\n+expo-json-utils@~55.0.0:\n+ version \"55.0.0\"\n+ resolved \"https://registry.yarnpkg.com/expo-json-utils/-/expo-json-utils-55.0.0.tgz#9af6675e63c6c3715e4989fcec2a84d79fd6e6ae\"\n+ integrity sha512-aupt/o5PDAb8dXDCb0JcRdkqnTLxe/F+La7jrnyd/sXlYFfRgBJLFOa1SqVFXm1E/Xam1SE/yw6eAb+DGY7Arg==\n \n-expo-keep-awake@~15.0.8:\n- version \"15.0.8\"\n- resolved \"https://registry.yarnpkg.com/expo-keep-awake/-/expo-keep-awake-15.0.8.tgz#911c5effeba9baff2ccde79ef0ff5bf856215f8d\"\n- integrity sha512-YK9M1VrnoH1vLJiQzChZgzDvVimVoriibiDIFLbQMpjYBnvyfUeHJcin/Gx1a+XgupNXy92EQJLgI/9ZuXajYQ==\n+expo-keep-awake@~55.0.4:\n+ version \"55.0.4\"\n+ resolved \"https://registry.yarnpkg.com/expo-keep-awake/-/expo-keep-awake-55.0.4.tgz#8fe3685b75bda28e15268821a384e069f0395fab\"\n+ integrity sha512-vwfdMtMS5Fxaon8gC0AiE70SpxTsHJ+rjeoVJl8kdfdbxczF7OIaVmfjFJ5Gfigd/WZiLqxhfZk34VAkXF4PNg==\n \n-expo-linking@~8.0.10:\n- version \"8.0.10\"\n- resolved \"https://registry.yarnpkg.com/expo-linking/-/expo-linking-8.0.10.tgz#9108dabf97085ea93fa5036d64143bb07ffc553d\"\n- integrity sha512-0EKtn4Sk6OYmb/5ZqK8riO0k1Ic+wyT3xExbmDvUYhT7p/cKqlVUExMuOIAt3Cx3KUUU1WCgGmdd493W/D5XjA==\n+expo-linking@~55.0.7:\n+ version \"55.0.7\"\n+ resolved \"https://registry.yarnpkg.com/expo-linking/-/expo-linking-55.0.7.tgz#9583e283dc1de25722675abda2a376fcc94e1e8f\"\n+ integrity sha512-MiGCedere1vzQTEi2aGrkzd7eh/rPSz4w6F3GMBuAJzYl+/0VhIuyhozpEGrueyDIXWfzaUVOcn3SfxVi+kwQQ==\n dependencies:\n- expo-constants \"~18.0.11\"\n+ expo-constants \"~55.0.7\"\n invariant \"^2.2.4\"\n \n-expo-localization@~17.0.8:\n- version \"17.0.8\"\n- resolved \"https://registry.yarnpkg.com/expo-localization/-/expo-localization-17.0.8.tgz#eb74ae0f9b5b49596322d68d2005662346211100\"\n- integrity sha512-UrdwklZBDJ+t+ZszMMiE0SXZ2eJxcquCuQcl6EvGHM9K+e6YqKVRQ+w8qE+iIB3H75v2RJy6MHAaLK+Mqeo04g==\n+expo-localization@~55.0.8:\n+ version \"55.0.8\"\n+ resolved \"https://registry.yarnpkg.com/expo-localization/-/expo-localization-55.0.8.tgz#1e78e8dc1af4d7f4eb5600cca48e10c6dff21bc0\"\n+ integrity sha512-uFmpTsoDT7JE5Nwgt0EQ5gBvFVo7/u458SlY6V9Ep9wY/WPucL0o00VpXoFULaMtKHquKBgVUdHwk6E+JFz4dg==\n dependencies:\n rtl-detect \"^1.0.2\"\n \n-expo-manifests@~1.0.10:\n- version \"1.0.10\"\n- resolved \"https://registry.yarnpkg.com/expo-manifests/-/expo-manifests-1.0.10.tgz#5dfb3db1cdf6b46fee349f1d68a25edf5e087994\"\n- integrity sha512-oxDUnURPcL4ZsOBY6X1DGWGuoZgVAFzp6PISWV7lPP2J0r8u1/ucuChBgpK7u1eLGFp6sDIPwXyEUCkI386XSQ==\n+expo-manifests@~55.0.9:\n+ version \"55.0.9\"\n+ resolved \"https://registry.yarnpkg.com/expo-manifests/-/expo-manifests-55.0.9.tgz#7cc479cf3af5f01369e40d068018d54a5711d44f\"\n+ integrity sha512-i82j3X4hbxYDe6kxUw4u8WfvbvTj2w+9BD9WKuL0mFRy+MjvdzdyaqAjEViWCKo/alquP/hTApDTQBb3UmWhkg==\n dependencies:\n- \"@expo/config\" \"~12.0.11\"\n- expo-json-utils \"~0.15.0\"\n+ \"@expo/config\" \"~55.0.8\"\n+ expo-json-utils \"~55.0.0\"\n \n-expo-modules-autolinking@3.0.23:\n- version \"3.0.23\"\n- resolved \"https://registry.yarnpkg.com/expo-modules-autolinking/-/expo-modules-autolinking-3.0.23.tgz#1b4349476d4c75b4f2dcefe716ff28c6746aa6ed\"\n- integrity sha512-YZnaE0G+52xftjH5nsIRaWsoVBY38SQCECclpdgLisdbRY/6Mzo7ndokjauOv3mpFmzMZACHyJNu1YSAffQwTg==\n+expo-modules-autolinking@55.0.8:\n+ version \"55.0.8\"\n+ resolved \"https://registry.yarnpkg.com/expo-modules-autolinking/-/expo-modules-autolinking-55.0.8.tgz#3b69d3e0032f714efc5b979165989a0eab6f7bfc\"\n+ integrity sha512-nrWB1pkNp7bR8ECUTgYUiJ2Pyh6AvxCBXZ+lyPlfl1TzEIGhwU1Yqr+d78eJDueXaW+9zKeE0HqrTZoLS3ve4A==\n dependencies:\n+ \"@expo/require-utils\" \"^55.0.2\"\n \"@expo/spawn-async\" \"^1.7.2\"\n chalk \"^4.1.0\"\n commander \"^7.2.0\"\n- require-from-string \"^2.0.2\"\n- resolve-from \"^5.0.0\"\n \n-expo-modules-core@3.0.29:\n- version \"3.0.29\"\n- resolved \"https://registry.yarnpkg.com/expo-modules-core/-/expo-modules-core-3.0.29.tgz#99287eba52f21784bcb2e4f4edd4fc4c21b5b265\"\n- integrity sha512-LzipcjGqk8gvkrOUf7O2mejNWugPkf3lmd9GkqL9WuNyeN2fRwU0Dn77e3ZUKI3k6sI+DNwjkq4Nu9fNN9WS7Q==\n+expo-modules-core@55.0.13:\n+ version \"55.0.13\"\n+ resolved \"https://registry.yarnpkg.com/expo-modules-core/-/expo-modules-core-55.0.13.tgz#7707078561cf489f95a68cc6fcbf9bbf6bf0fd24\"\n+ integrity sha512-DYLQTOJAR7jD3M9S0sH9myZaPEtShdicHrPiWcupIXMeMkQxFzErx+adUI8gZPy4AU45BgeGgtaogRfT25iLfw==\n dependencies:\n invariant \"^2.2.4\"\n \n-expo-notifications@~0.32.15:\n- version \"0.32.15\"\n- resolved \"https://registry.yarnpkg.com/expo-notifications/-/expo-notifications-0.32.15.tgz#33476b5b36aa82553abae677430a658b33264f8a\"\n- integrity sha512-gnJcauheC2S0Wl0RuJaFkaBRVzCG011j5hlG0TEbsuOCPBuB/F30YEk8yurK8Psv+zHkVfeiJ5AC+nL0LWk0WA==\n+expo-notifications@~55.0.10:\n+ version \"55.0.10\"\n+ resolved \"https://registry.yarnpkg.com/expo-notifications/-/expo-notifications-55.0.10.tgz#7e0e27d9a1168fa01cd1b90009b7396a56de7825\"\n+ integrity sha512-F+ozrVFthKCwfqz2cXmcqrqwzBMTAwoNBqTZERuFtgc+6I++mweVzLLTtbAy8kBDZ33MA13GKyeq7mw13/rDgw==\n dependencies:\n- \"@expo/image-utils\" \"^0.8.8\"\n- \"@ide/backoff\" \"^1.0.0\"\n+ \"@expo/image-utils\" \"^0.8.12\"\n abort-controller \"^3.0.0\"\n- assert \"^2.0.0\"\n badgin \"^1.1.5\"\n- expo-application \"~7.0.8\"\n- expo-constants \"~18.0.12\"\n+ expo-application \"~55.0.8\"\n+ expo-constants \"~55.0.7\"\n \n-expo-server@^1.0.5:\n- version \"1.0.5\"\n- resolved \"https://registry.yarnpkg.com/expo-server/-/expo-server-1.0.5.tgz#2d52002199a2af99c2c8771d0657916004345ca9\"\n- integrity sha512-IGR++flYH70rhLyeXF0Phle56/k4cee87WeQ4mamS+MkVAVP+dDlOHf2nN06Z9Y2KhU0Gp1k+y61KkghF7HdhA==\n+expo-server@^55.0.6:\n+ version \"55.0.6\"\n+ resolved \"https://registry.yarnpkg.com/expo-server/-/expo-server-55.0.6.tgz#db8c2e13e82537a398ea4a420903499efe89235c\"\n+ integrity sha512-xI72FTm469FfuuBL2R5aNtthgH+GR7ygOpsx/KcPS0K8AZaZd7VjtEExbzn9/qyyYkWW3T+3dAmCDKOMX8gdmQ==\n \n-expo-sharing@~14.0.8:\n- version \"14.0.8\"\n- resolved \"https://registry.yarnpkg.com/expo-sharing/-/expo-sharing-14.0.8.tgz#cfd5fcf77ab5f64cf3d192a40a925abb316d3545\"\n- integrity sha512-A1pPr2iBrxypFDCWVAESk532HK+db7MFXbvO2sCV9ienaFXAk7lIBm6bkqgE6vzRd9O3RGdEGzYx80cYlc089Q==\n+expo-sharing@~55.0.11:\n+ version \"55.0.11\"\n+ resolved \"https://registry.yarnpkg.com/expo-sharing/-/expo-sharing-55.0.11.tgz#e948107bf5714c8735a2e2ebc21d7d63312daab7\"\n+ integrity sha512-YlVez832W0sYR2KJY4Dr8ON9aC+Wp8a/r40eQyhoHT9Tetkr2KBM7tWLT0CGKRuTTnrqJL1C51UacLkHJ9zmNA==\n+ dependencies:\n+ \"@expo/config-plugins\" \"^55.0.6\"\n+ \"@expo/config-types\" \"^55.0.5\"\n+ \"@expo/plist\" \"^0.5.2\"\n \n-expo-status-bar@~3.0.9:\n- version \"3.0.9\"\n- resolved \"https://registry.yarnpkg.com/expo-status-bar/-/expo-status-bar-3.0.9.tgz#87cfc803fa614f09a985b8e75e3dd7abd51ce2cb\"\n- integrity sha512-xyYyVg6V1/SSOZWh4Ni3U129XHCnFHBTcUo0dhWtFDrZbNp/duw5AGsQfb2sVeU0gxWHXSY1+5F0jnKYC7WuOw==\n+expo-status-bar@~55.0.4:\n+ version \"55.0.4\"\n+ resolved \"https://registry.yarnpkg.com/expo-status-bar/-/expo-status-bar-55.0.4.tgz#f192ab6fecae0b1c6c5f913c9a0c388e04e1f6d9\"\n+ integrity sha512-BPDjUXKqv1F9j2YNGLRZfkBEZXIEEpqj+t81y4c+4fdSN3Pos7goIHXgcl2ozbKQLgKRZQyNZQtbUgh5UjHYUQ==\n dependencies:\n react-native-is-edge-to-edge \"^1.2.1\"\n \n-expo-store-review@~9.0.9:\n- version \"9.0.9\"\n- resolved \"https://registry.yarnpkg.com/expo-store-review/-/expo-store-review-9.0.9.tgz#7ad05f63175ddbecef78edc32b45fd745e36caa7\"\n- integrity sha512-99vS7edXlKzPcdjrzVlMQWc4zOyq4khQfFjhNqJgpGP+AgRn4U0LaZkHIrVjmzolryD3rcHJSiUQH9Vi0sD0MQ==\n+expo-store-review@~55.0.8:\n+ version \"55.0.8\"\n+ resolved \"https://registry.yarnpkg.com/expo-store-review/-/expo-store-review-55.0.8.tgz#395b3efaf13e061522322dfce7ebed70e8f1cd09\"\n+ integrity sha512-DxDD5F8jEAFV2daotIQtLRO5KTtKE/cEgaTC5fHvMDLn0BWfXRrPKsYoMma4vvcLdx4zqf905OTK2tT4w7L/zw==\n \n-expo-structured-headers@~5.0.0:\n- version \"5.0.0\"\n- resolved \"https://registry.yarnpkg.com/expo-structured-headers/-/expo-structured-headers-5.0.0.tgz#b3cc223a7a58964652093f088a8988316db9ed9d\"\n- integrity sha512-RmrBtnSphk5REmZGV+lcdgdpxyzio5rJw8CXviHE6qH5pKQQ83fhMEcigvrkBdsn2Efw2EODp4Yxl1/fqMvOZw==\n+expo-structured-headers@~55.0.0:\n+ version \"55.0.0\"\n+ resolved \"https://registry.yarnpkg.com/expo-structured-headers/-/expo-structured-headers-55.0.0.tgz#38270c80caedeaf930de495c172e1c87ba16b54f\"\n+ integrity sha512-udaNvuWb45/Sryq9FLC/blwgOChhznuqlTrUzVjC0T83pMdcmscKJX23lnNDW6hCec8p81Y3z1DIFwIyk0g/PQ==\n \n-expo-updates-interface@~2.0.0:\n- version \"2.0.0\"\n- resolved \"https://registry.yarnpkg.com/expo-updates-interface/-/expo-updates-interface-2.0.0.tgz#7721cb64c37bcb46b23827b2717ef451a9378749\"\n- integrity sha512-pTzAIufEZdVPKql6iMi5ylVSPqV1qbEopz9G6TSECQmnNde2nwq42PxdFBaUEd8IZJ/fdJLQnOT3m6+XJ5s7jg==\n+expo-updates-interface@~55.1.3:\n+ version \"55.1.3\"\n+ resolved \"https://registry.yarnpkg.com/expo-updates-interface/-/expo-updates-interface-55.1.3.tgz#cecc1821a9f5e773739144bea7ad93c6a485baea\"\n+ integrity sha512-UVVIiZqymQZJL+o/jh65kXOI97xdkbqBJJM0LMabaPMNLFnc6/WvOMOzmQs7SPyKb8+0PeBaFd7tj5DzF6JeQg==\n \n-expo-updates@~29.0.15:\n- version \"29.0.15\"\n- resolved \"https://registry.yarnpkg.com/expo-updates/-/expo-updates-29.0.15.tgz#a135ed0915500f0e30f6d09a9e13318e99a9c651\"\n- integrity sha512-6Qj+g56nnCksKKnEPQFm19dfWvYB5EggQNN3SaLbIj4LI40k/pjQwqYStEuwTU+Ow+PG0AqxIhQ3NvgVPEzLvg==\n+expo-updates@~55.0.12:\n+ version \"55.0.12\"\n+ resolved \"https://registry.yarnpkg.com/expo-updates/-/expo-updates-55.0.12.tgz#409b470d0bc2cd885a628309eeff9bffc5774062\"\n+ integrity sha512-20YTlmivT7pU8+jYMQHqHQmFTdNHHfIMXXVuFjQA31qCyAOwR32AvDn30IBpgn1Z7XJTX+Sr6cEoMhqz5IJfww==\n dependencies:\n- \"@expo/code-signing-certificates\" \"0.0.5\"\n- \"@expo/plist\" \"^0.4.8\"\n+ \"@expo/code-signing-certificates\" \"^0.0.6\"\n+ \"@expo/plist\" \"^0.5.2\"\n \"@expo/spawn-async\" \"^1.7.2\"\n- arg \"4.1.0\"\n+ arg \"^4.1.0\"\n chalk \"^4.1.2\"\n debug \"^4.3.4\"\n- expo-eas-client \"~1.0.8\"\n- expo-manifests \"~1.0.10\"\n- expo-structured-headers \"~5.0.0\"\n- expo-updates-interface \"~2.0.0\"\n+ expo-eas-client \"~55.0.2\"\n+ expo-manifests \"~55.0.9\"\n+ expo-structured-headers \"~55.0.0\"\n+ expo-updates-interface \"~55.1.3\"\n getenv \"^2.0.0\"\n glob \"^13.0.0\"\n ignore \"^5.3.1\"\n resolve-from \"^5.0.0\"\n \n-expo-web-browser@~15.0.10:\n- version \"15.0.10\"\n- resolved \"https://registry.yarnpkg.com/expo-web-browser/-/expo-web-browser-15.0.10.tgz#ee7fb59b4f143f262c13c020433a83444181f1a3\"\n- integrity sha512-fvDhW4bhmXAeWFNFiInmsGCK83PAqAcQaFyp/3pE/jbdKmFKoRCWr46uZGIfN4msLK/OODhaQ/+US7GSJNDHJg==\n+expo-web-browser@~55.0.9:\n+ version \"55.0.9\"\n+ resolved \"https://registry.yarnpkg.com/expo-web-browser/-/expo-web-browser-55.0.9.tgz#b00fbc0dcc08bc8d577bac305dd589002e6aa05d\"\n+ integrity sha512-PvAVsG401QmZabtTsYh1cYcpPiqvBPs8oiOkSrp0jIXnneiM466HxmeNtvo+fNxqJ2nwOBz9qLPiWRO91VBfsQ==\n \n-expo@~54.0.29:\n- version \"54.0.29\"\n- resolved \"https://registry.yarnpkg.com/expo/-/expo-54.0.29.tgz#c685e152b72883ab77c685b1dcd7bfa8dbf57a08\"\n- integrity sha512-9C90gyOzV83y2S3XzCbRDCuKYNaiyCzuP9ketv46acHCEZn+QTamPK/DobdghoSiofCmlfoaiD6/SzfxDiHMnw==\n+expo@^55.0.0:\n+ version \"55.0.4\"\n+ resolved \"https://registry.yarnpkg.com/expo/-/expo-55.0.4.tgz#69e10716a5260830f6281a4abdd66c5107d765dc\"\n+ integrity sha512-cbQBPYwmH6FRvh942KR8mSdEcrVdsIMkjdHthtf59zlpzgrk28FabhOdL/Pc9WuS+CsIP3EIQbZqmLkTjv6qPg==\n dependencies:\n \"@babel/runtime\" \"^7.20.0\"\n- \"@expo/cli\" \"54.0.19\"\n- \"@expo/config\" \"~12.0.12\"\n- \"@expo/config-plugins\" \"~54.0.4\"\n- \"@expo/devtools\" \"0.1.8\"\n- \"@expo/fingerprint\" \"0.15.4\"\n- \"@expo/metro\" \"~54.1.0\"\n- \"@expo/metro-config\" \"54.0.11\"\n- \"@expo/vector-icons\" \"^15.0.3\"\n+ \"@expo/cli\" \"55.0.14\"\n+ \"@expo/config\" \"~55.0.8\"\n+ \"@expo/config-plugins\" \"~55.0.6\"\n+ \"@expo/devtools\" \"55.0.2\"\n+ \"@expo/fingerprint\" \"0.16.5\"\n+ \"@expo/local-build-cache-provider\" \"55.0.6\"\n+ \"@expo/log-box\" \"55.0.7\"\n+ \"@expo/metro\" \"~54.2.0\"\n+ \"@expo/metro-config\" \"55.0.9\"\n+ \"@expo/vector-icons\" \"^15.0.2\"\n \"@ungap/structured-clone\" \"^1.3.0\"\n- babel-preset-expo \"~54.0.8\"\n- expo-asset \"~12.0.11\"\n- expo-constants \"~18.0.12\"\n- expo-file-system \"~19.0.21\"\n- expo-font \"~14.0.10\"\n- expo-keep-awake \"~15.0.8\"\n- expo-modules-autolinking \"3.0.23\"\n- expo-modules-core \"3.0.29\"\n+ babel-preset-expo \"~55.0.10\"\n+ expo-asset \"~55.0.8\"\n+ expo-constants \"~55.0.7\"\n+ expo-file-system \"~55.0.10\"\n+ expo-font \"~55.0.4\"\n+ expo-keep-awake \"~55.0.4\"\n+ expo-modules-autolinking \"55.0.8\"\n+ expo-modules-core \"55.0.13\"\n pretty-format \"^29.7.0\"\n react-refresh \"^0.14.2\"\n- whatwg-url-without-unicode \"8.0.0-3\"\n+ whatwg-url-minimum \"^0.1.1\"\n \n exponential-backoff@^3.1.1:\n version \"3.1.3\"\n@@ -4338,9 +4333,9 @@ fast-levenshtein@^2.0.6:\n integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==\n \n fastq@^1.6.0:\n- version \"1.19.1\"\n- resolved \"https://registry.yarnpkg.com/fastq/-/fastq-1.19.1.tgz#d50eaba803c8846a883c16492821ebcd2cda55f5\"\n- integrity sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==\n+ version \"1.20.1\"\n+ resolved \"https://registry.yarnpkg.com/fastq/-/fastq-1.20.1.tgz#ca750a10dc925bc8b18839fd203e3ef4b3ced675\"\n+ integrity sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==\n dependencies:\n reusify \"^1.0.4\"\n \n@@ -4361,6 +4356,11 @@ fdir@^6.5.0:\n resolved \"https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350\"\n integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==\n \n+fetch-nodeshim@^0.4.6:\n+ version \"0.4.8\"\n+ resolved \"https://registry.yarnpkg.com/fetch-nodeshim/-/fetch-nodeshim-0.4.8.tgz#e87df7d8f85c6409903dac402aaf9465e36b5165\"\n+ integrity sha512-YW5vG33rabBq6JpYosLNoXoaMN69/WH26MeeX2hkDVjN6UlvRGq3Wkazl9H0kisH95aMu/HtHL64JUvv/+Nv/g==\n+\n file-entry-cache@^6.0.1:\n version \"6.0.1\"\n resolved \"https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027\"\n@@ -4472,11 +4472,6 @@ form-data@^4.0.0:\n hasown \"^2.0.2\"\n mime-types \"^2.1.12\"\n \n-freeport-async@^2.0.0:\n- version \"2.0.0\"\n- resolved \"https://registry.yarnpkg.com/freeport-async/-/freeport-async-2.0.0.tgz#6adf2ec0c629d11abff92836acd04b399135bab4\"\n- integrity sha512-K7od3Uw45AJg00XUmy15+Hae2hOcgKcmN3/EF6Y7i01O0gaqiRx8sUSpsb9+BRNL8RPBrhzPsVfy8q9ADlJuWQ==\n-\n fresh@~0.5.2:\n version \"0.5.2\"\n resolved \"https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7\"\n@@ -4557,7 +4552,7 @@ get-package-type@^0.1.0:\n resolved \"https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a\"\n integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==\n \n-get-proto@^1.0.1:\n+get-proto@^1.0.0, get-proto@^1.0.1:\n version \"1.0.1\"\n resolved \"https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1\"\n integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==\n@@ -4580,9 +4575,9 @@ get-symbol-description@^1.1.0:\n get-intrinsic \"^1.2.6\"\n \n get-tsconfig@^4.2.0:\n- version \"4.13.0\"\n- resolved \"https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.13.0.tgz#fcdd991e6d22ab9a600f00e91c318707a5d9a0d7\"\n- integrity sha512-1VKTZJCwBrvbd+Wn3AOgQP/2Av+TfTCOlE4AcRJE72W1ksZXbAx8PPBR9RzgTeSPzlPMHrbANMH3LbltH73wxQ==\n+ version \"4.13.6\"\n+ resolved \"https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.13.6.tgz#2fbfda558a98a691a798f123afd95915badce876\"\n+ integrity sha512-shZT/QMiSHc/YBLxxOkMtgSid5HFoauqCE3/exfsEcwg1WkeqjG+V40yBbBrsD+jW2HDXcs28xOfcbm2jI8Ddw==\n dependencies:\n resolve-pkg-maps \"^1.0.0\"\n \n@@ -4618,13 +4613,13 @@ glob@7.1.6:\n path-is-absolute \"^1.0.0\"\n \n glob@^13.0.0:\n- version \"13.0.0\"\n- resolved \"https://registry.yarnpkg.com/glob/-/glob-13.0.0.tgz#9d9233a4a274fc28ef7adce5508b7ef6237a1be3\"\n- integrity sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==\n+ version \"13.0.6\"\n+ resolved \"https://registry.yarnpkg.com/glob/-/glob-13.0.6.tgz#078666566a425147ccacfbd2e332deb66a2be71d\"\n+ integrity sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==\n dependencies:\n- minimatch \"^10.1.1\"\n- minipass \"^7.1.2\"\n- path-scurry \"^2.0.0\"\n+ minimatch \"^10.2.2\"\n+ minipass \"^7.1.3\"\n+ path-scurry \"^2.0.2\"\n \n glob@^7.1.1, glob@^7.1.3, glob@^7.1.4:\n version \"7.2.3\"\n@@ -4648,13 +4643,6 @@ glob@^9.3.3:\n minipass \"^4.2.4\"\n path-scurry \"^1.6.1\"\n \n-global-dirs@^0.1.1:\n- version \"0.1.1\"\n- resolved \"https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445\"\n- integrity sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==\n- dependencies:\n- ini \"^1.3.4\"\n-\n globalize@^1.6.0:\n version \"1.7.1\"\n resolved \"https://registry.yarnpkg.com/globalize/-/globalize-1.7.1.tgz#67af662d9e3fb0816baf9c9cd2bc561db07e1e32\"\n@@ -4756,11 +4744,6 @@ has-tostringtag@^1.0.2:\n dependencies:\n has-symbols \"^1.0.3\"\n \n-has@^1.0.3:\n- version \"1.0.4\"\n- resolved \"https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6\"\n- integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==\n-\n hasown@^2.0.2:\n version \"2.0.2\"\n resolved \"https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003\"\n@@ -4768,27 +4751,25 @@ hasown@^2.0.2:\n dependencies:\n function-bind \"^1.1.2\"\n \n-hermes-compiler@0.14.0:\n- version \"0.14.0\"\n- resolved \"https://registry.yarnpkg.com/hermes-compiler/-/hermes-compiler-0.14.0.tgz#ec0ec83132ab5954e7bd2c74e6331752742f188f\"\n- integrity sha512-clxa193o+GYYwykWVFfpHduCATz8fR5jvU7ngXpfKHj+E9hr9vjLNtdLSEe8MUbObvVexV3wcyxQ00xTPIrB1Q==\n-\n-hermes-estree@0.29.1:\n- version \"0.29.1\"\n- resolved \"https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.29.1.tgz#043c7db076e0e8ef8c5f6ed23828d1ba463ebcc5\"\n- integrity sha512-jl+x31n4/w+wEqm0I2r4CMimukLbLQEYpisys5oCre611CI5fc9TxhqkBBCJ1edDG4Kza0f7CgNz8xVMLZQOmQ==\n+hermes-compiler@0.14.1:\n+ version \"0.14.1\"\n+ resolved \"https://registry.yarnpkg.com/hermes-compiler/-/hermes-compiler-0.14.1.tgz#5381d2bb88454027d16736b8cb7fddaaf1556538\"\n+ integrity sha512-+RPPQlayoZ9n6/KXKt5SFILWXCGJ/LV5d24L5smXrvTDrPS4L6dSctPczXauuvzFP3QEJbD1YO7Z3Ra4a+4IhA==\n \n hermes-estree@0.32.0:\n version \"0.32.0\"\n resolved \"https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.32.0.tgz#bb7da6613ab8e67e334a1854ea1e209f487d307b\"\n integrity sha512-KWn3BqnlDOl97Xe1Yviur6NbgIZ+IP+UVSpshlZWkq+EtoHg6/cwiDj/osP9PCEgFE15KBm1O55JRwbMEm5ejQ==\n \n-hermes-parser@0.29.1, hermes-parser@^0.29.1:\n- version \"0.29.1\"\n- resolved \"https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.29.1.tgz#436b24bcd7bb1e71f92a04c396ccc0716c288d56\"\n- integrity sha512-xBHWmUtRC5e/UL0tI7Ivt2riA/YBq9+SiYFU7C1oBa/j2jYGlIF9043oak1F47ihuDIxQ5nbsKueYJDRY02UgA==\n- dependencies:\n- hermes-estree \"0.29.1\"\n+hermes-estree@0.32.1:\n+ version \"0.32.1\"\n+ resolved \"https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.32.1.tgz#04075556a559da284d8a3eba01c07595d5e05ce3\"\n+ integrity sha512-ne5hkuDxheNBAikDjqvCZCwihnz0vVu9YsBzAEO1puiyFR4F1+PAz/SiPHSsNTuOveCYGRMX8Xbx4LOubeC0Qg==\n+\n+hermes-estree@0.33.3:\n+ version \"0.33.3\"\n+ resolved \"https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.33.3.tgz#6d6b593d4b471119772c82bdb0212dfadabb6f17\"\n+ integrity sha512-6kzYZHCk8Fy1Uc+t3HGYyJn3OL4aeqKLTyina4UFtWl8I0kSL7OmKThaiX+Uh2f8nGw3mo4Ifxg0M5Zk3/Oeqg==\n \n hermes-parser@0.32.0:\n version \"0.32.0\"\n@@ -4797,6 +4778,20 @@ hermes-parser@0.32.0:\n dependencies:\n hermes-estree \"0.32.0\"\n \n+hermes-parser@0.32.1, hermes-parser@^0.32.0:\n+ version \"0.32.1\"\n+ resolved \"https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.32.1.tgz#c1bce9405055609233710ad26de6955396a706ba\"\n+ integrity sha512-175dz634X/W5AiwrpLdoMl/MOb17poLHyIqgyExlE8D9zQ1OPnoORnGMB5ltRKnpvQzBjMYvT2rN/sHeIfZW5Q==\n+ dependencies:\n+ hermes-estree \"0.32.1\"\n+\n+hermes-parser@0.33.3:\n+ version \"0.33.3\"\n+ resolved \"https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.33.3.tgz#da50ababb7a5ab636d339e7b2f6e3848e217e09d\"\n+ integrity sha512-Yg3HgaG4CqgyowtYjX/FsnPAuZdHOqSMtnbpylbptsQ9nwwSKsy6uRWcGO5RK0EqiX12q8HvDWKgeAVajRO5DA==\n+ dependencies:\n+ hermes-estree \"0.33.3\"\n+\n hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:\n version \"3.3.2\"\n resolved \"https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45\"\n@@ -4833,6 +4828,16 @@ htmlparser2@^10.0.0:\n domutils \"^3.2.2\"\n entities \"^7.0.1\"\n \n+htmlparser2@^7.1.2:\n+ version \"7.2.0\"\n+ resolved \"https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-7.2.0.tgz#8817cdea38bbc324392a90b1990908e81a65f5a5\"\n+ integrity sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==\n+ dependencies:\n+ domelementtype \"^2.0.1\"\n+ domhandler \"^4.2.2\"\n+ domutils \"^2.8.0\"\n+ entities \"^3.0.1\"\n+\n http-errors@~2.0.1:\n version \"2.0.1\"\n resolved \"https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.1.tgz#36d2f65bc909c8790018dd36fb4d93da6caae06b\"\n@@ -4902,17 +4907,12 @@ iconv-lite@0.6.3:\n dependencies:\n safer-buffer \">= 2.1.2 < 3.0.0\"\n \n-ieee754@^1.1.13:\n- version \"1.2.1\"\n- resolved \"https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352\"\n- integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==\n-\n ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.1:\n version \"5.3.2\"\n resolved \"https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5\"\n integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==\n \n-ignore@^7.0.0:\n+ignore@^7.0.5:\n version \"7.0.5\"\n resolved \"https://registry.yarnpkg.com/ignore/-/ignore-7.0.5.tgz#4cb5f6cd7d4c7ab0365738c7aea888baa6d7efd9\"\n integrity sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==\n@@ -4963,16 +4963,11 @@ inflight@^1.0.4:\n once \"^1.3.0\"\n wrappy \"1\"\n \n-inherits@2, inherits@^2.0.3, inherits@~2.0.3, inherits@~2.0.4:\n+inherits@2, inherits@~2.0.3, inherits@~2.0.4:\n version \"2.0.4\"\n resolved \"https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c\"\n integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==\n \n-ini@^1.3.4, ini@~1.3.0:\n- version \"1.3.8\"\n- resolved \"https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c\"\n- integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==\n-\n internal-slot@^1.1.0:\n version \"1.1.0\"\n resolved \"https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.1.0.tgz#1eac91762947d2f7056bc838d93e13b2e9604961\"\n@@ -4989,14 +4984,6 @@ invariant@^2.2.4:\n dependencies:\n loose-envify \"^1.0.0\"\n \n-is-arguments@^1.0.4:\n- version \"1.2.0\"\n- resolved \"https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.2.0.tgz#ad58c6aecf563b78ef2bf04df540da8f5d7d8e1b\"\n- integrity sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==\n- dependencies:\n- call-bound \"^1.0.2\"\n- has-tostringtag \"^1.0.2\"\n-\n is-array-buffer@^3.0.4, is-array-buffer@^3.0.5:\n version \"3.0.5\"\n resolved \"https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz#65742e1e687bd2cc666253068fd8707fe4d44280\"\n@@ -5047,7 +5034,7 @@ is-callable@^1.2.7:\n resolved \"https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055\"\n integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==\n \n-is-core-module@^2.10.0, is-core-module@^2.13.0, is-core-module@^2.16.1, is-core-module@^2.8.1:\n+is-core-module@^2.10.0, is-core-module@^2.13.0, is-core-module@^2.16.1:\n version \"2.16.1\"\n resolved \"https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4\"\n integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==\n@@ -5098,7 +5085,7 @@ is-generator-fn@^2.0.0:\n resolved \"https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118\"\n integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==\n \n-is-generator-function@^1.0.10, is-generator-function@^1.0.7:\n+is-generator-function@^1.0.10:\n version \"1.1.2\"\n resolved \"https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.2.tgz#ae3b61e3d5ea4e4839b90bad22b02335051a17d5\"\n integrity sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==\n@@ -5121,14 +5108,6 @@ is-map@^2.0.3:\n resolved \"https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e\"\n integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==\n \n-is-nan@^1.3.2:\n- version \"1.3.2\"\n- resolved \"https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d\"\n- integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==\n- dependencies:\n- call-bind \"^1.0.0\"\n- define-properties \"^1.1.3\"\n-\n is-negative-zero@^2.0.3:\n version \"2.0.3\"\n resolved \"https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747\"\n@@ -5206,7 +5185,7 @@ is-symbol@^1.0.4, is-symbol@^1.1.1:\n has-symbols \"^1.1.0\"\n safe-regex-test \"^1.1.0\"\n \n-is-typed-array@^1.1.13, is-typed-array@^1.1.14, is-typed-array@^1.1.15, is-typed-array@^1.1.3:\n+is-typed-array@^1.1.13, is-typed-array@^1.1.14, is-typed-array@^1.1.15:\n version \"1.1.15\"\n resolved \"https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b\"\n integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==\n@@ -5303,6 +5282,18 @@ istanbul-reports@^3.1.3:\n html-escaper \"^2.0.0\"\n istanbul-lib-report \"^3.0.0\"\n \n+iterator.prototype@^1.1.5:\n+ version \"1.1.5\"\n+ resolved \"https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.5.tgz#12c959a29de32de0aa3bbbb801f4d777066dae39\"\n+ integrity sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==\n+ dependencies:\n+ define-data-property \"^1.1.4\"\n+ es-object-atoms \"^1.0.0\"\n+ get-intrinsic \"^1.2.6\"\n+ get-proto \"^1.0.0\"\n+ has-symbols \"^1.1.0\"\n+ set-function-name \"^2.0.2\"\n+\n jest-changed-files@^29.7.0:\n version \"29.7.0\"\n resolved \"https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.7.0.tgz#1c06d07e77c78e1585d020424dedc10d6e17ac3a\"\n@@ -5437,13 +5428,13 @@ jest-environment-node@^29.7.0:\n jest-mock \"^29.7.0\"\n jest-util \"^29.7.0\"\n \n-jest-expo@~54.0.16:\n- version \"54.0.16\"\n- resolved \"https://registry.yarnpkg.com/jest-expo/-/jest-expo-54.0.16.tgz#debd1df7e59f4803e44f54df3181c87b939d8590\"\n- integrity sha512-wPV5dddlNMORNSA7ZjEjePA+ztks3G5iKCOHLIauURnKQPTscnaat5juXPboK1Bv2I+c/RDfkt4uZtAmXdlu/g==\n+jest-expo@~55.0.9:\n+ version \"55.0.9\"\n+ resolved \"https://registry.yarnpkg.com/jest-expo/-/jest-expo-55.0.9.tgz#bbe7c0a848521eca753611641c3095851309a5ec\"\n+ integrity sha512-6wz7JJUeW2e0+APRQP7eOcXKPdI7bdmAIoBiPJbtzSBRlghho8LzPcv4jkoVFoYi8SKb9k3BTKx4GcUlyVMedw==\n dependencies:\n- \"@expo/config\" \"~12.0.12\"\n- \"@expo/json-file\" \"^10.0.8\"\n+ \"@expo/config\" \"~55.0.8\"\n+ \"@expo/json-file\" \"^10.0.12\"\n \"@jest/create-cache-key-function\" \"^29.2.1\"\n \"@jest/globals\" \"^29.2.1\"\n babel-jest \"^29.2.1\"\n@@ -5453,7 +5444,7 @@ jest-expo@~54.0.16:\n jest-watch-typeahead \"2.2.1\"\n json5 \"^2.2.3\"\n lodash \"^4.17.19\"\n- react-test-renderer \"19.1.0\"\n+ react-test-renderer \"19.2.0\"\n server-only \"^0.0.1\"\n stacktrace-js \"^2.0.2\"\n \n@@ -5843,10 +5834,10 @@ kleur@^3.0.3:\n resolved \"https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e\"\n integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==\n \n-lan-network@^0.1.6:\n- version \"0.1.7\"\n- resolved \"https://registry.yarnpkg.com/lan-network/-/lan-network-0.1.7.tgz#9fcb9967c6d951f10b2f9a9ffabe4a312d63f69d\"\n- integrity sha512-mnIlAEMu4OyEvUNdzco9xpuB9YVcPkQec+QsgycBCtPZvEqWPCDPfbAE4OJMdBBWpZWtpCn1xw9jJYlwjWI5zQ==\n+lan-network@^0.2.0:\n+ version \"0.2.0\"\n+ resolved \"https://registry.yarnpkg.com/lan-network/-/lan-network-0.2.0.tgz#2d0858ef8f909dff62f17e868bb31786def30a64\"\n+ integrity sha512-EZgbsXMrGS+oK+Ta12mCjzBFse+SIewGdwrSTr5g+MSymnjpox2x05ceI20PQejJOFvOgzcXrfDk/SdY7dSCtw==\n \n leven@^3.1.0:\n version \"3.1.0\"\n@@ -5869,79 +5860,79 @@ lighthouse-logger@^1.0.0:\n debug \"^2.6.9\"\n marky \"^1.2.2\"\n \n-lightningcss-android-arm64@1.30.2:\n- version \"1.30.2\"\n- resolved \"https://registry.yarnpkg.com/lightningcss-android-arm64/-/lightningcss-android-arm64-1.30.2.tgz#6966b7024d39c94994008b548b71ab360eb3a307\"\n- integrity sha512-BH9sEdOCahSgmkVhBLeU7Hc9DWeZ1Eb6wNS6Da8igvUwAe0sqROHddIlvU06q3WyXVEOYDZ6ykBZQnjTbmo4+A==\n-\n-lightningcss-darwin-arm64@1.30.2:\n- version \"1.30.2\"\n- resolved \"https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.2.tgz#a5fa946d27c029e48c7ff929e6e724a7de46eb2c\"\n- integrity sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA==\n-\n-lightningcss-darwin-x64@1.30.2:\n- version \"1.30.2\"\n- resolved \"https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.2.tgz#5ce87e9cd7c4f2dcc1b713f5e8ee185c88d9b7cd\"\n- integrity sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ==\n-\n-lightningcss-freebsd-x64@1.30.2:\n- version \"1.30.2\"\n- resolved \"https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.2.tgz#6ae1d5e773c97961df5cff57b851807ef33692a5\"\n- integrity sha512-c2bH6xTrf4BDpK8MoGG4Bd6zAMZDAXS569UxCAGcA7IKbHNMlhGQ89eRmvpIUGfKWNVdbhSbkQaWhEoMGmGslA==\n-\n-lightningcss-linux-arm-gnueabihf@1.30.2:\n- version \"1.30.2\"\n- resolved \"https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.2.tgz#62c489610c0424151a6121fa99d77731536cdaeb\"\n- integrity sha512-eVdpxh4wYcm0PofJIZVuYuLiqBIakQ9uFZmipf6LF/HRj5Bgm0eb3qL/mr1smyXIS1twwOxNWndd8z0E374hiA==\n-\n-lightningcss-linux-arm64-gnu@1.30.2:\n- version \"1.30.2\"\n- resolved \"https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.2.tgz#2a3661b56fe95a0cafae90be026fe0590d089298\"\n- integrity sha512-UK65WJAbwIJbiBFXpxrbTNArtfuznvxAJw4Q2ZGlU8kPeDIWEX1dg3rn2veBVUylA2Ezg89ktszWbaQnxD/e3A==\n-\n-lightningcss-linux-arm64-musl@1.30.2:\n- version \"1.30.2\"\n- resolved \"https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.2.tgz#d7ddd6b26959245e026bc1ad9eb6aa983aa90e6b\"\n- integrity sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==\n-\n-lightningcss-linux-x64-gnu@1.30.2:\n- version \"1.30.2\"\n- resolved \"https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.2.tgz#5a89814c8e63213a5965c3d166dff83c36152b1a\"\n- integrity sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==\n-\n-lightningcss-linux-x64-musl@1.30.2:\n- version \"1.30.2\"\n- resolved \"https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.2.tgz#808c2e91ce0bf5d0af0e867c6152e5378c049728\"\n- integrity sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==\n-\n-lightningcss-win32-arm64-msvc@1.30.2:\n- version \"1.30.2\"\n- resolved \"https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.2.tgz#ab4a8a8a2e6a82a4531e8bbb6bf0ff161ee6625a\"\n- integrity sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==\n-\n-lightningcss-win32-x64-msvc@1.30.2:\n- version \"1.30.2\"\n- resolved \"https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.2.tgz#f01f382c8e0a27e1c018b0bee316d210eac43b6e\"\n- integrity sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw==\n+lightningcss-android-arm64@1.31.1:\n+ version \"1.31.1\"\n+ resolved \"https://registry.yarnpkg.com/lightningcss-android-arm64/-/lightningcss-android-arm64-1.31.1.tgz#609ff48332adff452a8157a7c2842fd692a8eac4\"\n+ integrity sha512-HXJF3x8w9nQ4jbXRiNppBCqeZPIAfUo8zE/kOEGbW5NZvGc/K7nMxbhIr+YlFlHW5mpbg/YFPdbnCh1wAXCKFg==\n+\n+lightningcss-darwin-arm64@1.31.1:\n+ version \"1.31.1\"\n+ resolved \"https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.31.1.tgz#a13da040a7929582bab3ace9a67bdc146e99fc2d\"\n+ integrity sha512-02uTEqf3vIfNMq3h/z2cJfcOXnQ0GRwQrkmPafhueLb2h7mqEidiCzkE4gBMEH65abHRiQvhdcQ+aP0D0g67sg==\n+\n+lightningcss-darwin-x64@1.31.1:\n+ version \"1.31.1\"\n+ resolved \"https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.31.1.tgz#f7482c311273571ec0c2bd8277c1f5f6e90e03a4\"\n+ integrity sha512-1ObhyoCY+tGxtsz1lSx5NXCj3nirk0Y0kB/g8B8DT+sSx4G9djitg9ejFnjb3gJNWo7qXH4DIy2SUHvpoFwfTA==\n+\n+lightningcss-freebsd-x64@1.31.1:\n+ version \"1.31.1\"\n+ resolved \"https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.31.1.tgz#91df1bb290f1cb7bb2af832d7d0d8809225e0124\"\n+ integrity sha512-1RINmQKAItO6ISxYgPwszQE1BrsVU5aB45ho6O42mu96UiZBxEXsuQ7cJW4zs4CEodPUioj/QrXW1r9pLUM74A==\n+\n+lightningcss-linux-arm-gnueabihf@1.31.1:\n+ version \"1.31.1\"\n+ resolved \"https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.31.1.tgz#c3cad5ae8b70045f21600dc95295ab6166acf57e\"\n+ integrity sha512-OOCm2//MZJ87CdDK62rZIu+aw9gBv4azMJuA8/KB74wmfS3lnC4yoPHm0uXZ/dvNNHmnZnB8XLAZzObeG0nS1g==\n+\n+lightningcss-linux-arm64-gnu@1.31.1:\n+ version \"1.31.1\"\n+ resolved \"https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.31.1.tgz#a5c4f6a5ac77447093f61b209c0bd7fef1f0a3e3\"\n+ integrity sha512-WKyLWztD71rTnou4xAD5kQT+982wvca7E6QoLpoawZ1gP9JM0GJj4Tp5jMUh9B3AitHbRZ2/H3W5xQmdEOUlLg==\n+\n+lightningcss-linux-arm64-musl@1.31.1:\n+ version \"1.31.1\"\n+ resolved \"https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.31.1.tgz#af26ab8f829b727ada0a200938a6c8796ff36900\"\n+ integrity sha512-mVZ7Pg2zIbe3XlNbZJdjs86YViQFoJSpc41CbVmKBPiGmC4YrfeOyz65ms2qpAobVd7WQsbW4PdsSJEMymyIMg==\n+\n+lightningcss-linux-x64-gnu@1.31.1:\n+ version \"1.31.1\"\n+ resolved \"https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.31.1.tgz#a891d44e84b71c0d88959feb9a7522bbf61450ee\"\n+ integrity sha512-xGlFWRMl+0KvUhgySdIaReQdB4FNudfUTARn7q0hh/V67PVGCs3ADFjw+6++kG1RNd0zdGRlEKa+T13/tQjPMA==\n+\n+lightningcss-linux-x64-musl@1.31.1:\n+ version \"1.31.1\"\n+ resolved \"https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.31.1.tgz#8c8b21def851f4d477fa897b80cb3db2b650bc6e\"\n+ integrity sha512-eowF8PrKHw9LpoZii5tdZwnBcYDxRw2rRCyvAXLi34iyeYfqCQNA9rmUM0ce62NlPhCvof1+9ivRaTY6pSKDaA==\n+\n+lightningcss-win32-arm64-msvc@1.31.1:\n+ version \"1.31.1\"\n+ resolved \"https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.31.1.tgz#79000fb8c57e94a91b8fc643e74d5a54407d7080\"\n+ integrity sha512-aJReEbSEQzx1uBlQizAOBSjcmr9dCdL3XuC/6HLXAxmtErsj2ICo5yYggg1qOODQMtnjNQv2UHb9NpOuFtYe4w==\n+\n+lightningcss-win32-x64-msvc@1.31.1:\n+ version \"1.31.1\"\n+ resolved \"https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.31.1.tgz#7f025274c81c7d659829731e09c8b6f442209837\"\n+ integrity sha512-I9aiFrbd7oYHwlnQDqr1Roz+fTz61oDDJX7n9tYF9FJymH1cIN1DtKw3iYt6b8WZgEjoNwVSncwF4wx/ZedMhw==\n \n lightningcss@^1.30.1:\n- version \"1.30.2\"\n- resolved \"https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.30.2.tgz#4ade295f25d140f487d37256f4cd40dc607696d0\"\n- integrity sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ==\n+ version \"1.31.1\"\n+ resolved \"https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.31.1.tgz#1a19dd327b547a7eda1d5c296ebe1e72df5a184b\"\n+ integrity sha512-l51N2r93WmGUye3WuFoN5k10zyvrVs0qfKBhyC5ogUQ6Ew6JUSswh78mbSO+IU3nTWsyOArqPCcShdQSadghBQ==\n dependencies:\n detect-libc \"^2.0.3\"\n optionalDependencies:\n- lightningcss-android-arm64 \"1.30.2\"\n- lightningcss-darwin-arm64 \"1.30.2\"\n- lightningcss-darwin-x64 \"1.30.2\"\n- lightningcss-freebsd-x64 \"1.30.2\"\n- lightningcss-linux-arm-gnueabihf \"1.30.2\"\n- lightningcss-linux-arm64-gnu \"1.30.2\"\n- lightningcss-linux-arm64-musl \"1.30.2\"\n- lightningcss-linux-x64-gnu \"1.30.2\"\n- lightningcss-linux-x64-musl \"1.30.2\"\n- lightningcss-win32-arm64-msvc \"1.30.2\"\n- lightningcss-win32-x64-msvc \"1.30.2\"\n+ lightningcss-android-arm64 \"1.31.1\"\n+ lightningcss-darwin-arm64 \"1.31.1\"\n+ lightningcss-darwin-x64 \"1.31.1\"\n+ lightningcss-freebsd-x64 \"1.31.1\"\n+ lightningcss-linux-arm-gnueabihf \"1.31.1\"\n+ lightningcss-linux-arm64-gnu \"1.31.1\"\n+ lightningcss-linux-arm64-musl \"1.31.1\"\n+ lightningcss-linux-x64-gnu \"1.31.1\"\n+ lightningcss-linux-x64-musl \"1.31.1\"\n+ lightningcss-win32-arm64-msvc \"1.31.1\"\n+ lightningcss-win32-x64-msvc \"1.31.1\"\n \n lines-and-columns@^1.1.6:\n version \"1.2.4\"\n@@ -5993,9 +5984,9 @@ lodash.throttle@4.1.1, lodash.throttle@^4.1.1:\n integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==\n \n lodash@^4.17.19:\n- version \"4.17.21\"\n- resolved \"https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c\"\n- integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==\n+ version \"4.17.23\"\n+ resolved \"https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a\"\n+ integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==\n \n log-symbols@^2.2.0:\n version \"2.2.0\"\n@@ -6017,9 +6008,9 @@ lru-cache@^10.0.1, lru-cache@^10.2.0:\n integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==\n \n lru-cache@^11.0.0:\n- version \"11.2.4\"\n- resolved \"https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.2.4.tgz#ecb523ebb0e6f4d837c807ad1abaea8e0619770d\"\n- integrity sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==\n+ version \"11.2.6\"\n+ resolved \"https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.2.6.tgz#356bf8a29e88a7a2945507b31f6429a65a192c58\"\n+ integrity sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==\n \n lru-cache@^5.1.1:\n version \"5.1.1\"\n@@ -6095,16 +6086,6 @@ merge2@^1.3.0, merge2@^1.4.1:\n resolved \"https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae\"\n integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==\n \n-metro-babel-transformer@0.83.2:\n- version \"0.83.2\"\n- resolved \"https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.83.2.tgz#d3885f2a266f01e43f16bdcfb786b1d8f1598f56\"\n- integrity sha512-rirY1QMFlA1uxH3ZiNauBninwTioOgwChnRdDcbB4tgRZ+bGX9DiXoh9QdpppiaVKXdJsII932OwWXGGV4+Nlw==\n- dependencies:\n- \"@babel/core\" \"^7.25.2\"\n- flow-enums-runtime \"^0.0.6\"\n- hermes-parser \"0.32.0\"\n- nullthrows \"^1.1.1\"\n-\n metro-babel-transformer@0.83.3:\n version \"0.83.3\"\n resolved \"https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.83.3.tgz#d8c134615530c9ee61364526d44ca4bb0c5343ea\"\n@@ -6115,12 +6096,15 @@ metro-babel-transformer@0.83.3:\n hermes-parser \"0.32.0\"\n nullthrows \"^1.1.1\"\n \n-metro-cache-key@0.83.2:\n- version \"0.83.2\"\n- resolved \"https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.83.2.tgz#b34427fdafe551d567ac312f8a3c7e334a20f796\"\n- integrity sha512-3EMG/GkGKYoTaf5RqguGLSWRqGTwO7NQ0qXKmNBjr0y6qD9s3VBXYlwB+MszGtmOKsqE9q3FPrE5Nd9Ipv7rZw==\n+metro-babel-transformer@0.83.4:\n+ version \"0.83.4\"\n+ resolved \"https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.83.4.tgz#9a4068c1a4ba40c073ee7830b19ed87d3ed1557e\"\n+ integrity sha512-xfNtsYIigybqm9xVL3ygTYYNFyYTMf2lGg/Wt+znVGtwcjXoRPG80WlL5SS09ZjYVei3MoE920i7MNr7ukSULA==\n dependencies:\n+ \"@babel/core\" \"^7.25.2\"\n flow-enums-runtime \"^0.0.6\"\n+ hermes-parser \"0.33.3\"\n+ nullthrows \"^1.1.1\"\n \n metro-cache-key@0.83.3:\n version \"0.83.3\"\n@@ -6129,15 +6113,12 @@ metro-cache-key@0.83.3:\n dependencies:\n flow-enums-runtime \"^0.0.6\"\n \n-metro-cache@0.83.2:\n- version \"0.83.2\"\n- resolved \"https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.83.2.tgz#d647d9253312801b19c4930be586c60976244540\"\n- integrity sha512-Z43IodutUZeIS7OTH+yQFjc59QlFJ6s5OvM8p2AP9alr0+F8UKr8ADzFzoGKoHefZSKGa4bJx7MZJLF6GwPDHQ==\n+metro-cache-key@0.83.4:\n+ version \"0.83.4\"\n+ resolved \"https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.83.4.tgz#eb70beab737782bf36eb145a30c2e97e20de52e8\"\n+ integrity sha512-Y8E6mm1alkYIRzmfkOdrwXMzJ4HKANYiZE7J2d3iYTwmnLIQG+aoIpvla+bo6LRxH1Gm3qjEiOl+LbxvPCzIug==\n dependencies:\n- exponential-backoff \"^3.1.1\"\n flow-enums-runtime \"^0.0.6\"\n- https-proxy-agent \"^7.0.5\"\n- metro-core \"0.83.2\"\n \n metro-cache@0.83.3:\n version \"0.83.3\"\n@@ -6149,21 +6130,17 @@ metro-cache@0.83.3:\n https-proxy-agent \"^7.0.5\"\n metro-core \"0.83.3\"\n \n-metro-config@0.83.2:\n- version \"0.83.2\"\n- resolved \"https://registry.yarnpkg.com/metro-config/-/metro-config-0.83.2.tgz#5ab5eba754c7affd0f3e44be98543aea37c9fab7\"\n- integrity sha512-1FjCcdBe3e3D08gSSiU9u3Vtxd7alGH3x/DNFqWDFf5NouX4kLgbVloDDClr1UrLz62c0fHh2Vfr9ecmrOZp+g==\n+metro-cache@0.83.4:\n+ version \"0.83.4\"\n+ resolved \"https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.83.4.tgz#d9ff274c053e1ffcbf42b49882af9473ac5f35fb\"\n+ integrity sha512-Pm6CiksVms0cZNDDe/nFzYr1xpXzJLOSwvOjl4b3cYtXxEFllEjD6EeBgoQK5C8yk7U54PcuRaUAFSvJ+eCKbg==\n dependencies:\n- connect \"^3.6.5\"\n+ exponential-backoff \"^3.1.1\"\n flow-enums-runtime \"^0.0.6\"\n- jest-validate \"^29.7.0\"\n- metro \"0.83.2\"\n- metro-cache \"0.83.2\"\n- metro-core \"0.83.2\"\n- metro-runtime \"0.83.2\"\n- yaml \"^2.6.1\"\n+ https-proxy-agent \"^7.0.5\"\n+ metro-core \"0.83.4\"\n \n-metro-config@0.83.3, metro-config@^0.83.1, metro-config@^0.83.3:\n+metro-config@0.83.3:\n version \"0.83.3\"\n resolved \"https://registry.yarnpkg.com/metro-config/-/metro-config-0.83.3.tgz#a30e7a69b5cf8c4ac4c4b68b1b4c33649ae129a2\"\n integrity sha512-mTel7ipT0yNjKILIan04bkJkuCzUUkm2SeEaTads8VfEecCh+ltXchdq6DovXJqzQAXuR2P9cxZB47Lg4klriA==\n@@ -6177,16 +6154,21 @@ metro-config@0.83.3, metro-config@^0.83.1, metro-config@^0.83.3:\n metro-runtime \"0.83.3\"\n yaml \"^2.6.1\"\n \n-metro-core@0.83.2:\n- version \"0.83.2\"\n- resolved \"https://registry.yarnpkg.com/metro-core/-/metro-core-0.83.2.tgz#8b6292482c8cd88bae5f56c5f4903ef7ee292631\"\n- integrity sha512-8DRb0O82Br0IW77cNgKMLYWUkx48lWxUkvNUxVISyMkcNwE/9ywf1MYQUE88HaKwSrqne6kFgCSA/UWZoUT0Iw==\n+metro-config@0.83.4, metro-config@^0.83.3:\n+ version \"0.83.4\"\n+ resolved \"https://registry.yarnpkg.com/metro-config/-/metro-config-0.83.4.tgz#10c99df962cf3a1ab6ad86bcc697dfcac0a316af\"\n+ integrity sha512-ydOgMNI9aT8l2LOTOugt1FvC7getPKG9uJo9Vclg9/RWJxbwkBF/FMBm6w5gH8NwJokSmQrbNkojXPn7nm0kGw==\n dependencies:\n+ connect \"^3.6.5\"\n flow-enums-runtime \"^0.0.6\"\n- lodash.throttle \"^4.1.1\"\n- metro-resolver \"0.83.2\"\n+ jest-validate \"^29.7.0\"\n+ metro \"0.83.4\"\n+ metro-cache \"0.83.4\"\n+ metro-core \"0.83.4\"\n+ metro-runtime \"0.83.4\"\n+ yaml \"^2.6.1\"\n \n-metro-core@0.83.3, metro-core@^0.83.1, metro-core@^0.83.3:\n+metro-core@0.83.3:\n version \"0.83.3\"\n resolved \"https://registry.yarnpkg.com/metro-core/-/metro-core-0.83.3.tgz#007e93f7d1983777da8988dfb103ad897c9835b8\"\n integrity sha512-M+X59lm7oBmJZamc96usuF1kusd5YimqG/q97g4Ac7slnJ3YiGglW5CsOlicTR5EWf8MQFxxjDoB6ytTqRe8Hw==\n@@ -6195,10 +6177,19 @@ metro-core@0.83.3, metro-core@^0.83.1, metro-core@^0.83.3:\n lodash.throttle \"^4.1.1\"\n metro-resolver \"0.83.3\"\n \n-metro-file-map@0.83.2:\n- version \"0.83.2\"\n- resolved \"https://registry.yarnpkg.com/metro-file-map/-/metro-file-map-0.83.2.tgz#8f943d608f27216fde8dd91787294b5a9409752e\"\n- integrity sha512-cMSWnEqZrp/dzZIEd7DEDdk72PXz6w5NOKriJoDN9p1TDQ5nAYrY2lHi8d6mwbcGLoSlWmpPyny9HZYFfPWcGQ==\n+metro-core@0.83.4, metro-core@^0.83.3:\n+ version \"0.83.4\"\n+ resolved \"https://registry.yarnpkg.com/metro-core/-/metro-core-0.83.4.tgz#06fd79d73935748317076aab24be0bb4cbaab801\"\n+ integrity sha512-EE+j/imryd3og/6Ly9usku9vcTLQr2o4IDax/izsr6b0HRqZK9k6f5SZkGkOPqnsACLq6csPCx+2JsgF9DkVbw==\n+ dependencies:\n+ flow-enums-runtime \"^0.0.6\"\n+ lodash.throttle \"^4.1.1\"\n+ metro-resolver \"0.83.4\"\n+\n+metro-file-map@0.83.3:\n+ version \"0.83.3\"\n+ resolved \"https://registry.yarnpkg.com/metro-file-map/-/metro-file-map-0.83.3.tgz#3d79fbb1d379ab178dd895ce54cb5ecb183d74a2\"\n+ integrity sha512-jg5AcyE0Q9Xbbu/4NAwwZkmQn7doJCKGW0SLeSJmzNB9Z24jBe0AL2PHNMy4eu0JiKtNWHz9IiONGZWq7hjVTA==\n dependencies:\n debug \"^4.4.0\"\n fb-watchman \"^2.0.0\"\n@@ -6210,10 +6201,10 @@ metro-file-map@0.83.2:\n nullthrows \"^1.1.1\"\n walker \"^1.0.7\"\n \n-metro-file-map@0.83.3:\n- version \"0.83.3\"\n- resolved \"https://registry.yarnpkg.com/metro-file-map/-/metro-file-map-0.83.3.tgz#3d79fbb1d379ab178dd895ce54cb5ecb183d74a2\"\n- integrity sha512-jg5AcyE0Q9Xbbu/4NAwwZkmQn7doJCKGW0SLeSJmzNB9Z24jBe0AL2PHNMy4eu0JiKtNWHz9IiONGZWq7hjVTA==\n+metro-file-map@0.83.4:\n+ version \"0.83.4\"\n+ resolved \"https://registry.yarnpkg.com/metro-file-map/-/metro-file-map-0.83.4.tgz#f694f2e4950e64daff922b80d87e98731daa756b\"\n+ integrity sha512-RSZLpGQhW9topefjJ9dp77Ff7BP88b17sb/YjxLHC1/H0lJVYYC9Cgqua21Vxe4RUJK2z64hw72g+ySLGTCawA==\n dependencies:\n debug \"^4.4.0\"\n fb-watchman \"^2.0.0\"\n@@ -6225,14 +6216,6 @@ metro-file-map@0.83.3:\n nullthrows \"^1.1.1\"\n walker \"^1.0.7\"\n \n-metro-minify-terser@0.83.2:\n- version \"0.83.2\"\n- resolved \"https://registry.yarnpkg.com/metro-minify-terser/-/metro-minify-terser-0.83.2.tgz#17ea8aef987970f8505ed8f890ab00c47c419608\"\n- integrity sha512-zvIxnh7U0JQ7vT4quasKsijId3dOAWgq+ip2jF/8TMrPUqQabGrs04L2dd0haQJ+PA+d4VvK/bPOY8X/vL2PWw==\n- dependencies:\n- flow-enums-runtime \"^0.0.6\"\n- terser \"^5.15.0\"\n-\n metro-minify-terser@0.83.3:\n version \"0.83.3\"\n resolved \"https://registry.yarnpkg.com/metro-minify-terser/-/metro-minify-terser-0.83.3.tgz#c1c70929c86b14c8bf03e6321b4f9310bc8dbe87\"\n@@ -6241,12 +6224,13 @@ metro-minify-terser@0.83.3:\n flow-enums-runtime \"^0.0.6\"\n terser \"^5.15.0\"\n \n-metro-resolver@0.83.2:\n- version \"0.83.2\"\n- resolved \"https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.83.2.tgz#d4a40a602615baacfb94d8a773e8b93eaac70d0f\"\n- integrity sha512-Yf5mjyuiRE/Y+KvqfsZxrbHDA15NZxyfg8pIk0qg47LfAJhpMVEX+36e6ZRBq7KVBqy6VDX5Sq55iHGM4xSm7Q==\n+metro-minify-terser@0.83.4:\n+ version \"0.83.4\"\n+ resolved \"https://registry.yarnpkg.com/metro-minify-terser/-/metro-minify-terser-0.83.4.tgz#43dea24b72369e01a1831483e7b1bd49581a4cb9\"\n+ integrity sha512-KmZnpxfj0nPIRkbBNTc6xul5f5GPvWL5kQ1UkisB7qFkgh6+UiJG+L4ukJ2sK7St6+8Za/Cb68MUEYkUouIYcQ==\n dependencies:\n flow-enums-runtime \"^0.0.6\"\n+ terser \"^5.15.0\"\n \n metro-resolver@0.83.3:\n version \"0.83.3\"\n@@ -6255,15 +6239,14 @@ metro-resolver@0.83.3:\n dependencies:\n flow-enums-runtime \"^0.0.6\"\n \n-metro-runtime@0.83.2:\n- version \"0.83.2\"\n- resolved \"https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.83.2.tgz#77c9715483fd3d449407435c1c160f7410c588d7\"\n- integrity sha512-nnsPtgRvFbNKwemqs0FuyFDzXLl+ezuFsUXDbX8o0SXOfsOPijqiQrf3kuafO1Zx1aUWf4NOrKJMAQP5EEHg9A==\n+metro-resolver@0.83.4:\n+ version \"0.83.4\"\n+ resolved \"https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.83.4.tgz#20e9ebc45beeacc7fff657e3ad0404ad9bdffe55\"\n+ integrity sha512-drWdylyNqgdaJufz0GjU/ielv2hjcc6piegjjJwKn8l7A/72aLQpUpOHtP+GMR+kOqhSsD4MchhJ6PSANvlSEw==\n dependencies:\n- \"@babel/runtime\" \"^7.25.0\"\n flow-enums-runtime \"^0.0.6\"\n \n-metro-runtime@0.83.3, metro-runtime@^0.83.1, metro-runtime@^0.83.3:\n+metro-runtime@0.83.3:\n version \"0.83.3\"\n resolved \"https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.83.3.tgz#ff504df5d93f38b1af396715b327e589ba8d184d\"\n integrity sha512-JHCJb9ebr9rfJ+LcssFYA2x1qPYuSD/bbePupIGhpMrsla7RCwC/VL3yJ9cSU+nUhU4c9Ixxy8tBta+JbDeZWw==\n@@ -6271,23 +6254,15 @@ metro-runtime@0.83.3, metro-runtime@^0.83.1, metro-runtime@^0.83.3:\n \"@babel/runtime\" \"^7.25.0\"\n flow-enums-runtime \"^0.0.6\"\n \n-metro-source-map@0.83.2:\n- version \"0.83.2\"\n- resolved \"https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.83.2.tgz#5688eeb3fc85a1ca0f5f5efede2257a872e2b9fe\"\n- integrity sha512-5FL/6BSQvshIKjXOennt9upFngq2lFvDakZn5LfauIVq8+L4sxXewIlSTcxAtzbtjAIaXeOSVMtCJ5DdfCt9AA==\n+metro-runtime@0.83.4, metro-runtime@^0.83.3:\n+ version \"0.83.4\"\n+ resolved \"https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.83.4.tgz#44296e7ddee052cf1966f484f60fc6290a1cf5df\"\n+ integrity sha512-sWj9KN311yG22Zv0kVbAp9dorB9HtTThvQKsAn6PLxrVrz+1UBsLrQSxjE/s4PtzDi1HABC648jo4K9Euz/5jw==\n dependencies:\n- \"@babel/traverse\" \"^7.25.3\"\n- \"@babel/traverse--for-generate-function-map\" \"npm:@babel/traverse@^7.25.3\"\n- \"@babel/types\" \"^7.25.2\"\n+ \"@babel/runtime\" \"^7.25.0\"\n flow-enums-runtime \"^0.0.6\"\n- invariant \"^2.2.4\"\n- metro-symbolicate \"0.83.2\"\n- nullthrows \"^1.1.1\"\n- ob1 \"0.83.2\"\n- source-map \"^0.5.6\"\n- vlq \"^1.0.0\"\n \n-metro-source-map@0.83.3, metro-source-map@^0.83.1, metro-source-map@^0.83.3:\n+metro-source-map@0.83.3:\n version \"0.83.3\"\n resolved \"https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.83.3.tgz#04bb464f7928ea48bcdfd18912c8607cf317c898\"\n integrity sha512-xkC3qwUBh2psVZgVavo8+r2C9Igkk3DibiOXSAht1aYRRcztEZNFtAMtfSB7sdO2iFMx2Mlyu++cBxz/fhdzQg==\n@@ -6303,15 +6278,18 @@ metro-source-map@0.83.3, metro-source-map@^0.83.1, metro-source-map@^0.83.3:\n source-map \"^0.5.6\"\n vlq \"^1.0.0\"\n \n-metro-symbolicate@0.83.2:\n- version \"0.83.2\"\n- resolved \"https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.83.2.tgz#63a5f31cdb6db17371a00d259890643d84a75549\"\n- integrity sha512-KoU9BLwxxED6n33KYuQQuc5bXkIxF3fSwlc3ouxrrdLWwhu64muYZNQrukkWzhVKRNFIXW7X2iM8JXpi2heIPw==\n+metro-source-map@0.83.4, metro-source-map@^0.83.3:\n+ version \"0.83.4\"\n+ resolved \"https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.83.4.tgz#c39442f308708055df08545398f5d8d18b9bac7a\"\n+ integrity sha512-pPbmQwS0zgU+/0u5KPkuvlsQP0V+WYQ9qNshqupIL720QRH0vS3QR25IVVtbunofEDJchI11Q4QtIbmUyhpOBw==\n dependencies:\n+ \"@babel/traverse\" \"^7.29.0\"\n+ \"@babel/types\" \"^7.29.0\"\n flow-enums-runtime \"^0.0.6\"\n invariant \"^2.2.4\"\n- metro-source-map \"0.83.2\"\n+ metro-symbolicate \"0.83.4\"\n nullthrows \"^1.1.1\"\n+ ob1 \"0.83.4\"\n source-map \"^0.5.6\"\n vlq \"^1.0.0\"\n \n@@ -6327,17 +6305,17 @@ metro-symbolicate@0.83.3:\n source-map \"^0.5.6\"\n vlq \"^1.0.0\"\n \n-metro-transform-plugins@0.83.2:\n- version \"0.83.2\"\n- resolved \"https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.83.2.tgz#c4353147212cad1c76dcea8fd93c7f0c7b09b3a4\"\n- integrity sha512-5WlW25WKPkiJk2yA9d8bMuZrgW7vfA4f4MBb9ZeHbTB3eIAoNN8vS8NENgG/X/90vpTB06X66OBvxhT3nHwP6A==\n+metro-symbolicate@0.83.4:\n+ version \"0.83.4\"\n+ resolved \"https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.83.4.tgz#147dd0109c156351fa67a686377856075ed07b5a\"\n+ integrity sha512-clyWAXDgkDHPwvldl95pcLTrJIqUj9GbZayL8tfeUs69ilsIUBpVym2lRd/8l3/8PIHCInxL868NvD2Y7OqKXg==\n dependencies:\n- \"@babel/core\" \"^7.25.2\"\n- \"@babel/generator\" \"^7.25.0\"\n- \"@babel/template\" \"^7.25.0\"\n- \"@babel/traverse\" \"^7.25.3\"\n flow-enums-runtime \"^0.0.6\"\n+ invariant \"^2.2.4\"\n+ metro-source-map \"0.83.4\"\n nullthrows \"^1.1.1\"\n+ source-map \"^0.5.6\"\n+ vlq \"^1.0.0\"\n \n metro-transform-plugins@0.83.3:\n version \"0.83.3\"\n@@ -6351,23 +6329,16 @@ metro-transform-plugins@0.83.3:\n flow-enums-runtime \"^0.0.6\"\n nullthrows \"^1.1.1\"\n \n-metro-transform-worker@0.83.2:\n- version \"0.83.2\"\n- resolved \"https://registry.yarnpkg.com/metro-transform-worker/-/metro-transform-worker-0.83.2.tgz#f97367b6384be87ea216a97072810705c19c3775\"\n- integrity sha512-G5DsIg+cMZ2KNfrdLnWMvtppb3+Rp1GMyj7Bvd9GgYc/8gRmvq1XVEF9XuO87Shhb03kFhGqMTgZerz3hZ1v4Q==\n+metro-transform-plugins@0.83.4:\n+ version \"0.83.4\"\n+ resolved \"https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.83.4.tgz#5a08d28f032c38400304141286616ce6ee5401da\"\n+ integrity sha512-c0ROVcyvdaGPUFIg2N5nEQF4xbsqB2p1PPPhVvK1d/Y7ZhBAFiwQ75so0SJok32q+I++lc/hq7IdPCp2frPGQg==\n dependencies:\n \"@babel/core\" \"^7.25.2\"\n- \"@babel/generator\" \"^7.25.0\"\n- \"@babel/parser\" \"^7.25.3\"\n- \"@babel/types\" \"^7.25.2\"\n+ \"@babel/generator\" \"^7.29.1\"\n+ \"@babel/template\" \"^7.28.6\"\n+ \"@babel/traverse\" \"^7.29.0\"\n flow-enums-runtime \"^0.0.6\"\n- metro \"0.83.2\"\n- metro-babel-transformer \"0.83.2\"\n- metro-cache \"0.83.2\"\n- metro-cache-key \"0.83.2\"\n- metro-minify-terser \"0.83.2\"\n- metro-source-map \"0.83.2\"\n- metro-transform-plugins \"0.83.2\"\n nullthrows \"^1.1.1\"\n \n metro-transform-worker@0.83.3:\n@@ -6389,10 +6360,29 @@ metro-transform-worker@0.83.3:\n metro-transform-plugins \"0.83.3\"\n nullthrows \"^1.1.1\"\n \n-metro@0.83.2:\n- version \"0.83.2\"\n- resolved \"https://registry.yarnpkg.com/metro/-/metro-0.83.2.tgz#a56d31a604819951c8b9cf19d570897341e29b07\"\n- integrity sha512-HQgs9H1FyVbRptNSMy/ImchTTE5vS2MSqLoOo7hbDoBq6hPPZokwJvBMwrYSxdjQZmLXz2JFZtdvS+ZfgTc9yw==\n+metro-transform-worker@0.83.4:\n+ version \"0.83.4\"\n+ resolved \"https://registry.yarnpkg.com/metro-transform-worker/-/metro-transform-worker-0.83.4.tgz#c71c53687dcf274d668aa5c6a9d4d3c00a7f7203\"\n+ integrity sha512-6I81IZLeU/0ww7OBgCPALFl0OE0FQwvIuKCtuViSiKufmislF7kVr7IHH9GYtQuZcnualQ82gYeQ11KzZQTouw==\n+ dependencies:\n+ \"@babel/core\" \"^7.25.2\"\n+ \"@babel/generator\" \"^7.29.1\"\n+ \"@babel/parser\" \"^7.29.0\"\n+ \"@babel/types\" \"^7.29.0\"\n+ flow-enums-runtime \"^0.0.6\"\n+ metro \"0.83.4\"\n+ metro-babel-transformer \"0.83.4\"\n+ metro-cache \"0.83.4\"\n+ metro-cache-key \"0.83.4\"\n+ metro-minify-terser \"0.83.4\"\n+ metro-source-map \"0.83.4\"\n+ metro-transform-plugins \"0.83.4\"\n+ nullthrows \"^1.1.1\"\n+\n+metro@0.83.3:\n+ version \"0.83.3\"\n+ resolved \"https://registry.yarnpkg.com/metro/-/metro-0.83.3.tgz#1e7e04c15519af746f8932c7f9c553d92c39e922\"\n+ integrity sha512-+rP+/GieOzkt97hSJ0MrPOuAH/jpaS21ZDvL9DJ35QYRDlQcwzcvUlGUf79AnQxq/2NPiS/AULhhM4TKutIt8Q==\n dependencies:\n \"@babel/code-frame\" \"^7.24.7\"\n \"@babel/core\" \"^7.25.2\"\n@@ -6415,18 +6405,18 @@ metro@0.83.2:\n jest-worker \"^29.7.0\"\n jsc-safe-url \"^0.2.2\"\n lodash.throttle \"^4.1.1\"\n- metro-babel-transformer \"0.83.2\"\n- metro-cache \"0.83.2\"\n- metro-cache-key \"0.83.2\"\n- metro-config \"0.83.2\"\n- metro-core \"0.83.2\"\n- metro-file-map \"0.83.2\"\n- metro-resolver \"0.83.2\"\n- metro-runtime \"0.83.2\"\n- metro-source-map \"0.83.2\"\n- metro-symbolicate \"0.83.2\"\n- metro-transform-plugins \"0.83.2\"\n- metro-transform-worker \"0.83.2\"\n+ metro-babel-transformer \"0.83.3\"\n+ metro-cache \"0.83.3\"\n+ metro-cache-key \"0.83.3\"\n+ metro-config \"0.83.3\"\n+ metro-core \"0.83.3\"\n+ metro-file-map \"0.83.3\"\n+ metro-resolver \"0.83.3\"\n+ metro-runtime \"0.83.3\"\n+ metro-source-map \"0.83.3\"\n+ metro-symbolicate \"0.83.3\"\n+ metro-transform-plugins \"0.83.3\"\n+ metro-transform-worker \"0.83.3\"\n mime-types \"^2.1.27\"\n nullthrows \"^1.1.1\"\n serialize-error \"^2.1.0\"\n@@ -6435,19 +6425,19 @@ metro@0.83.2:\n ws \"^7.5.10\"\n yargs \"^17.6.2\"\n \n-metro@0.83.3, metro@^0.83.1, metro@^0.83.3:\n- version \"0.83.3\"\n- resolved \"https://registry.yarnpkg.com/metro/-/metro-0.83.3.tgz#1e7e04c15519af746f8932c7f9c553d92c39e922\"\n- integrity sha512-+rP+/GieOzkt97hSJ0MrPOuAH/jpaS21ZDvL9DJ35QYRDlQcwzcvUlGUf79AnQxq/2NPiS/AULhhM4TKutIt8Q==\n+metro@0.83.4, metro@^0.83.3:\n+ version \"0.83.4\"\n+ resolved \"https://registry.yarnpkg.com/metro/-/metro-0.83.4.tgz#beddd541e8e6d227a670039548e39cae051069a2\"\n+ integrity sha512-eBkAtcob+YmvSLL+/rsFiK8dHNfDbQA2/pi0lnxg3E6LLtUpwDfdGJ9WBWXkj0PVeOhoWQyj9Rt7s/+6k/GXuA==\n dependencies:\n- \"@babel/code-frame\" \"^7.24.7\"\n+ \"@babel/code-frame\" \"^7.29.0\"\n \"@babel/core\" \"^7.25.2\"\n- \"@babel/generator\" \"^7.25.0\"\n- \"@babel/parser\" \"^7.25.3\"\n- \"@babel/template\" \"^7.25.0\"\n- \"@babel/traverse\" \"^7.25.3\"\n- \"@babel/types\" \"^7.25.2\"\n- accepts \"^1.3.7\"\n+ \"@babel/generator\" \"^7.29.1\"\n+ \"@babel/parser\" \"^7.29.0\"\n+ \"@babel/template\" \"^7.28.6\"\n+ \"@babel/traverse\" \"^7.29.0\"\n+ \"@babel/types\" \"^7.29.0\"\n+ accepts \"^2.0.0\"\n chalk \"^4.0.0\"\n ci-info \"^2.0.0\"\n connect \"^3.6.5\"\n@@ -6455,25 +6445,25 @@ metro@0.83.3, metro@^0.83.1, metro@^0.83.3:\n error-stack-parser \"^2.0.6\"\n flow-enums-runtime \"^0.0.6\"\n graceful-fs \"^4.2.4\"\n- hermes-parser \"0.32.0\"\n+ hermes-parser \"0.33.3\"\n image-size \"^1.0.2\"\n invariant \"^2.2.4\"\n jest-worker \"^29.7.0\"\n jsc-safe-url \"^0.2.2\"\n lodash.throttle \"^4.1.1\"\n- metro-babel-transformer \"0.83.3\"\n- metro-cache \"0.83.3\"\n- metro-cache-key \"0.83.3\"\n- metro-config \"0.83.3\"\n- metro-core \"0.83.3\"\n- metro-file-map \"0.83.3\"\n- metro-resolver \"0.83.3\"\n- metro-runtime \"0.83.3\"\n- metro-source-map \"0.83.3\"\n- metro-symbolicate \"0.83.3\"\n- metro-transform-plugins \"0.83.3\"\n- metro-transform-worker \"0.83.3\"\n- mime-types \"^2.1.27\"\n+ metro-babel-transformer \"0.83.4\"\n+ metro-cache \"0.83.4\"\n+ metro-cache-key \"0.83.4\"\n+ metro-config \"0.83.4\"\n+ metro-core \"0.83.4\"\n+ metro-file-map \"0.83.4\"\n+ metro-resolver \"0.83.4\"\n+ metro-runtime \"0.83.4\"\n+ metro-source-map \"0.83.4\"\n+ metro-symbolicate \"0.83.4\"\n+ metro-transform-plugins \"0.83.4\"\n+ metro-transform-worker \"0.83.4\"\n+ mime-types \"^3.0.1\"\n nullthrows \"^1.1.1\"\n serialize-error \"^2.1.0\"\n source-map \"^0.5.6\"\n@@ -6494,7 +6484,7 @@ mime-db@1.52.0:\n resolved \"https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70\"\n integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==\n \n-\"mime-db@>= 1.43.0 < 2\":\n+\"mime-db@>= 1.43.0 < 2\", mime-db@^1.54.0:\n version \"1.54.0\"\n resolved \"https://registry.yarnpkg.com/mime-db/-/mime-db-1.54.0.tgz#cddb3ee4f9c64530dff640236661d42cb6a314f5\"\n integrity sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==\n@@ -6506,6 +6496,13 @@ mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.34:\n dependencies:\n mime-db \"1.52.0\"\n \n+mime-types@^3.0.0, mime-types@^3.0.1:\n+ version \"3.0.2\"\n+ resolved \"https://registry.yarnpkg.com/mime-types/-/mime-types-3.0.2.tgz#39002d4182575d5af036ffa118100f2524b2e2ab\"\n+ integrity sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==\n+ dependencies:\n+ mime-db \"^1.54.0\"\n+\n mime@1.6.0:\n version \"1.6.0\"\n resolved \"https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1\"\n@@ -6526,31 +6523,24 @@ min-indent@^1.0.0:\n resolved \"https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869\"\n integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==\n \n-minimatch@^10.1.1:\n- version \"10.1.1\"\n- resolved \"https://registry.yarnpkg.com/minimatch/-/minimatch-10.1.1.tgz#e6e61b9b0c1dcab116b5a7d1458e8b6ae9e73a55\"\n- integrity sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==\n+minimatch@^10.2.2:\n+ version \"10.2.4\"\n+ resolved \"https://registry.yarnpkg.com/minimatch/-/minimatch-10.2.4.tgz#465b3accbd0218b8281f5301e27cedc697f96fde\"\n+ integrity sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==\n dependencies:\n- \"@isaacs/brace-expansion\" \"^5.0.0\"\n+ brace-expansion \"^5.0.2\"\n \n minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:\n- version \"3.1.2\"\n- resolved \"https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b\"\n- integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==\n+ version \"3.1.5\"\n+ resolved \"https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.5.tgz#580c88f8d5445f2bd6aa8f3cadefa0de79fbd69e\"\n+ integrity sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==\n dependencies:\n brace-expansion \"^1.1.7\"\n \n minimatch@^8.0.2:\n- version \"8.0.4\"\n- resolved \"https://registry.yarnpkg.com/minimatch/-/minimatch-8.0.4.tgz#847c1b25c014d4e9a7f68aaf63dedd668a626229\"\n- integrity sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==\n- dependencies:\n- brace-expansion \"^2.0.1\"\n-\n-minimatch@^9.0.0, minimatch@^9.0.4:\n- version \"9.0.5\"\n- resolved \"https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5\"\n- integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==\n+ version \"8.0.7\"\n+ resolved \"https://registry.yarnpkg.com/minimatch/-/minimatch-8.0.7.tgz#954766e22da88a3e0a17ad93b58c15c9d8a579de\"\n+ integrity sha512-V+1uQNdzybxa14e/p00HZnQNNcTjnRJjDxg2V8wtkjFctq4M7hXFws4oekyTP0Jebeq7QYtpFyOeBAjc88zvYg==\n dependencies:\n brace-expansion \"^2.0.1\"\n \n@@ -6564,17 +6554,10 @@ minipass@^4.2.4:\n resolved \"https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a\"\n integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==\n \n-\"minipass@^5.0.0 || ^6.0.2 || ^7.0.0\", minipass@^7.0.4, minipass@^7.1.2:\n- version \"7.1.2\"\n- resolved \"https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707\"\n- integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==\n-\n-minizlib@^3.1.0:\n- version \"3.1.0\"\n- resolved \"https://registry.yarnpkg.com/minizlib/-/minizlib-3.1.0.tgz#6ad76c3a8f10227c9b51d1c9ac8e30b27f5a251c\"\n- integrity sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==\n- dependencies:\n- minipass \"^7.1.2\"\n+\"minipass@^5.0.0 || ^6.0.2 || ^7.0.0\", minipass@^7.1.2, minipass@^7.1.3:\n+ version \"7.1.3\"\n+ resolved \"https://registry.yarnpkg.com/minipass/-/minipass-7.1.3.tgz#79389b4eb1bb2d003a9bba87d492f2bd37bdc65b\"\n+ integrity sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==\n \n mkdirp@^1.0.4:\n version \"1.0.4\"\n@@ -6586,10 +6569,10 @@ mockdate@3.0.5:\n resolved \"https://registry.yarnpkg.com/mockdate/-/mockdate-3.0.5.tgz#789be686deb3149e7df2b663d2bc4392bc3284fb\"\n integrity sha512-iniQP4rj1FhBdBYS/+eQv7j1tadJ9lJtdzgOpvsOHng/GbcDh2Fhdeq+ZRldrPYdXvCyfFUmFeEwEGXZB5I/AQ==\n \n-moment@2.24.0:\n- version \"2.24.0\"\n- resolved \"https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b\"\n- integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==\n+moment@2.30.1:\n+ version \"2.30.1\"\n+ resolved \"https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae\"\n+ integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==\n \n ms@2.0.0:\n version \"2.0.0\"\n@@ -6601,14 +6584,10 @@ ms@2.1.3, ms@^2.1.1, ms@^2.1.3:\n resolved \"https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2\"\n integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==\n \n-mz@^2.7.0:\n- version \"2.7.0\"\n- resolved \"https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32\"\n- integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==\n- dependencies:\n- any-promise \"^1.0.0\"\n- object-assign \"^4.0.1\"\n- thenify-all \"^1.0.0\"\n+multitars@^0.2.3:\n+ version \"0.2.4\"\n+ resolved \"https://registry.yarnpkg.com/multitars/-/multitars-0.2.4.tgz#37d003ca1dfddb5c4fbf1e51077831d576100b38\"\n+ integrity sha512-XgLbg1HHchFauMCQPRwMj6MSyDd5koPlTA1hM3rUFkeXzGpjU/I9fP3to7yrObE9jcN8ChIOQGrM0tV0kUZaKg==\n \n nanoid@^3.3.11, nanoid@^3.3.7:\n version \"3.3.11\"\n@@ -6625,15 +6604,25 @@ negotiator@0.6.3:\n resolved \"https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd\"\n integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==\n \n+negotiator@^1.0.0:\n+ version \"1.0.0\"\n+ resolved \"https://registry.yarnpkg.com/negotiator/-/negotiator-1.0.0.tgz#b6c91bb47172d69f93cfd7c357bbb529019b5f6a\"\n+ integrity sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==\n+\n negotiator@~0.6.4:\n version \"0.6.4\"\n resolved \"https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7\"\n integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==\n \n-nested-error-stacks@~2.0.1:\n- version \"2.0.1\"\n- resolved \"https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.0.1.tgz#d2cc9fc5235ddb371fc44d506234339c8e4b0a4b\"\n- integrity sha512-SrQrok4CATudVzBS7coSz26QRSmlK9TzzoFbeKfcPBUFPjcQM9Rqvr/DlJkOrwI/0KcgvMub1n1g5Jt9EgRn4A==\n+node-exports-info@^1.6.0:\n+ version \"1.6.0\"\n+ resolved \"https://registry.yarnpkg.com/node-exports-info/-/node-exports-info-1.6.0.tgz#1aedafb01a966059c9a5e791a94a94d93f5c2a13\"\n+ integrity sha512-pyFS63ptit/P5WqUkt+UUfe+4oevH+bFeIiPPdfb0pFeYEu/1ELnJu5l+5EcTKYL5M7zaAa7S8ddywgXypqKCw==\n+ dependencies:\n+ array.prototype.flatmap \"^1.3.3\"\n+ es-errors \"^1.3.0\"\n+ object.entries \"^1.1.9\"\n+ semver \"^6.3.1\"\n \n node-fetch@^2.6.7:\n version \"2.7.0\"\n@@ -6642,7 +6631,7 @@ node-fetch@^2.6.7:\n dependencies:\n whatwg-url \"^5.0.0\"\n \n-node-forge@^1.2.1, node-forge@^1.3.1:\n+node-forge@^1.3.3:\n version \"1.3.3\"\n resolved \"https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.3.tgz#0ad80f6333b3a0045e827ac20b7f735f93716751\"\n integrity sha512-rLvcdSyRCyouf6jcOIPe/BgwG/d7hKjzMKOas33/pHEr6gbq18IK9zV7DiPvzsz0oBJPme6qr6H6kGZuI9/DZg==\n@@ -6696,13 +6685,6 @@ nwsapi@^2.2.2:\n resolved \"https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.23.tgz#59712c3a88e6de2bb0b6ccc1070397267019cf6c\"\n integrity sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==\n \n-ob1@0.83.2:\n- version \"0.83.2\"\n- resolved \"https://registry.yarnpkg.com/ob1/-/ob1-0.83.2.tgz#23c2e58b7d542fb01e627049710334d14c287cf8\"\n- integrity sha512-XlK3w4M+dwd1g1gvHzVbxiXEbUllRONEgcF2uEO0zm4nxa0eKlh41c6N65q1xbiDOeKKda1tvNOAD33fNjyvCg==\n- dependencies:\n- flow-enums-runtime \"^0.0.6\"\n-\n ob1@0.83.3:\n version \"0.83.3\"\n resolved \"https://registry.yarnpkg.com/ob1/-/ob1-0.83.3.tgz#2208e20c9070e9beff3ad067f2db458fa6b07014\"\n@@ -6710,7 +6692,14 @@ ob1@0.83.3:\n dependencies:\n flow-enums-runtime \"^0.0.6\"\n \n-object-assign@^4.0.1, object-assign@^4.1.1:\n+ob1@0.83.4:\n+ version \"0.83.4\"\n+ resolved \"https://registry.yarnpkg.com/ob1/-/ob1-0.83.4.tgz#f034e861376ca4294c5e75623389f07b48028aeb\"\n+ integrity sha512-9JiflaRKCkxKzH8uuZlax72cHzZ8iFLsNIORFOAKDgZUOfvfwYWOVS0ezGLzPp/yEhVktD+PTTImC0AAehSOBw==\n+ dependencies:\n+ flow-enums-runtime \"^0.0.6\"\n+\n+object-assign@^4.1.1:\n version \"4.1.1\"\n resolved \"https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863\"\n integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==\n@@ -6720,14 +6709,6 @@ object-inspect@^1.13.3, object-inspect@^1.13.4:\n resolved \"https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213\"\n integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==\n \n-object-is@^1.1.5:\n- version \"1.1.6\"\n- resolved \"https://registry.yarnpkg.com/object-is/-/object-is-1.1.6.tgz#1a6a53aed2dd8f7e6775ff870bea58545956ab07\"\n- integrity sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==\n- dependencies:\n- call-bind \"^1.0.7\"\n- define-properties \"^1.2.1\"\n-\n object-keys@^1.1.1:\n version \"1.1.1\"\n resolved \"https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e\"\n@@ -6745,7 +6726,7 @@ object.assign@^4.1.4, object.assign@^4.1.7:\n has-symbols \"^1.1.0\"\n object-keys \"^1.1.1\"\n \n-object.entries@^1.1.5:\n+object.entries@^1.1.9:\n version \"1.1.9\"\n resolved \"https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.9.tgz#e4770a6a1444afb61bd39f984018b5bede25f8b3\"\n integrity sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==\n@@ -6755,7 +6736,7 @@ object.entries@^1.1.5:\n define-properties \"^1.2.1\"\n es-object-atoms \"^1.1.1\"\n \n-object.fromentries@^2.0.5:\n+object.fromentries@^2.0.8:\n version \"2.0.8\"\n resolved \"https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65\"\n integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==\n@@ -6765,16 +6746,16 @@ object.fromentries@^2.0.5:\n es-abstract \"^1.23.2\"\n es-object-atoms \"^1.0.0\"\n \n-object.hasown@^1.1.1:\n- version \"1.1.4\"\n- resolved \"https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.4.tgz#e270ae377e4c120cdcb7656ce66884a6218283dc\"\n- integrity sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==\n+object.groupby@^1.0.3:\n+ version \"1.0.3\"\n+ resolved \"https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e\"\n+ integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==\n dependencies:\n+ call-bind \"^1.0.7\"\n define-properties \"^1.2.1\"\n es-abstract \"^1.23.2\"\n- es-object-atoms \"^1.0.0\"\n \n-object.values@^1.1.5, object.values@^1.1.6:\n+object.values@^1.1.6, object.values@^1.2.1:\n version \"1.2.1\"\n resolved \"https://registry.yarnpkg.com/object.values/-/object.values-1.2.1.tgz#deed520a50809ff7f75a7cfd4bc64c7a038c6216\"\n integrity sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==\n@@ -6975,7 +6956,7 @@ path-key@^3.0.0, path-key@^3.1.0:\n resolved \"https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375\"\n integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==\n \n-path-parse@^1.0.5, path-parse@^1.0.7:\n+path-parse@^1.0.7:\n version \"1.0.7\"\n resolved \"https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735\"\n integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==\n@@ -6988,10 +6969,10 @@ path-scurry@^1.6.1:\n lru-cache \"^10.2.0\"\n minipass \"^5.0.0 || ^6.0.2 || ^7.0.0\"\n \n-path-scurry@^2.0.0:\n- version \"2.0.1\"\n- resolved \"https://registry.yarnpkg.com/path-scurry/-/path-scurry-2.0.1.tgz#4b6572376cfd8b811fca9cd1f5c24b3cbac0fe10\"\n- integrity sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==\n+path-scurry@^2.0.2:\n+ version \"2.0.2\"\n+ resolved \"https://registry.yarnpkg.com/path-scurry/-/path-scurry-2.0.2.tgz#6be0d0ee02a10d9e0de7a98bae65e182c9061f85\"\n+ integrity sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==\n dependencies:\n lru-cache \"^11.0.0\"\n minipass \"^7.1.2\"\n@@ -7001,7 +6982,7 @@ path-type@^4.0.0:\n resolved \"https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b\"\n integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==\n \n-picocolors@^1.0.0, picocolors@^1.1.1:\n+picocolors@^1.1.1:\n version \"1.1.1\"\n resolved \"https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b\"\n integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==\n@@ -7011,17 +6992,12 @@ picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1:\n resolved \"https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42\"\n integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==\n \n-picomatch@^3.0.1:\n- version \"3.0.1\"\n- resolved \"https://registry.yarnpkg.com/picomatch/-/picomatch-3.0.1.tgz#817033161def55ec9638567a2f3bbc876b3e7516\"\n- integrity sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==\n-\n picomatch@^4.0.3:\n version \"4.0.3\"\n resolved \"https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.3.tgz#796c76136d1eead715db1e7bad785dedd695a042\"\n integrity sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==\n \n-pirates@^4.0.1, pirates@^4.0.4:\n+pirates@^4.0.4:\n version \"4.0.7\"\n resolved \"https://registry.yarnpkg.com/pirates/-/pirates-4.0.7.tgz#643b4a18c4257c8a65104b73f3049ce9a0a15e22\"\n integrity sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==\n@@ -7086,9 +7062,9 @@ prelude-ls@^1.2.1:\n integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==\n \n prettier-linter-helpers@^1.0.0:\n- version \"1.0.0\"\n- resolved \"https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b\"\n- integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==\n+ version \"1.0.1\"\n+ resolved \"https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.1.tgz#6a31f88a4bad6c7adda253de12ba4edaea80ebcd\"\n+ integrity sha512-SxToR7P8Y2lWmv/kTzVLC1t/GDI2WGjMwNhLLE9qtH8Q13C+aEmuRlzDst4Up4s0Wc8sF2M+J57iB3cMLqftfg==\n dependencies:\n fast-diff \"^1.1.2\"\n \n@@ -7097,11 +7073,6 @@ prettier@2.1.2:\n resolved \"https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5\"\n integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==\n \n-pretty-bytes@^5.6.0:\n- version \"5.6.0\"\n- resolved \"https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb\"\n- integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==\n-\n pretty-format@^29.0.0, pretty-format@^29.7.0:\n version \"29.7.0\"\n resolved \"https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812\"\n@@ -7143,7 +7114,7 @@ prompts@^2.0.1, prompts@^2.2.1, prompts@^2.3.2:\n kleur \"^3.0.3\"\n sisteransi \"^1.0.5\"\n \n-prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:\n+prop-types@^15.5.7, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:\n version \"15.8.1\"\n resolved \"https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5\"\n integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==\n@@ -7174,11 +7145,6 @@ pure-rand@^6.0.0:\n resolved \"https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.1.0.tgz#d173cf23258231976ccbdb05247c9787957604f2\"\n integrity sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==\n \n-qrcode-terminal@0.11.0:\n- version \"0.11.0\"\n- resolved \"https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.11.0.tgz#ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e\"\n- integrity sha512-Uu7ii+FQy4Qf82G4xu7ShHhjhGahEpCWc3x8UavY3CTcWV+ufmmCtwkr7ZKsX42jdL0kr1B5FKUeqJvAn51jzQ==\n-\n query-string@^7.1.3:\n version \"7.1.3\"\n resolved \"https://registry.yarnpkg.com/query-string/-/query-string-7.1.3.tgz#a1cf90e994abb113a325804a972d98276fe02328\"\n@@ -7211,6 +7177,11 @@ ramda@0.27.0:\n resolved \"https://registry.yarnpkg.com/ramda/-/ramda-0.27.0.tgz#915dc29865c0800bf3f69b8fd6c279898b59de43\"\n integrity sha512-pVzZdDpWwWqEVVLshWUHjNwuVP7SfcmPraYuqocJp1yo2U1R7P+5QAfDhdItkuoGqIBnBYrtPp7rEPqDn9HlZA==\n \n+ramda@^0.27.2:\n+ version \"0.27.2\"\n+ resolved \"https://registry.yarnpkg.com/ramda/-/ramda-0.27.2.tgz#84463226f7f36dc33592f6f4ed6374c48306c3f1\"\n+ integrity sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA==\n+\n ramda@^0.32.0:\n version \"0.32.0\"\n resolved \"https://registry.yarnpkg.com/ramda/-/ramda-0.32.0.tgz#b2116807b59b6b177af7a2ad19b14a3653570e96\"\n@@ -7221,16 +7192,6 @@ range-parser@~1.2.1:\n resolved \"https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031\"\n integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==\n \n-rc@~1.2.7:\n- version \"1.2.8\"\n- resolved \"https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed\"\n- integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==\n- dependencies:\n- deep-extend \"^0.6.0\"\n- ini \"~1.3.0\"\n- minimist \"^1.2.0\"\n- strip-json-comments \"~2.0.1\"\n-\n react-devtools-core@^6.1.5:\n version \"6.1.5\"\n resolved \"https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-6.1.5.tgz#c5eca79209dab853a03b2158c034c5166975feee\"\n@@ -7239,12 +7200,12 @@ react-devtools-core@^6.1.5:\n shell-quote \"^1.6.1\"\n ws \"^7\"\n \n-react-dom@19.1.0:\n- version \"19.1.0\"\n- resolved \"https://registry.yarnpkg.com/react-dom/-/react-dom-19.1.0.tgz#133558deca37fa1d682708df8904b25186793623\"\n- integrity sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==\n+react-dom@19.2.0:\n+ version \"19.2.0\"\n+ resolved \"https://registry.yarnpkg.com/react-dom/-/react-dom-19.2.0.tgz#00ed1e959c365e9a9d48f8918377465466ec3af8\"\n+ integrity sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==\n dependencies:\n- scheduler \"^0.26.0\"\n+ scheduler \"^0.27.0\"\n \n react-freeze@^1.0.0:\n version \"1.0.4\"\n@@ -7261,22 +7222,20 @@ react-is@^18.0.0:\n resolved \"https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e\"\n integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==\n \n-react-is@^19.1.0:\n- version \"19.2.3\"\n- resolved \"https://registry.yarnpkg.com/react-is/-/react-is-19.2.3.tgz#eec2feb69c7fb31f77d0b5c08c10ae1c88886b29\"\n- integrity sha512-qJNJfu81ByyabuG7hPFEbXqNcWSU3+eVus+KJs+0ncpGfMyYdvSmxiJxbWR65lYi1I+/0HBcliO029gc4F+PnA==\n+react-is@^19.1.0, react-is@^19.2.0:\n+ version \"19.2.4\"\n+ resolved \"https://registry.yarnpkg.com/react-is/-/react-is-19.2.4.tgz#a080758243c572ccd4a63386537654298c99d135\"\n+ integrity sha512-W+EWGn2v0ApPKgKKCy/7s7WHXkboGcsrXE+2joLyVxkbyVQfO3MUEaUQDHoSmb8TFFrSKYa9mw64WZHNHSDzYA==\n \n-react-native-collapsible@1.5.2:\n- version \"1.5.2\"\n- resolved \"https://registry.yarnpkg.com/react-native-collapsible/-/react-native-collapsible-1.5.2.tgz#544616dc04a71870508dc707049544a805402993\"\n- integrity sha512-pmETueIStEhKY93yO/nh+G9jyMZaZta9xyUO51KP+p/tefXDtDG8Ok9QELld0Fk/kiDOldvG5Tjy+JcdS8Sdxw==\n- dependencies:\n- prop-types \"^15.6.2\"\n+react-native-collapsible@1.6.2:\n+ version \"1.6.2\"\n+ resolved \"https://registry.yarnpkg.com/react-native-collapsible/-/react-native-collapsible-1.6.2.tgz#3b67fa402a6ba3c291022f5db8f345083862c3d8\"\n+ integrity sha512-MCOBVJWqHNjnDaGkvxX997VONmJeebh6wyJxnHEgg0L1PrlcXU1e/bo6eK+CDVFuMrCafw8Qh4DOv/C4V/+Iew==\n \n-react-native-gesture-handler@~2.28.0:\n- version \"2.28.0\"\n- resolved \"https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.28.0.tgz#07fb4f5eae72f810aac3019b060d26c1835bfd0c\"\n- integrity sha512-0msfJ1vRxXKVgTgvL+1ZOoYw3/0z1R+Ked0+udoJhyplC2jbVKIJ8Z1bzWdpQRCV3QcQ87Op0zJVE5DhKK2A0A==\n+react-native-gesture-handler@~2.30.0:\n+ version \"2.30.0\"\n+ resolved \"https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.30.0.tgz#990c621fbeeefde853ececdcab7cbe1b621dbb8b\"\n+ integrity sha512-5YsnKHGa0X9C8lb5oCnKm0fLUPM6CRduvUUw2Bav4RIj/C3HcFh4RIUnF8wgG6JQWCL1//gRx4v+LVWgcIQdGA==\n dependencies:\n \"@egjs/hammerjs\" \"^2.0.17\"\n hoist-non-react-statics \"^3.3.0\"\n@@ -7299,7 +7258,7 @@ react-native-iphone-x-helper@^1.0.3:\n resolved \"https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz#20c603e9a0e765fd6f97396638bdeb0e5a60b010\"\n integrity sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg==\n \n-react-native-is-edge-to-edge@^1.2.1:\n+react-native-is-edge-to-edge@1.2.1, react-native-is-edge-to-edge@^1.2.1:\n version \"1.2.1\"\n resolved \"https://registry.yarnpkg.com/react-native-is-edge-to-edge/-/react-native-is-edge-to-edge-1.2.1.tgz#64e10851abd9d176cbf2b40562f751622bde3358\"\n integrity sha512-FLbPWl/MyYQWz+KwqOZsSyj2JmLKglHatd3xLZWskXOpRaio4LfEDEz8E/A6uD8QoTHW6Aobw1jbEwK7KMgR7Q==\n@@ -7319,10 +7278,10 @@ react-native-modal-datetime-picker@14.0.1:\n dependencies:\n prop-types \"^15.7.2\"\n \n-react-native-pager-view@6.9.1:\n- version \"6.9.1\"\n- resolved \"https://registry.yarnpkg.com/react-native-pager-view/-/react-native-pager-view-6.9.1.tgz#a9e6d9323935cc2ae1d46d7816b66f76dc3eff8e\"\n- integrity sha512-uUT0MMMbNtoSbxe9pRvdJJKEi9snjuJ3fXlZhG8F2vVMOBJVt/AFtqMPUHu9yMflmqOr08PewKzj9EPl/Yj+Gw==\n+react-native-pager-view@8.0.0:\n+ version \"8.0.0\"\n+ resolved \"https://registry.yarnpkg.com/react-native-pager-view/-/react-native-pager-view-8.0.0.tgz#9a6cc7d8239d97581840fe51691f07320d1ce4f7\"\n+ integrity sha512-oAwlWT1lhTkIs9HhODnjNNl/owxzn9DP1MbP+az6OTUdgbmzA16Up83sBH8NRKwrH8rNm7iuWnX1qMqiiWOLhg==\n \n react-native-progress@5.0.1:\n version \"5.0.1\"\n@@ -7331,73 +7290,88 @@ react-native-progress@5.0.1:\n dependencies:\n prop-types \"^15.7.2\"\n \n-react-native-reanimated@~4.1.1:\n- version \"4.1.6\"\n- resolved \"https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-4.1.6.tgz#9d3d06416eaf48ab25594611185f66b34e404291\"\n- integrity sha512-F+ZJBYiok/6Jzp1re75F/9aLzkgoQCOh4yxrnwATa8392RvM3kx+fiXXFvwcgE59v48lMwd9q0nzF1oJLXpfxQ==\n- dependencies:\n- react-native-is-edge-to-edge \"^1.2.1\"\n- semver \"7.7.2\"\n+react-native-reanimated@4.2.1:\n+ version \"4.2.1\"\n+ resolved \"https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-4.2.1.tgz#fbdee721bff0946a6e5ae67c8c38c37ca4a0a057\"\n+ integrity sha512-/NcHnZMyOvsD/wYXug/YqSKw90P9edN0kEPL5lP4PFf1aQ4F1V7MKe/E0tvfkXKIajy3Qocp5EiEnlcrK/+BZg==\n+ dependencies:\n+ react-native-is-edge-to-edge \"1.2.1\"\n+ semver \"7.7.3\"\n+\n+react-native-render-html@^6.3.4:\n+ version \"6.3.4\"\n+ resolved \"https://registry.yarnpkg.com/react-native-render-html/-/react-native-render-html-6.3.4.tgz#01684897bed2de84829e540a1dbb3a7bdf9d0e57\"\n+ integrity sha512-H2jSMzZjidE+Wo3qCWPUMU1nm98Vs2SGCvQCz/i6xf0P3Y9uVtG/b0sDbG/cYFir2mSYBYCIlS1Dv0WC1LjYig==\n+ dependencies:\n+ \"@jsamr/counter-style\" \"^2.0.1\"\n+ \"@jsamr/react-native-li\" \"^2.3.0\"\n+ \"@native-html/transient-render-engine\" \"11.2.3\"\n+ \"@types/ramda\" \"^0.27.40\"\n+ \"@types/urijs\" \"^1.19.15\"\n+ prop-types \"^15.5.7\"\n+ ramda \"^0.27.2\"\n+ stringify-entities \"^3.1.0\"\n+ urijs \"^1.19.6\"\n \n react-native-safe-area-context@~5.6.0:\n version \"5.6.2\"\n resolved \"https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-5.6.2.tgz#283e006f5b434fb247fcb4be0971ad7473d5c560\"\n integrity sha512-4XGqMNj5qjUTYywJqpdWZ9IG8jgkS3h06sfVjfw5yZQZfWnRFXczi0GnYyFyCc2EBps/qFmoCH8fez//WumdVg==\n \n-react-native-screens@4.19.0:\n- version \"4.19.0\"\n- resolved \"https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-4.19.0.tgz#d00f2ec070d7426204eaf34ef6c64396a6871e1d\"\n- integrity sha512-qSDAO3AL5bti0Ri7KZRSVmWlhDr8MV86N5GruiKVQfEL7Zx2nUi3Dl62lqHUAD/LnDvOPuDDsMHCfIpYSv3hPQ==\n+react-native-screens@~4.23.0:\n+ version \"4.23.0\"\n+ resolved \"https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-4.23.0.tgz#81574b1b0cc4ac6c9ed63e46eca7126f37affe86\"\n+ integrity sha512-XhO3aK0UeLpBn4kLecd+J+EDeRRJlI/Ro9Fze06vo1q163VeYtzfU9QS09/VyDFMWR1qxDC1iazCArTPSFFiPw==\n dependencies:\n react-freeze \"^1.0.0\"\n warn-once \"^0.1.0\"\n \n-react-native-svg@15.12.1:\n- version \"15.12.1\"\n- resolved \"https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-15.12.1.tgz#7ba756dd6a235f86a2c312a1e7911f9b0d18ad3a\"\n- integrity sha512-vCuZJDf8a5aNC2dlMovEv4Z0jjEUET53lm/iILFnFewa15b4atjVxU6Wirm6O9y6dEsdjDZVD7Q3QM4T1wlI8g==\n+react-native-svg@15.15.3:\n+ version \"15.15.3\"\n+ resolved \"https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-15.15.3.tgz#48baf15ad9610be816b37c03ffbb1f72c056a2b0\"\n+ integrity sha512-/k4KYwPBLGcx2f5d4FjE+vCScK7QOX14cl2lIASJ28u4slHHtIhL0SZKU7u9qmRBHxTCKPoPBtN6haT1NENJNA==\n dependencies:\n css-select \"^5.1.0\"\n css-tree \"^1.1.3\"\n warn-once \"0.1.1\"\n \n-react-native-tab-view@^4.2.1:\n- version \"4.2.1\"\n- resolved \"https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-4.2.1.tgz#ced74185db2a36856c4334453d27883c05af624e\"\n- integrity sha512-3fJXlzTVunVg9V+7a83XVcjwIxUO014qkkkpB5z7mMjXf5XVQFxzxUtC6GrdDK57wBA/OglpsP1qx5HvqMPtfw==\n+react-native-tab-view@^4.2.2:\n+ version \"4.2.2\"\n+ resolved \"https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-4.2.2.tgz#303accb4ddb2f5856d62bb323dd202724275e6a2\"\n+ integrity sha512-NXtrG6OchvbGjsvbySJGVocXxo4Y2vA17ph4rAaWtA2jh+AasD8OyikKBRg2SmllEfeQ+GEhcKe8kulHv8BhTg==\n dependencies:\n use-latest-callback \"^0.2.4\"\n \n-react-native-worklets@0.5.1:\n- version \"0.5.1\"\n- resolved \"https://registry.yarnpkg.com/react-native-worklets/-/react-native-worklets-0.5.1.tgz#d153242655e3757b6c62a474768831157316ad33\"\n- integrity sha512-lJG6Uk9YuojjEX/tQrCbcbmpdLCSFxDK1rJlkDhgqkVi1KZzG7cdcBFQRqyNOOzR9Y0CXNuldmtWTGOyM0k0+w==\n- dependencies:\n- \"@babel/plugin-transform-arrow-functions\" \"^7.0.0-0\"\n- \"@babel/plugin-transform-class-properties\" \"^7.0.0-0\"\n- \"@babel/plugin-transform-classes\" \"^7.0.0-0\"\n- \"@babel/plugin-transform-nullish-coalescing-operator\" \"^7.0.0-0\"\n- \"@babel/plugin-transform-optional-chaining\" \"^7.0.0-0\"\n- \"@babel/plugin-transform-shorthand-properties\" \"^7.0.0-0\"\n- \"@babel/plugin-transform-template-literals\" \"^7.0.0-0\"\n- \"@babel/plugin-transform-unicode-regex\" \"^7.0.0-0\"\n- \"@babel/preset-typescript\" \"^7.16.7\"\n- convert-source-map \"^2.0.0\"\n- semver \"7.7.2\"\n-\n-react-native@*:\n- version \"0.83.0\"\n- resolved \"https://registry.yarnpkg.com/react-native/-/react-native-0.83.0.tgz#30f815ca6355c9fe32daa8772338075d3e2d84f1\"\n- integrity sha512-a8wPjGfkktb1+Mjvzkky3d0u6j6zdWAzftZ2LdQtgRgqkMMfgQxD9S+ri3RNlfAFQpuCAOYUIyrNHiVkUQChxA==\n+react-native-worklets@0.7.2:\n+ version \"0.7.2\"\n+ resolved \"https://registry.yarnpkg.com/react-native-worklets/-/react-native-worklets-0.7.2.tgz#acfbfe4f8c7f3b2889e7f394e4fbd7e78e167134\"\n+ integrity sha512-DuLu1kMV/Uyl9pQHp3hehAlThoLw7Yk2FwRTpzASOmI+cd4845FWn3m2bk9MnjUw8FBRIyhwLqYm2AJaXDXsog==\n+ dependencies:\n+ \"@babel/plugin-transform-arrow-functions\" \"7.27.1\"\n+ \"@babel/plugin-transform-class-properties\" \"7.27.1\"\n+ \"@babel/plugin-transform-classes\" \"7.28.4\"\n+ \"@babel/plugin-transform-nullish-coalescing-operator\" \"7.27.1\"\n+ \"@babel/plugin-transform-optional-chaining\" \"7.27.1\"\n+ \"@babel/plugin-transform-shorthand-properties\" \"7.27.1\"\n+ \"@babel/plugin-transform-template-literals\" \"7.27.1\"\n+ \"@babel/plugin-transform-unicode-regex\" \"7.27.1\"\n+ \"@babel/preset-typescript\" \"7.27.1\"\n+ convert-source-map \"2.0.0\"\n+ semver \"7.7.3\"\n+\n+react-native@0.83.2:\n+ version \"0.83.2\"\n+ resolved \"https://registry.yarnpkg.com/react-native/-/react-native-0.83.2.tgz#d0df3c425f5793fdcf3f8f281cacb5ced7ae4b10\"\n+ integrity sha512-ZDma3SLkRN2U2dg0/EZqxNBAx4of/oTnPjXAQi299VLq2gdnbZowGy9hzqv+O7sTA62g+lM1v+2FM5DUnJ/6hg==\n dependencies:\n \"@jest/create-cache-key-function\" \"^29.7.0\"\n- \"@react-native/assets-registry\" \"0.83.0\"\n- \"@react-native/codegen\" \"0.83.0\"\n- \"@react-native/community-cli-plugin\" \"0.83.0\"\n- \"@react-native/gradle-plugin\" \"0.83.0\"\n- \"@react-native/js-polyfills\" \"0.83.0\"\n- \"@react-native/normalize-colors\" \"0.83.0\"\n- \"@react-native/virtualized-lists\" \"0.83.0\"\n+ \"@react-native/assets-registry\" \"0.83.2\"\n+ \"@react-native/codegen\" \"0.83.2\"\n+ \"@react-native/community-cli-plugin\" \"0.83.2\"\n+ \"@react-native/gradle-plugin\" \"0.83.2\"\n+ \"@react-native/js-polyfills\" \"0.83.2\"\n+ \"@react-native/normalize-colors\" \"0.83.2\"\n+ \"@react-native/virtualized-lists\" \"0.83.2\"\n abort-controller \"^3.0.0\"\n anser \"^1.4.9\"\n ansi-regex \"^5.0.0\"\n@@ -7407,7 +7381,7 @@ react-native@*:\n commander \"^12.0.0\"\n flow-enums-runtime \"^0.0.6\"\n glob \"^7.1.1\"\n- hermes-compiler \"0.14.0\"\n+ hermes-compiler \"0.14.1\"\n invariant \"^2.2.4\"\n jest-environment-node \"^29.7.0\"\n memoize-one \"^5.0.0\"\n@@ -7426,46 +7400,6 @@ react-native@*:\n ws \"^7.5.10\"\n yargs \"^17.6.2\"\n \n-react-native@0.81.5:\n- version \"0.81.5\"\n- resolved \"https://registry.yarnpkg.com/react-native/-/react-native-0.81.5.tgz#6c963f137d3979b22aef2d8482067775c8fe2fed\"\n- integrity sha512-1w+/oSjEXZjMqsIvmkCRsOc8UBYv163bTWKTI8+1mxztvQPhCRYGTvZ/PL1w16xXHneIj/SLGfxWg2GWN2uexw==\n- dependencies:\n- \"@jest/create-cache-key-function\" \"^29.7.0\"\n- \"@react-native/assets-registry\" \"0.81.5\"\n- \"@react-native/codegen\" \"0.81.5\"\n- \"@react-native/community-cli-plugin\" \"0.81.5\"\n- \"@react-native/gradle-plugin\" \"0.81.5\"\n- \"@react-native/js-polyfills\" \"0.81.5\"\n- \"@react-native/normalize-colors\" \"0.81.5\"\n- \"@react-native/virtualized-lists\" \"0.81.5\"\n- abort-controller \"^3.0.0\"\n- anser \"^1.4.9\"\n- ansi-regex \"^5.0.0\"\n- babel-jest \"^29.7.0\"\n- babel-plugin-syntax-hermes-parser \"0.29.1\"\n- base64-js \"^1.5.1\"\n- commander \"^12.0.0\"\n- flow-enums-runtime \"^0.0.6\"\n- glob \"^7.1.1\"\n- invariant \"^2.2.4\"\n- jest-environment-node \"^29.7.0\"\n- memoize-one \"^5.0.0\"\n- metro-runtime \"^0.83.1\"\n- metro-source-map \"^0.83.1\"\n- nullthrows \"^1.1.1\"\n- pretty-format \"^29.7.0\"\n- promise \"^8.3.0\"\n- react-devtools-core \"^6.1.5\"\n- react-refresh \"^0.14.0\"\n- regenerator-runtime \"^0.13.2\"\n- scheduler \"0.26.0\"\n- semver \"^7.1.3\"\n- stacktrace-parser \"^0.1.10\"\n- whatwg-fetch \"^3.0.0\"\n- ws \"^6.2.3\"\n- yargs \"^17.6.2\"\n-\n react-reconciler@~0.31.0:\n version \"0.31.0\"\n resolved \"https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.31.0.tgz#6b7390fe8fab59210daf523d7400943973de1458\"\n@@ -7490,18 +7424,18 @@ react-refresh@^0.14.0, react-refresh@^0.14.2:\n resolved \"https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.2.tgz#3833da01ce32da470f1f936b9d477da5c7028bf9\"\n integrity sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==\n \n-react-test-renderer@19.1.0:\n- version \"19.1.0\"\n- resolved \"https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-19.1.0.tgz#89e1baa9e45a6da064b9760f92251d5b8e1f34ab\"\n- integrity sha512-jXkSl3CpvPYEF+p/eGDLB4sPoDX8pKkYvRl9+rR8HxLY0X04vW7hCm1/0zHoUSjPZ3bDa+wXWNTDVIw/R8aDVw==\n+react-test-renderer@19.2.0:\n+ version \"19.2.0\"\n+ resolved \"https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-19.2.0.tgz#5c9782b4a4ba0630a77d7ce092779fdf9ccde209\"\n+ integrity sha512-zLCFMHFE9vy/w3AxO0zNxy6aAupnCuLSVOJYDe/Tp+ayGI1f2PLQsFVPANSD42gdSbmYx5oN+1VWDhcXtq7hAQ==\n dependencies:\n- react-is \"^19.1.0\"\n- scheduler \"^0.26.0\"\n+ react-is \"^19.2.0\"\n+ scheduler \"^0.27.0\"\n \n-react@19.1.0:\n- version \"19.1.0\"\n- resolved \"https://registry.yarnpkg.com/react/-/react-19.1.0.tgz#926864b6c48da7627f004795d6cce50e90793b75\"\n- integrity sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==\n+react@19.2.0:\n+ version \"19.2.0\"\n+ resolved \"https://registry.yarnpkg.com/react/-/react-19.2.0.tgz#d33dd1721698f4376ae57a54098cb47fc75d93a5\"\n+ integrity sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==\n \n redent@^3.0.0:\n version \"3.0.0\"\n@@ -7612,20 +7546,6 @@ require-directory@^2.1.1:\n resolved \"https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42\"\n integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==\n \n-require-from-string@^2.0.2:\n- version \"2.0.2\"\n- resolved \"https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909\"\n- integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==\n-\n-requireg@^0.2.2:\n- version \"0.2.2\"\n- resolved \"https://registry.yarnpkg.com/requireg/-/requireg-0.2.2.tgz#437e77a5316a54c9bcdbbf5d1f755fe093089830\"\n- integrity sha512-nYzyjnFcPNGR3lx9lwPPPnuQxv6JWEZd2Ci0u9opN7N5zUEPIhY/GbL3vMGOr2UXwEg9WwSyV9X9Y/kLFgPsOg==\n- dependencies:\n- nested-error-stacks \"~2.0.1\"\n- rc \"~1.2.7\"\n- resolve \"~1.7.1\"\n-\n requires-port@^1.0.0:\n version \"1.0.0\"\n resolved \"https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff\"\n@@ -7653,29 +7573,22 @@ resolve-from@^5.0.0:\n resolved \"https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69\"\n integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==\n \n-resolve-global@^1.0.0:\n- version \"1.0.0\"\n- resolved \"https://registry.yarnpkg.com/resolve-global/-/resolve-global-1.0.0.tgz#a2a79df4af2ca3f49bf77ef9ddacd322dad19255\"\n- integrity sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw==\n- dependencies:\n- global-dirs \"^0.1.1\"\n-\n resolve-pkg-maps@^1.0.0:\n version \"1.0.0\"\n resolved \"https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f\"\n integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==\n \n resolve-workspace-root@^2.0.0:\n- version \"2.0.0\"\n- resolved \"https://registry.yarnpkg.com/resolve-workspace-root/-/resolve-workspace-root-2.0.0.tgz#a0098daa0067cd0efa6eb525c57c8fb4a61e78f8\"\n- integrity sha512-IsaBUZETJD5WsI11Wt8PKHwaIe45or6pwNc8yflvLJ4DWtImK9kuLoH5kUva/2Mmx/RdIyr4aONNSa2v9LTJsw==\n+ version \"2.0.1\"\n+ resolved \"https://registry.yarnpkg.com/resolve-workspace-root/-/resolve-workspace-root-2.0.1.tgz#9cbbf8321ebccaaf0e4ffea5274aa26b611ccd62\"\n+ integrity sha512-nR23LHAvaI6aHtMg6RWoaHpdR4D881Nydkzi2CixINyg9T00KgaJdJI6Vwty+Ps8WLxZHuxsS0BseWjxSA4C+w==\n \n-resolve.exports@^2.0.0, resolve.exports@^2.0.3:\n+resolve.exports@^2.0.0:\n version \"2.0.3\"\n resolved \"https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.3.tgz#41955e6f1b4013b7586f873749a635dea07ebe3f\"\n integrity sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==\n \n-resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.10, resolve@^1.22.2, resolve@^1.22.4, resolve@^1.22.8:\n+resolve@^1.20.0, resolve@^1.22.11, resolve@^1.22.4, resolve@^1.22.8:\n version \"1.22.11\"\n resolved \"https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262\"\n integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==\n@@ -7684,22 +7597,18 @@ resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.10, resolve@^1.22.2, resolve@^1.\n path-parse \"^1.0.7\"\n supports-preserve-symlinks-flag \"^1.0.0\"\n \n-resolve@^2.0.0-next.3:\n- version \"2.0.0-next.5\"\n- resolved \"https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c\"\n- integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==\n+resolve@^2.0.0-next.5:\n+ version \"2.0.0-next.6\"\n+ resolved \"https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.6.tgz#b3961812be69ace7b3bc35d5bf259434681294af\"\n+ integrity sha512-3JmVl5hMGtJ3kMmB3zi3DL25KfkCEyy3Tw7Gmw7z5w8M9WlwoPFnIvwChzu1+cF3iaK3sp18hhPz8ANeimdJfA==\n dependencies:\n- is-core-module \"^2.13.0\"\n+ es-errors \"^1.3.0\"\n+ is-core-module \"^2.16.1\"\n+ node-exports-info \"^1.6.0\"\n+ object-keys \"^1.1.1\"\n path-parse \"^1.0.7\"\n supports-preserve-symlinks-flag \"^1.0.0\"\n \n-resolve@~1.7.1:\n- version \"1.7.1\"\n- resolved \"https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3\"\n- integrity sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==\n- dependencies:\n- path-parse \"^1.0.5\"\n-\n restore-cursor@^2.0.0:\n version \"2.0.0\"\n resolved \"https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf\"\n@@ -7771,9 +7680,9 @@ safe-regex-test@^1.1.0:\n integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==\n \n sax@>=0.6.0:\n- version \"1.4.3\"\n- resolved \"https://registry.yarnpkg.com/sax/-/sax-1.4.3.tgz#fcebae3b756cdc8428321805f4b70f16ec0ab5db\"\n- integrity sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ==\n+ version \"1.4.4\"\n+ resolved \"https://registry.yarnpkg.com/sax/-/sax-1.4.4.tgz#f29c2bba80ce5b86f4343b4c2be9f2b96627cf8b\"\n+ integrity sha512-1n3r/tGXO6b6VXMdFT54SHzT9ytu9yr7TaELowdYpMqY/Ao7EnlQGmAQ1+RatX7Tkkdm6hONI2owqNx2aZj5Sw==\n \n saxes@^6.0.0:\n version \"6.0.0\"\n@@ -7782,12 +7691,7 @@ saxes@^6.0.0:\n dependencies:\n xmlchars \"^2.2.0\"\n \n-scheduler@0.26.0, scheduler@^0.26.0:\n- version \"0.26.0\"\n- resolved \"https://registry.yarnpkg.com/scheduler/-/scheduler-0.26.0.tgz#4ce8a8c2a2095f13ea11bf9a445be50c555d6337\"\n- integrity sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==\n-\n-scheduler@0.27.0:\n+scheduler@0.27.0, scheduler@^0.27.0:\n version \"0.27.0\"\n resolved \"https://registry.yarnpkg.com/scheduler/-/scheduler-0.27.0.tgz#0c4ef82d67d1e5c1e359e8fc76d3a87f045fe5bd\"\n integrity sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==\n@@ -7807,20 +7711,20 @@ semver-regex@^2.0.0:\n resolved \"https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338\"\n integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==\n \n-semver@7.7.2:\n- version \"7.7.2\"\n- resolved \"https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58\"\n- integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==\n+semver@7.7.3:\n+ version \"7.7.3\"\n+ resolved \"https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946\"\n+ integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==\n \n semver@^6.3.0, semver@^6.3.1:\n version \"6.3.1\"\n resolved \"https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4\"\n integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==\n \n-semver@^7.1.3, semver@^7.3.5, semver@^7.3.7, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0:\n- version \"7.7.3\"\n- resolved \"https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946\"\n- integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==\n+semver@^7.1.3, semver@^7.3.5, semver@^7.3.7, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.7.3:\n+ version \"7.7.4\"\n+ resolved \"https://registry.yarnpkg.com/semver/-/semver-7.7.4.tgz#28464e36060e991fa7a11d0279d2d3f3b57a7e8a\"\n+ integrity sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==\n \n send@^0.19.0, send@~0.19.1:\n version \"0.19.2\"\n@@ -8147,7 +8051,7 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:\n is-fullwidth-code-point \"^3.0.0\"\n strip-ansi \"^6.0.1\"\n \n-string.prototype.matchall@^4.0.7:\n+string.prototype.matchall@^4.0.12:\n version \"4.0.12\"\n resolved \"https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz#6c88740e49ad4956b1332a911e949583a275d4c0\"\n integrity sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==\n@@ -8166,6 +8070,14 @@ string.prototype.matchall@^4.0.7:\n set-function-name \"^2.0.2\"\n side-channel \"^1.1.0\"\n \n+string.prototype.repeat@^1.0.0:\n+ version \"1.0.0\"\n+ resolved \"https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz#e90872ee0308b29435aa26275f6e1b762daee01a\"\n+ integrity sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==\n+ dependencies:\n+ define-properties \"^1.1.3\"\n+ es-abstract \"^1.17.5\"\n+\n string.prototype.trim@^1.2.10:\n version \"1.2.10\"\n resolved \"https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz#40b2dd5ee94c959b4dcfb1d65ce72e90da480c81\"\n@@ -8198,6 +8110,15 @@ string.prototype.trimstart@^1.0.8:\n define-properties \"^1.2.1\"\n es-object-atoms \"^1.0.0\"\n \n+stringify-entities@^3.1.0:\n+ version \"3.1.0\"\n+ resolved \"https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-3.1.0.tgz#b8d3feac256d9ffcc9fa1fefdcf3ca70576ee903\"\n+ integrity sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg==\n+ dependencies:\n+ character-entities-html4 \"^1.0.0\"\n+ character-entities-legacy \"^1.0.0\"\n+ xtend \"^4.0.0\"\n+\n stringify-entities@^4.0.4:\n version \"4.0.4\"\n resolved \"https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-4.0.4.tgz#b3b79ef5f277cc4ac73caeb0236c5ba939b3a4f3\"\n@@ -8221,11 +8142,11 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:\n ansi-regex \"^5.0.1\"\n \n strip-ansi@^7.0.1:\n- version \"7.1.2\"\n- resolved \"https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba\"\n- integrity sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==\n+ version \"7.2.0\"\n+ resolved \"https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.2.0.tgz#d22a269522836a627af8d04b5c3fd2c7fa3e32e3\"\n+ integrity sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==\n dependencies:\n- ansi-regex \"^6.0.1\"\n+ ansi-regex \"^6.2.2\"\n \n strip-bom@^3.0.0:\n version \"3.0.0\"\n@@ -8254,29 +8175,11 @@ strip-json-comments@^3.1.1:\n resolved \"https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006\"\n integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==\n \n-strip-json-comments@~2.0.1:\n- version \"2.0.1\"\n- resolved \"https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a\"\n- integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==\n-\n structured-headers@^0.4.1:\n version \"0.4.1\"\n resolved \"https://registry.yarnpkg.com/structured-headers/-/structured-headers-0.4.1.tgz#77abd9410622c6926261c09b9d16cf10592694d1\"\n integrity sha512-0MP/Cxx5SzeeZ10p/bZI0S6MpgD+yxAhi1BOQ34jgnMXsCq3j1t6tQnZu+KdlL7dvJTLT3g9xN8tl10TqgFMcg==\n \n-sucrase@~3.35.1:\n- version \"3.35.1\"\n- resolved \"https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.1.tgz#4619ea50393fe8bd0ae5071c26abd9b2e346bfe1\"\n- integrity sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==\n- dependencies:\n- \"@jridgewell/gen-mapping\" \"^0.3.2\"\n- commander \"^4.0.0\"\n- lines-and-columns \"^1.1.6\"\n- mz \"^2.7.0\"\n- pirates \"^4.0.1\"\n- tinyglobby \"^0.2.11\"\n- ts-interface-checker \"^0.1.9\"\n-\n supports-color@^5.3.0:\n version \"5.5.0\"\n resolved \"https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f\"\n@@ -8324,27 +8227,16 @@ synckit@^0.8.4:\n \"@pkgr/core\" \"^0.1.0\"\n tslib \"^2.6.2\"\n \n-tapable@^2.2.0:\n+tagged-tag@^1.0.0:\n+ version \"1.0.0\"\n+ resolved \"https://registry.yarnpkg.com/tagged-tag/-/tagged-tag-1.0.0.tgz#a0b5917c2864cba54841495abfa3f6b13edcf4d6\"\n+ integrity sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==\n+\n+tapable@^2.3.0:\n version \"2.3.0\"\n resolved \"https://registry.yarnpkg.com/tapable/-/tapable-2.3.0.tgz#7e3ea6d5ca31ba8e078b560f0d83ce9a14aa8be6\"\n integrity sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==\n \n-tar@^7.5.2:\n- version \"7.5.2\"\n- resolved \"https://registry.yarnpkg.com/tar/-/tar-7.5.2.tgz#115c061495ec51ff3c6745ff8f6d0871c5b1dedc\"\n- integrity sha512-7NyxrTE4Anh8km8iEy7o0QYPs+0JKBTj5ZaqHg6B39erLg0qYXN3BijtShwbsNSvQ+LN75+KV+C4QR/f6Gwnpg==\n- dependencies:\n- \"@isaacs/fs-minipass\" \"^4.0.0\"\n- chownr \"^3.0.0\"\n- minipass \"^7.1.2\"\n- minizlib \"^3.1.0\"\n- yallist \"^5.0.0\"\n-\n-temp-dir@~2.0.0:\n- version \"2.0.0\"\n- resolved \"https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e\"\n- integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==\n-\n terminal-link@^2.1.1:\n version \"2.1.1\"\n resolved \"https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994\"\n@@ -8354,9 +8246,9 @@ terminal-link@^2.1.1:\n supports-hyperlinks \"^2.0.0\"\n \n terser@^5.15.0:\n- version \"5.44.1\"\n- resolved \"https://registry.yarnpkg.com/terser/-/terser-5.44.1.tgz#e391e92175c299b8c284ad6ded609e37303b0a9c\"\n- integrity sha512-t/R3R/n0MSwnnazuPpPNVO60LX0SKL45pyl9YlvxIdkH0Of7D5qM2EVe+yASRIlY5pZ73nclYJfNANGWPwFDZw==\n+ version \"5.46.0\"\n+ resolved \"https://registry.yarnpkg.com/terser/-/terser-5.46.0.tgz#1b81e560d584bbdd74a8ede87b4d9477b0ff9695\"\n+ integrity sha512-jTwoImyr/QbOWFFso3YoU3ik0jBBDJ6JTOQiy/J2YxVJdZCc+5u7skhNwiOR3FQIygFqVUPHl7qbbxtjW2K3Qg==\n dependencies:\n \"@jridgewell/source-map\" \"^0.3.3\"\n acorn \"^8.15.0\"\n@@ -8377,26 +8269,12 @@ text-table@^0.2.0:\n resolved \"https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4\"\n integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==\n \n-thenify-all@^1.0.0:\n- version \"1.6.0\"\n- resolved \"https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726\"\n- integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==\n- dependencies:\n- thenify \">= 3.1.0 < 4\"\n-\n-\"thenify@>= 3.1.0 < 4\":\n- version \"3.3.1\"\n- resolved \"https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f\"\n- integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==\n- dependencies:\n- any-promise \"^1.0.0\"\n-\n throat@^5.0.0:\n version \"5.0.0\"\n resolved \"https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b\"\n integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==\n \n-tinyglobby@^0.2.11, tinyglobby@^0.2.15:\n+tinyglobby@^0.2.15:\n version \"0.2.15\"\n resolved \"https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.15.tgz#e228dd1e638cea993d2fdb4fcd2d4602a79951c2\"\n integrity sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==\n@@ -8421,6 +8299,11 @@ toidentifier@~1.0.1:\n resolved \"https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35\"\n integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==\n \n+toqr@^0.1.1:\n+ version \"0.1.1\"\n+ resolved \"https://registry.yarnpkg.com/toqr/-/toqr-0.1.1.tgz#fb987ea706be36affc89336ca26543a16062725a\"\n+ integrity sha512-FWAPzCIHZHnrE/5/w9MPk0kK25hSQSH2IKhYh9PyjS3SG/+IEMvlwIHbhz+oF7xl54I+ueZlVnMjyzdSwLmAwA==\n+\n tough-cookie@^4.1.2:\n version \"4.1.4\"\n resolved \"https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36\"\n@@ -8443,27 +8326,27 @@ tr46@~0.0.3:\n resolved \"https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a\"\n integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==\n \n-ts-api-utils@^2.1.0:\n- version \"2.1.0\"\n- resolved \"https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.1.0.tgz#595f7094e46eed364c13fd23e75f9513d29baf91\"\n- integrity sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==\n-\n-ts-interface-checker@^0.1.9:\n- version \"0.1.13\"\n- resolved \"https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699\"\n- integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==\n+ts-api-utils@^2.4.0:\n+ version \"2.4.0\"\n+ resolved \"https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.4.0.tgz#2690579f96d2790253bdcf1ca35d569ad78f9ad8\"\n+ integrity sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==\n \n ts-toolbelt@^4.12.0:\n version \"4.14.6\"\n resolved \"https://registry.yarnpkg.com/ts-toolbelt/-/ts-toolbelt-4.14.6.tgz#9a232f62276caeee4fa9e81e0c4bffa047de0765\"\n integrity sha512-SONcnRd93+LuYGfn/CZg5A5qhCODohZslAVZKHHu5bnwUxoXLqd2k2VIdwRUXYfKnY+UCeNbI2pTPz+Dno6Mpg==\n \n+ts-toolbelt@^6.15.1:\n+ version \"6.15.5\"\n+ resolved \"https://registry.yarnpkg.com/ts-toolbelt/-/ts-toolbelt-6.15.5.tgz#cb3b43ed725cb63644782c64fbcad7d8f28c0a83\"\n+ integrity sha512-FZIXf1ksVyLcfr7M317jbB67XFJhOO1YqdTcuGaq9q5jLUoTikukZ+98TPjKiP2jC5CgmYdWWYs0s2nLSU0/1A==\n+\n ts-toolbelt@^9.6.0:\n version \"9.6.0\"\n resolved \"https://registry.yarnpkg.com/ts-toolbelt/-/ts-toolbelt-9.6.0.tgz#50a25426cfed500d4a09bd1b3afb6f28879edfd5\"\n integrity sha512-nsZd8ZeNUzukXPlJmTBwUAuABDe/9qtVDelJeT/qW0ow3ZS3BsQJtNkan1802aM9Uf68/Y8ljw86Hu0h5IUW3w==\n \n-tsconfig-paths@^3.14.1:\n+tsconfig-paths@^3.15.0:\n version \"3.15.0\"\n resolved \"https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4\"\n integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==\n@@ -8517,6 +8400,13 @@ type-fest@^0.7.1:\n resolved \"https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48\"\n integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==\n \n+type-fest@^5.4.4:\n+ version \"5.4.4\"\n+ resolved \"https://registry.yarnpkg.com/type-fest/-/type-fest-5.4.4.tgz#577f165b5ecb44cfc686559cc54ca77f62aa374d\"\n+ integrity sha512-JnTrzGu+zPV3aXIUhnyWJj4z/wigMsdYajGLIYakqyOW1nPllzXEJee0QQbHj+CTIQtXGlAjuK0UY+2xTyjVAw==\n+ dependencies:\n+ tagged-tag \"^1.0.0\"\n+\n typed-array-buffer@^1.0.3:\n version \"1.0.3\"\n resolved \"https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536\"\n@@ -8594,15 +8484,10 @@ unbox-primitive@^1.1.0:\n has-symbols \"^1.1.0\"\n which-boxed-primitive \"^1.1.1\"\n \n-undici-types@~7.16.0:\n- version \"7.16.0\"\n- resolved \"https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46\"\n- integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==\n-\n-undici@^6.18.2:\n- version \"6.22.0\"\n- resolved \"https://registry.yarnpkg.com/undici/-/undici-6.22.0.tgz#281adbc157af41da8e75393c9d75a1b788811bc3\"\n- integrity sha512-hU/10obOIu62MGYjdskASR3CUAiYaFTtC9Pa6vHyf//mAipSvSQg6od2CnJswq7fvzNS3zJhxoRkgNVaHurWKw==\n+undici-types@~7.18.0:\n+ version \"7.18.2\"\n+ resolved \"https://registry.yarnpkg.com/undici-types/-/undici-types-7.18.2.tgz#29357a89e7b7ca4aef3bf0fd3fd0cd73884229e9\"\n+ integrity sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==\n \n unicode-canonical-property-names-ecmascript@^2.0.0:\n version \"2.0.1\"\n@@ -8627,13 +8512,6 @@ unicode-property-aliases-ecmascript@^2.0.0:\n resolved \"https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.2.0.tgz#301d4f8a43d2b75c97adfad87c9dd5350c9475d1\"\n integrity sha512-hpbDzxUY9BFwX+UeBnxv3Sh1q7HFxj48DTmXchNgRa46lO8uj3/1iEn3MiNUYTg1g9ctIqXCCERn8gYZhHC5lQ==\n \n-unique-string@~2.0.0:\n- version \"2.0.0\"\n- resolved \"https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d\"\n- integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==\n- dependencies:\n- crypto-random-string \"^2.0.0\"\n-\n universal-test-renderer@0.6.0:\n version \"0.6.0\"\n resolved \"https://registry.yarnpkg.com/universal-test-renderer/-/universal-test-renderer-0.6.0.tgz#72473a68ca7c21af316ba25d8b10eaa622ff8d60\"\n@@ -8666,7 +8544,7 @@ uri-js@^4.2.2:\n dependencies:\n punycode \"^2.1.0\"\n \n-urijs@^1.19.11:\n+urijs@^1.19.11, urijs@^1.19.6:\n version \"1.19.11\"\n resolved \"https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc\"\n integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==\n@@ -8689,17 +8567,6 @@ use-sync-external-store@^1.0.0, use-sync-external-store@^1.5.0:\n resolved \"https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz#b174bfa65cb2b526732d9f2ac0a408027876f32d\"\n integrity sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==\n \n-util@^0.12.5:\n- version \"0.12.5\"\n- resolved \"https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc\"\n- integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==\n- dependencies:\n- inherits \"^2.0.3\"\n- is-arguments \"^1.0.4\"\n- is-generator-function \"^1.0.7\"\n- is-typed-array \"^1.1.3\"\n- which-typed-array \"^1.1.2\"\n-\n utils-merge@1.0.1:\n version \"1.0.1\"\n resolved \"https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713\"\n@@ -8770,11 +8637,6 @@ webidl-conversions@^3.0.0:\n resolved \"https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871\"\n integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==\n \n-webidl-conversions@^5.0.0:\n- version \"5.0.0\"\n- resolved \"https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff\"\n- integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==\n-\n webidl-conversions@^7.0.0:\n version \"7.0.0\"\n resolved \"https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a\"\n@@ -8797,14 +8659,10 @@ whatwg-mimetype@^3.0.0:\n resolved \"https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7\"\n integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==\n \n-whatwg-url-without-unicode@8.0.0-3:\n- version \"8.0.0-3\"\n- resolved \"https://registry.yarnpkg.com/whatwg-url-without-unicode/-/whatwg-url-without-unicode-8.0.0-3.tgz#ab6df4bf6caaa6c85a59f6e82c026151d4bb376b\"\n- integrity sha512-HoKuzZrUlgpz35YO27XgD28uh/WJH4B0+3ttFqRo//lmq+9T/mIOJ6kqmINI9HpUpz1imRC/nR/lxKpJiv0uig==\n- dependencies:\n- buffer \"^5.4.3\"\n- punycode \"^2.1.1\"\n- webidl-conversions \"^5.0.0\"\n+whatwg-url-minimum@^0.1.1:\n+ version \"0.1.1\"\n+ resolved \"https://registry.yarnpkg.com/whatwg-url-minimum/-/whatwg-url-minimum-0.1.1.tgz#df90eba931c3624c6a74dd9b7d39634390f2b67f\"\n+ integrity sha512-u2FNVjFVFZhdjb502KzXy1gKn1mEisQRJssmSJT8CPhZdZa0AP6VCbWlXERKyGu0l09t0k50FiDiralpGhBxgA==\n \n whatwg-url@^11.0.0:\n version \"11.0.0\"\n@@ -8867,10 +8725,10 @@ which-pm-runs@^1.0.0:\n resolved \"https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.1.0.tgz#35ccf7b1a0fce87bd8b92a478c9d045785d3bf35\"\n integrity sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==\n \n-which-typed-array@^1.1.16, which-typed-array@^1.1.19, which-typed-array@^1.1.2:\n- version \"1.1.19\"\n- resolved \"https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz#df03842e870b6b88e117524a4b364b6fc689f956\"\n- integrity sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==\n+which-typed-array@^1.1.16, which-typed-array@^1.1.19:\n+ version \"1.1.20\"\n+ resolved \"https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.20.tgz#3fdb7adfafe0ea69157b1509f3a1cd892bd1d122\"\n+ integrity sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==\n dependencies:\n available-typed-arrays \"^1.0.7\"\n call-bind \"^1.0.8\"\n@@ -8887,11 +8745,6 @@ which@^2.0.1, which@^2.0.2:\n dependencies:\n isexe \"^2.0.0\"\n \n-wonka@^6.3.2:\n- version \"6.3.5\"\n- resolved \"https://registry.yarnpkg.com/wonka/-/wonka-6.3.5.tgz#33fa54ea700ff3e87b56fe32202112a9e8fea1a2\"\n- integrity sha512-SSil+ecw6B4/Dm7Pf2sAshKQ5hWFvfyGlfPbEd6A14dOH6VDjrmbY86u6nZvy9omGwwIPFR8V41+of1EezgoUw==\n-\n word-wrap@^1.2.5:\n version \"1.2.5\"\n resolved \"https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34\"\n@@ -8919,22 +8772,15 @@ write-file-atomic@^4.0.2:\n imurmurhash \"^0.1.4\"\n signal-exit \"^3.0.7\"\n \n-ws@^6.2.3:\n- version \"6.2.3\"\n- resolved \"https://registry.yarnpkg.com/ws/-/ws-6.2.3.tgz#ccc96e4add5fd6fedbc491903075c85c5a11d9ee\"\n- integrity sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==\n- dependencies:\n- async-limiter \"~1.0.0\"\n-\n ws@^7, ws@^7.5.10:\n version \"7.5.10\"\n resolved \"https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9\"\n integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==\n \n ws@^8.11.0, ws@^8.12.1:\n- version \"8.18.3\"\n- resolved \"https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472\"\n- integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==\n+ version \"8.19.0\"\n+ resolved \"https://registry.yarnpkg.com/ws/-/ws-8.19.0.tgz#ddc2bdfa5b9ad860204f5a72a4863a8895fd8c8b\"\n+ integrity sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==\n \n xcode@^3.0.1:\n version \"3.0.1\"\n@@ -8972,6 +8818,11 @@ xmlchars@^2.2.0:\n resolved \"https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb\"\n integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==\n \n+xtend@^4.0.0:\n+ version \"4.0.2\"\n+ resolved \"https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54\"\n+ integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==\n+\n y18n@^5.0.5:\n version \"5.0.8\"\n resolved \"https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55\"\n@@ -8982,11 +8833,6 @@ yallist@^3.0.2:\n resolved \"https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd\"\n integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==\n \n-yallist@^5.0.0:\n- version \"5.0.0\"\n- resolved \"https://registry.yarnpkg.com/yallist/-/yallist-5.0.0.tgz#00e2de443639ed0d78fd87de0d27469fbcffb533\"\n- integrity sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==\n-\n yaml@^1.7.2:\n version \"1.10.2\"\n resolved \"https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b\"\n@@ -9019,3 +8865,16 @@ yocto-queue@^0.1.0:\n version \"0.1.0\"\n resolved \"https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b\"\n integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==\n+\n+zod@^3.25.76:\n+ version \"3.25.76\"\n+ resolved \"https://registry.yarnpkg.com/zod/-/zod-3.25.76.tgz#26841c3f6fd22a6a2760e7ccb719179768471e34\"\n+ integrity sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==\n+\n+zxing-wasm@3.0.0:\n+ version \"3.0.0\"\n+ resolved \"https://registry.yarnpkg.com/zxing-wasm/-/zxing-wasm-3.0.0.tgz#184feade580ef7763cac4f1231eae1aa6fe28a39\"\n+ integrity sha512-s7ASCPKX+QnH7Y83f4Byxmq/vDzYW7B9m6jMP5S30JGfN2A6WAUn6P3vcBmNguDhPLE6ny2fjTooQVyKBXI1qA==\n+ dependencies:\n+ \"@types/emscripten\" \"^1.41.5\"\n+ type-fest \"^5.4.4\"\n", "test_patch": "diff --git a/app/components/NoEmission/__tests__/__snapshots__/NoEmissions.test.tsx.snap b/app/components/NoEmission/__tests__/__snapshots__/NoEmissions.test.tsx.snap\nindex d472c46a..298220ba 100644\n--- a/app/components/NoEmission/__tests__/__snapshots__/NoEmissions.test.tsx.snap\n+++ b/app/components/NoEmission/__tests__/__snapshots__/NoEmissions.test.tsx.snap\n@@ -2,6 +2,11 @@\n \n exports[`renders correctly NoEmission 1`] = `\n \r\n\r\n\u2705 I have read the [contributing file](https://github.com/NMF-earth/nmf-app/blob/main/contributing.md)\r\n\r\n## Summary\r\n\r\nFixes #406 \r\n\r\n## Changelog\r\n\r\n- Updates styles for the switch\r\n\r\n## Demo\r\n\r\n\"image\"\r\n\r\n", "base": {"label": "NMF-earth:main", "ref": "main", "sha": "d495e2bdf83b6c168e6f39c2d6a672e3dfcc02ee"}, "resolved_issues": [{"number": 406, "title": "Bug: aligment issue switch", "body": "**Describe the bug**\n\nFix alignment issue, see screenshot below. It should be center vertically and the trailing edge of the switch should have same margin as the chevron.\n\n\"Image\""}], "lang": "typescript", "problem_statement": "Bug: aligment issue switch\n**Describe the bug**\n\nFix alignment issue, see screenshot below. It should be center vertically and the trailing edge of the switch should have same margin as the chevron.\n\n\"Image\"\n", "pull_url": "https://github.com/NMF-earth/nmf-app/pull/412", "issue_urls": ["https://github.com/NMF-earth/nmf-app/issues/406"], "test_command": "NODE_OPTIONS='--experimental-vm-modules --max-old-space-size=4096' npx --no-install jest app/components/ListItemSwitch/__tests__/ListItemSwitch.test.tsx --passWithNoTests 2>&1", "fix_patch": "diff --git a/app/components/ListItemSwitch/ListItemSwitch.styles.ts b/app/components/ListItemSwitch/ListItemSwitch.styles.ts\nindex b412184b..f237406d 100644\n--- a/app/components/ListItemSwitch/ListItemSwitch.styles.ts\n+++ b/app/components/ListItemSwitch/ListItemSwitch.styles.ts\n@@ -12,6 +12,9 @@ export default StyleSheet.create({\n text: {\n paddingVertical: 18,\n },\n+ switch: {\n+ alignSelf: \"center\",\n+ },\n topLine: {\n borderTopColor: Colors.grey10,\n borderTopWidth: 1.6,\ndiff --git a/app/components/ListItemSwitch/ListItemSwitch.tsx b/app/components/ListItemSwitch/ListItemSwitch.tsx\nindex d32c8e6c..17ce4893 100644\n--- a/app/components/ListItemSwitch/ListItemSwitch.tsx\n+++ b/app/components/ListItemSwitch/ListItemSwitch.tsx\n@@ -32,7 +32,7 @@ const ListItemSwitch: React.FC = ({\n return (\n \n {title}\n- \n+ \n \n );\n };\n", "test_patch": "diff --git a/app/components/ListItemSwitch/__tests__/__snapshots__/ListItemSwitch.test.tsx.snap b/app/components/ListItemSwitch/__tests__/__snapshots__/ListItemSwitch.test.tsx.snap\nindex b1e08408..031fcd86 100644\n--- a/app/components/ListItemSwitch/__tests__/__snapshots__/ListItemSwitch.test.tsx.snap\n+++ b/app/components/ListItemSwitch/__tests__/__snapshots__/ListItemSwitch.test.tsx.snap\n@@ -34,6 +34,11 @@ exports[` ListItem renders correctly with both topLine and bot\n \n \n \n@@ -69,6 +74,11 @@ exports[` ListItem renders correctly with bottomLine 1`] = `\n \n \n \n@@ -104,6 +114,11 @@ exports[` ListItem renders correctly with topLine 1`] = `\n \n \n \n@@ -135,6 +150,11 @@ exports[` render 1`] = `\n \n \n \n", "n2p_tests": {}, "f2p_tests": {"render": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/components/ListItemSwitch/__tests__/ListItemSwitch.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "ListItem renders correctly with topLine": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "ListItem renders correctly with bottomLine": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "ListItem renders correctly with both topLine and bottomLine": {"run": "PASS", "test": "FAIL", "fix": "PASS"}}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "NMF-earth__nmf-app-403", "org": "NMF-earth", "repo": "nmf-app", "number": 403, "state": "closed", "title": "Remove all usages of suppressHighlighting and make Ionicons have opacity on touch", "body": "\r\n\r\n\u2705 I have read the [contributing file](https://github.com/NMF-earth/nmf-app/blob/main/contributing.md)\r\n\r\n## Summary\r\n\r\nResolves #392 \r\n\r\n## Changelog\r\n\r\n- Most of the usages of Ionicons dont need any suppressHighlighting as they are not touchable\r\n- Accordion as the whole top header is Touchable it makes sense to have touch effect on it as whole not just the Ionicons\r\n- Updated other Ionicons which are actually Touchable to wrap inside TouchableOpacity\r\n\r\n## Demo\r\nCover common icon cases.\r\nhttps://github.com/user-attachments/assets/0a52e64b-e99a-45cd-adc1-134ac5a5eed7", "base": {"label": "NMF-earth:main", "ref": "main", "sha": "8752a29cc7b46df11d6c4dbc3b24fceb0d3f962a"}, "resolved_issues": [{"number": 392, "title": "Ionicons buttons opacity", "body": "#### Summary\r\nFind alternative to `suppressHighlighting={true}` for `Ionicons`, see this [commit](https://github.com/NMF-earth/nmf-app/commit/2e8b6f224993e29cbb0c4af1112b5155caa5d4ff). The icon opacity should change like back button instead\r\n"}], "lang": "typescript", "problem_statement": "Ionicons buttons opacity\n#### Summary\r\nFind alternative to `suppressHighlighting={true}` for `Ionicons`, see this [commit](https://github.com/NMF-earth/nmf-app/commit/2e8b6f224993e29cbb0c4af1112b5155caa5d4ff). The icon opacity should change like back button instead\r\n\n", "pull_url": "https://github.com/NMF-earth/nmf-app/pull/403", "issue_urls": ["https://github.com/NMF-earth/nmf-app/issues/392"], "test_command": "NODE_OPTIONS='--experimental-vm-modules --max-old-space-size=4096' npx --no-install jest app/components/Accordion/__tests__/Accordion.test.tsx app/components/Button/__tests__/Button.test.tsx app/components/EmissionListItem/__tests__/EmissionListItem.test.tsx app/components/InfoButton/__tests__/InfoButton.test.tsx app/components/ListItem/__tests__/ListItem.test.tsx app/components/SelectableListItem/__tests__/SelectableListItem.test.tsx app/components/TabBarIcon/__tests__/TabBarIcon.test.tsx app/components/Tag/__tests__/Tag.test.tsx app/components/TextButton/__tests__/TextButton.test.tsx app/screens/Emissions/components/SectionHeader/__tests__/SectionHeader.test.tsx app/screens/Faq/__tests__/FaqScreen.test.tsx app/screens/Languages/__tests__/LanguagesScreen.test.tsx app/screens/MonthlyBudget/__tests__/MonthlyBudgetScreen.test.tsx --passWithNoTests 2>&1", "fix_patch": "diff --git a/app/components/Accordion/Accordion.tsx b/app/components/Accordion/Accordion.tsx\nindex 6a3941e7..97732ec5 100644\n--- a/app/components/Accordion/Accordion.tsx\n+++ b/app/components/Accordion/Accordion.tsx\n@@ -1,5 +1,5 @@\n import React, { FC, ReactNode, Children, cloneElement, useState, ReactElement } from \"react\";\n-import { Pressable, View } from \"react-native\";\n+import { TouchableOpacity, View } from \"react-native\";\n import { Ionicons } from \"@expo/vector-icons\";\n \n import Text from \"../Text\";\n@@ -19,11 +19,11 @@ interface AccordionProps {\n \n const Item: FC = ({ title, children, isFirst, isOpen, onTitlePress }) => (\n \n- \n- \n+ \n+ \n \n {title}\n- \n+ \n \n {isOpen ? (\n \ndiff --git a/app/components/Button/Button.tsx b/app/components/Button/Button.tsx\nindex 855e06f5..7f7edaf4 100644\n--- a/app/components/Button/Button.tsx\n+++ b/app/components/Button/Button.tsx\n@@ -36,7 +36,6 @@ const buttonFactory: ButtonFactory = (type) => (props) => {\n if (icon) {\n iconItem = (\n {\n title: string;\n@@ -45,7 +45,6 @@ const EmissionListItem: React.FC = ({\n \n \n = ({\n \n \n {\n useSelector((state) => emissions.selectors.getEmissionById(state, emissionId)) || {};\n \n return (\n- navigator.openInfoModal({ emissionModelType })}\n- />\n+ navigator.openInfoModal({ emissionModelType })}>\n+ \n+ \n );\n };\n \ndiff --git a/app/components/ListItem/ListItem.tsx b/app/components/ListItem/ListItem.tsx\nindex 6b5290e3..7068f83f 100644\n--- a/app/components/ListItem/ListItem.tsx\n+++ b/app/components/ListItem/ListItem.tsx\n@@ -28,7 +28,7 @@ const ListItem: React.FC = ({ title, onPress, showTopLine, showBottomLine\n return (\n \n {title}\n- \n+ \n \n );\n };\ndiff --git a/app/components/SelectableListItem/SelectableListItem.tsx b/app/components/SelectableListItem/SelectableListItem.tsx\nindex 36143ca6..71832efe 100644\n--- a/app/components/SelectableListItem/SelectableListItem.tsx\n+++ b/app/components/SelectableListItem/SelectableListItem.tsx\n@@ -20,7 +20,7 @@ const SelectableListItem: React.FC = ({ selected, title, onPress }) => {\n {title}\n \n {selected && (\n- \n+ \n )}\n \n );\ndiff --git a/app/components/TabBarIcon/TabBarIcon.tsx b/app/components/TabBarIcon/TabBarIcon.tsx\nindex c6d1c0af..8da5a732 100644\n--- a/app/components/TabBarIcon/TabBarIcon.tsx\n+++ b/app/components/TabBarIcon/TabBarIcon.tsx\n@@ -11,7 +11,6 @@ interface Props {\n export default function TabBarIcon(props: Props): ReactElement {\n return (\n = ({ text, onPress, icon }) => {\n if (icon) {\n iconItem = (\n = ({ text, onPress, icon }) => {\n \n {text}\n \n- \n+ \n \n );\n };\ndiff --git a/app/components/TextButton/TextButton.tsx b/app/components/TextButton/TextButton.tsx\nindex d6d0d160..3413a2cd 100644\n--- a/app/components/TextButton/TextButton.tsx\n+++ b/app/components/TextButton/TextButton.tsx\n@@ -19,7 +19,7 @@ const TextButton: React.FC = ({ onPress, iconLeft, text }) => {\n return (\n \n \n- \n+ \n \n \n \n@@ -27,7 +27,7 @@ const TextButton: React.FC = ({ onPress, iconLeft, text }) => {\n \n \n \n- \n+ \n \n \n );\ndiff --git a/app/components/TextInput/TextInput.tsx b/app/components/TextInput/TextInput.tsx\nindex 3997a0f9..4f451da5 100644\n--- a/app/components/TextInput/TextInput.tsx\n+++ b/app/components/TextInput/TextInput.tsx\n@@ -25,7 +25,7 @@ const TextInput: React.FC = ({ isOptional, onChangeText, value, placehold\n style={styles.containerOptionalTitle}\n >\n {isOptional && (\n- \n+ \n )}\n {title}\n \ndiff --git a/app/screens/ComingSoon/ComingSoonScreen.navigationOptions.tsx b/app/screens/ComingSoon/ComingSoonScreen.navigationOptions.tsx\nindex 7541baba..637ffd44 100644\n--- a/app/screens/ComingSoon/ComingSoonScreen.navigationOptions.tsx\n+++ b/app/screens/ComingSoon/ComingSoonScreen.navigationOptions.tsx\n@@ -1,5 +1,5 @@\n import React from \"react\";\n-import { View } from \"react-native\";\n+import { TouchableOpacity } from \"react-native\";\n import { Ionicons } from \"@expo/vector-icons\";\n import { StackNavigationOptions } from \"@react-navigation/stack\";\n \n@@ -27,17 +27,14 @@ const navigationOptionsIOS = ({ navigation }): StackNavigationOptions => ({\n headerTitle: () => null,\n headerLeft: () => null,\n headerRight: () => (\n- \n- {\n- navigate(navigation).goBack();\n- }}\n- />\n- \n+ {\n+ navigate(navigation).goBack();\n+ }}\n+ >\n+ \n+ \n ),\n });\n \ndiff --git a/app/screens/Emissions/components/SectionHeader/SectionHeader.tsx b/app/screens/Emissions/components/SectionHeader/SectionHeader.tsx\nindex 233f42cb..182b15d8 100644\n--- a/app/screens/Emissions/components/SectionHeader/SectionHeader.tsx\n+++ b/app/screens/Emissions/components/SectionHeader/SectionHeader.tsx\n@@ -53,7 +53,6 @@ const SectionHeader: React.FC = ({\n {headerText}\n \n \n ),\n headerLeft: () => null,\n headerRight: () => (\n- \n- {\n- navigate(navigation).goBack();\n- }}\n- />\n- \n+ {\n+ navigate(navigation).goBack();\n+ }}\n+ >\n+ \n+ \n ),\n });\n \ndiff --git a/app/screens/MonthlyBudget/MonthlyBudgetScreen.tsx b/app/screens/MonthlyBudget/MonthlyBudgetScreen.tsx\nindex 42fd1706..32a3eddf 100644\n--- a/app/screens/MonthlyBudget/MonthlyBudgetScreen.tsx\n+++ b/app/screens/MonthlyBudget/MonthlyBudgetScreen.tsx\n@@ -1,5 +1,5 @@\n import React, { useState } from \"react\";\n-import { View, ScrollView } from \"react-native\";\n+import { View, ScrollView, TouchableOpacity } from \"react-native\";\n import { useNavigation } from \"@react-navigation/native\";\n import Slider from \"@react-native-community/slider\";\n import { Ionicons } from \"@expo/vector-icons\";\n@@ -98,13 +98,13 @@ const MonthlyBudgetScreen: NavStatelessComponent = () => {\n \n \n {t(\"MONTHLY_BUDGET_SCREEN_CARBON_EMISSIONS_WORLD\")}\n- \n+ \n+ \n+ \n \n \n {translationMonthlyBudgetCountries.map((countryArr, idx) =>\n@@ -115,14 +115,13 @@ const MonthlyBudgetScreen: NavStatelessComponent = () => {\n {t(\"MONTHLY_BUDGET_SCREEN_PARIS_AGREEMENT\")}{\" \"}\n {Math.round(getDisplayUnitsValue(167, useMetricUnits))}{\" \"}\n {getDisplayUnits(167, useMetricUnits) + \"CO2eq\"}\n- \n+ \n+ \n+ \n \n \n \ndiff --git a/app/screens/Periodicity/PeriodicityModal.navigationOptions.tsx b/app/screens/Periodicity/PeriodicityModal.navigationOptions.tsx\nindex f946a011..5d00c77a 100644\n--- a/app/screens/Periodicity/PeriodicityModal.navigationOptions.tsx\n+++ b/app/screens/Periodicity/PeriodicityModal.navigationOptions.tsx\n@@ -1,5 +1,5 @@\n import React from \"react\";\n-import { View } from \"react-native\";\n+import { TouchableOpacity } from \"react-native\";\n import { Ionicons } from \"@expo/vector-icons\";\n import { StackNavigationOptions } from \"@react-navigation/stack\";\n \n@@ -28,15 +28,9 @@ const navigationOptionsIOS = ({ navigation }): StackNavigationOptions => ({\n headerTitle: () => {t(\"PERIODICITY_MODAL_SCREEN_TITLE\")},\n headerLeft: () => null,\n headerRight: () => (\n- \n- navigate(navigation).goBack()}\n- />\n- \n+ navigate(navigation).goBack()}>\n+ \n+ \n ),\n });\n \n", "test_patch": "diff --git a/app/components/Accordion/__tests__/__snapshots__/Accordion.test.tsx.snap b/app/components/Accordion/__tests__/__snapshots__/Accordion.test.tsx.snap\nindex a62741a1..0b4c3b59 100644\n--- a/app/components/Accordion/__tests__/__snapshots__/Accordion.test.tsx.snap\n+++ b/app/components/Accordion/__tests__/__snapshots__/Accordion.test.tsx.snap\n@@ -24,36 +24,8 @@ exports[`Accordion renders correctly 1`] = `\n ]\n }\n >\n- \n \n Test title 1\n \n- \n+ \n \n \n- \n \n Test title 2\n \n- \n+ \n \n \n `;\ndiff --git a/app/components/Button/__tests__/__snapshots__/Button.test.tsx.snap b/app/components/Button/__tests__/__snapshots__/Button.test.tsx.snap\nindex 9aa34591..9e50f6fd 100644\n--- a/app/components/Button/__tests__/__snapshots__/Button.test.tsx.snap\n+++ b/app/components/Button/__tests__/__snapshots__/Button.test.tsx.snap\n@@ -194,7 +194,6 @@ exports[`renders correctly fullwidth Danger Button with icon 1`] = `\n \"marginHorizontal\": 10,\n }\n }\n- suppressHighlighting={true}\n />\n \n `;\n@@ -288,7 +287,6 @@ exports[`renders correctly fullwidth Primary Button with icon 1`] = `\n \"marginHorizontal\": 10,\n }\n }\n- suppressHighlighting={true}\n />\n \n `;\n@@ -382,7 +380,6 @@ exports[`renders correctly fullwidth Secondary Button with icon 1`] = `\n \"marginHorizontal\": 10,\n }\n }\n- suppressHighlighting={true}\n />\n \n `;\ndiff --git a/app/components/EmissionListItem/__tests__/__snapshots__/EmissionListItem.test.tsx.snap b/app/components/EmissionListItem/__tests__/__snapshots__/EmissionListItem.test.tsx.snap\nindex f2d7fe97..76f00f78 100644\n--- a/app/components/EmissionListItem/__tests__/__snapshots__/EmissionListItem.test.tsx.snap\n+++ b/app/components/EmissionListItem/__tests__/__snapshots__/EmissionListItem.test.tsx.snap\n@@ -47,7 +47,6 @@ exports[`EmissionListItem renders correctly if mitigated 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -156,7 +154,6 @@ exports[`EmissionListItem renders correctly with audio icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -255,7 +251,6 @@ exports[`EmissionListItem renders correctly with boat icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -354,7 +348,6 @@ exports[`EmissionListItem renders correctly with bus icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -453,7 +445,6 @@ exports[`EmissionListItem renders correctly with car icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -552,7 +542,6 @@ exports[`EmissionListItem renders correctly with card icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -651,7 +639,6 @@ exports[`EmissionListItem renders correctly with chocolate icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -750,7 +736,6 @@ exports[`EmissionListItem renders correctly with coffee icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -849,7 +833,6 @@ exports[`EmissionListItem renders correctly with electricity icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -948,7 +930,6 @@ exports[`EmissionListItem renders correctly with fish icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -1047,7 +1027,6 @@ exports[`EmissionListItem renders correctly with full hd video icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -1146,7 +1124,6 @@ exports[`EmissionListItem renders correctly with hd video icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -1245,7 +1221,6 @@ exports[`EmissionListItem renders correctly with longHaulFlight icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -1344,7 +1318,6 @@ exports[`EmissionListItem renders correctly with meal icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -1443,7 +1415,6 @@ exports[`EmissionListItem renders correctly with mediumHaulFlight icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -1542,7 +1512,6 @@ exports[`EmissionListItem renders correctly with motorbike icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -1641,7 +1609,6 @@ exports[`EmissionListItem renders correctly with redMeat icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -1740,7 +1706,6 @@ exports[`EmissionListItem renders correctly with shirt icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -1839,7 +1803,6 @@ exports[`EmissionListItem renders correctly with shortHaulFlight icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -1938,7 +1900,6 @@ exports[`EmissionListItem renders correctly with train icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -2037,7 +1997,6 @@ exports[`EmissionListItem renders correctly with ultra hd video icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -2136,7 +2094,6 @@ exports[`EmissionListItem renders correctly with whiteMeat icon 1`] = `\n \"marginHorizontal\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n \n \ndiff --git a/app/components/InfoButton/__tests__/__snapshots__/InfoButton.test.tsx.snap b/app/components/InfoButton/__tests__/__snapshots__/InfoButton.test.tsx.snap\nindex 8369f9b9..b64be5db 100644\n--- a/app/components/InfoButton/__tests__/__snapshots__/InfoButton.test.tsx.snap\n+++ b/app/components/InfoButton/__tests__/__snapshots__/InfoButton.test.tsx.snap\n@@ -1,16 +1,18 @@\n // Jest Snapshot v1, https://goo.gl/fbAQLP\n \n exports[`renders correctly 1`] = `\n-\n+ \n+ />\n+\n `;\ndiff --git a/app/components/ListItem/__tests__/__snapshots__/ListItem.test.tsx.snap b/app/components/ListItem/__tests__/__snapshots__/ListItem.test.tsx.snap\nindex f37ff2f3..ae495d66 100644\n--- a/app/components/ListItem/__tests__/__snapshots__/ListItem.test.tsx.snap\n+++ b/app/components/ListItem/__tests__/__snapshots__/ListItem.test.tsx.snap\n@@ -32,7 +32,6 @@ exports[` ListItem renders correctly both topLine and bottomLine 1`]\n color=\"#878787\"\n name=\"chevron-forward-outline\"\n size={14}\n- suppressHighlighting={true}\n />\n \n `;\n@@ -65,7 +64,6 @@ exports[` ListItem renders correctly wtesth bottomLine 1`] = `\n color=\"#878787\"\n name=\"chevron-forward-outline\"\n size={14}\n- suppressHighlighting={true}\n />\n \n `;\n@@ -98,7 +96,6 @@ exports[` ListItem renders correctly wtesth topLine 1`] = `\n color=\"#878787\"\n name=\"chevron-forward-outline\"\n size={14}\n- suppressHighlighting={true}\n />\n \n `;\n@@ -127,7 +124,6 @@ exports[` render 1`] = `\n color=\"#878787\"\n name=\"chevron-forward-outline\"\n size={14}\n- suppressHighlighting={true}\n />\n \n `;\ndiff --git a/app/components/SelectableListItem/__tests__/__snapshots__/SelectableListItem.test.tsx.snap b/app/components/SelectableListItem/__tests__/__snapshots__/SelectableListItem.test.tsx.snap\nindex 5a7fcb98..2e5ea749 100644\n--- a/app/components/SelectableListItem/__tests__/__snapshots__/SelectableListItem.test.tsx.snap\n+++ b/app/components/SelectableListItem/__tests__/__snapshots__/SelectableListItem.test.tsx.snap\n@@ -31,7 +31,6 @@ exports[` render 1`] = `\n \"marginTop\": 18,\n }\n }\n- suppressHighlighting={true}\n />\n \n `;\n@@ -67,7 +66,6 @@ exports[` render if not selected 1`] = `\n \"marginTop\": 18,\n }\n }\n- suppressHighlighting={true}\n />\n \n `;\ndiff --git a/app/components/TabBarIcon/__tests__/__snapshots__/TabBarIcon.test.tsx.snap b/app/components/TabBarIcon/__tests__/__snapshots__/TabBarIcon.test.tsx.snap\nindex b4dd3685..85a19765 100644\n--- a/app/components/TabBarIcon/__tests__/__snapshots__/TabBarIcon.test.tsx.snap\n+++ b/app/components/TabBarIcon/__tests__/__snapshots__/TabBarIcon.test.tsx.snap\n@@ -5,6 +5,5 @@ exports[`renders correctly 1`] = `\n color=\"#878787\"\n name=\"ios-information-circle\"\n size={26}\n- suppressHighlighting={true}\n />\n `;\ndiff --git a/app/components/Tag/__tests__/__snapshots__/Tag.test.tsx.snap b/app/components/Tag/__tests__/__snapshots__/Tag.test.tsx.snap\nindex cf8f7590..b46ede54 100644\n--- a/app/components/Tag/__tests__/__snapshots__/Tag.test.tsx.snap\n+++ b/app/components/Tag/__tests__/__snapshots__/Tag.test.tsx.snap\n@@ -28,7 +28,6 @@ exports[`Tag renders correctly with airplane icon 1`] = `\n \"marginRight\": 16,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n `;\n@@ -96,7 +94,6 @@ exports[`Tag renders correctly with no icon 1`] = `\n color=\"#0F853B\"\n name=\"chevron-forward\"\n size={20}\n- suppressHighlighting={true}\n />\n \n `;\ndiff --git a/app/components/TextButton/__tests__/__snapshots__/TextButton.test.tsx.snap b/app/components/TextButton/__tests__/__snapshots__/TextButton.test.tsx.snap\nindex f697208e..cd8e74a7 100644\n--- a/app/components/TextButton/__tests__/__snapshots__/TextButton.test.tsx.snap\n+++ b/app/components/TextButton/__tests__/__snapshots__/TextButton.test.tsx.snap\n@@ -23,7 +23,6 @@ exports[`TextButton renders correctly with camera icon 1`] = `\n color=\"#3957D0\"\n name=\"camera\"\n size={20}\n- suppressHighlighting={true}\n />\n \n \n \n \n@@ -84,7 +82,6 @@ exports[`TextButton renders correctly with repeat icon 1`] = `\n color=\"#3957D0\"\n name=\"repeat\"\n size={20}\n- suppressHighlighting={true}\n />\n \n \n \n \ndiff --git a/app/screens/Emissions/components/SectionHeader/__tests__/__snapshots__/SectionHeader.test.tsx.snap b/app/screens/Emissions/components/SectionHeader/__tests__/__snapshots__/SectionHeader.test.tsx.snap\nindex 80cf6f01..13954e50 100644\n--- a/app/screens/Emissions/components/SectionHeader/__tests__/__snapshots__/SectionHeader.test.tsx.snap\n+++ b/app/screens/Emissions/components/SectionHeader/__tests__/__snapshots__/SectionHeader.test.tsx.snap\n@@ -38,7 +38,6 @@ exports[`SectionHeader should render when date 1`] = `\n name=\"chevron-forward-outline\"\n size={24}\n style={{}}\n- suppressHighlighting={true}\n />\n \n `;\n@@ -81,7 +80,6 @@ exports[`SectionHeader should render when title 1`] = `\n name=\"chevron-forward-outline\"\n size={24}\n style={{}}\n- suppressHighlighting={true}\n />\n \n `;\ndiff --git a/app/screens/Faq/__tests__/__snapshots__/FaqScreen.test.tsx.snap b/app/screens/Faq/__tests__/__snapshots__/FaqScreen.test.tsx.snap\nindex 846cb9ad..1de894f9 100644\n--- a/app/screens/Faq/__tests__/__snapshots__/FaqScreen.test.tsx.snap\n+++ b/app/screens/Faq/__tests__/__snapshots__/FaqScreen.test.tsx.snap\n@@ -38,36 +38,8 @@ exports[`FaqScreen renders correctly 1`] = `\n ]\n }\n >\n- \n \n Are you a startup?\n \n- \n+ \n \n \n- \n \n Are you collecting my data?\n \n- \n+ \n \n \n- \n \n What is your goal?\n \n- \n+ \n \n \n- \n \n How are you different?\n \n- \n+ \n \n \n- \n \n Is everyone doing greenwashing?\n \n- \n+ \n \n \n- \n \n Why NMF?\n \n- \n+ \n \n \n- \n \n Why do I have to enter manually my emissions?\n \n- \n+ \n \n \n- \n \n Why do you encourage people to be vegetarian / vegan / flexitarian ?\n \n- \n+ \n \n \n \ndiff --git a/app/screens/Languages/__tests__/__snapshots__/LanguagesScreen.test.tsx.snap b/app/screens/Languages/__tests__/__snapshots__/LanguagesScreen.test.tsx.snap\nindex 7a1922f2..c4c512f5 100644\n--- a/app/screens/Languages/__tests__/__snapshots__/LanguagesScreen.test.tsx.snap\n+++ b/app/screens/Languages/__tests__/__snapshots__/LanguagesScreen.test.tsx.snap\n@@ -42,7 +42,6 @@ exports[`LanguageScreen renders correctly 1`] = `\n \"marginTop\": 18,\n }\n }\n- suppressHighlighting={true}\n />\n \n \n Average monthly emissions per capita in a sample of countries \n- \n+ >\n+ \n+ \n \n \n \n+ >\n+ \n+ \n \n \n \n", "n2p_tests": {}, "f2p_tests": {"app/components/Button/__tests__/Button.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/components/SelectableListItem/__tests__/SelectableListItem.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/components/TextButton/__tests__/TextButton.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/components/TabBarIcon/__tests__/TabBarIcon.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/screens/Languages/__tests__/LanguagesScreen.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/screens/MonthlyBudget/__tests__/MonthlyBudgetScreen.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/components/InfoButton/__tests__/InfoButton.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/components/ListItem/__tests__/ListItem.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/screens/Emissions/components/SectionHeader/__tests__/SectionHeader.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/components/EmissionListItem/__tests__/EmissionListItem.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/components/Accordion/__tests__/Accordion.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/screens/Faq/__tests__/FaqScreen.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/components/Tag/__tests__/Tag.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "NMF-earth__nmf-app-402", "org": "NMF-earth", "repo": "nmf-app", "number": 402, "state": "closed", "title": "refactor: move FaqScreen ScrollView padding to contentContainerStyle", "body": "\r\n\r\n\r\n\u2705 I have read the [contributing file](https://github.com/NMF-earth/nmf-app/blob/main/contributing.md)\r\n\r\n## Summary\r\n\r\nFixes #399 \r\n\r\n## Changelog\r\n\r\n- Move FaqScreen ScrollView padding to contentContainerStyle\r\n\r\n## Demo\r\n\r\n| Android | iOS |\r\n|:--------|:-----------:|\r\n| \"Image\" | \"Image\" |\r\n\r\n\r\n", "base": {"label": "NMF-earth:main", "ref": "main", "sha": "1518b11db4564f4151708c8caf71c1e0ca3463c1"}, "resolved_issues": [{"number": 399, "title": "Bug: Bottom Tabs Overlap FAQ Content", "body": "**Describe the bug**\n In the FAQ screen under the Settings tab, the content of an expanded Accordion overlaps with the bottom tab navigator. The last item of the list becomes partially hidden, reducing readability and hurting the user experience. There should be a margin or padding at the bottom to avoid this overlap.\n \n**To Reproduce**\nSteps to reproduce the behavior:\n1. Navigate to 'Settings Tab'\n2. Tap on 'FAQ'\n3. Expand an Accordion item with a longer description.\n4. Scroll to the bottom \u2014 observe how content overlaps with the bottom tabs.\n\n**Expected behaviour**\nThere should be adequate space between the last Accordion item and the bottom navigation tabs to ensure content visibility and accessibility.\n\n**Screenshots**\n\n![Image](https://github.com/user-attachments/assets/ac8b5679-e5d7-44a3-b0b5-92e29b5524bd)\n\n**Device and OS info**\n - Device: [Xiaomi Redmi12]\n - OS: [Android 15] \n - Version [0.10.1-51]\n\n**Additional context**\nNo"}], "lang": "typescript", "problem_statement": "Bug: Bottom Tabs Overlap FAQ Content\n**Describe the bug**\n In the FAQ screen under the Settings tab, the content of an expanded Accordion overlaps with the bottom tab navigator. The last item of the list becomes partially hidden, reducing readability and hurting the user experience. There should be a margin or padding at the bottom to avoid this overlap.\n \n**To Reproduce**\nSteps to reproduce the behavior:\n1. Navigate to 'Settings Tab'\n2. Tap on 'FAQ'\n3. Expand an Accordion item with a longer description.\n4. Scroll to the bottom \u2014 observe how content overlaps with the bottom tabs.\n\n**Expected behaviour**\nThere should be adequate space between the last Accordion item and the bottom navigation tabs to ensure content visibility and accessibility.\n\n**Screenshots**\n\n![Image](https://github.com/user-attachments/assets/ac8b5679-e5d7-44a3-b0b5-92e29b5524bd)\n\n**Device and OS info**\n - Device: [Xiaomi Redmi12]\n - OS: [Android 15] \n - Version [0.10.1-51]\n\n**Additional context**\nNo\n", "hints": "I\u2019d like to take this issue and work on a fix. Planning to address it by adding bottom padding or adjusting contentInset to ensure the last Accordion item doesn\u2019t overlap with the bottom tab.\n@muhammadkamran8586 thanks for reporting this bug. You can open a pr, I will have a look ;)\nHey @PierreBresson I am happy to help address this and I do have a fix ready for this on my local but will hold it till be merge #401 as that will allow me to pass the pre-commit checks and create a pr \n\nAdding Local fix screenshot for reference\n\n| Android | iOS |\n|:--------|:-----------:|\n| \"Image\" | \"Image\" |\n@hb2708 well done, I've assigned you to this task :)", "pull_url": "https://github.com/NMF-earth/nmf-app/pull/402", "issue_urls": ["https://github.com/NMF-earth/nmf-app/issues/399"], "test_command": "NODE_OPTIONS='--experimental-vm-modules --max-old-space-size=4096' npx --no-install jest app/screens/Faq/__tests__/FaqScreen.test.tsx --passWithNoTests 2>&1", "fix_patch": "diff --git a/app/screens/Faq/FaqScreen.styles.ts b/app/screens/Faq/FaqScreen.styles.ts\nindex bcfeccf0..dc706a1a 100644\n--- a/app/screens/Faq/FaqScreen.styles.ts\n+++ b/app/screens/Faq/FaqScreen.styles.ts\n@@ -5,6 +5,8 @@ import { Colors } from \"style\";\n const styles = StyleSheet.create({\n container: {\n backgroundColor: Colors.white,\n+ },\n+ contentContainer: {\n paddingHorizontal: 16,\n paddingVertical: 24,\n },\ndiff --git a/app/screens/Faq/FaqScreen.tsx b/app/screens/Faq/FaqScreen.tsx\nindex a17c76b4..9103dcc6 100644\n--- a/app/screens/Faq/FaqScreen.tsx\n+++ b/app/screens/Faq/FaqScreen.tsx\n@@ -10,7 +10,10 @@ import navigationOptions from \"./FaqScreen.navigationOptions\";\n \n const FaqScreen: NavStatelessComponent = () => {\n return (\n- \n+ \n \n {content.map((content, index) => (\n \n", "test_patch": "diff --git a/app/screens/Faq/__tests__/__snapshots__/FaqScreen.test.tsx.snap b/app/screens/Faq/__tests__/__snapshots__/FaqScreen.test.tsx.snap\nindex e4334a01..846cb9ad 100644\n--- a/app/screens/Faq/__tests__/__snapshots__/FaqScreen.test.tsx.snap\n+++ b/app/screens/Faq/__tests__/__snapshots__/FaqScreen.test.tsx.snap\n@@ -2,13 +2,17 @@\n \n exports[`FaqScreen renders correctly 1`] = `\n \n \n | \"Simulator |\r\n\r\n\r\n**Tests Passed:**\r\nRan `yarn test` successfully with all 66 test suites passing.\r\n\r\n```bash\r\nTest Suites: 66 passed, 66 total\r\nTests: 433 passed, 433 total\r\nSnapshots: 143 passed, 143 total\r\nTime: 15.013 s", "base": {"label": "NMF-earth:main", "ref": "main", "sha": "b0414f6c6bf3706d8a2060c7fd680204ff75f44c"}, "resolved_issues": [{"number": 400, "title": "Non-working links", "body": "The two links on the end of the settings pages are not available. \n\n**To Reproduce**\nSteps to reproduce the behavior:\n1. Go to 'settings'\n2. Scroll down to the end of the page\n3. Click on 'mastodon.social icon and medium.com'\n4. See error\n\n**Expected behaviour**\nLinks should take us to a useful page.\n\n**Screenshots**\n\n![Image](https://github.com/user-attachments/assets/e7114eb2-fee4-4446-9252-f29c2c651d3e)\n![Image](https://github.com/user-attachments/assets/a63ab8dc-cdcd-4eb1-bb8d-1346a61857ba)\n![Image](https://github.com/user-attachments/assets/1f1635c4-6de5-4646-8379-fbcd79eb643c)\n\n** Please complete the following information (if applicable):**\n - Device: Motorola Edge 40 neo\n - OS: Android\n - Version [e.g. 0.5.0]\n\n\n"}], "lang": "typescript", "problem_statement": "Non-working links\nThe two links on the end of the settings pages are not available. \n\n**To Reproduce**\nSteps to reproduce the behavior:\n1. Go to 'settings'\n2. Scroll down to the end of the page\n3. Click on 'mastodon.social icon and medium.com'\n4. See error\n\n**Expected behaviour**\nLinks should take us to a useful page.\n\n**Screenshots**\n\n![Image](https://github.com/user-attachments/assets/e7114eb2-fee4-4446-9252-f29c2c651d3e)\n![Image](https://github.com/user-attachments/assets/a63ab8dc-cdcd-4eb1-bb8d-1346a61857ba)\n![Image](https://github.com/user-attachments/assets/1f1635c4-6de5-4646-8379-fbcd79eb643c)\n\n** Please complete the following information (if applicable):**\n - Device: Motorola Edge 40 neo\n - OS: Android\n - Version [e.g. 0.5.0]\n\n\n\n", "hints": "I'd like to know if there are any other links you would want to add instead of these. Also the about page is very simple, i would like to redesign it.\nHey,\nThe 2 available links atm are github and nmf website, I've close down social media. Feel free to submit a redesign :)\n@PierreBresson did you take down http://nmf.earth ? seems no more avalilable?\n@hb2708 it's online here now : https://nmf-earth.github.io\n> [@hb2708](https://github.com/hb2708) it's online here now : https://nmf-earth.github.io\n\n@PierreBresson \nThanks for pointing it out.\n\nI was trying to fix the issue by removing the close down social link and noticed that multiple test are failing as well us unable to commit at all due to same. And it seems from the [latest commit on master](https://github.com/NMF-earth/nmf-app/commit/b0414f6c6bf3706d8a2060c7fd680204ff75f44c). Would you be okey if i help to fix those tests as well?\n", "pull_url": "https://github.com/NMF-earth/nmf-app/pull/401", "issue_urls": ["https://github.com/NMF-earth/nmf-app/issues/400"], "test_command": "NODE_OPTIONS='--experimental-vm-modules --max-old-space-size=4096' npx --no-install jest app/components/OpenFoodFacts/__tests__/OpenFoodFacts.test.tsx app/components/SocialMedia/__tests__/SocialMedia.test.tsx app/components/StickersImage/__tests__/StickersImage.test.tsx app/screens/MonthlyBudget/__tests__/MonthlyBudgetScreen.test.tsx app/screens/Settings/__tests__/SettingsScreen.test.tsx --passWithNoTests 2>&1", "fix_patch": "diff --git a/app/components/SocialMedia/SocialMedia.styles.ts b/app/components/SocialMedia/SocialMedia.styles.ts\nindex ebb319e7..6835b392 100644\n--- a/app/components/SocialMedia/SocialMedia.styles.ts\n+++ b/app/components/SocialMedia/SocialMedia.styles.ts\n@@ -9,8 +9,9 @@ export default StyleSheet.create({\n box: {\n flex: 1,\n flexDirection: \"row\",\n- justifyContent: \"space-between\",\n+ justifyContent: \"center\",\n maxWidth: 200,\n+ gap: 40,\n paddingBottom: 50,\n },\n });\ndiff --git a/app/components/SocialMedia/SocialMedia.tsx b/app/components/SocialMedia/SocialMedia.tsx\nindex 5e1f3875..25992879 100644\n--- a/app/components/SocialMedia/SocialMedia.tsx\n+++ b/app/components/SocialMedia/SocialMedia.tsx\n@@ -13,12 +13,8 @@ const socialMedia = [\n url: \"https://github.com/NMF-earth\",\n },\n {\n- iconName: \"mastodon\",\n- url: \"https://mastodon.social/@nmf_earth\",\n- },\n- {\n- iconName: \"medium-m\",\n- url: \"https://medium.com/@nmf_earth\",\n+ iconName: \"globe\",\n+ url: \"https://nmf-earth.github.io\",\n },\n ];\n \ndiff --git a/app/screens/BarCodeScan/BarCodeScanScreen.tsx b/app/screens/BarCodeScan/BarCodeScanScreen.tsx\nindex ce61ed7c..798fa26b 100644\n--- a/app/screens/BarCodeScan/BarCodeScanScreen.tsx\n+++ b/app/screens/BarCodeScan/BarCodeScanScreen.tsx\n@@ -1,7 +1,7 @@\n import React, { useState, useEffect } from \"react\";\n import { useNavigation } from \"@react-navigation/native\";\n import { ActivityIndicator, View } from \"react-native\";\n-import { CameraView, CameraType, useCameraPermissions } from \"expo-camera\";\n+import { CameraView, useCameraPermissions } from \"expo-camera\";\n import { is, path, pathOr, both, complement, equals } from \"ramda\";\n import constants from \"expo-constants\";\n \n@@ -24,7 +24,7 @@ const getEcoScore = pathOr(\"\", [\"ecoscore_grade\"]);\n const getName = path([\"product_name\"]);\n \n const BarCodeScanScreen = ({ language = \"\" }: LocalizationContextProps) => {\n- const [hasPermission, setHasPermission] = useState(null);\n+ // eslint-disable-next-line @typescript-eslint/no-unused-vars\n const [scanned, setScanned] = useState(false);\n const [hasCarbonData, setHasCarbonData] = useState(true);\n const [isFetchingData, setIsFetchingData] = useState(false);\n@@ -39,15 +39,13 @@ const BarCodeScanScreen = ({ language = \"\" }: LocalizationContextProps) => {\n const { version, ios, android } = constants.expoConfig;\n const buildNumber = platform.isIOS ? ios.buildNumber : android.versionCode;\n const platformType = platform.isIOS ? \"iOS\" : \"Android\";\n- // TODO:\n const [permission, requestPermission] = useCameraPermissions();\n \n useEffect(() => {\n (async () => {\n- const { status } = await requestPermission();\n- setHasPermission(status === \"granted\");\n+ await requestPermission();\n })();\n- }, []);\n+ }, [requestPermission]);\n \n const onPressTryAgain = () => {\n setError(false);\n@@ -119,7 +117,7 @@ const BarCodeScanScreen = ({ language = \"\" }: LocalizationContextProps) => {\n return ;\n }\n \n- if (!permission) {\n+ if (!permission.granted) {\n return ;\n }\n \n@@ -179,7 +177,8 @@ const BarCodeScanScreen = ({ language = \"\" }: LocalizationContextProps) => {\n \n \n {__DEV__ ? (\n {\n }\n \n if (value) {\n- // TODO: fix\n- // await Notifications.scheduleNotificationAsync(notification);\n+ await Notifications.scheduleNotificationAsync(notification);\n } else {\n await Notifications.cancelAllScheduledNotificationsAsync();\n }\n", "test_patch": "diff --git a/app/components/OpenFoodFacts/__tests__/__snapshots__/OpenFoodFacts.test.tsx.snap b/app/components/OpenFoodFacts/__tests__/__snapshots__/OpenFoodFacts.test.tsx.snap\nindex 5bc53025..11fd5648 100644\n--- a/app/components/OpenFoodFacts/__tests__/__snapshots__/OpenFoodFacts.test.tsx.snap\n+++ b/app/components/OpenFoodFacts/__tests__/__snapshots__/OpenFoodFacts.test.tsx.snap\n@@ -35,7 +35,11 @@ exports[` render correctly 1`] = `\n >\n render correctly 1`] = `\n >\n render correctly 1`] = `\n >\n render nothing if bad data passed 1`] = `\n >\n render nothing if bad data passed 1`] = `\n >\n render nothing if bad data passed 1`] = `\n >\n \n \n- \n- \n- \n \ndiff --git a/app/components/StickersImage/__tests__/__snapshots__/StickersImage.test.tsx.snap b/app/components/StickersImage/__tests__/__snapshots__/StickersImage.test.tsx.snap\nindex 2c825305..a06506a2 100644\n--- a/app/components/StickersImage/__tests__/__snapshots__/StickersImage.test.tsx.snap\n+++ b/app/components/StickersImage/__tests__/__snapshots__/StickersImage.test.tsx.snap\n@@ -10,7 +10,11 @@ exports[`renders correctly StickersImage with bike image 1`] = `\n >\n \n \n \n {\n };\n });\n \n-jest.mock(\"expo-barcode-scanner\", () => {\n- return {\n- BarCodeScanner: {\n- requestPermissionsAsync: () => ({\n- status: \"denied\",\n- }),\n- },\n- };\n-});\n-\n jest.mock(\"expo-notifications\", () => {\n return {\n requestPermissionsAsync: () => ({\n", "n2p_tests": {}, "f2p_tests": {"app/components/SocialMedia/__tests__/SocialMedia.test.tsx": {"run": "FAIL", "test": "FAIL", "fix": "PASS"}}, "p2p_tests": {"app/screens/Settings/__tests__/SettingsScreen.test.tsx": {"run": "FAIL", "test": "PASS", "fix": "PASS"}, "app/components/StickersImage/__tests__/StickersImage.test.tsx": {"run": "FAIL", "test": "PASS", "fix": "PASS"}, "app/screens/MonthlyBudget/__tests__/MonthlyBudgetScreen.test.tsx": {"run": "FAIL", "test": "PASS", "fix": "PASS"}, "app/components/OpenFoodFacts/__tests__/OpenFoodFacts.test.tsx": {"run": "FAIL", "test": "PASS", "fix": "PASS"}}, "s2p_tests": {}} {"instance_id": "NMF-earth__nmf-app-342", "org": "NMF-earth", "repo": "nmf-app", "number": 342, "state": "closed", "title": "(#339) Present PermissionsRequest in Notification screen", "body": "\u2705 I have read the [contributing file](https://github.com/NMF-earth/nmf-app/blob/main/contributing.md)\r\n\r\n## Summary\r\n\r\nCloses #339 \r\n\r\n## Changelog\r\n\r\n- Update snapshots\r\n- Check for permissions on useEffect in Notifications screen\r\n- Use PermissionsRequest component to require permissions in Notifications screen\r\n- Add necessary translations\r\n\r\n## Demo\r\n\r\n![image](https://user-images.githubusercontent.com/39802870/139155519-63c26c98-460a-4fe9-bd67-dcb9e04e3330.png)\r\n\r\n", "base": {"label": "NMF-earth:main", "ref": "main", "sha": "bd4f7cc9a17936c44a2b67f78a2b8952645cb427"}, "resolved_issues": [{"number": 339, "title": "Present PermissionsRequest in Notification screen", "body": "#### Summary\r\nShow `PermissionsRequest` component in Notification screen instead of opening settings with Linking.\r\n\r\n_NB: First to submit a valid PR, first to merge. Except if you already have merged some good code in this repo, I won\u2019t assign any issue due to spam and beginners unable to complete a PR without a lot of help from my side._"}], "lang": "typescript", "problem_statement": "Present PermissionsRequest in Notification screen\n#### Summary\r\nShow `PermissionsRequest` component in Notification screen instead of opening settings with Linking.\r\n\r\n_NB: First to submit a valid PR, first to merge. Except if you already have merged some good code in this repo, I won\u2019t assign any issue due to spam and beginners unable to complete a PR without a lot of help from my side._\n", "hints": "As far as I'm concerned you can't show the permission pop up twice to a user once they've rejected.\r\nI also agree that just sending users to settings might not be a good UX, rather showing a popup saying :\r\n`you've rejected before if you want you can go to settings and give permission manually` (sth like that) & then two buttons `yes`/`no` sth\n@BatDroid indeed, you are right, you can only ask once with the native popup/dialog/prompt.\r\nThe idea is to do the same as in the `BarCodeScanScreen`. When user open for the notification screen for the first time, he should see the native dialog with empty screen behind, like line 102 of `BarCodeScanScreen` : \r\n```\r\n if (hasPermission === null) {\r\n return ;\r\n }\r\n```\r\nAnd then if user has denied the authorization in the dialog show the component:\r\n```\r\n if (!hasPermission) {\r\n return ;\r\n }\r\n```\r\notherwise, show normal render. ", "pull_url": "https://github.com/NMF-earth/nmf-app/pull/342", "issue_urls": ["https://github.com/NMF-earth/nmf-app/issues/339"], "test_command": "NODE_OPTIONS='--experimental-vm-modules --max-old-space-size=4096' npx --no-install jest app/components/PermissionsRequest/__tests__/PermissionsRequest.test.tsx app/screens/Notifications/__tests__/NotificationsScreen.tests.tsx --passWithNoTests 2>&1", "fix_patch": "diff --git a/app/components/PermissionsRequest/translations/en.json b/app/components/PermissionsRequest/translations/en.json\nindex ae6002d8..5210dddb 100644\n--- a/app/components/PermissionsRequest/translations/en.json\n+++ b/app/components/PermissionsRequest/translations/en.json\n@@ -2,6 +2,6 @@\n \"PERMISSIONS_REQUEST_COMPONENT_OPEN_SETTINGS\": \"Open settings\",\n \"PERMISSIONS_REQUEST_COMPONENT_CAMERA_TITLE\": \"No access to camera\",\n \"PERMISSIONS_REQUEST_COMPONENT_CAMERA_SUBTITLE\": \"Please give NMF.earth app access to camera in your phone settings to use this feature.\",\n- \"PERMISSIONS_REQUEST_COMPONENT_NOTIFICATION_TITLE\": \"\",\n- \"PERMISSIONS_REQUEST_COMPONENT_NOTIFICATION_SUBTITLE\": \"\"\n+ \"PERMISSIONS_REQUEST_COMPONENT_NOTIFICATION_TITLE\": \"No permission to send notifications\",\n+ \"PERMISSIONS_REQUEST_COMPONENT_NOTIFICATION_SUBTITLE\": \"Please give NMF.earth app permission to send you notifications in your phone settings to use this feature.\"\n }\ndiff --git a/app/screens/Notifications/NotificationsScreen.tsx b/app/screens/Notifications/NotificationsScreen.tsx\nindex b772d818..63c75c78 100644\n--- a/app/screens/Notifications/NotificationsScreen.tsx\n+++ b/app/screens/Notifications/NotificationsScreen.tsx\n@@ -1,10 +1,10 @@\n-import React, { useCallback, useState } from \"react\";\n+import React, { useCallback, useState, useEffect } from \"react\";\n import { View, Switch, Alert, Linking } from \"react-native\";\n import * as Notifications from \"expo-notifications\";\n import { useDispatch, useSelector } from \"react-redux\";\n \n import { NavStatelessComponent } from \"interfaces\";\n-import { Text } from \"components\";\n+import { PermissionsRequest, Text } from \"components\";\n import { userPreferences } from \"ducks\";\n import { t } from \"utils\";\n \n@@ -29,31 +29,46 @@ const NotificationsScreen: NavStatelessComponent = () => {\n const [activated, setActivated] = useState(\n useSelector(userPreferences.selectors.getActivateNotifications)\n );\n+ const [hasPermission, setHasPermission] = useState(null);\n \n const onValueChange = useCallback(\n async (value: boolean) => {\n try {\n- const permission = await Notifications.requestPermissionsAsync();\n+ if (!hasPermission) {\n+ Linking.openSettings();\n+ return;\n+ }\n \n- if (permission.granted && value) {\n+ if (value) {\n await Notifications.scheduleNotificationAsync(notification);\n } else {\n await Notifications.cancelAllScheduledNotificationsAsync();\n-\n- if (!permission.granted) {\n- Linking.openSettings();\n- }\n }\n \n- setActivated(permission.granted && value);\n- dispatch(userPreferences.actions.toggleNotifications(permission.granted && value));\n+ setActivated(value);\n+ dispatch(userPreferences.actions.toggleNotifications(value));\n } catch (e) {\n Alert.alert(\"Error\", e);\n }\n },\n- [dispatch]\n+ [dispatch, hasPermission]\n );\n \n+ useEffect(() => {\n+ (async () => {\n+ const { status } = await Notifications.requestPermissionsAsync();\n+ setHasPermission(status === \"granted\");\n+ })();\n+ }, []);\n+\n+ if (hasPermission === null) {\n+ return ;\n+ }\n+\n+ if (!hasPermission) {\n+ return ;\n+ }\n+\n return (\n \n {t(\"NOTIFICATIONS_SCREEN_INTRO\")}\ndiff --git a/scripts/poeditor/en.json b/scripts/poeditor/en.json\nindex dd1e4570..76207d46 100644\n--- a/scripts/poeditor/en.json\n+++ b/scripts/poeditor/en.json\n@@ -217,6 +217,6 @@\n \t\"PERMISSIONS_REQUEST_COMPONENT_OPEN_SETTINGS\": \"Open settings\",\n \t\"PERMISSIONS_REQUEST_COMPONENT_CAMERA_TITLE\": \"No access to camera\",\n \t\"PERMISSIONS_REQUEST_COMPONENT_CAMERA_SUBTITLE\": \"Please give NMF.earth app access to camera in your phone settings to use this feature.\",\n-\t\"PERMISSIONS_REQUEST_COMPONENT_NOTIFICATION_TITLE\": \"\",\n-\t\"PERMISSIONS_REQUEST_COMPONENT_NOTIFICATION_SUBTITLE\": \"\"\n+\t\"PERMISSIONS_REQUEST_COMPONENT_NOTIFICATION_TITLE\": \"No permission to send notifications\",\n+\t\"PERMISSIONS_REQUEST_COMPONENT_NOTIFICATION_SUBTITLE\": \"Please give NMF.earth app permission to send you notifications in your phone settings to use this feature.\"\n }\n\\ No newline at end of file\n", "test_patch": "diff --git a/app/components/PermissionsRequest/__tests__/__snapshots__/PermissionsRequest.test.tsx.snap b/app/components/PermissionsRequest/__tests__/__snapshots__/PermissionsRequest.test.tsx.snap\nindex 25b50ab3..bdbde928 100644\n--- a/app/components/PermissionsRequest/__tests__/__snapshots__/PermissionsRequest.test.tsx.snap\n+++ b/app/components/PermissionsRequest/__tests__/__snapshots__/PermissionsRequest.test.tsx.snap\n@@ -85,12 +85,12 @@ exports[`renders correctly PermissionsRequest if notification 1`] = `\n \n- \n+ No permission to send notifications\n \n \n- \n+ Please give NMF.earth app permission to send you notifications in your phone settings to use this feature.\n \n \n \n- \n- Receive a notification every Sunday at 9 p.m to remind you to add your weekly emissions.\n- \n- \n- \n- Activated\n- \n- \n- \n-\n+/>\n `;\n", "n2p_tests": {}, "f2p_tests": {"app/screens/Notifications/__tests__/NotificationsScreen.tests.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/components/PermissionsRequest/__tests__/PermissionsRequest.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "NMF-earth__nmf-app-337", "org": "NMF-earth", "repo": "nmf-app", "number": 337, "state": "closed", "title": "Store review", "body": "\u2705 I have read the [contributing file](https://github.com/NMF-earth/nmf-app/blob/main/contributing.md)\r\n\r\n## Summary\r\n\r\nCloses #309\r\n\r\n## Changelog\r\n\r\n- Adds `expo-store-review`;\r\n- Adds `timesStarted` variable, and its corresponding action and selector, in userPreferences redux slice;\r\n- Checks if the user has started the app for the 4th time and asks for a Store Review in the `StoreReviewChecker`, which wraps the `AppNavigator` component in `App.tsx`.\r\n\r\n## Notes\r\n- All the implementation was done in a Windows environment and tested only on Android;\r\n- The method `StoreReview.requestReview()` crashes the app silently when using Android Emulator **without** Play Store;\r\n- When using Android Emulator **with** Play Store, be sure to be logged in on it, otherwise, the app will show a blank screen when calling `StoreReview.requestReview()`;\r\n- The Play Store review modal only shows once. So, when testing, to be able to see the modal again, clean the Play Store app data in its App info on Clear Storage option (see below);\r\n- `timesStarted` increments every time the user opens the app, but only if the user has accepted the terms of use (maybe it can be used for something else in the future);\r\n- ~I wasn't sure about where to implement the check for review, so I've placed it in EmissionsScreen `index`. But any suggestions are welcome \ud83d\ude00.~\r\n\r\n## Demo\r\nhttps://user-images.githubusercontent.com/22963240/136712594-9945d39e-f63b-475d-8fb1-154112c82f1d.mp4\r\n\r\n\r\n### Steps for clearing Play Store storage\r\n1. Open Play Store App Info:\r\n- By tapping and holding the Play Store app icon, then tap on App info; Or\r\n- Go to Settings > Apps & notifications > See all apps, then search for Play Store.\r\n2. Go to Storage & cache;\r\n3. Clear Storage;\r\n4. Confirm the deletion of app data.\r\n", "base": {"label": "NMF-earth:main", "ref": "main", "sha": "c7977bef0fe4a6eb124a618d04f4d8b1b7362230"}, "resolved_issues": [{"number": 309, "title": "Store Review", "body": "#### Summary\r\nAfter 4 starts of the app, if the user has accepted terms of use, ask him to rate the app thanks to expo [store-review api](https://docs.expo.dev/versions/v38.0.0/sdk/storereview/). See more [here](https://expo.canny.io/feature-requests/p/android-in-app-review)\r\n\r\n_NB: First to submit a valid PR, first to merge. Except if you already have merged some good code in this repo, I won\u2019t assign any issue due to spam and beginners unable to complete a PR without a lot of help from my side._"}], "lang": "typescript", "problem_statement": "Store Review\n#### Summary\r\nAfter 4 starts of the app, if the user has accepted terms of use, ask him to rate the app thanks to expo [store-review api](https://docs.expo.dev/versions/v38.0.0/sdk/storereview/). See more [here](https://expo.canny.io/feature-requests/p/android-in-app-review)\r\n\r\n_NB: First to submit a valid PR, first to merge. Except if you already have merged some good code in this repo, I won\u2019t assign any issue due to spam and beginners unable to complete a PR without a lot of help from my side._\n", "hints": "Hello @PierreBresson! I started working on this and I have a question. Do you think that a new redux slice is needed to store the number of times the user has opened the app? Or could we just set a variable on the `userPreferences` slice? \n@EmersonPinheiro Thanks for having a look :)\r\nYes, you can simply set a variable in `userPreference` \ud83d\udc4d", "pull_url": "https://github.com/NMF-earth/nmf-app/pull/337", "issue_urls": ["https://github.com/NMF-earth/nmf-app/issues/309"], "test_command": "NODE_OPTIONS='--experimental-vm-modules --max-old-space-size=4096' npx --no-install jest app/components/StoreReviewChecker/__tests__/StoreReviewChecker.test.tsx app/ducks/userPreferences/__tests__/userPreferences.actions.test.ts app/ducks/userPreferences/__tests__/userPreferences.reducer.test.ts app/ducks/userPreferences/__tests__/userPreferences.selectors.test.ts --passWithNoTests 2>&1", "fix_patch": "diff --git a/App.tsx b/App.tsx\nindex 1d2707de..e63d7f86 100644\n--- a/App.tsx\n+++ b/App.tsx\n@@ -13,6 +13,7 @@ import { Provider } from \"react-redux\";\n import { enableScreens } from \"react-native-screens\";\n \n import { LocalizationContext } from \"utils\";\n+import StoreReviewChecker from \"components/StoreReviewChecker\";\n \n import AppNavigator from \"./app/navigation/Navigator/AppNavigator\";\n import store from \"./app/redux/store\";\n@@ -98,7 +99,9 @@ const App: React.FC = () => {\n setLanguage: setLanguage,\n }}\n >\n- \n+ \n+ \n+ \n \n \n \ndiff --git a/app/components/StoreReviewChecker/StoreReviewChecker.tsx b/app/components/StoreReviewChecker/StoreReviewChecker.tsx\nnew file mode 100644\nindex 00000000..f4b84554\n--- /dev/null\n+++ b/app/components/StoreReviewChecker/StoreReviewChecker.tsx\n@@ -0,0 +1,43 @@\n+import React, { useEffect, useRef } from \"react\";\n+import { useDispatch, useSelector } from \"react-redux\";\n+import * as StoreReview from \"expo-store-review\";\n+\n+import { userPreferences } from \"ducks\";\n+import { Preferences } from \"constant\";\n+\n+type Props = {\n+ children: React.ReactElement;\n+};\n+\n+const StoreReviewChecker = ({ children }: Props): React.ReactElement => {\n+ const dispatch = useDispatch();\n+ const timesStarted = useSelector(userPreferences.selectors.getTimesStarted);\n+ const hasAcceptedTermsOfUseVersion =\n+ Preferences.currentTermsOfUseVersion ===\n+ useSelector(userPreferences.selectors.getAcceptedTermsOfUseVersion);\n+ const timesStartedRef = useRef();\n+\n+ useEffect(() => {\n+ timesStartedRef.current = timesStarted;\n+ }, [timesStarted]);\n+ const prevTimesStarted = timesStartedRef.current;\n+\n+ useEffect(() => {\n+ if (hasAcceptedTermsOfUseVersion) {\n+ dispatch(userPreferences.actions.incrementTimesStarted());\n+ }\n+ }, [dispatch, hasAcceptedTermsOfUseVersion]);\n+\n+ useEffect(() => {\n+ const checkForReview = async () => {\n+ if (prevTimesStarted === 3 && timesStarted === 4 && (await StoreReview.hasAction())) {\n+ await StoreReview.requestReview();\n+ }\n+ };\n+ checkForReview();\n+ }, [dispatch, prevTimesStarted, timesStarted]);\n+\n+ return children;\n+};\n+\n+export default StoreReviewChecker;\ndiff --git a/app/components/StoreReviewChecker/index.ts b/app/components/StoreReviewChecker/index.ts\nnew file mode 100644\nindex 00000000..60365d17\n--- /dev/null\n+++ b/app/components/StoreReviewChecker/index.ts\n@@ -0,0 +1,1 @@\n+export { default } from \"./StoreReviewChecker\";\ndiff --git a/app/ducks/userPreferences/userPreferences.selectors.ts b/app/ducks/userPreferences/userPreferences.selectors.ts\nindex 512ec64b..e0aee2e7 100644\n--- a/app/ducks/userPreferences/userPreferences.selectors.ts\n+++ b/app/ducks/userPreferences/userPreferences.selectors.ts\n@@ -16,9 +16,12 @@ const getActivateNotifications = (state) =>\n \n const getLanguage = (state) => pathOr(currentLanguage, [namespace, \"language\"], state);\n \n+const getTimesStarted = (state) => pathOr(0, [namespace, \"timesStarted\"], state);\n+\n export default {\n getAcceptedTermsOfUseVersion,\n getActivateNotifications,\n getLocation,\n getLanguage,\n+ getTimesStarted,\n };\ndiff --git a/app/ducks/userPreferences/userPreferences.slice.ts b/app/ducks/userPreferences/userPreferences.slice.ts\nindex 4b0212fa..db07bab3 100644\n--- a/app/ducks/userPreferences/userPreferences.slice.ts\n+++ b/app/ducks/userPreferences/userPreferences.slice.ts\n@@ -8,6 +8,7 @@ const initialState = {\n activatedNotifications: false,\n location: ElectricityType.world,\n language: currentLanguage,\n+ timesStarted: 0,\n };\n \n const userPreferences = createSlice({\n@@ -26,6 +27,9 @@ const userPreferences = createSlice({\n changeLanguage(state, action: PayloadAction) {\n state.language = action.payload;\n },\n+ incrementTimesStarted(state) {\n+ state.timesStarted += 1;\n+ },\n },\n });\n \n@@ -34,6 +38,7 @@ const {\n updateLocation,\n toggleNotifications,\n changeLanguage,\n+ incrementTimesStarted,\n } = userPreferences.actions;\n \n export const actions = {\n@@ -41,6 +46,7 @@ export const actions = {\n updateLocation,\n toggleNotifications,\n changeLanguage,\n+ incrementTimesStarted,\n };\n \n export const namespace = userPreferences.name;\ndiff --git a/package.json b/package.json\nindex 014a1b63..a1674743 100644\n--- a/package.json\n+++ b/package.json\n@@ -51,6 +51,7 @@\n \"expo-notifications\": \"0.12.3\",\n \"expo-sharing\": \"9.2.1\",\n \"expo-status-bar\": \"1.0.4\",\n+ \"expo-store-review\": \"4.1.0\",\n \"expo-updates\": \"0.8.2\",\n \"expo-web-browser\": \"9.2.0\",\n \"i18n-js\": \"3.5.1\",\ndiff --git a/yarn.lock b/yarn.lock\nindex 05d66264..22a83c98 100644\n--- a/yarn.lock\n+++ b/yarn.lock\n@@ -7029,6 +7029,11 @@ expo-status-bar@1.0.4:\n resolved \"https://registry.yarnpkg.com/expo-status-bar/-/expo-status-bar-1.0.4.tgz#d8a4c4418b5868c1606969b12bdee85b6fa7d8a4\"\n integrity sha512-s7nc496D/Zn1NGiMJ5wu6HyIdXxbgGtmZZtbHm7rpbcmLdf28GmMSNHDx7M0t00BMhky7VAurTCUo+BJs8ugsw==\n \n+expo-store-review@4.1.0:\n+ version \"4.1.0\"\n+ resolved \"https://registry.yarnpkg.com/expo-store-review/-/expo-store-review-4.1.0.tgz#42a9f21ad3114f0c48d8d428182dd0b8e2f2ad76\"\n+ integrity sha512-vIrgr26MykIyEhqf8UpqxBjO5VzSM7mpBATOLZswphQnWyAD0nL5XmVnba9kOJkFkNzzW4ur0W7/+j2nGeYO6Q==\n+\n expo-structured-headers@~1.1.1:\n version \"1.1.1\"\n resolved \"https://registry.yarnpkg.com/expo-structured-headers/-/expo-structured-headers-1.1.1.tgz#95e28ff8686a2c06fe6ad1decdbb94cc44716683\"\n@@ -14547,8 +14552,10 @@ watchpack@^1.7.4:\n resolved \"https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453\"\n integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==\n dependencies:\n+ chokidar \"^3.4.1\"\n graceful-fs \"^4.1.2\"\n neo-async \"^2.5.0\"\n+ watchpack-chokidar2 \"^2.0.1\"\n optionalDependencies:\n chokidar \"^3.4.1\"\n watchpack-chokidar2 \"^2.0.1\"\n", "test_patch": "diff --git a/app/components/StoreReviewChecker/__tests__/StoreReviewChecker.test.tsx b/app/components/StoreReviewChecker/__tests__/StoreReviewChecker.test.tsx\nnew file mode 100644\nindex 00000000..b292a2ce\n--- /dev/null\n+++ b/app/components/StoreReviewChecker/__tests__/StoreReviewChecker.test.tsx\n@@ -0,0 +1,18 @@\n+import React from \"react\";\n+import { create } from \"react-test-renderer\";\n+import { View } from \"react-native\";\n+\n+import StoreReviewChecker from \"..\";\n+\n+describe(\"StoreReviewChecker tests\", () => {\n+ const children = ;\n+ it(\"should render correctly\", () => {\n+ const tree = create({children}).toJSON();\n+ expect(tree).toMatchSnapshot();\n+ });\n+\n+ it(\"should render children correctly\", () => {\n+ const tree = create({children}).toJSON();\n+ expect(tree.type).toBe(children.type.displayName);\n+ });\n+});\ndiff --git a/app/components/StoreReviewChecker/__tests__/__snapshots__/StoreReviewChecker.test.tsx.snap b/app/components/StoreReviewChecker/__tests__/__snapshots__/StoreReviewChecker.test.tsx.snap\nnew file mode 100644\nindex 00000000..bc068dd1\n--- /dev/null\n+++ b/app/components/StoreReviewChecker/__tests__/__snapshots__/StoreReviewChecker.test.tsx.snap\n@@ -0,0 +1,3 @@\n+// Jest Snapshot v1, https://goo.gl/fbAQLP\n+\n+exports[`StoreReviewChecker tests should render correctly 1`] = ``;\ndiff --git a/app/ducks/userPreferences/__tests__/__snapshots__/userPreferences.actions.test.ts.snap b/app/ducks/userPreferences/__tests__/__snapshots__/userPreferences.actions.test.ts.snap\nindex 9c527d77..bacf47c0 100644\n--- a/app/ducks/userPreferences/__tests__/__snapshots__/userPreferences.actions.test.ts.snap\n+++ b/app/ducks/userPreferences/__tests__/__snapshots__/userPreferences.actions.test.ts.snap\n@@ -4,6 +4,7 @@ exports[`userPreferences actions should export expected actions 1`] = `\n Object {\n \"acceptTermsOfUse\": [Function],\n \"changeLanguage\": [Function],\n+ \"incrementTimesStarted\": [Function],\n \"toggleNotifications\": [Function],\n \"updateLocation\": [Function],\n }\ndiff --git a/app/ducks/userPreferences/__tests__/userPreferences.actions.test.ts b/app/ducks/userPreferences/__tests__/userPreferences.actions.test.ts\nindex c08514f3..beab68ac 100644\n--- a/app/ducks/userPreferences/__tests__/userPreferences.actions.test.ts\n+++ b/app/ducks/userPreferences/__tests__/userPreferences.actions.test.ts\n@@ -32,4 +32,11 @@ describe(\"userPreferences actions should\", () => {\n };\n expect(userPreferences.actions.toggleNotifications(true)).toEqual(expectedAction);\n });\n+\n+ it(\"be able to increment the number of times app has started\", () => {\n+ const expectedAction = {\n+ type: userPreferences.actions.incrementTimesStarted.toString(),\n+ };\n+ expect(userPreferences.actions.incrementTimesStarted()).toEqual(expectedAction);\n+ });\n });\ndiff --git a/app/ducks/userPreferences/__tests__/userPreferences.reducer.test.ts b/app/ducks/userPreferences/__tests__/userPreferences.reducer.test.ts\nindex fb03c32f..f7dc85ce 100644\n--- a/app/ducks/userPreferences/__tests__/userPreferences.reducer.test.ts\n+++ b/app/ducks/userPreferences/__tests__/userPreferences.reducer.test.ts\n@@ -13,6 +13,7 @@ describe(\"userPreferences reducer should\", () => {\n activatedNotifications: false,\n location: ElectricityType.world,\n language: currentLanguage,\n+ timesStarted: 0,\n });\n });\n \n@@ -29,6 +30,7 @@ describe(\"userPreferences reducer should\", () => {\n activatedNotifications: false,\n location: ElectricityType.world,\n language: currentLanguage,\n+ timesStarted: 0,\n });\n });\n \n@@ -43,6 +45,7 @@ describe(\"userPreferences reducer should\", () => {\n activatedNotifications: false,\n location: ElectricityType.belgium,\n language: currentLanguage,\n+ timesStarted: 0,\n });\n });\n \n@@ -57,6 +60,7 @@ describe(\"userPreferences reducer should\", () => {\n activatedNotifications: true,\n location: ElectricityType.world,\n language: currentLanguage,\n+ timesStarted: 0,\n });\n });\n \n@@ -71,6 +75,21 @@ describe(\"userPreferences reducer should\", () => {\n activatedNotifications: false,\n location: ElectricityType.world,\n language: \"fr\",\n+ timesStarted: 0,\n+ });\n+ });\n+\n+ it(\"handle increment of the number of times app has started\", () => {\n+ const expectedAction = {\n+ type: userPreferences.actions.incrementTimesStarted.toString(),\n+ };\n+\n+ expect(userPreferences.reducer(undefined, expectedAction)).toEqual({\n+ acceptedTermsOfUseVersion: 0,\n+ activatedNotifications: false,\n+ location: ElectricityType.world,\n+ language: currentLanguage,\n+ timesStarted: 1,\n });\n });\n });\ndiff --git a/app/ducks/userPreferences/__tests__/userPreferences.selectors.test.ts b/app/ducks/userPreferences/__tests__/userPreferences.selectors.test.ts\nindex 436151b3..9292c3ea 100644\n--- a/app/ducks/userPreferences/__tests__/userPreferences.selectors.test.ts\n+++ b/app/ducks/userPreferences/__tests__/userPreferences.selectors.test.ts\n@@ -11,6 +11,7 @@ const initialState = {\n activatedNotifications: false,\n location: ElectricityType.world,\n language: supportedLanguages.en,\n+ timesStarted: 4,\n };\n \n describe(\"userPreferences selector should\", () => {\n@@ -35,4 +36,7 @@ describe(\"userPreferences selector should\", () => {\n \n test(\"return current language\", () =>\n expect(userPreferences.selectors.getLanguage(state)).toEqual(initialState.language));\n+\n+ test(\"return current timesStarted\", () =>\n+ expect(userPreferences.selectors.getTimesStarted(state)).toEqual(initialState.timesStarted));\n });\n", "n2p_tests": {}, "f2p_tests": {"app/ducks/userPreferences/__tests__/userPreferences.actions.test.ts": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/ducks/userPreferences/__tests__/userPreferences.selectors.test.ts": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/ducks/userPreferences/__tests__/userPreferences.reducer.test.ts": {"run": "PASS", "test": "FAIL", "fix": "PASS"}}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "NMF-earth__nmf-app-333", "org": "NMF-earth", "repo": "nmf-app", "number": 333, "state": "closed", "title": "Add ClickableTag", "body": "\r\n\r\n\u2705 I have read the [contributing file](https://github.com/NMF-earth/nmf-app/blob/main/contributing.md)\r\n\r\n## Summary\r\n\r\nThis PR creates the ClickableTag component.\r\nCloses #324\r\n\r\n## Changelog\r\n\r\n- Added the `ClickableTag` component, story and tests.\r\n", "base": {"label": "NMF-earth:main", "ref": "main", "sha": "76d3c553a36d33c039b388bb98427e85ebd80458"}, "resolved_issues": [{"number": 324, "title": "ClickableTag component", "body": "#### Summary\r\nCreate ClickableTag component with 2 props, `text` and `isSelected`\r\n\r\n#### To Do List \r\n\r\n- [ ] Code\r\n- [ ] Snapshots Tests + OnPress Test\r\n\r\n_NB: First to submit a valid PR, first to merge. Except if you already have merged some good code in this repo, I won\u2019t assign any issue due to spam and beginners unable to complete a PR without a lot of help from my side._\r\n\r\n\"Screenshot\r\n"}], "lang": "typescript", "problem_statement": "ClickableTag component\n#### Summary\r\nCreate ClickableTag component with 2 props, `text` and `isSelected`\r\n\r\n#### To Do List \r\n\r\n- [ ] Code\r\n- [ ] Snapshots Tests + OnPress Test\r\n\r\n_NB: First to submit a valid PR, first to merge. Except if you already have merged some good code in this repo, I won\u2019t assign any issue due to spam and beginners unable to complete a PR without a lot of help from my side._\r\n\r\n\"Screenshot\r\n\n", "pull_url": "https://github.com/NMF-earth/nmf-app/pull/333", "issue_urls": ["https://github.com/NMF-earth/nmf-app/issues/324"], "test_command": "NODE_OPTIONS='--experimental-vm-modules --max-old-space-size=4096' npx --no-install jest app/components/ClickableTag/__tests__/ClickableTag.test.tsx --passWithNoTests 2>&1", "fix_patch": "diff --git a/app/components/ClickableTag/ClickableTag.styles.ts b/app/components/ClickableTag/ClickableTag.styles.ts\nnew file mode 100644\nindex 00000000..c9a37298\n--- /dev/null\n+++ b/app/components/ClickableTag/ClickableTag.styles.ts\n@@ -0,0 +1,21 @@\n+import { StyleSheet } from \"react-native\";\n+\n+import { Colors } from \"style\";\n+\n+export default StyleSheet.create({\n+ default: {\n+ alignSelf: \"center\",\n+ paddingHorizontal: 10,\n+ paddingVertical: 4,\n+ borderRadius: 6,\n+ borderWidth: 1.5,\n+ },\n+ selected: {\n+ backgroundColor: Colors.green10,\n+ borderColor: Colors.green50,\n+ },\n+ unselected: {\n+ backgroundColor: Colors.grey10,\n+ borderColor: Colors.grey40,\n+ },\n+});\ndiff --git a/app/components/ClickableTag/ClickableTag.tsx b/app/components/ClickableTag/ClickableTag.tsx\nnew file mode 100644\nindex 00000000..9808321a\n--- /dev/null\n+++ b/app/components/ClickableTag/ClickableTag.tsx\n@@ -0,0 +1,31 @@\n+import React, { ReactElement } from \"react\";\n+import { StyleProp, TouchableOpacity, ViewStyle } from \"react-native\";\n+\n+import { Text } from \"components\";\n+\n+import styles from \"./ClickableTag.styles\";\n+\n+type Props = {\n+ text: string;\n+ isSelected: boolean;\n+ onPress: () => void;\n+};\n+\n+const ClickableTag = ({ text, isSelected, onPress }: Props): ReactElement => {\n+ const containerStyle: StyleProp = [\n+ styles.default,\n+ isSelected ? styles.selected : styles.unselected,\n+ ];\n+\n+ const textColor = { darkGray: !isSelected, green: isSelected };\n+\n+ return (\n+ \n+ \n+ {text}\n+ \n+ \n+ );\n+};\n+\n+export default ClickableTag;\ndiff --git a/app/components/ClickableTag/index.ts b/app/components/ClickableTag/index.ts\nnew file mode 100644\nindex 00000000..4092383a\n--- /dev/null\n+++ b/app/components/ClickableTag/index.ts\n@@ -0,0 +1,1 @@\n+export { default } from \"./ClickableTag\";\ndiff --git a/app/components/ClickableTag/stories/ClickableTag.story.tsx b/app/components/ClickableTag/stories/ClickableTag.story.tsx\nnew file mode 100644\nindex 00000000..40f9b8d1\n--- /dev/null\n+++ b/app/components/ClickableTag/stories/ClickableTag.story.tsx\n@@ -0,0 +1,15 @@\n+import React from \"react\";\n+import { storiesOf } from \"@storybook/react-native\";\n+import { boolean, text } from \"@storybook/addon-knobs\";\n+\n+import ClickableTag from \"..\";\n+\n+storiesOf(\"ClickableTag\", module).add(\"Clickable tag\", () => {\n+ {\n+ // do nothing.\n+ }}\n+ />;\n+});\ndiff --git a/storybook/storyLoader.js b/storybook/storyLoader.js\nindex 71f02999..9ff9b1d3 100644\n--- a/storybook/storyLoader.js\n+++ b/storybook/storyLoader.js\n@@ -5,6 +5,8 @@\n \n function loadStories() {\n require(\"../app/components/Button/stories/Button.story\");\n+ require(\"../app/components/ClickableTag/stories/ClickableTag.story\");\n+ require(\"../app/components/EmissionListItem/stories/EmissionListItem.story\");\n require(\"../app/components/ListItem/stories/ListItem.story\");\n require(\"../app/components/NoEmission/stories/NoEmission.story\");\n require(\"../app/components/SelectableListItem/stories/SelectableListItem.story\");\n@@ -12,11 +14,12 @@ function loadStories() {\n require(\"../app/components/Tag/__stories__/Tag.story\");\n require(\"../app/components/Text/stories/Text.story\");\n require(\"../app/components/TextInput/__stories__/TextInput.story\");\n- require(\"../app/components/EmissionListItem/stories/EmissionListItem.story\");\n }\n \n const stories = [\n \"../app/components/Button/stories/Button.story\",\n+ \"../app/components/ClickableTag/stories/ClickableTag.story\",\n+ \"../app/components/EmissionListItem/stories/EmissionListItem.story\",\n \"../app/components/ListItem/stories/ListItem.story\",\n \"../app/components/NoEmission/stories/NoEmission.story\",\n \"../app/components/SelectableListItem/stories/SelectableListItem.story\",\n@@ -24,7 +27,6 @@ const stories = [\n \"../app/components/Tag/__stories__/Tag.story\",\n \"../app/components/Text/stories/Text.story\",\n \"../app/components/TextInput/__stories__/TextInput.story\",\n- \"../app/components/EmissionListItem/stories/EmissionListItem.story\",\n ];\n \n module.exports = {\n", "test_patch": "diff --git a/app/components/ClickableTag/__tests__/ClickableTag.test.tsx b/app/components/ClickableTag/__tests__/ClickableTag.test.tsx\nnew file mode 100644\nindex 00000000..d1191003\n--- /dev/null\n+++ b/app/components/ClickableTag/__tests__/ClickableTag.test.tsx\n@@ -0,0 +1,26 @@\n+import React from \"react\";\n+import { create } from \"react-test-renderer\";\n+\n+import ClickableTag from \"..\";\n+\n+describe(\"ClickableTag tests\", () => {\n+ const mockOnPress = jest.fn();\n+ const props = {\n+ text: \"Monday\",\n+ isSelected: false,\n+ onPress: () => mockOnPress(),\n+ };\n+\n+ it(\"should render correctly\", () => {\n+ const element = create().toJSON();\n+\n+ expect(element).toMatchSnapshot();\n+ });\n+\n+ it(\"given onPress should be called\", () => {\n+ const element = create().toJSON();\n+ element.props.onPress();\n+\n+ expect(mockOnPress).toBeCalled();\n+ });\n+});\ndiff --git a/app/components/ClickableTag/__tests__/__snapshots__/ClickableTag.test.tsx.snap b/app/components/ClickableTag/__tests__/__snapshots__/ClickableTag.test.tsx.snap\nnew file mode 100644\nindex 00000000..d7e68f83\n--- /dev/null\n+++ b/app/components/ClickableTag/__tests__/__snapshots__/ClickableTag.test.tsx.snap\n@@ -0,0 +1,30 @@\n+// Jest Snapshot v1, https://goo.gl/fbAQLP\n+\n+exports[`ClickableTag tests should render correctly 1`] = `\n+\n+ \n+ Monday\n+ \n+\n+`;\n", "n2p_tests": {"should render correctly": {"run": "NONE", "test": "NONE", "fix": "PASS"}, "given onPress should be called": {"run": "NONE", "test": "NONE", "fix": "PASS"}}, "f2p_tests": {"app/components/ClickableTag/__tests__/ClickableTag.test.tsx": {"run": "NONE", "test": "FAIL", "fix": "PASS"}}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "NMF-earth__nmf-app-253", "org": "NMF-earth", "repo": "nmf-app", "number": 253, "state": "closed", "title": "Updated @expo-vector-icons", "body": "\r\n\r\n\u2705 I have read the [contributing file](https://github.com/NMF-earth/nmf-app/blob/main/contributing.md)\r\n\r\n## Summary\r\n\r\n\r\nPR resolves #252 \r\n\r\n\r\n## Changelog\r\n\r\n\r\n\r\n- Update @expo-vector-icons from `10.0.6` to `12.0.0` to solve the warning on starting the app\r\n- Change MaterialCommunityIcons to FontAwesome5 in SocialMedia component - Medium Icon was removed in [v5.0.45](https://dev.materialdesignicons.com/changelog#version-5.0.45)\r\n- Change BottomTabNavigator icons due to changes in [Ionicons 5.0.0](https://github.com/ionic-team/ionicons/releases/tag/5.0.0)\r\n- Updated SocialMedia unit test due to change in icons component (Material to FontAwesome)\r\n- Added @types/react-native-vector-icons to solve typescript problem\r\n\r\n## Demo\r\n\r\n\r\n\r\n![image](https://user-images.githubusercontent.com/39802870/103216378-a9a03100-48f4-11eb-8d57-080d2f7b8509.png)\r\n\r\nAll icons changed (SocialMedia and BottomTabNavigator)\r\n\r\n", "base": {"label": "NMF-earth:main", "ref": "main", "sha": "c4f531d8c87423494011fe9b07dfffb19e1a02bb"}, "resolved_issues": [{"number": 252, "title": "Not compatible @expo/vector-icons version", "body": "**Describe the bug**\r\nWhen you try to run the app, the following warning will appear in console:\r\n![image](https://user-images.githubusercontent.com/39802870/103212070-a9019d80-48e8-11eb-9c70-fa0f5d4c15ea.png)\r\nThe app works fine and there's no another problem besides that warning. But that's a good practice to keep it updated.\r\n\r\n**To Reproduce**\r\nSteps to reproduce the behavior:\r\n1. run `expo start`\r\n\r\n**Additional context**\r\nNew `@expo/vector-icons` have new icons and a lot of name changes in Ionicons icons\r\n"}], "lang": "typescript", "problem_statement": "Not compatible @expo/vector-icons version\n**Describe the bug**\r\nWhen you try to run the app, the following warning will appear in console:\r\n![image](https://user-images.githubusercontent.com/39802870/103212070-a9019d80-48e8-11eb-9c70-fa0f5d4c15ea.png)\r\nThe app works fine and there's no another problem besides that warning. But that's a good practice to keep it updated.\r\n\r\n**To Reproduce**\r\nSteps to reproduce the behavior:\r\n1. run `expo start`\r\n\r\n**Additional context**\r\nNew `@expo/vector-icons` have new icons and a lot of name changes in Ionicons icons\r\n\n", "pull_url": "https://github.com/NMF-earth/nmf-app/pull/253", "issue_urls": ["https://github.com/NMF-earth/nmf-app/issues/252"], "test_command": "NODE_OPTIONS='--experimental-vm-modules --max-old-space-size=4096' npx --no-install jest app/components/ListItem/__tests__/ListItem.test.tsx app/components/SocialMedia/__tests__/SocialMedia.test.tsx app/screens/Act/__tests__/ActScreen.test.tsx app/screens/Budget/components/ProgressChart/__tests__/ProgressChart.test.tsx app/screens/Emissions/components/EmissionsListItem/__tests__/EmissionListItem.test.tsx app/screens/Settings/components/SettingsRow/__tests__/SettingsRow.test.tsx --passWithNoTests 2>&1", "fix_patch": "diff --git a/app/components/ListItem/ListItem.tsx b/app/components/ListItem/ListItem.tsx\nindex 318b7371..e81eb2bb 100644\n--- a/app/components/ListItem/ListItem.tsx\n+++ b/app/components/ListItem/ListItem.tsx\n@@ -20,7 +20,7 @@ const ListItem = ({ title, onPress }: Props) => {\n \n \ndiff --git a/app/components/SocialMedia/SocialMedia.tsx b/app/components/SocialMedia/SocialMedia.tsx\nindex 4ac1d37f..afe63392 100644\n--- a/app/components/SocialMedia/SocialMedia.tsx\n+++ b/app/components/SocialMedia/SocialMedia.tsx\n@@ -1,6 +1,6 @@\n import React from \"react\";\n import { View, TouchableOpacity } from \"react-native\";\n-import { MaterialCommunityIcons } from \"@expo/vector-icons\";\n+import { FontAwesome5 } from \"@expo/vector-icons\";\n import * as Linking from \"expo-linking\";\n \n import { Colors } from \"style\";\n@@ -14,7 +14,7 @@ const socialMedia = [\n \"https://join.slack.com/t/not-my-fault/shared_invite/enQtODMzMzcyNjExMzc3LTVlNDQwMTA0OGUxMmJmNTE4MTA4MTgwZGZmNTBiZmRhNTcxY2FlN2MzZGQyMmRjZDVjN2Q2MjFlNzE4ZGI5ZTI\",\n },\n {\n- iconName: \"github-circle\",\n+ iconName: \"github\",\n url: \"https://github.com/NMF-earth\",\n },\n {\n@@ -22,23 +22,21 @@ const socialMedia = [\n url: \"https://mastodon.social/@nmf_earth\",\n },\n {\n- iconName: \"medium\",\n+ iconName: \"medium-m\",\n url: \"https://medium.com/@nmf_earth\",\n },\n ];\n \n-export default () => (\n+const SocialMedia = () => (\n \n \n {socialMedia.map((item, index) => (\n Linking.openURL(item.url)}>\n- \n+ \n \n ))}\n \n \n );\n+\n+export default SocialMedia;\ndiff --git a/app/navigation/Navigator/BottomTabNavigator.tsx b/app/navigation/Navigator/BottomTabNavigator.tsx\nindex 0dea2ae5..07d9b47d 100644\n--- a/app/navigation/Navigator/BottomTabNavigator.tsx\n+++ b/app/navigation/Navigator/BottomTabNavigator.tsx\n@@ -23,21 +23,21 @@ const BudgetOptions = {\n const EmissionsOptions = {\n tabBarLabel: t(\"EMISSIONS_SCREEN_TAB_NAME\"),\n tabBarIcon: ({ focused }) => (\n- \n+ \n ),\n };\n \n const ActOptions = {\n tabBarLabel: t(\"ACT_SCREEN_TAB_NAME\"),\n tabBarIcon: ({ focused }) => (\n- \n+ \n ),\n };\n \n const SettingsOptions = {\n tabBarLabel: t(\"SETTINGS_SCREEN_TAB_NAME\"),\n tabBarIcon: ({ focused }) => (\n- \n+ \n ),\n };\n \ndiff --git a/app/screens/Emissions/components/EmissionsListItem/EmissionsListItem.tsx b/app/screens/Emissions/components/EmissionsListItem/EmissionsListItem.tsx\nindex 3579e7b0..c4d7dc8a 100644\n--- a/app/screens/Emissions/components/EmissionsListItem/EmissionsListItem.tsx\n+++ b/app/screens/Emissions/components/EmissionsListItem/EmissionsListItem.tsx\n@@ -50,7 +50,7 @@ const EmissionsListItem = ({\n \n \n {\n return (\n \n {title}\n- \n+ \n \n );\n };\ndiff --git a/package.json b/package.json\nindex 56364e26..e25d76f6 100644\n--- a/package.json\n+++ b/package.json\n@@ -26,7 +26,7 @@\n ]\n },\n \"dependencies\": {\n- \"@expo/vector-icons\": \"10.0.6\",\n+ \"@expo/vector-icons\": \"12.0.0\",\n \"@react-native-community/datetimepicker\": \"3.0.4\",\n \"@react-native-community/masked-view\": \"0.1.10\",\n \"@react-native-community/slider\": \"3.0.3\",\n@@ -88,6 +88,7 @@\n \"@types/ramda\": \"0.26.39\",\n \"@types/react\": \"16.9.35\",\n \"@types/react-native\": \"0.63.2\",\n+ \"@types/react-native-vector-icons\": \"6.4.6\",\n \"@types/react-redux\": \"7.1.7\",\n \"@types/react-test-renderer\": \"16.9.2\",\n \"@types/uuid\": \"3.4.6\",\ndiff --git a/yarn.lock b/yarn.lock\nindex 07a8b88e..0e13ca09 100644\n--- a/yarn.lock\n+++ b/yarn.lock\n@@ -1258,12 +1258,17 @@\n dependencies:\n cross-spawn \"^6.0.5\"\n \n-\"@expo/vector-icons@10.0.6\":\n- version \"10.0.6\"\n- resolved \"https://registry.yarnpkg.com/@expo/vector-icons/-/vector-icons-10.0.6.tgz#5718953ff0b97827d11dae5787976fa8ce5caaed\"\n- integrity sha512-qNlKPNdf073LpeEpyClxAh0D3mmIK4TGAQzeKR0HVwf14RIEe17+mLW5Z6Ka5Ho/lUtKMRPDHumSllFyKvpeGg==\n+\"@expo/vector-icons@12.0.0\":\n+ version \"12.0.0\"\n+ resolved \"https://registry.yarnpkg.com/@expo/vector-icons/-/vector-icons-12.0.0.tgz#200859ed32095847abd5cce8efe9aa1c7286f1f8\"\n+ integrity sha512-R8kVnAamF48bFEctgunkgYB4HImQ/wO2d0r23QgW3snSWe+gZmXukcvm45d8SRCvnMdRRXnZdTsYLYKSNrux4Q==\n dependencies:\n- lodash \"^4.17.4\"\n+ lodash.frompairs \"^4.0.1\"\n+ lodash.isequal \"^4.5.0\"\n+ lodash.isstring \"^4.0.1\"\n+ lodash.omit \"^4.5.0\"\n+ lodash.pick \"^4.4.0\"\n+ lodash.template \"^4.5.0\"\n \n \"@expo/vector-icons@^12.0.0\":\n version \"12.0.2\"\n@@ -1730,7 +1735,7 @@\n resolved \"https://registry.yarnpkg.com/@react-native-community/slider/-/slider-3.0.3.tgz#830167fd757ba70ac638747ba3169b2dbae60330\"\n integrity sha512-8IeHfDwJ9/CTUwFs6x90VlobV3BfuPgNLjTgC6dRZovfCWigaZwVNIFFJnHBakK3pW2xErAPwhdvNR4JeNoYbw==\n \n-\"@react-navigation/bottom-tabs@^5.11.2\":\n+\"@react-navigation/bottom-tabs@5.11.2\":\n version \"5.11.2\"\n resolved \"https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-5.11.2.tgz#5b541612fcecdea2a5024a4028da35e4a727bde6\"\n integrity sha512-7+hH00N9Ze74VcX8uYWVyXFXZ0Fwid+lG+SSLtmnJjk1Y6oIQpQ17EPqKO0UZlKKjhsvMlAnL5fdgFtoqnSjcA==\n@@ -1771,7 +1776,7 @@\n dependencies:\n nanoid \"^3.1.15\"\n \n-\"@react-navigation/stack@^5.12.8\":\n+\"@react-navigation/stack@5.12.8\":\n version \"5.12.8\"\n resolved \"https://registry.yarnpkg.com/@react-navigation/stack/-/stack-5.12.8.tgz#31e54e05d8a3ffaaa3e39a1a9b7969f8316a35bf\"\n integrity sha512-wUJFbU0v606RBXOUxHToCXJNmiwxtFYhN2TFvjxCZ3PJU+OWWx8HTmn99pT3rVH4Ax2cfO5BDUy9v+r74ZrIWw==\n@@ -2630,6 +2635,21 @@\n \"@types/react\" \"*\"\n \"@types/reactcss\" \"*\"\n \n+\"@types/react-native-vector-icons@^6.4.6\":\n+ version \"6.4.6\"\n+ resolved \"https://registry.yarnpkg.com/@types/react-native-vector-icons/-/react-native-vector-icons-6.4.6.tgz#848e3b14572def56212cafbf5cb1254b445bfb41\"\n+ integrity sha512-lAyxNfMd5L1xZvXWsGcJmNegDf61TAp40uL6ashNNWj9W3IrDJO59L9+9inh0Y2MsEZpLTdxzVU8Unb4/0FQng==\n+ dependencies:\n+ \"@types/react\" \"*\"\n+ \"@types/react-native\" \"*\"\n+\n+\"@types/react-native@*\":\n+ version \"0.63.43\"\n+ resolved \"https://registry.yarnpkg.com/@types/react-native/-/react-native-0.63.43.tgz#0278dd540f8479b35ae5d6ef373dd9b3be4cffb1\"\n+ integrity sha512-zFD+rFf7xmk3ZL5laaGdWB8NLNoN36TjHc2M5PcT5gXcDk7ZJBPsiabNcPDQPSIU/om8YPwBpaFdd1IiyuIM+g==\n+ dependencies:\n+ \"@types/react\" \"*\"\n+\n \"@types/react-native@0.63.2\":\n version \"0.63.2\"\n resolved \"https://registry.yarnpkg.com/@types/react-native/-/react-native-0.63.2.tgz#428a4d71351ccbc31ab170b5f32477c7ce78dfd7\"\n@@ -6122,7 +6142,7 @@ expo-application@~2.4.1:\n resolved \"https://registry.yarnpkg.com/expo-application/-/expo-application-2.4.1.tgz#f8eb4a3a05a0b8a8f38f2e981f587a815945b685\"\n integrity sha512-VHDvXz55LIYdLoE1aR0AFycB1jz4ggbMToUbKAbCEjro+PdUNm/Gj8gQeFgH6wL2oAztQH4qJ+uiOwrw8SFK+Q==\n \n-expo-asset@~8.2.1:\n+expo-asset@8.2.1, expo-asset@~8.2.1:\n version \"8.2.1\"\n resolved \"https://registry.yarnpkg.com/expo-asset/-/expo-asset-8.2.1.tgz#1b69724f29ca4260805f2e6368c4428d8ad90cc6\"\n integrity sha512-M97jZU83Gm6wWGkrCwTzDVlufQCmnrCbmW4AMOH6xl3XhwOpgsQ6m6xrwT0Sq1tto7JUuL0tPbB9vb9L7yLfyg==\n@@ -6150,6 +6170,14 @@ expo-constants@9.3.1:\n fbjs \"1.0.0\"\n uuid \"^3.3.2\"\n \n+expo-constants@9.3.3:\n+ version \"9.3.3\"\n+ resolved \"https://registry.yarnpkg.com/expo-constants/-/expo-constants-9.3.3.tgz#e02b71109e0514d17aa7eacbad44f1277eca1ae8\"\n+ integrity sha512-QDjM4rbUiBCpWb4XJvkZHJnrrm40EcHBj3ZRhc/IcZVFt+BlsSHIg3YlZ0ncjikYswVGEY85kcJy1Kq1g6ib3w==\n+ dependencies:\n+ fbjs \"1.0.0\"\n+ uuid \"^3.3.2\"\n+\n expo-device@*:\n version \"2.4.0\"\n resolved \"https://registry.yarnpkg.com/expo-device/-/expo-device-2.4.0.tgz#277f830827c3b12710f1db5c0096d507e751689b\"\n@@ -6172,7 +6200,7 @@ expo-file-system@~9.3.0:\n dependencies:\n uuid \"^3.4.0\"\n \n-expo-font@~8.4.0:\n+expo-font@8.4.0, expo-font@~8.4.0:\n version \"8.4.0\"\n resolved \"https://registry.yarnpkg.com/expo-font/-/expo-font-8.4.0.tgz#7cb4cc9d852dd8d0977ce425146b94221b40c1d5\"\n integrity sha512-CPGcHLUkPP+yf618fiw2bWTFLojIYCCqWonco/JONcM3tsv6wjkafx4Qw1mMCRoFL7XoiBfHylkKnD0avpzQIQ==\n@@ -6190,7 +6218,7 @@ expo-linear-gradient@~8.4.0:\n resolved \"https://registry.yarnpkg.com/expo-linear-gradient/-/expo-linear-gradient-8.4.0.tgz#34e6f960b1971c57dacf7211c747ba490a76bf63\"\n integrity sha512-f9JOXaIl0MR8RBYRIud5UAsEi52oz81XhQs73VUpujemHjOyHmrZa6dqwf399YOwI/WBwbpcINcUIw/mCYE1mA==\n \n-expo-linking@~2.0.0:\n+expo-linking@2.0.0, expo-linking@~2.0.0:\n version \"2.0.0\"\n resolved \"https://registry.yarnpkg.com/expo-linking/-/expo-linking-2.0.0.tgz#c39f610825e99ef0d10e8d82fbcf7beed8456b00\"\n integrity sha512-/48/+MHa96l3/YgL0uM/hbli+H0J8XXAUWgMCBpTIcmUc0POYw4Xp+7BhXcTbPRZsVoOiAHAmKIsEjFVTd5L+A==\n@@ -6199,7 +6227,7 @@ expo-linking@~2.0.0:\n qs \"^6.5.0\"\n url-parse \"^1.4.4\"\n \n-expo-localization@~9.1.0:\n+expo-localization@9.1.0:\n version \"9.1.0\"\n resolved \"https://registry.yarnpkg.com/expo-localization/-/expo-localization-9.1.0.tgz#463381568082fdcb28ad4e4c533a6f9471a3f78a\"\n integrity sha512-0KYVUOJAHVRS/5oq0Bcf2i0imKOIFdpLnnNSG9XeaskkNgNSnbzeTQsoDvHi9UGYLwwtUo9HLciQJ/xcoSiftw==\n@@ -6211,7 +6239,7 @@ expo-location@~10.0.0:\n resolved \"https://registry.yarnpkg.com/expo-location/-/expo-location-10.0.0.tgz#2923411649434f2f079343b163b13c5c9eee8b2d\"\n integrity sha512-QLEb0iaBv4/blLxxfKRj2/HPisY+1t+g6MgegqZ1j1U/0qih4dvzUQrxie9ZOZyQB9gnXFCRnZv3QzHEb52dcA==\n \n-expo-notifications@~0.8.2:\n+expo-notifications@0.8.2:\n version \"0.8.2\"\n resolved \"https://registry.yarnpkg.com/expo-notifications/-/expo-notifications-0.8.2.tgz#69e04a4e48ec6bafaeb354d284fbc23c26f2d62d\"\n integrity sha512-eX/HB96FqXzSMAwtA/fhxB1tGYELQywPm7oBTfnALHH3MFHy1bW7NZYGcU82sDF+DF09uLZ4Fn4p5ValMWA5TA==\n@@ -6234,7 +6262,7 @@ expo-secure-store@~9.3.0:\n resolved \"https://registry.yarnpkg.com/expo-secure-store/-/expo-secure-store-9.3.0.tgz#b716d5d115cc50a34037d1afef84fe4b8ea0745c\"\n integrity sha512-dNhKcoUUn+1kmEfFVxSU7h+YsqODqlExZQJcQgxgeiuCeeDvJWkE10t3jjrO6aNfrdM5i/X2l3oh401EDslWsQ==\n \n-expo-splash-screen@~0.8.1:\n+expo-splash-screen@0.8.1:\n version \"0.8.1\"\n resolved \"https://registry.yarnpkg.com/expo-splash-screen/-/expo-splash-screen-0.8.1.tgz#de4a018c82af879eeaa9b697013ef37d9567453a\"\n integrity sha512-7NQo8OgkfQ4sv4mIHE58fkiQTGyl5dOP70uAUTb5YXC/QUsHIqEpKQ6ZXDpkLU1cbZ32c8Vtok4r2FRIUrzxcg==\n@@ -6249,19 +6277,19 @@ expo-sqlite@~8.5.0:\n \"@expo/websql\" \"^1.0.1\"\n lodash \"^4.17.15\"\n \n-expo-status-bar@~1.0.3:\n+expo-status-bar@1.0.3:\n version \"1.0.3\"\n resolved \"https://registry.yarnpkg.com/expo-status-bar/-/expo-status-bar-1.0.3.tgz#62b4d6145680abd43ba6ecfa465f835e88bf6263\"\n integrity sha512-/Orgla1nkIrfswNHbuAOTbPVq0g3+GrhoQVk7MRafY2dwrFLgXhaPExS+eN2hpmzqPv2LG5cqAZDCQUAjmZYBQ==\n \n-expo-web-browser@~8.6.0:\n+expo-web-browser@8.6.0:\n version \"8.6.0\"\n resolved \"https://registry.yarnpkg.com/expo-web-browser/-/expo-web-browser-8.6.0.tgz#121ad81b2597b8273739b630c278a6f6937b95ae\"\n integrity sha512-VHFuBl0im00yEVbEzOZUrQVvq8uGhyU/4WivJkfLF4GA3Pj7CaG6PMo0+6YNzkzB1JoVx5AfuKgBbSuOuETP9Q==\n dependencies:\n compare-urls \"^2.0.0\"\n \n-expo@^40.0.0:\n+expo@40.0.0:\n version \"40.0.0\"\n resolved \"https://registry.yarnpkg.com/expo/-/expo-40.0.0.tgz#6caf03587532cd18b482991332a8b75eeca2fcb7\"\n integrity sha512-LT6Ae/Ms0qtRyJlJsj/FMB5AQpj6nED39SY9KqY4zK/uFG+R7DJ/4VUzkPued1mWtRUrtaqR+t88pA3p0vAWcg==\n@@ -8261,10 +8289,10 @@ jest-environment-node@^25.5.0:\n jest-util \"^25.5.0\"\n semver \"^6.3.0\"\n \n-jest-expo@^40.0.0:\n- version \"40.0.1\"\n- resolved \"https://registry.yarnpkg.com/jest-expo/-/jest-expo-40.0.1.tgz#3ee1e955036eff1e0b7d0b4ec599701bc65eaa2d\"\n- integrity sha512-4X6x4Xj4ErUxhfDhZJyWob/xg3KuOReQidQYXPMTEUEG1Qw5LchCV2wm4fcuQwRGTks9DGpB/2eM3PosVdwCpA==\n+jest-expo@40.0.0:\n+ version \"40.0.0\"\n+ resolved \"https://registry.yarnpkg.com/jest-expo/-/jest-expo-40.0.0.tgz#eb472c0a9df943b1e9bbc74e4bad88a373b656d2\"\n+ integrity sha512-rRi/EmgAY/GwaVqyBvzOMwaE/nb7A4+l27Io85RCTBgeN5qIxm2YntQp+zvj5ux7qkN9JYZiRNpXCqiWEXmJ9w==\n dependencies:\n \"@expo/config\" \"^3.2.3\"\n babel-jest \"^25.2.0\"\n@@ -9066,7 +9094,7 @@ lodash.unescape@4.0.1:\n resolved \"https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c\"\n integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=\n \n-lodash@^4.0.1, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.6.0:\n+lodash@^4.0.1, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.6.0:\n version \"4.17.20\"\n resolved \"https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52\"\n integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==\n@@ -11322,7 +11350,7 @@ react-native-color-picker@^0.4.0:\n prop-types \"^15.5.10\"\n tinycolor2 \"^1.4.1\"\n \n-react-native-gesture-handler@~1.8.0:\n+react-native-gesture-handler@1.8.0:\n version \"1.8.0\"\n resolved \"https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.8.0.tgz#18f61f51da50320f938957b0ee79bc58f47449dc\"\n integrity sha512-E2FZa0qZ5Bi0Z8Jg4n9DaFomHvedSjwbO2DPmUUHYRy1lH2yxXUpSrqJd6yymu+Efzmjg2+JZzsjFYA2Iq8VEQ==\n@@ -11385,10 +11413,10 @@ react-native-modal@^11.0.2:\n prop-types \"^15.6.2\"\n react-native-animatable \"1.3.3\"\n \n-react-native-reanimated@~1.13.0:\n- version \"1.13.2\"\n- resolved \"https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.13.2.tgz#1ae5457b24b4913d173a5a064bb28eae7783d293\"\n- integrity sha512-O+WhgxSjOIzcVdAAvx+h2DY331Ek1knKlaq+jsNLpC1fhRy9XTdOObovgob/aF2ve9uJfPEawCx8381g/tUJZQ==\n+react-native-reanimated@1.13.0:\n+ version \"1.13.0\"\n+ resolved \"https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.13.0.tgz#1ee5d27d34bd2cee7dfad4ae9a3673300872c917\"\n+ integrity sha512-uadP/0QO+4TCsyPSvzRdl+76NPM7Bp8M25KQLB4Hg3tWBMjhrMrETnzNi33L/OPfmhU+7rceyi0QPe/DxKT5bQ==\n dependencies:\n fbjs \"^1.0.0\"\n \n@@ -11407,7 +11435,7 @@ react-native-safe-area-context@3.1.9:\n resolved \"https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-3.1.9.tgz#48864ea976b0fa57142a2cc523e1fd3314e7247e\"\n integrity sha512-wmcGbdyE/vBSL5IjDPReoJUEqxkZsywZw5gPwsVUV1NBpw5eTIdnL6Y0uNKHE25Z661moxPHQz6kwAkYQyorxA==\n \n-react-native-screens@~2.15.0:\n+react-native-screens@2.15.0:\n version \"2.15.0\"\n resolved \"https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-2.15.0.tgz#9b97c1881c4fcdf304bf363f0013225901625f44\"\n integrity sha512-qTSQPy0WKHtlb8xt5gY0Gt6sdvfQUQAnFSqgsggW9UEvySbkHzpqOrOYNA79Ca8oXO0dCFwp6X8buIiDefa7+Q==\n", "test_patch": "diff --git a/app/components/ListItem/__tests__/__snapshots__/ListItem.test.tsx.snap b/app/components/ListItem/__tests__/__snapshots__/ListItem.test.tsx.snap\nindex 9d4ffda9..9e718427 100644\n--- a/app/components/ListItem/__tests__/__snapshots__/ListItem.test.tsx.snap\n+++ b/app/components/ListItem/__tests__/__snapshots__/ListItem.test.tsx.snap\n@@ -22,7 +22,7 @@ exports[` render 1`] = `\n \n {\n+ // eslint-disable-next-line @typescript-eslint/no-var-requires\n+ const { View } = require(\"react-native\");\n+ return {\n+ FontAwesome5: View,\n+ };\n+});\n+\n beforeEach(() => {\n jest.spyOn(Linking, \"openURL\").mockImplementation((url: string) => {\n if (url) {\n@@ -16,7 +24,7 @@ beforeEach(() => {\n });\n \n test(\"renders correctly SocialMedia\", () => {\n- const tree = create().toJSON();\n+ const tree = create();\n expect(tree).toMatchSnapshot();\n });\n \ndiff --git a/app/components/SocialMedia/__tests__/__snapshots__/SocialMedia.test.tsx.snap b/app/components/SocialMedia/__tests__/__snapshots__/SocialMedia.test.tsx.snap\nindex 4a9c6666..040774f2 100644\n--- a/app/components/SocialMedia/__tests__/__snapshots__/SocialMedia.test.tsx.snap\n+++ b/app/components/SocialMedia/__tests__/__snapshots__/SocialMedia.test.tsx.snap\n@@ -25,7 +25,7 @@ exports[`renders correctly SocialMedia 1`] = `\n \n- \n- \n \n \n- \n- \n \ndiff --git a/app/screens/Act/__tests__/__snapshots__/ActScreen.test.tsx.snap b/app/screens/Act/__tests__/__snapshots__/ActScreen.test.tsx.snap\nindex e10f0945..fb65db74 100644\n--- a/app/screens/Act/__tests__/__snapshots__/ActScreen.test.tsx.snap\n+++ b/app/screens/Act/__tests__/__snapshots__/ActScreen.test.tsx.snap\n@@ -163,7 +163,7 @@ exports[`ActScreen renders correctly 1`] = `\n \n \n \n \n \n \n \n- 2020\n+ 2021\n \n \n \n \n \ndiff --git a/app/screens/Emissions/components/EmissionsListItem/__tests__/__snapshots__/EmissionListItem.test.tsx.snap b/app/screens/Emissions/components/EmissionsListItem/__tests__/__snapshots__/EmissionListItem.test.tsx.snap\nindex b44c20a7..3b96c729 100644\n--- a/app/screens/Emissions/components/EmissionsListItem/__tests__/__snapshots__/EmissionListItem.test.tsx.snap\n+++ b/app/screens/Emissions/components/EmissionsListItem/__tests__/__snapshots__/EmissionListItem.test.tsx.snap\n@@ -95,7 +95,7 @@ exports[`EmissionsListItem renders correctly if mitigated 1`] = `\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n", "n2p_tests": {}, "f2p_tests": {"app/components/SocialMedia/__tests__/SocialMedia.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/screens/Settings/components/SettingsRow/__tests__/SettingsRow.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/components/ListItem/__tests__/ListItem.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/screens/Emissions/components/EmissionsListItem/__tests__/EmissionListItem.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "app/screens/Act/__tests__/ActScreen.test.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "NMF-earth__nmf-app-246", "org": "NMF-earth", "repo": "nmf-app", "number": 246, "state": "closed", "title": "Fix 239 little bug in a guide script", "body": "\r\n\r\n\u2705 I have read the [contributing file](https://github.com/NMF-earth/nmf-app/blob/main/contributing.md)\r\n\r\n## Summary\r\n\r\nFixes #239 \r\n\r\n## Changelog\r\n\r\nUpdated the generate guides stript to fix the key path as it was before\r\n", "base": {"label": "NMF-earth:main", "ref": "main", "sha": "8b83bbd75f0bcb0ac4078fa25cfc193bee3bfce6"}, "resolved_issues": [{"number": 239, "title": "Fix little bug in a guide script", "body": "**Describe the bug**\r\n\r\nRemove \"personal\" path (`/Users/pierrebresson/Documents/Git/nmf-app/assets//markdown/`) in snapshot file (like it was before). See `key` in this hot [fix](https://github.com/NMF-earth/nmf-app/commit/a32dc9adc900803964ec7964d299d04a6a9a87f1)\r\n\r\nThis is a side effect of using `${process.env.PWD}` in order to make the script work (see issue #199 )"}], "lang": "typescript", "problem_statement": "Fix little bug in a guide script\n**Describe the bug**\r\n\r\nRemove \"personal\" path (`/Users/pierrebresson/Documents/Git/nmf-app/assets//markdown/`) in snapshot file (like it was before). See `key` in this hot [fix](https://github.com/NMF-earth/nmf-app/commit/a32dc9adc900803964ec7964d299d04a6a9a87f1)\r\n\r\nThis is a side effect of using `${process.env.PWD}` in order to make the script work (see issue #199 )\n", "pull_url": "https://github.com/NMF-earth/nmf-app/pull/246", "issue_urls": ["https://github.com/NMF-earth/nmf-app/issues/239"], "test_command": "NODE_OPTIONS='--experimental-vm-modules --max-old-space-size=4096' npx --no-install jest app/screens/Act/__tests__/ActScreen.test.tsx --passWithNoTests 2>&1", "fix_patch": "diff --git a/assets/guides/guides.json b/assets/guides/guides.json\nindex 04b37525..4b56c0d3 100644\n--- a/assets/guides/guides.json\n+++ b/assets/guides/guides.json\n@@ -1,1 +1,1 @@\n-[{\"title\":\"Clean your cloud data\",\"category\":\"digital\",\"body\":\"

Clean your cloud data

\\n

When your data is saved on the cloud, it means it's saved on remote computers (servers). It's really nice and convenient because if you loose your computer or your phone, your data is not lost!

\\n

However, redundant data is not environmental friendly at all and will never be. Remember this: everytime you save data, transfer data it means CO2 emissions.

\\n

Servers as well as your devices needs many rare metals but also because it needs electricity to work. For the servers, it's every single day of the year with no down time, to make sure you can access your data at any time of the day. As you know, electricity production always emits CO2, even if it's solar, windmills or nuclear. Yes, there is no "green" energy and solar panels manufacturing pollutes a lot.

\\n

Therefore, the less emails you have on your mailbox, the less data you have on the cloud, the better for the environment.

\\n

More data = more pollution

\\n\",\"key\":\"/Users/pierrebresson/Documents/Git/nmf-app/assets//markdown/clean-your-cloud-data.md\"},{\"title\":\"Find replacement for internet giants\",\"category\":\"digital\",\"body\":\"

Find replacement for internet giants

\\n

G**gle, Facebook, \ud83c\udf4f and any other tech monsters are harvesting data about their users and that's a bad thing for you and the environment.

\\n

If something is free, there is a trick, right? The more data these companies have on you, the more valuable you are for them. It allows target ads depending on your age, sex, religion, political opinion etc.

\\n

Framasoft a French association is trying to de-g**gle-ify the internet by providing the same services as some of the GAFA but in a ethical and open source way.

\\n

Examples :

\\n
    \\n
  • Peertube alternative to Youtube.
    • \\n
  • Mobilizon is an alternative to Meetup and Facebook events.
    • \\n
  • FramaTalk as a replacement for Zoom/Skype
    • \\n
  • Framagenda: creating public or private calendars
    • \\n
\\n

Visit Framasoft website for more info and services!

\\n

Alternative to :

\\n\\n\",\"key\":\"/Users/pierrebresson/Documents/Git/nmf-app/assets//markdown/gafa-replacement.md\"},{\"title\":\"Eating seasonal and local\",\"category\":\"kitchen\",\"body\":\"

Eating seasonal fruits and vegetables

\\n

We all love tomatoes. But eating tomatoes during the whole year is not sustainable. During winter, we eat imported tomatoes or cultivated in greenhouses. And that\u2019s a pity : tomatoes are more juicy and tasteful during summer. Respecting nature by eating seasonal fruit and vegetables can be a very interesting challenge to make you discover new ingredients such as black radish, lotus root or winter melon.

\\n

Fun fact\u00a0: cheese are also seasonal.

\\n

Eating locally

\\n

You\u2019re already eating less meat or you\u2019re already vegetarian? Great! Next step, you can become a locavore, which means that the food you're eating is limited from an area of 50 to 200 kilometers. Of course, it\u2019s easier to eat locally when you leaving in the countryside than in a big town. But it is still possible !

\\n\",\"key\":\"/Users/pierrebresson/Documents/Git/nmf-app/assets//markdown/eat-seasonal-and-local.md\"},{\"title\":\"Get a phone you can repair/upgrade\",\"category\":\"digital\",\"body\":\"

Buy a phone you can repair

\\n

A lot of people are changing their phones because the screen is damage, because they want a better camera or because the battery is not working well anymore.

\\n

Changing phone every year is not sustainable and it's bad for the environement. To face this issue, a Dutch company, Fairphone, is making ethical and modular phone that you can fix and upgrade yourself.

\\n

If you are on Android, installing an alternative rom like LineageOS can make your old phone faster and increase its lifespan.

\\n\",\"key\":\"/Users/pierrebresson/Documents/Git/nmf-app/assets//markdown/repair-phone.md\"},{\"title\":\"Avoid streaming\",\"category\":\"digital\",\"body\":\"

Avoid streaming

\\n

Streaming is nice, streaming is amazing, but have you ever though about the consequences on the environement?

\\n

To give you an idea on how bad the streaming is, let's take an example. The size of the article text in the English Wikipedia is around 20 gigabytes of data in 2020. It means that everytime you watch a season of the Walking Dead in HD (1080p), you have downloaded on your computer/phone the same amount of data as the entire Wikipedia encyclopedia.

\\n

Same applies to Spotify, Apple Music, Amazon and Youtube. Music is much smaller than a HD video but an average user consumes several songs in a day so at the end of the year, the impact of the climate is not negligeable.

\\n

Both music and video streaming relies on servers as well as internet infrastuctures to transport the data to you. All of this has a cost, so instead of streaming in all circomstances, try to listen to the radio, go the cinema.... Who knows, you might end up meeting real people in real life!

\\n

Don't forget to cancel autoplay by default, leading to unecessary streaming like Youtube is doing. In most video streaming platform, you can save this behavior in the preferences. If you can, use Peertube, a decentralized and open-source video platform, much better for the environement compared to Youtube and more ethical.

\\n

If you still want to use YouTube, we recomment Youtube Focus, an add-on who tries to promote a healthier watching. As said on their Github, YouTube has one billion hours whatched daily, and it\u2019s recommendation algorithm generates more than 70% of views. That means 700.000.000 hours every single day. What means that the greatest slice of time that people spend on YouTube isnt because they searched for something to whatch or something to learn, it is because they were sugested by YouTube's algorithm.

\\n\",\"key\":\"/Users/pierrebresson/Documents/Git/nmf-app/assets//markdown/avoid-streaming.md\"},{\"title\":\"Reduce your browsing emissions\",\"category\":\"digital\",\"body\":\"

Calculate your browsing carbon impact and reduce it

\\n

They are several browser add-ons, mainly for Chrome and Firefox, that can help you decrease and understand better your digital carbon emissions.

\\n
    \\n
  • Carbon analyser: excellent plugin that will help you to have an idea on what you emit when you browse the internet. It shows a chart of your main emissions so you can act on it. Open-source and made by the awesome french association the Shift Project.
    • \\n
  • Low Tech: open-source extension aims to reduce our datas and limit the energy consumption of our Internet browsing. For example, when possible, video quality is set to low quality, autoplay and loop parameters are disabled. If it's possible, quality of images is decreased or loading delayed and animated gif only plays when hovering them. Some "superfluous" content can also be blocked like share and like button, avatar images or fonts. 100 % approved and recommended by the NMF.earth team!
    • \\n
  • Bare Tracker: helps peoples get a barer, lighter browsing experience by informing them about their browsing environmental impact. Similar to carbon analyser.
    • \\n
\\n\",\"key\":\"/Users/pierrebresson/Documents/Git/nmf-app/assets//markdown/internet-browsing-impact.md\"},{\"title\":\"Install an add blocker\",\"category\":\"digital\",\"body\":\"

Install an add blocker

\\n

All modern browser like Firefox, Safari, Chrome... let users the posibility to install add-ons, also name plugins or extensions.

\\n

In order to not get ads or to see less ads, you can install the following browser extensions :

\\n
    \\n
  • Ghostery: built-in ad blocker removing advertisements from a web page to eliminate clutter so you can focus on the content you want. Protect your privacy, browse faster.
    • \\n
  • uBlock Origin : content blocker with CPU and memory efficiency as a primary feature.
    • \\n
\\n

Less ads, less compulsatory purchases, less CO2 emissions

\\n\",\"key\":\"/Users/pierrebresson/Documents/Git/nmf-app/assets//markdown/ad-blocker.md\"}]\n\\ No newline at end of file\n+[{\"title\":\"Avoid streaming\",\"category\":\"digital\",\"body\":\"

Avoid streaming

\\n

Streaming is nice, streaming is amazing, but have you ever though about the consequences on the environement?

\\n

To give you an idea on how bad the streaming is, let's take an example. The size of the article text in the English Wikipedia is around 20 gigabytes of data in 2020. It means that everytime you watch a season of the Walking Dead in HD (1080p), you have downloaded on your computer/phone the same amount of data as the entire Wikipedia encyclopedia.

\\n

Same applies to Spotify, Apple Music, Amazon and Youtube. Music is much smaller than a HD video but an average user consumes several songs in a day so at the end of the year, the impact of the climate is not negligeable.

\\n

Both music and video streaming relies on servers as well as internet infrastuctures to transport the data to you. All of this has a cost, so instead of streaming in all circomstances, try to listen to the radio, go the cinema.... Who knows, you might end up meeting real people in real life!

\\n

Don't forget to cancel autoplay by default, leading to unecessary streaming like Youtube is doing. In most video streaming platform, you can save this behavior in the preferences. If you can, use Peertube, a decentralized and open-source video platform, much better for the environement compared to Youtube and more ethical.

\\n

If you still want to use YouTube, we recomment Youtube Focus, an add-on who tries to promote a healthier watching. As said on their Github, YouTube has one billion hours whatched daily, and it\u2019s recommendation algorithm generates more than 70% of views. That means 700.000.000 hours every single day. What means that the greatest slice of time that people spend on YouTube isnt because they searched for something to whatch or something to learn, it is because they were sugested by YouTube's algorithm.

\\n\",\"key\":\".//markdown/avoid-streaming.md\"},{\"title\":\"Install an add blocker\",\"category\":\"digital\",\"body\":\"

Install an add blocker

\\n

All modern browser like Firefox, Safari, Chrome... let users the posibility to install add-ons, also name plugins or extensions.

\\n

In order to not get ads or to see less ads, you can install the following browser extensions :

\\n
    \\n
  • Ghostery: built-in ad blocker removing advertisements from a web page to eliminate clutter so you can focus on the content you want. Protect your privacy, browse faster.
    • \\n
  • uBlock Origin : content blocker with CPU and memory efficiency as a primary feature.
    • \\n
\\n

Less ads, less compulsatory purchases, less CO2 emissions

\\n\",\"key\":\".//markdown/ad-blocker.md\"},{\"title\":\"Eating seasonal and local\",\"category\":\"kitchen\",\"body\":\"

Eating seasonal fruits and vegetables

\\n

We all love tomatoes. But eating tomatoes during the whole year is not sustainable. During winter, we eat imported tomatoes or cultivated in greenhouses. And that\u2019s a pity : tomatoes are more juicy and tasteful during summer. Respecting nature by eating seasonal fruit and vegetables can be a very interesting challenge to make you discover new ingredients such as black radish, lotus root or winter melon.

\\n

Fun fact\u00a0: cheese are also seasonal.

\\n

Eating locally

\\n

You\u2019re already eating less meat or you\u2019re already vegetarian? Great! Next step, you can become a locavore, which means that the food you're eating is limited from an area of 50 to 200 kilometers. Of course, it\u2019s easier to eat locally when you leaving in the countryside than in a big town. But it is still possible !

\\n\",\"key\":\".//markdown/eat-seasonal-and-local.md\"},{\"title\":\"Clean your cloud data\",\"category\":\"digital\",\"body\":\"

Clean your cloud data

\\n

When your data is saved on the cloud, it means it's saved on remote computers (servers). It's really nice and convenient because if you loose your computer or your phone, your data is not lost!

\\n

However, redundant data is not environmental friendly at all and will never be. Remember this: everytime you save data, transfer data it means CO2 emissions.

\\n

Servers as well as your devices needs many rare metals but also because it needs electricity to work. For the servers, it's every single day of the year with no down time, to make sure you can access your data at any time of the day. As you know, electricity production always emits CO2, even if it's solar, windmills or nuclear. Yes, there is no "green" energy and solar panels manufacturing pollutes a lot.

\\n

Therefore, the less emails you have on your mailbox, the less data you have on the cloud, the better for the environment.

\\n

More data = more pollution

\\n\",\"key\":\".//markdown/clean-your-cloud-data.md\"},{\"title\":\"Find replacement for internet giants\",\"category\":\"digital\",\"body\":\"

Find replacement for internet giants

\\n

G**gle, Facebook, \ud83c\udf4f and any other tech monsters are harvesting data about their users and that's a bad thing for you and the environment.

\\n

If something is free, there is a trick, right? The more data these companies have on you, the more valuable you are for them. It allows target ads depending on your age, sex, religion, political opinion etc.

\\n

Framasoft a French association is trying to de-g**gle-ify the internet by providing the same services as some of the GAFA but in a ethical and open source way.

\\n

Examples :

\\n
    \\n
  • Peertube alternative to Youtube.
    • \\n
  • Mobilizon is an alternative to Meetup and Facebook events.
    • \\n
  • FramaTalk as a replacement for Zoom/Skype
    • \\n
  • Framagenda: creating public or private calendars
    • \\n
\\n

Visit Framasoft website for more info and services!

\\n

Alternative to :

\\n\\n\",\"key\":\".//markdown/gafa-replacement.md\"},{\"title\":\"Reduce your browsing emissions\",\"category\":\"digital\",\"body\":\"

Calculate your browsing carbon impact and reduce it

\\n

They are several browser add-ons, mainly for Chrome and Firefox, that can help you decrease and understand better your digital carbon emissions.

\\n
    \\n
  • Carbon analyser: excellent plugin that will help you to have an idea on what you emit when you browse the internet. It shows a chart of your main emissions so you can act on it. Open-source and made by the awesome french association the Shift Project.
    • \\n
  • Low Tech: open-source extension aims to reduce our datas and limit the energy consumption of our Internet browsing. For example, when possible, video quality is set to low quality, autoplay and loop parameters are disabled. If it's possible, quality of images is decreased or loading delayed and animated gif only plays when hovering them. Some "superfluous" content can also be blocked like share and like button, avatar images or fonts. 100 % approved and recommended by the NMF.earth team!
    • \\n
  • Bare Tracker: helps peoples get a barer, lighter browsing experience by informing them about their browsing environmental impact. Similar to carbon analyser.
    • \\n
\\n\",\"key\":\".//markdown/internet-browsing-impact.md\"},{\"title\":\"Get a phone you can repair/upgrade\",\"category\":\"digital\",\"body\":\"

Buy a phone you can repair

\\n

A lot of people are changing their phones because the screen is damage, because they want a better camera or because the battery is not working well anymore.

\\n

Changing phone every year is not sustainable and it's bad for the environement. To face this issue, a Dutch company, Fairphone, is making ethical and modular phone that you can fix and upgrade yourself.

\\n

If you are on Android, installing an alternative rom like LineageOS can make your old phone faster and increase its lifespan.

\\n\",\"key\":\".//markdown/repair-phone.md\"}]\n\\ No newline at end of file\ndiff --git a/scripts/generate-guides.js b/scripts/generate-guides.js\nindex eece5a08..9bf8cedf 100644\n--- a/scripts/generate-guides.js\n+++ b/scripts/generate-guides.js\n@@ -6,7 +6,8 @@ const fm = require(\"front-matter\");\n const MarkdownIt = require(\"markdown-it\");\n const md = new MarkdownIt();\n const data = [];\n-const guidesPath = `${process.env.PWD}/assets/guides/markdown/*.md`;\n+const pwd = process.env.PWD\n+const guidesPath = `${pwd}/assets/guides/markdown/*.md`;\n \n /*\n * Script to parse and build all guides into\n@@ -30,10 +31,10 @@ glob(guidesPath, {}, function (err, files) {\n data.push({\n ...parsed.attributes,\n body: md.render(parsed.body),\n- key: file.replace(\"guides\", \"\"),\n+ key: \"./\".concat(file.split(\"markdown\").pop()),\n });\n fs.writeFile(\n- `${process.env.PWD}/assets/guides/guides.json`,\n+ `${pwd}/assets/guides/guides.json`,\n JSON.stringify(data),\n () => {\n console.log(\"Wrote guides.json\");\n@@ -44,7 +45,7 @@ glob(guidesPath, {}, function (err, files) {\n \n // pre-requiring image that are used in markdown files.\n const imageFiles = fs\n- .readdirSync(`${process.env.PWD}/assets/images/guide`)\n+ .readdirSync(`${pwd}/assets/images/guide`)\n .filter((x) => x.includes(\"png\" || \"jpg\"));\n const imagePath =\n \"{\\n\" +\n@@ -59,7 +60,7 @@ glob(guidesPath, {}, function (err, files) {\n \"}\";\n const res = \"export default \" + imagePath;\n fs.writeFileSync(\n- `${process.env.PWD}/app/screens/ActDetail/imagePath.ts`,\n+ `${pwd}/app/screens/ActDetail/imagePath.ts`,\n res\n );\n });\n", "test_patch": "diff --git a/app/screens/Act/__tests__/__snapshots__/ActScreen.test.tsx.snap b/app/screens/Act/__tests__/__snapshots__/ActScreen.test.tsx.snap\nindex 03326e83..e10f0945 100644\n--- a/app/screens/Act/__tests__/__snapshots__/ActScreen.test.tsx.snap\n+++ b/app/screens/Act/__tests__/__snapshots__/ActScreen.test.tsx.snap\n@@ -17,6 +17,33 @@ exports[`ActScreen renders correctly 1`] = `\n }\n data={\n Array [\n+ Object {\n+ \"body\": \"

Avoid streaming

\n+

Streaming is nice, streaming is amazing, but have you ever though about the consequences on the environement?

\n+

To give you an idea on how bad the streaming is, let's take an example. The size of the article text in the English Wikipedia is around 20 gigabytes of data in 2020. It means that everytime you watch a season of the Walking Dead in HD (1080p), you have downloaded on your computer/phone the same amount of data as the entire Wikipedia encyclopedia.

\n+

Same applies to Spotify, Apple Music, Amazon and Youtube. Music is much smaller than a HD video but an average user consumes several songs in a day so at the end of the year, the impact of the climate is not negligeable.

\n+

Both music and video streaming relies on servers as well as internet infrastuctures to transport the data to you. All of this has a cost, so instead of streaming in all circomstances, try to listen to the radio, go the cinema.... Who knows, you might end up meeting real people in real life!

\n+

Don't forget to cancel autoplay by default, leading to unecessary streaming like Youtube is doing. In most video streaming platform, you can save this behavior in the preferences. If you can, use Peertube, a decentralized and open-source video platform, much better for the environement compared to Youtube and more ethical.

\n+

If you still want to use YouTube, we recomment Youtube Focus, an add-on who tries to promote a healthier watching. As said on their Github, YouTube has one billion hours whatched daily, and it\u2019s recommendation algorithm generates more than 70% of views. That means 700.000.000 hours every single day. What means that the greatest slice of time that people spend on YouTube isnt because they searched for something to whatch or something to learn, it is because they were sugested by YouTube's algorithm.

\n+\",\n+ \"category\": \"digital\",\n+ \"key\": \".//markdown/avoid-streaming.md\",\n+ \"title\": \"Avoid streaming\",\n+ },\n+ Object {\n+ \"body\": \"

Install an add blocker

\n+

All modern browser like Firefox, Safari, Chrome... let users the posibility to install add-ons, also name plugins or extensions.

\n+

In order to not get ads or to see less ads, you can install the following browser extensions :

\n+
    \n+
  • Ghostery: built-in ad blocker removing advertisements from a web page to eliminate clutter so you can focus on the content you want. Protect your privacy, browse faster.
    • \n+
  • uBlock Origin : content blocker with CPU and memory efficiency as a primary feature.
    • \n+
\n+

Less ads, less compulsatory purchases, less CO2 emissions

\n+\",\n+ \"category\": \"digital\",\n+ \"key\": \".//markdown/ad-blocker.md\",\n+ \"title\": \"Install an add blocker\",\n+ },\n Object {\n \"body\": \"

Clean your cloud data

\n

When your data is saved on the cloud, it means it's saved on remote computers (servers). It's really nice and convenient because if you loose your computer or your phone, your data is not lost!

\n@@ -26,7 +53,7 @@ exports[`ActScreen renders correctly 1`] = `\n

More data = more pollution

\n \",\n \"category\": \"digital\",\n- \"key\": \"/Users/pierrebresson/Documents/Git/nmf-app/assets//markdown/clean-your-cloud-data.md\",\n+ \"key\": \".//markdown/clean-your-cloud-data.md\",\n \"title\": \"Clean your cloud data\",\n },\n Object {\n@@ -53,32 +80,9 @@ exports[`ActScreen renders correctly 1`] = `\n \n \",\n \"category\": \"digital\",\n- \"key\": \"/Users/pierrebresson/Documents/Git/nmf-app/assets//markdown/gafa-replacement.md\",\n+ \"key\": \".//markdown/gafa-replacement.md\",\n \"title\": \"Find replacement for internet giants\",\n },\n- Object {\n- \"body\": \"

Buy a phone you can repair

\n-

A lot of people are changing their phones because the screen is damage, because they want a better camera or because the battery is not working well anymore.

\n-

Changing phone every year is not sustainable and it's bad for the environement. To face this issue, a Dutch company, Fairphone, is making ethical and modular phone that you can fix and upgrade yourself.

\n-

If you are on Android, installing an alternative rom like LineageOS can make your old phone faster and increase its lifespan.

\n-\",\n- \"category\": \"digital\",\n- \"key\": \"/Users/pierrebresson/Documents/Git/nmf-app/assets//markdown/repair-phone.md\",\n- \"title\": \"Get a phone you can repair/upgrade\",\n- },\n- Object {\n- \"body\": \"

Avoid streaming

\n-

Streaming is nice, streaming is amazing, but have you ever though about the consequences on the environement?

\n-

To give you an idea on how bad the streaming is, let's take an example. The size of the article text in the English Wikipedia is around 20 gigabytes of data in 2020. It means that everytime you watch a season of the Walking Dead in HD (1080p), you have downloaded on your computer/phone the same amount of data as the entire Wikipedia encyclopedia.

\n-

Same applies to Spotify, Apple Music, Amazon and Youtube. Music is much smaller than a HD video but an average user consumes several songs in a day so at the end of the year, the impact of the climate is not negligeable.

\n-

Both music and video streaming relies on servers as well as internet infrastuctures to transport the data to you. All of this has a cost, so instead of streaming in all circomstances, try to listen to the radio, go the cinema.... Who knows, you might end up meeting real people in real life!

\n-

Don't forget to cancel autoplay by default, leading to unecessary streaming like Youtube is doing. In most video streaming platform, you can save this behavior in the preferences. If you can, use Peertube, a decentralized and open-source video platform, much better for the environement compared to Youtube and more ethical.

\n-

If you still want to use YouTube, we recomment Youtube Focus, an add-on who tries to promote a healthier watching. As said on their Github, YouTube has one billion hours whatched daily, and it\u2019s recommendation algorithm generates more than 70% of views. That means 700.000.000 hours every single day. What means that the greatest slice of time that people spend on YouTube isnt because they searched for something to whatch or something to learn, it is because they were sugested by YouTube's algorithm.

\n-\",\n- \"category\": \"digital\",\n- \"key\": \"/Users/pierrebresson/Documents/Git/nmf-app/assets//markdown/avoid-streaming.md\",\n- \"title\": \"Avoid streaming\",\n- },\n Object {\n \"body\": \"

Calculate your browsing carbon impact and reduce it

\n

They are several browser add-ons, mainly for Chrome and Firefox, that can help you decrease and understand better your digital carbon emissions.

\n@@ -89,22 +93,18 @@ exports[`ActScreen renders correctly 1`] = `\n \n \",\n \"category\": \"digital\",\n- \"key\": \"/Users/pierrebresson/Documents/Git/nmf-app/assets//markdown/internet-browsing-impact.md\",\n+ \"key\": \".//markdown/internet-browsing-impact.md\",\n \"title\": \"Reduce your browsing emissions\",\n },\n Object {\n- \"body\": \"

Install an add blocker

\n-

All modern browser like Firefox, Safari, Chrome... let users the posibility to install add-ons, also name plugins or extensions.

\n-

In order to not get ads or to see less ads, you can install the following browser extensions :

\n-
    \n-
  • Ghostery: built-in ad blocker removing advertisements from a web page to eliminate clutter so you can focus on the content you want. Protect your privacy, browse faster.
    • \n-
  • uBlock Origin : content blocker with CPU and memory efficiency as a primary feature.
    • \n-
\n-

Less ads, less compulsatory purchases, less CO2 emissions

\n+ \"body\": \"

Buy a phone you can repair

\n+

A lot of people are changing their phones because the screen is damage, because they want a better camera or because the battery is not working well anymore.

\n+

Changing phone every year is not sustainable and it's bad for the environement. To face this issue, a Dutch company, Fairphone, is making ethical and modular phone that you can fix and upgrade yourself.

\n+

If you are on Android, installing an alternative rom like LineageOS can make your old phone faster and increase its lifespan.

\n \",\n \"category\": \"digital\",\n- \"key\": \"/Users/pierrebresson/Documents/Git/nmf-app/assets//markdown/ad-blocker.md\",\n- \"title\": \"Install an add blocker\",\n+ \"key\": \".//markdown/repair-phone.md\",\n+ \"title\": \"Get a phone you can repair/upgrade\",\n },\n ]\n }\n@@ -159,7 +159,7 @@ exports[`ActScreen renders correctly 1`] = `\n }\n }\n >\n- Clean your cloud data\n+ Avoid streaming\n \n \n- Find replacement for internet giants\n+ Install an add blocker\n \n \n- Get a phone you can repair/upgrade\n+ Clean your cloud data\n \n \n- Avoid streaming\n+ Find replacement for internet giants\n \n \n- Install an add blocker\n+ Get a phone you can repair/upgrade\n \n \r\n\r\n\"Screenshot\r\n\r\n"}], "lang": "typescript", "problem_statement": "Emission info\nAdd a button on EmissionItemScreen opening a new modal screen. This new modal screen should show some text from a markdown file, in the same way as sustainable guide is working.\r\n\r\n\"Screenshot\r\n\r\n\"Screenshot\r\n\r\n\n", "hints": "What kind of markdown we have here. Are we using anything? \n@akkikumar72 Same markdown mechanism as act tab / sustainable guide.\nLooks like it same as https://github.com/NMF-earth/nmf-app/issues/154.\r\nIf yes, I can have a look\n> Looks like it same as #154.\r\n> If yes, I can have a look\r\n\r\nExact, same as #154 ", "pull_url": "https://github.com/NMF-earth/nmf-app/pull/212", "issue_urls": ["https://github.com/NMF-earth/nmf-app/issues/144"], "test_command": "NODE_OPTIONS='--experimental-vm-modules --max-old-space-size=4096' npx --no-install jest app/components/InfoButton/__tests__/EmissionInfoButton.test.tsx app/screens/InfoModal/__test__/InfoModalScreen.test.tsx app/screens/Methodology/__test__/MethodologyScreen.test.tsx --passWithNoTests 2>&1", "fix_patch": "diff --git a/app/screens/AddEmission/components/InfoButton/InfoButton.styles.ts b/app/components/InfoButton/InfoButton.styles.ts\nsimilarity index 82%\nrename from app/screens/AddEmission/components/InfoButton/InfoButton.styles.ts\nrename to app/components/InfoButton/InfoButton.styles.ts\nindex fe6092fe..7bc804ec 100644\n--- a/app/screens/AddEmission/components/InfoButton/InfoButton.styles.ts\n+++ b/app/components/InfoButton/InfoButton.styles.ts\n@@ -2,7 +2,7 @@ import { StyleSheet } from \"react-native\";\n \n import { Layout } from \"constant\";\n \n-import { Colors } from \"../../../../style\";\n+import { Colors } from \"../../style\";\n \n export default StyleSheet.create({\n infoIcon: {\ndiff --git a/app/components/InfoButton/InfoButton.tsx b/app/components/InfoButton/InfoButton.tsx\nnew file mode 100644\nindex 00000000..82b65731\n--- /dev/null\n+++ b/app/components/InfoButton/InfoButton.tsx\n@@ -0,0 +1,33 @@\n+import React from \"react\";\n+import { useSelector } from \"react-redux\";\n+import { pathOr } from \"ramda\";\n+import { Ionicons } from \"@expo/vector-icons\";\n+import { useNavigation, useRoute } from \"@react-navigation/native\";\n+\n+import { emissions } from \"../../ducks\";\n+import { navigate } from \"../../navigation\";\n+import styles from \"./InfoButton.styles\";\n+\n+const InfoButton = () => {\n+ const navigation = useNavigation();\n+ const navigator = navigate(navigation);\n+\n+ const route = useRoute();\n+ const emissionId = pathOr(\"\", [\"params\", \"id\"], route);\n+\n+ const { emissionModelType } =\n+ useSelector((state) =>\n+ emissions.selectors.getEmissionById(state, emissionId)\n+ ) || {};\n+\n+ return (\n+ navigator.openInfoModal({ emissionModelType })}\n+ />\n+ );\n+};\n+\n+export default InfoButton;\ndiff --git a/app/screens/AddEmission/components/InfoButton/index.ts b/app/components/InfoButton/index.ts\nsimilarity index 100%\nrename from app/screens/AddEmission/components/InfoButton/index.ts\nrename to app/components/InfoButton/index.ts\ndiff --git a/app/components/index.ts b/app/components/index.ts\nindex c89c25e4..72121582 100644\n--- a/app/components/index.ts\n+++ b/app/components/index.ts\n@@ -8,6 +8,7 @@ import StickersImage from \"./StickersImage\";\n import SelectableListItem from \"./SelectableListItem\";\n import ListItem from \"./ListItem\";\n import HTMLImage from \"./HTMLImage\";\n+import InfoButton from \"./InfoButton\";\n \n export {\n HTMLImage,\n@@ -20,4 +21,5 @@ export {\n Button,\n Text,\n TextInput,\n+ InfoButton,\n };\ndiff --git a/app/navigation/Navigator/AppNavigator.tsx b/app/navigation/Navigator/AppNavigator.tsx\nindex 6a9f069a..70b6f37a 100644\n--- a/app/navigation/Navigator/AppNavigator.tsx\n+++ b/app/navigation/Navigator/AppNavigator.tsx\n@@ -3,10 +3,9 @@ import { NavigationContainer } from \"@react-navigation/native\";\n import { createStackNavigator } from \"@react-navigation/stack\";\n \n import ModalNavigator from \"./ModalNavigator\";\n-import MethodologyModalNavigator from \"./MethodologyModalNavigator\";\n+import InfoModalNavigator from \"./InfoModalNavigator\";\n import RootNavigator from \"./RootNavigator\";\n import ComingSoonScreen from \"../../screens/ComingSoon\";\n-import Methodology from \"../../screens/Methodology\";\n \n const AppStack = createStackNavigator();\n \n@@ -16,8 +15,8 @@ const App = (): React.ReactElement => {\n \n \n {\n component={ModalNavigator}\n />\n \n \n \ndiff --git a/app/navigation/Navigator/InfoModalNavigator.tsx b/app/navigation/Navigator/InfoModalNavigator.tsx\nnew file mode 100644\nindex 00000000..47dfb353\n--- /dev/null\n+++ b/app/navigation/Navigator/InfoModalNavigator.tsx\n@@ -0,0 +1,18 @@\n+import React from \"react\";\n+import { createStackNavigator } from \"@react-navigation/stack\";\n+\n+import InfoModalScreen from \"../../screens/InfoModal\";\n+\n+const Stack = createStackNavigator();\n+\n+const InfoModalNavigator = (): React.ReactElement => (\n+ \n+ \n+ \n+);\n+\n+export default InfoModalNavigator;\ndiff --git a/app/navigation/Navigator/MethodologyModalNavigator.tsx b/app/navigation/Navigator/MethodologyModalNavigator.tsx\ndeleted file mode 100644\nindex 3c9ca312..00000000\n--- a/app/navigation/Navigator/MethodologyModalNavigator.tsx\n+++ /dev/null\n@@ -1,18 +0,0 @@\n-import React from \"react\";\n-import { createStackNavigator } from \"@react-navigation/stack\";\n-\n-import MethodologyScreen from \"../../screens/Methodology\";\n-\n-const Stack = createStackNavigator();\n-\n-const MethodologyModalNavigator = (): React.ReactElement => (\n- \n- \n- \n-);\n-\n-export default MethodologyModalNavigator;\ndiff --git a/app/navigation/navigate.ts b/app/navigation/navigate.ts\nindex 3eeedc01..ad2b9946 100644\n--- a/app/navigation/navigate.ts\n+++ b/app/navigation/navigate.ts\n@@ -8,8 +8,11 @@ const openComingSoon = (navigation) => (props = {}) => {\n navigation.navigate(\"ComingSoon\", props);\n };\n \n-const openMethodology = (navigation) => (props = {}) => {\n- navigation.navigate(\"Methodology\", props);\n+const openInfoModal = (navigation) => (props = {}) => {\n+ navigation.navigate(\"InfoModal\", {\n+ screen: \"InfoModal\",\n+ params: props,\n+ });\n };\n \n /* push */\n@@ -52,7 +55,7 @@ const openBudget = (navigation) => (props = {}) => {\n const navigate = (navigation) => ({\n goBack: navigation.goBack,\n openComingSoon: navigateOneTime(openComingSoon(navigation)),\n- openMethodology: navigateOneTime(openMethodology(navigation)),\n+ openInfoModal: navigateOneTime(openInfoModal(navigation)),\n openBudget: navigateOneTime(openBudget(navigation)),\n openMontlyBudget: navigateOneTime(openMontlyBudget(navigation)),\n openAddEmission: navigateOneTime(openAddEmission(navigation)),\ndiff --git a/app/screens/AddEmission/AddEmissionScreen.navigationOptions.tsx b/app/screens/AddEmission/AddEmissionScreen.navigationOptions.tsx\nindex 6d107150..12ced852 100644\n--- a/app/screens/AddEmission/AddEmissionScreen.navigationOptions.tsx\n+++ b/app/screens/AddEmission/AddEmissionScreen.navigationOptions.tsx\n@@ -1,9 +1,8 @@\n import React from \"react\";\n \n-import { Text } from \"../../components\";\n+import { Text, InfoButton } from \"../../components\";\n import { t } from \"../../utils\";\n import { Colors, ComponentsStyle } from \"../../style\";\n-import { InfoButton } from \"./components\";\n \n const navigationOptions = () => ({\n ...ComponentsStyle.transitionBetweenScreenPresets,\ndiff --git a/app/screens/AddEmission/components/InfoButton/InfoButton.tsx b/app/screens/AddEmission/components/InfoButton/InfoButton.tsx\ndeleted file mode 100644\nindex b04733c5..00000000\n--- a/app/screens/AddEmission/components/InfoButton/InfoButton.tsx\n+++ /dev/null\n@@ -1,19 +0,0 @@\n-import React from \"react\";\n-import { Ionicons } from \"@expo/vector-icons\";\n-import { useNavigation } from \"@react-navigation/native\";\n-\n-import { navigate } from \"../../../../navigation\";\n-import styles from \"./InfoButton.styles\";\n-\n-export default () => {\n- const navigation = useNavigation();\n- const navigator = navigate(navigation);\n- return (\n- \n- );\n-};\ndiff --git a/app/screens/AddEmission/components/index.ts b/app/screens/AddEmission/components/index.ts\nindex be2df6d6..599ca664 100644\n--- a/app/screens/AddEmission/components/index.ts\n+++ b/app/screens/AddEmission/components/index.ts\n@@ -4,14 +4,5 @@ import Custom from \"./Custom\";\n import Streaming from \"./Streaming\";\n import Electricity from \"./Electricity\";\n import AddEmissionButton from \"./AddEmissionButton\";\n-import InfoButton from \"./InfoButton\";\n \n-export {\n- Food,\n- Electricity,\n- Streaming,\n- Transport,\n- Custom,\n- AddEmissionButton,\n- InfoButton,\n-};\n+export { Food, Electricity, Streaming, Transport, Custom, AddEmissionButton };\ndiff --git a/app/screens/EmissionItem/EmissionItemScreen.navigationOptions.tsx b/app/screens/EmissionItem/EmissionItemScreen.navigationOptions.tsx\nindex d2e33da8..e3852bd4 100644\n--- a/app/screens/EmissionItem/EmissionItemScreen.navigationOptions.tsx\n+++ b/app/screens/EmissionItem/EmissionItemScreen.navigationOptions.tsx\n@@ -1,6 +1,6 @@\n import React from \"react\";\n \n-import { Text } from \"../../components\";\n+import { Text, InfoButton } from \"../../components\";\n import { t } from \"../../utils\";\n import { Colors, ComponentsStyle } from \"../../style\";\n \n@@ -11,6 +11,7 @@ const navigationOptions = () => ({\n },\n headerTintColor: Colors.grey100,\n headerBackTitleVisible: false,\n+ headerRight: () => ,\n headerTitle: () => {t(\"EMISSION_ITEM_TITLE\")},\n });\n \ndiff --git a/app/screens/Methodology/Methodology.navigationOptions.tsx b/app/screens/InfoModal/InfoModal.navigationOptions.tsx\nsimilarity index 60%\nrename from app/screens/Methodology/Methodology.navigationOptions.tsx\nrename to app/screens/InfoModal/InfoModal.navigationOptions.tsx\nindex e37cf6d7..ae701f5c 100644\n--- a/app/screens/Methodology/Methodology.navigationOptions.tsx\n+++ b/app/screens/InfoModal/InfoModal.navigationOptions.tsx\n@@ -6,26 +6,40 @@ import { Layout } from \"constant\";\n \n import { Colors, ComponentsStyle } from \"../../style\";\n import { navigate } from \"../../navigation\";\n-import { platform, t } from \"../../utils\";\n+import { platform, t, ui } from \"../../utils\";\n import { Text } from \"../../components\";\n \n const iconStyle = { paddingRight: Layout.PADDING_HORIZONTAL };\n \n-const navigationOptionsAndroid = () => ({\n+const navigationOptionsAndroid = ({ route }) => ({\n ...ComponentsStyle.transitionBetweenScreenPresets,\n headerStyle: {\n ...ComponentsStyle.header,\n },\n- headerTitle: () => {t(\"METHODOLOGY_SCREEN_TITLE\")},\n+ headerTitle: () =>\n+ route.params?.emissionModelType ? (\n+ \n+ {ui.getTranslationModelType(route.params.emissionModelType)}\n+ \n+ ) : (\n+ {t(\"INFO_MODAL_SCREEN_METHODOLOGY\")}\n+ ),\n headerRight: () => null,\n });\n \n-const navigationOptionsIOS = ({ navigation }) => ({\n+const navigationOptionsIOS = ({ navigation, route }) => ({\n headerStyle: {\n ...ComponentsStyle.header,\n borderBottomWidth: 0,\n },\n- headerTitle: () => {t(\"METHODOLOGY_SCREEN_TITLE\")},\n+ headerTitle: () =>\n+ route.params?.emissionModelType ? (\n+ \n+ {ui.getTranslationModelType(route.params.emissionModelType)}\n+ \n+ ) : (\n+ {t(\"INFO_MODAL_SCREEN_METHODOLOGY\")}\n+ ),\n headerLeft: () => null,\n headerRight: () => (\n \ndiff --git a/app/screens/Methodology/MethodologyScreen.styles.ts b/app/screens/InfoModal/InfoModalScreen.styles.ts\nsimilarity index 100%\nrename from app/screens/Methodology/MethodologyScreen.styles.ts\nrename to app/screens/InfoModal/InfoModalScreen.styles.ts\ndiff --git a/app/screens/InfoModal/InfoModalScreen.tsx b/app/screens/InfoModal/InfoModalScreen.tsx\nnew file mode 100644\nindex 00000000..931ba9e3\n--- /dev/null\n+++ b/app/screens/InfoModal/InfoModalScreen.tsx\n@@ -0,0 +1,33 @@\n+import React from \"react\";\n+import { ScrollView } from \"react-native\";\n+import HTML from \"react-native-render-html\";\n+\n+import styles from \"./InfoModalScreen.styles\";\n+import navigationOptions from \"./InfoModal.navigationOptions\";\n+import methodology from \"../../../assets/methodology/methodology.json\";\n+import { ui } from \"../../utils\";\n+\n+const InfoModalScreen = ({ route }) => {\n+ const emissionModelType = route?.params?.emissionModelType;\n+ let html: string;\n+ if (emissionModelType) {\n+ // TODO: load corresponding html\n+ html = `

${emissionModelType} placeholder

`;\n+ } else {\n+ html = methodology[0].body;\n+ }\n+\n+ return (\n+ \n+ \n+ \n+ );\n+};\n+\n+InfoModalScreen.navigationOptions = navigationOptions;\n+\n+export default InfoModalScreen;\ndiff --git a/app/screens/InfoModal/index.ts b/app/screens/InfoModal/index.ts\nnew file mode 100644\nindex 00000000..1e9dbdc5\n--- /dev/null\n+++ b/app/screens/InfoModal/index.ts\n@@ -0,0 +1,1 @@\n+export { default } from \"./InfoModalScreen\";\ndiff --git a/app/screens/InfoModal/translations/da.json b/app/screens/InfoModal/translations/da.json\nnew file mode 100644\nindex 00000000..4ad7ae1e\n--- /dev/null\n+++ b/app/screens/InfoModal/translations/da.json\n@@ -0,0 +1,3 @@\n+{\n+ \"INFO_MODAL_SCREEN_METHODOLOGY\": \"Methodology\"\n+}\ndiff --git a/app/screens/InfoModal/translations/de.json b/app/screens/InfoModal/translations/de.json\nnew file mode 100644\nindex 00000000..4ad7ae1e\n--- /dev/null\n+++ b/app/screens/InfoModal/translations/de.json\n@@ -0,0 +1,3 @@\n+{\n+ \"INFO_MODAL_SCREEN_METHODOLOGY\": \"Methodology\"\n+}\ndiff --git a/app/screens/InfoModal/translations/en.json b/app/screens/InfoModal/translations/en.json\nnew file mode 100644\nindex 00000000..4ad7ae1e\n--- /dev/null\n+++ b/app/screens/InfoModal/translations/en.json\n@@ -0,0 +1,3 @@\n+{\n+ \"INFO_MODAL_SCREEN_METHODOLOGY\": \"Methodology\"\n+}\ndiff --git a/app/screens/InfoModal/translations/es.json b/app/screens/InfoModal/translations/es.json\nnew file mode 100644\nindex 00000000..4ad7ae1e\n--- /dev/null\n+++ b/app/screens/InfoModal/translations/es.json\n@@ -0,0 +1,3 @@\n+{\n+ \"INFO_MODAL_SCREEN_METHODOLOGY\": \"Methodology\"\n+}\ndiff --git a/app/screens/InfoModal/translations/fr.json b/app/screens/InfoModal/translations/fr.json\nnew file mode 100644\nindex 00000000..8fbc4d3a\n--- /dev/null\n+++ b/app/screens/InfoModal/translations/fr.json\n@@ -0,0 +1,3 @@\n+{\n+ \"INFO_MODAL_SCREEN_METHODOLOGY\": \"Methodologie\"\n+}\ndiff --git a/app/screens/Methodology/translations/index.ts b/app/screens/InfoModal/translations/index.ts\nsimilarity index 89%\nrename from app/screens/Methodology/translations/index.ts\nrename to app/screens/InfoModal/translations/index.ts\nindex bddee47c..7d86e4fb 100644\n--- a/app/screens/Methodology/translations/index.ts\n+++ b/app/screens/InfoModal/translations/index.ts\n@@ -9,7 +9,7 @@ import ru from \"./ru.json\";\n import pl from \"./pl.json\";\n \n interface TranslationKeys {\n- METHODOLOGY_SCREEN_TITLE: string;\n+ INFO_MODAL_SCREEN_METHODOLOGY: string;\n }\n \n export { en, fr, de, sv, es, pt, da, ru, pl, TranslationKeys };\ndiff --git a/app/screens/InfoModal/translations/pl.json b/app/screens/InfoModal/translations/pl.json\nnew file mode 100644\nindex 00000000..4ad7ae1e\n--- /dev/null\n+++ b/app/screens/InfoModal/translations/pl.json\n@@ -0,0 +1,3 @@\n+{\n+ \"INFO_MODAL_SCREEN_METHODOLOGY\": \"Methodology\"\n+}\ndiff --git a/app/screens/InfoModal/translations/pt.json b/app/screens/InfoModal/translations/pt.json\nnew file mode 100644\nindex 00000000..4ad7ae1e\n--- /dev/null\n+++ b/app/screens/InfoModal/translations/pt.json\n@@ -0,0 +1,3 @@\n+{\n+ \"INFO_MODAL_SCREEN_METHODOLOGY\": \"Methodology\"\n+}\ndiff --git a/app/screens/InfoModal/translations/ru.json b/app/screens/InfoModal/translations/ru.json\nnew file mode 100644\nindex 00000000..4ad7ae1e\n--- /dev/null\n+++ b/app/screens/InfoModal/translations/ru.json\n@@ -0,0 +1,3 @@\n+{\n+ \"INFO_MODAL_SCREEN_METHODOLOGY\": \"Methodology\"\n+}\ndiff --git a/app/screens/InfoModal/translations/sv.json b/app/screens/InfoModal/translations/sv.json\nnew file mode 100644\nindex 00000000..4ad7ae1e\n--- /dev/null\n+++ b/app/screens/InfoModal/translations/sv.json\n@@ -0,0 +1,3 @@\n+{\n+ \"INFO_MODAL_SCREEN_METHODOLOGY\": \"Methodology\"\n+}\ndiff --git a/app/screens/Methodology/MethodologyScreen.tsx b/app/screens/Methodology/MethodologyScreen.tsx\ndeleted file mode 100644\nindex d82d8a74..00000000\n--- a/app/screens/Methodology/MethodologyScreen.tsx\n+++ /dev/null\n@@ -1,25 +0,0 @@\n-import React from \"react\";\n-import { ScrollView } from \"react-native\";\n-import HTML from \"react-native-render-html\";\n-\n-import { ui } from \"../../utils\";\n-\n-import styles from \"./MethodologyScreen.styles\";\n-import navigationOptions from \"./Methodology.navigationOptions\";\n-import methodology from \"../../../assets/methodology/methodology.json\";\n-\n-const MethodologyScreen = () => {\n- return (\n- \n- \n- \n- );\n-};\n-\n-MethodologyScreen.navigationOptions = navigationOptions;\n-\n-export default MethodologyScreen;\ndiff --git a/app/screens/Methodology/index.ts b/app/screens/Methodology/index.ts\ndeleted file mode 100644\nindex 53566fdf..00000000\n--- a/app/screens/Methodology/index.ts\n+++ /dev/null\n@@ -1,1 +0,0 @@\n-export { default } from \"./MethodologyScreen\";\ndiff --git a/app/screens/Methodology/translations/da.json b/app/screens/Methodology/translations/da.json\ndeleted file mode 100644\nindex cc58c1e1..00000000\n--- a/app/screens/Methodology/translations/da.json\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-{\n- \"METHODOLOGY_SCREEN_TITLE\": \"Methodology\"\n-}\ndiff --git a/app/screens/Methodology/translations/de.json b/app/screens/Methodology/translations/de.json\ndeleted file mode 100644\nindex cc58c1e1..00000000\n--- a/app/screens/Methodology/translations/de.json\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-{\n- \"METHODOLOGY_SCREEN_TITLE\": \"Methodology\"\n-}\ndiff --git a/app/screens/Methodology/translations/en.json b/app/screens/Methodology/translations/en.json\ndeleted file mode 100644\nindex cc58c1e1..00000000\n--- a/app/screens/Methodology/translations/en.json\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-{\n- \"METHODOLOGY_SCREEN_TITLE\": \"Methodology\"\n-}\ndiff --git a/app/screens/Methodology/translations/es.json b/app/screens/Methodology/translations/es.json\ndeleted file mode 100644\nindex cc58c1e1..00000000\n--- a/app/screens/Methodology/translations/es.json\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-{\n- \"METHODOLOGY_SCREEN_TITLE\": \"Methodology\"\n-}\ndiff --git a/app/screens/Methodology/translations/fr.json b/app/screens/Methodology/translations/fr.json\ndeleted file mode 100644\nindex b48353a0..00000000\n--- a/app/screens/Methodology/translations/fr.json\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-{\n- \"METHODOLOGY_SCREEN_TITLE\": \"Methodologie\"\n-}\ndiff --git a/app/screens/Methodology/translations/pl.json b/app/screens/Methodology/translations/pl.json\ndeleted file mode 100644\nindex cc58c1e1..00000000\n--- a/app/screens/Methodology/translations/pl.json\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-{\n- \"METHODOLOGY_SCREEN_TITLE\": \"Methodology\"\n-}\ndiff --git a/app/screens/Methodology/translations/pt.json b/app/screens/Methodology/translations/pt.json\ndeleted file mode 100644\nindex cc58c1e1..00000000\n--- a/app/screens/Methodology/translations/pt.json\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-{\n- \"METHODOLOGY_SCREEN_TITLE\": \"Methodology\"\n-}\ndiff --git a/app/screens/Methodology/translations/ru.json b/app/screens/Methodology/translations/ru.json\ndeleted file mode 100644\nindex cc58c1e1..00000000\n--- a/app/screens/Methodology/translations/ru.json\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-{\n- \"METHODOLOGY_SCREEN_TITLE\": \"Methodology\"\n-}\ndiff --git a/app/screens/Methodology/translations/sv.json b/app/screens/Methodology/translations/sv.json\ndeleted file mode 100644\nindex cc58c1e1..00000000\n--- a/app/screens/Methodology/translations/sv.json\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-{\n- \"METHODOLOGY_SCREEN_TITLE\": \"Methodology\"\n-}\ndiff --git a/app/utils/translations/resources.ts b/app/utils/translations/resources.ts\nindex f32c7f5e..0ca70938 100644\n--- a/app/utils/translations/resources.ts\n+++ b/app/utils/translations/resources.ts\n@@ -5,7 +5,7 @@ import * as Emissions from \"../../screens/Emissions/translations\";\n import * as Settings from \"../../screens/Settings/translations\";\n import * as MonthlyBudget from \"../../screens/MonthlyBudget/translations\";\n import * as ComingSoon from \"../../screens/ComingSoon/translations\";\n-import * as Methodology from \"../../screens/Methodology/translations\";\n+import * as InfoModal from \"../../screens/InfoModal/translations\";\n import * as AddEmission from \"../../screens/AddEmission/translations\";\n import * as EmissionItem from \"../../screens/EmissionItem/translations\";\n import * as Intro from \"../../screens/Intro/translations\";\n@@ -30,7 +30,7 @@ const en = {\n ...Emissions.en,\n ...Settings.en,\n ...ComingSoon.en,\n- ...Methodology.en,\n+ ...InfoModal.en,\n ...AddEmission.en,\n ...EmissionItem.en,\n ...Intro.en,\n@@ -49,7 +49,7 @@ const de = {\n ...Emissions.de,\n ...Settings.de,\n ...ComingSoon.de,\n- ...Methodology.de,\n+ ...InfoModal.de,\n ...AddEmission.de,\n ...EmissionItem.de,\n ...Intro.de,\n@@ -68,7 +68,7 @@ const fr = {\n ...Emissions.fr,\n ...Settings.fr,\n ...ComingSoon.fr,\n- ...Methodology.fr,\n+ ...InfoModal.fr,\n ...AddEmission.fr,\n ...EmissionItem.fr,\n ...Intro.fr,\n@@ -87,7 +87,7 @@ const sv = {\n ...Emissions.sv,\n ...Settings.sv,\n ...ComingSoon.sv,\n- ...Methodology.sv,\n+ ...InfoModal.sv,\n ...AddEmission.sv,\n ...EmissionItem.sv,\n ...Intro.sv,\n@@ -105,7 +105,7 @@ const pt = {\n ...Budget.pt,\n ...Emissions.pt,\n ...Settings.pt,\n- ...Methodology.pt,\n+ ...InfoModal.pt,\n ...AddEmission.pt,\n ...EmissionItem.pt,\n ...Intro.pt,\n@@ -123,7 +123,7 @@ const es = {\n ...Budget.es,\n ...Emissions.es,\n ...Settings.es,\n- ...Methodology.es,\n+ ...InfoModal.es,\n ...AddEmission.es,\n ...EmissionItem.es,\n ...Intro.es,\n@@ -141,7 +141,7 @@ const ru = {\n ...Budget.ru,\n ...Emissions.ru,\n ...Settings.ru,\n- ...Methodology.ru,\n+ ...InfoModal.ru,\n ...AddEmission.ru,\n ...EmissionItem.ru,\n ...Intro.ru,\n@@ -159,7 +159,7 @@ const pl = {\n ...Budget.pl,\n ...Emissions.pl,\n ...Settings.pl,\n- ...Methodology.pl,\n+ ...InfoModal.pl,\n ...AddEmission.pl,\n ...EmissionItem.pl,\n ...Intro.pl,\n@@ -177,7 +177,7 @@ const da = {\n ...Budget.da,\n ...Emissions.da,\n ...Settings.da,\n- ...Methodology.da,\n+ ...InfoModal.da,\n ...AddEmission.da,\n ...EmissionItem.da,\n ...Intro.da,\n@@ -194,7 +194,7 @@ export interface TranslationKeys\n Budget.TranslationKeys,\n Emissions.TranslationKeys,\n ComingSoon.TranslationKeys,\n- Methodology.TranslationKeys,\n+ InfoModal.TranslationKeys,\n AddEmission.TranslationKeys,\n EmissionItem.TranslationKeys,\n Settings.TranslationKeys,\n", "test_patch": "diff --git a/app/components/InfoButton/__tests__/EmissionInfoButton.test.tsx b/app/components/InfoButton/__tests__/EmissionInfoButton.test.tsx\nnew file mode 100644\nindex 00000000..54b8333b\n--- /dev/null\n+++ b/app/components/InfoButton/__tests__/EmissionInfoButton.test.tsx\n@@ -0,0 +1,9 @@\n+import React from \"react\";\n+import { create } from \"react-test-renderer\";\n+\n+import InfoButton from \"..\";\n+\n+it(\"renders correctly\", () => {\n+ const tree = create().toJSON();\n+ expect(tree).toMatchSnapshot();\n+});\ndiff --git a/app/components/InfoButton/__tests__/__snapshots__/EmissionInfoButton.test.tsx.snap b/app/components/InfoButton/__tests__/__snapshots__/EmissionInfoButton.test.tsx.snap\nnew file mode 100644\nindex 00000000..04ad94ea\n--- /dev/null\n+++ b/app/components/InfoButton/__tests__/__snapshots__/EmissionInfoButton.test.tsx.snap\n@@ -0,0 +1,15 @@\n+// Jest Snapshot v1, https://goo.gl/fbAQLP\n+\n+exports[`renders correctly 1`] = `\n+\n+`;\ndiff --git a/app/screens/InfoModal/__test__/InfoModalScreen.test.tsx b/app/screens/InfoModal/__test__/InfoModalScreen.test.tsx\nnew file mode 100644\nindex 00000000..c41af3af\n--- /dev/null\n+++ b/app/screens/InfoModal/__test__/InfoModalScreen.test.tsx\n@@ -0,0 +1,9 @@\n+import React from \"react\";\n+import { create } from \"react-test-renderer\";\n+\n+import InfoModalScreen from \"../InfoModalScreen\";\n+\n+it(\"InfoModalScreen renders correctly\", () => {\n+ const tree = create().toJSON();\n+ expect(tree).toMatchSnapshot();\n+});\ndiff --git a/app/screens/Methodology/__test__/__snapshots__/MethodologyScreen.test.tsx.snap b/app/screens/InfoModal/__test__/__snapshots__/InfoModalScreen.test.tsx.snap\nsimilarity index 99%\nrename from app/screens/Methodology/__test__/__snapshots__/MethodologyScreen.test.tsx.snap\nrename to app/screens/InfoModal/__test__/__snapshots__/InfoModalScreen.test.tsx.snap\nindex b7ea697e..a8b2f940 100644\n--- a/app/screens/Methodology/__test__/__snapshots__/MethodologyScreen.test.tsx.snap\n+++ b/app/screens/InfoModal/__test__/__snapshots__/InfoModalScreen.test.tsx.snap\n@@ -1,6 +1,6 @@\n // Jest Snapshot v1, https://goo.gl/fbAQLP\n \n-exports[`MethodologyScreen renders correctly 1`] = `\n+exports[`InfoModalScreen renders correctly 1`] = `\n {\n- const tree = create().toJSON();\n- expect(tree).toMatchSnapshot();\n-});\n", "n2p_tests": {}, "f2p_tests": {"app/components/InfoButton/__tests__/EmissionInfoButton.test.tsx": {"run": "NONE", "test": "FAIL", "fix": "PASS"}, "app/screens/InfoModal/__test__/InfoModalScreen.test.tsx": {"run": "NONE", "test": "FAIL", "fix": "PASS"}}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "artsy__eigen-4378", "org": "artsy", "repo": "eigen", "number": 4378, "state": "closed", "title": "Add watched lots to Inbox 'bids' tab", "body": "The type of this PR is: **feature**\r\n\r\n\r\n\r\n\r\n\r\n\r\n### Description\r\nThis PR resolves [PURCHASE-2206]. It is based off of and closes #4344. It adds watched lots to a user's active bids inbox \ud83c\udf89\r\ncc @artsy/purchase-devs \r\n\r\nNote: A regression prior to this PR broke the pull-refresh mechanism again. We should prioritize a fix for it but it is not new to this change\r\n\r\n\r\n\r\n### PR Checklist (tick all before merging)\r\n\r\n\r\n- [x] **Analytics included**\r\n- [x] I have included screenshots or videos to illustrate my changes, or I have not changed anything that impacts the UI.\r\n- [x] I have added tests for my changes, or my changes don't require testing, or I have included a link to a separate Jira ticket covering the tests.\r\n- [x] I have documented any follow-up work that this PR will require, or it does not require any.\r\n- [x] I have added an app state migration, or my changes do not require one. ([What are migrations?](https://github.com/artsy/eigen/blob/master/docs/adding_state_migrations.md))\r\n- [x] I have added a [CHANGELOG.yml](/CHANGELOG.yml) entry or my changes do not require one.\r\n\r\nIn this GIF: \r\n- i am not registered for the first sale, only watching a lot\r\n- i am registered for the second sale, bid on lot 1, watching lot 2, bidding and watching lot 6.\r\n![2021-02-01 10 33 56](https://user-images.githubusercontent.com/9088720/106480201-1e790480-6479-11eb-94ab-d43d7e90bcb2.gif)\r\n\r\n[PURCHASE-2206]: https://artsyproduct.atlassian.net/browse/PURCHASE-2206\r\n\r\n[CX-434]: https://artsyproduct.atlassian.net/browse/CX-434", "base": {"label": "artsy:master", "ref": "master", "sha": "11421d622c6f4e14e92b64fb0b18b98d994c0f73"}, "resolved_issues": [{"number": 4344, "title": "WIP - Watched Lots", "body": "The type of this PR is: **TYPE**\r\n\r\n\r\n\r\n\r\n\r\nThis PR resolves [CX-]\r\n\r\n### Description\r\n\r\n\r\n\r\n### PR Checklist (tick all before merging)\r\n\r\n\r\n\r\n- [ ] I have included screenshots or videos to illustrate my changes, or I have not changed anything that impacts the UI.\r\n- [ ] I have added tests for my changes, or my changes don't require testing, or I have included a link to a separate Jira ticket covering the tests.\r\n- [ ] I have documented any follow-up work that this PR will require, or it does not require any.\r\n- [ ] I have added an app state migration, or my changes do not require one. ([What are migrations?](https://github.com/artsy/eigen/blob/master/docs/adding_state_migrations.md))\r\n- [ ] I have added a [CHANGELOG.yml](/CHANGELOG.yml) entry or my changes do not require one.\r\n\n\n[CX-434]: https://artsyproduct.atlassian.net/browse/CX-434"}], "lang": "typescript", "problem_statement": "WIP - Watched Lots\nThe type of this PR is: **TYPE**\r\n\r\n\r\n\r\n\r\n\r\nThis PR resolves [CX-]\r\n\r\n### Description\r\n\r\n\r\n\r\n### PR Checklist (tick all before merging)\r\n\r\n\r\n\r\n- [ ] I have included screenshots or videos to illustrate my changes, or I have not changed anything that impacts the UI.\r\n- [ ] I have added tests for my changes, or my changes don't require testing, or I have included a link to a separate Jira ticket covering the tests.\r\n- [ ] I have documented any follow-up work that this PR will require, or it does not require any.\r\n- [ ] I have added an app state migration, or my changes do not require one. ([What are migrations?](https://github.com/artsy/eigen/blob/master/docs/adding_state_migrations.md))\r\n- [ ] I have added a [CHANGELOG.yml](/CHANGELOG.yml) entry or my changes do not require one.\r\n\n\n[CX-434]: https://artsyproduct.atlassian.net/browse/CX-434\n", "pull_url": "https://github.com/artsy/eigen/pull/4378", "issue_urls": ["https://github.com/artsy/eigen/issues/4344"], "test_command": "NODE_OPTIONS='--experimental-vm-modules --max-old-space-size=4096' npx --no-install jest src/lib/Scenes/MyBids/__tests__/ActiveLotStanding-tests.tsx src/lib/Scenes/MyBids/__tests__/ClosedLotStanding-tests.tsx src/lib/Scenes/MyBids/__tests__/MyBids-tests.tsx --passWithNoTests 2>&1", "fix_patch": "diff --git a/src/__generated__/ActiveLot_lotStanding.graphql.ts b/src/__generated__/ActiveLotStanding_lotStanding.graphql.ts\nsimilarity index 90%\nrename from src/__generated__/ActiveLot_lotStanding.graphql.ts\nrename to src/__generated__/ActiveLotStanding_lotStanding.graphql.ts\nindex a43cd8adaab..5ada26e1fcd 100644\n--- a/src/__generated__/ActiveLot_lotStanding.graphql.ts\n+++ b/src/__generated__/ActiveLotStanding_lotStanding.graphql.ts\n@@ -6,7 +6,7 @@ import { ReaderFragment } from \"relay-runtime\";\n import { FragmentRefs } from \"relay-runtime\";\n export type AuctionsReserveStatus = \"NoReserve\" | \"ReserveMet\" | \"ReserveNotMet\" | \"%future added value\";\n export type AuctionsSoldStatus = \"ForSale\" | \"Passed\" | \"Sold\" | \"%future added value\";\n-export type ActiveLot_lotStanding = {\n+export type ActiveLotStanding_lotStanding = {\n readonly isHighestBidder: boolean;\n readonly lot: {\n readonly internalID: string;\n@@ -31,12 +31,12 @@ export type ActiveLot_lotStanding = {\n } | null;\n readonly \" $fragmentRefs\": FragmentRefs<\"Lot_saleArtwork\">;\n } | null;\n- readonly \" $refType\": \"ActiveLot_lotStanding\";\n+ readonly \" $refType\": \"ActiveLotStanding_lotStanding\";\n };\n-export type ActiveLot_lotStanding$data = ActiveLot_lotStanding;\n-export type ActiveLot_lotStanding$key = {\n- readonly \" $data\"?: ActiveLot_lotStanding$data;\n- readonly \" $fragmentRefs\": FragmentRefs<\"ActiveLot_lotStanding\">;\n+export type ActiveLotStanding_lotStanding$data = ActiveLotStanding_lotStanding;\n+export type ActiveLotStanding_lotStanding$key = {\n+ readonly \" $data\"?: ActiveLotStanding_lotStanding$data;\n+ readonly \" $fragmentRefs\": FragmentRefs<\"ActiveLotStanding_lotStanding\">;\n };\n \n \n@@ -62,7 +62,7 @@ return {\n \"argumentDefinitions\": [],\n \"kind\": \"Fragment\",\n \"metadata\": null,\n- \"name\": \"ActiveLot_lotStanding\",\n+ \"name\": \"ActiveLotStanding_lotStanding\",\n \"selections\": [\n {\n \"alias\": null,\n@@ -189,5 +189,5 @@ return {\n \"abstractKey\": null\n };\n })();\n-(node as any).hash = '61a73dc602ab0bcd7240f8c606937f9a';\n+(node as any).hash = '7bd2160ecda002affbfc8f733134e665';\n export default node;\ndiff --git a/src/__generated__/ClosedLot_lotStanding.graphql.ts b/src/__generated__/ClosedLotStanding_lotStanding.graphql.ts\nsimilarity index 90%\nrename from src/__generated__/ClosedLot_lotStanding.graphql.ts\nrename to src/__generated__/ClosedLotStanding_lotStanding.graphql.ts\nindex dbe5403fc5b..d8602e4ee28 100644\n--- a/src/__generated__/ClosedLot_lotStanding.graphql.ts\n+++ b/src/__generated__/ClosedLotStanding_lotStanding.graphql.ts\n@@ -6,7 +6,7 @@ import { ReaderFragment } from \"relay-runtime\";\n import { FragmentRefs } from \"relay-runtime\";\n export type AuctionsReserveStatus = \"NoReserve\" | \"ReserveMet\" | \"ReserveNotMet\" | \"%future added value\";\n export type AuctionsSoldStatus = \"ForSale\" | \"Passed\" | \"Sold\" | \"%future added value\";\n-export type ClosedLot_lotStanding = {\n+export type ClosedLotStanding_lotStanding = {\n readonly isHighestBidder: boolean;\n readonly lot: {\n readonly internalID: string;\n@@ -30,12 +30,12 @@ export type ClosedLot_lotStanding = {\n } | null;\n readonly \" $fragmentRefs\": FragmentRefs<\"Lot_saleArtwork\">;\n } | null;\n- readonly \" $refType\": \"ClosedLot_lotStanding\";\n+ readonly \" $refType\": \"ClosedLotStanding_lotStanding\";\n };\n-export type ClosedLot_lotStanding$data = ClosedLot_lotStanding;\n-export type ClosedLot_lotStanding$key = {\n- readonly \" $data\"?: ClosedLot_lotStanding$data;\n- readonly \" $fragmentRefs\": FragmentRefs<\"ClosedLot_lotStanding\">;\n+export type ClosedLotStanding_lotStanding$data = ClosedLotStanding_lotStanding;\n+export type ClosedLotStanding_lotStanding$key = {\n+ readonly \" $data\"?: ClosedLotStanding_lotStanding$data;\n+ readonly \" $fragmentRefs\": FragmentRefs<\"ClosedLotStanding_lotStanding\">;\n };\n \n \n@@ -52,7 +52,7 @@ return {\n \"argumentDefinitions\": [],\n \"kind\": \"Fragment\",\n \"metadata\": null,\n- \"name\": \"ClosedLot_lotStanding\",\n+ \"name\": \"ClosedLotStanding_lotStanding\",\n \"selections\": [\n {\n \"alias\": null,\n@@ -191,5 +191,5 @@ return {\n \"abstractKey\": null\n };\n })();\n-(node as any).hash = '47a50b528c216b6331947c0d9add8119';\n+(node as any).hash = '3182e3dbf02d6b71bed58ac014451e3b';\n export default node;\ndiff --git a/src/__generated__/InboxQuery.graphql.ts b/src/__generated__/InboxQuery.graphql.ts\nindex f96482f66c4..c5875cef029 100644\n--- a/src/__generated__/InboxQuery.graphql.ts\n+++ b/src/__generated__/InboxQuery.graphql.ts\n@@ -1,7 +1,7 @@\n /* tslint:disable */\n /* eslint-disable */\n // @ts-nocheck\n-/* @relayHash 0d13bf46caac48f48beb67e2720d8170 */\n+/* @relayHash b887631f5c52ea1634aa1ff213f90d46 */\n \n import { ConcreteRequest } from \"relay-runtime\";\n import { FragmentRefs } from \"relay-runtime\";\n@@ -26,7 +26,7 @@ query InboxQuery {\n }\n }\n \n-fragment ActiveLot_lotStanding on AuctionsLotStanding {\n+fragment ActiveLotStanding_lotStanding on AuctionsLotStanding {\n isHighestBidder\n lot {\n internalID\n@@ -57,7 +57,7 @@ fragment ActiveLot_lotStanding on AuctionsLotStanding {\n }\n }\n \n-fragment ClosedLot_lotStanding on AuctionsLotStanding {\n+fragment ClosedLotStanding_lotStanding on AuctionsLotStanding {\n isHighestBidder\n lot {\n internalID\n@@ -169,6 +169,19 @@ fragment Inbox_me on Me {\n ...MyBids_me\n }\n \n+fragment LotStatusListItem_lot on Lot {\n+ ...WatchedLot_lot\n+}\n+\n+fragment LotStatusListItem_lotStanding on AuctionsLotStanding {\n+ ...ActiveLotStanding_lotStanding\n+ ...ClosedLotStanding_lotStanding\n+ lot {\n+ soldStatus\n+ id\n+ }\n+}\n+\n fragment Lot_saleArtwork on SaleArtwork {\n lotLabel\n artwork {\n@@ -182,15 +195,14 @@ fragment Lot_saleArtwork on SaleArtwork {\n \n fragment MyBids_me on Me {\n ...SaleCard_me\n- identityVerified\n bidders(active: true) {\n sale {\n+ internalID\n ...SaleCard_sale\n registrationStatus {\n qualifiedForBidding\n id\n }\n- internalID\n liveStartAt\n endAt\n status\n@@ -201,8 +213,8 @@ fragment MyBids_me on Me {\n auctionsLotStandingConnection(first: 25, after: \"\") {\n edges {\n node {\n- ...ActiveLot_lotStanding\n- ...ClosedLot_lotStanding\n+ isHighestBidder\n+ ...LotStatusListItem_lotStanding\n lot {\n internalID\n saleId\n@@ -231,6 +243,31 @@ fragment MyBids_me on Me {\n hasNextPage\n }\n }\n+ watchedLotConnection(first: 20, after: \"\") {\n+ edges {\n+ node {\n+ ...LotStatusListItem_lot\n+ lot {\n+ internalID\n+ id\n+ }\n+ saleArtwork {\n+ internalID\n+ position\n+ sale {\n+ ...SaleCard_sale\n+ internalID\n+ liveStartAt\n+ endAt\n+ status\n+ id\n+ }\n+ id\n+ }\n+ id\n+ }\n+ }\n+ }\n }\n \n fragment SaleCard_me on Me {\n@@ -261,6 +298,34 @@ fragment SaleCard_sale on Sale {\n }\n requireIdentityVerification\n }\n+\n+fragment WatchedLot_lot on Lot {\n+ lot {\n+ internalID\n+ bidCount\n+ sellingPrice {\n+ display\n+ }\n+ soldStatus\n+ id\n+ }\n+ saleArtwork {\n+ ...Lot_saleArtwork\n+ artwork {\n+ internalID\n+ href\n+ slug\n+ id\n+ }\n+ sale {\n+ liveStartAt\n+ endAt\n+ status\n+ id\n+ }\n+ id\n+ }\n+}\n */\n \n const node: ConcreteRequest = (function(){\n@@ -441,7 +506,21 @@ v21 = [\n \"value\": 25\n }\n ],\n-v22 = [\n+v22 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"bidCount\",\n+ \"storageKey\": null\n+},\n+v23 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"soldStatus\",\n+ \"storageKey\": null\n+},\n+v24 = [\n {\n \"alias\": null,\n \"args\": null,\n@@ -449,7 +528,71 @@ v22 = [\n \"name\": \"display\",\n \"storageKey\": null\n }\n-];\n+],\n+v25 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Money\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"sellingPrice\",\n+ \"plural\": false,\n+ \"selections\": (v24/*: any*/),\n+ \"storageKey\": null\n+},\n+v26 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"lotLabel\",\n+ \"storageKey\": null\n+},\n+v27 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Artwork\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"artwork\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v8/*: any*/),\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Image\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"image\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": [\n+ {\n+ \"kind\": \"Literal\",\n+ \"name\": \"version\",\n+ \"value\": \"medium\"\n+ }\n+ ],\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"url\",\n+ \"storageKey\": \"url(version:\\\"medium\\\")\"\n+ }\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v5/*: any*/),\n+ (v3/*: any*/),\n+ (v13/*: any*/),\n+ (v14/*: any*/)\n+ ],\n+ \"storageKey\": null\n+},\n+v28 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"position\",\n+ \"storageKey\": null\n+};\n return {\n \"fragment\": {\n \"argumentDefinitions\": [],\n@@ -801,13 +944,7 @@ return {\n \"plural\": false,\n \"selections\": [\n (v3/*: any*/),\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"bidCount\",\n- \"storageKey\": null\n- },\n+ (v22/*: any*/),\n {\n \"alias\": null,\n \"args\": null,\n@@ -815,13 +952,7 @@ return {\n \"name\": \"reserveStatus\",\n \"storageKey\": null\n },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"soldStatus\",\n- \"storageKey\": null\n- },\n+ (v23/*: any*/),\n {\n \"alias\": \"askingPrice\",\n \"args\": null,\n@@ -829,19 +960,10 @@ return {\n \"kind\": \"LinkedField\",\n \"name\": \"onlineAskingPrice\",\n \"plural\": false,\n- \"selections\": (v22/*: any*/),\n- \"storageKey\": null\n- },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Money\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"sellingPrice\",\n- \"plural\": false,\n- \"selections\": (v22/*: any*/),\n+ \"selections\": (v24/*: any*/),\n \"storageKey\": null\n },\n+ (v25/*: any*/),\n (v5/*: any*/),\n {\n \"alias\": null,\n@@ -861,53 +983,8 @@ return {\n \"name\": \"saleArtwork\",\n \"plural\": false,\n \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"lotLabel\",\n- \"storageKey\": null\n- },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Artwork\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"artwork\",\n- \"plural\": false,\n- \"selections\": [\n- (v8/*: any*/),\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Image\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"image\",\n- \"plural\": false,\n- \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": [\n- {\n- \"kind\": \"Literal\",\n- \"name\": \"version\",\n- \"value\": \"medium\"\n- }\n- ],\n- \"kind\": \"ScalarField\",\n- \"name\": \"url\",\n- \"storageKey\": \"url(version:\\\"medium\\\")\"\n- }\n- ],\n- \"storageKey\": null\n- },\n- (v5/*: any*/),\n- (v3/*: any*/),\n- (v13/*: any*/),\n- (v14/*: any*/)\n- ],\n- \"storageKey\": null\n- },\n+ (v26/*: any*/),\n+ (v27/*: any*/),\n {\n \"alias\": null,\n \"args\": null,\n@@ -932,13 +1009,7 @@ return {\n \"storageKey\": null\n },\n (v5/*: any*/),\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"position\",\n- \"storageKey\": null\n- }\n+ (v28/*: any*/)\n ],\n \"storageKey\": null\n },\n@@ -973,6 +1044,102 @@ return {\n \"kind\": \"LinkedHandle\",\n \"name\": \"auctionsLotStandingConnection\"\n },\n+ {\n+ \"alias\": null,\n+ \"args\": [\n+ (v0/*: any*/),\n+ {\n+ \"kind\": \"Literal\",\n+ \"name\": \"first\",\n+ \"value\": 20\n+ }\n+ ],\n+ \"concreteType\": \"LotConnection\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"watchedLotConnection\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"LotEdge\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"edges\",\n+ \"plural\": true,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Lot\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"node\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"AuctionsLotState\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"lot\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v3/*: any*/),\n+ (v22/*: any*/),\n+ (v25/*: any*/),\n+ (v23/*: any*/),\n+ (v5/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"SaleArtwork\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"saleArtwork\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v26/*: any*/),\n+ (v27/*: any*/),\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Sale\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"sale\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v15/*: any*/),\n+ (v16/*: any*/),\n+ (v20/*: any*/),\n+ (v5/*: any*/),\n+ (v3/*: any*/),\n+ (v13/*: any*/),\n+ (v14/*: any*/),\n+ (v4/*: any*/),\n+ (v11/*: any*/),\n+ (v17/*: any*/),\n+ (v18/*: any*/),\n+ (v19/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v5/*: any*/),\n+ (v3/*: any*/),\n+ (v28/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v5/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": \"watchedLotConnection(after:\\\"\\\",first:20)\"\n+ },\n (v5/*: any*/)\n ],\n \"storageKey\": null\n@@ -980,7 +1147,7 @@ return {\n ]\n },\n \"params\": {\n- \"id\": \"0d13bf46caac48f48beb67e2720d8170\",\n+ \"id\": \"b887631f5c52ea1634aa1ff213f90d46\",\n \"metadata\": {},\n \"name\": \"InboxQuery\",\n \"operationKind\": \"query\",\ndiff --git a/src/__generated__/InboxRefetchQuery.graphql.ts b/src/__generated__/InboxRefetchQuery.graphql.ts\nindex 96e044fb175..151fbb5871e 100644\n--- a/src/__generated__/InboxRefetchQuery.graphql.ts\n+++ b/src/__generated__/InboxRefetchQuery.graphql.ts\n@@ -1,7 +1,7 @@\n /* tslint:disable */\n /* eslint-disable */\n // @ts-nocheck\n-/* @relayHash f011ea46e7fb5b39aae9943e9480a1d1 */\n+/* @relayHash 01b42b4b1d6571a5059550499a2c82b3 */\n \n import { ConcreteRequest } from \"relay-runtime\";\n import { FragmentRefs } from \"relay-runtime\";\n@@ -26,7 +26,7 @@ query InboxRefetchQuery {\n }\n }\n \n-fragment ActiveLot_lotStanding on AuctionsLotStanding {\n+fragment ActiveLotStanding_lotStanding on AuctionsLotStanding {\n isHighestBidder\n lot {\n internalID\n@@ -57,7 +57,7 @@ fragment ActiveLot_lotStanding on AuctionsLotStanding {\n }\n }\n \n-fragment ClosedLot_lotStanding on AuctionsLotStanding {\n+fragment ClosedLotStanding_lotStanding on AuctionsLotStanding {\n isHighestBidder\n lot {\n internalID\n@@ -169,6 +169,19 @@ fragment Inbox_me on Me {\n ...MyBids_me\n }\n \n+fragment LotStatusListItem_lot on Lot {\n+ ...WatchedLot_lot\n+}\n+\n+fragment LotStatusListItem_lotStanding on AuctionsLotStanding {\n+ ...ActiveLotStanding_lotStanding\n+ ...ClosedLotStanding_lotStanding\n+ lot {\n+ soldStatus\n+ id\n+ }\n+}\n+\n fragment Lot_saleArtwork on SaleArtwork {\n lotLabel\n artwork {\n@@ -182,15 +195,14 @@ fragment Lot_saleArtwork on SaleArtwork {\n \n fragment MyBids_me on Me {\n ...SaleCard_me\n- identityVerified\n bidders(active: true) {\n sale {\n+ internalID\n ...SaleCard_sale\n registrationStatus {\n qualifiedForBidding\n id\n }\n- internalID\n liveStartAt\n endAt\n status\n@@ -201,8 +213,8 @@ fragment MyBids_me on Me {\n auctionsLotStandingConnection(first: 25, after: \"\") {\n edges {\n node {\n- ...ActiveLot_lotStanding\n- ...ClosedLot_lotStanding\n+ isHighestBidder\n+ ...LotStatusListItem_lotStanding\n lot {\n internalID\n saleId\n@@ -231,6 +243,31 @@ fragment MyBids_me on Me {\n hasNextPage\n }\n }\n+ watchedLotConnection(first: 20, after: \"\") {\n+ edges {\n+ node {\n+ ...LotStatusListItem_lot\n+ lot {\n+ internalID\n+ id\n+ }\n+ saleArtwork {\n+ internalID\n+ position\n+ sale {\n+ ...SaleCard_sale\n+ internalID\n+ liveStartAt\n+ endAt\n+ status\n+ id\n+ }\n+ id\n+ }\n+ id\n+ }\n+ }\n+ }\n }\n \n fragment SaleCard_me on Me {\n@@ -261,6 +298,34 @@ fragment SaleCard_sale on Sale {\n }\n requireIdentityVerification\n }\n+\n+fragment WatchedLot_lot on Lot {\n+ lot {\n+ internalID\n+ bidCount\n+ sellingPrice {\n+ display\n+ }\n+ soldStatus\n+ id\n+ }\n+ saleArtwork {\n+ ...Lot_saleArtwork\n+ artwork {\n+ internalID\n+ href\n+ slug\n+ id\n+ }\n+ sale {\n+ liveStartAt\n+ endAt\n+ status\n+ id\n+ }\n+ id\n+ }\n+}\n */\n \n const node: ConcreteRequest = (function(){\n@@ -441,7 +506,21 @@ v21 = [\n \"value\": 25\n }\n ],\n-v22 = [\n+v22 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"bidCount\",\n+ \"storageKey\": null\n+},\n+v23 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"soldStatus\",\n+ \"storageKey\": null\n+},\n+v24 = [\n {\n \"alias\": null,\n \"args\": null,\n@@ -449,7 +528,71 @@ v22 = [\n \"name\": \"display\",\n \"storageKey\": null\n }\n-];\n+],\n+v25 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Money\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"sellingPrice\",\n+ \"plural\": false,\n+ \"selections\": (v24/*: any*/),\n+ \"storageKey\": null\n+},\n+v26 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"lotLabel\",\n+ \"storageKey\": null\n+},\n+v27 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Artwork\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"artwork\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v8/*: any*/),\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Image\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"image\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": [\n+ {\n+ \"kind\": \"Literal\",\n+ \"name\": \"version\",\n+ \"value\": \"medium\"\n+ }\n+ ],\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"url\",\n+ \"storageKey\": \"url(version:\\\"medium\\\")\"\n+ }\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v5/*: any*/),\n+ (v3/*: any*/),\n+ (v13/*: any*/),\n+ (v14/*: any*/)\n+ ],\n+ \"storageKey\": null\n+},\n+v28 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"position\",\n+ \"storageKey\": null\n+};\n return {\n \"fragment\": {\n \"argumentDefinitions\": [],\n@@ -801,13 +944,7 @@ return {\n \"plural\": false,\n \"selections\": [\n (v3/*: any*/),\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"bidCount\",\n- \"storageKey\": null\n- },\n+ (v22/*: any*/),\n {\n \"alias\": null,\n \"args\": null,\n@@ -815,13 +952,7 @@ return {\n \"name\": \"reserveStatus\",\n \"storageKey\": null\n },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"soldStatus\",\n- \"storageKey\": null\n- },\n+ (v23/*: any*/),\n {\n \"alias\": \"askingPrice\",\n \"args\": null,\n@@ -829,19 +960,10 @@ return {\n \"kind\": \"LinkedField\",\n \"name\": \"onlineAskingPrice\",\n \"plural\": false,\n- \"selections\": (v22/*: any*/),\n- \"storageKey\": null\n- },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Money\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"sellingPrice\",\n- \"plural\": false,\n- \"selections\": (v22/*: any*/),\n+ \"selections\": (v24/*: any*/),\n \"storageKey\": null\n },\n+ (v25/*: any*/),\n (v5/*: any*/),\n {\n \"alias\": null,\n@@ -861,53 +983,8 @@ return {\n \"name\": \"saleArtwork\",\n \"plural\": false,\n \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"lotLabel\",\n- \"storageKey\": null\n- },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Artwork\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"artwork\",\n- \"plural\": false,\n- \"selections\": [\n- (v8/*: any*/),\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Image\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"image\",\n- \"plural\": false,\n- \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": [\n- {\n- \"kind\": \"Literal\",\n- \"name\": \"version\",\n- \"value\": \"medium\"\n- }\n- ],\n- \"kind\": \"ScalarField\",\n- \"name\": \"url\",\n- \"storageKey\": \"url(version:\\\"medium\\\")\"\n- }\n- ],\n- \"storageKey\": null\n- },\n- (v5/*: any*/),\n- (v3/*: any*/),\n- (v13/*: any*/),\n- (v14/*: any*/)\n- ],\n- \"storageKey\": null\n- },\n+ (v26/*: any*/),\n+ (v27/*: any*/),\n {\n \"alias\": null,\n \"args\": null,\n@@ -932,13 +1009,7 @@ return {\n \"storageKey\": null\n },\n (v5/*: any*/),\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"position\",\n- \"storageKey\": null\n- }\n+ (v28/*: any*/)\n ],\n \"storageKey\": null\n },\n@@ -973,6 +1044,102 @@ return {\n \"kind\": \"LinkedHandle\",\n \"name\": \"auctionsLotStandingConnection\"\n },\n+ {\n+ \"alias\": null,\n+ \"args\": [\n+ (v0/*: any*/),\n+ {\n+ \"kind\": \"Literal\",\n+ \"name\": \"first\",\n+ \"value\": 20\n+ }\n+ ],\n+ \"concreteType\": \"LotConnection\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"watchedLotConnection\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"LotEdge\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"edges\",\n+ \"plural\": true,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Lot\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"node\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"AuctionsLotState\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"lot\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v3/*: any*/),\n+ (v22/*: any*/),\n+ (v25/*: any*/),\n+ (v23/*: any*/),\n+ (v5/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"SaleArtwork\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"saleArtwork\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v26/*: any*/),\n+ (v27/*: any*/),\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Sale\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"sale\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v15/*: any*/),\n+ (v16/*: any*/),\n+ (v20/*: any*/),\n+ (v5/*: any*/),\n+ (v3/*: any*/),\n+ (v13/*: any*/),\n+ (v14/*: any*/),\n+ (v4/*: any*/),\n+ (v11/*: any*/),\n+ (v17/*: any*/),\n+ (v18/*: any*/),\n+ (v19/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v5/*: any*/),\n+ (v3/*: any*/),\n+ (v28/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v5/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": \"watchedLotConnection(after:\\\"\\\",first:20)\"\n+ },\n (v5/*: any*/)\n ],\n \"storageKey\": null\n@@ -980,7 +1147,7 @@ return {\n ]\n },\n \"params\": {\n- \"id\": \"f011ea46e7fb5b39aae9943e9480a1d1\",\n+ \"id\": \"01b42b4b1d6571a5059550499a2c82b3\",\n \"metadata\": {},\n \"name\": \"InboxRefetchQuery\",\n \"operationKind\": \"query\",\ndiff --git a/src/__generated__/LotStatusListItem_lot.graphql.ts b/src/__generated__/LotStatusListItem_lot.graphql.ts\nnew file mode 100644\nindex 00000000000..45d39ea1ede\n--- /dev/null\n+++ b/src/__generated__/LotStatusListItem_lot.graphql.ts\n@@ -0,0 +1,35 @@\n+/* tslint:disable */\n+/* eslint-disable */\n+// @ts-nocheck\n+\n+import { ReaderFragment } from \"relay-runtime\";\n+import { FragmentRefs } from \"relay-runtime\";\n+export type LotStatusListItem_lot = {\n+ readonly \" $fragmentRefs\": FragmentRefs<\"WatchedLot_lot\">;\n+ readonly \" $refType\": \"LotStatusListItem_lot\";\n+};\n+export type LotStatusListItem_lot$data = LotStatusListItem_lot;\n+export type LotStatusListItem_lot$key = {\n+ readonly \" $data\"?: LotStatusListItem_lot$data;\n+ readonly \" $fragmentRefs\": FragmentRefs<\"LotStatusListItem_lot\">;\n+};\n+\n+\n+\n+const node: ReaderFragment = {\n+ \"argumentDefinitions\": [],\n+ \"kind\": \"Fragment\",\n+ \"metadata\": null,\n+ \"name\": \"LotStatusListItem_lot\",\n+ \"selections\": [\n+ {\n+ \"args\": null,\n+ \"kind\": \"FragmentSpread\",\n+ \"name\": \"WatchedLot_lot\"\n+ }\n+ ],\n+ \"type\": \"Lot\",\n+ \"abstractKey\": null\n+};\n+(node as any).hash = 'ad4007d2799357c635a950822f07123d';\n+export default node;\ndiff --git a/src/__generated__/LotStatusListItem_lotStanding.graphql.ts b/src/__generated__/LotStatusListItem_lotStanding.graphql.ts\nnew file mode 100644\nindex 00000000000..818d94df80a\n--- /dev/null\n+++ b/src/__generated__/LotStatusListItem_lotStanding.graphql.ts\n@@ -0,0 +1,62 @@\n+/* tslint:disable */\n+/* eslint-disable */\n+// @ts-nocheck\n+\n+import { ReaderFragment } from \"relay-runtime\";\n+import { FragmentRefs } from \"relay-runtime\";\n+export type AuctionsSoldStatus = \"ForSale\" | \"Passed\" | \"Sold\" | \"%future added value\";\n+export type LotStatusListItem_lotStanding = {\n+ readonly lot: {\n+ readonly soldStatus: AuctionsSoldStatus;\n+ };\n+ readonly \" $fragmentRefs\": FragmentRefs<\"ActiveLotStanding_lotStanding\" | \"ClosedLotStanding_lotStanding\">;\n+ readonly \" $refType\": \"LotStatusListItem_lotStanding\";\n+};\n+export type LotStatusListItem_lotStanding$data = LotStatusListItem_lotStanding;\n+export type LotStatusListItem_lotStanding$key = {\n+ readonly \" $data\"?: LotStatusListItem_lotStanding$data;\n+ readonly \" $fragmentRefs\": FragmentRefs<\"LotStatusListItem_lotStanding\">;\n+};\n+\n+\n+\n+const node: ReaderFragment = {\n+ \"argumentDefinitions\": [],\n+ \"kind\": \"Fragment\",\n+ \"metadata\": null,\n+ \"name\": \"LotStatusListItem_lotStanding\",\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"AuctionsLotState\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"lot\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"soldStatus\",\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": null\n+ },\n+ {\n+ \"args\": null,\n+ \"kind\": \"FragmentSpread\",\n+ \"name\": \"ActiveLotStanding_lotStanding\"\n+ },\n+ {\n+ \"args\": null,\n+ \"kind\": \"FragmentSpread\",\n+ \"name\": \"ClosedLotStanding_lotStanding\"\n+ }\n+ ],\n+ \"type\": \"AuctionsLotStanding\",\n+ \"abstractKey\": null\n+};\n+(node as any).hash = 'cf199632926afe062d5f2bb9736bcd76';\n+export default node;\ndiff --git a/src/__generated__/MyBidsPaginatedQuery.graphql.ts b/src/__generated__/MyBidsPaginatedQuery.graphql.ts\nindex cc107c1d0b6..f84df7d0864 100644\n--- a/src/__generated__/MyBidsPaginatedQuery.graphql.ts\n+++ b/src/__generated__/MyBidsPaginatedQuery.graphql.ts\n@@ -1,7 +1,7 @@\n /* tslint:disable */\n /* eslint-disable */\n // @ts-nocheck\n-/* @relayHash aad63c10753c544804443a318b5d68a1 */\n+/* @relayHash b80b183b0283bff41676d10cb865ba06 */\n \n import { ConcreteRequest } from \"relay-runtime\";\n import { FragmentRefs } from \"relay-runtime\";\n@@ -32,7 +32,7 @@ query MyBidsPaginatedQuery(\n }\n }\n \n-fragment ActiveLot_lotStanding on AuctionsLotStanding {\n+fragment ActiveLotStanding_lotStanding on AuctionsLotStanding {\n isHighestBidder\n lot {\n internalID\n@@ -63,7 +63,7 @@ fragment ActiveLot_lotStanding on AuctionsLotStanding {\n }\n }\n \n-fragment ClosedLot_lotStanding on AuctionsLotStanding {\n+fragment ClosedLotStanding_lotStanding on AuctionsLotStanding {\n isHighestBidder\n lot {\n internalID\n@@ -93,6 +93,19 @@ fragment ClosedLot_lotStanding on AuctionsLotStanding {\n }\n }\n \n+fragment LotStatusListItem_lot on Lot {\n+ ...WatchedLot_lot\n+}\n+\n+fragment LotStatusListItem_lotStanding on AuctionsLotStanding {\n+ ...ActiveLotStanding_lotStanding\n+ ...ClosedLotStanding_lotStanding\n+ lot {\n+ soldStatus\n+ id\n+ }\n+}\n+\n fragment Lot_saleArtwork on SaleArtwork {\n lotLabel\n artwork {\n@@ -106,15 +119,14 @@ fragment Lot_saleArtwork on SaleArtwork {\n \n fragment MyBids_me_1G22uz on Me {\n ...SaleCard_me\n- identityVerified\n bidders(active: true) {\n sale {\n+ internalID\n ...SaleCard_sale\n registrationStatus {\n qualifiedForBidding\n id\n }\n- internalID\n liveStartAt\n endAt\n status\n@@ -125,8 +137,8 @@ fragment MyBids_me_1G22uz on Me {\n auctionsLotStandingConnection(first: $count, after: $cursor) {\n edges {\n node {\n- ...ActiveLot_lotStanding\n- ...ClosedLot_lotStanding\n+ isHighestBidder\n+ ...LotStatusListItem_lotStanding\n lot {\n internalID\n saleId\n@@ -155,6 +167,31 @@ fragment MyBids_me_1G22uz on Me {\n hasNextPage\n }\n }\n+ watchedLotConnection(first: 20, after: $cursor) {\n+ edges {\n+ node {\n+ ...LotStatusListItem_lot\n+ lot {\n+ internalID\n+ id\n+ }\n+ saleArtwork {\n+ internalID\n+ position\n+ sale {\n+ ...SaleCard_sale\n+ internalID\n+ liveStartAt\n+ endAt\n+ status\n+ id\n+ }\n+ id\n+ }\n+ id\n+ }\n+ }\n+ }\n }\n \n fragment SaleCard_me on Me {\n@@ -185,6 +222,34 @@ fragment SaleCard_sale on Sale {\n }\n requireIdentityVerification\n }\n+\n+fragment WatchedLot_lot on Lot {\n+ lot {\n+ internalID\n+ bidCount\n+ sellingPrice {\n+ display\n+ }\n+ soldStatus\n+ id\n+ }\n+ saleArtwork {\n+ ...Lot_saleArtwork\n+ artwork {\n+ internalID\n+ href\n+ slug\n+ id\n+ }\n+ sale {\n+ liveStartAt\n+ endAt\n+ status\n+ id\n+ }\n+ id\n+ }\n+}\n */\n \n const node: ConcreteRequest = (function(){\n@@ -313,19 +378,34 @@ v12 = {\n \"name\": \"status\",\n \"storageKey\": null\n },\n-v13 = [\n- {\n- \"kind\": \"Variable\",\n- \"name\": \"after\",\n- \"variableName\": \"cursor\"\n- },\n+v13 = {\n+ \"kind\": \"Variable\",\n+ \"name\": \"after\",\n+ \"variableName\": \"cursor\"\n+},\n+v14 = [\n+ (v13/*: any*/),\n {\n \"kind\": \"Variable\",\n \"name\": \"first\",\n \"variableName\": \"count\"\n }\n ],\n-v14 = [\n+v15 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"bidCount\",\n+ \"storageKey\": null\n+},\n+v16 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"soldStatus\",\n+ \"storageKey\": null\n+},\n+v17 = [\n {\n \"alias\": null,\n \"args\": null,\n@@ -333,7 +413,77 @@ v14 = [\n \"name\": \"display\",\n \"storageKey\": null\n }\n-];\n+],\n+v18 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Money\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"sellingPrice\",\n+ \"plural\": false,\n+ \"selections\": (v17/*: any*/),\n+ \"storageKey\": null\n+},\n+v19 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"lotLabel\",\n+ \"storageKey\": null\n+},\n+v20 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Artwork\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"artwork\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"artistNames\",\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Image\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"image\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": [\n+ {\n+ \"kind\": \"Literal\",\n+ \"name\": \"version\",\n+ \"value\": \"medium\"\n+ }\n+ ],\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"url\",\n+ \"storageKey\": \"url(version:\\\"medium\\\")\"\n+ }\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v2/*: any*/),\n+ (v1/*: any*/),\n+ (v3/*: any*/),\n+ (v4/*: any*/)\n+ ],\n+ \"storageKey\": null\n+},\n+v21 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"position\",\n+ \"storageKey\": null\n+};\n return {\n \"fragment\": {\n \"argumentDefinitions\": (v0/*: any*/),\n@@ -449,7 +599,7 @@ return {\n },\n {\n \"alias\": null,\n- \"args\": (v13/*: any*/),\n+ \"args\": (v14/*: any*/),\n \"concreteType\": \"AuctionsLotStandingConnection\",\n \"kind\": \"LinkedField\",\n \"name\": \"auctionsLotStandingConnection\",\n@@ -487,13 +637,7 @@ return {\n \"plural\": false,\n \"selections\": [\n (v1/*: any*/),\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"bidCount\",\n- \"storageKey\": null\n- },\n+ (v15/*: any*/),\n {\n \"alias\": null,\n \"args\": null,\n@@ -501,13 +645,7 @@ return {\n \"name\": \"reserveStatus\",\n \"storageKey\": null\n },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"soldStatus\",\n- \"storageKey\": null\n- },\n+ (v16/*: any*/),\n {\n \"alias\": \"askingPrice\",\n \"args\": null,\n@@ -515,19 +653,10 @@ return {\n \"kind\": \"LinkedField\",\n \"name\": \"onlineAskingPrice\",\n \"plural\": false,\n- \"selections\": (v14/*: any*/),\n- \"storageKey\": null\n- },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Money\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"sellingPrice\",\n- \"plural\": false,\n- \"selections\": (v14/*: any*/),\n+ \"selections\": (v17/*: any*/),\n \"storageKey\": null\n },\n+ (v18/*: any*/),\n (v2/*: any*/),\n {\n \"alias\": null,\n@@ -547,59 +676,8 @@ return {\n \"name\": \"saleArtwork\",\n \"plural\": false,\n \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"lotLabel\",\n- \"storageKey\": null\n- },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Artwork\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"artwork\",\n- \"plural\": false,\n- \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"artistNames\",\n- \"storageKey\": null\n- },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Image\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"image\",\n- \"plural\": false,\n- \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": [\n- {\n- \"kind\": \"Literal\",\n- \"name\": \"version\",\n- \"value\": \"medium\"\n- }\n- ],\n- \"kind\": \"ScalarField\",\n- \"name\": \"url\",\n- \"storageKey\": \"url(version:\\\"medium\\\")\"\n- }\n- ],\n- \"storageKey\": null\n- },\n- (v2/*: any*/),\n- (v1/*: any*/),\n- (v3/*: any*/),\n- (v4/*: any*/)\n- ],\n- \"storageKey\": null\n- },\n+ (v19/*: any*/),\n+ (v20/*: any*/),\n {\n \"alias\": null,\n \"args\": null,\n@@ -624,13 +702,7 @@ return {\n \"storageKey\": null\n },\n (v2/*: any*/),\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"position\",\n- \"storageKey\": null\n- }\n+ (v21/*: any*/)\n ],\n \"storageKey\": null\n },\n@@ -685,13 +757,109 @@ return {\n },\n {\n \"alias\": null,\n- \"args\": (v13/*: any*/),\n+ \"args\": (v14/*: any*/),\n \"filters\": null,\n \"handle\": \"connection\",\n \"key\": \"MyBids_auctionsLotStandingConnection\",\n \"kind\": \"LinkedHandle\",\n \"name\": \"auctionsLotStandingConnection\"\n },\n+ {\n+ \"alias\": null,\n+ \"args\": [\n+ (v13/*: any*/),\n+ {\n+ \"kind\": \"Literal\",\n+ \"name\": \"first\",\n+ \"value\": 20\n+ }\n+ ],\n+ \"concreteType\": \"LotConnection\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"watchedLotConnection\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"LotEdge\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"edges\",\n+ \"plural\": true,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Lot\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"node\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"AuctionsLotState\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"lot\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v1/*: any*/),\n+ (v15/*: any*/),\n+ (v18/*: any*/),\n+ (v16/*: any*/),\n+ (v2/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"SaleArtwork\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"saleArtwork\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v19/*: any*/),\n+ (v20/*: any*/),\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Sale\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"sale\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v6/*: any*/),\n+ (v7/*: any*/),\n+ (v12/*: any*/),\n+ (v2/*: any*/),\n+ (v1/*: any*/),\n+ (v3/*: any*/),\n+ (v4/*: any*/),\n+ (v5/*: any*/),\n+ (v8/*: any*/),\n+ (v9/*: any*/),\n+ (v10/*: any*/),\n+ (v11/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v2/*: any*/),\n+ (v1/*: any*/),\n+ (v21/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v2/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": null\n+ },\n (v2/*: any*/)\n ],\n \"storageKey\": null\n@@ -699,7 +867,7 @@ return {\n ]\n },\n \"params\": {\n- \"id\": \"aad63c10753c544804443a318b5d68a1\",\n+ \"id\": \"b80b183b0283bff41676d10cb865ba06\",\n \"metadata\": {},\n \"name\": \"MyBidsPaginatedQuery\",\n \"operationKind\": \"query\",\ndiff --git a/src/__generated__/MyBidsQuery.graphql.ts b/src/__generated__/MyBidsQuery.graphql.ts\nindex fc1f6c6b14e..9a70a7c93ec 100644\n--- a/src/__generated__/MyBidsQuery.graphql.ts\n+++ b/src/__generated__/MyBidsQuery.graphql.ts\n@@ -1,7 +1,7 @@\n /* tslint:disable */\n /* eslint-disable */\n // @ts-nocheck\n-/* @relayHash 83b52952a848c7997f1eca2743aa4892 */\n+/* @relayHash a8b75b24d93605a9cb512bdffa9978ac */\n \n import { ConcreteRequest } from \"relay-runtime\";\n import { FragmentRefs } from \"relay-runtime\";\n@@ -26,7 +26,7 @@ query MyBidsQuery {\n }\n }\n \n-fragment ActiveLot_lotStanding on AuctionsLotStanding {\n+fragment ActiveLotStanding_lotStanding on AuctionsLotStanding {\n isHighestBidder\n lot {\n internalID\n@@ -57,7 +57,7 @@ fragment ActiveLot_lotStanding on AuctionsLotStanding {\n }\n }\n \n-fragment ClosedLot_lotStanding on AuctionsLotStanding {\n+fragment ClosedLotStanding_lotStanding on AuctionsLotStanding {\n isHighestBidder\n lot {\n internalID\n@@ -87,6 +87,19 @@ fragment ClosedLot_lotStanding on AuctionsLotStanding {\n }\n }\n \n+fragment LotStatusListItem_lot on Lot {\n+ ...WatchedLot_lot\n+}\n+\n+fragment LotStatusListItem_lotStanding on AuctionsLotStanding {\n+ ...ActiveLotStanding_lotStanding\n+ ...ClosedLotStanding_lotStanding\n+ lot {\n+ soldStatus\n+ id\n+ }\n+}\n+\n fragment Lot_saleArtwork on SaleArtwork {\n lotLabel\n artwork {\n@@ -100,15 +113,14 @@ fragment Lot_saleArtwork on SaleArtwork {\n \n fragment MyBids_me on Me {\n ...SaleCard_me\n- identityVerified\n bidders(active: true) {\n sale {\n+ internalID\n ...SaleCard_sale\n registrationStatus {\n qualifiedForBidding\n id\n }\n- internalID\n liveStartAt\n endAt\n status\n@@ -119,8 +131,8 @@ fragment MyBids_me on Me {\n auctionsLotStandingConnection(first: 25, after: \"\") {\n edges {\n node {\n- ...ActiveLot_lotStanding\n- ...ClosedLot_lotStanding\n+ isHighestBidder\n+ ...LotStatusListItem_lotStanding\n lot {\n internalID\n saleId\n@@ -149,6 +161,31 @@ fragment MyBids_me on Me {\n hasNextPage\n }\n }\n+ watchedLotConnection(first: 20, after: \"\") {\n+ edges {\n+ node {\n+ ...LotStatusListItem_lot\n+ lot {\n+ internalID\n+ id\n+ }\n+ saleArtwork {\n+ internalID\n+ position\n+ sale {\n+ ...SaleCard_sale\n+ internalID\n+ liveStartAt\n+ endAt\n+ status\n+ id\n+ }\n+ id\n+ }\n+ id\n+ }\n+ }\n+ }\n }\n \n fragment SaleCard_me on Me {\n@@ -179,6 +216,34 @@ fragment SaleCard_sale on Sale {\n }\n requireIdentityVerification\n }\n+\n+fragment WatchedLot_lot on Lot {\n+ lot {\n+ internalID\n+ bidCount\n+ sellingPrice {\n+ display\n+ }\n+ soldStatus\n+ id\n+ }\n+ saleArtwork {\n+ ...Lot_saleArtwork\n+ artwork {\n+ internalID\n+ href\n+ slug\n+ id\n+ }\n+ sale {\n+ liveStartAt\n+ endAt\n+ status\n+ id\n+ }\n+ id\n+ }\n+}\n */\n \n const node: ConcreteRequest = (function(){\n@@ -295,19 +360,34 @@ v11 = {\n \"name\": \"status\",\n \"storageKey\": null\n },\n-v12 = [\n- {\n- \"kind\": \"Literal\",\n- \"name\": \"after\",\n- \"value\": \"\"\n- },\n+v12 = {\n+ \"kind\": \"Literal\",\n+ \"name\": \"after\",\n+ \"value\": \"\"\n+},\n+v13 = [\n+ (v12/*: any*/),\n {\n \"kind\": \"Literal\",\n \"name\": \"first\",\n \"value\": 25\n }\n ],\n-v13 = [\n+v14 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"bidCount\",\n+ \"storageKey\": null\n+},\n+v15 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"soldStatus\",\n+ \"storageKey\": null\n+},\n+v16 = [\n {\n \"alias\": null,\n \"args\": null,\n@@ -315,7 +395,77 @@ v13 = [\n \"name\": \"display\",\n \"storageKey\": null\n }\n-];\n+],\n+v17 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Money\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"sellingPrice\",\n+ \"plural\": false,\n+ \"selections\": (v16/*: any*/),\n+ \"storageKey\": null\n+},\n+v18 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"lotLabel\",\n+ \"storageKey\": null\n+},\n+v19 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Artwork\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"artwork\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"artistNames\",\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Image\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"image\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": [\n+ {\n+ \"kind\": \"Literal\",\n+ \"name\": \"version\",\n+ \"value\": \"medium\"\n+ }\n+ ],\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"url\",\n+ \"storageKey\": \"url(version:\\\"medium\\\")\"\n+ }\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v1/*: any*/),\n+ (v0/*: any*/),\n+ (v2/*: any*/),\n+ (v3/*: any*/)\n+ ],\n+ \"storageKey\": null\n+},\n+v20 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"position\",\n+ \"storageKey\": null\n+};\n return {\n \"fragment\": {\n \"argumentDefinitions\": [],\n@@ -420,7 +570,7 @@ return {\n },\n {\n \"alias\": null,\n- \"args\": (v12/*: any*/),\n+ \"args\": (v13/*: any*/),\n \"concreteType\": \"AuctionsLotStandingConnection\",\n \"kind\": \"LinkedField\",\n \"name\": \"auctionsLotStandingConnection\",\n@@ -458,13 +608,7 @@ return {\n \"plural\": false,\n \"selections\": [\n (v0/*: any*/),\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"bidCount\",\n- \"storageKey\": null\n- },\n+ (v14/*: any*/),\n {\n \"alias\": null,\n \"args\": null,\n@@ -472,13 +616,7 @@ return {\n \"name\": \"reserveStatus\",\n \"storageKey\": null\n },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"soldStatus\",\n- \"storageKey\": null\n- },\n+ (v15/*: any*/),\n {\n \"alias\": \"askingPrice\",\n \"args\": null,\n@@ -486,19 +624,10 @@ return {\n \"kind\": \"LinkedField\",\n \"name\": \"onlineAskingPrice\",\n \"plural\": false,\n- \"selections\": (v13/*: any*/),\n- \"storageKey\": null\n- },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Money\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"sellingPrice\",\n- \"plural\": false,\n- \"selections\": (v13/*: any*/),\n+ \"selections\": (v16/*: any*/),\n \"storageKey\": null\n },\n+ (v17/*: any*/),\n (v1/*: any*/),\n {\n \"alias\": null,\n@@ -518,59 +647,8 @@ return {\n \"name\": \"saleArtwork\",\n \"plural\": false,\n \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"lotLabel\",\n- \"storageKey\": null\n- },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Artwork\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"artwork\",\n- \"plural\": false,\n- \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"artistNames\",\n- \"storageKey\": null\n- },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Image\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"image\",\n- \"plural\": false,\n- \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": [\n- {\n- \"kind\": \"Literal\",\n- \"name\": \"version\",\n- \"value\": \"medium\"\n- }\n- ],\n- \"kind\": \"ScalarField\",\n- \"name\": \"url\",\n- \"storageKey\": \"url(version:\\\"medium\\\")\"\n- }\n- ],\n- \"storageKey\": null\n- },\n- (v1/*: any*/),\n- (v0/*: any*/),\n- (v2/*: any*/),\n- (v3/*: any*/)\n- ],\n- \"storageKey\": null\n- },\n+ (v18/*: any*/),\n+ (v19/*: any*/),\n {\n \"alias\": null,\n \"args\": null,\n@@ -595,13 +673,7 @@ return {\n \"storageKey\": null\n },\n (v1/*: any*/),\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"position\",\n- \"storageKey\": null\n- }\n+ (v20/*: any*/)\n ],\n \"storageKey\": null\n },\n@@ -656,13 +728,109 @@ return {\n },\n {\n \"alias\": null,\n- \"args\": (v12/*: any*/),\n+ \"args\": (v13/*: any*/),\n \"filters\": null,\n \"handle\": \"connection\",\n \"key\": \"MyBids_auctionsLotStandingConnection\",\n \"kind\": \"LinkedHandle\",\n \"name\": \"auctionsLotStandingConnection\"\n },\n+ {\n+ \"alias\": null,\n+ \"args\": [\n+ (v12/*: any*/),\n+ {\n+ \"kind\": \"Literal\",\n+ \"name\": \"first\",\n+ \"value\": 20\n+ }\n+ ],\n+ \"concreteType\": \"LotConnection\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"watchedLotConnection\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"LotEdge\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"edges\",\n+ \"plural\": true,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Lot\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"node\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"AuctionsLotState\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"lot\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v0/*: any*/),\n+ (v14/*: any*/),\n+ (v17/*: any*/),\n+ (v15/*: any*/),\n+ (v1/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"SaleArtwork\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"saleArtwork\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v18/*: any*/),\n+ (v19/*: any*/),\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Sale\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"sale\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v5/*: any*/),\n+ (v6/*: any*/),\n+ (v11/*: any*/),\n+ (v1/*: any*/),\n+ (v0/*: any*/),\n+ (v2/*: any*/),\n+ (v3/*: any*/),\n+ (v4/*: any*/),\n+ (v7/*: any*/),\n+ (v8/*: any*/),\n+ (v9/*: any*/),\n+ (v10/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v1/*: any*/),\n+ (v0/*: any*/),\n+ (v20/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v1/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": \"watchedLotConnection(after:\\\"\\\",first:20)\"\n+ },\n (v1/*: any*/)\n ],\n \"storageKey\": null\n@@ -670,7 +838,7 @@ return {\n ]\n },\n \"params\": {\n- \"id\": \"83b52952a848c7997f1eca2743aa4892\",\n+ \"id\": \"a8b75b24d93605a9cb512bdffa9978ac\",\n \"metadata\": {},\n \"name\": \"MyBidsQuery\",\n \"operationKind\": \"query\",\ndiff --git a/src/__generated__/MyBids_me.graphql.ts b/src/__generated__/MyBids_me.graphql.ts\nindex 86708431f28..ce088bf2436 100644\n--- a/src/__generated__/MyBids_me.graphql.ts\n+++ b/src/__generated__/MyBids_me.graphql.ts\n@@ -6,13 +6,12 @@ import { ReaderFragment } from \"relay-runtime\";\n import { FragmentRefs } from \"relay-runtime\";\n export type AuctionsSoldStatus = \"ForSale\" | \"Passed\" | \"Sold\" | \"%future added value\";\n export type MyBids_me = {\n- readonly identityVerified: boolean | null;\n readonly bidders: ReadonlyArray<{\n readonly sale: {\n+ readonly internalID: string;\n readonly registrationStatus: {\n readonly qualifiedForBidding: boolean | null;\n } | null;\n- readonly internalID: string;\n readonly liveStartAt: string | null;\n readonly endAt: string | null;\n readonly status: string | null;\n@@ -22,6 +21,7 @@ export type MyBids_me = {\n readonly auctionsLotStandingConnection: {\n readonly edges: ReadonlyArray<{\n readonly node: {\n+ readonly isHighestBidder: boolean;\n readonly lot: {\n readonly internalID: string;\n readonly saleId: string;\n@@ -37,10 +37,31 @@ export type MyBids_me = {\n readonly \" $fragmentRefs\": FragmentRefs<\"SaleCard_sale\">;\n } | null;\n } | null;\n- readonly \" $fragmentRefs\": FragmentRefs<\"ActiveLot_lotStanding\" | \"ClosedLot_lotStanding\">;\n+ readonly \" $fragmentRefs\": FragmentRefs<\"LotStatusListItem_lotStanding\">;\n };\n } | null> | null;\n };\n+ readonly watchedLotConnection: {\n+ readonly edges: ReadonlyArray<{\n+ readonly node: {\n+ readonly lot: {\n+ readonly internalID: string;\n+ };\n+ readonly saleArtwork: {\n+ readonly internalID: string;\n+ readonly position: number | null;\n+ readonly sale: {\n+ readonly internalID: string;\n+ readonly liveStartAt: string | null;\n+ readonly endAt: string | null;\n+ readonly status: string | null;\n+ readonly \" $fragmentRefs\": FragmentRefs<\"SaleCard_sale\">;\n+ } | null;\n+ } | null;\n+ readonly \" $fragmentRefs\": FragmentRefs<\"LotStatusListItem_lot\">;\n+ } | null;\n+ } | null> | null;\n+ } | null;\n readonly \" $fragmentRefs\": FragmentRefs<\"SaleCard_me\">;\n readonly \" $refType\": \"MyBids_me\";\n };\n@@ -85,6 +106,29 @@ v4 = {\n \"args\": null,\n \"kind\": \"FragmentSpread\",\n \"name\": \"SaleCard_sale\"\n+},\n+v5 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"position\",\n+ \"storageKey\": null\n+},\n+v6 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Sale\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"sale\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v0/*: any*/),\n+ (v1/*: any*/),\n+ (v2/*: any*/),\n+ (v3/*: any*/),\n+ (v4/*: any*/)\n+ ],\n+ \"storageKey\": null\n };\n return {\n \"argumentDefinitions\": [\n@@ -114,13 +158,6 @@ return {\n },\n \"name\": \"MyBids_me\",\n \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"identityVerified\",\n- \"storageKey\": null\n- },\n {\n \"alias\": null,\n \"args\": [\n@@ -143,6 +180,7 @@ return {\n \"name\": \"sale\",\n \"plural\": false,\n \"selections\": [\n+ (v0/*: any*/),\n {\n \"alias\": null,\n \"args\": null,\n@@ -161,7 +199,6 @@ return {\n ],\n \"storageKey\": null\n },\n- (v0/*: any*/),\n (v1/*: any*/),\n (v2/*: any*/),\n (v3/*: any*/),\n@@ -196,6 +233,13 @@ return {\n \"name\": \"node\",\n \"plural\": false,\n \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"isHighestBidder\",\n+ \"storageKey\": null\n+ },\n {\n \"alias\": null,\n \"args\": null,\n@@ -230,29 +274,8 @@ return {\n \"name\": \"saleArtwork\",\n \"plural\": false,\n \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"position\",\n- \"storageKey\": null\n- },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Sale\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"sale\",\n- \"plural\": false,\n- \"selections\": [\n- (v0/*: any*/),\n- (v1/*: any*/),\n- (v2/*: any*/),\n- (v3/*: any*/),\n- (v4/*: any*/)\n- ],\n- \"storageKey\": null\n- }\n+ (v5/*: any*/),\n+ (v6/*: any*/)\n ],\n \"storageKey\": null\n },\n@@ -266,12 +289,7 @@ return {\n {\n \"args\": null,\n \"kind\": \"FragmentSpread\",\n- \"name\": \"ActiveLot_lotStanding\"\n- },\n- {\n- \"args\": null,\n- \"kind\": \"FragmentSpread\",\n- \"name\": \"ClosedLot_lotStanding\"\n+ \"name\": \"LotStatusListItem_lotStanding\"\n }\n ],\n \"storageKey\": null\n@@ -314,6 +332,81 @@ return {\n ],\n \"storageKey\": null\n },\n+ {\n+ \"alias\": null,\n+ \"args\": [\n+ {\n+ \"kind\": \"Variable\",\n+ \"name\": \"after\",\n+ \"variableName\": \"cursor\"\n+ },\n+ {\n+ \"kind\": \"Literal\",\n+ \"name\": \"first\",\n+ \"value\": 20\n+ }\n+ ],\n+ \"concreteType\": \"LotConnection\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"watchedLotConnection\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"LotEdge\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"edges\",\n+ \"plural\": true,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Lot\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"node\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"AuctionsLotState\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"lot\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v0/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"SaleArtwork\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"saleArtwork\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v0/*: any*/),\n+ (v5/*: any*/),\n+ (v6/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ {\n+ \"args\": null,\n+ \"kind\": \"FragmentSpread\",\n+ \"name\": \"LotStatusListItem_lot\"\n+ }\n+ ],\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": null\n+ },\n {\n \"args\": null,\n \"kind\": \"FragmentSpread\",\n@@ -324,5 +417,5 @@ return {\n \"abstractKey\": null\n };\n })();\n-(node as any).hash = '3b7393a5d5db8d2f7c959fea97ac9530';\n+(node as any).hash = 'dbd4742b3b55bc7fc69e140e04e044e6';\n export default node;\ndiff --git a/src/__generated__/WatchedLot_lot.graphql.ts b/src/__generated__/WatchedLot_lot.graphql.ts\nnew file mode 100644\nindex 00000000000..a30908f4f4c\n--- /dev/null\n+++ b/src/__generated__/WatchedLot_lot.graphql.ts\n@@ -0,0 +1,178 @@\n+/* tslint:disable */\n+/* eslint-disable */\n+// @ts-nocheck\n+\n+import { ReaderFragment } from \"relay-runtime\";\n+import { FragmentRefs } from \"relay-runtime\";\n+export type AuctionsSoldStatus = \"ForSale\" | \"Passed\" | \"Sold\" | \"%future added value\";\n+export type WatchedLot_lot = {\n+ readonly lot: {\n+ readonly internalID: string;\n+ readonly bidCount: number;\n+ readonly sellingPrice: {\n+ readonly display: string | null;\n+ } | null;\n+ readonly soldStatus: AuctionsSoldStatus;\n+ };\n+ readonly saleArtwork: {\n+ readonly artwork: {\n+ readonly internalID: string;\n+ readonly href: string | null;\n+ readonly slug: string;\n+ } | null;\n+ readonly sale: {\n+ readonly liveStartAt: string | null;\n+ readonly endAt: string | null;\n+ readonly status: string | null;\n+ } | null;\n+ readonly \" $fragmentRefs\": FragmentRefs<\"Lot_saleArtwork\">;\n+ } | null;\n+ readonly \" $refType\": \"WatchedLot_lot\";\n+};\n+export type WatchedLot_lot$data = WatchedLot_lot;\n+export type WatchedLot_lot$key = {\n+ readonly \" $data\"?: WatchedLot_lot$data;\n+ readonly \" $fragmentRefs\": FragmentRefs<\"WatchedLot_lot\">;\n+};\n+\n+\n+\n+const node: ReaderFragment = (function(){\n+var v0 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"internalID\",\n+ \"storageKey\": null\n+};\n+return {\n+ \"argumentDefinitions\": [],\n+ \"kind\": \"Fragment\",\n+ \"metadata\": null,\n+ \"name\": \"WatchedLot_lot\",\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"AuctionsLotState\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"lot\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v0/*: any*/),\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"bidCount\",\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Money\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"sellingPrice\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"display\",\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"soldStatus\",\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"SaleArtwork\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"saleArtwork\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Artwork\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"artwork\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v0/*: any*/),\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"href\",\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"slug\",\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Sale\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"sale\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"liveStartAt\",\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"endAt\",\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"status\",\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": null\n+ },\n+ {\n+ \"args\": null,\n+ \"kind\": \"FragmentSpread\",\n+ \"name\": \"Lot_saleArtwork\"\n+ }\n+ ],\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"type\": \"Lot\",\n+ \"abstractKey\": null\n+};\n+})();\n+(node as any).hash = '8e5d2ed17ca72e4bc5086f5c1d2f86db';\n+export default node;\ndiff --git a/src/lib/Scenes/MyBids/Components/ActiveLot.tsx b/src/lib/Scenes/MyBids/Components/ActiveLotStanding.tsx\nsimilarity index 88%\nrename from src/lib/Scenes/MyBids/Components/ActiveLot.tsx\nrename to src/lib/Scenes/MyBids/Components/ActiveLotStanding.tsx\nindex bc2ebb955cf..9769219d80d 100644\n--- a/src/lib/Scenes/MyBids/Components/ActiveLot.tsx\n+++ b/src/lib/Scenes/MyBids/Components/ActiveLotStanding.tsx\n@@ -1,5 +1,5 @@\n import { ActionType, ContextModule, OwnerType } from \"@artsy/cohesion\"\n-import { ActiveLot_lotStanding } from \"__generated__/ActiveLot_lotStanding.graphql\"\n+import { ActiveLotStanding_lotStanding } from \"__generated__/ActiveLotStanding_lotStanding.graphql\"\n import { navigate } from \"lib/navigation/navigate\"\n import { isSmallScreen } from \"lib/Scenes/MyBids/helpers/screenDimensions\"\n import { Flex, Text } from \"palette\"\n@@ -11,7 +11,7 @@ import { TimelySale } from \"../helpers/timely\"\n import { HighestBid, Outbid, ReserveNotMet } from \"./BiddingStatuses\"\n import { LotFragmentContainer as Lot } from \"./Lot\"\n \n-export const ActiveLot = ({ lotStanding }: { lotStanding: ActiveLot_lotStanding }) => {\n+export const ActiveLotStanding = ({ lotStanding }: { lotStanding: ActiveLotStanding_lotStanding }) => {\n const timelySale = TimelySale.create(lotStanding?.saleArtwork?.sale!)\n \n const sellingPrice = lotStanding?.lot?.sellingPrice?.display\n@@ -66,9 +66,9 @@ export const ActiveLot = ({ lotStanding }: { lotStanding: ActiveLot_lotStanding\n )\n }\n \n-export const ActiveLotFragmentContainer = createFragmentContainer(ActiveLot, {\n+export const ActiveLotStandingFragmentContainer = createFragmentContainer(ActiveLotStanding, {\n lotStanding: graphql`\n- fragment ActiveLot_lotStanding on AuctionsLotStanding {\n+ fragment ActiveLotStanding_lotStanding on AuctionsLotStanding {\n isHighestBidder\n lot {\n internalID\ndiff --git a/src/lib/Scenes/MyBids/Components/BiddingStatuses.tsx b/src/lib/Scenes/MyBids/Components/BiddingStatuses.tsx\nindex 7f012b2924a..b2b7457c75d 100644\n--- a/src/lib/Scenes/MyBids/Components/BiddingStatuses.tsx\n+++ b/src/lib/Scenes/MyBids/Components/BiddingStatuses.tsx\n@@ -1,5 +1,5 @@\n import { ArrowDownCircleFillIcon, ArrowUpCircleFillIcon, Text } from \"palette\"\n-import { ExclamationMarkCircleFill } from \"palette/svgs/sf\"\n+import { BookmarkFill, ExclamationMarkCircleFill } from \"palette/svgs/sf\"\n import React from \"react\"\n \n export const ReserveNotMet = () => (\n@@ -49,3 +49,13 @@ export const Passed = () => (\n Passed\n \n )\n+\n+export const Watching = () => (\n+ <>\n+ \n+ \n+ {\" \"}\n+ Watching\n+ \n+ \n+)\ndiff --git a/src/lib/Scenes/MyBids/Components/ClosedLot.tsx b/src/lib/Scenes/MyBids/Components/ClosedLotStanding.tsx\nsimilarity index 89%\nrename from src/lib/Scenes/MyBids/Components/ClosedLot.tsx\nrename to src/lib/Scenes/MyBids/Components/ClosedLotStanding.tsx\nindex 2f500fa774e..ba450c13712 100644\n--- a/src/lib/Scenes/MyBids/Components/ClosedLot.tsx\n+++ b/src/lib/Scenes/MyBids/Components/ClosedLotStanding.tsx\n@@ -1,5 +1,5 @@\n import { ActionType, ContextModule, OwnerType } from \"@artsy/cohesion\"\n-import { ClosedLot_lotStanding } from \"__generated__/ClosedLot_lotStanding.graphql\"\n+import { ClosedLotStanding_lotStanding } from \"__generated__/ClosedLotStanding_lotStanding.graphql\"\n import { navigate } from \"lib/navigation/navigate\"\n import moment from \"moment-timezone\"\n import { Flex, Text } from \"palette\"\n@@ -24,12 +24,12 @@ const saleClosedMessage: (sale: { endAt: string | null; status: string | null })\n }\n }\n \n-export const ClosedLot = ({\n+export const ClosedLotStanding = ({\n lotStanding,\n withTimelyInfo = true,\n inActiveSale = false,\n }: {\n- lotStanding: ClosedLot_lotStanding\n+ lotStanding: ClosedLotStanding_lotStanding\n withTimelyInfo?: boolean\n inActiveSale?: boolean\n }) => {\n@@ -76,9 +76,9 @@ export const ClosedLot = ({\n )\n }\n \n-export const ClosedLotFragmentContainer = createFragmentContainer(ClosedLot, {\n+export const ClosedLotStandingFragmentContainer = createFragmentContainer(ClosedLotStanding, {\n lotStanding: graphql`\n- fragment ClosedLot_lotStanding on AuctionsLotStanding {\n+ fragment ClosedLotStanding_lotStanding on AuctionsLotStanding {\n isHighestBidder\n lot {\n internalID\ndiff --git a/src/lib/Scenes/MyBids/Components/LotStatusListItem.tsx b/src/lib/Scenes/MyBids/Components/LotStatusListItem.tsx\nnew file mode 100644\nindex 00000000000..587cf2fb409\n--- /dev/null\n+++ b/src/lib/Scenes/MyBids/Components/LotStatusListItem.tsx\n@@ -0,0 +1,56 @@\n+import { LotStatusListItem_lot } from \"__generated__/LotStatusListItem_lot.graphql\"\n+import { LotStatusListItem_lotStanding } from \"__generated__/LotStatusListItem_lotStanding.graphql\"\n+import React from \"react\"\n+import { createFragmentContainer, graphql } from \"react-relay\"\n+import { ActiveLotStandingFragmentContainer as ActiveLotStanding } from \"./ActiveLotStanding\"\n+import { ClosedLotStandingFragmentContainer as ClosedLotStanding } from \"./ClosedLotStanding\"\n+import { WatchedLotFragmentContainer as WatchedLot } from \"./WatchedLot\"\n+\n+interface Props {\n+ /** A general lot to display. */\n+ lot: LotStatusListItem_lot | null\n+ /** A user's lot standing. Takes precedence over `lot` */\n+ lotStanding?: LotStatusListItem_lotStanding | null\n+ /** Whether the lot's entire sale has closed */\n+ saleIsClosed?: boolean\n+}\n+\n+const completeStatuses = [\"sold\", \"passed\"]\n+\n+const LotStatusListItem: React.FC = ({ lot, lotStanding, saleIsClosed = false }) => {\n+ if (lotStanding) {\n+ if (saleIsClosed) {\n+ return \n+ } else {\n+ const lotState = lotStanding.lot\n+ const soldStatus = lotState.soldStatus?.toLowerCase() as string\n+ const isComplete = completeStatuses.includes(soldStatus)\n+ return isComplete ? (\n+ \n+ ) : (\n+ \n+ )\n+ }\n+ } else if (lot) {\n+ return \n+ } else {\n+ return null\n+ }\n+}\n+\n+export const LotStatusListItemContainer = createFragmentContainer(LotStatusListItem, {\n+ lot: graphql`\n+ fragment LotStatusListItem_lot on Lot {\n+ ...WatchedLot_lot\n+ }\n+ `,\n+ lotStanding: graphql`\n+ fragment LotStatusListItem_lotStanding on AuctionsLotStanding {\n+ ...ActiveLotStanding_lotStanding\n+ ...ClosedLotStanding_lotStanding\n+ lot {\n+ soldStatus\n+ }\n+ }\n+ `,\n+})\ndiff --git a/src/lib/Scenes/MyBids/Components/WatchedLot.tsx b/src/lib/Scenes/MyBids/Components/WatchedLot.tsx\nnew file mode 100644\nindex 00000000000..fe5aa6f22b7\n--- /dev/null\n+++ b/src/lib/Scenes/MyBids/Components/WatchedLot.tsx\n@@ -0,0 +1,87 @@\n+import { ActionType, ContextModule, OwnerType } from \"@artsy/cohesion\"\n+import { WatchedLot_lot } from \"__generated__/WatchedLot_lot.graphql\"\n+import { navigate } from \"lib/navigation/navigate\"\n+import { isSmallScreen } from \"lib/Scenes/MyBids/helpers/screenDimensions\"\n+import { Flex, Text } from \"palette\"\n+import React from \"react\"\n+import { TouchableOpacity } from \"react-native\"\n+import { createFragmentContainer, graphql } from \"react-relay\"\n+import { useTracking } from \"react-tracking\"\n+import { Watching } from \"./BiddingStatuses\"\n+import { LotFragmentContainer as Lot } from \"./Lot\"\n+\n+interface WatchedLotProps {\n+ lot: WatchedLot_lot\n+}\n+\n+export const WatchedLot: React.FC = ({ lot }) => {\n+ const { saleArtwork, lot: lotState } = lot\n+ const bidCount = lotState.bidCount\n+ const sellingPrice = lotState?.sellingPrice?.display\n+ const tracking = useTracking()\n+\n+ const displayBidCount = (): string | undefined => {\n+ if (isSmallScreen) {\n+ return\n+ } else {\n+ return `(${bidCount.toString() + (bidCount === 1 ? \" bid\" : \" bids\")})`\n+ }\n+ }\n+\n+ const handleLotTap = () => {\n+ tracking.trackEvent({\n+ action: ActionType.tappedArtworkGroup,\n+ context_module: ContextModule.inboxActiveBids,\n+ context_screen_owner_type: OwnerType.inboxBids,\n+ destination_screen_owner_typ: OwnerType.artwork,\n+ destination_screen_owner_id: lot.saleArtwork?.artwork?.internalID,\n+ destination_screen_owner_slug: lot.saleArtwork?.artwork?.slug,\n+ })\n+ navigate(saleArtwork?.artwork?.href as string)\n+ }\n+\n+ return (\n+ \n+ \n+ \n+ {sellingPrice}\n+ \n+ {\" \"}\n+ {displayBidCount()}\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ )\n+}\n+\n+export const WatchedLotFragmentContainer = createFragmentContainer(WatchedLot, {\n+ lot: graphql`\n+ fragment WatchedLot_lot on Lot {\n+ lot {\n+ internalID\n+ bidCount\n+ sellingPrice {\n+ display\n+ }\n+ soldStatus\n+ }\n+ saleArtwork {\n+ ...Lot_saleArtwork\n+ artwork {\n+ internalID\n+ href\n+ slug\n+ }\n+ sale {\n+ liveStartAt\n+ endAt\n+ status\n+ }\n+ }\n+ }\n+ `,\n+})\ndiff --git a/src/lib/Scenes/MyBids/Components/index.tsx b/src/lib/Scenes/MyBids/Components/index.tsx\nindex 3a20087f221..6d53174f217 100644\n--- a/src/lib/Scenes/MyBids/Components/index.tsx\n+++ b/src/lib/Scenes/MyBids/Components/index.tsx\n@@ -1,4 +1,4 @@\n-export { ActiveLotFragmentContainer } from \"./ActiveLot\"\n+export { ActiveLotStandingFragmentContainer } from \"./ActiveLotStanding\"\n export { MyBidsPlaceholder } from \"./MyBidsPlaceholder\"\n-export { ClosedLotFragmentContainer } from \"./ClosedLot\"\n+export { ClosedLotStandingFragmentContainer } from \"./ClosedLotStanding\"\n export { SaleCardFragmentContainer } from \"./SaleCard\"\ndiff --git a/src/lib/Scenes/MyBids/MyBids.tsx b/src/lib/Scenes/MyBids/MyBids.tsx\nindex 26c2bb5a832..ac0235ba630 100644\n--- a/src/lib/Scenes/MyBids/MyBids.tsx\n+++ b/src/lib/Scenes/MyBids/MyBids.tsx\n@@ -15,14 +15,10 @@ import { extractNodes } from \"lib/utils/extractNodes\"\n import { renderWithPlaceholder } from \"lib/utils/renderWithPlaceholder\"\n import { ProvideScreenTrackingWithCohesionSchema } from \"lib/utils/track\"\n import moment from \"moment-timezone\"\n-import {\n- ActiveLotFragmentContainer as ActiveLot,\n- ClosedLotFragmentContainer as ClosedLot,\n- MyBidsPlaceholder,\n- SaleCardFragmentContainer,\n-} from \"./Components\"\n+import { MyBidsPlaceholder, SaleCardFragmentContainer } from \"./Components\"\n+import { LotStatusListItemContainer } from \"./Components/LotStatusListItem\"\n import { NoBids } from \"./Components/NoBids\"\n-import { isLotStandingComplete, TimelySale } from \"./helpers/timely\"\n+import { TimelySale } from \"./helpers/timely\"\n \n export interface MyBidsProps {\n me: MyBids_me\n@@ -30,8 +26,6 @@ export interface MyBidsProps {\n relay: RelayPaginationProp\n }\n \n-type Sale = NonNullable[0]>[\"sale\"]>\n-\n const MyBids: React.FC = (props) => {\n const [isFetching, setIsFetching] = React.useState(false)\n const { relay, isActiveTab, me } = props\n@@ -57,34 +51,20 @@ const MyBids: React.FC = (props) => {\n }\n }, [isActiveTab])\n \n+ const watchedLots = extractNodes(me?.watchedLotConnection)\n const lotStandings = extractNodes(me?.auctionsLotStandingConnection)\n+ const registeredSales: Sale[] = me.bidders?.map((b) => b!.sale!) || []\n \n- const [activeStandings, closedStandings] = partition(\n- lotStandings.filter((ls) => !!ls),\n- (ls) => !TimelySale.create(ls?.saleArtwork?.sale!).isClosed\n+ const { ActiveLotStandingsBySaleId, activeSales: sales, closedStandings } = sortLotsAndSales(\n+ watchedLots,\n+ lotStandings,\n+ registeredSales\n )\n \n- // group active lot standings by sale id\n- const activeBySaleId = groupBy(activeStandings, (ls) => ls?.saleArtwork?.sale?.internalID)\n-\n- // sort each group of lot standings by position (lot number)\n- const sortedActiveLots = mapValues(activeBySaleId, (lss) => sortBy(lss, (ls) => ls?.saleArtwork?.position!))\n-\n- // TODO: create list of all unique sales from lotStandings, bidders, and watchedLots (in the future).\n- // NOTE: bidders should include lotStandings, do we need both?\n-\n- // sort an ordered list of sales by their relevant end time\n- const sales: Sale[] = me.bidders?.map((b) => b!.sale!) || []\n- const sortedSales = sortBy(sales, (sale) => {\n- const timelySale = TimelySale.create(sale)\n- return moment(timelySale.relevantEnd).unix()\n- })\n-\n- const hasActiveBids = activeStandings.length > 0\n const hasClosedBids = closedStandings.length > 0\n- const hasRegistrations = sales.length > 0\n+ const hasActiveSales = sales.length > 0\n \n- const somethingToShow = hasActiveBids || hasClosedBids || hasRegistrations\n+ const somethingToShow = hasClosedBids || hasActiveSales\n \n return (\n = (props) => {\n }\n >\n {!somethingToShow && }\n- {!!hasRegistrations && Active Bids}\n- {!!hasRegistrations && (\n+ {!!hasActiveSales && Active Bids}\n+ {!!hasActiveSales && (\n \n }>\n- {sortedSales.map((sale) => {\n- const activeLotStandings = sortedActiveLots[sale.internalID] || []\n- const showNoBids = !activeLotStandings.length && !!sale.registrationStatus?.qualifiedForBidding\n+ {sales.map((sale) => {\n+ const sortedActiveLotStandings = ActiveLotStandingsBySaleId[sale.internalID] || []\n+ const showNoBids = !sortedActiveLotStandings.length && !!sale.registrationStatus?.qualifiedForBidding\n return (\n \n }>\n {!!showNoBids && (\n@@ -129,14 +109,12 @@ const MyBids: React.FC = (props) => {\n You haven't placed any bids on this sale\n \n )}\n- {activeLotStandings.map((ls) => {\n- // Note: Occasionally, during live bidding, closed lots appear in active sales\n- if (ls && sale) {\n- return isLotStandingComplete(ls) ? (\n- \n- ) : (\n- \n- )\n+ {sortedActiveLotStandings.map((lot) => {\n+ // this check performs type narrowing (from Lot | LotStanding)\n+ if (\"isHighestBidder\" in lot) {\n+ return \n+ } else {\n+ return \n }\n })}\n \n@@ -151,16 +129,14 @@ const MyBids: React.FC = (props) => {\n \n \n }>\n- {closedStandings?.map((ls) => {\n+ {closedStandings?.map((lotStanding) => {\n return (\n- !!ls && (\n- \n- )\n+ \n )\n })}\n \n@@ -189,9 +165,9 @@ export const MyBidsContainer = createPaginationContainer(\n fragment MyBids_me on Me\n @argumentDefinitions(count: { type: \"Int\", defaultValue: 25 }, cursor: { type: \"String\", defaultValue: \"\" }) {\n ...SaleCard_me\n- identityVerified\n bidders(active: true) {\n sale {\n+ internalID\n ...SaleCard_sale\n registrationStatus {\n qualifiedForBidding\n@@ -206,8 +182,8 @@ export const MyBidsContainer = createPaginationContainer(\n @connection(key: \"MyBids_auctionsLotStandingConnection\") {\n edges {\n node {\n- ...ActiveLot_lotStanding\n- ...ClosedLot_lotStanding\n+ isHighestBidder\n+ ...LotStatusListItem_lotStanding\n lot {\n internalID\n saleId\n@@ -226,6 +202,27 @@ export const MyBidsContainer = createPaginationContainer(\n }\n }\n }\n+ watchedLotConnection(first: 20, after: $cursor) {\n+ edges {\n+ node {\n+ ...LotStatusListItem_lot\n+ lot {\n+ internalID\n+ }\n+ saleArtwork {\n+ internalID\n+ position\n+ sale {\n+ ...SaleCard_sale\n+ internalID\n+ liveStartAt\n+ endAt\n+ status\n+ }\n+ }\n+ }\n+ }\n+ }\n }\n `,\n },\n@@ -269,3 +266,79 @@ export const MyBidsQueryRenderer: React.FC = () => (\n variables={{}}\n />\n )\n+\n+type Sale = NonNullable[0]>[\"sale\"]>\n+type LotStanding = NonNullable<\n+ NonNullable[\"edges\"]>[number]>[\"node\"]\n+>\n+type WatchedLot = NonNullable<\n+ NonNullable[\"edges\"]>[number]>[\"node\"]\n+>\n+type LotLike = LotStanding | WatchedLot\n+type SortData = (\n+ watchedLots: WatchedLot[],\n+ lotStandings: LotStanding[],\n+ registeredSales: Sale[]\n+) => {\n+ ActiveLotStandingsBySaleId: { [saleId: string]: LotLike[] }\n+ activeSales: Sale[]\n+ closedStandings: LotStanding[]\n+}\n+\n+/**\n+ * This function provides the sorting and ordering logic for our watched lots, lot standings and registered sales.\n+ */\n+const sortLotsAndSales: SortData = (watchedLots, lotStandings, registeredSales) => {\n+ // separate active standings from closed standings\n+ const [activeStandings, closedStandings] = partition(\n+ lotStandings,\n+ (ls) => !TimelySale.create(ls?.saleArtwork?.sale!).isClosed\n+ )\n+\n+ // combine unique watched lots with active standings => `ActiveLotStandings`\n+ const ActiveLotStandings = watchedLots.reduce(\n+ (acc: any[], watchedLot) => {\n+ if (!!activeStandings.find((existingLot) => existingLot!.lot!.internalID === watchedLot.lot.internalID)) {\n+ return acc\n+ } else {\n+ return [...acc, watchedLot]\n+ }\n+ },\n+ [...activeStandings]\n+ )\n+\n+ // group active lots by sale id\n+ const activeBySaleId = groupBy(ActiveLotStandings, (ls) => ls?.saleArtwork?.sale?.internalID)\n+\n+ // fetch unique sales from all active lots\n+ const salesFromLots = ActiveLotStandings.reduce((acc: Array<{ internalID: string }>, lot) => {\n+ return !!acc.find((sale: { internalID: string }) => sale.internalID === lot.saleArtwork.sale.internalID)\n+ ? acc\n+ : [...acc, lot.saleArtwork.sale]\n+ }, [])\n+\n+ // Combine all unique sales from registrations and active lots\n+ const allSales = registeredSales.reduce((acc, sale) => {\n+ if (!acc.find((existingSale: { internalID: string }) => existingSale.internalID === sale.internalID)) {\n+ return [...acc, sale]\n+ } else {\n+ return acc\n+ }\n+ }, salesFromLots)\n+\n+ // sort each group of lot standings by position (lot number)\n+ // The values of this object are displayed to the user under each sale card\n+ const ActiveLotStandingsBySaleId = mapValues(activeBySaleId, (lss) => sortBy(lss, (ls) => ls?.saleArtwork?.position!))\n+\n+ // sort all sales by their relevant end time\n+ const activeSales = sortBy(allSales, (sale) => {\n+ const timelySale = TimelySale.create(sale)\n+ return moment(timelySale.relevantEnd).unix()\n+ })\n+\n+ return {\n+ ActiveLotStandingsBySaleId,\n+ activeSales,\n+ closedStandings,\n+ }\n+}\ndiff --git a/src/lib/Scenes/MyBids/helpers/timely.ts b/src/lib/Scenes/MyBids/helpers/timely.ts\nindex 42dedffe774..4d89ff1d23a 100644\n--- a/src/lib/Scenes/MyBids/helpers/timely.ts\n+++ b/src/lib/Scenes/MyBids/helpers/timely.ts\n@@ -1,17 +1,20 @@\n import moment from \"moment-timezone\"\n \n /** Whether lot is in one of its pre-closed states */\n-export const lotInActiveSale: (lotStanding: {\n- saleArtwork: { sale: { status: string | null } | null } | null\n-}) => boolean = (lotStanding) => {\n- const status = lotStanding?.saleArtwork?.sale?.status\n- return !!status && [\"open\", \"preview\"].includes(status.toLowerCase())\n+export const lotInActiveSale: (lot: { saleArtwork: { sale: { status: string | null } | null } | null }) => boolean = (\n+ lot\n+) => {\n+ const status = lot?.saleArtwork?.sale?.status\n+ switch (status?.toLowerCase()) {\n+ case \"open\":\n+ return true\n+ case \"preview\":\n+ return true\n+ default:\n+ return false\n+ }\n }\n \n-/** Whether the lot has been completed, regardless of the sale's closed status. Lot is no longer for sale, either it has been sold or is no longer available for bidding. */\n-export const isLotStandingComplete: (lotStanding: { lot?: { soldStatus?: string } }) => boolean = (lotStanding) =>\n- !!(lotStanding.lot?.soldStatus && [\"sold\", \"passed\"].includes(lotStanding.lot.soldStatus?.toLowerCase()))\n-\n interface SaleWithTimes {\n status?: string | null\n liveStartAt?: string | null\n@@ -27,9 +30,9 @@ export class TimelySale {\n private liveStartAt: string\n \n constructor(sale: SaleWithTimes) {\n- this.status = sale.status!\n- this.endAt = sale.endAt!\n- this.liveStartAt = sale.liveStartAt!\n+ this.status = sale?.status!\n+ this.endAt = sale?.endAt!\n+ this.liveStartAt = sale?.liveStartAt!\n }\n \n get isLAI() {\n", "test_patch": "diff --git a/src/__generated__/InboxTestsQuery.graphql.ts b/src/__generated__/InboxTestsQuery.graphql.ts\nindex f0b4fcb2a1b..681d1ea4182 100644\n--- a/src/__generated__/InboxTestsQuery.graphql.ts\n+++ b/src/__generated__/InboxTestsQuery.graphql.ts\n@@ -1,7 +1,7 @@\n /* tslint:disable */\n /* eslint-disable */\n // @ts-nocheck\n-/* @relayHash dea3173041d54f366910fd88b1f3cda0 */\n+/* @relayHash 0b3b455cae9ec6a73b915f59ac6e2e7b */\n \n import { ConcreteRequest } from \"relay-runtime\";\n import { FragmentRefs } from \"relay-runtime\";\n@@ -26,7 +26,7 @@ query InboxTestsQuery {\n }\n }\n \n-fragment ActiveLot_lotStanding on AuctionsLotStanding {\n+fragment ActiveLotStanding_lotStanding on AuctionsLotStanding {\n isHighestBidder\n lot {\n internalID\n@@ -57,7 +57,7 @@ fragment ActiveLot_lotStanding on AuctionsLotStanding {\n }\n }\n \n-fragment ClosedLot_lotStanding on AuctionsLotStanding {\n+fragment ClosedLotStanding_lotStanding on AuctionsLotStanding {\n isHighestBidder\n lot {\n internalID\n@@ -169,6 +169,19 @@ fragment Inbox_me on Me {\n ...MyBids_me\n }\n \n+fragment LotStatusListItem_lot on Lot {\n+ ...WatchedLot_lot\n+}\n+\n+fragment LotStatusListItem_lotStanding on AuctionsLotStanding {\n+ ...ActiveLotStanding_lotStanding\n+ ...ClosedLotStanding_lotStanding\n+ lot {\n+ soldStatus\n+ id\n+ }\n+}\n+\n fragment Lot_saleArtwork on SaleArtwork {\n lotLabel\n artwork {\n@@ -182,15 +195,14 @@ fragment Lot_saleArtwork on SaleArtwork {\n \n fragment MyBids_me on Me {\n ...SaleCard_me\n- identityVerified\n bidders(active: true) {\n sale {\n+ internalID\n ...SaleCard_sale\n registrationStatus {\n qualifiedForBidding\n id\n }\n- internalID\n liveStartAt\n endAt\n status\n@@ -201,8 +213,8 @@ fragment MyBids_me on Me {\n auctionsLotStandingConnection(first: 25, after: \"\") {\n edges {\n node {\n- ...ActiveLot_lotStanding\n- ...ClosedLot_lotStanding\n+ isHighestBidder\n+ ...LotStatusListItem_lotStanding\n lot {\n internalID\n saleId\n@@ -231,6 +243,31 @@ fragment MyBids_me on Me {\n hasNextPage\n }\n }\n+ watchedLotConnection(first: 20, after: \"\") {\n+ edges {\n+ node {\n+ ...LotStatusListItem_lot\n+ lot {\n+ internalID\n+ id\n+ }\n+ saleArtwork {\n+ internalID\n+ position\n+ sale {\n+ ...SaleCard_sale\n+ internalID\n+ liveStartAt\n+ endAt\n+ status\n+ id\n+ }\n+ id\n+ }\n+ id\n+ }\n+ }\n+ }\n }\n \n fragment SaleCard_me on Me {\n@@ -261,6 +298,34 @@ fragment SaleCard_sale on Sale {\n }\n requireIdentityVerification\n }\n+\n+fragment WatchedLot_lot on Lot {\n+ lot {\n+ internalID\n+ bidCount\n+ sellingPrice {\n+ display\n+ }\n+ soldStatus\n+ id\n+ }\n+ saleArtwork {\n+ ...Lot_saleArtwork\n+ artwork {\n+ internalID\n+ href\n+ slug\n+ id\n+ }\n+ sale {\n+ liveStartAt\n+ endAt\n+ status\n+ id\n+ }\n+ id\n+ }\n+}\n */\n \n const node: ConcreteRequest = (function(){\n@@ -441,7 +506,21 @@ v21 = [\n \"value\": 25\n }\n ],\n-v22 = [\n+v22 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"bidCount\",\n+ \"storageKey\": null\n+},\n+v23 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"soldStatus\",\n+ \"storageKey\": null\n+},\n+v24 = [\n {\n \"alias\": null,\n \"args\": null,\n@@ -450,67 +529,171 @@ v22 = [\n \"storageKey\": null\n }\n ],\n-v23 = {\n+v25 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Money\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"sellingPrice\",\n+ \"plural\": false,\n+ \"selections\": (v24/*: any*/),\n+ \"storageKey\": null\n+},\n+v26 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"lotLabel\",\n+ \"storageKey\": null\n+},\n+v27 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Artwork\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"artwork\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v8/*: any*/),\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Image\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"image\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": [\n+ {\n+ \"kind\": \"Literal\",\n+ \"name\": \"version\",\n+ \"value\": \"medium\"\n+ }\n+ ],\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"url\",\n+ \"storageKey\": \"url(version:\\\"medium\\\")\"\n+ }\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v5/*: any*/),\n+ (v3/*: any*/),\n+ (v13/*: any*/),\n+ (v14/*: any*/)\n+ ],\n+ \"storageKey\": null\n+},\n+v28 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"position\",\n+ \"storageKey\": null\n+},\n+v29 = {\n \"enumValues\": null,\n \"nullable\": false,\n \"plural\": false,\n \"type\": \"String\"\n },\n-v24 = {\n+v30 = {\n \"enumValues\": null,\n \"nullable\": false,\n \"plural\": false,\n \"type\": \"ID\"\n },\n-v25 = {\n+v31 = {\n \"enumValues\": null,\n \"nullable\": false,\n \"plural\": false,\n \"type\": \"Boolean\"\n },\n-v26 = {\n+v32 = {\n+ \"enumValues\": null,\n+ \"nullable\": false,\n+ \"plural\": false,\n+ \"type\": \"AuctionsLotState\"\n+},\n+v33 = {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"Money\"\n },\n-v27 = {\n+v34 = {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"String\"\n },\n-v28 = {\n+v35 = {\n+ \"enumValues\": null,\n+ \"nullable\": false,\n+ \"plural\": false,\n+ \"type\": \"Int\"\n+},\n+v36 = {\n+ \"enumValues\": [\n+ \"ForSale\",\n+ \"Passed\",\n+ \"Sold\"\n+ ],\n+ \"nullable\": false,\n+ \"plural\": false,\n+ \"type\": \"AuctionsSoldStatus\"\n+},\n+v37 = {\n+ \"enumValues\": null,\n+ \"nullable\": true,\n+ \"plural\": false,\n+ \"type\": \"SaleArtwork\"\n+},\n+v38 = {\n+ \"enumValues\": null,\n+ \"nullable\": true,\n+ \"plural\": false,\n+ \"type\": \"Artwork\"\n+},\n+v39 = {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"Image\"\n },\n-v29 = {\n+v40 = {\n+ \"enumValues\": null,\n+ \"nullable\": true,\n+ \"plural\": false,\n+ \"type\": \"Float\"\n+},\n+v41 = {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"Sale\"\n },\n-v30 = {\n+v42 = {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"Partner\"\n },\n-v31 = {\n+v43 = {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"Bidder\"\n },\n-v32 = {\n+v44 = {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"Boolean\"\n },\n-v33 = {\n+v45 = {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n@@ -867,13 +1050,7 @@ return {\n \"plural\": false,\n \"selections\": [\n (v3/*: any*/),\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"bidCount\",\n- \"storageKey\": null\n- },\n+ (v22/*: any*/),\n {\n \"alias\": null,\n \"args\": null,\n@@ -881,13 +1058,7 @@ return {\n \"name\": \"reserveStatus\",\n \"storageKey\": null\n },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"soldStatus\",\n- \"storageKey\": null\n- },\n+ (v23/*: any*/),\n {\n \"alias\": \"askingPrice\",\n \"args\": null,\n@@ -895,19 +1066,10 @@ return {\n \"kind\": \"LinkedField\",\n \"name\": \"onlineAskingPrice\",\n \"plural\": false,\n- \"selections\": (v22/*: any*/),\n- \"storageKey\": null\n- },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Money\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"sellingPrice\",\n- \"plural\": false,\n- \"selections\": (v22/*: any*/),\n+ \"selections\": (v24/*: any*/),\n \"storageKey\": null\n },\n+ (v25/*: any*/),\n (v5/*: any*/),\n {\n \"alias\": null,\n@@ -927,53 +1089,8 @@ return {\n \"name\": \"saleArtwork\",\n \"plural\": false,\n \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"lotLabel\",\n- \"storageKey\": null\n- },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Artwork\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"artwork\",\n- \"plural\": false,\n- \"selections\": [\n- (v8/*: any*/),\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Image\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"image\",\n- \"plural\": false,\n- \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": [\n- {\n- \"kind\": \"Literal\",\n- \"name\": \"version\",\n- \"value\": \"medium\"\n- }\n- ],\n- \"kind\": \"ScalarField\",\n- \"name\": \"url\",\n- \"storageKey\": \"url(version:\\\"medium\\\")\"\n- }\n- ],\n- \"storageKey\": null\n- },\n- (v5/*: any*/),\n- (v3/*: any*/),\n- (v13/*: any*/),\n- (v14/*: any*/)\n- ],\n- \"storageKey\": null\n- },\n+ (v26/*: any*/),\n+ (v27/*: any*/),\n {\n \"alias\": null,\n \"args\": null,\n@@ -998,13 +1115,7 @@ return {\n \"storageKey\": null\n },\n (v5/*: any*/),\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"position\",\n- \"storageKey\": null\n- }\n+ (v28/*: any*/)\n ],\n \"storageKey\": null\n },\n@@ -1039,6 +1150,102 @@ return {\n \"kind\": \"LinkedHandle\",\n \"name\": \"auctionsLotStandingConnection\"\n },\n+ {\n+ \"alias\": null,\n+ \"args\": [\n+ (v0/*: any*/),\n+ {\n+ \"kind\": \"Literal\",\n+ \"name\": \"first\",\n+ \"value\": 20\n+ }\n+ ],\n+ \"concreteType\": \"LotConnection\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"watchedLotConnection\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"LotEdge\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"edges\",\n+ \"plural\": true,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Lot\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"node\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"AuctionsLotState\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"lot\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v3/*: any*/),\n+ (v22/*: any*/),\n+ (v25/*: any*/),\n+ (v23/*: any*/),\n+ (v5/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"SaleArtwork\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"saleArtwork\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v26/*: any*/),\n+ (v27/*: any*/),\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Sale\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"sale\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v15/*: any*/),\n+ (v16/*: any*/),\n+ (v20/*: any*/),\n+ (v5/*: any*/),\n+ (v3/*: any*/),\n+ (v13/*: any*/),\n+ (v14/*: any*/),\n+ (v4/*: any*/),\n+ (v11/*: any*/),\n+ (v17/*: any*/),\n+ (v18/*: any*/),\n+ (v19/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v5/*: any*/),\n+ (v3/*: any*/),\n+ (v28/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v5/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": \"watchedLotConnection(after:\\\"\\\",first:20)\"\n+ },\n (v5/*: any*/)\n ],\n \"storageKey\": null\n@@ -1046,7 +1253,7 @@ return {\n ]\n },\n \"params\": {\n- \"id\": \"dea3173041d54f366910fd88b1f3cda0\",\n+ \"id\": \"0b3b455cae9ec6a73b915f59ac6e2e7b\",\n \"metadata\": {\n \"relayTestingSelectionTypeInfo\": {\n \"me\": {\n@@ -1067,32 +1274,22 @@ return {\n \"plural\": true,\n \"type\": \"AuctionsLotStandingEdge\"\n },\n- \"me.auctionsLotStandingConnection.edges.cursor\": (v23/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.cursor\": (v29/*: any*/),\n \"me.auctionsLotStandingConnection.edges.node\": {\n \"enumValues\": null,\n \"nullable\": false,\n \"plural\": false,\n \"type\": \"AuctionsLotStanding\"\n },\n- \"me.auctionsLotStandingConnection.edges.node.__typename\": (v23/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.id\": (v24/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.isHighestBidder\": (v25/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.lot\": {\n- \"enumValues\": null,\n- \"nullable\": false,\n- \"plural\": false,\n- \"type\": \"AuctionsLotState\"\n- },\n- \"me.auctionsLotStandingConnection.edges.node.lot.askingPrice\": (v26/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.lot.askingPrice.display\": (v27/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.lot.bidCount\": {\n- \"enumValues\": null,\n- \"nullable\": false,\n- \"plural\": false,\n- \"type\": \"Int\"\n- },\n- \"me.auctionsLotStandingConnection.edges.node.lot.id\": (v24/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.lot.internalID\": (v24/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.__typename\": (v29/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.id\": (v30/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.isHighestBidder\": (v31/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot\": (v32/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.askingPrice\": (v33/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.askingPrice.display\": (v34/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.bidCount\": (v35/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.id\": (v30/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.internalID\": (v30/*: any*/),\n \"me.auctionsLotStandingConnection.edges.node.lot.reserveStatus\": {\n \"enumValues\": [\n \"NoReserve\",\n@@ -1103,97 +1300,73 @@ return {\n \"plural\": false,\n \"type\": \"AuctionsReserveStatus\"\n },\n- \"me.auctionsLotStandingConnection.edges.node.lot.saleId\": (v24/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.lot.sellingPrice\": (v26/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.lot.sellingPrice.display\": (v27/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.lot.soldStatus\": {\n- \"enumValues\": [\n- \"ForSale\",\n- \"Passed\",\n- \"Sold\"\n- ],\n- \"nullable\": false,\n- \"plural\": false,\n- \"type\": \"AuctionsSoldStatus\"\n- },\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork\": {\n- \"enumValues\": null,\n- \"nullable\": true,\n- \"plural\": false,\n- \"type\": \"SaleArtwork\"\n- },\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork\": {\n- \"enumValues\": null,\n- \"nullable\": true,\n- \"plural\": false,\n- \"type\": \"Artwork\"\n- },\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.artistNames\": (v27/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.href\": (v27/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.id\": (v24/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.image\": (v28/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.image.url\": (v27/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.internalID\": (v24/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.slug\": (v24/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.id\": (v24/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.lotLabel\": (v27/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.position\": {\n- \"enumValues\": null,\n- \"nullable\": true,\n- \"plural\": false,\n- \"type\": \"Float\"\n- },\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale\": (v29/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.coverImage\": (v28/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.coverImage.url\": (v27/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.endAt\": (v27/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.href\": (v27/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.id\": (v24/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.internalID\": (v24/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.liveStartAt\": (v27/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.name\": (v27/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.partner\": (v30/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.partner.id\": (v24/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.partner.name\": (v27/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.registrationStatus\": (v31/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.registrationStatus.id\": (v24/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.registrationStatus.qualifiedForBidding\": (v32/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.requireIdentityVerification\": (v32/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.slug\": (v24/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.status\": (v27/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.saleId\": (v30/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.sellingPrice\": (v33/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.sellingPrice.display\": (v34/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.soldStatus\": (v36/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork\": (v37/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork\": (v38/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.artistNames\": (v34/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.href\": (v34/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.id\": (v30/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.image\": (v39/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.image.url\": (v34/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.internalID\": (v30/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.slug\": (v30/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.id\": (v30/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.lotLabel\": (v34/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.position\": (v40/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale\": (v41/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.coverImage\": (v39/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.coverImage.url\": (v34/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.endAt\": (v34/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.href\": (v34/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.id\": (v30/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.internalID\": (v30/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.liveStartAt\": (v34/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.name\": (v34/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.partner\": (v42/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.partner.id\": (v30/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.partner.name\": (v34/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.registrationStatus\": (v43/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.registrationStatus.id\": (v30/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.registrationStatus.qualifiedForBidding\": (v44/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.requireIdentityVerification\": (v44/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.slug\": (v30/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.status\": (v34/*: any*/),\n \"me.auctionsLotStandingConnection.pageInfo\": {\n \"enumValues\": null,\n \"nullable\": false,\n \"plural\": false,\n \"type\": \"AuctionsPageInfo\"\n },\n- \"me.auctionsLotStandingConnection.pageInfo.endCursor\": (v27/*: any*/),\n- \"me.auctionsLotStandingConnection.pageInfo.hasNextPage\": (v25/*: any*/),\n+ \"me.auctionsLotStandingConnection.pageInfo.endCursor\": (v34/*: any*/),\n+ \"me.auctionsLotStandingConnection.pageInfo.hasNextPage\": (v31/*: any*/),\n \"me.bidders\": {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": true,\n \"type\": \"Bidder\"\n },\n- \"me.bidders.id\": (v24/*: any*/),\n- \"me.bidders.sale\": (v29/*: any*/),\n- \"me.bidders.sale.coverImage\": (v28/*: any*/),\n- \"me.bidders.sale.coverImage.url\": (v27/*: any*/),\n- \"me.bidders.sale.endAt\": (v27/*: any*/),\n- \"me.bidders.sale.href\": (v27/*: any*/),\n- \"me.bidders.sale.id\": (v24/*: any*/),\n- \"me.bidders.sale.internalID\": (v24/*: any*/),\n- \"me.bidders.sale.liveStartAt\": (v27/*: any*/),\n- \"me.bidders.sale.name\": (v27/*: any*/),\n- \"me.bidders.sale.partner\": (v30/*: any*/),\n- \"me.bidders.sale.partner.id\": (v24/*: any*/),\n- \"me.bidders.sale.partner.name\": (v27/*: any*/),\n- \"me.bidders.sale.registrationStatus\": (v31/*: any*/),\n- \"me.bidders.sale.registrationStatus.id\": (v24/*: any*/),\n- \"me.bidders.sale.registrationStatus.qualifiedForBidding\": (v32/*: any*/),\n- \"me.bidders.sale.requireIdentityVerification\": (v32/*: any*/),\n- \"me.bidders.sale.slug\": (v24/*: any*/),\n- \"me.bidders.sale.status\": (v27/*: any*/),\n+ \"me.bidders.id\": (v30/*: any*/),\n+ \"me.bidders.sale\": (v41/*: any*/),\n+ \"me.bidders.sale.coverImage\": (v39/*: any*/),\n+ \"me.bidders.sale.coverImage.url\": (v34/*: any*/),\n+ \"me.bidders.sale.endAt\": (v34/*: any*/),\n+ \"me.bidders.sale.href\": (v34/*: any*/),\n+ \"me.bidders.sale.id\": (v30/*: any*/),\n+ \"me.bidders.sale.internalID\": (v30/*: any*/),\n+ \"me.bidders.sale.liveStartAt\": (v34/*: any*/),\n+ \"me.bidders.sale.name\": (v34/*: any*/),\n+ \"me.bidders.sale.partner\": (v42/*: any*/),\n+ \"me.bidders.sale.partner.id\": (v30/*: any*/),\n+ \"me.bidders.sale.partner.name\": (v34/*: any*/),\n+ \"me.bidders.sale.registrationStatus\": (v43/*: any*/),\n+ \"me.bidders.sale.registrationStatus.id\": (v30/*: any*/),\n+ \"me.bidders.sale.registrationStatus.qualifiedForBidding\": (v44/*: any*/),\n+ \"me.bidders.sale.requireIdentityVerification\": (v44/*: any*/),\n+ \"me.bidders.sale.slug\": (v30/*: any*/),\n+ \"me.bidders.sale.status\": (v34/*: any*/),\n \"me.conversations\": {\n \"enumValues\": null,\n \"nullable\": true,\n@@ -1206,15 +1379,15 @@ return {\n \"plural\": true,\n \"type\": \"ConversationEdge\"\n },\n- \"me.conversations.edges.cursor\": (v23/*: any*/),\n+ \"me.conversations.edges.cursor\": (v29/*: any*/),\n \"me.conversations.edges.node\": {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"Conversation\"\n },\n- \"me.conversations.edges.node.__typename\": (v23/*: any*/),\n- \"me.conversations.edges.node.id\": (v24/*: any*/),\n+ \"me.conversations.edges.node.__typename\": (v29/*: any*/),\n+ \"me.conversations.edges.node.id\": (v30/*: any*/),\n \"me.conversations.edges.node.internalID\": {\n \"enumValues\": null,\n \"nullable\": true,\n@@ -1233,67 +1406,124 @@ return {\n \"plural\": false,\n \"type\": \"ConversationItemType\"\n },\n- \"me.conversations.edges.node.items.item.__isNode\": (v23/*: any*/),\n- \"me.conversations.edges.node.items.item.__typename\": (v23/*: any*/),\n- \"me.conversations.edges.node.items.item.artistNames\": (v27/*: any*/),\n- \"me.conversations.edges.node.items.item.coverImage\": (v28/*: any*/),\n- \"me.conversations.edges.node.items.item.coverImage.url\": (v27/*: any*/),\n- \"me.conversations.edges.node.items.item.date\": (v27/*: any*/),\n+ \"me.conversations.edges.node.items.item.__isNode\": (v29/*: any*/),\n+ \"me.conversations.edges.node.items.item.__typename\": (v29/*: any*/),\n+ \"me.conversations.edges.node.items.item.artistNames\": (v34/*: any*/),\n+ \"me.conversations.edges.node.items.item.coverImage\": (v39/*: any*/),\n+ \"me.conversations.edges.node.items.item.coverImage.url\": (v34/*: any*/),\n+ \"me.conversations.edges.node.items.item.date\": (v34/*: any*/),\n \"me.conversations.edges.node.items.item.fair\": {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"Fair\"\n },\n- \"me.conversations.edges.node.items.item.fair.id\": (v24/*: any*/),\n- \"me.conversations.edges.node.items.item.fair.name\": (v27/*: any*/),\n- \"me.conversations.edges.node.items.item.id\": (v24/*: any*/),\n- \"me.conversations.edges.node.items.item.image\": (v28/*: any*/),\n- \"me.conversations.edges.node.items.item.image.url\": (v27/*: any*/),\n- \"me.conversations.edges.node.items.item.internalID\": (v24/*: any*/),\n- \"me.conversations.edges.node.items.item.name\": (v27/*: any*/),\n- \"me.conversations.edges.node.items.item.partner\": (v30/*: any*/),\n- \"me.conversations.edges.node.items.item.partner.id\": (v24/*: any*/),\n- \"me.conversations.edges.node.items.item.partner.internalID\": (v24/*: any*/),\n- \"me.conversations.edges.node.items.item.title\": (v27/*: any*/),\n- \"me.conversations.edges.node.lastMessage\": (v27/*: any*/),\n- \"me.conversations.edges.node.lastMessageAt\": (v27/*: any*/),\n- \"me.conversations.edges.node.last_message\": (v27/*: any*/),\n+ \"me.conversations.edges.node.items.item.fair.id\": (v30/*: any*/),\n+ \"me.conversations.edges.node.items.item.fair.name\": (v34/*: any*/),\n+ \"me.conversations.edges.node.items.item.id\": (v30/*: any*/),\n+ \"me.conversations.edges.node.items.item.image\": (v39/*: any*/),\n+ \"me.conversations.edges.node.items.item.image.url\": (v34/*: any*/),\n+ \"me.conversations.edges.node.items.item.internalID\": (v30/*: any*/),\n+ \"me.conversations.edges.node.items.item.name\": (v34/*: any*/),\n+ \"me.conversations.edges.node.items.item.partner\": (v42/*: any*/),\n+ \"me.conversations.edges.node.items.item.partner.id\": (v30/*: any*/),\n+ \"me.conversations.edges.node.items.item.partner.internalID\": (v30/*: any*/),\n+ \"me.conversations.edges.node.items.item.title\": (v34/*: any*/),\n+ \"me.conversations.edges.node.lastMessage\": (v34/*: any*/),\n+ \"me.conversations.edges.node.lastMessageAt\": (v34/*: any*/),\n+ \"me.conversations.edges.node.last_message\": (v34/*: any*/),\n \"me.conversations.edges.node.messagesConnection\": {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"MessageConnection\"\n },\n- \"me.conversations.edges.node.messagesConnection.totalCount\": (v33/*: any*/),\n+ \"me.conversations.edges.node.messagesConnection.totalCount\": (v45/*: any*/),\n \"me.conversations.edges.node.to\": {\n \"enumValues\": null,\n \"nullable\": false,\n \"plural\": false,\n \"type\": \"ConversationResponder\"\n },\n- \"me.conversations.edges.node.to.id\": (v24/*: any*/),\n- \"me.conversations.edges.node.to.name\": (v23/*: any*/),\n- \"me.conversations.edges.node.unread\": (v32/*: any*/),\n+ \"me.conversations.edges.node.to.id\": (v30/*: any*/),\n+ \"me.conversations.edges.node.to.name\": (v29/*: any*/),\n+ \"me.conversations.edges.node.unread\": (v44/*: any*/),\n \"me.conversations.pageInfo\": {\n \"enumValues\": null,\n \"nullable\": false,\n \"plural\": false,\n \"type\": \"PageInfo\"\n },\n- \"me.conversations.pageInfo.endCursor\": (v27/*: any*/),\n- \"me.conversations.pageInfo.hasNextPage\": (v25/*: any*/),\n- \"me.conversations.totalUnreadCount\": (v33/*: any*/),\n- \"me.id\": (v24/*: any*/),\n- \"me.identityVerified\": (v32/*: any*/),\n+ \"me.conversations.pageInfo.endCursor\": (v34/*: any*/),\n+ \"me.conversations.pageInfo.hasNextPage\": (v31/*: any*/),\n+ \"me.conversations.totalUnreadCount\": (v45/*: any*/),\n+ \"me.id\": (v30/*: any*/),\n+ \"me.identityVerified\": (v44/*: any*/),\n \"me.pendingIdentityVerification\": {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"IdentityVerification\"\n },\n- \"me.pendingIdentityVerification.id\": (v24/*: any*/),\n- \"me.pendingIdentityVerification.internalID\": (v24/*: any*/)\n+ \"me.pendingIdentityVerification.id\": (v30/*: any*/),\n+ \"me.pendingIdentityVerification.internalID\": (v30/*: any*/),\n+ \"me.watchedLotConnection\": {\n+ \"enumValues\": null,\n+ \"nullable\": true,\n+ \"plural\": false,\n+ \"type\": \"LotConnection\"\n+ },\n+ \"me.watchedLotConnection.edges\": {\n+ \"enumValues\": null,\n+ \"nullable\": true,\n+ \"plural\": true,\n+ \"type\": \"LotEdge\"\n+ },\n+ \"me.watchedLotConnection.edges.node\": {\n+ \"enumValues\": null,\n+ \"nullable\": true,\n+ \"plural\": false,\n+ \"type\": \"Lot\"\n+ },\n+ \"me.watchedLotConnection.edges.node.id\": (v30/*: any*/),\n+ \"me.watchedLotConnection.edges.node.lot\": (v32/*: any*/),\n+ \"me.watchedLotConnection.edges.node.lot.bidCount\": (v35/*: any*/),\n+ \"me.watchedLotConnection.edges.node.lot.id\": (v30/*: any*/),\n+ \"me.watchedLotConnection.edges.node.lot.internalID\": (v30/*: any*/),\n+ \"me.watchedLotConnection.edges.node.lot.sellingPrice\": (v33/*: any*/),\n+ \"me.watchedLotConnection.edges.node.lot.sellingPrice.display\": (v34/*: any*/),\n+ \"me.watchedLotConnection.edges.node.lot.soldStatus\": (v36/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork\": (v37/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.artwork\": (v38/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.artwork.artistNames\": (v34/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.artwork.href\": (v34/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.artwork.id\": (v30/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.artwork.image\": (v39/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.artwork.image.url\": (v34/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.artwork.internalID\": (v30/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.artwork.slug\": (v30/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.id\": (v30/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.internalID\": (v30/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.lotLabel\": (v34/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.position\": (v40/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale\": (v41/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.coverImage\": (v39/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.coverImage.url\": (v34/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.endAt\": (v34/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.href\": (v34/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.id\": (v30/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.internalID\": (v30/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.liveStartAt\": (v34/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.name\": (v34/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.partner\": (v42/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.partner.id\": (v30/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.partner.name\": (v34/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.registrationStatus\": (v43/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.registrationStatus.id\": (v30/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.registrationStatus.qualifiedForBidding\": (v44/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.requireIdentityVerification\": (v44/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.slug\": (v30/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.status\": (v34/*: any*/)\n }\n },\n \"name\": \"InboxTestsQuery\",\ndiff --git a/src/__generated__/MyBidsTestsQuery.graphql.ts b/src/__generated__/MyBidsTestsQuery.graphql.ts\nindex f71d8459487..8f7f07ac7c0 100644\n--- a/src/__generated__/MyBidsTestsQuery.graphql.ts\n+++ b/src/__generated__/MyBidsTestsQuery.graphql.ts\n@@ -1,7 +1,7 @@\n /* tslint:disable */\n /* eslint-disable */\n // @ts-nocheck\n-/* @relayHash 9cb9057f90509d58cd955bc06f759ced */\n+/* @relayHash 75bc35f842cf81dc8a6ee6048d944fd4 */\n \n import { ConcreteRequest } from \"relay-runtime\";\n import { FragmentRefs } from \"relay-runtime\";\n@@ -26,7 +26,7 @@ query MyBidsTestsQuery {\n }\n }\n \n-fragment ActiveLot_lotStanding on AuctionsLotStanding {\n+fragment ActiveLotStanding_lotStanding on AuctionsLotStanding {\n isHighestBidder\n lot {\n internalID\n@@ -57,7 +57,7 @@ fragment ActiveLot_lotStanding on AuctionsLotStanding {\n }\n }\n \n-fragment ClosedLot_lotStanding on AuctionsLotStanding {\n+fragment ClosedLotStanding_lotStanding on AuctionsLotStanding {\n isHighestBidder\n lot {\n internalID\n@@ -87,6 +87,19 @@ fragment ClosedLot_lotStanding on AuctionsLotStanding {\n }\n }\n \n+fragment LotStatusListItem_lot on Lot {\n+ ...WatchedLot_lot\n+}\n+\n+fragment LotStatusListItem_lotStanding on AuctionsLotStanding {\n+ ...ActiveLotStanding_lotStanding\n+ ...ClosedLotStanding_lotStanding\n+ lot {\n+ soldStatus\n+ id\n+ }\n+}\n+\n fragment Lot_saleArtwork on SaleArtwork {\n lotLabel\n artwork {\n@@ -100,15 +113,14 @@ fragment Lot_saleArtwork on SaleArtwork {\n \n fragment MyBids_me on Me {\n ...SaleCard_me\n- identityVerified\n bidders(active: true) {\n sale {\n+ internalID\n ...SaleCard_sale\n registrationStatus {\n qualifiedForBidding\n id\n }\n- internalID\n liveStartAt\n endAt\n status\n@@ -119,8 +131,8 @@ fragment MyBids_me on Me {\n auctionsLotStandingConnection(first: 25, after: \"\") {\n edges {\n node {\n- ...ActiveLot_lotStanding\n- ...ClosedLot_lotStanding\n+ isHighestBidder\n+ ...LotStatusListItem_lotStanding\n lot {\n internalID\n saleId\n@@ -149,6 +161,31 @@ fragment MyBids_me on Me {\n hasNextPage\n }\n }\n+ watchedLotConnection(first: 20, after: \"\") {\n+ edges {\n+ node {\n+ ...LotStatusListItem_lot\n+ lot {\n+ internalID\n+ id\n+ }\n+ saleArtwork {\n+ internalID\n+ position\n+ sale {\n+ ...SaleCard_sale\n+ internalID\n+ liveStartAt\n+ endAt\n+ status\n+ id\n+ }\n+ id\n+ }\n+ id\n+ }\n+ }\n+ }\n }\n \n fragment SaleCard_me on Me {\n@@ -179,6 +216,34 @@ fragment SaleCard_sale on Sale {\n }\n requireIdentityVerification\n }\n+\n+fragment WatchedLot_lot on Lot {\n+ lot {\n+ internalID\n+ bidCount\n+ sellingPrice {\n+ display\n+ }\n+ soldStatus\n+ id\n+ }\n+ saleArtwork {\n+ ...Lot_saleArtwork\n+ artwork {\n+ internalID\n+ href\n+ slug\n+ id\n+ }\n+ sale {\n+ liveStartAt\n+ endAt\n+ status\n+ id\n+ }\n+ id\n+ }\n+}\n */\n \n const node: ConcreteRequest = (function(){\n@@ -295,19 +360,34 @@ v11 = {\n \"name\": \"status\",\n \"storageKey\": null\n },\n-v12 = [\n- {\n- \"kind\": \"Literal\",\n- \"name\": \"after\",\n- \"value\": \"\"\n- },\n+v12 = {\n+ \"kind\": \"Literal\",\n+ \"name\": \"after\",\n+ \"value\": \"\"\n+},\n+v13 = [\n+ (v12/*: any*/),\n {\n \"kind\": \"Literal\",\n \"name\": \"first\",\n \"value\": 25\n }\n ],\n-v13 = [\n+v14 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"bidCount\",\n+ \"storageKey\": null\n+},\n+v15 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"soldStatus\",\n+ \"storageKey\": null\n+},\n+v16 = [\n {\n \"alias\": null,\n \"args\": null,\n@@ -316,61 +396,171 @@ v13 = [\n \"storageKey\": null\n }\n ],\n-v14 = {\n+v17 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Money\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"sellingPrice\",\n+ \"plural\": false,\n+ \"selections\": (v16/*: any*/),\n+ \"storageKey\": null\n+},\n+v18 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"lotLabel\",\n+ \"storageKey\": null\n+},\n+v19 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Artwork\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"artwork\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"artistNames\",\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Image\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"image\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": [\n+ {\n+ \"kind\": \"Literal\",\n+ \"name\": \"version\",\n+ \"value\": \"medium\"\n+ }\n+ ],\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"url\",\n+ \"storageKey\": \"url(version:\\\"medium\\\")\"\n+ }\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v1/*: any*/),\n+ (v0/*: any*/),\n+ (v2/*: any*/),\n+ (v3/*: any*/)\n+ ],\n+ \"storageKey\": null\n+},\n+v20 = {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"kind\": \"ScalarField\",\n+ \"name\": \"position\",\n+ \"storageKey\": null\n+},\n+v21 = {\n \"enumValues\": null,\n \"nullable\": false,\n \"plural\": false,\n \"type\": \"String\"\n },\n-v15 = {\n+v22 = {\n \"enumValues\": null,\n \"nullable\": false,\n \"plural\": false,\n \"type\": \"ID\"\n },\n-v16 = {\n+v23 = {\n \"enumValues\": null,\n \"nullable\": false,\n \"plural\": false,\n \"type\": \"Boolean\"\n },\n-v17 = {\n+v24 = {\n+ \"enumValues\": null,\n+ \"nullable\": false,\n+ \"plural\": false,\n+ \"type\": \"AuctionsLotState\"\n+},\n+v25 = {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"Money\"\n },\n-v18 = {\n+v26 = {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"String\"\n },\n-v19 = {\n+v27 = {\n+ \"enumValues\": null,\n+ \"nullable\": false,\n+ \"plural\": false,\n+ \"type\": \"Int\"\n+},\n+v28 = {\n+ \"enumValues\": [\n+ \"ForSale\",\n+ \"Passed\",\n+ \"Sold\"\n+ ],\n+ \"nullable\": false,\n+ \"plural\": false,\n+ \"type\": \"AuctionsSoldStatus\"\n+},\n+v29 = {\n+ \"enumValues\": null,\n+ \"nullable\": true,\n+ \"plural\": false,\n+ \"type\": \"SaleArtwork\"\n+},\n+v30 = {\n+ \"enumValues\": null,\n+ \"nullable\": true,\n+ \"plural\": false,\n+ \"type\": \"Artwork\"\n+},\n+v31 = {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"Image\"\n },\n-v20 = {\n+v32 = {\n+ \"enumValues\": null,\n+ \"nullable\": true,\n+ \"plural\": false,\n+ \"type\": \"Float\"\n+},\n+v33 = {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"Sale\"\n },\n-v21 = {\n+v34 = {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"Partner\"\n },\n-v22 = {\n+v35 = {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n \"type\": \"Bidder\"\n },\n-v23 = {\n+v36 = {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n@@ -480,7 +670,7 @@ return {\n },\n {\n \"alias\": null,\n- \"args\": (v12/*: any*/),\n+ \"args\": (v13/*: any*/),\n \"concreteType\": \"AuctionsLotStandingConnection\",\n \"kind\": \"LinkedField\",\n \"name\": \"auctionsLotStandingConnection\",\n@@ -518,13 +708,7 @@ return {\n \"plural\": false,\n \"selections\": [\n (v0/*: any*/),\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"bidCount\",\n- \"storageKey\": null\n- },\n+ (v14/*: any*/),\n {\n \"alias\": null,\n \"args\": null,\n@@ -532,13 +716,7 @@ return {\n \"name\": \"reserveStatus\",\n \"storageKey\": null\n },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"soldStatus\",\n- \"storageKey\": null\n- },\n+ (v15/*: any*/),\n {\n \"alias\": \"askingPrice\",\n \"args\": null,\n@@ -546,19 +724,10 @@ return {\n \"kind\": \"LinkedField\",\n \"name\": \"onlineAskingPrice\",\n \"plural\": false,\n- \"selections\": (v13/*: any*/),\n- \"storageKey\": null\n- },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Money\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"sellingPrice\",\n- \"plural\": false,\n- \"selections\": (v13/*: any*/),\n+ \"selections\": (v16/*: any*/),\n \"storageKey\": null\n },\n+ (v17/*: any*/),\n (v1/*: any*/),\n {\n \"alias\": null,\n@@ -578,59 +747,8 @@ return {\n \"name\": \"saleArtwork\",\n \"plural\": false,\n \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"lotLabel\",\n- \"storageKey\": null\n- },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Artwork\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"artwork\",\n- \"plural\": false,\n- \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"artistNames\",\n- \"storageKey\": null\n- },\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"concreteType\": \"Image\",\n- \"kind\": \"LinkedField\",\n- \"name\": \"image\",\n- \"plural\": false,\n- \"selections\": [\n- {\n- \"alias\": null,\n- \"args\": [\n- {\n- \"kind\": \"Literal\",\n- \"name\": \"version\",\n- \"value\": \"medium\"\n- }\n- ],\n- \"kind\": \"ScalarField\",\n- \"name\": \"url\",\n- \"storageKey\": \"url(version:\\\"medium\\\")\"\n- }\n- ],\n- \"storageKey\": null\n- },\n- (v1/*: any*/),\n- (v0/*: any*/),\n- (v2/*: any*/),\n- (v3/*: any*/)\n- ],\n- \"storageKey\": null\n- },\n+ (v18/*: any*/),\n+ (v19/*: any*/),\n {\n \"alias\": null,\n \"args\": null,\n@@ -655,13 +773,7 @@ return {\n \"storageKey\": null\n },\n (v1/*: any*/),\n- {\n- \"alias\": null,\n- \"args\": null,\n- \"kind\": \"ScalarField\",\n- \"name\": \"position\",\n- \"storageKey\": null\n- }\n+ (v20/*: any*/)\n ],\n \"storageKey\": null\n },\n@@ -716,13 +828,109 @@ return {\n },\n {\n \"alias\": null,\n- \"args\": (v12/*: any*/),\n+ \"args\": (v13/*: any*/),\n \"filters\": null,\n \"handle\": \"connection\",\n \"key\": \"MyBids_auctionsLotStandingConnection\",\n \"kind\": \"LinkedHandle\",\n \"name\": \"auctionsLotStandingConnection\"\n },\n+ {\n+ \"alias\": null,\n+ \"args\": [\n+ (v12/*: any*/),\n+ {\n+ \"kind\": \"Literal\",\n+ \"name\": \"first\",\n+ \"value\": 20\n+ }\n+ ],\n+ \"concreteType\": \"LotConnection\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"watchedLotConnection\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"LotEdge\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"edges\",\n+ \"plural\": true,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Lot\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"node\",\n+ \"plural\": false,\n+ \"selections\": [\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"AuctionsLotState\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"lot\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v0/*: any*/),\n+ (v14/*: any*/),\n+ (v17/*: any*/),\n+ (v15/*: any*/),\n+ (v1/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"SaleArtwork\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"saleArtwork\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v18/*: any*/),\n+ (v19/*: any*/),\n+ {\n+ \"alias\": null,\n+ \"args\": null,\n+ \"concreteType\": \"Sale\",\n+ \"kind\": \"LinkedField\",\n+ \"name\": \"sale\",\n+ \"plural\": false,\n+ \"selections\": [\n+ (v5/*: any*/),\n+ (v6/*: any*/),\n+ (v11/*: any*/),\n+ (v1/*: any*/),\n+ (v0/*: any*/),\n+ (v2/*: any*/),\n+ (v3/*: any*/),\n+ (v4/*: any*/),\n+ (v7/*: any*/),\n+ (v8/*: any*/),\n+ (v9/*: any*/),\n+ (v10/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v1/*: any*/),\n+ (v0/*: any*/),\n+ (v20/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ },\n+ (v1/*: any*/)\n+ ],\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": null\n+ }\n+ ],\n+ \"storageKey\": \"watchedLotConnection(after:\\\"\\\",first:20)\"\n+ },\n (v1/*: any*/)\n ],\n \"storageKey\": null\n@@ -730,7 +938,7 @@ return {\n ]\n },\n \"params\": {\n- \"id\": \"9cb9057f90509d58cd955bc06f759ced\",\n+ \"id\": \"75bc35f842cf81dc8a6ee6048d944fd4\",\n \"metadata\": {\n \"relayTestingSelectionTypeInfo\": {\n \"me\": {\n@@ -751,32 +959,22 @@ return {\n \"plural\": true,\n \"type\": \"AuctionsLotStandingEdge\"\n },\n- \"me.auctionsLotStandingConnection.edges.cursor\": (v14/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.cursor\": (v21/*: any*/),\n \"me.auctionsLotStandingConnection.edges.node\": {\n \"enumValues\": null,\n \"nullable\": false,\n \"plural\": false,\n \"type\": \"AuctionsLotStanding\"\n },\n- \"me.auctionsLotStandingConnection.edges.node.__typename\": (v14/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.id\": (v15/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.isHighestBidder\": (v16/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.lot\": {\n- \"enumValues\": null,\n- \"nullable\": false,\n- \"plural\": false,\n- \"type\": \"AuctionsLotState\"\n- },\n- \"me.auctionsLotStandingConnection.edges.node.lot.askingPrice\": (v17/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.lot.askingPrice.display\": (v18/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.lot.bidCount\": {\n- \"enumValues\": null,\n- \"nullable\": false,\n- \"plural\": false,\n- \"type\": \"Int\"\n- },\n- \"me.auctionsLotStandingConnection.edges.node.lot.id\": (v15/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.lot.internalID\": (v15/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.__typename\": (v21/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.id\": (v22/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.isHighestBidder\": (v23/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot\": (v24/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.askingPrice\": (v25/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.askingPrice.display\": (v26/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.bidCount\": (v27/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.id\": (v22/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.internalID\": (v22/*: any*/),\n \"me.auctionsLotStandingConnection.edges.node.lot.reserveStatus\": {\n \"enumValues\": [\n \"NoReserve\",\n@@ -787,107 +985,140 @@ return {\n \"plural\": false,\n \"type\": \"AuctionsReserveStatus\"\n },\n- \"me.auctionsLotStandingConnection.edges.node.lot.saleId\": (v15/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.lot.sellingPrice\": (v17/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.lot.sellingPrice.display\": (v18/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.lot.soldStatus\": {\n- \"enumValues\": [\n- \"ForSale\",\n- \"Passed\",\n- \"Sold\"\n- ],\n+ \"me.auctionsLotStandingConnection.edges.node.lot.saleId\": (v22/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.sellingPrice\": (v25/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.sellingPrice.display\": (v26/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.lot.soldStatus\": (v28/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork\": (v29/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork\": (v30/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.artistNames\": (v26/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.href\": (v26/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.id\": (v22/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.image\": (v31/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.image.url\": (v26/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.internalID\": (v22/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.slug\": (v22/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.id\": (v22/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.lotLabel\": (v26/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.position\": (v32/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale\": (v33/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.coverImage\": (v31/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.coverImage.url\": (v26/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.endAt\": (v26/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.href\": (v26/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.id\": (v22/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.internalID\": (v22/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.liveStartAt\": (v26/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.name\": (v26/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.partner\": (v34/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.partner.id\": (v22/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.partner.name\": (v26/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.registrationStatus\": (v35/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.registrationStatus.id\": (v22/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.registrationStatus.qualifiedForBidding\": (v36/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.requireIdentityVerification\": (v36/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.slug\": (v22/*: any*/),\n+ \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.status\": (v26/*: any*/),\n+ \"me.auctionsLotStandingConnection.pageInfo\": {\n+ \"enumValues\": null,\n \"nullable\": false,\n \"plural\": false,\n- \"type\": \"AuctionsSoldStatus\"\n+ \"type\": \"AuctionsPageInfo\"\n },\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork\": {\n+ \"me.auctionsLotStandingConnection.pageInfo.endCursor\": (v26/*: any*/),\n+ \"me.auctionsLotStandingConnection.pageInfo.hasNextPage\": (v23/*: any*/),\n+ \"me.bidders\": {\n \"enumValues\": null,\n \"nullable\": true,\n- \"plural\": false,\n- \"type\": \"SaleArtwork\"\n+ \"plural\": true,\n+ \"type\": \"Bidder\"\n },\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork\": {\n+ \"me.bidders.id\": (v22/*: any*/),\n+ \"me.bidders.sale\": (v33/*: any*/),\n+ \"me.bidders.sale.coverImage\": (v31/*: any*/),\n+ \"me.bidders.sale.coverImage.url\": (v26/*: any*/),\n+ \"me.bidders.sale.endAt\": (v26/*: any*/),\n+ \"me.bidders.sale.href\": (v26/*: any*/),\n+ \"me.bidders.sale.id\": (v22/*: any*/),\n+ \"me.bidders.sale.internalID\": (v22/*: any*/),\n+ \"me.bidders.sale.liveStartAt\": (v26/*: any*/),\n+ \"me.bidders.sale.name\": (v26/*: any*/),\n+ \"me.bidders.sale.partner\": (v34/*: any*/),\n+ \"me.bidders.sale.partner.id\": (v22/*: any*/),\n+ \"me.bidders.sale.partner.name\": (v26/*: any*/),\n+ \"me.bidders.sale.registrationStatus\": (v35/*: any*/),\n+ \"me.bidders.sale.registrationStatus.id\": (v22/*: any*/),\n+ \"me.bidders.sale.registrationStatus.qualifiedForBidding\": (v36/*: any*/),\n+ \"me.bidders.sale.requireIdentityVerification\": (v36/*: any*/),\n+ \"me.bidders.sale.slug\": (v22/*: any*/),\n+ \"me.bidders.sale.status\": (v26/*: any*/),\n+ \"me.id\": (v22/*: any*/),\n+ \"me.identityVerified\": (v36/*: any*/),\n+ \"me.pendingIdentityVerification\": {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n- \"type\": \"Artwork\"\n+ \"type\": \"IdentityVerification\"\n },\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.artistNames\": (v18/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.href\": (v18/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.id\": (v15/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.image\": (v19/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.image.url\": (v18/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.internalID\": (v15/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.artwork.slug\": (v15/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.id\": (v15/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.lotLabel\": (v18/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.position\": {\n+ \"me.pendingIdentityVerification.id\": (v22/*: any*/),\n+ \"me.pendingIdentityVerification.internalID\": (v22/*: any*/),\n+ \"me.watchedLotConnection\": {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n- \"type\": \"Float\"\n+ \"type\": \"LotConnection\"\n },\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale\": (v20/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.coverImage\": (v19/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.coverImage.url\": (v18/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.endAt\": (v18/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.href\": (v18/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.id\": (v15/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.internalID\": (v15/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.liveStartAt\": (v18/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.name\": (v18/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.partner\": (v21/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.partner.id\": (v15/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.partner.name\": (v18/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.registrationStatus\": (v22/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.registrationStatus.id\": (v15/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.registrationStatus.qualifiedForBidding\": (v23/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.requireIdentityVerification\": (v23/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.slug\": (v15/*: any*/),\n- \"me.auctionsLotStandingConnection.edges.node.saleArtwork.sale.status\": (v18/*: any*/),\n- \"me.auctionsLotStandingConnection.pageInfo\": {\n- \"enumValues\": null,\n- \"nullable\": false,\n- \"plural\": false,\n- \"type\": \"AuctionsPageInfo\"\n- },\n- \"me.auctionsLotStandingConnection.pageInfo.endCursor\": (v18/*: any*/),\n- \"me.auctionsLotStandingConnection.pageInfo.hasNextPage\": (v16/*: any*/),\n- \"me.bidders\": {\n+ \"me.watchedLotConnection.edges\": {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": true,\n- \"type\": \"Bidder\"\n+ \"type\": \"LotEdge\"\n },\n- \"me.bidders.id\": (v15/*: any*/),\n- \"me.bidders.sale\": (v20/*: any*/),\n- \"me.bidders.sale.coverImage\": (v19/*: any*/),\n- \"me.bidders.sale.coverImage.url\": (v18/*: any*/),\n- \"me.bidders.sale.endAt\": (v18/*: any*/),\n- \"me.bidders.sale.href\": (v18/*: any*/),\n- \"me.bidders.sale.id\": (v15/*: any*/),\n- \"me.bidders.sale.internalID\": (v15/*: any*/),\n- \"me.bidders.sale.liveStartAt\": (v18/*: any*/),\n- \"me.bidders.sale.name\": (v18/*: any*/),\n- \"me.bidders.sale.partner\": (v21/*: any*/),\n- \"me.bidders.sale.partner.id\": (v15/*: any*/),\n- \"me.bidders.sale.partner.name\": (v18/*: any*/),\n- \"me.bidders.sale.registrationStatus\": (v22/*: any*/),\n- \"me.bidders.sale.registrationStatus.id\": (v15/*: any*/),\n- \"me.bidders.sale.registrationStatus.qualifiedForBidding\": (v23/*: any*/),\n- \"me.bidders.sale.requireIdentityVerification\": (v23/*: any*/),\n- \"me.bidders.sale.slug\": (v15/*: any*/),\n- \"me.bidders.sale.status\": (v18/*: any*/),\n- \"me.id\": (v15/*: any*/),\n- \"me.identityVerified\": (v23/*: any*/),\n- \"me.pendingIdentityVerification\": {\n+ \"me.watchedLotConnection.edges.node\": {\n \"enumValues\": null,\n \"nullable\": true,\n \"plural\": false,\n- \"type\": \"IdentityVerification\"\n+ \"type\": \"Lot\"\n },\n- \"me.pendingIdentityVerification.id\": (v15/*: any*/),\n- \"me.pendingIdentityVerification.internalID\": (v15/*: any*/)\n+ \"me.watchedLotConnection.edges.node.id\": (v22/*: any*/),\n+ \"me.watchedLotConnection.edges.node.lot\": (v24/*: any*/),\n+ \"me.watchedLotConnection.edges.node.lot.bidCount\": (v27/*: any*/),\n+ \"me.watchedLotConnection.edges.node.lot.id\": (v22/*: any*/),\n+ \"me.watchedLotConnection.edges.node.lot.internalID\": (v22/*: any*/),\n+ \"me.watchedLotConnection.edges.node.lot.sellingPrice\": (v25/*: any*/),\n+ \"me.watchedLotConnection.edges.node.lot.sellingPrice.display\": (v26/*: any*/),\n+ \"me.watchedLotConnection.edges.node.lot.soldStatus\": (v28/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork\": (v29/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.artwork\": (v30/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.artwork.artistNames\": (v26/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.artwork.href\": (v26/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.artwork.id\": (v22/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.artwork.image\": (v31/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.artwork.image.url\": (v26/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.artwork.internalID\": (v22/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.artwork.slug\": (v22/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.id\": (v22/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.internalID\": (v22/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.lotLabel\": (v26/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.position\": (v32/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale\": (v33/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.coverImage\": (v31/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.coverImage.url\": (v26/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.endAt\": (v26/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.href\": (v26/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.id\": (v22/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.internalID\": (v22/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.liveStartAt\": (v26/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.name\": (v26/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.partner\": (v34/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.partner.id\": (v22/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.partner.name\": (v26/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.registrationStatus\": (v35/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.registrationStatus.id\": (v22/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.registrationStatus.qualifiedForBidding\": (v36/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.requireIdentityVerification\": (v36/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.slug\": (v22/*: any*/),\n+ \"me.watchedLotConnection.edges.node.saleArtwork.sale.status\": (v26/*: any*/)\n }\n },\n \"name\": \"MyBidsTestsQuery\",\ndiff --git a/src/lib/Scenes/MyBids/__tests__/ActiveLot-tests.tsx b/src/lib/Scenes/MyBids/__tests__/ActiveLotStanding-tests.tsx\nsimilarity index 79%\nrename from src/lib/Scenes/MyBids/__tests__/ActiveLot-tests.tsx\nrename to src/lib/Scenes/MyBids/__tests__/ActiveLotStanding-tests.tsx\nindex cff51522107..b5ee19e1def 100644\n--- a/src/lib/Scenes/MyBids/__tests__/ActiveLot-tests.tsx\n+++ b/src/lib/Scenes/MyBids/__tests__/ActiveLotStanding-tests.tsx\n@@ -1,10 +1,10 @@\n import React from \"react\"\n \n-import { ActiveLot_lotStanding } from \"__generated__/ActiveLot_lotStanding.graphql\"\n+import { ActiveLotStanding_lotStanding } from \"__generated__/ActiveLotStanding_lotStanding.graphql\"\n import { extractText } from \"lib/tests/extractText\"\n import { renderWithWrappers } from \"lib/tests/renderWithWrappers\"\n import { merge } from \"lodash\"\n-import { ActiveLot } from \"../Components/ActiveLot\"\n+import { ActiveLotStanding } from \"../Components/ActiveLotStanding\"\n \n const defaultLotStanding = {\n isHighestBidder: true,\n@@ -34,21 +34,23 @@ const defaultLotStanding = {\n }\n \n const lotStandingFixture = (overrides = {}) => {\n- return (merge({}, defaultLotStanding, overrides) as unknown) as ActiveLot_lotStanding\n+ return (merge({}, defaultLotStanding, overrides) as unknown) as ActiveLotStanding_lotStanding\n }\n \n-describe(ActiveLot, () => {\n+describe(ActiveLotStanding, () => {\n describe(\"User winning status\", () => {\n it(\"says 'Highest bid' if the user is winning the lot\", () => {\n const tree = renderWithWrappers(\n- \n+ \n )\n expect(extractText(tree.root)).toContain(\"Highest bid\")\n })\n \n it(\"says 'Highest bid' if the user is has the high bid and reserveStatus is UnknownReserve\", () => {\n const tree = renderWithWrappers(\n- \n )\n@@ -59,7 +61,7 @@ describe(ActiveLot, () => {\n const date = new Date()\n date.setDate(date.getDate() + 1)\n const tree = renderWithWrappers(\n- {\n \n it(\"says 'Reserve not met' if the user is winning the lot, but the reserveStatus is ReserveNotMet\", () => {\n const tree = renderWithWrappers(\n- \n )\n@@ -81,7 +83,7 @@ describe(ActiveLot, () => {\n \n it(\"says 'Outbid' if the user is outbid on the lot, but the reserveStatus is ReserveNotMet\", () => {\n const tree = renderWithWrappers(\n- \n )\n@@ -90,7 +92,9 @@ describe(ActiveLot, () => {\n \n it(\"says 'outbid' if the user is outbid on the lot and reserve is met\", () => {\n const tree = renderWithWrappers(\n- \n+ \n )\n expect(extractText(tree.root)).toContain(\"Outbid\")\n })\n@@ -99,7 +103,9 @@ describe(ActiveLot, () => {\n describe(\"selling price\", () => {\n it(\"shows floor selling price\", () => {\n const tree = renderWithWrappers(\n- \n+ \n )\n expect(extractText(tree.root)).toContain(\"CHF 1,800\")\n })\ndiff --git a/src/lib/Scenes/MyBids/__tests__/ClosedLot-tests.tsx b/src/lib/Scenes/MyBids/__tests__/ClosedLotStanding-tests.tsx\nsimilarity index 69%\nrename from src/lib/Scenes/MyBids/__tests__/ClosedLot-tests.tsx\nrename to src/lib/Scenes/MyBids/__tests__/ClosedLotStanding-tests.tsx\nindex a49837fc823..caf47ee3b05 100644\n--- a/src/lib/Scenes/MyBids/__tests__/ClosedLot-tests.tsx\n+++ b/src/lib/Scenes/MyBids/__tests__/ClosedLotStanding-tests.tsx\n@@ -1,11 +1,11 @@\n import React from \"react\"\n \n-import { ClosedLot_lotStanding } from \"__generated__/ClosedLot_lotStanding.graphql\"\n+import { ClosedLotStanding_lotStanding } from \"__generated__/ClosedLotStanding_lotStanding.graphql\"\n import { extractText } from \"lib/tests/extractText\"\n import { renderWithWrappers } from \"lib/tests/renderWithWrappers\"\n import { merge } from \"lodash\"\n import { StarCircleFill } from \"palette/svgs/sf\"\n-import { ClosedLot } from \"../Components/ClosedLot\"\n+import { ClosedLotStanding } from \"../Components/ClosedLotStanding\"\n \n const defaultLotStanding = {\n isHighestBidder: true,\n@@ -38,28 +38,28 @@ const defaultLotStanding = {\n }\n \n const lotStandingFixture = (overrides = {}) => {\n- return (merge({}, defaultLotStanding, overrides) as unknown) as ClosedLot_lotStanding\n+ return (merge({}, defaultLotStanding, overrides) as unknown) as ClosedLotStanding_lotStanding\n }\n \n-describe(ClosedLot, () => {\n+describe(ClosedLotStanding, () => {\n describe(\"result message\", () => {\n it(\"says 'You won!' if the user won the lot\", () => {\n const tree = renderWithWrappers(\n- \n+ \n )\n expect(extractText(tree.root)).toContain(\"You won!\")\n })\n \n it(\"says 'Outbid' if the the lot sold to someone else\", () => {\n const tree = renderWithWrappers(\n- \n+ \n )\n expect(extractText(tree.root)).toContain(\"Outbid\")\n })\n \n it(\"says 'Passed' if the lot did not sell at all\", () => {\n const tree = renderWithWrappers(\n- \n+ \n )\n expect(extractText(tree.root)).toContain(\"Passed\")\n })\n@@ -69,7 +69,7 @@ describe(ClosedLot, () => {\n it(\"has a little star badge if the user won the lot\", () => {\n expect(\n renderWithWrappers(\n- \n+ \n ).root.findAllByType(StarCircleFill).length\n ).toBe(1)\n })\n@@ -77,14 +77,14 @@ describe(ClosedLot, () => {\n \n describe(\"closing time\", () => {\n it(\"renders the time the sale ended by default\", () => {\n- const tree = renderWithWrappers()\n+ const tree = renderWithWrappers()\n expect(extractText(tree.root)).toContain(\"Closed Aug 5\")\n })\n })\n \n describe(\"selling price\", () => {\n it(\"shows selling price\", () => {\n- const tree = renderWithWrappers()\n+ const tree = renderWithWrappers()\n expect(extractText(tree.root)).toContain(\"CHF 1,800\")\n })\n })\ndiff --git a/src/lib/Scenes/MyBids/__tests__/MyBids-tests.tsx b/src/lib/Scenes/MyBids/__tests__/MyBids-tests.tsx\nindex 8d6634b18b4..5da4d12c32a 100644\n--- a/src/lib/Scenes/MyBids/__tests__/MyBids-tests.tsx\n+++ b/src/lib/Scenes/MyBids/__tests__/MyBids-tests.tsx\n@@ -6,22 +6,25 @@ import React from \"react\"\n import { graphql, QueryRenderer } from \"react-relay\"\n import { act, ReactTestInstance } from \"react-test-renderer\"\n import { createMockEnvironment, MockPayloadGenerator } from \"relay-test-utils\"\n-import { ActiveLot } from \"../Components/ActiveLot\"\n-import { ClosedLot } from \"../Components/ClosedLot\"\n+import { ActiveLotStanding } from \"../Components/ActiveLotStanding\"\n+import { ClosedLotStanding } from \"../Components/ClosedLotStanding\"\n+import { WatchedLot } from \"../Components/WatchedLot\"\n import { MyBidsContainer, MyBidsQueryRenderer } from \"../MyBids\"\n \n jest.unmock(\"react-relay\")\n \n const closedSectionLots = (root: ReactTestInstance): ReactTestInstance[] => {\n const closedSection = root.findByProps({ \"data-test-id\": \"closed-section\" })\n- return closedSection.findAllByType(ClosedLot)\n+ return closedSection.findAllByType(ClosedLotStanding)\n }\n \n const activeSectionLots = (root: ReactTestInstance): ReactTestInstance[] => {\n const activeSection = root.findByProps({ \"data-test-id\": \"active-section\" })\n- const activeLots = activeSection.findAllByType(ActiveLot)\n- const closedLots = activeSection.findAllByType(ClosedLot)\n- return [...activeLots, ...closedLots]\n+ const ActiveLotStandings = activeSection.findAll((instance: ReactTestInstance) => {\n+ return [ActiveLotStanding, ClosedLotStanding, WatchedLot].includes((instance as any).type)\n+ })\n+\n+ return ActiveLotStandings\n }\n \n describe(\"My Bids\", () => {\n@@ -83,6 +86,9 @@ describe(\"My Bids\", () => {\n \n return {\n bidders: [],\n+ watchedLotConnection: {\n+ edges: [],\n+ },\n auctionsLotStandingConnection: {\n edges: [\n {\n@@ -102,13 +108,13 @@ describe(\"My Bids\", () => {\n },\n })\n \n- const closedLots = closedSectionLots(wrapper.root).map(extractText)\n- expect(closedLots[0]).toContain(\"artistNames\")\n- expect(closedLots[0]).toContain(\"Passed\")\n- expect(closedLots[0]).toContain(\"Closed Aug 13\")\n+ const ClosedLotStandings = closedSectionLots(wrapper.root).map(extractText)\n+ expect(ClosedLotStandings[0]).toContain(\"artistNames\")\n+ expect(ClosedLotStandings[0]).toContain(\"Passed\")\n+ expect(ClosedLotStandings[0]).toContain(\"Closed Aug 13\")\n })\n \n- it(\"renders a completed lot in an ongoing live sale in the 'active' column\", () => {\n+ it(\"renders a completed lot in an ongoing live sale in the 'active' section\", () => {\n const wrapper = getWrapper({\n Me: () => {\n const sale = {\n@@ -122,6 +128,9 @@ describe(\"My Bids\", () => {\n sale,\n },\n ],\n+ watchedLotConnection: {\n+ edges: [],\n+ },\n auctionsLotStandingConnection: {\n edges: [\n {\n@@ -142,14 +151,17 @@ describe(\"My Bids\", () => {\n },\n })\n \n- const activeLots = activeSectionLots(wrapper.root).map(extractText)\n- expect(activeLots[0]).toContain(\"Passed\")\n+ const ActiveLotStandings = activeSectionLots(wrapper.root).map(extractText)\n+ expect(ActiveLotStandings[0]).toContain(\"Passed\")\n })\n \n- it(\"renders the empty view when there are no lot standings\", () => {\n+ it(\"renders the empty view when there are no lots to show\", () => {\n const wrapper = getWrapper({\n Me: () => ({\n bidders: [],\n+ watchedLotConnection: {\n+ edges: [],\n+ },\n auctionsLotStandingConnection: {\n edges: [],\n },\n@@ -175,6 +187,9 @@ describe(\"My Bids\", () => {\n },\n },\n ],\n+ watchedLotConnection: {\n+ edges: [],\n+ },\n auctionsLotStandingConnection: {\n edges: [],\n },\n@@ -183,4 +198,189 @@ describe(\"My Bids\", () => {\n })\n expect(extractText(wrapper.root)).toContain(\"You haven't placed any bids on this sale\")\n })\n+\n+ describe(\"when a user is watching lots\", () => {\n+ it(\"renders a watched lot for a sale the user has not registered for\", () => {\n+ const wrapper = getWrapper({\n+ Me: () => ({\n+ bidders: [],\n+ auctionsLotStandingConnection: { edges: [] },\n+ watchedLotConnection: {\n+ edges: [\n+ {\n+ node: {\n+ saleArtwork: {\n+ sale: {\n+ registrationStatus: null,\n+ },\n+ },\n+ },\n+ },\n+ ],\n+ },\n+ }),\n+ })\n+ expect(extractText(wrapper.root)).toContain(\"Complete registration\")\n+ })\n+\n+ it(\"renders a watched lot for a sale with a pending registration\", () => {\n+ const wrapper = getWrapper({\n+ Me: () => ({\n+ bidders: [],\n+ auctionsLotStandingConnection: { edges: [] },\n+ watchedLotConnection: {\n+ edges: [\n+ {\n+ node: {\n+ saleArtwork: {\n+ sale: {\n+ registrationStatus: { qualifiedForBidding: false },\n+ },\n+ },\n+ },\n+ },\n+ ],\n+ },\n+ }),\n+ })\n+ expect(extractText(wrapper.root)).toContain(\"Registration pending\")\n+ })\n+\n+ it(\"does not render a watched lot that also has a bid\", () => {\n+ const wrapper = getWrapper({\n+ Me: () => {\n+ const sale = {\n+ internalID: \"sale-id\",\n+ status: \"open\",\n+ liveStartAt: \"2020-08-13T16:00:00+00:00\",\n+ }\n+ return {\n+ bidders: [\n+ {\n+ sale,\n+ },\n+ ],\n+ watchedLotConnection: {\n+ edges: [\n+ {\n+ node: {\n+ lot: {\n+ internalID: \"same-id\",\n+ },\n+ saleArtwork: {\n+ artwork: {\n+ artistNames: \"Watched artist\",\n+ },\n+ },\n+ },\n+ },\n+ ],\n+ },\n+ auctionsLotStandingConnection: {\n+ edges: [\n+ {\n+ node: {\n+ lot: {\n+ internalID: \"same-id\",\n+ },\n+ saleArtwork: {\n+ artwork: {\n+ artistNames: \"Lot standing artist\",\n+ },\n+ },\n+ },\n+ },\n+ ],\n+ },\n+ }\n+ },\n+ })\n+\n+ const ActiveLotStandings = activeSectionLots(wrapper.root).map(extractText)\n+ expect(ActiveLotStandings.length).toEqual(1)\n+ expect(ActiveLotStandings[0]).toContain(\"Lot standing artist\")\n+ expect(ActiveLotStandings[0]).not.toContain(\"Watched artist\")\n+ })\n+\n+ it(\"renders a watched lot in the active section ordered by lot position\", () => {\n+ const wrapper = getWrapper({\n+ Me: () => {\n+ const sale = {\n+ internalID: \"sale-id\",\n+ status: \"open\",\n+ liveStartAt: \"2020-08-13T16:00:00+00:00\",\n+ }\n+ return {\n+ bidders: [\n+ {\n+ sale,\n+ },\n+ ],\n+ watchedLotConnection: {\n+ edges: [\n+ {\n+ node: {\n+ lot: {\n+ internalID: \"Unique id\",\n+ soldStatus: \"Passed\",\n+ reserveStatus: \"ReserveNotMet\",\n+ },\n+ saleArtwork: {\n+ sale,\n+ position: 2,\n+ lotLabel: \"#2\",\n+ artwork: {\n+ artistNames: \"Watched artist\",\n+ },\n+ },\n+ },\n+ },\n+ ],\n+ },\n+ auctionsLotStandingConnection: {\n+ edges: [\n+ {\n+ node: {\n+ lot: {\n+ soldStatus: \"Passed\",\n+ reserveStatus: \"ReserveNotMet\",\n+ },\n+ saleArtwork: {\n+ position: 1,\n+ lotLabel: \"#1\",\n+ artwork: {\n+ artistNames: \"Lot standing artist 1\",\n+ },\n+ sale,\n+ },\n+ },\n+ },\n+ {\n+ node: {\n+ lot: {\n+ soldStatus: \"Sold\",\n+ reserveStatus: \"ReserveMet\",\n+ },\n+ saleArtwork: {\n+ position: 3,\n+ lotLabel: \"#3\",\n+ artwork: {\n+ artistNames: \"Lot standing artist 3\",\n+ },\n+ sale,\n+ },\n+ },\n+ },\n+ ],\n+ },\n+ }\n+ },\n+ })\n+\n+ const ActiveLotStandings = activeSectionLots(wrapper.root).map(extractText)\n+ expect(ActiveLotStandings[0]).toContain(\"Lot standing artist 1Lot #1\")\n+ expect(ActiveLotStandings[1]).toContain(\"Watched artistLot #2\")\n+ expect(ActiveLotStandings[2]).toContain(\"Lot standing artist 3Lot #3\")\n+ })\n+ })\n })\n", "n2p_tests": {}, "f2p_tests": {"src/lib/Scenes/MyBids/__tests__/MyBids-tests.tsx": {"run": "PASS", "test": "FAIL", "fix": "PASS"}, "src/lib/Scenes/MyBids/__tests__/ActiveLotStanding-tests.tsx": {"run": "NONE", "test": "FAIL", "fix": "PASS"}, "src/lib/Scenes/MyBids/__tests__/ClosedLotStanding-tests.tsx": {"run": "NONE", "test": "FAIL", "fix": "PASS"}}, "p2p_tests": {}, "s2p_tests": {}} {"instance_id": "PalisadoesFoundation__talawa-2481", "org": "PalisadoesFoundation", "repo": "talawa", "number": 2481, "state": "closed", "title": "Fixed Error in Event Creation & Update with latest recurrence changes", "body": "**What kind of change does this PR introduce?**\r\n\r\nbugfix, feature, refactoring\r\n\r\n**Issue Number:**\r\n\r\nFixes #2468 \r\n\r\n**Did you add tests for your changes?**\r\n\r\nYes \r\n\r\n**Snapshots/Videos:**\r\n\r\nhttps://github.com/PalisadoesFoundation/talawa/assets/109027247/7f3718c6-00f2-4bc8-8d23-da7abf868110\r\n\r\n**Summary**\r\n\r\n- Remove latitude, longitude, recurrance deprecated fields from events and updated query.\r\n- Added support for latest recurrence changes made in https://github.com/PalisadoesFoundation/talawa-api/pull/2234\r\n- Added dynamic recurrence labels in dropdown as well as custom monthly recurrence\r\n- Generated new test_helper_mocks (mockito)\r\n- Update Create event model to remove unused fields.\r\n- Updated test cases & Added docs for modified files.\r\n\r\n**Does this PR introduce a breaking change?**\r\n\r\nNo.\r\n\r\n**Other information**\r\n\r\nNo. of files changed is large as had to make minor changes in unrelated files due to generating new test_helper_mocks via mockito.\r\n\r\n**Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa/blob/master/CONTRIBUTING.md)?**\r\n\r\nYes \r\n", "base": "{\"label\": \"PalisadoesFoundation:develop\", \"ref\": \"develop\", \"sha\": \"24f4aa77060693190ace0ac74dc5387c7107993d\"}", "resolved_issues": "[{\"number\": 2468, \"title\": \"Error in Event Creation & Fetch due to Faulty mutation\", \"body\": \"**Describe the bug**\\r\\nUser is unable to create event due to faulty and old implementation of `createEvent` mutation. The support for recurrance field was removed from API in https://github.com/PalisadoesFoundation/talawa-api/issues/2107 and there are issuein recurrenceRule used on Talawa Mobile.\\r\\n\\r\\nUpdate mutation as per latest https://github.com/PalisadoesFoundation/talawa-api/pull/2234\\r\\n\\r\\n**Errors in console:**\\r\\n\\r\\n - **`GraphQLError(message: Variable \\\"$recurrenceRuleData\\\" got invalid value \\\"TU\\\" at \\\"recurrenceRuleData.weekDays[0]\\\"; Value \\\"TU\\\" does not exist in \\\"WeekDays\\\" enum., locations: null, path: null, extensions: null)`**\\r\\n - **`Field \\\"recurrance\\\" is not defined by type \\\"EventInput\\\"`.**\\r\\n\\r\\n**To Reproduce**\\r\\nSteps to reproduce the behavior:\\r\\n\\r\\n1. Login to a organization.\\r\\n2. Open Events tab\\r\\n3. Click on Create Event Button\\r\\n4. Fill the details and try to create new event\\r\\n5. Error Dialog is shown on the screen.\\r\\n\\r\\n**Expected behavior**\\r\\nOn click of create event button, the Event should be created successfully if all details are filled and valid.\\r\\n\\r\\n**Actual behavior**\\r\\nOn click of create event button, A Error Dialog is shown.\\r\\n\\r\\n**Screenshots**\\r\\n\\r\\nhttps://github.com/PalisadoesFoundation/talawa/assets/109027247/139fa0d8-f512-4d3f-8f2a-89c519dc1673\\r\\n\\r\\n**Additional details**\\r\\nPart (pre-requisite) for Event Parity Project.\\r\\n\\r\\n**Potential internship candidates**\\r\\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\\r\\n\"}]", "lang": "dart", "problem_statement": "Error in Event Creation & Fetch due to Faulty mutation\n**Describe the bug**\r\nUser is unable to create event due to faulty and old implementation of `createEvent` mutation. The support for recurrance field was removed from API in https://github.com/PalisadoesFoundation/talawa-api/issues/2107 and there are issuein recurrenceRule used on Talawa Mobile.\r\n\r\nUpdate mutation as per latest https://github.com/PalisadoesFoundation/talawa-api/pull/2234\r\n\r\n**Errors in console:**\r\n\r\n - **`GraphQLError(message: Variable \"$recurrenceRuleData\" got invalid value \"TU\" at \"recurrenceRuleData.weekDays[0]\"; Value \"TU\" does not exist in \"WeekDays\" enum., locations: null, path: null, extensions: null)`**\r\n - **`Field \"recurrance\" is not defined by type \"EventInput\"`.**\r\n\r\n**To Reproduce**\r\nSteps to reproduce the behavior:\r\n\r\n1. Login to a organization.\r\n2. Open Events tab\r\n3. Click on Create Event Button\r\n4. Fill the details and try to create new event\r\n5. Error Dialog is shown on the screen.\r\n\r\n**Expected behavior**\r\nOn click of create event button, the Event should be created successfully if all details are filled and valid.\r\n\r\n**Actual behavior**\r\nOn click of create event button, A Error Dialog is shown.\r\n\r\n**Screenshots**\r\n\r\nhttps://github.com/PalisadoesFoundation/talawa/assets/109027247/139fa0d8-f512-4d3f-8f2a-89c519dc1673\r\n\r\n**Additional details**\r\nPart (pre-requisite) for Event Parity Project.\r\n\r\n**Potential internship candidates**\r\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\r\n\n", "hints": "Would like to work on this issue", "pull_url": "https://github.com/PalisadoesFoundation/talawa/pull/2481", "issue_urls": "[\"https://github.com/PalisadoesFoundation/talawa/issues/2468\"]", "test_command": NaN, "fix_patch": "diff --git a/lang/de.json b/lang/de.json\nindex 679e807a59..d1e9798204 100644\n--- a/lang/de.json\n+++ b/lang/de.json\n@@ -70,6 +70,8 @@\n \"Add Event\": \"Ereignis hinzuf\u00fcgen\",\n \"Add\": \"Anzeige\",\n \"Add Image\": \"Bild hinzuf\u00fcgen\",\n+ \"Select Start Date\": \"Startdatum ausw\u00e4hlen\",\n+ \"Select End Date\": \"Enddatum ausw\u00e4hlen\",\n \"Select Start Date and Time\": \"W\u00e4hlen Sie Startdatum und -uhrzeit\",\n \"Select End Date and Time\": \"W\u00e4hlen Sie Enddatum und -uhrzeit\",\n \"Does not repeat\": \"Wiederholt sich nicht\",\ndiff --git a/lang/en.json b/lang/en.json\nindex aa970061d6..a110b9ae4e 100644\n--- a/lang/en.json\n+++ b/lang/en.json\n@@ -76,6 +76,8 @@\n \"Add Event\": \"Add Event\",\n \"Add\": \"Add\",\n \"Add Image\": \"Add Image\",\n+ \"Select Start Date\": \"Select Start Date\",\n+ \"Select End Date\": \"Select End Date\",\n \"Select Start Date and Time\": \"Select Start Date and Time\",\n \"Select End Date and Time\": \"Select End Date and Time\",\n \"Does not repeat\": \"Does not repeat\",\ndiff --git a/lang/es.json b/lang/es.json\nindex df4d6ea1cf..9885c9af3c 100644\n--- a/lang/es.json\n+++ b/lang/es.json\n@@ -73,6 +73,8 @@\n \"Add Image\": \"A\u00f1adir imagen\",\n \"Select Start Date and Time\": \"Seleccione la fecha y hora de inicio\",\n \"Select End Date and Time\": \"Seleccione la fecha y hora de finalizaci\u00f3n\",\n+ \"Select Start Date\": \"Seleccionar fecha de inicio\",\n+ \"Select End Date\": \"Seleccionar fecha de finalizaci\u00f3n\",\n \"Does not repeat\": \"No se repite\",\n \"Keep Public\": \"Mantener p\u00fablica\",\n \"Keep Registerable\": \"Mantener registrable\",\ndiff --git a/lang/fr.json b/lang/fr.json\nindex 9c241bbb17..c6535f724c 100644\n--- a/lang/fr.json\n+++ b/lang/fr.json\n@@ -76,6 +76,8 @@\n \"Add Event\": \"Ajouter un \u00e9v\u00e8nement\",\n \"Add\": \"Ajoutez-le\",\n \"Add Image\": \"Ajouter une image\",\n+ \"Select Start Date\": \"S\u00e9lectionner la date de d\u00e9but\",\n+ \"Select End Date\": \"S\u00e9lectionner la date de fin\",\n \"Select Start Date and Time\": \"S\u00e9lectionnez la date et l'heure de d\u00e9but\",\n \"Select End Date and Time\": \"S\u00e9lectionnez la date et l'heure de fin\",\n \"Does not repeat\": \"\u00e7a ne se r\u00e9p\u00e8te pas\",\ndiff --git a/lang/hi.json b/lang/hi.json\nindex 75d702e976..4cc46c1cc4 100644\n--- a/lang/hi.json\n+++ b/lang/hi.json\n@@ -71,6 +71,8 @@\n \"Add Event\": \"\u0915\u093e\u0930\u094d\u092f\u0915\u094d\u0930\u092e \u091c\u094b\u0921\u093c\u0947\u0902\",\n \"Add\": \"\u0907\u0938\u0947 \u091c\u094b\u0921\u093c\u0947\u0902\",\n \"Add Image\": \"\u091b\u0935\u093f \u091c\u094b\u0921\u093c\u0947\u0902\",\n+ \"Select Start Date\": \"\u0936\u0941\u0930\u0942\u0906\u0924 \u0915\u0940 \u0924\u093f\u0925\u093f \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902\",\n+ \"Select End Date\": \"\u0938\u092e\u093e\u092a\u094d\u0924\u093f \u0915\u0940 \u0924\u093f\u0925\u093f \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902\",\n \"Select Start Date and Time\": \"\u092a\u094d\u0930\u093e\u0930\u0902\u092d \u0926\u093f\u0928\u093e\u0902\u0915 \u0914\u0930 \u0938\u092e\u092f \u091a\u0941\u0928\u0947\u0902\",\n \"Select End Date and Time\": \"\u0938\u092e\u093e\u092a\u094d\u0924\u093f \u0924\u093f\u0925\u093f \u0914\u0930 \u0938\u092e\u092f \u091a\u0941\u0928\u0947\u0902\",\n \"Does not repeat\": \"\u092f\u0939 \u0926\u094b\u0939\u0930\u093e\u0924\u093e \u0928\u0939\u0940\u0902 \u0939\u0948\",\ndiff --git a/lang/ja.json b/lang/ja.json\nindex 7c802fe1e3..75dd81deee 100644\n--- a/lang/ja.json\n+++ b/lang/ja.json\n@@ -71,6 +71,8 @@\n \"Add Event\": \"\u30a4\u30d9\u30f3\u30c8\u3092\u8ffd\u52a0\",\n \"Add\": \"\u8ffd\u52a0\",\n \"Add Image\": \"\u753b\u50cf\u3092\u8ffd\u52a0\",\n+ \"Select Start Date\": \"\u958b\u59cb\u65e5\u3092\u9078\u629e\",\n+ \"Select End Date\": \"\u7d42\u4e86\u65e5\u3092\u9078\u629e\",\n \"Select Start Date and Time\": \"\u958b\u59cb\u65e5\u6642\u3092\u9078\u629e\u3057\u307e\u3059\",\n \"Select End Date and Time\": \"\u7d42\u4e86\u65e5\u6642\u3092\u9078\u629e\u3057\u307e\u3059\",\n \"Does not repeat\": \"\u7e70\u308a\u8fd4\u3055\u306a\u3044\",\ndiff --git a/lang/pt.json b/lang/pt.json\nindex f83c80a06b..861139a632 100644\n--- a/lang/pt.json\n+++ b/lang/pt.json\n@@ -71,6 +71,8 @@\n \"Add Event\": \"Adicionar Evento\",\n \"Add\": \"Adicionar\",\n \"Add Image\": \"Adicionar imagem\",\n+ \"Select Start Date\": \"Selecionar data de in\u00edcio\",\n+ \"Select End Date\": \"Selecionar data de t\u00e9rmino\",\n \"Select Start Date and Time\": \"Selecione a data e hora de in\u00edcio\",\n \"Select End Date and Time\": \"Selecione a data e hora de t\u00e9rmino\",\n \"Does not repeat\": \"N\u00e3o repete\",\ndiff --git a/lang/zh.json b/lang/zh.json\nindex 8d473194c5..68e3dc825a 100644\n--- a/lang/zh.json\n+++ b/lang/zh.json\n@@ -71,6 +71,8 @@\n \"Add Event\": \"\u6dfb\u52a0\u4e8b\u4ef6\",\n \"Add\": \"\u6dfb\u52a0\",\n \"Add Image\": \"\u6dfb\u52a0\u56fe\u7247\",\n+ \"Select Start Date\": \"\u9009\u62e9\u5f00\u59cb\u65e5\u671f\",\n+ \"Select End Date\": \"\u9009\u62e9\u7ed3\u675f\u65e5\u671f\",\n \"Select Start Date and Time\": \"\u9009\u62e9\u5f00\u59cb\u65e5\u671f\u548c\u65f6\u95f4\",\n \"Select End Date and Time\": \"\u9009\u62e9\u7ed3\u675f\u65e5\u671f\u548c\u65f6\u95f4\",\n \"Does not repeat\": \"\u4e0d\u91cd\u590d\",\ndiff --git a/lib/constants/recurrence_values.dart b/lib/constants/recurrence_values.dart\nindex c6393aa06c..ff55d17c75 100644\n--- a/lib/constants/recurrence_values.dart\n+++ b/lib/constants/recurrence_values.dart\n@@ -1,53 +1,279 @@\n-/// Class containing constants for recurrence options.\n-class Recurrance {\n- /// Constant representing an event that does not repeat.\n- static const once = 'Does not repeat';\n+import 'dart:core';\n+import 'package:intl/intl.dart';\n \n- /// Constant representing daily recurrence.\n+/// Class containing constants for event intervals.\n+class EventIntervals {\n+ /// Constant representing an event that occurs every day.\n static const daily = 'day';\n \n- /// Constant representing weekly recurrence.\n+ /// Constant representing an event that occurs every week.\n static const weekly = 'week';\n \n- /// Constant representing monthly recurrence.\n+ /// Constant representing an event that occurs every month.\n static const monthly = 'month';\n \n- /// Constant representing yearly recurrence.\n+ /// Constant representing an event that occurs every year.\n static const yearly = 'year';\n+}\n \n- /// Constant representing a custom recurrence.\n- static const custom = 'custom...';\n+/// Class containing constants for event end types.\n+class EventEndTypes {\n+ /// Constant representing an event that never ends.\n+ static const never = 'never';\n \n- /// Constant representing Monday in weekdays.\n- static const weekdayMonday = 'MO';\n+ /// Constant representing an event that ends on a specific date.\n+ static const on = 'on';\n \n- /// Constant representing Tuesday in weekdays.\n- static const weekdayTuesday = 'TU';\n+ /// Constant representing an event that ends after a specified number of occurrences.\n+ static const after = 'after';\n+}\n+\n+/// Class containing constants for frequency options.\n+class Frequency {\n+ /// Constant representing an event that occurs every day.\n+ static const daily = 'DAILY';\n+\n+ /// Constant representing an event that occurs every week.\n+ static const weekly = 'WEEKLY';\n \n- /// Constant representing Wednesday in weekdays.\n- static const weekdayWednesday = 'WE';\n+ /// Constant representing an event that occurs every month.\n+ static const monthly = 'MONTHLY';\n+\n+ /// Constant representing an event that occurs every year.\n+ static const yearly = 'YEARLY';\n+}\n \n- /// Constant representing Thursday in weekdays.\n- static const weekdayThursday = 'TH';\n+/// Class containing constants for week days.\n+class WeekDays {\n+ /// Constant representing Sunday.\n+ static const sunday = 'SUNDAY';\n \n- /// Constant representing Friday in weekdays.\n- static const weekdayFriday = 'FR';\n+ /// Constant representing Monday.\n+ static const monday = 'MONDAY';\n \n- /// Constant representing Saturday in weekdays.\n- static const weekdaySaturday = 'SA';\n+ /// Constant representing Tuesday.\n+ static const tuesday = 'TUESDAY';\n \n- /// Constant representing Sunday in weekdays.\n- static const weekdaySunday = 'SU';\n+ /// Constant representing Wednesday.\n+ static const wednesday = 'WEDNESDAY';\n+\n+ /// Constant representing Thursday.\n+ static const thursday = 'THURSDAY';\n+\n+ /// Constant representing Friday.\n+ static const friday = 'FRIDAY';\n+\n+ /// Constant representing Saturday.\n+ static const saturday = 'SATURDAY';\n }\n \n-/// Class containing constants for event end types.\n-class EventEndTypes {\n- /// Constant representing an event that never ends.\n- static const never = 'Never';\n+/// Class containing constants for recurrence end types.\n+class RecurringEventMutationType {\n+ /// Constant representing mutation of current instance only.\n+ static const thisInstance = 'ThisInstance';\n \n- /// Constant representing an event that ends on a specific date.\n- static const on = 'On';\n+ /// constant representing mutation of current and following instances.\n+ static const thisAndFollowingInstances = 'ThisAndFollowingInstances';\n \n- /// Constant representing an event that ends after a specified number of occurrences.\n- static const after = 'After';\n+ /// constant representing mutation of all instances.\n+ static const allInstances = 'AllInstances';\n+}\n+\n+/// represents all the days in a week.\n+List days = [\n+ WeekDays.monday,\n+ WeekDays.tuesday,\n+ WeekDays.wednesday,\n+ WeekDays.thursday,\n+ WeekDays.friday,\n+ WeekDays.saturday,\n+ WeekDays.sunday,\n+];\n+\n+/// conatins all neccessary utils.\n+class RecurrenceUtils {\n+ /// represents all the months.\n+ static const List monthNames = [\n+ 'January',\n+ 'February',\n+ 'March',\n+ 'April',\n+ 'May',\n+ 'June',\n+ 'July',\n+ 'August',\n+ 'September',\n+ 'October',\n+ 'November',\n+ 'December',\n+ ];\n+\n+ /// represents all the week day occurences.\n+ static const List weekDayOccurences = [\n+ 'First',\n+ 'Second',\n+ 'Third',\n+ 'Fourth',\n+ 'Last',\n+ ];\n+\n+ /// represents all the week days.\n+ static const List weekDays = [\n+ 'Monday',\n+ 'Tuesday',\n+ 'Wednesday',\n+ 'Thursday',\n+ 'Friday',\n+ 'Saturday',\n+ 'Sunday',\n+ ];\n+\n+ /// 'getRecurrenceRuleText' return text for various recurrence rules.\n+ ///\n+ /// **params**:\n+ /// * `frequency`: Frequency of the event.\n+ /// * `weekDays`: List of week days.\n+ /// * `interval`: Interval of the event.\n+ /// * `count`: Count of the event.\n+ /// * `weekDayOccurenceInMonth`: Week day occurence in month.\n+ /// * `startDate`: Start date of the event.\n+ /// * `endDate`: End date of the event.\n+ ///\n+ /// **returns**:\n+ /// * `String`: Recurrence rule text.\n+ static String getRecurrenceRuleText(\n+ String frequency,\n+ Set? weekDays,\n+ int? interval,\n+ int? count,\n+ int? weekDayOccurenceInMonth,\n+ DateTime startDate,\n+ DateTime? endDate,\n+ ) {\n+ String recurrenceRuleText = '';\n+\n+ switch (frequency) {\n+ case Frequency.daily:\n+ if (interval != null && interval > 1) {\n+ recurrenceRuleText = 'Every $interval days';\n+ } else {\n+ recurrenceRuleText = 'Daily';\n+ }\n+ break;\n+ case Frequency.weekly:\n+ if (weekDays == null) {\n+ break;\n+ }\n+ if (interval != null && interval > 1) {\n+ recurrenceRuleText = 'Every $interval weeks on ';\n+ } else {\n+ recurrenceRuleText = 'Weekly on ';\n+ }\n+ recurrenceRuleText += getWeekDaysString(weekDays.toList());\n+ break;\n+ case Frequency.monthly:\n+ if (interval != null && interval > 1) {\n+ recurrenceRuleText = 'Every $interval months on ';\n+ } else {\n+ recurrenceRuleText = 'Monthly on ';\n+ }\n+\n+ if (weekDayOccurenceInMonth != null) {\n+ final getOccurence =\n+ weekDayOccurenceInMonth != -1 ? weekDayOccurenceInMonth - 1 : 4;\n+ recurrenceRuleText +=\n+ '${weekDayOccurences[getOccurence]} ${RecurrenceUtils.weekDays[startDate.weekday - 1]}';\n+ } else {\n+ recurrenceRuleText += 'Day ${startDate.day}';\n+ }\n+ break;\n+ case Frequency.yearly:\n+ if (interval != null && interval > 1) {\n+ recurrenceRuleText = 'Every $interval years on ';\n+ } else {\n+ recurrenceRuleText = 'Annually on ';\n+ }\n+ recurrenceRuleText +=\n+ '${monthNames[startDate.month - 1]} ${startDate.day}';\n+ break;\n+ }\n+\n+ if (endDate != null) {\n+ final formatter = DateFormat('MMMM dd, yyyy');\n+ recurrenceRuleText += ', until ${formatter.format(endDate)}';\n+ }\n+\n+ if (count != null) {\n+ recurrenceRuleText += ', $count ${count > 1 ? 'times' : 'time'}';\n+ }\n+\n+ return recurrenceRuleText;\n+ }\n+\n+ /// 'getWeekDaysString' returns string for weekDays.\n+ ///\n+ /// **params**:\n+ /// * `weekDays`: List of Weekdays\n+ ///\n+ /// **returns**:\n+ /// * `String`: returns string for weekDays.\n+ static String getWeekDaysString(List weekDays) {\n+ final fullDayNames = weekDays\n+ .map((day) => RecurrenceUtils.weekDays[weekDays.indexOf(day)])\n+ .toList();\n+\n+ String weekDaysString = fullDayNames.join(', ');\n+\n+ final lastCommaIndex = weekDaysString.lastIndexOf(',');\n+ if (lastCommaIndex != -1) {\n+ weekDaysString =\n+ '${weekDaysString.substring(0, lastCommaIndex)} &${weekDaysString.substring(lastCommaIndex + 1)}';\n+ }\n+\n+ return weekDaysString;\n+ }\n+\n+ /// 'getWeekDayOccurenceInMonth' returns the week day occurence in month.\n+ ///\n+ /// **params**:\n+ /// * `date`: Date of the event.\n+ ///\n+ /// **returns**:\n+ /// * `int`: Week day occurence in month.\n+ static int getWeekDayOccurenceInMonth(DateTime date) {\n+ final dayOfMonth = date.day;\n+\n+ // Calculate the current occurrence\n+ final occurrence = (dayOfMonth / 7).ceil();\n+\n+ return occurrence;\n+ }\n+\n+ /// Function to check whether cuurent event instance is Last occurence of Week Day.\n+ ///\n+ /// **params**:\n+ /// * `date`: Date of the event.\n+ ///\n+ /// **returns**:\n+ /// * `bool`: Returns true if the current event instance is the last occurence of the week day.\n+ static bool isLastOccurenceOfWeekDay(DateTime date) {\n+ final currentDay = date.weekday;\n+\n+ DateTime lastOccurenceInMonth = DateTime(\n+ date.year,\n+ date.month + 1,\n+ 0,\n+ );\n+\n+ // set the lastOccurenceInMonth to that day's last occurence\n+ while (lastOccurenceInMonth.weekday != currentDay) {\n+ lastOccurenceInMonth = DateTime(\n+ lastOccurenceInMonth.year,\n+ lastOccurenceInMonth.month,\n+ lastOccurenceInMonth.day - 1,\n+ );\n+ }\n+\n+ return date.day == lastOccurenceInMonth.day;\n+ }\n }\ndiff --git a/lib/models/chats/chat_list_tile_data_model.g.dart b/lib/models/chats/chat_list_tile_data_model.g.dart\nindex b7d137027e..200e515497 100644\n--- a/lib/models/chats/chat_list_tile_data_model.g.dart\n+++ b/lib/models/chats/chat_list_tile_data_model.g.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n // GENERATED CODE - DO NOT MODIFY BY HAND\n \n part of 'chat_list_tile_data_model.dart';\n@@ -16,7 +13,7 @@ ChatListTileDataModel _$ChatListTileDataModelFromJson(\n (json['users'] as List?)\n ?.map((e) => ChatUser.fromJson(e as Map))\n .toList(),\n- json['_id'] as String?,\n+ json['id'] as String?,\n );\n \n Map _$ChatListTileDataModelToJson(\n@@ -24,5 +21,5 @@ Map _$ChatListTileDataModelToJson(\n ) =>\n {\n 'users': instance.users,\n- '_id': instance.id,\n+ 'id': instance.id,\n };\ndiff --git a/lib/models/chats/chat_message.g.dart b/lib/models/chats/chat_message.g.dart\nindex 4ac1f34564..24dedabc9b 100644\n--- a/lib/models/chats/chat_message.g.dart\n+++ b/lib/models/chats/chat_message.g.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n // GENERATED CODE - DO NOT MODIFY BY HAND\n \n part of 'chat_message.dart';\n@@ -10,7 +7,7 @@ part of 'chat_message.dart';\n // **************************************************************************\n \n ChatMessage _$ChatMessageFromJson(Map json) => ChatMessage(\n- json['_id'] as String?,\n+ json['id'] as String?,\n json['sender'] == null\n ? null\n : ChatUser.fromJson(json['sender'] as Map),\n@@ -22,7 +19,7 @@ ChatMessage _$ChatMessageFromJson(Map json) => ChatMessage(\n \n Map _$ChatMessageToJson(ChatMessage instance) =>\n {\n- '_id': instance.id,\n+ 'id': instance.id,\n 'sender': instance.sender?.toJson(),\n 'receiver': instance.receiver?.toJson(),\n 'messageContent': instance.messageContent,\ndiff --git a/lib/models/chats/chat_user.g.dart b/lib/models/chats/chat_user.g.dart\nindex 421737da7e..beeef4f36e 100644\n--- a/lib/models/chats/chat_user.g.dart\n+++ b/lib/models/chats/chat_user.g.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n // GENERATED CODE - DO NOT MODIFY BY HAND\n \n part of 'chat_user.dart';\n@@ -11,12 +8,12 @@ part of 'chat_user.dart';\n \n ChatUser _$ChatUserFromJson(Map json) => ChatUser(\n firstName: json['firstName'] as String?,\n- id: json['_id'] as String?,\n+ id: json['id'] as String?,\n image: json['image'] as String?,\n );\n \n Map _$ChatUserToJson(ChatUser instance) => {\n 'firstName': instance.firstName,\n- '_id': instance.id,\n+ 'id': instance.id,\n 'image': instance.image,\n };\ndiff --git a/lib/models/events/event_model.dart b/lib/models/events/event_model.dart\nindex 4c4bbb727d..a15db5925c 100644\n--- a/lib/models/events/event_model.dart\n+++ b/lib/models/events/event_model.dart\n@@ -9,15 +9,12 @@ class Event {\n this.description,\n this.attendees,\n this.location,\n- this.latitude,\n- this.longitude,\n this.recurring,\n this.allDay,\n this.startDate,\n this.endDate,\n this.startTime,\n this.endTime,\n- this.recurrence,\n this.isPublic,\n this.isRegistered,\n this.isRegisterable,\n@@ -34,15 +31,12 @@ class Event {\n title: json['title'] as String?,\n description: json['description'] as String?,\n location: json['location'] as String?,\n- longitude: json['longitude'] as double?,\n- latitude: json['latitude'] as double?,\n recurring: json['recurring'] as bool?,\n allDay: json['allDay'] as bool?,\n startDate: json['startDate'] as String?,\n endDate: json['endDate'] as String?,\n startTime: json['startTime'] as String?,\n endTime: json['endTime'] as String?,\n- recurrence: json['recurrence'] as String?,\n isPublic: json['isPublic'] as bool?,\n isRegistered: json['isRegistered'] as bool?,\n isRegisterable: json['isRegisterable'] as bool?,\n@@ -84,12 +78,6 @@ class Event {\n /// The location of the event.\n String? location;\n \n- /// The latitude of the event.\n- double? latitude;\n-\n- /// The longitude of the event.\n- double? longitude;\n-\n /// A boolean value that indicates if the event is recurring.\n bool? recurring;\n \n@@ -108,9 +96,6 @@ class Event {\n /// The end time of the event.\n String? endTime;\n \n- /// The recurrence of the event.\n- String? recurrence;\n-\n /// A boolean value that indicates if the event is public.\n bool? isPublic;\n \ndiff --git a/lib/models/user/user_info.g.dart b/lib/models/user/user_info.g.dart\nindex 7059bec4c8..3b89a5ff1d 100644\n--- a/lib/models/user/user_info.g.dart\n+++ b/lib/models/user/user_info.g.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n // GENERATED CODE - DO NOT MODIFY BY HAND\n \n part of 'user_info.dart';\ndiff --git a/lib/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart b/lib/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart\nindex 3baf49052d..dd2ec28dd7 100644\n--- a/lib/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart\n+++ b/lib/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart\n@@ -41,7 +41,8 @@ class CreateEventViewModel extends BaseModel {\n TextEditingController(text: '1');\n \n /// Event ends After n occurences controller.\n- TextEditingController endOccurenceController = TextEditingController();\n+ TextEditingController endOccurenceController =\n+ TextEditingController(text: '1');\n \n /// Event Start Time.\n TimeOfDay eventStartTime = TimeOfDay.now();\n@@ -56,7 +57,13 @@ class CreateEventViewModel extends BaseModel {\n DateTime eventStartDate = DateTime.now();\n \n /// Event End Date.\n- DateTime? eventEndDate = DateTime.now();\n+ DateTime eventEndDate = DateTime.now();\n+\n+ /// Event Start Date for recurrence.\n+ DateTime recurrenceStartDate = DateTime.now();\n+\n+ /// Event End Date for recurrence.\n+ DateTime? recurrenceEndDate;\n \n /// Public Event or Not.\n bool isPublicSwitch = true;\n@@ -73,38 +80,37 @@ class CreateEventViewModel extends BaseModel {\n /// DescriptionFocus FocusNode.\n FocusNode descriptionFocus = FocusNode();\n \n- /// Latitude store.\n- double? latitude;\n-\n- /// Longitude store.\n- double? longitude;\n-\n /// is an allday event.\n bool isAllDay = true;\n \n /// Is a recurring event.\n bool isRecurring = false;\n \n- /// recurrence count.\n- int recurranceCount = 1;\n+ /// RecurrenceRuleData frequency.\n+ String recurrenceInterval = EventIntervals.weekly;\n+\n+ /// Event end type.\n+ String eventEndType = EventEndTypes.never;\n \n- /// recurrence.\n- String? recurrance;\n+ /// represents the frequency of the event.\n+ String frequency = Frequency.weekly;\n \n- /// RecurranceRuleData frequency.\n- String recurranceFrequency = Recurrance.weekly;\n+ /// represents the week days of the event.\n+ Set weekDays = {\n+ days[DateTime.now().weekday - 1],\n+ };\n \n- /// Monthly recurrence.\n- String monthlyRecurrence = 'Monthly on day 3';\n+ /// represents the interval of the event.\n+ int interval = 1;\n \n- /// weekdays.\n- Set weekdays = {Recurrance.weekdayTuesday};\n+ /// represents the count of the event.\n+ int? count;\n \n- /// Event end type.\n- String eventEndType = EventEndTypes.never;\n+ /// represents the week day occurence in Month.\n+ int? weekDayOccurenceInMonth;\n \n- /// Custom recurrance event end date.\n- DateTime? eventEndOnEndDate = DateTime.now();\n+ /// represents the recurrence label.\n+ String recurrenceLabel = 'Does not repeat';\n \n //late OrganizationService _organizationService;\n late final Map _memberCheckedMap = {};\n@@ -193,41 +199,47 @@ class CreateEventViewModel extends BaseModel {\n eventStartTime.minute,\n );\n final DateTime endTime = DateTime(\n- eventEndDate?.year ?? DateTime.now().year,\n- eventEndDate?.month ?? DateTime.now().month,\n- eventEndDate?.day ?? DateTime.now().day,\n+ eventEndDate.year,\n+ eventEndDate.month,\n+ eventEndDate.day,\n eventEndTime.hour,\n eventEndTime.minute,\n );\n-\n- final String? frequency = getRecurrance(recurranceFrequency);\n-\n // all required data for creating an event\n final Map variables = {\n \"data\": {\n- 'startDate': DateFormat('yyyy-MM-dd').format(eventStartDate),\n- if (eventEndDate != null)\n- 'endDate': DateFormat('yyyy-MM-dd').format(eventEndDate!),\n- 'organizationId': _currentOrg.id,\n 'title': eventTitleTextController.text,\n 'description': eventDescriptionTextController.text,\n 'location': eventLocationTextController.text,\n 'isPublic': isPublicSwitch,\n 'isRegisterable': isRegisterableSwitch,\n 'recurring': isRecurring,\n- 'recurrance': recurrance ?? frequency,\n 'allDay': isAllDay,\n- 'startTime': '${DateFormat('HH:mm:ss').format(startTime)}Z',\n- if (eventEndDate != null)\n- 'endTime': '${DateFormat('HH:mm:ss').format(endTime)}Z',\n- if (latitude != null) 'latitude': latitude,\n- if (longitude != null) 'longitude': longitude,\n+ 'organizationId': _currentOrg.id,\n+ 'startDate': DateFormat('yyyy-MM-dd').format(eventStartDate),\n+ 'endDate': DateFormat('yyyy-MM-dd').format(eventEndDate),\n+ 'startTime':\n+ isAllDay ? null : '${DateFormat('HH:mm:ss').format(startTime)}Z',\n+ 'endTime':\n+ isAllDay ? null : '${DateFormat('HH:mm:ss').format(endTime)}Z',\n },\n- if (recurrance == null)\n+ if (isRecurring)\n 'recurrenceRuleData': {\n- if (eventEndType != EventEndTypes.never) 'count': recurranceCount,\n+ 'recurrenceStartDate': DateFormat('yyyy-MM-dd').format(\n+ recurrenceStartDate,\n+ ),\n+ 'recurrenceEndDate': recurrenceEndDate != null\n+ ? DateFormat('yyyy-MM-dd').format(recurrenceEndDate!)\n+ : null,\n 'frequency': frequency,\n- if (frequency == 'WEEKLY') 'weekDays': List.from(weekdays),\n+ 'weekDays': (frequency == Frequency.weekly ||\n+ (frequency == Frequency.monthly &&\n+ weekDayOccurenceInMonth != null))\n+ ? weekDays.toList()\n+ : null,\n+ 'interval': interval,\n+ 'count': count,\n+ 'weekDayOccurenceInMonth': weekDayOccurenceInMonth,\n },\n };\n \n@@ -240,11 +252,9 @@ class CreateEventViewModel extends BaseModel {\n EventQueries().addEvent(),\n variables: variables,\n );\n- print(result);\n navigationService.pop();\n if (result != null) {\n navigationService.pop();\n-\n await _eventService.getEvents();\n }\n }\n@@ -343,33 +353,8 @@ class CreateEventViewModel extends BaseModel {\n ///\n /// **returns**:\n /// None\n- void setEventEndDate(DateTime? selectedEndDate) {\n+ void setEventEndDate(DateTime selectedEndDate) {\n eventEndDate = selectedEndDate;\n notifyListeners();\n }\n-\n- /// Returns corresponding recurrence value based on frequency.\n- ///\n- /// **params**:\n- /// * `frequency`: Recurrence frequency selected by user.\n- ///\n- /// **returns**:\n- /// * `String?`: Recurrence value.\n- String? getRecurrance(String frequency) {\n- isRecurring = true;\n- if (frequency == Recurrance.daily || frequency == 'Every day') {\n- return 'DAILY';\n- } else if (frequency == Recurrance.weekly || frequency == 'Every week') {\n- return 'WEEKLY';\n- } else if (frequency == Recurrance.monthly || frequency == 'Every month') {\n- return 'MONTHLY';\n- } else if (frequency == Recurrance.yearly || frequency == 'Every year') {\n- return 'YEARLY';\n- } else if (frequency == Recurrance.once) {\n- isRecurring = false;\n- return null;\n- } else {\n- return null;\n- }\n- }\n }\ndiff --git a/lib/view_model/after_auth_view_models/event_view_models/explore_events_view_model.dart b/lib/view_model/after_auth_view_models/event_view_models/explore_events_view_model.dart\nindex 4740452f6a..7b792d7be0 100644\n--- a/lib/view_model/after_auth_view_models/event_view_models/explore_events_view_model.dart\n+++ b/lib/view_model/after_auth_view_models/event_view_models/explore_events_view_model.dart\n@@ -1,6 +1,4 @@\n import 'dart:async';\n-\n-import 'package:intl/intl.dart';\n import 'package:talawa/enums/enums.dart';\n import 'package:talawa/locator.dart';\n import 'package:talawa/models/events/event_model.dart';\n@@ -117,7 +115,7 @@ class ExploreEventsViewModel extends BaseModel {\n if (!_uniqueEventIds.contains(newEvent.id) &&\n newEvent.organization!.id == userConfig.currentOrg.id) {\n _uniqueEventIds.add(newEvent.id!);\n- _parseEventDateTime(newEvent);\n+ _events.insert(0, newEvent);\n }\n if (!_userEvents.any((event) => event.id == newEvent.id) &&\n newEvent.creator!.id == userConfig.currentUser.id) {\n@@ -126,43 +124,6 @@ class ExploreEventsViewModel extends BaseModel {\n notifyListeners();\n }\n \n- /// The helper function that used to parse the date and time.\n- ///\n- /// **params**:\n- /// * `newEvent`: `Event` type variable containing data to create a new event.\n- ///\n- /// **returns**:\n- /// None\n- void _parseEventDateTime(Event newEvent) {\n- // Maybe needed for the tests. Can be further discussed.\n- if (newEvent.startDate == null ||\n- newEvent.endDate == null ||\n- newEvent.startTime == null ||\n- newEvent.endTime == null) {\n- newEvent.startDate = DateFormat('yyyy-MM-dd').format(DateTime.now());\n- newEvent.endDate = DateFormat('yyyy-MM-dd').format(DateTime.now());\n- newEvent.startTime = DateFormat('HH:mm:ss').format(DateTime.now());\n- newEvent.endTime = DateFormat('HH:mm:ss').format(DateTime.now());\n- }\n-\n- if (RegExp(r'^\\d{4}-\\d{2}-\\d{2}$').hasMatch(newEvent.startDate!) &&\n- RegExp(r'^\\d{2}:\\d{2}:\\d{2}.\\d{3}Z$').hasMatch(newEvent.startTime!) &&\n- RegExp(r'^\\d{4}-\\d{2}-\\d{2}$').hasMatch(newEvent.endDate!) &&\n- RegExp(r'^\\d{2}:\\d{2}:\\d{2}.\\d{3}Z$').hasMatch(newEvent.endTime!)) {\n- final startMoment =\n- DateTime.parse('${newEvent.startDate} ${newEvent.startTime}')\n- .toLocal();\n- final endMoment =\n- DateTime.parse('${newEvent.endDate} ${newEvent.endTime}').toLocal();\n-\n- newEvent.startDate = DateFormat('yMd').format(startMoment);\n- newEvent.endDate = DateFormat('yMd').format(endMoment);\n- newEvent.startTime = DateFormat('h:mm a').format(startMoment);\n- newEvent.endTime = DateFormat('h:mm a').format(endMoment);\n- }\n- _events.insert(0, newEvent);\n- }\n-\n /// This function deletes the event.\n ///\n /// **params**:\n@@ -184,7 +145,6 @@ class ExploreEventsViewModel extends BaseModel {\n if (result != null) {\n navigationService.pop();\n setState(ViewState.busy);\n- print(result);\n _uniqueEventIds.remove(eventId);\n _events.removeWhere((element) => element.id == eventId);\n _userEvents.removeWhere((element) => element.id == eventId);\ndiff --git a/lib/views/after_auth_screens/events/create_custom_recurring_event.dart b/lib/views/after_auth_screens/events/create_custom_recurring_event.dart\nindex 5edd07ab20..0667482d91 100644\n--- a/lib/views/after_auth_screens/events/create_custom_recurring_event.dart\n+++ b/lib/views/after_auth_screens/events/create_custom_recurring_event.dart\n@@ -26,8 +26,13 @@ class _CustomRecurrencePageState extends State {\n late CreateEventViewModel viewModel;\n \n @override\n- Widget build(BuildContext context) {\n+ void initState() {\n+ super.initState();\n viewModel = widget.model;\n+ }\n+\n+ @override\n+ Widget build(BuildContext context) {\n return Scaffold(\n appBar: AppBar(\n backgroundColor: Theme.of(context).primaryColor,\n@@ -43,14 +48,26 @@ class _CustomRecurrencePageState extends State {\n actions: [\n TextButton(\n onPressed: () {\n- if (viewModel.eventEndType == EventEndTypes.never) {\n- viewModel.setEventEndDate(null);\n- } else if (viewModel.eventEndType == EventEndTypes.on) {\n- viewModel.eventEndDate = viewModel.eventEndOnEndDate;\n- } else if (viewModel.eventEndType == EventEndTypes.after) {\n- viewModel.recurranceCount =\n- int.parse(viewModel.endOccurenceController.text);\n- }\n+ setState(() {\n+ if (viewModel.eventEndType == EventEndTypes.never) {\n+ viewModel.recurrenceEndDate = null;\n+ } else if (viewModel.eventEndType == EventEndTypes.after) {\n+ viewModel.count =\n+ int.parse(viewModel.endOccurenceController.text);\n+ }\n+ viewModel.interval =\n+ int.parse(viewModel.repeatsEveryCountController.text);\n+ viewModel.recurrenceLabel =\n+ RecurrenceUtils.getRecurrenceRuleText(\n+ viewModel.frequency,\n+ viewModel.weekDays,\n+ viewModel.interval,\n+ viewModel.count,\n+ viewModel.weekDayOccurenceInMonth,\n+ viewModel.recurrenceStartDate,\n+ viewModel.recurrenceEndDate,\n+ );\n+ });\n navigationService.pop();\n },\n child: Text(AppLocalizations.of(context)!.strictTranslate('Done')),\n@@ -72,6 +89,43 @@ class _CustomRecurrencePageState extends State {\n /// **returns**:\n /// * `Column`: Column of recurrence options widgets.\n Column _buildRecurrenceOptions(BuildContext context) {\n+ final List monthlyOptions = [\n+ RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.monthly,\n+ null,\n+ int.parse(viewModel.repeatsEveryCountController.text),\n+ int.parse(viewModel.endOccurenceController.text),\n+ null,\n+ viewModel.recurrenceStartDate,\n+ viewModel.recurrenceEndDate,\n+ ),\n+ RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.monthly,\n+ {\n+ RecurrenceUtils\n+ .weekDays[widget.model.recurrenceStartDate.weekday - 1],\n+ },\n+ int.parse(viewModel.repeatsEveryCountController.text),\n+ int.parse(viewModel.endOccurenceController.text),\n+ RecurrenceUtils.getWeekDayOccurenceInMonth(\n+ widget.model.recurrenceStartDate,\n+ ),\n+ viewModel.recurrenceStartDate,\n+ viewModel.recurrenceEndDate,\n+ ),\n+ RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.monthly,\n+ {\n+ RecurrenceUtils\n+ .weekDays[widget.model.recurrenceStartDate.weekday - 1],\n+ },\n+ int.parse(viewModel.repeatsEveryCountController.text),\n+ int.parse(viewModel.endOccurenceController.text),\n+ -1,\n+ viewModel.recurrenceStartDate,\n+ viewModel.recurrenceEndDate,\n+ ),\n+ ];\n return Column(\n crossAxisAlignment: CrossAxisAlignment.start,\n children: [\n@@ -85,11 +139,12 @@ class _CustomRecurrencePageState extends State {\n ],\n ),\n ),\n- recurrenceisDailyorYearly()\n- ? buildCustomDivider(context)\n+ (viewModel.recurrenceInterval == EventIntervals.daily ||\n+ viewModel.recurrenceInterval == EventIntervals.yearly)\n+ ? Divider(color: Theme.of(context).hintColor)\n : Column(\n children: [\n- buildCustomDivider(context),\n+ Divider(color: Theme.of(context).hintColor),\n Container(\n padding: EdgeInsets.fromLTRB(\n _sectionPadding,\n@@ -97,19 +152,57 @@ class _CustomRecurrencePageState extends State {\n 90,\n _sectionPadding,\n ),\n- child: viewModel.recurranceFrequency == Recurrance.monthly\n+ child: viewModel.recurrenceInterval ==\n+ EventIntervals.monthly\n ? Row(\n children: [\n RecurrenceFrequencyDropdown(\n model: viewModel,\n options: [\n- 'Monthly on day 3',\n- 'Monthly on the first Sunday',\n+ monthlyOptions[0],\n+ if (RecurrenceUtils\n+ .getWeekDayOccurenceInMonth(\n+ widget.model.recurrenceStartDate,\n+ ) !=\n+ 5)\n+ monthlyOptions[1],\n+ if (RecurrenceUtils.isLastOccurenceOfWeekDay(\n+ widget.model.recurrenceStartDate,\n+ ))\n+ monthlyOptions[2],\n ],\n- selectedOption: viewModel.monthlyRecurrence,\n+ selectedOption: monthlyOptions[0],\n onSelected: (String value) {\n+ Set tempWeekDays;\n+ int? tempWeekDayOccurenceInMonth;\n+ if (value == monthlyOptions[0]) {\n+ tempWeekDays = {};\n+ tempWeekDayOccurenceInMonth = null;\n+ } else if (value == monthlyOptions[1]) {\n+ tempWeekDays = {\n+ RecurrenceUtils.weekDays[widget.model\n+ .recurrenceStartDate.weekday -\n+ 1],\n+ };\n+ tempWeekDayOccurenceInMonth =\n+ RecurrenceUtils\n+ .getWeekDayOccurenceInMonth(\n+ widget.model.recurrenceStartDate,\n+ );\n+ } else {\n+ tempWeekDays = {\n+ RecurrenceUtils.weekDays[widget.model\n+ .recurrenceStartDate.weekday -\n+ 1],\n+ };\n+ tempWeekDayOccurenceInMonth = -1;\n+ }\n setState(() {\n- viewModel.monthlyRecurrence = value;\n+ viewModel.frequency = Frequency.monthly;\n+ viewModel.recurrenceLabel = value;\n+ viewModel.weekDays = tempWeekDays;\n+ viewModel.weekDayOccurenceInMonth =\n+ tempWeekDayOccurenceInMonth;\n });\n },\n ),\n@@ -125,7 +218,7 @@ class _CustomRecurrencePageState extends State {\n ],\n ),\n ),\n- buildCustomDivider(context),\n+ Divider(color: Theme.of(context).hintColor),\n ],\n ),\n Column(\n@@ -136,9 +229,7 @@ class _CustomRecurrencePageState extends State {\n EdgeInsets.only(top: _sectionPadding, left: _sectionPadding),\n child: inputFieldHeading('Ends'),\n ),\n- EventEndOptions(\n- model: viewModel,\n- ),\n+ EventEndOptions(model: viewModel),\n ],\n ),\n ],\n@@ -169,16 +260,27 @@ class _CustomRecurrencePageState extends State {\n RecurrenceFrequencyDropdown(\n model: viewModel,\n options: [\n- Recurrance.daily,\n- Recurrance.weekly,\n- Recurrance.monthly,\n- Recurrance.yearly,\n+ EventIntervals.daily,\n+ EventIntervals.weekly,\n+ EventIntervals.monthly,\n+ EventIntervals.yearly,\n ],\n- selectedOption: viewModel.recurranceFrequency,\n+ selectedOption: viewModel.recurrenceInterval,\n onSelected: (String value) {\n- setState(() {\n- viewModel.recurranceFrequency = value;\n- });\n+ switch (value) {\n+ case EventIntervals.daily:\n+ updateModel(Frequency.daily, value, null, null);\n+ break;\n+ case EventIntervals.weekly:\n+ updateModel(Frequency.weekly, value, null, null);\n+ break;\n+ case EventIntervals.monthly:\n+ updateModel(Frequency.monthly, value, null, null);\n+ break;\n+ case EventIntervals.yearly:\n+ updateModel(Frequency.yearly, value, null, null);\n+ break;\n+ }\n },\n ),\n ],\n@@ -204,29 +306,27 @@ class _CustomRecurrencePageState extends State {\n ),\n );\n \n- /// Divider with custom properties.\n+ /// Returns the updated model with the selected recurrence options.\n ///\n /// **params**:\n- /// * `context`: BuildContext of the widget.\n+ /// * `frequency`: represent the frequency of the event.\n+ /// * `value`: represent the interval of the event.\n+ /// * `weekDayOccurenceInMonth`: represent the week day occurence in month.\n+ /// * `weekDays`: represent the list of week days.\n ///\n /// **returns**:\n- /// * `Divider`: Custom divider.\n- Divider buildCustomDivider(BuildContext context) {\n- return Divider(\n- color: Theme.of(context).hintColor,\n- );\n- }\n-\n- /// Determines whether the recurrence frequency is daily or yearly.\n- ///\n- /// **params**:\n /// None\n- ///\n- /// **returns**:\n- /// * `bool`: A boolean value indicating whether the recurrence frequency is daily or yearly.\n- bool recurrenceisDailyorYearly() {\n- final widgetModel = viewModel;\n- return widgetModel.recurranceFrequency == Recurrance.daily ||\n- widgetModel.recurranceFrequency == Recurrance.yearly;\n+ void updateModel(\n+ String frequency,\n+ String value,\n+ int? weekDayOccurenceInMonth,\n+ Set? weekDays,\n+ ) {\n+ setState(() {\n+ widget.model.frequency = frequency;\n+ widget.model.recurrenceInterval = value;\n+ widget.model.weekDayOccurenceInMonth = weekDayOccurenceInMonth;\n+ widget.model.weekDays = weekDays ?? {};\n+ });\n }\n }\ndiff --git a/lib/views/after_auth_screens/events/create_event_page.dart b/lib/views/after_auth_screens/events/create_event_page.dart\nindex ba5f2a770f..99cd94457d 100644\n--- a/lib/views/after_auth_screens/events/create_event_page.dart\n+++ b/lib/views/after_auth_screens/events/create_event_page.dart\n@@ -26,8 +26,6 @@ class CreateEventPage extends StatefulWidget {\n \n /// _CreateEventPageState returns a widget for a Page to Creatxe the Event in the Organization.\n class _CreateEventPageState extends State {\n- /// Recurrence label of recurrence selection button.\n- String recurrenceLabel = Recurrance.once;\n @override\n Widget build(BuildContext context) {\n final TextStyle subtitleTextStyle =\n@@ -36,7 +34,6 @@ class _CreateEventPageState extends State {\n return BaseView(\n onModelReady: (model) => model.initialize(),\n builder: (context, model, child) {\n- print(model.recurrance);\n return Scaffold(\n // AppBar is the header of the page\n appBar: AppBar(\n@@ -44,14 +41,10 @@ class _CreateEventPageState extends State {\n elevation: 1,\n centerTitle: true,\n leading: GestureDetector(\n- onTap: () {\n- // ignore: undefined_method\n- navigationServiceLocal.pop();\n- },\n+ onTap: () => navigationServiceLocal.pop(),\n child: const Icon(Icons.close),\n ),\n title: Text(\n- // text translation to the app language.\n AppLocalizations.of(context)!.strictTranslate('Add Event'),\n style: Theme.of(context).textTheme.titleLarge!.copyWith(\n fontWeight: FontWeight.w600,\n@@ -82,7 +75,6 @@ class _CreateEventPageState extends State {\n body: Scrollbar(\n thickness: 2,\n child: SingleChildScrollView(\n- // SingleChildScrollView is a box in which a single widget can be scrolled.\n child: Padding(\n padding: const EdgeInsets.all(15),\n child: Column(\n@@ -109,10 +101,8 @@ class _CreateEventPageState extends State {\n ),\n ],\n ),\n- // If the image for the event is selected or not null.\n model.imageFile != null\n ? Container(\n- // Container for rendering the selected image\n height: 300,\n padding: const EdgeInsets.all(8.0),\n child: Stack(\n@@ -139,27 +129,109 @@ class _CreateEventPageState extends State {\n : Container(),\n const Divider(),\n CreateEventForm(\n- // CreateEventForm returns a widget of a Form for creating events.\n- // This widget is exported from `lib/views/after_auth_screens/events/create_event_form.dart`.\n model: model,\n ),\n+ SizedBox(height: SizeConfig.screenHeight! * 0.013),\n+ const Divider(),\n+ SizedBox(\n+ width: SizeConfig.screenWidth,\n+ child: Wrap(\n+ alignment: WrapAlignment.spaceBetween,\n+ children: [\n+ Row(\n+ mainAxisSize: MainAxisSize.min,\n+ children: [\n+ Text(\n+ AppLocalizations.of(context)!\n+ .strictTranslate('Keep Registerable'),\n+ style: subtitleTextStyle,\n+ ),\n+ SizedBox(\n+ width: SizeConfig.screenWidth! * 0.005,\n+ ),\n+ Switch(\n+ value: model.isRegisterableSwitch,\n+ onChanged: (value) {\n+ setState(() {\n+ model.isRegisterableSwitch = value;\n+ });\n+ },\n+ activeColor:\n+ Theme.of(context).colorScheme.primary,\n+ ),\n+ ],\n+ ),\n+ Row(\n+ mainAxisSize: MainAxisSize.min,\n+ children: [\n+ Text(\n+ AppLocalizations.of(context)!\n+ .strictTranslate('All day'),\n+ style: subtitleTextStyle,\n+ ),\n+ SizedBox(\n+ width: SizeConfig.screenWidth! * 0.005,\n+ ),\n+ Switch(\n+ // Switch to select the visibility of the event.\n+ value: model.isAllDay,\n+ onChanged: (value) {\n+ setState(() {\n+ model.isAllDay = value;\n+ });\n+ },\n+ activeColor:\n+ Theme.of(context).colorScheme.primary,\n+ ),\n+ ],\n+ ),\n+ Row(\n+ mainAxisSize: MainAxisSize.min,\n+ children: [\n+ Text(\n+ AppLocalizations.of(context)!\n+ .strictTranslate('Keep Public'),\n+ style: subtitleTextStyle,\n+ ),\n+ SizedBox(\n+ width: SizeConfig.screenWidth! * 0.005,\n+ ),\n+ Switch(\n+ value: model.isPublicSwitch,\n+ onChanged: (value) {\n+ setState(() {\n+ model.isPublicSwitch = value;\n+ });\n+ },\n+ activeColor:\n+ Theme.of(context).colorScheme.primary,\n+ ),\n+ ],\n+ ),\n+ ],\n+ ),\n+ ),\n SizedBox(\n height: SizeConfig.screenHeight! * 0.013,\n ),\n const Divider(),\n+ SizedBox(\n+ height: SizeConfig.screenHeight! * 0.013,\n+ ),\n Text(\n- // translation of the text to app language.\n- AppLocalizations.of(context)!\n- .strictTranslate('Select Start Date and Time'),\n+ AppLocalizations.of(context)!.strictTranslate(\n+ model.isAllDay\n+ ? 'Select Start Date'\n+ : 'Select Start Date and Time',\n+ ),\n style: subtitleTextStyle,\n ),\n SizedBox(\n height: SizeConfig.screenHeight! * 0.013,\n ),\n // DateTimeTile is custom widget that returns a tile to select date and time.\n- // You can learn more about DateTimeTile from [here](lib/widgets/date_time_picker.dart).\n DateTimeTile(\n- // variables and member functions initialisation.\n+ isAllDay: model.isAllDay,\n date: \"${model.eventStartDate.toLocal()}\".split(' ')[0],\n time: model.eventStartTime.format(context),\n setDate: () async {\n@@ -172,25 +244,32 @@ class _CreateEventPageState extends State {\n );\n }\n setState(() {\n- model.eventStartDate = date;\n+ if (model.eventStartDate != date) {\n+ model.eventStartDate = date;\n+ model.recurrenceStartDate = date;\n+ model.recurrenceLabel = 'Does not repeat';\n+ model.isRecurring = false;\n+ model.frequency = Frequency.weekly;\n+ model.weekDays = {};\n+ model.weekDayOccurenceInMonth = null;\n+ }\n });\n },\n setTime: () async {\n- print(model.eventStartDate);\n final time = await customTimePicker(\n initialTime: model.eventStartTime,\n );\n- // print(model.eventStartTime);\n final validationError = Validator.validateEventTime(\n time,\n model.eventEndTime,\n );\n- print('hi');\n if (validationError != null) {\n+ // coverage:ignore-start\n navigationService.showTalawaErrorSnackBar(\n 'Start time must be before end time',\n MessageType.error,\n );\n+ // coverage:ignore-end\n } else {\n setState(() {\n model.eventStartTime = time;\n@@ -202,8 +281,11 @@ class _CreateEventPageState extends State {\n height: SizeConfig.screenHeight! * 0.026,\n ),\n Text(\n- AppLocalizations.of(context)!\n- .strictTranslate('Select End Date and Time'),\n+ AppLocalizations.of(context)!.strictTranslate(\n+ model.isAllDay\n+ ? 'Select End Date'\n+ : 'Select End Date and Time',\n+ ),\n style: Theme.of(context)\n .textTheme\n .headlineSmall!\n@@ -214,20 +296,29 @@ class _CreateEventPageState extends State {\n ),\n DateTimeTile(\n key: const Key('key for test cep'),\n- date: \"${model.eventEndDate?.toLocal() ?? DateTime.now()}\"\n- .split(' ')[0],\n+ isAllDay: model.isAllDay,\n+ date: \"${model.eventEndDate.toLocal()}\".split(' ')[0],\n time: model.eventEndTime.format(context),\n setDate: () async {\n final date = await customDatePicker(\n- initialDate: model.eventEndDate ?? DateTime.now(),\n+ initialDate: model.eventEndDate,\n );\n final startDate = model.eventStartDate;\n+ // coverage:ignore-start\n if (startDate.compareTo(date) < 0) {\n setState(() {\n- model.eventEndDate = date;\n+ if (model.eventEndDate != date) {\n+ model.eventEndDate = date;\n+ model.recurrenceLabel = 'Does not repeat';\n+ model.recurrenceEndDate = null;\n+ model.isRecurring = false;\n+ model.frequency = Frequency.weekly;\n+ model.weekDays = {};\n+ model.weekDayOccurenceInMonth = null;\n+ }\n });\n+ // coverage:ignore-end\n } else {\n- // ignore: undefined_method\n navigationServiceLocal.showSnackBar(\n \"End Date cannot be after start date \",\n );\n@@ -244,10 +335,12 @@ class _CreateEventPageState extends State {\n final showSnackBar =\n navigationService.showTalawaErrorSnackBar;\n if (validationError != null) {\n+ // coverage:ignore-start\n showSnackBar(\n 'Start time must be before end time',\n MessageType.error,\n );\n+ // coverage:ignore-end\n } else {\n setState(() {\n model.eventEndTime = time;\n@@ -259,16 +352,20 @@ class _CreateEventPageState extends State {\n height: SizeConfig.screenHeight! * 0.026,\n ),\n InkWell(\n+ key: const Key('inkwell_recurrLabel'),\n child: Row(\n children: [\n const Icon(Icons.restore),\n SizedBox(\n width: SizeConfig.screenWidth! * 0.045,\n ),\n- Text(\n- AppLocalizations.of(context)!\n- .strictTranslate(recurrenceLabel),\n- style: subtitleTextStyle,\n+ Expanded(\n+ child: Text(\n+ AppLocalizations.of(context)!\n+ .strictTranslate(model.recurrenceLabel),\n+ style: subtitleTextStyle,\n+ overflow: TextOverflow.ellipsis,\n+ ),\n ),\n ],\n ),\n@@ -279,101 +376,18 @@ class _CreateEventPageState extends State {\n builder: (context) {\n return ShowRecurrenceDialog(\n model: model,\n- initialRecurrence: recurrenceLabel,\n );\n },\n );\n setState(() {\n- recurrenceLabel = selectedReccurence!;\n+ if (selectedReccurence != null) {\n+ model.recurrenceLabel = selectedReccurence;\n+ }\n });\n },\n ),\n SizedBox(height: SizeConfig.screenHeight! * 0.026),\n const Divider(),\n- SizedBox(\n- width: SizeConfig.screenWidth,\n- child: Wrap(\n- alignment: WrapAlignment.spaceBetween,\n- children: [\n- Row(\n- mainAxisSize: MainAxisSize.min,\n- children: [\n- Text(\n- AppLocalizations.of(context)!\n- .strictTranslate('Keep Registerable'),\n- style: subtitleTextStyle,\n- ),\n- SizedBox(\n- width: SizeConfig.screenWidth! * 0.005,\n- ),\n- Switch(\n- value: model.isRegisterableSwitch,\n- onChanged: (value) {\n- setState(() {\n- model.isRegisterableSwitch = value;\n- print(model.isRegisterableSwitch);\n- });\n- },\n- activeColor:\n- Theme.of(context).colorScheme.primary,\n- ),\n- ],\n- ),\n- Row(\n- mainAxisSize: MainAxisSize.min,\n- children: [\n- Text(\n- AppLocalizations.of(context)!\n- .strictTranslate('All day'),\n- style: subtitleTextStyle,\n- ),\n- SizedBox(\n- width: SizeConfig.screenWidth! * 0.005,\n- ),\n- Switch(\n- // Switch to select the visibility of the event.\n- value: model.isAllDay,\n- onChanged: (value) {\n- setState(() {\n- model.isAllDay = value;\n- print(model.isAllDay);\n- });\n- },\n- activeColor:\n- Theme.of(context).colorScheme.primary,\n- ),\n- ],\n- ),\n- Row(\n- mainAxisSize: MainAxisSize.min,\n- children: [\n- Text(\n- AppLocalizations.of(context)!\n- .strictTranslate('Keep Public'),\n- style: subtitleTextStyle,\n- ),\n- SizedBox(\n- width: SizeConfig.screenWidth! * 0.005,\n- ),\n- Switch(\n- // Switch to select the visibility of the event.\n- value: model.isPublicSwitch,\n- onChanged: (value) {\n- setState(() {\n- model.isPublicSwitch = value;\n- print(model.isPublicSwitch);\n- });\n- },\n- activeColor:\n- Theme.of(context).colorScheme.primary,\n- ),\n- ],\n- ),\n- ],\n- ),\n- ),\n- SizedBox(height: SizeConfig.screenHeight! * 0.026),\n- const Divider(),\n InkWell(\n key: const Key('inwell_cep2'),\n onTap: () {\ndiff --git a/lib/views/after_auth_screens/events/edit_event_page.dart b/lib/views/after_auth_screens/events/edit_event_page.dart\nindex 6a87ceb03b..8ea4d2a6da 100644\n--- a/lib/views/after_auth_screens/events/edit_event_page.dart\n+++ b/lib/views/after_auth_screens/events/edit_event_page.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'package:flutter/material.dart';\n import 'package:talawa/locator.dart';\n import 'package:talawa/models/events/event_model.dart';\n@@ -15,14 +12,15 @@ import 'package:talawa/widgets/event_date_time_tile.dart';\n /// EditEventPage returns a widget that has mutable state _EditEventPageState.\n class EditEventPage extends StatefulWidget {\n const EditEventPage({super.key, required this.event});\n+\n+ /// Represents event instance to be edited.\n final Event event;\n \n @override\n _EditEventPageState createState() => _EditEventPageState();\n }\n \n-/// _EditEventPageState returns a widget to edit the\n-/// event that is being posted by the current user.\n+/// _EditEventPageState returns a widget to edit the event that is being posted by the current user.\n class _EditEventPageState extends State {\n @override\n Widget build(BuildContext context) {\n@@ -33,7 +31,6 @@ class _EditEventPageState extends State {\n builder: (context, model, child) {\n return Scaffold(\n appBar: AppBar(\n- // returns a header for the page.\n backgroundColor: Theme.of(context).primaryColor,\n elevation: 1,\n centerTitle: true,\n@@ -90,8 +87,6 @@ class _EditEventPageState extends State {\n ),\n const Divider(),\n EditEventForm(\n- // EditEventForm returns a widget of a Form for editing the event.\n- // This widget is exported from `lib/views/after_auth_screens/events/edit_events_form.dart`.\n model: model,\n ),\n SizedBox(\n@@ -102,9 +97,8 @@ class _EditEventPageState extends State {\n SizedBox(\n height: SizeConfig.screenHeight! * 0.013,\n ),\n- // DateTimeTile is custom widget that returns a tile to select date and time.\n- // You can learn more about DateTimeTile from [here](lib/widgets/date_time_picker.dart).\n DateTimeTile(\n+ isAllDay: false,\n // variables and member functions initialisation.\n date: \"${model.eventStartDate.toLocal()}\".split(' ')[0],\n time: model.eventStartTime.format(context),\n@@ -120,7 +114,6 @@ class _EditEventPageState extends State {\n final time = await customTimePicker(\n initialTime: model.eventStartTime,\n );\n-\n setState(() {\n model.eventStartTime = time;\n });\n@@ -140,6 +133,7 @@ class _EditEventPageState extends State {\n height: SizeConfig.screenHeight! * 0.013,\n ),\n DateTimeTile(\n+ isAllDay: false,\n date: \"${model.eventEndDate.toLocal()}\".split(' ')[0],\n time: model.eventEndTime.format(context),\n setDate: () async {\n@@ -193,7 +187,6 @@ class _EditEventPageState extends State {\n onChanged: (value) {\n setState(() {\n model.isPublicSwitch = value;\n- print(model.isPublicSwitch);\n });\n },\n activeColor:\n@@ -216,7 +209,6 @@ class _EditEventPageState extends State {\n onChanged: (value) {\n setState(() {\n model.isRegisterableSwitch = value;\n- print(model.isRegisterableSwitch);\n });\n },\n activeColor:\ndiff --git a/lib/views/after_auth_screens/events/event_info_body.dart b/lib/views/after_auth_screens/events/event_info_body.dart\nindex c47745a1c7..65f516282a 100644\n--- a/lib/views/after_auth_screens/events/event_info_body.dart\n+++ b/lib/views/after_auth_screens/events/event_info_body.dart\n@@ -89,7 +89,7 @@ class EventInfoBody extends StatelessWidget {\n ),\n Text(\n // Display start and end date of the Event.\n- \"${event.startDate!} - ${event.endDate!}\",\n+ \"${event.startDate} - ${event.endDate}\",\n style: Theme.of(context).textTheme.bodySmall,\n ),\n const Spacer(),\n@@ -125,23 +125,24 @@ class EventInfoBody extends StatelessWidget {\n SizedBox(\n height: SizeConfig.screenHeight! * 0.011,\n ),\n- Row(\n- crossAxisAlignment: CrossAxisAlignment.start,\n- children: [\n- // display schedule icon with the start and end date of the time.\n- const Icon(\n- Icons.schedule,\n- size: 12,\n- ),\n- SizedBox(\n- width: SizeConfig.screenWidth! * 0.025,\n- ),\n- Text(\n- \"${event.startTime!} - ${event.endTime!}\",\n- style: Theme.of(context).textTheme.bodySmall,\n- ),\n- ],\n- ),\n+ if (event.startTime != null && event.endTime != null)\n+ Row(\n+ crossAxisAlignment: CrossAxisAlignment.start,\n+ children: [\n+ // display schedule icon with the start and end date of the time.\n+ const Icon(\n+ Icons.schedule,\n+ size: 12,\n+ ),\n+ SizedBox(\n+ width: SizeConfig.screenWidth! * 0.025,\n+ ),\n+ Text(\n+ \"${event.startTime} - ${event.endTime}\",\n+ style: Theme.of(context).textTheme.bodySmall,\n+ ),\n+ ],\n+ ),\n SizedBox(\n height: SizeConfig.screenHeight! * 0.011,\n ),\ndiff --git a/lib/widgets/create_recurring_event_helper_widgets.dart b/lib/widgets/create_recurring_event_helper_widgets.dart\nindex 16c31b1bcd..df3d0240eb 100644\n--- a/lib/widgets/create_recurring_event_helper_widgets.dart\n+++ b/lib/widgets/create_recurring_event_helper_widgets.dart\n@@ -137,7 +137,10 @@ class _RecurrenceFrequencyDropdownState\n child: Row(\n mainAxisAlignment: MainAxisAlignment.center,\n children: [\n- Text(widget.selectedOption),\n+ Text(\n+ widget.selectedOption,\n+ overflow: TextOverflow.ellipsis,\n+ ),\n const Icon(Icons.arrow_drop_down),\n ],\n ),\n@@ -177,16 +180,13 @@ class _EventEndOptionsState extends State {\n @override\n void initState() {\n if (widget.model.eventEndType == EventEndTypes.never) {\n- widget.model.eventEndDate = null;\n+ widget.model.recurrenceEndDate = null;\n }\n super.initState();\n }\n \n @override\n Widget build(BuildContext context) {\n- print(widget.model.eventEndType);\n- print(widget.model.recurrance);\n- print(widget.model.recurranceFrequency);\n return Column(\n children: [\n radioButton(\n@@ -194,8 +194,9 @@ class _EventEndOptionsState extends State {\n child: const Text(EventEndTypes.never),\n index: 0,\n inputAction: () {\n- widget.model.setEventEndDate(null);\n setState(() {\n+ widget.model.count = null;\n+ widget.model.recurrenceEndDate = null;\n widget.model.eventEndType = EventEndTypes.never;\n });\n },\n@@ -216,17 +217,18 @@ class _EventEndOptionsState extends State {\n onPressed: () async {\n // initially pickedDate is initialised with current end time.\n final pickedDate = await customDatePicker(\n- initialDate:\n- widget.model.eventEndOnEndDate ?? DateTime.now(),\n+ initialDate: DateTime.now(),\n );\n setState(() {\n- widget.model.eventEndOnEndDate = pickedDate;\n+ widget.model.recurrenceEndDate = pickedDate;\n widget.model.eventEndType = EventEndTypes.on;\n });\n },\n icon: Text(\n formatDate(\n- widget.model.eventEndOnEndDate.toString().split(\" \")[0],\n+ (widget.model.recurrenceEndDate ?? DateTime.now())\n+ .toString()\n+ .split(\" \")[0],\n ),\n style: widget.model.eventEndType == EventEndTypes.on\n ? TextStyle(color: Theme.of(context).dividerColor)\n@@ -244,7 +246,9 @@ class _EventEndOptionsState extends State {\n index: 1,\n inputAction: () {\n setState(() {\n+ widget.model.recurrenceEndDate = DateTime.now();\n widget.model.eventEndType = EventEndTypes.on;\n+ widget.model.count = null;\n });\n },\n ),\n@@ -266,6 +270,7 @@ class _EventEndOptionsState extends State {\n index: 2,\n inputAction: () {\n setState(() {\n+ widget.model.recurrenceEndDate = null;\n widget.model.eventEndType = EventEndTypes.after;\n });\n },\ndiff --git a/lib/widgets/custom_weekday_selector.dart b/lib/widgets/custom_weekday_selector.dart\nindex 6f60696642..f46ef92d11 100644\n--- a/lib/widgets/custom_weekday_selector.dart\n+++ b/lib/widgets/custom_weekday_selector.dart\n@@ -16,7 +16,7 @@ class CustomWeekDaySelector extends StatefulWidget {\n class _CustomWeekDaySelectorState extends State {\n @override\n Widget build(BuildContext context) {\n- final Set weekdays = widget.model.weekdays;\n+ final Set weekdays = widget.model.weekDays;\n return Container(\n child: Row(\n mainAxisAlignment: MainAxisAlignment.spaceBetween,\n@@ -30,6 +30,7 @@ class _CustomWeekDaySelectorState extends State {\n } else {\n weekdays.add(weekday);\n }\n+ widget.model.weekDays = weekdays;\n });\n },\n child: Container(\n@@ -73,19 +74,19 @@ class _CustomWeekDaySelectorState extends State {\n String _getWeekdayAbbreviation(int index) {\n switch (index) {\n case 0:\n- return Recurrance.weekdaySunday;\n+ return WeekDays.sunday;\n case 1:\n- return Recurrance.weekdayMonday;\n+ return WeekDays.monday;\n case 2:\n- return Recurrance.weekdayTuesday;\n+ return WeekDays.tuesday;\n case 3:\n- return Recurrance.weekdayWednesday;\n+ return WeekDays.wednesday;\n case 4:\n- return Recurrance.weekdayThursday;\n+ return WeekDays.thursday;\n case 5:\n- return Recurrance.weekdayFriday;\n+ return WeekDays.friday;\n case 6:\n- return Recurrance.weekdaySaturday;\n+ return WeekDays.saturday;\n default:\n return '';\n }\ndiff --git a/lib/widgets/event_card.dart b/lib/widgets/event_card.dart\nindex 676e24b6a1..6e1691b5c6 100644\n--- a/lib/widgets/event_card.dart\n+++ b/lib/widgets/event_card.dart\n@@ -122,7 +122,7 @@ class EventCard extends StatelessWidget {\n const Spacer(),\n Expanded(\n child: Text(\n- \"${event.startDate!} - ${event.endDate!}\",\n+ \"${event.startDate} - ${event.endDate}\",\n style: Theme.of(context).textTheme.bodySmall,\n ),\n ),\n@@ -131,35 +131,36 @@ class EventCard extends StatelessWidget {\n SizedBox(\n height: SizeConfig.screenHeight! * 0.006,\n ),\n- Row(\n- children: [\n- const Icon(\n- Icons.schedule,\n- size: 12,\n- ),\n- SizedBox(\n- width: SizeConfig.screenWidth! * 0.015,\n- ),\n- Text(\n- \"${event.startTime!} - ${event.endTime!}\",\n- style: Theme.of(context).textTheme.bodySmall,\n- ),\n- const Spacer(),\n- const Icon(\n- Icons.place,\n- size: 12,\n- ),\n- SizedBox(\n- child: Text(\n- event.location!.substring(\n- 0,\n- min(event.location!.length, 20),\n- ),\n+ if (event.startTime != null && event.endTime != null)\n+ Row(\n+ children: [\n+ const Icon(\n+ Icons.schedule,\n+ size: 12,\n+ ),\n+ SizedBox(\n+ width: SizeConfig.screenWidth! * 0.015,\n+ ),\n+ Text(\n+ \"${event.startTime} - ${event.endTime!}\",\n style: Theme.of(context).textTheme.bodySmall,\n ),\n- ),\n- ],\n- ),\n+ const Spacer(),\n+ const Icon(\n+ Icons.place,\n+ size: 12,\n+ ),\n+ SizedBox(\n+ child: Text(\n+ event.location!.substring(\n+ 0,\n+ min(event.location!.length, 20),\n+ ),\n+ style: Theme.of(context).textTheme.bodySmall,\n+ ),\n+ ),\n+ ],\n+ ),\n SizedBox(\n height: SizeConfig.screenHeight! * 0.013,\n ),\ndiff --git a/lib/widgets/event_date_time_tile.dart b/lib/widgets/event_date_time_tile.dart\nindex 09a86b2204..459765823a 100644\n--- a/lib/widgets/event_date_time_tile.dart\n+++ b/lib/widgets/event_date_time_tile.dart\n@@ -9,6 +9,7 @@ class DateTimeTile extends StatelessWidget {\n required this.time,\n required this.setDate,\n required this.setTime,\n+ required this.isAllDay,\n });\n \n /// Represents a date in string format.\n@@ -17,6 +18,9 @@ class DateTimeTile extends StatelessWidget {\n /// Represents a time in string format.\n final String time;\n \n+ /// Represents a boolean value indicating if the event is all day.\n+ final bool isAllDay;\n+\n /// Function that sets the date.\n final Function() setDate;\n \n@@ -52,25 +56,27 @@ class DateTimeTile extends StatelessWidget {\n style: const TextStyle(fontSize: 16),\n ),\n ),\n- const Spacer(),\n- const Icon(\n- Icons.schedule,\n- color: Color(0xff524F4F),\n- size: 19,\n- ),\n- SizedBox(\n- width: SizeConfig.screenWidth! * 0.045,\n- ),\n- InkWell(\n- key: const Key('EventDateTimeTileTime'),\n- onTap: () async {\n- setTime();\n- },\n- child: Text(\n- time,\n- style: const TextStyle(fontSize: 16),\n+ if (!isAllDay) ...[\n+ const Spacer(),\n+ const Icon(\n+ Icons.schedule,\n+ color: Color(0xff524F4F),\n+ size: 19,\n ),\n- ),\n+ SizedBox(\n+ width: SizeConfig.screenWidth! * 0.045,\n+ ),\n+ InkWell(\n+ key: const Key('EventDateTimeTileTime'),\n+ onTap: () async {\n+ setTime();\n+ },\n+ child: Text(\n+ time,\n+ style: const TextStyle(fontSize: 16),\n+ ),\n+ ),\n+ ],\n ],\n ),\n ),\ndiff --git a/lib/widgets/recurrence_dialog.dart b/lib/widgets/recurrence_dialog.dart\nindex 348460a9f9..2d35c103c1 100644\n--- a/lib/widgets/recurrence_dialog.dart\n+++ b/lib/widgets/recurrence_dialog.dart\n@@ -1,4 +1,6 @@\n import 'package:flutter/material.dart';\n+import 'package:intl/intl.dart';\n+import 'package:talawa/constants/recurrence_values.dart';\n import 'package:talawa/constants/routing_constants.dart';\n import 'package:talawa/locator.dart';\n import 'package:talawa/services/size_config.dart';\n@@ -9,78 +11,191 @@ class ShowRecurrenceDialog extends StatefulWidget {\n const ShowRecurrenceDialog({\n super.key,\n required this.model,\n- required this.initialRecurrence,\n });\n \n+ /// Instance of create event view model.\n final CreateEventViewModel model;\n- final String initialRecurrence;\n \n @override\n State createState() => _ShowRecurrenceDialogState();\n }\n \n class _ShowRecurrenceDialogState extends State {\n- static const donotRepeat = \"Does not repeat\";\n- static const dialy = \"Every day\";\n- static const weekly = \"Every week\";\n- static const monthly = \"Every month\";\n- static const yearly = \"Every year\";\n- static const custom = \"Custom...\";\n-\n- static const List _frequencies = [\n- donotRepeat,\n- dialy,\n- weekly,\n- monthly,\n- yearly,\n- custom,\n- ];\n-\n- late String _frequency;\n @override\n Widget build(BuildContext context) {\n- _frequency = widget.initialRecurrence;\n- print('widget built');\n return Dialog(\n child: SizedBox(\n- height: SizeConfig.screenHeight! * 0.5,\n+ height: SizeConfig.screenHeight! * 0.74,\n child: Column(\n mainAxisAlignment: MainAxisAlignment.center,\n children: [\n- radioButton(_frequencies[0]),\n- radioButton(_frequencies[1]),\n- radioButton(_frequencies[2]),\n- radioButton(_frequencies[3]),\n- radioButton(_frequencies[4]),\n- radioButton(_frequencies[5]),\n+ radioButtonFixText(\n+ \"Does not repeat\",\n+ // coverage:ignore-start\n+ (value) => updateModel(value!, false, null, null, null),\n+ // coverage:ignore-end\n+ ),\n+ radioButton(\n+ Frequency.daily,\n+ widget.model.interval,\n+ widget.model.count,\n+ null,\n+ null,\n+ ),\n+ radioButton(Frequency.weekly, widget.model.interval,\n+ widget.model.count, null, [\n+ RecurrenceUtils\n+ .weekDays[widget.model.recurrenceStartDate.weekday - 1],\n+ ]),\n+ radioButton(\n+ Frequency.monthly,\n+ widget.model.interval,\n+ widget.model.count,\n+ null,\n+ null,\n+ ),\n+ if (RecurrenceUtils.getWeekDayOccurenceInMonth(\n+ widget.model.recurrenceStartDate,\n+ ) !=\n+ 5)\n+ radioButton(\n+ Frequency.monthly,\n+ widget.model.interval,\n+ widget.model.count,\n+ RecurrenceUtils.getWeekDayOccurenceInMonth(\n+ widget.model.recurrenceStartDate,\n+ ),\n+ [\n+ RecurrenceUtils\n+ .weekDays[widget.model.recurrenceStartDate.weekday - 1],\n+ ]),\n+ if (RecurrenceUtils.isLastOccurenceOfWeekDay(\n+ widget.model.recurrenceStartDate,\n+ ))\n+ radioButton(Frequency.monthly, widget.model.interval,\n+ widget.model.count, -1, [\n+ RecurrenceUtils\n+ .weekDays[widget.model.recurrenceStartDate.weekday],\n+ ]),\n+ radioButton(\n+ Frequency.yearly,\n+ widget.model.interval,\n+ widget.model.count,\n+ null,\n+ null,\n+ ),\n+ radioButtonFixText(\n+ 'Monday to Friday ${widget.model.recurrenceEndDate != null ? \"until ${DateFormat('MMMM d, y').format(widget.model.recurrenceEndDate!)}\" : \"\"}',\n+ (value) => updateModel(value!, true, Frequency.weekly, null, {\n+ 'MONDAY',\n+ 'TUESDAY',\n+ 'WEDNESDAY',\n+ 'THURSDAY',\n+ 'FRIDAY',\n+ }),\n+ ),\n+ radioButtonFixText(\"Custom...\", (value) async {\n+ widget.model.isRecurring = true;\n+ await navigationService.pushScreen(\n+ Routes.customRecurrencePage,\n+ arguments: widget.model,\n+ );\n+ setState(() {\n+ Navigator.pop(context, widget.model.recurrenceLabel);\n+ });\n+ }),\n ],\n ),\n ),\n );\n }\n \n- // custom radio list tile.\n+ /// custom radio list tile.\n+ ///\n+ /// **params**:\n+ /// * `frequency`: represent the frequency of the event.\n+ /// * `interval`: represent the interval of the event.\n+ /// * `count`: represent the count of the event.\n+ /// * `weekDayOccurenceInMonth`: represent the week day occurence in month.\n+ /// * `weekDays`: represent the list of week days.\n+ ///\n+ /// **returns**:\n+ /// * `RadioListTile`: returns radio list tile.\n RadioListTile radioButton(\n String frequency,\n+ int? interval,\n+ int? count,\n+ int? weekDayOccurenceInMonth,\n+ List? weekDays,\n+ ) {\n+ final String text = RecurrenceUtils.getRecurrenceRuleText(\n+ frequency,\n+ weekDays?.toSet(),\n+ interval,\n+ count,\n+ weekDayOccurenceInMonth,\n+ widget.model.recurrenceStartDate,\n+ widget.model.recurrenceEndDate,\n+ );\n+ return RadioListTile(\n+ title: Text(text),\n+ value: text,\n+ groupValue: widget.model.recurrenceLabel,\n+ onChanged: (value) => updateModel(\n+ value!,\n+ true,\n+ frequency,\n+ weekDayOccurenceInMonth,\n+ weekDays?.map((day) => day.toUpperCase()).toSet(),\n+ ),\n+ );\n+ }\n+\n+ /// custom radio list tile with fixed the text.\n+ ///\n+ /// **params**:\n+ /// * `text`: represents the text of the radio button.\n+ /// * `onChanged`: represents the function to be called when the radio button is pressed.\n+ ///\n+ /// **returns**:\n+ /// * `RadioListTile`: returns radio list tile.\n+ RadioListTile radioButtonFixText(\n+ String text,\n+ Function(String?)? onChanged,\n ) {\n return RadioListTile(\n- title: Text(frequency),\n- value: frequency,\n- groupValue: _frequency,\n- onChanged: (value) async {\n- // navigate to custom recurrence page when pressed custom... button.\n- widget.model.recurrance = widget.model.getRecurrance(value!);\n- if (value == _frequencies[5]) {\n- await navigationService.pushScreen(\n- Routes.customRecurrencePage,\n- arguments: widget.model,\n- );\n- }\n- setState(() {\n- _frequency = value;\n- Navigator.pop(context, _frequency);\n- });\n- },\n+ title: Text(text),\n+ value: text,\n+ groupValue: widget.model.recurrenceLabel,\n+ onChanged: onChanged,\n );\n }\n+\n+ /// Returns the updated model with the selected recurrence options.\n+ ///\n+ /// **params**:\n+ /// * `value`: represents text of the selected recurrence option.\n+ /// * `isRecurring`: represent whether the event is recurring or not.\n+ /// * `frequency`: represent the frequency of the event.\n+ /// * `weekDayOccurenceInMonth`: represent the week day occurence in month.\n+ /// * `weekDays`: represent the list of week days.\n+ ///\n+ /// **returns**:\n+ /// None\n+ void updateModel(\n+ String value,\n+ bool isRecurring,\n+ String? frequency,\n+ int? weekDayOccurenceInMonth,\n+ Set? weekDays,\n+ ) {\n+ setState(() {\n+ widget.model.isRecurring = isRecurring;\n+ widget.model.recurrenceLabel = value;\n+ widget.model.weekDays = weekDays ?? {};\n+ widget.model.weekDayOccurenceInMonth = weekDayOccurenceInMonth;\n+ widget.model.frequency = frequency ?? Frequency.weekly;\n+ Navigator.pop(context, value);\n+ });\n+ }\n }\n", "test_patch": "diff --git a/test/helpers/test_helpers.mocks.dart b/test/helpers/test_helpers.mocks.dart\nindex 17c038dc22..017b54648e 100644\n--- a/test/helpers/test_helpers.mocks.dart\n+++ b/test/helpers/test_helpers.mocks.dart\n@@ -978,6 +978,51 @@ class MockGraphQLClient extends _i2.Mock implements _i3.GraphQLClient {\n ///\n /// See the documentation for Mockito's code generation for more information.\n class MockPostService extends _i2.Mock implements _i16.PostService {\n+ @override\n+ set postInfo(Map? _postInfo) => super.noSuchMethod(\n+ Invocation.setter(\n+ #postInfo,\n+ _postInfo,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ set after(String? _after) => super.noSuchMethod(\n+ Invocation.setter(\n+ #after,\n+ _after,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ set before(String? _before) => super.noSuchMethod(\n+ Invocation.setter(\n+ #before,\n+ _before,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ set first(int? _first) => super.noSuchMethod(\n+ Invocation.setter(\n+ #first,\n+ _first,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ set last(int? _last) => super.noSuchMethod(\n+ Invocation.setter(\n+ #last,\n+ _last,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n @override\n _i5.Stream> get postStream => (super.noSuchMethod(\n Invocation.getter(#postStream),\n@@ -1060,24 +1105,24 @@ class MockPostService extends _i2.Mock implements _i16.PostService {\n );\n \n @override\n- _i5.Future nextPage() => super.noSuchMethod(\n+ _i5.Future nextPage() => (super.noSuchMethod(\n Invocation.method(\n #nextPage,\n [],\n ),\n returnValue: _i5.Future.value(),\n returnValueForMissingStub: _i5.Future.value(),\n- );\n+ ) as _i5.Future);\n \n @override\n- _i5.Future previousPage() => super.noSuchMethod(\n+ _i5.Future previousPage() => (super.noSuchMethod(\n Invocation.method(\n #previousPage,\n [],\n ),\n returnValue: _i5.Future.value(),\n returnValueForMissingStub: _i5.Future.value(),\n- );\n+ ) as _i5.Future);\n }\n \n /// A class which mocks [MultiMediaPickerService].\n@@ -2831,24 +2876,8 @@ class MockOrganizationFeedViewModel extends _i2.Mock\n ),\n returnValueForMissingStub: null,\n );\n- @override\n- void nextPage() => super.noSuchMethod(\n- Invocation.method(\n- #nextPage,\n- [],\n- ),\n- returnValueForMissingStub: null,\n- );\n \n @override\n- void previousPage() => super.noSuchMethod(\n- Invocation.method(\n- #previousPage,\n- [],\n- ),\n- returnValueForMissingStub: null,\n- );\n- @override\n void initialise({bool? isTest = false}) => super.noSuchMethod(\n Invocation.method(\n #initialise,\n@@ -2922,6 +2951,24 @@ class MockOrganizationFeedViewModel extends _i2.Mock\n returnValueForMissingStub: _i5.Future.value(),\n ) as _i5.Future);\n \n+ @override\n+ void nextPage() => super.noSuchMethod(\n+ Invocation.method(\n+ #nextPage,\n+ [],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ void previousPage() => super.noSuchMethod(\n+ Invocation.method(\n+ #previousPage,\n+ [],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n @override\n void setState(_i14.ViewState? viewState) => super.noSuchMethod(\n Invocation.method(\n@@ -3447,6 +3494,19 @@ class MockCreateEventViewModel extends _i2.Mock\n returnValueForMissingStub: null,\n );\n \n+ @override\n+ DateTime get eventEndDate => (super.noSuchMethod(\n+ Invocation.getter(#eventEndDate),\n+ returnValue: _FakeDateTime_23(\n+ this,\n+ Invocation.getter(#eventEndDate),\n+ ),\n+ returnValueForMissingStub: _FakeDateTime_23(\n+ this,\n+ Invocation.getter(#eventEndDate),\n+ ),\n+ ) as DateTime);\n+\n @override\n set eventEndDate(DateTime? _eventEndDate) => super.noSuchMethod(\n Invocation.setter(\n@@ -3456,6 +3516,37 @@ class MockCreateEventViewModel extends _i2.Mock\n returnValueForMissingStub: null,\n );\n \n+ @override\n+ DateTime get recurrenceStartDate => (super.noSuchMethod(\n+ Invocation.getter(#recurrenceStartDate),\n+ returnValue: _FakeDateTime_23(\n+ this,\n+ Invocation.getter(#recurrenceStartDate),\n+ ),\n+ returnValueForMissingStub: _FakeDateTime_23(\n+ this,\n+ Invocation.getter(#recurrenceStartDate),\n+ ),\n+ ) as DateTime);\n+\n+ @override\n+ set recurrenceStartDate(DateTime? _recurrenceStartDate) => super.noSuchMethod(\n+ Invocation.setter(\n+ #recurrenceStartDate,\n+ _recurrenceStartDate,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ set recurrenceEndDate(DateTime? _recurrenceEndDate) => super.noSuchMethod(\n+ Invocation.setter(\n+ #recurrenceEndDate,\n+ _recurrenceEndDate,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n @override\n bool get isPublicSwitch => (super.noSuchMethod(\n Invocation.getter(#isPublicSwitch),\n@@ -3554,24 +3645,6 @@ class MockCreateEventViewModel extends _i2.Mock\n returnValueForMissingStub: null,\n );\n \n- @override\n- set latitude(double? _latitude) => super.noSuchMethod(\n- Invocation.setter(\n- #latitude,\n- _latitude,\n- ),\n- returnValueForMissingStub: null,\n- );\n-\n- @override\n- set longitude(double? _longitude) => super.noSuchMethod(\n- Invocation.setter(\n- #longitude,\n- _longitude,\n- ),\n- returnValueForMissingStub: null,\n- );\n-\n @override\n bool get isAllDay => (super.noSuchMethod(\n Invocation.getter(#isAllDay),\n@@ -3605,117 +3678,140 @@ class MockCreateEventViewModel extends _i2.Mock\n );\n \n @override\n- int get recurranceCount => (super.noSuchMethod(\n- Invocation.getter(#recurranceCount),\n- returnValue: 0,\n- returnValueForMissingStub: 0,\n- ) as int);\n-\n- @override\n- set recurranceCount(int? _recurranceCount) => super.noSuchMethod(\n- Invocation.setter(\n- #recurranceCount,\n- _recurranceCount,\n+ String get recurrenceInterval => (super.noSuchMethod(\n+ Invocation.getter(#recurrenceInterval),\n+ returnValue: _i25.dummyValue(\n+ this,\n+ Invocation.getter(#recurrenceInterval),\n ),\n- returnValueForMissingStub: null,\n- );\n+ returnValueForMissingStub: _i25.dummyValue(\n+ this,\n+ Invocation.getter(#recurrenceInterval),\n+ ),\n+ ) as String);\n \n @override\n- set recurrance(String? _recurrance) => super.noSuchMethod(\n+ set recurrenceInterval(String? _recurrenceInterval) => super.noSuchMethod(\n Invocation.setter(\n- #recurrance,\n- _recurrance,\n+ #recurrenceInterval,\n+ _recurrenceInterval,\n ),\n returnValueForMissingStub: null,\n );\n \n @override\n- String get recurranceFrequency => (super.noSuchMethod(\n- Invocation.getter(#recurranceFrequency),\n+ String get eventEndType => (super.noSuchMethod(\n+ Invocation.getter(#eventEndType),\n returnValue: _i25.dummyValue(\n this,\n- Invocation.getter(#recurranceFrequency),\n+ Invocation.getter(#eventEndType),\n ),\n returnValueForMissingStub: _i25.dummyValue(\n this,\n- Invocation.getter(#recurranceFrequency),\n+ Invocation.getter(#eventEndType),\n ),\n ) as String);\n \n @override\n- set recurranceFrequency(String? _recurranceFrequency) => super.noSuchMethod(\n+ set eventEndType(String? _eventEndType) => super.noSuchMethod(\n Invocation.setter(\n- #recurranceFrequency,\n- _recurranceFrequency,\n+ #eventEndType,\n+ _eventEndType,\n ),\n returnValueForMissingStub: null,\n );\n \n @override\n- String get monthlyRecurrence => (super.noSuchMethod(\n- Invocation.getter(#monthlyRecurrence),\n+ String get frequency => (super.noSuchMethod(\n+ Invocation.getter(#frequency),\n returnValue: _i25.dummyValue(\n this,\n- Invocation.getter(#monthlyRecurrence),\n+ Invocation.getter(#frequency),\n ),\n returnValueForMissingStub: _i25.dummyValue(\n this,\n- Invocation.getter(#monthlyRecurrence),\n+ Invocation.getter(#frequency),\n ),\n ) as String);\n \n @override\n- set monthlyRecurrence(String? _monthlyRecurrence) => super.noSuchMethod(\n+ set frequency(String? _frequency) => super.noSuchMethod(\n Invocation.setter(\n- #monthlyRecurrence,\n- _monthlyRecurrence,\n+ #frequency,\n+ _frequency,\n ),\n returnValueForMissingStub: null,\n );\n \n @override\n- Set get weekdays => (super.noSuchMethod(\n- Invocation.getter(#weekdays),\n+ Set get weekDays => (super.noSuchMethod(\n+ Invocation.getter(#weekDays),\n returnValue: {},\n returnValueForMissingStub: {},\n ) as Set);\n \n @override\n- set weekdays(Set? _weekdays) => super.noSuchMethod(\n+ set weekDays(Set? _weekDays) => super.noSuchMethod(\n Invocation.setter(\n- #weekdays,\n- _weekdays,\n+ #weekDays,\n+ _weekDays,\n ),\n returnValueForMissingStub: null,\n );\n \n @override\n- String get eventEndType => (super.noSuchMethod(\n- Invocation.getter(#eventEndType),\n- returnValue: _i25.dummyValue(\n- this,\n- Invocation.getter(#eventEndType),\n+ int get interval => (super.noSuchMethod(\n+ Invocation.getter(#interval),\n+ returnValue: 0,\n+ returnValueForMissingStub: 0,\n+ ) as int);\n+\n+ @override\n+ set interval(int? _interval) => super.noSuchMethod(\n+ Invocation.setter(\n+ #interval,\n+ _interval,\n ),\n- returnValueForMissingStub: _i25.dummyValue(\n- this,\n- Invocation.getter(#eventEndType),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ set count(int? _count) => super.noSuchMethod(\n+ Invocation.setter(\n+ #count,\n+ _count,\n ),\n- ) as String);\n+ returnValueForMissingStub: null,\n+ );\n \n @override\n- set eventEndType(String? _eventEndType) => super.noSuchMethod(\n+ set weekDayOccurenceInMonth(int? _weekDayOccurenceInMonth) =>\n+ super.noSuchMethod(\n Invocation.setter(\n- #eventEndType,\n- _eventEndType,\n+ #weekDayOccurenceInMonth,\n+ _weekDayOccurenceInMonth,\n ),\n returnValueForMissingStub: null,\n );\n \n @override\n- set eventEndOnEndDate(DateTime? _eventEndOnEndDate) => super.noSuchMethod(\n+ String get recurrenceLabel => (super.noSuchMethod(\n+ Invocation.getter(#recurrenceLabel),\n+ returnValue: _i25.dummyValue(\n+ this,\n+ Invocation.getter(#recurrenceLabel),\n+ ),\n+ returnValueForMissingStub: _i25.dummyValue(\n+ this,\n+ Invocation.getter(#recurrenceLabel),\n+ ),\n+ ) as String);\n+\n+ @override\n+ set recurrenceLabel(String? _recurrenceLabel) => super.noSuchMethod(\n Invocation.setter(\n- #eventEndOnEndDate,\n- _eventEndOnEndDate,\n+ #recurrenceLabel,\n+ _recurrenceLabel,\n ),\n returnValueForMissingStub: null,\n );\n@@ -3879,15 +3975,6 @@ class MockCreateEventViewModel extends _i2.Mock\n returnValueForMissingStub: null,\n );\n \n- @override\n- String? getRecurrance(String? frequency) => (super.noSuchMethod(\n- Invocation.method(\n- #getRecurrance,\n- [frequency],\n- ),\n- returnValueForMissingStub: null,\n- ) as String?);\n-\n @override\n void setState(_i14.ViewState? viewState) => super.noSuchMethod(\n Invocation.method(\ndiff --git a/test/model_tests/chat/chat_list_tile_data_model_test.dart b/test/model_tests/chat/chat_list_tile_data_model_test.dart\nindex 0bda6029e0..5571f7aecf 100644\n--- a/test/model_tests/chat/chat_list_tile_data_model_test.dart\n+++ b/test/model_tests/chat/chat_list_tile_data_model_test.dart\n@@ -1,10 +1,28 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'package:flutter_test/flutter_test.dart';\n import 'package:talawa/models/chats/chat_list_tile_data_model.dart';\n import 'package:talawa/models/chats/chat_user.dart';\n \n+/// function to check if the users are equal or not.\n+///\n+/// **params**:\n+/// * `users1`: list of ChatUser\n+/// * `users2`: list of ChatUser\n+///\n+/// **returns**:\n+/// None\n+void checkUsers(List? users1, List? users2) {\n+ if (users1 == null || users2 == null) {\n+ expect(users1, users2);\n+ return;\n+ }\n+\n+ for (int index = 0; index < users1.length; index++) {\n+ expect(users1[index].id, users2[index].id);\n+ expect(users1[index].firstName, users2[index].firstName);\n+ expect(users1[index].image, users2[index].image);\n+ }\n+}\n+\n void main() {\n group('Test ChatListTileDataModel', () {\n const int listLength = 4;\n@@ -23,29 +41,16 @@ void main() {\n );\n \n final Map json = {\n- '_id': '123',\n+ 'id': '123',\n 'users': List.generate(listLength, (index) {\n return {\n- '_id': '$index',\n+ 'id': '$index',\n 'firstName': 'First$index',\n 'image': 'Image$index',\n };\n }),\n };\n \n- void checkUsers(List? users1, List? users2) {\n- if (users1 == null || users2 == null) {\n- expect(users1, users2);\n- return;\n- }\n-\n- for (int index = 0; index < users1.length; index++) {\n- expect(users1[index].id, users2[index].id);\n- expect(users1[index].firstName, users2[index].firstName);\n- expect(users1[index].image, users2[index].image);\n- }\n- }\n-\n test('Test constructor', () {\n expect(chatListTileDataModel.id, '123');\n checkUsers(chatListTileDataModel.users, users);\n@@ -65,7 +70,7 @@ void main() {\n test('Test toJson', () {\n final Map json = chatListTileDataModel.toJson();\n \n- expect(json['_id'], chatListTileDataModel.id);\n+ expect(json['id'], chatListTileDataModel.id);\n checkUsers(json['users'] as List, chatListTileDataModel.users);\n });\n });\ndiff --git a/test/model_tests/chat/chat_user_test.dart b/test/model_tests/chat/chat_user_test.dart\nindex f6a4793a1e..50430f8304 100644\n--- a/test/model_tests/chat/chat_user_test.dart\n+++ b/test/model_tests/chat/chat_user_test.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'package:flutter_test/flutter_test.dart';\n import 'package:talawa/models/chats/chat_user.dart';\n \n@@ -13,7 +10,7 @@ void main() {\n );\n final chatUserJson = {\n 'firstName': 'Ayush',\n- '_id': null,\n+ 'id': null,\n 'image': 'random image url',\n };\n test('Test json to model', () {\ndiff --git a/test/model_tests/events/event_model_test.dart b/test/model_tests/events/event_model_test.dart\nindex 689472c0cf..2557fa085a 100644\n--- a/test/model_tests/events/event_model_test.dart\n+++ b/test/model_tests/events/event_model_test.dart\n@@ -21,15 +21,12 @@ void main() {\n title: 'for test only',\n description: 'for test only',\n location: 'for test only',\n- latitude: 1233,\n- longitude: 123,\n recurring: false,\n allDay: false,\n startDate: 'for test only',\n endDate: 'for test only',\n startTime: 'for test only',\n endTime: 'for test only',\n- recurrence: 'for test only',\n isPublic: true,\n isRegistered: true,\n isRegisterable: true,\n@@ -56,15 +53,12 @@ void main() {\n 'title': 'for test only',\n 'description': 'for test only',\n 'location': 'for test only',\n- 'latitude': 1233.00,\n- 'longitude': 123.00,\n 'recurring': false,\n 'allDay': false,\n 'startDate': 'for test only',\n 'endDate': 'for test only',\n 'startTime': 'for test only',\n 'endTime': 'for test only',\n- 'recurrence': 'for test only',\n 'isPublic': true,\n 'isRegistered': true,\n 'isRegisterable': true,\n@@ -119,14 +113,11 @@ void main() {\n );\n expect(event.attendees?[0].image, eventFromJson.attendees?[0].image);\n expect(event.location, eventFromJson.location);\n- expect(event.latitude, eventFromJson.latitude);\n- expect(event.longitude, eventFromJson.longitude);\n expect(event.recurring, eventFromJson.recurring);\n expect(event.allDay, eventFromJson.allDay);\n expect(event.startDate, eventFromJson.startDate);\n expect(event.startTime, eventFromJson.startTime);\n expect(event.endTime, eventFromJson.endTime);\n- expect(event.recurrence, eventFromJson.recurrence);\n expect(event.isPublic, eventFromJson.isPublic);\n expect(event.isRegistered, eventFromJson.isRegistered);\n expect(event.isRegisterable, eventFromJson.isRegisterable);\ndiff --git a/test/service_tests/event_service_test.dart b/test/service_tests/event_service_test.dart\nindex 76c461bbde..9da3f09356 100644\n--- a/test/service_tests/event_service_test.dart\n+++ b/test/service_tests/event_service_test.dart\n@@ -136,15 +136,12 @@ void main() {\n \"title\": \"Sample Event\",\n \"description\": \"This is a sample event description.\",\n \"location\": \"Sample Location\",\n- \"longitude\": -73.935242,\n- \"latitude\": 40.73061,\n \"recurring\": true,\n \"allDay\": false,\n \"startDate\": \"2024-01-15\",\n \"endDate\": \"2024-01-16\",\n \"startTime\": \"10:00 AM\",\n \"endTime\": \"4:00 PM\",\n- \"recurrence\": \"Weekly\",\n \"isPublic\": true,\n \"isRegistered\": true,\n \"isRegisterable\": true,\ndiff --git a/test/view_model_tests/after_auth_view_model_tests/event_view_model_tests/create_event_view_model_test.dart b/test/view_model_tests/after_auth_view_model_tests/event_view_model_tests/create_event_view_model_test.dart\nindex 7c444d6c2b..cd683b6f8c 100644\n--- a/test/view_model_tests/after_auth_view_model_tests/event_view_model_tests/create_event_view_model_test.dart\n+++ b/test/view_model_tests/after_auth_view_model_tests/event_view_model_tests/create_event_view_model_test.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'dart:io';\n \n import 'package:flutter/material.dart';\n@@ -21,12 +18,33 @@ import 'package:talawa/view_model/after_auth_view_models/event_view_models/creat\n import '../../../helpers/test_helpers.dart';\n import '../../../helpers/test_locator.dart';\n \n+/// `MockBuildContext` class represents mock instance of Build context.\n class MockBuildContext extends Mock implements BuildContext {}\n \n+/// Instance of callback function.\n class MockCallbackFunction extends Mock {\n+ /// Callback function.\n+ ///\n+ /// **params**:\n+ /// None\n+ ///\n+ /// **returns**:\n+ /// None\n void call();\n }\n \n+/// a_line_ending_with_end_punctuation.\n+///\n+/// more_info_if_required\n+///\n+/// **params**:\n+/// * `formKey`: define_the_param\n+/// * `eventTitleTextController`: define_the_param\n+/// * `eventLocationTextController`: define_the_param\n+/// * `eventDescriptionTextController`: define_the_param\n+///\n+/// **returns**:\n+/// * `Widget`: define_the_return\n Widget createApp(\n GlobalKey formKey,\n TextEditingController eventTitleTextController,\n@@ -127,9 +145,9 @@ void main() {\n model.eventStartTime.minute,\n );\n final DateTime endMoment = DateTime(\n- model.eventEndDate!.year,\n- model.eventEndDate!.month,\n- model.eventEndDate!.day,\n+ model.eventEndDate.year,\n+ model.eventEndDate.month,\n+ model.eventEndDate.day,\n model.eventEndTime.hour,\n model.eventEndTime.minute,\n );\n@@ -169,16 +187,177 @@ void main() {\n 'location': model.eventLocationTextController.text,\n 'isPublic': model.isPublicSwitch,\n 'isRegisterable': model.isRegisterableSwitch,\n- 'recurring': true,\n- 'recurrance': 'WEEKLY',\n+ 'recurring': model.isRecurring,\n 'allDay': true,\n- 'startTime': '${DateFormat('HH:mm:ss').format(startMoment)}Z',\n- 'endTime': '${DateFormat('HH:mm:ss').format(endMoment)}Z',\n+ 'startTime': model.isAllDay\n+ ? null\n+ : '${DateFormat('HH:mm:ss').format(startMoment)}Z',\n+ 'endTime': model.isAllDay\n+ ? null\n+ : '${DateFormat('HH:mm:ss').format(endMoment)}Z',\n },\n- 'recurrenceRuleData': {\n- 'frequency': 'WEEKLY',\n- 'weekDays': ['TU'],\n+ if (model.isRecurring)\n+ 'recurrenceRuleData': {\n+ 'recurrenceStartDate':\n+ DateFormat('yyyy-MM-dd').format(model.recurrenceStartDate),\n+ 'recurrenceEndDate': model.recurrenceEndDate != null\n+ ? DateFormat('yyyy-MM-dd').format(model.recurrenceEndDate!)\n+ : null,\n+ 'frequency': model.frequency,\n+ 'weekDays': (model.frequency == Frequency.weekly ||\n+ (model.frequency == Frequency.monthly &&\n+ model.weekDayOccurenceInMonth != null))\n+ ? model.weekDays.toList()\n+ : null,\n+ 'interval': model.interval,\n+ 'count': model.count,\n+ 'weekDayOccurenceInMonth': model.weekDayOccurenceInMonth,\n+ },\n+ },\n+ ),\n+ ).thenAnswer((_) async {\n+ return true;\n+ });\n+\n+ await model.createEvent();\n+\n+ verify(\n+ databaseFunctions.gqlAuthMutation(\n+ EventQueries().addEvent(),\n+ variables: {\n+ 'data': {\n+ 'startDate': DateFormat('yyyy-MM-dd').format(startMoment),\n+ 'endDate': DateFormat('yyyy-MM-dd').format(endMoment),\n+ 'organizationId': 'XYZ',\n+ 'title': model.eventTitleTextController.text,\n+ 'description': model.eventDescriptionTextController.text,\n+ 'location': model.eventLocationTextController.text,\n+ 'isPublic': model.isPublicSwitch,\n+ 'isRegisterable': model.isRegisterableSwitch,\n+ 'recurring': model.isRecurring,\n+ 'allDay': true,\n+ 'startTime': model.isAllDay\n+ ? null\n+ : '${DateFormat('HH:mm:ss').format(startMoment)}Z',\n+ 'endTime': model.isAllDay\n+ ? null\n+ : '${DateFormat('HH:mm:ss').format(endMoment)}Z',\n },\n+ if (model.isRecurring)\n+ 'recurrenceRuleData': {\n+ 'recurrenceStartDate':\n+ DateFormat('yyyy-MM-dd').format(model.recurrenceStartDate),\n+ 'recurrenceEndDate': model.recurrenceEndDate != null\n+ ? DateFormat('yyyy-MM-dd').format(model.recurrenceEndDate!)\n+ : null,\n+ 'frequency': model.frequency,\n+ 'weekDays': (model.frequency == Frequency.weekly ||\n+ (model.frequency == Frequency.monthly &&\n+ model.weekDayOccurenceInMonth != null))\n+ ? model.weekDays.toList()\n+ : null,\n+ 'interval': model.interval,\n+ 'count': model.count,\n+ 'weekDayOccurenceInMonth': model.weekDayOccurenceInMonth,\n+ },\n+ },\n+ ),\n+ );\n+\n+ verify(navigationService.pop());\n+ });\n+\n+ testWidgets(\"testing createEvent function (Recurring)\", (tester) async {\n+ final model = CreateEventViewModel();\n+ model.initialize();\n+ await tester.pumpWidget(\n+ createApp(\n+ model.formKey,\n+ model.eventTitleTextController,\n+ model.eventLocationTextController,\n+ model.eventDescriptionTextController,\n+ ),\n+ );\n+\n+ final DateTime startMoment = DateTime(\n+ model.eventStartDate.year,\n+ model.eventStartDate.month,\n+ model.eventStartDate.day,\n+ model.eventStartTime.hour,\n+ model.eventStartTime.minute,\n+ );\n+\n+ final DateTime endMoment = DateTime(\n+ model.eventEndDate.year,\n+ model.eventEndDate.month,\n+ model.eventEndDate.day,\n+ model.eventEndTime.hour,\n+ model.eventEndTime.minute,\n+ );\n+\n+ model.isRecurring = true;\n+\n+ await tester.pump();\n+ await tester.pumpAndSettle();\n+\n+ await tester.enterText(\n+ find.byType(TextFormField).first,\n+ 'fakeEventTitle',\n+ );\n+ await tester.enterText(\n+ find.byType(TextFormField).last,\n+ 'fakeEventDescription',\n+ );\n+ await tester.enterText(\n+ find.byType(TextFormField).at(1),\n+ 'fakeEventLocation',\n+ );\n+ databaseFunctions.init();\n+\n+ when(databaseFunctions.refreshAccessToken(\"testtoken\"))\n+ .thenAnswer((realInvocation) async {\n+ return true;\n+ });\n+\n+ when(\n+ databaseFunctions.gqlAuthMutation(\n+ EventQueries().addEvent(),\n+ variables: {\n+ 'data': {\n+ 'startDate': DateFormat('yyyy-MM-dd').format(startMoment),\n+ 'endDate': DateFormat('yyyy-MM-dd').format(endMoment),\n+ 'organizationId': 'XYZ',\n+ 'title': model.eventTitleTextController.text,\n+ 'description': model.eventDescriptionTextController.text,\n+ 'location': model.eventLocationTextController.text,\n+ 'isPublic': model.isPublicSwitch,\n+ 'isRegisterable': model.isRegisterableSwitch,\n+ 'recurring': model.isRecurring,\n+ 'allDay': true,\n+ 'startTime': model.isAllDay\n+ ? null\n+ : '${DateFormat('HH:mm:ss').format(startMoment)}Z',\n+ 'endTime': model.isAllDay\n+ ? null\n+ : '${DateFormat('HH:mm:ss').format(endMoment)}Z',\n+ },\n+ if (model.isRecurring)\n+ 'recurrenceRuleData': {\n+ 'recurrenceStartDate':\n+ DateFormat('yyyy-MM-dd').format(model.recurrenceStartDate),\n+ 'recurrenceEndDate': model.recurrenceEndDate != null\n+ ? DateFormat('yyyy-MM-dd').format(model.recurrenceEndDate!)\n+ : null,\n+ 'frequency': model.frequency,\n+ 'weekDays': (model.frequency == Frequency.weekly ||\n+ (model.frequency == Frequency.monthly &&\n+ model.weekDayOccurenceInMonth != null))\n+ ? model.weekDays.toList()\n+ : null,\n+ 'interval': model.interval,\n+ 'count': model.count,\n+ 'weekDayOccurenceInMonth': model.weekDayOccurenceInMonth,\n+ },\n },\n ),\n ).thenAnswer((_) async {\n@@ -200,16 +379,83 @@ void main() {\n 'location': model.eventLocationTextController.text,\n 'isPublic': model.isPublicSwitch,\n 'isRegisterable': model.isRegisterableSwitch,\n- 'recurring': true,\n- 'recurrance': 'WEEKLY',\n+ 'recurring': model.isRecurring,\n 'allDay': true,\n- 'startTime': '${DateFormat('HH:mm:ss').format(startMoment)}Z',\n- 'endTime': '${DateFormat('HH:mm:ss').format(endMoment)}Z',\n+ 'startTime': model.isAllDay\n+ ? null\n+ : '${DateFormat('HH:mm:ss').format(startMoment)}Z',\n+ 'endTime': model.isAllDay\n+ ? null\n+ : '${DateFormat('HH:mm:ss').format(endMoment)}Z',\n },\n- 'recurrenceRuleData': {\n- 'frequency': 'WEEKLY',\n- 'weekDays': ['TU'],\n+ if (model.isRecurring)\n+ 'recurrenceRuleData': {\n+ 'recurrenceStartDate':\n+ DateFormat('yyyy-MM-dd').format(model.recurrenceStartDate),\n+ 'recurrenceEndDate': model.recurrenceEndDate != null\n+ ? DateFormat('yyyy-MM-dd').format(model.recurrenceEndDate!)\n+ : null,\n+ 'frequency': model.frequency,\n+ 'weekDays': (model.frequency == Frequency.weekly ||\n+ (model.frequency == Frequency.monthly &&\n+ model.weekDayOccurenceInMonth != null))\n+ ? model.weekDays.toList()\n+ : null,\n+ 'interval': model.interval,\n+ 'count': model.count,\n+ 'weekDayOccurenceInMonth': model.weekDayOccurenceInMonth,\n+ },\n+ },\n+ ),\n+ );\n+\n+ verify(navigationService.pop());\n+\n+ model.recurrenceEndDate = DateTime.now();\n+ model.frequency = Frequency.monthly;\n+ model.weekDayOccurenceInMonth = 1;\n+\n+ await model.createEvent();\n+\n+ verify(\n+ databaseFunctions.gqlAuthMutation(\n+ EventQueries().addEvent(),\n+ variables: {\n+ 'data': {\n+ 'startDate': DateFormat('yyyy-MM-dd').format(startMoment),\n+ 'endDate': DateFormat('yyyy-MM-dd').format(endMoment),\n+ 'organizationId': 'XYZ',\n+ 'title': model.eventTitleTextController.text,\n+ 'description': model.eventDescriptionTextController.text,\n+ 'location': model.eventLocationTextController.text,\n+ 'isPublic': model.isPublicSwitch,\n+ 'isRegisterable': model.isRegisterableSwitch,\n+ 'recurring': model.isRecurring,\n+ 'allDay': true,\n+ 'startTime': model.isAllDay\n+ ? null\n+ : '${DateFormat('HH:mm:ss').format(startMoment)}Z',\n+ 'endTime': model.isAllDay\n+ ? null\n+ : '${DateFormat('HH:mm:ss').format(endMoment)}Z',\n },\n+ if (model.isRecurring)\n+ 'recurrenceRuleData': {\n+ 'recurrenceStartDate':\n+ DateFormat('yyyy-MM-dd').format(model.recurrenceStartDate),\n+ 'recurrenceEndDate': model.recurrenceEndDate != null\n+ ? DateFormat('yyyy-MM-dd').format(model.recurrenceEndDate!)\n+ : null,\n+ 'frequency': model.frequency,\n+ 'weekDays': (model.frequency == Frequency.weekly ||\n+ (model.frequency == Frequency.monthly &&\n+ model.weekDayOccurenceInMonth != null))\n+ ? model.weekDays.toList()\n+ : null,\n+ 'interval': model.interval,\n+ 'count': model.count,\n+ 'weekDayOccurenceInMonth': model.weekDayOccurenceInMonth,\n+ },\n },\n ),\n );\n@@ -313,12 +559,19 @@ void main() {\n expect(isMemberFound, false);\n });\n \n- test('getRecurrence method', () {\n+ test('setEventEndDate should set the event end date and notify listeners',\n+ () {\n final model = CreateEventViewModel();\n model.initialize();\n- expect(model.getRecurrance(Recurrance.monthly), 'MONTHLY');\n- expect(model.getRecurrance(Recurrance.yearly), 'YEARLY');\n- expect(model.getRecurrance(Recurrance.once), null);\n+\n+ final newDate = DateTime.now().add(const Duration(days: 1));\n+ final notifyListenerCallback = MockCallbackFunction();\n+ model.addListener(notifyListenerCallback);\n+\n+ model.setEventEndDate(newDate);\n+\n+ expect(model.eventEndDate, newDate);\n+ verify(notifyListenerCallback()).called(1);\n });\n });\n }\ndiff --git a/test/view_model_tests/after_auth_view_model_tests/event_view_model_tests/explore_events_view_model_test.dart b/test/view_model_tests/after_auth_view_model_tests/event_view_model_tests/explore_events_view_model_test.dart\nindex 7c157e70be..294e7e79a3 100644\n--- a/test/view_model_tests/after_auth_view_model_tests/event_view_model_tests/explore_events_view_model_test.dart\n+++ b/test/view_model_tests/after_auth_view_model_tests/event_view_model_tests/explore_events_view_model_test.dart\n@@ -75,7 +75,6 @@ void main() {\n endDate: '2024-01-14',\n startTime: '08:01:00.000Z',\n endTime: '08:50:00.000Z',\n- recurrence: \"none\",\n creator: User(id: 'Test Id'),\n isPublic: true,\n isRegistered: true,\ndiff --git a/test/views/after_auth_screens/events/create_custom_recurring_event_test.dart b/test/views/after_auth_screens/events/create_custom_recurring_event_test.dart\nindex b4997ad425..9043883d4b 100644\n--- a/test/views/after_auth_screens/events/create_custom_recurring_event_test.dart\n+++ b/test/views/after_auth_screens/events/create_custom_recurring_event_test.dart\n@@ -21,6 +21,7 @@ import '../../../helpers/test_locator.dart';\n /// **params**:\n /// * `themeMode`: ThemeMode\n /// * `theme`: ThemeData of App\n+/// * `model`: CreateEventViewModel\n ///\n /// **returns**:\n /// * `Widget`: Event Screen Widget\n@@ -65,6 +66,125 @@ void main() {\n // tearDown(() {\n // unregisterServices();\n // });\n+\n+ group(\"RecurrenceUtils\", () {\n+ test(\"getRecurrenceRuleText for Frequency Daily\", () {\n+ final ruleText = RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.daily,\n+ null,\n+ 2,\n+ null,\n+ null,\n+ DateTime(2024, 1, 1),\n+ null,\n+ );\n+ expect(ruleText, 'Every 2 days');\n+\n+ final ruleText2 = RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.daily,\n+ null,\n+ 1,\n+ null,\n+ null,\n+ DateTime(2024, 1, 1),\n+ null,\n+ );\n+ expect(ruleText2, 'Daily');\n+ });\n+\n+ test(\"getRecurrenceRuleText for Frequency Weekly\", () {\n+ final ruleText = RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.weekly,\n+ {'MONDAY'},\n+ 2,\n+ null,\n+ null,\n+ DateTime(2024, 1, 1),\n+ null,\n+ );\n+ expect(ruleText, 'Every 2 weeks on Monday');\n+\n+ final ruleText2 = RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.weekly,\n+ {'MONDAY'},\n+ 1,\n+ null,\n+ null,\n+ DateTime(2024, 1, 1),\n+ null,\n+ );\n+ expect(ruleText2, 'Weekly on Monday');\n+ });\n+\n+ test(\"getRecurrenceRuleText for Frequency Monthly\", () {\n+ final ruleText = RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.monthly,\n+ null,\n+ 2,\n+ null,\n+ 2,\n+ DateTime(2024, 1, 1),\n+ null,\n+ );\n+ expect(ruleText, 'Every 2 months on Second Monday');\n+\n+ final ruleText2 = RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.monthly,\n+ null,\n+ 1,\n+ null,\n+ null,\n+ DateTime(2024, 1, 1),\n+ null,\n+ );\n+ expect(ruleText2, 'Monthly on Day 1');\n+ });\n+\n+ test(\"getRecurrenceRuleText for Frequency Yearly\", () {\n+ final ruleText = RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.yearly,\n+ null,\n+ 3,\n+ null,\n+ null,\n+ DateTime(2024, 1, 1),\n+ null,\n+ );\n+ expect(ruleText, 'Every 3 years on January 1');\n+\n+ final ruleText2 = RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.yearly,\n+ null,\n+ 1,\n+ null,\n+ null,\n+ DateTime(2024, 1, 1),\n+ null,\n+ );\n+ expect(ruleText2, 'Annually on January 1');\n+ });\n+\n+ test('getWeekDaysString formats string correctly', () {\n+ final weekDaysString = RecurrenceUtils.getWeekDaysString([\n+ WeekDays.monday,\n+ WeekDays.tuesday,\n+ WeekDays.wednesday,\n+ ]);\n+ expect(weekDaysString, 'Monday, Tuesday & Wednesday');\n+ });\n+\n+ test('isLastOccurenceOfWeekDay returns true for last occurrence', () {\n+ final date = DateTime(2022, 1, 31); // Last Monday of January 2022\n+ final isLastOccurrence = RecurrenceUtils.isLastOccurenceOfWeekDay(date);\n+ expect(isLastOccurrence, true);\n+ });\n+\n+ test('isLastOccurenceOfWeekDay returns false for not last occurrence', () {\n+ final date = DateTime(2022, 1, 24); // Not the last Monday of January 2022\n+ final isLastOccurrence = RecurrenceUtils.isLastOccurenceOfWeekDay(date);\n+ expect(isLastOccurrence, false);\n+ });\n+ });\n group('Test custom recurrence page.', () {\n testWidgets('Appbar is being rendered as expected.', (tester) async {\n await tester.pumpWidget(\n@@ -72,17 +192,11 @@ void main() {\n theme: TalawaTheme.darkTheme,\n ),\n );\n- await tester.pump();\n-\n+ await tester.pumpAndSettle();\n final appBarFinder = find.byType(AppBar);\n \n- // verify if AppBar renders.\n expect(appBarFinder, findsOne);\n-\n- // Verify if the AppBar renders with the correct title\n expect(find.text('Custom recurrence'), findsOneWidget);\n-\n- // Verify if the Done button is present\n expect(find.text('Done'), findsOneWidget);\n });\n \n@@ -93,9 +207,7 @@ void main() {\n ),\n );\n await tester.pump();\n-\n final customDividerFinder = find.byType(Divider);\n-\n expect(customDividerFinder, findsNWidgets(2));\n });\n \n@@ -127,10 +239,12 @@ void main() {\n expect(customTextFieldFinder, findsNWidgets(2));\n });\n \n- testWidgets('section1InputFields', (tester) async {\n+ testWidgets('Check functionality of Interval Frequency', (tester) async {\n+ final model = CreateEventViewModel();\n await tester.pumpWidget(\n createCustomRecurrenceScreen(\n theme: TalawaTheme.darkTheme,\n+ model: model,\n ),\n );\n await tester.pump();\n@@ -153,7 +267,7 @@ void main() {\n // Test RecurrenceFrequencyDropdown\n expect(find.text(\"week\"), findsOne);\n \n- final popupMenuButton = find.byType(PopupMenuButton);\n+ final popupMenuButton = find.byType(PopupMenuButton).first;\n \n await tester.tap(popupMenuButton);\n await tester.pumpAndSettle();\n@@ -162,26 +276,138 @@ void main() {\n expect(find.text(\"month\"), findsOne);\n expect(find.text(\"year\"), findsOne);\n \n- // Test dropdown selection working.\n- await tester.tap(find.text(\"month\"));\n+ // check functionality of interval frequency day\n+ await tester.tap(find.text(EventIntervals.daily));\n+ await tester.pumpAndSettle();\n+\n+ expect(model.frequency, Frequency.daily);\n+ expect(model.recurrenceInterval, EventIntervals.daily);\n+ expect(model.weekDayOccurenceInMonth, null);\n+ expect(model.weekDays, []);\n+\n+ // check functionality of interval frequency week\n+ await tester.tap(popupMenuButton);\n+ await tester.pumpAndSettle();\n+ await tester.tap(find.text(EventIntervals.weekly));\n+ await tester.pumpAndSettle();\n+\n+ expect(model.frequency, Frequency.weekly);\n+ expect(model.recurrenceInterval, EventIntervals.weekly);\n+ expect(model.weekDayOccurenceInMonth, null);\n+ expect(model.weekDays, []);\n+\n+ // check functionality of interval frequency week\n+ await tester.tap(popupMenuButton);\n await tester.pumpAndSettle();\n+ await tester.tap(find.text(EventIntervals.monthly));\n+ await tester.pumpAndSettle();\n+\n+ expect(model.frequency, Frequency.monthly);\n+ expect(model.recurrenceInterval, EventIntervals.monthly);\n+ expect(model.weekDayOccurenceInMonth, null);\n+ expect(model.weekDays, []);\n+\n+ // check functionality of interval frequency year\n+ await tester.tap(popupMenuButton);\n+ await tester.pumpAndSettle();\n+ await tester.tap(find.text(EventIntervals.yearly));\n+ await tester.pumpAndSettle();\n+\n+ expect(model.frequency, Frequency.yearly);\n+ expect(model.recurrenceInterval, EventIntervals.yearly);\n+ expect(model.weekDayOccurenceInMonth, null);\n+ expect(model.weekDays, []);\n+ });\n+\n+ testWidgets(\"Dropdown for Monthly frequency\", (tester) async {\n+ final model = CreateEventViewModel();\n+ model.recurrenceStartDate = DateTime(2023, 02, 28);\n+ await tester.pumpWidget(\n+ createCustomRecurrenceScreen(\n+ theme: TalawaTheme.darkTheme,\n+ model: model,\n+ ),\n+ );\n+ await tester.pump();\n \n+ final frequencyDropdown = find.byType(PopupMenuButton).first;\n+ await tester.tap(frequencyDropdown);\n+ await tester.pumpAndSettle();\n+\n+ expect(find.text(\"day\"), findsOne);\n expect(find.text(\"month\"), findsOne);\n+ expect(find.text(\"year\"), findsOne);\n+\n+ // select interval frequency as month\n+ await tester.tap(find.text(\"month\"));\n+ await tester.pumpAndSettle();\n \n- // check if monthly recurrence dropdown shows up.\n- await tester.tap(find.text('Monthly on day 3'));\n+ await tester.tap(find.byType(PopupMenuButton).last);\n await tester.pumpAndSettle();\n- await tester.tap(find.text('Monthly on day 3').last);\n+\n+ // check all the functionality of dropdown option shown on isLastDayOccurence is true (monthlyOption[2])\n+ final monthlyRecurrenceLabel1 = RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.monthly,\n+ {\n+ RecurrenceUtils.weekDays[model.recurrenceStartDate.weekday - 1],\n+ },\n+ int.parse(model.repeatsEveryCountController.text),\n+ int.parse(model.endOccurenceController.text),\n+ -1,\n+ model.recurrenceStartDate,\n+ model.recurrenceEndDate,\n+ );\n+ expect(\n+ find.text(monthlyRecurrenceLabel1),\n+ findsOne,\n+ );\n+\n+ await tester.tap(find.text(monthlyRecurrenceLabel1));\n await tester.pumpAndSettle();\n \n- // check if interval UI's middle part dissappears\n- // when clicked on day/year.\n- await tester.tap(find.text('month'));\n+ expect(model.frequency, Frequency.monthly);\n+ expect(model.recurrenceLabel, monthlyRecurrenceLabel1);\n+ expect(model.weekDayOccurenceInMonth, -1);\n+ expect(model.weekDays, {\n+ RecurrenceUtils.weekDays[model.recurrenceStartDate.weekday - 1],\n+ });\n+\n+ // check all the functionality of dropdown option shown when weekDayOccurence~=5 (monthlyOption[1])\n+ await tester.tap(find.byType(PopupMenuButton).last);\n await tester.pumpAndSettle();\n- await tester.tap(find.text('year'));\n+\n+ final monthlyRecurrenceLabel2 = RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.monthly,\n+ {\n+ RecurrenceUtils.weekDays[model.recurrenceStartDate.weekday - 1],\n+ },\n+ int.parse(model.repeatsEveryCountController.text),\n+ int.parse(model.endOccurenceController.text),\n+ RecurrenceUtils.getWeekDayOccurenceInMonth(\n+ model.recurrenceStartDate,\n+ ),\n+ model.recurrenceStartDate,\n+ model.recurrenceEndDate,\n+ );\n+ expect(\n+ find.text(monthlyRecurrenceLabel2),\n+ findsOne,\n+ );\n+\n+ await tester.tap(find.text(monthlyRecurrenceLabel2));\n await tester.pumpAndSettle();\n \n- expect(find.text('Monthly on day 3'), findsNothing);\n+ expect(model.frequency, Frequency.monthly);\n+ expect(model.recurrenceLabel, monthlyRecurrenceLabel2);\n+ expect(\n+ model.weekDayOccurenceInMonth,\n+ RecurrenceUtils.getWeekDayOccurenceInMonth(\n+ model.recurrenceStartDate,\n+ ),\n+ );\n+ expect(model.weekDays, {\n+ RecurrenceUtils.weekDays[model.recurrenceStartDate.weekday - 1],\n+ });\n });\n \n testWidgets('CustomWeekDaySelector', (tester) async {\n@@ -191,10 +417,8 @@ void main() {\n await tester.pumpWidget(widget);\n await tester.pump();\n \n- // Test widget rendering.\n expect(find.byType(CustomWeekDaySelector), findsOne);\n \n- // Test widget functionality.\n await tester.tap(find.text(\"M\"));\n await tester.pumpAndSettle();\n await tester.tap(find.text(\"W\"));\n@@ -250,13 +474,13 @@ void main() {\n \n expect(find.byType(DatePickerDialog), findsNothing);\n \n- await tester.tap(find.text('Never'));\n+ await tester.tap(find.text('never'));\n await tester.pumpAndSettle();\n \n expect(model.eventEndType, EventEndTypes.never);\n- expect(model.eventEndDate, null);\n+ expect(model.recurrenceEndDate, null);\n \n- await tester.tap(find.text('On'));\n+ await tester.tap(find.text('on'));\n await tester.pumpAndSettle();\n \n expect(model.eventEndType, EventEndTypes.on);\n@@ -274,17 +498,15 @@ void main() {\n await tester.tap(find.text('Done'));\n await tester.pumpAndSettle();\n \n- expect(model.eventEndDate, null);\n+ expect(model.recurrenceEndDate, null);\n \n- await tester.tap(find.text('On'));\n+ await tester.tap(find.text('on'));\n await tester.pumpAndSettle();\n \n await tester.tap(find.text('Done'));\n await tester.pumpAndSettle();\n \n- expect(model.eventEndDate, model.eventEndOnEndDate);\n-\n- await tester.tap(find.text('After'));\n+ await tester.tap(find.text('after'));\n await tester.pumpAndSettle();\n \n final afterTextField = find.byType(CustomTextField).last;\ndiff --git a/test/views/after_auth_screens/events/create_event_page_test.dart b/test/views/after_auth_screens/events/create_event_page_test.dart\nindex 5d5f5eb7a3..c947afb148 100644\n--- a/test/views/after_auth_screens/events/create_event_page_test.dart\n+++ b/test/views/after_auth_screens/events/create_event_page_test.dart\n@@ -1,5 +1,4 @@\n import 'dart:io';\n-\n import 'package:flutter/material.dart';\n import 'package:flutter_localizations/flutter_localizations.dart';\n import 'package:flutter_test/flutter_test.dart';\n@@ -21,11 +20,22 @@ import '../../../helpers/test_helpers.dart';\n import '../../../helpers/test_locator.dart';\n import '../../../widget_tests/after_auth_screens/events/create_event_form_test.dart';\n \n+/// Mock class instance of CallbackFunction.\n class MockCallbackFunction extends Mock {\n+ /// Mock function call.\n+ ///\n+ /// **params**:\n+ /// None\n+ ///\n+ /// **returns**:\n+ /// None\n void call();\n }\n \n+/// mock instance for setDateCallback.\n final setDateCallback = MockCallbackFunction();\n+\n+/// mock instance for setTimeCallback.\n final setTimeCallback = MockCallbackFunction();\n \n /// Creates a EventScreen for tests.\n@@ -79,7 +89,7 @@ void main() {\n tearDown(() {\n unregisterServices();\n });\n- group('testing', () {\n+ group('testing -> CreateEventPage', () {\n testWidgets(\"Checking tap Inkwell for setDate 1 datetime\", (tester) async {\n await tester.pumpWidget(\n createEventScreen(\n@@ -87,25 +97,26 @@ void main() {\n theme: TalawaTheme.darkTheme,\n ),\n );\n+\n+ await tester.pumpAndSettle();\n+\n+ final switches = find.descendant(\n+ of: find.byType(Row),\n+ matching: find.byType(Switch),\n+ );\n+ expect(switches, findsNWidgets(3));\n+ expect((tester.widgetList(switches).toList()[0] as Switch).value, true);\n+ await tester.ensureVisible(switches.at(0));\n+ await tester.tap(switches.at(1));\n+\n await tester.pump();\n final inkwellFinder = find.byType(InkWell);\n expect(inkwellFinder, findsNWidgets(8));\n- // tester.allElements.forEach((element) {\n- // print(element);\n- // });\n \n- ///returning the file variable to the\n- ///result of function multimediaPickerService.getPhotoFromGallery\n- ///when this function is called in the\n- ///view model of add_post_page.\n final file = File('fakePath');\n \n- /// using the new instance of multimediaPickerService\n- /// so that when statement can be used again,\n- /// else it gives null point exception\n final multimediaPickerService = locator();\n \n- /// when is function provided by mockito lib\n when(multimediaPickerService.getPhotoFromGallery(camera: false))\n .thenAnswer((_) async {\n return file;\n@@ -122,22 +133,25 @@ void main() {\n theme: TalawaTheme.darkTheme,\n ),\n );\n+ await tester.pumpAndSettle();\n+\n+ final switches = find.descendant(\n+ of: find.byType(Row),\n+ matching: find.byType(Switch),\n+ );\n+ expect(switches, findsNWidgets(3));\n+ expect((tester.widgetList(switches).toList()[0] as Switch).value, true);\n+ await tester.ensureVisible(switches.at(0));\n+ await tester.tap(switches.at(1));\n+\n await tester.pump();\n final inkwellFinder = find.byType(InkWell);\n expect(inkwellFinder, findsNWidgets(8));\n \n- ///returning the file variable to the\n- ///result of function multimediaPickerService.getPhotoFromGallery\n- ///when this function is called in the\n- ///view model of add_post_page.\n final file = File('fakePath');\n \n- /// using the new instance of multimediaPickerService\n- /// so that when statement can be used again,\n- /// else it gives null point exception\n final multimediaPickerService = locator();\n \n- /// when is function provided by mockito lib\n when(multimediaPickerService.getPhotoFromGallery(camera: false))\n .thenAnswer((_) async {\n return file;\n@@ -174,31 +188,13 @@ void main() {\n );\n await tester.pumpAndSettle();\n \n- const List frequencies = [\n- \"Does not repeat\",\n- \"Every day\",\n- \"Every week\",\n- \"Every month\",\n- \"Every year\",\n- \"Custom...\",\n- ];\n-\n- String prev = frequencies[0];\n- for (int i = 1; i < 5; i++) {\n- expect(find.text(prev), findsAny);\n- await tester.tap(find.text(prev));\n- await tester.pumpAndSettle();\n- await tester.tap(find.text(frequencies[i]).last);\n- await tester.pumpAndSettle();\n- expect(find.byType(ShowRecurrenceDialog), findsNothing);\n- expect(find.text(frequencies[i]), findsOneWidget);\n- prev = frequencies[i];\n- }\n+ const String prev = \"Does not repeat\";\n \n expect(find.text(prev), findsAny);\n+ await tester.ensureVisible(find.byKey(const Key(\"inkwell_recurrLabel\")));\n await tester.tap(find.text(prev));\n await tester.pumpAndSettle();\n- await tester.tap(find.text(frequencies[5]));\n+ await tester.tap(find.text(\"Custom...\"));\n await tester.pumpAndSettle();\n \n expect(find.byType(ShowRecurrenceDialog), findsNothing);\n@@ -211,22 +207,26 @@ void main() {\n theme: TalawaTheme.darkTheme,\n ),\n );\n+\n+ await tester.pumpAndSettle();\n+\n+ final switches = find.descendant(\n+ of: find.byType(Row),\n+ matching: find.byType(Switch),\n+ );\n+ expect(switches, findsNWidgets(3));\n+ expect((tester.widgetList(switches).toList()[0] as Switch).value, true);\n+ await tester.ensureVisible(switches.at(0));\n+ await tester.tap(switches.at(1));\n+\n await tester.pump();\n final inkwellFinder = find.byType(InkWell);\n expect(inkwellFinder, findsNWidgets(8));\n \n- ///returning the file variable to the\n- ///result of function multimediaPickerService.getPhotoFromGallery\n- ///when this function is called in the\n- ///view model of add_post_page.\n final file = File('fakePath');\n \n- /// using the new instance of multimediaPickerService\n- /// so that when statement can be used again,\n- /// else it gives null point exception\n final multimediaPickerService = locator();\n \n- /// when is function provided by mockito lib\n when(multimediaPickerService.getPhotoFromGallery(camera: false))\n .thenAnswer((_) async {\n return file;\n@@ -243,25 +243,26 @@ void main() {\n theme: TalawaTheme.darkTheme,\n ),\n );\n+\n+ await tester.pumpAndSettle();\n+\n+ final switches = find.descendant(\n+ of: find.byType(Row),\n+ matching: find.byType(Switch),\n+ );\n+ expect(switches, findsNWidgets(3));\n+ expect((tester.widgetList(switches).toList()[0] as Switch).value, true);\n+ await tester.ensureVisible(switches.at(0));\n+ await tester.tap(switches.at(1));\n+\n await tester.pump();\n final inkwellFinder = find.byType(InkWell);\n expect(inkwellFinder, findsNWidgets(8));\n- // tester.allElements.forEach((element) {\n- // print(element);\n- // });\n \n- ///returning the file variable to the\n- ///result of function multimediaPickerService.getPhotoFromGallery\n- ///when this function is called in the\n- ///view model of add_post_page.\n final file = File('fakePath');\n \n- /// using the new instance of multimediaPickerService\n- /// so that when statement can be used again,\n- /// else it gives null point exception\n final multimediaPickerService = locator();\n \n- /// when is function provided by mockito lib\n when(multimediaPickerService.getPhotoFromGallery(camera: false))\n .thenAnswer((_) async {\n return file;\n@@ -281,25 +282,12 @@ void main() {\n );\n await tester.pump();\n \n- /// using the key of icon button\n- /// because their are many icon button\n-\n final finder = find.byKey(const Key('txt_btn_cep'));\n \n expect(finder, findsOneWidget);\n-\n- ///returning the file variable to the\n- ///result of function multimediaPickerService.getPhotoFromGallery\n- ///when this function is called in the\n- ///view model of add_post_page.\n final file = File('fakePath');\n-\n- /// using the new instance of multimediaPickerService\n- /// so that when statement can be used again,\n- /// else it gives null point exception\n final multimediaPickerServices = locator();\n \n- /// when is function provided by mockito lib\n when(multimediaPickerServices.getPhotoFromGallery())\n .thenAnswer((_) async {\n return file;\n@@ -331,18 +319,10 @@ void main() {\n \n expect(finder, findsOneWidget);\n \n- ///returning the file variable to the\n- ///result of function multimediaPickerService.getPhotoFromGallery\n- ///when this function is called in the\n- ///view model of add_post_page.\n final file = File('fakePath');\n \n- /// using the new instance of multimediaPickerService\n- /// so that when statement can be used again,\n- /// else it gives null point exception\n final multimediaPickerService = locator();\n \n- /// when is function provided by mockito lib\n when(multimediaPickerService.getPhotoFromGallery(camera: false))\n .thenAnswer((_) async {\n return file;\n@@ -509,6 +489,18 @@ void main() {\n theme: TalawaTheme.darkTheme,\n ),\n );\n+\n+ await tester.pumpAndSettle();\n+\n+ final switches = find.descendant(\n+ of: find.byType(Row),\n+ matching: find.byType(Switch),\n+ );\n+ expect(switches, findsNWidgets(3));\n+ expect((tester.widgetList(switches).toList()[0] as Switch).value, true);\n+ await tester.ensureVisible(switches.at(0));\n+ await tester.tap(switches.at(1));\n+\n await tester.pump();\n final inkwellFinder = find.byType(InkWell);\n expect(inkwellFinder, findsNWidgets(8));\n@@ -558,6 +550,36 @@ void main() {\n findsNWidgets(2),\n );\n });\n+\n+ testWidgets('Test end date selection', (tester) async {\n+ await tester.pumpWidget(\n+ createEventScreen(\n+ themeMode: ThemeMode.dark,\n+ theme: TalawaTheme.darkTheme,\n+ ),\n+ );\n+\n+ await tester.pumpAndSettle();\n+\n+ final switches = find.descendant(\n+ of: find.byType(Row),\n+ matching: find.byType(Switch),\n+ );\n+ expect(switches, findsNWidgets(3));\n+ expect((tester.widgetList(switches).toList()[0] as Switch).value, true);\n+ await tester.ensureVisible(switches.at(0));\n+ await tester.tap(switches.at(1));\n+\n+ await tester.pump();\n+\n+ await tester.tap(find.byKey(const Key('EventDateTimeTileDate')).last);\n+ await tester.pump();\n+\n+ await tester.tap(find.text('OK'));\n+ await tester.pumpAndSettle();\n+ expect(find.text('Does not repeat'), findsOneWidget);\n+ });\n+\n testWidgets('Tap on DateTimeTile time', (tester) async {\n final currentTime = DateTime.now();\n final futureTime = currentTime.add(const Duration(minutes: 30));\n@@ -569,6 +591,16 @@ void main() {\n );\n await tester.pumpAndSettle();\n \n+ final switches = find.descendant(\n+ of: find.byType(Row),\n+ matching: find.byType(Switch),\n+ );\n+ expect(switches, findsNWidgets(3));\n+ expect((tester.widgetList(switches).toList()[0] as Switch).value, true);\n+ await tester.ensureVisible(switches.at(0));\n+ await tester.tap(switches.at(1));\n+\n+ await tester.pump();\n await tester.tap(find.byKey(const Key('EventDateTimeTileTime')).first);\n await tester.pump();\n \n@@ -593,6 +625,18 @@ void main() {\n theme: TalawaTheme.darkTheme,\n ),\n );\n+\n+ await tester.pumpAndSettle();\n+\n+ final switches = find.descendant(\n+ of: find.byType(Row),\n+ matching: find.byType(Switch),\n+ );\n+ expect(switches, findsNWidgets(3));\n+ expect((tester.widgetList(switches).toList()[0] as Switch).value, true);\n+ await tester.ensureVisible(switches.at(0));\n+ await tester.tap(switches.at(1));\n+\n await tester.pump();\n \n await tester.tap(find.byKey(const Key('EventDateTimeTileDate')).last);\n@@ -622,6 +666,16 @@ void main() {\n );\n await tester.pumpAndSettle();\n \n+ final switches = find.descendant(\n+ of: find.byType(Row),\n+ matching: find.byType(Switch),\n+ );\n+ expect(switches, findsNWidgets(3));\n+ expect((tester.widgetList(switches).toList()[0] as Switch).value, true);\n+ await tester.ensureVisible(switches.at(0));\n+ await tester.tap(switches.at(1));\n+\n+ await tester.pump();\n await tester.tap(find.byKey(const Key('EventDateTimeTileTime')).last);\n await tester.pump();\n \n@@ -642,11 +696,12 @@ void main() {\n });\n \n group(\"Tests for integration with view model and services\", () {\n- late final CreateEventViewModel cachedViewModel;\n+ late final CreateEventViewModel cachedViewModel =\n+ getAndRegisterCreateEventModel();\n \n- testWidgets(\"setup MockCreateEventViewModel\", (tester) async {\n- cachedViewModel = getAndRegisterCreateEventModel();\n- });\n+ // testWidgets(\"setup MockCreateEventViewModel\", (tester) async {\n+ // cachedViewModel = getAndRegisterCreateEventModel();\n+ // });\n \n testWidgets(\"Check if AppBar buttons work\", (tester) async {\n mockNetworkImages(() async {\n@@ -709,12 +764,9 @@ void main() {\n await tester.ensureVisible(find.byKey(const Key('text_btn_ambs1')));\n await tester.pumpAndSettle();\n \n- await tester.tap(find.byType(CheckboxListTile));\n- expect(cachedViewModel.memberCheckedMap['fakeUser1'], false);\n- await tester.pumpAndSettle();\n- await tester.tap(find.byType(CheckboxListTile));\n+ await tester.tap(find.byType(CheckboxListTile).first);\n expect(cachedViewModel.memberCheckedMap['fakeUser1'], true);\n- await tester.pump();\n+ await tester.pumpAndSettle();\n });\n \n testWidgets(\ndiff --git a/test/views/after_auth_screens/events/event_info_body_test.dart b/test/views/after_auth_screens/events/event_info_body_test.dart\nindex e1804b6cf8..b7b8b5bba3 100644\n--- a/test/views/after_auth_screens/events/event_info_body_test.dart\n+++ b/test/views/after_auth_screens/events/event_info_body_test.dart\n@@ -36,8 +36,6 @@ Event getTestEvent({\n startTime: \"00:00\",\n endTime: \"24:00\",\n location: \"iitbhu, varanasi\",\n- latitude: viewOnMap ? 40.730610 : null,\n- longitude: viewOnMap ? -73.935242 : null,\n description: \"test_event_description\",\n admins: [\n User(\n@@ -57,7 +55,6 @@ Event getTestEvent({\n ),\n ],\n isRegisterable: true,\n- isRegistered: false,\n );\n }\n \ndiff --git a/test/views/after_auth_screens/profile/user_event_test.dart b/test/views/after_auth_screens/profile/user_event_test.dart\nindex 0d39be40d8..c210b26eb5 100644\n--- a/test/views/after_auth_screens/profile/user_event_test.dart\n+++ b/test/views/after_auth_screens/profile/user_event_test.dart\n@@ -139,15 +139,12 @@ void main() {\n title: 'Sample Event',\n description: 'This is a fake event description.',\n location: 'City Park',\n- latitude: 40.7128,\n- longitude: -74.0060,\n recurring: false,\n allDay: false,\n startDate: '2022-01-01',\n endDate: '2022-01-02',\n startTime: '12:00 PM',\n endTime: '3:00 PM',\n- recurrence: 'Weekly',\n isPublic: true,\n isRegistered: false,\n isRegisterable: true,\ndiff --git a/test/widget_tests/after_auth_screens/events/create_event_page_test.dart b/test/widget_tests/after_auth_screens/events/create_event_page_test.dart\nindex 55e8f5d6fb..c3a33cbf58 100644\n--- a/test/widget_tests/after_auth_screens/events/create_event_page_test.dart\n+++ b/test/widget_tests/after_auth_screens/events/create_event_page_test.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'package:flutter/material.dart';\n import 'package:flutter_localizations/flutter_localizations.dart';\n import 'package:flutter_test/flutter_test.dart';\n@@ -16,6 +13,14 @@ import 'package:talawa/views/base_view.dart';\n import 'package:talawa/widgets/event_date_time_tile.dart';\n import 'package:talawa/widgets/member_name_tile.dart';\n \n+/// Creates an instance of CreateEventScreen with the given parameters.\n+///\n+/// **params**:\n+/// * `themeMode`: ThemeMode of the app\n+/// * `theme`: ThemeData of the app\n+///\n+/// **returns**:\n+/// * `Widget`: return the CreateEventScreen widget\n Widget createEventScreen({\n ThemeMode themeMode = ThemeMode.light,\n required ThemeData theme,\n@@ -277,7 +282,7 @@ void main() {\n navigationService.navigatorKey.currentContext!,\n );\n final textDesc = find.text(\n- appLocalization!.strictTranslate('Select Start Date and Time'),\n+ appLocalization!.strictTranslate('Select Start Date'),\n );\n final dateTimeTiles = find.byType(DateTimeTile);\n expect(textDesc, findsOneWidget);\n@@ -299,7 +304,7 @@ void main() {\n navigationService.navigatorKey.currentContext!,\n );\n final textDesc = find.text(\n- appLocalization!.strictTranslate('Select End Date and Time'),\n+ appLocalization!.strictTranslate('Select End Date'),\n );\n final dateTimeTiles = find.byType(DateTimeTile);\n expect(textDesc, findsOneWidget);\ndiff --git a/test/widget_tests/after_auth_screens/events/event_info_page_test.dart b/test/widget_tests/after_auth_screens/events/event_info_page_test.dart\nindex 752b2506ce..054f21ce9e 100644\n--- a/test/widget_tests/after_auth_screens/events/event_info_page_test.dart\n+++ b/test/widget_tests/after_auth_screens/events/event_info_page_test.dart\n@@ -1,8 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n-// ignore_for_file: avoid_positional_boolean_parameters\n-\n import 'package:flutter/material.dart';\n import 'package:flutter_localizations/flutter_localizations.dart';\n import 'package:flutter_test/flutter_test.dart';\n@@ -19,6 +14,14 @@ import 'package:talawa/views/after_auth_screens/events/event_info_page.dart';\n \n import '../../../helpers/test_helpers.dart';\n \n+/// Creates an instance of Event with the given parameters.\n+///\n+/// **params**:\n+/// * `isPublic`: event is public or not\n+/// * `isCreator`: user is creator of the event or not\n+///\n+/// **returns**:\n+/// * `Event`: return the Event instance\n Event getEvent(bool isPublic, bool isCreator) {\n return Event(\n id: '1',\n@@ -37,8 +40,6 @@ Event getEvent(bool isPublic, bool isCreator) {\n ),\n startDate: '10000',\n endDate: '20000',\n- latitude: 23.45,\n- longitude: -23.45,\n admins: [\n User(\n id: isCreator ? \"xzy1\" : \"abc1\",\n@@ -51,6 +52,14 @@ Event getEvent(bool isPublic, bool isCreator) {\n );\n }\n \n+/// Creates an instance of EventInfoPage with the given parameters.\n+///\n+/// **params**:\n+/// * `isPublic`: whether the event is public or not\n+/// * `isCreator`: whether the user is the creator of the event or not\n+///\n+/// **returns**:\n+/// * `Widget`: return the EventInfoPage widget\n Widget createEventInfoPage(bool isPublic, bool isCreator) {\n return MaterialApp(\n localizationsDelegates: [\ndiff --git a/test/widget_tests/widgets/event_date_time_tile_test.dart b/test/widget_tests/widgets/event_date_time_tile_test.dart\nindex 7e7291f706..4fb0c6e0de 100644\n--- a/test/widget_tests/widgets/event_date_time_tile_test.dart\n+++ b/test/widget_tests/widgets/event_date_time_tile_test.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'package:flutter/material.dart';\n import 'package:flutter_test/flutter_test.dart';\n import 'package:mockito/mockito.dart';\n@@ -10,17 +7,36 @@ import 'package:talawa/widgets/event_date_time_tile.dart';\n import '../../helpers/test_helpers.dart';\n import '../../helpers/test_locator.dart';\n \n+/// Instance of callback function.\n class MockCallbackFunction extends Mock {\n+ /// Callback function.\n+ ///\n+ /// **params**:\n+ /// None\n+ ///\n+ /// **returns**:\n+ /// None\n void call();\n }\n \n+/// A callback function to set date.\n final setDateCallback = MockCallbackFunction();\n+\n+/// A callback function to set time.\n final setTimeCallback = MockCallbackFunction();\n \n+/// Creates a widget for testing.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `Widget`: Returns mocked Material App Widget\n Widget createWidget() {\n return MaterialApp(\n home: Scaffold(\n body: DateTimeTile(\n+ isAllDay: false,\n date: \"fakeDate\",\n time: \"fakeTime\",\n setDate: setDateCallback,\ndiff --git a/test/widget_tests/widgets/recurrence_dialog_test.dart b/test/widget_tests/widgets/recurrence_dialog_test.dart\nnew file mode 100644\nindex 0000000000..6909cf2bc0\n--- /dev/null\n+++ b/test/widget_tests/widgets/recurrence_dialog_test.dart\n@@ -0,0 +1,257 @@\n+import 'package:flutter/material.dart';\n+import 'package:flutter_test/flutter_test.dart';\n+import 'package:intl/intl.dart';\n+import 'package:talawa/constants/recurrence_values.dart';\n+import 'package:talawa/services/size_config.dart';\n+import 'package:talawa/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart';\n+import 'package:talawa/widgets/recurrence_dialog.dart';\n+\n+import '../../helpers/test_helpers.dart';\n+import '../../helpers/test_locator.dart';\n+\n+void main() {\n+ group('ShowRecurrenceDialog', () {\n+ TestWidgetsFlutterBinding.ensureInitialized();\n+ testSetupLocator();\n+ locator().test();\n+ late CreateEventViewModel model;\n+\n+ setUp(() {\n+ locator().test();\n+ registerServices();\n+ model = CreateEventViewModel();\n+ model.initialize();\n+ });\n+\n+ tearDown(() => unregisterServices());\n+\n+ testWidgets('shows correct initial values', (tester) async {\n+ await tester.pumpWidget(\n+ MaterialApp(\n+ home: ShowRecurrenceDialog(model: model),\n+ ),\n+ );\n+\n+ expect(find.text('Does not repeat'), findsOneWidget);\n+ expect(find.text('Daily'), findsOneWidget);\n+ expect(\n+ find.text(\n+ RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.weekly,\n+ {RecurrenceUtils.weekDays[model.recurrenceStartDate.weekday - 1]},\n+ model.interval,\n+ model.count,\n+ model.weekDayOccurenceInMonth,\n+ model.recurrenceStartDate,\n+ model.recurrenceEndDate,\n+ ),\n+ ),\n+ findsOneWidget,\n+ );\n+ expect(\n+ find.text(\n+ RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.monthly,\n+ null,\n+ model.interval,\n+ model.count,\n+ model.weekDayOccurenceInMonth,\n+ model.recurrenceStartDate,\n+ model.recurrenceEndDate,\n+ ),\n+ ),\n+ findsOneWidget,\n+ );\n+ expect(\n+ find.text(\n+ RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.yearly,\n+ null,\n+ model.interval,\n+ model.count,\n+ model.weekDayOccurenceInMonth,\n+ model.recurrenceStartDate,\n+ model.recurrenceEndDate,\n+ ),\n+ ),\n+ findsOneWidget,\n+ );\n+ expect(\n+ find.text(\n+ 'Monday to Friday ${model.recurrenceEndDate != null ? \"until ${DateFormat('MMMM d, y').format(model.recurrenceEndDate!)}\" : \"\"}',\n+ ),\n+ findsOneWidget,\n+ );\n+ expect(find.text('Custom...'), findsOneWidget);\n+ });\n+\n+ testWidgets('shows correct initial values for last weekday occurrence',\n+ (tester) async {\n+ model.recurrenceStartDate = DateTime(2023, 02, 28);\n+ await tester.pumpWidget(\n+ MaterialApp(\n+ home: ShowRecurrenceDialog(model: model),\n+ ),\n+ );\n+\n+ expect(\n+ find.text(\n+ RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.monthly,\n+ {'TUESDAY'},\n+ model.interval,\n+ model.count,\n+ -1,\n+ model.recurrenceStartDate,\n+ model.recurrenceEndDate,\n+ ),\n+ ),\n+ findsOneWidget,\n+ );\n+ });\n+\n+ testWidgets('updates model when Does not repeat is selected',\n+ (tester) async {\n+ await tester.pumpWidget(\n+ MaterialApp(\n+ home: ShowRecurrenceDialog(model: model),\n+ ),\n+ );\n+\n+ await tester.tap(find.text('Does not repeat'));\n+ await tester.pump();\n+\n+ expect(model.isRecurring, false);\n+ expect(model.recurrenceLabel, 'Does not repeat');\n+ expect(model.frequency, Frequency.weekly);\n+ expect(model.weekDays, {\n+ days[DateTime.now().weekday - 1],\n+ });\n+ expect(model.weekDayOccurenceInMonth, null);\n+ });\n+\n+ testWidgets('updates model when Daily is selected', (tester) async {\n+ await tester.pumpWidget(\n+ MaterialApp(\n+ home: ShowRecurrenceDialog(model: model),\n+ ),\n+ );\n+\n+ await tester.tap(find.text('Daily'));\n+ await tester.pump();\n+\n+ expect(model.isRecurring, true);\n+ expect(model.recurrenceLabel, 'Daily');\n+ expect(model.frequency, Frequency.daily);\n+ });\n+\n+ testWidgets('updates model when Weekly is selected', (tester) async {\n+ await tester.pumpWidget(\n+ MaterialApp(\n+ home: ShowRecurrenceDialog(model: model),\n+ ),\n+ );\n+ final label = RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.weekly,\n+ {RecurrenceUtils.weekDays[model.recurrenceStartDate.weekday - 1]},\n+ model.interval,\n+ model.count,\n+ model.weekDayOccurenceInMonth,\n+ model.recurrenceStartDate,\n+ model.recurrenceEndDate,\n+ );\n+ await tester.tap(find.text(label));\n+ await tester.pump();\n+\n+ expect(model.isRecurring, true);\n+ expect(model.recurrenceLabel, label);\n+ expect(model.frequency, Frequency.weekly);\n+ expect(\n+ model.weekDays,\n+ {\n+ RecurrenceUtils.weekDays[model.recurrenceStartDate.weekday - 1]\n+ .toUpperCase(),\n+ },\n+ );\n+ });\n+\n+ testWidgets('updates model when Monthly is selected', (tester) async {\n+ await tester.pumpWidget(\n+ MaterialApp(\n+ home: ShowRecurrenceDialog(model: model),\n+ ),\n+ );\n+\n+ final label = RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.monthly,\n+ null,\n+ model.interval,\n+ model.count,\n+ model.weekDayOccurenceInMonth,\n+ model.recurrenceStartDate,\n+ model.recurrenceEndDate,\n+ );\n+\n+ await tester.tap(find.text(label));\n+ await tester.pump();\n+\n+ expect(model.isRecurring, true);\n+ expect(model.recurrenceLabel, label);\n+ expect(model.frequency, Frequency.monthly);\n+ });\n+\n+ testWidgets('updates model when Yearly is selected', (tester) async {\n+ await tester.pumpWidget(\n+ MaterialApp(\n+ home: ShowRecurrenceDialog(model: model),\n+ ),\n+ );\n+\n+ final label = RecurrenceUtils.getRecurrenceRuleText(\n+ Frequency.yearly,\n+ null,\n+ model.interval,\n+ model.count,\n+ model.weekDayOccurenceInMonth,\n+ model.recurrenceStartDate,\n+ model.recurrenceEndDate,\n+ );\n+\n+ await tester.tap(find.text(label));\n+ await tester.pump();\n+\n+ expect(model.isRecurring, true);\n+ expect(model.recurrenceLabel, label);\n+ expect(model.frequency, Frequency.yearly);\n+ });\n+\n+ testWidgets('updates model when Monday to Friday is selected',\n+ (tester) async {\n+ await tester.pumpWidget(\n+ MaterialApp(\n+ home: ShowRecurrenceDialog(model: model),\n+ ),\n+ );\n+\n+ final label =\n+ 'Monday to Friday ${model.recurrenceEndDate != null ? \"until ${DateFormat('MMMM d, y').format(model.recurrenceEndDate!)}\" : \"\"}';\n+\n+ await tester.tap(find.text(label));\n+ await tester.pump();\n+\n+ expect(model.isRecurring, true);\n+ expect(model.recurrenceLabel, label);\n+ expect(model.frequency, Frequency.weekly);\n+ expect(\n+ model.weekDays,\n+ {\n+ 'MONDAY',\n+ 'TUESDAY',\n+ 'WEDNESDAY',\n+ 'THURSDAY',\n+ 'FRIDAY',\n+ },\n+ );\n+ });\n+ });\n+}\n", "n2p_tests": "{}", "f2p_tests": "{\"/home/talawa/test/model_tests/chat/chat_user_test.dart: Test chat_user model Test model to json\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/chat/chat_list_tile_data_model_test.dart: Test ChatListTileDataModel Test ChatListTileDataModel.fromJson\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/chat/chat_list_tile_data_model_test.dart: Test ChatListTileDataModel Test toJson\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"/home/talawa/test/model_tests/chat/chat_list_tile_data_model_test.dart: Test ChatListTileDataModel Test constructor\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/chat/chat_user_test.dart: Test chat_user model Test json to model\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/events/event_model_test.dart: Test Event Model Test Event \": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "PalisadoesFoundation__talawa-2477", "org": "PalisadoesFoundation", "repo": "talawa", "number": 2477, "state": "closed", "title": "Bug-Fix SignUp", "body": "**What kind of change does this PR introduce?**\r\nBug-Fix\r\n\r\n\r\n**Issue Number:**\r\nFixes #2454 \r\n\r\n**Did you add tests for your changes?**\r\nYes, I have made changed in the unit tests to make sure workflow doesn't fail.\r\n\r\n**Snapshots/Videos:**\r\nSignUp is working fine now\r\n\r\nhttps://github.com/PalisadoesFoundation/talawa/assets/99138286/8834c360-8894-48ef-92bb-ccebd466caca\r\n\r\n**If relevant, did you update the documentation?**\r\nNo\r\n\r\n**Summary**\r\nSignUp was failing for the app continuously which was acting as an hindrance to the other issues after the signup process. It solves the problem of SignUp and now the user can log in after signing it without any problem.\r\n\r\n\r\n**Does this PR introduce a breaking change?**\r\nYes\r\n\r\n\r\n**Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa/blob/master/CONTRIBUTING.md)?**\r\nYes\r\n\r\n", "base": "{\"label\": \"PalisadoesFoundation:develop\", \"ref\": \"develop\", \"sha\": \"21db262aea3450e12725ddeee5db16632a222d55\"}", "resolved_issues": "[{\"number\": 2454, \"title\": \"Bug Report: SignUp (Mobile)\", \"body\": \"**Describe the bug**\\r\\n\\r\\nThe Talawa App is not able to run locally because of certain GrapphQL errors on the client side \\r\\n\\r\\n\\r\\n![image](https://github.com/PalisadoesFoundation/talawa/assets/99138286/d22e02fc-7fa5-45ca-a4aa-d33e39d74a69)\\r\\n\\r\\nOn server Talawa-API `userRegistrationRequired` is not defined for the type Organizations in `types.ts`\\r\\n\\r\\n\\\"image\\\"\\r\\n\\r\\n\\r\\n\\r\\nDuring Login there is a GraphQL error \\r\\n\\r\\n![image](https://github.com/PalisadoesFoundation/talawa/assets/99138286/b69ba434-9fee-4ffd-90a4-7cffc9ceb789)\\r\\n\\\"image\\\"\\r\\n\\r\\n\\\"image\\\"\\r\\n\\r\\n\\r\\n**To Reproduce**\\r\\nSteps to reproduce the behavior:\\r\\n\\r\\n1. Fix Login by taking care of `appUserProfile` \\r\\n2. Fix Sign Up by taking care of `userRegistrationRequired`\\r\\n\\r\\n**Expected behavior**\\r\\nRun Talawa Mobile successfully without any errors.\\r\\n\\r\\n**Actual behavior**\\r\\n- Error while login and signup.\\r\\n- Error fetching organizations.\\r\\n\\r\\n\\r\\n**Additional details**\\r\\nI'll create an issue in Talawa-API to add the particular fields described in screenshot in `types.ts` \\r\\n\\r\\n**Potential internship candidates**\\r\\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\\r\\n\"}]", "lang": "dart", "problem_statement": "Bug Report: SignUp (Mobile)\n**Describe the bug**\r\n\r\nThe Talawa App is not able to run locally because of certain GrapphQL errors on the client side \r\n\r\n\r\n![image](https://github.com/PalisadoesFoundation/talawa/assets/99138286/d22e02fc-7fa5-45ca-a4aa-d33e39d74a69)\r\n\r\nOn server Talawa-API `userRegistrationRequired` is not defined for the type Organizations in `types.ts`\r\n\r\n\"image\"\r\n\r\n\r\n\r\nDuring Login there is a GraphQL error \r\n\r\n![image](https://github.com/PalisadoesFoundation/talawa/assets/99138286/b69ba434-9fee-4ffd-90a4-7cffc9ceb789)\r\n\"image\"\r\n\r\n\"image\"\r\n\r\n\r\n**To Reproduce**\r\nSteps to reproduce the behavior:\r\n\r\n1. Fix Login by taking care of `appUserProfile` \r\n2. Fix Sign Up by taking care of `userRegistrationRequired`\r\n\r\n**Expected behavior**\r\nRun Talawa Mobile successfully without any errors.\r\n\r\n**Actual behavior**\r\n- Error while login and signup.\r\n- Error fetching organizations.\r\n\r\n\r\n**Additional details**\r\nI'll create an issue in Talawa-API to add the particular fields described in screenshot in `types.ts` \r\n\r\n**Potential internship candidates**\r\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\r\n\n", "hints": "I would like to work on this issue\n@ArinNigam Before working on this, please verify this issue is happening in the develop march. Please close this if it is not needed. \nThe error is being caused by `userRegistrationRequired`. The server issue has been closed. Apparently the fields are present in `develop` branch and I mistook `main` branch as the `develop`\r\n\r\nThough the issue with SignUp and Login still exist at client side: \r\n\r\n`GraphQLError(message: Cannot return null for non-nullable field Organization.userRegistrationRequired.`\r\n\r\n\r\nhttps://github.com/PalisadoesFoundation/talawa/assets/99138286/6d4868f1-e038-488d-bc5a-82bac1e9ec56\r\n\r\n\r\n\r\nhttps://github.com/PalisadoesFoundation/talawa/assets/99138286/8744bc46-9161-4974-b325-879e84ac153e\r\n\r\n\r\n\nHi, just checked that sample imports were old in my databases and were causing issues for `login` and `signup` where it was giving `userRegistrationRequired` to be null since it was not defined in the database initially. \r\n\r\nhttps://github.com/PalisadoesFoundation/talawa/assets/99138286/5f762c5d-159c-4ee1-911f-5a507768a771\r\n\r\nhttps://github.com/PalisadoesFoundation/talawa/assets/99138286/ea985977-9abc-4b90-9b45-e8889be22c42\r\n\r\n\r\nLogin works perfectly fine. But still there is an issue persists with signup which is most probably be caused from the server side. Attaching the logs \r\n\r\nThis is when you click on **signup** after filling all the details\r\n\r\n_From Server_ \r\n```\r\nerror Field \"UserInput.selectedOrganization\" of required type \"ID!\" was not provided. {\r\n\"locations\": [\r\n {\r\n \"line\": 3,\r\n \"column\": 16\r\n }\r\n],\r\n\"extensions\": {\r\n \"code\": \"GRAPHQL_VALIDATION_FAILED\",\r\n \"stacktrace\": [\r\n \"GraphQLError: Field \\\"UserInput.selectedOrganization\\\" of required type \\\"ID!\\\" was not provided.\",\r\n \" at Object.ObjectValue (/Users/arinnigam/Desktop/AppDev/talawa/talawa-api/node_modules/graphql/validation/rules/ValuesOfCorrectTypeRule.js:64:13)\",\r\n \" at Object.enter (/Users/arinnigam/Desktop/AppDev/talawa/talawa-api/node_modules/graphql/language/visitor.js:301:32)\",\r\n \" at Object.enter (/Users/arinnigam/Desktop/AppDev/talawa/talawa-api/node_modules/graphql/utilities/TypeInfo.js:391:27)\",\r\n \" at visit (/Users/arinnigam/Desktop/AppDev/talawa/talawa-api/node_modules/graphql/language/visitor.js:197:21)\",\r\n \" at validate (/Users/arinnigam/Desktop/AppDev/talawa/talawa-api/node_modules/graphql/validation/validate.js:91:24)\",\r\n \" at processGraphQLRequest (/Users/arinnigam/Desktop/AppDev/talawa/talawa-api/node_modules/@apollo/server/src/requestPipeline.ts:247:40)\",\r\n \" at process.processTicksAndRejections (node:internal/process/task_queues:95:5)\",\r\n \" at internalExecuteOperation (/Users/arinnigam/Desktop/AppDev/talawa/talawa-api/node_modules/@apollo/server/src/ApolloServer.ts:1313:12)\",\r\n \" at runHttpQuery (/Users/arinnigam/Desktop/AppDev/talawa/talawa-api/node_modules/@apollo/server/src/runHttpQuery.ts:232:27)\",\r\n \" at runPotentiallyBatchedHttpQuery (/Users/arinnigam/Desktop/AppDev/talawa/talawa-api/node_modules/@apollo/server/src/httpBatching.ts:85:12)\",\r\n \" at ApolloServer.executeHTTPGraphQLRequest (/Users/arinnigam/Desktop/AppDev/talawa/talawa-api/node_modules/@apollo/server/src/ApolloServer.ts:1087:14)\"\r\n ]\r\n}\r\n}\r\n```\r\n\r\n_From Client_\r\n```\r\nI/flutter (17501): ServerException(\r\n originalException: null, \r\n originalStackTrace: null, \r\n parsedResponse: \r\n Response\r\n (data: null,\r\n errors: [GraphQLError(message: Field \"UserInput.selectedOrganization\" of required type \"ID!\" was not provided.,\r\n locations: null, path: null, extensions: null)],\r\n context: Context({ResponseExtensions: Instance of 'ResponseExtensions'}), \r\n response: {\r\n errors: [{message: Field \"UserInput.selectedOrganization\" of required type \"ID!\" was not provided.,\r\n status: GRAPHQL_VALIDATION_FAILED,\r\n data: []}]}\r\n ))\r\n```\r\nThe current issue persists for `SignUp` page which is most probably is being caused from the server side. I would like to know to if there is any existing issue in `talawa-api` who are working on this thing or should I link this issue and create one on `talawa-api`.\r\n\r\n---\r\n\r\nI am not closing this issue since there still persists an issue with signup on the mobile app. Once it gets solved on the backend side. I'll close this issue.\r\n\r\n\r\n\r\n", "pull_url": "https://github.com/PalisadoesFoundation/talawa/pull/2477", "issue_urls": "[\"https://github.com/PalisadoesFoundation/talawa/issues/2454\"]", "test_command": NaN, "fix_patch": "diff --git a/lib/utils/queries.dart b/lib/utils/queries.dart\nindex 256aa26516..60234d4228 100644\n--- a/lib/utils/queries.dart\n+++ b/lib/utils/queries.dart\n@@ -10,6 +10,7 @@ class Queries {\n /// * `lastName`: user's data.\n /// * `email`: user's data.\n /// * `password`: user's data.\n+ /// * `selectedOrganization`: ID of the selected organization.\n ///\n /// **returns**:\n /// * `String`: Return the mutation in string type to be passed to graphql client.\n@@ -18,10 +19,11 @@ class Queries {\n String lastName,\n String email,\n String password,\n+ String? selectedOrganization,\n ) {\n return \"\"\"\n mutation{\n- signUp(data: {firstName: \"$firstName\", lastName: \"$lastName\", email: \"$email\", password: \"$password\"})\n+ signUp(data: {firstName: \"$firstName\", lastName: \"$lastName\", email: \"$email\", password: \"$password\", selectedOrganization: \"$selectedOrganization\"})\n {\n appUserProfile{\n adminFor{\ndiff --git a/lib/view_model/pre_auth_view_models/signup_details_view_model.dart b/lib/view_model/pre_auth_view_models/signup_details_view_model.dart\nindex 2fc3c14515..494afac0b5 100644\n--- a/lib/view_model/pre_auth_view_models/signup_details_view_model.dart\n+++ b/lib/view_model/pre_auth_view_models/signup_details_view_model.dart\n@@ -135,6 +135,7 @@ class SignupDetailsViewModel extends BaseModel {\n Encryptor.encryptString(\n password.text,\n ),\n+ selectedOrganization.id,\n ),\n );\n navigationService.pop();\n", "test_patch": "diff --git a/test/utils_tests/queries_test.dart b/test/utils_tests/queries_test.dart\nindex 6fffa67398..cdb43da4da 100644\n--- a/test/utils_tests/queries_test.dart\n+++ b/test/utils_tests/queries_test.dart\n@@ -10,8 +10,13 @@ void main() {\n var mutation = false;\n expect(mutation, false);\n \n- final fnData = Queries()\n- .registerUser('Ayush', 'Chaudhary', 'ayush@gmail.com', 'password');\n+ final fnData = Queries().registerUser(\n+ 'Ayush',\n+ 'Chaudhary',\n+ 'ayush@gmail.com',\n+ 'password',\n+ 'orgId123',\n+ );\n if (fnData.contains('Ayush')) {\n mutation = true;\n }\ndiff --git a/test/view_model_tests/pre_auth_view_models/signup_details_view_model_test.dart b/test/view_model_tests/pre_auth_view_models/signup_details_view_model_test.dart\nindex cfd954522b..a98bf1a029 100644\n--- a/test/view_model_tests/pre_auth_view_models/signup_details_view_model_test.dart\n+++ b/test/view_model_tests/pre_auth_view_models/signup_details_view_model_test.dart\n@@ -49,7 +49,7 @@ class SignUpMock extends StatelessWidget {\n }\n \n OrgInfo get org => OrgInfo(\n- id: '3',\n+ id: '',\n name: 'test org 3',\n userRegistrationRequired: userRegistrationRequired,\n creatorInfo: User(firstName: 'test', lastName: '1'),\n@@ -84,13 +84,13 @@ void main() {\n source: QueryResultSource.network,\n data: data,\n options: QueryOptions(\n- document: gql(queries.registerUser('', '', '', '')),\n+ document: gql(queries.registerUser('', '', '', '', '')),\n ),\n );\n when(graphqlConfig.getToken()).thenAnswer((_) async => true);\n when(\n databaseFunctions.gqlNonAuthMutation(\n- queries.registerUser('', '', '', ''),\n+ queries.registerUser('', '', '', '', ''),\n ),\n ).thenAnswer((_) async => result);\n when(databaseFunctions.gqlAuthMutation(queries.joinOrgById(org.id!)))\n@@ -116,7 +116,7 @@ void main() {\n verify(databaseFunctions.gqlAuthMutation(queries.joinOrgById(org.id!)));\n verify(\n databaseFunctions.gqlNonAuthMutation(\n- queries.registerUser('', '', '', ''),\n+ queries.registerUser('', '', '', '', ''),\n ),\n );\n verify(\n@@ -143,12 +143,12 @@ void main() {\n locator.registerSingleton(MockUserConfig());\n \n final model = SignupDetailsViewModel();\n-\n+ model.selectedOrganization = OrgInfo(id: \"\");\n await tester.pumpWidget(SignUpMock(formKey: model.formKey));\n \n when(\n databaseFunctions.gqlNonAuthMutation(\n- queries.registerUser('', '', '', ''),\n+ queries.registerUser('', '', '', '', ''),\n ),\n ).thenAnswer((_) async => null);\n \n@@ -194,13 +194,13 @@ void main() {\n source: QueryResultSource.network,\n data: data,\n options: QueryOptions(\n- document: gql(queries.registerUser('', '', '', '')),\n+ document: gql(queries.registerUser('', '', '', '', '')),\n ),\n );\n when(graphqlConfig.getToken()).thenAnswer((_) async => false);\n when(\n databaseFunctions.gqlNonAuthMutation(\n- queries.registerUser('', '', '', ''),\n+ queries.registerUser('', '', '', '', ''),\n ),\n ).thenAnswer((_) async => result);\n \n@@ -301,13 +301,13 @@ void main() {\n source: QueryResultSource.network,\n data: data,\n options: QueryOptions(\n- document: gql(queries.registerUser('', '', '', '')),\n+ document: gql(queries.registerUser('', '', '', '', '')),\n ),\n );\n when(graphqlConfig.getToken()).thenAnswer((_) async => true);\n when(\n databaseFunctions.gqlNonAuthMutation(\n- queries.registerUser('', '', '', ''),\n+ queries.registerUser('', '', '', '', ''),\n ),\n ).thenAnswer((_) async => result);\n when(\n@@ -340,7 +340,7 @@ void main() {\n );\n verify(\n databaseFunctions.gqlNonAuthMutation(\n- queries.registerUser('', '', '', ''),\n+ queries.registerUser('', '', '', '', ''),\n ),\n );\n verify(\n@@ -364,7 +364,7 @@ void main() {\n when(graphqlConfig.getToken()).thenAnswer((_) async => true);\n when(\n databaseFunctions.gqlNonAuthMutation(\n- queries.registerUser('', '', '', ''),\n+ queries.registerUser('', '', '', '', ''),\n ),\n ).thenThrow(Exception());\n \n@@ -374,7 +374,7 @@ void main() {\n \n verify(\n databaseFunctions.gqlNonAuthMutation(\n- queries.registerUser('', '', '', ''),\n+ queries.registerUser('', '', '', '', ''),\n ),\n );\n verifyNever(\n@@ -416,13 +416,15 @@ void main() {\n source: QueryResultSource.network,\n data: data,\n options: QueryOptions(\n- document: gql(queries.registerUser('', '', '', '')),\n+ document: gql(\n+ queries.registerUser('', '', '', '', ''),\n+ ),\n ),\n );\n when(graphqlConfig.getToken()).thenAnswer((_) async => true);\n when(\n databaseFunctions.gqlNonAuthMutation(\n- queries.registerUser('', '', '', ''),\n+ queries.registerUser('', '', '', '', ''),\n ),\n ).thenAnswer((_) async => result);\n when(databaseFunctions.gqlAuthMutation(queries.joinOrgById(org.id!)))\n@@ -435,7 +437,7 @@ void main() {\n verify(databaseFunctions.gqlAuthMutation(queries.joinOrgById(org.id!)));\n verify(\n databaseFunctions.gqlNonAuthMutation(\n- queries.registerUser('', '', '', ''),\n+ queries.registerUser('', '', '', '', ''),\n ),\n );\n verifyNever(\n@@ -478,13 +480,15 @@ void main() {\n source: QueryResultSource.network,\n data: data,\n options: QueryOptions(\n- document: gql(queries.registerUser('', '', '', '')),\n+ document: gql(\n+ queries.registerUser('', '', '', '', ''),\n+ ),\n ),\n );\n when(graphqlConfig.getToken()).thenAnswer((_) async => true);\n when(\n databaseFunctions.gqlNonAuthMutation(\n- queries.registerUser('', '', '', ''),\n+ queries.registerUser('', '', '', '', ''),\n ),\n ).thenAnswer((_) async => result);\n when(\n@@ -503,7 +507,7 @@ void main() {\n );\n verify(\n databaseFunctions.gqlNonAuthMutation(\n- queries.registerUser('', '', '', ''),\n+ queries.registerUser('', '', '', '', ''),\n ),\n );\n verifyNever(\n", "n2p_tests": "{\"/home/talawa/test/utils_tests/queries_test.dart: Tests for queries.dart Check if updateLanguage works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils_tests/queries_test.dart: Tests for queries.dart Check if logout works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils_tests/queries_test.dart: Tests for queries.dart Check if registerUser works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils_tests/queries_test.dart: Tests for queries.dart Check if refreshToken works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils_tests/queries_test.dart: Tests for queries.dart Check if createDonation works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils_tests/queries_test.dart: Tests for queries.dart Check if getPluginsList works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils_tests/queries_test.dart: Tests for queries.dart Check if loginUser works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils_tests/queries_test.dart: Tests for queries.dart Check if fetchOrgDetailsById works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils_tests/queries_test.dart: Tests for queries.dart Check if fetchJoinInOrg works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils_tests/queries_test.dart: Tests for queries.dart Check if newUserLanguage works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils_tests/queries_test.dart: Tests for queries.dart Check if userlanguage works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils_tests/queries_test.dart: Tests for queries.dart Check if joinOrgById works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils_tests/queries_test.dart: Tests for queries.dart Check if fetchJoinInOrgByName works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils_tests/queries_test.dart: Tests for queries.dart Check if sendMembershipRequest works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils_tests/queries_test.dart: Tests for queries.dart Check if updateUserProfile works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils_tests/queries_test.dart: Tests for queries.dart Check if fetchOrgById works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "PalisadoesFoundation__talawa-2469", "org": "PalisadoesFoundation", "repo": "talawa", "number": 2469, "state": "closed", "title": "Fixed registerForEvent mutation & update tests", "body": "**What kind of change does this PR introduce?**\r\n\r\nbugfix\r\n\r\n**Issue Number:**\r\n\r\nFixes #2467 \r\n\r\n**Did you add tests for your changes?**\r\n\r\nYes\r\n\r\n**Snapshots/Videos:**\r\n\r\n\r\nhttps://github.com/PalisadoesFoundation/talawa/assets/109027247/3261ed92-cf07-4223-bc8a-bb7f017a5de6\r\n\r\n**Summary**\r\n\r\n- Modified `registerForEvent` mutation as per changes made in Talawa API.\r\n- Updated the tests for same\r\n\r\n**Does this PR introduce a breaking change?**\r\n\r\nNo\r\n\r\n\r\n**Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa/blob/master/CONTRIBUTING.md)?**\r\n\r\nYes \r\n", "base": "{\"label\": \"PalisadoesFoundation:develop\", \"ref\": \"develop\", \"sha\": \"897a0b19e50e70c1a13ff352159bb430fb7c0524\"}", "resolved_issues": "[{\"number\": 2467, \"title\": \"Error in Event Registration due Faulty mutation\", \"body\": \"**Describe the bug**\\r\\nThe `registerForEvent` mutation being used for register functionality was updated in Talawa API in https://github.com/PalisadoesFoundation/talawa-api/issues/1644 . Before update `registerForEvent` returned `Event` object, after update it returns `EventAttendee` object. Due to older implementation of `registerForEvent` the mutation fails. \\r\\n\\r\\n**To Reproduce**\\r\\nSteps to reproduce the behavior:\\r\\n\\r\\n1. Login in a organiszation.\\r\\n2. Open Events Tab\\r\\n3. Open a specific event (where you've not already registered)\\r\\n4. Click on register.\\r\\n5. Error is displayed as No mutation occurs.\\r\\n\\r\\n**Expected behavior**\\r\\nOn click of register button, user should be registered for the event.\\r\\n\\r\\n**Actual behavior**\\r\\nOn click of register button, error is displayed due to failing mutation.\\r\\n\\r\\n**Screenshots**\\r\\n\\r\\nhttps://github.com/PalisadoesFoundation/talawa/assets/109027247/899b8344-0c4e-4d91-bd83-38995c77fe6f\\r\\n\\r\\n\\r\\n**Additional details**\\r\\nPart (pre-requisite) for Event Parity project\\r\\n\\r\\n**Potential internship candidates**\\r\\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\\r\\n\"}]", "lang": "dart", "problem_statement": "Error in Event Registration due Faulty mutation\n**Describe the bug**\r\nThe `registerForEvent` mutation being used for register functionality was updated in Talawa API in https://github.com/PalisadoesFoundation/talawa-api/issues/1644 . Before update `registerForEvent` returned `Event` object, after update it returns `EventAttendee` object. Due to older implementation of `registerForEvent` the mutation fails. \r\n\r\n**To Reproduce**\r\nSteps to reproduce the behavior:\r\n\r\n1. Login in a organiszation.\r\n2. Open Events Tab\r\n3. Open a specific event (where you've not already registered)\r\n4. Click on register.\r\n5. Error is displayed as No mutation occurs.\r\n\r\n**Expected behavior**\r\nOn click of register button, user should be registered for the event.\r\n\r\n**Actual behavior**\r\nOn click of register button, error is displayed due to failing mutation.\r\n\r\n**Screenshots**\r\n\r\nhttps://github.com/PalisadoesFoundation/talawa/assets/109027247/899b8344-0c4e-4d91-bd83-38995c77fe6f\r\n\r\n\r\n**Additional details**\r\nPart (pre-requisite) for Event Parity project\r\n\r\n**Potential internship candidates**\r\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\r\n\n", "hints": "Would like to work on this issue", "pull_url": "https://github.com/PalisadoesFoundation/talawa/pull/2469", "issue_urls": "[\"https://github.com/PalisadoesFoundation/talawa/issues/2467\"]", "test_command": NaN, "fix_patch": "diff --git a/lib/services/event_service.dart b/lib/services/event_service.dart\nindex eff3153edd..6b3146ec89 100644\n--- a/lib/services/event_service.dart\n+++ b/lib/services/event_service.dart\n@@ -80,7 +80,6 @@ class EventService {\n \n final List eventsJson =\n (result as QueryResult).data![\"eventsByOrganizationConnection\"] as List;\n- debugPrint('Events: $eventsJson');\n eventsJson.forEach((eventJsonData) {\n final Event event = Event.fromJson(eventJsonData as Map);\n event.isRegistered = event.attendees?.any(\ndiff --git a/lib/utils/event_queries.dart b/lib/utils/event_queries.dart\nindex c68b8e3781..554c180f47 100644\n--- a/lib/utils/event_queries.dart\n+++ b/lib/utils/event_queries.dart\n@@ -114,14 +114,11 @@ class EventQueries {\n String registerForEvent() {\n return \"\"\"\n mutation registerForEvent(\\$eventId: ID!) { \n- registerForEvent(id: \\$eventId)\n- {\n+ registerForEvent(id: \\$eventId) {\n _id\n- title\n- description\n }\n- }\n- \"\"\";\n+ }\n+ \"\"\";\n }\n \n /// Creates a GraphQL mutation for deleting an event.\ndiff --git a/lib/view_model/after_auth_view_models/event_view_models/event_info_view_model.dart b/lib/view_model/after_auth_view_models/event_view_models/event_info_view_model.dart\nindex 1eb36c925f..8835a662e0 100644\n--- a/lib/view_model/after_auth_view_models/event_view_models/event_info_view_model.dart\n+++ b/lib/view_model/after_auth_view_models/event_view_models/event_info_view_model.dart\n@@ -61,19 +61,20 @@ class EventInfoViewModel extends BaseModel {\n await locator().registerForAnEvent(event.id!);\n if (registerResult != null) {\n event.isRegistered = true;\n+ final userConfig = locator();\n attendees.add(\n Attendee(\n- id: UserConfig().currentUser.id,\n- firstName: UserConfig().currentUser.firstName,\n- lastName: UserConfig().currentUser.lastName,\n- image: UserConfig().currentUser.image,\n+ id: userConfig.currentUser.id,\n+ firstName: userConfig.currentUser.firstName,\n+ lastName: userConfig.currentUser.lastName,\n+ image: userConfig.currentUser.image,\n ),\n );\n }\n- print(registerResult);\n fabTitle = getFabTitle();\n navigationService.pop();\n notifyListeners();\n+ await locator().getEvents();\n }\n }\n \n", "test_patch": "diff --git a/test/service_tests/event_service_test.dart b/test/service_tests/event_service_test.dart\nindex 5546bfa246..76c461bbde 100644\n--- a/test/service_tests/event_service_test.dart\n+++ b/test/service_tests/event_service_test.dart\n@@ -1,5 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-\n import 'package:flutter_test/flutter_test.dart';\n import 'package:graphql_flutter/graphql_flutter.dart';\n import 'package:mockito/mockito.dart';\n@@ -91,7 +89,6 @@ void main() {\n data: {\n 'register for an event': {\n '_id': 'eventId',\n- 'name': 'name',\n },\n },\n source: QueryResultSource.network,\ndiff --git a/test/utils/event_queries_test.dart b/test/utils/event_queries_test.dart\nindex 95e867f636..83342ae372 100644\n--- a/test/utils/event_queries_test.dart\n+++ b/test/utils/event_queries_test.dart\n@@ -87,14 +87,11 @@ void main() {\n test(\"Check if registerForEvent works correctly\", () {\n const data = \"\"\"\n mutation registerForEvent(\\$eventId: ID!) { \n- registerForEvent(id: \\$eventId)\n- {\n+ registerForEvent(id: \\$eventId) {\n _id\n- title\n- description\n }\n- }\n- \"\"\";\n+ }\n+ \"\"\";\n \n final fnData = EventQueries().registerForEvent();\n expect(fnData, data);\n", "n2p_tests": "{}", "f2p_tests": "{\"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if registerForEvent works correctly\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if attendeesByEvent works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if addEvent works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if updateEvent works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if deleteEvent works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if fetchOrgEvents works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "PalisadoesFoundation__talawa-2466", "org": "PalisadoesFoundation", "repo": "talawa", "number": 2466, "state": "closed", "title": "Fix issues in loading Attendees ", "body": "**What kind of change does this PR introduce?**\r\n\r\nbugfix, refactoring\r\n\r\n**Issue Number:**\r\n\r\nFixes #2463 \r\n\r\n**Did you add tests for your changes?**\r\n\r\nYes \r\n\r\n**Snapshots/Videos:**\r\n\r\n\r\nhttps://github.com/PalisadoesFoundation/talawa/assets/109027247/d23e9acd-0198-40d1-8c01-3ad2753eb760\r\n\r\n\r\n\r\n**Summary**\r\nIn API registrants was deprecated and replaced with `attendees` which have attributes such as isRegistered, isInvited, isCheckedIn, isCheckedOut which are further used to determine status of event attendee.\r\n \r\n- Replaced deprecated `registrantsByEvent` query with getEventAttendeesByEventId.\r\n- Replaced deprecated `eventsByOrganization` with `eventsByOrganizationConnection` as the later provide server-side sorting and filtering support.\r\n- Refac codebase to use `attendees` instead of registrants.\r\n- Updated related tests.\r\n- Added documentation for all modified files \r\n\r\n**Does this PR introduce a breaking change?**\r\n\r\nNo\r\n\r\n**Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa/blob/master/CONTRIBUTING.md)?**\r\n\r\nYes \r\n", "base": "{\"label\": \"PalisadoesFoundation:develop\", \"ref\": \"develop\", \"sha\": \"62c72227603b96f47185e73e47e68c5ab2cf9e24\"}", "resolved_issues": "[{\"number\": 2463, \"title\": \"Event Attendees Not loading due faulty query\", \"body\": \"**Describe the bug**\\r\\nIn the Event Page, the attendees for that specific events don't load, due to usage of `registrantsByEvent` query whose support was removed from API instead `getEventAttendeesByEventId` query resolvers should be used which was added in https://github.com/PalisadoesFoundation/talawa-api/issues/1644. \\r\\n\\r\\n**To Reproduce**\\r\\nSteps to reproduce the behavior:\\r\\n\\r\\n1. Login to organization\\r\\n2. Open Events tab.\\r\\n3. Open a specific Event page.\\r\\n4. The attendees keep on loading due to no value being received as a result of wrong (old) query.\\r\\n\\r\\n**Expected behavior**\\r\\nAttendees for the event must be rendered in Attendees section and \\\"No attendees\\\" if there are no attendees.\\r\\n\\r\\n**Actual behavior**\\r\\nThe Attendees section keep on loading (circular progress indicator) indefinitely.\\r\\n\\r\\n**Screenshots**\\r\\n![attendees](https://github.com/PalisadoesFoundation/talawa/assets/109027247/8697fac3-f61c-4035-8415-15b3fae97588)\\r\\n\\r\\n**Potential internship candidates**\\r\\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\\r\\n\"}]", "lang": "dart", "problem_statement": "Event Attendees Not loading due faulty query\n**Describe the bug**\r\nIn the Event Page, the attendees for that specific events don't load, due to usage of `registrantsByEvent` query whose support was removed from API instead `getEventAttendeesByEventId` query resolvers should be used which was added in https://github.com/PalisadoesFoundation/talawa-api/issues/1644. \r\n\r\n**To Reproduce**\r\nSteps to reproduce the behavior:\r\n\r\n1. Login to organization\r\n2. Open Events tab.\r\n3. Open a specific Event page.\r\n4. The attendees keep on loading due to no value being received as a result of wrong (old) query.\r\n\r\n**Expected behavior**\r\nAttendees for the event must be rendered in Attendees section and \"No attendees\" if there are no attendees.\r\n\r\n**Actual behavior**\r\nThe Attendees section keep on loading (circular progress indicator) indefinitely.\r\n\r\n**Screenshots**\r\n![attendees](https://github.com/PalisadoesFoundation/talawa/assets/109027247/8697fac3-f61c-4035-8415-15b3fae97588)\r\n\r\n**Potential internship candidates**\r\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\r\n\n", "hints": "I would like to work on this issue", "pull_url": "https://github.com/PalisadoesFoundation/talawa/pull/2466", "issue_urls": "[\"https://github.com/PalisadoesFoundation/talawa/issues/2463\"]", "test_command": NaN, "fix_patch": "diff --git a/lib/demo_server_data/events_demo_data.dart b/lib/demo_server_data/events_demo_data.dart\nindex 5578599915..9d22b4ef95 100644\n--- a/lib/demo_server_data/events_demo_data.dart\n+++ b/lib/demo_server_data/events_demo_data.dart\n@@ -1,14 +1,29 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n+/// 'eventsDemoData' is a list of events that are used to display the events in the app.\n+///\n+/// Each event has the following properties:\n+/// - title: The title of the event.\n+/// - description: The description of the event.\n+/// - location: The location of the event.\n+/// - recurring: Whether the event is recurring or not.\n+/// - allDay: Whether the event is an all-day event or not.\n+/// - startDate: The start date of the event.\n+/// - endDate: The end date of the event.\n+/// - startTime: The start time of the event.\n+/// - endTime: The end time of the event.\n+/// - recurrence: The recurrence of the event.\n+/// - isPublic: Whether the event is public or not.\n+/// - isSubscribed: Whether the user is subscribed to the event or not.\n+/// - isRegisterable: Whether the event is registerable or not.\n+/// - creator: The creator of the event.\n+/// - attendees: The attendees of the event.\n+/// - admins: The admins of the event.\n+/// - organization: The organization of the event.\n \n-///This file contains demo data. It contains a list of type Map\n-/// and sample data of events.\n const eventsDemoData = [\n {\n \"title\": \"Calculus\",\n \"description\":\n \"This course introduces calculus using analytic geometry functions. Topics include limits and continuity, derivatives, optimization, related rates, graphing and other applications of derivatives, definite and indefinite integrals, and numerical integration.\",\n- \"attendees\": \"50\",\n \"location\": \"Lostilos\",\n \"recurring\": \"false\",\n \"allDay\": \"true\",\n@@ -25,17 +40,21 @@ const eventsDemoData = [\n \"lastName\": \"Shendge\",\n \"_id\": \"asdasdasd\",\n },\n- \"registrants\": [\n- {\"firstName\": \"Utkarsh\", \"lastName\": \"Shendge\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Bustin\", \"lastName\": \"Jiber\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Warren\", \"lastName\": \"Buff\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Utkarsh\", \"lastName\": \"Shendge\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Bustin\", \"lastName\": \"Jiber\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Warren\", \"lastName\": \"Buff\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Utkarsh\", \"lastName\": \"Shendge\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Bustin\", \"lastName\": \"Jiber\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Warren\", \"lastName\": \"Buff\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Bustin\", \"lastName\": \"Jiber\", \"_id\": \"asdasdasd\"},\n+ \"attendees\": [\n+ {\"id\": \"attendee1\", \"firstName\": \"firstName1\", \"lastName\": \"lastName1\"},\n+ {\"id\": \"attendee2\", \"firstName\": \"firstName2\", \"lastName\": \"lastName2\"},\n+ {\"id\": \"attendee3\", \"firstName\": \"firstName3\", \"lastName\": \"lastName3\"},\n+ {\"id\": \"attendee4\", \"firstName\": \"firstName4\", \"lastName\": \"lastName4\"},\n+ {\"id\": \"attendee5\", \"firstName\": \"firstName5\", \"lastName\": \"lastName5\"},\n+ {\"id\": \"attendee6\", \"firstName\": \"firstName6\", \"lastName\": \"lastName6\"},\n+ {\"id\": \"attendee7\", \"firstName\": \"firstName7\", \"lastName\": \"lastName7\"},\n+ {\"id\": \"attendee8\", \"firstName\": \"firstName8\", \"lastName\": \"lastName8\"},\n+ {\"id\": \"attendee9\", \"firstName\": \"firstName9\", \"lastName\": \"lastName9\"},\n+ {\n+ \"id\": \"attendee10\",\n+ \"firstName\": \"firstName10\",\n+ \"lastName\": \"lastName10\",\n+ },\n ],\n \"admins\": [\n {\"firstName\": \"Utkarsh\", \"lastName\": \"Shendge\", \"_id\": \"asdasdasd\"},\n@@ -55,7 +74,6 @@ const eventsDemoData = [\n \"title\": \"UI/UX\",\n \"description\":\n \"UX design refers to the term \u201cuser experience design\u201d, while UI stands for \u201cuser interface design\u201d. Both elements are crucial to a product and work closely together.\",\n- \"attendees\": \"80\",\n \"location\": \"Tokyo, Japan\",\n \"recurring\": \"false\",\n \"allDay\": \"true\",\n@@ -72,17 +90,21 @@ const eventsDemoData = [\n \"lastName\": \"Chandla\",\n \"_id\": \"asdasdasd\",\n },\n- \"registrants\": [\n- {\"firstName\": \"Utkarsh\", \"lastName\": \"Shendge\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Bustin\", \"lastName\": \"Jiber\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Warren\", \"lastName\": \"Buff\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Utkarsh\", \"lastName\": \"Shendge\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Bustin\", \"lastName\": \"Jiber\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Warren\", \"lastName\": \"Buff\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Utkarsh\", \"lastName\": \"Shendge\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Bustin\", \"lastName\": \"Jiber\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Warren\", \"lastName\": \"Buff\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Bustin\", \"lastName\": \"Jiber\", \"_id\": \"asdasdasd\"},\n+ \"attendees\": [\n+ {\"id\": \"attendee1\", \"firstName\": \"firstName1\", \"lastName\": \"lastName1\"},\n+ {\"id\": \"attendee2\", \"firstName\": \"firstName2\", \"lastName\": \"lastName2\"},\n+ {\"id\": \"attendee3\", \"firstName\": \"firstName3\", \"lastName\": \"lastName3\"},\n+ {\"id\": \"attendee4\", \"firstName\": \"firstName4\", \"lastName\": \"lastName4\"},\n+ {\"id\": \"attendee5\", \"firstName\": \"firstName5\", \"lastName\": \"lastName5\"},\n+ {\"id\": \"attendee6\", \"firstName\": \"firstName6\", \"lastName\": \"lastName6\"},\n+ {\"id\": \"attendee7\", \"firstName\": \"firstName7\", \"lastName\": \"lastName7\"},\n+ {\"id\": \"attendee8\", \"firstName\": \"firstName8\", \"lastName\": \"lastName8\"},\n+ {\"id\": \"attendee9\", \"firstName\": \"firstName9\", \"lastName\": \"lastName9\"},\n+ {\n+ \"id\": \"attendee10\",\n+ \"firstName\": \"firstName10\",\n+ \"lastName\": \"lastName10\",\n+ },\n ],\n \"admins\": [\n {\"firstName\": \"Utkarsh\", \"lastName\": \"Shendge\", \"_id\": \"asdasdasd\"},\n@@ -102,7 +124,6 @@ const eventsDemoData = [\n \"title\": \"System Design\",\n \"description\":\n \"Systems design is the process of defining the architecture, product design, modules, interfaces, and data for a system to satisfy specified requirements. Systems design could be seen as the application of systems theory to product development.\",\n- \"attendees\": \"29\",\n \"location\": \"Shimla, India\",\n \"recurring\": \"false\",\n \"allDay\": \"true\",\n@@ -119,17 +140,21 @@ const eventsDemoData = [\n \"lastName\": \"Srivastav\",\n \"_id\": \"asdasdasd\",\n },\n- \"registrants\": [\n- {\"firstName\": \"Utkarsh\", \"lastName\": \"Shendge\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Bustin\", \"lastName\": \"Jiber\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Warren\", \"lastName\": \"Buff\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Utkarsh\", \"lastName\": \"Shendge\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Bustin\", \"lastName\": \"Jiber\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Warren\", \"lastName\": \"Buff\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Utkarsh\", \"lastName\": \"Shendge\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Bustin\", \"lastName\": \"Jiber\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Warren\", \"lastName\": \"Buff\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Bustin\", \"lastName\": \"Jiber\", \"_id\": \"asdasdasd\"},\n+ \"attendees\": [\n+ {\"id\": \"attendee1\", \"firstName\": \"firstName1\", \"lastName\": \"lastName1\"},\n+ {\"id\": \"attendee2\", \"firstName\": \"firstName2\", \"lastName\": \"lastName2\"},\n+ {\"id\": \"attendee3\", \"firstName\": \"firstName3\", \"lastName\": \"lastName3\"},\n+ {\"id\": \"attendee4\", \"firstName\": \"firstName4\", \"lastName\": \"lastName4\"},\n+ {\"id\": \"attendee5\", \"firstName\": \"firstName5\", \"lastName\": \"lastName5\"},\n+ {\"id\": \"attendee6\", \"firstName\": \"firstName6\", \"lastName\": \"lastName6\"},\n+ {\"id\": \"attendee7\", \"firstName\": \"firstName7\", \"lastName\": \"lastName7\"},\n+ {\"id\": \"attendee8\", \"firstName\": \"firstName8\", \"lastName\": \"lastName8\"},\n+ {\"id\": \"attendee9\", \"firstName\": \"firstName9\", \"lastName\": \"lastName9\"},\n+ {\n+ \"id\": \"attendee10\",\n+ \"firstName\": \"firstName10\",\n+ \"lastName\": \"lastName10\",\n+ },\n ],\n \"admins\": [\n {\"firstName\": \"Utkarsh\", \"lastName\": \"Shendge\", \"_id\": \"asdasdasd\"},\n@@ -147,11 +172,8 @@ const eventsDemoData = [\n },\n {\n \"title\": \"Gaming\",\n- // ignore: missing_whitespace_between_adjacent_strings\n \"description\":\n \"Cyberpunk 2077 is a 2020 action role-playing v_ideo game developed and published by CD Projekt. The story takes place in Night City, an open world set in the Cyberpunk universe.\",\n-\n- \"attendees\": \"5k+\",\n \"location\": \"Nagpur, India\",\n \"recurring\": \"false\",\n \"allDay\": \"true\",\n@@ -163,23 +185,26 @@ const eventsDemoData = [\n \"isPublic\": \"true\",\n \"isSubscribed\": \"true\",\n \"isRegisterable\": \"true\",\n-\n \"creator\": {\n \"firstName\": \"Utkarsh\",\n \"lastName\": \"Shendge\",\n \"_id\": \"asdasdasd\",\n },\n- \"registrants\": [\n- {\"firstName\": \"Utkarsh\", \"lastName\": \"Shendge\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Bustin\", \"lastName\": \"Jiber\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Warren\", \"lastName\": \"Buff\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Utkarsh\", \"lastName\": \"Shendge\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Bustin\", \"lastName\": \"Jiber\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Warren\", \"lastName\": \"Buff\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Utkarsh\", \"lastName\": \"Shendge\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Bustin\", \"lastName\": \"Jiber\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Warren\", \"lastName\": \"Buff\", \"_id\": \"asdasdasd\"},\n- {\"firstName\": \"Bustin\", \"lastName\": \"Jiber\", \"_id\": \"asdasdasd\"},\n+ \"attendees\": [\n+ {\"id\": \"attendee1\", \"firstName\": \"firstName1\", \"lastName\": \"lastName1\"},\n+ {\"id\": \"attendee2\", \"firstName\": \"firstName2\", \"lastName\": \"lastName2\"},\n+ {\"id\": \"attendee3\", \"firstName\": \"firstName3\", \"lastName\": \"lastName3\"},\n+ {\"id\": \"attendee4\", \"firstName\": \"firstName4\", \"lastName\": \"lastName4\"},\n+ {\"id\": \"attendee5\", \"firstName\": \"firstName5\", \"lastName\": \"lastName5\"},\n+ {\"id\": \"attendee6\", \"firstName\": \"firstName6\", \"lastName\": \"lastName6\"},\n+ {\"id\": \"attendee7\", \"firstName\": \"firstName7\", \"lastName\": \"lastName7\"},\n+ {\"id\": \"attendee8\", \"firstName\": \"firstName8\", \"lastName\": \"lastName8\"},\n+ {\"id\": \"attendee9\", \"firstName\": \"firstName9\", \"lastName\": \"lastName9\"},\n+ {\n+ \"id\": \"attendee10\",\n+ \"firstName\": \"firstName10\",\n+ \"lastName\": \"lastName10\",\n+ },\n ],\n \"admins\": [\n {\"firstName\": \"Utkarsh\", \"lastName\": \"Shendge\", \"_id\": \"asdasdasd\"},\ndiff --git a/lib/enums/enums.dart b/lib/enums/enums.dart\nindex bd58e38a20..f2bb7274eb 100644\n--- a/lib/enums/enums.dart\n+++ b/lib/enums/enums.dart\n@@ -1,25 +1,71 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n-///This file contains different enums.\n-///The enum keyword is used to define an enumeration type in Dart.\n-/// The use case of enumeration is to store finite data members under the same type definition.\n-\n-/// Represents the state of the view\n+/// Represents the state of the view.\n enum ViewState {\n+ /// The view is not doing anything.\n idle,\n+\n+ /// The view is loading something.\n busy,\n }\n \n-/// Represents the state of the chat\n-enum ChatState { initial, loading, complete }\n+/// Represents the state of the chat.\n+enum ChatState {\n+ /// The chat is at initial state.\n+ initial,\n+\n+ /// The chat is loading something.\n+ loading,\n+\n+ /// The chat state is complete.\n+ complete\n+}\n+\n+/// Represents the type of the tile.\n+enum TileType {\n+ /// Represents the tile of the user.\n+ user,\n+\n+ /// Represents the tile of the attendee.\n+ attendee,\n \n-/// Represents the type of the tile\n-enum TileType { user, org, option }\n+ /// Represents the tile of the organization.\n+ org,\n+\n+ /// Represents the tile of the option.\n+ option\n+}\n \n-/// Represents the type of the Message\n-enum MessageType { error, warning, info, random }\n+/// Represents the type of the Message.\n+enum MessageType {\n+ /// Represents error message.\n+ error,\n \n-enum CallFor { login, signup, joinPublicOrg }\n+ /// Represents warning message.\n+ warning,\n \n-enum ModalSheet { donation, invite }\n+ /// Represents info message.\n+ info,\n+\n+ /// Represents random message.\n+ random\n+}\n+\n+/// Represents the type of CallFor.\n+enum CallFor {\n+ /// Represents the call for login.\n+ login,\n+\n+ /// Represents the call for signup.\n+ signup,\n+\n+ /// Represents the call for joining Public organization.\n+ joinPublicOrg\n+}\n+\n+/// Represents the type of ModalSheet.\n+enum ModalSheet {\n+ /// Represents the modal sheet for donation.\n+ donation,\n+\n+ /// Represents the modal sheet for invite.\n+ invite\n+}\ndiff --git a/lib/models/events/event_model.dart b/lib/models/events/event_model.dart\nindex 5642a462eb..4c4bbb727d 100644\n--- a/lib/models/events/event_model.dart\n+++ b/lib/models/events/event_model.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'package:talawa/models/organization/org_info.dart';\n import 'package:talawa/models/user/user_info.dart';\n \n@@ -27,7 +24,6 @@ class Event {\n this.creator,\n this.organization,\n this.admins,\n- this.registrants,\n });\n //Creating a new Event instance from a map structure.\n factory Event.fromJson(\n@@ -37,7 +33,6 @@ class Event {\n id: json['_id'] as String,\n title: json['title'] as String?,\n description: json['description'] as String?,\n- attendees: json['attendees'] as String?,\n location: json['location'] as String?,\n longitude: json['longitude'] as double?,\n latitude: json['latitude'] as double?,\n@@ -53,14 +48,12 @@ class Event {\n isRegisterable: json['isRegisterable'] as bool?,\n creator: json['creator'] == null\n ? null\n- //Creating a new User instance from a map structure.\n : User.fromJson(\n json['creator'] as Map,\n fromOrg: true,\n ),\n organization: json['organization'] == null\n ? null\n- //Creating a new OrgInfo instance from a map structure.\n : OrgInfo.fromJson(json['organization'] as Map),\n admins: json['admins'] == null\n ? null\n@@ -69,30 +62,116 @@ class Event {\n (e) => User.fromJson(e as Map, fromOrg: true),\n )\n .toList(),\n- registrants: (json['registrants'] as List?)\n- ?.map((e) => User.fromJson(e as Map, fromOrg: false))\n- .toList(),\n+ attendees: (json[\"attendees\"] as List?)?.isEmpty ?? true\n+ ? null\n+ : (json['attendees'] as List?)\n+ ?.map(\n+ (e) => Attendee.fromJson(e as Map),\n+ )\n+ .toList(),\n );\n }\n+\n+ ///Unique identifier for the event.\n String? id;\n+\n+ /// The title of the event.\n String? title;\n+\n+ /// The description of the event.\n String? description;\n- String? attendees;\n+\n+ /// The location of the event.\n String? location;\n+\n+ /// The latitude of the event.\n double? latitude;\n+\n+ /// The longitude of the event.\n double? longitude;\n+\n+ /// A boolean value that indicates if the event is recurring.\n bool? recurring;\n+\n+ /// A boolean value that indicates if the event is an all-day event.\n bool? allDay;\n+\n+ /// The start date of the event.\n String? startDate;\n+\n+ /// The end date of the event.\n String? endDate;\n+\n+ /// The start time of the event.\n String? startTime;\n+\n+ /// The end time of the event.\n String? endTime;\n+\n+ /// The recurrence of the event.\n String? recurrence;\n+\n+ /// A boolean value that indicates if the event is public.\n bool? isPublic;\n+\n+ /// A boolean value that indicates if the user is registered for the event.\n bool? isRegistered;\n+\n+ /// A boolean value that indicates if the event is registerable.\n bool? isRegisterable;\n+\n+ /// The creator of the event.\n User? creator;\n+\n+ /// The organization of the event.\n OrgInfo? organization;\n+\n+ /// The admins of the event.\n List? admins;\n- List? registrants;\n+\n+ /// The attendees of the event.\n+ List? attendees;\n+}\n+\n+///This class creates an attendee model and returns an Attendee instance.\n+class Attendee {\n+ Attendee({this.id, this.firstName, this.lastName, this.image});\n+\n+ Attendee.fromJson(Map json) {\n+ id = json['_id'] as String?;\n+ firstName = json['firstName'] as String?;\n+ lastName = json['lastName'] as String?;\n+ image = json['image'] as String?;\n+ }\n+\n+ ///Unique identifier for the attendee.\n+ String? id;\n+\n+ /// The first name of the attendee.\n+ String? firstName;\n+\n+ /// The last name of the attendee.\n+ String? lastName;\n+\n+ /// The image of the attendee.\n+ String? image;\n+\n+ /// Converts the Attendee instance to a map structure..\n+ ///\n+ /// This method is used to convert the Attendee instance to a map structure that can be converted to a JSON object.\n+ ///\n+ /// **params**:\n+ /// None\n+ ///\n+ /// **returns**:\n+ /// * `Map`: A map structure that can be converted to a JSON object.\n+\n+ Map toJson() {\n+ final Map data = {};\n+ data['_id'] = this.id;\n+ data['firstName'] = this.firstName;\n+ data['lastName'] = this.lastName;\n+ data['image'] = this.image;\n+ return data;\n+ }\n }\ndiff --git a/lib/services/event_service.dart b/lib/services/event_service.dart\nindex 11070dde70..eff3153edd 100644\n--- a/lib/services/event_service.dart\n+++ b/lib/services/event_service.dart\n@@ -1,5 +1,4 @@\n import 'dart:async';\n-\n import 'package:flutter/material.dart';\n import 'package:graphql_flutter/graphql_flutter.dart';\n import 'package:talawa/constants/routing_constants.dart';\n@@ -17,7 +16,7 @@ import 'package:talawa/widgets/custom_progress_dialog.dart';\n /// Services include:\n /// * `setOrgStreamSubscription` : to set organization stream subscription for user.\n /// * `getEvents` : to get all events of the organization.\n-/// * `fetchRegistrantsByEvent` : to fetch all registrants of an event.\n+/// * `fetchAttendeesByEvent` : to fetch all attendees of an event.\n /// * `registerForAnEvent` : to register for an event.\n /// * `deleteEvent` : to delete an event.\n /// * `editEvent` : to edit the event.\n@@ -78,12 +77,14 @@ class EventService {\n final result = await _dbFunctions.gqlAuthMutation(mutation);\n \n if (result == null) return;\n+\n final List eventsJson =\n- (result as QueryResult).data![\"eventsByOrganization\"] as List;\n+ (result as QueryResult).data![\"eventsByOrganizationConnection\"] as List;\n+ debugPrint('Events: $eventsJson');\n eventsJson.forEach((eventJsonData) {\n final Event event = Event.fromJson(eventJsonData as Map);\n- event.isRegistered = event.registrants?.any(\n- (registrant) => registrant.id == _userConfig.currentUser.id,\n+ event.isRegistered = event.attendees?.any(\n+ (attendee) => attendee.id == _userConfig.currentUser.id,\n ) ??\n false;\n _eventStreamController.add(event);\n@@ -97,9 +98,9 @@ class EventService {\n ///\n /// **returns**:\n /// * `Future`: Information about event registrants.\n- Future fetchRegistrantsByEvent(String eventId) async {\n+ Future fetchAttendeesByEvent(String eventId) async {\n final result = await _dbFunctions.gqlAuthQuery(\n- EventQueries().registrantsByEvent(eventId),\n+ EventQueries().attendeesByEvent(eventId),\n );\n return result;\n }\ndiff --git a/lib/utils/event_queries.dart b/lib/utils/event_queries.dart\nindex 65bbe3d441..c68b8e3781 100644\n--- a/lib/utils/event_queries.dart\n+++ b/lib/utils/event_queries.dart\n@@ -14,38 +14,49 @@ class EventQueries {\n String fetchOrgEvents(String orgId) {\n return \"\"\"\n query {\n- eventsByOrganization(id: \"$orgId\"){ \n- _id\n- organization {\n- _id\n- image\n- }\n- title\n- description\n- isPublic\n- isRegisterable\n- recurring\n- startDate\n- endDate\n- allDay\n- startTime\n- endTime\n- location\n- creator{\n- _id\n- firstName\n- lastName\n- }\n- admins {\n- firstName\n- lastName\n- }\n- }\n+ eventsByOrganizationConnection(\n+ where: {\n+ organization_id: \"$orgId\"\n+ }\n+ ) {\n+ _id\n+ organization {\n+ _id\n+ image\n+ }\n+ title\n+ description\n+ isPublic\n+ isRegisterable\n+ recurring\n+ startDate\n+ endDate\n+ allDay\n+ startTime\n+ endTime\n+ location\n+ creator {\n+ _id\n+ firstName\n+ lastName\n+ }\n+ admins {\n+ _id\n+ firstName\n+ lastName\n+ } \n+ attendees {\n+ _id\n+ firstName\n+ lastName\n+ image\n+ }\n+ }\n }\n \"\"\";\n }\n \n- /// Fetches registrants by event ID.\n+ /// Fetches attendees by event ID.\n ///\n /// **params**:\n /// * `eventId`: The ID of the event to fetch registrants for.\n@@ -55,14 +66,16 @@ class EventQueries {\n ///\n /// This function generates a GraphQL query string to fetch registrants\n /// based on the provided event ID.\n- String registrantsByEvent(String eventId) {\n+ String attendeesByEvent(String eventId) {\n return '''\n query {\n- registrantsByEvent(id: \"$eventId\") {\n- _id\n- firstName\n- lastName\n- image\n+ getEventAttendeesByEventId(eventId: \"$eventId\") {\n+ eventId\n+ userId\n+ isRegistered\n+ isInvited\n+ isCheckedIn\n+ isCheckedOut\n }\n }\n ''';\ndiff --git a/lib/view_model/after_auth_view_models/event_view_models/event_info_view_model.dart b/lib/view_model/after_auth_view_models/event_view_models/event_info_view_model.dart\nindex ca45fdf846..1eb36c925f 100644\n--- a/lib/view_model/after_auth_view_models/event_view_models/event_info_view_model.dart\n+++ b/lib/view_model/after_auth_view_models/event_view_models/event_info_view_model.dart\n@@ -1,52 +1,52 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'package:flutter/material.dart';\n-import 'package:graphql_flutter/graphql_flutter.dart';\n import 'package:talawa/enums/enums.dart';\n import 'package:talawa/locator.dart';\n import 'package:talawa/models/events/event_model.dart';\n-import 'package:talawa/models/user/user_info.dart';\n import 'package:talawa/services/event_service.dart';\n import 'package:talawa/services/user_config.dart';\n import 'package:talawa/view_model/after_auth_view_models/event_view_models/explore_events_view_model.dart';\n import 'package:talawa/view_model/base_view_model.dart';\n import 'package:talawa/widgets/custom_progress_dialog.dart';\n \n-/// EventInfoViewModel class helps interacting with model to serve view with the event information data.'\n-///\n-/// Methods include:\n-/// * `registerForEvent` : to register user for an event.\n-/// * `getFabTitle` : to get the status of \"registration\" for an event.\n+/// EventInfoViewModel class helps interacting with model to serve view with the event information data.\n class EventInfoViewModel extends BaseModel {\n+ /// ExploreEventsViewModel instance to fetch the event data.\n late ExploreEventsViewModel exploreEventsInstance;\n+\n+ /// Event instance to store the event data.\n late Event event;\n+\n+ /// String type variable to store the FAB title.\n late String fabTitle;\n- late List registrants;\n \n- /// initialise with the event data fetched from the model.\n+ /// List of Attendee type to store the attendees data.\n+ late List attendees = [];\n+\n+ /// This function initializes the EventInfoViewModel class with the required arguments.\n+ ///\n+ /// **params**:\n+ /// * `args`: A map of arguments required to initialize the EventInfoViewModel class.\n+ ///\n+ /// **returns**:\n+ /// None\n Future initialize({required Map args}) async {\n event = args[\"event\"] as Event;\n exploreEventsInstance =\n args[\"exploreEventViewModel\"] as ExploreEventsViewModel;\n fabTitle = getFabTitle();\n setState(ViewState.busy);\n- final fetchRegistrantsByEventQueryResult = await locator()\n- .fetchRegistrantsByEvent(event.id!) as QueryResult;\n- final registrantsJsonList = fetchRegistrantsByEventQueryResult\n- .data!['registrantsByEvent'] as List;\n- registrants = registrantsJsonList\n- .map(\n- (registrantJson) => User.fromJson(\n- registrantJson! as Map,\n- fromOrg: true,\n- ),\n- )\n- .toList();\n+\n+ attendees = event.attendees ?? [];\n setState(ViewState.idle);\n }\n \n- /// This function helps the user to register for an event.\n+ /// The function allows user to register for an event.\n+ ///\n+ /// **params**:\n+ /// None\n+ ///\n+ /// **returns**:\n+ /// None\n Future registerForEvent() async {\n // if event registration is open and user not already registered for the event.\n if (event.isRegisterable == true && event.isRegistered == false) {\n@@ -59,11 +59,16 @@ class EventInfoViewModel extends BaseModel {\n // use `registerForAnEvent` function provided by `EventService` service.\n final registerResult =\n await locator().registerForAnEvent(event.id!);\n- //final registerResult = await EventService().registerForAnEvent(event.id!);\n- // if the registration is successful.\n if (registerResult != null) {\n event.isRegistered = true;\n- registrants.add(locator().currentUser);\n+ attendees.add(\n+ Attendee(\n+ id: UserConfig().currentUser.id,\n+ firstName: UserConfig().currentUser.firstName,\n+ lastName: UserConfig().currentUser.lastName,\n+ image: UserConfig().currentUser.image,\n+ ),\n+ );\n }\n print(registerResult);\n fabTitle = getFabTitle();\n@@ -72,7 +77,13 @@ class EventInfoViewModel extends BaseModel {\n }\n }\n \n- /// This function returns `String` type for the event registration status.\n+ /// The funtion returns title to be displayed on Floating Action Button.\n+ ///\n+ /// **params**:\n+ /// None\n+ ///\n+ /// **returns**:\n+ /// * `String`: Returns the title to be displayed on Floating Action Button.\n String getFabTitle() {\n if (event.isRegisterable == false) {\n return \"Not Registrable\";\ndiff --git a/lib/views/after_auth_screens/events/event_info_body.dart b/lib/views/after_auth_screens/events/event_info_body.dart\nindex 7a297299fe..0c1b2063c1 100644\n--- a/lib/views/after_auth_screens/events/event_info_body.dart\n+++ b/lib/views/after_auth_screens/events/event_info_body.dart\n@@ -237,16 +237,16 @@ class EventInfoBody extends StatelessWidget {\n ListView.builder(\n padding: EdgeInsets.zero,\n shrinkWrap: true,\n- itemCount: model.registrants.length,\n+ itemCount: model.attendees.length,\n itemBuilder: (BuildContext context, int index) {\n return CustomListTile(\n key: Key(\n '${AppLocalizations.of(context)!.strictTranslate(\"Attendee\")}$index',\n ),\n index: index,\n- type: TileType.user,\n- userInfo: model.registrants[index],\n- onTapUserInfo: () {},\n+ type: TileType.attendee,\n+ attendeeInfo: model.attendees[index],\n+ onTapAttendeeInfo: () {},\n );\n },\n ),\ndiff --git a/lib/widgets/custom_list_tile.dart b/lib/widgets/custom_list_tile.dart\nindex 26eb497368..d4d75bee5c 100644\n--- a/lib/widgets/custom_list_tile.dart\n+++ b/lib/widgets/custom_list_tile.dart\n@@ -1,6 +1,6 @@\n-// ignore_for_file: talawa_good_doc_comments, talawa_api_doc\n import 'package:flutter/material.dart';\n import 'package:talawa/enums/enums.dart';\n+import 'package:talawa/models/events/event_model.dart';\n import 'package:talawa/models/options/options.dart';\n import 'package:talawa/models/organization/org_info.dart';\n import 'package:talawa/models/user/user_info.dart';\n@@ -15,11 +15,13 @@ class CustomListTile extends StatelessWidget {\n required this.type,\n this.showIcon = false,\n this.orgInfo,\n- this.onTapOrgInfo,\n this.userInfo,\n+ this.attendeeInfo,\n+ this.option,\n+ this.onTapOrgInfo,\n this.onTapUserInfo,\n+ this.onTapAttendeeInfo,\n this.onTapOption,\n- this.option,\n }) : super(key: key);\n \n /// Index int of tiles.\n@@ -34,6 +36,9 @@ class CustomListTile extends StatelessWidget {\n /// Object containing all the necessary info regarding the user.\n final User? userInfo;\n \n+ /// Object containing all the necessary info regarding the Attendee.\n+ final Attendee? attendeeInfo;\n+\n /// Object containing all the necessary info regarding the options.\n final Options? option;\n \n@@ -43,6 +48,9 @@ class CustomListTile extends StatelessWidget {\n /// Function to handle the tap on user info.\n final Function()? onTapUserInfo;\n \n+ /// Function to handle the tap on attendee info.\n+ final Function()? onTapAttendeeInfo;\n+\n /// Function to handle the tap on org info.\n final Function(OrgInfo)? onTapOrgInfo;\n \n@@ -51,13 +59,31 @@ class CustomListTile extends StatelessWidget {\n \n @override\n Widget build(BuildContext context) {\n+ String text = '';\n+ Function()? onTap;\n+\n+ switch (type) {\n+ case TileType.org:\n+ text = orgInfo!.name!;\n+ onTap = () => onTapOrgInfo!(orgInfo!);\n+ break;\n+ case TileType.user:\n+ text = '${userInfo!.firstName!} ${userInfo!.lastName!}';\n+ onTap = onTapUserInfo;\n+ break;\n+ case TileType.attendee:\n+ text = '${attendeeInfo!.firstName!} ${attendeeInfo!.lastName!}';\n+ onTap = onTapAttendeeInfo;\n+ break;\n+ default:\n+ text = option!.title;\n+ onTap = onTapOption;\n+ break;\n+ }\n+\n return InkWell(\n // checking whether the tapped tile is of user or org.\n- onTap: () => type == TileType.org\n- ? onTapOrgInfo!(orgInfo!)\n- : type == TileType.user\n- ? onTapUserInfo!()\n- : onTapOption!(),\n+ onTap: onTap,\n child: Padding(\n padding: const EdgeInsets.all(18.0),\n child: Container(\n@@ -75,17 +101,13 @@ class CustomListTile extends StatelessWidget {\n horizontal: 25,\n ),\n child: Text(\n- type == TileType.org\n- ? orgInfo!.name!\n- : type == TileType.user\n- ? '${userInfo!.firstName!} ${userInfo!.lastName!}'\n- : option!.title,\n+ text,\n style: type == TileType.org\n ? Theme.of(context)\n .textTheme\n .headlineSmall!\n .copyWith(fontSize: 18, color: Colors.black)\n- : type == TileType.user\n+ : type == TileType.user || type == TileType.attendee\n ? Theme.of(context)\n .textTheme\n .titleLarge!\n@@ -107,7 +129,7 @@ class CustomListTile extends StatelessWidget {\n ),\n Expanded(\n flex: 1,\n- child: type != TileType.user\n+ child: type != TileType.user && type != TileType.attendee\n ? type == TileType.org\n ? Icon(\n !orgInfo!.userRegistrationRequired!\ndiff --git a/lib/widgets/event_card.dart b/lib/widgets/event_card.dart\nindex b6566c53e0..676e24b6a1 100644\n--- a/lib/widgets/event_card.dart\n+++ b/lib/widgets/event_card.dart\n@@ -247,15 +247,10 @@ class EventCard extends StatelessWidget {\n SizedBox(\n width: SizeConfig.screenWidth! * 0.013,\n ),\n- event.attendees != null\n- ? Text(\n- event.attendees!,\n- style: Theme.of(context).textTheme.bodySmall,\n- )\n- : Text(\n- (event.registrants?.length ?? 0).toString(),\n- style: Theme.of(context).textTheme.bodySmall,\n- ),\n+ Text(\n+ (event.attendees?.length ?? 0).toString(),\n+ style: Theme.of(context).textTheme.bodySmall,\n+ ),\n ],\n ),\n ],\n", "test_patch": "diff --git a/test/helpers/test_helpers.dart b/test/helpers/test_helpers.dart\nindex ee66b2ffb4..dfdae1de6c 100644\n--- a/test/helpers/test_helpers.dart\n+++ b/test/helpers/test_helpers.dart\n@@ -1,8 +1,4 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'dart:async';\n-\n import 'package:connectivity_plus/connectivity_plus.dart';\n import 'package:flutter/material.dart';\n import 'package:graphql_flutter/graphql_flutter.dart';\n@@ -97,13 +93,26 @@ import 'test_helpers.mocks.dart';\n MockSpec(onMissingStub: OnMissingStub.returnDefault),\n ],\n )\n+\n+/// member1 represents a member of the organization.\n final User member1 = User(id: \"testMem1\");\n+\n+/// member2 represents a member of the organization.\n final User member2 = User(id: \"testMem2\");\n+\n+/// admin1 represents an admin of the organization.\n final User admin1 = User(id: \"testAdmin1\");\n+\n+/// admin2 represents an admin of the organization.\n final User admin2 = User(id: \"testAdmin2\");\n+\n+/// members represents a list of members of the organization.\n final List members = [member1, member2];\n+\n+/// admins represents a list of admins of the organization.\n final List admins = [admin1, admin2];\n \n+/// fakeOrgInfo represents a mock organization.\n final fakeOrgInfo = OrgInfo(\n id: \"XYZ\",\n name: \"Organization Name\",\n@@ -116,12 +125,26 @@ final fakeOrgInfo = OrgInfo(\n userRegistrationRequired: true,\n );\n \n+/// `removeRegistrationIfExists` removes the registration of a service if it is already registered.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// None\n void _removeRegistrationIfExists() {\n if (locator.isRegistered()) {\n locator.unregister();\n }\n }\n \n+/// `getAndRegisterNavigationService` returns a mock instance of the `NavigationService` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `NavigationService`: A mock instance of the `NavigationService` class.\n NavigationService getAndRegisterNavigationService() {\n _removeRegistrationIfExists();\n final service = MockNavigationService();\n@@ -136,6 +159,13 @@ NavigationService getAndRegisterNavigationService() {\n return service;\n }\n \n+/// `getAndRegisterOrganizationService` returns a mock instance of the `OrganizationService` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `OrganizationService`: A mock instance of the `OrganizationService` class.\n OrganizationService getAndRegisterOrganizationService() {\n _removeRegistrationIfExists();\n final service = MockOrganizationService();\n@@ -160,6 +190,13 @@ OrganizationService getAndRegisterOrganizationService() {\n return service;\n }\n \n+/// `getAndRegisterAppTheme` returns a mock instance of the `AppTheme` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `AppTheme`: A mock instance of the `AppTheme` class.\n AppTheme getAndRegisterAppTheme() {\n _removeRegistrationIfExists();\n final service = MockAppTheme();\n@@ -167,6 +204,13 @@ AppTheme getAndRegisterAppTheme() {\n return service;\n }\n \n+/// `getAndRegisterCommentService` returns a mock instance of the `CommentService` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `CommentService`: A mock instance of the `CommentService` class.\n CommentService getAndRegisterCommentService() {\n _removeRegistrationIfExists();\n final service = MockCommentService();\n@@ -174,6 +218,13 @@ CommentService getAndRegisterCommentService() {\n return service;\n }\n \n+/// `getAndRegisterSessionManager` returns a mock instance of the `SessionManager` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `SessionManager`: A mock instance of the `SessionManager` class.\n SessionManager getAndRegisterSessionManager() {\n _removeRegistrationIfExists();\n final service = MockSessionManger();\n@@ -181,6 +232,13 @@ SessionManager getAndRegisterSessionManager() {\n return service;\n }\n \n+/// `getAndRegisterChatService` returns a mock instance of the `ChatService` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `ChatService`: A mock instance of the `ChatService` class.\n ChatService getAndRegisterChatService() {\n _removeRegistrationIfExists();\n final service = MockChatService();\n@@ -214,6 +272,13 @@ ChatService getAndRegisterChatService() {\n return service;\n }\n \n+/// `getAndRegisterAppLanguage` returns a mock instance of the `AppLanguage` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `AppLanguage`: A mock instance of the `AppLanguage` class.\n AppLanguage getAndRegisterAppLanguage() {\n _removeRegistrationIfExists();\n final service = MockAppLanguage();\n@@ -224,6 +289,13 @@ AppLanguage getAndRegisterAppLanguage() {\n return service;\n }\n \n+/// `getAndRegisterGraphqlConfig` returns a mock instance of the `GraphqlConfig` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `GraphqlConfig`: A mock instance of the `GraphqlConfig` class.\n GraphqlConfig getAndRegisterGraphqlConfig() {\n _removeRegistrationIfExists();\n final service = MockGraphqlConfig();\n@@ -261,6 +333,13 @@ GraphqlConfig getAndRegisterGraphqlConfig() {\n return service;\n }\n \n+/// `getAndRegisterGraphQLClient` returns a mock instance of the `GraphQLClient` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `GraphQLClient`: A mock instance of the `GraphQLClient` class.\n GraphQLClient getAndRegisterGraphQLClient() {\n _removeRegistrationIfExists();\n \n@@ -312,6 +391,13 @@ GraphQLClient getAndRegisterGraphQLClient() {\n return service;\n }\n \n+/// `getAndRegisterDatabaseMutationFunctions` returns a mock instance of the `DataBaseMutationFunctions` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `DataBaseMutationFunctions`: A mock instance of the `DataBaseMutationFunctions` class.\n DataBaseMutationFunctions getAndRegisterDatabaseMutationFunctions() {\n _removeRegistrationIfExists();\n final service = MockDataBaseMutationFunctions();\n@@ -325,6 +411,13 @@ DataBaseMutationFunctions getAndRegisterDatabaseMutationFunctions() {\n return service;\n }\n \n+/// `getAndRegisterUserConfig` returns a mock instance of the `UserConfig` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `UserConfig`: A mock instance of the `UserConfig` class.\n UserConfig getAndRegisterUserConfig() {\n _removeRegistrationIfExists();\n final service = MockUserConfig();\n@@ -408,6 +501,13 @@ UserConfig getAndRegisterUserConfig() {\n return service;\n }\n \n+/// `getAndRegisterPostService` returns a mock instance of the `PostService` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `PostService`: A mock instance of the `PostService` class.\n PostService getAndRegisterPostService() {\n _removeRegistrationIfExists();\n final service = MockPostService();\n@@ -427,6 +527,13 @@ PostService getAndRegisterPostService() {\n return service;\n }\n \n+/// `getAndRegisterMultiMediaPickerService` returns a mock instance of the `MultiMediaPickerService` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `MultiMediaPickerService`: A mock instance of the `MultiMediaPickerService` class.\n MultiMediaPickerService getAndRegisterMultiMediaPickerService() {\n _removeRegistrationIfExists();\n final service = MockMultiMediaPickerService();\n@@ -434,6 +541,13 @@ MultiMediaPickerService getAndRegisterMultiMediaPickerService() {\n return service;\n }\n \n+/// `getAndRegisterImageCropper` returns a mock instance of the `ImageCropper` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `ImageCropper`: A mock instance of the `ImageCropper` class.\n ImageCropper getAndRegisterImageCropper() {\n _removeRegistrationIfExists();\n final service = MockImageCropper();\n@@ -441,6 +555,13 @@ ImageCropper getAndRegisterImageCropper() {\n return service;\n }\n \n+/// `getAndRegisterImageService` returns a mock instance of the `ImageService` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `ImageService`: A mock instance of the `ImageService` class.\n ImageService getAndRegisterImageService() {\n _removeRegistrationIfExists();\n final service = MockImageService();\n@@ -448,6 +569,13 @@ ImageService getAndRegisterImageService() {\n return service;\n }\n \n+/// `getAndRegisterImagePicker` returns a mock instance of the `ImagePicker` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `ImagePicker`: A mock instance of the `ImagePicker` class.\n ImagePicker getAndRegisterImagePicker() {\n _removeRegistrationIfExists();\n final service = MockImagePicker();\n@@ -455,6 +583,13 @@ ImagePicker getAndRegisterImagePicker() {\n return service;\n }\n \n+/// `getAndRegisterEventService` returns a mock instance of the `EventService` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `EventService`: A mock instance of the `EventService` class.\n EventService getAndRegisterEventService() {\n _removeRegistrationIfExists();\n final service = MockEventService();\n@@ -493,21 +628,19 @@ EventService getAndRegisterEventService() {\n ),\n );\n const data = {\n- 'registrantsByEvent': [\n+ 'getEventAttendeesByEventId': [\n {\n- '_id': 'xzy1',\n- 'firstName': 'Test',\n- 'lastName': 'User',\n+ 'userId': 'xzy1',\n }\n ],\n };\n- when(service.fetchRegistrantsByEvent('1')).thenAnswer(\n+ when(service.fetchAttendeesByEvent('1')).thenAnswer(\n (realInvocation) async => QueryResult(\n source: QueryResultSource.network,\n data: data,\n options: QueryOptions(\n document: gql(\n- EventQueries().registrantsByEvent('1'),\n+ EventQueries().attendeesByEvent('1'),\n ),\n ),\n ),\n@@ -517,6 +650,13 @@ EventService getAndRegisterEventService() {\n return service;\n }\n \n+/// `getAndRegisterConnectivityService` returns a mock instance of the `Connectivity` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `Connectivity`: A mock instance of the `Connectivity` class.\n Connectivity getAndRegisterConnectivityService() {\n _removeRegistrationIfExists();\n final service = MockConnectivity();\n@@ -524,6 +664,15 @@ Connectivity getAndRegisterConnectivityService() {\n return service;\n }\n \n+/// `getPostMockModel` returns a mock instance of the `Post` class.\n+///\n+/// **params**:\n+/// * `sId`: represent the post id.\n+/// * `description`: represent the post description.\n+/// * `duration`: represent the post duration.\n+///\n+/// **returns**:\n+/// * `Post`: A mock instance of the `Post` class.\n Post getPostMockModel({\n String sId = \"PostID\",\n String description = \"TestDescription\",\n@@ -542,6 +691,13 @@ Post getPostMockModel({\n return postMock;\n }\n \n+/// `getAndRegisterCreateEventModel` returns a mock instance of the `CreateEventViewModel` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `CreateEventViewModel`: A mock instance of the `CreateEventViewModel` class.\n CreateEventViewModel getAndRegisterCreateEventModel() {\n _removeRegistrationIfExists();\n final cachedViewModel = MockCreateEventViewModel();\n@@ -571,7 +727,6 @@ CreateEventViewModel getAndRegisterCreateEventModel() {\n id: \"fakeUser1\",\n firstName: 'r',\n lastName: 'p',\n- // image: 'www.image.com',\n );\n \n final mapType = {user1.id!: true};\n@@ -581,14 +736,10 @@ CreateEventViewModel getAndRegisterCreateEventModel() {\n return [user1];\n });\n \n- //when(cachedViewModel.selectedAdmins).thenReturn([user2]);\n when(cachedViewModel.selectedMembers).thenReturn([user1]);\n when(cachedViewModel.orgMembersList).thenReturn([user1]);\n-\n when(cachedViewModel.memberCheckedMap).thenReturn(mapType);\n-\n when(cachedViewModel.isAllDay).thenReturn(true);\n-\n when(cachedViewModel.eventStartTime).thenReturn(TimeOfDay.now());\n \n when(cachedViewModel.eventEndTime).thenReturn(\n@@ -608,15 +759,17 @@ CreateEventViewModel getAndRegisterCreateEventModel() {\n print('called');\n });\n \n- // when(cachedViewModel.removeUserFromList(userId: \"fakeUser2\"))\n- // .thenAnswer((realInvocation) async {\n- // when(cachedViewModel.selectedAdmins).thenReturn([]);\n- // });\n-\n locator.registerSingleton(cachedViewModel);\n return cachedViewModel;\n }\n \n+/// `getAndRegisterDirectChatViewModel` returns a mock instance of the `DirectChatViewModel` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `DirectChatViewModel`: A mock instance of the `DirectChatViewModel` class.\n DirectChatViewModel getAndRegisterDirectChatViewModel() {\n _removeRegistrationIfExists();\n final cachedViewModel = MockDirectChatViewModel();\n@@ -641,7 +794,6 @@ DirectChatViewModel getAndRegisterDirectChatViewModel() {\n when(cachedViewModel.name).thenReturn(\"XYZ\");\n when(cachedViewModel.chats).thenReturn([chatListTileDataModel1]);\n when(cachedViewModel.chatMessagesByUser).thenReturn(messages);\n-\n when(cachedViewModel.initialise()).thenAnswer((realInvocation) async {});\n when(cachedViewModel.sendMessageToDirectChat(\"XYZ\", \"Something\"))\n .thenAnswer((realInvocation) async {\n@@ -655,6 +807,13 @@ DirectChatViewModel getAndRegisterDirectChatViewModel() {\n return cachedViewModel;\n }\n \n+/// `getAndRegisterExploreEventsViewModel` returns a mock instance of the `ExploreEventsViewModel` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `ExploreEventsViewModel`: A mock instance of the `ExploreEventsViewModel` class.\n ExploreEventsViewModel getAndRegisterExploreEventsViewModel() {\n _removeRegistrationIfExists();\n final cachedViewModel = MockExploreEventsViewModel();\n@@ -672,6 +831,13 @@ ExploreEventsViewModel getAndRegisterExploreEventsViewModel() {\n return cachedViewModel;\n }\n \n+/// `getAndRegisterMainViewModel` returns a mock instance of the `MainScreenViewModel` class.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// * `MainScreenViewModel`: A mock instance of the `MainScreenViewModel` class.\n MainScreenViewModel getAndRegisterMainViewModel() {\n _removeRegistrationIfExists();\n final cachedViewModel = MockMainScreenViewModel();\n@@ -680,6 +846,13 @@ MainScreenViewModel getAndRegisterMainViewModel() {\n return cachedViewModel;\n }\n \n+/// `registerServices` registers all the services required for the test.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// None\n void registerServices() {\n getAndRegisterNavigationService();\n getAndRegisterAppLanguage();\n@@ -698,6 +871,13 @@ void registerServices() {\n getAndRegisterImagePicker();\n }\n \n+/// `unregisterServices` unregisters all the services required for the test.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// None\n void unregisterServices() {\n locator.unregister();\n locator.unregister();\n@@ -713,6 +893,13 @@ void unregisterServices() {\n locator.unregister();\n }\n \n+/// registerViewModels registers all the view models required for the test.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// None\n void registerViewModels() {\n locator.registerFactory(() => MainScreenViewModel());\n locator.registerFactory(() => OrganizationFeedViewModel());\n@@ -732,6 +919,13 @@ void registerViewModels() {\n locator.registerFactory(() => SelectContactViewModel());\n }\n \n+/// `unregisterViewModels` unregisters all the view models required for the test.\n+///\n+/// **params**:\n+/// None\n+///\n+/// **returns**:\n+/// None\n void unregisterViewModels() {\n locator.unregister();\n locator.unregister();\ndiff --git a/test/helpers/test_helpers.mocks.dart b/test/helpers/test_helpers.mocks.dart\nindex eaac44810f..a62b803184 100644\n--- a/test/helpers/test_helpers.mocks.dart\n+++ b/test/helpers/test_helpers.mocks.dart\n@@ -1158,10 +1158,10 @@ class MockEventService extends _i2.Mock implements _i11.EventService {\n ) as _i5.Future);\n \n @override\n- _i5.Future fetchRegistrantsByEvent(String? eventId) =>\n+ _i5.Future fetchAttendeesByEvent(String? eventId) =>\n (super.noSuchMethod(\n Invocation.method(\n- #fetchRegistrantsByEvent,\n+ #fetchAttendeesByEvent,\n [eventId],\n ),\n returnValue: _i5.Future.value(),\ndiff --git a/test/model_tests/events/event_model_test.dart b/test/model_tests/events/event_model_test.dart\nindex 9fd1ca6a07..689472c0cf 100644\n--- a/test/model_tests/events/event_model_test.dart\n+++ b/test/model_tests/events/event_model_test.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'package:flutter_test/flutter_test.dart';\n import 'package:talawa/models/events/event_model.dart';\n import 'package:talawa/models/organization/org_info.dart';\n@@ -23,7 +20,6 @@ void main() {\n id: '12',\n title: 'for test only',\n description: 'for test only',\n- attendees: 'for test only',\n location: 'for test only',\n latitude: 1233,\n longitude: 123,\n@@ -39,7 +35,14 @@ void main() {\n isRegisterable: true,\n organization: OrgInfo(admins: users),\n admins: users,\n- registrants: users,\n+ attendees: [\n+ Attendee(\n+ id: \"attendee1\",\n+ firstName: \"firstName1\",\n+ lastName: \"lastName1\",\n+ image: null,\n+ ),\n+ ],\n );\n \n final eventJson = {\n@@ -52,7 +55,6 @@ void main() {\n '_id': '12',\n 'title': 'for test only',\n 'description': 'for test only',\n- 'attendees': 'for test only',\n 'location': 'for test only',\n 'latitude': 1233.00,\n 'longitude': 123.00,\n@@ -88,23 +90,13 @@ void main() {\n 'email': 'test@test.com',\n },\n ],\n- 'registrants': [\n- {\n- 'user': {\n- 'id': '123',\n- 'firstName': 'Ayush',\n- 'lastName': 'Chaudhary',\n- 'email': 'test@test.com',\n- },\n- },\n- {\n- 'user': {\n- 'id': '123',\n- 'firstName': 'Aykkush',\n- 'lastName': 'Chaudhary',\n- 'email': 'test@test.com',\n- },\n- },\n+ 'attendees': [\n+ Attendee(\n+ id: \"attendee1\",\n+ firstName: \"firstName1\",\n+ lastName: \"lastName1\",\n+ image: null,\n+ ).toJson(),\n ],\n };\n final eventFromJson = Event.fromJson(eventJson);\n@@ -116,7 +108,16 @@ void main() {\n expect(event.title, eventFromJson.title);\n expect(event.id, eventFromJson.id);\n expect(event.description, eventFromJson.description);\n- expect(event.attendees, eventFromJson.attendees);\n+ expect(event.attendees?[0].id, eventFromJson.attendees?[0].id);\n+ expect(\n+ event.attendees?[0].firstName,\n+ eventFromJson.attendees?[0].firstName,\n+ );\n+ expect(\n+ event.attendees?[0].lastName,\n+ eventFromJson.attendees?[0].lastName,\n+ );\n+ expect(event.attendees?[0].image, eventFromJson.attendees?[0].image);\n expect(event.location, eventFromJson.location);\n expect(event.latitude, eventFromJson.latitude);\n expect(event.longitude, eventFromJson.longitude);\ndiff --git a/test/service_tests/event_service_test.dart b/test/service_tests/event_service_test.dart\nindex 0d8502de41..5546bfa246 100644\n--- a/test/service_tests/event_service_test.dart\n+++ b/test/service_tests/event_service_test.dart\n@@ -101,24 +101,24 @@ void main() {\n await services.registerForAnEvent('eventId');\n });\n \n- test('Test fetchRegistrantsByEvent method', () async {\n+ test('Test fetchAttendeesByEvent method', () async {\n final dataBaseMutationFunctions = locator();\n const query = '';\n when(\n dataBaseMutationFunctions.gqlAuthQuery(\n- EventQueries().registrantsByEvent('eventId'),\n+ EventQueries().attendeesByEvent('eventId'),\n ),\n ).thenAnswer(\n (realInvocation) async => QueryResult(\n options: QueryOptions(document: gql(query)),\n data: {\n- 'registrant': {'_id': 'registrantId', 'name': 'name'},\n+ 'getEventAttendeesByEventId': {'userId': 'userId'},\n },\n source: QueryResultSource.network,\n ),\n );\n final services = EventService();\n- services.fetchRegistrantsByEvent('eventId');\n+ services.fetchAttendeesByEvent('eventId');\n });\n \n test('Test getEvents method', () async {\n@@ -133,12 +133,11 @@ void main() {\n (realInvocation) async => QueryResult(\n options: QueryOptions(document: gql(query)),\n data: {\n- 'eventsByOrganization': [\n+ 'eventsByOrganizationConnection': [\n {\n \"_id\": \"1234567890\",\n \"title\": \"Sample Event\",\n \"description\": \"This is a sample event description.\",\n- \"attendees\": \"John Doe, Jane Smith\",\n \"location\": \"Sample Location\",\n \"longitude\": -73.935242,\n \"latitude\": 40.73061,\n@@ -162,7 +161,7 @@ void main() {\n \"name\": \"Organization Name\",\n \"description\": \"Sample organization description.\",\n },\n- \"registrants\": [\n+ \"attendees\": [\n testDataNotFromOrg,\n ],\n }\ndiff --git a/test/utils/event_queries_test.dart b/test/utils/event_queries_test.dart\nindex 811ff80d3f..95e867f636 100644\n--- a/test/utils/event_queries_test.dart\n+++ b/test/utils/event_queries_test.dart\n@@ -6,33 +6,44 @@ void main() {\n test(\"Check if fetchOrgEvents works correctly\", () {\n const data = \"\"\"\n query {\n- eventsByOrganization(id: \"sampleID\"){ \n- _id\n- organization {\n- _id\n- image\n- }\n- title\n- description\n- isPublic\n- isRegisterable\n- recurring\n- startDate\n- endDate\n- allDay\n- startTime\n- endTime\n- location\n- creator{\n- _id\n- firstName\n- lastName\n- }\n- admins {\n- firstName\n- lastName\n- }\n- }\n+ eventsByOrganizationConnection(\n+ where: {\n+ organization_id: \"sampleID\"\n+ }\n+ ) {\n+ _id\n+ organization {\n+ _id\n+ image\n+ }\n+ title\n+ description\n+ isPublic\n+ isRegisterable\n+ recurring\n+ startDate\n+ endDate\n+ allDay\n+ startTime\n+ endTime\n+ location\n+ creator {\n+ _id\n+ firstName\n+ lastName\n+ }\n+ admins {\n+ _id\n+ firstName\n+ lastName\n+ } \n+ attendees {\n+ _id\n+ firstName\n+ lastName\n+ image\n+ }\n+ }\n }\n \"\"\";\n \n@@ -40,19 +51,21 @@ void main() {\n expect(fnData, data);\n });\n \n- test(\"Check if registrantsByEvents works correctly\", () {\n+ test(\"Check if attendeesByEvent works correctly\", () {\n const data = '''\n query {\n- registrantsByEvent(id: \"sampleID\") {\n- _id\n- firstName\n- lastName\n- image\n+ getEventAttendeesByEventId(eventId: \"sampleID\") {\n+ eventId\n+ userId\n+ isRegistered\n+ isInvited\n+ isCheckedIn\n+ isCheckedOut\n }\n }\n ''';\n \n- final fnData = EventQueries().registrantsByEvent(\"sampleID\");\n+ final fnData = EventQueries().attendeesByEvent(\"sampleID\");\n expect(fnData, data);\n });\n \ndiff --git a/test/view_model_tests/after_auth_view_model_tests/event_view_model_tests/explore_events_view_model_test.dart b/test/view_model_tests/after_auth_view_model_tests/event_view_model_tests/explore_events_view_model_test.dart\nindex b95ba77042..7c157e70be 100644\n--- a/test/view_model_tests/after_auth_view_model_tests/event_view_model_tests/explore_events_view_model_test.dart\n+++ b/test/view_model_tests/after_auth_view_model_tests/event_view_model_tests/explore_events_view_model_test.dart\n@@ -1,8 +1,4 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'dart:async';\n-\n import 'package:flutter/material.dart';\n import 'package:flutter_localizations/flutter_localizations.dart';\n import 'package:flutter_test/flutter_test.dart';\n@@ -72,7 +68,7 @@ void main() {\n id: \"1\",\n title: \"fake_event_title\",\n description: \"fake_event_desc\",\n- attendees: \"20\",\n+ attendees: [Attendee(id: 'Test Id')],\n location: \"fake_event_loc\",\n recurring: false,\n startDate: '2024-01-14',\ndiff --git a/test/views/after_auth_screens/events/event_info_body_test.dart b/test/views/after_auth_screens/events/event_info_body_test.dart\nindex 420159678c..e1804b6cf8 100644\n--- a/test/views/after_auth_screens/events/event_info_body_test.dart\n+++ b/test/views/after_auth_screens/events/event_info_body_test.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'package:flutter/material.dart';\n import 'package:flutter_localizations/flutter_localizations.dart';\n import 'package:flutter_test/flutter_test.dart';\n@@ -52,8 +49,9 @@ Event getTestEvent({\n lastName: \"shaikh_admin_two\",\n ),\n ],\n- registrants: [\n- User(\n+ attendees: [\n+ Attendee(\n+ id: \"1\",\n firstName: \"Test\",\n lastName: \"User\",\n ),\ndiff --git a/test/views/after_auth_screens/profile/user_event_test.dart b/test/views/after_auth_screens/profile/user_event_test.dart\nindex b702046a88..0d39be40d8 100644\n--- a/test/views/after_auth_screens/profile/user_event_test.dart\n+++ b/test/views/after_auth_screens/profile/user_event_test.dart\n@@ -138,7 +138,6 @@ void main() {\n id: 'a',\n title: 'Sample Event',\n description: 'This is a fake event description.',\n- attendees: 'John Doe, Jane Doe',\n location: 'City Park',\n latitude: 40.7128,\n longitude: -74.0060,\n@@ -157,8 +156,8 @@ void main() {\n admins: [\n User(id: 'admin'),\n ],\n- registrants: [\n- User(id: 'registrant'),\n+ attendees: [\n+ Attendee(id: 'attendee1'),\n ],\n ),\n ]);\ndiff --git a/test/widget_tests/widgets/event_card_test.dart b/test/widget_tests/widgets/event_card_test.dart\nindex 774e5a48f0..202d20e18a 100644\n--- a/test/widget_tests/widgets/event_card_test.dart\n+++ b/test/widget_tests/widgets/event_card_test.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'package:flutter/material.dart';\n import 'package:flutter_localizations/flutter_localizations.dart';\n import 'package:flutter_test/flutter_test.dart';\n@@ -25,7 +22,7 @@ Event getEvent({bool? isRegistered, bool isPublic = false}) {\n endTime: \"08:15PM\",\n isPublic: isPublic,\n isRegistered: isRegistered,\n- attendees: \"96\",\n+ attendees: [Attendee(id: \"attendee1\")],\n creator: User(id: \"ravidi\"),\n );\n }\n@@ -194,7 +191,7 @@ void main() {\n find.text(\"Testing for the Event Card Widget\"),\n findsOneWidget,\n ); // event description\n- expect(find.text(\"96\"), findsOneWidget);\n+ expect(find.text(\"1\"), findsOneWidget);\n });\n });\n });\n", "n2p_tests": "{\"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if updateEvent works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if attendeesByEvent works correctly\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if addEvent works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if registerForEvent works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if deleteEvent works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/events/event_model_test.dart: Test Event Model Test Event \": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if fetchOrgEvents works correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "PalisadoesFoundation__talawa-2462", "org": "PalisadoesFoundation", "repo": "talawa", "number": 2462, "state": "closed", "title": "Updated implementation of fetchOrgEvents", "body": "**What kind of change does this PR introduce?**\r\n\r\nbugfix\r\n\r\n**Issue Number:**\r\n\r\nFixes #2461 \r\n\r\n**Did you add tests for your changes?**\r\n\r\nYes (Updated existing tests) \r\n\r\n**Snapshots/Videos:**\r\n\r\n\r\nhttps://github.com/PalisadoesFoundation/talawa/assets/109027247/55c5d69e-c2fa-413f-a6d2-4c95ab273109\r\n\r\n**Summary**\r\n\r\n- Removed the reccurance field from fetchOrgEvents query, as is support was removed and neither is it used in UI,\r\n- Updated the related tests for fetchOrgEvents query\r\n\r\n**Does this PR introduce a breaking change?**\r\n\r\nNo\r\n\r\n\r\n**Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa/blob/master/CONTRIBUTING.md)?**\r\n\r\nYes\r\n", "base": "{\"label\": \"PalisadoesFoundation:develop\", \"ref\": \"develop\", \"sha\": \"676c1f81e723c8c2ab9f411ba2b23de7e4726654\"}", "resolved_issues": "[{\"number\": 2461, \"title\": \"Events not rendering due older implementation of fetchOrgEvents query\", \"body\": \"**Describe the bug**\\r\\n\\r\\nfetchOrgEvents query being used in app is still on older implementation which requires recurrance field. The reccurance field support was removed from Talawa API in https://github.com/PalisadoesFoundation/talawa-api/issues/2107\\r\\n\\r\\n**To Reproduce**\\r\\nSteps to reproduce the behavior:\\r\\n\\r\\n1. Login to a organisation.\\r\\n2. Open Events tab.\\r\\n3. No events are rendered due to failing query.\\r\\n\\r\\n**Expected behavior**\\r\\nThe `fetchOrgEvents` query must return events as a result, all the events of organization must be rendered. \\r\\n\\r\\n**Actual behavior**\\r\\nThe `fetchOrgEvents` query fails, as a result no events are rendered.\\r\\n\\r\\n**Screenshots**\\r\\n\\r\\n![eventNotRendered](https://github.com/PalisadoesFoundation/talawa/assets/109027247/5adf8aa0-500a-491d-9024-b74053508a7d)\\r\\n\\r\\n**Potential internship candidates**\\r\\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\\r\\n\"}]", "lang": "dart", "problem_statement": "Events not rendering due older implementation of fetchOrgEvents query\n**Describe the bug**\r\n\r\nfetchOrgEvents query being used in app is still on older implementation which requires recurrance field. The reccurance field support was removed from Talawa API in https://github.com/PalisadoesFoundation/talawa-api/issues/2107\r\n\r\n**To Reproduce**\r\nSteps to reproduce the behavior:\r\n\r\n1. Login to a organisation.\r\n2. Open Events tab.\r\n3. No events are rendered due to failing query.\r\n\r\n**Expected behavior**\r\nThe `fetchOrgEvents` query must return events as a result, all the events of organization must be rendered. \r\n\r\n**Actual behavior**\r\nThe `fetchOrgEvents` query fails, as a result no events are rendered.\r\n\r\n**Screenshots**\r\n\r\n![eventNotRendered](https://github.com/PalisadoesFoundation/talawa/assets/109027247/5adf8aa0-500a-491d-9024-b74053508a7d)\r\n\r\n**Potential internship candidates**\r\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\r\n\n", "hints": "I would like to work on this issue", "pull_url": "https://github.com/PalisadoesFoundation/talawa/pull/2462", "issue_urls": "[\"https://github.com/PalisadoesFoundation/talawa/issues/2461\"]", "test_command": NaN, "fix_patch": "diff --git a/lib/utils/event_queries.dart b/lib/utils/event_queries.dart\nindex d3f5ec5cb8..65bbe3d441 100644\n--- a/lib/utils/event_queries.dart\n+++ b/lib/utils/event_queries.dart\n@@ -25,7 +25,6 @@ class EventQueries {\n isPublic\n isRegisterable\n recurring\n- recurrance\n startDate\n endDate\n allDay\n", "test_patch": "diff --git a/test/utils/event_queries_test.dart b/test/utils/event_queries_test.dart\nindex cc0d370031..811ff80d3f 100644\n--- a/test/utils/event_queries_test.dart\n+++ b/test/utils/event_queries_test.dart\n@@ -17,7 +17,6 @@ void main() {\n isPublic\n isRegisterable\n recurring\n- recurrance\n startDate\n endDate\n allDay\n", "n2p_tests": "{}", "f2p_tests": "{\"Tests for event_queries.dart Check if fetchOrgEvents works correctly\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"Tests for event_queries.dart Check if registerForEvent works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Tests for event_queries.dart Check if registrantsByEvents works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Tests for event_queries.dart Check if addEvent works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Tests for event_queries.dart Check if updateEvent works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Tests for event_queries.dart Check if deleteEvent works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "PalisadoesFoundation__talawa-2412", "org": "PalisadoesFoundation", "repo": "talawa", "number": 2412, "state": "closed", "title": "Integrated create recurrence event API.", "body": "\r\n\r\n\r\n\r\n**What kind of change does this PR introduce?**\r\n\r\nThis PR integrates the create recurring event API and adds functionality to create custom recurrence event.\r\n\r\n**Issue Number:**\r\n\r\nFixes #2341 \r\n\r\n**Did you add tests for your changes?**\r\n\r\nYes\r\n\r\n**Snapshots/Videos:**\r\n\r\n\r\nhttps://github.com/PalisadoesFoundation/talawa/assets/120930148/0dc53265-c0bf-4cd0-8844-7422711a9e91\r\n\r\n\r\n\r\n**If relevant, did you update the documentation?**\r\n\r\n\r\n\r\n**Summary**\r\n\r\nThis PR is a follow up PR to #2386, where the UI was built and this PR integrates the api and makes the UI fully functional.\r\n\r\n**Does this PR introduce a breaking change?**\r\n\r\nNo\r\n\r\n**Other information**\r\n\r\n\r\n\r\n**Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa/blob/master/CONTRIBUTING.md)?**\r\n\r\nYes\r\n", "base": "{\"label\": \"PalisadoesFoundation:develop\", \"ref\": \"develop\", \"sha\": \"8fb384f2b3d850e116b36439832306fd4c0ac556\"}", "resolved_issues": "[{\"number\": 2341, \"title\": \"Mobile - Add support to recurring events.\", \"body\": \"**Is your feature request related to a problem? Please describe.**\\r\\nImplement `recurring events` functionality into Talawa mobile. \\r\\n\\r\\n**Describe the solution you'd like**\\r\\n- The event creation screen(s) should have functionality to create recurring events.\\r\\n 1. weeks\\r\\n 2. months \\r\\n 3. days \\r\\n 4. weekdays \\r\\n- The Calendar screen(s) should display all the created recurring events.\\r\\n- The edit event screen(s) should have funcitonality to edit these recurring events.\\r\\n 1. All instances in the series\\r\\n 2. Just the instance in question\\r\\n 3. The instance in question and all those in future\\r\\n- Make use of updated `event mutations` to implement the described functionality.\\r\\n- The screen(s) design must follow the guidelines of Talawa Design System found here:\\r\\n - https://docs.talawa.io/docs/design/ux/ux-design-system\\r\\n- Other functionality must not be affected.\\r\\n- Write tests and achieve 100% code coverage to all the new functionality added.\\r\\n\\r\\n**Describe alternatives you've considered**\\r\\n N/A\\r\\n\\r\\n**Approach to be followed (optional)**\\r\\n - see above.\\r\\n\\r\\n**Additional context**\\r\\n 1. related issues:\\r\\n - https://github.com/PalisadoesFoundation/talawa-api/issues/1583#issue-2057545112\\r\\n 2. related PRs:\\r\\n - https://github.com/PalisadoesFoundation/talawa-api/pull/1658#issue-2069943639\\r\\n - https://github.com/PalisadoesFoundation/talawa-api/pull/1712#issue-2086753320\\r\\n\\r\\n**Potential internship candidates**\\r\\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\\r\\n\"}]", "lang": "dart", "problem_statement": "Mobile - Add support to recurring events.\n**Is your feature request related to a problem? Please describe.**\r\nImplement `recurring events` functionality into Talawa mobile. \r\n\r\n**Describe the solution you'd like**\r\n- The event creation screen(s) should have functionality to create recurring events.\r\n 1. weeks\r\n 2. months \r\n 3. days \r\n 4. weekdays \r\n- The Calendar screen(s) should display all the created recurring events.\r\n- The edit event screen(s) should have funcitonality to edit these recurring events.\r\n 1. All instances in the series\r\n 2. Just the instance in question\r\n 3. The instance in question and all those in future\r\n- Make use of updated `event mutations` to implement the described functionality.\r\n- The screen(s) design must follow the guidelines of Talawa Design System found here:\r\n - https://docs.talawa.io/docs/design/ux/ux-design-system\r\n- Other functionality must not be affected.\r\n- Write tests and achieve 100% code coverage to all the new functionality added.\r\n\r\n**Describe alternatives you've considered**\r\n N/A\r\n\r\n**Approach to be followed (optional)**\r\n - see above.\r\n\r\n**Additional context**\r\n 1. related issues:\r\n - https://github.com/PalisadoesFoundation/talawa-api/issues/1583#issue-2057545112\r\n 2. related PRs:\r\n - https://github.com/PalisadoesFoundation/talawa-api/pull/1658#issue-2069943639\r\n - https://github.com/PalisadoesFoundation/talawa-api/pull/1712#issue-2086753320\r\n\r\n**Potential internship candidates**\r\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\r\n\n", "hints": "@palisadoes please have a look at this issue and do let me know if any follow ups and if I missedout on any thing.\n@Azad99-9 \r\nYou are requested to hold off for some time as there is currently a discussion underway regarding whether we should follow a denormalized approach or another one. \r\nOnce it is confirmed, there may be some tweaks that need to be made in the weekly recurring events PR. Until then, please wait. \r\nThank you for your understanding\nSure @Community-Programmer \n@Cioppolo14 @noman2002 I would like to work on this, please assign me.\r\n\r\nAs the implementation of this feature in backend is in progress, meanwhile i will start working on the UI part of this issue.\nThis issue did not get any activity in the past 10 days and will be closed in 180 days if no update occurs. Please check if the develop branch has fixed it and report again or close the issue.\nWorking on this, as the recent PR related to this issue in Talawa API has been closed.\nThis issue did not get any activity in the past 10 days and will be closed in 180 days if no update occurs. Please check if the develop branch has fixed it and report again or close the issue.\nHI @Azad99-9 are you still working on this?\r\n\n@Olatade yes I am working on this. There is a backend dependency.\n@palisadoes @noman2002 The implementation of this feature requires multiple files to be changed.\r\n- Creation of new Model & View models.\r\n- Modificaton & addition of new Queries.\r\n- New UI changes.\r\n\r\nI have also had a word with @meetulr, 2 more PRs related to event updation & deletion are also about to come.\r\n\r\nSo meanwhile i am thinking to split this issue into multiple PRs and raise them one by one.\nThis was expected. Large PRs are too difficult to review effectively.\n@palisadoes @noman2002 please review the UI and suggest changes if any.\r\n**Note** Api integration not yet done. For now UI is built. \r\nIf finalized i will raise a PR for the same. I will make a seperate PR for Api integration.\r\n\r\nhttps://github.com/PalisadoesFoundation/talawa/assets/120930148/42adca5d-8f0f-4d1d-8e75-3e8a5a8fb61c\r\n\r\n\r\n\r\n\r\n\r\n\r\n\n1. Yes this is good\r\n2. Use this to test your work against the API PR in review:\r\n 1. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally\n@palisadoes @Cioppolo14 still API integration work is pending with this issue. Please reopen this so that I can raise a PR for the same.\nApi integration completed, writing tests. Will raise the PR by tomorrow.", "pull_url": "https://github.com/PalisadoesFoundation/talawa/pull/2412", "issue_urls": "[\"https://github.com/PalisadoesFoundation/talawa/issues/2341\"]", "test_command": NaN, "fix_patch": "diff --git a/lib/constants/recurrence_values.dart b/lib/constants/recurrence_values.dart\nnew file mode 100644\nindex 0000000000..c6393aa06c\n--- /dev/null\n+++ b/lib/constants/recurrence_values.dart\n@@ -0,0 +1,53 @@\n+/// Class containing constants for recurrence options.\n+class Recurrance {\n+ /// Constant representing an event that does not repeat.\n+ static const once = 'Does not repeat';\n+\n+ /// Constant representing daily recurrence.\n+ static const daily = 'day';\n+\n+ /// Constant representing weekly recurrence.\n+ static const weekly = 'week';\n+\n+ /// Constant representing monthly recurrence.\n+ static const monthly = 'month';\n+\n+ /// Constant representing yearly recurrence.\n+ static const yearly = 'year';\n+\n+ /// Constant representing a custom recurrence.\n+ static const custom = 'custom...';\n+\n+ /// Constant representing Monday in weekdays.\n+ static const weekdayMonday = 'MO';\n+\n+ /// Constant representing Tuesday in weekdays.\n+ static const weekdayTuesday = 'TU';\n+\n+ /// Constant representing Wednesday in weekdays.\n+ static const weekdayWednesday = 'WE';\n+\n+ /// Constant representing Thursday in weekdays.\n+ static const weekdayThursday = 'TH';\n+\n+ /// Constant representing Friday in weekdays.\n+ static const weekdayFriday = 'FR';\n+\n+ /// Constant representing Saturday in weekdays.\n+ static const weekdaySaturday = 'SA';\n+\n+ /// Constant representing Sunday in weekdays.\n+ static const weekdaySunday = 'SU';\n+}\n+\n+/// Class containing constants for event end types.\n+class EventEndTypes {\n+ /// Constant representing an event that never ends.\n+ static const never = 'Never';\n+\n+ /// Constant representing an event that ends on a specific date.\n+ static const on = 'On';\n+\n+ /// Constant representing an event that ends after a specified number of occurrences.\n+ static const after = 'After';\n+}\ndiff --git a/lib/router.dart b/lib/router.dart\nindex 5c5f9b3a3f..a7ed05754d 100644\n--- a/lib/router.dart\n+++ b/lib/router.dart\n@@ -8,6 +8,7 @@ import 'package:talawa/models/organization/org_info.dart';\n import 'package:talawa/models/post/post_model.dart';\n import 'package:talawa/splash_screen.dart';\n import 'package:talawa/view_model/after_auth_view_models/chat_view_models/direct_chat_view_model.dart';\n+import 'package:talawa/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart';\n import 'package:talawa/views/after_auth_screens/add_post_page.dart';\n import 'package:talawa/views/after_auth_screens/app_settings/app_settings_page.dart';\n import 'package:talawa/views/after_auth_screens/chat/chat_message_screen.dart';\n@@ -199,9 +200,12 @@ Route generateRoute(RouteSettings settings) {\n \n // Returns the CreateEventPage Widget\n case Routes.customRecurrencePage:\n+ final model = settings.arguments! as CreateEventViewModel;\n return MaterialPageRoute(\n- builder: (context) =>\n- CustomRecurrencePage(key: const Key('CreateEvent')),\n+ builder: (context) => CustomRecurrencePage(\n+ key: const Key('CreateEvent'),\n+ model: model,\n+ ),\n );\n \n // Returns the ProfilePage Widget\ndiff --git a/lib/utils/event_queries.dart b/lib/utils/event_queries.dart\nindex 6944de83fa..d3f5ec5cb8 100644\n--- a/lib/utils/event_queries.dart\n+++ b/lib/utils/event_queries.dart\n@@ -80,35 +80,8 @@ class EventQueries {\n /// This function generates a GraphQL mutation string for creating an event.\n String addEvent() {\n return \"\"\"\n- mutation createEvent( \\$organizationId: ID!,\n- \\$title:String!,\n- \\$description: String!,\n- \\$startTime: Time,\n- \\$endTime: Time,\n- \\$allDay: Boolean!,\n- \\$recurring: Boolean!,\n- \\$isPublic: Boolean!,\n- \\$isRegisterable: Boolean!,\n- \\$location: String,\n- \\$startDate : Date!,\n- \\$endDate : Date!,\n- ) { \n- createEvent(\n- data:{\n- organizationId: \\$organizationId,\n- title: \\$title,\n- description: \\$description,\n- isPublic: \\$isPublic,\n- isRegisterable: \\$isRegisterable,\n- recurring: \\$recurring,\n- allDay: \\$allDay,\n- startTime: \\$startTime,\n- endTime: \\$endTime,\n- startDate: \\$startDate,\n- endDate: \\$endDate,\n- location: \\$location,\n- }\n- ){\n+ mutation Mutation(\\$data: EventInput!, \\$recurrenceRuleData: RecurrenceRuleInput) {\n+ createEvent(data: \\$data, recurrenceRuleData: \\$recurrenceRuleData) {\n _id\n title\n description\ndiff --git a/lib/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart b/lib/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart\nindex bcd6d257ee..3baf49052d 100644\n--- a/lib/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart\n+++ b/lib/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart\n@@ -1,6 +1,7 @@\n import 'dart:io';\n import 'package:flutter/material.dart';\n import 'package:intl/intl.dart';\n+import 'package:talawa/constants/recurrence_values.dart';\n import 'package:talawa/locator.dart';\n import 'package:talawa/models/organization/org_info.dart';\n import 'package:talawa/models/user/user_info.dart';\n@@ -35,6 +36,13 @@ class CreateEventViewModel extends BaseModel {\n TextEditingController eventDescriptionTextController =\n TextEditingController();\n \n+ /// Repeats Every count controller.\n+ TextEditingController repeatsEveryCountController =\n+ TextEditingController(text: '1');\n+\n+ /// Event ends After n occurences controller.\n+ TextEditingController endOccurenceController = TextEditingController();\n+\n /// Event Start Time.\n TimeOfDay eventStartTime = TimeOfDay.now();\n \n@@ -48,7 +56,7 @@ class CreateEventViewModel extends BaseModel {\n DateTime eventStartDate = DateTime.now();\n \n /// Event End Date.\n- DateTime eventEndDate = DateTime.now();\n+ DateTime? eventEndDate = DateTime.now();\n \n /// Public Event or Not.\n bool isPublicSwitch = true;\n@@ -71,6 +79,33 @@ class CreateEventViewModel extends BaseModel {\n /// Longitude store.\n double? longitude;\n \n+ /// is an allday event.\n+ bool isAllDay = true;\n+\n+ /// Is a recurring event.\n+ bool isRecurring = false;\n+\n+ /// recurrence count.\n+ int recurranceCount = 1;\n+\n+ /// recurrence.\n+ String? recurrance;\n+\n+ /// RecurranceRuleData frequency.\n+ String recurranceFrequency = Recurrance.weekly;\n+\n+ /// Monthly recurrence.\n+ String monthlyRecurrence = 'Monthly on day 3';\n+\n+ /// weekdays.\n+ Set weekdays = {Recurrance.weekdayTuesday};\n+\n+ /// Event end type.\n+ String eventEndType = EventEndTypes.never;\n+\n+ /// Custom recurrance event end date.\n+ DateTime? eventEndOnEndDate = DateTime.now();\n+\n //late OrganizationService _organizationService;\n late final Map _memberCheckedMap = {};\n late final List _selectedMembers = [];\n@@ -150,39 +185,50 @@ class CreateEventViewModel extends BaseModel {\n validate = AutovalidateMode.disabled;\n \n // variables initialisation\n- final DateTime startDate = eventStartDate;\n- final DateTime endDate = eventEndDate;\n final DateTime startTime = DateTime(\n- startDate.year,\n- startDate.month,\n- startDate.day,\n+ eventStartDate.year,\n+ eventStartDate.month,\n+ eventStartDate.day,\n eventStartTime.hour,\n eventStartTime.minute,\n );\n final DateTime endTime = DateTime(\n- endDate.year,\n- endDate.month,\n- endDate.day,\n+ eventEndDate?.year ?? DateTime.now().year,\n+ eventEndDate?.month ?? DateTime.now().month,\n+ eventEndDate?.day ?? DateTime.now().day,\n eventEndTime.hour,\n eventEndTime.minute,\n );\n \n+ final String? frequency = getRecurrance(recurranceFrequency);\n+\n // all required data for creating an event\n final Map variables = {\n- 'startDate': DateFormat('yyyy-MM-dd').format(startDate),\n- 'endDate': DateFormat('yyyy-MM-dd').format(endDate),\n- 'organizationId': _currentOrg.id,\n- 'title': eventTitleTextController.text,\n- 'description': eventDescriptionTextController.text,\n- 'location': eventLocationTextController.text,\n- 'isPublic': isPublicSwitch,\n- 'isRegisterable': isRegisterableSwitch,\n- 'recurring': false,\n- 'allDay': false,\n- 'startTime': '${DateFormat('HH:mm:ss').format(startTime)}Z',\n- 'endTime': '${DateFormat('HH:mm:ss').format(endTime)}Z',\n- if (latitude != null) 'latitude': latitude,\n- if (longitude != null) 'longitude': longitude,\n+ \"data\": {\n+ 'startDate': DateFormat('yyyy-MM-dd').format(eventStartDate),\n+ if (eventEndDate != null)\n+ 'endDate': DateFormat('yyyy-MM-dd').format(eventEndDate!),\n+ 'organizationId': _currentOrg.id,\n+ 'title': eventTitleTextController.text,\n+ 'description': eventDescriptionTextController.text,\n+ 'location': eventLocationTextController.text,\n+ 'isPublic': isPublicSwitch,\n+ 'isRegisterable': isRegisterableSwitch,\n+ 'recurring': isRecurring,\n+ 'recurrance': recurrance ?? frequency,\n+ 'allDay': isAllDay,\n+ 'startTime': '${DateFormat('HH:mm:ss').format(startTime)}Z',\n+ if (eventEndDate != null)\n+ 'endTime': '${DateFormat('HH:mm:ss').format(endTime)}Z',\n+ if (latitude != null) 'latitude': latitude,\n+ if (longitude != null) 'longitude': longitude,\n+ },\n+ if (recurrance == null)\n+ 'recurrenceRuleData': {\n+ if (eventEndType != EventEndTypes.never) 'count': recurranceCount,\n+ 'frequency': frequency,\n+ if (frequency == 'WEEKLY') 'weekDays': List.from(weekdays),\n+ },\n };\n \n navigationService.pushDialog(\n@@ -194,6 +240,7 @@ class CreateEventViewModel extends BaseModel {\n EventQueries().addEvent(),\n variables: variables,\n );\n+ print(result);\n navigationService.pop();\n if (result != null) {\n navigationService.pop();\n@@ -288,4 +335,41 @@ class CreateEventViewModel extends BaseModel {\n \n notifyListeners();\n }\n+\n+ /// Updates the event end date to selected event end date.\n+ ///\n+ /// **params**:\n+ /// * `selectedEndDate`: new event end date selected by user.\n+ ///\n+ /// **returns**:\n+ /// None\n+ void setEventEndDate(DateTime? selectedEndDate) {\n+ eventEndDate = selectedEndDate;\n+ notifyListeners();\n+ }\n+\n+ /// Returns corresponding recurrence value based on frequency.\n+ ///\n+ /// **params**:\n+ /// * `frequency`: Recurrence frequency selected by user.\n+ ///\n+ /// **returns**:\n+ /// * `String?`: Recurrence value.\n+ String? getRecurrance(String frequency) {\n+ isRecurring = true;\n+ if (frequency == Recurrance.daily || frequency == 'Every day') {\n+ return 'DAILY';\n+ } else if (frequency == Recurrance.weekly || frequency == 'Every week') {\n+ return 'WEEKLY';\n+ } else if (frequency == Recurrance.monthly || frequency == 'Every month') {\n+ return 'MONTHLY';\n+ } else if (frequency == Recurrance.yearly || frequency == 'Every year') {\n+ return 'YEARLY';\n+ } else if (frequency == Recurrance.once) {\n+ isRecurring = false;\n+ return null;\n+ } else {\n+ return null;\n+ }\n+ }\n }\ndiff --git a/lib/views/after_auth_screens/events/create_custom_recurring_event.dart b/lib/views/after_auth_screens/events/create_custom_recurring_event.dart\nindex ce038eb005..51e38b3a09 100644\n--- a/lib/views/after_auth_screens/events/create_custom_recurring_event.dart\n+++ b/lib/views/after_auth_screens/events/create_custom_recurring_event.dart\n@@ -1,21 +1,33 @@\n import 'package:flutter/material.dart';\n+import 'package:talawa/constants/recurrence_values.dart';\n+import 'package:talawa/locator.dart';\n import 'package:talawa/services/size_config.dart';\n import 'package:talawa/utils/app_localization.dart';\n+import 'package:talawa/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart';\n import 'package:talawa/widgets/create_recurring_event_helper_widgets.dart';\n import 'package:talawa/widgets/custom_weekday_selector.dart';\n \n /// custom padding.\n final _sectionPadding = SizeConfig.blockSizeHorizontal! * 8;\n \n-/// Enables users to define their customRecurrence event.\n-class CustomRecurrencePage extends StatelessWidget {\n- CustomRecurrencePage({super.key});\n+/// Widget to build custom recurrence page.\n+class CustomRecurrencePage extends StatefulWidget {\n+ const CustomRecurrencePage({super.key, required this.model});\n \n- final TextEditingController _repeatFrequencyTextController =\n- TextEditingController();\n+ /// Instance of create event view model.\n+ final CreateEventViewModel model;\n+\n+ @override\n+ State createState() => _CustomRecurrencePageState();\n+}\n+\n+class _CustomRecurrencePageState extends State {\n+ /// Instance of create event view model.\n+ late CreateEventViewModel viewModel;\n \n @override\n Widget build(BuildContext context) {\n+ viewModel = widget.model;\n return Scaffold(\n appBar: AppBar(\n backgroundColor: Theme.of(context).primaryColor,\n@@ -30,7 +42,17 @@ class CustomRecurrencePage extends StatelessWidget {\n ),\n actions: [\n TextButton(\n- onPressed: () {},\n+ onPressed: () {\n+ if (viewModel.eventEndType == EventEndTypes.never) {\n+ viewModel.setEventEndDate(null);\n+ } else if (viewModel.eventEndType == EventEndTypes.on) {\n+ viewModel.eventEndDate = viewModel.eventEndOnEndDate;\n+ } else if (viewModel.eventEndType == EventEndTypes.after) {\n+ viewModel.recurranceCount =\n+ int.parse(viewModel.endOccurenceController.text);\n+ }\n+ navigationService.pop();\n+ },\n child: const Text('Done'),\n ),\n ],\n@@ -63,23 +85,49 @@ class CustomRecurrencePage extends StatelessWidget {\n ],\n ),\n ),\n- buildCustomDivider(context),\n- Container(\n- padding: EdgeInsets.fromLTRB(\n- _sectionPadding,\n- _sectionPadding,\n- 90,\n- _sectionPadding,\n- ),\n- child: Column(\n- crossAxisAlignment: CrossAxisAlignment.start,\n- children: [\n- inputFieldHeading('Repeats on'),\n- CustomWeekDaySelector(),\n- ],\n- ),\n- ),\n- buildCustomDivider(context),\n+ recurrenceisDailyorYearly()\n+ ? buildCustomDivider(context)\n+ : Column(\n+ children: [\n+ buildCustomDivider(context),\n+ Container(\n+ padding: EdgeInsets.fromLTRB(\n+ _sectionPadding,\n+ _sectionPadding,\n+ 90,\n+ _sectionPadding,\n+ ),\n+ child: viewModel.recurranceFrequency == Recurrance.monthly\n+ ? Row(\n+ children: [\n+ RecurrenceFrequencyDropdown(\n+ model: viewModel,\n+ options: [\n+ 'Monthly on day 3',\n+ 'Monthly on the first Sunday',\n+ ],\n+ selectedOption: viewModel.monthlyRecurrence,\n+ onSelected: (String value) {\n+ setState(() {\n+ viewModel.monthlyRecurrence = value;\n+ });\n+ },\n+ ),\n+ ],\n+ )\n+ : Column(\n+ crossAxisAlignment: CrossAxisAlignment.start,\n+ children: [\n+ inputFieldHeading('Repeats on'),\n+ CustomWeekDaySelector(\n+ model: viewModel,\n+ ),\n+ ],\n+ ),\n+ ),\n+ buildCustomDivider(context),\n+ ],\n+ ),\n Column(\n crossAxisAlignment: CrossAxisAlignment.start,\n children: [\n@@ -88,7 +136,9 @@ class CustomRecurrencePage extends StatelessWidget {\n EdgeInsets.only(top: _sectionPadding, left: _sectionPadding),\n child: inputFieldHeading('Ends'),\n ),\n- const EventEndOptions(),\n+ EventEndOptions(\n+ model: viewModel,\n+ ),\n ],\n ),\n ],\n@@ -110,25 +160,26 @@ class CustomRecurrencePage extends StatelessWidget {\n child: CustomTextField(\n key: const Key('inputsection1TextField'),\n maxTextLength: 2,\n- textEditingController: _repeatFrequencyTextController,\n+ textEditingController: viewModel.repeatsEveryCountController,\n ),\n ),\n SizedBox(\n width: SizeConfig.screenWidth! * 0.03,\n ),\n- CustomRectangle(\n- child: Container(\n- padding: const EdgeInsets.all(12),\n- child: Center(\n- child: Row(\n- mainAxisAlignment: MainAxisAlignment\n- .center, // Align the row's contents to the center horizontally\n- children: [\n- RecurrenceFrequencyDropdown(),\n- ],\n- ),\n- ),\n- ),\n+ RecurrenceFrequencyDropdown(\n+ model: viewModel,\n+ options: [\n+ Recurrance.daily,\n+ Recurrance.weekly,\n+ Recurrance.monthly,\n+ Recurrance.yearly,\n+ ],\n+ selectedOption: viewModel.recurranceFrequency,\n+ onSelected: (String value) {\n+ setState(() {\n+ viewModel.recurranceFrequency = value;\n+ });\n+ },\n ),\n ],\n );\n@@ -165,4 +216,17 @@ class CustomRecurrencePage extends StatelessWidget {\n color: Theme.of(context).hintColor,\n );\n }\n+\n+ /// Determines whether the recurrence frequency is daily or yearly.\n+ ///\n+ /// **params**:\n+ /// None\n+ ///\n+ /// **returns**:\n+ /// * `bool`: A boolean value indicating whether the recurrence frequency is daily or yearly.\n+ bool recurrenceisDailyorYearly() {\n+ final widgetModel = viewModel;\n+ return widgetModel.recurranceFrequency == Recurrance.daily ||\n+ widgetModel.recurranceFrequency == Recurrance.yearly;\n+ }\n }\ndiff --git a/lib/views/after_auth_screens/events/create_event_page.dart b/lib/views/after_auth_screens/events/create_event_page.dart\nindex d9047e9879..ba5f2a770f 100644\n--- a/lib/views/after_auth_screens/events/create_event_page.dart\n+++ b/lib/views/after_auth_screens/events/create_event_page.dart\n@@ -1,4 +1,5 @@\n import 'package:flutter/material.dart';\n+import 'package:talawa/constants/recurrence_values.dart';\n import 'package:talawa/enums/enums.dart';\n import 'package:talawa/locator.dart';\n import 'package:talawa/services/navigation_service.dart';\n@@ -25,6 +26,8 @@ class CreateEventPage extends StatefulWidget {\n \n /// _CreateEventPageState returns a widget for a Page to Creatxe the Event in the Organization.\n class _CreateEventPageState extends State {\n+ /// Recurrence label of recurrence selection button.\n+ String recurrenceLabel = Recurrance.once;\n @override\n Widget build(BuildContext context) {\n final TextStyle subtitleTextStyle =\n@@ -33,6 +36,7 @@ class _CreateEventPageState extends State {\n return BaseView(\n onModelReady: (model) => model.initialize(),\n builder: (context, model, child) {\n+ print(model.recurrance);\n return Scaffold(\n // AppBar is the header of the page\n appBar: AppBar(\n@@ -94,7 +98,9 @@ class _CreateEventPageState extends State {\n ),\n TextButton(\n key: const Key('txt_btn_cep'),\n- onPressed: () => model.getImageFromGallery(),\n+ onPressed: () {\n+ model.getImageFromGallery();\n+ },\n child: Text(\n AppLocalizations.of(context)!\n .strictTranslate(\"Add Image\"),\n@@ -208,11 +214,12 @@ class _CreateEventPageState extends State {\n ),\n DateTimeTile(\n key: const Key('key for test cep'),\n- date: \"${model.eventEndDate.toLocal()}\".split(' ')[0],\n+ date: \"${model.eventEndDate?.toLocal() ?? DateTime.now()}\"\n+ .split(' ')[0],\n time: model.eventEndTime.format(context),\n setDate: () async {\n final date = await customDatePicker(\n- initialDate: model.eventEndDate,\n+ initialDate: model.eventEndDate ?? DateTime.now(),\n );\n final startDate = model.eventStartDate;\n if (startDate.compareTo(date) < 0) {\n@@ -260,18 +267,25 @@ class _CreateEventPageState extends State {\n ),\n Text(\n AppLocalizations.of(context)!\n- .strictTranslate('Does not repeat'),\n+ .strictTranslate(recurrenceLabel),\n style: subtitleTextStyle,\n ),\n ],\n ),\n- onTap: () {\n- showDialog(\n+ onTap: () async {\n+ final String? selectedReccurence;\n+ selectedReccurence = await showDialog(\n context: context,\n builder: (context) {\n- return const ShowRecurrenceDialog();\n+ return ShowRecurrenceDialog(\n+ model: model,\n+ initialRecurrence: recurrenceLabel,\n+ );\n },\n );\n+ setState(() {\n+ recurrenceLabel = selectedReccurence!;\n+ });\n },\n ),\n SizedBox(height: SizeConfig.screenHeight! * 0.026),\n@@ -286,7 +300,31 @@ class _CreateEventPageState extends State {\n children: [\n Text(\n AppLocalizations.of(context)!\n- .strictTranslate('Keep Public'),\n+ .strictTranslate('Keep Registerable'),\n+ style: subtitleTextStyle,\n+ ),\n+ SizedBox(\n+ width: SizeConfig.screenWidth! * 0.005,\n+ ),\n+ Switch(\n+ value: model.isRegisterableSwitch,\n+ onChanged: (value) {\n+ setState(() {\n+ model.isRegisterableSwitch = value;\n+ print(model.isRegisterableSwitch);\n+ });\n+ },\n+ activeColor:\n+ Theme.of(context).colorScheme.primary,\n+ ),\n+ ],\n+ ),\n+ Row(\n+ mainAxisSize: MainAxisSize.min,\n+ children: [\n+ Text(\n+ AppLocalizations.of(context)!\n+ .strictTranslate('All day'),\n style: subtitleTextStyle,\n ),\n SizedBox(\n@@ -294,11 +332,11 @@ class _CreateEventPageState extends State {\n ),\n Switch(\n // Switch to select the visibility of the event.\n- value: model.isPublicSwitch,\n+ value: model.isAllDay,\n onChanged: (value) {\n setState(() {\n- model.isPublicSwitch = value;\n- print(model.isPublicSwitch);\n+ model.isAllDay = value;\n+ print(model.isAllDay);\n });\n },\n activeColor:\n@@ -311,18 +349,19 @@ class _CreateEventPageState extends State {\n children: [\n Text(\n AppLocalizations.of(context)!\n- .strictTranslate('Keep Registerable'),\n+ .strictTranslate('Keep Public'),\n style: subtitleTextStyle,\n ),\n SizedBox(\n width: SizeConfig.screenWidth! * 0.005,\n ),\n Switch(\n- value: model.isRegisterableSwitch,\n+ // Switch to select the visibility of the event.\n+ value: model.isPublicSwitch,\n onChanged: (value) {\n setState(() {\n- model.isRegisterableSwitch = value;\n- print(model.isRegisterableSwitch);\n+ model.isPublicSwitch = value;\n+ print(model.isPublicSwitch);\n });\n },\n activeColor:\ndiff --git a/lib/views/after_auth_screens/events/event_calendar.dart b/lib/views/after_auth_screens/events/event_calendar.dart\nindex 5e6779f6c4..7c7a4a2f28 100644\n--- a/lib/views/after_auth_screens/events/event_calendar.dart\n+++ b/lib/views/after_auth_screens/events/event_calendar.dart\n@@ -123,11 +123,28 @@ _AppointmentDataSource _getCalendarDataSource(List eventsList) {\n int index = 0;\n // looping through all the events created in the organization.\n eventsList.forEach((event) {\n- final startDate = DateFormat('yMd').parse(event.startDate!);\n+ DateTime? startDate;\n+ DateTime? endDate;\n+\n+ /// change made here, code related to the fix.\n+ if (event.startDate!.contains('/')) {\n+ startDate = DateFormat('MM/dd/yyyy').parse(event.startDate!);\n+ } else {\n+ startDate = DateFormat('yyyy-MM-dd').parse(event.startDate!);\n+ }\n+\n+ /// change made here, code related to the fix.\n+ if (event.endDate!.contains('/')) {\n+ endDate = DateFormat('MM/dd/yyyy').parse(event.endDate!);\n+ } else {\n+ endDate = DateFormat('yyyy-MM-dd').parse(event.endDate!);\n+ }\n+\n+ // final startDate = DateFormat('yMd').parse(event.startDate!);\n print(\"${event.startTime!}##############################\");\n final startTime = parseTime(event.startTime ?? '14:23:01');\n // .parse(event.startTime!);\n- final endDate = DateFormat('yMd').parse(event.endDate!);\n+ // final endDate = DateFormat('yMd').parse(event.endDate!);\n final endTime = parseTime(event.endTime ?? '21:23:01');\n \n // adding appointments on the calender for event[index] date time.\ndiff --git a/lib/widgets/create_recurring_event_helper_widgets.dart b/lib/widgets/create_recurring_event_helper_widgets.dart\nindex d10f88c629..16c31b1bcd 100644\n--- a/lib/widgets/create_recurring_event_helper_widgets.dart\n+++ b/lib/widgets/create_recurring_event_helper_widgets.dart\n@@ -1,6 +1,9 @@\n import 'package:flutter/material.dart';\n+import 'package:flutter/services.dart';\n import 'package:intl/intl.dart';\n+import 'package:talawa/constants/recurrence_values.dart';\n import 'package:talawa/services/size_config.dart';\n+import 'package:talawa/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart';\n import 'package:talawa/widgets/date_time_picker.dart';\n \n /// Builds a rectangle with custom properties.\n@@ -33,16 +36,24 @@ class CustomRectangle extends StatelessWidget {\n class CustomTextField extends StatelessWidget {\n const CustomTextField({\n super.key,\n- required this.maxTextLength,\n+ this.maxTextLength,\n required this.textEditingController,\n+ this.readOnly = false,\n+ this.enabled,\n });\n \n /// Max textLength the text field allows.\n- final int maxTextLength;\n+ final int? maxTextLength;\n \n /// Controller of textField.\n final TextEditingController textEditingController;\n \n+ /// Indicates wether text field is enabled.\n+ final bool? enabled;\n+\n+ /// Indicates wether text field is read only.\n+ final bool readOnly;\n+\n @override\n Widget build(BuildContext context) {\n final outLineBorder = OutlineInputBorder(\n@@ -55,14 +66,18 @@ class CustomTextField extends StatelessWidget {\n maxLength: maxTextLength,\n textAlign: TextAlign.center,\n keyboardType: TextInputType.number,\n+ inputFormatters: [FilteringTextInputFormatter.digitsOnly],\n controller: textEditingController,\n decoration: InputDecoration(\n counterText: \"\",\n enabledBorder: outLineBorder,\n focusedBorder: outLineBorder,\n border: outLineBorder,\n+ disabledBorder: outLineBorder,\n contentPadding: const EdgeInsets.symmetric(vertical: 14),\n ),\n+ enabled: enabled,\n+ readOnly: readOnly,\n ),\n );\n }\n@@ -70,6 +85,25 @@ class CustomTextField extends StatelessWidget {\n \n /// Recurrence Frequency selection widget.\n class RecurrenceFrequencyDropdown extends StatefulWidget {\n+ const RecurrenceFrequencyDropdown({\n+ required this.model,\n+ required this.onSelected,\n+ required this.options,\n+ required this.selectedOption,\n+ });\n+\n+ /// Instance of create event view model.\n+ final CreateEventViewModel model;\n+\n+ /// Callback to be executed when selected value changes.\n+ final void Function(String)? onSelected;\n+\n+ /// Options to be shown in dropdown.\n+ final List options;\n+\n+ /// Selected option.\n+ final String selectedOption;\n+\n @override\n _RecurrenceFrequencyDropdownState createState() =>\n _RecurrenceFrequencyDropdownState();\n@@ -77,36 +111,40 @@ class RecurrenceFrequencyDropdown extends StatefulWidget {\n \n class _RecurrenceFrequencyDropdownState\n extends State {\n- /// Frequency options.\n- List options = ['day', 'week', 'month', 'year'];\n-\n- late String _selectedOption = 'week';\n-\n @override\n Widget build(BuildContext context) {\n- return PopupMenuButton(\n- offset: const Offset(0, 40),\n- itemBuilder: (BuildContext context) {\n- return >[\n- for (int i = 0; i < options.length; i++)\n- PopupMenuItem(\n- value: options[i],\n- child: Text(options[i]),\n- ),\n- ];\n- },\n- onSelected: (String value) {\n- setState(() {\n- _selectedOption = value;\n- });\n- },\n- tooltip: 'Select option',\n- child: Row(\n- mainAxisAlignment: MainAxisAlignment.center,\n- children: [\n- Text(_selectedOption),\n- const Icon(Icons.arrow_drop_down),\n- ],\n+ return CustomRectangle(\n+ child: Container(\n+ padding: const EdgeInsets.all(12),\n+ child: Center(\n+ child: Row(\n+ mainAxisAlignment: MainAxisAlignment\n+ .center, // Align the row's contents to the center horizontally\n+ children: [\n+ PopupMenuButton(\n+ offset: const Offset(0, 40),\n+ itemBuilder: (BuildContext context) {\n+ return >[\n+ for (int i = 0; i < widget.options.length; i++)\n+ PopupMenuItem(\n+ value: widget.options[i],\n+ child: Text(widget.options[i]),\n+ ),\n+ ];\n+ },\n+ onSelected: widget.onSelected,\n+ tooltip: 'Select option',\n+ child: Row(\n+ mainAxisAlignment: MainAxisAlignment.center,\n+ children: [\n+ Text(widget.selectedOption),\n+ const Icon(Icons.arrow_drop_down),\n+ ],\n+ ),\n+ ),\n+ ],\n+ ),\n+ ),\n ),\n );\n }\n@@ -114,40 +152,60 @@ class _RecurrenceFrequencyDropdownState\n \n /// Event ending configuration options.\n class EventEndOptions extends StatefulWidget {\n- const EventEndOptions({super.key});\n+ const EventEndOptions({super.key, required this.model});\n+\n+ /// Instance of create event view model.\n+ final CreateEventViewModel model;\n \n @override\n State createState() => _EventEndOptionsState();\n }\n \n class _EventEndOptionsState extends State {\n- /// Event ending frequency.\n- static List frequency = [\n- 'Never',\n- 'On',\n- 'After',\n+ /// Event end types.\n+ List eventEndTypes = [\n+ EventEndTypes.never,\n+ EventEndTypes.on,\n+ EventEndTypes.after,\n ];\n- String _selectedFrequency = frequency[0];\n- DateTime _endDate = DateTime.now();\n- final TextEditingController _repeatFrequencyTextController =\n- TextEditingController();\n \n /// Custom inline width.\n static const inlineWidth = SizedBox(\n width: 8,\n );\n \n+ @override\n+ void initState() {\n+ if (widget.model.eventEndType == EventEndTypes.never) {\n+ widget.model.eventEndDate = null;\n+ }\n+ super.initState();\n+ }\n+\n @override\n Widget build(BuildContext context) {\n+ print(widget.model.eventEndType);\n+ print(widget.model.recurrance);\n+ print(widget.model.recurranceFrequency);\n return Column(\n children: [\n- radioButton(const Key('neverRadioButton'), Text(frequency[0]), 0),\n radioButton(\n- const Key('onRadioButton'),\n- Row(\n+ key: const Key('neverRadioButton'),\n+ child: const Text(EventEndTypes.never),\n+ index: 0,\n+ inputAction: () {\n+ widget.model.setEventEndDate(null);\n+ setState(() {\n+ widget.model.eventEndType = EventEndTypes.never;\n+ });\n+ },\n+ ),\n+ radioButton(\n+ key: const Key('onRadioButton'),\n+ child: Row(\n crossAxisAlignment: CrossAxisAlignment.center,\n children: [\n- Text(frequency[1]),\n+ const Text(EventEndTypes.on),\n inlineWidth,\n CustomRectangle(\n child: Container(\n@@ -157,60 +215,92 @@ class _EventEndOptionsState extends State {\n // button to select the date and time of an event.\n onPressed: () async {\n // initially pickedDate is initialised with current end time.\n- final pickedDate =\n- await customDatePicker(initialDate: _endDate);\n+ final pickedDate = await customDatePicker(\n+ initialDate:\n+ widget.model.eventEndOnEndDate ?? DateTime.now(),\n+ );\n setState(() {\n- _endDate = pickedDate;\n+ widget.model.eventEndOnEndDate = pickedDate;\n+ widget.model.eventEndType = EventEndTypes.on;\n });\n },\n- icon: Text(formatDate(_endDate.toString().split(\" \")[0])),\n+ icon: Text(\n+ formatDate(\n+ widget.model.eventEndOnEndDate.toString().split(\" \")[0],\n+ ),\n+ style: widget.model.eventEndType == EventEndTypes.on\n+ ? TextStyle(color: Theme.of(context).dividerColor)\n+ : TextStyle(\n+ color: Theme.of(context)\n+ .dividerColor\n+ .withOpacity(0.4),\n+ ),\n+ ),\n ),\n ),\n ),\n ],\n ),\n- 1,\n+ index: 1,\n+ inputAction: () {\n+ setState(() {\n+ widget.model.eventEndType = EventEndTypes.on;\n+ });\n+ },\n ),\n radioButton(\n- const Key('afterRadioButton'),\n- Row(\n+ key: const Key('afterRadioButton'),\n+ child: Row(\n children: [\n- Text(frequency[2]),\n+ const Text(EventEndTypes.after),\n inlineWidth,\n CustomTextField(\n+ enabled: widget.model.eventEndType == EventEndTypes.after,\n maxTextLength: 3,\n- textEditingController: _repeatFrequencyTextController,\n+ textEditingController: widget.model.endOccurenceController,\n ),\n inlineWidth,\n const Text('occurrence'),\n ],\n ),\n- 2,\n+ index: 2,\n+ inputAction: () {\n+ setState(() {\n+ widget.model.eventEndType = EventEndTypes.after;\n+ });\n+ },\n ),\n ],\n );\n }\n \n- /// Custom radio button to select event ending frequency.\n+ /// Custom radio button to select event ending eventEndType.\n ///\n /// **params**:\n /// * `key`: Uniquely identifies the radioButton.\n /// * `child`: RadioListTile widget.\n- /// * `index`: index of [frequency].\n+ /// * `index`: index of [eventEndType].\n+ /// * `inputAction`: Call back to be executed when clicked on radio button.\n ///\n /// **returns**:\n /// * `Theme`: custom theme.\n- Theme radioButton(Key key, Widget child, int index) {\n+ Theme radioButton({\n+ required Key key,\n+ required Widget child,\n+ required int index,\n+ Function()? inputAction,\n+ }) {\n return Theme(\n key: key,\n data: Theme.of(context).copyWith(focusColor: Colors.transparent),\n child: RadioListTile(\n title: child,\n- value: frequency[index],\n- groupValue: _selectedFrequency,\n+ value: eventEndTypes[index],\n+ groupValue: widget.model.eventEndType,\n onChanged: (value) {\n setState(() {\n- _selectedFrequency = value!;\n+ widget.model.eventEndType = value!;\n+ inputAction?.call();\n });\n },\n ),\ndiff --git a/lib/widgets/custom_weekday_selector.dart b/lib/widgets/custom_weekday_selector.dart\nindex e19d33fe7c..6f60696642 100644\n--- a/lib/widgets/custom_weekday_selector.dart\n+++ b/lib/widgets/custom_weekday_selector.dart\n@@ -1,37 +1,47 @@\n import 'package:flutter/material.dart';\n+import 'package:talawa/constants/recurrence_values.dart';\n+import 'package:talawa/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart';\n \n /// Custom Widget to select weekdays.\n class CustomWeekDaySelector extends StatefulWidget {\n+ const CustomWeekDaySelector({required this.model});\n+\n+ /// instance of create event view model.\n+ final CreateEventViewModel model;\n+\n @override\n _CustomWeekDaySelectorState createState() => _CustomWeekDaySelectorState();\n }\n \n class _CustomWeekDaySelectorState extends State {\n- /// Keeps track of week days that are selected.\n- List isSelected = List.generate(7, (_) => false);\n-\n @override\n Widget build(BuildContext context) {\n- print('came');\n+ final Set weekdays = widget.model.weekdays;\n return Container(\n child: Row(\n mainAxisAlignment: MainAxisAlignment.spaceBetween,\n- children: List.generate(\n- 7,\n- (index) => GestureDetector(\n+ children: List.generate(7, (index) {\n+ final weekday = _getWeekdayAbbreviation(index);\n+ return GestureDetector(\n onTap: () {\n setState(() {\n- isSelected[index] = !isSelected[index];\n+ if (weekdays.contains(weekday)) {\n+ weekdays.remove(weekday);\n+ } else {\n+ weekdays.add(weekday);\n+ }\n });\n },\n child: Container(\n width: 30,\n height: 30,\n decoration: BoxDecoration(\n- color: Colors.transparent,\n+ color: weekdays.contains(weekday)\n+ ? Theme.of(context).colorScheme.primary.withOpacity(0.5)\n+ : Colors.transparent,\n border: Border.all(\n- width: 0.5,\n- color: isSelected[index]\n+ width: weekdays.contains(weekday) ? 2 : 1,\n+ color: weekdays.contains(weekday)\n ? Theme.of(context).colorScheme.primary\n : Theme.of(context).dividerColor,\n ),\n@@ -39,18 +49,16 @@ class _CustomWeekDaySelectorState extends State {\n ),\n child: Center(\n child: Text(\n- _getWeekdayAbbreviation(index),\n+ weekday[0],\n style: TextStyle(\n- color: isSelected[index]\n- ? Theme.of(context).colorScheme.primary\n- : Theme.of(context).dividerColor,\n+ color: Theme.of(context).dividerColor,\n fontWeight: FontWeight.bold,\n ),\n ),\n ),\n ),\n- ),\n- ),\n+ );\n+ }),\n ),\n );\n }\n@@ -65,19 +73,19 @@ class _CustomWeekDaySelectorState extends State {\n String _getWeekdayAbbreviation(int index) {\n switch (index) {\n case 0:\n- return 'S';\n+ return Recurrance.weekdaySunday;\n case 1:\n- return 'M';\n+ return Recurrance.weekdayMonday;\n case 2:\n- return 'T';\n+ return Recurrance.weekdayTuesday;\n case 3:\n- return 'W';\n+ return Recurrance.weekdayWednesday;\n case 4:\n- return 'T';\n+ return Recurrance.weekdayThursday;\n case 5:\n- return 'F';\n+ return Recurrance.weekdayFriday;\n case 6:\n- return 'S';\n+ return Recurrance.weekdaySaturday;\n default:\n return '';\n }\ndiff --git a/lib/widgets/recurrence_dialog.dart b/lib/widgets/recurrence_dialog.dart\nindex 402daea913..348460a9f9 100644\n--- a/lib/widgets/recurrence_dialog.dart\n+++ b/lib/widgets/recurrence_dialog.dart\n@@ -2,27 +2,45 @@ import 'package:flutter/material.dart';\n import 'package:talawa/constants/routing_constants.dart';\n import 'package:talawa/locator.dart';\n import 'package:talawa/services/size_config.dart';\n+import 'package:talawa/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart';\n \n /// Dialog for showing recurrence options.\n class ShowRecurrenceDialog extends StatefulWidget {\n- const ShowRecurrenceDialog({super.key});\n+ const ShowRecurrenceDialog({\n+ super.key,\n+ required this.model,\n+ required this.initialRecurrence,\n+ });\n+\n+ final CreateEventViewModel model;\n+ final String initialRecurrence;\n \n @override\n State createState() => _ShowRecurrenceDialogState();\n }\n \n class _ShowRecurrenceDialogState extends State {\n+ static const donotRepeat = \"Does not repeat\";\n+ static const dialy = \"Every day\";\n+ static const weekly = \"Every week\";\n+ static const monthly = \"Every month\";\n+ static const yearly = \"Every year\";\n+ static const custom = \"Custom...\";\n+\n static const List _frequencies = [\n- \"Does not repeat\",\n- \"Every day\",\n- \"Every week\",\n- \"Every month\",\n- \"Every year\",\n- \"Custom...\",\n+ donotRepeat,\n+ dialy,\n+ weekly,\n+ monthly,\n+ yearly,\n+ custom,\n ];\n- String _frequency = _frequencies[0];\n+\n+ late String _frequency;\n @override\n Widget build(BuildContext context) {\n+ _frequency = widget.initialRecurrence;\n+ print('widget built');\n return Dialog(\n child: SizedBox(\n height: SizeConfig.screenHeight! * 0.5,\n@@ -49,13 +67,18 @@ class _ShowRecurrenceDialogState extends State {\n title: Text(frequency),\n value: frequency,\n groupValue: _frequency,\n- onChanged: (value) {\n+ onChanged: (value) async {\n // navigate to custom recurrence page when pressed custom... button.\n+ widget.model.recurrance = widget.model.getRecurrance(value!);\n if (value == _frequencies[5]) {\n- navigationService.pushScreen(Routes.customRecurrencePage);\n+ await navigationService.pushScreen(\n+ Routes.customRecurrencePage,\n+ arguments: widget.model,\n+ );\n }\n setState(() {\n- _frequency = value!;\n+ _frequency = value;\n+ Navigator.pop(context, _frequency);\n });\n },\n );\n", "test_patch": "diff --git a/test/helpers/setup_hive.mocks.dart b/test/helpers/setup_hive.mocks.dart\nindex dc67dfd0a5..8b4dfda4a8 100644\n--- a/test/helpers/setup_hive.mocks.dart\n+++ b/test/helpers/setup_hive.mocks.dart\n@@ -1,5 +1,5 @@\n-// Mocks generated by Mockito 5.4.3 from annotations\n-// in talawa/test/utils/encryptor_test.dart.\n+// Mocks generated by Mockito 5.4.4 from annotations\n+// in talawa/test/helpers/setup_hive.dart.\n // Do not manually edit this file.\n \n // ignore_for_file: no_leading_underscores_for_library_prefixes\ndiff --git a/test/helpers/test_helpers.dart b/test/helpers/test_helpers.dart\nindex 250a4a9147..ee66b2ffb4 100644\n--- a/test/helpers/test_helpers.dart\n+++ b/test/helpers/test_helpers.dart\n@@ -587,6 +587,18 @@ CreateEventViewModel getAndRegisterCreateEventModel() {\n \n when(cachedViewModel.memberCheckedMap).thenReturn(mapType);\n \n+ when(cachedViewModel.isAllDay).thenReturn(true);\n+\n+ when(cachedViewModel.eventStartTime).thenReturn(TimeOfDay.now());\n+\n+ when(cachedViewModel.eventEndTime).thenReturn(\n+ TimeOfDay.now().replacing(\n+ hour:\n+ (TimeOfDay.now().hour + (TimeOfDay.now().minute >= 30 ? 1 : 0)) % 24,\n+ minute: (TimeOfDay.now().minute + 30) % 60,\n+ ),\n+ );\n+\n when(cachedViewModel.removeUserFromList(userId: \"fakeUser1\"))\n .thenAnswer((realInvocation) async {\n when(cachedViewModel.selectedMembers).thenReturn([]);\ndiff --git a/test/helpers/test_helpers.mocks.dart b/test/helpers/test_helpers.mocks.dart\nindex a6253957f7..d602a48227 100644\n--- a/test/helpers/test_helpers.mocks.dart\n+++ b/test/helpers/test_helpers.mocks.dart\n@@ -4,54 +4,54 @@\n \n // ignore_for_file: no_leading_underscores_for_library_prefixes\n import 'dart:async' as _i5;\n-import 'dart:io' as _i21;\n+import 'dart:io' as _i19;\n import 'dart:ui' as _i10;\n \n-import 'package:connectivity_plus/connectivity_plus.dart' as _i28;\n+import 'package:connectivity_plus/connectivity_plus.dart' as _i27;\n import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'\n- as _i29;\n+ as _i28;\n import 'package:flutter/material.dart' as _i1;\n import 'package:graphql_flutter/graphql_flutter.dart' as _i3;\n-import 'package:image_cropper/src/cropper.dart' as _i43;\n+import 'package:image_cropper/src/cropper.dart' as _i41;\n import 'package:image_cropper_platform_interface/image_cropper_platform_interface.dart'\n- as _i44;\n+ as _i42;\n import 'package:image_picker/image_picker.dart' as _i13;\n import 'package:mockito/mockito.dart' as _i2;\n-import 'package:mockito/src/dummies.dart' as _i16;\n+import 'package:mockito/src/dummies.dart' as _i25;\n import 'package:qr_code_scanner/src/qr_code_scanner.dart' as _i34;\n import 'package:qr_code_scanner/src/types/barcode.dart' as _i35;\n import 'package:qr_code_scanner/src/types/camera.dart' as _i36;\n import 'package:qr_code_scanner/src/types/features.dart' as _i12;\n-import 'package:talawa/enums/enums.dart' as _i17;\n-import 'package:talawa/models/chats/chat_list_tile_data_model.dart' as _i24;\n-import 'package:talawa/models/chats/chat_message.dart' as _i25;\n-import 'package:talawa/models/events/event_model.dart' as _i22;\n+import 'package:talawa/enums/enums.dart' as _i14;\n+import 'package:talawa/models/chats/chat_list_tile_data_model.dart' as _i22;\n+import 'package:talawa/models/chats/chat_message.dart' as _i23;\n+import 'package:talawa/models/events/event_model.dart' as _i20;\n import 'package:talawa/models/organization/org_info.dart' as _i6;\n-import 'package:talawa/models/post/post_model.dart' as _i15;\n+import 'package:talawa/models/post/post_model.dart' as _i17;\n import 'package:talawa/models/user/user_info.dart' as _i7;\n-import 'package:talawa/services/chat_service.dart' as _i23;\n+import 'package:talawa/services/chat_service.dart' as _i21;\n import 'package:talawa/services/comment_service.dart' as _i37;\n import 'package:talawa/services/database_mutation_functions.dart' as _i9;\n import 'package:talawa/services/event_service.dart' as _i11;\n-import 'package:talawa/services/graphql_config.dart' as _i18;\n+import 'package:talawa/services/graphql_config.dart' as _i15;\n import 'package:talawa/services/navigation_service.dart' as _i8;\n-import 'package:talawa/services/org_service.dart' as _i31;\n-import 'package:talawa/services/post_service.dart' as _i19;\n+import 'package:talawa/services/org_service.dart' as _i30;\n+import 'package:talawa/services/post_service.dart' as _i16;\n import 'package:talawa/services/third_party_service/multi_media_pick_service.dart'\n- as _i20;\n-import 'package:talawa/services/user_config.dart' as _i26;\n+ as _i18;\n+import 'package:talawa/services/user_config.dart' as _i24;\n import 'package:talawa/utils/validators.dart' as _i33;\n import 'package:talawa/view_model/after_auth_view_models/chat_view_models/direct_chat_view_model.dart'\n- as _i42;\n+ as _i40;\n import 'package:talawa/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart'\n- as _i41;\n+ as _i39;\n import 'package:talawa/view_model/after_auth_view_models/event_view_models/explore_events_view_model.dart'\n- as _i32;\n+ as _i31;\n import 'package:talawa/view_model/after_auth_view_models/feed_view_models/organization_feed_view_model.dart'\n- as _i14;\n-import 'package:talawa/view_model/lang_view_model.dart' as _i27;\n+ as _i32;\n+import 'package:talawa/view_model/lang_view_model.dart' as _i26;\n import 'package:talawa/view_model/pre_auth_view_models/signup_details_view_model.dart'\n- as _i30;\n+ as _i29;\n import 'package:talawa/view_model/theme_view_model.dart' as _i38;\n import 'package:talawa/widgets/custom_alert_dialog.dart' as _i4;\n \n@@ -337,220 +337,6 @@ class _FakeLostDataResponse_24 extends _i2.SmartFake\n );\n }\n \n-/// A class which mocks [OrganizationFeedViewModel].\n-///\n-/// See the documentation for Mockito's code generation for more information.\n-class MockOrganizationFeedViewModel extends _i2.Mock\n- implements _i14.OrganizationFeedViewModel {\n- MockOrganizationFeedViewModel() {\n- _i2.throwOnMissingStub(this);\n- }\n-\n- @override\n- bool get istest => (super.noSuchMethod(\n- Invocation.getter(#istest),\n- returnValue: false,\n- ) as bool);\n-\n- @override\n- set istest(bool? _istest) => super.noSuchMethod(\n- Invocation.setter(\n- #istest,\n- _istest,\n- ),\n- returnValueForMissingStub: null,\n- );\n-\n- @override\n- List<_i15.Post> get posts => (super.noSuchMethod(\n- Invocation.getter(#posts),\n- returnValue: <_i15.Post>[],\n- ) as List<_i15.Post>);\n-\n- @override\n- List<_i15.Post> get userPosts => (super.noSuchMethod(\n- Invocation.getter(#userPosts),\n- returnValue: <_i15.Post>[],\n- ) as List<_i15.Post>);\n-\n- @override\n- List<_i15.Post> get pinnedPosts => (super.noSuchMethod(\n- Invocation.getter(#pinnedPosts),\n- returnValue: <_i15.Post>[],\n- ) as List<_i15.Post>);\n-\n- @override\n- String get currentOrgName => (super.noSuchMethod(\n- Invocation.getter(#currentOrgName),\n- returnValue: _i16.dummyValue(\n- this,\n- Invocation.getter(#currentOrgName),\n- ),\n- ) as String);\n-\n- @override\n- bool get isFetchingPosts => (super.noSuchMethod(\n- Invocation.getter(#isFetchingPosts),\n- returnValue: false,\n- ) as bool);\n-\n- @override\n- _i17.ViewState get state => (super.noSuchMethod(\n- Invocation.getter(#state),\n- returnValue: _i17.ViewState.idle,\n- ) as _i17.ViewState);\n-\n- @override\n- bool get isBusy => (super.noSuchMethod(\n- Invocation.getter(#isBusy),\n- returnValue: false,\n- ) as bool);\n-\n- @override\n- bool get hasListeners => (super.noSuchMethod(\n- Invocation.getter(#hasListeners),\n- returnValue: false,\n- ) as bool);\n-\n- @override\n- void setCurrentOrganizationName(String? updatedOrganization) =>\n- super.noSuchMethod(\n- Invocation.method(\n- #setCurrentOrganizationName,\n- [updatedOrganization],\n- ),\n- returnValueForMissingStub: null,\n- );\n-\n- @override\n- void fetchNewPosts() => super.noSuchMethod(\n- Invocation.method(\n- #fetchNewPosts,\n- [],\n- ),\n- returnValueForMissingStub: null,\n- );\n-\n- @override\n- void initialise({bool? isTest = false}) => super.noSuchMethod(\n- Invocation.method(\n- #initialise,\n- [],\n- {#isTest: isTest},\n- ),\n- returnValueForMissingStub: null,\n- );\n-\n- @override\n- void initializeWithDemoData() => super.noSuchMethod(\n- Invocation.method(\n- #initializeWithDemoData,\n- [],\n- ),\n- returnValueForMissingStub: null,\n- );\n-\n- @override\n- void buildNewPosts(List<_i15.Post>? newPosts) => super.noSuchMethod(\n- Invocation.method(\n- #buildNewPosts,\n- [newPosts],\n- ),\n- returnValueForMissingStub: null,\n- );\n-\n- @override\n- void navigateToIndividualPage(_i15.Post? post) => super.noSuchMethod(\n- Invocation.method(\n- #navigateToIndividualPage,\n- [post],\n- ),\n- returnValueForMissingStub: null,\n- );\n-\n- @override\n- void navigateToPinnedPostPage() => super.noSuchMethod(\n- Invocation.method(\n- #navigateToPinnedPostPage,\n- [],\n- ),\n- returnValueForMissingStub: null,\n- );\n-\n- @override\n- void dispose() => super.noSuchMethod(\n- Invocation.method(\n- #dispose,\n- [],\n- ),\n- returnValueForMissingStub: null,\n- );\n-\n- @override\n- void addNewPost(_i15.Post? newPost) => super.noSuchMethod(\n- Invocation.method(\n- #addNewPost,\n- [newPost],\n- ),\n- returnValueForMissingStub: null,\n- );\n-\n- @override\n- void updatedPost(_i15.Post? post) => super.noSuchMethod(\n- Invocation.method(\n- #updatedPost,\n- [post],\n- ),\n- returnValueForMissingStub: null,\n- );\n-\n- @override\n- _i5.Future removePost(_i15.Post? post) => (super.noSuchMethod(\n- Invocation.method(\n- #removePost,\n- [post],\n- ),\n- returnValue: _i5.Future.value(),\n- returnValueForMissingStub: _i5.Future.value(),\n- ) as _i5.Future);\n-\n- @override\n- void setState(_i17.ViewState? viewState) => super.noSuchMethod(\n- Invocation.method(\n- #setState,\n- [viewState],\n- ),\n- returnValueForMissingStub: null,\n- );\n-\n- @override\n- void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(\n- Invocation.method(\n- #addListener,\n- [listener],\n- ),\n- returnValueForMissingStub: null,\n- );\n-\n- @override\n- void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(\n- Invocation.method(\n- #removeListener,\n- [listener],\n- ),\n- returnValueForMissingStub: null,\n- );\n-\n- @override\n- void notifyListeners() => super.noSuchMethod(\n- Invocation.method(\n- #notifyListeners,\n- [],\n- ),\n- returnValueForMissingStub: null,\n- );\n-}\n-\n /// A class which mocks [NavigationService].\n ///\n /// See the documentation for Mockito's code generation for more information.\n@@ -668,7 +454,7 @@ class MockNavigationService extends _i2.Mock implements _i8.NavigationService {\n @override\n void showTalawaErrorSnackBar(\n String? errorMessage,\n- _i17.MessageType? messageType,\n+ _i14.MessageType? messageType,\n ) =>\n super.noSuchMethod(\n Invocation.method(\n@@ -684,7 +470,7 @@ class MockNavigationService extends _i2.Mock implements _i8.NavigationService {\n @override\n void showTalawaErrorDialog(\n String? errorMessage,\n- _i17.MessageType? messageType,\n+ _i14.MessageType? messageType,\n ) =>\n super.noSuchMethod(\n Invocation.method(\n@@ -710,7 +496,7 @@ class MockNavigationService extends _i2.Mock implements _i8.NavigationService {\n /// A class which mocks [GraphqlConfig].\n ///\n /// See the documentation for Mockito's code generation for more information.\n-class MockGraphqlConfig extends _i2.Mock implements _i18.GraphqlConfig {\n+class MockGraphqlConfig extends _i2.Mock implements _i15.GraphqlConfig {\n @override\n _i3.HttpLink get httpLink => (super.noSuchMethod(\n Invocation.getter(#httpLink),\n@@ -1191,20 +977,20 @@ class MockGraphQLClient extends _i2.Mock implements _i3.GraphQLClient {\n /// A class which mocks [PostService].\n ///\n /// See the documentation for Mockito's code generation for more information.\n-class MockPostService extends _i2.Mock implements _i19.PostService {\n+class MockPostService extends _i2.Mock implements _i16.PostService {\n @override\n- _i5.Stream> get postStream => (super.noSuchMethod(\n+ _i5.Stream> get postStream => (super.noSuchMethod(\n Invocation.getter(#postStream),\n- returnValue: _i5.Stream>.empty(),\n- returnValueForMissingStub: _i5.Stream>.empty(),\n- ) as _i5.Stream>);\n+ returnValue: _i5.Stream>.empty(),\n+ returnValueForMissingStub: _i5.Stream>.empty(),\n+ ) as _i5.Stream>);\n \n @override\n- _i5.Stream<_i15.Post> get updatedPostStream => (super.noSuchMethod(\n+ _i5.Stream<_i17.Post> get updatedPostStream => (super.noSuchMethod(\n Invocation.getter(#updatedPostStream),\n- returnValue: _i5.Stream<_i15.Post>.empty(),\n- returnValueForMissingStub: _i5.Stream<_i15.Post>.empty(),\n- ) as _i5.Stream<_i15.Post>);\n+ returnValue: _i5.Stream<_i17.Post>.empty(),\n+ returnValueForMissingStub: _i5.Stream<_i17.Post>.empty(),\n+ ) as _i5.Stream<_i17.Post>);\n \n @override\n void setOrgStreamSubscription() => super.noSuchMethod(\n@@ -1226,18 +1012,19 @@ class MockPostService extends _i2.Mock implements _i19.PostService {\n ) as _i5.Future);\n \n @override\n- Future refreshFeed() async => super.noSuchMethod(\n+ _i5.Future refreshFeed() => (super.noSuchMethod(\n Invocation.method(\n #refreshFeed,\n [],\n ),\n- returnValueForMissingStub: null,\n- );\n+ returnValue: _i5.Future.value(),\n+ returnValueForMissingStub: _i5.Future.value(),\n+ ) as _i5.Future);\n \n @override\n- void addnewpost(_i15.Post? newPost) => super.noSuchMethod(\n+ void addNewpost(_i17.Post? newPost) => super.noSuchMethod(\n Invocation.method(\n- #addnewpost,\n+ #addNewpost,\n [newPost],\n ),\n returnValueForMissingStub: null,\n@@ -1277,7 +1064,7 @@ class MockPostService extends _i2.Mock implements _i19.PostService {\n ///\n /// See the documentation for Mockito's code generation for more information.\n class MockMultiMediaPickerService extends _i2.Mock\n- implements _i20.MultiMediaPickerService {\n+ implements _i18.MultiMediaPickerService {\n @override\n _i5.Stream get fileStream => (super.noSuchMethod(\n Invocation.getter(#fileStream),\n@@ -1286,16 +1073,16 @@ class MockMultiMediaPickerService extends _i2.Mock\n ) as _i5.Stream);\n \n @override\n- _i5.Future<_i21.File?> getPhotoFromGallery({bool? camera = false}) =>\n+ _i5.Future<_i19.File?> getPhotoFromGallery({bool? camera = false}) =>\n (super.noSuchMethod(\n Invocation.method(\n #getPhotoFromGallery,\n [],\n {#camera: camera},\n ),\n- returnValue: _i5.Future<_i21.File?>.value(),\n- returnValueForMissingStub: _i5.Future<_i21.File?>.value(),\n- ) as _i5.Future<_i21.File?>);\n+ returnValue: _i5.Future<_i19.File?>.value(),\n+ returnValueForMissingStub: _i5.Future<_i19.File?>.value(),\n+ ) as _i5.Future<_i19.File?>);\n \n @override\n _i4.CustomAlertDialog permissionDeniedDialog() => (super.noSuchMethod(\n@@ -1325,11 +1112,11 @@ class MockMultiMediaPickerService extends _i2.Mock\n /// See the documentation for Mockito's code generation for more information.\n class MockEventService extends _i2.Mock implements _i11.EventService {\n @override\n- _i5.Stream<_i22.Event> get eventStream => (super.noSuchMethod(\n+ _i5.Stream<_i20.Event> get eventStream => (super.noSuchMethod(\n Invocation.getter(#eventStream),\n- returnValue: _i5.Stream<_i22.Event>.empty(),\n- returnValueForMissingStub: _i5.Stream<_i22.Event>.empty(),\n- ) as _i5.Stream<_i22.Event>);\n+ returnValue: _i5.Stream<_i20.Event>.empty(),\n+ returnValueForMissingStub: _i5.Stream<_i20.Event>.empty(),\n+ ) as _i5.Stream<_i20.Event>);\n \n @override\n void setOrgStreamSubscription() => super.noSuchMethod(\n@@ -1413,7 +1200,7 @@ class MockEventService extends _i2.Mock implements _i11.EventService {\n /// A class which mocks [ChatService].\n ///\n /// See the documentation for Mockito's code generation for more information.\n-class MockChatService extends _i2.Mock implements _i23.ChatService {\n+class MockChatService extends _i2.Mock implements _i21.ChatService {\n @override\n _i5.Stream<_i3.QueryResult> get chatStream => (super.noSuchMethod(\n Invocation.getter(#chatStream),\n@@ -1432,20 +1219,20 @@ class MockChatService extends _i2.Mock implements _i23.ChatService {\n );\n \n @override\n- _i5.Stream<_i24.ChatListTileDataModel> get chatListStream =>\n+ _i5.Stream<_i22.ChatListTileDataModel> get chatListStream =>\n (super.noSuchMethod(\n Invocation.getter(#chatListStream),\n- returnValue: _i5.Stream<_i24.ChatListTileDataModel>.empty(),\n+ returnValue: _i5.Stream<_i22.ChatListTileDataModel>.empty(),\n returnValueForMissingStub:\n- _i5.Stream<_i24.ChatListTileDataModel>.empty(),\n- ) as _i5.Stream<_i24.ChatListTileDataModel>);\n+ _i5.Stream<_i22.ChatListTileDataModel>.empty(),\n+ ) as _i5.Stream<_i22.ChatListTileDataModel>);\n \n @override\n- _i5.Stream<_i25.ChatMessage> get chatMessagesStream => (super.noSuchMethod(\n+ _i5.Stream<_i23.ChatMessage> get chatMessagesStream => (super.noSuchMethod(\n Invocation.getter(#chatMessagesStream),\n- returnValue: _i5.Stream<_i25.ChatMessage>.empty(),\n- returnValueForMissingStub: _i5.Stream<_i25.ChatMessage>.empty(),\n- ) as _i5.Stream<_i25.ChatMessage>);\n+ returnValue: _i5.Stream<_i23.ChatMessage>.empty(),\n+ returnValueForMissingStub: _i5.Stream<_i23.ChatMessage>.empty(),\n+ ) as _i5.Stream<_i23.ChatMessage>);\n \n @override\n _i5.Future sendMessageToDirectChat(\n@@ -1489,7 +1276,7 @@ class MockChatService extends _i2.Mock implements _i23.ChatService {\n /// A class which mocks [UserConfig].\n ///\n /// See the documentation for Mockito's code generation for more information.\n-class MockUserConfig extends _i2.Mock implements _i26.UserConfig {\n+class MockUserConfig extends _i2.Mock implements _i24.UserConfig {\n @override\n _i5.Stream<_i6.OrgInfo> get currentOrgInfoStream => (super.noSuchMethod(\n Invocation.getter(#currentOrgInfoStream),\n@@ -1527,11 +1314,11 @@ class MockUserConfig extends _i2.Mock implements _i26.UserConfig {\n @override\n String get currentOrgName => (super.noSuchMethod(\n Invocation.getter(#currentOrgName),\n- returnValue: _i16.dummyValue(\n+ returnValue: _i25.dummyValue(\n this,\n Invocation.getter(#currentOrgName),\n ),\n- returnValueForMissingStub: _i16.dummyValue(\n+ returnValueForMissingStub: _i25.dummyValue(\n this,\n Invocation.getter(#currentOrgName),\n ),\n@@ -1700,7 +1487,7 @@ class MockUserConfig extends _i2.Mock implements _i26.UserConfig {\n /// A class which mocks [AppLanguage].\n ///\n /// See the documentation for Mockito's code generation for more information.\n-class MockAppLanguage extends _i2.Mock implements _i27.AppLanguage {\n+class MockAppLanguage extends _i2.Mock implements _i26.AppLanguage {\n @override\n bool get isTest => (super.noSuchMethod(\n Invocation.getter(#isTest),\n@@ -1748,11 +1535,11 @@ class MockAppLanguage extends _i2.Mock implements _i27.AppLanguage {\n ) as _i10.Locale);\n \n @override\n- _i17.ViewState get state => (super.noSuchMethod(\n+ _i14.ViewState get state => (super.noSuchMethod(\n Invocation.getter(#state),\n- returnValue: _i17.ViewState.idle,\n- returnValueForMissingStub: _i17.ViewState.idle,\n- ) as _i17.ViewState);\n+ returnValue: _i14.ViewState.idle,\n+ returnValueForMissingStub: _i14.ViewState.idle,\n+ ) as _i14.ViewState);\n \n @override\n bool get isBusy => (super.noSuchMethod(\n@@ -1839,7 +1626,7 @@ class MockAppLanguage extends _i2.Mock implements _i27.AppLanguage {\n ) as _i5.Future);\n \n @override\n- void setState(_i17.ViewState? viewState) => super.noSuchMethod(\n+ void setState(_i14.ViewState? viewState) => super.noSuchMethod(\n Invocation.method(\n #setState,\n [viewState],\n@@ -1887,34 +1674,34 @@ class MockAppLanguage extends _i2.Mock implements _i27.AppLanguage {\n /// A class which mocks [Connectivity].\n ///\n /// See the documentation for Mockito's code generation for more information.\n-class MockConnectivity extends _i2.Mock implements _i28.Connectivity {\n+class MockConnectivity extends _i2.Mock implements _i27.Connectivity {\n @override\n- _i5.Stream<_i29.ConnectivityResult> get onConnectivityChanged =>\n+ _i5.Stream<_i28.ConnectivityResult> get onConnectivityChanged =>\n (super.noSuchMethod(\n Invocation.getter(#onConnectivityChanged),\n- returnValue: _i5.Stream<_i29.ConnectivityResult>.empty(),\n- returnValueForMissingStub: _i5.Stream<_i29.ConnectivityResult>.empty(),\n- ) as _i5.Stream<_i29.ConnectivityResult>);\n+ returnValue: _i5.Stream<_i28.ConnectivityResult>.empty(),\n+ returnValueForMissingStub: _i5.Stream<_i28.ConnectivityResult>.empty(),\n+ ) as _i5.Stream<_i28.ConnectivityResult>);\n \n @override\n- _i5.Future<_i29.ConnectivityResult> checkConnectivity() =>\n+ _i5.Future<_i28.ConnectivityResult> checkConnectivity() =>\n (super.noSuchMethod(\n Invocation.method(\n #checkConnectivity,\n [],\n ),\n- returnValue: _i5.Future<_i29.ConnectivityResult>.value(\n- _i29.ConnectivityResult.bluetooth),\n- returnValueForMissingStub: _i5.Future<_i29.ConnectivityResult>.value(\n- _i29.ConnectivityResult.bluetooth),\n- ) as _i5.Future<_i29.ConnectivityResult>);\n+ returnValue: _i5.Future<_i28.ConnectivityResult>.value(\n+ _i28.ConnectivityResult.bluetooth),\n+ returnValueForMissingStub: _i5.Future<_i28.ConnectivityResult>.value(\n+ _i28.ConnectivityResult.bluetooth),\n+ ) as _i5.Future<_i28.ConnectivityResult>);\n }\n \n /// A class which mocks [SignupDetailsViewModel].\n ///\n /// See the documentation for Mockito's code generation for more information.\n class MockSignupDetailsViewModel extends _i2.Mock\n- implements _i30.SignupDetailsViewModel {\n+ implements _i29.SignupDetailsViewModel {\n @override\n _i1.GlobalKey<_i1.FormState> get formKey => (super.noSuchMethod(\n Invocation.getter(#formKey),\n@@ -2133,11 +1920,11 @@ class MockSignupDetailsViewModel extends _i2.Mock\n );\n \n @override\n- _i17.ViewState get state => (super.noSuchMethod(\n+ _i14.ViewState get state => (super.noSuchMethod(\n Invocation.getter(#state),\n- returnValue: _i17.ViewState.idle,\n- returnValueForMissingStub: _i17.ViewState.idle,\n- ) as _i17.ViewState);\n+ returnValue: _i14.ViewState.idle,\n+ returnValueForMissingStub: _i14.ViewState.idle,\n+ ) as _i14.ViewState);\n \n @override\n bool get isBusy => (super.noSuchMethod(\n@@ -2173,7 +1960,7 @@ class MockSignupDetailsViewModel extends _i2.Mock\n ) as _i5.Future);\n \n @override\n- void setState(_i17.ViewState? viewState) => super.noSuchMethod(\n+ void setState(_i14.ViewState? viewState) => super.noSuchMethod(\n Invocation.method(\n #setState,\n [viewState],\n@@ -2221,15 +2008,15 @@ class MockSignupDetailsViewModel extends _i2.Mock\n /// A class which mocks [Post].\n ///\n /// See the documentation for Mockito's code generation for more information.\n-class MockPost extends _i2.Mock implements _i15.Post {\n+class MockPost extends _i2.Mock implements _i17.Post {\n @override\n String get sId => (super.noSuchMethod(\n Invocation.getter(#sId),\n- returnValue: _i16.dummyValue(\n+ returnValue: _i25.dummyValue(\n this,\n Invocation.getter(#sId),\n ),\n- returnValueForMissingStub: _i16.dummyValue(\n+ returnValueForMissingStub: _i25.dummyValue(\n this,\n Invocation.getter(#sId),\n ),\n@@ -2308,7 +2095,7 @@ class MockPost extends _i2.Mock implements _i15.Post {\n );\n \n @override\n- set likedBy(List<_i15.LikedBy>? _likedBy) => super.noSuchMethod(\n+ set likedBy(List<_i17.LikedBy>? _likedBy) => super.noSuchMethod(\n Invocation.setter(\n #likedBy,\n _likedBy,\n@@ -2317,7 +2104,7 @@ class MockPost extends _i2.Mock implements _i15.Post {\n );\n \n @override\n- set comments(List<_i15.Comments>? _comments) => super.noSuchMethod(\n+ set comments(List<_i17.Comments>? _comments) => super.noSuchMethod(\n Invocation.setter(\n #comments,\n _comments,\n@@ -2331,14 +2118,14 @@ class MockPost extends _i2.Mock implements _i15.Post {\n #getPostCreatedDuration,\n [],\n ),\n- returnValue: _i16.dummyValue(\n+ returnValue: _i25.dummyValue(\n this,\n Invocation.method(\n #getPostCreatedDuration,\n [],\n ),\n ),\n- returnValueForMissingStub: _i16.dummyValue(\n+ returnValueForMissingStub: _i25.dummyValue(\n this,\n Invocation.method(\n #getPostCreatedDuration,\n@@ -2591,6 +2378,15 @@ class MockDataBaseMutationFunctions extends _i2.Mock\n returnValueForMissingStub: null,\n );\n \n+ @override\n+ void initClientNonAuth() => super.noSuchMethod(\n+ Invocation.method(\n+ #initClientNonAuth,\n+ [],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n @override\n bool? encounteredExceptionOrError(\n _i3.OperationException? exception, {\n@@ -2696,7 +2492,7 @@ class MockDataBaseMutationFunctions extends _i2.Mock\n ///\n /// See the documentation for Mockito's code generation for more information.\n class MockOrganizationService extends _i2.Mock\n- implements _i31.OrganizationService {\n+ implements _i30.OrganizationService {\n @override\n _i5.Future> getOrgMembersList(String? orgId) =>\n (super.noSuchMethod(\n@@ -2714,7 +2510,7 @@ class MockOrganizationService extends _i2.Mock\n ///\n /// See the documentation for Mockito's code generation for more information.\n class MockExploreEventsViewModel extends _i2.Mock\n- implements _i32.ExploreEventsViewModel {\n+ implements _i31.ExploreEventsViewModel {\n @override\n bool get demoMode => (super.noSuchMethod(\n Invocation.getter(#demoMode),\n@@ -2732,18 +2528,18 @@ class MockExploreEventsViewModel extends _i2.Mock\n );\n \n @override\n- List<_i22.Event> get events => (super.noSuchMethod(\n+ List<_i20.Event> get events => (super.noSuchMethod(\n Invocation.getter(#events),\n- returnValue: <_i22.Event>[],\n- returnValueForMissingStub: <_i22.Event>[],\n- ) as List<_i22.Event>);\n+ returnValue: <_i20.Event>[],\n+ returnValueForMissingStub: <_i20.Event>[],\n+ ) as List<_i20.Event>);\n \n @override\n- List<_i22.Event> get userEvents => (super.noSuchMethod(\n+ List<_i20.Event> get userEvents => (super.noSuchMethod(\n Invocation.getter(#userEvents),\n- returnValue: <_i22.Event>[],\n- returnValueForMissingStub: <_i22.Event>[],\n- ) as List<_i22.Event>);\n+ returnValue: <_i20.Event>[],\n+ returnValueForMissingStub: <_i20.Event>[],\n+ ) as List<_i20.Event>);\n \n @override\n _i11.EventService get eventService => (super.noSuchMethod(\n@@ -2761,11 +2557,11 @@ class MockExploreEventsViewModel extends _i2.Mock\n @override\n String get emptyListMessage => (super.noSuchMethod(\n Invocation.getter(#emptyListMessage),\n- returnValue: _i16.dummyValue(\n+ returnValue: _i25.dummyValue(\n this,\n Invocation.getter(#emptyListMessage),\n ),\n- returnValueForMissingStub: _i16.dummyValue(\n+ returnValueForMissingStub: _i25.dummyValue(\n this,\n Invocation.getter(#emptyListMessage),\n ),\n@@ -2774,22 +2570,22 @@ class MockExploreEventsViewModel extends _i2.Mock\n @override\n String get chosenValue => (super.noSuchMethod(\n Invocation.getter(#chosenValue),\n- returnValue: _i16.dummyValue(\n+ returnValue: _i25.dummyValue(\n this,\n Invocation.getter(#chosenValue),\n ),\n- returnValueForMissingStub: _i16.dummyValue(\n+ returnValueForMissingStub: _i25.dummyValue(\n this,\n Invocation.getter(#chosenValue),\n ),\n ) as String);\n \n @override\n- _i17.ViewState get state => (super.noSuchMethod(\n+ _i14.ViewState get state => (super.noSuchMethod(\n Invocation.getter(#state),\n- returnValue: _i17.ViewState.idle,\n- returnValueForMissingStub: _i17.ViewState.idle,\n- ) as _i17.ViewState);\n+ returnValue: _i14.ViewState.idle,\n+ returnValueForMissingStub: _i14.ViewState.idle,\n+ ) as _i14.ViewState);\n \n @override\n bool get isBusy => (super.noSuchMethod(\n@@ -2836,7 +2632,7 @@ class MockExploreEventsViewModel extends _i2.Mock\n ) as _i5.Future);\n \n @override\n- _i5.Future checkIfExistsAndAddNewEvent(_i22.Event? newEvent) =>\n+ _i5.Future checkIfExistsAndAddNewEvent(_i20.Event? newEvent) =>\n (super.noSuchMethod(\n Invocation.method(\n #checkIfExistsAndAddNewEvent,\n@@ -2878,7 +2674,7 @@ class MockExploreEventsViewModel extends _i2.Mock\n );\n \n @override\n- void setState(_i17.ViewState? viewState) => super.noSuchMethod(\n+ void setState(_i14.ViewState? viewState) => super.noSuchMethod(\n Invocation.method(\n #setState,\n [viewState],\n@@ -2914,56 +2710,269 @@ class MockExploreEventsViewModel extends _i2.Mock\n );\n }\n \n-/// A class which mocks [Validator].\n-///\n-/// See the documentation for Mockito's code generation for more information.\n-class MockValidator extends _i2.Mock implements _i33.Validator {\n- @override\n- _i5.Future validateUrlExistence(String? url) => (super.noSuchMethod(\n- Invocation.method(\n- #validateUrlExistence,\n- [url],\n- ),\n- returnValue: _i5.Future.value(),\n- returnValueForMissingStub: _i5.Future.value(),\n- ) as _i5.Future);\n-}\n-\n-/// A class which mocks [QRViewController].\n+/// A class which mocks [OrganizationFeedViewModel].\n ///\n /// See the documentation for Mockito's code generation for more information.\n-class MockQRViewController extends _i2.Mock implements _i34.QRViewController {\n- @override\n- _i5.Stream<_i35.Barcode> get scannedDataStream => (super.noSuchMethod(\n- Invocation.getter(#scannedDataStream),\n- returnValue: _i5.Stream<_i35.Barcode>.empty(),\n- returnValueForMissingStub: _i5.Stream<_i35.Barcode>.empty(),\n- ) as _i5.Stream<_i35.Barcode>);\n-\n+class MockOrganizationFeedViewModel extends _i2.Mock\n+ implements _i32.OrganizationFeedViewModel {\n @override\n- bool get hasPermissions => (super.noSuchMethod(\n- Invocation.getter(#hasPermissions),\n+ bool get istest => (super.noSuchMethod(\n+ Invocation.getter(#istest),\n returnValue: false,\n returnValueForMissingStub: false,\n ) as bool);\n \n @override\n- _i5.Future<_i36.CameraFacing> getCameraInfo() => (super.noSuchMethod(\n- Invocation.method(\n- #getCameraInfo,\n- [],\n+ set istest(bool? _istest) => super.noSuchMethod(\n+ Invocation.setter(\n+ #istest,\n+ _istest,\n ),\n- returnValue:\n- _i5.Future<_i36.CameraFacing>.value(_i36.CameraFacing.back),\n- returnValueForMissingStub:\n- _i5.Future<_i36.CameraFacing>.value(_i36.CameraFacing.back),\n- ) as _i5.Future<_i36.CameraFacing>);\n+ returnValueForMissingStub: null,\n+ );\n \n @override\n- _i5.Future<_i36.CameraFacing> flipCamera() => (super.noSuchMethod(\n- Invocation.method(\n- #flipCamera,\n- [],\n+ List<_i17.Post> get posts => (super.noSuchMethod(\n+ Invocation.getter(#posts),\n+ returnValue: <_i17.Post>[],\n+ returnValueForMissingStub: <_i17.Post>[],\n+ ) as List<_i17.Post>);\n+\n+ @override\n+ List<_i17.Post> get userPosts => (super.noSuchMethod(\n+ Invocation.getter(#userPosts),\n+ returnValue: <_i17.Post>[],\n+ returnValueForMissingStub: <_i17.Post>[],\n+ ) as List<_i17.Post>);\n+\n+ @override\n+ List<_i17.Post> get pinnedPosts => (super.noSuchMethod(\n+ Invocation.getter(#pinnedPosts),\n+ returnValue: <_i17.Post>[],\n+ returnValueForMissingStub: <_i17.Post>[],\n+ ) as List<_i17.Post>);\n+\n+ @override\n+ String get currentOrgName => (super.noSuchMethod(\n+ Invocation.getter(#currentOrgName),\n+ returnValue: _i25.dummyValue(\n+ this,\n+ Invocation.getter(#currentOrgName),\n+ ),\n+ returnValueForMissingStub: _i25.dummyValue(\n+ this,\n+ Invocation.getter(#currentOrgName),\n+ ),\n+ ) as String);\n+\n+ @override\n+ bool get isFetchingPosts => (super.noSuchMethod(\n+ Invocation.getter(#isFetchingPosts),\n+ returnValue: false,\n+ returnValueForMissingStub: false,\n+ ) as bool);\n+\n+ @override\n+ _i14.ViewState get state => (super.noSuchMethod(\n+ Invocation.getter(#state),\n+ returnValue: _i14.ViewState.idle,\n+ returnValueForMissingStub: _i14.ViewState.idle,\n+ ) as _i14.ViewState);\n+\n+ @override\n+ bool get isBusy => (super.noSuchMethod(\n+ Invocation.getter(#isBusy),\n+ returnValue: false,\n+ returnValueForMissingStub: false,\n+ ) as bool);\n+\n+ @override\n+ bool get hasListeners => (super.noSuchMethod(\n+ Invocation.getter(#hasListeners),\n+ returnValue: false,\n+ returnValueForMissingStub: false,\n+ ) as bool);\n+\n+ @override\n+ void setCurrentOrganizationName(String? updatedOrganization) =>\n+ super.noSuchMethod(\n+ Invocation.method(\n+ #setCurrentOrganizationName,\n+ [updatedOrganization],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ void fetchNewPosts() => super.noSuchMethod(\n+ Invocation.method(\n+ #fetchNewPosts,\n+ [],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ void initialise({bool? isTest = false}) => super.noSuchMethod(\n+ Invocation.method(\n+ #initialise,\n+ [],\n+ {#isTest: isTest},\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ void buildNewPosts(List<_i17.Post>? newPosts) => super.noSuchMethod(\n+ Invocation.method(\n+ #buildNewPosts,\n+ [newPosts],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ void navigateToIndividualPage(_i17.Post? post) => super.noSuchMethod(\n+ Invocation.method(\n+ #navigateToIndividualPage,\n+ [post],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ void navigateToPinnedPostPage() => super.noSuchMethod(\n+ Invocation.method(\n+ #navigateToPinnedPostPage,\n+ [],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ void dispose() => super.noSuchMethod(\n+ Invocation.method(\n+ #dispose,\n+ [],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ void addNewPost(_i17.Post? newPost) => super.noSuchMethod(\n+ Invocation.method(\n+ #addNewPost,\n+ [newPost],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ void updatedPost(_i17.Post? post) => super.noSuchMethod(\n+ Invocation.method(\n+ #updatedPost,\n+ [post],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ _i5.Future removePost(_i17.Post? post) => (super.noSuchMethod(\n+ Invocation.method(\n+ #removePost,\n+ [post],\n+ ),\n+ returnValue: _i5.Future.value(),\n+ returnValueForMissingStub: _i5.Future.value(),\n+ ) as _i5.Future);\n+\n+ @override\n+ void setState(_i14.ViewState? viewState) => super.noSuchMethod(\n+ Invocation.method(\n+ #setState,\n+ [viewState],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(\n+ Invocation.method(\n+ #addListener,\n+ [listener],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(\n+ Invocation.method(\n+ #removeListener,\n+ [listener],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ void notifyListeners() => super.noSuchMethod(\n+ Invocation.method(\n+ #notifyListeners,\n+ [],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+}\n+\n+/// A class which mocks [Validator].\n+///\n+/// See the documentation for Mockito's code generation for more information.\n+class MockValidator extends _i2.Mock implements _i33.Validator {\n+ @override\n+ _i5.Future validateUrlExistence(String? url) => (super.noSuchMethod(\n+ Invocation.method(\n+ #validateUrlExistence,\n+ [url],\n+ ),\n+ returnValue: _i5.Future.value(),\n+ returnValueForMissingStub: _i5.Future.value(),\n+ ) as _i5.Future);\n+}\n+\n+/// A class which mocks [QRViewController].\n+///\n+/// See the documentation for Mockito's code generation for more information.\n+class MockQRViewController extends _i2.Mock implements _i34.QRViewController {\n+ @override\n+ _i5.Stream<_i35.Barcode> get scannedDataStream => (super.noSuchMethod(\n+ Invocation.getter(#scannedDataStream),\n+ returnValue: _i5.Stream<_i35.Barcode>.empty(),\n+ returnValueForMissingStub: _i5.Stream<_i35.Barcode>.empty(),\n+ ) as _i5.Stream<_i35.Barcode>);\n+\n+ @override\n+ bool get hasPermissions => (super.noSuchMethod(\n+ Invocation.getter(#hasPermissions),\n+ returnValue: false,\n+ returnValueForMissingStub: false,\n+ ) as bool);\n+\n+ @override\n+ _i5.Future<_i36.CameraFacing> getCameraInfo() => (super.noSuchMethod(\n+ Invocation.method(\n+ #getCameraInfo,\n+ [],\n+ ),\n+ returnValue:\n+ _i5.Future<_i36.CameraFacing>.value(_i36.CameraFacing.back),\n+ returnValueForMissingStub:\n+ _i5.Future<_i36.CameraFacing>.value(_i36.CameraFacing.back),\n+ ) as _i5.Future<_i36.CameraFacing>);\n+\n+ @override\n+ _i5.Future<_i36.CameraFacing> flipCamera() => (super.noSuchMethod(\n+ Invocation.method(\n+ #flipCamera,\n+ [],\n ),\n returnValue:\n _i5.Future<_i36.CameraFacing>.value(_i36.CameraFacing.back),\n@@ -3105,11 +3114,11 @@ class MockAppTheme extends _i2.Mock implements _i38.AppTheme {\n @override\n String get key => (super.noSuchMethod(\n Invocation.getter(#key),\n- returnValue: _i16.dummyValue(\n+ returnValue: _i25.dummyValue(\n this,\n Invocation.getter(#key),\n ),\n- returnValueForMissingStub: _i16.dummyValue(\n+ returnValueForMissingStub: _i25.dummyValue(\n this,\n Invocation.getter(#key),\n ),\n@@ -3123,11 +3132,11 @@ class MockAppTheme extends _i2.Mock implements _i38.AppTheme {\n ) as bool);\n \n @override\n- _i17.ViewState get state => (super.noSuchMethod(\n+ _i14.ViewState get state => (super.noSuchMethod(\n Invocation.getter(#state),\n- returnValue: _i17.ViewState.idle,\n- returnValueForMissingStub: _i17.ViewState.idle,\n- ) as _i17.ViewState);\n+ returnValue: _i14.ViewState.idle,\n+ returnValueForMissingStub: _i14.ViewState.idle,\n+ ) as _i14.ViewState);\n \n @override\n bool get isBusy => (super.noSuchMethod(\n@@ -3163,7 +3172,7 @@ class MockAppTheme extends _i2.Mock implements _i38.AppTheme {\n );\n \n @override\n- void setState(_i17.ViewState? viewState) => super.noSuchMethod(\n+ void setState(_i14.ViewState? viewState) => super.noSuchMethod(\n Invocation.method(\n #setState,\n [viewState],\n@@ -3212,7 +3221,7 @@ class MockAppTheme extends _i2.Mock implements _i38.AppTheme {\n ///\n /// See the documentation for Mockito's code generation for more information.\n class MockCreateEventViewModel extends _i2.Mock\n- implements _i41.CreateEventViewModel {\n+ implements _i39.CreateEventViewModel {\n @override\n _i1.TextEditingController get eventTitleTextController => (super.noSuchMethod(\n Invocation.getter(#eventTitleTextController),\n@@ -3287,6 +3296,55 @@ class MockCreateEventViewModel extends _i2.Mock\n returnValueForMissingStub: null,\n );\n \n+ @override\n+ _i1.TextEditingController get repeatsEveryCountController =>\n+ (super.noSuchMethod(\n+ Invocation.getter(#repeatsEveryCountController),\n+ returnValue: _FakeTextEditingController_17(\n+ this,\n+ Invocation.getter(#repeatsEveryCountController),\n+ ),\n+ returnValueForMissingStub: _FakeTextEditingController_17(\n+ this,\n+ Invocation.getter(#repeatsEveryCountController),\n+ ),\n+ ) as _i1.TextEditingController);\n+\n+ @override\n+ set repeatsEveryCountController(\n+ _i1.TextEditingController? _repeatsEveryCountController) =>\n+ super.noSuchMethod(\n+ Invocation.setter(\n+ #repeatsEveryCountController,\n+ _repeatsEveryCountController,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ _i1.TextEditingController get endOccurenceController => (super.noSuchMethod(\n+ Invocation.getter(#endOccurenceController),\n+ returnValue: _FakeTextEditingController_17(\n+ this,\n+ Invocation.getter(#endOccurenceController),\n+ ),\n+ returnValueForMissingStub: _FakeTextEditingController_17(\n+ this,\n+ Invocation.getter(#endOccurenceController),\n+ ),\n+ ) as _i1.TextEditingController);\n+\n+ @override\n+ set endOccurenceController(\n+ _i1.TextEditingController? _endOccurenceController) =>\n+ super.noSuchMethod(\n+ Invocation.setter(\n+ #endOccurenceController,\n+ _endOccurenceController,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n @override\n _i1.TimeOfDay get eventStartTime => (super.noSuchMethod(\n Invocation.getter(#eventStartTime),\n@@ -3353,19 +3411,6 @@ class MockCreateEventViewModel extends _i2.Mock\n returnValueForMissingStub: null,\n );\n \n- @override\n- DateTime get eventEndDate => (super.noSuchMethod(\n- Invocation.getter(#eventEndDate),\n- returnValue: _FakeDateTime_23(\n- this,\n- Invocation.getter(#eventEndDate),\n- ),\n- returnValueForMissingStub: _FakeDateTime_23(\n- this,\n- Invocation.getter(#eventEndDate),\n- ),\n- ) as DateTime);\n-\n @override\n set eventEndDate(DateTime? _eventEndDate) => super.noSuchMethod(\n Invocation.setter(\n@@ -3491,6 +3536,154 @@ class MockCreateEventViewModel extends _i2.Mock\n returnValueForMissingStub: null,\n );\n \n+ @override\n+ bool get isAllDay => (super.noSuchMethod(\n+ Invocation.getter(#isAllDay),\n+ returnValue: false,\n+ returnValueForMissingStub: false,\n+ ) as bool);\n+\n+ @override\n+ set isAllDay(bool? _isAllDay) => super.noSuchMethod(\n+ Invocation.setter(\n+ #isAllDay,\n+ _isAllDay,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ bool get isRecurring => (super.noSuchMethod(\n+ Invocation.getter(#isRecurring),\n+ returnValue: false,\n+ returnValueForMissingStub: false,\n+ ) as bool);\n+\n+ @override\n+ set isRecurring(bool? _isRecurring) => super.noSuchMethod(\n+ Invocation.setter(\n+ #isRecurring,\n+ _isRecurring,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ int get recurranceCount => (super.noSuchMethod(\n+ Invocation.getter(#recurranceCount),\n+ returnValue: 0,\n+ returnValueForMissingStub: 0,\n+ ) as int);\n+\n+ @override\n+ set recurranceCount(int? _recurranceCount) => super.noSuchMethod(\n+ Invocation.setter(\n+ #recurranceCount,\n+ _recurranceCount,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ set recurrance(String? _recurrance) => super.noSuchMethod(\n+ Invocation.setter(\n+ #recurrance,\n+ _recurrance,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ String get recurranceFrequency => (super.noSuchMethod(\n+ Invocation.getter(#recurranceFrequency),\n+ returnValue: _i25.dummyValue(\n+ this,\n+ Invocation.getter(#recurranceFrequency),\n+ ),\n+ returnValueForMissingStub: _i25.dummyValue(\n+ this,\n+ Invocation.getter(#recurranceFrequency),\n+ ),\n+ ) as String);\n+\n+ @override\n+ set recurranceFrequency(String? _recurranceFrequency) => super.noSuchMethod(\n+ Invocation.setter(\n+ #recurranceFrequency,\n+ _recurranceFrequency,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ String get monthlyRecurrence => (super.noSuchMethod(\n+ Invocation.getter(#monthlyRecurrence),\n+ returnValue: _i25.dummyValue(\n+ this,\n+ Invocation.getter(#monthlyRecurrence),\n+ ),\n+ returnValueForMissingStub: _i25.dummyValue(\n+ this,\n+ Invocation.getter(#monthlyRecurrence),\n+ ),\n+ ) as String);\n+\n+ @override\n+ set monthlyRecurrence(String? _monthlyRecurrence) => super.noSuchMethod(\n+ Invocation.setter(\n+ #monthlyRecurrence,\n+ _monthlyRecurrence,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ Set get weekdays => (super.noSuchMethod(\n+ Invocation.getter(#weekdays),\n+ returnValue: {},\n+ returnValueForMissingStub: {},\n+ ) as Set);\n+\n+ @override\n+ set weekdays(Set? _weekdays) => super.noSuchMethod(\n+ Invocation.setter(\n+ #weekdays,\n+ _weekdays,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ String get eventEndType => (super.noSuchMethod(\n+ Invocation.getter(#eventEndType),\n+ returnValue: _i25.dummyValue(\n+ this,\n+ Invocation.getter(#eventEndType),\n+ ),\n+ returnValueForMissingStub: _i25.dummyValue(\n+ this,\n+ Invocation.getter(#eventEndType),\n+ ),\n+ ) as String);\n+\n+ @override\n+ set eventEndType(String? _eventEndType) => super.noSuchMethod(\n+ Invocation.setter(\n+ #eventEndType,\n+ _eventEndType,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ set eventEndOnEndDate(DateTime? _eventEndOnEndDate) => super.noSuchMethod(\n+ Invocation.setter(\n+ #eventEndOnEndDate,\n+ _eventEndOnEndDate,\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n @override\n List<_i7.User> get orgMembersList => (super.noSuchMethod(\n Invocation.getter(#orgMembersList),\n@@ -3551,11 +3744,11 @@ class MockCreateEventViewModel extends _i2.Mock\n ) as Map);\n \n @override\n- _i17.ViewState get state => (super.noSuchMethod(\n+ _i14.ViewState get state => (super.noSuchMethod(\n Invocation.getter(#state),\n- returnValue: _i17.ViewState.idle,\n- returnValueForMissingStub: _i17.ViewState.idle,\n- ) as _i17.ViewState);\n+ returnValue: _i14.ViewState.idle,\n+ returnValueForMissingStub: _i14.ViewState.idle,\n+ ) as _i14.ViewState);\n \n @override\n bool get isBusy => (super.noSuchMethod(\n@@ -3642,7 +3835,25 @@ class MockCreateEventViewModel extends _i2.Mock\n );\n \n @override\n- void setState(_i17.ViewState? viewState) => super.noSuchMethod(\n+ void setEventEndDate(DateTime? selectedEndDate) => super.noSuchMethod(\n+ Invocation.method(\n+ #setEventEndDate,\n+ [selectedEndDate],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ String? getRecurrance(String? frequency) => (super.noSuchMethod(\n+ Invocation.method(\n+ #getRecurrance,\n+ [frequency],\n+ ),\n+ returnValueForMissingStub: null,\n+ ) as String?);\n+\n+ @override\n+ void setState(_i14.ViewState? viewState) => super.noSuchMethod(\n Invocation.method(\n #setState,\n [viewState],\n@@ -3691,7 +3902,7 @@ class MockCreateEventViewModel extends _i2.Mock\n ///\n /// See the documentation for Mockito's code generation for more information.\n class MockDirectChatViewModel extends _i2.Mock\n- implements _i42.DirectChatViewModel {\n+ implements _i40.DirectChatViewModel {\n @override\n _i1.GlobalKey<_i1.AnimatedListState> get listKey => (super.noSuchMethod(\n Invocation.getter(#listKey),\n@@ -3706,14 +3917,14 @@ class MockDirectChatViewModel extends _i2.Mock\n ) as _i1.GlobalKey<_i1.AnimatedListState>);\n \n @override\n- _i17.ChatState get chatState => (super.noSuchMethod(\n+ _i14.ChatState get chatState => (super.noSuchMethod(\n Invocation.getter(#chatState),\n- returnValue: _i17.ChatState.initial,\n- returnValueForMissingStub: _i17.ChatState.initial,\n- ) as _i17.ChatState);\n+ returnValue: _i14.ChatState.initial,\n+ returnValueForMissingStub: _i14.ChatState.initial,\n+ ) as _i14.ChatState);\n \n @override\n- set chatState(_i17.ChatState? _chatState) => super.noSuchMethod(\n+ set chatState(_i14.ChatState? _chatState) => super.noSuchMethod(\n Invocation.setter(\n #chatState,\n _chatState,\n@@ -3731,26 +3942,26 @@ class MockDirectChatViewModel extends _i2.Mock\n );\n \n @override\n- List<_i24.ChatListTileDataModel> get chats => (super.noSuchMethod(\n+ List<_i22.ChatListTileDataModel> get chats => (super.noSuchMethod(\n Invocation.getter(#chats),\n- returnValue: <_i24.ChatListTileDataModel>[],\n- returnValueForMissingStub: <_i24.ChatListTileDataModel>[],\n- ) as List<_i24.ChatListTileDataModel>);\n+ returnValue: <_i22.ChatListTileDataModel>[],\n+ returnValueForMissingStub: <_i22.ChatListTileDataModel>[],\n+ ) as List<_i22.ChatListTileDataModel>);\n \n @override\n- Map> get chatMessagesByUser =>\n+ Map> get chatMessagesByUser =>\n (super.noSuchMethod(\n Invocation.getter(#chatMessagesByUser),\n- returnValue: >{},\n- returnValueForMissingStub: >{},\n- ) as Map>);\n+ returnValue: >{},\n+ returnValueForMissingStub: >{},\n+ ) as Map>);\n \n @override\n- _i17.ViewState get state => (super.noSuchMethod(\n+ _i14.ViewState get state => (super.noSuchMethod(\n Invocation.getter(#state),\n- returnValue: _i17.ViewState.idle,\n- returnValueForMissingStub: _i17.ViewState.idle,\n- ) as _i17.ViewState);\n+ returnValue: _i14.ViewState.idle,\n+ returnValueForMissingStub: _i14.ViewState.idle,\n+ ) as _i14.ViewState);\n \n @override\n bool get isBusy => (super.noSuchMethod(\n@@ -3831,7 +4042,7 @@ class MockDirectChatViewModel extends _i2.Mock\n );\n \n @override\n- void setState(_i17.ViewState? viewState) => super.noSuchMethod(\n+ void setState(_i14.ViewState? viewState) => super.noSuchMethod(\n Invocation.method(\n #setState,\n [viewState],\n@@ -3870,24 +4081,24 @@ class MockDirectChatViewModel extends _i2.Mock\n /// A class which mocks [ImageCropper].\n ///\n /// See the documentation for Mockito's code generation for more information.\n-class MockImageCropper extends _i2.Mock implements _i43.ImageCropper {\n+class MockImageCropper extends _i2.Mock implements _i41.ImageCropper {\n @override\n- _i5.Future<_i44.CroppedFile?> cropImage({\n+ _i5.Future<_i42.CroppedFile?> cropImage({\n required String? sourcePath,\n int? maxWidth,\n int? maxHeight,\n- _i44.CropAspectRatio? aspectRatio,\n- List<_i44.CropAspectRatioPreset>? aspectRatioPresets = const [\n- _i44.CropAspectRatioPreset.original,\n- _i44.CropAspectRatioPreset.square,\n- _i44.CropAspectRatioPreset.ratio3x2,\n- _i44.CropAspectRatioPreset.ratio4x3,\n- _i44.CropAspectRatioPreset.ratio16x9,\n+ _i42.CropAspectRatio? aspectRatio,\n+ List<_i42.CropAspectRatioPreset>? aspectRatioPresets = const [\n+ _i42.CropAspectRatioPreset.original,\n+ _i42.CropAspectRatioPreset.square,\n+ _i42.CropAspectRatioPreset.ratio3x2,\n+ _i42.CropAspectRatioPreset.ratio4x3,\n+ _i42.CropAspectRatioPreset.ratio16x9,\n ],\n- _i44.CropStyle? cropStyle = _i44.CropStyle.rectangle,\n- _i44.ImageCompressFormat? compressFormat = _i44.ImageCompressFormat.jpg,\n+ _i42.CropStyle? cropStyle = _i42.CropStyle.rectangle,\n+ _i42.ImageCompressFormat? compressFormat = _i42.ImageCompressFormat.jpg,\n int? compressQuality = 90,\n- List<_i44.PlatformUiSettings>? uiSettings,\n+ List<_i42.PlatformUiSettings>? uiSettings,\n }) =>\n (super.noSuchMethod(\n Invocation.method(\n@@ -3905,19 +4116,19 @@ class MockImageCropper extends _i2.Mock implements _i43.ImageCropper {\n #uiSettings: uiSettings,\n },\n ),\n- returnValue: _i5.Future<_i44.CroppedFile?>.value(),\n- returnValueForMissingStub: _i5.Future<_i44.CroppedFile?>.value(),\n- ) as _i5.Future<_i44.CroppedFile?>);\n+ returnValue: _i5.Future<_i42.CroppedFile?>.value(),\n+ returnValueForMissingStub: _i5.Future<_i42.CroppedFile?>.value(),\n+ ) as _i5.Future<_i42.CroppedFile?>);\n \n @override\n- _i5.Future<_i44.CroppedFile?> recoverImage() => (super.noSuchMethod(\n+ _i5.Future<_i42.CroppedFile?> recoverImage() => (super.noSuchMethod(\n Invocation.method(\n #recoverImage,\n [],\n ),\n- returnValue: _i5.Future<_i44.CroppedFile?>.value(),\n- returnValueForMissingStub: _i5.Future<_i44.CroppedFile?>.value(),\n- ) as _i5.Future<_i44.CroppedFile?>);\n+ returnValue: _i5.Future<_i42.CroppedFile?>.value(),\n+ returnValueForMissingStub: _i5.Future<_i42.CroppedFile?>.value(),\n+ ) as _i5.Future<_i42.CroppedFile?>);\n }\n \n /// A class which mocks [ImagePicker].\ndiff --git a/test/router_test.dart b/test/router_test.dart\nindex 344771cf1a..33d17cf055 100644\n--- a/test/router_test.dart\n+++ b/test/router_test.dart\n@@ -15,6 +15,7 @@ import 'package:talawa/models/user/user_info.dart';\n import 'package:talawa/router.dart';\n import 'package:talawa/splash_screen.dart';\n import 'package:talawa/view_model/after_auth_view_models/chat_view_models/direct_chat_view_model.dart';\n+import 'package:talawa/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart';\n import 'package:talawa/views/after_auth_screens/add_post_page.dart';\n import 'package:talawa/views/after_auth_screens/app_settings/app_settings_page.dart';\n import 'package:talawa/views/after_auth_screens/chat/chat_message_screen.dart';\n@@ -188,9 +189,16 @@ void main() {\n \n testWidgets('Test createCustomRecurringEvent route',\n (WidgetTester tester) async {\n- final route =\n- generateRoute(const RouteSettings(name: Routes.customRecurrencePage));\n- expect(route, isA());\n+ final route = generateRoute(\n+ RouteSettings(\n+ name: Routes.customRecurrencePage,\n+ arguments: CreateEventViewModel(),\n+ ),\n+ );\n+ expect(\n+ route,\n+ isA(),\n+ );\n if (route is MaterialPageRoute) {\n final builder = route.builder;\n final widget = builder(MockBuildContext());\ndiff --git a/test/utils/event_queries_test.dart b/test/utils/event_queries_test.dart\nindex cb9fe23fe9..cc0d370031 100644\n--- a/test/utils/event_queries_test.dart\n+++ b/test/utils/event_queries_test.dart\n@@ -59,35 +59,8 @@ void main() {\n \n test(\"Check if addEvent works correctly\", () {\n const data = \"\"\"\n- mutation createEvent( \\$organizationId: ID!,\n- \\$title:String!,\n- \\$description: String!,\n- \\$startTime: Time,\n- \\$endTime: Time,\n- \\$allDay: Boolean!,\n- \\$recurring: Boolean!,\n- \\$isPublic: Boolean!,\n- \\$isRegisterable: Boolean!,\n- \\$location: String,\n- \\$startDate : Date!,\n- \\$endDate : Date!,\n- ) { \n- createEvent(\n- data:{\n- organizationId: \\$organizationId,\n- title: \\$title,\n- description: \\$description,\n- isPublic: \\$isPublic,\n- isRegisterable: \\$isRegisterable,\n- recurring: \\$recurring,\n- allDay: \\$allDay,\n- startTime: \\$startTime,\n- endTime: \\$endTime,\n- startDate: \\$startDate,\n- endDate: \\$endDate,\n- location: \\$location,\n- }\n- ){\n+ mutation Mutation(\\$data: EventInput!, \\$recurrenceRuleData: RecurrenceRuleInput) {\n+ createEvent(data: \\$data, recurrenceRuleData: \\$recurrenceRuleData) {\n _id\n title\n description\ndiff --git a/test/view_model_tests/after_auth_view_model_tests/event_view_model_tests/create_event_view_model_test.dart b/test/view_model_tests/after_auth_view_model_tests/event_view_model_tests/create_event_view_model_test.dart\nindex 125b156011..7c444d6c2b 100644\n--- a/test/view_model_tests/after_auth_view_model_tests/event_view_model_tests/create_event_view_model_test.dart\n+++ b/test/view_model_tests/after_auth_view_model_tests/event_view_model_tests/create_event_view_model_test.dart\n@@ -8,6 +8,7 @@ import 'package:flutter_localizations/flutter_localizations.dart';\n import 'package:flutter_test/flutter_test.dart';\n import 'package:intl/intl.dart';\n import 'package:mockito/mockito.dart';\n+import 'package:talawa/constants/recurrence_values.dart';\n import 'package:talawa/models/user/user_info.dart';\n import 'package:talawa/router.dart' as router;\n import 'package:talawa/services/graphql_config.dart';\n@@ -126,9 +127,9 @@ void main() {\n model.eventStartTime.minute,\n );\n final DateTime endMoment = DateTime(\n- model.eventEndDate.year,\n- model.eventEndDate.month,\n- model.eventEndDate.day,\n+ model.eventEndDate!.year,\n+ model.eventEndDate!.month,\n+ model.eventEndDate!.day,\n model.eventEndTime.hour,\n model.eventEndTime.minute,\n );\n@@ -159,18 +160,25 @@ void main() {\n databaseFunctions.gqlAuthMutation(\n EventQueries().addEvent(),\n variables: {\n- 'startDate': DateFormat('yyyy-MM-dd').format(startMoment),\n- 'endDate': DateFormat('yyyy-MM-dd').format(endMoment),\n- 'organizationId': \"XYZ\",\n- 'title': model.eventTitleTextController.text,\n- 'description': model.eventDescriptionTextController.text,\n- 'location': model.eventLocationTextController.text,\n- 'isPublic': model.isPublicSwitch,\n- 'isRegisterable': model.isRegisterableSwitch,\n- 'recurring': false,\n- 'allDay': false,\n- 'startTime': '${DateFormat('HH:mm:ss').format(startMoment)}Z',\n- 'endTime': '${DateFormat('HH:mm:ss').format(endMoment)}Z',\n+ 'data': {\n+ 'startDate': DateFormat('yyyy-MM-dd').format(startMoment),\n+ 'endDate': DateFormat('yyyy-MM-dd').format(endMoment),\n+ 'organizationId': 'XYZ',\n+ 'title': model.eventTitleTextController.text,\n+ 'description': model.eventDescriptionTextController.text,\n+ 'location': model.eventLocationTextController.text,\n+ 'isPublic': model.isPublicSwitch,\n+ 'isRegisterable': model.isRegisterableSwitch,\n+ 'recurring': true,\n+ 'recurrance': 'WEEKLY',\n+ 'allDay': true,\n+ 'startTime': '${DateFormat('HH:mm:ss').format(startMoment)}Z',\n+ 'endTime': '${DateFormat('HH:mm:ss').format(endMoment)}Z',\n+ },\n+ 'recurrenceRuleData': {\n+ 'frequency': 'WEEKLY',\n+ 'weekDays': ['TU'],\n+ },\n },\n ),\n ).thenAnswer((_) async {\n@@ -183,18 +191,25 @@ void main() {\n databaseFunctions.gqlAuthMutation(\n EventQueries().addEvent(),\n variables: {\n- 'startDate': DateFormat('yyyy-MM-dd').format(startMoment),\n- 'endDate': DateFormat('yyyy-MM-dd').format(endMoment),\n- 'organizationId': \"XYZ\",\n- 'title': model.eventTitleTextController.text,\n- 'description': model.eventDescriptionTextController.text,\n- 'location': model.eventLocationTextController.text,\n- 'isPublic': model.isPublicSwitch,\n- 'isRegisterable': model.isRegisterableSwitch,\n- 'recurring': false,\n- 'allDay': false,\n- 'startTime': '${DateFormat('HH:mm:ss').format(startMoment)}Z',\n- 'endTime': '${DateFormat('HH:mm:ss').format(endMoment)}Z',\n+ 'data': {\n+ 'startDate': DateFormat('yyyy-MM-dd').format(startMoment),\n+ 'endDate': DateFormat('yyyy-MM-dd').format(endMoment),\n+ 'organizationId': 'XYZ',\n+ 'title': model.eventTitleTextController.text,\n+ 'description': model.eventDescriptionTextController.text,\n+ 'location': model.eventLocationTextController.text,\n+ 'isPublic': model.isPublicSwitch,\n+ 'isRegisterable': model.isRegisterableSwitch,\n+ 'recurring': true,\n+ 'recurrance': 'WEEKLY',\n+ 'allDay': true,\n+ 'startTime': '${DateFormat('HH:mm:ss').format(startMoment)}Z',\n+ 'endTime': '${DateFormat('HH:mm:ss').format(endMoment)}Z',\n+ },\n+ 'recurrenceRuleData': {\n+ 'frequency': 'WEEKLY',\n+ 'weekDays': ['TU'],\n+ },\n },\n ),\n );\n@@ -297,5 +312,13 @@ void main() {\n model.selectedMembers.contains(usersInCurrentOrg.first);\n expect(isMemberFound, false);\n });\n+\n+ test('getRecurrence method', () {\n+ final model = CreateEventViewModel();\n+ model.initialize();\n+ expect(model.getRecurrance(Recurrance.monthly), 'MONTHLY');\n+ expect(model.getRecurrance(Recurrance.yearly), 'YEARLY');\n+ expect(model.getRecurrance(Recurrance.once), null);\n+ });\n });\n }\ndiff --git a/test/views/after_auth_screens/events/create_custom_recurring_event_test.dart b/test/views/after_auth_screens/events/create_custom_recurring_event_test.dart\nindex 4509c13d96..b4997ad425 100644\n--- a/test/views/after_auth_screens/events/create_custom_recurring_event_test.dart\n+++ b/test/views/after_auth_screens/events/create_custom_recurring_event_test.dart\n@@ -2,15 +2,18 @@ import 'package:flutter/material.dart';\n import 'package:flutter_localizations/flutter_localizations.dart';\n import 'package:flutter_test/flutter_test.dart';\n import 'package:talawa/constants/custom_theme.dart';\n+import 'package:talawa/constants/recurrence_values.dart';\n import 'package:talawa/router.dart' as router;\n import 'package:talawa/services/size_config.dart';\n import 'package:talawa/utils/app_localization.dart';\n+import 'package:talawa/view_model/after_auth_view_models/event_view_models/create_event_view_model.dart';\n import 'package:talawa/view_model/lang_view_model.dart';\n import 'package:talawa/views/after_auth_screens/events/create_custom_recurring_event.dart';\n import 'package:talawa/views/base_view.dart';\n import 'package:talawa/widgets/create_recurring_event_helper_widgets.dart';\n import 'package:talawa/widgets/custom_weekday_selector.dart';\n \n+import '../../../helpers/test_helpers.dart';\n import '../../../helpers/test_locator.dart';\n \n /// Creates a EventScreen for tests.\n@@ -24,6 +27,7 @@ import '../../../helpers/test_locator.dart';\n Widget createCustomRecurrenceScreen({\n ThemeMode themeMode = ThemeMode.light,\n required ThemeData theme,\n+ CreateEventViewModel? model,\n }) =>\n BaseView(\n onModelReady: (model) => model.initialize(),\n@@ -39,7 +43,9 @@ Widget createCustomRecurrenceScreen({\n themeMode: themeMode,\n theme: theme,\n home: Scaffold(\n- body: CustomRecurrencePage(),\n+ body: CustomRecurrencePage(\n+ model: model ?? CreateEventViewModel(),\n+ ),\n ),\n navigatorKey: navigationService.navigatorKey,\n onGenerateRoute: router.generateRoute,\n@@ -50,6 +56,7 @@ Widget createCustomRecurrenceScreen({\n void main() {\n SizeConfig().test();\n testSetupLocator();\n+ getAndRegisterNavigationService();\n \n // setUp(() {\n // registerServices();\n@@ -75,9 +82,6 @@ void main() {\n // Verify if the AppBar renders with the correct title\n expect(find.text('Custom recurrence'), findsOneWidget);\n \n- await tester.tap(find.text('Done'));\n- await tester.pumpAndSettle();\n-\n // Verify if the Done button is present\n expect(find.text('Done'), findsOneWidget);\n });\n@@ -163,6 +167,21 @@ void main() {\n await tester.pumpAndSettle();\n \n expect(find.text(\"month\"), findsOne);\n+\n+ // check if monthly recurrence dropdown shows up.\n+ await tester.tap(find.text('Monthly on day 3'));\n+ await tester.pumpAndSettle();\n+ await tester.tap(find.text('Monthly on day 3').last);\n+ await tester.pumpAndSettle();\n+\n+ // check if interval UI's middle part dissappears\n+ // when clicked on day/year.\n+ await tester.tap(find.text('month'));\n+ await tester.pumpAndSettle();\n+ await tester.tap(find.text('year'));\n+ await tester.pumpAndSettle();\n+\n+ expect(find.text('Monthly on day 3'), findsNothing);\n });\n \n testWidgets('CustomWeekDaySelector', (tester) async {\n@@ -189,8 +208,10 @@ void main() {\n });\n \n testWidgets('EventEndOptions', (tester) async {\n+ final CreateEventViewModel model = CreateEventViewModel();\n final widget = createCustomRecurrenceScreen(\n theme: TalawaTheme.darkTheme,\n+ model: model,\n );\n await tester.pumpWidget(widget);\n await tester.pump();\n@@ -228,6 +249,55 @@ void main() {\n await tester.pumpAndSettle();\n \n expect(find.byType(DatePickerDialog), findsNothing);\n+\n+ await tester.tap(find.text('Never'));\n+ await tester.pumpAndSettle();\n+\n+ expect(model.eventEndType, EventEndTypes.never);\n+ expect(model.eventEndDate, null);\n+\n+ await tester.tap(find.text('On'));\n+ await tester.pumpAndSettle();\n+\n+ expect(model.eventEndType, EventEndTypes.on);\n+ });\n+\n+ testWidgets('Done button', (tester) async {\n+ final CreateEventViewModel model = CreateEventViewModel();\n+ final widget = createCustomRecurrenceScreen(\n+ theme: TalawaTheme.darkTheme,\n+ model: model,\n+ );\n+ await tester.pumpWidget(widget);\n+ await tester.pump();\n+\n+ await tester.tap(find.text('Done'));\n+ await tester.pumpAndSettle();\n+\n+ expect(model.eventEndDate, null);\n+\n+ await tester.tap(find.text('On'));\n+ await tester.pumpAndSettle();\n+\n+ await tester.tap(find.text('Done'));\n+ await tester.pumpAndSettle();\n+\n+ expect(model.eventEndDate, model.eventEndOnEndDate);\n+\n+ await tester.tap(find.text('After'));\n+ await tester.pumpAndSettle();\n+\n+ final afterTextField = find.byType(CustomTextField).last;\n+\n+ await tester.tap(afterTextField);\n+ await tester.pumpAndSettle();\n+\n+ await tester.enterText(afterTextField, '2');\n+\n+ await tester.tap(find.text('Done'));\n+ await tester.pumpAndSettle();\n+\n+ expect(model.endOccurenceController.text, '2');\n });\n });\n }\ndiff --git a/test/views/after_auth_screens/events/create_event_page_test.dart b/test/views/after_auth_screens/events/create_event_page_test.dart\nindex 4448353173..5d5f5eb7a3 100644\n--- a/test/views/after_auth_screens/events/create_event_page_test.dart\n+++ b/test/views/after_auth_screens/events/create_event_page_test.dart\n@@ -15,6 +15,7 @@ import 'package:talawa/view_model/after_auth_view_models/event_view_models/creat\n import 'package:talawa/view_model/lang_view_model.dart';\n import 'package:talawa/views/after_auth_screens/events/create_event_page.dart';\n import 'package:talawa/views/base_view.dart';\n+import 'package:talawa/widgets/recurrence_dialog.dart';\n \n import '../../../helpers/test_helpers.dart';\n import '../../../helpers/test_locator.dart';\n@@ -173,9 +174,6 @@ void main() {\n );\n await tester.pumpAndSettle();\n \n- await tester.tap(find.byIcon(Icons.restore));\n- await tester.pumpAndSettle();\n-\n const List frequencies = [\n \"Does not repeat\",\n \"Every day\",\n@@ -185,14 +183,25 @@ void main() {\n \"Custom...\",\n ];\n \n- final customButtonFinder = find.text(\"Custom...\");\n+ String prev = frequencies[0];\n+ for (int i = 1; i < 5; i++) {\n+ expect(find.text(prev), findsAny);\n+ await tester.tap(find.text(prev));\n+ await tester.pumpAndSettle();\n+ await tester.tap(find.text(frequencies[i]).last);\n+ await tester.pumpAndSettle();\n+ expect(find.byType(ShowRecurrenceDialog), findsNothing);\n+ expect(find.text(frequencies[i]), findsOneWidget);\n+ prev = frequencies[i];\n+ }\n \n- await tester.tap(customButtonFinder);\n+ expect(find.text(prev), findsAny);\n+ await tester.tap(find.text(prev));\n+ await tester.pumpAndSettle();\n+ await tester.tap(find.text(frequencies[5]));\n await tester.pumpAndSettle();\n \n- for (final frequency in frequencies) {\n- expect(find.text(frequency), findsAny);\n- }\n+ expect(find.byType(ShowRecurrenceDialog), findsNothing);\n });\n \n testWidgets(\"Checking tap Inkwell for setDate 2 datetime\", (tester) async {\n@@ -346,7 +355,7 @@ void main() {\n await tester.pump();\n });\n \n- testWidgets(\"Testing Keep public section\", (tester) async {\n+ testWidgets(\"Testing All day section\", (tester) async {\n await tester.pumpWidget(\n createEventScreen(\n theme: TalawaTheme.lightTheme,\n@@ -356,27 +365,27 @@ void main() {\n final appLocalization = AppLocalizations.of(\n navigationService.navigatorKey.currentContext!,\n );\n- final keepPublicText = find.descendant(\n+ final allDayText = find.descendant(\n of: find.byType(Row),\n matching: find.text(\n- appLocalization!.strictTranslate('Keep Public'),\n+ appLocalization!.strictTranslate('All day'),\n ),\n );\n final switches = find.descendant(\n of: find.byType(Row),\n matching: find.byType(Switch),\n );\n- expect(keepPublicText, findsOneWidget);\n- expect(switches, findsNWidgets(2));\n+ expect(allDayText, findsOneWidget);\n+ expect(switches, findsNWidgets(3));\n expect(\n- (tester.widget(keepPublicText) as Text?)?.style!.fontSize,\n+ (tester.widget(allDayText) as Text?)?.style!.fontSize,\n 16,\n );\n- expect((tester.firstWidget(switches) as Switch).value, true);\n- await tester.ensureVisible(switches.first);\n- await tester.tap(switches.first);\n+ expect((tester.widgetList(switches).toList()[0] as Switch).value, true);\n+ await tester.ensureVisible(switches.at(0));\n+ await tester.tap(switches.at(0));\n await tester.pumpAndSettle();\n- expect((tester.firstWidget(switches) as Switch).value, false);\n+ expect((tester.widgetList(switches).toList()[0] as Switch).value, false);\n });\n \n testWidgets(\"Testing Keep Registerable section\", (tester) async {\n@@ -400,7 +409,7 @@ void main() {\n matching: find.byType(Switch),\n );\n expect(keepRegisterableText, findsOneWidget);\n- expect(switches, findsNWidgets(2));\n+ expect(switches, findsNWidgets(3));\n expect(\n (tester.widget(keepRegisterableText) as Text?)?.style!.fontSize,\n 16,\n@@ -412,6 +421,39 @@ void main() {\n expect((tester.widgetList(switches).toList()[1] as Switch).value, false);\n });\n \n+ testWidgets(\"Testing Keep public section\", (tester) async {\n+ await tester.pumpWidget(\n+ createEventScreen(\n+ theme: TalawaTheme.lightTheme,\n+ ),\n+ );\n+ await tester.pumpAndSettle();\n+ final appLocalization = AppLocalizations.of(\n+ navigationService.navigatorKey.currentContext!,\n+ );\n+ final keepPublicText = find.descendant(\n+ of: find.byType(Row),\n+ matching: find.text(\n+ appLocalization!.strictTranslate('Keep Public'),\n+ ),\n+ );\n+ final switches = find.descendant(\n+ of: find.byType(Row),\n+ matching: find.byType(Switch),\n+ );\n+ expect(keepPublicText, findsOneWidget);\n+ expect(switches, findsNWidgets(3));\n+ expect(\n+ (tester.widget(keepPublicText) as Text?)?.style!.fontSize,\n+ 16,\n+ );\n+ expect((tester.widgetList(switches).toList()[2] as Switch).value, true);\n+ await tester.ensureVisible(switches.at(2));\n+ await tester.tap(switches.at(2));\n+ await tester.pumpAndSettle();\n+ expect((tester.widgetList(switches).toList()[2] as Switch).value, false);\n+ });\n+\n // testWidgets(\"Checking tap Inkwell work for admin list\", (tester) async {\n // await tester.pumpWidget(\n // createEventScreen(\ndiff --git a/test/widget_tests/after_auth_screens/events/create_event_page_test.dart b/test/widget_tests/after_auth_screens/events/create_event_page_test.dart\nindex 3aae3aeb0b..55e8f5d6fb 100644\n--- a/test/widget_tests/after_auth_screens/events/create_event_page_test.dart\n+++ b/test/widget_tests/after_auth_screens/events/create_event_page_test.dart\n@@ -358,7 +358,7 @@ void main() {\n matching: find.byType(Switch),\n );\n expect(keepPublicText, findsOneWidget);\n- expect(switches, findsNWidgets(2));\n+ expect(switches, findsNWidgets(3));\n expect(\n (tester.widget(keepPublicText) as Text?)?.style!.fontSize,\n 16,\n@@ -390,7 +390,7 @@ void main() {\n matching: find.byType(Switch),\n );\n expect(keepRegisterableText, findsOneWidget);\n- expect(switches, findsNWidgets(2));\n+ expect(switches, findsNWidgets(3));\n expect(\n (tester.widget(keepRegisterableText) as Text?)?.style!.fontSize,\n 16,\n", "n2p_tests": "{}", "f2p_tests": "{\"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if addEvent works correctly\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if registrantsByEvents works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if updateEvent works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if registerForEvent works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if deleteEvent works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/event_queries_test.dart: Tests for event_queries.dart Check if fetchOrgEvents works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "PalisadoesFoundation__talawa-2350", "org": "PalisadoesFoundation", "repo": "talawa", "number": 2350, "state": "closed", "title": "Post comments were invisible in Individual Post Page with Image", "body": "**What kind of change does this PR introduce?**\r\n\r\nBugFix: Comments were not visible for posts with images. \r\n\r\n**Issue Number:**\r\n\r\nFixes #2333 \r\n\r\n**Did you add tests for your changes?**\r\n\r\nYes\r\n\r\n**Snapshots/Videos:**\r\n\r\n\r\nhttps://github.com/PalisadoesFoundation/talawa/assets/93479496/2eb8603d-b3dc-48d2-9226-3d1af27aafab\r\n\r\n\r\n![first](https://github.com/PalisadoesFoundation/talawa/assets/93479496/d1aecd46-bbc3-4ca3-86b8-a6065dae2665)\r\n![seconf](https://github.com/PalisadoesFoundation/talawa/assets/93479496/c1145888-9115-4e0c-9359-fb1c8aa5ff7c)\r\n![third](https://github.com/PalisadoesFoundation/talawa/assets/93479496/499cc804-7414-4f0f-a46d-7e5414313294)\r\n\r\n\r\n\r\n**If relevant, did you update the documentation?**\r\n\r\n\r\n\r\n**Summary**\r\n\r\nComments were not visible for posts with images\r\n\r\n**Does this PR introduce a breaking change?**\r\n\r\nNo\r\n\r\n**Other information**\r\n\r\nThe bug was there because app was trying to get the complete post data for fetching comments of the post and the `imageurl` was to be sent in proper format by api for this. That's how `fetchPostsByOrganisation` was working. Now since only comments were needed I removed the extra data fecthed along with comments.\r\n\r\n**Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa/blob/master/CONTRIBUTING.md)?**\r\n\r\n\r\nYes\r\n", "base": "{\"label\": \"PalisadoesFoundation:develop\", \"ref\": \"develop\", \"sha\": \"f314e5c2b6c1712ea8335e6f6a0f079a8a5c42f6\"}", "resolved_issues": "[{\"number\": 2333, \"title\": \"Bug: Post comments are invisible in Individual Post Page.\", \"body\": \"**Describe the bug**\\r\\n`Post comments` in `individual post page` are empty and `invisible` despite the `existence` of comments.\\r\\n\\r\\n**To Reproduce**\\r\\nSteps to reproduce the behavior:\\r\\n\\r\\n1. Login and Join an organisation.\\r\\n2. Create a post in case of empty posts.\\r\\n3. Find the created post in news feed and click on its comment option.\\r\\n4. Add a new comment.\\r\\n5. Navigate back to news feed.\\r\\n6. Once again click on same post comment option.\\r\\n\\r\\n**Expected behavior**\\r\\nThe previously created comment should be visible.\\r\\n\\r\\n**Actual behavior**\\r\\nThe comment list is empty despite the comment icon showing non zero value.\\r\\n\\r\\n**Screenshots**\\r\\n\\r\\nhttps://github.com/PalisadoesFoundation/talawa/assets/120930148/981d45d6-854d-4823-9028-f3d2a058ff81\\r\\n\\r\\n\\r\\n\\r\\n**Additional details**\\r\\nAdd any other context or screenshots about the feature request here.\\r\\n\\r\\n**Potential internship candidates**\\r\\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\\r\\n\"}]", "lang": "dart", "problem_statement": "Bug: Post comments are invisible in Individual Post Page.\n**Describe the bug**\r\n`Post comments` in `individual post page` are empty and `invisible` despite the `existence` of comments.\r\n\r\n**To Reproduce**\r\nSteps to reproduce the behavior:\r\n\r\n1. Login and Join an organisation.\r\n2. Create a post in case of empty posts.\r\n3. Find the created post in news feed and click on its comment option.\r\n4. Add a new comment.\r\n5. Navigate back to news feed.\r\n6. Once again click on same post comment option.\r\n\r\n**Expected behavior**\r\nThe previously created comment should be visible.\r\n\r\n**Actual behavior**\r\nThe comment list is empty despite the comment icon showing non zero value.\r\n\r\n**Screenshots**\r\n\r\nhttps://github.com/PalisadoesFoundation/talawa/assets/120930148/981d45d6-854d-4823-9028-f3d2a058ff81\r\n\r\n\r\n\r\n**Additional details**\r\nAdd any other context or screenshots about the feature request here.\r\n\r\n**Potential internship candidates**\r\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\r\n\n", "hints": "@noman2002 @Cioppolo14\r\n Can you please assign this to me\r\n\nI have found the cause of bug and will try to create a PR to fix this till tomorrow.", "pull_url": "https://github.com/PalisadoesFoundation/talawa/pull/2350", "issue_urls": "[\"https://github.com/PalisadoesFoundation/talawa/issues/2333\"]", "test_command": NaN, "fix_patch": "diff --git a/lib/services/comment_service.dart b/lib/services/comment_service.dart\nindex 7b25338eb9..b118b6c003 100644\n--- a/lib/services/comment_service.dart\n+++ b/lib/services/comment_service.dart\n@@ -4,7 +4,6 @@ import 'package:talawa/locator.dart';\n import 'package:talawa/services/database_mutation_functions.dart';\n import 'package:talawa/services/navigation_service.dart';\n import 'package:talawa/utils/comment_queries.dart';\n-import 'package:talawa/utils/post_queries.dart';\n \n /// CommentService class have different member functions which provides service in the context of commenting.\n ///\n@@ -62,7 +61,7 @@ class CommentService {\n /// * `Future>`: promise that will be fulfilled with list of comments.\n ///\n Future> getCommentsForPost(String postId) async {\n- final String getCommmentQuery = PostQueries().getPostById(postId);\n+ final String getCommmentQuery = CommentQueries().getPostsComments(postId);\n \n final dynamic result = await _dbFunctions.gqlAuthMutation(getCommmentQuery);\n \ndiff --git a/lib/utils/comment_queries.dart b/lib/utils/comment_queries.dart\nindex 6c6b36bc34..fa11f6c18b 100644\n--- a/lib/utils/comment_queries.dart\n+++ b/lib/utils/comment_queries.dart\n@@ -1,9 +1,12 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n ///This class creates the queries dealing with comments.\n class CommentQueries {\n- //Returns a query for creating a comment\n+ /// Creating a comment.\n+ ///\n+ /// **params**:\n+ /// None\n+ ///\n+ /// **returns**:\n+ /// * `String`: The query for creating a comment\n String createComment() {\n return \"\"\"\n mutation createComment(\\$postId: ID!, \\$text: String!) { \n@@ -18,20 +21,29 @@ class CommentQueries {\n \"\"\";\n }\n \n- //Returns a query to get the comments of a post\n+ /// Get all comments for a post.\n+ ///\n+ /// **params**:\n+ /// * `postId`: The id of the post to get comments for.\n+ ///\n+ /// **returns**:\n+ /// * `String`: The query for getting all comments for a post.\n String getPostsComments(String postId) {\n return \"\"\"\n- query{\n- commentsByPost(id: \"$postId\"){\n- _id\n- text\n- createdAt\n+ query {\n+ post(id: \"$postId\")\n+ { _id,\n+ comments{\n+ _id,\n+ text,\n+ createdAt\n creator{\n firstName\n lastName\n }\n+ }\n+ }\n }\n- }\n- \"\"\";\n+\"\"\";\n }\n }\ndiff --git a/lib/utils/post_queries.dart b/lib/utils/post_queries.dart\nindex 365c940d00..4d763032d7 100644\n--- a/lib/utils/post_queries.dart\n+++ b/lib/utils/post_queries.dart\n@@ -73,7 +73,7 @@ class PostQueries {\n _id\n }\n comments{\n- _id,\n+ _id,\n text,\n createdAt\n creator{\n", "test_patch": "diff --git a/test/service_tests/comment_service_test.dart b/test/service_tests/comment_service_test.dart\nindex 71233621d7..4a8af56952 100644\n--- a/test/service_tests/comment_service_test.dart\n+++ b/test/service_tests/comment_service_test.dart\n@@ -6,7 +6,6 @@ import 'package:talawa/locator.dart';\n import 'package:talawa/services/comment_service.dart';\n import 'package:talawa/services/database_mutation_functions.dart';\n import 'package:talawa/utils/comment_queries.dart';\n-import 'package:talawa/utils/post_queries.dart';\n import '../helpers/test_helpers.dart';\n \n void main() {\n@@ -75,7 +74,7 @@ void main() {\n test('test for getCommentsForPost', () async {\n final dataBaseMutationFunctions = locator();\n final String getCommmentQuery =\n- PostQueries().getPostById('Ayush s postid');\n+ CommentQueries().getPostsComments('Ayush s postid');\n \n when(\n dataBaseMutationFunctions.gqlAuthMutation(getCommmentQuery),\n@@ -167,7 +166,7 @@ void main() {\n final dataBaseMutationFunctions = locator();\n \n final String getCommmentQuery =\n- PostQueries().getPostById('Ayush s postid');\n+ CommentQueries().getPostsComments('Ayush s postid');\n when(\n dataBaseMutationFunctions.gqlAuthMutation(getCommmentQuery),\n ).thenAnswer(\n@@ -221,7 +220,7 @@ void main() {\n final dataBaseMutationFunctions = locator();\n \n final String getCommmentQuery =\n- PostQueries().getPostById('Ayush s postid');\n+ CommentQueries().getPostsComments('Ayush s postid');\n when(\n dataBaseMutationFunctions.gqlAuthMutation(getCommmentQuery),\n ).thenAnswer(\n@@ -273,7 +272,7 @@ void main() {\n final dataBaseMutationFunctions = locator();\n \n final String getCommmentQuery =\n- PostQueries().getPostById('Ayush s postid');\n+ CommentQueries().getPostsComments('Ayush s postid');\n when(\n dataBaseMutationFunctions.gqlAuthMutation(getCommmentQuery),\n ).thenAnswer(\n@@ -325,7 +324,7 @@ void main() {\n final dataBaseMutationFunctions = locator();\n \n final String getCommmentQuery =\n- PostQueries().getPostById('Ayush s postid');\n+ CommentQueries().getPostsComments('Ayush s postid');\n when(\n dataBaseMutationFunctions.gqlAuthMutation(getCommmentQuery),\n ).thenAnswer(\ndiff --git a/test/utils/comment_queries_test.dart b/test/utils/comment_queries_test.dart\nindex f73df7de7f..d9b34b9b7f 100644\n--- a/test/utils/comment_queries_test.dart\n+++ b/test/utils/comment_queries_test.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'package:flutter_test/flutter_test.dart';\n import 'package:talawa/utils/comment_queries.dart';\n \n@@ -8,18 +5,21 @@ void main() {\n group(\"Tests for comment_queries.dart\", () {\n test(\"Check if getPostsComments works correctly\", () {\n const data = \"\"\"\n- query{\n- commentsByPost(id: \"abc\"){\n- _id\n- text\n- createdAt\n+ query {\n+ post(id: \"abc\")\n+ { _id,\n+ comments{\n+ _id,\n+ text,\n+ createdAt\n creator{\n firstName\n lastName\n }\n+ }\n+ }\n }\n- }\n- \"\"\";\n+\"\"\";\n final fnData = CommentQueries().getPostsComments(\"abc\");\n expect(fnData, data);\n });\ndiff --git a/test/utils/post_queries_test.dart b/test/utils/post_queries_test.dart\nindex 5f5029d245..203d193ab5 100644\n--- a/test/utils/post_queries_test.dart\n+++ b/test/utils/post_queries_test.dart\n@@ -54,6 +54,47 @@ void main() {\n expect(fnData, data);\n });\n \n+ test(\"Check if getPostById works correctly\", () {\n+ const data = \"\"\"\n+ query {\n+ post(id: \"abc\")\n+ { \n+ _id\n+ text\n+ createdAt\n+ imageUrl\n+ videoUrl\n+ title\n+ commentCount\n+ likeCount\n+ creator{\n+ _id\n+ firstName\n+ lastName\n+ image\n+ }\n+ organization{\n+ _id\n+ }\n+ likedBy{\n+ _id\n+ }\n+ comments{\n+ _id,\n+ text,\n+ createdAt\n+ creator{\n+ firstName\n+ lastName\n+ }\n+ }\n+ }\n+ }\n+\"\"\";\n+ final fnData = PostQueries().getPostById(\"abc\");\n+ expect(fnData, data);\n+ });\n+\n test(\"Check if removeLike works correctly\", () {\n const data = \"\"\"\n mutation unlikePost(\\$postID: ID!) { \n", "n2p_tests": "{}", "f2p_tests": "{\"/home/talawa/test/utils/post_queries_test.dart: Tests for post_queries.dart Check if getPostById works correctly\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/comment_queries_test.dart: Tests for comment_queries.dart Check if getPostsComments works correctly\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"/home/talawa/test/utils/post_queries_test.dart: Tests for post_queries.dart Check if removeLike works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/post_queries_test.dart: Tests for post_queries.dart Check if removePost works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/comment_queries_test.dart: Tests for comment_queries.dart Check if createComment works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/post_queries_test.dart: Tests for post_queries.dart Check if getPostsById works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/post_queries_test.dart: Tests for post_queries.dart Check if uploadPost works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/talawa/test/utils/post_queries_test.dart: Tests for post_queries.dart Check if addLike works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "PalisadoesFoundation__talawa-2322", "org": "PalisadoesFoundation", "repo": "talawa", "number": 2322, "state": "closed", "title": "converted private orgs to userRegistrationRequired orgs", "body": "\r\n\r\n\r\n\r\n**What kind of change does this PR introduce?**\r\n\r\nThis PR converts all the support & references of `private organizations` to `userRegistrationRequired organizations`.\r\n\r\n**Issue Number:**\r\n\r\nFixes #2287 \r\n\r\n**Did you add tests for your changes?**\r\n\r\nYes\r\n\r\n**Snapshots/Videos:**\r\n\r\n\r\n\r\n**If relevant, did you update the documentation?**\r\n\r\n\r\n\r\n**Summary**\r\n\r\nThe motive of this PR is to transform all the references and code of `private` organizatioins to `userRegistrationRequired` organizations.\r\nThe above transformation is achieved by replacing the `isPublic` attribute of `Organisation` model with `userRegistrationRequired` attribute in entire code base and making respective change to the logic.\r\n\r\n**Does this PR introduce a breaking change?**\r\n\r\nNo\r\n\r\n**Other information**\r\n\r\n\r\n\r\n**Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa/blob/master/CONTRIBUTING.md)?**\r\n\r\nYes", "base": "{\"label\": \"PalisadoesFoundation:develop\", \"ref\": \"develop\", \"sha\": \"dce8ce0ddba752f6ac7df5ad273cf0b60f4aa7bd\"}", "resolved_issues": "[{\"number\": 2287, \"title\": \"Mobile - Remove Support for Private Organizations\", \"body\": \"**Is your feature request related to a problem? Please describe.**\\r\\nWe need to reduce and simplify some of the Talawa features. \\r\\n\\r\\nThe concept of private organizations is unlikely given that most organizations using Talawa will be non-profits where transparency will be important.\\r\\n\\r\\n**Describe the solution you'd like**\\r\\n\\r\\nRemove all support for private organizations in:\\r\\n1. Screens, sections of screens and supporting code that reference the feature\\r\\n\\r\\nOther:\\r\\n\\r\\n1. All tests must be valid and pass\\r\\n1. No other functionality must be affected.\\r\\n\\r\\n**Describe alternatives you've considered**\\r\\n- N/A\\r\\n\\r\\n**Approach to be followed (optional)**\\r\\n- See above\\r\\n\\r\\n**Additional context**\\r\\nRelated issues include:\\r\\n1. https://github.com/PalisadoesFoundation/talawa-api/issues/1604\\r\\n2. https://github.com/PalisadoesFoundation/talawa-admin/issues/1327\\r\\n3. https://github.com/PalisadoesFoundation/talawa/issues/2287\\r\\n\\r\\n**Potential internship candidates**\\r\\n- Please read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\\r\\n\"}]", "lang": "dart", "problem_statement": "Mobile - Remove Support for Private Organizations\n**Is your feature request related to a problem? Please describe.**\r\nWe need to reduce and simplify some of the Talawa features. \r\n\r\nThe concept of private organizations is unlikely given that most organizations using Talawa will be non-profits where transparency will be important.\r\n\r\n**Describe the solution you'd like**\r\n\r\nRemove all support for private organizations in:\r\n1. Screens, sections of screens and supporting code that reference the feature\r\n\r\nOther:\r\n\r\n1. All tests must be valid and pass\r\n1. No other functionality must be affected.\r\n\r\n**Describe alternatives you've considered**\r\n- N/A\r\n\r\n**Approach to be followed (optional)**\r\n- See above\r\n\r\n**Additional context**\r\nRelated issues include:\r\n1. https://github.com/PalisadoesFoundation/talawa-api/issues/1604\r\n2. https://github.com/PalisadoesFoundation/talawa-admin/issues/1327\r\n3. https://github.com/PalisadoesFoundation/talawa/issues/2287\r\n\r\n**Potential internship candidates**\r\n- Please read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\r\n\n", "hints": "@noman2002 @Cioppolo14 @Kevoniat can any one of you please assign this issue to me. I would like to work on this.\nCan I work on this issue?\n@AVtheking If the issue has already been assigned, please don't ask to be assigned. We want everyone to get a chance.\n@palisadoes a small clarification, the `membership request` feature is only available for private orgs right ?\nIt should be valid for all types of organizations\n@palisadoes if we remove the support for private orgs then i think the `membership request feature` is of no use because the public orgs allow the users to directly participate.\r\n\r\n![Screenshot from 2024-01-04 17-01-58](https://github.com/PalisadoesFoundation/talawa/assets/120930148/eadf5fd7-1201-4a05-be62-f3c5c66af68d)\r\n\r\nand in above context the concept of waiting screen also makes no sense.\nso i am planning to remove both `waiting screen` and `membership request feature` from the application.\n1. When users first create their accounts, they register to an organization and the Admin approves it. \r\n2. The Admin portal has a request approvals screen for this. \r\n3. We should consider whether organizations want to have the option of automatic registration or not.\r\n\r\n@rishav-jha-mech @aashimawadhwa @beingnoble03 What is the current workflow in the web Admin and User portals?\n**Admin Panel**\r\n\r\n1. The first registered user becomes Superadmin, others will be just the users\r\n2. The superadmin creates Organizations, and can manually add any user to it\r\n3. The superadmin can change the role of any user, from user to admin and vice-versa\r\n4. An admin cannot change the role of other admin \r\n5. We have a membership requests page, on Admin Panel, only admins who are not approved by an admin will be listed there, it is redundant now, so that will be removed\r\n6. We dont have Membership Requests screen at the moment for the organization, we have to create one\n@rishav-jha-mech please clarify\n\n1. if an organisation is public, then the users can directly join that org right? No need of sending a membership request and waiting for the approval.\n> so i am planning to remove both waiting screen and membership request feature from the application.\r\n\r\n@palisadoes please suggest, what would be the appropriate solution shall I remove the above screens or leave them as it is.\n> @rishav-jha-mech please clarify\n> \n> 1. if an organisation is public, then the users can directly join that org right? No need of sending a membership request and waiting for the approval.\n\nThere may be a requirement by the admin to require registration approvals for public orgs.\n\nPlease reference the issues mentioned in the other tepos\nPlease work with @rishav-jha-mech on this\nPlease refer to this discussion before proceeding\r\n- https://github.com/PalisadoesFoundation/talawa-api/pull/1643#issuecomment-1879947274 \n@palisadoes this is for your kind information,\r\nas soon as [this](https://github.com/PalisadoesFoundation/talawa-api/pull/1643) PR gets merged i will work on this issue.\nFYI - The issue blocking this has been completed\r\n- https://github.com/PalisadoesFoundation/talawa-api/issues/1604\nThanks @palisadoes , I will start working on it.", "pull_url": "https://github.com/PalisadoesFoundation/talawa/pull/2322", "issue_urls": "[\"https://github.com/PalisadoesFoundation/talawa/issues/2287\"]", "test_command": NaN, "fix_patch": "diff --git a/lib/models/organization/org_info.dart b/lib/models/organization/org_info.dart\nindex 1ab789ad52..28b790924c 100644\n--- a/lib/models/organization/org_info.dart\n+++ b/lib/models/organization/org_info.dart\n@@ -14,7 +14,7 @@ class OrgInfo {\n this.description,\n this.id,\n this.image,\n- this.isPublic,\n+ this.userRegistrationRequired,\n this.name,\n });\n \n@@ -34,7 +34,9 @@ class OrgInfo {\n name: json['name'] != null ? json['name'] as String? : null,\n description:\n json['description'] != null ? json['description'] as String? : null,\n- isPublic: json['isPublic'] != null ? json['isPublic'] as bool? : null,\n+ userRegistrationRequired: json['userRegistrationRequired'] != null\n+ ? json['userRegistrationRequired'] as bool?\n+ : null,\n creatorInfo: json['creator'] != null\n ? User.fromJson(\n json['creator'] as Map,\n@@ -112,9 +114,9 @@ class OrgInfo {\n @HiveField(5)\n String? description;\n \n- /// The org visibility.\n+ /// The org registration is required.\n @HiveField(6)\n- bool? isPublic;\n+ bool? userRegistrationRequired;\n \n /// The org creatorInfo.\n @HiveField(7)\ndiff --git a/lib/models/organization/org_info.g.dart b/lib/models/organization/org_info.g.dart\nindex fea56e918d..91985214a7 100644\n--- a/lib/models/organization/org_info.g.dart\n+++ b/lib/models/organization/org_info.g.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n // GENERATED CODE - DO NOT MODIFY BY HAND\n \n part of 'org_info.dart';\n@@ -26,7 +23,7 @@ class OrgInfoAdapter extends TypeAdapter {\n description: fields[5] as String?,\n id: fields[1] as String?,\n image: fields[0] as String?,\n- isPublic: fields[6] as bool?,\n+ userRegistrationRequired: fields[6] as bool?,\n name: fields[2] as String?,\n );\n }\n@@ -48,7 +45,7 @@ class OrgInfoAdapter extends TypeAdapter {\n ..writeByte(5)\n ..write(obj.description)\n ..writeByte(6)\n- ..write(obj.isPublic)\n+ ..write(obj.userRegistrationRequired)\n ..writeByte(7)\n ..write(obj.creatorInfo);\n }\ndiff --git a/lib/router.dart b/lib/router.dart\nindex 86fd7f8a19..3d2f124867 100644\n--- a/lib/router.dart\n+++ b/lib/router.dart\n@@ -43,7 +43,7 @@ import 'package:talawa/views/pre_auth_screens/select_language.dart';\n import 'package:talawa/views/pre_auth_screens/select_organization.dart';\n import 'package:talawa/views/pre_auth_screens/set_url.dart';\n import 'package:talawa/views/pre_auth_screens/signup_details.dart';\n-import 'package:talawa/views/pre_auth_screens/waiting_to_join_private_org.dart';\n+import 'package:talawa/views/pre_auth_screens/waiting_screen.dart';\n \n /// The MaterialApp provides us with a property called generateRoute where.\n ///\ndiff --git a/lib/utils/queries.dart b/lib/utils/queries.dart\nindex 446c66880f..dacc866ce7 100644\n--- a/lib/utils/queries.dart\n+++ b/lib/utils/queries.dart\n@@ -35,7 +35,7 @@ class Queries {\n name\n image\n description\n- isPublic\n+ userRegistrationRequired\n creator{\n _id\n firstName\n@@ -48,7 +48,7 @@ class Queries {\n name\n image\n description\n- isPublic\n+ userRegistrationRequired\n creator{\n _id\n firstName\n@@ -62,7 +62,7 @@ class Queries {\n name\n image\n description\n- isPublic\n+ userRegistrationRequired\n creator{\n _id\n firstName\n@@ -106,7 +106,7 @@ class Queries {\n name\n image\n description\n- isPublic\n+ userRegistrationRequired\n creator{\n _id\n firstName\n@@ -119,7 +119,7 @@ class Queries {\n name\n image\n description\n- isPublic\n+ userRegistrationRequired\n creator{\n _id\n firstName\n@@ -133,7 +133,7 @@ class Queries {\n name\n image\n description\n- isPublic\n+ userRegistrationRequired\n creator{\n _id\n firstName\n@@ -207,7 +207,7 @@ class Queries {\n _id\n name\n image\n- isPublic\n+ userRegistrationRequired\n creator{\n firstName\n lastName\n@@ -229,7 +229,7 @@ class Queries {\n where:{\n name_starts_with: \\$nameStartsWith,\n visibleInSearch: true,\n- isPublic: true,\n+ userRegistrationRequired: true,\n }\n first: \\$first,\n skip: \\$skip,\n@@ -239,7 +239,7 @@ class Queries {\n _id\n name\n image\n- isPublic\n+ userRegistrationRequired\n creator{\n firstName\n lastName\n@@ -266,7 +266,7 @@ class Queries {\n name\n image\n description\n- isPublic\n+ userRegistrationRequired\n creator{\n _id\n firstName\n@@ -297,7 +297,7 @@ class Queries {\n name\n image\n description\n- isPublic\n+ userRegistrationRequired\n creator{\n _id\n firstName\n@@ -324,7 +324,7 @@ class Queries {\n name\n image\n description\n- isPublic\n+ userRegistrationRequired\n creator{\n _id\n firstName\n@@ -338,7 +338,7 @@ class Queries {\n name\n image\n description\n- isPublic\n+ userRegistrationRequired\n creator{\n _id\n firstName\n@@ -351,7 +351,7 @@ class Queries {\n _id\n name\n image\n- isPublic\n+ userRegistrationRequired\n creator{\n _id\n firstName\n@@ -420,7 +420,7 @@ class Queries {\n _id\n name\n image\n- isPublic\n+ userRegistrationRequired\n creator{\n firstName\n lastName\n@@ -480,7 +480,7 @@ class Queries {\n _id\n }\n description\n- isPublic\n+ userRegistrationRequired\n creator{\n _id\n firstName\ndiff --git a/lib/view_model/pre_auth_view_models/select_organization_view_model.dart b/lib/view_model/pre_auth_view_models/select_organization_view_model.dart\nindex 688b6878a0..f2a0c911c4 100644\n--- a/lib/view_model/pre_auth_view_models/select_organization_view_model.dart\n+++ b/lib/view_model/pre_auth_view_models/select_organization_view_model.dart\n@@ -123,9 +123,8 @@ class SelectOrganizationViewModel extends BaseModel {\n selectedOrganization = item;\n notifyListeners();\n onTapJoin();\n- // print(selectedOrganization.isPublic);\n \n- if (!selectedOrganization.isPublic!) {\n+ if (selectedOrganization.userRegistrationRequired!) {\n navigationService.pushScreen(\n Routes.requestAccess,\n arguments: selectedOrganization,\n@@ -186,8 +185,8 @@ class SelectOrganizationViewModel extends BaseModel {\n /// **returns**:\n /// * `Future`: None\n Future onTapJoin() async {\n- // if `selectedOrganization` is public.\n- if (selectedOrganization.isPublic == true) {\n+ // if `selectedOrganization` registrations is not required.\n+ if (selectedOrganization.userRegistrationRequired == false) {\n try {\n // run the graph QL mutation\n final QueryResult result = await databaseFunctions.gqlAuthMutation(\ndiff --git a/lib/view_model/pre_auth_view_models/signup_details_view_model.dart b/lib/view_model/pre_auth_view_models/signup_details_view_model.dart\nindex e25261cdc1..8456887dce 100644\n--- a/lib/view_model/pre_auth_view_models/signup_details_view_model.dart\n+++ b/lib/view_model/pre_auth_view_models/signup_details_view_model.dart\n@@ -142,8 +142,8 @@ class SignupDetailsViewModel extends BaseModel {\n final bool tokenRefreshed = await graphqlConfig.getToken() as bool;\n // if user successfully saved and access token is also generated.\n if (userSaved && tokenRefreshed) {\n- // if the selected organization is public.\n- if (selectedOrganization.isPublic!) {\n+ // if the selected organization userRegistration not required.\n+ if (!selectedOrganization.userRegistrationRequired!) {\n try {\n final QueryResult result =\n await databaseFunctions.gqlAuthMutation(\ndiff --git a/lib/views/pre_auth_screens/waiting_to_join_private_org.dart b/lib/views/pre_auth_screens/waiting_screen.dart\nsimilarity index 96%\nrename from lib/views/pre_auth_screens/waiting_to_join_private_org.dart\nrename to lib/views/pre_auth_screens/waiting_screen.dart\nindex 011f5a5fb9..5615793c15 100644\n--- a/lib/views/pre_auth_screens/waiting_to_join_private_org.dart\n+++ b/lib/views/pre_auth_screens/waiting_screen.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'package:flutter/material.dart';\n import 'package:talawa/enums/enums.dart';\n import 'package:talawa/services/size_config.dart';\n@@ -12,7 +9,7 @@ import 'package:talawa/widgets/raised_round_edge_button.dart';\n import 'package:talawa/widgets/rich_text.dart';\n import 'package:talawa/widgets/signup_progress_indicator.dart';\n \n-/// This class returns a widget which shows the request sent by the user to join a private organization.\n+/// Displays a screen instructing the user to wait for approval.\n class WaitingPage extends StatelessWidget {\n const WaitingPage({super.key});\n \ndiff --git a/lib/widgets/custom_list_tile.dart b/lib/widgets/custom_list_tile.dart\nindex 54c02ddfa0..26eb497368 100644\n--- a/lib/widgets/custom_list_tile.dart\n+++ b/lib/widgets/custom_list_tile.dart\n@@ -110,8 +110,10 @@ class CustomListTile extends StatelessWidget {\n child: type != TileType.user\n ? type == TileType.org\n ? Icon(\n- orgInfo!.isPublic! ? Icons.lock_open : Icons.lock,\n- color: orgInfo!.isPublic!\n+ !orgInfo!.userRegistrationRequired!\n+ ? Icons.lock_open\n+ : Icons.lock,\n+ color: !orgInfo!.userRegistrationRequired!\n ? const Color(0xFF34AD64)\n : const Color(0xffFABC57),\n )\n", "test_patch": "diff --git a/test/helpers/test_helpers.dart b/test/helpers/test_helpers.dart\nindex 71ebf67576..9de98325bc 100644\n--- a/test/helpers/test_helpers.dart\n+++ b/test/helpers/test_helpers.dart\n@@ -111,7 +111,7 @@ final fakeOrgInfo = OrgInfo(\n firstName: \"ravidi\",\n lastName: \"shaikh\",\n ),\n- isPublic: false,\n+ userRegistrationRequired: true,\n );\n \n void _removeRegistrationIfExists() {\n@@ -363,13 +363,13 @@ UserConfig getAndRegisterUserConfig() {\n OrgInfo(\n id: '3',\n name: 'test org 3',\n- isPublic: true,\n+ userRegistrationRequired: false,\n creatorInfo: User(firstName: 'test', lastName: '1'),\n ),\n OrgInfo(\n id: '4',\n name: 'test org 4',\n- isPublic: false,\n+ userRegistrationRequired: true,\n creatorInfo: User(firstName: 'test', lastName: '2'),\n ),\n OrgInfo(\n@@ -381,13 +381,13 @@ UserConfig getAndRegisterUserConfig() {\n OrgInfo(\n id: '1',\n name: 'test org',\n- isPublic: false,\n+ userRegistrationRequired: true,\n creatorInfo: User(firstName: 'test', lastName: 'test'),\n ),\n OrgInfo(\n id: '2',\n name: 'test org',\n- isPublic: false,\n+ userRegistrationRequired: true,\n creatorInfo: User(firstName: 'test', lastName: 'test'),\n ),\n ],\ndiff --git a/test/model_tests/organization/org_info_test.dart b/test/model_tests/organization/org_info_test.dart\nindex fb96537579..9bbca3d8c9 100644\n--- a/test/model_tests/organization/org_info_test.dart\n+++ b/test/model_tests/organization/org_info_test.dart\n@@ -16,7 +16,7 @@ void main() {\n 'image': 'image_url',\n 'name': 'Name',\n 'description': 'Description',\n- 'isPublic': true,\n+ 'userRegistrationRequired': false,\n 'creator': userJson,\n 'members': [userJson],\n 'admins': [userJson],\n@@ -26,7 +26,7 @@ void main() {\n 'image': 'image_url',\n 'name': 'Name',\n 'description': 'Description',\n- 'isPublic': true,\n+ 'userRegistrationRequired': false,\n 'creator': userJson,\n 'members': [userJson],\n 'admins': [userJson],\n@@ -39,7 +39,7 @@ void main() {\n expect(result.image, 'image_url');\n expect(result.name, 'Name');\n expect(result.description, 'Description');\n- expect(result.isPublic, true);\n+ expect(result.userRegistrationRequired, false);\n expect(result.creatorInfo!.authToken, ' ');\n expect(result.creatorInfo!.refreshToken, ' ');\n expect(result.creatorInfo!.id, 'user_id');\n@@ -64,7 +64,7 @@ void main() {\n expect(result.image, 'image_url');\n expect(result.name, 'Name');\n expect(result.description, 'Description');\n- expect(result.isPublic, true);\n+ expect(result.userRegistrationRequired, false);\n expect(result.creatorInfo!.authToken, ' ');\n expect(result.creatorInfo!.refreshToken, ' ');\n expect(result.creatorInfo!.id, 'user_id');\n@@ -92,7 +92,7 @@ void main() {\n expect(result.image, 'image_url');\n expect(result.name, 'Name');\n expect(result.description, 'Description');\n- expect(result.isPublic, true);\n+ expect(result.userRegistrationRequired, false);\n expect(result.creatorInfo!.authToken, ' ');\n expect(result.creatorInfo!.refreshToken, ' ');\n expect(result.creatorInfo!.id, 'user_id');\n@@ -124,7 +124,7 @@ void main() {\n expect(res[0].image, 'image_url');\n expect(res[0].name, 'Name');\n expect(res[0].description, 'Description');\n- expect(res[0].isPublic, true);\n+ expect(res[0].userRegistrationRequired, false);\n expect(res[0].creatorInfo!.authToken, ' ');\n expect(res[0].creatorInfo!.refreshToken, ' ');\n expect(res[0].creatorInfo!.id, 'user_id');\n@@ -141,7 +141,7 @@ void main() {\n expect(res[1].image, 'image_url');\n expect(res[1].name, 'Name');\n expect(res[1].description, 'Description');\n- expect(res[1].isPublic, true);\n+ expect(res[1].userRegistrationRequired, false);\n expect(res[1].creatorInfo!.authToken, ' ');\n expect(res[1].creatorInfo!.refreshToken, ' ');\n expect(res[1].creatorInfo!.id, 'user_id');\n@@ -158,7 +158,7 @@ void main() {\n expect(res[2].image, 'image_url');\n expect(res[2].name, 'Name');\n expect(res[2].description, 'Description');\n- expect(res[2].isPublic, true);\n+ expect(res[2].userRegistrationRequired, false);\n expect(res[2].creatorInfo!.authToken, ' ');\n expect(res[2].creatorInfo!.refreshToken, ' ');\n expect(res[2].creatorInfo!.id, 'user_id');\ndiff --git a/test/model_tests/user/user_info_test.dart b/test/model_tests/user/user_info_test.dart\nindex 00262f3689..f4611e34b0 100644\n--- a/test/model_tests/user/user_info_test.dart\n+++ b/test/model_tests/user/user_info_test.dart\n@@ -11,14 +11,14 @@ import 'package:talawa/models/user/user_info.dart';\n final encodedOrg = {\n \"name\": 'test_org',\n \"image\": 'https://testimg.com',\n- \"isPublic\": false,\n+ \"userRegistrationRequired\": true,\n };\n \n /// Updated Organization.\n final updatedOrg = OrgInfo.fromJson({\n \"name\": 'test_org_updated',\n \"image\": 'https://testimg_updated.com',\n- \"isPublic\": true,\n+ \"userRegistrationRequired\": false,\n });\n \n /// Membership Request Organization.\n@@ -136,7 +136,7 @@ void main() {\n expect(userInfo.joinedOrganizations!.length, 2);\n expect(userInfo.joinedOrganizations![0].name, 'test_org');\n expect(userInfo.joinedOrganizations![0].image, 'https://testimg.com');\n- expect(userInfo.joinedOrganizations![0].isPublic, false);\n+ expect(userInfo.joinedOrganizations![0].userRegistrationRequired, true);\n \n userInfo.updateJoinedOrg([updatedOrg, updatedOrg, updatedOrg]);\n \n@@ -146,7 +146,7 @@ void main() {\n userInfo.joinedOrganizations![0].image,\n 'https://testimg_updated.com',\n );\n- expect(userInfo.joinedOrganizations![0].isPublic, true);\n+ expect(userInfo.joinedOrganizations![0].userRegistrationRequired, false);\n });\n \n test('Check if the method updateCreatedOrg works', () async {\n@@ -155,7 +155,7 @@ void main() {\n expect(userInfo.createdOrganizations!.length, 2);\n expect(userInfo.createdOrganizations![0].name, 'test_org');\n expect(userInfo.createdOrganizations![0].image, 'https://testimg.com');\n- expect(userInfo.createdOrganizations![0].isPublic, false);\n+ expect(userInfo.createdOrganizations![0].userRegistrationRequired, true);\n \n userInfo.updateCreatedOrg([updatedOrg, updatedOrg, updatedOrg]);\n \n@@ -165,7 +165,7 @@ void main() {\n userInfo.createdOrganizations![0].image,\n 'https://testimg_updated.com',\n );\n- expect(userInfo.createdOrganizations![0].isPublic, true);\n+ expect(userInfo.createdOrganizations![0].userRegistrationRequired, false);\n });\n \n test('Check if the method updateMemberRequestOrg works', () async {\n@@ -174,7 +174,7 @@ void main() {\n expect(userInfo.membershipRequests!.length, 2);\n expect(userInfo.membershipRequests![0].name, 'test_org');\n expect(userInfo.membershipRequests![0].image, 'https://testimg.com');\n- expect(userInfo.membershipRequests![0].isPublic, false);\n+ expect(userInfo.membershipRequests![0].userRegistrationRequired, true);\n \n userInfo.updateMemberRequestOrg([updatedOrg, updatedOrg, updatedOrg]);\n \n@@ -184,7 +184,7 @@ void main() {\n userInfo.membershipRequests![3].image,\n 'https://testimg_updated.com',\n );\n- expect(userInfo.membershipRequests![3].isPublic, true);\n+ expect(userInfo.membershipRequests![3].userRegistrationRequired, false);\n });\n \n test('Check if the method updateAdminFor works', () async {\n@@ -193,14 +193,14 @@ void main() {\n expect(userInfo.adminFor!.length, 2);\n expect(userInfo.adminFor![0].name, 'test_org');\n expect(userInfo.adminFor![0].image, 'https://testimg.com');\n- expect(userInfo.adminFor![0].isPublic, false);\n+ expect(userInfo.adminFor![0].userRegistrationRequired, true);\n \n userInfo.updateAdminFor([updatedOrg, updatedOrg, updatedOrg]);\n \n expect(userInfo.adminFor!.length, 3);\n expect(userInfo.adminFor![0].name, 'test_org_updated');\n expect(userInfo.adminFor![0].image, 'https://testimg_updated.com');\n- expect(userInfo.adminFor![0].isPublic, true);\n+ expect(userInfo.adminFor![0].userRegistrationRequired, false);\n });\n \n test('Check if Hive storage works', () async {\ndiff --git a/test/router_test.dart b/test/router_test.dart\nindex a46d7a2f93..71c6260862 100644\n--- a/test/router_test.dart\n+++ b/test/router_test.dart\n@@ -41,7 +41,7 @@ import 'package:talawa/views/pre_auth_screens/change_password.dart';\n import 'package:talawa/views/pre_auth_screens/select_language.dart';\n import 'package:talawa/views/pre_auth_screens/select_organization.dart';\n import 'package:talawa/views/pre_auth_screens/set_url.dart';\n-import 'package:talawa/views/pre_auth_screens/waiting_to_join_private_org.dart';\n+import 'package:talawa/views/pre_auth_screens/waiting_screen.dart';\n \n class MockBuildContext extends Mock implements BuildContext {}\n \ndiff --git a/test/service_tests/database_mutations_function_test.dart b/test/service_tests/database_mutations_function_test.dart\nindex 75b821c2c6..dff3fc097d 100644\n--- a/test/service_tests/database_mutations_function_test.dart\n+++ b/test/service_tests/database_mutations_function_test.dart\n@@ -58,7 +58,7 @@ void main() async {\n 'image': 'sampleimg',\n 'id': 'XYZ',\n 'name': 'Sample1',\n- 'isPublic': true,\n+ 'userRegistrationRequired': false,\n 'creator': {'firstName': 'Shivam', 'lastName': 'Gupta'},\n });\n \n@@ -145,7 +145,7 @@ void main() async {\n 'id': 'XYZ',\n 'image': 'sampleimg',\n 'name': 'Sample1',\n- 'isPublic': true,\n+ 'userRegistrationRequired': false,\n 'creator': {'firstName': 'Shivam', 'lastName': 'Gupta'},\n },\n ],\n@@ -159,7 +159,7 @@ void main() async {\n expect(org.id, testOrg.id);\n expect(org.name, testOrg.name);\n expect(org.image, testOrg.image);\n- expect(org.isPublic, testOrg.isPublic);\n+ expect(org.userRegistrationRequired, testOrg.userRegistrationRequired);\n expect(org.creatorInfo!.firstName, testOrg.creatorInfo!.firstName);\n });\n \n@@ -374,7 +374,7 @@ void main() async {\n 'id': 'XYZ',\n 'image': 'sampleimg',\n 'name': 'Sample1',\n- 'isPublic': true,\n+ 'userRegistrationRequired': false,\n 'creator': {'firstName': 'Shivam', 'lastName': 'Gupta'},\n },\n ],\n@@ -391,7 +391,7 @@ void main() async {\n expect(org.id, testOrg.id);\n expect(org.name, testOrg.name);\n expect(org.image, testOrg.image);\n- expect(org.isPublic, testOrg.isPublic);\n+ expect(org.userRegistrationRequired, testOrg.userRegistrationRequired);\n expect(org.creatorInfo!.firstName, testOrg.creatorInfo!.firstName);\n });\n \n@@ -501,7 +501,7 @@ void main() async {\n 'id': 'XYZ',\n 'image': 'sampleimg',\n 'name': 'Sample1',\n- 'isPublic': true,\n+ 'userRegistrationRequired': false,\n 'creator': {'firstName': 'Shivam', 'lastName': 'Gupta'},\n },\n ],\n@@ -518,7 +518,7 @@ void main() async {\n expect(org.id, testOrg.id);\n expect(org.name, testOrg.name);\n expect(org.image, testOrg.image);\n- expect(org.isPublic, testOrg.isPublic);\n+ expect(org.userRegistrationRequired, testOrg.userRegistrationRequired);\n expect(org.creatorInfo!.firstName, testOrg.creatorInfo!.firstName);\n });\n \n@@ -629,7 +629,7 @@ void main() async {\n 'id': 'XYZ',\n 'image': 'sampleimg',\n 'name': 'Sample1',\n- 'isPublic': true,\n+ 'userRegistrationRequired': false,\n 'creator': {'firstName': 'Shivam', 'lastName': 'Gupta'},\n },\n ],\n@@ -646,7 +646,7 @@ void main() async {\n expect(org.id, testOrg.id);\n expect(org.name, testOrg.name);\n expect(org.image, testOrg.image);\n- expect(org.isPublic, testOrg.isPublic);\n+ expect(org.userRegistrationRequired, testOrg.userRegistrationRequired);\n expect(org.creatorInfo!.firstName, testOrg.creatorInfo!.firstName);\n });\n \n@@ -664,7 +664,7 @@ void main() async {\n 'id': 'XYZ',\n 'image': 'sampleimg',\n 'name': 'Sample1',\n- 'isPublic': true,\n+ 'userRegistrationRequired': false,\n 'creator': {'firstName': 'Shivam', 'lastName': 'Gupta'},\n },\n ],\n@@ -681,7 +681,7 @@ void main() async {\n expect(org.id, testOrg.id);\n expect(org.name, testOrg.name);\n expect(org.image, testOrg.image);\n- expect(org.isPublic, testOrg.isPublic);\n+ expect(org.userRegistrationRequired, testOrg.userRegistrationRequired);\n expect(org.creatorInfo!.firstName, testOrg.creatorInfo!.firstName);\n });\n \ndiff --git a/test/service_tests/org_service_test.dart b/test/service_tests/org_service_test.dart\nindex bb0b1a0cce..736e6cd77b 100644\n--- a/test/service_tests/org_service_test.dart\n+++ b/test/service_tests/org_service_test.dart\n@@ -31,7 +31,7 @@ void main() {\n _id\n }\n description\n- isPublic\n+ userRegistrationRequired\n creator{\n _id\n firstName\ndiff --git a/test/view_model_tests/access_request_view_model_test.dart b/test/view_model_tests/access_request_view_model_test.dart\nindex bd0352028e..e6a63d6a5f 100644\n--- a/test/view_model_tests/access_request_view_model_test.dart\n+++ b/test/view_model_tests/access_request_view_model_test.dart\n@@ -53,7 +53,7 @@ void main() {\n 'name': 'Organization Name',\n 'image': null,\n 'description': null,\n- 'isPublic': false,\n+ 'userRegistrationRequired': true,\n 'creator': {\n 'firstName': 'ravidi',\n 'lastName': 'shaikh',\n@@ -106,7 +106,7 @@ void main() {\n 'name': 'Organization Name',\n 'image': null,\n 'description': null,\n- 'isPublic': false,\n+ 'userRegistrationRequired': true,\n 'creator': {\n 'firstName': 'ravidi',\n 'lastName': 'shaikh',\ndiff --git a/test/view_model_tests/custom_drawer_view_model_test.dart b/test/view_model_tests/custom_drawer_view_model_test.dart\nindex ee24e31fff..3d5f92550e 100644\n--- a/test/view_model_tests/custom_drawer_view_model_test.dart\n+++ b/test/view_model_tests/custom_drawer_view_model_test.dart\n@@ -166,7 +166,7 @@ void main() {\n final OrgInfo fakeOrg = OrgInfo(\n id: '5',\n name: 'fake org 1',\n- isPublic: false,\n+ userRegistrationRequired: true,\n creatorInfo: User(firstName: 'fake', lastName: 'user'),\n );\n //check if the mocked org is present or not\ndiff --git a/test/view_model_tests/pre_auth_view_models/login_view_model_test.dart b/test/view_model_tests/pre_auth_view_models/login_view_model_test.dart\nindex f2b7be22f9..b9f1c737e1 100644\n--- a/test/view_model_tests/pre_auth_view_models/login_view_model_test.dart\n+++ b/test/view_model_tests/pre_auth_view_models/login_view_model_test.dart\n@@ -162,7 +162,7 @@ class MockUserConfig extends Mock implements UserConfig {\n OrgInfo(\n id: '3',\n name: 'test org 3',\n- isPublic: true,\n+ userRegistrationRequired: false,\n creatorInfo: User(firstName: 'test', lastName: '1'),\n ),\n ],\ndiff --git a/test/view_model_tests/pre_auth_view_models/select_organization_view_model_test.dart b/test/view_model_tests/pre_auth_view_models/select_organization_view_model_test.dart\nindex 7d6770aace..ed8223f16e 100644\n--- a/test/view_model_tests/pre_auth_view_models/select_organization_view_model_test.dart\n+++ b/test/view_model_tests/pre_auth_view_models/select_organization_view_model_test.dart\n@@ -79,7 +79,7 @@ void main() {\n org = OrgInfo(\n id: '3',\n name: 'test org 3',\n- isPublic: true,\n+ userRegistrationRequired: false,\n creatorInfo: User(firstName: 'test', lastName: '1'),\n );\n locator.registerSingleton(Queries());\n@@ -272,7 +272,8 @@ void main() {\n \n expect(selectOrganizationViewModel.selectedOrganization, org);\n });\n- testWidgets('Test for successful selectOrg function when org is private',\n+ testWidgets(\n+ 'Test for successful selectOrg function when org requires userRegistration',\n (WidgetTester tester) async {\n locator.registerSingleton(_MockUserConfig());\n final selectOrganizationViewModel = SelectOrganizationViewModel();\n@@ -282,7 +283,7 @@ void main() {\n qrKey: selectOrganizationViewModel.qrKey,\n ),\n );\n- org.isPublic = false;\n+ org.userRegistrationRequired = true;\n selectOrganizationViewModel.selectedOrganization = org;\n \n when(databaseFunctions.gqlAuthMutation(queries.joinOrgById(org.id!)))\n@@ -537,7 +538,7 @@ void main() {\n });\n \n /// we no longer have the tap button to join a org\n- // testWidgets('Test for successful onTapJoin function when isPublic is false',\n+ // testWidgets('Test for successful onTapJoin function when userRegistrationRequired is false',\n // (WidgetTester tester) async {\n // locator.registerSingleton(_MockUserConfig());\n // final selectOrganizationViewModel = SelectOrganizationViewModel();\n@@ -548,7 +549,7 @@ void main() {\n // ),\n // );\n //\n- // org.isPublic = false;\n+ // org.userRegistrationRequired = false;\n // selectOrganizationViewModel.selectedOrganization = org;\n // _user = User(joinedOrganizations: []);\n //\n@@ -583,7 +584,7 @@ void main() {\n // );\n // });\n // testWidgets(\n- // 'Test for successful onTapJoin function when isPublic is false and joined orgnazation is not empty',\n+ // 'Test for successful onTapJoin function when userRegistrationRequired is false and joined orgnazation is not empty',\n // (WidgetTester tester) async {\n // locator.registerSingleton(_MockUserConfig());\n // final selectOrganizationViewModel = SelectOrganizationViewModel();\n@@ -594,7 +595,7 @@ void main() {\n // ),\n // );\n //\n- // org.isPublic = false;\n+ // org.userRegistrationRequired = false;\n // selectOrganizationViewModel.selectedOrganization = org;\n // _user = User(joinedOrganizations: [org]);\n //\n@@ -630,7 +631,7 @@ void main() {\n // );\n // });\n // testWidgets(\n- // 'Test for successful onTapJoin function when isPublic is false and result is null',\n+ // 'Test for successful onTapJoin function when userRegistrationRequired is false and result is null',\n // (WidgetTester tester) async {\n // locator.registerSingleton(_MockUserConfig());\n // final selectOrganizationViewModel = SelectOrganizationViewModel();\n@@ -641,7 +642,7 @@ void main() {\n // ),\n // );\n //\n- // org.isPublic = false;\n+ // org.userRegistrationRequired = false;\n // selectOrganizationViewModel.selectedOrganization = org;\n //\n // when(\n@@ -672,7 +673,7 @@ void main() {\n // );\n // });\n testWidgets(\n- 'Test for successful onTapJoin function when isPublic is true and throws exception',\n+ 'Test for successful onTapJoin function when userRegistrationRequired is false and throws exception',\n (WidgetTester tester) async {\n locator.registerSingleton(_MockUserConfig());\n final selectOrganizationViewModel = SelectOrganizationViewModel();\n@@ -699,7 +700,7 @@ void main() {\n verify(databaseFunctions.gqlAuthMutation(queries.joinOrgById(org.id!)));\n });\n // testWidgets(\n- // 'Test for successful onTapJoin function when isPublic is false and throws exception',\n+ // 'Test for successful onTapJoin function when userRegistrationRequired is false and throws exception',\n // (WidgetTester tester) async {\n // locator.registerSingleton(_MockUserConfig());\n // final selectOrganizationViewModel = SelectOrganizationViewModel();\n@@ -709,7 +710,7 @@ void main() {\n // qrKey: selectOrganizationViewModel.qrKey,\n // ),\n // );\n- // org.isPublic = false;\n+ // org.userRegistrationRequired = false;\n //\n // selectOrganizationViewModel.selectedOrganization = org;\n //\ndiff --git a/test/view_model_tests/pre_auth_view_models/signup_details_view_model_test.dart b/test/view_model_tests/pre_auth_view_models/signup_details_view_model_test.dart\nindex f41bd73534..cfd954522b 100644\n--- a/test/view_model_tests/pre_auth_view_models/signup_details_view_model_test.dart\n+++ b/test/view_model_tests/pre_auth_view_models/signup_details_view_model_test.dart\n@@ -18,7 +18,7 @@ import '../../helpers/test_helpers.dart';\n \n bool empty = true;\n bool userSaved = true;\n-bool isPublic = true;\n+bool userRegistrationRequired = false;\n final data = {\n 'signUp': {\n 'user': {\n@@ -51,7 +51,7 @@ class SignUpMock extends StatelessWidget {\n OrgInfo get org => OrgInfo(\n id: '3',\n name: 'test org 3',\n- isPublic: isPublic,\n+ userRegistrationRequired: userRegistrationRequired,\n creatorInfo: User(firstName: 'test', lastName: '1'),\n );\n \n@@ -62,7 +62,7 @@ void main() {\n await locator.unregister();\n userSaved = true;\n empty = true;\n- isPublic = true;\n+ userRegistrationRequired = false;\n });\n tearDown(() async {\n await locator.unregister();\n@@ -286,9 +286,9 @@ void main() {\n );\n });\n testWidgets(\n- 'Check if signup() is working fine when selected organization is not public',\n+ 'Check if signup() is working fine when selected organization requires userRegistration',\n (tester) async {\n- isPublic = false;\n+ userRegistrationRequired = true;\n locator.registerSingleton(MockUserConfig());\n \n final model = SignupDetailsViewModel();\n@@ -465,7 +465,7 @@ void main() {\n testWidgets(\n 'Check if signup() is working fine when process of send membership request throws exception',\n (tester) async {\n- isPublic = false;\n+ userRegistrationRequired = true;\n locator.registerSingleton(MockUserConfig());\n \n final model = SignupDetailsViewModel();\ndiff --git a/test/views/after_auth_screens/join_org_after_auth_test/join_organisation_after_auth_test.dart b/test/views/after_auth_screens/join_org_after_auth_test/join_organisation_after_auth_test.dart\nindex aeb9075374..448d301d86 100644\n--- a/test/views/after_auth_screens/join_org_after_auth_test/join_organisation_after_auth_test.dart\n+++ b/test/views/after_auth_screens/join_org_after_auth_test/join_organisation_after_auth_test.dart\n@@ -236,7 +236,7 @@ void main() {\n firstName: \"ravidi\",\n lastName: \"shaikh\",\n ),\n- isPublic: false,\n+ userRegistrationRequired: true,\n );\n final orgTwo = OrgInfo(\n name: \"org_two\",\n@@ -244,7 +244,7 @@ void main() {\n firstName: \"ravidi\",\n lastName: \"shaikh\",\n ),\n- isPublic: false,\n+ userRegistrationRequired: true,\n );\n \n final selectOrgInfoVM = locator.get();\ndiff --git a/test/widget_tests/after_auth_screens/feed/organization_feed_test.dart b/test/widget_tests/after_auth_screens/feed/organization_feed_test.dart\nindex bc08c8142b..61b92337c6 100644\n--- a/test/widget_tests/after_auth_screens/feed/organization_feed_test.dart\n+++ b/test/widget_tests/after_auth_screens/feed/organization_feed_test.dart\n@@ -55,7 +55,6 @@ Widget createOrganizationFeedScreen({\n // late OrganizationFeedViewModel _organizationFeedViewModel;\n \n Widget createOrganizationFeedScreen2({\n- bool isPublic = true,\n bool viewOnMap = true,\n required MainScreenViewModel homeModel,\n }) {\ndiff --git a/test/widget_tests/after_auth_screens/feed/pinned_post_screen_test.dart b/test/widget_tests/after_auth_screens/feed/pinned_post_screen_test.dart\nindex 3132eac4be..cb47343218 100644\n--- a/test/widget_tests/after_auth_screens/feed/pinned_post_screen_test.dart\n+++ b/test/widget_tests/after_auth_screens/feed/pinned_post_screen_test.dart\n@@ -34,7 +34,7 @@ Widget createApp() {\n final OrgInfo org = OrgInfo(\n id: '2',\n name: 'test org',\n- isPublic: true,\n+ userRegistrationRequired: false,\n creatorInfo: User(firstName: 'test', lastName: 'test'),\n );\n print(org);\ndiff --git a/test/widget_tests/pre_auth_screens/signup_details_test.dart b/test/widget_tests/pre_auth_screens/signup_details_test.dart\nindex 039466814f..6bbdfede4e 100644\n--- a/test/widget_tests/pre_auth_screens/signup_details_test.dart\n+++ b/test/widget_tests/pre_auth_screens/signup_details_test.dart\n@@ -27,7 +27,7 @@ Widget createApp() {\n final OrgInfo org = OrgInfo(\n id: '2',\n name: 'test org',\n- isPublic: true,\n+ userRegistrationRequired: false,\n creatorInfo: User(firstName: 'test', lastName: 'test'),\n );\n \ndiff --git a/test/widget_tests/pre_auth_screens/waiting_page_test.dart b/test/widget_tests/pre_auth_screens/waiting_page_test.dart\nindex 5ec2e8c9b1..2d945e41c2 100644\n--- a/test/widget_tests/pre_auth_screens/waiting_page_test.dart\n+++ b/test/widget_tests/pre_auth_screens/waiting_page_test.dart\n@@ -16,7 +16,7 @@ import 'package:talawa/router.dart' as router;\n import 'package:talawa/services/navigation_service.dart';\n import 'package:talawa/services/size_config.dart';\n import 'package:talawa/utils/app_localization.dart';\n-import 'package:talawa/views/pre_auth_screens/waiting_to_join_private_org.dart';\n+import 'package:talawa/views/pre_auth_screens/waiting_screen.dart';\n import 'package:talawa/widgets/raised_round_edge_button.dart';\n import 'package:talawa/widgets/rich_text.dart';\n \ndiff --git a/test/widget_tests/widgets/custom_list_tile_test.dart b/test/widget_tests/widgets/custom_list_tile_test.dart\nindex a069faf13c..ffb78db782 100644\n--- a/test/widget_tests/widgets/custom_list_tile_test.dart\n+++ b/test/widget_tests/widgets/custom_list_tile_test.dart\n@@ -90,7 +90,7 @@ void main() {\n bool executed = false;\n _orgInfo = OrgInfo(\n name: 'Test Name',\n- isPublic: true,\n+ userRegistrationRequired: false,\n creatorInfo: User(\n firstName: 'Test firstname',\n lastName: 'Test lastname',\n@@ -144,7 +144,7 @@ void main() {\n (WidgetTester tester) async {\n _orgInfo = OrgInfo(\n name: 'Test Name',\n- isPublic: false,\n+ userRegistrationRequired: true,\n creatorInfo: User(\n firstName: 'Test firstname',\n lastName: 'Test lastname',\n@@ -237,7 +237,7 @@ void main() {\n \n // expect(userSizedBoxFallback, findsOneWidget);\n \n- // Testing SizedBox for users fallback for isPublic info\n+ // Testing SizedBox for users fallback for userRegistrationRequired info\n // final userSizedBoxFallback1 = find\n // .descendant(\n // of: find.byType(Expanded).at(1),\n", "n2p_tests": "{\"/home/talawa/test/model_tests/user/user_info_test.dart: Tests for UserInfo.dart Check if print method works\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/user/user_info_test.dart: Tests for UserInfo.dart Check if UserInfo.fromJson works with fromOrg\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/organization/org_info_test.dart: Test OrgInfo model Test fromJson function with memberRequest false\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/organization/org_info_test.dart: Test OrgInfo model Test fromJsonToList\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/user/user_info_test.dart: Tests for UserInfo.dart Test ==\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/organization/org_info_test.dart: Test OrgInfo model Test fromJsonToList with nested structures\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/user/user_info_test.dart: Tests for UserInfo.dart Test hashCode\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/organization/org_info_test.dart: Test OrgInfo model Test fromJson function with memberRequest true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/user/user_info_test.dart: Tests for UserInfo.dart Check if the method updateMemberRequestOrg works\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/user/user_info_test.dart: Tests for UserInfo.dart Check if the method updateJoinedOrg works\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/user/user_info_test.dart: Tests for UserInfo.dart Check if the method updateAdminFor works\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/user/user_info_test.dart: Tests for UserInfo.dart Check if the method \\\"update\\\" works\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/user/user_info_test.dart: Tests for UserInfo.dart Check if the method updateCreatedOrg works\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/user/user_info_test.dart: Tests for UserInfo.dart Check if Hive storage works\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/talawa/test/model_tests/user/user_info_test.dart: Tests for UserInfo.dart Check if UserInfo.fromJson works without fromOrg\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "PalisadoesFoundation__talawa-2308", "org": "PalisadoesFoundation", "repo": "talawa", "number": 2308, "state": "closed", "title": "fixed fetch events bug", "body": "\r\n\r\n\r\n\r\n**What kind of change does this PR introduce?**\r\n\r\nThis PR fixes the event fetching bug in explore events page.\r\n\r\n**Issue Number:**\r\n\r\nFixes #2307 \r\n\r\n**Did you add tests for your changes?**\r\n\r\n\r\n\r\n**Snapshots/Videos:**\r\n\r\n![Screenshot_20240106-041619](https://github.com/PalisadoesFoundation/talawa/assets/120930148/2d2e4614-a5b2-45d2-91c9-253685bdf3e6)\r\n\r\n\r\n**If relevant, did you update the documentation?**\r\n\r\n\r\n\r\n**Summary**\r\n\r\nRemoved a field name `registrants` from the query which is not actually defined for the Collection `Event` in the `database`.\r\n\r\n**Does this PR introduce a breaking change?**\r\n\r\nNo\r\n\r\n**Other information**\r\n\r\n\r\n\r\n**Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa/blob/master/CONTRIBUTING.md)?**\r\nYes", "base": "{\"label\": \"PalisadoesFoundation:develop\", \"ref\": \"develop\", \"sha\": \"6d95344d7c4ecc07faa83683ded189cf547d2e3b\"}", "resolved_issues": "[{\"number\": 2307, \"title\": \"Explore Events page is failing to fetch Events.\", \"body\": \"**Describe the bug**\\r\\n**Explore Events page not working properly.**\\r\\nThe `Explore Events page` fails to retrieve events from the server, consistently displaying an `empty list message` on the screen despite the` existence of events` in the database.\\r\\n\\r\\n**To Reproduce**\\r\\nSteps to reproduce the behavior:\\r\\n\\r\\n1. Navigate to Explore Events page.\\r\\n2. Refresh the page / Create an event.\\r\\n\\r\\n**Expected behavior**\\r\\nThe `created events` / `existing events from database` should be shown on screen in a vertical scrolling fashion.\\r\\n\\r\\n**Actual behavior**\\r\\n`empty list` message is being shown always, despite the events present in the database.\\r\\n\\r\\n**Screenshots**\\r\\n**Actual**\\r\\n![Screenshot_20240106-041638](https://github.com/PalisadoesFoundation/talawa/assets/120930148/cbae99e2-06de-401f-96e5-1d98c914645f)\\r\\n\\r\\n**Expected**\\r\\n![Screenshot_20240106-041619](https://github.com/PalisadoesFoundation/talawa/assets/120930148/555a838c-c0ea-41a2-9518-33b8af78647b)\\r\\n\\r\\n**Additional details**\\r\\n1. The Details of the Event are also not properly being fetched into the `EventCard` and `Event Page`.\\r\\n\\r\\n**Potential internship candidates**\\r\\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\\r\\n\"}]", "lang": "dart", "problem_statement": "Explore Events page is failing to fetch Events.\n**Describe the bug**\r\n**Explore Events page not working properly.**\r\nThe `Explore Events page` fails to retrieve events from the server, consistently displaying an `empty list message` on the screen despite the` existence of events` in the database.\r\n\r\n**To Reproduce**\r\nSteps to reproduce the behavior:\r\n\r\n1. Navigate to Explore Events page.\r\n2. Refresh the page / Create an event.\r\n\r\n**Expected behavior**\r\nThe `created events` / `existing events from database` should be shown on screen in a vertical scrolling fashion.\r\n\r\n**Actual behavior**\r\n`empty list` message is being shown always, despite the events present in the database.\r\n\r\n**Screenshots**\r\n**Actual**\r\n![Screenshot_20240106-041638](https://github.com/PalisadoesFoundation/talawa/assets/120930148/cbae99e2-06de-401f-96e5-1d98c914645f)\r\n\r\n**Expected**\r\n![Screenshot_20240106-041619](https://github.com/PalisadoesFoundation/talawa/assets/120930148/555a838c-c0ea-41a2-9518-33b8af78647b)\r\n\r\n**Additional details**\r\n1. The Details of the Event are also not properly being fetched into the `EventCard` and `Event Page`.\r\n\r\n**Potential internship candidates**\r\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\r\n\n", "hints": "@noman2002 @Cioppolo14 @Kevoniat please assign me this issue, I would like to work on this.\nhttps://github.com/PalisadoesFoundation/talawa/issues/2195\r\n\r\nThis issue already exists and someone is working on it, the reason why events are not getting fetched because of same problem why you cannot create an event which is related to firebase. Right when app initialise if you check debug console you could see graphql exception related to this.\n@Dante291 Please understand This issue is different from the issue you have mentioned.\n1. The issue you have mentioned solely focuses on Failure of creating a new event.\n2. This issue focuses on failure of fetching the events existing in the database. \n3. Try creating an Event through admin panel and then try to find it in explore events page. It's not possible to see the created event in the explore events page\nBut it's visible in admin panel.\n@Azad99-9 This is the exception you get when you try to make a new event \r\n\r\n![image](https://github.com/PalisadoesFoundation/talawa/assets/103507835/d8c5b9dd-b8e7-4fb2-9690-b6aa97925f99)\r\n\r\nand this is the exception when you fetch events \r\n\r\n![image](https://github.com/PalisadoesFoundation/talawa/assets/103507835/72612d25-4658-4cfc-818f-0688e6f8dee1)\r\n\r\nwhich are basically same, this exception is occurring due to some error related to firebase. \r\n\r\nYou could work on this though, this will resolve both issues ig.\r\n\r\n\n> @Dante291 Please understand This issue is different from the issue you have mentioned.\r\n> \r\n> 1. The issue you have mentioned solely focuses on Failure of creating a new event.\r\n> 2. This issue focuses on failure of fetching the events existing in the database.\r\n> 3. Try creating an Event through admin panel and then try to find it in explore events page. It's not possible to see the created event in the explore events page\r\n> But it's visible in admin panel.\r\n\r\nYeah, event is getting created successfully but the main problem is with fetching ig so basically https://github.com/PalisadoesFoundation/talawa/issues/2195 this issue should be about fetching of events is giving exception due to firebase?? maybe this exception is occurring because we are using same query to fetch events just after making a new event (which is created successfully). \n> @Dante291 I am working with @Abhisheksainii on this.\r\n\r\nI figured out the root cause of the problem by some lil debugging \r\n\r\n![Screenshot 2024-01-06 130842](https://github.com/PalisadoesFoundation/talawa/assets/103507835/21d03654-33fc-4226-b9e7-b63178e31191)\r\n\r\n![Screenshot 2024-01-06 130820](https://github.com/PalisadoesFoundation/talawa/assets/103507835/52c4a2ca-a791-4bb2-a930-9ae7d6c3e4da)\r\n\r\n\r\nI think the problem is with fetchOrgEvents query (it is stated as mutation, it should be query not mutation) which may be related to backend side ig.\n@Dante291 nice work bro. This will surely help the backend developer to resolve the issue\n> @Dante291 nice work bro. This will surely help the backend developer to resolve the issue\r\n\r\nNo ig the issue is with fetchOrgEvents query only because in admin portal events are getting fetched successfully, so it might not be a problem related to backend but with the query only, you guys could further work on this to find the main cause and if its the query do update it and ig that will fix the problem.\n@Dante291 Yes you are right I solved an issue earlier in which comments were not visible, initially I thought it was backend issue but then I realized I was able to fetch the comments by just modifying the query. Events can be fetched in a similar way.", "pull_url": "https://github.com/PalisadoesFoundation/talawa/pull/2308", "issue_urls": "[\"https://github.com/PalisadoesFoundation/talawa/issues/2307\"]", "test_command": NaN, "fix_patch": "diff --git a/lib/utils/event_queries.dart b/lib/utils/event_queries.dart\nindex 23b06458b5..14c9e82e52 100644\n--- a/lib/utils/event_queries.dart\n+++ b/lib/utils/event_queries.dart\n@@ -1,9 +1,15 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n ///This class creates queries related to the events.\n class EventQueries {\n- //Returns a query to fetch an organization's events\n+ /// Fetches events by organization ID.\n+ ///\n+ /// **params**:\n+ /// * `orgId`: The ID of the organization to fetch events for.\n+ ///\n+ /// **returns**:\n+ /// * `String`: Returns a GraphQL query string to fetch events associated with the specified organization ID.\n+ ///\n+ /// This function generates a GraphQL query string to retrieve events\n+ /// based on the provided organization ID.\n String fetchOrgEvents(String orgId) {\n return \"\"\"\n query {\n@@ -34,17 +40,21 @@ class EventQueries {\n firstName\n lastName\n }\n- registrants {\n- user {\n- _id\n- }\n- }\n }\n }\n \"\"\";\n }\n \n- //returns a query to get the registrants of a particular event.\n+ /// Fetches registrants by event ID.\n+ ///\n+ /// **params**:\n+ /// * `eventId`: The ID of the event to fetch registrants for.\n+ ///\n+ /// **returns**:\n+ /// * `String`: Returns a GraphQL query string to retrieve registrants associated with the specified event ID.\n+ ///\n+ /// This function generates a GraphQL query string to fetch registrants\n+ /// based on the provided event ID.\n String registrantsByEvent(String eventId) {\n return '''\n query {\n@@ -58,7 +68,15 @@ class EventQueries {\n ''';\n }\n \n- //returns a query to add an event.\n+ /// Creates a GraphQL mutation for adding an event.\n+ ///\n+ /// **params**:\n+ /// None\n+ ///\n+ /// **returns**:\n+ /// * `String`: Returns a GraphQL mutation string to create an event.\n+ ///\n+ /// This function generates a GraphQL mutation string for creating an event.\n String addEvent() {\n return \"\"\"\n mutation createEvent( \\$organizationId: ID!,\n@@ -98,7 +116,15 @@ class EventQueries {\n \"\"\";\n }\n \n- //returns a query to register for an event\n+ /// Creates a GraphQL mutation for registering for an event.\n+ ///\n+ /// **params**:\n+ /// None\n+ ///\n+ /// **returns**:\n+ /// * `String`: Returns a GraphQL mutation string to register for the specified event.\n+ ///\n+ /// This function generates a GraphQL mutation string for registering an individual for an event.\n String registerForEvent() {\n return \"\"\"\n mutation registerForEvent(\\$eventId: ID!) { \n@@ -112,7 +138,16 @@ class EventQueries {\n \"\"\";\n }\n \n- //returns a query to delete an event\n+ /// Creates a GraphQL mutation for deleting an event.\n+ ///\n+ /// **params**:\n+ /// * `id`: The ID of the event to delete.\n+ ///\n+ /// **returns**:\n+ /// * `String`: Returns a GraphQL mutation string to delete the specified event.\n+ ///\n+ /// This function generates a GraphQL mutation string for removing/deleting an event\n+ /// based on the provided event ID.\n String deleteEvent(String id) {\n return \"\"\"\n mutation {\n@@ -125,7 +160,19 @@ class EventQueries {\n \"\"\";\n }\n \n- //returns a query to update an event\n+ /// Creates a GraphQL mutation for updating an event.\n+ ///\n+ /// **params**:\n+ /// * `eventId`: The ID of the event to update.\n+ ///\n+ /// **returns**:\n+ /// * `String`: Returns a GraphQL mutation string to update the specified event.\n+ ///\n+ /// This function generates a GraphQL mutation string for updating an event\n+ /// based on the provided parameters. It takes the event ID along with updated\n+ /// details.\n+ /// The mutation updates the event details and returns the ID, title, and description\n+ /// of the updated event.\n String updateEvent({\n eventId,\n }) {\n", "test_patch": "diff --git a/test/utils/event_queries_test.dart b/test/utils/event_queries_test.dart\nindex a3d03a86f4..cb9fe23fe9 100644\n--- a/test/utils/event_queries_test.dart\n+++ b/test/utils/event_queries_test.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'package:flutter_test/flutter_test.dart';\n import 'package:talawa/utils/event_queries.dart';\n \n@@ -36,11 +33,6 @@ void main() {\n firstName\n lastName\n }\n- registrants {\n- user {\n- _id\n- }\n- }\n }\n }\n \"\"\";\n", "n2p_tests": "{}", "f2p_tests": "{\"Tests for event_queries.dart Check if fetchOrgEvents works correctly\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"Tests for event_queries.dart Check if registerForEvent works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Tests for event_queries.dart Check if registrantsByEvents works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Tests for event_queries.dart Check if addEvent works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Tests for event_queries.dart Check if updateEvent works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Tests for event_queries.dart Check if deleteEvent works correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "PalisadoesFoundation__talawa-2230", "org": "PalisadoesFoundation", "repo": "talawa", "number": 2230, "state": "closed", "title": "Navigation Services Test Written", "body": "\r\n\r\n\r\n\r\n**What kind of change does this PR introduce?**\r\n1) Unit tests written for Navigation Services\r\n2) Code coverage went from 67% to 100%\r\n3) Minor bug fix, `duration` parameter was not being used in `showTalawaErrorSnackBar` method, hence it's duration was always 4 seconds instead of 2 seconds\r\n\r\n\r\n\r\n**Issue Number:**\r\n\r\nFixes #2158\r\n\r\n**Did you add tests for your changes?** Yes\r\n\r\n\r\n\r\n**Snapshots/Videos:**\r\n\r\n\r\n\r\n**If relevant, did you update the documentation?**\r\n\r\n\r\n\r\n**Summary**\r\n\r\n\r\n\r\n\r\n**Does this PR introduce a breaking change?**\r\n\r\n\r\n\r\n**Other information**\r\n\r\n\r\n\r\n**Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa/blob/master/CONTRIBUTING.md)?**\r\nYes\r\n\r\n", "base": "{\"label\": \"PalisadoesFoundation:develop\", \"ref\": \"develop\", \"sha\": \"82039eeb22fad52c3a48f4fd9a3af3594c78c992\"}", "resolved_issues": "[{\"number\": 2158, \"title\": \"Write tests for service navigation_service.dart\", \"body\": \"The Talawa code base needs to be 100% reliable. This means we need to have 100% unittest code coverage.\\r\\n\\r\\nWe will need unittests done for all methods, classes and functions found in this file.\\r\\n\\r\\nAny widgets referenced in this file must also have unittests done\\r\\n\\r\\n\\r\\n```\\r\\nlib/services/navigation_service.dart\\r\\n```\\r\\n\\r\\nThe current code coverage for this file can be found here:\\r\\n- https://app.codecov.io/gh/PalisadoesFoundation/talawa?displayType=list\\r\\n\"}]", "lang": "dart", "problem_statement": "Write tests for service navigation_service.dart\nThe Talawa code base needs to be 100% reliable. This means we need to have 100% unittest code coverage.\r\n\r\nWe will need unittests done for all methods, classes and functions found in this file.\r\n\r\nAny widgets referenced in this file must also have unittests done\r\n\r\n\r\n```\r\nlib/services/navigation_service.dart\r\n```\r\n\r\nThe current code coverage for this file can be found here:\r\n- https://app.codecov.io/gh/PalisadoesFoundation/talawa?displayType=list\r\n\n", "hints": "This issue did not get any activity in the past 10 days and will be closed in 180 days if no update occurs. Please check if the develop branch has fixed it and report again or close the issue.\n@palisadoes @noman2002 \r\nCan you assign this issue to me\n@Manik2708 Assigned to you, please consider adding a profile picture. It helps us to remember people who are consistently working. ", "pull_url": "https://github.com/PalisadoesFoundation/talawa/pull/2230", "issue_urls": "[\"https://github.com/PalisadoesFoundation/talawa/issues/2158\"]", "test_command": NaN, "fix_patch": "diff --git a/lib/services/navigation_service.dart b/lib/services/navigation_service.dart\nindex cc177b8d0a..508da99bd9 100644\n--- a/lib/services/navigation_service.dart\n+++ b/lib/services/navigation_service.dart\n@@ -131,6 +131,7 @@ class NavigationService {\n errorMessage: errorMessage,\n ),\n backgroundColor: const Color.fromRGBO(65, 65, 66, 1),\n+ duration: duration,\n ),\n );\n }\n", "test_patch": "diff --git a/test/service_tests/navigation_service_test.dart b/test/service_tests/navigation_service_test.dart\nnew file mode 100644\nindex 0000000000..13a90a35dd\n--- /dev/null\n+++ b/test/service_tests/navigation_service_test.dart\n@@ -0,0 +1,563 @@\n+import 'package:flutter/material.dart';\n+import 'package:flutter_localizations/flutter_localizations.dart';\n+import 'package:flutter_test/flutter_test.dart';\n+import 'package:talawa/enums/enums.dart';\n+import 'package:talawa/services/navigation_service.dart';\n+import 'package:talawa/services/size_config.dart';\n+import 'package:talawa/utils/app_localization.dart';\n+import 'package:talawa/widgets/talawa_error_dialog.dart';\n+import 'package:talawa/widgets/talawa_error_snackbar.dart';\n+\n+// This methods tries to cover all the cases which can be there in future!\n+Route _onGenerateTestRoute(RouteSettings settings) {\n+ if (settings.name == '/second-screen') {\n+ if (settings.arguments == null) {\n+ return MaterialPageRoute(builder: (context) => const SecondTestScreen());\n+ } else {\n+ if (settings.arguments is String) {\n+ return MaterialPageRoute(\n+ builder: (context) => SecondTestScreen(\n+ arguments: settings.arguments! as String,\n+ ),\n+ );\n+ } else if (settings.arguments is Function) {\n+ return MaterialPageRoute(\n+ builder: (context) => SecondTestScreen(\n+ onclick: settings.arguments! as VoidCallback,\n+ ),\n+ );\n+ } else if (settings.arguments is Map) {\n+ final map = settings.arguments! as Map;\n+ return MaterialPageRoute(\n+ builder: (context) => SecondTestScreen(\n+ arguments: map['Argument'] as String,\n+ onclick: map['Function'] as VoidCallback,\n+ ),\n+ );\n+ }\n+ }\n+ }\n+ if (settings.name == '/first-screen') {\n+ if (settings.arguments == null) {\n+ return MaterialPageRoute(\n+ builder: (context) => FirstTestScreen(\n+ onClick: () {},\n+ ),\n+ );\n+ } else {\n+ return MaterialPageRoute(\n+ builder: (context) => FirstTestScreen(\n+ onClick: () {},\n+ arguments: settings.arguments! as String,\n+ ),\n+ );\n+ }\n+ }\n+ if (settings.name == '/third-screen') {\n+ if (settings.arguments == null) {\n+ return MaterialPageRoute(builder: (context) => const ThirdTestScreen());\n+ } else {\n+ return MaterialPageRoute(\n+ builder: (context) => ThirdTestScreen(\n+ arguments: settings.arguments! as String,\n+ ),\n+ );\n+ }\n+ }\n+ return MaterialPageRoute(\n+ builder: (context) => FirstTestScreen(\n+ onClick: () {},\n+ ),\n+ );\n+}\n+\n+class HomeApp extends StatefulWidget {\n+ const HomeApp({\n+ super.key,\n+ required this.onClick,\n+ required this.navigateorKey,\n+ });\n+ final GlobalKey navigateorKey;\n+ final VoidCallback onClick;\n+\n+ @override\n+ State createState() => _HomeAppState();\n+}\n+\n+class _HomeAppState extends State {\n+ @override\n+ Widget build(BuildContext context) {\n+ return MaterialApp(\n+ navigatorKey: widget.navigateorKey,\n+ initialRoute: '/',\n+ onGenerateRoute: _onGenerateTestRoute,\n+ home: FirstTestScreen(\n+ onClick: () {\n+ widget.onClick();\n+ },\n+ ),\n+ );\n+ }\n+}\n+\n+class FirstTestScreen extends StatefulWidget {\n+ const FirstTestScreen({super.key, required this.onClick, this.arguments});\n+ final VoidCallback onClick;\n+ final String? arguments;\n+\n+ @override\n+ State createState() => _FirstScrenState();\n+}\n+\n+class _FirstScrenState extends State {\n+ @override\n+ Widget build(BuildContext context) {\n+ return Scaffold(\n+ body: Column(\n+ children: [\n+ Center(\n+ child: ElevatedButton(\n+ child: const Text('Button'),\n+ onPressed: () {\n+ widget.onClick();\n+ },\n+ ),\n+ ),\n+ const Text('First Screen'),\n+ Center(\n+ child: Text(widget.arguments == null ? 'null' : widget.arguments!),\n+ ),\n+ ],\n+ ),\n+ );\n+ }\n+}\n+\n+class SecondTestScreen extends StatefulWidget {\n+ const SecondTestScreen({super.key, this.arguments, this.onclick});\n+ final String? arguments;\n+ final VoidCallback? onclick;\n+\n+ @override\n+ State createState() => _SecondTestScreenState();\n+}\n+\n+class _SecondTestScreenState extends State {\n+ @override\n+ Widget build(BuildContext context) {\n+ return Scaffold(\n+ body: Column(\n+ children: [\n+ const Center(child: Text('Second Screen')),\n+ Center(\n+ child: Text(widget.arguments == null ? 'null' : widget.arguments!),\n+ ),\n+ ElevatedButton(\n+ onPressed: () {\n+ if (widget.onclick != null) {\n+ widget.onclick?.call();\n+ }\n+ },\n+ child: const Text('Button 2'),\n+ ),\n+ ],\n+ ),\n+ );\n+ }\n+}\n+\n+class ThirdTestScreen extends StatefulWidget {\n+ const ThirdTestScreen({super.key, this.arguments});\n+ final String? arguments;\n+\n+ @override\n+ State createState() => _ThirdTestScreenState();\n+}\n+\n+class _ThirdTestScreenState extends State {\n+ @override\n+ Widget build(BuildContext context) {\n+ return Scaffold(\n+ body: Column(\n+ children: [\n+ const Text('Third Screen'),\n+ Center(\n+ child: Text(widget.arguments == null ? 'null' : widget.arguments!),\n+ ),\n+ ],\n+ ),\n+ );\n+ }\n+}\n+\n+class TalawaErrorWidget extends StatelessWidget {\n+ const TalawaErrorWidget({\n+ super.key,\n+ required this.navigationService,\n+ required this.onClick,\n+ });\n+ final NavigationService navigationService;\n+ final VoidCallback onClick;\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ return MaterialApp(\n+ navigatorKey: navigationService.navigatorKey,\n+ navigatorObservers: [],\n+ locale: const Locale('en'),\n+ supportedLocales: [\n+ const Locale('en', 'US'),\n+ const Locale('es', 'ES'),\n+ const Locale('fr', 'FR'),\n+ const Locale('hi', 'IN'),\n+ const Locale('zh', 'CN'),\n+ const Locale('de', 'DE'),\n+ const Locale('ja', 'JP'),\n+ const Locale('pt', 'PT'),\n+ ],\n+ localizationsDelegates: [\n+ const AppLocalizationsDelegate(isTest: true),\n+ GlobalMaterialLocalizations.delegate,\n+ GlobalWidgetsLocalizations.delegate,\n+ ],\n+ home: Scaffold(\n+ body: TextButton(\n+ child: const Text('Open'),\n+ onPressed: () {\n+ onClick();\n+ },\n+ ),\n+ ),\n+ );\n+ }\n+}\n+\n+void main() {\n+ SizeConfig().test();\n+ group('Navigation Services Tests', () {\n+ late NavigationService navigationService;\n+ late GlobalKey mockKey;\n+ setUp(() {\n+ navigationService = NavigationService();\n+ mockKey = navigationService.navigatorKey;\n+ });\n+ testWidgets('pushScreen() test without arguments',\n+ (WidgetTester tester) async {\n+ await tester.pumpWidget(\n+ HomeApp(\n+ navigateorKey: mockKey,\n+ onClick: () async {\n+ await navigationService.pushScreen('/second-screen');\n+ },\n+ ),\n+ );\n+ await tester.tap(find.byType(ElevatedButton));\n+ await tester.pumpAndSettle();\n+ expect(find.textContaining('Second Screen'), findsOneWidget);\n+ expect(find.textContaining('null'), findsOneWidget);\n+ });\n+ testWidgets('pushScreen() test with arguments', (tester) async {\n+ await tester.pumpWidget(\n+ HomeApp(\n+ navigateorKey: mockKey,\n+ onClick: () async {\n+ await navigationService.pushScreen(\n+ '/second-screen',\n+ arguments: 'Hello Talawa',\n+ );\n+ },\n+ ),\n+ );\n+ await tester.tap(find.byType(ElevatedButton));\n+ await tester.pumpAndSettle();\n+ expect(find.textContaining('Second Screen'), findsOneWidget);\n+ expect(find.textContaining('Hello Talawa'), findsOneWidget);\n+ });\n+ testWidgets('popAndPushScreen() test without arguments', (tester) async {\n+ await tester.pumpWidget(\n+ HomeApp(\n+ navigateorKey: mockKey,\n+ onClick: () async {\n+ await mockKey.currentState!.pushNamed('/second-screen');\n+ },\n+ ),\n+ );\n+ await tester.tap(find.byType(ElevatedButton));\n+ await tester.pumpAndSettle();\n+ final initialPageLength = mockKey.currentState!.widget.pages.length;\n+ navigationService.popAndPushScreen('/first-screen');\n+ await tester.pumpAndSettle();\n+ final finalPageLength = mockKey.currentState!.widget.pages.length;\n+ expect(find.textContaining('null'), findsOneWidget);\n+ expect(find.textContaining('First Screen'), findsOneWidget);\n+ expect(finalPageLength, initialPageLength);\n+ });\n+ testWidgets('popAndPushScreen() test with arguments', (tester) async {\n+ await tester.pumpWidget(\n+ HomeApp(\n+ navigateorKey: mockKey,\n+ onClick: () async {\n+ await mockKey.currentState!.pushNamed('/second-screen');\n+ },\n+ ),\n+ );\n+ await tester.tap(find.byType(ElevatedButton));\n+ await tester.pumpAndSettle();\n+ final initialPageLength = mockKey.currentState!.widget.pages.length;\n+ navigationService.popAndPushScreen(\n+ '/first-screen',\n+ arguments: 'Hello Talawa',\n+ );\n+ await tester.pumpAndSettle();\n+ final finalPageLength = mockKey.currentState!.widget.pages.length;\n+ expect(find.textContaining('Hello Talawa'), findsOneWidget);\n+ expect(find.textContaining('First Screen'), findsOneWidget);\n+ expect(finalPageLength, initialPageLength);\n+ });\n+ testWidgets('pushReplacementScreen() test without arguments',\n+ (tester) async {\n+ await tester.pumpWidget(\n+ HomeApp(\n+ navigateorKey: mockKey,\n+ onClick: () async {\n+ await mockKey.currentState!.pushNamed(\n+ '/second-screen',\n+ arguments: mockKey.currentState!.pushNamed('/first-screen'),\n+ );\n+ },\n+ ),\n+ );\n+ await tester.tap(find.byType(ElevatedButton));\n+ await tester.pumpAndSettle();\n+ navigationService.pushReplacementScreen('/first-screen');\n+ await tester.pumpAndSettle();\n+ expect(find.textContaining('null'), findsOneWidget);\n+ expect(find.textContaining('First Screen'), findsOneWidget);\n+ });\n+ testWidgets('pushReplacementScreen() test with arguments', (tester) async {\n+ await tester.pumpWidget(\n+ HomeApp(\n+ navigateorKey: mockKey,\n+ onClick: () async {\n+ await mockKey.currentState!.pushNamed(\n+ '/second-screen',\n+ arguments: mockKey.currentState!.pushNamed('/first-screen'),\n+ );\n+ },\n+ ),\n+ );\n+ await tester.tap(find.byType(ElevatedButton));\n+ await tester.pumpAndSettle();\n+ navigationService.pushReplacementScreen(\n+ '/first-screen',\n+ arguments: 'Hello Talawa',\n+ );\n+ await tester.pumpAndSettle();\n+ expect(find.textContaining('Hello Talawa'), findsOneWidget);\n+ expect(find.textContaining('First Screen'), findsOneWidget);\n+ });\n+ testWidgets('removeAllAndPush() test without arguments', (tester) async {\n+ void functionToTest() {\n+ navigationService.removeAllAndPush(\n+ '/third-screen',\n+ '/second-screen',\n+ );\n+ }\n+\n+ await tester.pumpWidget(\n+ HomeApp(\n+ navigateorKey: mockKey,\n+ onClick: () async {\n+ await mockKey.currentState!.pushNamed(\n+ '/second-screen',\n+ arguments: functionToTest,\n+ );\n+ },\n+ ),\n+ );\n+ await tester.tap(find.byType(ElevatedButton));\n+ await tester.pumpAndSettle();\n+ await tester.tap(find.byType(ElevatedButton));\n+ await tester.pumpAndSettle();\n+ expect(find.textContaining('null'), findsOneWidget);\n+ expect(find.textContaining('Third Screen'), findsOneWidget);\n+ expect(mockKey.currentState!.widget.pages.length, 0);\n+ });\n+ testWidgets('removeAllAndPush() test with arguments', (tester) async {\n+ void functionToTest() {\n+ navigationService.removeAllAndPush(\n+ '/third-screen',\n+ '/second-screen',\n+ arguments: 'Hello Talawa',\n+ );\n+ }\n+\n+ await tester.pumpWidget(\n+ HomeApp(\n+ navigateorKey: mockKey,\n+ onClick: () async {\n+ await mockKey.currentState!.pushNamed(\n+ '/second-screen',\n+ arguments: functionToTest,\n+ );\n+ },\n+ ),\n+ );\n+ await tester.tap(find.byType(ElevatedButton));\n+ await tester.pumpAndSettle();\n+ await tester.tap(find.byType(ElevatedButton));\n+ await tester.pumpAndSettle();\n+ expect(find.textContaining('Hello Talawa'), findsOneWidget);\n+ expect(find.textContaining('Third Screen'), findsOneWidget);\n+ expect(mockKey.currentState!.widget.pages.length, 0);\n+ });\n+ testWidgets('pushDialog() test', (tester) async {\n+ Widget testDialog() {\n+ return const AlertDialog(\n+ title: Text('Test Dialog'),\n+ content: Text('This is a test dialog.'),\n+ );\n+ }\n+\n+ void functionForOnClick() {\n+ navigationService.pushDialog(testDialog());\n+ }\n+\n+ await tester.pumpWidget(\n+ HomeApp(navigateorKey: mockKey, onClick: functionForOnClick),\n+ );\n+ await tester.pumpAndSettle();\n+ await tester.tap(find.byType(ElevatedButton));\n+ await tester.pumpAndSettle();\n+ expect(find.byWidget(testDialog()), findsOneWidget);\n+ await tester.tap(find.byType(FirstTestScreen), warnIfMissed: false);\n+ await tester.pumpAndSettle();\n+ expect(find.byWidget(testDialog()), findsOneWidget);\n+ });\n+ testWidgets('showSnackBar() test with default duration', (tester) async {\n+ await tester.pumpWidget(\n+ HomeApp(\n+ navigateorKey: mockKey,\n+ onClick: () {\n+ navigationService.showSnackBar('Hello Talawa');\n+ },\n+ ),\n+ );\n+ await tester.pumpAndSettle();\n+ await tester.tap(find.byType(ElevatedButton));\n+ await tester.pumpAndSettle();\n+ expect(find.textContaining('Hello Talawa'), findsOneWidget);\n+ final snackBarFinder = find.byType(SnackBar);\n+ final snackBarWidget = tester.widget(snackBarFinder);\n+ expect(snackBarWidget.behavior, equals(SnackBarBehavior.floating));\n+ expect(snackBarWidget.duration, equals(const Duration(seconds: 2)));\n+ });\n+ testWidgets('showSnackBar() test with custom duration', (tester) async {\n+ await tester.pumpWidget(\n+ HomeApp(\n+ navigateorKey: mockKey,\n+ onClick: () {\n+ navigationService.showSnackBar(\n+ 'Hello Talawa',\n+ duration: const Duration(seconds: 3),\n+ );\n+ },\n+ ),\n+ );\n+ await tester.pumpAndSettle();\n+ await tester.tap(find.byType(ElevatedButton));\n+ await tester.pumpAndSettle();\n+ expect(find.textContaining('Hello Talawa'), findsOneWidget);\n+ final snackBarFinder = find.byType(SnackBar);\n+ final snackBarWidget = tester.widget(snackBarFinder);\n+ expect(snackBarWidget.behavior, equals(SnackBarBehavior.floating));\n+ expect(snackBarWidget.duration, equals(const Duration(seconds: 3)));\n+ });\n+ testWidgets('showTalawaErrorSnackBar() test with default duration',\n+ (tester) async {\n+ await tester.pumpWidget(\n+ TalawaErrorWidget(\n+ navigationService: navigationService,\n+ onClick: () {\n+ navigationService.showTalawaErrorSnackBar(\n+ 'Error Message',\n+ MessageType.error,\n+ );\n+ },\n+ ),\n+ );\n+ await tester.pumpAndSettle();\n+ await tester.tap(find.byType(TextButton));\n+ await tester.pumpAndSettle();\n+ expect(find.byType(TalawaErrorSnackBar), findsOneWidget);\n+ final snackBarFinder = find.byType(SnackBar);\n+ final snackBarWidget = tester.widget(snackBarFinder);\n+ expect(snackBarWidget.duration, equals(const Duration(seconds: 2)));\n+ expect(\n+ snackBarWidget.backgroundColor,\n+ const Color.fromRGBO(65, 65, 66, 1),\n+ );\n+ });\n+ testWidgets('showTalawaErrorSnackBar() test with custom duration',\n+ (tester) async {\n+ await tester.pumpWidget(\n+ TalawaErrorWidget(\n+ navigationService: navigationService,\n+ onClick: () {\n+ navigationService.showTalawaErrorSnackBar(\n+ 'Error Message',\n+ MessageType.error,\n+ duration: const Duration(seconds: 3),\n+ );\n+ },\n+ ),\n+ );\n+ await tester.pumpAndSettle();\n+ await tester.tap(find.byType(TextButton));\n+ await tester.pumpAndSettle();\n+ expect(find.byType(TalawaErrorSnackBar), findsOneWidget);\n+ final snackBarFinder = find.byType(SnackBar);\n+ final snackBarWidget = tester.widget(snackBarFinder);\n+ expect(snackBarWidget.duration, equals(const Duration(seconds: 3)));\n+ expect(\n+ snackBarWidget.backgroundColor,\n+ const Color.fromRGBO(65, 65, 66, 1),\n+ );\n+ });\n+ testWidgets('showTalawaErrorDialog() test with custom duration',\n+ (tester) async {\n+ await tester.pumpWidget(\n+ TalawaErrorWidget(\n+ navigationService: navigationService,\n+ onClick: () {\n+ navigationService.showTalawaErrorDialog(\n+ 'Hello Talawa',\n+ MessageType.error,\n+ );\n+ },\n+ ),\n+ );\n+ await tester.pumpAndSettle();\n+ await tester.tap(find.byType(TextButton));\n+ await tester.pumpAndSettle();\n+ expect(find.byType(TalawaErrorDialog), findsOneWidget);\n+ await tester.tap(find.byType(TalawaErrorWidget), warnIfMissed: false);\n+ await tester.pumpAndSettle();\n+ expect(find.byType(TalawaErrorDialog), findsOneWidget);\n+ });\n+ testWidgets('pop() method test', (tester) async {\n+ await tester.pumpWidget(\n+ HomeApp(\n+ navigateorKey: mockKey,\n+ onClick: () {\n+ navigationService.pop();\n+ },\n+ ),\n+ );\n+ await tester.pumpAndSettle();\n+ await tester.tap(find.byType(ElevatedButton));\n+ await tester.pumpAndSettle();\n+ expect(mockKey.currentState!.canPop(), false);\n+ });\n+ });\n+}\n", "n2p_tests": "{}", "f2p_tests": "{\"Navigation Services Tests showTalawaErrorSnackBar() test with default duration\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"Navigation Services Tests showTalawaErrorSnackBar() test with custom duration\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"Navigation Services Tests pushScreen() test with arguments\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Navigation Services Tests removeAllAndPush() test with arguments\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Navigation Services Tests pop() method test\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Navigation Services Tests showSnackBar() test with custom duration\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Navigation Services Tests popAndPushScreen() test without arguments\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Navigation Services Tests popAndPushScreen() test with arguments\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Navigation Services Tests removeAllAndPush() test without arguments\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Navigation Services Tests pushReplacementScreen() test with arguments\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Navigation Services Tests pushDialog() test\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Navigation Services Tests pushScreen() test without arguments\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Navigation Services Tests showSnackBar() test with default duration\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Navigation Services Tests showTalawaErrorDialog() test with custom duration\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Navigation Services Tests pushReplacementScreen() test without arguments\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "PalisadoesFoundation__talawa-2220", "org": "PalisadoesFoundation", "repo": "talawa", "number": 2220, "state": "closed", "title": "Tests for encryptor.dart written", "body": "\r\n\r\n\r\n\r\n**What kind of change does this PR introduce?** \r\nThis change is about:\r\n1) Making the coverage of `lib/utils/encryptor.dart` from 2.94% to 100%\r\n2) Covering all the test cases related to this file\r\n3) Correcting the `generateRSAKeyPair()` function which previously was not generating keys but currently is!\r\n4) Created AsymetricKeys Model to save Key Pairs in Hive which previously was not created, registered the respective Adapters in the `main.dart` file. \r\n5) Created a Mock/Testing environment for Hive Data Base, so that Future Developers are able to write tests including Hive easily. \r\n\r\n\r\n\r\n**Issue Number:** 2149\r\n\r\nFixes #2149\r\n\r\n**Did you add tests for your changes?** Yes\r\n\r\n\r\n\r\n**Snapshots/Videos:**\r\n\r\n\r\n\r\n**If relevant, did you update the documentation?**\r\n\r\n\r\n\r\n**Summary**\r\n\r\n\r\n\r\n\r\n**Does this PR introduce a breaking change?** Yes, the Testing Environment for Hive is going to make life of Talawa Developers easy! \r\n\r\n\r\n\r\n**Other information**\r\n\r\n\r\n\r\n**Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa/blob/master/CONTRIBUTING.md)?** Yes\r\n\r\n\r\n", "base": "{\"label\": \"PalisadoesFoundation:develop\", \"ref\": \"develop\", \"sha\": \"405f49da5360280343582c1c76514e70a1adc1f2\"}", "resolved_issues": "[{\"number\": 2149, \"title\": \"Write tests for lib/utils/encryptor.dart\", \"body\": \"The Talawa code base needs to be 100% reliable. This means we need to have 100% unittest code coverage. No functionality must be removed to achieve this goal.\\r\\n\\r\\nWe will need unittests done for all methods, classes and functions found in this file.\\r\\n\\r\\nAny widgets referenced in this file must also have unittests done\\r\\n\\r\\n\\r\\n```\\r\\nlib/utils/encryptor.dart\\r\\n\\r\\n```\\r\\n\\r\\nThe current code coverage for this file can be found here:\\r\\n- https://app.codecov.io/gh/PalisadoesFoundation/talawa?displayType=list\\r\\n\"}]", "lang": "dart", "problem_statement": "Write tests for lib/utils/encryptor.dart\nThe Talawa code base needs to be 100% reliable. This means we need to have 100% unittest code coverage. No functionality must be removed to achieve this goal.\r\n\r\nWe will need unittests done for all methods, classes and functions found in this file.\r\n\r\nAny widgets referenced in this file must also have unittests done\r\n\r\n\r\n```\r\nlib/utils/encryptor.dart\r\n\r\n```\r\n\r\nThe current code coverage for this file can be found here:\r\n- https://app.codecov.io/gh/PalisadoesFoundation/talawa?displayType=list\r\n\n", "hints": "@Ayush0Chaudhary @noman2002 I would like to work on this issue.. can you please assign it to me?\nSolve other issues first \n@Ayush0Chaudhary @noman2002 Can you assign this issue to me?\nThere is a problem lying in the `generateRSAKeyPair()` function, the parameters passed in ` final random = SecureRandom('Fortuna')\r\n ..seed(secureRandom as CipherParameters);` are wrong as `secureRandom` is not a Cypher Parameter. When changed to the `KeyParametres` then to start AES Enginer, a key is required and also more configurations are required which can't be done without the assistance of Maintainers. See this link for more info: [AES-CBC with Pointy Castle](https://github.com/bcgit/pc-dart/blob/master/tutorials/aes-cbc.md)\nIf Maintainers can allow me, I can move forward with random configurations which can be modified further, otherwise test can't be written as parameters are wrong!\n@literalEval Please answer this query.\n```\r\nAsymmetricKeyPair generateRSAKeyPair() {\r\n final secureRandom = FortunaRandom();\r\n final random = Random.secure();\r\n final List seeds = [];\r\n for (int i = 0; i < 32; i++) {\r\n seeds.add(random.nextInt(255));\r\n }\r\n secureRandom.seed(KeyParameter(Uint8List.fromList(seeds)));\r\n final rsapars = RSAKeyGeneratorParameters(BigInt.from(65537), 2048, 64);\r\n final params = ParametersWithRandom(rsapars, secureRandom);\r\n final keyGenerator = RSAKeyGenerator();\r\n keyGenerator.init(params);\r\n return keyGenerator.generateKeyPair();\r\n }\r\n```\r\nI have modified this function in this way with the help of the blog [Asymmetric Key Generation in Flutter](https://medium.com/flutter-community/asymmetric-key-generation-in-flutter-ad2b912f3309l). Kindly check if it is right as it is working fine!", "pull_url": "https://github.com/PalisadoesFoundation/talawa/pull/2220", "issue_urls": "[\"https://github.com/PalisadoesFoundation/talawa/issues/2149\"]", "test_command": NaN, "fix_patch": "diff --git a/lib/main.dart b/lib/main.dart\nindex 19350a4cc3..7ec3b18905 100644\n--- a/lib/main.dart\n+++ b/lib/main.dart\n@@ -15,6 +15,7 @@ import 'package:talawa/constants/custom_theme.dart';\n import 'package:talawa/constants/quick_actions.dart';\n import 'package:talawa/firebase_options.dart';\n import 'package:talawa/locator.dart';\n+import 'package:talawa/models/asymetric_keys/asymetric_keys.dart';\n import 'package:talawa/models/organization/org_info.dart';\n import 'package:talawa/models/user/user_info.dart';\n import 'package:talawa/plugins/fetch_plugin_list.dart';\n@@ -105,11 +106,12 @@ Future main() async {\n Hive\n ..init(dir.path)\n ..registerAdapter(UserAdapter())\n- ..registerAdapter(OrgInfoAdapter());\n+ ..registerAdapter(OrgInfoAdapter())\n+ ..registerAdapter(AsymetricKeysAdapter());\n \n await Hive.openBox('currentUser');\n await Hive.openBox('currentOrg');\n-\n+ await Hive.openBox('user_keys');\n await Hive.openBox('pluginBox');\n await Hive.openBox('url');\n \ndiff --git a/lib/models/asymetric_keys/asymetric_keys.dart b/lib/models/asymetric_keys/asymetric_keys.dart\nnew file mode 100644\nindex 0000000000..5791136a4c\n--- /dev/null\n+++ b/lib/models/asymetric_keys/asymetric_keys.dart\n@@ -0,0 +1,11 @@\n+import 'package:hive/hive.dart';\n+import 'package:pointycastle/api.dart';\n+part 'asymetric_keys.g.dart';\n+\n+// This model is created to save Asymmetric Keys to the Hive as Hive doesn't allow to store objects other than Arrays, List, int, Strings etc.\n+@HiveType(typeId: 7)\n+class AsymetricKeys extends HiveObject {\n+ AsymetricKeys({required this.keyPair});\n+ @HiveField(0)\n+ final AsymmetricKeyPair keyPair;\n+}\ndiff --git a/lib/models/asymetric_keys/asymetric_keys.g.dart b/lib/models/asymetric_keys/asymetric_keys.g.dart\nnew file mode 100644\nindex 0000000000..5661ba4f03\n--- /dev/null\n+++ b/lib/models/asymetric_keys/asymetric_keys.g.dart\n@@ -0,0 +1,41 @@\n+// GENERATED CODE - DO NOT MODIFY BY HAND\n+\n+part of 'asymetric_keys.dart';\n+\n+// **************************************************************************\n+// TypeAdapterGenerator\n+// **************************************************************************\n+\n+class AsymetricKeysAdapter extends TypeAdapter {\n+ @override\n+ final int typeId = 7;\n+\n+ @override\n+ AsymetricKeys read(BinaryReader reader) {\n+ final numOfFields = reader.readByte();\n+ final fields = {\n+ for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),\n+ };\n+ return AsymetricKeys(\n+ keyPair: fields[0] as AsymmetricKeyPair,\n+ );\n+ }\n+\n+ @override\n+ void write(BinaryWriter writer, AsymetricKeys obj) {\n+ writer\n+ ..writeByte(1)\n+ ..writeByte(0)\n+ ..write(obj.keyPair);\n+ }\n+\n+ @override\n+ int get hashCode => typeId.hashCode;\n+\n+ @override\n+ bool operator ==(Object other) =>\n+ identical(this, other) ||\n+ other is AsymetricKeysAdapter &&\n+ runtimeType == other.runtimeType &&\n+ typeId == other.typeId;\n+}\ndiff --git a/lib/utils/encryptor.dart b/lib/utils/encryptor.dart\nindex 6435a25275..8bdef772d8 100644\n--- a/lib/utils/encryptor.dart\n+++ b/lib/utils/encryptor.dart\n@@ -1,12 +1,15 @@\n import 'dart:convert';\n+import 'dart:math';\n import 'dart:typed_data';\n \n import 'package:crypto/crypto.dart';\n import 'package:hive/hive.dart';\n import 'package:pointycastle/asymmetric/oaep.dart';\n import 'package:pointycastle/asymmetric/rsa.dart';\n+import 'package:pointycastle/key_generators/rsa_key_generator.dart';\n import 'package:pointycastle/pointycastle.dart';\n import 'package:pointycastle/random/fortuna_random.dart';\n+import 'package:talawa/models/asymetric_keys/asymetric_keys.dart';\n \n /// Handles all of the encryption tasks in the codebase.\n class Encryptor {\n@@ -43,15 +46,17 @@ class Encryptor {\n /// * `AsymmetricKeyPair`: The generated\n /// public and private keys.\n AsymmetricKeyPair generateRSAKeyPair() {\n- final keyGen = RSAKeyGeneratorParameters(BigInt.parse('65537'), 2048, 64);\n final secureRandom = FortunaRandom();\n- final random = SecureRandom('Fortuna')\n- ..seed(secureRandom as CipherParameters);\n- final keyGenParams = ParametersWithRandom(keyGen, random);\n-\n- final keyGenerator = KeyGenerator('RSA');\n- keyGenerator.init(keyGenParams);\n-\n+ final random = Random.secure();\n+ final List seeds = [];\n+ for (int i = 0; i < 32; i++) {\n+ seeds.add(random.nextInt(255));\n+ }\n+ secureRandom.seed(KeyParameter(Uint8List.fromList(seeds)));\n+ final rsapars = RSAKeyGeneratorParameters(BigInt.from(65537), 2048, 64);\n+ final params = ParametersWithRandom(rsapars, secureRandom);\n+ final keyGenerator = RSAKeyGenerator();\n+ keyGenerator.init(params);\n return keyGenerator.generateKeyPair();\n }\n \n@@ -66,13 +71,12 @@ class Encryptor {\n /// * `Future`: None\n Future saveKeyPair(\n AsymmetricKeyPair keyPair,\n+ HiveInterface hiveInterface,\n ) async {\n // TODO: Implement secure storage here\n-\n- await Hive.openBox>('user_keys');\n- final keysBox = await Hive.openBox('user_keys');\n-\n- keysBox.put('key_pair', keyPair);\n+ final Box keysBox =\n+ await hiveInterface.openBox('user_keys');\n+ keysBox.put('key_pair', AsymetricKeys(keyPair: keyPair));\n }\n \n /// Loads secret keys from the Hive db.\n@@ -83,12 +87,11 @@ class Encryptor {\n /// **returns**:\n /// * `Future>`: The public and\n /// private key pair\n- Future> loadKeyPair() async {\n- await Hive.openBox>('user_keys');\n- final keysBox = await Hive.openBox('user_keys');\n-\n- return (await keysBox.get('key_pair'))\n- as AsymmetricKeyPair;\n+ Future> loadKeyPair(\n+ HiveInterface hive,\n+ ) async {\n+ final keysBox = await hive.openBox('user_keys');\n+ return keysBox.get('key_pair')!.keyPair;\n }\n \n /// Encrypts the given string data with Recipient's Public Key.\n@@ -136,15 +139,21 @@ class Encryptor {\n /// **returns**:\n /// * `Future`: None\n /// TODO: Use this somewhere\n- Future receiveMessage(Map message) async {\n- final privateKey = (await loadKeyPair()).privateKey;\n-\n- final encryptedMessage = message['encryptedMessage'] as String;\n- final decryptedMessage = assymetricDecryptString(\n- encryptedMessage,\n- privateKey as RSAPrivateKey,\n- );\n-\n- print('Decrypted Message: $decryptedMessage');\n+ Future receiveMessage(\n+ Map message,\n+ HiveInterface hive,\n+ ) async {\n+ try {\n+ final encryptedMessage = message['encryptedMessage'] as String;\n+ final privateKey = (await loadKeyPair(hive)).privateKey;\n+ final decryptedMessage = assymetricDecryptString(\n+ encryptedMessage,\n+ privateKey as RSAPrivateKey,\n+ );\n+\n+ print('Decrypted Message: $decryptedMessage');\n+ } catch (e) {\n+ throw Exception('Error');\n+ }\n }\n }\n", "test_patch": "diff --git a/test/helpers/setup_hive.dart b/test/helpers/setup_hive.dart\nindex cb9b87fbc5..55cc63be57 100644\n--- a/test/helpers/setup_hive.dart\n+++ b/test/helpers/setup_hive.dart\n@@ -2,9 +2,22 @@\n // ignore_for_file: talawa_good_doc_comments\n \n import 'package:hive/hive.dart';\n+import 'package:mockito/annotations.dart';\n import 'package:talawa/models/organization/org_info.dart';\n import 'package:talawa/models/user/user_info.dart';\n \n+@GenerateMocks(\n+ [\n+ HiveInterface,\n+ Box,\n+ ],\n+ customMocks: [\n+ MockSpec(\n+ as: Symbol('MockHiveBox'),\n+ onMissingStub: OnMissingStub.returnDefault,\n+ ),\n+ ],\n+)\n Future setUpUserInfoHive() async {\n Hive\n ..init(\"./temporaryPath\")\ndiff --git a/test/helpers/setup_hive.mocks.dart b/test/helpers/setup_hive.mocks.dart\nnew file mode 100644\nindex 0000000000..dc67dfd0a5\n--- /dev/null\n+++ b/test/helpers/setup_hive.mocks.dart\n@@ -0,0 +1,837 @@\n+// Mocks generated by Mockito 5.4.3 from annotations\n+// in talawa/test/utils/encryptor_test.dart.\n+// Do not manually edit this file.\n+\n+// ignore_for_file: no_leading_underscores_for_library_prefixes\n+import 'dart:async' as _i3;\n+import 'dart:typed_data' as _i6;\n+\n+import 'package:hive/hive.dart' as _i2;\n+import 'package:hive/src/box/default_compaction_strategy.dart' as _i5;\n+import 'package:hive/src/box/default_key_comparator.dart' as _i4;\n+import 'package:mockito/mockito.dart' as _i1;\n+import 'package:mockito/src/dummies.dart' as _i7;\n+\n+// ignore_for_file: type=lint\n+// ignore_for_file: avoid_redundant_argument_values\n+// ignore_for_file: avoid_setters_without_getters\n+// ignore_for_file: comment_references\n+// ignore_for_file: deprecated_member_use\n+// ignore_for_file: deprecated_member_use_from_same_package\n+// ignore_for_file: implementation_imports\n+// ignore_for_file: invalid_use_of_visible_for_testing_member\n+// ignore_for_file: prefer_const_constructors\n+// ignore_for_file: unnecessary_parenthesis\n+// ignore_for_file: camel_case_types\n+// ignore_for_file: subtype_of_sealed_class\n+\n+class _FakeBox_0 extends _i1.SmartFake implements _i2.Box {\n+ _FakeBox_0(\n+ Object parent,\n+ Invocation parentInvocation,\n+ ) : super(\n+ parent,\n+ parentInvocation,\n+ );\n+}\n+\n+class _FakeLazyBox_1 extends _i1.SmartFake implements _i2.LazyBox {\n+ _FakeLazyBox_1(\n+ Object parent,\n+ Invocation parentInvocation,\n+ ) : super(\n+ parent,\n+ parentInvocation,\n+ );\n+}\n+\n+/// A class which mocks [HiveInterface].\n+///\n+/// See the documentation for Mockito's code generation for more information.\n+class MockHiveInterface extends _i1.Mock implements _i2.HiveInterface {\n+ MockHiveInterface() {\n+ _i1.throwOnMissingStub(this);\n+ }\n+\n+ @override\n+ void init(\n+ String? path, {\n+ _i2.HiveStorageBackendPreference? backendPreference =\n+ _i2.HiveStorageBackendPreference.native,\n+ }) =>\n+ super.noSuchMethod(\n+ Invocation.method(\n+ #init,\n+ [path],\n+ {#backendPreference: backendPreference},\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ _i3.Future<_i2.Box> openBox(\n+ String? name, {\n+ _i2.HiveCipher? encryptionCipher,\n+ _i2.KeyComparator? keyComparator = _i4.defaultKeyComparator,\n+ _i2.CompactionStrategy? compactionStrategy = _i5.defaultCompactionStrategy,\n+ bool? crashRecovery = true,\n+ String? path,\n+ _i6.Uint8List? bytes,\n+ String? collection,\n+ List? encryptionKey,\n+ }) =>\n+ (super.noSuchMethod(\n+ Invocation.method(\n+ #openBox,\n+ [name],\n+ {\n+ #encryptionCipher: encryptionCipher,\n+ #keyComparator: keyComparator,\n+ #compactionStrategy: compactionStrategy,\n+ #crashRecovery: crashRecovery,\n+ #path: path,\n+ #bytes: bytes,\n+ #collection: collection,\n+ #encryptionKey: encryptionKey,\n+ },\n+ ),\n+ returnValue: _i3.Future<_i2.Box>.value(_FakeBox_0(\n+ this,\n+ Invocation.method(\n+ #openBox,\n+ [name],\n+ {\n+ #encryptionCipher: encryptionCipher,\n+ #keyComparator: keyComparator,\n+ #compactionStrategy: compactionStrategy,\n+ #crashRecovery: crashRecovery,\n+ #path: path,\n+ #bytes: bytes,\n+ #collection: collection,\n+ #encryptionKey: encryptionKey,\n+ },\n+ ),\n+ )),\n+ ) as _i3.Future<_i2.Box>);\n+\n+ @override\n+ _i3.Future<_i2.LazyBox> openLazyBox(\n+ String? name, {\n+ _i2.HiveCipher? encryptionCipher,\n+ _i2.KeyComparator? keyComparator = _i4.defaultKeyComparator,\n+ _i2.CompactionStrategy? compactionStrategy = _i5.defaultCompactionStrategy,\n+ bool? crashRecovery = true,\n+ String? path,\n+ String? collection,\n+ List? encryptionKey,\n+ }) =>\n+ (super.noSuchMethod(\n+ Invocation.method(\n+ #openLazyBox,\n+ [name],\n+ {\n+ #encryptionCipher: encryptionCipher,\n+ #keyComparator: keyComparator,\n+ #compactionStrategy: compactionStrategy,\n+ #crashRecovery: crashRecovery,\n+ #path: path,\n+ #collection: collection,\n+ #encryptionKey: encryptionKey,\n+ },\n+ ),\n+ returnValue: _i3.Future<_i2.LazyBox>.value(_FakeLazyBox_1(\n+ this,\n+ Invocation.method(\n+ #openLazyBox,\n+ [name],\n+ {\n+ #encryptionCipher: encryptionCipher,\n+ #keyComparator: keyComparator,\n+ #compactionStrategy: compactionStrategy,\n+ #crashRecovery: crashRecovery,\n+ #path: path,\n+ #collection: collection,\n+ #encryptionKey: encryptionKey,\n+ },\n+ ),\n+ )),\n+ ) as _i3.Future<_i2.LazyBox>);\n+\n+ @override\n+ _i2.Box box(String? name) => (super.noSuchMethod(\n+ Invocation.method(\n+ #box,\n+ [name],\n+ ),\n+ returnValue: _FakeBox_0(\n+ this,\n+ Invocation.method(\n+ #box,\n+ [name],\n+ ),\n+ ),\n+ ) as _i2.Box);\n+\n+ @override\n+ _i2.LazyBox lazyBox(String? name) => (super.noSuchMethod(\n+ Invocation.method(\n+ #lazyBox,\n+ [name],\n+ ),\n+ returnValue: _FakeLazyBox_1(\n+ this,\n+ Invocation.method(\n+ #lazyBox,\n+ [name],\n+ ),\n+ ),\n+ ) as _i2.LazyBox);\n+\n+ @override\n+ bool isBoxOpen(String? name) => (super.noSuchMethod(\n+ Invocation.method(\n+ #isBoxOpen,\n+ [name],\n+ ),\n+ returnValue: false,\n+ ) as bool);\n+\n+ @override\n+ _i3.Future close() => (super.noSuchMethod(\n+ Invocation.method(\n+ #close,\n+ [],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future deleteBoxFromDisk(\n+ String? name, {\n+ String? path,\n+ }) =>\n+ (super.noSuchMethod(\n+ Invocation.method(\n+ #deleteBoxFromDisk,\n+ [name],\n+ {#path: path},\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future deleteFromDisk() => (super.noSuchMethod(\n+ Invocation.method(\n+ #deleteFromDisk,\n+ [],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ List generateSecureKey() => (super.noSuchMethod(\n+ Invocation.method(\n+ #generateSecureKey,\n+ [],\n+ ),\n+ returnValue: [],\n+ ) as List);\n+\n+ @override\n+ _i3.Future boxExists(\n+ String? name, {\n+ String? path,\n+ }) =>\n+ (super.noSuchMethod(\n+ Invocation.method(\n+ #boxExists,\n+ [name],\n+ {#path: path},\n+ ),\n+ returnValue: _i3.Future.value(false),\n+ ) as _i3.Future);\n+\n+ @override\n+ void resetAdapters() => super.noSuchMethod(\n+ Invocation.method(\n+ #resetAdapters,\n+ [],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ void registerAdapter(\n+ _i2.TypeAdapter? adapter, {\n+ bool? internal = false,\n+ bool? override = false,\n+ }) =>\n+ super.noSuchMethod(\n+ Invocation.method(\n+ #registerAdapter,\n+ [adapter],\n+ {\n+ #internal: internal,\n+ #override: override,\n+ },\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ bool isAdapterRegistered(int? typeId) => (super.noSuchMethod(\n+ Invocation.method(\n+ #isAdapterRegistered,\n+ [typeId],\n+ ),\n+ returnValue: false,\n+ ) as bool);\n+\n+ @override\n+ void ignoreTypeId(int? typeId) => super.noSuchMethod(\n+ Invocation.method(\n+ #ignoreTypeId,\n+ [typeId],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+}\n+\n+/// A class which mocks [Box].\n+///\n+/// See the documentation for Mockito's code generation for more information.\n+class MockBox extends _i1.Mock implements _i2.Box {\n+ MockBox() {\n+ _i1.throwOnMissingStub(this);\n+ }\n+\n+ @override\n+ Iterable get values => (super.noSuchMethod(\n+ Invocation.getter(#values),\n+ returnValue: [],\n+ ) as Iterable);\n+\n+ @override\n+ String get name => (super.noSuchMethod(\n+ Invocation.getter(#name),\n+ returnValue: _i7.dummyValue(\n+ this,\n+ Invocation.getter(#name),\n+ ),\n+ ) as String);\n+\n+ @override\n+ bool get isOpen => (super.noSuchMethod(\n+ Invocation.getter(#isOpen),\n+ returnValue: false,\n+ ) as bool);\n+\n+ @override\n+ bool get lazy => (super.noSuchMethod(\n+ Invocation.getter(#lazy),\n+ returnValue: false,\n+ ) as bool);\n+\n+ @override\n+ Iterable get keys => (super.noSuchMethod(\n+ Invocation.getter(#keys),\n+ returnValue: [],\n+ ) as Iterable);\n+\n+ @override\n+ int get length => (super.noSuchMethod(\n+ Invocation.getter(#length),\n+ returnValue: 0,\n+ ) as int);\n+\n+ @override\n+ bool get isEmpty => (super.noSuchMethod(\n+ Invocation.getter(#isEmpty),\n+ returnValue: false,\n+ ) as bool);\n+\n+ @override\n+ bool get isNotEmpty => (super.noSuchMethod(\n+ Invocation.getter(#isNotEmpty),\n+ returnValue: false,\n+ ) as bool);\n+\n+ @override\n+ Iterable valuesBetween({\n+ dynamic startKey,\n+ dynamic endKey,\n+ }) =>\n+ (super.noSuchMethod(\n+ Invocation.method(\n+ #valuesBetween,\n+ [],\n+ {\n+ #startKey: startKey,\n+ #endKey: endKey,\n+ },\n+ ),\n+ returnValue: [],\n+ ) as Iterable);\n+\n+ @override\n+ E? getAt(int? index) => (super.noSuchMethod(Invocation.method(\n+ #getAt,\n+ [index],\n+ )) as E?);\n+\n+ @override\n+ Map toMap() => (super.noSuchMethod(\n+ Invocation.method(\n+ #toMap,\n+ [],\n+ ),\n+ returnValue: {},\n+ ) as Map);\n+\n+ @override\n+ dynamic keyAt(int? index) => super.noSuchMethod(Invocation.method(\n+ #keyAt,\n+ [index],\n+ ));\n+\n+ @override\n+ _i3.Stream<_i2.BoxEvent> watch({dynamic key}) => (super.noSuchMethod(\n+ Invocation.method(\n+ #watch,\n+ [],\n+ {#key: key},\n+ ),\n+ returnValue: _i3.Stream<_i2.BoxEvent>.empty(),\n+ ) as _i3.Stream<_i2.BoxEvent>);\n+\n+ @override\n+ bool containsKey(dynamic key) => (super.noSuchMethod(\n+ Invocation.method(\n+ #containsKey,\n+ [key],\n+ ),\n+ returnValue: false,\n+ ) as bool);\n+\n+ @override\n+ _i3.Future put(\n+ dynamic key,\n+ E? value,\n+ ) =>\n+ (super.noSuchMethod(\n+ Invocation.method(\n+ #put,\n+ [\n+ key,\n+ value,\n+ ],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future putAt(\n+ int? index,\n+ E? value,\n+ ) =>\n+ (super.noSuchMethod(\n+ Invocation.method(\n+ #putAt,\n+ [\n+ index,\n+ value,\n+ ],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future putAll(Map? entries) => (super.noSuchMethod(\n+ Invocation.method(\n+ #putAll,\n+ [entries],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future add(E? value) => (super.noSuchMethod(\n+ Invocation.method(\n+ #add,\n+ [value],\n+ ),\n+ returnValue: _i3.Future.value(0),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future> addAll(Iterable? values) => (super.noSuchMethod(\n+ Invocation.method(\n+ #addAll,\n+ [values],\n+ ),\n+ returnValue: _i3.Future>.value([]),\n+ ) as _i3.Future>);\n+\n+ @override\n+ _i3.Future delete(dynamic key) => (super.noSuchMethod(\n+ Invocation.method(\n+ #delete,\n+ [key],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future deleteAt(int? index) => (super.noSuchMethod(\n+ Invocation.method(\n+ #deleteAt,\n+ [index],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future deleteAll(Iterable? keys) => (super.noSuchMethod(\n+ Invocation.method(\n+ #deleteAll,\n+ [keys],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future compact() => (super.noSuchMethod(\n+ Invocation.method(\n+ #compact,\n+ [],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future clear() => (super.noSuchMethod(\n+ Invocation.method(\n+ #clear,\n+ [],\n+ ),\n+ returnValue: _i3.Future.value(0),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future close() => (super.noSuchMethod(\n+ Invocation.method(\n+ #close,\n+ [],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future deleteFromDisk() => (super.noSuchMethod(\n+ Invocation.method(\n+ #deleteFromDisk,\n+ [],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future flush() => (super.noSuchMethod(\n+ Invocation.method(\n+ #flush,\n+ [],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+}\n+\n+/// A class which mocks [Box].\n+///\n+/// See the documentation for Mockito's code generation for more information.\n+class MockHiveBox extends _i1.Mock implements _i2.Box {\n+ @override\n+ Iterable get values => (super.noSuchMethod(\n+ Invocation.getter(#values),\n+ returnValue: [],\n+ returnValueForMissingStub: [],\n+ ) as Iterable);\n+\n+ @override\n+ String get name => (super.noSuchMethod(\n+ Invocation.getter(#name),\n+ returnValue: _i7.dummyValue(\n+ this,\n+ Invocation.getter(#name),\n+ ),\n+ returnValueForMissingStub: _i7.dummyValue(\n+ this,\n+ Invocation.getter(#name),\n+ ),\n+ ) as String);\n+\n+ @override\n+ bool get isOpen => (super.noSuchMethod(\n+ Invocation.getter(#isOpen),\n+ returnValue: false,\n+ returnValueForMissingStub: false,\n+ ) as bool);\n+\n+ @override\n+ bool get lazy => (super.noSuchMethod(\n+ Invocation.getter(#lazy),\n+ returnValue: false,\n+ returnValueForMissingStub: false,\n+ ) as bool);\n+\n+ @override\n+ Iterable get keys => (super.noSuchMethod(\n+ Invocation.getter(#keys),\n+ returnValue: [],\n+ returnValueForMissingStub: [],\n+ ) as Iterable);\n+\n+ @override\n+ int get length => (super.noSuchMethod(\n+ Invocation.getter(#length),\n+ returnValue: 0,\n+ returnValueForMissingStub: 0,\n+ ) as int);\n+\n+ @override\n+ bool get isEmpty => (super.noSuchMethod(\n+ Invocation.getter(#isEmpty),\n+ returnValue: false,\n+ returnValueForMissingStub: false,\n+ ) as bool);\n+\n+ @override\n+ bool get isNotEmpty => (super.noSuchMethod(\n+ Invocation.getter(#isNotEmpty),\n+ returnValue: false,\n+ returnValueForMissingStub: false,\n+ ) as bool);\n+\n+ @override\n+ Iterable valuesBetween({\n+ dynamic startKey,\n+ dynamic endKey,\n+ }) =>\n+ (super.noSuchMethod(\n+ Invocation.method(\n+ #valuesBetween,\n+ [],\n+ {\n+ #startKey: startKey,\n+ #endKey: endKey,\n+ },\n+ ),\n+ returnValue: [],\n+ returnValueForMissingStub: [],\n+ ) as Iterable);\n+\n+ @override\n+ E? getAt(int? index) => (super.noSuchMethod(\n+ Invocation.method(\n+ #getAt,\n+ [index],\n+ ),\n+ returnValueForMissingStub: null,\n+ ) as E?);\n+\n+ @override\n+ Map toMap() => (super.noSuchMethod(\n+ Invocation.method(\n+ #toMap,\n+ [],\n+ ),\n+ returnValue: {},\n+ returnValueForMissingStub: {},\n+ ) as Map);\n+\n+ @override\n+ dynamic keyAt(int? index) => super.noSuchMethod(\n+ Invocation.method(\n+ #keyAt,\n+ [index],\n+ ),\n+ returnValueForMissingStub: null,\n+ );\n+\n+ @override\n+ _i3.Stream<_i2.BoxEvent> watch({dynamic key}) => (super.noSuchMethod(\n+ Invocation.method(\n+ #watch,\n+ [],\n+ {#key: key},\n+ ),\n+ returnValue: _i3.Stream<_i2.BoxEvent>.empty(),\n+ returnValueForMissingStub: _i3.Stream<_i2.BoxEvent>.empty(),\n+ ) as _i3.Stream<_i2.BoxEvent>);\n+\n+ @override\n+ bool containsKey(dynamic key) => (super.noSuchMethod(\n+ Invocation.method(\n+ #containsKey,\n+ [key],\n+ ),\n+ returnValue: false,\n+ returnValueForMissingStub: false,\n+ ) as bool);\n+\n+ @override\n+ _i3.Future put(\n+ dynamic key,\n+ E? value,\n+ ) =>\n+ (super.noSuchMethod(\n+ Invocation.method(\n+ #put,\n+ [\n+ key,\n+ value,\n+ ],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future putAt(\n+ int? index,\n+ E? value,\n+ ) =>\n+ (super.noSuchMethod(\n+ Invocation.method(\n+ #putAt,\n+ [\n+ index,\n+ value,\n+ ],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future putAll(Map? entries) => (super.noSuchMethod(\n+ Invocation.method(\n+ #putAll,\n+ [entries],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future add(E? value) => (super.noSuchMethod(\n+ Invocation.method(\n+ #add,\n+ [value],\n+ ),\n+ returnValue: _i3.Future.value(0),\n+ returnValueForMissingStub: _i3.Future.value(0),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future> addAll(Iterable? values) => (super.noSuchMethod(\n+ Invocation.method(\n+ #addAll,\n+ [values],\n+ ),\n+ returnValue: _i3.Future>.value([]),\n+ returnValueForMissingStub: _i3.Future>.value([]),\n+ ) as _i3.Future>);\n+\n+ @override\n+ _i3.Future delete(dynamic key) => (super.noSuchMethod(\n+ Invocation.method(\n+ #delete,\n+ [key],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future deleteAt(int? index) => (super.noSuchMethod(\n+ Invocation.method(\n+ #deleteAt,\n+ [index],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future deleteAll(Iterable? keys) => (super.noSuchMethod(\n+ Invocation.method(\n+ #deleteAll,\n+ [keys],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future compact() => (super.noSuchMethod(\n+ Invocation.method(\n+ #compact,\n+ [],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future clear() => (super.noSuchMethod(\n+ Invocation.method(\n+ #clear,\n+ [],\n+ ),\n+ returnValue: _i3.Future.value(0),\n+ returnValueForMissingStub: _i3.Future.value(0),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future close() => (super.noSuchMethod(\n+ Invocation.method(\n+ #close,\n+ [],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future deleteFromDisk() => (super.noSuchMethod(\n+ Invocation.method(\n+ #deleteFromDisk,\n+ [],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+\n+ @override\n+ _i3.Future flush() => (super.noSuchMethod(\n+ Invocation.method(\n+ #flush,\n+ [],\n+ ),\n+ returnValue: _i3.Future.value(),\n+ returnValueForMissingStub: _i3.Future.value(),\n+ ) as _i3.Future);\n+}\ndiff --git a/test/utils/encryptor_test.dart b/test/utils/encryptor_test.dart\nnew file mode 100644\nindex 0000000000..4c311a665c\n--- /dev/null\n+++ b/test/utils/encryptor_test.dart\n@@ -0,0 +1,139 @@\n+import 'dart:convert';\n+import 'dart:typed_data';\n+\n+import 'package:crypto/crypto.dart';\n+import 'package:flutter_test/flutter_test.dart';\n+import 'package:mockito/mockito.dart';\n+import 'package:pointycastle/api.dart' as pointy;\n+import 'package:pointycastle/asymmetric/oaep.dart';\n+import 'package:pointycastle/asymmetric/rsa.dart';\n+import 'package:pointycastle/pointycastle.dart';\n+import 'package:talawa/models/asymetric_keys/asymetric_keys.dart';\n+import 'package:talawa/utils/encryptor.dart';\n+import '../helpers/setup_hive.mocks.dart';\n+\n+// This test is being written believing that in future when Encryptor class will get rid of shouldEncrypt variable then all the tests using that variable can be removed\n+void main() {\n+ group('When shouldEncrypt is true', () {\n+ test('encryptString method should return the encrypted string', () {\n+ Encryptor.shouldEncrypt = true;\n+ const String inputString = 'password123';\n+ final String outputString =\n+ sha256.convert(utf8.encode(inputString)).toString();\n+ expect(Encryptor.encryptString(inputString), outputString);\n+ });\n+ });\n+// As the bool variable is not used anywhere except in this method so moving ahead with making this variable as false\n+// On getting rid of this variable the above test can be removed\n+ group('When shouldEncrypt is false', () {\n+ late Encryptor encryptor;\n+ late AsymmetricKeyPair keyPair;\n+ late pointy.PublicKey publicKey;\n+ late MockHiveInterface mockHiveInterface;\n+ late MockBox mockHiveBox;\n+ setUpAll(() {\n+ encryptor = Encryptor();\n+ Encryptor.shouldEncrypt = false;\n+ keyPair = encryptor.generateRSAKeyPair();\n+ publicKey = keyPair.publicKey;\n+ mockHiveInterface = MockHiveInterface();\n+ mockHiveBox = MockBox();\n+ });\n+ test('encryptString method should return the same string', () {\n+ const String inputString = 'password123';\n+ expect(Encryptor.encryptString(inputString), inputString);\n+ });\n+ test(\n+ 'Correct security options are added while generating keys from generateRSAKeyPair method',\n+ () {\n+ expect(publicKey, isA());\n+ final RSAPublicKey key = publicKey as RSAPublicKey;\n+ expect(key.publicExponent, BigInt.parse('65537'));\n+ expect(key.modulus!.bitLength, 2048);\n+ });\n+ test(\n+ 'Checking whether Box Names and Key Names are appropriate for Hive or not',\n+ () async {\n+ when(mockHiveInterface.openBox('user_keys'))\n+ .thenAnswer((realInvocation) async {\n+ return mockHiveBox;\n+ });\n+ await encryptor.saveKeyPair(keyPair, mockHiveInterface);\n+ verify(mockHiveInterface.openBox('user_keys'));\n+ verify(mockHiveBox.put('key_pair', any));\n+ });\n+ test('For loadPairKey()', () async {\n+ when(mockHiveInterface.openBox('user_keys'))\n+ .thenAnswer((realInvocation) async {\n+ return mockHiveBox;\n+ });\n+ when(mockHiveBox.get('key_pair'))\n+ .thenAnswer((realInvocation) => AsymetricKeys(keyPair: keyPair));\n+ await encryptor.loadKeyPair(mockHiveInterface);\n+ verify(mockHiveBox.get('key_pair'));\n+ });\n+ test(\n+ 'For checking whether the data is properly encrypted through RSA by assymetricEncryptString()',\n+ () {\n+ const String data = 'Hello Talawa';\n+ final output = encryptor.assymetricEncryptString(\n+ data,\n+ keyPair.publicKey as RSAPublicKey,\n+ );\n+ final cipher = OAEPEncoding(RSAEngine())\n+ ..init(false, PrivateKeyParameter(keyPair.privateKey));\n+ final decryptedBytes = cipher.process(base64Decode(output));\n+ expect(String.fromCharCodes(decryptedBytes), data);\n+ });\n+ test(\n+ 'For checking whether the data is getting decrypted properly through assymetricDecryptString()',\n+ () {\n+ const String data = 'Hello Talawa';\n+ final cipher = OAEPEncoding(RSAEngine())\n+ ..init(true, PublicKeyParameter(keyPair.publicKey));\n+ final encryptedBytes = cipher.process(Uint8List.fromList(data.codeUnits));\n+ final output = encryptor.assymetricDecryptString(\n+ base64Encode(encryptedBytes),\n+ keyPair.privateKey as RSAPrivateKey,\n+ );\n+ expect(output, data);\n+ });\n+ test('Test for wrong message sent to receiveMessage()', () {\n+ const Map message = {\"message\": \"Hello Talawa\"};\n+ expect(\n+ encryptor.receiveMessage(message, mockHiveInterface),\n+ throwsException,\n+ );\n+ });\n+ test('Unencrypted message sent to receiveMessage()', () {\n+ const Map message = {\"encryptedMessage\": \"Hello Talawa\"};\n+ when(mockHiveInterface.openBox('user_keys'))\n+ .thenAnswer((realInvocation) async {\n+ return mockHiveBox;\n+ });\n+ when(mockHiveBox.get('key_pair'))\n+ .thenAnswer((realInvocation) => AsymetricKeys(keyPair: keyPair));\n+ expect(\n+ encryptor.receiveMessage(message, mockHiveInterface),\n+ throwsException,\n+ );\n+ });\n+ test('Encrypted Message sent to receiveMessage()', () {\n+ const String data = 'Hello Talawa';\n+ final cipher = OAEPEncoding(RSAEngine())\n+ ..init(true, PublicKeyParameter(keyPair.publicKey));\n+ final encryptedBytes = cipher.process(Uint8List.fromList(data.codeUnits));\n+ final String encryptedMessge = base64Encode(encryptedBytes);\n+ final Map message = {\n+ \"encryptedMessage\": encryptedMessge,\n+ };\n+ when(mockHiveInterface.openBox('user_keys'))\n+ .thenAnswer((realInvocation) async {\n+ return mockHiveBox;\n+ });\n+ when(mockHiveBox.get('key_pair'))\n+ .thenAnswer((realInvocation) => AsymetricKeys(keyPair: keyPair));\n+ expect(encryptor.receiveMessage(message, mockHiveInterface), completes);\n+ });\n+ });\n+}\n", "n2p_tests": "{\"When shouldEncrypt is false For loadPairKey()\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"When shouldEncrypt is false encryptString method should return the same string\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"When shouldEncrypt is false For checking whether the data is getting decrypted properly through assymetricDecryptString()\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"When shouldEncrypt is false Checking whether Box Names and Key Names are appropriate for Hive or not\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"When shouldEncrypt is false For checking whether the data is properly encrypted through RSA by assymetricEncryptString()\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"When shouldEncrypt is false Unencrypted message sent to receiveMessage()\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"When shouldEncrypt is false Correct security options are added while generating keys from generateRSAKeyPair method\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"When shouldEncrypt is false Encrypted Message sent to receiveMessage()\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"When shouldEncrypt is false (setUpAll)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"When shouldEncrypt is false (tearDownAll)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"When shouldEncrypt is true encryptString method should return the encrypted string\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"When shouldEncrypt is false Test for wrong message sent to receiveMessage()\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "PalisadoesFoundation__talawa-2216", "org": "PalisadoesFoundation", "repo": "talawa", "number": 2216, "state": "closed", "title": "Fixing bug to join or switch to any joined org", "body": "**What kind of change does this PR introduce?**\r\n\r\nFix the bug to switch or join new org.\r\n\r\n**Issue Number:**\r\n\r\nFixes #2199 \r\n\r\n**Did you add tests for your changes?**\r\n\r\nNo\r\n\r\n**Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa/blob/master/CONTRIBUTING.md)?**\r\n\r\nYes\r\n", "base": "{\"label\": \"PalisadoesFoundation:develop\", \"ref\": \"develop\", \"sha\": \"63a420c20c55ae0cb99d79cbc0217ddfcb78fb63\"}", "resolved_issues": "[{\"number\": 2199, \"title\": \"Switching organizations fails when organization exists\", \"body\": \"**Describe the bug**\\r\\n- Please work with @Ayush0Chaudhary for comments, advice and review of your PR.\\r\\n- Switching organizations fails even when the organization exists\\r\\n- A `No organization found! Please contact your admin` message is seen\\r\\n\\r\\n**To Reproduce**\\r\\nSteps to reproduce the behavior:\\r\\n\\r\\n1. Log into the app\\r\\n2. Access the left drawer to switch organizations\\r\\n3. Click Join new organization\\r\\n4. Select organization\\r\\n5. Error occurs\\r\\n\\r\\n**Expected behavior**\\r\\n- No error should occur\\r\\n- If the user is already a member of the organization, then the transition must be seamless\\r\\n- If the user is not a member, then a registration screen or something similar must be viewed\\r\\n\\r\\n**Actual behavior**\\r\\n- Error occurs\\r\\n\\r\\n**Screenshots**\\r\\n- https://www.youtube.com/watch?v=86AzK_Y_GCQ&t=711s\\r\\n- https://youtu.be/86AzK_Y_GCQ?t=764 This could be related to the Firebase implementation. Ideally we don't want Firebase integration. You may have to work with an API and Admin person on this.\\r\\n\\r\\n**Additional details**\\r\\n- You must get the test **_code coverage up to 100%_** for any edited files.\\r\\n\\r\\n**Potential internship candidates**\\r\\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\\r\\n\"}]", "lang": "dart", "problem_statement": "Switching organizations fails when organization exists\n**Describe the bug**\r\n- Please work with @Ayush0Chaudhary for comments, advice and review of your PR.\r\n- Switching organizations fails even when the organization exists\r\n- A `No organization found! Please contact your admin` message is seen\r\n\r\n**To Reproduce**\r\nSteps to reproduce the behavior:\r\n\r\n1. Log into the app\r\n2. Access the left drawer to switch organizations\r\n3. Click Join new organization\r\n4. Select organization\r\n5. Error occurs\r\n\r\n**Expected behavior**\r\n- No error should occur\r\n- If the user is already a member of the organization, then the transition must be seamless\r\n- If the user is not a member, then a registration screen or something similar must be viewed\r\n\r\n**Actual behavior**\r\n- Error occurs\r\n\r\n**Screenshots**\r\n- https://www.youtube.com/watch?v=86AzK_Y_GCQ&t=711s\r\n- https://youtu.be/86AzK_Y_GCQ?t=764 This could be related to the Firebase implementation. Ideally we don't want Firebase integration. You may have to work with an API and Admin person on this.\r\n\r\n**Additional details**\r\n- You must get the test **_code coverage up to 100%_** for any edited files.\r\n\r\n**Potential internship candidates**\r\nPlease read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359\r\n\n", "hints": "I would like to work on this issue. Can you please assign it to me?\r\n\nI would like to work on this @noman2002 @palisadoes ", "pull_url": "https://github.com/PalisadoesFoundation/talawa/pull/2216", "issue_urls": "[\"https://github.com/PalisadoesFoundation/talawa/issues/2199\"]", "test_command": NaN, "fix_patch": "diff --git a/lib/models/organization/org_info.dart b/lib/models/organization/org_info.dart\nindex a72873f562..1ab789ad52 100644\n--- a/lib/models/organization/org_info.dart\n+++ b/lib/models/organization/org_info.dart\n@@ -66,15 +66,25 @@ class OrgInfo {\n ///\n /// **returns**:\n /// * `List`: returning the OrgInfo object containing the json data\n- List fromJsonToList(List json) {\n+ List fromJsonToList(dynamic json) {\n final List orgList = [];\n- json.forEach((element) {\n- if (element is Map) {\n- // print(68);\n- final OrgInfo org = OrgInfo.fromJson(element);\n- orgList.add(org);\n+\n+ if (json is List) {\n+ for (final dynamic outerElement in json) {\n+ if (outerElement is List) {\n+ for (final dynamic innerElement in outerElement) {\n+ if (innerElement is Map) {\n+ final OrgInfo org = OrgInfo.fromJson(innerElement);\n+ orgList.add(org);\n+ }\n+ }\n+ } else if (outerElement is Map) {\n+ final OrgInfo org = OrgInfo.fromJson(outerElement);\n+ orgList.add(org);\n+ }\n }\n- });\n+ }\n+\n return orgList;\n }\n \ndiff --git a/lib/widgets/organization_list.dart b/lib/widgets/organization_list.dart\nindex 1228d8d13c..a2a01ad79b 100644\n--- a/lib/widgets/organization_list.dart\n+++ b/lib/widgets/organization_list.dart\n@@ -63,7 +63,7 @@ class OrganizationList extends StatelessWidget {\n if (!result.isLoading) {\n // print(result.data!['organizationsConnection']);\n model.organizations = OrgInfo().fromJsonToList(\n- result.data!['organizationsConnection'] as List,\n+ result.data!['organizationsConnection'],\n );\n }\n \ndiff --git a/lib/widgets/organization_search_list.dart b/lib/widgets/organization_search_list.dart\nindex 9998e4a293..7b432b1bd3 100644\n--- a/lib/widgets/organization_search_list.dart\n+++ b/lib/widgets/organization_search_list.dart\n@@ -1,6 +1,3 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'package:flutter/cupertino.dart';\n import 'package:flutter/material.dart';\n import 'package:graphql_flutter/graphql_flutter.dart';\n@@ -13,10 +10,11 @@ import 'package:talawa/view_model/pre_auth_view_models/select_organization_view_\n import 'package:talawa/widgets/custom_list_tile.dart';\n import 'package:visibility_detector/visibility_detector.dart';\n \n-/// OrganizationSearchList class return a widget that shows all\n-/// the matching organizations searched on the search bar.\n+/// This class returns the widget that shows all the matching orgs searched in the search bar.\n class OrganizationSearchList extends StatelessWidget {\n const OrganizationSearchList({required this.model, super.key});\n+\n+ /// model constructor for the selectOrganisation widget.\n final SelectOrganizationViewModel model;\n \n @override\n@@ -53,7 +51,7 @@ class OrganizationSearchList extends StatelessWidget {\n // If the result is still loading!\n if (!result.isLoading) {\n model.organizations = OrgInfo().fromJsonToList(\n- result.data!['organizationsConnection'] as List,\n+ result.data!['organizationsConnection'],\n );\n }\n // return the Scroll bar widget for scrolling down the organizations.\ndiff --git a/lib/widgets/talawa_error_dialog.dart b/lib/widgets/talawa_error_dialog.dart\nindex a37a0abac0..7b0e0be8ec 100644\n--- a/lib/widgets/talawa_error_dialog.dart\n+++ b/lib/widgets/talawa_error_dialog.dart\n@@ -1,20 +1,23 @@\n-// ignore_for_file: talawa_api_doc\n-// ignore_for_file: talawa_good_doc_comments\n-\n import 'package:auto_size_text/auto_size_text.dart';\n import 'package:flutter/material.dart';\n import 'package:flutter_svg/svg.dart';\n \n import 'package:talawa/enums/enums.dart';\n+import 'package:talawa/services/size_config.dart';\n import 'package:talawa/utils/app_localization.dart';\n \n+/// Common Error Dialog box for the whole talawa app.\n class TalawaErrorDialog extends StatelessWidget {\n const TalawaErrorDialog(\n this.errorMessage, {\n super.key,\n required this.messageType,\n });\n+\n+ /// error message for the talawaDialogBox.\n final String errorMessage;\n+\n+ /// enum to what is the type of error message.\n final MessageType messageType;\n \n @override\n@@ -22,8 +25,8 @@ class TalawaErrorDialog extends StatelessWidget {\n return SizedBox(\n child: AlertDialog(\n content: SizedBox(\n- width: 200,\n- height: 135,\n+ width: SizeConfig.screenWidth! * 0.65,\n+ height: SizeConfig.screenWidth! * 0.38,\n child: Column(\n children: [\n SvgPicture.asset(\n@@ -74,10 +77,12 @@ class TalawaErrorDialog extends StatelessWidget {\n const SizedBox(\n height: 5,\n ),\n- AutoSizeText(\n- AppLocalizations.of(context)!.strictTranslate(errorMessage),\n- style: const TextStyle(fontSize: 16),\n- maxLines: 3,\n+ Expanded(\n+ child: AutoSizeText(\n+ AppLocalizations.of(context)!.strictTranslate(errorMessage),\n+ style: const TextStyle(fontSize: 16),\n+ maxLines: 3,\n+ ),\n ),\n const SizedBox(\n height: 19,\n", "test_patch": "diff --git a/test/model_tests/organization/org_info_test.dart b/test/model_tests/organization/org_info_test.dart\nindex 7e1ad7c1e1..fb96537579 100644\n--- a/test/model_tests/organization/org_info_test.dart\n+++ b/test/model_tests/organization/org_info_test.dart\n@@ -106,5 +106,70 @@ void main() {\n expect(result.admins![0].id, 'user_id');\n }\n });\n+\n+ test('Test fromJsonToList with nested structures', () {\n+ final List nestedJson = [\n+ [json1, json2], // Nested list with org information\n+ json1, // Single org information\n+ ];\n+\n+ final List res = OrgInfo().fromJsonToList(nestedJson);\n+\n+ expect(\n+ res.length,\n+ 3,\n+ ); // There are two orgs in the nested list and one in the single org information\n+\n+ expect(res[0].id, '123');\n+ expect(res[0].image, 'image_url');\n+ expect(res[0].name, 'Name');\n+ expect(res[0].description, 'Description');\n+ expect(res[0].isPublic, true);\n+ expect(res[0].creatorInfo!.authToken, ' ');\n+ expect(res[0].creatorInfo!.refreshToken, ' ');\n+ expect(res[0].creatorInfo!.id, 'user_id');\n+ expect(res[0].members!.length, 1);\n+ expect(res[0].members![0].authToken, ' ');\n+ expect(res[0].members![0].refreshToken, ' ');\n+ expect(res[0].members![0].id, 'user_id');\n+ expect(res[0].admins!.length, 1);\n+ expect(res[0].admins![0].authToken, ' ');\n+ expect(res[0].admins![0].refreshToken, ' ');\n+ expect(res[0].admins![0].id, 'user_id');\n+\n+ expect(res[1].id, '321');\n+ expect(res[1].image, 'image_url');\n+ expect(res[1].name, 'Name');\n+ expect(res[1].description, 'Description');\n+ expect(res[1].isPublic, true);\n+ expect(res[1].creatorInfo!.authToken, ' ');\n+ expect(res[1].creatorInfo!.refreshToken, ' ');\n+ expect(res[1].creatorInfo!.id, 'user_id');\n+ expect(res[1].members!.length, 1);\n+ expect(res[1].members![0].authToken, ' ');\n+ expect(res[1].members![0].refreshToken, ' ');\n+ expect(res[1].members![0].id, 'user_id');\n+ expect(res[1].admins!.length, 1);\n+ expect(res[1].admins![0].authToken, ' ');\n+ expect(res[1].admins![0].refreshToken, ' ');\n+ expect(res[1].admins![0].id, 'user_id');\n+\n+ expect(res[2].id, '123');\n+ expect(res[2].image, 'image_url');\n+ expect(res[2].name, 'Name');\n+ expect(res[2].description, 'Description');\n+ expect(res[2].isPublic, true);\n+ expect(res[2].creatorInfo!.authToken, ' ');\n+ expect(res[2].creatorInfo!.refreshToken, ' ');\n+ expect(res[2].creatorInfo!.id, 'user_id');\n+ expect(res[2].members!.length, 1);\n+ expect(res[2].members![0].authToken, ' ');\n+ expect(res[2].members![0].refreshToken, ' ');\n+ expect(res[2].members![0].id, 'user_id');\n+ expect(res[2].admins!.length, 1);\n+ expect(res[2].admins![0].authToken, ' ');\n+ expect(res[2].admins![0].refreshToken, ' ');\n+ expect(res[2].admins![0].id, 'user_id');\n+ });\n });\n }\n", "n2p_tests": "{}", "f2p_tests": "{\"Test OrgInfo model Test fromJsonToList with nested structures\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"Test OrgInfo model Test fromJson function with memberRequest false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Test OrgInfo model Test fromJson function with memberRequest true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Test OrgInfo model Test fromJsonToList\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1952", "org": "zulip", "repo": "zulip-flutter", "number": 1952, "state": "closed", "title": "compose: Fix bug where topic input not filled on quote-and-reply", "body": "Fixes #1469.", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"f5602fe60ebedce733e0a794e1377258dc97b2f0\"}", "resolved_issues": "[{\"number\": 1469, \"title\": \"compose: On recent servers, quote-and-reply doesn't fill empty topic input\", \"body\": \"To reproduce:\\n\\n1. Connect to CZO or another realm with feature level 334+\\n2. Enter a channel narrow\\n3. Long-press a message; tap \\\"Quote and reply\\\"\\n4. See the content input update with the quoted message\\n\\nExpected: the topic input is automatically filled with the message's topic\\n\\nActual: the topic input remains blank\\n\\n-----\\n\\nThis looks like a regression from the recent \\\"general chat\\\" work. To check if the topic input was left empty, the quote-and-reply button checks the condition `composeBoxController.topic.textNormalized == kNoTopicTopic`. Before 769cc7df405562d5f99a869ed009662e2b5801b6, that condition was a reliable test of whether the topic input was left empty. But it isn't reliable anymore; on recent servers, if the topic input is left empty, `composeBoxController.topic.textNormalized` will be the empty string.\\n\\nAssigning @PIG208 as the author of 769cc7df405562d5f99a869ed009662e2b5801b6.\"}]", "lang": "dart", "problem_statement": "compose: On recent servers, quote-and-reply doesn't fill empty topic input\nTo reproduce:\n\n1. Connect to CZO or another realm with feature level 334+\n2. Enter a channel narrow\n3. Long-press a message; tap \"Quote and reply\"\n4. See the content input update with the quoted message\n\nExpected: the topic input is automatically filled with the message's topic\n\nActual: the topic input remains blank\n\n-----\n\nThis looks like a regression from the recent \"general chat\" work. To check if the topic input was left empty, the quote-and-reply button checks the condition `composeBoxController.topic.textNormalized == kNoTopicTopic`. Before 769cc7df405562d5f99a869ed009662e2b5801b6, that condition was a reliable test of whether the topic input was left empty. But it isn't reliable anymore; on recent servers, if the topic input is left empty, `composeBoxController.topic.textNormalized` will be the empty string.\n\nAssigning @PIG208 as the author of 769cc7df405562d5f99a869ed009662e2b5801b6.\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/1952", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1469\"]", "test_command": "flutter test test/widgets/action_sheet_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/widgets/action_sheet.dart b/lib/widgets/action_sheet.dart\nindex 30bbf433f5..c56e41d5c2 100644\n--- a/lib/widgets/action_sheet.dart\n+++ b/lib/widgets/action_sheet.dart\n@@ -1409,7 +1409,7 @@ class QuoteAndReplyButton extends MessageActionSheetMenuItemButton {\n composeBoxController!;\n if (\n composeBoxController is StreamComposeBoxController\n- && composeBoxController.topic.textNormalized == kNoTopicTopic\n+ && composeBoxController.topic.isTopicVacuous\n && message is StreamMessage\n ) {\n composeBoxController.topic.setTopic(message.topic);\n", "test_patch": "diff --git a/test/model/autocomplete_checks.dart b/test/model/autocomplete_checks.dart\nindex cb08378e77..65e3aaf755 100644\n--- a/test/model/autocomplete_checks.dart\n+++ b/test/model/autocomplete_checks.dart\n@@ -10,6 +10,7 @@ extension ComposeContentControllerChecks on Subject {\n \n extension ComposeTopicControllerChecks on Subject {\n Subject?> get autocompleteIntent => has((c) => c.autocompleteIntent(), 'autocompleteIntent');\n+ Subject get textNormalized => has((c) => c.textNormalized, 'textNormalized');\n }\n \n extension AutocompleteIntentChecks on Subject> {\ndiff --git a/test/widgets/action_sheet_test.dart b/test/widgets/action_sheet_test.dart\nindex 621f759f28..c43c6daab7 100644\n--- a/test/widgets/action_sheet_test.dart\n+++ b/test/widgets/action_sheet_test.dart\n@@ -41,6 +41,7 @@ import '../api/fake_api.dart';\n import '../api/model/model_checks.dart';\n import '../example_data.dart' as eg;\n import '../flutter_checks.dart';\n+import '../model/autocomplete_checks.dart';\n import '../model/binding.dart';\n import '../model/content_test.dart';\n import '../model/test_store.dart';\n@@ -1674,8 +1675,33 @@ void main() {\n check(contentController).not((it) => it.validationErrors.contains(ContentValidationError.quoteAndReplyInProgress));\n }\n \n- testWidgets('in channel narrow', (tester) async {\n- final message = eg.streamMessage();\n+ testWidgets('in channel narrow with different, non-vacuous topic', (tester) async {\n+ final message = eg.streamMessage(topic: 'some topic');\n+ await setupToMessageActionSheet(tester, message: message, narrow: ChannelNarrow(message.streamId));\n+\n+ final composeBoxController = findComposeBoxController(tester) as StreamComposeBoxController;\n+ final contentController = composeBoxController.content;\n+\n+ // Ensure channel-topics are loaded before testing quote & reply behavior\n+ connection.prepare(body:\n+ jsonEncode(GetStreamTopicsResult(topics: [eg.getStreamTopicsEntry()]).toJson()));\n+ final topicController = composeBoxController.topic;\n+ topicController.value = TextEditingValue(text: 'other topic');\n+\n+ final valueBefore = contentController.value;\n+ prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');\n+ await tapQuoteAndReplyButton(tester);\n+ checkLoadingState(store, contentController, valueBefore: valueBefore, message: message);\n+ await tester.pump(Duration.zero); // message is fetched; compose box updates\n+ check(composeBoxController.contentFocusNode.hasFocus).isTrue();\n+ checkSuccessState(store, contentController,\n+ valueBefore: valueBefore, message: message, rawContent: 'Hello world');\n+ check(topicController).textNormalized.equals('other topic');\n+ });\n+\n+ testWidgets('in channel narrow with empty topic', (tester) async {\n+ // Regression test for https://github.com/zulip/zulip-flutter/issues/1469\n+ final message = eg.streamMessage(topic: 'some topic');\n await setupToMessageActionSheet(tester, message: message, narrow: ChannelNarrow(message.streamId));\n \n final composeBoxController = findComposeBoxController(tester) as StreamComposeBoxController;\n@@ -1685,7 +1711,7 @@ void main() {\n connection.prepare(body:\n jsonEncode(GetStreamTopicsResult(topics: [eg.getStreamTopicsEntry()]).toJson()));\n final topicController = composeBoxController.topic;\n- topicController.value = const TextEditingValue(text: kNoTopicTopic);\n+ topicController.value = const TextEditingValue(text: '');\n \n final valueBefore = contentController.value;\n prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');\n@@ -1695,6 +1721,7 @@ void main() {\n check(composeBoxController.contentFocusNode.hasFocus).isTrue();\n checkSuccessState(store, contentController,\n valueBefore: valueBefore, message: message, rawContent: 'Hello world');\n+ check(topicController).textNormalized.equals('some topic');\n });\n \n group('in topic narrow', () {\n", "n2p_tests": "{}", "f2p_tests": "{\"message action sheet QuoteAndReplyButton in channel narrow with empty topic\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"message action sheet StarButton star success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from app bar on topic list: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet UnsubscribeButton channel subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet MarkChannelAsReadButton request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton mute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageTextButton success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in channel narrow with different, non-vacuous topic\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: false, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from message-list app bar in channel narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet header public channel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet header muted sender also shown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when topic is empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton unresolve: weird prefix\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from inbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ShareButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: true, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet SubscribeButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet DeleteMessageButton visibility shown when user has permission\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from inbox; message in Unreads but not in MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from recipient header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread visible if message is read\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from recipient header in combined feed: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet MarkTopicAsReadButton visible if topic has unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet CopyTopicLinkButton copies topic link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons absent if ServerEmojiData not loaded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons slight_smile removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in DM narrow smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: Instance of 'CombinedFeedNarrow', realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons smile removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet StarButton unstar success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton not offered in StarredMessagesNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet DeleteMessageButton request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads but not MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton unfollow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: ChannelNarrow(1), realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: true, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from inbox: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton tap button smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet UnrevealMutedMessageButton when pressed, unreveals the message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet header poll is rendered\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet UnsubscribeButton smoke, public channel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet StarButton star request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads and MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton not offered in MentionsNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet TopicListButton happy path from msglist app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ShareButton request succeeds; sharing succeeds\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread onPressed on topic move, acts on new topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet header message sender and content shown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread not visible if message is not read\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons slight_smile request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet header web-public channel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet header without topic (general chat)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton request fails with an error dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton not offered in CombinedFeedNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons slight_smile adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet UnsubscribeButton channel not subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet UnrevealMutedMessageButton visible if message is from muted sender and revealed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from msglist app bar on channel feed: not visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when msglist empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton unresolve: request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet MarkChannelAsReadButton happy path from inbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet UnrevealMutedMessageButton not visible if message is from normal sender (not muted)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageTextButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet MarkTopicAsReadButton not visible if topic has no unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from topic-list app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton unresolve: happy path\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet DeleteMessageButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet DeleteMessageButton visibility not shown when user does not have permission\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 10, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in topic narrow smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: false, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton unmute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet CopyChannelLinkButton copies channel link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: false, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ViewReactionsButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet UnsubscribeButton smoke, private channel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton unmuteInMutedChannel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ViewReactionsButton not visible if message has no reactions\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet MarkTopicAsReadButton marks topic as read when pressed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from recipient header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread onPressed shows error when fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet header with topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from subscription list: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet DeleteMessageButton cancel confirmation dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet header private channel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show with no unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet TopicListButton not visible from app bar on topic list\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton handle empty topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton resolve: request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread onPressed smoke test\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet SubscribeButton channel subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons smile request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ViewReadReceiptsButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MessageActionSheetCancelButton pressing the button dismisses the action sheet\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet header unknown channel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton follow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from message-list app bar in topic narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons smile adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet StarButton unstar request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from inbox; message in Unreads and in MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet SubscribeButton channel not subscribed, without content access\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in topic narrow no error if user lost posting permission after action sheet opened\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in DM narrow no error if recipient was deactivated while raw-content request in progress\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet SubscribeButton channel not subscribed, with content access\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton navigates to channel feed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet CopyTopicLinkButton FL < 271 -> link doesn't contain \\\"with\\\" operator\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ViewReadReceiptsButton realm-level read receipts disabled -> button is absent\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ShareButton request succeeds; sharing fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageLinkButton copies message link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 600, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from subscription list\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageTextButton can show snackbar on success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1915", "org": "zulip", "repo": "zulip-flutter", "number": 1915, "state": "closed", "title": "all_channels: Replace three dot menu with long press gesture and add on tap to feed", "body": "Fixes #1914\r\n\r\n
\r\nBefore and After still \r\n\r\n### Page View\r\n| Before | After |\r\n| --- | --- |\r\n|\"Screenshot_1761912198\" | \"Screenshot_1761912094\" |\r\n\r\n\r\n\r\n
\r\n\r\n
\r\nAfter Max Sys Font\r\n\r\n| After Max Sys Font |\r\n| --- |\r\n\"Screenshot_1761913062\"|\r\n\r\n
\r\n\r\n
\r\nLong Press View\r\n\r\n| Long Press on Public Channel | ~~Long Press on Private Channel~~ Not part of this PR anymore |\r\n| --- | --- |\r\n| \"public-long\" | \"private-long\" |\r\n\r\n
\r\n\r\n
\r\nGesture Press Views\r\n\r\n## Gesture press in default sys font \r\nhttps://github.com/user-attachments/assets/de182d27-9f3f-4304-8ffe-5856f0669f6b\r\n\r\n## ~Unsub from private channel 200 milliseconds fade~. Not part of PR\r\nhttps://github.com/user-attachments/assets/7f1b0f99-8ae5-47bf-8b05-764614e53a39\r\n
", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"3781b308124cf43f04a1c0dd0dc86f15e558f967\"}", "resolved_issues": "[{\"number\": 1914, \"title\": \"Make \\\"All channels\\\" view more similar to \\\"Channels\\\"\", \"body\": \"\\nWe should make the UI of the \\\"All channels\\\" view match the \\\"Channels\\\" view better:\\n\\n- Click on the row should navigate to the channel.\\n- Long press should open the channel menu.\\n- Remove the `...` buttons, as users can follow the regular pattern of opening the menu with a long press when needed.\"}]", "lang": "dart", "problem_statement": "Make \"All channels\" view more similar to \"Channels\"\n\nWe should make the UI of the \"All channels\" view match the \"Channels\" view better:\n\n- Click on the row should navigate to the channel.\n- Long press should open the channel menu.\n- Remove the `...` buttons, as users can follow the regular pattern of opening the menu with a long press when needed.\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/1915", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1914\"]", "test_command": "flutter test test/widgets/all_channels_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/widgets/all_channels.dart b/lib/widgets/all_channels.dart\nindex 3aaf0d8baf..7d662bcc2d 100644\n--- a/lib/widgets/all_channels.dart\n+++ b/lib/widgets/all_channels.dart\n@@ -5,11 +5,13 @@ import '../api/route/channels.dart';\n import '../generated/l10n/zulip_localizations.dart';\n import '../log.dart';\n import '../model/channel.dart';\n+import '../model/narrow.dart';\n import 'action_sheet.dart';\n import 'actions.dart';\n import 'app_bar.dart';\n import 'button.dart';\n import 'icons.dart';\n+import 'message_list.dart';\n import 'page.dart';\n import 'remote_settings.dart';\n import 'store.dart';\n@@ -96,28 +98,30 @@ class AllChannelsListEntry extends StatelessWidget {\n final Subscription? subscription = channel is Subscription ? channel : null;\n final hasContentAccess = store.selfHasContentAccess(channel);\n \n- return Padding(\n- padding: EdgeInsetsDirectional.only(start: 8, end: 4),\n- child: Row(spacing: 6, children: [\n- Icon(\n- size: 20,\n- color: colorSwatchFor(context, subscription).iconOnPlainBackground,\n- iconDataForStream(channel)),\n- Expanded(\n- child: Text(\n- style: TextStyle(\n- color: designVariables.textMessage,\n- fontSize: 17,\n- height: 20 / 17,\n- ).merge(weightVariableTextStyle(context, wght: 600)),\n- channel.name)),\n- if (hasContentAccess) _SubscribeToggle(channel: channel),\n- ZulipIconButton(\n- icon: ZulipIcons.more_horizontal,\n- onPressed: () {\n- showChannelActionSheet(context, channelId: channel.streamId);\n- }),\n- ]));\n+ return InkWell(\n+ onTap: !hasContentAccess ? null : () => Navigator.push(context,\n+ MessageListPage.buildRoute(context: context,\n+ narrow: ChannelNarrow(channel.streamId))),\n+ onLongPress: () => showChannelActionSheet(context, channelId: channel.streamId),\n+ child: ConstrainedBox(constraints: const BoxConstraints(minHeight: 44),\n+ child: Padding(padding: const EdgeInsetsDirectional.only(start: 8, end: 12),\n+ child: Row(spacing: 6, children: [\n+ Icon(\n+ size: 20,\n+ color: colorSwatchFor(context, subscription).iconOnPlainBackground,\n+ iconDataForStream(channel)),\n+ Expanded(\n+ child: Text(\n+ maxLines: 1,\n+ overflow: TextOverflow.ellipsis,\n+ style: TextStyle(\n+ color: designVariables.textMessage,\n+ fontSize: 17,\n+ height: 20 / 17,\n+ ).merge(weightVariableTextStyle(context, wght: 600)),\n+ channel.name)),\n+ if (hasContentAccess) _SubscribeToggle(channel: channel),\n+ ]))));\n }\n }\n \n", "test_patch": "diff --git a/test/widgets/all_channels_test.dart b/test/widgets/all_channels_test.dart\nindex b47546be40..f6e1092781 100644\n--- a/test/widgets/all_channels_test.dart\n+++ b/test/widgets/all_channels_test.dart\n@@ -12,6 +12,7 @@ import 'package:zulip/widgets/app_bar.dart';\n import 'package:zulip/widgets/button.dart';\n import 'package:zulip/widgets/home.dart';\n import 'package:zulip/widgets/icons.dart';\n+import 'package:zulip/widgets/message_list.dart';\n import 'package:zulip/widgets/page.dart';\n import 'package:zulip/widgets/remote_settings.dart';\n import 'package:zulip/widgets/theme.dart';\n@@ -203,20 +204,37 @@ void main() {\n check(maybeToggle).isNull();\n }\n \n- check(findInRow(find.byIcon(ZulipIcons.more_horizontal))).findsOne();\n+ final touchTargetSize = tester.getSize(findElement);\n+ check(touchTargetSize.height).equals(44);\n }\n });\n \n- testWidgets('tapping three-dots button opens channel action sheet', (tester) async {\n+ testWidgets('open channel action sheet on long press', (tester) async {\n await setupAllChannelsPage(tester, channels: [eg.stream()]);\n \n- await tester.tap(find.byIcon(ZulipIcons.more_horizontal));\n+ await tester.longPress(find.byType(AllChannelsListEntry));\n await tester.pump();\n await transitionDurationObserver.pumpPastTransition(tester);\n \n check(find.byType(BottomSheet)).findsOne();\n });\n \n+ testWidgets('navigate to channel feed on tap', (tester) async {\n+ final channel = eg.stream(name: 'some-channel');\n+ await setupAllChannelsPage(tester, channels: [channel]);\n+\n+ connection.prepare(json: eg.newestGetMessagesResult(\n+ foundOldest: true, messages: [eg.streamMessage(stream: channel)]).toJson());\n+ await tester.tap(find.byType(AllChannelsListEntry));\n+ await tester.pump();\n+ await transitionDurationObserver.pumpPastTransition(tester);\n+\n+ check(find.descendant(\n+ of: find.byType(MessageListPage),\n+ matching: find.text('some-channel')),\n+ ).findsOne();\n+ });\n+\n testWidgets('use toggle switch to subscribe/unsubscribe', (tester) async {\n final channel = eg.stream();\n await setupAllChannelsPage(tester, channels: [channel]);\n", "n2p_tests": "{}", "f2p_tests": "{\"navigate to channel feed on tap\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"sorting/appearance\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"open channel action sheet on long press\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"navigate to page from empty subscription list\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"use toggle switch to subscribe/unsubscribe\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"navigate to page\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Toggle \\\"off\\\" to unsubscribe, public channel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"Toggle \\\"off\\\" to unsubscribe, but without resubscribe permission\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1911", "org": "zulip", "repo": "zulip-flutter", "number": 1911, "state": "closed", "title": "settings: Make page scrollable", "body": "| Before | After (Screenshot) |\r\n| ------- | ------------------ |\r\n| ![column_l](https://github.com/user-attachments/assets/5218af2f-3fe8-445a-8380-69694b0f7301) | ![listview_l](https://github.com/user-attachments/assets/21f84210-aeba-49cb-859d-1c7389e6bb84) |\r\n| ![column_d](https://github.com/user-attachments/assets/d4722bf7-5ecd-419f-9013-2799a3022111) | ![listview_d](https://github.com/user-attachments/assets/d949e2bb-199e-470c-8361-a99187f3848b) |\r\n\r\n\r\n
\r\n\r\n### Video Recordings\r\n\r\n### Before\r\n\r\nhttps://github.com/user-attachments/assets/03716367-b5d9-4f83-84f4-3716abb59829\r\n\r\n
\r\n\r\n### After (Normal)\r\n\r\nhttps://github.com/user-attachments/assets/92a05eab-6789-4811-bb95-271838c864f3\r\n\r\n
\r\n\r\n### After (Increased Text Size to unreasonably high in android settings to test edge case)\r\n\r\nhttps://github.com/user-attachments/assets/c070507f-8a4f-4fcf-8f4f-5731bef5f9d3\r\n\r\n\r\nFixes #1904 \r\n\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"50bbf93941d184c79c680fbe65c2dc0d38d06441\"}", "resolved_issues": "[{\"number\": 1904, \"title\": \"Settings page should scroll\", \"body\": \"The settings page should be scrollable if the content doesn't all fit on the screen.\\n\\nCurrently there are only a few settings, so for most users this doesn't happen. But it can happen if the user has a very small screen (https://github.com/zulip/zulip-flutter/issues/1898#issuecomment-3386032763) or have their display zoomed in for accessibility. In the future it'll probably happen for more users, as we add more settings.\\n\\n\"}]", "lang": "dart", "problem_statement": "Settings page should scroll\nThe settings page should be scrollable if the content doesn't all fit on the screen.\n\nCurrently there are only a few settings, so for most users this doesn't happen. But it can happen if the user has a very small screen (https://github.com/zulip/zulip-flutter/issues/1898#issuecomment-3386032763) or have their display zoomed in for accessibility. In the future it'll probably happen for more users, as we add more settings.\n\n\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/1911", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1904\"]", "test_command": "flutter test test/widgets/settings_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/widgets/settings.dart b/lib/widgets/settings.dart\nindex 5995cdcbfe..bad16c336b 100644\n--- a/lib/widgets/settings.dart\n+++ b/lib/widgets/settings.dart\n@@ -20,7 +20,7 @@ class SettingsPage extends StatelessWidget {\n return Scaffold(\n appBar: ZulipAppBar(\n title: Text(zulipLocalizations.settingsPageTitle)),\n- body: Column(children: [\n+ body: ListView(children: [\n const _ThemeSetting(),\n const _BrowserPreferenceSetting(),\n const _VisitFirstUnreadSetting(),\n", "test_patch": "diff --git a/test/widgets/settings_test.dart b/test/widgets/settings_test.dart\nindex e889fa0d3d..a56b93d7d9 100644\n--- a/test/widgets/settings_test.dart\n+++ b/test/widgets/settings_test.dart\n@@ -64,6 +64,21 @@ void main() {\n hasCheckedState: true, isChecked: expectedIsChecked);\n }\n \n+ testWidgets('SettingsPage is scrollable when taller than a screenful', (tester) async {\n+ tester.view.physicalSize = const Size(200, 200);\n+ tester.view.devicePixelRatio = 1.0;\n+ addTearDown(tester.view.reset);\n+ await prepare(tester);\n+\n+ final lastElementFinder = GlobalSettingsStore.experimentalFeatureFlags.isNotEmpty\n+ ? find.text(\"Experimental features\")\n+ : find.text(\"Mark messages as read on scroll\");\n+ check(lastElementFinder).findsNothing();\n+\n+ await tester.scrollUntilVisible(lastElementFinder, 100);\n+ check(lastElementFinder).findsOne();\n+ });\n+\n group('ThemeSetting', () {\n void checkThemeSetting(WidgetTester tester, {\n required ThemeSetting? expectedThemeSetting,\n", "n2p_tests": "{}", "f2p_tests": "{\"SettingsPage is scrollable when taller than a screenful\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"BrowserPreference use our per-platform default browser preference (variant: TargetPlatform.android)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"ThemeSetting smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"ThemeSetting follow system setting when themeSetting is null\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"MarkReadOnScrollSetting smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"BrowserPreference use our per-platform default browser preference (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"VisitFirstUnreadSetting smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"BrowserPreference smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1909", "org": "zulip", "repo": "zulip-flutter", "number": 1909, "state": "closed", "title": "Open uploaded files using authed temporary URLs", "body": "Fixes #1732.\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"5599f64bf22288788e05c142054a165b2602b97a\"}", "resolved_issues": "[{\"number\": 1732, \"title\": \"Open uploaded files without logging in again\", \"body\": \"Currently if you're looking at a Zulip message that contains an uploaded file (other than an image or video, which we handle directly in the message feed) \\u2014 for example a PDF \\u2014 and you click the link to try to open the file, you get a Zulip login page.\\n\\nThis ultimately works; you just have to do the login, and then you can see the file. But it'd be smoother if the file opened without that step; after all, you were already logged in in the Zulip app.\\n\\nThe legacy app had this feature; see https://github.com/zulip/zulip-mobile/issues/3303 where it was requested, and https://github.com/zulip/zulip-mobile/pull/4089 for the implementation. We'll use the same feature of the Zulip server API as the legacy app did for this; see [getFileTemporaryUrl.js](https://github.com/zulip/zulip-mobile/blob/eb8505c4a0ccfb7bdd817ca9022c11ce57ab69d8/src/api/messages/getFileTemporaryUrl.js).\\n\\n### References\\n* Chat thread: [#mobile > can't open uploaded PDF](https://chat.zulip.org/#narrow/channel/48-mobile/topic/can't.20open.20uploaded.20PDF/with/2226578)\\n* Old zulip-mobile issue: zulip/zulip-mobile#3303\\n* Implementation in zulip-mobile: zulip/zulip-mobile#4089\\n* API documentation: partial docs at https://zulip.com/api/get-file-temporary-url ; additional details in zulip-mobile's API binding at [zulip-mobile:src/api/messages/getFileTemporaryUrl.js](https://github.com/zulip/zulip-mobile/blob/eb8505c4a0ccfb7bdd817ca9022c11ce57ab69d8/src/api/messages/getFileTemporaryUrl.js).\"}]", "lang": "dart", "problem_statement": "Open uploaded files without logging in again\nCurrently if you're looking at a Zulip message that contains an uploaded file (other than an image or video, which we handle directly in the message feed) \u2014 for example a PDF \u2014 and you click the link to try to open the file, you get a Zulip login page.\n\nThis ultimately works; you just have to do the login, and then you can see the file. But it'd be smoother if the file opened without that step; after all, you were already logged in in the Zulip app.\n\nThe legacy app had this feature; see https://github.com/zulip/zulip-mobile/issues/3303 where it was requested, and https://github.com/zulip/zulip-mobile/pull/4089 for the implementation. We'll use the same feature of the Zulip server API as the legacy app did for this; see [getFileTemporaryUrl.js](https://github.com/zulip/zulip-mobile/blob/eb8505c4a0ccfb7bdd817ca9022c11ce57ab69d8/src/api/messages/getFileTemporaryUrl.js).\n\n### References\n* Chat thread: [#mobile > can't open uploaded PDF](https://chat.zulip.org/#narrow/channel/48-mobile/topic/can't.20open.20uploaded.20PDF/with/2226578)\n* Old zulip-mobile issue: zulip/zulip-mobile#3303\n* Implementation in zulip-mobile: zulip/zulip-mobile#4089\n* API documentation: partial docs at https://zulip.com/api/get-file-temporary-url ; additional details in zulip-mobile's API binding at [zulip-mobile:src/api/messages/getFileTemporaryUrl.js](https://github.com/zulip/zulip-mobile/blob/eb8505c4a0ccfb7bdd817ca9022c11ce57ab69d8/src/api/messages/getFileTemporaryUrl.js).\n", "hints": "Describing this with different words to help with finding it in search (after #1834; thanks @varkor): you might say you're trying to open or download a file that's been shared in a Zulip message.\n", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1909", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1732\"]", "test_command": "flutter test test/model/internal_link_test.dart test/widgets/actions_test.dart test/widgets/content_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/assets/l10n/app_en.arb b/assets/l10n/app_en.arb\nindex 9048fa98de..1f52ac32ba 100644\n--- a/assets/l10n/app_en.arb\n+++ b/assets/l10n/app_en.arb\n@@ -329,6 +329,10 @@\n \"@errorCouldNotFetchMessageSource\": {\n \"description\": \"Error message when the source of a message could not be fetched.\"\n },\n+ \"errorCouldNotAccessUploadedFileTitle\": \"Could not access uploaded file\",\n+ \"@errorCouldNotAccessUploadedFileTitle\": {\n+ \"description\": \"Error title on failure in opening a file someone previously uploaded to Zulip\"\n+ },\n \"errorCopyingFailed\": \"Copying failed\",\n \"@errorCopyingFailed\": {\n \"description\": \"Error message when copying the text of a message to the user's system clipboard failed.\"\ndiff --git a/lib/api/route/messages.dart b/lib/api/route/messages.dart\nindex 6d0487f0d7..73ecb02af9 100644\n--- a/lib/api/route/messages.dart\n+++ b/lib/api/route/messages.dart\n@@ -285,6 +285,29 @@ class UploadFileResult {\n Map toJson() => _$UploadFileResultToJson(this);\n }\n \n+/// https://zulip.com/api/get-file-temporary-url\n+Future getFileTemporaryUrl(ApiConnection connection, {\n+ required int realmId,\n+ required String filename,\n+}) {\n+ return connection.get('getFileTemporaryUrl', GetFileTemporaryUrlResult.fromJson,\n+ 'user_uploads/$realmId/$filename', {});\n+}\n+\n+@JsonSerializable(fieldRename: FieldRename.snake)\n+class GetFileTemporaryUrlResult {\n+ final String url;\n+\n+ GetFileTemporaryUrlResult({\n+ required this.url,\n+ });\n+\n+ factory GetFileTemporaryUrlResult.fromJson(Map json) =>\n+ _$GetFileTemporaryUrlResultFromJson(json);\n+\n+ Map toJson() => _$GetFileTemporaryUrlResultToJson(this);\n+}\n+\n /// https://zulip.com/api/add-reaction\n Future addReaction(ApiConnection connection, {\n required int messageId,\ndiff --git a/lib/api/route/messages.g.dart b/lib/api/route/messages.g.dart\nindex 4169634701..bf07f1f153 100644\n--- a/lib/api/route/messages.g.dart\n+++ b/lib/api/route/messages.g.dart\n@@ -55,6 +55,14 @@ UploadFileResult _$UploadFileResultFromJson(Map json) =>\n Map _$UploadFileResultToJson(UploadFileResult instance) =>\n {'uri': instance.url};\n \n+GetFileTemporaryUrlResult _$GetFileTemporaryUrlResultFromJson(\n+ Map json,\n+) => GetFileTemporaryUrlResult(url: json['url'] as String);\n+\n+Map _$GetFileTemporaryUrlResultToJson(\n+ GetFileTemporaryUrlResult instance,\n+) => {'url': instance.url};\n+\n UpdateMessageFlagsResult _$UpdateMessageFlagsResultFromJson(\n Map json,\n ) => UpdateMessageFlagsResult(\ndiff --git a/lib/generated/l10n/zulip_localizations.dart b/lib/generated/l10n/zulip_localizations.dart\nindex 7a08e9d986..d1d40b2010 100644\n--- a/lib/generated/l10n/zulip_localizations.dart\n+++ b/lib/generated/l10n/zulip_localizations.dart\n@@ -593,6 +593,12 @@ abstract class ZulipLocalizations {\n /// **'Could not fetch message source.'**\n String get errorCouldNotFetchMessageSource;\n \n+ /// Error title on failure in opening a file someone previously uploaded to Zulip\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Could not access uploaded file'**\n+ String get errorCouldNotAccessUploadedFileTitle;\n+\n /// Error message when copying the text of a message to the user's system clipboard failed.\n ///\n /// In en, this message translates to:\ndiff --git a/lib/generated/l10n/zulip_localizations_ar.dart b/lib/generated/l10n/zulip_localizations_ar.dart\nindex 759cd06a01..1a292881ec 100644\n--- a/lib/generated/l10n/zulip_localizations_ar.dart\n+++ b/lib/generated/l10n/zulip_localizations_ar.dart\n@@ -277,6 +277,10 @@ class ZulipLocalizationsAr extends ZulipLocalizations {\n String get errorCouldNotFetchMessageSource =>\n 'Could not fetch message source.';\n \n+ @override\n+ String get errorCouldNotAccessUploadedFileTitle =>\n+ 'Could not access uploaded file';\n+\n @override\n String get errorCopyingFailed => 'Copying failed';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_de.dart b/lib/generated/l10n/zulip_localizations_de.dart\nindex 4975e37387..83cc660772 100644\n--- a/lib/generated/l10n/zulip_localizations_de.dart\n+++ b/lib/generated/l10n/zulip_localizations_de.dart\n@@ -285,6 +285,10 @@ class ZulipLocalizationsDe extends ZulipLocalizations {\n String get errorCouldNotFetchMessageSource =>\n 'Konnte Nachrichtenquelle nicht abrufen.';\n \n+ @override\n+ String get errorCouldNotAccessUploadedFileTitle =>\n+ 'Could not access uploaded file';\n+\n @override\n String get errorCopyingFailed => 'Kopieren fehlgeschlagen';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_en.dart b/lib/generated/l10n/zulip_localizations_en.dart\nindex 4ad9cf4f51..80c1c2c475 100644\n--- a/lib/generated/l10n/zulip_localizations_en.dart\n+++ b/lib/generated/l10n/zulip_localizations_en.dart\n@@ -277,6 +277,10 @@ class ZulipLocalizationsEn extends ZulipLocalizations {\n String get errorCouldNotFetchMessageSource =>\n 'Could not fetch message source.';\n \n+ @override\n+ String get errorCouldNotAccessUploadedFileTitle =>\n+ 'Could not access uploaded file';\n+\n @override\n String get errorCopyingFailed => 'Copying failed';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_fr.dart b/lib/generated/l10n/zulip_localizations_fr.dart\nindex 402619efec..7572aa5d3f 100644\n--- a/lib/generated/l10n/zulip_localizations_fr.dart\n+++ b/lib/generated/l10n/zulip_localizations_fr.dart\n@@ -284,6 +284,10 @@ class ZulipLocalizationsFr extends ZulipLocalizations {\n String get errorCouldNotFetchMessageSource =>\n 'Impossible d\\'atteindre le message source.';\n \n+ @override\n+ String get errorCouldNotAccessUploadedFileTitle =>\n+ 'Could not access uploaded file';\n+\n @override\n String get errorCopyingFailed => '\u00c9chec de la copie';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_it.dart b/lib/generated/l10n/zulip_localizations_it.dart\nindex ce18a1d568..e42ef1f08e 100644\n--- a/lib/generated/l10n/zulip_localizations_it.dart\n+++ b/lib/generated/l10n/zulip_localizations_it.dart\n@@ -283,6 +283,10 @@ class ZulipLocalizationsIt extends ZulipLocalizations {\n String get errorCouldNotFetchMessageSource =>\n 'Impossibile recuperare l\\'origine del messaggio.';\n \n+ @override\n+ String get errorCouldNotAccessUploadedFileTitle =>\n+ 'Could not access uploaded file';\n+\n @override\n String get errorCopyingFailed => 'Copia non riuscita';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_ja.dart b/lib/generated/l10n/zulip_localizations_ja.dart\nindex 4e75bf6568..eae3a0c3eb 100644\n--- a/lib/generated/l10n/zulip_localizations_ja.dart\n+++ b/lib/generated/l10n/zulip_localizations_ja.dart\n@@ -272,6 +272,10 @@ class ZulipLocalizationsJa extends ZulipLocalizations {\n @override\n String get errorCouldNotFetchMessageSource => '\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u30bd\u30fc\u30b9\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002';\n \n+ @override\n+ String get errorCouldNotAccessUploadedFileTitle =>\n+ 'Could not access uploaded file';\n+\n @override\n String get errorCopyingFailed => '\u30b3\u30d4\u30fc\u306b\u5931\u6557\u3057\u307e\u3057\u305f';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_nb.dart b/lib/generated/l10n/zulip_localizations_nb.dart\nindex 344bb0372b..cc2c5e1852 100644\n--- a/lib/generated/l10n/zulip_localizations_nb.dart\n+++ b/lib/generated/l10n/zulip_localizations_nb.dart\n@@ -277,6 +277,10 @@ class ZulipLocalizationsNb extends ZulipLocalizations {\n String get errorCouldNotFetchMessageSource =>\n 'Could not fetch message source.';\n \n+ @override\n+ String get errorCouldNotAccessUploadedFileTitle =>\n+ 'Could not access uploaded file';\n+\n @override\n String get errorCopyingFailed => 'Copying failed';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_pl.dart b/lib/generated/l10n/zulip_localizations_pl.dart\nindex 45e9fb2cac..c7c14cf77e 100644\n--- a/lib/generated/l10n/zulip_localizations_pl.dart\n+++ b/lib/generated/l10n/zulip_localizations_pl.dart\n@@ -288,6 +288,10 @@ class ZulipLocalizationsPl extends ZulipLocalizations {\n String get errorCouldNotFetchMessageSource =>\n 'Nie mo\u017cna uzyska\u0107 \u017ar\u00f3d\u0142owej wiadomo\u015bci.';\n \n+ @override\n+ String get errorCouldNotAccessUploadedFileTitle =>\n+ 'Could not access uploaded file';\n+\n @override\n String get errorCopyingFailed => 'Nie uda\u0142o si\u0119 skopiowa\u0107';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_ru.dart b/lib/generated/l10n/zulip_localizations_ru.dart\nindex 817d6b03f8..ae8ce816c4 100644\n--- a/lib/generated/l10n/zulip_localizations_ru.dart\n+++ b/lib/generated/l10n/zulip_localizations_ru.dart\n@@ -289,6 +289,10 @@ class ZulipLocalizationsRu extends ZulipLocalizations {\n String get errorCouldNotFetchMessageSource =>\n '\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0438\u0437\u0432\u043b\u0435\u0447\u044c \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f.';\n \n+ @override\n+ String get errorCouldNotAccessUploadedFileTitle =>\n+ 'Could not access uploaded file';\n+\n @override\n String get errorCopyingFailed => '\u0421\u0431\u043e\u0439 \u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_sk.dart b/lib/generated/l10n/zulip_localizations_sk.dart\nindex 2504894b25..ca321e40a6 100644\n--- a/lib/generated/l10n/zulip_localizations_sk.dart\n+++ b/lib/generated/l10n/zulip_localizations_sk.dart\n@@ -278,6 +278,10 @@ class ZulipLocalizationsSk extends ZulipLocalizations {\n String get errorCouldNotFetchMessageSource =>\n 'Nepodarilo sa nahra\u0165 zdroj spr\u00e1vy';\n \n+ @override\n+ String get errorCouldNotAccessUploadedFileTitle =>\n+ 'Could not access uploaded file';\n+\n @override\n String get errorCopyingFailed => 'Kop\u00edrovanie zlyhalo';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_sl.dart b/lib/generated/l10n/zulip_localizations_sl.dart\nindex 933971c93a..3e72b30aac 100644\n--- a/lib/generated/l10n/zulip_localizations_sl.dart\n+++ b/lib/generated/l10n/zulip_localizations_sl.dart\n@@ -286,6 +286,10 @@ class ZulipLocalizationsSl extends ZulipLocalizations {\n String get errorCouldNotFetchMessageSource =>\n 'Ni bilo mogo\u010de pridobiti vira sporo\u010dila.';\n \n+ @override\n+ String get errorCouldNotAccessUploadedFileTitle =>\n+ 'Could not access uploaded file';\n+\n @override\n String get errorCopyingFailed => 'Kopiranje ni uspelo';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_uk.dart b/lib/generated/l10n/zulip_localizations_uk.dart\nindex 24076bc706..993cb65cdb 100644\n--- a/lib/generated/l10n/zulip_localizations_uk.dart\n+++ b/lib/generated/l10n/zulip_localizations_uk.dart\n@@ -287,6 +287,10 @@ class ZulipLocalizationsUk extends ZulipLocalizations {\n String get errorCouldNotFetchMessageSource =>\n '\u041d\u0435 \u0432\u0434\u0430\u043b\u043e\u0441\u044f \u043e\u0442\u0440\u0438\u043c\u0430\u0442\u0438 \u0434\u0436\u0435\u0440\u0435\u043b\u043e \u043f\u043e\u0432\u0456\u0434\u043e\u043c\u043b\u0435\u043d\u043d\u044f.';\n \n+ @override\n+ String get errorCouldNotAccessUploadedFileTitle =>\n+ 'Could not access uploaded file';\n+\n @override\n String get errorCopyingFailed => '\u041f\u043e\u043c\u0438\u043b\u043a\u0430 \u043a\u043e\u043f\u0456\u044e\u0432\u0430\u043d\u043d\u044f';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_zh.dart b/lib/generated/l10n/zulip_localizations_zh.dart\nindex 4084a19aba..6d62f29892 100644\n--- a/lib/generated/l10n/zulip_localizations_zh.dart\n+++ b/lib/generated/l10n/zulip_localizations_zh.dart\n@@ -277,6 +277,10 @@ class ZulipLocalizationsZh extends ZulipLocalizations {\n String get errorCouldNotFetchMessageSource =>\n 'Could not fetch message source.';\n \n+ @override\n+ String get errorCouldNotAccessUploadedFileTitle =>\n+ 'Could not access uploaded file';\n+\n @override\n String get errorCopyingFailed => 'Copying failed';\n \ndiff --git a/lib/model/internal_link.dart b/lib/model/internal_link.dart\nindex d46942f6d5..bb40fb98fa 100644\n--- a/lib/model/internal_link.dart\n+++ b/lib/model/internal_link.dart\n@@ -128,6 +128,47 @@ class NarrowLink extends InternalLink {\n final int? nearMessageId;\n }\n \n+/// A parsed link to an uploaded file in Zulip.\n+///\n+/// The structure mirrors the data required for [getFileTemporaryUrl]:\n+/// https://zulip.com/api/get-file-temporary-url\n+class UserUploadLink extends InternalLink {\n+ UserUploadLink(this.realmId, this.path, {required super.realmUrl});\n+\n+ static UserUploadLink? _tryParse(String urlPath, Uri realmUrl) {\n+ final match = _urlPathRegexp.matchAsPrefix(urlPath);\n+ if (match == null) return null;\n+ final realmId = int.parse(match.group(1)!, radix: 10);\n+ return UserUploadLink(realmId, match.group(2)!, realmUrl: realmUrl);\n+ }\n+\n+ static const _urlPathPrefix = '/user_uploads/';\n+ static final _urlPathRegexp = RegExp(r'^/user_uploads/(\\d+)/(.+)$');\n+\n+ final int realmId;\n+\n+ /// The remaining path components after the realm ID.\n+ ///\n+ /// This value excludes the slash that separates the realm ID from the\n+ /// next component, but includes the rest of the URL path after that slash.\n+ ///\n+ /// This value should only be used as part of a URL, not elsewhere\n+ /// in the Zulip API. Other uses are likely to cause a new version\n+ /// of the following issue:\n+ /// https://github.com/zulip/zulip-flutter/issues/1709\n+ /// Concretely, this string might differ from the corresponding substring of\n+ /// the original URL string (e.g., one found in the HTML of a Zulip message):\n+ /// if there were non-ASCII characters in the original string,\n+ /// then [Uri.parse] will have converted them to percent-encoded form.\n+ /// This is fine as part of a URL, because then the HTTP client would\n+ /// otherwise have had to percent-encode those characters anyway.\n+ ///\n+ /// This corresponds to `filename` in the arguments to [getFileTemporaryUrl];\n+ /// but it's typically several path components,\n+ /// not just one as that name would suggest.\n+ final String path;\n+}\n+\n /// Try to parse the given URL as a page in this app, on `store`'s realm.\n ///\n /// `url` must already be a result from [PerAccountStore.tryResolveUrl]\n@@ -148,27 +189,37 @@ class NarrowLink extends InternalLink {\n /// #narrow/stream/1-announce/stream/1-announce (duplicated operator)\n // TODO(#1661): handle all valid narrow links, returning a search narrow\n InternalLink? parseInternalLink(Uri url, PerAccountStore store) {\n- if (!_isInternalLink(url, store.realmUrl)) return null;\n-\n- final (category, segments) = _getCategoryAndSegmentsFromFragment(url.fragment);\n- switch (category) {\n- case 'narrow':\n- if (segments.isEmpty || !segments.length.isEven) return null;\n- return _interpretNarrowSegments(segments, store);\n+ if (!_sameOrigin(url, store.realmUrl)) return null;\n+\n+ if ((url.hasEmptyPath || url.path == '/')) {\n+ if (url.hasQuery) return null;\n+ if (!url.hasFragment) return null;\n+ // The URL is of the form `/#\u2026` relative to the realm URL,\n+ // the shape used for representing a state within the web app.\n+ final (category, segments) = _getCategoryAndSegmentsFromFragment(url.fragment);\n+ switch (category) {\n+ case 'narrow':\n+ if (segments.isEmpty || !segments.length.isEven) return null;\n+ return _interpretNarrowSegments(segments, store);\n+ }\n+ } else if (url.path.startsWith(UserUploadLink._urlPathPrefix)) {\n+ return UserUploadLink._tryParse(url.path, store.realmUrl);\n }\n+\n return null;\n }\n \n-/// Check if `url` is an internal link on the given `realmUrl`.\n-bool _isInternalLink(Uri url, Uri realmUrl) {\n+/// Check if `url` has the same origin as `realmUrl`.\n+bool _sameOrigin(Uri url, Uri realmUrl) {\n try {\n- if (url.origin != realmUrl.origin) return false;\n+ return url.origin == realmUrl.origin;\n } on StateError {\n+ // The getter [Uri.origin] throws if the scheme is not \"http\" or \"https\".\n+ // (Also if the URL is relative or certain kinds of malformed, but those\n+ // should be impossible as `url` came from [PerAccountStore.tryResolveUrl]).\n+ // In that case `url` has no \"origin\", and certainly not the realm's origin.\n return false;\n }\n- return (url.hasEmptyPath || url.path == '/')\n- && !url.hasQuery\n- && url.hasFragment;\n }\n \n /// Split `fragment` of arbitrary segments and handle trailing slashes\ndiff --git a/lib/widgets/actions.dart b/lib/widgets/actions.dart\nindex 39232847b3..bd8274613f 100644\n--- a/lib/widgets/actions.dart\n+++ b/lib/widgets/actions.dart\n@@ -7,9 +7,11 @@ import '../api/exception.dart';\n import '../api/model/model.dart';\n import '../api/model/narrow.dart';\n import '../api/route/messages.dart';\n+import '../api/route/messages.dart' as messages_api;\n import '../api/route/channels.dart' as channels_api;\n import '../generated/l10n/zulip_localizations.dart';\n import '../model/binding.dart';\n+import '../model/internal_link.dart';\n import '../model/narrow.dart';\n import '../model/realm.dart';\n import 'dialog.dart';\n@@ -241,6 +243,42 @@ abstract final class ZulipAction {\n return fetchedMessage?.content;\n }\n \n+ /// Fetch and parse a URL from [messages_api.getFileTemporaryUrl];\n+ /// on failure, show an error dialog and return null.\n+ static Future getFileTemporaryUrl(BuildContext context, UserUploadLink link) async {\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n+\n+ String? resultUrl;\n+ try {\n+ final store = PerAccountStoreWidget.of(context);\n+ resultUrl = (await messages_api.getFileTemporaryUrl(store.connection,\n+ realmId: link.realmId, filename: link.path)).url;\n+ } catch (e) {\n+ if (!context.mounted) return null;\n+ final errorMessage = switch (e) {\n+ ZulipApiException() => e.message,\n+ // TODO specific messages for common errors, like network errors\n+ // (support with reusable code)\n+ _ => null,\n+ };\n+ showErrorDialog(context: context,\n+ title: zulipLocalizations.errorCouldNotAccessUploadedFileTitle,\n+ message: errorMessage);\n+ return null;\n+ }\n+ if (!context.mounted) return null;\n+\n+ final tempUrl = PerAccountStoreWidget.of(context).tryResolveUrl(resultUrl);\n+ if (tempUrl == null) {\n+ showErrorDialog(context: context,\n+ title: zulipLocalizations.errorCouldNotAccessUploadedFileTitle,\n+ message: zulipLocalizations.errorInvalidResponse);\n+ return null;\n+ }\n+\n+ return tempUrl;\n+ }\n+\n static Future subscribeToChannel(BuildContext context, {\n required int channelId,\n }) async {\ndiff --git a/lib/widgets/content.dart b/lib/widgets/content.dart\nindex 2816e90233..4544fc91c4 100644\n--- a/lib/widgets/content.dart\n+++ b/lib/widgets/content.dart\n@@ -1436,6 +1436,12 @@ void _launchUrl(BuildContext context, String urlString) async {\n narrow: internalLink.narrow,\n initAnchorMessageId: internalLink.nearMessageId)));\n \n+ case UserUploadLink():\n+ final tempUrl = await ZulipAction.getFileTemporaryUrl(context, internalLink);\n+ if (!context.mounted) return null;\n+ if (tempUrl == null) return;\n+ await PlatformActions.launchUrl(context, tempUrl);\n+\n case null:\n await PlatformActions.launchUrl(context, url);\n }\n", "test_patch": "diff --git a/test/model/internal_link_test.dart b/test/model/internal_link_test.dart\nindex 74345f9811..c256286b6a 100644\n--- a/test/model/internal_link_test.dart\n+++ b/test/model/internal_link_test.dart\n@@ -586,6 +586,34 @@ void main() {\n });\n });\n });\n+\n+ group('parseInternalLink uploads', () {\n+ for (final (expectParse, urlPath) in [\n+ (true, '/user_uploads/123/abc.pdf'),\n+ (true, '/user_uploads/123/4/ab/5/cde'),\n+ (false, '/user_uploads/123/'),\n+ (false, '/user_uploads/123'),\n+ (false, '/user_uploads/'),\n+ (false, '/user_uploads'),\n+ (false, '/user_uploads//abc.pdf'),\n+ (false, '/user_uploads/-123/abc.pdf'),\n+ (false, '/user_upload/123/abc.pdf'),\n+ ]) {\n+ test('$urlPath -> ${expectParse ? 'parse' : 'reject'}', () {\n+ final store = eg.store();\n+ final url = store.tryResolveUrl(urlPath)!;\n+ final result = parseInternalLink(url, store);\n+ if (!expectParse) {\n+ check(result).isNull();\n+ } else {\n+ check(result).isA();\n+ result as UserUploadLink;\n+ final reconstructedPath = '/user_uploads/${result.realmId}/${result.path}';\n+ check(reconstructedPath).equals(urlPath);\n+ }\n+ });\n+ }\n+ });\n }\n \n extension InternalLinkChecks on Subject {\ndiff --git a/test/widgets/actions_test.dart b/test/widgets/actions_test.dart\nindex 2aa7432280..7c292aa62e 100644\n--- a/test/widgets/actions_test.dart\n+++ b/test/widgets/actions_test.dart\n@@ -11,6 +11,7 @@ import 'package:zulip/api/model/model.dart';\n import 'package:zulip/api/model/narrow.dart';\n import 'package:zulip/api/route/messages.dart';\n import 'package:zulip/model/binding.dart';\n+import 'package:zulip/model/internal_link.dart';\n import 'package:zulip/model/localizations.dart';\n import 'package:zulip/model/narrow.dart';\n import 'package:zulip/model/settings.dart';\n@@ -244,6 +245,27 @@ void main() {\n check(await didPass).isFalse();\n });\n });\n+\n+ group('getFileTemporaryUrl', () {\n+ testWidgets('smoke', (tester) async {\n+ await prepare(tester);\n+ connection.prepare(json: GetFileTemporaryUrlResult(\n+ url: '/temp/s3kr1t-auth-token/paper.pdf').toJson());\n+ final link = parseInternalLink(\n+ store.tryResolveUrl('/user_uploads/123/ab/paper.pdf')!, store);\n+\n+ final future = ZulipAction.getFileTemporaryUrl(context,\n+ link as UserUploadLink);\n+ await tester.pump(Duration.zero);\n+ check(connection.lastRequest).isA()\n+ ..method.equals('GET')\n+ ..url.path.equals('/api/v1/user_uploads/123/ab/paper.pdf')\n+ ..url.query.isEmpty()\n+ ..body.isEmpty();\n+ check(await future).equals(\n+ store.tryResolveUrl('/temp/s3kr1t-auth-token/paper.pdf')!);\n+ });\n+ });\n });\n \n group('PlatformActions', () {\ndiff --git a/test/widgets/content_test.dart b/test/widgets/content_test.dart\nindex 28af496c59..cf3d7a4e1b 100644\n--- a/test/widgets/content_test.dart\n+++ b/test/widgets/content_test.dart\n@@ -9,6 +9,7 @@ import 'package:url_launcher/url_launcher.dart';\n import 'package:zulip/api/core.dart';\n import 'package:zulip/api/model/initial_snapshot.dart';\n import 'package:zulip/api/model/model.dart';\n+import 'package:zulip/api/route/messages.dart';\n import 'package:zulip/model/content.dart';\n import 'package:zulip/model/narrow.dart';\n import 'package:zulip/model/settings.dart';\n@@ -21,6 +22,7 @@ import 'package:zulip/widgets/page.dart';\n import 'package:zulip/widgets/store.dart';\n import 'package:zulip/widgets/text.dart';\n \n+import '../api/fake_api.dart';\n import '../example_data.dart' as eg;\n import '../flutter_checks.dart';\n import '../model/binding.dart';\n@@ -944,6 +946,9 @@ void main() {\n });\n \n group('LinkNode on internal links', () {\n+ late PerAccountStore store;\n+ late FakeApiConnection connection;\n+\n Future>> prepare(WidgetTester tester, String html) async {\n final pushedRoutes = >[];\n final testNavObserver = TestNavigatorObserver()\n@@ -959,12 +964,13 @@ void main() {\n assert(pushedRoutes.length == 1);\n pushedRoutes.removeLast();\n \n- final store = await testBinding.globalStore.perAccount(eg.selfAccount.id);\n+ store = await testBinding.globalStore.perAccount(eg.selfAccount.id);\n+ connection = store.connection as FakeApiConnection;\n await store.addStream(eg.stream(name: 'stream'));\n return pushedRoutes;\n }\n \n- testWidgets('valid internal links are navigated to within app', (tester) async {\n+ testWidgets('narrow links are navigated to within app', (tester) async {\n final pushedRoutes = await prepare(tester,\n '

stream

');\n \n@@ -976,6 +982,22 @@ void main() {\n \n // TODO(#1570): test links with /near/ go to the specific message\n \n+ testWidgets('uploaded-file links are opened with temporary authed URL', (tester) async {\n+ final pushedRoutes = await prepare(tester,\n+ '

paper.pdf

');\n+\n+ final tempUrlString = '/temp/s3kr1t-auth-token/paper.pdf';\n+ final expectedUrl = eg.realmUrl.resolve(tempUrlString);\n+\n+ connection.prepare(json: GetFileTemporaryUrlResult(\n+ url: tempUrlString).toJson());\n+ await tapText(tester, find.text('paper.pdf'));\n+ await tester.pump(Duration.zero);\n+ check(testBinding.takeLaunchUrlCalls())\n+ .single.equals((url: expectedUrl, mode: LaunchMode.inAppBrowserView));\n+ check(pushedRoutes).isEmpty();\n+ });\n+\n testWidgets('invalid internal links are opened in browser', (tester) async {\n // Link is invalid due to `topic` operator missing an operand.\n final pushedRoutes = await prepare(tester,\n@@ -1190,10 +1212,14 @@ void main() {\n }\n \n testWidgets('tapping on audio link opens it in browser', (tester) async {\n- final url = eg.realmUrl.resolve('/user_uploads/2/f2/a_WnijOXIeRnI6OSxo9F6gZM/crab-rave.mp3');\n await prepare(tester, ContentExample.audioInline.html);\n+ final store = await testBinding.globalStore.perAccount(eg.selfAccount.id);\n+ final connection = store.connection as FakeApiConnection;\n \n+ final url = eg.realmUrl.resolve('/temp/token/crab-rave.mp3');\n+ connection.prepare(json: GetFileTemporaryUrlResult(url: url.path).toJson());\n await tapText(tester, find.text('crab-rave.mp3'));\n+ await tester.pump(Duration.zero);\n \n final expectedLaunchMode = defaultTargetPlatform == TargetPlatform.iOS ?\n LaunchMode.externalApplication : LaunchMode.inAppBrowserView;\n", "n2p_tests": "{\"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime TwentyFourHourTimeMode.twentyFourHour\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in spoiler header (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList image with invalid src URL\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in h1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in table column header\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects triple slash: https://example.com///#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/actions_test.dart: PlatformActions launchUrl globalSettings.browserPreference is inApp; use platform default for non-http links (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math fallback to displaying KaTeX source if unsupported KaTeX HTML is bold in bold span\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects triple slash: https://example.com///#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: legacy plain channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in bold context\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h6 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in h1 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain user @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji has strike-through line in strike-through\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink ChannelNarrow / TopicNarrow modern including \\\"channel\\\" operator\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric stream ID and topic: #narrow/channel/123-a/topic/topic1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList content after image cluster\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions link inside HeadingNode\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList image cluster in implicit paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h3\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong domain, realm-like path, narrow-like fragment: https://web.archive.org/web/*/https://example.com/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>\\\" returns expected ChannelNarrow /#narrow/stream/stream/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects same domain, realm-like path, narrow-like fragment: web/*/https://example.com/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h4\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline code smoke: inline code\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji smoke: Unicode emoji, encoded in span element, multiple codepoints\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric stream ID and topic: #narrow/stream/123-a/topic/topic1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong path: user_uploads/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions link containing other spans\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock syntax highlighting: non-bold span (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList single image loading placeholder\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: smoke: quotation\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: WebsitePreview smoke: without title or description\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime clock icon and text are the same color: common case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in plain paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math fallback to displaying KaTeX source if unsupported KaTeX HTML maintains font-size ratio with surrounding text, when falling back to TeX source\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/actions_test.dart: PlatformActions launchUrl ZulipBinding.launchUrl returns false (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock syntax highlighting: bold span (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: WebsitePreview smoke: without description\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric pm user IDs (old operator): #narrow/pm-with/123-mark\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler interactions: spoiler with tappable content (an image) in the header tap image\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageEmbedVideo video preview for vimeo embed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink ChannelNarrow / TopicNarrow legacy including \\\"stream\\\" operator\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/actions_test.dart: ZulipActions markNarrowAsRead smoke test on modern server\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math fallback to displaying KaTeX source if unsupported KaTeX HTML smoke: inline math\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math maintains font-size ratio with surrounding text\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions follow browser preference setting to open URL (variant: TargetPlatform.android)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with port: https://example.com:444/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageTable text alignment in column; with link\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions relative links are resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: InlineAudio tapping on audio link opens it in browser (variant: TargetPlatform.android)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects double slash: https://example.com//#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock smoke: code block without syntax highlighting\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions multiple links in paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: InlineAudio tapping on audio link opens it in browser (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong domain, realm-like path, narrow-like fragment: https://web.archive.org/web/*/https://example.com/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: WebsitePreview smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong domain: https://another.com/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: RealmContentNetworkImage includes auth header if `src` on-realm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageTable bold column header label (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions error dialog if platform cannot open link\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/actions_test.dart: PlatformActions launchUrl globalSettings.browserPreference is inApp; follow the user preference for http links (variant: TargetPlatform.iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageEmbedVideo video preview for youtube embed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in spoiler header\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric stream ID: #narrow/channel/123-check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageTable bold column header label\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects odd scheme, wrong domain, realm-like path, narrow-like fragment: ftp://web.archive.org/web/*/https://example.com/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/actions_test.dart: PlatformActions launchUrl globalSettings.browserPreference is null; use our per-platform defaults for non-HTTP links (variant: TargetPlatform.android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent user @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink CombinedFeedNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: legacy silent channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math smoke: inline math\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) has strike-through line in strike-through\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline code is link-colored in link span\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong path: user_uploads/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime TwentyFourHourTimeMode.twelveHour\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList multiple images\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList image as immediate child in implicit paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in spoiler header (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList multiple clusters of images\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/actions_test.dart: PlatformActions launchUrl globalSettings.browserPreference is null; use our per-platform defaults for HTTP links (variant: TargetPlatform.android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions link nested in other spans\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageInlineVideo tapping on preview opens lightbox\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline code maintains font-size ratio with surrounding text\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h4 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ListNodeWidget list uses correct text baseline alignment\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts legacy: stream name, no ID, topic: #narrow/stream/check/topic/topic1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock smoke: math block\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler interactions: spoiler with tappable content (an image) in the header tap header away from expand/collapse icon (and image)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in bold context (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong domain: https://another.com/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji smoke: Unicode emoji, encoded in span element\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode on internal links uploaded-file links are opened with temporary authed URL\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math fallback to displaying KaTeX source if unsupported KaTeX HTML is bold in bold span (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImageEmoji smoke: custom emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts legacy: stream name, no ID, topic: #narrow/channel/check/topic/topic1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent group @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink MentionsNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock smoke: code block spans with multiple CSS classes\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects double slash: https://example.com//#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts legacy: stream name, no ID: #narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent channel wildcard @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric pm user IDs (new operator): #narrow/dm/123-mark\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime maintains font-size ratio with surrounding text text is scaled\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in table column header\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h3 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock smoke: code block with syntax highlighting\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock smoke: code block, multiline, with syntax highlighting\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in plain paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock displays KaTeX content\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with port: https://example.com:444/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: WebsitePreview smoke: without title\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h2 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageTable header row background color\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects #narrowly: #narrowly/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/actions_test.dart: PlatformActions launchUrl globalSettings.browserPreference is null; use our per-platform defaults for HTTP links (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in table column header (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric stream ID: #narrow/stream/123-check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h5 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in plain paragraph (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>\\\" returns expected ChannelNarrow /#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) smoke: strong/bold\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/actions_test.dart: PlatformActions copyWithPopup Android <13\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode on internal links narrow links are navigated to within app\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock fallback to displaying KaTeX source if unsupported KaTeX HTML\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions can tap a link to open URL (variant: TargetPlatform.android)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in spoiler header\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji smoke: Unicode emoji, not encoded in span element\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler interactions: spoiler with tappable content (an image) in the header tap header on expand/collapse icon\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ListNodeWidget ordered list with custom start\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock syntax highlighting: non-bold span\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline code is bold in bold span (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline code is bold in bold span\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: legacy silent channel wildcard @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink DmNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList single image no thumbnail\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects same domain, realm-like path, narrow-like fragment: web/*/https://example.com/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain group @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts legacy: stream name, no ID: #narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ThematicBreak smoke ThematicBreak\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Heading plain h6\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts ipv4 address: http://192.168.0.1/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent @-topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink StarredMessagesNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions error dialog if invalid URL\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ListNodeWidget ordered list markers have enough space to render completely\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts punycodable host: https://example.\\u092d\\u093e\\u0930\\u0924/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/actions_test.dart: PlatformActions launchUrl globalSettings.browserPreference is external; follow the user preference (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImageEmoji smoke: Zulip extra emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList multiple images no thumbnails\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent @-topic, class order reversed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler smoke: spoiler with plain custom header\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math fallback to displaying KaTeX source if unsupported KaTeX HTML is link-colored in link span\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects odd scheme, wrong domain, realm-like path, narrow-like fragment: ftp://web.archive.org/web/*/https://example.com/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h1 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions can tap a link to open URL (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler smoke: spoiler with default header\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain @-topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>\\\" returns expected ChannelNarrow /#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: RealmContentNetworkImage excludes auth header if `src` off-realm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts ipv4 address: http://192.168.0.1/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji use emoji font (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h5\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: RealmContentNetworkImage throws if no `PerAccountStoreWidget` ancestor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageTable different text alignment in columns\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji use emoji font (variant: TargetPlatform.android)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList single image\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink normalize links to always include a \\\"/\\\" after hostname\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime TwentyFourHourTimeMode.localeDefault\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime maintains font-size ratio with surrounding text clock icon is scaled\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime clock icon and text are the same color: inside link\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode on internal links invalid internal links are opened in browser\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts punycodable host: https://example.\\u092d\\u093e\\u0930\\u0924/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions follow browser preference setting to open URL (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/actions_test.dart: PlatformActions launchUrl globalSettings.browserPreference is inApp; follow the user preference for http links (variant: TargetPlatform.android)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock syntax highlighting: bold span\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: smoke: deleted/strike-through\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in table column header (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: smoke: emphasis/italic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h6\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in plain paragraph (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ListNodeWidget ordered list markers are end-aligned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Heading smoke test for h1, h2, h3, h4, h5\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention maintains font-size ratio with surrounding text\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImageEmoji smoke: custom emoji with invalid URL\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong fragment: #nope\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1890", "org": "zulip", "repo": "zulip-flutter", "number": 1890, "state": "closed", "title": "Confirm before unsubscribing (always, if from action sheet; only sometimes, if from \"All channels\")", "body": "Stacked atop #1887.\r\n\r\n-----\r\n\r\nFixes #1827.\r\nFixes #1878.\r\n\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"aaff63f2ef79ab53a4b7909ee11b0987fb9e3152\"}", "resolved_issues": "[{\"number\": 1878, \"title\": \"Add warning when unsubscribing from private channel using toggle\", \"body\": \"When unsubscribing from a private channel using the unsubscribe option in the three dot menu, the app shows a confirmation dialog with a warning that you might not be able to rejoin.\\n\\nHowever, when unsubscribing using the toggle switch next to the channel name, this warning is not shown. This makes it very easy to accidentally unsubscribe from a private channel by hitting this toggle.\\n\\nI think the toggle switch should show the same warning that the unsubscribe option in the menu does. \\n\\nAlternatively, maybe private channels shouldn't have this toggle switch at all, since the convenience of fast subscribe-unsubscribe doesn't really benefit private channels where you can't subscribe yourself.\\n\\n\\n\"}, {\"number\": 1827, \"title\": \"Confirmation dialog on channel-unsubscribe from action sheet, for any channel\", \"body\": \"We offer an \\\"Unsubscribe\\\" button in the channel action sheet, but it doesn't give a confirmation dialog unless it's a private channel (with refinements of that condition tracked in #1788 and #1786). That dialog exists to guard against leaving channels that you won't be able to rejoin.\\n\\nIt's helpful to guard against accidental unsubscribes for a few other reasons, which apply to any channel:\\n- If you opened the action sheet from a channel row in some views including the inbox and subscribed-channels screen, unsubscribing will make the channel's row disappear, and you'll have to find the channel again to undo the action.\\n- Unsubscribing can be a destructive action even if you're able to resubscribe right away, because its messages are automatically marked as read.\\n\\nIn the soon-to-be-build \\\"All channels\\\" page, the second item doesn't apply, and a confirmation dialog might be annoying if you want to unsubscribe from many channels quickly by switching each channel's switch to \\\"off\\\". We could skip a confirmation dialog on that page, or maybe offer a snackbar with an \\\"undo\\\" button instead.\"}]", "lang": "dart", "problem_statement": "Add warning when unsubscribing from private channel using toggle\nWhen unsubscribing from a private channel using the unsubscribe option in the three dot menu, the app shows a confirmation dialog with a warning that you might not be able to rejoin.\n\nHowever, when unsubscribing using the toggle switch next to the channel name, this warning is not shown. This makes it very easy to accidentally unsubscribe from a private channel by hitting this toggle.\n\nI think the toggle switch should show the same warning that the unsubscribe option in the menu does. \n\nAlternatively, maybe private channels shouldn't have this toggle switch at all, since the convenience of fast subscribe-unsubscribe doesn't really benefit private channels where you can't subscribe yourself.\n\n\n\nConfirmation dialog on channel-unsubscribe from action sheet, for any channel\nWe offer an \"Unsubscribe\" button in the channel action sheet, but it doesn't give a confirmation dialog unless it's a private channel (with refinements of that condition tracked in #1788 and #1786). That dialog exists to guard against leaving channels that you won't be able to rejoin.\n\nIt's helpful to guard against accidental unsubscribes for a few other reasons, which apply to any channel:\n- If you opened the action sheet from a channel row in some views including the inbox and subscribed-channels screen, unsubscribing will make the channel's row disappear, and you'll have to find the channel again to undo the action.\n- Unsubscribing can be a destructive action even if you're able to resubscribe right away, because its messages are automatically marked as read.\n\nIn the soon-to-be-build \"All channels\" page, the second item doesn't apply, and a confirmation dialog might be annoying if you want to unsubscribe from many channels quickly by switching each channel's switch to \"off\". We could skip a confirmation dialog on that page, or maybe offer a snackbar with an \"undo\" button instead.\n", "hints": "Screenshot to clarify what I'm talking about:\n\n\"Screenshot\"\nWarning here when we'd warn from the other UI makes sense to me.\nCan I try this??\n\n/attempt\n@chrisbobbe can I work on this???\n a snack bar like the one whatsapp shows to undo the deleted message action \n\ncan i implement the undo option ???\n\nfor undo option we can \n - unsubscribe the user show him the snackbar when \"undo \" is pressed the resubscribe him and restore settings like final previousSettings = {\n 'isMuted': subscription.isMuted,\n 'notificationSettings': subscription.notificationSettings,\n.... other things here \n};\n- or when unsubscribed we can just take that channel away from user view like cache it and then unsubscribe it if \"undo \" is pressed then take it back to user view instantly as 'unsubscribe' window in short in time !!\n ", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1890", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1878\", \"https://github.com/zulip/zulip-flutter/issues/1827\"]", "test_command": "flutter test test/widgets/action_sheet_test.dart test/widgets/all_channels_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/assets/l10n/app_en.arb b/assets/l10n/app_en.arb\nindex 2570578b6f..05598dab42 100644\n--- a/assets/l10n/app_en.arb\n+++ b/assets/l10n/app_en.arb\n@@ -140,7 +140,7 @@\n \"@unsubscribeConfirmationDialogTitle\": {\n \"description\": \"Title for a confirmation dialog for unsubscribing from a channel.\",\n \"placeholders\": {\n- \"channelName\": {\"type\": \"String\", \"example\": \"mobile\"}\n+ \"channelName\": {\"type\": \"String\", \"example\": \"#mobile\"}\n }\n },\n \"unsubscribeConfirmationDialogMessageCannotResubscribe\": \"Once you leave this channel, you will not be able to rejoin.\",\ndiff --git a/lib/widgets/action_sheet.dart b/lib/widgets/action_sheet.dart\nindex 5d233a527f..c01b8b9937 100644\n--- a/lib/widgets/action_sheet.dart\n+++ b/lib/widgets/action_sheet.dart\n@@ -17,7 +17,6 @@ import '../model/content.dart';\n import '../model/emoji.dart';\n import '../model/internal_link.dart';\n import '../model/narrow.dart';\n-import '../model/realm.dart';\n import 'actions.dart';\n import 'button.dart';\n import 'color.dart';\n@@ -634,45 +633,7 @@ class UnsubscribeButton extends ActionSheetMenuItemButton {\n \n @override\n void onPressed() async {\n- final store = PerAccountStoreWidget.of(pageContext);\n- final subscription = store.subscriptions[channelId];\n- if (subscription == null) return; // TODO could give feedback\n-\n- // TODO(future) check if the self-user is a guest and the channel is not web-public\n- final couldResubscribe = !subscription.inviteOnly\n- || store.selfHasPermissionForGroupSetting(subscription.canSubscribeGroup,\n- GroupSettingType.stream, 'can_subscribe_group');\n- if (!couldResubscribe) {\n- // TODO(#1788) warn if org would lose content access (nobody can subscribe)\n- final zulipLocalizations = ZulipLocalizations.of(pageContext);\n-\n- final dialog = showSuggestedActionDialog(context: pageContext,\n- title: zulipLocalizations.unsubscribeConfirmationDialogTitle(subscription.name),\n- message: zulipLocalizations.unsubscribeConfirmationDialogMessageCannotResubscribe,\n- destructiveActionButton: true,\n- actionButtonText: zulipLocalizations.unsubscribeConfirmationDialogConfirmButton);\n- if (await dialog.result != true) return;\n- if (!pageContext.mounted) return;\n- }\n-\n- try {\n- await unsubscribeFromChannel(PerAccountStoreWidget.of(pageContext).connection,\n- subscriptions: [subscription.name]);\n- } catch (e) {\n- if (!pageContext.mounted) return;\n-\n- String? errorMessage;\n- switch (e) {\n- case ZulipApiException():\n- errorMessage = e.message;\n- // TODO(#741) specific messages for common errors, like network errors\n- // (support with reusable code)\n- default:\n- }\n-\n- final title = ZulipLocalizations.of(pageContext).unsubscribeFailedTitle;\n- showErrorDialog(context: pageContext, title: title, message: errorMessage);\n- }\n+ await ZulipAction.unsubscribeFromChannel(pageContext, channelId: channelId);\n }\n }\n \ndiff --git a/lib/widgets/actions.dart b/lib/widgets/actions.dart\nindex 4c725f9878..dd34564768 100644\n--- a/lib/widgets/actions.dart\n+++ b/lib/widgets/actions.dart\n@@ -7,9 +7,11 @@ import '../api/exception.dart';\n import '../api/model/model.dart';\n import '../api/model/narrow.dart';\n import '../api/route/messages.dart';\n+import '../api/route/channels.dart' as channels_api;\n import '../generated/l10n/zulip_localizations.dart';\n import '../model/binding.dart';\n import '../model/narrow.dart';\n+import '../model/realm.dart';\n import 'dialog.dart';\n import 'store.dart';\n \n@@ -239,6 +241,64 @@ abstract final class ZulipAction {\n \n return fetchedMessage?.content;\n }\n+\n+ /// Unsubscribe from a channel, possibly after a confirmation dialog,\n+ /// showing an error dialog on failure.\n+ ///\n+ /// A confirmation dialog is shown if the user would not have permission\n+ /// to resubscribe.\n+ /// If [alwaysAsk] is true (the default),\n+ /// a confirmation dialog is shown unconditionally.\n+ static Future unsubscribeFromChannel(BuildContext context, {\n+ required int channelId,\n+ bool alwaysAsk = true,\n+ }) async {\n+ final store = PerAccountStoreWidget.of(context);\n+ final subscription = store.subscriptions[channelId];\n+ if (subscription == null) return; // TODO could give feedback\n+\n+ // TODO(future) check if the self-user is a guest and the channel is not web-public\n+ final couldResubscribe = !subscription.inviteOnly\n+ || store.selfHasPermissionForGroupSetting(subscription.canSubscribeGroup,\n+ GroupSettingType.stream, 'can_subscribe_group');\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n+ if (!couldResubscribe) {\n+ // TODO(#1788) warn if org would lose content access (nobody can subscribe)\n+\n+ final dialog = showSuggestedActionDialog(context: context,\n+ title: zulipLocalizations.unsubscribeConfirmationDialogTitle('#${subscription.name}'),\n+ message: zulipLocalizations.unsubscribeConfirmationDialogMessageCannotResubscribe,\n+ destructiveActionButton: true,\n+ actionButtonText: zulipLocalizations.unsubscribeConfirmationDialogConfirmButton);\n+ if (await dialog.result != true) return;\n+ if (!context.mounted) return;\n+ } else if (alwaysAsk) {\n+ final dialog = showSuggestedActionDialog(context: context,\n+ title: zulipLocalizations.unsubscribeConfirmationDialogTitle('#${subscription.name}'),\n+ actionButtonText: zulipLocalizations.unsubscribeConfirmationDialogConfirmButton);\n+ if (await dialog.result != true) return;\n+ if (!context.mounted) return;\n+ }\n+\n+ try {\n+ await channels_api.unsubscribeFromChannel(PerAccountStoreWidget.of(context).connection,\n+ subscriptions: [subscription.name]);\n+ } catch (e) {\n+ if (!context.mounted) return;\n+\n+ String? errorMessage;\n+ switch (e) {\n+ case ZulipApiException():\n+ errorMessage = e.message;\n+ // TODO(#741) specific messages for common errors, like network errors\n+ // (support with reusable code)\n+ default:\n+ }\n+\n+ final title = ZulipLocalizations.of(context).unsubscribeFailedTitle;\n+ showErrorDialog(context: context, title: title, message: errorMessage);\n+ }\n+ }\n }\n \n /// Methods that act through platform APIs and show feedback in the UI.\ndiff --git a/lib/widgets/all_channels.dart b/lib/widgets/all_channels.dart\nindex 7acdbe8521..3aaf0d8baf 100644\n--- a/lib/widgets/all_channels.dart\n+++ b/lib/widgets/all_channels.dart\n@@ -6,6 +6,7 @@ import '../generated/l10n/zulip_localizations.dart';\n import '../log.dart';\n import '../model/channel.dart';\n import 'action_sheet.dart';\n+import 'actions.dart';\n import 'app_bar.dart';\n import 'button.dart';\n import 'icons.dart';\n@@ -137,8 +138,9 @@ class _SubscribeToggle extends StatelessWidget {\n await subscribeToChannel(store.connection,\n subscriptions: [channel.name]);\n } else {\n- await unsubscribeFromChannel(store.connection,\n- subscriptions: [channel.name]);\n+ await ZulipAction.unsubscribeFromChannel(context,\n+ channelId: channel.streamId,\n+ alwaysAsk: false);\n }\n },\n // TODO(#741) interpret API errors for user\ndiff --git a/lib/widgets/dialog.dart b/lib/widgets/dialog.dart\nindex fb93a3d6cc..8a0164d577 100644\n--- a/lib/widgets/dialog.dart\n+++ b/lib/widgets/dialog.dart\n@@ -145,7 +145,7 @@ DialogStatus showErrorDialog({\n DialogStatus showSuggestedActionDialog({\n required BuildContext context,\n required String title,\n- required String message,\n+ String? message,\n required String? actionButtonText,\n bool destructiveActionButton = false,\n }) {\n@@ -154,7 +154,7 @@ DialogStatus showSuggestedActionDialog({\n context: context,\n builder: (BuildContext context) => AlertDialog.adaptive(\n title: Text(title),\n- content: _adaptiveContent(Text(message)),\n+ content: message != null ? _adaptiveContent(Text(message)) : null,\n actions: [\n _adaptiveAction(\n onPressed: () => Navigator.pop(context, null),\n", "test_patch": "diff --git a/test/widgets/action_sheet_test.dart b/test/widgets/action_sheet_test.dart\nindex e03e102cf5..22a4b06d8e 100644\n--- a/test/widgets/action_sheet_test.dart\n+++ b/test/widgets/action_sheet_test.dart\n@@ -573,9 +573,15 @@ void main() {\n \n connection.prepare(json: {});\n await tapButton(tester);\n- await tester.pump(Duration.zero);\n+ await tester.pump();\n \n- checkNoDialog(tester);\n+ final (unsubscribeButton, cancelButton) = checkSuggestedActionDialog(tester,\n+ expectedTitle: 'Unsubscribe from #${channel.name}?',\n+ expectDestructiveActionButton: false,\n+ expectedActionButtonText: 'Unsubscribe');\n+ await tester.tap(find.byWidget(unsubscribeButton));\n+ await tester.pump();\n+ await tester.pump(Duration.zero);\n \n check(connection.lastRequest).isA()\n ..method.equals('DELETE')\n@@ -599,7 +605,7 @@ void main() {\n await tester.pump();\n \n final (unsubscribeButton, cancelButton) = checkSuggestedActionDialog(tester,\n- expectedTitle: 'Unsubscribe from ${channel.name}?',\n+ expectedTitle: 'Unsubscribe from #${channel.name}?',\n expectedMessage: 'Once you leave this channel, you will not be able to rejoin.',\n expectDestructiveActionButton: true,\n expectedActionButtonText: 'Unsubscribe');\ndiff --git a/test/widgets/all_channels_test.dart b/test/widgets/all_channels_test.dart\nindex c824e5fe9b..b47546be40 100644\n--- a/test/widgets/all_channels_test.dart\n+++ b/test/widgets/all_channels_test.dart\n@@ -1,7 +1,10 @@\n+import 'dart:convert';\n+\n import 'package:checks/checks.dart';\n import 'package:flutter/material.dart';\n import 'package:flutter_checks/flutter_checks.dart';\n import 'package:flutter_test/flutter_test.dart';\n+import 'package:http/http.dart' as http;\n import 'package:zulip/api/model/model.dart';\n import 'package:zulip/model/store.dart';\n import 'package:zulip/widgets/all_channels.dart';\n@@ -10,20 +13,25 @@ import 'package:zulip/widgets/button.dart';\n import 'package:zulip/widgets/home.dart';\n import 'package:zulip/widgets/icons.dart';\n import 'package:zulip/widgets/page.dart';\n+import 'package:zulip/widgets/remote_settings.dart';\n import 'package:zulip/widgets/theme.dart';\n \n+import '../api/fake_api.dart';\n import '../api/model/model_checks.dart';\n import '../flutter_checks.dart';\n import '../model/binding.dart';\n import '../example_data.dart' as eg;\n import '../model/test_store.dart';\n+import '../stdlib_checks.dart';\n import 'checks.dart';\n+import 'dialog_checks.dart';\n import 'test_app.dart';\n \n void main() {\n TestZulipBinding.ensureInitialized();\n \n late PerAccountStore store;\n+ late FakeApiConnection connection;\n late TransitionDurationObserver transitionDurationObserver;\n \n final groupSettingWithSelf = eg.groupSetting(members: [eg.selfUser.userId]);\n@@ -40,6 +48,7 @@ void main() {\n );\n await testBinding.globalStore.add(eg.selfAccount, initialSnapshot);\n store = await testBinding.globalStore.perAccount(eg.selfAccount.id);\n+ connection = store.connection as FakeApiConnection;\n \n transitionDurationObserver = TransitionDurationObserver();\n await tester.pumpWidget(TestZulipApp(accountId: eg.selfAccount.id,\n@@ -207,4 +216,79 @@ void main() {\n \n check(find.byType(BottomSheet)).findsOne();\n });\n+\n+ testWidgets('use toggle switch to subscribe/unsubscribe', (tester) async {\n+ final channel = eg.stream();\n+ await setupAllChannelsPage(tester, channels: [channel]);\n+\n+ await tester.tap(find.byType(Toggle));\n+ check(connection.lastRequest).isA()\n+ ..method.equals('POST')\n+ ..url.path.equals('/api/v1/users/me/subscriptions')\n+ ..bodyFields.deepEquals({\n+ 'subscriptions': jsonEncode([{'name': channel.name}]),\n+ });\n+\n+ await store.addSubscription(eg.subscription(channel));\n+ await tester.pump(); // Toggle changes state\n+\n+ await tester.tap(find.byType(Toggle));\n+ check(connection.lastRequest).isA()\n+ ..method.equals('DELETE')\n+ ..url.path.equals('/api/v1/users/me/subscriptions')\n+ ..bodyFields.deepEquals({\n+ 'subscriptions': jsonEncode([channel.name]),\n+ });\n+ });\n+\n+ testWidgets('Toggle \"off\" to unsubscribe, public channel', (tester) async {\n+ final channel = eg.stream(inviteOnly: false);\n+ final subscription = eg.subscription(channel);\n+\n+ await setupAllChannelsPage(tester, channels: [subscription]);\n+\n+ connection.prepare(json: {});\n+ await tester.tap(find.byType(Toggle));\n+ await tester.pump(Duration.zero);\n+ checkNoDialog(tester);\n+ check(connection.lastRequest).isA()\n+ ..method.equals('DELETE')\n+ ..url.path.equals('/api/v1/users/me/subscriptions')\n+ ..bodyFields.deepEquals({\n+ 'subscriptions': jsonEncode([channel.name]),\n+ });\n+ });\n+\n+ testWidgets('Toggle \"off\" to unsubscribe, but without resubscribe permission', (tester) async {\n+ final channel = eg.stream(\n+ inviteOnly: true, canSubscribeGroup: eg.groupSetting(members: []));\n+ final subscription = eg.subscription(channel);\n+\n+ (Widget, Widget) checkConfirmDialog() => checkSuggestedActionDialog(tester,\n+ expectedTitle: 'Unsubscribe from #${channel.name}?',\n+ expectedMessage: 'Once you leave this channel, you will not be able to rejoin.',\n+ expectDestructiveActionButton: true,\n+ expectedActionButtonText: 'Unsubscribe');\n+\n+ await setupAllChannelsPage(tester, channels: [subscription]);\n+\n+ await tester.tap(find.byType(Toggle));\n+ await tester.pump();\n+ final (_, cancelButton) = checkConfirmDialog();\n+ await tester.tap(find.byWidget(cancelButton));\n+ await tester.pumpAndSettle();\n+ check(connection.lastRequest).isNull();\n+ await tester.pump(RemoteSettingBuilder.localEchoIdleTimeout);\n+\n+ await tester.tap(find.byType(Toggle));\n+ await tester.pump();\n+ final (unsubscribeButton, _) = checkConfirmDialog();\n+ await tester.tap(find.byWidget(unsubscribeButton));\n+ check(connection.lastRequest).isA()\n+ ..method.equals('DELETE')\n+ ..url.path.equals('/api/v1/users/me/subscriptions')\n+ ..bodyFields.deepEquals({\n+ 'subscriptions': jsonEncode([channel.name]),\n+ });\n+ });\n }\ndiff --git a/test/widgets/dialog_checks.dart b/test/widgets/dialog_checks.dart\nindex aca3eeffae..b41f6daf79 100644\n--- a/test/widgets/dialog_checks.dart\n+++ b/test/widgets/dialog_checks.dart\n@@ -109,7 +109,7 @@ void checkNoDialog(WidgetTester tester) {\n /// Tap the action button by calling `tester.tap(find.byWidget(actionButton))`.\n (Widget, Widget) checkSuggestedActionDialog(WidgetTester tester, {\n required String expectedTitle,\n- required String expectedMessage,\n+ String? expectedMessage,\n String? expectedActionButtonText,\n bool expectDestructiveActionButton = false,\n }) {\n@@ -121,8 +121,10 @@ void checkNoDialog(WidgetTester tester) {\n final dialog = tester.widget(find.bySubtype());\n tester.widget(find.descendant(matchRoot: true,\n of: find.byWidget(dialog.title!), matching: find.text(expectedTitle)));\n- tester.widget(find.descendant(matchRoot: true,\n- of: find.byWidget(dialog.content!), matching: find.text(expectedMessage)));\n+ if (expectedMessage != null) {\n+ tester.widget(find.descendant(matchRoot: true,\n+ of: find.byWidget(dialog.content!), matching: find.text(expectedMessage)));\n+ }\n \n final actionButton = tester.widget(find.descendant(of: find.byWidget(dialog),\n matching: find.widgetWithText(TextButton, expectedActionButtonText ?? 'Continue')));\n@@ -135,8 +137,10 @@ void checkNoDialog(WidgetTester tester) {\n final dialog = tester.widget(find.byType(CupertinoAlertDialog));\n tester.widget(find.descendant(matchRoot: true,\n of: find.byWidget(dialog.title!), matching: find.text(expectedTitle)));\n- tester.widget(find.descendant(matchRoot: true,\n- of: find.byWidget(dialog.content!), matching: find.text(expectedMessage)));\n+ if (expectedMessage != null) {\n+ tester.widget(find.descendant(matchRoot: true,\n+ of: find.byWidget(dialog.content!), matching: find.text(expectedMessage)));\n+ }\n \n final actionButton = tester.widget(\n find.descendant(\n", "n2p_tests": "{\"/home/zulip-flutter/test/widgets/all_channels_test.dart: Toggle \\\"off\\\" to unsubscribe, public channel\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/all_channels_test.dart: navigate to page from empty subscription list\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"/home/zulip-flutter/test/widgets/all_channels_test.dart: Toggle \\\"off\\\" to unsubscribe, but without resubscribe permission\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet UnsubscribeButton smoke, public channel\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet UnsubscribeButton smoke, private channel\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet SubscribeButton channel subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet UnrevealMutedMessageButton when pressed, unreveals the message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 600, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet UnrevealMutedMessageButton visible if message is from muted sender and revealed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet header muted sender also shown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet MarkChannelAsReadButton happy path from inbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ViewReadReceiptsButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 10, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet DeleteMessageButton cancel confirmation dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: true, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton in topic narrow no error if user lost posting permission after action sheet opened\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons smile removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton not offered in StarredMessagesNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet CopyMessageTextButton can show snackbar on success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet MarkAsUnread onPressed shows error when fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet StarButton star success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons slight_smile removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from recipient header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet MarkAsUnread onPressed on topic move, acts on new topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ShareButton request succeeds; sharing fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton handle empty topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet ChannelFeedButton from recipient header in combined feed: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when msglist empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet showChannelActionSheet show from message-list app bar in topic narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: true, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet showChannelActionSheet show from inbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet TopicListButton happy path from msglist app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton not offered in MentionsNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet CopyMessageTextButton success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton not offered in CombinedFeedNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton in channel narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet DeleteMessageButton visibility shown when user has permission\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton unresolve: weird prefix\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton unmute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet CopyChannelLinkButton copies channel link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet ChannelFeedButton from msglist app bar on channel feed: not visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton unresolve: happy path\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton unfollow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/all_channels_test.dart: sorting/appearance\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet DeleteMessageButton request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet UnrevealMutedMessageButton not visible if message is from normal sender (not muted)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet header poll is rendered\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton mute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ViewReadReceiptsButton realm-level read receipts disabled -> button is absent\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet showChannelActionSheet show from recipient header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: false, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton request fails with an error dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet DeleteMessageButton visibility not shown when user does not have permission\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet StarButton unstar request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads and MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet MarkTopicAsReadButton visible if topic has unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons slight_smile adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton in topic narrow smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet CopyTopicLinkButton copies topic link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 0, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from inbox; message in Unreads and in MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ShareButton request succeeds; sharing succeeds\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet StarButton star request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ShareButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet UnsubscribeButton channel subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ViewReactionsButton not visible if message has no reactions\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet showChannelActionSheet show with no unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet MarkTopicAsReadButton not visible if topic has no unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet CopyMessageTextButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/all_channels_test.dart: navigate to page\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet header message sender and content shown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet DeleteMessageButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton follow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet MarkAsUnread not visible if message is not read\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet TopicListButton not visible from app bar on topic list\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton resolve: request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: Instance of 'CombinedFeedNarrow', realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet SubscribeButton channel not subscribed, without content access\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet ChannelFeedButton from inbox: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton unmuteInMutedChannel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: false, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/all_channels_test.dart: tapping three-dots button opens channel action sheet\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet ChannelFeedButton from app bar on topic list: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet StarButton unstar success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when topic is empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet CopyMessageLinkButton copies message link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet ChannelFeedButton navigates to channel feed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet ChannelFeedButton from subscription list: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet MarkAsUnread onPressed smoke test\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet MarkChannelAsReadButton request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton tap button smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons smile adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet SubscribeButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet showChannelActionSheet show from message-list app bar in channel narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet MarkAsUnread visible if message is read\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons slight_smile request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton unresolve: request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: false, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton in DM narrow smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads but not MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet SubscribeButton channel not subscribed, with content access\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet MessageActionSheetCancelButton pressing the button dismisses the action sheet\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons smile request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet showChannelActionSheet show from topic-list app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet UnsubscribeButton channel not subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons absent if ServerEmojiData not loaded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from inbox; message in Unreads but not in MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet MarkTopicAsReadButton marks topic as read when pressed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton in DM narrow no error if recipient was deactivated while raw-content request in progress\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet CopyTopicLinkButton FL < 271 -> link doesn't contain \\\"with\\\" operator\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: ChannelNarrow(1), realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ViewReactionsButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1887", "org": "zulip", "repo": "zulip-flutter", "number": 1887, "state": "closed", "title": "action_sheet: Check can_subscribe_group for \"Subscribe\" confirmation dialog", "body": "Fixes #1786.\r\n\r\n(Also fill in some test coverage for the change in cf83c9ec6 / #1822.)", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"38a2c63fd3bc5ac7bce88445c3d3e198c6f35a7b\"}", "resolved_issues": "[{\"number\": 1786, \"title\": \"Check group-based permission to subscribe to a channel, as needed\", \"body\": \"We should check the relevant permission:\\n\\n- ~~before deciding to show a \\\"Subscribe\\\" button in the channel action sheet (#1224)~~ (this was done in #1822)\\n- to give a specific warning \\\"you won't have permission to resubscribe\\\" in the confirmation dialog when unsubscribing from a channel (#1224)\\n\\nHelp-center doc: https://zulip.com/help/configure-who-can-subscribe\\n\\n### Prerequisites\\n\\n- #814 \"}]", "lang": "dart", "problem_statement": "Check group-based permission to subscribe to a channel, as needed\nWe should check the relevant permission:\n\n- ~~before deciding to show a \"Subscribe\" button in the channel action sheet (#1224)~~ (this was done in #1822)\n- to give a specific warning \"you won't have permission to resubscribe\" in the confirmation dialog when unsubscribing from a channel (#1224)\n\nHelp-center doc: https://zulip.com/help/configure-who-can-subscribe\n\n### Prerequisites\n\n- #814 \n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/1887", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1786\"]", "test_command": "flutter test test/widgets/action_sheet_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/assets/l10n/app_en.arb b/assets/l10n/app_en.arb\nindex 73bcb373b0..89160f5bad 100644\n--- a/assets/l10n/app_en.arb\n+++ b/assets/l10n/app_en.arb\n@@ -143,9 +143,9 @@\n \"channelName\": {\"type\": \"String\", \"example\": \"mobile\"}\n }\n },\n- \"unsubscribeConfirmationDialogMessageMaybeCannotResubscribe\": \"Once you leave this channel, you might not be able to rejoin.\",\n- \"@unsubscribeConfirmationDialogMessageMaybeCannotResubscribe\": {\n- \"description\": \"Message for a confirmation dialog for unsubscribing from a channel when you might not have permission to resubscribe.\"\n+ \"unsubscribeConfirmationDialogMessageCannotResubscribe\": \"Once you leave this channel, you will not be able to rejoin.\",\n+ \"@unsubscribeConfirmationDialogMessageCannotResubscribe\": {\n+ \"description\": \"Message for a confirmation dialog for unsubscribing from a channel when you will not have permission to resubscribe.\"\n },\n \"unsubscribeConfirmationDialogConfirmButton\": \"Unsubscribe\",\n \"@unsubscribeConfirmationDialogConfirmButton\": {\ndiff --git a/lib/generated/l10n/zulip_localizations.dart b/lib/generated/l10n/zulip_localizations.dart\nindex 44fadaa2ec..a3bf9c2cc7 100644\n--- a/lib/generated/l10n/zulip_localizations.dart\n+++ b/lib/generated/l10n/zulip_localizations.dart\n@@ -341,11 +341,11 @@ abstract class ZulipLocalizations {\n /// **'Unsubscribe from {channelName}?'**\n String unsubscribeConfirmationDialogTitle(String channelName);\n \n- /// Message for a confirmation dialog for unsubscribing from a channel when you might not have permission to resubscribe.\n+ /// Message for a confirmation dialog for unsubscribing from a channel when you will not have permission to resubscribe.\n ///\n /// In en, this message translates to:\n- /// **'Once you leave this channel, you might not be able to rejoin.'**\n- String get unsubscribeConfirmationDialogMessageMaybeCannotResubscribe;\n+ /// **'Once you leave this channel, you will not be able to rejoin.'**\n+ String get unsubscribeConfirmationDialogMessageCannotResubscribe;\n \n /// Label for the 'Unsubscribe' button on a confirmation dialog for unsubscribing from a channel.\n ///\ndiff --git a/lib/generated/l10n/zulip_localizations_ar.dart b/lib/generated/l10n/zulip_localizations_ar.dart\nindex 6c9ef2fcc5..9c67f11fc6 100644\n--- a/lib/generated/l10n/zulip_localizations_ar.dart\n+++ b/lib/generated/l10n/zulip_localizations_ar.dart\n@@ -124,8 +124,8 @@ class ZulipLocalizationsAr extends ZulipLocalizations {\n }\n \n @override\n- String get unsubscribeConfirmationDialogMessageMaybeCannotResubscribe =>\n- 'Once you leave this channel, you might not be able to rejoin.';\n+ String get unsubscribeConfirmationDialogMessageCannotResubscribe =>\n+ 'Once you leave this channel, you will not be able to rejoin.';\n \n @override\n String get unsubscribeConfirmationDialogConfirmButton => 'Unsubscribe';\ndiff --git a/lib/generated/l10n/zulip_localizations_de.dart b/lib/generated/l10n/zulip_localizations_de.dart\nindex 9768e579e5..d693740f43 100644\n--- a/lib/generated/l10n/zulip_localizations_de.dart\n+++ b/lib/generated/l10n/zulip_localizations_de.dart\n@@ -126,8 +126,8 @@ class ZulipLocalizationsDe extends ZulipLocalizations {\n }\n \n @override\n- String get unsubscribeConfirmationDialogMessageMaybeCannotResubscribe =>\n- 'Wenn du diesen Kanal verl\u00e4sst, kannst du sich vielleicht nicht wieder beitreten.';\n+ String get unsubscribeConfirmationDialogMessageCannotResubscribe =>\n+ 'Once you leave this channel, you will not be able to rejoin.';\n \n @override\n String get unsubscribeConfirmationDialogConfirmButton => 'Deabonnieren';\ndiff --git a/lib/generated/l10n/zulip_localizations_en.dart b/lib/generated/l10n/zulip_localizations_en.dart\nindex 81ceadcb9c..18e76a9331 100644\n--- a/lib/generated/l10n/zulip_localizations_en.dart\n+++ b/lib/generated/l10n/zulip_localizations_en.dart\n@@ -124,8 +124,8 @@ class ZulipLocalizationsEn extends ZulipLocalizations {\n }\n \n @override\n- String get unsubscribeConfirmationDialogMessageMaybeCannotResubscribe =>\n- 'Once you leave this channel, you might not be able to rejoin.';\n+ String get unsubscribeConfirmationDialogMessageCannotResubscribe =>\n+ 'Once you leave this channel, you will not be able to rejoin.';\n \n @override\n String get unsubscribeConfirmationDialogConfirmButton => 'Unsubscribe';\ndiff --git a/lib/generated/l10n/zulip_localizations_fr.dart b/lib/generated/l10n/zulip_localizations_fr.dart\nindex 94c4848a9f..2268056038 100644\n--- a/lib/generated/l10n/zulip_localizations_fr.dart\n+++ b/lib/generated/l10n/zulip_localizations_fr.dart\n@@ -126,8 +126,8 @@ class ZulipLocalizationsFr extends ZulipLocalizations {\n }\n \n @override\n- String get unsubscribeConfirmationDialogMessageMaybeCannotResubscribe =>\n- 'Once you leave this channel, you might not be able to rejoin.';\n+ String get unsubscribeConfirmationDialogMessageCannotResubscribe =>\n+ 'Once you leave this channel, you will not be able to rejoin.';\n \n @override\n String get unsubscribeConfirmationDialogConfirmButton => 'Se d\u00e9sinscrire';\ndiff --git a/lib/generated/l10n/zulip_localizations_it.dart b/lib/generated/l10n/zulip_localizations_it.dart\nindex a7b2cdd663..cccd1dc8b1 100644\n--- a/lib/generated/l10n/zulip_localizations_it.dart\n+++ b/lib/generated/l10n/zulip_localizations_it.dart\n@@ -125,8 +125,8 @@ class ZulipLocalizationsIt extends ZulipLocalizations {\n }\n \n @override\n- String get unsubscribeConfirmationDialogMessageMaybeCannotResubscribe =>\n- 'Once you leave this channel, you might not be able to rejoin.';\n+ String get unsubscribeConfirmationDialogMessageCannotResubscribe =>\n+ 'Once you leave this channel, you will not be able to rejoin.';\n \n @override\n String get unsubscribeConfirmationDialogConfirmButton => 'Unsubscribe';\ndiff --git a/lib/generated/l10n/zulip_localizations_ja.dart b/lib/generated/l10n/zulip_localizations_ja.dart\nindex 09a9b822b4..5f6fa404d4 100644\n--- a/lib/generated/l10n/zulip_localizations_ja.dart\n+++ b/lib/generated/l10n/zulip_localizations_ja.dart\n@@ -123,8 +123,8 @@ class ZulipLocalizationsJa extends ZulipLocalizations {\n }\n \n @override\n- String get unsubscribeConfirmationDialogMessageMaybeCannotResubscribe =>\n- '\u3053\u306e\u30c1\u30e3\u30f3\u30cd\u30eb\u3092\u9000\u51fa\u3059\u308b\u3068\u3001\u518d\u3073\u53c2\u52a0\u3067\u304d\u306a\u3044\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002';\n+ String get unsubscribeConfirmationDialogMessageCannotResubscribe =>\n+ 'Once you leave this channel, you will not be able to rejoin.';\n \n @override\n String get unsubscribeConfirmationDialogConfirmButton => '\u30c1\u30e3\u30f3\u30cd\u30eb\u304b\u3089\u9000\u51fa';\ndiff --git a/lib/generated/l10n/zulip_localizations_nb.dart b/lib/generated/l10n/zulip_localizations_nb.dart\nindex 8ee2e9c4da..8653de5c7b 100644\n--- a/lib/generated/l10n/zulip_localizations_nb.dart\n+++ b/lib/generated/l10n/zulip_localizations_nb.dart\n@@ -124,8 +124,8 @@ class ZulipLocalizationsNb extends ZulipLocalizations {\n }\n \n @override\n- String get unsubscribeConfirmationDialogMessageMaybeCannotResubscribe =>\n- 'Once you leave this channel, you might not be able to rejoin.';\n+ String get unsubscribeConfirmationDialogMessageCannotResubscribe =>\n+ 'Once you leave this channel, you will not be able to rejoin.';\n \n @override\n String get unsubscribeConfirmationDialogConfirmButton => 'Unsubscribe';\ndiff --git a/lib/generated/l10n/zulip_localizations_pl.dart b/lib/generated/l10n/zulip_localizations_pl.dart\nindex fcc527a284..98d6b1de53 100644\n--- a/lib/generated/l10n/zulip_localizations_pl.dart\n+++ b/lib/generated/l10n/zulip_localizations_pl.dart\n@@ -126,8 +126,8 @@ class ZulipLocalizationsPl extends ZulipLocalizations {\n }\n \n @override\n- String get unsubscribeConfirmationDialogMessageMaybeCannotResubscribe =>\n- 'Po opuszczeniu kana\u0142u mo\u017cesz utraci\u0107 mo\u017cliwo\u015b\u0107 powrotu.';\n+ String get unsubscribeConfirmationDialogMessageCannotResubscribe =>\n+ 'Once you leave this channel, you will not be able to rejoin.';\n \n @override\n String get unsubscribeConfirmationDialogConfirmButton => 'Odsubskrybuj';\ndiff --git a/lib/generated/l10n/zulip_localizations_ru.dart b/lib/generated/l10n/zulip_localizations_ru.dart\nindex fedbacf98f..7effd9fa73 100644\n--- a/lib/generated/l10n/zulip_localizations_ru.dart\n+++ b/lib/generated/l10n/zulip_localizations_ru.dart\n@@ -126,8 +126,8 @@ class ZulipLocalizationsRu extends ZulipLocalizations {\n }\n \n @override\n- String get unsubscribeConfirmationDialogMessageMaybeCannotResubscribe =>\n- '\u041f\u043e\u043a\u0438\u043d\u0443\u0432 \u044d\u0442\u043e\u0442 \u043a\u0430\u043d\u0430\u043b, \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e, \u0432\u044b \u043d\u0435 \u0441\u043c\u043e\u0436\u0435\u0442\u0435 \u043f\u0440\u0438\u0441\u043e\u0435\u0434\u0438\u043d\u0438\u0442\u044c\u0441\u044f \u0432\u043d\u043e\u0432\u044c.';\n+ String get unsubscribeConfirmationDialogMessageCannotResubscribe =>\n+ 'Once you leave this channel, you will not be able to rejoin.';\n \n @override\n String get unsubscribeConfirmationDialogConfirmButton => '\u041e\u0442\u043f\u0438\u0441\u0430\u0442\u044c\u0441\u044f';\ndiff --git a/lib/generated/l10n/zulip_localizations_sk.dart b/lib/generated/l10n/zulip_localizations_sk.dart\nindex 4201d37be2..14310986f6 100644\n--- a/lib/generated/l10n/zulip_localizations_sk.dart\n+++ b/lib/generated/l10n/zulip_localizations_sk.dart\n@@ -124,8 +124,8 @@ class ZulipLocalizationsSk extends ZulipLocalizations {\n }\n \n @override\n- String get unsubscribeConfirmationDialogMessageMaybeCannotResubscribe =>\n- 'Once you leave this channel, you might not be able to rejoin.';\n+ String get unsubscribeConfirmationDialogMessageCannotResubscribe =>\n+ 'Once you leave this channel, you will not be able to rejoin.';\n \n @override\n String get unsubscribeConfirmationDialogConfirmButton => 'Unsubscribe';\ndiff --git a/lib/generated/l10n/zulip_localizations_sl.dart b/lib/generated/l10n/zulip_localizations_sl.dart\nindex ac70ca61da..8bfc8810cb 100644\n--- a/lib/generated/l10n/zulip_localizations_sl.dart\n+++ b/lib/generated/l10n/zulip_localizations_sl.dart\n@@ -124,8 +124,8 @@ class ZulipLocalizationsSl extends ZulipLocalizations {\n }\n \n @override\n- String get unsubscribeConfirmationDialogMessageMaybeCannotResubscribe =>\n- 'Ko zapustite ta kanal, se morda ne boste mogli znova pridru\u017eiti.';\n+ String get unsubscribeConfirmationDialogMessageCannotResubscribe =>\n+ 'Once you leave this channel, you will not be able to rejoin.';\n \n @override\n String get unsubscribeConfirmationDialogConfirmButton => 'Prekli\u010di naro\u010dnino';\ndiff --git a/lib/generated/l10n/zulip_localizations_uk.dart b/lib/generated/l10n/zulip_localizations_uk.dart\nindex ddfb79ac57..f5b955fb55 100644\n--- a/lib/generated/l10n/zulip_localizations_uk.dart\n+++ b/lib/generated/l10n/zulip_localizations_uk.dart\n@@ -127,8 +127,8 @@ class ZulipLocalizationsUk extends ZulipLocalizations {\n }\n \n @override\n- String get unsubscribeConfirmationDialogMessageMaybeCannotResubscribe =>\n- '\u041f\u0456\u0441\u043b\u044f \u0442\u043e\u0433\u043e, \u044f\u043a \u0432\u0438 \u0437\u0430\u043b\u0438\u0448\u0438\u0442\u0435 \u0446\u0435\u0439 \u043a\u0430\u043d\u0430\u043b, \u0432\u0438, \u043c\u043e\u0436\u043b\u0438\u0432\u043e, \u043d\u0435 \u0437\u043c\u043e\u0436\u0435\u0442\u0435 \u043f\u0440\u0438\u0454\u0434\u043d\u0430\u0442\u0438\u0441\u044f \u0437\u043d\u043e\u0432\u0443.';\n+ String get unsubscribeConfirmationDialogMessageCannotResubscribe =>\n+ 'Once you leave this channel, you will not be able to rejoin.';\n \n @override\n String get unsubscribeConfirmationDialogConfirmButton => '\u0421\u043a\u0430\u0441\u0443\u0432\u0430\u0442\u0438 \u043f\u0456\u0434\u043f\u0438\u0441\u043a\u0443';\ndiff --git a/lib/generated/l10n/zulip_localizations_zh.dart b/lib/generated/l10n/zulip_localizations_zh.dart\nindex f974ce7573..e3f483e560 100644\n--- a/lib/generated/l10n/zulip_localizations_zh.dart\n+++ b/lib/generated/l10n/zulip_localizations_zh.dart\n@@ -124,8 +124,8 @@ class ZulipLocalizationsZh extends ZulipLocalizations {\n }\n \n @override\n- String get unsubscribeConfirmationDialogMessageMaybeCannotResubscribe =>\n- 'Once you leave this channel, you might not be able to rejoin.';\n+ String get unsubscribeConfirmationDialogMessageCannotResubscribe =>\n+ 'Once you leave this channel, you will not be able to rejoin.';\n \n @override\n String get unsubscribeConfirmationDialogConfirmButton => 'Unsubscribe';\n@@ -1254,10 +1254,6 @@ class ZulipLocalizationsZhHansCn extends ZulipLocalizationsZh {\n return '\u786e\u5b9a\u53d6\u6d88\u8ba2\u9605$channelName\u4e48?';\n }\n \n- @override\n- String get unsubscribeConfirmationDialogMessageMaybeCannotResubscribe =>\n- '\u4e00\u65e6\u9000\u51fa\u8be5\u9891\u9053\uff0c\u60a8\u53ef\u80fd\u65e0\u6cd5\u91cd\u65b0\u52a0\u5165\u3002';\n-\n @override\n String get unsubscribeConfirmationDialogConfirmButton => '\u53d6\u6d88\u8ba2\u9605';\n \n@@ -2342,10 +2338,6 @@ class ZulipLocalizationsZhHantTw extends ZulipLocalizationsZh {\n return '\u78ba\u5b9a\u8981\u53d6\u6d88\u8a02\u95b1 $channelName \u55ce\uff1f';\n }\n \n- @override\n- String get unsubscribeConfirmationDialogMessageMaybeCannotResubscribe =>\n- '\u4e00\u65e6\u60a8\u96e2\u958b\u6b64\u983b\u9053\uff0c\u53ef\u80fd\u7121\u6cd5\u91cd\u65b0\u52a0\u5165\u3002';\n-\n @override\n String get unsubscribeConfirmationDialogConfirmButton => '\u53d6\u6d88\u8a02\u95b1';\n \ndiff --git a/lib/widgets/action_sheet.dart b/lib/widgets/action_sheet.dart\nindex 8191f58069..5d233a527f 100644\n--- a/lib/widgets/action_sheet.dart\n+++ b/lib/widgets/action_sheet.dart\n@@ -17,6 +17,7 @@ import '../model/content.dart';\n import '../model/emoji.dart';\n import '../model/internal_link.dart';\n import '../model/narrow.dart';\n+import '../model/realm.dart';\n import 'actions.dart';\n import 'button.dart';\n import 'color.dart';\n@@ -633,20 +634,21 @@ class UnsubscribeButton extends ActionSheetMenuItemButton {\n \n @override\n void onPressed() async {\n- final subscription = PerAccountStoreWidget.of(pageContext).subscriptions[channelId];\n+ final store = PerAccountStoreWidget.of(pageContext);\n+ final subscription = store.subscriptions[channelId];\n if (subscription == null) return; // TODO could give feedback\n \n- // TODO(#1786) check group-based permission to subscribe, then replace\n- // error message with a new one saying \"will not\" instead of \"might not\"\n // TODO(future) check if the self-user is a guest and the channel is not web-public\n- final couldResubscribe = !subscription.inviteOnly;\n+ final couldResubscribe = !subscription.inviteOnly\n+ || store.selfHasPermissionForGroupSetting(subscription.canSubscribeGroup,\n+ GroupSettingType.stream, 'can_subscribe_group');\n if (!couldResubscribe) {\n // TODO(#1788) warn if org would lose content access (nobody can subscribe)\n final zulipLocalizations = ZulipLocalizations.of(pageContext);\n \n final dialog = showSuggestedActionDialog(context: pageContext,\n title: zulipLocalizations.unsubscribeConfirmationDialogTitle(subscription.name),\n- message: zulipLocalizations.unsubscribeConfirmationDialogMessageMaybeCannotResubscribe,\n+ message: zulipLocalizations.unsubscribeConfirmationDialogMessageCannotResubscribe,\n destructiveActionButton: true,\n actionButtonText: zulipLocalizations.unsubscribeConfirmationDialogConfirmButton);\n if (await dialog.result != true) return;\n", "test_patch": "diff --git a/test/model/test_store.dart b/test/model/test_store.dart\nindex e706f3139f..faf62412e4 100644\n--- a/test/model/test_store.dart\n+++ b/test/model/test_store.dart\n@@ -319,6 +319,19 @@ extension PerAccountStoreTestExtension on PerAccountStore {\n await handleEvent(ChannelCreateEvent(id: 1, streams: streams));\n }\n \n+ Future updateChannel(\n+ int channelId,\n+ ChannelPropertyName property,\n+ Object? value,\n+ ) async {\n+ await handleEvent(ChannelUpdateEvent(\n+ id: 1,\n+ streamId: channelId,\n+ name: 'some channel name', // (not true, of course, but that's fine)\n+ property: property,\n+ value: value));\n+ }\n+\n Future addSubscription(Subscription subscription) async {\n await addSubscriptions([subscription]);\n }\ndiff --git a/test/widgets/action_sheet_test.dart b/test/widgets/action_sheet_test.dart\nindex 9866b9dc10..e03e102cf5 100644\n--- a/test/widgets/action_sheet_test.dart\n+++ b/test/widgets/action_sheet_test.dart\n@@ -341,14 +341,30 @@ void main() {\n await tester.pump(); // [MenuItemButton.onPressed] called in a post-frame callback: flutter/flutter@e4a39fa2e\n }\n \n- testWidgets('channel not subscribed', (tester) async {\n+ testWidgets('channel not subscribed, with content access', (tester) async {\n await prepare();\n final narrow = ChannelNarrow(someChannel.streamId);\n await store.removeSubscription(narrow.streamId);\n+ check(store.selfHasContentAccess(someChannel)).isTrue();\n await showFromMsglistAppBar(tester, narrow: narrow);\n checkButton('Subscribe');\n });\n \n+ testWidgets('channel not subscribed, without content access', (tester) async {\n+ final privateChannel = eg.stream(inviteOnly: true);\n+ await prepare();\n+ await store.addStream(privateChannel);\n+ await store.updateChannel(privateChannel.streamId,\n+ ChannelPropertyName.canSubscribeGroup, eg.groupSetting(members: []));\n+ await store.updateChannel(privateChannel.streamId,\n+ ChannelPropertyName.canAddSubscribersGroup, eg.groupSetting(members: []));\n+ final narrow = ChannelNarrow(privateChannel.streamId);\n+ check(store.selfHasContentAccess(privateChannel)).isFalse();\n+ await showFromMsglistAppBar(tester,\n+ channel: privateChannel, narrow: narrow);\n+ checkNoButton('Subscribe');\n+ });\n+\n testWidgets('channel subscribed', (tester) async {\n await prepare();\n final narrow = ChannelNarrow(someChannel.streamId);\n@@ -584,7 +600,7 @@ void main() {\n \n final (unsubscribeButton, cancelButton) = checkSuggestedActionDialog(tester,\n expectedTitle: 'Unsubscribe from ${channel.name}?',\n- expectedMessage: 'Once you leave this channel, you might not be able to rejoin.',\n+ expectedMessage: 'Once you leave this channel, you will not be able to rejoin.',\n expectDestructiveActionButton: true,\n expectedActionButtonText: 'Unsubscribe');\n await tester.tap(find.byWidget(unsubscribeButton));\n", "n2p_tests": "{}", "f2p_tests": "{\"channel action sheet UnsubscribeButton smoke, private channel\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"message action sheet StarButton star success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from app bar on topic list: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet UnsubscribeButton channel subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet MarkChannelAsReadButton request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton mute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageTextButton success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: false, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from message-list app bar in channel narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet header muted sender also shown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when topic is empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton unresolve: weird prefix\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from inbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ShareButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: true, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet SubscribeButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet DeleteMessageButton visibility shown when user has permission\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from inbox; message in Unreads but not in MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from recipient header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread visible if message is read\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from recipient header in combined feed: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet MarkTopicAsReadButton visible if topic has unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet CopyTopicLinkButton copies topic link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons absent if ServerEmojiData not loaded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons slight_smile removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in DM narrow smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: Instance of 'CombinedFeedNarrow', realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons smile removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet StarButton unstar success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton not offered in StarredMessagesNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet DeleteMessageButton request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads but not MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton unfollow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: ChannelNarrow(1), realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: true, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from inbox: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton tap button smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet UnrevealMutedMessageButton when pressed, unreveals the message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet header poll is rendered\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet UnsubscribeButton smoke, public channel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet StarButton star request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads and MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton not offered in MentionsNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet TopicListButton happy path from msglist app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ShareButton request succeeds; sharing succeeds\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread onPressed on topic move, acts on new topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 0, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet header message sender and content shown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread not visible if message is not read\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons slight_smile request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton request fails with an error dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton not offered in CombinedFeedNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons slight_smile adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet UnsubscribeButton channel not subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet UnrevealMutedMessageButton visible if message is from muted sender and revealed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from msglist app bar on channel feed: not visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when msglist empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton unresolve: request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet MarkChannelAsReadButton happy path from inbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet UnrevealMutedMessageButton not visible if message is from normal sender (not muted)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageTextButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet MarkTopicAsReadButton not visible if topic has no unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from topic-list app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton unresolve: happy path\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet DeleteMessageButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet DeleteMessageButton visibility not shown when user does not have permission\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 10, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in topic narrow smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: false, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton unmute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet CopyChannelLinkButton copies channel link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: false, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ViewReactionsButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton unmuteInMutedChannel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ViewReactionsButton not visible if message has no reactions\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet MarkTopicAsReadButton marks topic as read when pressed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from recipient header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread onPressed shows error when fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from subscription list: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet DeleteMessageButton cancel confirmation dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet TopicListButton not visible from app bar on topic list\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show with no unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton handle empty topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton resolve: request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread onPressed smoke test\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet SubscribeButton channel subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons smile request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ViewReadReceiptsButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MessageActionSheetCancelButton pressing the button dismisses the action sheet\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton follow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from message-list app bar in topic narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons smile adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet StarButton unstar request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from inbox; message in Unreads and in MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in topic narrow no error if user lost posting permission after action sheet opened\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in DM narrow no error if recipient was deactivated while raw-content request in progress\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet SubscribeButton channel not subscribed, without content access\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton navigates to channel feed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ViewReadReceiptsButton realm-level read receipts disabled -> button is absent\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet CopyTopicLinkButton FL < 271 -> link doesn't contain \\\"with\\\" operator\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ShareButton request succeeds; sharing fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet SubscribeButton channel not subscribed, with content access\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageLinkButton copies message link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 600, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in channel narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from subscription list\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageTextButton can show snackbar on success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1879", "org": "zulip", "repo": "zulip-flutter", "number": 1879, "state": "closed", "title": "home: Add icons label on main navigation bar.", "body": "**Key Changes:** (Screenshots Outdated) \r\n\r\n| Dark Theme | Light Theme |\r\n|---------|---------|\r\n| ![1000051916](https://github.com/user-attachments/assets/a85fada6-7038-45a0-a595-13bcc386197e) | ![1000051917](https://github.com/user-attachments/assets/8e1cd84f-4641-42c1-b5d9-63ff21a84ebb) |\r\n\r\n\r\n\r\n\r\nI have kept the height of the Navigation to be fixed because a fully dynamic navigation bar height that adjusts based on label content across languages is not feasibly after having done some feasibility study. The UI jitter when the bar changes its size suddenly when the user changes the app language is extremely unlikely to be solved and can negatively impact user experience hence even in day to day app these types of dynamic navigation bar are not used.\r\n\r\nintegration of the page bodies and semantics has been done\r\n\r\nDiscussion : [#mobile > Flutter feedback - Icons in app @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/Flutter.20feedback.20-.20Icons.20in.20app/near/2219685)\r\n \r\n\r\n- Language Consistency for all language for the added labels will be fixed after receiving feedback from the Moderators about the Implementation of the solution.\r\n\r\nThank you\r\n\r\n[Figma Design Link](https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=11677-62351&t=z0Pq39n8h1rzALdc-4)\r\n\r\nFixes #1857\r\nFixes #1960", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"49d6226eca4641d6253534c3b20bd0a8ba36977f\"}", "resolved_issues": "[{\"number\": 1857, \"title\": \"Label icons on main nav bar\", \"body\": \"In the bottom nav bar on the home screens of the app, we want to show a text label along with the icon for each button.\\n\\nThis should also resolve the lack of such labels for screen readers, which was one of the points noted at https://github.com/zulip/zulip-flutter/issues/535#issuecomment-2973276995 .\\n\\n### References\\n* Chat thread with user request: [#mobile > Flutter feedback - Icons in app](https://chat.zulip.org/#narrow/channel/48-mobile/topic/Flutter.20feedback.20-.20Icons.20in.20app/with/2223128)\\n* Design: [#mobile > Flutter feedback - Icons in app @ \\ud83d\\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/Flutter.20feedback.20-.20Icons.20in.20app/near/2219685)\\n\\n\"}, {\"number\": 1960, \"title\": \"Semantic labels on main nav bar\", \"body\": \"This was found in https://github.com/zulip/zulip-flutter/issues/535#issuecomment-2973276995 when investigating the app's behavior with a screen reader:\\n> The home page bottom tabs do not have labels. The caption for each of them is just: \\\"button, double tap to activate\\\".\\n\\nWe should fix this.\\n\\nThis might get fixed as part of the same change as:\\n* #1857\\n\\n\"}]", "lang": "dart", "problem_statement": "Label icons on main nav bar\nIn the bottom nav bar on the home screens of the app, we want to show a text label along with the icon for each button.\n\nThis should also resolve the lack of such labels for screen readers, which was one of the points noted at https://github.com/zulip/zulip-flutter/issues/535#issuecomment-2973276995 .\n\n### References\n* Chat thread with user request: [#mobile > Flutter feedback - Icons in app](https://chat.zulip.org/#narrow/channel/48-mobile/topic/Flutter.20feedback.20-.20Icons.20in.20app/with/2223128)\n* Design: [#mobile > Flutter feedback - Icons in app @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/Flutter.20feedback.20-.20Icons.20in.20app/near/2219685)\n\n\nSemantic labels on main nav bar\nThis was found in https://github.com/zulip/zulip-flutter/issues/535#issuecomment-2973276995 when investigating the app's behavior with a screen reader:\n> The home page bottom tabs do not have labels. The caption for each of them is just: \"button, double tap to activate\".\n\nWe should fix this.\n\nThis might get fixed as part of the same change as:\n* #1857\n\n\n", "hints": "\n@MritunjayTiwari14, would you check whether your #1879 resolves this issue, and if so then mark it as doing so?\n\nYes @gnprice , it can also fix it. In most app i checked out like Google and Whatsapp using TalkBack On. I noticed that both of them uses ` Tab` as a convention to announce the different bottom navbar items. So i am implementing the same in Zulip-flutter.", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1879", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1857\", \"https://github.com/zulip/zulip-flutter/issues/1960\"]", "test_command": "flutter test test/widgets/home_test.dart test/widgets/recent_dm_conversations_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/assets/l10n/app_en.arb b/assets/l10n/app_en.arb\nindex 45c7e6ca94..38b49c2edd 100644\n--- a/assets/l10n/app_en.arb\n+++ b/assets/l10n/app_en.arb\n@@ -1261,6 +1261,10 @@\n \"@wildcardMentionTopicDescription\": {\n \"description\": \"Description for \\\"@topic\\\" wildcard-mention autocomplete options when writing a channel message.\"\n },\n+ \"navBarMenuLabel\": \"Menu\",\n+ \"@navBarMenuLabel\": {\n+ \"description\": \"Label for the Menu button on the bottom navigation bar.\"\n+ },\n \"messageIsEditedLabel\": \"EDITED\",\n \"@messageIsEditedLabel\": {\n \"description\": \"Label for an edited message. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)\"\ndiff --git a/lib/generated/l10n/zulip_localizations.dart b/lib/generated/l10n/zulip_localizations.dart\nindex ce46ae6e7d..fe79921c07 100644\n--- a/lib/generated/l10n/zulip_localizations.dart\n+++ b/lib/generated/l10n/zulip_localizations.dart\n@@ -1833,6 +1833,12 @@ abstract class ZulipLocalizations {\n /// **'Notify topic'**\n String get wildcardMentionTopicDescription;\n \n+ /// Label for the Menu button on the bottom navigation bar.\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Menu'**\n+ String get navBarMenuLabel;\n+\n /// Label for an edited message. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)\n ///\n /// In en, this message translates to:\ndiff --git a/lib/generated/l10n/zulip_localizations_ar.dart b/lib/generated/l10n/zulip_localizations_ar.dart\nindex d4c35968bf..5e69a181da 100644\n--- a/lib/generated/l10n/zulip_localizations_ar.dart\n+++ b/lib/generated/l10n/zulip_localizations_ar.dart\n@@ -1054,6 +1054,9 @@ class ZulipLocalizationsAr extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => '\u0625\u062e\u0637\u0627\u0631 \u0627\u0644\u0645\u0648\u0636\u0648\u0639';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => 'EDITED';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_de.dart b/lib/generated/l10n/zulip_localizations_de.dart\nindex 0a43ac50b5..241e886e55 100644\n--- a/lib/generated/l10n/zulip_localizations_de.dart\n+++ b/lib/generated/l10n/zulip_localizations_de.dart\n@@ -1073,6 +1073,9 @@ class ZulipLocalizationsDe extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => 'Thema benachrichtigen';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => 'BEARBEITET';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_el.dart b/lib/generated/l10n/zulip_localizations_el.dart\nindex c7725a64e2..ce72dc77bf 100644\n--- a/lib/generated/l10n/zulip_localizations_el.dart\n+++ b/lib/generated/l10n/zulip_localizations_el.dart\n@@ -1054,6 +1054,9 @@ class ZulipLocalizationsEl extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => 'Notify topic';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => 'EDITED';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_en.dart b/lib/generated/l10n/zulip_localizations_en.dart\nindex 334df16239..6d10362555 100644\n--- a/lib/generated/l10n/zulip_localizations_en.dart\n+++ b/lib/generated/l10n/zulip_localizations_en.dart\n@@ -1054,6 +1054,9 @@ class ZulipLocalizationsEn extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => 'Notify topic';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => 'EDITED';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_es.dart b/lib/generated/l10n/zulip_localizations_es.dart\nindex f45d3db383..80098d557f 100644\n--- a/lib/generated/l10n/zulip_localizations_es.dart\n+++ b/lib/generated/l10n/zulip_localizations_es.dart\n@@ -1054,6 +1054,9 @@ class ZulipLocalizationsEs extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => 'Notify topic';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => 'EDITED';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_fr.dart b/lib/generated/l10n/zulip_localizations_fr.dart\nindex 0d64c3b679..adb41177b2 100644\n--- a/lib/generated/l10n/zulip_localizations_fr.dart\n+++ b/lib/generated/l10n/zulip_localizations_fr.dart\n@@ -1070,6 +1070,9 @@ class ZulipLocalizationsFr extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => 'Notify topic';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => 'EDITED';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_he.dart b/lib/generated/l10n/zulip_localizations_he.dart\nindex 5e1609ccba..e59309be3e 100644\n--- a/lib/generated/l10n/zulip_localizations_he.dart\n+++ b/lib/generated/l10n/zulip_localizations_he.dart\n@@ -1054,6 +1054,9 @@ class ZulipLocalizationsHe extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => 'Notify topic';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => 'EDITED';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_hu.dart b/lib/generated/l10n/zulip_localizations_hu.dart\nindex aacb5d9d8d..6a3c11465c 100644\n--- a/lib/generated/l10n/zulip_localizations_hu.dart\n+++ b/lib/generated/l10n/zulip_localizations_hu.dart\n@@ -1054,6 +1054,9 @@ class ZulipLocalizationsHu extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => 'Notify topic';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => 'EDITED';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_it.dart b/lib/generated/l10n/zulip_localizations_it.dart\nindex 4fc1ba6e42..cd27a1daa7 100644\n--- a/lib/generated/l10n/zulip_localizations_it.dart\n+++ b/lib/generated/l10n/zulip_localizations_it.dart\n@@ -1067,6 +1067,9 @@ class ZulipLocalizationsIt extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => 'Notifica argomento';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => 'MODIFICATO';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_ja.dart b/lib/generated/l10n/zulip_localizations_ja.dart\nindex e779208dcf..d11aedf19f 100644\n--- a/lib/generated/l10n/zulip_localizations_ja.dart\n+++ b/lib/generated/l10n/zulip_localizations_ja.dart\n@@ -1029,6 +1029,9 @@ class ZulipLocalizationsJa extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => '\u30c8\u30d4\u30c3\u30af\u53c2\u52a0\u8005\u306b\u901a\u77e5';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => '\u7de8\u96c6\u6e08\u307f';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_nb.dart b/lib/generated/l10n/zulip_localizations_nb.dart\nindex 3d9b7990e7..162ca9e677 100644\n--- a/lib/generated/l10n/zulip_localizations_nb.dart\n+++ b/lib/generated/l10n/zulip_localizations_nb.dart\n@@ -1054,6 +1054,9 @@ class ZulipLocalizationsNb extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => 'Notify topic';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => 'EDITED';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_pl.dart b/lib/generated/l10n/zulip_localizations_pl.dart\nindex ea8d3b4fd8..40682171b2 100644\n--- a/lib/generated/l10n/zulip_localizations_pl.dart\n+++ b/lib/generated/l10n/zulip_localizations_pl.dart\n@@ -1070,6 +1070,9 @@ class ZulipLocalizationsPl extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => 'Powiadom w w\u0105tku';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => 'ZMIENIONO';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_ru.dart b/lib/generated/l10n/zulip_localizations_ru.dart\nindex 17f82a0d26..04f8903b91 100644\n--- a/lib/generated/l10n/zulip_localizations_ru.dart\n+++ b/lib/generated/l10n/zulip_localizations_ru.dart\n@@ -1083,6 +1083,9 @@ class ZulipLocalizationsRu extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => '\u041e\u043f\u043e\u0432\u0435\u0441\u0442\u0438\u0442\u044c \u0442\u0435\u043c\u0443';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => '\u0418\u0417\u041c\u0415\u041d\u0415\u041d\u041e';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_sk.dart b/lib/generated/l10n/zulip_localizations_sk.dart\nindex 092070d0f3..e2dc542fc5 100644\n--- a/lib/generated/l10n/zulip_localizations_sk.dart\n+++ b/lib/generated/l10n/zulip_localizations_sk.dart\n@@ -1056,6 +1056,9 @@ class ZulipLocalizationsSk extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => 'Notify topic';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => 'UPRAVEN\u00c9';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_sl.dart b/lib/generated/l10n/zulip_localizations_sl.dart\nindex f18f440748..6f9d8343ca 100644\n--- a/lib/generated/l10n/zulip_localizations_sl.dart\n+++ b/lib/generated/l10n/zulip_localizations_sl.dart\n@@ -1091,6 +1091,9 @@ class ZulipLocalizationsSl extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => 'Obvesti udele\u017eence teme';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => 'UREJENO';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_uk.dart b/lib/generated/l10n/zulip_localizations_uk.dart\nindex 3810960b63..84df26a42e 100644\n--- a/lib/generated/l10n/zulip_localizations_uk.dart\n+++ b/lib/generated/l10n/zulip_localizations_uk.dart\n@@ -1071,6 +1071,9 @@ class ZulipLocalizationsUk extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => '\u041f\u043e\u0432\u0456\u0434\u043e\u043c\u0438\u0442\u0438 \u043a\u0430\u043d\u0430\u043b';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => '\u0420\u0415\u0414\u0410\u0413\u041e\u0412\u0410\u041d\u041e';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_zh.dart b/lib/generated/l10n/zulip_localizations_zh.dart\nindex 5db806ac0e..b08c25004e 100644\n--- a/lib/generated/l10n/zulip_localizations_zh.dart\n+++ b/lib/generated/l10n/zulip_localizations_zh.dart\n@@ -1054,6 +1054,9 @@ class ZulipLocalizationsZh extends ZulipLocalizations {\n @override\n String get wildcardMentionTopicDescription => 'Notify topic';\n \n+ @override\n+ String get navBarMenuLabel => 'Menu';\n+\n @override\n String get messageIsEditedLabel => 'EDITED';\n \ndiff --git a/lib/widgets/home.dart b/lib/widgets/home.dart\nindex 62c09c0857..c74da27a86 100644\n--- a/lib/widgets/home.dart\n+++ b/lib/widgets/home.dart\n@@ -1,6 +1,7 @@\n import 'dart:async';\n \n import 'package:flutter/material.dart';\n+import 'package:flutter/rendering.dart';\n \n import '../generated/l10n/zulip_localizations.dart';\n import '../model/narrow.dart';\n@@ -47,6 +48,9 @@ class HomePage extends StatefulWidget {\n HomePage.buildRoute(accountId: accountId)));\n }\n \n+ static String contentSemanticsIdentifier = 'home-page-content';\n+ static String titleSemanticsIdentifier = 'home-page-title';\n+\n @override\n State createState() => _HomePageState();\n }\n@@ -93,58 +97,97 @@ class _HomePageState extends State {\n (_HomePageTab.directMessages, RecentDmConversationsPageBody()),\n ];\n \n- _NavigationBarButton button(_HomePageTab tab, IconData icon) {\n- return _NavigationBarButton(icon: icon,\n- selected: _tab.value == tab,\n- onPressed: () {\n- _tab.value = tab;\n- });\n- }\n+ return Scaffold(\n+ appBar: ZulipAppBar(titleSpacing: 16,\n+ title: Semantics(\n+ identifier: HomePage.titleSemanticsIdentifier,\n+ namesRoute: true,\n+ child: Text(_currentTabTitle))),\n+ body: Semantics(\n+ role: SemanticsRole.tabPanel,\n+ identifier: HomePage.contentSemanticsIdentifier,\n+ container: true,\n+ explicitChildNodes: true,\n+ child: Stack(\n+ children: [\n+ for (final (tab, body) in pageBodies)\n+ Offstage(offstage: tab != _tab.value, child: body),\n+ ])),\n+ bottomNavigationBar: _BottomNavBar(tabNotifier: _tab));\n+ }\n+}\n+\n+class _BottomNavBar extends StatelessWidget {\n+ const _BottomNavBar({required this.tabNotifier});\n+\n+ final ValueNotifier<_HomePageTab> tabNotifier;\n+\n+ _NavigationBarButton _button({\n+ required _HomePageTab tab,\n+ required IconData icon,\n+ required String label,\n+ }) {\n+ return _NavigationBarButton(icon: icon,\n+ label: label,\n+ selected: tabNotifier.value == tab,\n+ onPressed: () {\n+ tabNotifier.value = tab;\n+ });\n+ }\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ final designVariables = DesignVariables.of(context);\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n \n // TODO(a11y): add tooltips for these buttons\n final navigationBarButtons = [\n- button(_HomePageTab.inbox, ZulipIcons.inbox),\n- _NavigationBarButton( icon: ZulipIcons.message_feed,\n+ _button(tab: _HomePageTab.inbox,\n+ icon: ZulipIcons.inbox,\n+ label: zulipLocalizations.inboxPageTitle),\n+ _NavigationBarButton(icon: ZulipIcons.message_feed,\n+ label: zulipLocalizations.combinedFeedPageTitle,\n selected: false,\n onPressed: () => Navigator.push(context,\n MessageListPage.buildRoute(context: context,\n narrow: const CombinedFeedNarrow()))),\n- button(_HomePageTab.channels, ZulipIcons.hash_italic),\n+ _button(tab: _HomePageTab.channels,\n+ icon: ZulipIcons.hash_italic,\n+ label: zulipLocalizations.channelsPageTitle),\n // TODO(#1094): Users\n- button(_HomePageTab.directMessages, ZulipIcons.two_person),\n- _NavigationBarButton( icon: ZulipIcons.menu,\n+ _button(tab: _HomePageTab.directMessages,\n+ icon: ZulipIcons.two_person,\n+ label: zulipLocalizations.recentDmConversationsPageTitle),\n+ _NavigationBarButton(icon: ZulipIcons.menu,\n+ label: zulipLocalizations.navBarMenuLabel,\n selected: false,\n- onPressed: () => _showMainMenu(context, tabNotifier: _tab)),\n+ onPressed: () => _showMainMenu(context, tabNotifier: tabNotifier)),\n ];\n \n- final designVariables = DesignVariables.of(context);\n- return Scaffold(\n- appBar: ZulipAppBar(titleSpacing: 16,\n- title: Text(_currentTabTitle)),\n- body: Stack(\n- children: [\n- for (final (tab, body) in pageBodies)\n- // TODO(#535): Decide if we find it helpful to use something like\n- // [SemanticsProperties.namesRoute] to structure this UI better\n- // for screen-reader software.\n- Offstage(offstage: tab != _tab.value, child: body),\n- ]),\n- bottomNavigationBar: DecoratedBox(\n- decoration: BoxDecoration(\n- border: Border(top: BorderSide(color: designVariables.borderBar)),\n- color: designVariables.bgBotBar),\n- child: SafeArea(\n- child: SizedBox(height: 48,\n- child: Center(\n- child: ConstrainedBox(\n- // TODO(design): determine a suitable max width for bottom nav bar\n- constraints: const BoxConstraints(maxWidth: 600),\n- child: Row(\n- crossAxisAlignment: CrossAxisAlignment.stretch,\n- children: [\n- for (final navigationBarButton in navigationBarButtons)\n- Expanded(child: navigationBarButton),\n- ])))))));\n+ Widget result = DecoratedBox(\n+ decoration: BoxDecoration(\n+ border: Border(top: BorderSide(color: designVariables.borderBar)),\n+ color: designVariables.bgBotBar),\n+ child: SafeArea(\n+ child: Center(\n+ heightFactor: 1,\n+ child: ConstrainedBox(\n+ // TODO(design): determine a suitable max width for bottom nav bar\n+ constraints: const BoxConstraints(maxWidth: 600, minHeight: 48),\n+ child: Row(\n+ crossAxisAlignment: CrossAxisAlignment.start,\n+ children: [\n+ for (final navigationBarButton in navigationBarButtons)\n+ Expanded(child: navigationBarButton),\n+ ])))));\n+\n+ result = Semantics(\n+ container: true,\n+ explicitChildNodes: true,\n+ role: SemanticsRole.tabBar,\n+ child: result);\n+\n+ return result;\n }\n }\n \n@@ -229,37 +272,62 @@ class _LoadingPlaceholderPageState extends State<_LoadingPlaceholderPage> {\n class _NavigationBarButton extends StatelessWidget {\n const _NavigationBarButton({\n required this.icon,\n+ required this.label,\n required this.selected,\n required this.onPressed,\n });\n \n final IconData icon;\n+ final String label;\n final bool selected;\n final void Function() onPressed;\n \n @override\n Widget build(BuildContext context) {\n final designVariables = DesignVariables.of(context);\n+ final color = selected ? designVariables.iconSelected : designVariables.icon;\n \n- final iconColor = WidgetStateColor.fromMap({\n- WidgetState.pressed: designVariables.iconSelected,\n- ~WidgetState.pressed: selected ? designVariables.iconSelected\n- : designVariables.icon,\n- });\n-\n- return AnimatedScaleOnTap(\n+ Widget result = AnimatedScaleOnTap(\n scaleEnd: 0.875,\n duration: const Duration(milliseconds: 100),\n- child: IconButton(\n- icon: Icon(icon, size: 24),\n- onPressed: onPressed,\n- style: IconButton.styleFrom(\n+ child: Material(\n+ type: MaterialType.transparency,\n+ child: InkWell(\n+ borderRadius: BorderRadius.all(Radius.circular(4)),\n // TODO(#417): Disable splash effects for all buttons globally.\n splashFactory: NoSplash.splashFactory,\n highlightColor: designVariables.navigationButtonBg,\n- shape: const RoundedRectangleBorder(\n- borderRadius: BorderRadius.all(Radius.circular(4))),\n- ).copyWith(foregroundColor: iconColor)));\n+ onTap: onPressed,\n+ child: Padding(\n+ // (Added 3px horizontal padding not present in Figma, to make the\n+ // text wrap before getting too close to the button's edge, which is\n+ // visible on tap-down.)\n+ padding: const EdgeInsets.fromLTRB(3, 6, 3, 3),\n+ child: Column(\n+ spacing: 3,\n+ mainAxisSize: MainAxisSize.min,\n+ children: [\n+ Icon(icon, size: 24, color: color),\n+ Flexible(\n+ child: Text(\n+ label,\n+ style: TextStyle(fontSize: 12, color: color, height: 12 / 12),\n+ textAlign: TextAlign.center,\n+ textScaler: MediaQuery.textScalerOf(context).clamp(maxScaleFactor: 1.5))),\n+ ])))));\n+\n+ result = MergeSemantics(\n+ child: Semantics(\n+ role: SemanticsRole.tab,\n+ controlsNodes: {\n+ HomePage.contentSemanticsIdentifier,\n+ HomePage.titleSemanticsIdentifier,\n+ },\n+ selected: selected,\n+ onTap: onPressed,\n+ child: result));\n+\n+ return result;\n }\n }\n \n", "test_patch": "diff --git a/test/widgets/home_test.dart b/test/widgets/home_test.dart\nindex 1ee0a0ae8e..239449c990 100644\n--- a/test/widgets/home_test.dart\n+++ b/test/widgets/home_test.dart\n@@ -1,3 +1,5 @@\n+import 'dart:ui';\n+\n import 'package:checks/checks.dart';\n import 'package:flutter/material.dart';\n import 'package:flutter_checks/flutter_checks.dart';\n@@ -82,6 +84,15 @@ void main () {\n }\n \n group('bottom nav navigation', () {\n+ final findBottomNavSemantics = find.byWidgetPredicate((widget) {\n+ if (widget is! Semantics) return false;\n+ return widget.properties.role == SemanticsRole.tab;\n+ });\n+\n+ // Finds a widget within the bottom navbar's semantics box subtree.\n+ Finder findInBottomNav(Finder finder) =>\n+ find.descendant(of: findBottomNavSemantics, matching: finder);\n+\n testWidgets('preserve states when switching between views', (tester) async {\n await prepare(tester);\n await store.addUser(eg.otherUser);\n@@ -131,6 +142,26 @@ void main () {\n matching: find.text('Direct messages'))).findsOne();\n });\n \n+ testWidgets(\"view switches when labels are tapped\", (tester) async {\n+ await prepare(tester);\n+\n+ check(find.descendant(\n+ of: find.byType(ZulipAppBar),\n+ matching: find.text('Inbox'))).findsOne();\n+\n+ await tester.tap(findInBottomNav(find.text('Channels')));\n+ await tester.pump();\n+ check(find.descendant(\n+ of: find.byType(ZulipAppBar),\n+ matching: find.text('Channels'))).findsOne();\n+\n+ await tester.tap(findInBottomNav(find.text('Direct messages')));\n+ await tester.pump();\n+ check(find.descendant(\n+ of: find.byType(ZulipAppBar),\n+ matching: find.text('Direct messages'))).findsOne();\n+ });\n+\n testWidgets('combined feed', (tester) async {\n await prepare(tester);\n pushedRoutes.clear();\ndiff --git a/test/widgets/recent_dm_conversations_test.dart b/test/widgets/recent_dm_conversations_test.dart\nindex a558734119..b5fdd10217 100644\n--- a/test/widgets/recent_dm_conversations_test.dart\n+++ b/test/widgets/recent_dm_conversations_test.dart\n@@ -59,7 +59,7 @@ Future setupPage(WidgetTester tester, {\n \n // Switch to direct messages tab.\n await tester.tap(find.descendant(\n- of: find.byType(Center),\n+ of: find.byType(DecoratedBox),\n matching: find.byIcon(ZulipIcons.two_person)));\n await tester.pump();\n }\n", "n2p_tests": "{\"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsItem content/appearance 1:1 has right title/avatar muted user\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsItem content/appearance self-1:1 User status emoji is not set, text is set -> text is not displayed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsItem content/appearance self-1:1 short name takes one line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsItem content/appearance group status emoji & text are set -> none of them is displayed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsItem content/appearance 1:1 User status emoji & text are set -> emoji is displayed, text is not\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsItem content/appearance group unread counts\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsItem content/appearance 1:1 short name takes one line\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsItem on tap, navigates to message list 1:1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: bottom nav navigation combined feed\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsPage page builds; conversations appear in order\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsItem on tap, navigates to message list group\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{\"/home/zulip-flutter/test/widgets/home_test.dart: _LoadingPlaceholderPage after finishing loading, choose the loaded account\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsItem content/appearance group no error when one user somehow missing from user store\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: bottom nav navigation preserve states when switching between views\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: logging out while still loading\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsPage fling to scroll down\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: menu menu buttons dismiss the menu\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: _LoadingPlaceholderPage while loading, go to nested levels of ChooseAccountPage\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsItem on tap, navigates to message list self-1:1\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: menu navigation bar menu buttons control navigation states\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: menu _AboutZulipButton\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: menu _MyProfileButton\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsItem content/appearance self-1:1 User status emoji & text are set -> emoji is displayed, text is not\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: logging out after fully loaded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsItem content/appearance group very many names takes two lines (must be ellipsized)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: _LoadingPlaceholderPage while loading, choose a different account\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: _LoadingPlaceholderPage while loading, choosing an account disallows going back\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsItem content/appearance self-1:1 has right title/avatar\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: _LoadingPlaceholderPage \\\"Try another account\\\" button appears after timeout\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: _LoadingPlaceholderPage while loading, go back from ChooseAccountPage\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/recent_dm_conversations_test.dart: RecentDmConversationsPage opens new DM sheet on New DM button tap\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1877", "org": "zulip", "repo": "zulip-flutter", "number": 1877, "state": "closed", "title": "Show channel/topic at top of channel/topic action sheet", "body": "Fixes #1533.\r\n\r\n-----\r\n\r\n
\r\nOutdated screenshots; working on new ones\u2026\r\n\r\n| Channel | Topic |\r\n| --- | --- |\r\n| \"image\" | \"image\" |\r\n| \"image\" | \"image\" |\r\n\r\n| Light (general chat) | Dark (general chat) |\r\n| --- | --- |\r\n| \"image\" | \"image\" |\r\n\r\n| Globe, short letter | Globe, tall letter |\r\n| --- | --- |\r\n| \"image\" | \"image\" |\r\n| \"image\" | \"image\" |\r\n\r\n| Hash, short letter | Hash, tall letter |\r\n| --- | --- |\r\n| \"image\" | \"image\" |\r\n| \"image\" | \"image\" |\r\n\r\n| Lock, short letter | Lock, tall letter |\r\n| --- | --- |\r\n| \"image\" | \"image\" |\r\n| \"image\" | \"image\" |\r\n\r\n| Long topic (light) | Long topic (dark) |\r\n| --- | --- |\r\n| \"image\" | \"image\" |\r\n\r\n| Unknown channel | Unknown channel, with topic |\r\n| --- | --- |\r\n| \"image\" | \"image\" |\r\n\r\n
", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"cc2b97ec11ad8395eceb69e54abfe3f7aa16956c\"}", "resolved_issues": "[{\"number\": 1533, \"title\": \"Show channel/topic at top of channel/topic action sheet\", \"body\": \"When the user opens the channel action sheet or topic action sheet (e.g. by long-pressing on the channel or topic name somewhere), the resulting bottom sheet should show at the top the name of the channel, or the channel and topic, respectively.\\n\\n### References\\n* Chat thread: [#mobile > abbreviated headings @ \\ud83d\\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/abbreviated.20headings/near/2182042)\\n* Similar issue (but more complex to implement): #217\\n\\n### Figma design\\n\\nChannel action sheet:\\n\\nhttps://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=6327-96692&m=dev\\n\\\"Image\\\"\\n\\nTopic action sheet:\\n\\n(I didn't find a Figma design for this in a quick look.)\"}]", "lang": "dart", "problem_statement": "Show channel/topic at top of channel/topic action sheet\nWhen the user opens the channel action sheet or topic action sheet (e.g. by long-pressing on the channel or topic name somewhere), the resulting bottom sheet should show at the top the name of the channel, or the channel and topic, respectively.\n\n### References\n* Chat thread: [#mobile > abbreviated headings @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/abbreviated.20headings/near/2182042)\n* Similar issue (but more complex to implement): #217\n\n### Figma design\n\nChannel action sheet:\n\nhttps://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=6327-96692&m=dev\n\"Image\"\n\nTopic action sheet:\n\n(I didn't find a Figma design for this in a quick look.)\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/1877", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1533\"]", "test_command": "flutter test test/widgets/action_sheet_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/widgets/action_sheet.dart b/lib/widgets/action_sheet.dart\nindex 59be92482f..30bbf433f5 100644\n--- a/lib/widgets/action_sheet.dart\n+++ b/lib/widgets/action_sheet.dart\n@@ -35,11 +35,20 @@ import 'text.dart';\n import 'theme.dart';\n import 'topic_list.dart';\n \n+/// Show an action sheet with scrollable menu buttons\n+/// and an optional scrollable header.\n+///\n+/// [header] should not use vertical padding to position itself on the sheet.\n+/// It will be wrapped in vertical padding\n+/// and, if [headerScrollable], a scroll view and an [InsetShadowBox].\n void _showActionSheet(\n BuildContext pageContext, {\n Widget? header,\n+ bool headerScrollable = true,\n required List> buttonSections,\n }) {\n+ assert(header is! BottomSheetHeader || !header.outerVerticalPadding);\n+\n // Could omit this if we need _showActionSheet outside a per-account context.\n final accountId = PerAccountStoreWidget.accountIdOf(pageContext);\n \n@@ -53,6 +62,52 @@ void _showActionSheet(\n isScrollControlled: true,\n builder: (BuildContext _) {\n final designVariables = DesignVariables.of(pageContext);\n+\n+ Widget? effectiveHeader;\n+ if (header != null) {\n+ effectiveHeader = headerScrollable\n+ ? Flexible(\n+ // TODO(upstream) Enforce a flex ratio (e.g. 1:3)\n+ // only when the header height plus the buttons' height\n+ // exceeds available space. Otherwise let one or the other\n+ // grow to fill available space even if it breaks the ratio.\n+ // Needs support for separate properties like `flex-grow`\n+ // and `flex-shrink`.\n+ flex: 1,\n+ child: InsetShadowBox(\n+ top: 8, bottom: 8,\n+ color: designVariables.bgContextMenu,\n+ child: SingleChildScrollView(\n+ padding: EdgeInsets.symmetric(vertical: 8),\n+ child: header)))\n+ : Padding(\n+ padding: EdgeInsets.only(top: 16, bottom: 4),\n+ child: header);\n+ }\n+\n+ final body = Flexible(\n+ flex: (effectiveHeader != null && headerScrollable)\n+ ? 3\n+ : 1,\n+ child: Padding(\n+ padding: const EdgeInsets.fromLTRB(16, 0, 16, 0),\n+ child: Column(\n+ crossAxisAlignment: CrossAxisAlignment.stretch,\n+ mainAxisSize: MainAxisSize.min,\n+ children: [\n+ Flexible(child: InsetShadowBox(\n+ top: 8, bottom: 8,\n+ color: designVariables.bgContextMenu,\n+ child: SingleChildScrollView(\n+ padding: const EdgeInsets.symmetric(vertical: 8),\n+ child: Column(\n+ mainAxisSize: MainAxisSize.min,\n+ spacing: 8,\n+ children: buttonSections.map((buttons) =>\n+ MenuButtonsShape(buttons: buttons)).toList())))),\n+ const BottomSheetDismissButton(style: BottomSheetDismissButtonStyle.cancel),\n+ ])));\n+\n return PerAccountStoreWidget(\n accountId: accountId,\n child: Semantics(\n@@ -62,43 +117,11 @@ void _showActionSheet(\n child: Column(\n mainAxisSize: MainAxisSize.min,\n children: [\n- if (header != null)\n- Flexible(\n- // TODO(upstream) Enforce a flex ratio (e.g. 1:3)\n- // only when the header height plus the buttons' height\n- // exceeds available space. Otherwise let one or the other\n- // grow to fill available space even if it breaks the ratio.\n- // Needs support for separate properties like `flex-grow`\n- // and `flex-shrink`.\n- flex: 1,\n- child: InsetShadowBox(\n- top: 8, bottom: 8,\n- color: designVariables.bgContextMenu,\n- child: SingleChildScrollView(\n- padding: EdgeInsets.symmetric(vertical: 8),\n- child: header)))\n+ if (effectiveHeader != null)\n+ effectiveHeader\n else\n SizedBox(height: 8),\n- Flexible(\n- flex: 3,\n- child: Padding(\n- padding: const EdgeInsets.fromLTRB(16, 0, 16, 0),\n- child: Column(\n- crossAxisAlignment: CrossAxisAlignment.stretch,\n- mainAxisSize: MainAxisSize.min,\n- children: [\n- Flexible(child: InsetShadowBox(\n- top: 8, bottom: 8,\n- color: designVariables.bgContextMenu,\n- child: SingleChildScrollView(\n- padding: const EdgeInsets.symmetric(vertical: 8),\n- child: Column(\n- mainAxisSize: MainAxisSize.min,\n- spacing: 8,\n- children: buttonSections.map((buttons) =>\n- MenuButtonsShape(buttons: buttons)).toList())))),\n- const BottomSheetDismissButton(style: BottomSheetDismissButtonStyle.cancel),\n- ]))),\n+ body,\n ]))));\n });\n }\n@@ -114,7 +137,8 @@ typedef WidgetBuilderFromTextStyle = Widget Function(TextStyle);\n /// The \"build\" params support richer content, such as [TextWithLink],\n /// and the callback is passed a [TextStyle] which is the base style.\n ///\n-/// Assumes 8px padding below the top of the bottom sheet.\n+/// To add outer vertical padding to position the header on the sheet,\n+/// pass true for [outerVerticalPadding].\n ///\n /// Figma; just message no title:\n /// https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=3481-26993&m=dev\n@@ -133,6 +157,7 @@ class BottomSheetHeader extends StatelessWidget {\n this.buildTitle,\n this.message,\n this.buildMessage,\n+ this.outerVerticalPadding = false,\n }) : assert(message == null || buildMessage == null),\n assert(title == null || buildTitle == null),\n assert((message != null || buildMessage != null)\n@@ -142,6 +167,7 @@ class BottomSheetHeader extends StatelessWidget {\n final Widget Function(TextStyle)? buildTitle;\n final String? message;\n final Widget Function(TextStyle)? buildMessage;\n+ final bool outerVerticalPadding;\n \n @override\n Widget build(BuildContext context) {\n@@ -149,16 +175,30 @@ class BottomSheetHeader extends StatelessWidget {\n \n final baseTitleStyle = TextStyle(\n fontSize: 20,\n- height: 20 / 20,\n+ // More height than in Figma, but it was looking too tight:\n+ // https://github.com/zulip/zulip-flutter/pull/1877#issuecomment-3379664807\n+ // (See use of TextHeightBehavior below.)\n+ height: 24 / 20,\n color: designVariables.title,\n ).merge(weightVariableTextStyle(context, wght: 600));\n \n- final effectiveTitle = switch ((buildTitle, title)) {\n+ Widget? effectiveTitle = switch ((buildTitle, title)) {\n (final build?, null) => build(baseTitleStyle),\n (null, final data?) => Text(style: baseTitleStyle, data),\n _ => null,\n };\n \n+ if (effectiveTitle != null) {\n+ effectiveTitle = DefaultTextHeightBehavior(\n+ textHeightBehavior: TextHeightBehavior(\n+ // We want some breathing room between lines,\n+ // without adding margin above or below the title.\n+ applyHeightToFirstAscent: false,\n+ applyHeightToLastDescent: false,\n+ ),\n+ child: effectiveTitle);\n+ }\n+\n final baseMessageStyle = TextStyle(\n color: designVariables.labelTime,\n fontSize: 17,\n@@ -170,12 +210,20 @@ class BottomSheetHeader extends StatelessWidget {\n _ => null,\n };\n \n- return Padding(\n- padding: EdgeInsets.fromLTRB(16, 8, 16, 4),\n+ Widget result = Padding(\n+ padding: EdgeInsets.symmetric(horizontal: 16),\n child: Column(\n crossAxisAlignment: CrossAxisAlignment.stretch,\n spacing: 8,\n children: [?effectiveTitle, ?effectiveMessage]));\n+\n+ if (outerVerticalPadding) {\n+ result = Padding(\n+ padding: EdgeInsets.only(top: 16, bottom: 4),\n+ child: result);\n+ }\n+\n+ return result;\n }\n }\n \n@@ -468,7 +516,21 @@ void showChannelActionSheet(BuildContext context, {\n [UnsubscribeButton(pageContext: pageContext, channelId: channelId)],\n ];\n \n- _showActionSheet(pageContext, buttonSections: buttonSections);\n+ final header = BottomSheetHeader(\n+ buildTitle: (baseStyle) => Text.rich(\n+ style: baseStyle,\n+ channelTopicLabelSpan(\n+ context: context,\n+ channelId: channelId,\n+ fontSize: baseStyle.fontSize!,\n+ color: baseStyle.color!)),\n+ // TODO(#1896) show channel description\n+ );\n+\n+ _showActionSheet(pageContext,\n+ header: header,\n+ headerScrollable: false,\n+ buttonSections: buttonSections);\n }\n \n class SubscribeButton extends ActionSheetMenuItemButton {\n@@ -723,7 +785,20 @@ void showTopicActionSheet(BuildContext context, {\n narrow: TopicNarrow(channelId, topic, with_: someMessageIdInTopic),\n pageContext: context));\n \n- _showActionSheet(pageContext, buttonSections: [optionButtons]);\n+ final header = BottomSheetHeader(\n+ buildTitle: (baseStyle) => Text.rich(\n+ style: baseStyle,\n+ channelTopicLabelSpan(\n+ context: context,\n+ channelId: channelId,\n+ topic: topic,\n+ fontSize: baseStyle.fontSize!,\n+ color: baseStyle.color!)));\n+\n+ _showActionSheet(pageContext,\n+ header: header,\n+ headerScrollable: false,\n+ buttonSections: [optionButtons]);\n }\n \n class UserTopicUpdateButton extends ActionSheetMenuItemButton {\ndiff --git a/lib/widgets/emoji_reaction.dart b/lib/widgets/emoji_reaction.dart\nindex 2c7c5d61ab..45131d7ad0 100644\n--- a/lib/widgets/emoji_reaction.dart\n+++ b/lib/widgets/emoji_reaction.dart\n@@ -804,10 +804,9 @@ class ViewReactionsHeader extends StatelessWidget {\n final reactions = message?.reactions;\n \n if (reactions == null || reactions.aggregated.isEmpty) {\n- return Padding(\n- padding: const EdgeInsets.only(top: 8),\n- child: BottomSheetHeader(message: zulipLocalizations.seeWhoReactedSheetNoReactions),\n- );\n+ return BottomSheetHeader(\n+ outerVerticalPadding: true,\n+ message: zulipLocalizations.seeWhoReactedSheetNoReactions);\n }\n \n return Padding(\ndiff --git a/lib/widgets/read_receipts.dart b/lib/widgets/read_receipts.dart\nindex 46c920372a..8416d78c85 100644\n--- a/lib/widgets/read_receipts.dart\n+++ b/lib/widgets/read_receipts.dart\n@@ -128,11 +128,10 @@ class _ReadReceiptsHeader extends StatelessWidget {\n markup: zulipLocalizations.actionSheetReadReceiptsReadCount(receiptCount));\n }\n \n- return Padding(\n- padding: const EdgeInsets.only(top: 8),\n- child: BottomSheetHeader(\n- title: zulipLocalizations.actionSheetReadReceipts,\n- buildMessage: headerMessageBuilder));\n+ return BottomSheetHeader(\n+ outerVerticalPadding: true,\n+ title: zulipLocalizations.actionSheetReadReceipts,\n+ buildMessage: headerMessageBuilder);\n }\n }\n \ndiff --git a/lib/widgets/text.dart b/lib/widgets/text.dart\nindex 3fe48484e3..10a6485023 100644\n--- a/lib/widgets/text.dart\n+++ b/lib/widgets/text.dart\n@@ -4,6 +4,10 @@ import 'package:flutter/foundation.dart';\n import 'package:flutter/gestures.dart';\n import 'package:flutter/material.dart';\n \n+import '../api/model/model.dart';\n+import '../generated/l10n/zulip_localizations.dart';\n+import 'icons.dart';\n+import 'store.dart';\n import 'theme.dart';\n \n /// An app-wide [Typography] for Zulip, customized from the Material default.\n@@ -533,3 +537,161 @@ class _TextWithLinkState extends State {\n span);\n }\n }\n+\n+/// Data to size and position a square icon in a span of text.\n+class InlineIconGeometryData {\n+ /// What size the icon should be,\n+ /// as a fraction of the surrounding text's font size.\n+ final double sizeFactor;\n+\n+ /// Where to assign the icon's baseline, as a fraction of the icon's size,\n+ /// when the span is rendered with [TextBaseline.alphabetic].\n+ ///\n+ /// This is ignored when the span is rendered with [TextBaseline.ideographic];\n+ /// zero is used instead.\n+ final double alphabeticBaselineFactor;\n+\n+ /// How much horizontal padding should separate the icon from surrounding text,\n+ /// as a fraction of the icon's size.\n+ final double paddingFactor;\n+\n+ const InlineIconGeometryData._({\n+ required this.sizeFactor,\n+ required this.alphabeticBaselineFactor,\n+ required this.paddingFactor,\n+ });\n+\n+ factory InlineIconGeometryData.forIcon(IconData icon) {\n+ final result = _inlineIconGeometries[icon];\n+ assert(result != null);\n+ return result ?? _defaultGeometry;\n+ }\n+\n+ // Values are ad hoc unless otherwise specified.\n+ static final Map _inlineIconGeometries = {\n+ ZulipIcons.globe: InlineIconGeometryData._(\n+ sizeFactor: 0.8,\n+ alphabeticBaselineFactor: 1 / 8,\n+ paddingFactor: 1 / 4),\n+\n+ ZulipIcons.hash_sign: InlineIconGeometryData._(\n+ sizeFactor: 0.8,\n+ alphabeticBaselineFactor: 1 / 16,\n+ paddingFactor: 1 / 4),\n+\n+ ZulipIcons.lock: InlineIconGeometryData._(\n+ sizeFactor: 0.8,\n+ alphabeticBaselineFactor: 1 / 16,\n+ paddingFactor: 1 / 4),\n+\n+ ZulipIcons.chevron_right: InlineIconGeometryData._(\n+ sizeFactor: 1,\n+ alphabeticBaselineFactor: 5 / 24,\n+ paddingFactor: 0),\n+ };\n+\n+ static final _defaultGeometry = InlineIconGeometryData._(\n+ sizeFactor: 0.8,\n+ alphabeticBaselineFactor: 1 / 16,\n+ paddingFactor: 1 / 4,\n+ );\n+}\n+\n+/// An icon, sized and aligned for use in a span of text.\n+WidgetSpan iconWidgetSpan({\n+ required IconData icon,\n+ required double fontSize,\n+ required TextBaseline baselineType,\n+ required Color? color,\n+ bool padBefore = false,\n+ bool padAfter = false,\n+}) {\n+ final InlineIconGeometryData(\n+ :sizeFactor,\n+ :alphabeticBaselineFactor,\n+ :paddingFactor,\n+ ) = InlineIconGeometryData.forIcon(icon);\n+\n+ final size = sizeFactor * fontSize;\n+\n+ final effectiveBaselineOffset = switch (baselineType) {\n+ TextBaseline.alphabetic => alphabeticBaselineFactor * size,\n+ TextBaseline.ideographic => 0.0,\n+ };\n+\n+ Widget child = Icon(size: size, color: color, icon);\n+\n+ if (effectiveBaselineOffset != 0) {\n+ child = Transform.translate(\n+ offset: Offset(0, effectiveBaselineOffset),\n+ child: child);\n+ }\n+\n+ if (padBefore || padAfter) {\n+ final padding = paddingFactor * size;\n+ child = Padding(\n+ padding: EdgeInsetsDirectional.only(\n+ start: padBefore ? padding : 0,\n+ end: padAfter ? padding : 0,\n+ ),\n+ child: child);\n+ }\n+\n+ return WidgetSpan(\n+ alignment: PlaceholderAlignment.baseline,\n+ baseline: baselineType,\n+ child: child);\n+}\n+\n+/// An [InlineSpan] with a channel privacy icon, channel name,\n+/// and optionally a chevron-right icon plus topic.\n+///\n+/// Pass this to [Text.rich], which can be styled arbitrarily.\n+/// Pass the [fontSize] and [color] of surrounding text\n+/// so that the icons are sized and colored appropriately.\n+InlineSpan channelTopicLabelSpan({\n+ required BuildContext context,\n+ required int channelId,\n+ TopicName? topic,\n+ required double fontSize,\n+ required Color color,\n+}) {\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n+ final store = PerAccountStoreWidget.of(context);\n+ final channel = store.streams[channelId];\n+ final subscription = store.subscriptions[channelId];\n+ final swatch = colorSwatchFor(context, subscription);\n+ final channelIcon = channel != null ? iconDataForStream(channel) : null;\n+ final baselineType = localizedTextBaseline(context);\n+\n+ return TextSpan(children: [\n+ if (channelIcon != null)\n+ iconWidgetSpan(\n+ icon: channelIcon,\n+ fontSize: fontSize,\n+ baselineType: baselineType,\n+ color: swatch.iconOnPlainBackground,\n+ padAfter: true),\n+ if (channel != null)\n+ TextSpan(text: channel.name)\n+ else\n+ TextSpan(\n+ style: TextStyle(fontStyle: FontStyle.italic),\n+ text: zulipLocalizations.unknownChannelName),\n+ if (topic != null) ...[\n+ iconWidgetSpan(\n+ icon: ZulipIcons.chevron_right,\n+ fontSize: fontSize,\n+ baselineType: baselineType,\n+ color: color,\n+ padBefore: true,\n+ padAfter: true),\n+ if (topic.displayName != null)\n+ TextSpan(text: topic.displayName)\n+ else\n+ TextSpan(\n+ style: TextStyle(fontStyle: FontStyle.italic),\n+ text: store.realmEmptyTopicDisplayName),\n+ ],\n+ ]);\n+}\n", "test_patch": "diff --git a/test/api/model/model_checks.dart b/test/api/model/model_checks.dart\nindex a7db054b55..5cb6df7c24 100644\n--- a/test/api/model/model_checks.dart\n+++ b/test/api/model/model_checks.dart\n@@ -54,6 +54,9 @@ extension SavedSnippetChecks on Subject {\n \n extension ZulipStreamChecks on Subject {\n Subject get streamId => has((x) => x.streamId, 'streamId');\n+\n+ Subject get inviteOnly => has((x) => x.inviteOnly, 'inviteOnly');\n+ Subject get isWebPublic => has((x) => x.isWebPublic, 'isWebPublic');\n }\n \n extension ChannelFolderChecks on Subject {\ndiff --git a/test/widgets/action_sheet_test.dart b/test/widgets/action_sheet_test.dart\nindex 06e0eab5ca..621f759f28 100644\n--- a/test/widgets/action_sheet_test.dart\n+++ b/test/widgets/action_sheet_test.dart\n@@ -38,6 +38,7 @@ import 'package:zulip/widgets/topic_list.dart';\n import 'package:zulip/widgets/user.dart';\n import '../api/fake_api.dart';\n \n+import '../api/model/model_checks.dart';\n import '../example_data.dart' as eg;\n import '../flutter_checks.dart';\n import '../model/binding.dart';\n@@ -255,19 +256,21 @@ void main() {\n await tester.pump(const Duration(milliseconds: 250));\n }\n \n- Future showFromTopicListAppBar(WidgetTester tester) async {\n+ Future showFromTopicListAppBar(WidgetTester tester, {int? streamId}) async {\n+ streamId ??= someChannel.streamId;\n final transitionDurationObserver = TransitionDurationObserver();\n \n connection.prepare(json: GetStreamTopicsResult(topics: []).toJson());\n await tester.pumpWidget(TestZulipApp(\n navigatorObservers: [transitionDurationObserver],\n accountId: eg.selfAccount.id,\n- child: TopicListPage(streamId: someChannel.streamId)));\n+ child: TopicListPage(streamId: streamId)));\n await tester.pump();\n \n+ final titleText = store.streams[streamId]?.name ?? '(unknown channel)';\n await tester.longPress(find.descendant(\n of: find.byType(ZulipAppBar),\n- matching: find.text(someChannel.name)));\n+ matching: find.text(titleText)));\n await transitionDurationObserver.pumpPastTransition(tester);\n }\n \n@@ -290,6 +293,61 @@ void main() {\n checkButton('Copy link to channel');\n }\n \n+ group('header', () {\n+ final findHeader = find.descendant(\n+ of: actionSheetFinder,\n+ matching: find.byType(BottomSheetHeader));\n+\n+ Finder findInHeader(Finder finder) =>\n+ find.descendant(of: findHeader, matching: finder);\n+\n+ testWidgets('public channel', (tester) async {\n+ await prepare();\n+ check(store.streams[someChannel.streamId]).isNotNull()\n+ ..inviteOnly.isFalse()..isWebPublic.isFalse();\n+ await showFromInbox(tester);\n+ check(findInHeader(find.byIcon(ZulipIcons.hash_sign))).findsOne();\n+ check(findInHeader(find.textContaining(someChannel.name))).findsOne();\n+ });\n+\n+ testWidgets('web-public channel', (tester) async {\n+ await prepare();\n+ await store.handleEvent(ChannelUpdateEvent(id: 1,\n+ streamId: someChannel.streamId,\n+ name: someChannel.name,\n+ property: null, value: null,\n+ // (Ideally we'd use `property` and `value` but I'm not sure if\n+ // modern servers actually do that or if they still use this\n+ // separate field.)\n+ isWebPublic: true));\n+ check(store.streams[someChannel.streamId]).isNotNull()\n+ ..inviteOnly.isFalse()..isWebPublic.isTrue();\n+ await showFromInbox(tester);\n+ check(findInHeader(find.byIcon(ZulipIcons.globe))).findsOne();\n+ check(findInHeader(find.textContaining(someChannel.name))).findsOne();\n+ });\n+\n+ testWidgets('private channel', (tester) async {\n+ await prepare();\n+ await store.handleEvent(eg.channelUpdateEvent(someChannel,\n+ property: ChannelPropertyName.inviteOnly, value: true));\n+ check(store.streams[someChannel.streamId]).isNotNull()\n+ ..inviteOnly.isTrue()..isWebPublic.isFalse();\n+ await showFromInbox(tester);\n+ check(findInHeader(find.byIcon(ZulipIcons.lock))).findsOne();\n+ check(findInHeader(find.textContaining(someChannel.name))).findsOne();\n+ });\n+\n+ testWidgets('unknown channel', (tester) async {\n+ await prepare();\n+ await store.handleEvent(ChannelDeleteEvent(id: 1, streams: [someChannel]));\n+ check(store.streams[someChannel.streamId]).isNull();\n+ await showFromTopicListAppBar(tester);\n+ check(findInHeader(find.byType(Icon))).findsNothing();\n+ check(findInHeader(find.textContaining('(unknown channel)'))).findsOne();\n+ });\n+ });\n+\n testWidgets('show from inbox', (tester) async {\n await prepare();\n await showFromInbox(tester);\n@@ -747,6 +805,38 @@ void main() {\n checkButton('Copy link to topic');\n }\n \n+ group('header', () {\n+ final findHeader = find.descendant(\n+ of: actionSheetFinder,\n+ matching: find.byType(BottomSheetHeader));\n+\n+ Finder findInHeader(Finder finder) =>\n+ find.descendant(of: findHeader, matching: finder);\n+\n+ testWidgets('with topic', (tester) async {\n+ await prepare();\n+ check(store.streams[someChannel.streamId]).isNotNull()\n+ ..inviteOnly.isFalse()..isWebPublic.isFalse();\n+ await showFromAppBar(tester);\n+ check(findInHeader(find.byIcon(ZulipIcons.hash_sign))).findsOne();\n+ check(findInHeader(find.textContaining(someChannel.name))).findsOne();\n+ check(findInHeader(find.textContaining(someTopic))).findsOne();\n+ });\n+\n+ testWidgets('without topic (general chat)', (tester) async {\n+ await prepare(topic: '');\n+ check(store.streams[someChannel.streamId]).isNotNull()\n+ ..inviteOnly.isFalse()..isWebPublic.isFalse();\n+ final message = eg.streamMessage(\n+ stream: someChannel, topic: '', sender: eg.otherUser);\n+ await showFromAppBar(tester, messages: [message], topic: eg.t(''));\n+ check(findInHeader(find.byIcon(ZulipIcons.hash_sign))).findsOne();\n+ check(findInHeader(find.textContaining(someChannel.name))).findsOne();\n+ check(findInHeader(find.textContaining(store.realmEmptyTopicDisplayName)))\n+ .findsOne();\n+ });\n+ });\n+\n testWidgets('show from inbox; message in Unreads but not in MessageStore', (tester) async {\n await prepare(unreadMsgs: eg.unreadMsgs(count: 1,\n channels: [eg.unreadChannelMsgs(\n", "n2p_tests": "{}", "f2p_tests": "{\"channel action sheet showChannelActionSheet header public channel\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet header web-public channel\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet header without topic (general chat)\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet header with topic\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet header private channel\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet header unknown channel\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"message action sheet StarButton star success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from app bar on topic list: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet UnsubscribeButton channel subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet MarkChannelAsReadButton request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton mute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageTextButton success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: false, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from message-list app bar in channel narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet header muted sender also shown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when topic is empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton unresolve: weird prefix\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from inbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ShareButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: true, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet SubscribeButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet DeleteMessageButton visibility shown when user has permission\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from inbox; message in Unreads but not in MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from recipient header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread visible if message is read\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from recipient header in combined feed: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet MarkTopicAsReadButton visible if topic has unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet CopyTopicLinkButton copies topic link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons absent if ServerEmojiData not loaded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons slight_smile removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in DM narrow smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: Instance of 'CombinedFeedNarrow', realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons smile removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet StarButton unstar success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton not offered in StarredMessagesNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet DeleteMessageButton request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads but not MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton unfollow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: ChannelNarrow(1), realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: true, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from inbox: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton tap button smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet UnrevealMutedMessageButton when pressed, unreveals the message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet header poll is rendered\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet UnsubscribeButton smoke, public channel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet StarButton star request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads and MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton not offered in MentionsNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet TopicListButton happy path from msglist app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ShareButton request succeeds; sharing succeeds\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread onPressed on topic move, acts on new topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet header message sender and content shown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread not visible if message is not read\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons slight_smile request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton request fails with an error dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton not offered in CombinedFeedNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons slight_smile adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet UnsubscribeButton channel not subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet UnrevealMutedMessageButton visible if message is from muted sender and revealed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from msglist app bar on channel feed: not visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when msglist empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton unresolve: request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet MarkChannelAsReadButton happy path from inbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet UnrevealMutedMessageButton not visible if message is from normal sender (not muted)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageTextButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet MarkTopicAsReadButton not visible if topic has no unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from topic-list app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton unresolve: happy path\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet DeleteMessageButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet DeleteMessageButton visibility not shown when user does not have permission\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 10, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in topic narrow smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: false, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton unmute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet CopyChannelLinkButton copies channel link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: false, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ViewReactionsButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet UnsubscribeButton smoke, private channel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton unmuteInMutedChannel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ViewReactionsButton not visible if message has no reactions\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet MarkTopicAsReadButton marks topic as read when pressed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from recipient header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread onPressed shows error when fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from subscription list: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet DeleteMessageButton cancel confirmation dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet TopicListButton not visible from app bar on topic list\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show with no unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton handle empty topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton resolve: request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread onPressed smoke test\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet SubscribeButton channel subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons smile request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ViewReadReceiptsButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MessageActionSheetCancelButton pressing the button dismisses the action sheet\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton follow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from message-list app bar in topic narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons smile adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet StarButton unstar request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from inbox; message in Unreads and in MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet SubscribeButton channel not subscribed, without content access\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in topic narrow no error if user lost posting permission after action sheet opened\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in DM narrow no error if recipient was deactivated while raw-content request in progress\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet SubscribeButton channel not subscribed, with content access\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton navigates to channel feed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet CopyTopicLinkButton FL < 271 -> link doesn't contain \\\"with\\\" operator\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ViewReadReceiptsButton realm-level read receipts disabled -> button is absent\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ShareButton request succeeds; sharing fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageLinkButton copies message link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 600, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in channel narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from subscription list\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageTextButton can show snackbar on success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1869", "org": "zulip", "repo": "zulip-flutter", "number": 1869, "state": "closed", "title": "Rely on Zulip Server 6 APIs", "body": "Fixes #1837.\r\n\r\nThis isn't our most urgent issue, but I was looking for some low-hanging fruit I could clear during yesterday's heat wave when it was really hot and uncomfortable at home. :)", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"912f243b8ff45536b8e65112536e623e667627bb\"}", "resolved_issues": "[{\"number\": 1837, \"title\": \"Rely on Zulip Server 6 APIs\", \"body\": \"Since #1521, the app refuses to connect to servers older than Zulip Server 7. That means we can simplify away all the spots in our codebase where we have logic to accommodate older versions of the Zulip server.\\n\\nThe previous issue #268 was for removing the code for supporting Zulip Server 4, relying on server 5, as marked by comments `TODO(server-5)`. This one is for relying on server 6, as marked by comments `TODO(server-6)`. For details, see #268 and the previous issues linked from there.\\n\\n### References\\n* Previous round of the same thing: #268 \\n* PR that implemented the previous round: #904 \\n* PR that disallowed connecting to older servers (a prerequisite for this issue): #1521 \\n\"}]", "lang": "dart", "problem_statement": "Rely on Zulip Server 6 APIs\nSince #1521, the app refuses to connect to servers older than Zulip Server 7. That means we can simplify away all the spots in our codebase where we have logic to accommodate older versions of the Zulip server.\n\nThe previous issue #268 was for removing the code for supporting Zulip Server 4, relying on server 5, as marked by comments `TODO(server-5)`. This one is for relying on server 6, as marked by comments `TODO(server-6)`. For details, see #268 and the previous issues linked from there.\n\n### References\n* Previous round of the same thing: #268 \n* PR that implemented the previous round: #904 \n* PR that disallowed connecting to older servers (a prerequisite for this issue): #1521 \n\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/1869", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1837\"]", "test_command": "flutter test test/model/channel_test.dart test/model/message_list_test.dart test/model/unreads_test.dart test/widgets/action_sheet_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/api/core.dart b/lib/api/core.dart\nindex b4d05b5b34..7ac3f1f852 100644\n--- a/lib/api/core.dart\n+++ b/lib/api/core.dart\n@@ -14,7 +14,7 @@ import 'exception.dart';\n ///\n /// When updating this, also update [kMinSupportedZulipFeatureLevel]\n /// and the README.\n-// TODO(#992) address all TODO(server-6) and TODO(server-7)\n+// TODO(#1838) address all TODO(server-7)\n const kMinSupportedZulipVersion = '7.0';\n \n /// The Zulip feature level reserved for the [kMinSupportedZulipVersion] release.\ndiff --git a/lib/api/model/events.dart b/lib/api/model/events.dart\nindex 5d86935186..9fd83c88f4 100644\n--- a/lib/api/model/events.dart\n+++ b/lib/api/model/events.dart\n@@ -71,7 +71,6 @@ sealed class Event {\n case 'peer_remove': return SubscriptionPeerRemoveEvent.fromJson(json);\n default: return UnexpectedEvent.fromJson(json);\n }\n- // case 'muted_topics': \u2026 // TODO(#422) we ignore this feature on older servers\n case 'user_status': return UserStatusEvent.fromJson(json);\n case 'user_topic': return UserTopicEvent.fromJson(json);\n case 'muted_users': return MutedUsersEvent.fromJson(json);\n@@ -763,6 +762,7 @@ class SubscriptionUpdateEvent extends SubscriptionEvent {\n \n final int streamId;\n \n+ @JsonKey(unknownEnumValue: SubscriptionProperty.unknown)\n final SubscriptionProperty property;\n \n /// The new value, or null if we don't recognize the setting.\n@@ -783,7 +783,6 @@ class SubscriptionUpdateEvent extends SubscriptionEvent {\n assert(RegExp(r'^#[0-9a-f]{6}$').hasMatch(str));\n return 0xff000000 | int.parse(str.substring(1), radix: 16);\n case SubscriptionProperty.isMuted:\n- case SubscriptionProperty.inHomeView:\n case SubscriptionProperty.pinToTop:\n case SubscriptionProperty.desktopNotifications:\n case SubscriptionProperty.audibleNotifications:\n@@ -820,13 +819,18 @@ enum SubscriptionProperty {\n color,\n \n isMuted,\n- inHomeView,\n pinToTop,\n desktopNotifications,\n audibleNotifications,\n pushNotifications,\n emailNotifications,\n wildcardMentionsNotify,\n+\n+ /// A new, unrecognized property, or a deprecated one we don't use.\n+ ///\n+ /// Could be `in_home_view`, deprecated in FL 139 (Server 6) but still sent\n+ /// as of CZO on 2025-10-03.\n+ // TODO(server-future) Remove `in_home_view` comment once it stops being sent.\n unknown;\n \n static SubscriptionProperty fromRawString(String raw) => _byRawString[raw] ?? unknown;\ndiff --git a/lib/api/model/events.g.dart b/lib/api/model/events.g.dart\nindex 0313976018..7bf9ef0fcd 100644\n--- a/lib/api/model/events.g.dart\n+++ b/lib/api/model/events.g.dart\n@@ -513,7 +513,11 @@ SubscriptionUpdateEvent _$SubscriptionUpdateEventFromJson(\n ) => SubscriptionUpdateEvent(\n id: (json['id'] as num).toInt(),\n streamId: (json['stream_id'] as num).toInt(),\n- property: $enumDecode(_$SubscriptionPropertyEnumMap, json['property']),\n+ property: $enumDecode(\n+ _$SubscriptionPropertyEnumMap,\n+ json['property'],\n+ unknownValue: SubscriptionProperty.unknown,\n+ ),\n value: SubscriptionUpdateEvent._readValue(json, 'value'),\n );\n \n@@ -531,7 +535,6 @@ Map _$SubscriptionUpdateEventToJson(\n const _$SubscriptionPropertyEnumMap = {\n SubscriptionProperty.color: 'color',\n SubscriptionProperty.isMuted: 'is_muted',\n- SubscriptionProperty.inHomeView: 'in_home_view',\n SubscriptionProperty.pinToTop: 'pin_to_top',\n SubscriptionProperty.desktopNotifications: 'desktop_notifications',\n SubscriptionProperty.audibleNotifications: 'audible_notifications',\ndiff --git a/lib/api/model/initial_snapshot.dart b/lib/api/model/initial_snapshot.dart\nindex 9250f75fa2..83e53fa1ca 100644\n--- a/lib/api/model/initial_snapshot.dart\n+++ b/lib/api/model/initial_snapshot.dart\n@@ -35,8 +35,6 @@ class InitialSnapshot {\n @JsonKey(defaultValue: 10000)\n final int serverTypingStartedWaitPeriodMilliseconds;\n \n- // final List<\u2026> mutedTopics; // TODO(#422) we ignore this feature on older servers\n-\n final List mutedUsers;\n \n // In the modern format because we pass `slim_presence`.\n@@ -70,7 +68,7 @@ class InitialSnapshot {\n \n final UserSettings userSettings;\n \n- final List? userTopics; // TODO(server-6)\n+ final List userTopics;\n \n final GroupSettingValue? realmCanDeleteAnyMessageGroup; // TODO(server-10)\n \n@@ -111,7 +109,7 @@ class InitialSnapshot {\n \n final int maxFileUploadSizeMib;\n \n- final Uri? serverEmojiDataUrl; // TODO(server-6)\n+ final Uri serverEmojiDataUrl;\n \n final String? realmEmptyTopicDisplayName; // TODO(server-10)\n \n@@ -284,7 +282,7 @@ class UserSettings {\n )\n TwentyFourHourTimeMode twentyFourHourTime;\n \n- bool? displayEmojiReactionUsers; // TODO(server-6)\n+ bool displayEmojiReactionUsers;\n Emojiset emojiset;\n bool presenceEnabled;\n \ndiff --git a/lib/api/model/initial_snapshot.g.dart b/lib/api/model/initial_snapshot.g.dart\nindex ffcbfba827..c2fd97dde5 100644\n--- a/lib/api/model/initial_snapshot.g.dart\n+++ b/lib/api/model/initial_snapshot.g.dart\n@@ -78,8 +78,8 @@ InitialSnapshot _$InitialSnapshotFromJson(\n userSettings: UserSettings.fromJson(\n json['user_settings'] as Map,\n ),\n- userTopics: (json['user_topics'] as List?)\n- ?.map((e) => UserTopicItem.fromJson(e as Map))\n+ userTopics: (json['user_topics'] as List)\n+ .map((e) => UserTopicItem.fromJson(e as Map))\n .toList(),\n realmCanDeleteAnyMessageGroup:\n json['realm_can_delete_any_message_group'] == null\n@@ -115,9 +115,7 @@ InitialSnapshot _$InitialSnapshotFromJson(\n ),\n ),\n maxFileUploadSizeMib: (json['max_file_upload_size_mib'] as num).toInt(),\n- serverEmojiDataUrl: json['server_emoji_data_url'] == null\n- ? null\n- : Uri.parse(json['server_emoji_data_url'] as String),\n+ serverEmojiDataUrl: Uri.parse(json['server_emoji_data_url'] as String),\n realmEmptyTopicDisplayName: json['realm_empty_topic_display_name'] as String?,\n realmUsers:\n (InitialSnapshot._readUsersIsActiveFallbackTrue(json, 'realm_users')\n@@ -186,7 +184,7 @@ Map _$InitialSnapshotToJson(\n 'realm_presence_disabled': instance.realmPresenceDisabled,\n 'realm_default_external_accounts': instance.realmDefaultExternalAccounts,\n 'max_file_upload_size_mib': instance.maxFileUploadSizeMib,\n- 'server_emoji_data_url': instance.serverEmojiDataUrl?.toString(),\n+ 'server_emoji_data_url': instance.serverEmojiDataUrl.toString(),\n 'realm_empty_topic_display_name': instance.realmEmptyTopicDisplayName,\n 'realm_users': instance.realmUsers,\n 'realm_non_active_users': instance.realmNonActiveUsers,\n@@ -248,7 +246,7 @@ UserSettings _$UserSettingsFromJson(Map json) => UserSettings(\n twentyFourHourTime: TwentyFourHourTimeMode.fromApiValue(\n json['twenty_four_hour_time'] as bool?,\n ),\n- displayEmojiReactionUsers: json['display_emoji_reaction_users'] as bool?,\n+ displayEmojiReactionUsers: json['display_emoji_reaction_users'] as bool,\n emojiset: $enumDecode(_$EmojisetEnumMap, json['emojiset']),\n presenceEnabled: json['presence_enabled'] as bool,\n );\ndiff --git a/lib/api/model/model.dart b/lib/api/model/model.dart\nindex 2bc6d7d487..fdfd0c856d 100644\n--- a/lib/api/model/model.dart\n+++ b/lib/api/model/model.dart\n@@ -69,7 +69,7 @@ class CustomProfileField {\n final String name;\n final String hint;\n final String fieldData;\n- final bool? displayInProfileSummary; // TODO(server-6)\n+ final bool? displayInProfileSummary;\n \n CustomProfileField({\n required this.id,\n@@ -97,7 +97,7 @@ enum CustomProfileFieldType {\n link(apiValue: 5),\n user(apiValue: 6),\n externalAccount(apiValue: 7),\n- pronouns(apiValue: 8), // TODO(server-6) newly added\n+ pronouns(apiValue: 8),\n unknown(apiValue: null);\n \n const CustomProfileFieldType({\n@@ -257,7 +257,6 @@ class StatusEmoji {\n ///\n /// The absence of one of these means there is no change.\n class UserStatusChange {\n- // final Option away; // deprecated in server-6 (FL-148); ignore\n final Option text;\n final Option emoji;\n \n@@ -793,7 +792,6 @@ class Subscription extends ZulipStream {\n \n bool pinToTop;\n bool isMuted;\n- // final bool? inHomeView; // deprecated; ignore\n \n /// As an int that dart:ui's Color constructor will take:\n /// \ndiff --git a/lib/model/channel.dart b/lib/model/channel.dart\nindex 098f146df1..ea05dc01d3 100644\n--- a/lib/model/channel.dart\n+++ b/lib/model/channel.dart\n@@ -307,7 +307,7 @@ class ChannelStoreImpl extends HasUserStore with ChannelStore {\n }\n \n final topicVisibility = >{};\n- for (final item in initialSnapshot.userTopics ?? const []) {\n+ for (final item in initialSnapshot.userTopics) {\n if (_warnInvalidVisibilityPolicy(item.visibilityPolicy)) {\n // Not a value we expect. Keep it out of our data structures. // TODO(log)\n continue;\n@@ -473,8 +473,6 @@ class ChannelStoreImpl extends HasUserStore with ChannelStore {\n case SubscriptionProperty.isMuted:\n // TODO(#1255) update [MessageListView] if affected\n subscription.isMuted = event.value as bool;\n- case SubscriptionProperty.inHomeView:\n- subscription.isMuted = !(event.value as bool);\n case SubscriptionProperty.pinToTop:\n subscription.pinToTop = event.value as bool;\n case SubscriptionProperty.desktopNotifications:\ndiff --git a/lib/model/message_list.dart b/lib/model/message_list.dart\nindex fcb6943905..91868df2b2 100644\n--- a/lib/model/message_list.dart\n+++ b/lib/model/message_list.dart\n@@ -873,12 +873,6 @@ class MessageListView with ChangeNotifier, _MessageSequence {\n numBefore: kMessageListFetchBatchSize,\n numAfter: 0,\n processResult: (result) {\n- if (result.messages.isNotEmpty\n- && result.messages.last.id == messages[0].id) {\n- // TODO(server-6): includeAnchor should make this impossible\n- result.messages.removeLast();\n- }\n-\n store.reconcileMessages(result.messages);\n store.recentSenders.handleMessages(result.messages); // TODO(#824)\n \n@@ -909,12 +903,6 @@ class MessageListView with ChangeNotifier, _MessageSequence {\n numBefore: 0,\n numAfter: kMessageListFetchBatchSize,\n processResult: (result) {\n- if (result.messages.isNotEmpty\n- && result.messages.first.id == messages.last.id) {\n- // TODO(server-6): includeAnchor should make this impossible\n- result.messages.removeAt(0);\n- }\n-\n store.reconcileMessages(result.messages);\n store.recentSenders.handleMessages(result.messages); // TODO(#824)\n \ndiff --git a/lib/model/store.dart b/lib/model/store.dart\nindex fe503da36e..f39757343d 100644\n--- a/lib/model/store.dart\n+++ b/lib/model/store.dart\n@@ -1117,12 +1117,7 @@ class UpdateMachine {\n final updateMachine = UpdateMachine.fromInitialSnapshot(\n store: store, initialSnapshot: initialSnapshot);\n updateMachine.poll();\n- if (initialSnapshot.serverEmojiDataUrl != null) {\n- // TODO(server-6): If the server is ancient, just skip trying to have\n- // a list of its emoji. (The old servers that don't provide\n- // serverEmojiDataUrl are already unsupported at time of writing.)\n- unawaited(updateMachine.fetchEmojiData(initialSnapshot.serverEmojiDataUrl!));\n- }\n+ unawaited(updateMachine.fetchEmojiData(initialSnapshot.serverEmojiDataUrl));\n store.presence.start();\n return updateMachine;\n }\ndiff --git a/lib/model/unreads.dart b/lib/model/unreads.dart\nindex 616feb18ef..543cde28b6 100644\n--- a/lib/model/unreads.dart\n+++ b/lib/model/unreads.dart\n@@ -453,12 +453,8 @@ class Unreads extends PerAccountStoreBase with ChangeNotifier {\n final newlyUnreadInDms = >{};\n for (final messageId in event.messages) {\n final detail = event.messageDetails![messageId];\n- if (detail == null) { // TODO(log) if on Zulip 6.0+\n- // Happens as a bug in some cases before fixed in Zulip 6.0:\n- // https://chat.zulip.org/#narrow/stream/378-api-design/topic/unreads.20in.20unsubscribed.20streams/near/1458467\n- // TODO(server-6) remove Zulip 6.0 comment\n- continue;\n- }\n+ if (detail == null) continue; // TODO(log)\n+\n if (detail.mentioned == true) {\n mentions.add(messageId);\n }\n@@ -537,11 +533,7 @@ class Unreads extends PerAccountStoreBase with ChangeNotifier {\n final topics = streams[streamId] ??= makeTopicKeyedMap();\n topics.update(topic,\n ifAbsent: () => messageIds,\n- // setUnion dedupes existing and incoming unread IDs,\n- // so we tolerate zulip/zulip#22164, fixed in 6.0\n- // TODO(server-6) remove 6.0 comment\n- (existing) => setUnion(existing, messageIds),\n- );\n+ (existing) => setUnion(existing, messageIds));\n }\n \n /// Remove [idsToRemove] from [streams] and [dms].\n@@ -640,10 +632,6 @@ class Unreads extends PerAccountStoreBase with ChangeNotifier {\n void _addAllInDm(QueueList messageIds, DmNarrow dmNarrow) {\n dms.update(dmNarrow,\n ifAbsent: () => messageIds,\n- // setUnion dedupes existing and incoming unread IDs,\n- // so we tolerate zulip/zulip#22164, fixed in 6.0\n- // TODO(server-6) remove 6.0 comment\n- (existing) => setUnion(existing, messageIds),\n- );\n+ (existing) => setUnion(existing, messageIds));\n }\n }\ndiff --git a/lib/widgets/action_sheet.dart b/lib/widgets/action_sheet.dart\nindex c01b8b9937..1d41a574d5 100644\n--- a/lib/widgets/action_sheet.dart\n+++ b/lib/widgets/action_sheet.dart\n@@ -1013,8 +1013,6 @@ void showMessageActionSheet({required BuildContext context, required Message mes\n final isComposeBoxOffered = messageListPage.composeBoxState != null;\n \n final isMessageRead = message.flags.contains(MessageFlag.read);\n- final markAsUnreadSupported = store.zulipFeatureLevel >= 155; // TODO(server-6)\n- final showMarkAsUnreadButton = markAsUnreadSupported && isMessageRead;\n \n final isSenderMuted = store.isUserMuted(message.senderId);\n \n@@ -1029,7 +1027,7 @@ void showMessageActionSheet({required BuildContext context, required Message mes\n StarButton(message: message, pageContext: pageContext),\n if (isComposeBoxOffered)\n QuoteAndReplyButton(message: message, pageContext: pageContext),\n- if (showMarkAsUnreadButton)\n+ if (isMessageRead)\n MarkAsUnreadButton(message: message, pageContext: pageContext),\n if (isSenderMuted)\n // The message must have been revealed in order to open this action sheet.\n@@ -1109,10 +1107,7 @@ bool _getShouldShowEditButton(BuildContext pageContext, Message message) {\n \n final now = ZulipBinding.instance.utcNow().millisecondsSinceEpoch ~/ 1000;\n final editLimit = store.realmMessageContentEditLimitSeconds;\n- final outsideEditLimit =\n- editLimit != null\n- && editLimit != 0 // TODO(server-6) remove (pre-FL 138, 0 represents no limit)\n- && now - message.timestamp > editLimit;\n+ final outsideEditLimit = editLimit != null && now - message.timestamp > editLimit;\n \n return message.senderId == store.selfUserId\n && isComposeBoxOffered\ndiff --git a/lib/widgets/actions.dart b/lib/widgets/actions.dart\nindex dd34564768..b75a85ecef 100644\n--- a/lib/widgets/actions.dart\n+++ b/lib/widgets/actions.dart\n@@ -68,7 +68,6 @@ abstract final class ZulipAction {\n Message message,\n Narrow narrow,\n ) async {\n- assert(PerAccountStoreWidget.of(context).zulipFeatureLevel >= 155); // TODO(server-6)\n final zulipLocalizations = ZulipLocalizations.of(context);\n await updateMessageFlagsStartingFromAnchor(\n context: context,\ndiff --git a/lib/widgets/emoji_reaction.dart b/lib/widgets/emoji_reaction.dart\nindex b3117e465e..2c7c5d61ab 100644\n--- a/lib/widgets/emoji_reaction.dart\n+++ b/lib/widgets/emoji_reaction.dart\n@@ -130,7 +130,7 @@ class ReactionChipsList extends StatelessWidget {\n Widget build(BuildContext context) {\n final zulipLocalizations = ZulipLocalizations.of(context);\n final store = PerAccountStoreWidget.of(context);\n- final displayEmojiReactionUsers = store.userSettings.displayEmojiReactionUsers ?? false;\n+ final displayEmojiReactionUsers = store.userSettings.displayEmojiReactionUsers;\n final showNames = displayEmojiReactionUsers && reactions.total <= 3;\n \n Widget result = Wrap(spacing: 4, runSpacing: 4, crossAxisAlignment: WrapCrossAlignment.center,\n", "test_patch": "diff --git a/test/example_data.dart b/test/example_data.dart\nindex 9bc82b9d6d..a26b94ff13 100644\n--- a/test/example_data.dart\n+++ b/test/example_data.dart\n@@ -821,14 +821,13 @@ GetMessagesResult nearGetMessagesResult({\n /// A GetMessagesResult the server might return when we request older messages.\n GetMessagesResult olderGetMessagesResult({\n required int anchor,\n- bool foundAnchor = false, // the value if the server understood includeAnchor false\n required bool foundOldest,\n bool historyLimited = false,\n required List messages,\n }) {\n return GetMessagesResult(\n anchor: anchor,\n- foundAnchor: foundAnchor,\n+ foundAnchor: false,\n foundNewest: false, // empirically always this, even when anchor happens to be latest\n foundOldest: foundOldest,\n historyLimited: historyLimited,\n@@ -839,14 +838,13 @@ GetMessagesResult olderGetMessagesResult({\n /// A GetMessagesResult the server might return when we request newer messages.\n GetMessagesResult newerGetMessagesResult({\n required int anchor,\n- bool foundAnchor = false, // the value if the server understood includeAnchor false\n required bool foundNewest,\n bool historyLimited = false,\n required List messages,\n }) {\n return GetMessagesResult(\n anchor: anchor,\n- foundAnchor: foundAnchor,\n+ foundAnchor: false,\n foundOldest: false,\n foundNewest: foundNewest,\n historyLimited: historyLimited,\n@@ -1334,7 +1332,7 @@ InitialSnapshot initialSnapshot({\n emojiset: Emojiset.google,\n presenceEnabled: true,\n ),\n- userTopics: userTopics,\n+ userTopics: userTopics ?? [],\n // no default; allow `null` to simulate servers without this\n realmCanDeleteAnyMessageGroup: realmCanDeleteAnyMessageGroup,\n realmCanDeleteOwnMessageGroup: realmCanDeleteOwnMessageGroup,\ndiff --git a/test/model/channel_test.dart b/test/model/channel_test.dart\nindex e7e57357d6..e73965dac2 100644\n--- a/test/model/channel_test.dart\n+++ b/test/model/channel_test.dart\n@@ -121,20 +121,6 @@ void main() {\n value: true));\n check(store.subscriptions[stream.streamId]!.isMuted).isTrue();\n });\n-\n- test('SubscriptionProperty.inHomeView updates isMuted instead', () async {\n- final store = eg.store(initialSnapshot: eg.initialSnapshot(\n- streams: [stream],\n- subscriptions: [eg.subscription(stream, isMuted: false)],\n- ));\n- check(store.subscriptions[stream.streamId]!.isMuted).isFalse();\n-\n- await store.handleEvent(SubscriptionUpdateEvent(id: 1,\n- streamId: stream.streamId,\n- property: SubscriptionProperty.inHomeView,\n- value: false));\n- check(store.subscriptions[stream.streamId]!.isMuted).isTrue();\n- });\n });\n \n group('topic visibility', () {\ndiff --git a/test/model/message_list_test.dart b/test/model/message_list_test.dart\nindex 9cb4977a32..39f4305ff3 100644\n--- a/test/model/message_list_test.dart\n+++ b/test/model/message_list_test.dart\n@@ -625,40 +625,6 @@ void main() {\n check(connection.takeRequests()).single;\n }));\n \n- test('fetchOlder handles servers not understanding includeAnchor', () async {\n- await prepare();\n- await prepareMessages(foundOldest: false,\n- messages: List.generate(100, (i) => eg.streamMessage(id: 1000 + i)));\n-\n- // The old behavior is to include the anchor message regardless of includeAnchor.\n- connection.prepare(json: olderResult(\n- anchor: 1000, foundOldest: false, foundAnchor: true,\n- messages: List.generate(101, (i) => eg.streamMessage(id: 900 + i)),\n- ).toJson());\n- await model.fetchOlder();\n- checkNotified(count: 2);\n- check(model)\n- ..busyFetchingMore.isFalse()\n- ..messages.length.equals(200);\n- });\n-\n- test('fetchNewer handles servers not understanding includeAnchor', () async {\n- await prepare(anchor: NumericAnchor(1000));\n- await prepareMessages(foundOldest: true, foundNewest: false,\n- messages: List.generate(101, (i) => eg.streamMessage(id: 1000 + i)));\n-\n- // The old behavior is to include the anchor message regardless of includeAnchor.\n- connection.prepare(json: newerResult(\n- anchor: 1100, foundNewest: false, foundAnchor: true,\n- messages: List.generate(101, (i) => eg.streamMessage(id: 1100 + i)),\n- ).toJson());\n- await model.fetchNewer();\n- checkNotified(count: 2);\n- check(model)\n- ..busyFetchingMore.isFalse()\n- ..messages.length.equals(201);\n- });\n-\n // TODO(#824): move this test\n test('fetchOlder recent senders track all the messages', () async {\n await prepare();\ndiff --git a/test/model/unreads_test.dart b/test/model/unreads_test.dart\nindex 4952354044..089ef315cb 100644\n--- a/test/model/unreads_test.dart\n+++ b/test/model/unreads_test.dart\n@@ -1250,22 +1250,6 @@ void main() {\n checkMatchesMessages([message1, message2]);\n });\n \n- // TODO(server-6) remove mention of zulip/zulip#22164, fixed in 6.0\n- test('tolerates event pointing to DM/stream messages that are already unread (zulip/zulip#22164)', () {\n- final message1 = eg.streamMessage(id: 1, flags: []);\n- final message2 = eg.dmMessage(id: 2, from: eg.otherUser, to: [eg.selfUser], flags: []);\n-\n- prepare();\n- fillWithMessages([message1, message2]);\n-\n- model.handleUpdateMessageFlagsEvent(mkEvent([message1, message2]));\n- checkNotifiedOnce();\n-\n- message1.flags.remove(MessageFlag.read);\n- message2.flags.remove(MessageFlag.read);\n- checkMatchesMessages([message1, message2]);\n- });\n-\n test('tolerates \"message details\" missing', () {\n final stream = eg.stream();\n const topic = 'a';\ndiff --git a/test/widgets/action_sheet_test.dart b/test/widgets/action_sheet_test.dart\nindex 22a4b06d8e..06e0eab5ca 100644\n--- a/test/widgets/action_sheet_test.dart\n+++ b/test/widgets/action_sheet_test.dart\n@@ -2202,8 +2202,6 @@ void main() {\n }\n \n testVisibility(true);\n- // TODO(server-6) limit 0 not expected on 6.0+\n- testVisibility(true, limit: 0);\n testVisibility(true, limit: 600);\n testVisibility(true, narrow: ChannelNarrow(1));\n \n", "n2p_tests": "{\"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"member\\\" user can't post in channel with \\\"administrators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"moderator\\\" user can post in channel with \\\"moderators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent moves moving to unsubscribed channels drops the unreads\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in group narrow; new in different narrow (self 1:1)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in 1:1 narrow; new in different narrow (self 1:1)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent mentions unread 1:1 dm message (but read state unknown to model)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"owner\\\" user can post in channel with \\\"moderators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"owner\\\" user can post in channel with \\\"administrators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"guest\\\" user can't post in channel with \\\"administrators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"guest\\\" user can't post in channel with \\\"moderators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent moves moved messages \\u2282 read messages\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"member\\\" user can't post in channel with \\\"moderators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"member\\\" user posting in a channel with \\\"fullMembers\\\" policy a \\\"full\\\" member -> can post in the channel\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent moves tolerates unsorted messages\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"owner\\\" user can post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: isUnread oldUnreadsMissing; read DM message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"moderator\\\" user can't post in channel with \\\"administrators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent in narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchOlder recent senders track all the messages\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"administrator\\\" user can post in channel with \\\"administrators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"administrator\\\" user can post in channel with \\\"moderators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: makeTopicKeyedMap \\\"a\\\" equals \\\"A\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"member\\\" user posting in a channel with \\\"fullMembers\\\" policy not a \\\"full\\\" member -> cannot post in the channel\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more nop during backoff\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent mentions read 1:1 dm message (but read state unknown to model)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent mentions unread stream message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent moves message edit but no move\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent mentions read 1:1 dm message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: makeTopicKeyedMap \\\"A\\\" equals \\\"a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{\"/home/zulip-flutter/test/model/channel_test.dart: topic visibility events remove, as last in stream\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet SubscribeButton channel subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial recent senders track all the messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream not muted, policy none -> followed, no change\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet UnrevealMutedMessageButton when pressed, unreveals the message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 600, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet MarkChannelAsReadButton happy path from inbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 10, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons smile removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent moves moved messages = unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton not offered in StarredMessagesNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic unmuted -> none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream not muted, policy none -> muted, means muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent not in narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility getter topicVisibilityPolicy with nothing for topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream not muted, topic none -> unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet CopyMessageTextButton can show snackbar on success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet MarkAsUnread onPressed shows error when fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic none -> unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream not muted, topic unmuted -> muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet StarButton star success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility isTopicVisible/InStream with policy none, stream muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons slight_smile removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in group narrow; new in same narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from recipient header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ShareButton request succeeds; sharing fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton handle empty topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet ChannelFeedButton from recipient header in combined feed: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when msglist empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet showChannelActionSheet show from message-list app bar in topic narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"guest\\\" user can't post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet CopyMessageTextButton success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic muted -> muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton not offered in CombinedFeedNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more nop when already fetching newer\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton in channel narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet DeleteMessageButton visibility shown when user has permission\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial short history\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton unresolve: weird prefix\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: Unified stream/sub data initial\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream not muted, topic unmuted -> unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet ChannelFeedButton from msglist app bar on channel feed: not visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton unresolve: happy path\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: SubscriptionEvent SubscriptionProperty.color updates with an int value\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchOlder nop when already haveOldest true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent while in mid-history\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility getter topicVisibilityPolicy with nothing for stream\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial ignore [OutboxMessage]s outside narrow or with `hidden: true`\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"guest\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet UnsubscribeButton smoke, public channel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet UnrevealMutedMessageButton not visible if message is from normal sender (not muted)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton mute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: false, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream not muted, topic muted -> none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic unmuted -> unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet StarButton unstar request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads and MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons slight_smile adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton in topic narrow smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet CopyTopicLinkButton copies topic link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from inbox; message in Unreads and in MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream muted, topic none -> unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet showChannelActionSheet show with no unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet MarkTopicAsReadButton not visible if topic has no unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet header message sender and content shown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"administrator\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream muted, policy none -> followed, means none/unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial sends proper anchor newest\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton follow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream muted, topic unmuted -> muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet MarkAsUnread not visible if message is not read\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton resolve: request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet TopicListButton not visible from app bar on topic list\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent when there are outbox messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream not muted, topic unmuted -> none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: Instance of 'CombinedFeedNarrow', realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic muted -> unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: false, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial early in history\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet ChannelFeedButton from app bar on topic list: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream not muted, topic muted -> unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage not in group\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when topic is empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility events update existing policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet CopyMessageLinkButton copies message link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"owner\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more TODO fetchNewer recent senders track all the messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet MarkAsUnread onPressed smoke test\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton tap button smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons smile adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet SubscribeButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream muted, topic none -> muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial topic permalinks if no redirect, we still remove \\\"with\\\" element\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet MarkAsUnread visible if message is read\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchNewer smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility events add in existing stream\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton unresolve: request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: false, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton in DM narrow smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons absent if ServerEmojiData not loaded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from inbox; message in Unreads but not in MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton in DM narrow no error if recipient was deactivated while raw-content request in progress\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet UnsubscribeButton smoke, private channel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet CopyTopicLinkButton FL < 271 -> link doesn't contain \\\"with\\\" operator\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchNewer nop when already haveNewest true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet UnrevealMutedMessageButton visible if message is from muted sender and revealed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet header muted sender also shown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"administrator\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream muted, topic unmuted -> none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ViewReadReceiptsButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet DeleteMessageButton cancel confirmation dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial sends proper anchor oldest\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: true, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton in topic narrow no error if user lost posting permission after action sheet opened\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"administrator\\\" user can post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"moderator\\\" user can post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility isTopicVisible/InStream with policy followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic none -> muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream not muted, topic muted -> muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"member\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream muted, topic muted -> unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"moderator\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream muted, topic muted -> none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic muted -> none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet MarkAsUnread onPressed on topic move, acts on new topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent for an OutboxMessage in the narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: true, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility events add with new stream\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility events remove, with others in stream\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet showChannelActionSheet show from inbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet TopicListButton happy path from msglist app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton not offered in MentionsNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"guest\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream not muted, topic none -> none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"moderator\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility isTopicVisible/InStream with policy unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial smoke TopicNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility getter topicVisibilityPolicy with topic present\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial sends proper anchor numeric\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton unmute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more nop when already fetching older\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent from another client (localMessageId present but unrecognized)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet CopyChannelLinkButton copies channel link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility data structure\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton unfollow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial outbox messages not added until haveNewest\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet DeleteMessageButton request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet header poll is rendered\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ViewReadReceiptsButton realm-level read receipts disabled -> button is absent\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet showChannelActionSheet show from recipient header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton request fails with an error dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: Unified stream/sub data unsubscribed then subscribed by events\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility isTopicVisible/InStream with policy none, stream not muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial some messages found in fetch; outbox messages present\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet DeleteMessageButton visibility not shown when user does not have permission\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet MarkTopicAsReadButton visible if topic has unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent before fetch\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial sends proper anchor firstUnread\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: constructor empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ShareButton request succeeds; sharing succeeds\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage in group\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ShareButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet StarButton star request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet UnsubscribeButton channel subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ViewReactionsButton not visible if message has no reactions\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility events treat unknown enum value as removing\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet CopyMessageTextButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet DeleteMessageButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"owner\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream muted, policy none -> muted, means muted/none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: selfCanSendMessage, legacy \\\"member\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial no messages found in fetch; outbox messages present\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchOlder smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet SubscribeButton channel not subscribed, without content access\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet ChannelFeedButton from inbox: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton unmuteInMutedChannel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet StarButton unstar success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: Unified stream/sub data added/updated by events\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream not muted, topic none -> muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet showChannelActionSheet show from subscription list\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial smoke CombinedFeedNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream muted, topic none -> none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet ChannelFeedButton navigates to channel feed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet ChannelFeedButton from subscription list: visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility isTopicVisible/InStream with policy none, stream unsubscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet MarkChannelAsReadButton request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet showChannelActionSheet show from message-list app bar in channel narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic none -> none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons slight_smile request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial topic permalinks if redirect, we follow it and remove \\\"with\\\" element\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream muted, topic unmuted -> unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: SubscriptionEvent SubscriptionProperty.isMuted updates with a boolean value\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads but not MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial no messages found\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet SubscribeButton channel not subscribed, with content access\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet MessageActionSheetCancelButton pressing the button dismisses the action sheet\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons smile request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream muted, topic muted -> muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet showChannelActionSheet show from topic-list app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet UnsubscribeButton channel not subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet MarkTopicAsReadButton marks topic as read when pressed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility isTopicVisible/InStream with policy muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/channel_test.dart: topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic unmuted -> muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: ChannelNarrow(1), realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ViewReactionsButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1863", "org": "zulip", "repo": "zulip-flutter", "number": 1863, "state": "closed", "title": "channel: Implement modern group-based permission check for can-send-message", "body": "Fixes #1862.", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"690a0e5a3f9a81f1f2aafe2eb032e471ab681fcb\"}", "resolved_issues": "[{\"number\": 1862, \"title\": \"Update can-send-message check to use modern group-based permission when available\", \"body\": \"We have a permission check that controls which channels appear in the share-to-Zulip page, and also whether we offer a compose box in channels.\\n\\nWe should update it to use the modern `can_send_message_group` permission when that's available, instead of relying on the deprecated `channel_post_policy` field.\"}]", "lang": "dart", "problem_statement": "Update can-send-message check to use modern group-based permission when available\nWe have a permission check that controls which channels appear in the share-to-Zulip page, and also whether we offer a compose box in channels.\n\nWe should update it to use the modern `can_send_message_group` permission when that's available, instead of relying on the deprecated `channel_post_policy` field.\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/1863", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1862\"]", "test_command": "flutter test test/model/channel_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/api/model/events.dart b/lib/api/model/events.dart\nindex 94bf662e30..5d86935186 100644\n--- a/lib/api/model/events.dart\n+++ b/lib/api/model/events.dart\n@@ -680,6 +680,7 @@ class ChannelUpdateEvent extends ChannelEvent {\n case ChannelPropertyName.canAddSubscribersGroup:\n case ChannelPropertyName.canDeleteAnyMessageGroup:\n case ChannelPropertyName.canDeleteOwnMessageGroup:\n+ case ChannelPropertyName.canSendMessageGroup:\n case ChannelPropertyName.canSubscribeGroup:\n return GroupSettingValue.fromJson(value);\n case ChannelPropertyName.streamWeeklyTraffic:\ndiff --git a/lib/api/model/events.g.dart b/lib/api/model/events.g.dart\nindex 398802892a..0313976018 100644\n--- a/lib/api/model/events.g.dart\n+++ b/lib/api/model/events.g.dart\n@@ -465,6 +465,7 @@ const _$ChannelPropertyNameEnumMap = {\n ChannelPropertyName.canAddSubscribersGroup: 'can_add_subscribers_group',\n ChannelPropertyName.canDeleteAnyMessageGroup: 'can_delete_any_message_group',\n ChannelPropertyName.canDeleteOwnMessageGroup: 'can_delete_own_message_group',\n+ ChannelPropertyName.canSendMessageGroup: 'can_send_message_group',\n ChannelPropertyName.canSubscribeGroup: 'can_subscribe_group',\n ChannelPropertyName.streamWeeklyTraffic: 'stream_weekly_traffic',\n };\ndiff --git a/lib/api/model/model.dart b/lib/api/model/model.dart\nindex d0a80c2b4c..2bc6d7d487 100644\n--- a/lib/api/model/model.dart\n+++ b/lib/api/model/model.dart\n@@ -649,12 +649,13 @@ class ZulipStream {\n bool historyPublicToSubscribers;\n int? messageRetentionDays;\n @JsonKey(name: 'stream_post_policy')\n- ChannelPostPolicy channelPostPolicy;\n+ ChannelPostPolicy? channelPostPolicy; // TODO(server-10) remove\n // final bool isAnnouncementOnly; // deprecated for `channelPostPolicy`; ignore\n \n GroupSettingValue? canAddSubscribersGroup; // TODO(server-10)\n GroupSettingValue? canDeleteAnyMessageGroup; // TODO(server-11)\n GroupSettingValue? canDeleteOwnMessageGroup; // TODO(server-11)\n+ GroupSettingValue? canSendMessageGroup; // TODO(server-10)\n GroupSettingValue? canSubscribeGroup; // TODO(server-10)\n \n // TODO(server-8): added in FL 199, was previously only on [Subscription] objects\n@@ -676,6 +677,7 @@ class ZulipStream {\n required this.canAddSubscribersGroup,\n required this.canDeleteAnyMessageGroup,\n required this.canDeleteOwnMessageGroup,\n+ required this.canSendMessageGroup,\n required this.canSubscribeGroup,\n required this.streamWeeklyTraffic,\n });\n@@ -698,6 +700,7 @@ class ZulipStream {\n canAddSubscribersGroup: subscription.canAddSubscribersGroup,\n canDeleteAnyMessageGroup: subscription.canDeleteAnyMessageGroup,\n canDeleteOwnMessageGroup: subscription.canDeleteOwnMessageGroup,\n+ canSendMessageGroup: subscription.canSendMessageGroup,\n canSubscribeGroup: subscription.canSubscribeGroup,\n streamWeeklyTraffic: subscription.streamWeeklyTraffic,\n );\n@@ -733,6 +736,7 @@ enum ChannelPropertyName {\n canAddSubscribersGroup,\n canDeleteAnyMessageGroup,\n canDeleteOwnMessageGroup,\n+ canSendMessageGroup,\n canSubscribeGroup,\n streamWeeklyTraffic;\n \n@@ -817,6 +821,7 @@ class Subscription extends ZulipStream {\n required super.canAddSubscribersGroup,\n required super.canDeleteAnyMessageGroup,\n required super.canDeleteOwnMessageGroup,\n+ required super.canSendMessageGroup,\n required super.canSubscribeGroup,\n required super.streamWeeklyTraffic,\n required this.desktopNotifications,\ndiff --git a/lib/api/model/model.g.dart b/lib/api/model/model.g.dart\nindex b21b2ee29e..70316ae1eb 100644\n--- a/lib/api/model/model.g.dart\n+++ b/lib/api/model/model.g.dart\n@@ -247,7 +247,7 @@ ZulipStream _$ZulipStreamFromJson(Map json) => ZulipStream(\n isWebPublic: json['is_web_public'] as bool,\n historyPublicToSubscribers: json['history_public_to_subscribers'] as bool,\n messageRetentionDays: (json['message_retention_days'] as num?)?.toInt(),\n- channelPostPolicy: $enumDecode(\n+ channelPostPolicy: $enumDecodeNullable(\n _$ChannelPostPolicyEnumMap,\n json['stream_post_policy'],\n ),\n@@ -260,6 +260,9 @@ ZulipStream _$ZulipStreamFromJson(Map json) => ZulipStream(\n canDeleteOwnMessageGroup: json['can_delete_own_message_group'] == null\n ? null\n : GroupSettingValue.fromJson(json['can_delete_own_message_group']),\n+ canSendMessageGroup: json['can_send_message_group'] == null\n+ ? null\n+ : GroupSettingValue.fromJson(json['can_send_message_group']),\n canSubscribeGroup: json['can_subscribe_group'] == null\n ? null\n : GroupSettingValue.fromJson(json['can_subscribe_group']),\n@@ -283,6 +286,7 @@ Map _$ZulipStreamToJson(ZulipStream instance) =>\n 'can_add_subscribers_group': instance.canAddSubscribersGroup,\n 'can_delete_any_message_group': instance.canDeleteAnyMessageGroup,\n 'can_delete_own_message_group': instance.canDeleteOwnMessageGroup,\n+ 'can_send_message_group': instance.canSendMessageGroup,\n 'can_subscribe_group': instance.canSubscribeGroup,\n 'stream_weekly_traffic': instance.streamWeeklyTraffic,\n };\n@@ -307,7 +311,7 @@ Subscription _$SubscriptionFromJson(Map json) => Subscription(\n isWebPublic: json['is_web_public'] as bool,\n historyPublicToSubscribers: json['history_public_to_subscribers'] as bool,\n messageRetentionDays: (json['message_retention_days'] as num?)?.toInt(),\n- channelPostPolicy: $enumDecode(\n+ channelPostPolicy: $enumDecodeNullable(\n _$ChannelPostPolicyEnumMap,\n json['stream_post_policy'],\n ),\n@@ -320,6 +324,9 @@ Subscription _$SubscriptionFromJson(Map json) => Subscription(\n canDeleteOwnMessageGroup: json['can_delete_own_message_group'] == null\n ? null\n : GroupSettingValue.fromJson(json['can_delete_own_message_group']),\n+ canSendMessageGroup: json['can_send_message_group'] == null\n+ ? null\n+ : GroupSettingValue.fromJson(json['can_send_message_group']),\n canSubscribeGroup: json['can_subscribe_group'] == null\n ? null\n : GroupSettingValue.fromJson(json['can_subscribe_group']),\n@@ -351,6 +358,7 @@ Map _$SubscriptionToJson(Subscription instance) =>\n 'can_add_subscribers_group': instance.canAddSubscribersGroup,\n 'can_delete_any_message_group': instance.canDeleteAnyMessageGroup,\n 'can_delete_own_message_group': instance.canDeleteOwnMessageGroup,\n+ 'can_send_message_group': instance.canSendMessageGroup,\n 'can_subscribe_group': instance.canSubscribeGroup,\n 'stream_weekly_traffic': instance.streamWeeklyTraffic,\n 'desktop_notifications': instance.desktopNotifications,\n@@ -515,6 +523,7 @@ const _$ChannelPropertyNameEnumMap = {\n ChannelPropertyName.canAddSubscribersGroup: 'can_add_subscribers_group',\n ChannelPropertyName.canDeleteAnyMessageGroup: 'can_delete_any_message_group',\n ChannelPropertyName.canDeleteOwnMessageGroup: 'can_delete_own_message_group',\n+ ChannelPropertyName.canSendMessageGroup: 'can_send_message_group',\n ChannelPropertyName.canSubscribeGroup: 'can_subscribe_group',\n ChannelPropertyName.streamWeeklyTraffic: 'stream_weekly_traffic',\n };\ndiff --git a/lib/model/channel.dart b/lib/model/channel.dart\nindex 0403ba0bdf..098f146df1 100644\n--- a/lib/model/channel.dart\n+++ b/lib/model/channel.dart\n@@ -192,17 +192,36 @@ mixin ChannelStore on UserStore {\n required ZulipStream inChannel,\n required DateTime byDate,\n }) {\n+ // (selfHasPermissionForGroupSetting isn't equipped to handle the old-server\n+ // fallback logic for this specific permission; it's dynamic and depends on\n+ // channelPostPolicy, so we do our own null check here.)\n+ if (inChannel.canSendMessageGroup != null) {\n+ return selfHasPermissionForGroupSetting(inChannel.canSendMessageGroup!,\n+ GroupSettingType.stream, 'can_send_message_group');\n+ } else if (inChannel.channelPostPolicy != null) {\n+ return _selfPassesLegacyChannelPostPolicy(inChannel: inChannel, atDate: byDate);\n+ } else {\n+ assert(false); // TODO(log)\n+ return true;\n+ }\n+ }\n+\n+ bool _selfPassesLegacyChannelPostPolicy({\n+ required ZulipStream inChannel,\n+ required DateTime atDate,\n+ }) {\n+ assert(inChannel.channelPostPolicy != null);\n final role = selfUser.role;\n- // We let the users with [unknown] role to send the message, then the server\n- // will decide to accept it or not based on its actual role.\n- if (role == UserRole.unknown) return true;\n \n- switch (inChannel.channelPostPolicy) {\n+ // (Could early-return true on [UserRole.unknown],\n+ // but pre-333 servers shouldn't be giving us an unknown role.)\n+\n+ switch (inChannel.channelPostPolicy!) {\n case ChannelPostPolicy.any: return true;\n case ChannelPostPolicy.fullMembers: {\n if (!role.isAtLeast(UserRole.member)) return false;\n if (role == UserRole.member) {\n- return selfHasPassedWaitingPeriod(byDate: byDate);\n+ return selfHasPassedWaitingPeriod(byDate: atDate);\n }\n return true;\n }\n@@ -405,6 +424,8 @@ class ChannelStoreImpl extends HasUserStore with ChannelStore {\n stream.canDeleteAnyMessageGroup = event.value as GroupSettingValue;\n case ChannelPropertyName.canDeleteOwnMessageGroup:\n stream.canDeleteOwnMessageGroup = event.value as GroupSettingValue;\n+ case ChannelPropertyName.canSendMessageGroup:\n+ stream.canSendMessageGroup = event.value as GroupSettingValue;\n case ChannelPropertyName.canSubscribeGroup:\n stream.canSubscribeGroup = event.value as GroupSettingValue;\n case ChannelPropertyName.streamWeeklyTraffic:\n", "test_patch": "diff --git a/test/example_data.dart b/test/example_data.dart\nindex 9a9eb1099e..9bc82b9d6d 100644\n--- a/test/example_data.dart\n+++ b/test/example_data.dart\n@@ -461,9 +461,16 @@ ZulipStream stream({\n GroupSettingValue? canAddSubscribersGroup,\n GroupSettingValue? canDeleteAnyMessageGroup,\n GroupSettingValue? canDeleteOwnMessageGroup,\n+ GroupSettingValue? canSendMessageGroup,\n GroupSettingValue? canSubscribeGroup,\n int? streamWeeklyTraffic,\n }) {\n+ if (channelPostPolicy == null) {\n+ // Set a default for realmCanDeleteOwnMessageGroup, but only if we're\n+ // not trying to test legacy behavior with channelPostPolicy.\n+ canSendMessageGroup ??= groupSetting(members: [selfUser.userId]);\n+ }\n+\n _checkPositive(streamId, 'stream ID');\n _checkPositive(firstMessageId, 'message ID');\n var effectiveStreamId = streamId ?? _nextStreamId();\n@@ -485,6 +492,7 @@ ZulipStream stream({\n canAddSubscribersGroup: canAddSubscribersGroup ?? GroupSettingValueNamed(nobodyGroup.id),\n canDeleteAnyMessageGroup: canDeleteAnyMessageGroup ?? GroupSettingValueNamed(nobodyGroup.id),\n canDeleteOwnMessageGroup: canDeleteOwnMessageGroup ?? GroupSettingValueNamed(nobodyGroup.id),\n+ canSendMessageGroup: canSendMessageGroup,\n canSubscribeGroup: canSubscribeGroup ?? GroupSettingValueNamed(nobodyGroup.id),\n streamWeeklyTraffic: streamWeeklyTraffic,\n );\n@@ -528,6 +536,7 @@ Subscription subscription(\n canAddSubscribersGroup: stream.canAddSubscribersGroup,\n canDeleteAnyMessageGroup: stream.canDeleteAnyMessageGroup,\n canDeleteOwnMessageGroup: stream.canDeleteOwnMessageGroup,\n+ canSendMessageGroup: stream.canSendMessageGroup,\n canSubscribeGroup: stream.canSubscribeGroup,\n streamWeeklyTraffic: stream.streamWeeklyTraffic,\n desktopNotifications: desktopNotifications ?? false,\n@@ -1206,6 +1215,7 @@ ChannelUpdateEvent channelUpdateEvent(\n case ChannelPropertyName.canAddSubscribersGroup:\n case ChannelPropertyName.canDeleteAnyMessageGroup:\n case ChannelPropertyName.canDeleteOwnMessageGroup:\n+ case ChannelPropertyName.canSendMessageGroup:\n case ChannelPropertyName.canSubscribeGroup:\n assert(value is GroupSettingValue);\n case ChannelPropertyName.streamWeeklyTraffic:\ndiff --git a/test/model/channel_test.dart b/test/model/channel_test.dart\nindex 00dbfb10a2..e7e57357d6 100644\n--- a/test/model/channel_test.dart\n+++ b/test/model/channel_test.dart\n@@ -9,9 +9,12 @@ import 'package:zulip/model/channel.dart';\n import '../api/model/model_checks.dart';\n import '../example_data.dart' as eg;\n import '../stdlib_checks.dart';\n+import 'binding.dart';\n import 'test_store.dart';\n \n void main() {\n+ TestZulipBinding.ensureInitialized();\n+\n group('Unified stream/sub data', () {\n /// Check that `streams`, `streamsByName`, and `subscriptions` all agree\n /// and point to the same objects where applicable.\n@@ -455,34 +458,55 @@ void main() {\n });\n });\n \n- group('hasPostingPermission', () {\n+ group('selfCanSendMessage', () {\n+ test('in group', () {\n+ addTearDown(testBinding.reset);\n+ final now = testBinding.utcNow();\n+\n+ final canSendMessageGroup = eg.groupSetting(members: [eg.selfUser.userId]);\n+ final channel = eg.stream(canSendMessageGroup: canSendMessageGroup);\n+ final store = eg.store(\n+ initialSnapshot: eg.initialSnapshot(streams: [channel]));\n+ check(store.selfCanSendMessage(inChannel: channel, byDate: now))\n+ .isTrue();\n+ });\n+\n+ test('not in group', () {\n+ addTearDown(testBinding.reset);\n+ final now = testBinding.utcNow();\n+\n+ final canSendMessageGroup = eg.groupSetting(members: []);\n+ final channel = eg.stream(canSendMessageGroup: canSendMessageGroup);\n+ final store = eg.store(\n+ initialSnapshot: eg.initialSnapshot(streams: [channel]));\n+ check(store.selfCanSendMessage(inChannel: channel, byDate: now))\n+ .isFalse();\n+ });\n+ });\n+\n+ group('selfCanSendMessage, legacy', () {\n final testCases = [\n- (ChannelPostPolicy.unknown, UserRole.unknown, true),\n (ChannelPostPolicy.unknown, UserRole.guest, true),\n (ChannelPostPolicy.unknown, UserRole.member, true),\n (ChannelPostPolicy.unknown, UserRole.moderator, true),\n (ChannelPostPolicy.unknown, UserRole.administrator, true),\n (ChannelPostPolicy.unknown, UserRole.owner, true),\n- (ChannelPostPolicy.any, UserRole.unknown, true),\n (ChannelPostPolicy.any, UserRole.guest, true),\n (ChannelPostPolicy.any, UserRole.member, true),\n (ChannelPostPolicy.any, UserRole.moderator, true),\n (ChannelPostPolicy.any, UserRole.administrator, true),\n (ChannelPostPolicy.any, UserRole.owner, true),\n- (ChannelPostPolicy.fullMembers, UserRole.unknown, true),\n (ChannelPostPolicy.fullMembers, UserRole.guest, false),\n // The fullMembers/member case gets its own tests further below.\n // (ChannelPostPolicy.fullMembers, UserRole.member, /* complicated */),\n (ChannelPostPolicy.fullMembers, UserRole.moderator, true),\n (ChannelPostPolicy.fullMembers, UserRole.administrator, true),\n (ChannelPostPolicy.fullMembers, UserRole.owner, true),\n- (ChannelPostPolicy.moderators, UserRole.unknown, true),\n (ChannelPostPolicy.moderators, UserRole.guest, false),\n (ChannelPostPolicy.moderators, UserRole.member, false),\n (ChannelPostPolicy.moderators, UserRole.moderator, true),\n (ChannelPostPolicy.moderators, UserRole.administrator, true),\n (ChannelPostPolicy.moderators, UserRole.owner, true),\n- (ChannelPostPolicy.administrators, UserRole.unknown, true),\n (ChannelPostPolicy.administrators, UserRole.guest, false),\n (ChannelPostPolicy.administrators, UserRole.member, false),\n (ChannelPostPolicy.administrators, UserRole.moderator, false),\n", "n2p_tests": "{\"selfCanSendMessage, legacy \\\"moderator\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream not muted, policy none -> followed, no change\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"owner\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility isTopicVisible/InStream with policy muted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"guest\\\" user can't post in channel with \\\"moderators\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"guest\\\" user can't post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic muted -> muted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream not muted, topic none -> unmuted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic none -> none\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"guest\\\" user can't post in channel with \\\"administrators\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility events treat unknown enum value as removing\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility isTopicVisible/InStream with policy none, stream muted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility isTopicVisible/InStream with policy followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility events add in existing stream\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"owner\\\" user can post in channel with \\\"administrators\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"Unified stream/sub data unsubscribed then subscribed by events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"administrator\\\" user can post in channel with \\\"moderators\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"moderator\\\" user can post in channel with \\\"moderators\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"moderator\\\" user can't post in channel with \\\"administrators\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility isTopicVisible/InStream with policy none, stream unsubscribed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"moderator\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic muted -> none\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic none -> muted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream muted, topic muted -> muted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"guest\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility events update existing policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream not muted, topic none -> none\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility events remove, with others in stream\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"Unified stream/sub data added/updated by events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"owner\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"administrator\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream muted, topic none -> muted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility events remove, as last in stream\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"member\\\" user can't post in channel with \\\"moderators\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"SubscriptionEvent SubscriptionProperty.isMuted updates with a boolean value\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"member\\\" user posting in a channel with \\\"fullMembers\\\" policy a \\\"full\\\" member -> can post in the channel\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream not muted, topic none -> muted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream muted, topic unmuted -> none\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic muted -> unmuted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"member\\\" user posting in a channel with \\\"fullMembers\\\" policy not a \\\"full\\\" member -> cannot post in the channel\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream not muted, topic muted -> muted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream muted, topic unmuted -> muted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream not muted, topic unmuted -> none\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream muted, policy none -> followed, means none/unmuted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream muted, topic unmuted -> unmuted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"Unified stream/sub data initial\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"administrator\\\" user can post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream not muted, policy none -> muted, means muted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility isTopicVisible/InStream with policy unmuted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"administrator\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"SubscriptionEvent SubscriptionProperty.color updates with an int value\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream not muted, topic muted -> unmuted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"member\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility getter topicVisibilityPolicy with nothing for stream\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage not in group\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"makeTopicKeyedMap \\\"a\\\" equals \\\"A\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility data structure\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream not muted, topic unmuted -> muted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"makeTopicKeyedMap \\\"A\\\" equals \\\"a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic unmuted -> none\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream muted, topic none -> unmuted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility getter topicVisibilityPolicy with topic present\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream muted, policy none -> muted, means muted/none\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"member\\\" user can't post in channel with \\\"administrators\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"administrator\\\" user can post in channel with \\\"administrators\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream muted, topic muted -> none\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage in group\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility isTopicVisible/InStream with policy none, stream not muted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"owner\\\" user can post in channel with \\\"moderators\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream not muted, topic muted -> none\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream not muted, topic unmuted -> unmuted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic unmuted -> unmuted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"SubscriptionEvent SubscriptionProperty.inHomeView updates isMuted instead\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic unmuted -> muted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"guest\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility getter topicVisibilityPolicy with nothing for topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream unsubscribed, topic none -> unmuted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"member\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream muted, topic none -> none\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility willChangeIfTopicVisible/InStream stream muted, topic muted -> unmuted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"moderator\\\" user can post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"topic visibility events add with new stream\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"selfCanSendMessage, legacy \\\"owner\\\" user can post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1853", "org": "zulip", "repo": "zulip-flutter", "number": 1853, "state": "closed", "title": "initial_snapshot: Centralize group-permission defaults; fix admin permission for legacy servers", "body": "Fixes #1850.\r\n\r\nAlso does the refactor Greg suggested here: https://github.com/zulip/zulip-flutter/pull/1842#discussion_r2331337006", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"da1d968f31813f206a5c980487c691ef2617b963\"}", "resolved_issues": "[{\"number\": 1850, \"title\": \"Make `role:administrators` the default for `realm_can_delete_any_message_group`\", \"body\": \"Server 10 added the `realm_can_delete_any_message_group` permission. For servers before that, we're meant to use `role:administrators` when deciding whether to show the \\\"delete message\\\" button, but (with #1842, not yet merged) we'll actually use `role:nobody`. We should fix that and refactor a bit; see discussion: https://github.com/zulip/zulip-flutter/pull/1842#discussion_r2331362461\"}]", "lang": "dart", "problem_statement": "Make `role:administrators` the default for `realm_can_delete_any_message_group`\nServer 10 added the `realm_can_delete_any_message_group` permission. For servers before that, we're meant to use `role:administrators` when deciding whether to show the \"delete message\" button, but (with #1842, not yet merged) we'll actually use `role:nobody`. We should fix that and refactor a bit; see discussion: https://github.com/zulip/zulip-flutter/pull/1842#discussion_r2331362461\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/1853", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1850\"]", "test_command": "flutter test test/model/message_test.dart test/model/realm_test.dart test/model/user_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/api/model/initial_snapshot.dart b/lib/api/model/initial_snapshot.dart\nindex a8e99dde28..9250f75fa2 100644\n--- a/lib/api/model/initial_snapshot.dart\n+++ b/lib/api/model/initial_snapshot.dart\n@@ -424,248 +424,3 @@ class UnreadHuddleSnapshot {\n \n Map toJson() => _$UnreadHuddleSnapshotToJson(this);\n }\n-\n-/// Metadata about how to interpret the various group-based permission settings.\n-///\n-/// This is the type that [InitialSnapshot.serverSupportedPermissionSettings]\n-/// would have, according to the API as it exists as of 2025-08;\n-/// but that API is documented as unstable and subject to change.\n-///\n-/// For a useful value of this type, see [SupportedPermissionSettings.fixture].\n-///\n-/// For docs, search for \"d_perm\" in: https://zulip.com/api/register-queue\n-@JsonSerializable(fieldRename: FieldRename.snake)\n-class SupportedPermissionSettings {\n- final Map realm;\n- final Map stream;\n- final Map group;\n-\n- /// Metadata about how to interpret certain group-based permission settings,\n- /// including all those that this client uses, based on \"current\" servers.\n- ///\n- /// \"Current\" here means as of when this code was written, or last updated;\n- /// details in comments below. Naturally it'd be better to have an API to\n- /// get this information from the actual server.\n- ///\n- /// Effectively we're counting on it being uncommon for the metadata for a\n- /// given permission to ever change from one server version to the next,\n- /// so that the values we take from one server version usually remain valid\n- /// for all past and future server versions that have the corresponding\n- /// permission at all.\n- ///\n- /// TODO(server): Stabilize [InitialSnapshot.serverSupportedPermissionSettings]\n- /// or a similar API, and switch to using that. See thread:\n- /// https://chat.zulip.org/#narrow/channel/378-api-design/topic/server_supported_permission_settings/near/2247549\n- static SupportedPermissionSettings fixture = SupportedPermissionSettings(\n- realm: {\n- // From the server's Realm.REALM_PERMISSION_GROUP_SETTINGS,\n- // in zerver/models/realms.py. Current as of 6ab30fcce, 2025-08.\n- 'create_multiuse_invite_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.ADMINISTRATORS,\n- ),\n- 'can_access_all_users_group': PermissionSettingsItem(\n- // require_system_group=True,\n- // allow_nobody_group=False,\n- allowEveryoneGroup: true,\n- // default_group_name=SystemGroups.EVERYONE,\n- // # Note that user_can_access_all_other_users in the web\n- // # app is relying on members always have access.\n- // allowed_system_groups=[SystemGroups.EVERYONE, SystemGroups.MEMBERS],\n- ),\n- 'can_add_subscribers_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.MEMBERS,\n- ),\n- 'can_add_custom_emoji_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.MEMBERS,\n- ),\n- 'can_create_bots_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.MEMBERS,\n- ),\n- 'can_create_groups': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.MEMBERS,\n- ),\n- 'can_create_public_channel_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.MEMBERS,\n- ),\n- 'can_create_private_channel_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.MEMBERS,\n- ),\n- 'can_create_web_public_channel_group': PermissionSettingsItem(\n- // require_system_group=True,\n- // allow_nobody_group=True,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.OWNERS,\n- // allowed_system_groups=[\n- // SystemGroups.MODERATORS,\n- // SystemGroups.ADMINISTRATORS,\n- // SystemGroups.OWNERS,\n- // SystemGroups.NOBODY,\n- // ],\n- ),\n- 'can_create_write_only_bots_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.MEMBERS,\n- ),\n- 'can_delete_any_message_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.ADMINISTRATORS,\n- ),\n- 'can_delete_own_message_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: true,\n- // default_group_name=SystemGroups.EVERYONE,\n- ),\n- 'can_invite_users_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.MEMBERS,\n- ),\n- 'can_manage_all_groups': PermissionSettingsItem(\n- // allow_nobody_group=False,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.OWNERS,\n- ),\n- 'can_manage_billing_group': PermissionSettingsItem(\n- // allow_nobody_group=False,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.ADMINISTRATORS,\n- ),\n- 'can_mention_many_users_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: true,\n- // default_group_name=SystemGroups.ADMINISTRATORS,\n- ),\n- 'can_move_messages_between_channels_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.MEMBERS,\n- ),\n- 'can_move_messages_between_topics_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: true,\n- // default_group_name=SystemGroups.EVERYONE,\n- ),\n- 'can_resolve_topics_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: true,\n- // default_group_name=SystemGroups.EVERYONE,\n- ),\n- 'can_set_delete_message_policy_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.MODERATORS,\n- ),\n- 'can_set_topics_policy_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: true,\n- // default_group_name=SystemGroups.MEMBERS,\n- ),\n- 'can_summarize_topics_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: true,\n- // default_group_name=SystemGroups.EVERYONE,\n- ),\n- 'direct_message_initiator_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: true,\n- // default_group_name=SystemGroups.EVERYONE,\n- ),\n- 'direct_message_permission_group': PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: true,\n- // default_group_name=SystemGroups.EVERYONE,\n- ),\n- },\n- group: {}, // Please go ahead and fill this in when we come to need it.\n- stream: {\n- // From the server's Stream.stream_permission_group_settings,\n- // in zerver/models/streams.py. Current as of f9dc13014, 2025-08.\n- \"can_add_subscribers_group\": PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.NOBODY,\n- ),\n- \"can_administer_channel_group\": PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: false,\n- // default_group_name=\"stream_creator_or_nobody\",\n- ),\n- \"can_delete_any_message_group\": PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: true,\n- // default_group_name=SystemGroups.NOBODY,\n- ),\n- \"can_delete_own_message_group\": PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: true,\n- // default_group_name=SystemGroups.NOBODY,\n- ),\n- \"can_move_messages_out_of_channel_group\": PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: true,\n- // default_group_name=SystemGroups.NOBODY,\n- ),\n- \"can_move_messages_within_channel_group\": PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: true,\n- // default_group_name=SystemGroups.NOBODY,\n- ),\n- \"can_remove_subscribers_group\": PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: true,\n- // default_group_name=SystemGroups.ADMINISTRATORS,\n- ),\n- \"can_send_message_group\": PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: true,\n- // default_group_name=SystemGroups.EVERYONE,\n- ),\n- \"can_subscribe_group\": PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: false,\n- // default_group_name=SystemGroups.NOBODY,\n- ),\n- \"can_resolve_topics_group\": PermissionSettingsItem(\n- // allow_nobody_group=True,\n- allowEveryoneGroup: true,\n- // default_group_name=SystemGroups.NOBODY,\n- ),\n- },\n- );\n-\n- SupportedPermissionSettings({required this.realm, required this.stream, required this.group});\n-\n- factory SupportedPermissionSettings.fromJson(Map json) =>\n- _$SupportedPermissionSettingsFromJson(json);\n-\n- Map toJson() => _$SupportedPermissionSettingsToJson(this);\n-}\n-\n-@JsonSerializable(fieldRename: FieldRename.snake)\n-class PermissionSettingsItem {\n- final bool allowEveryoneGroup;\n- // also other fields not yet used\n-\n- PermissionSettingsItem({required this.allowEveryoneGroup});\n-\n- factory PermissionSettingsItem.fromJson(Map json) =>\n- _$PermissionSettingsItemFromJson(json);\n-\n- Map toJson() => _$PermissionSettingsItemToJson(this);\n-}\ndiff --git a/lib/api/model/initial_snapshot.g.dart b/lib/api/model/initial_snapshot.g.dart\nindex 4a4d153e2c..ffcbfba827 100644\n--- a/lib/api/model/initial_snapshot.g.dart\n+++ b/lib/api/model/initial_snapshot.g.dart\n@@ -382,38 +382,3 @@ Map _$UnreadHuddleSnapshotToJson(\n 'user_ids_string': instance.userIdsString,\n 'unread_message_ids': instance.unreadMessageIds,\n };\n-\n-SupportedPermissionSettings _$SupportedPermissionSettingsFromJson(\n- Map json,\n-) => SupportedPermissionSettings(\n- realm: (json['realm'] as Map).map(\n- (k, e) =>\n- MapEntry(k, PermissionSettingsItem.fromJson(e as Map)),\n- ),\n- stream: (json['stream'] as Map).map(\n- (k, e) =>\n- MapEntry(k, PermissionSettingsItem.fromJson(e as Map)),\n- ),\n- group: (json['group'] as Map).map(\n- (k, e) =>\n- MapEntry(k, PermissionSettingsItem.fromJson(e as Map)),\n- ),\n-);\n-\n-Map _$SupportedPermissionSettingsToJson(\n- SupportedPermissionSettings instance,\n-) => {\n- 'realm': instance.realm,\n- 'stream': instance.stream,\n- 'group': instance.group,\n-};\n-\n-PermissionSettingsItem _$PermissionSettingsItemFromJson(\n- Map json,\n-) => PermissionSettingsItem(\n- allowEveryoneGroup: json['allow_everyone_group'] as bool,\n-);\n-\n-Map _$PermissionSettingsItemToJson(\n- PermissionSettingsItem instance,\n-) => {'allow_everyone_group': instance.allowEveryoneGroup};\ndiff --git a/lib/api/model/permission.dart b/lib/api/model/permission.dart\nnew file mode 100644\nindex 0000000000..315f781ea8\n--- /dev/null\n+++ b/lib/api/model/permission.dart\n@@ -0,0 +1,354 @@\n+import 'package:json_annotation/json_annotation.dart';\n+\n+part 'permission.g.dart';\n+\n+/// Metadata about how to interpret the various group-based permission settings.\n+///\n+/// This is the type that [InitialSnapshot.serverSupportedPermissionSettings]\n+/// would have, according to the API as it exists as of 2025-08;\n+/// but that API is documented as unstable and subject to change.\n+///\n+/// For a useful value of this type, see [SupportedPermissionSettings.fixture].\n+///\n+/// For docs, search for \"d_perm\" in: https://zulip.com/api/register-queue\n+@JsonSerializable(fieldRename: FieldRename.snake)\n+class SupportedPermissionSettings {\n+ final Map realm;\n+ final Map stream;\n+ final Map group;\n+\n+ /// Metadata about how to interpret certain group-based permission settings,\n+ /// including all those that this client uses, based on \"current\" servers.\n+ ///\n+ /// \"Current\" here means as of when this code was written, or last updated;\n+ /// details in comments below. Naturally it'd be better to have an API to\n+ /// get this information from the actual server.\n+ ///\n+ /// Effectively we're counting on it being uncommon for the metadata for a\n+ /// given permission to ever change from one server version to the next,\n+ /// so that the values we take from one server version usually remain valid\n+ /// for all past and future server versions that have the corresponding\n+ /// permission at all.\n+ ///\n+ /// TODO(server): Stabilize [InitialSnapshot.serverSupportedPermissionSettings]\n+ /// or a similar API, and switch to using that. See thread:\n+ /// https://chat.zulip.org/#narrow/channel/378-api-design/topic/server_supported_permission_settings/near/2247549\n+ // TODO: When we get this data from the server, it will sometimes be missing\n+ // items that appear here, because they're for newer permissions that the\n+ // server doesn't know about. We'll want reasonable fallback behavior for\n+ // those missing items, and as a source for that, we can still record\n+ // current-server data somewhere in our codebase. Discussion:\n+ // https://github.com/zulip/zulip-flutter/pull/1842#discussion_r2331337006\n+ static SupportedPermissionSettings fixture = SupportedPermissionSettings(\n+ realm: {\n+ // From the server's Realm.REALM_PERMISSION_GROUP_SETTINGS,\n+ // in zerver/models/realms.py. Current as of 6ab30fcce, 2025-08.\n+ 'create_multiuse_invite_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.administrators,\n+ ),\n+ 'can_access_all_users_group': PermissionSettingsItem(\n+ // require_system_group=True,\n+ // allow_nobody_group=False,\n+ allowEveryoneGroup: true,\n+ defaultGroupName: SystemGroupName.everyone,\n+ // # Note that user_can_access_all_other_users in the web\n+ // # app is relying on members always have access.\n+ // allowed_system_groups=[SystemGroups.EVERYONE, SystemGroups.MEMBERS],\n+ ),\n+ 'can_add_subscribers_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.members,\n+ ),\n+ 'can_add_custom_emoji_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.members,\n+ ),\n+ 'can_create_bots_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.members,\n+ ),\n+ 'can_create_groups': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.members,\n+ ),\n+ 'can_create_public_channel_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.members,\n+ ),\n+ 'can_create_private_channel_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.members,\n+ ),\n+ 'can_create_web_public_channel_group': PermissionSettingsItem(\n+ // require_system_group=True,\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.owners,\n+ // allowed_system_groups=[\n+ // SystemGroups.MODERATORS,\n+ // SystemGroups.ADMINISTRATORS,\n+ // SystemGroups.OWNERS,\n+ // SystemGroups.NOBODY,\n+ // ],\n+ ),\n+ 'can_create_write_only_bots_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.members,\n+ ),\n+ 'can_delete_any_message_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.administrators,\n+ ),\n+ 'can_delete_own_message_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ defaultGroupName: SystemGroupName.everyone,\n+ ),\n+ 'can_invite_users_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.members,\n+ ),\n+ 'can_manage_all_groups': PermissionSettingsItem(\n+ // allow_nobody_group=False,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.owners,\n+ ),\n+ 'can_manage_billing_group': PermissionSettingsItem(\n+ // allow_nobody_group=False,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.administrators,\n+ ),\n+ 'can_mention_many_users_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ defaultGroupName: SystemGroupName.administrators,\n+ ),\n+ 'can_move_messages_between_channels_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.members,\n+ ),\n+ 'can_move_messages_between_topics_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ defaultGroupName: SystemGroupName.everyone,\n+ ),\n+ 'can_resolve_topics_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ defaultGroupName: SystemGroupName.everyone,\n+ ),\n+ 'can_set_delete_message_policy_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.moderators,\n+ ),\n+ 'can_set_topics_policy_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ defaultGroupName: SystemGroupName.members,\n+ ),\n+ 'can_summarize_topics_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ defaultGroupName: SystemGroupName.everyone,\n+ ),\n+ 'direct_message_initiator_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ defaultGroupName: SystemGroupName.everyone,\n+ ),\n+ 'direct_message_permission_group': PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ defaultGroupName: SystemGroupName.everyone,\n+ ),\n+ },\n+ group: {}, // Please go ahead and fill this in when we come to need it.\n+ stream: {\n+ // From the server's Stream.stream_permission_group_settings,\n+ // in zerver/models/streams.py. Current as of f9dc13014, 2025-08.\n+ \"can_add_subscribers_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.nobody,\n+ ),\n+ \"can_administer_channel_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: PseudoSystemGroupName.streamCreatorOrNobody,\n+ ),\n+ \"can_delete_any_message_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ defaultGroupName: SystemGroupName.nobody,\n+ ),\n+ \"can_delete_own_message_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ defaultGroupName: SystemGroupName.nobody,\n+ ),\n+ \"can_move_messages_out_of_channel_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ defaultGroupName: SystemGroupName.nobody,\n+ ),\n+ \"can_move_messages_within_channel_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ defaultGroupName: SystemGroupName.nobody,\n+ ),\n+ \"can_remove_subscribers_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ defaultGroupName: SystemGroupName.administrators,\n+ ),\n+ \"can_send_message_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ defaultGroupName: SystemGroupName.everyone,\n+ ),\n+ \"can_subscribe_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ defaultGroupName: SystemGroupName.nobody,\n+ ),\n+ \"can_resolve_topics_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ defaultGroupName: SystemGroupName.nobody,\n+ ),\n+ },\n+ );\n+\n+ SupportedPermissionSettings({required this.realm, required this.stream, required this.group});\n+\n+ factory SupportedPermissionSettings.fromJson(Map json) =>\n+ _$SupportedPermissionSettingsFromJson(json);\n+\n+ Map toJson() => _$SupportedPermissionSettingsToJson(this);\n+}\n+\n+@JsonSerializable(fieldRename: FieldRename.snake)\n+class PermissionSettingsItem {\n+ final bool allowEveryoneGroup;\n+\n+ final DefaultGroupName defaultGroupName;\n+\n+ // also other fields not yet used\n+\n+ PermissionSettingsItem({\n+ required this.allowEveryoneGroup,\n+ required this.defaultGroupName,\n+ });\n+\n+ factory PermissionSettingsItem.fromJson(Map json) =>\n+ _$PermissionSettingsItemFromJson(json);\n+\n+ Map toJson() => _$PermissionSettingsItemToJson(this);\n+}\n+\n+/// A value of [PermissionSettingsItem.defaultGroupName].\n+///\n+/// Can be any of these:\n+/// - a known system group [SystemGroupName]\n+/// - a known special string [PseudoSystemGroupName]\n+/// - an unknown system group or special string [DefaultGroupNameUnknown]\n+sealed class DefaultGroupName {\n+ DefaultGroupName();\n+\n+ factory DefaultGroupName.fromJson(String json) {\n+ final DefaultGroupName? maybeResult = json.startsWith('role:')\n+ ? SystemGroupName.fromJson(json)\n+ : PseudoSystemGroupName.fromJson(json);\n+ return maybeResult ?? DefaultGroupNameUnknown(json);\n+ }\n+\n+ String toJson();\n+}\n+\n+class DefaultGroupNameUnknown extends DefaultGroupName {\n+ DefaultGroupNameUnknown(this.apiValue);\n+ final String apiValue;\n+\n+ @override\n+ String toJson() => apiValue;\n+}\n+\n+/// A known special string\n+/// that [PermissionSettingsItem.defaultGroupName] might be.\n+///\n+/// See server implementation, e.g.\n+/// `can_administer_channel_group` in zerver/models/streams.py.\n+@JsonEnum(valueField: 'apiValue', alwaysCreate: true)\n+enum PseudoSystemGroupName implements DefaultGroupName {\n+ // Discussion on this; it looks like it might get renamed:\n+ // https://chat.zulip.org/#narrow/channel/378-api-design/topic/stream_creator_or_nobody/near/2258637\n+ streamCreatorOrNobody(apiValue: 'stream_creator_or_nobody'),\n+ ;\n+\n+ const PseudoSystemGroupName({required this.apiValue});\n+\n+ final String apiValue;\n+\n+ /// Get a [PseudoSystemGroupName] from an [apiValue],\n+ /// or null if it's not recognized.\n+ ///\n+ /// Example:\n+ /// 'stream_creator_or_nobody' -> PseudoSystemGroupName.streamCreatorOrNobody\n+ static PseudoSystemGroupName? fromJson(String json) => _byApiValue[json];\n+\n+ // _$\u2026EnumMap is thanks to `alwaysCreate: true`\n+ static final _byApiValue = _$PseudoSystemGroupNameEnumMap\n+ .map((key, value) => MapEntry(value, key));\n+\n+ @override\n+ String toJson() => _$PseudoSystemGroupNameEnumMap[this]!;\n+}\n+\n+/// A known canonical name for a system group.\n+///\n+/// Doc: https://zulip.com/api/group-setting-values#system-groups\n+@JsonEnum(valueField: 'apiValue', alwaysCreate: true)\n+enum SystemGroupName implements DefaultGroupName {\n+ // TODO(#1096) audit all references when implementing public-access option\n+ everyoneOnInternet(apiValue: 'role:internet'),\n+\n+ everyone(apiValue: 'role:everyone'),\n+ members(apiValue: 'role:members'),\n+ fullMembers(apiValue: 'role:fullmembers'),\n+ moderators(apiValue: 'role:moderators'),\n+ administrators(apiValue: 'role:administrators'),\n+ owners(apiValue: 'role:owners'),\n+ nobody(apiValue: 'role:nobody'),\n+ ;\n+\n+ const SystemGroupName({required this.apiValue});\n+\n+ final String apiValue;\n+\n+ /// Get a [SystemGroupName] from an [apiValue],\n+ /// or null if it's not recognized.\n+ ///\n+ /// Example:\n+ /// 'role:administrators' -> SystemGroupName.administrators\n+ static SystemGroupName? fromJson(String json) => _byApiValue[json];\n+\n+ // _$\u2026EnumMap is thanks to `alwaysCreate: true`\n+ static final _byApiValue = _$SystemGroupNameEnumMap\n+ .map((key, value) => MapEntry(value, key));\n+\n+ @override\n+ String toJson() => _$SystemGroupNameEnumMap[this]!;\n+}\ndiff --git a/lib/api/model/permission.g.dart b/lib/api/model/permission.g.dart\nnew file mode 100644\nindex 0000000000..280822f58f\n--- /dev/null\n+++ b/lib/api/model/permission.g.dart\n@@ -0,0 +1,65 @@\n+// GENERATED CODE - DO NOT MODIFY BY HAND\n+\n+// ignore_for_file: constant_identifier_names, unnecessary_cast\n+\n+part of 'permission.dart';\n+\n+// **************************************************************************\n+// JsonSerializableGenerator\n+// **************************************************************************\n+\n+SupportedPermissionSettings _$SupportedPermissionSettingsFromJson(\n+ Map json,\n+) => SupportedPermissionSettings(\n+ realm: (json['realm'] as Map).map(\n+ (k, e) =>\n+ MapEntry(k, PermissionSettingsItem.fromJson(e as Map)),\n+ ),\n+ stream: (json['stream'] as Map).map(\n+ (k, e) =>\n+ MapEntry(k, PermissionSettingsItem.fromJson(e as Map)),\n+ ),\n+ group: (json['group'] as Map).map(\n+ (k, e) =>\n+ MapEntry(k, PermissionSettingsItem.fromJson(e as Map)),\n+ ),\n+);\n+\n+Map _$SupportedPermissionSettingsToJson(\n+ SupportedPermissionSettings instance,\n+) => {\n+ 'realm': instance.realm,\n+ 'stream': instance.stream,\n+ 'group': instance.group,\n+};\n+\n+PermissionSettingsItem _$PermissionSettingsItemFromJson(\n+ Map json,\n+) => PermissionSettingsItem(\n+ allowEveryoneGroup: json['allow_everyone_group'] as bool,\n+ defaultGroupName: DefaultGroupName.fromJson(\n+ json['default_group_name'] as String,\n+ ),\n+);\n+\n+Map _$PermissionSettingsItemToJson(\n+ PermissionSettingsItem instance,\n+) => {\n+ 'allow_everyone_group': instance.allowEveryoneGroup,\n+ 'default_group_name': instance.defaultGroupName,\n+};\n+\n+const _$PseudoSystemGroupNameEnumMap = {\n+ PseudoSystemGroupName.streamCreatorOrNobody: 'stream_creator_or_nobody',\n+};\n+\n+const _$SystemGroupNameEnumMap = {\n+ SystemGroupName.everyoneOnInternet: 'role:internet',\n+ SystemGroupName.everyone: 'role:everyone',\n+ SystemGroupName.members: 'role:members',\n+ SystemGroupName.fullMembers: 'role:fullmembers',\n+ SystemGroupName.moderators: 'role:moderators',\n+ SystemGroupName.administrators: 'role:administrators',\n+ SystemGroupName.owners: 'role:owners',\n+ SystemGroupName.nobody: 'role:nobody',\n+};\ndiff --git a/lib/model/channel.dart b/lib/model/channel.dart\nindex e4a40790d4..0403ba0bdf 100644\n--- a/lib/model/channel.dart\n+++ b/lib/model/channel.dart\n@@ -174,25 +174,14 @@ mixin ChannelStore on UserStore {\n \n bool _selfHasContentAccessViaGroupPermissions(ZulipStream channel) {\n // Compare web's stream_data.has_content_access_via_group_permissions.\n- // TODO(#814) try to clean up this logic; perhaps record more explicitly\n- // what default/fallback value to use for a given group-based permission\n- // on older servers.\n-\n- if (channel.canAddSubscribersGroup != null\n- && selfHasPermissionForGroupSetting(channel.canAddSubscribersGroup!,\n- GroupSettingType.stream, 'can_add_subscribers_group')) {\n- // The behavior before this permission was introduced was equivalent to\n- // the \"nobody\" group.\n- // TODO(server-10): simplify\n+\n+ if (selfHasPermissionForGroupSetting(channel.canAddSubscribersGroup,\n+ GroupSettingType.stream, 'can_add_subscribers_group')) {\n return true;\n }\n \n- if (channel.canSubscribeGroup != null\n- && selfHasPermissionForGroupSetting(channel.canSubscribeGroup!,\n- GroupSettingType.stream, 'can_subscribe_group')) {\n- // The behavior before this permission was introduced was equivalent to\n- // the \"nobody\" group.\n- // TODO(server-10): simplify\n+ if (selfHasPermissionForGroupSetting(channel.canSubscribeGroup,\n+ GroupSettingType.stream, 'can_subscribe_group')) {\n return true;\n }\n \n@@ -213,7 +202,7 @@ mixin ChannelStore on UserStore {\n case ChannelPostPolicy.fullMembers: {\n if (!role.isAtLeast(UserRole.member)) return false;\n if (role == UserRole.member) {\n- return hasPassedWaitingPeriod(selfUser, byDate: byDate);\n+ return selfHasPassedWaitingPeriod(byDate: byDate);\n }\n return true;\n }\ndiff --git a/lib/model/message.dart b/lib/model/message.dart\nindex 9cc4d76f48..68c20c0d65 100644\n--- a/lib/model/message.dart\n+++ b/lib/model/message.dart\n@@ -107,18 +107,14 @@ mixin MessageStore on ChannelStore {\n return false;\n }\n \n- // TODO(#1850) really the default should be `role:administrators`:\n- // https://github.com/zulip/zulip-flutter/pull/1842#discussion_r2331362461\n- if (realmCanDeleteAnyMessageGroup != null\n- && selfHasPermissionForGroupSetting(realmCanDeleteAnyMessageGroup!,\n- GroupSettingType.realm, 'can_delete_any_message_group')) {\n+ if (selfHasPermissionForGroupSetting(realmCanDeleteAnyMessageGroup,\n+ GroupSettingType.realm, 'can_delete_any_message_group')) {\n return true;\n }\n \n if (channel != null) {\n- if (channel.canDeleteAnyMessageGroup != null\n- && selfHasPermissionForGroupSetting(channel.canDeleteAnyMessageGroup!,\n- GroupSettingType.stream, 'can_delete_any_message_group')) {\n+ if (selfHasPermissionForGroupSetting(channel.canDeleteAnyMessageGroup,\n+ GroupSettingType.stream, 'can_delete_any_message_group')) {\n return true;\n }\n }\n@@ -137,6 +133,9 @@ mixin MessageStore on ChannelStore {\n // that's impossible here because `message` can't be an [OutboxMessage]\n // (it's a [Message] from [MessageStore.messages]).\n \n+ // (selfHasPermissionForGroupSetting isn't equipped to handle the old-server\n+ // fallback logic for this specific permission; it's dynamic and depends on\n+ // realmDeleteOwnMessagePolicy, so we do our own null check here.)\n if (realmCanDeleteOwnMessageGroup != null) {\n if (!selfHasPermissionForGroupSetting(realmCanDeleteOwnMessageGroup!,\n GroupSettingType.realm, 'can_delete_own_message_group')) {\n@@ -145,11 +144,8 @@ mixin MessageStore on ChannelStore {\n return false;\n }\n \n- if (\n- channel.canDeleteOwnMessageGroup == null\n- || !selfHasPermissionForGroupSetting(channel.canDeleteOwnMessageGroup!,\n- GroupSettingType.stream, 'can_delete_own_message_group')\n- ) {\n+ if (!selfHasPermissionForGroupSetting(channel.canDeleteOwnMessageGroup,\n+ GroupSettingType.stream, 'can_delete_own_message_group')) {\n return false;\n }\n }\n@@ -185,7 +181,7 @@ mixin MessageStore on ChannelStore {\n case RealmDeleteOwnMessagePolicy.fullMembers: {\n if (!role.isAtLeast(UserRole.member)) return false;\n if (role == UserRole.member) {\n- return hasPassedWaitingPeriod(selfUser, byDate: atDate);\n+ return selfHasPassedWaitingPeriod(byDate: atDate);\n }\n return true;\n }\ndiff --git a/lib/model/realm.dart b/lib/model/realm.dart\nindex 782740405d..48036a343a 100644\n--- a/lib/model/realm.dart\n+++ b/lib/model/realm.dart\n@@ -3,6 +3,7 @@ import 'package:flutter/foundation.dart';\n import '../api/model/events.dart';\n import '../api/model/initial_snapshot.dart';\n import '../api/model/model.dart';\n+import '../api/model/permission.dart';\n import 'store.dart';\n import 'user_group.dart';\n \n@@ -128,9 +129,22 @@ mixin RealmStore on PerAccountStoreBase, UserGroupStore {\n return topic;\n }\n \n+ /// Whether the self-user has passed the realm's waiting period\n+ /// to be a full member.\n+ ///\n+ /// See:\n+ /// https://zulip.com/api/roles-and-permissions#determining-if-a-user-is-a-full-member\n+ ///\n+ /// To determine if the self-user is a full member,\n+ /// callers must also check that the user's role is at least [UserRole.member].\n+ bool selfHasPassedWaitingPeriod({required DateTime byDate});\n+\n /// Whether the self-user has the given (group-based) permission.\n- bool selfHasPermissionForGroupSetting(GroupSettingValue value,\n- GroupSettingType type, String name);\n+ ///\n+ /// If the server doesn't know about the permission,\n+ /// pass null for [value] and a reasonable default will be chosen.\n+ bool selfHasPermissionForGroupSetting(GroupSettingValue? value,\n+ GroupSettingType type, String name);\n }\n \n enum GroupSettingType { realm, stream, group }\n@@ -180,7 +194,10 @@ mixin ProxyRealmStore on RealmStore {\n @override\n List get customProfileFields => realmStore.customProfileFields;\n @override\n- bool selfHasPermissionForGroupSetting(GroupSettingValue value, GroupSettingType type, String name) =>\n+ bool selfHasPassedWaitingPeriod({required DateTime byDate}) =>\n+ realmStore.selfHasPassedWaitingPeriod(byDate: byDate);\n+ @override\n+ bool selfHasPermissionForGroupSetting(GroupSettingValue? value, GroupSettingType type, String name) =>\n realmStore.selfHasPermissionForGroupSetting(value, type, name);\n }\n \n@@ -203,6 +220,7 @@ class RealmStoreImpl extends HasUserGroupStore with RealmStore {\n required User selfUser,\n }) :\n _selfUserRole = selfUser.role,\n+ _selfUserDateJoined = selfUser.dateJoined,\n serverPresencePingIntervalSeconds = initialSnapshot.serverPresencePingIntervalSeconds,\n serverPresenceOfflineThresholdSeconds = initialSnapshot.serverPresenceOfflineThresholdSeconds,\n serverTypingStartedExpiryPeriodMilliseconds = initialSnapshot.serverTypingStartedExpiryPeriodMilliseconds,\n@@ -225,7 +243,23 @@ class RealmStoreImpl extends HasUserGroupStore with RealmStore {\n customProfileFields = _sortCustomProfileFields(initialSnapshot.customProfileFields);\n \n @override\n- bool selfHasPermissionForGroupSetting(GroupSettingValue value,\n+ bool selfHasPassedWaitingPeriod({required DateTime byDate}) {\n+ // [User.dateJoined] is in UTC. For logged-in users, the format is:\n+ // YYYY-MM-DDTHH:mm+00:00, which includes the timezone offset for UTC.\n+ // For logged-out spectators, the format is: YYYY-MM-DD, which doesn't\n+ // include the timezone offset. In the later case, [DateTime.parse] will\n+ // interpret it as the client's local timezone, which could lead to\n+ // incorrect results; but that's acceptable for now because the app\n+ // doesn't support viewing as a spectator.\n+ //\n+ // See the related discussion:\n+ // https://chat.zulip.org/#narrow/channel/412-api-documentation/topic/provide.20an.20explicit.20format.20for.20.60realm_user.2Edate_joined.60/near/1980194\n+ final dateJoined = DateTime.parse(_selfUserDateJoined);\n+ return byDate.difference(dateJoined).inDays >= realmWaitingPeriodThreshold;\n+ }\n+\n+ @override\n+ bool selfHasPermissionForGroupSetting(GroupSettingValue? value,\n GroupSettingType type, String name) {\n // Compare web's settings_data.user_has_permission_for_group_setting.\n //\n@@ -236,13 +270,60 @@ class RealmStoreImpl extends HasUserGroupStore with RealmStore {\n // That exists for deciding whether to offer the \"Generate email address\"\n // button, and if so then which users to offer in the dropdown;\n // it's predicting whether /api/get-stream-email-address would succeed.\n- if (_selfUserRole == UserRole.guest) {\n- final config = _groupSettingConfig(type, name);\n- if (!config.allowEveryoneGroup) return false;\n+\n+ final config = _groupSettingConfig(type, name);\n+\n+ if (_selfUserRole == UserRole.guest && !config.allowEveryoneGroup) {\n+ return false;\n }\n+\n+ if (value == null) {\n+ // The server doesn't know about the permission. *We* know about it\n+ // (or presumably we wouldn't have called this method),\n+ // and we know a reasonable default; use that.\n+ return _hasPermissionByDefault(config);\n+ }\n+\n return selfInGroupSetting(value);\n }\n \n+ bool _hasPermissionByDefault(PermissionSettingsItem config) {\n+ switch (config.defaultGroupName) {\n+ case DefaultGroupNameUnknown():\n+ // When we know about a permission, we should also know about the group\n+ // we've said is the default value for it.\n+ assert(false);\n+ return true;\n+ case PseudoSystemGroupName.streamCreatorOrNobody:\n+ // TODO(#1102) implement\n+ assert(() {\n+ throw UnimplementedError();\n+ }());\n+ return true;\n+ case SystemGroupName.everyoneOnInternet:\n+ case SystemGroupName.everyone:\n+ return true;\n+ case SystemGroupName.members:\n+ return _selfUserRole.isAtLeast(UserRole.member);\n+ case SystemGroupName.fullMembers:\n+ // There aren't any permissions where this is the default, and we\n+ // probably won't add any. So for now we skip the complication of\n+ // doing the waiting-period check.\n+ assert(() {\n+ throw UnimplementedError();\n+ }());\n+ return _selfUserRole.isAtLeast(UserRole.member);\n+ case SystemGroupName.moderators:\n+ return _selfUserRole.isAtLeast(UserRole.moderator);\n+ case SystemGroupName.administrators:\n+ return _selfUserRole.isAtLeast(UserRole.administrator);\n+ case SystemGroupName.owners:\n+ return _selfUserRole.isAtLeast(UserRole.owner);\n+ case SystemGroupName.nobody:\n+ return false;\n+ }\n+ }\n+\n /// The metadata for how to interpret the given group-based permission setting.\n PermissionSettingsItem _groupSettingConfig(GroupSettingType type, String name) {\n final supportedSettings = SupportedPermissionSettings.fixture;\n@@ -262,8 +343,20 @@ class RealmStoreImpl extends HasUserGroupStore with RealmStore {\n /// The main home of this information is [UserStore]: `store.selfUser.role`.\n /// We need it here for interpreting some permission settings;\n /// so we denormalize it here to avoid a cycle between substores.\n+ ///\n+ /// See also [_selfUserDateJoined].\n UserRole _selfUserRole;\n \n+ /// The [User.dateJoined] of the self-user.\n+ ///\n+ /// The main home of this information is [UserStore]:\n+ /// `store.selfUser.dateJoined`.\n+ /// We need it here for interpreting some permission settings;\n+ /// so we denormalize it here to avoid a cycle between substores.\n+ ///\n+ /// See also [_selfUserRole].\n+ final String _selfUserDateJoined;\n+\n @override\n final int serverPresencePingIntervalSeconds;\n @override\ndiff --git a/lib/model/user.dart b/lib/model/user.dart\nindex 4983cf48ca..ef26b9e589 100644\n--- a/lib/model/user.dart\n+++ b/lib/model/user.dart\n@@ -91,28 +91,6 @@ mixin UserStore on PerAccountStoreBase, RealmStore {\n return getUser(senderId)?.fullName ?? message.senderFullName;\n }\n \n- /// Whether [user] has passed the realm's waiting period to be a full member.\n- ///\n- /// See:\n- /// https://zulip.com/api/roles-and-permissions#determining-if-a-user-is-a-full-member\n- ///\n- /// To determine if a user is a full member, callers must also check that the\n- /// user's role is at least [UserRole.member].\n- bool hasPassedWaitingPeriod(User user, {required DateTime byDate}) {\n- // [User.dateJoined] is in UTC. For logged-in users, the format is:\n- // YYYY-MM-DDTHH:mm+00:00, which includes the timezone offset for UTC.\n- // For logged-out spectators, the format is: YYYY-MM-DD, which doesn't\n- // include the timezone offset. In the later case, [DateTime.parse] will\n- // interpret it as the client's local timezone, which could lead to\n- // incorrect results; but that's acceptable for now because the app\n- // doesn't support viewing as a spectator.\n- //\n- // See the related discussion:\n- // https://chat.zulip.org/#narrow/channel/412-api-documentation/topic/provide.20an.20explicit.20format.20for.20.60realm_user.2Edate_joined.60/near/1980194\n- final dateJoined = DateTime.parse(user.dateJoined);\n- return byDate.difference(dateJoined).inDays >= realmWaitingPeriodThreshold;\n- }\n-\n /// Whether the user with [userId] is muted by the self-user.\n ///\n /// Looks for [userId] in a private [Set],\n", "test_patch": "diff --git a/test/model/message_test.dart b/test/model/message_test.dart\nindex 7dbf28a47d..4eccf75112 100644\n--- a/test/model/message_test.dart\n+++ b/test/model/message_test.dart\n@@ -868,7 +868,7 @@ void main() {\n group('selfCanDeleteMessage', () {\n /// Call the method, with setup from [params].\n Future evaluate(CanDeleteMessageParams params) async {\n- final selfUser = eg.selfUser;\n+ final selfUser = eg.user(role: params.selfUserRole);\n final botUserOwnedBySelf = eg.user(isBot: true, botOwnerId: selfUser.userId);\n final botUserNotOwnedBySelf = eg.user(isBot: true, botOwnerId: eg.otherUser.userId);\n \n@@ -1078,8 +1078,8 @@ void main() {\n group('legacy behavior', () {\n group('pre-407', () {\n // The channel-level group permissions don't exist,\n- // so we act as though they were present and denied,\n- // notably by not throwing.\n+ // so we act as though they were present with role:nobody,\n+ // and we don't throw.\n \n test('denial is not forced just because one of the permissions is absent (the any-message one)', () async {\n check(await evaluate(\n@@ -1127,7 +1127,7 @@ void main() {\n // doesn't exist, so we follow realmDeleteOwnMessagePolicy instead,\n // and we don't error.\n \n- test('allowed', () async {\n+ test('allowed (permissive policy, low role)', () async {\n check(await evaluate(\n CanDeleteMessageParams.pre291(\n senderConfig: CanDeleteMessageSenderConfig.self,\n@@ -1135,6 +1135,27 @@ void main() {\n inRealmCanDeleteAnyMessageGroup: false,\n isChannelArchived: false,\n realmDeleteOwnMessagePolicy: RealmDeleteOwnMessagePolicy.everyone,\n+ selfUserRole: UserRole.member,\n+ )))\n+ ..equals(await evaluate(\n+ CanDeleteMessageParams.pre407(\n+ senderConfig: CanDeleteMessageSenderConfig.self,\n+ timeLimitConfig: CanDeleteMessageTimeLimitConfig.notLimited,\n+ inRealmCanDeleteAnyMessageGroup: false,\n+ inRealmCanDeleteOwnMessageGroup: true,\n+ isChannelArchived: false)))\n+ ..isTrue();\n+ });\n+\n+ test('allowed (strict policy, high role)', () async {\n+ check(await evaluate(\n+ CanDeleteMessageParams.pre291(\n+ senderConfig: CanDeleteMessageSenderConfig.self,\n+ timeLimitConfig: CanDeleteMessageTimeLimitConfig.notLimited,\n+ inRealmCanDeleteAnyMessageGroup: false,\n+ isChannelArchived: false,\n+ realmDeleteOwnMessagePolicy: RealmDeleteOwnMessagePolicy.admins,\n+ selfUserRole: UserRole.administrator,\n )))\n ..equals(await evaluate(\n CanDeleteMessageParams.pre407(\n@@ -1154,6 +1175,7 @@ void main() {\n inRealmCanDeleteAnyMessageGroup: false,\n isChannelArchived: false,\n realmDeleteOwnMessagePolicy: RealmDeleteOwnMessagePolicy.admins,\n+ selfUserRole: UserRole.moderator,\n )))..equals(await evaluate(\n CanDeleteMessageParams.pre407(\n senderConfig: CanDeleteMessageSenderConfig.self,\n@@ -1166,26 +1188,47 @@ void main() {\n });\n \n group('pre-281', () {\n- // The realm-level can-delete-any-message permission\n- // doesn't exist, so we act as though that's present and denied,\n- // notably by not throwing.\n+ // The realm-level can-delete-any-message permission doesn't exist,\n+ // so we act as though that's present with role:administrators,\n+ // and we don't throw.\n \n- test('denied', () async {\n+ test('self-user is not admin', () async {\n check(await evaluate(\n CanDeleteMessageParams.pre281(\n senderConfig: CanDeleteMessageSenderConfig.otherHuman,\n timeLimitConfig: CanDeleteMessageTimeLimitConfig.notLimited,\n isChannelArchived: false,\n realmDeleteOwnMessagePolicy: RealmDeleteOwnMessagePolicy.everyone,\n+ selfUserRole: UserRole.member,\n )))..equals(await evaluate(\n CanDeleteMessageParams.pre291(\n senderConfig: CanDeleteMessageSenderConfig.otherHuman,\n timeLimitConfig: CanDeleteMessageTimeLimitConfig.notLimited,\n inRealmCanDeleteAnyMessageGroup: false,\n isChannelArchived: false,\n- realmDeleteOwnMessagePolicy: RealmDeleteOwnMessagePolicy.everyone)))\n+ realmDeleteOwnMessagePolicy: RealmDeleteOwnMessagePolicy.everyone,\n+ selfUserRole: UserRole.member)))\n ..isFalse();\n });\n+\n+ test('self-user is admin', () async {\n+ check(await evaluate(\n+ CanDeleteMessageParams.pre281(\n+ senderConfig: CanDeleteMessageSenderConfig.otherHuman,\n+ timeLimitConfig: CanDeleteMessageTimeLimitConfig.notLimited,\n+ isChannelArchived: false,\n+ realmDeleteOwnMessagePolicy: RealmDeleteOwnMessagePolicy.everyone,\n+ selfUserRole: UserRole.administrator,\n+ )))..equals(await evaluate(\n+ CanDeleteMessageParams.pre291(\n+ senderConfig: CanDeleteMessageSenderConfig.otherHuman,\n+ timeLimitConfig: CanDeleteMessageTimeLimitConfig.notLimited,\n+ inRealmCanDeleteAnyMessageGroup: true,\n+ isChannelArchived: false,\n+ realmDeleteOwnMessagePolicy: RealmDeleteOwnMessagePolicy.everyone,\n+ selfUserRole: UserRole.administrator)))\n+ ..isTrue();\n+ });\n });\n });\n });\n@@ -2006,6 +2049,7 @@ class CanDeleteMessageParams {\n final bool? inChannelCanDeleteAnyMessageGroup;\n final bool? inChannelCanDeleteOwnMessageGroup;\n final RealmDeleteOwnMessagePolicy? realmDeleteOwnMessagePolicy;\n+ final UserRole? selfUserRole;\n \n CanDeleteMessageParams._({\n required this.senderConfig,\n@@ -2016,6 +2060,7 @@ class CanDeleteMessageParams {\n required this.inChannelCanDeleteAnyMessageGroup,\n required this.inChannelCanDeleteOwnMessageGroup,\n required this.realmDeleteOwnMessagePolicy,\n+ required this.selfUserRole,\n });\n \n CanDeleteMessageParams.modern({\n@@ -2026,7 +2071,9 @@ class CanDeleteMessageParams {\n required this.isChannelArchived,\n required this.inChannelCanDeleteAnyMessageGroup,\n required this.inChannelCanDeleteOwnMessageGroup,\n- }) : realmDeleteOwnMessagePolicy = null;\n+ }) :\n+ realmDeleteOwnMessagePolicy = null,\n+ selfUserRole = null;\n \n factory CanDeleteMessageParams.restrictiveForChannelMessageExcept({\n CanDeleteMessageSenderConfig? senderConfig,\n@@ -2110,6 +2157,7 @@ class CanDeleteMessageParams {\n inChannelCanDeleteAnyMessageGroup: null,\n inChannelCanDeleteOwnMessageGroup: null,\n realmDeleteOwnMessagePolicy: null,\n+ selfUserRole: null,\n );\n \n // TODO(server-10) delete\n@@ -2119,6 +2167,7 @@ class CanDeleteMessageParams {\n required bool inRealmCanDeleteAnyMessageGroup,\n required bool? isChannelArchived,\n required RealmDeleteOwnMessagePolicy realmDeleteOwnMessagePolicy,\n+ required UserRole selfUserRole,\n }) => CanDeleteMessageParams._(\n senderConfig: senderConfig,\n timeLimitConfig: timeLimitConfig,\n@@ -2128,6 +2177,7 @@ class CanDeleteMessageParams {\n inChannelCanDeleteAnyMessageGroup: null,\n inChannelCanDeleteOwnMessageGroup: null,\n realmDeleteOwnMessagePolicy: realmDeleteOwnMessagePolicy,\n+ selfUserRole: selfUserRole,\n );\n \n // TODO(server-10) delete\n@@ -2136,6 +2186,7 @@ class CanDeleteMessageParams {\n required CanDeleteMessageTimeLimitConfig timeLimitConfig,\n required bool? isChannelArchived,\n required RealmDeleteOwnMessagePolicy realmDeleteOwnMessagePolicy,\n+ required UserRole selfUserRole,\n }) => CanDeleteMessageParams._(\n senderConfig: senderConfig,\n timeLimitConfig: timeLimitConfig,\n@@ -2145,6 +2196,7 @@ class CanDeleteMessageParams {\n inChannelCanDeleteAnyMessageGroup: null,\n inChannelCanDeleteOwnMessageGroup: null,\n realmDeleteOwnMessagePolicy: realmDeleteOwnMessagePolicy,\n+ selfUserRole: selfUserRole,\n );\n \n String describe() {\ndiff --git a/test/model/realm_test.dart b/test/model/realm_test.dart\nindex 04ceb28855..222a2d1d87 100644\n--- a/test/model/realm_test.dart\n+++ b/test/model/realm_test.dart\n@@ -2,7 +2,9 @@ import 'package:checks/checks.dart';\n import 'package:test/scaffolding.dart';\n import 'package:zulip/api/model/events.dart';\n import 'package:zulip/api/model/model.dart';\n+import 'package:zulip/api/model/permission.dart';\n import 'package:zulip/model/realm.dart';\n+import 'package:zulip/model/store.dart';\n \n import '../example_data.dart' as eg;\n \n@@ -35,6 +37,32 @@ void main() {\n doCheck(eg.t('(no topic)'), eg.t(''), 370);\n });\n \n+ group('selfHasPassedWaitingPeriod', () {\n+ final testCases = [\n+ ('2024-11-25T10:00+00:00', DateTime.utc(2024, 11, 25 + 0, 10, 00), false),\n+ ('2024-11-25T10:00+00:00', DateTime.utc(2024, 11, 25 + 1, 10, 00), false),\n+ ('2024-11-25T10:00+00:00', DateTime.utc(2024, 11, 25 + 2, 09, 59), false),\n+ ('2024-11-25T10:00+00:00', DateTime.utc(2024, 11, 25 + 2, 10, 00), true),\n+ ('2024-11-25T10:00+00:00', DateTime.utc(2024, 11, 25 + 1000, 07, 00), true),\n+ ];\n+\n+ for (final (String dateJoined, DateTime currentDate, bool expected) in testCases) {\n+ test('self-user joined at $dateJoined ${expected ? 'has' : \"hasn't\"} '\n+ 'passed waiting period by $currentDate', () {\n+ final selfUser = eg.user(dateJoined: dateJoined);\n+ final store = eg.store(\n+ selfUser: selfUser,\n+ initialSnapshot: eg.initialSnapshot(\n+ realmWaitingPeriodThreshold: 2,\n+ realmUsers: [selfUser],\n+ ),\n+ );\n+ check(store.selfHasPassedWaitingPeriod(byDate: currentDate))\n+ .equals(expected);\n+ });\n+ }\n+ });\n+\n group('selfHasPermissionForGroupSetting', () {\n // Most of the implementation of this is in [UserGroupStore.selfInGroupSetting],\n // and is tested in more detail in user_group_test.dart .\n@@ -82,6 +110,93 @@ void main() {\n check(hasPermission(selfUser, group, 'can_send_message_group'))\n .isFalse();\n });\n+\n+ group('fallbacks for permissions not known to the server', () {\n+ late PerAccountStore store;\n+\n+ void prepare({UserRole? selfUserRole}) {\n+ final selfUser = eg.user(role: selfUserRole);\n+ store = eg.store(selfUser: selfUser,\n+ initialSnapshot: eg.initialSnapshot(realmUsers: [selfUser]));\n+ }\n+\n+ void doCheck(GroupSettingType type, String name, bool expected) {\n+ check(store.selfHasPermissionForGroupSetting(null, type, name)).equals(expected);\n+ }\n+\n+ for (final pseudoSystemGroupName in PseudoSystemGroupName.values) {\n+ switch (pseudoSystemGroupName) {\n+ case PseudoSystemGroupName.streamCreatorOrNobody:\n+ // TODO implement and test\n+ }\n+ }\n+\n+ for (final systemGroupName in SystemGroupName.values) {\n+ switch (systemGroupName) {\n+ case SystemGroupName.everyoneOnInternet:\n+ // (No permissions where we use this default value; continue.)\n+ break;\n+ case SystemGroupName.everyone:\n+ test('everyone', () {\n+ prepare(selfUserRole: UserRole.guest);\n+ doCheck(GroupSettingType.realm, 'can_access_all_users_group', true);\n+ });\n+ case SystemGroupName.members:\n+ test('members, is guest', () {\n+ prepare(selfUserRole: UserRole.guest);\n+ doCheck(GroupSettingType.realm, 'can_add_custom_emoji_group', false);\n+ });\n+ test('members, is member', () {\n+ prepare(selfUserRole: UserRole.member);\n+ doCheck(GroupSettingType.realm, 'can_add_custom_emoji_group', true);\n+ });\n+ case SystemGroupName.fullMembers:\n+ // (No permissions where we use this default value; continue.)\n+ break;\n+ case SystemGroupName.moderators:\n+ test('moderators, is member', () {\n+ prepare(selfUserRole: UserRole.member);\n+ doCheck(GroupSettingType.realm, 'can_set_delete_message_policy_group', false);\n+ });\n+ test('moderators, is moderator', () {\n+ prepare(selfUserRole: UserRole.moderator);\n+ doCheck(GroupSettingType.realm, 'can_set_delete_message_policy_group', true);\n+ });\n+ case SystemGroupName.administrators:\n+ test('administrators, is moderator', () {\n+ prepare(selfUserRole: UserRole.moderator);\n+ doCheck(GroupSettingType.stream, 'can_remove_subscribers_group', false);\n+ });\n+ test('administrators, is administrator', () {\n+ prepare(selfUserRole: UserRole.administrator);\n+ doCheck(GroupSettingType.stream, 'can_remove_subscribers_group', true);\n+ });\n+ case SystemGroupName.owners:\n+ test('owners, is administrator', () {\n+ prepare(selfUserRole: UserRole.administrator);\n+ doCheck(GroupSettingType.realm, 'can_create_web_public_channel_group', false);\n+ });\n+ test('owners, is owner', () {\n+ prepare(selfUserRole: UserRole.owner);\n+ doCheck(GroupSettingType.realm, 'can_create_web_public_channel_group', true);\n+ });\n+ case SystemGroupName.nobody:\n+ test('nobody', () {\n+ prepare(selfUserRole: UserRole.owner);\n+ doCheck(GroupSettingType.stream, 'can_delete_own_message_group', false);\n+ });\n+ }\n+ }\n+\n+ test('throw on unknown name', () {\n+ // We should know about all the permissions we're trying to implement,\n+ // even the ones old servers don't know about.\n+ prepare(selfUserRole: UserRole.member);\n+ check(() => store.selfHasPermissionForGroupSetting(null,\n+ GroupSettingType.realm, 'example_future_permission_name'),\n+ ).throws();\n+ });\n+ });\n });\n \n group('customProfileFields', () {\ndiff --git a/test/model/user_test.dart b/test/model/user_test.dart\nindex 6d5e5c2519..d306d12f0a 100644\n--- a/test/model/user_test.dart\n+++ b/test/model/user_test.dart\n@@ -58,28 +58,6 @@ void main() {\n });\n });\n \n- group('hasPassedWaitingPeriod', () {\n- final store = eg.store(initialSnapshot:\n- eg.initialSnapshot(realmWaitingPeriodThreshold: 2));\n-\n- final testCases = [\n- ('2024-11-25T10:00+00:00', DateTime.utc(2024, 11, 25 + 0, 10, 00), false),\n- ('2024-11-25T10:00+00:00', DateTime.utc(2024, 11, 25 + 1, 10, 00), false),\n- ('2024-11-25T10:00+00:00', DateTime.utc(2024, 11, 25 + 2, 09, 59), false),\n- ('2024-11-25T10:00+00:00', DateTime.utc(2024, 11, 25 + 2, 10, 00), true),\n- ('2024-11-25T10:00+00:00', DateTime.utc(2024, 11, 25 + 1000, 07, 00), true),\n- ];\n-\n- for (final (String dateJoined, DateTime currentDate, bool hasPassedWaitingPeriod) in testCases) {\n- test('user joined at $dateJoined ${hasPassedWaitingPeriod ? 'has' : \"hasn't\"} '\n- 'passed waiting period by $currentDate', () {\n- final user = eg.user(dateJoined: dateJoined);\n- check(store.hasPassedWaitingPeriod(user, byDate: currentDate))\n- .equals(hasPassedWaitingPeriod);\n- });\n- }\n- });\n-\n group('RealmUserUpdateEvent', () {\n // TODO write more tests for handling RealmUserUpdateEvent\n \n", "n2p_tests": "{\"/home/zulip-flutter/test/model/realm_test.dart: selfHasPermissionForGroupSetting guest -> no permission, despite group\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/realm_test.dart: customProfileFields update clobbers old list\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/realm_test.dart: processTopicLikeServer\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/realm_test.dart: selfHasPassedWaitingPeriod self-user joined at 2024-11-25T10:00+00:00 hasn't passed waiting period by 2024-11-27 09:59:00.000Z\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/realm_test.dart: selfHasPermissionForGroupSetting fallbacks for permissions not known to the server administrators, is moderator\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/realm_test.dart: selfHasPassedWaitingPeriod self-user joined at 2024-11-25T10:00+00:00 hasn't passed waiting period by 2024-11-25 10:00:00.000Z\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/realm_test.dart: selfHasPermissionForGroupSetting fallbacks for permissions not known to the server moderators, is member\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/realm_test.dart: selfHasPermissionForGroupSetting in group -> has permission\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage legacy behavior pre-281 self-user is admin\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"/home/zulip-flutter/test/model/message_test.dart: handleMessageEvent from empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage legacy behavior pre-291 allowed (strict policy, high role)\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: reconcileMessages from not-empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_test.dart: senderDisplayName on an unknown user\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: sendMessage waiting -> waitPeriodExpired -> waiting and never return to waitPeriodExpired\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: sendMessage smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: sendMessage smoke stream message: hidden -> waiting -> (delete)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage dm message params: sender: unknown, time limit: outsideLimit, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: false, channel is archived?: N/A, in channel.canDeleteAnyMessageGroup?: N/A, in channel.canDeleteOwnMessageGroup?: N/A, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: reconcileMessages matchContent and matchTopic are removed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage channel message approval conditions params: sender: botOwnedBySelf, time limit: insideLimit, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: false, channel is archived?: false, in channel.canDeleteAnyMessageGroup?: false, in channel.canDeleteOwnMessageGroup?: true, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_test.dart: MutedUsersEvent mightChangeShouldMuteDmConversation unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_test.dart: MutedUsersEvent mightChangeShouldMuteDmConversation muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage legacy behavior pre-407 exercise both existence checks\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage channel message denial conditions params: sender: botNotOwnedBySelf, time limit: notLimited, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: true, channel is archived?: false, in channel.canDeleteAnyMessageGroup?: false, in channel.canDeleteOwnMessageGroup?: true, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage channel message denial conditions params: sender: self, time limit: outsideLimit, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: false, channel is archived?: false, in channel.canDeleteAnyMessageGroup?: false, in channel.canDeleteOwnMessageGroup?: true, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: sendMessage \\u2026 -> (delete) hidden -> (delete) when event arrives before send request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_test.dart: MutedUsersEvent mightChangeShouldMuteDmConversation mixed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: sendMessage \\u2026 -> failed waiting -> failed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: reconcileMessages from empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: dispose cancels pending timers\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage channel message params: sender: unknown, time limit: outsideLimit, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: false, channel is archived?: true, in channel.canDeleteAnyMessageGroup?: false, in channel.canDeleteOwnMessageGroup?: false, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage channel message approval conditions params: sender: self, time limit: notLimited, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: true, channel is archived?: false, in channel.canDeleteAnyMessageGroup?: false, in channel.canDeleteOwnMessageGroup?: false, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage legacy behavior pre-407 denial is not forced just because one of the permissions is absent (the any-message one)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: edit-message methods message deleted while request in progress; we get failure response\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage dm message approval conditions params: sender: self, time limit: insideLimit, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: true, channel is archived?: N/A, in channel.canDeleteAnyMessageGroup?: N/A, in channel.canDeleteOwnMessageGroup?: N/A, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage channel message denial conditions params: sender: self, time limit: notLimited, in realmCanDeleteAnyMessageGroup?: true, in realmCanDeleteOwnMessageGroup?: true, channel is archived?: true, in channel.canDeleteAnyMessageGroup?: true, in channel.canDeleteOwnMessageGroup?: true, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage channel message denial conditions params: sender: unknown, time limit: notLimited, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: true, channel is archived?: false, in channel.canDeleteAnyMessageGroup?: false, in channel.canDeleteOwnMessageGroup?: true, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: sendMessage outbox messages get unique localMessageId\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage legacy behavior pre-281 self-user is not admin\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: edit-message methods editMessage throws StateError if editMessage already in progress for same message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_test.dart: UserStatusEvent\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage dm message params: sender: self, time limit: notLimited, in realmCanDeleteAnyMessageGroup?: true, in realmCanDeleteOwnMessageGroup?: true, channel is archived?: N/A, in channel.canDeleteAnyMessageGroup?: N/A, in channel.canDeleteOwnMessageGroup?: N/A, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: sendMessage hidden -> waiting and never transition to waitPeriodExpired\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: sendMessage smoke DM: hidden -> waiting -> (delete)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: edit-message methods request fails, then event arrives; take failed edit in between\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: edit-message methods takeFailedMessageEdit throws StateError when nothing to take\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent Handle message edit state update message topic moved update\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage channel message approval conditions params: sender: unknown, time limit: outsideLimit, in realmCanDeleteAnyMessageGroup?: true, in realmCanDeleteOwnMessageGroup?: false, channel is archived?: false, in channel.canDeleteAnyMessageGroup?: false, in channel.canDeleteOwnMessageGroup?: false, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: sendMessage when sending to \\\"(no topic)\\\", process topic like the server does when creating outbox message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: sendMessage \\u2026 -> failed waitPeriodExpired -> failed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: sendMessage \\u2026 -> failed hidden -> failed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: edit-message methods request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent ignore when message unknown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: edit-message methods concurrent edits on different messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: sendMessage set timestamp to now when creating outbox messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleMessageEvent from not-empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_test.dart: MutedUsersEvent mightChangeShouldMuteDmConversation none (empty to empty)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage legacy behavior pre-291 denied\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent update timestamps on all messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage channel message params: sender: self, time limit: notLimited, in realmCanDeleteAnyMessageGroup?: true, in realmCanDeleteOwnMessageGroup?: true, channel is archived?: false, in channel.canDeleteAnyMessageGroup?: true, in channel.canDeleteOwnMessageGroup?: true, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage dm message denial conditions params: sender: otherHuman, time limit: notLimited, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: true, channel is archived?: N/A, in channel.canDeleteAnyMessageGroup?: N/A, in channel.canDeleteOwnMessageGroup?: N/A, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage dm message denial conditions params: sender: botNotOwnedBySelf, time limit: notLimited, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: true, channel is archived?: N/A, in channel.canDeleteAnyMessageGroup?: N/A, in channel.canDeleteOwnMessageGroup?: N/A, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: sendMessage \\u2026 -> (delete) waiting -> (delete) because event received\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: sendMessage \\u2026 -> (delete) hidden -> (delete) because event received\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: edit-message methods request fails, then message deleted\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleDeleteMessageEvent delete an unknown message with a known message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: takeOutboxMessage\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleMessageEvent new message clobbers old on ID collision\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage dm message denial conditions params: sender: self, time limit: outsideLimit, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: true, channel is archived?: N/A, in channel.canDeleteAnyMessageGroup?: N/A, in channel.canDeleteOwnMessageGroup?: N/A, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_test.dart: MutedUsersEvent mightChangeShouldMuteDmConversation none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage channel message approval conditions params: sender: unknown, time limit: outsideLimit, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: false, channel is archived?: false, in channel.canDeleteAnyMessageGroup?: true, in channel.canDeleteOwnMessageGroup?: false, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: edit-message methods smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage channel message denial conditions params: sender: self, time limit: notLimited, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: false, channel is archived?: false, in channel.canDeleteAnyMessageGroup?: false, in channel.canDeleteOwnMessageGroup?: false, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage channel message denial conditions params: sender: otherHuman, time limit: notLimited, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: true, channel is archived?: false, in channel.canDeleteAnyMessageGroup?: false, in channel.canDeleteOwnMessageGroup?: true, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_test.dart: MutedUsersEvent mightChangeShouldMuteDmConversation mixed (all replaced)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: sendMessage waiting -> waitPeriodExpired\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: edit-message methods event arrives, then request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: edit-message methods request fails; take failed edit\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: edit-message methods request fails, then event arrives\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage dm message denial conditions params: sender: self, time limit: notLimited, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: false, channel is archived?: N/A, in channel.canDeleteAnyMessageGroup?: N/A, in channel.canDeleteOwnMessageGroup?: N/A, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent update a message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_test.dart: userDisplayName on a known user\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_test.dart: senderDisplayName on a known user\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent Handle message edit state update message topic both resolved and edited update\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage dm message approval conditions params: sender: unknown, time limit: outsideLimit, in realmCanDeleteAnyMessageGroup?: true, in realmCanDeleteOwnMessageGroup?: false, channel is archived?: N/A, in channel.canDeleteAnyMessageGroup?: N/A, in channel.canDeleteOwnMessageGroup?: N/A, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_test.dart: MutedUsersEvent smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: reconcileMessages on ID collision, new message does not clobber old in store.messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage channel message denial conditions params: sender: self, time limit: outsideLimit, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: true, channel is archived?: false, in channel.canDeleteAnyMessageGroup?: false, in channel.canDeleteOwnMessageGroup?: true, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleDeleteMessageEvent delete messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage legacy behavior pre-291 allowed (permissive policy, low role)\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage dm message denial conditions params: sender: unknown, time limit: notLimited, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: true, channel is archived?: N/A, in channel.canDeleteAnyMessageGroup?: N/A, in channel.canDeleteOwnMessageGroup?: N/A, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: selfCanDeleteMessage dm message approval conditions params: sender: self, time limit: notLimited, in realmCanDeleteAnyMessageGroup?: false, in realmCanDeleteOwnMessageGroup?: true, channel is archived?: N/A, in channel.canDeleteAnyMessageGroup?: N/A, in channel.canDeleteOwnMessageGroup?: N/A, realmDeleteOwnMessagePolicy: N/A\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: edit-message methods message deleted while request in progress but we get success response\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_test.dart: userDisplayName on an unknown user\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageFlagsEvent add flag message is unknown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_test.dart: RealmUserUpdateEvent deliveryEmail\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1840", "org": "zulip", "repo": "zulip-flutter", "number": 1840, "state": "closed", "title": "msglist: Suppress bottom inset in top sliver, too", "body": "Fixes #1523.\r\n\r\nChris reported the issue, debugged, and wrote the core of the fix. I added the test, found that the left and right insets reappeared, debugged why, and added removeLeft and removeRight to fix those.\r\n\r\nCo-authored-by: Chris Bobbe \r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"b49ebf1d5a724004aa28ae52d72e70834e3f4c6d\"}", "resolved_issues": "[{\"number\": 1523, \"title\": \"content/msglist: Horizontal scrollbar in code block sometimes has wrong vertical position (again)\", \"body\": \"In a message-list page without a compose box, the scroll bar in a code block is misaligned, if it's in a message in the top sliver:\\n\\n| Bottom sliver (aligned correctly) | Top sliver (bug) |\\n| --- | --- |\\n| \\\"Image\\\" | \\\"Image\\\" |\\n\\n## Diagnosis\\n\\nThis is #736 again, reappearing in fca651bf5f14562a8a742d25c8e64385ac3ed9a7; the bug is present at that commit but not its parent. We have a regression test for that issue, but it doesn't check the case where the message is in the top sliver:\\n\\n
\\n\\n```dart\\n testWidgets('content not asked to consume insets (including bottom), even without compose box', (tester) async {\\n // Regression test for: https://github.com/zulip/zulip-flutter/issues/736\\n const fakePadding = FakeViewPadding(left: 10, top: 10, right: 10, bottom: 10);\\n tester.view.viewInsets = fakePadding;\\n tester.view.padding = fakePadding;\\n\\n await setupMessageListPage(tester, narrow: const CombinedFeedNarrow(),\\n messages: [eg.streamMessage(content: ContentExample.codeBlockPlain.html)]);\\n\\n // Verify this message list lacks a compose box.\\n // (The original bug wouldn't reproduce with a compose box present.)\\n final state = MessageListPage.ancestorOf(tester.element(find.text(\\\"verb\\\\natim\\\")));\\n check(state.composeBoxState).isNull();\\n\\n final element = tester.element(find.byType(CodeBlock));\\n final padding = MediaQuery.of(element).padding;\\n check(padding).equals(EdgeInsets.zero);\\n });\\n```\\n\\n
\\n\\ncc @gnprice as the author of fca651bf5f14562a8a742d25c8e64385ac3ed9a7.\"}]", "lang": "dart", "problem_statement": "content/msglist: Horizontal scrollbar in code block sometimes has wrong vertical position (again)\nIn a message-list page without a compose box, the scroll bar in a code block is misaligned, if it's in a message in the top sliver:\n\n| Bottom sliver (aligned correctly) | Top sliver (bug) |\n| --- | --- |\n| \"Image\" | \"Image\" |\n\n## Diagnosis\n\nThis is #736 again, reappearing in fca651bf5f14562a8a742d25c8e64385ac3ed9a7; the bug is present at that commit but not its parent. We have a regression test for that issue, but it doesn't check the case where the message is in the top sliver:\n\n
\n\n```dart\n testWidgets('content not asked to consume insets (including bottom), even without compose box', (tester) async {\n // Regression test for: https://github.com/zulip/zulip-flutter/issues/736\n const fakePadding = FakeViewPadding(left: 10, top: 10, right: 10, bottom: 10);\n tester.view.viewInsets = fakePadding;\n tester.view.padding = fakePadding;\n\n await setupMessageListPage(tester, narrow: const CombinedFeedNarrow(),\n messages: [eg.streamMessage(content: ContentExample.codeBlockPlain.html)]);\n\n // Verify this message list lacks a compose box.\n // (The original bug wouldn't reproduce with a compose box present.)\n final state = MessageListPage.ancestorOf(tester.element(find.text(\"verb\\natim\")));\n check(state.composeBoxState).isNull();\n\n final element = tester.element(find.byType(CodeBlock));\n final padding = MediaQuery.of(element).padding;\n check(padding).equals(EdgeInsets.zero);\n });\n```\n\n
\n\ncc @gnprice as the author of fca651bf5f14562a8a742d25c8e64385ac3ed9a7.\n", "hints": "This seems to fix it; @gnprice, would you check this and send a PR, updating the regression test so it exercises the top-sliver case?\n\n```diff\ndiff --git lib/widgets/message_list.dart lib/widgets/message_list.dart\nindex dcd063a62..071231412 100644\n--- lib/widgets/message_list.dart\n+++ lib/widgets/message_list.dart\n@@ -579,7 +579,7 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n \n // The top sliver has its child 0 as the item just before the\n // sliver boundary, child 1 as the item before that, and so on.\n- final topSliver = SliverStickyHeaderList(\n+ Widget topSliver = SliverStickyHeaderList(\n headerPlacement: HeaderPlacement.scrollingStart,\n delegate: SliverChildBuilderDelegate(\n // To preserve state across rebuilds for individual [MessageItem]\n@@ -663,6 +663,8 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n if (!ComposeBox.hasComposeBox(widget.narrow)) {\n // TODO(#311) If we have a bottom nav, it will pad the bottom inset,\n // and this can be removed; also remove mention in MessageList dartdoc\n+ topSliver = MediaQuery.removePadding(context: context,\n+ removeBottom: true, child: topSliver);\n bottomSliver = SliverSafeArea(key: bottomSliver.key, sliver: bottomSliver);\n }\n```\nHi @chrisbobbe and @gnprice,\n\nI\u2019m interested in addressing this bug (#1523). May I begin working on a fix, or is someone else already assigned?\nSure, I've just assigned it to you. A key part of this work will be to update the regression test so that it fails without the fix and passes with the fix.\nHi @chrisbobbe,\n\nThanks for assigning me this issue! I'm really excited to work on it and make sure the fix is solid.\n\nI've already implemented the core fix for the issue, and now I'm focusing on writing the regression test. To be completely transparent, I haven't had much prior experience writing comprehensive regression tests in Flutter before. My main focus has been on feature development.\n\nHowever, I'm fully committed to learning and implementing this correctly. I understand the importance of having a robust regression test that fails without the fix and passes with it. I've already started diving into Flutter's testing documentation and examples, and I'm confident I can get this done.\n\nI'll be sure to keep you updated on my progress, and if I face any major blockers, I'll reach out for guidance.\n\nThanks again for the opportunity!\n\n\n\"Hey Chris,\r\n\r\nHope you're doing well!\r\n\r\nI wanted to let you know that I've completed the main fix for *Bug #1523\r\n(ComposeBox Padding)*. The padding issue has now been resolved.\r\n\r\nHowever, I'm facing a bit of a challenge with updating the regression test.\r\nTo be honest, I don't have much experience with testing and regression\r\ntests yet, and I'm finding this part difficult to grasp properly.\r\n\r\nWould it be possible for me to commit just this padding fix for now? This\r\nwould resolve the core problem, and we could get it merged quickly. I'm\r\ndefinitely keen to learn more about testing concepts in the future, but for\r\nnow, I'd like to see this fix go live.\r\n\r\nAfter this, I'd like to focus on other help wanted issues that might be\r\nmore critical and where I can contribute effectively with my current skills.\r\n\r\nPlease let me know what you think.\r\n\r\nThanks a lot, Vinod\"\r\n\r\nOn Thu, Jun 5, 2025 at 11:02\u202fAM Chris Bobbe ***@***.***>\r\nwrote:\r\n\r\n> *chrisbobbe* left a comment (zulip/zulip-flutter#1523)\r\n> \r\n>\r\n> Sure, I've just assigned it to you. A key part of this work will be to\r\n> update the regression test so that it fails without the fix and passes with\r\n> the fix.\r\n>\r\n> \u2014\r\n> Reply to this email directly, view it on GitHub\r\n> ,\r\n> or unsubscribe\r\n> \r\n> .\r\n> You are receiving this because you were assigned.Message ID:\r\n> ***@***.***>\r\n>\r\n\nThe test is an important part of the change: it's how we make sure your fix doesn't get accidentally broken by a future change.\n\nTo ask for help with writing the test, you're welcome to stop by the #mobile-dev-help channel on chat.zulip.org and ask there. See our guide to using chat.zulip.org, and to asking for help:\nhttps://zulip.com/development-community/\n\n", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1840", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1523\"]", "test_command": "flutter test test/widgets/message_list_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/widgets/message_list.dart b/lib/widgets/message_list.dart\nindex 6316655705..77e2e8cb24 100644\n--- a/lib/widgets/message_list.dart\n+++ b/lib/widgets/message_list.dart\n@@ -1069,7 +1069,7 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n \n // The top sliver has its child 0 as the item just before the\n // sliver boundary, child 1 as the item before that, and so on.\n- final topSliver = SliverStickyHeaderList(\n+ Widget topSliver = SliverStickyHeaderList(\n headerPlacement: HeaderPlacement.scrollingStart,\n delegate: SliverChildBuilderDelegate(\n // To preserve state across rebuilds for individual [MessageItem]\n@@ -1148,6 +1148,15 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n // TODO(#311) If we have a bottom nav, it will pad the bottom inset,\n // and this can be removed; also remove mention in MessageList dartdoc\n bottomSliver = SliverSafeArea(key: bottomSliver.key, sliver: bottomSliver);\n+ topSliver = MediaQuery.removePadding(context: context,\n+ // In the top sliver, forget the bottom inset;\n+ // we're having the bottom sliver take care of it.\n+ removeBottom: true,\n+ // (Also forget the left and right insets; the outer SafeArea, above,\n+ // does that, but the `context` we're passing to this `removePadding`\n+ // is from outside that SafeArea, so we need to repeat it.)\n+ removeLeft: true, removeRight: true,\n+ child: topSliver);\n }\n \n return MessageListScrollView(\n", "test_patch": "diff --git a/test/widgets/message_list_test.dart b/test/widgets/message_list_test.dart\nindex 1755994cfd..acdde3fd2c 100644\n--- a/test/widgets/message_list_test.dart\n+++ b/test/widgets/message_list_test.dart\n@@ -405,7 +405,31 @@ void main() {\n });\n \n group('presents message content appropriately', () {\n- testWidgets('content not asked to consume insets (including bottom), even without compose box', (tester) async {\n+ testWidgets('content not asked to consume insets (including bottom), even without compose box, in top sliver', (tester) async {\n+ // Regression test for: https://github.com/zulip/zulip-flutter/issues/1523\n+ const fakePadding = FakeViewPadding(left: 10, top: 10, right: 10, bottom: 10);\n+ tester.view.viewInsets = fakePadding;\n+ tester.view.padding = fakePadding;\n+\n+ await setupMessageListPage(tester, narrow: const CombinedFeedNarrow(),\n+ messages: [\n+ eg.streamMessage(content: ContentExample.codeBlockPlain.html),\n+ eg.streamMessage(),\n+ ]);\n+\n+ // Verify this message list lacks a compose box.\n+ // (The original bug wouldn't reproduce with a compose box present.)\n+ final state = MessageListPage.ancestorOf(tester.element(find.text(\"verb\\natim\")));\n+ check(state.composeBoxState).isNull();\n+ // Also verify that the first message is in the top sliver.\n+ check(state.model!.middleMessage).equals(1);\n+\n+ final element = tester.element(find.byType(CodeBlock));\n+ final padding = MediaQuery.of(element).padding;\n+ check(padding).equals(EdgeInsets.zero);\n+ });\n+\n+ testWidgets('content not asked to consume insets (including bottom), even without compose box, in bottom sliver', (tester) async {\n // Regression test for: https://github.com/zulip/zulip-flutter/issues/736\n const fakePadding = FakeViewPadding(left: 10, top: 10, right: 10, bottom: 10);\n tester.view.viewInsets = fakePadding;\n@@ -418,6 +442,8 @@ void main() {\n // (The original bug wouldn't reproduce with a compose box present.)\n final state = MessageListPage.ancestorOf(tester.element(find.text(\"verb\\natim\")));\n check(state.composeBoxState).isNull();\n+ // Also verify that the message is in the bottom sliver.\n+ check(state.model!.middleMessage).equals(0);\n \n final element = tester.element(find.byType(CodeBlock));\n final padding = MediaQuery.of(element).padding;\n", "n2p_tests": "{}", "f2p_tests": "{\"presents message content appropriately content not asked to consume insets (including bottom), even without compose box, in top sliver\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"app bar show topic visibility policy for topic narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fetch initial batch of messages topic permalink with message move\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"MessageListPage MessageListPageState.narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"app bar channel icon in channel row; web-public: true, invite-only: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"MessageListPage ancestorOf throws when not a descendant of MessageListPage\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"no-messages placeholder Search, empty keyword\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"app bar has topic-list action for topic narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fetch older messages on scroll observe double-fetch glitch\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"smoke test for light/dark/lerped\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"MessageListPage narrow gets normalized from \\\"general chat\\\"\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"app bar channel icon in channel row; web-public: false, invite-only: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"no-messages placeholder when `messages` empty but `outboxMessages` not empty, show outboxes, not placeholder\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"MessageListPage dispose MessageListView when logged out\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"MessageListPage composeBoxState null when no compose box\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"app bar shows \\\"Muted user\\\" label for muted users in DM narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"app bar has topic-list action for channel narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"no-messages placeholder Search, non-empty keyword\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fetch initial batch of messages topic permalink without message move\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"MessageListPage dispose MessageListView when event queue expired\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fetch older messages on scroll basic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"MessageListPage composeBoxState finds compose box\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"MessageListPage ancestorOf finds page state from message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"app bar handle empty topics\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"app bar has channel-feed action for topic narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"app bar channel icon in channel row; web-public: false, invite-only: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"presents message content appropriately content not asked to consume insets (including bottom), even without compose box, in bottom sliver\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"no-messages placeholder Combined feed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1822", "org": "zulip", "repo": "zulip-flutter", "number": 1822, "state": "closed", "title": "Group-based permissions", "body": "Fixes #1687.\r\nFixes #814.\r\n\r\nStacked atop #1814.\r\n\r\nThis adds all the generic infrastructure needed for implementing any given group-based permission. The last commit (or pair of commits) then adds the permission \"has content access (to a channel)\" (which we'll want for #188), to demonstrate end-to-end how to add individual permissions using the new infrastructure.\r\n\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"e86e2352b89802536c6d9ec67e4c28ea27efdd74\"}", "resolved_issues": "[{\"number\": 814, \"title\": \"Implement group-based permission checks\", \"body\": \"In the Zulip API, we've recently introduced a new group-based permission system, where a realm's admins can define arbitrary user groups to use for permissions. This is more flexible than the old roles-based system, which has a fixed handful of roles like \\\"admin\\\", \\\"moderator\\\", or \\\"member\\\".\\r\\n\\r\\nMostly this is a matter for the server, and for admin settings UIs, and we generally implement very little of an admin settings UI in the Zulip mobile apps (leaving users to go to the web/desktop app to handle those tasks). But in some places a client also needs to check if the user has a given permission, in order to give them a good experience in the case where they don't. For example, #791.\\r\\n\\r\\nSo we need to implement permission checks, and we should do so with the new API. In particular, new permission settings in Zulip (like #791) are being expressed only in the new system, so it's the only way to properly handle those.\\r\\n\\r\\nThis issue is for implementing the infrastructure of that system, so that we can easily add new permissions checks that use it when we need them. That means:\\r\\n* First, as a prerequisite, implement #662.\\r\\n\\r\\n* Then implement a method for \\\"user A is transitively in group X\\\". The desired semantics are transitive: if user A is in group Z, which is in group Y, which is in group X, then A is transitively in X and Y as well as Z.\\r\\n\\r\\n API reference for this: https://zulip.com/api/group-setting-values\\r\\n See also the web implementation, at `is_user_in_group` in `user_groups.ts`.\\r\\n\\r\\n* Implement some particular setting that uses the system, so we can demonstrate end-to-end that the implementation works.\\r\\n\\r\\n I think the one current candidate for this is `direct_message_permission_group` and `direct_message_initiator_group` (for #791).\\r\\n The server also has `can_mention_group` ([this feature](https://zulip.com/api/update-user-group#parameter-can_mention_group)), which we'd use as part of #233.\\r\\n I'd thought I'd seen mention of `stream_post_policy` (for #674) getting turned into a group-based setting; but I don't see that [in the server API](https://zulip.com/api/update-stream#parameter-stream_post_policy).\\r\\n By the time you read this, there may be more: see https://zulip.com/api/changelog after feature level 270 (the latest as I write this).\\r\\n\"}, {\"number\": 1687, \"title\": \"Track membership of user groups\", \"body\": \"In the initial implementation #662, we'll skip tracking the membership of the user groups, because that information isn't needed for our first application of the user-group data: #233.\\n\\nThis issue is for tracking the groups' membership, both direct and indirect. The prime application we'll need that data for is group-based permission checks, #814.\\n\\nCopying from the #662 thread one wrinkle we'll need to handle when implementing this, to help make sure we remember:\\n\\n> For current servers since [zulip/zulip#29498](https://github.com/zulip/zulip/pull/29498) (server-10, ZFL 303), correctly maintaining user groups will also involve acting on RealmUserUpdateEvent.isActive. See the API docs for that property.\\n> \\n> Chat thread: https://chat.zulip.org/#narrow/stream/378-api-design/topic/Groups.20events.20for.20deactivated.20users/near/1958907\\n\\n### References\\n* Prerequisite: #662 \\n* A motivating use case: #814 \\n\"}]", "lang": "dart", "problem_statement": "Implement group-based permission checks\nIn the Zulip API, we've recently introduced a new group-based permission system, where a realm's admins can define arbitrary user groups to use for permissions. This is more flexible than the old roles-based system, which has a fixed handful of roles like \"admin\", \"moderator\", or \"member\".\r\n\r\nMostly this is a matter for the server, and for admin settings UIs, and we generally implement very little of an admin settings UI in the Zulip mobile apps (leaving users to go to the web/desktop app to handle those tasks). But in some places a client also needs to check if the user has a given permission, in order to give them a good experience in the case where they don't. For example, #791.\r\n\r\nSo we need to implement permission checks, and we should do so with the new API. In particular, new permission settings in Zulip (like #791) are being expressed only in the new system, so it's the only way to properly handle those.\r\n\r\nThis issue is for implementing the infrastructure of that system, so that we can easily add new permissions checks that use it when we need them. That means:\r\n* First, as a prerequisite, implement #662.\r\n\r\n* Then implement a method for \"user A is transitively in group X\". The desired semantics are transitive: if user A is in group Z, which is in group Y, which is in group X, then A is transitively in X and Y as well as Z.\r\n\r\n API reference for this: https://zulip.com/api/group-setting-values\r\n See also the web implementation, at `is_user_in_group` in `user_groups.ts`.\r\n\r\n* Implement some particular setting that uses the system, so we can demonstrate end-to-end that the implementation works.\r\n\r\n I think the one current candidate for this is `direct_message_permission_group` and `direct_message_initiator_group` (for #791).\r\n The server also has `can_mention_group` ([this feature](https://zulip.com/api/update-user-group#parameter-can_mention_group)), which we'd use as part of #233.\r\n I'd thought I'd seen mention of `stream_post_policy` (for #674) getting turned into a group-based setting; but I don't see that [in the server API](https://zulip.com/api/update-stream#parameter-stream_post_policy).\r\n By the time you read this, there may be more: see https://zulip.com/api/changelog after feature level 270 (the latest as I write this).\r\n\nTrack membership of user groups\nIn the initial implementation #662, we'll skip tracking the membership of the user groups, because that information isn't needed for our first application of the user-group data: #233.\n\nThis issue is for tracking the groups' membership, both direct and indirect. The prime application we'll need that data for is group-based permission checks, #814.\n\nCopying from the #662 thread one wrinkle we'll need to handle when implementing this, to help make sure we remember:\n\n> For current servers since [zulip/zulip#29498](https://github.com/zulip/zulip/pull/29498) (server-10, ZFL 303), correctly maintaining user groups will also involve acting on RealmUserUpdateEvent.isActive. See the API docs for that property.\n> \n> Chat thread: https://chat.zulip.org/#narrow/stream/378-api-design/topic/Groups.20events.20for.20deactivated.20users/near/1958907\n\n### References\n* Prerequisite: #662 \n* A motivating use case: #814 \n\n", "hints": "> - Implement some particular setting that uses the system, so we can demonstrate end-to-end that the implementation works.\r\n\r\nThe edit-topic permission is another candidate for this, used for\r\n- #1159.\n", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1822", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/814\", \"https://github.com/zulip/zulip-flutter/issues/1687\"]", "test_command": "flutter test test/model/realm_test.dart test/model/user_group_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/api/model/events.dart b/lib/api/model/events.dart\nindex e472f151b7..2f0f846d49 100644\n--- a/lib/api/model/events.dart\n+++ b/lib/api/model/events.dart\n@@ -34,7 +34,10 @@ sealed class Event {\n switch (json['op'] as String) {\n case 'add': return UserGroupAddEvent.fromJson(json);\n case 'update': return UserGroupUpdateEvent.fromJson(json);\n- // TODO(#1687): add_members, remove_members, add_subgroups, remove_subgroups\n+ case 'add_members': return UserGroupAddMembersEvent.fromJson(json);\n+ case 'remove_members': return UserGroupRemoveMembersEvent.fromJson(json);\n+ case 'add_subgroups': return UserGroupAddSubgroupsEvent.fromJson(json);\n+ case 'remove_subgroups': return UserGroupRemoveSubgroupsEvent.fromJson(json);\n case 'remove': return UserGroupRemoveEvent.fromJson(json);\n default: return UnexpectedEvent.fromJson(json);\n }\n@@ -280,6 +283,78 @@ class UserGroupUpdateData {\n Map toJson() => _$UserGroupUpdateDataToJson(this);\n }\n \n+/// A [UserGroupEvent] with op `add_members`: https://zulip.com/api/get-events#user_group-add_members\n+@JsonSerializable(fieldRename: FieldRename.snake)\n+class UserGroupAddMembersEvent extends UserGroupEvent {\n+ @override\n+ @JsonKey(includeToJson: true)\n+ String get op => 'add_members';\n+\n+ final int groupId;\n+ final List userIds;\n+\n+ UserGroupAddMembersEvent({required super.id, required this.groupId, required this.userIds});\n+\n+ factory UserGroupAddMembersEvent.fromJson(Map json) => _$UserGroupAddMembersEventFromJson(json);\n+\n+ @override\n+ Map toJson() => _$UserGroupAddMembersEventToJson(this);\n+}\n+\n+/// A [UserGroupEvent] with op `remove_members`: https://zulip.com/api/get-events#user_group-remove_members\n+@JsonSerializable(fieldRename: FieldRename.snake)\n+class UserGroupRemoveMembersEvent extends UserGroupEvent {\n+ @override\n+ @JsonKey(includeToJson: true)\n+ String get op => 'remove_members';\n+\n+ final int groupId;\n+ final List userIds;\n+\n+ UserGroupRemoveMembersEvent({required super.id, required this.groupId, required this.userIds});\n+\n+ factory UserGroupRemoveMembersEvent.fromJson(Map json) => _$UserGroupRemoveMembersEventFromJson(json);\n+\n+ @override\n+ Map toJson() => _$UserGroupRemoveMembersEventToJson(this);\n+}\n+\n+/// A [UserGroupEvent] with op `add_subgroups`: https://zulip.com/api/get-events#user_group-add_subgroups\n+@JsonSerializable(fieldRename: FieldRename.snake)\n+class UserGroupAddSubgroupsEvent extends UserGroupEvent {\n+ @override\n+ @JsonKey(includeToJson: true)\n+ String get op => 'add_subgroups';\n+\n+ final int groupId;\n+ final List directSubgroupIds;\n+\n+ UserGroupAddSubgroupsEvent({required super.id, required this.groupId, required this.directSubgroupIds});\n+\n+ factory UserGroupAddSubgroupsEvent.fromJson(Map json) => _$UserGroupAddSubgroupsEventFromJson(json);\n+\n+ @override\n+ Map toJson() => _$UserGroupAddSubgroupsEventToJson(this);\n+}\n+\n+/// A [UserGroupEvent] with op `remove_subgroups`: https://zulip.com/api/get-events#user_group-remove_subgroups\n+@JsonSerializable(fieldRename: FieldRename.snake)\n+class UserGroupRemoveSubgroupsEvent extends UserGroupEvent {\n+ @override\n+ @JsonKey(includeToJson: true)\n+ String get op => 'remove_subgroups';\n+\n+ final int groupId;\n+ final List directSubgroupIds;\n+\n+ UserGroupRemoveSubgroupsEvent({required super.id, required this.groupId, required this.directSubgroupIds});\n+\n+ factory UserGroupRemoveSubgroupsEvent.fromJson(Map json) => _$UserGroupRemoveSubgroupsEventFromJson(json);\n+\n+ @override\n+ Map toJson() => _$UserGroupRemoveSubgroupsEventToJson(this);\n+}\n+\n /// A [UserGroupEvent] with op `remove`: https://zulip.com/api/get-events#user_group-remove\n @JsonSerializable(fieldRename: FieldRename.snake)\n class UserGroupRemoveEvent extends UserGroupEvent {\n@@ -599,6 +674,9 @@ class ChannelUpdateEvent extends ChannelEvent {\n return value as int?;\n case ChannelPropertyName.channelPostPolicy:\n return ChannelPostPolicy.fromApiValue(value as int);\n+ case ChannelPropertyName.canAddSubscribersGroup:\n+ case ChannelPropertyName.canSubscribeGroup:\n+ return GroupSettingValue.fromJson(value);\n case ChannelPropertyName.streamWeeklyTraffic:\n return value as int?;\n case null:\ndiff --git a/lib/api/model/events.g.dart b/lib/api/model/events.g.dart\nindex bb85039555..6e7aadf362 100644\n--- a/lib/api/model/events.g.dart\n+++ b/lib/api/model/events.g.dart\n@@ -134,6 +134,86 @@ Map _$UserGroupUpdateDataToJson(\n 'deactivated': instance.deactivated,\n };\n \n+UserGroupAddMembersEvent _$UserGroupAddMembersEventFromJson(\n+ Map json,\n+) => UserGroupAddMembersEvent(\n+ id: (json['id'] as num).toInt(),\n+ groupId: (json['group_id'] as num).toInt(),\n+ userIds: (json['user_ids'] as List)\n+ .map((e) => (e as num).toInt())\n+ .toList(),\n+);\n+\n+Map _$UserGroupAddMembersEventToJson(\n+ UserGroupAddMembersEvent instance,\n+) => {\n+ 'id': instance.id,\n+ 'type': instance.type,\n+ 'op': instance.op,\n+ 'group_id': instance.groupId,\n+ 'user_ids': instance.userIds,\n+};\n+\n+UserGroupRemoveMembersEvent _$UserGroupRemoveMembersEventFromJson(\n+ Map json,\n+) => UserGroupRemoveMembersEvent(\n+ id: (json['id'] as num).toInt(),\n+ groupId: (json['group_id'] as num).toInt(),\n+ userIds: (json['user_ids'] as List)\n+ .map((e) => (e as num).toInt())\n+ .toList(),\n+);\n+\n+Map _$UserGroupRemoveMembersEventToJson(\n+ UserGroupRemoveMembersEvent instance,\n+) => {\n+ 'id': instance.id,\n+ 'type': instance.type,\n+ 'op': instance.op,\n+ 'group_id': instance.groupId,\n+ 'user_ids': instance.userIds,\n+};\n+\n+UserGroupAddSubgroupsEvent _$UserGroupAddSubgroupsEventFromJson(\n+ Map json,\n+) => UserGroupAddSubgroupsEvent(\n+ id: (json['id'] as num).toInt(),\n+ groupId: (json['group_id'] as num).toInt(),\n+ directSubgroupIds: (json['direct_subgroup_ids'] as List)\n+ .map((e) => (e as num).toInt())\n+ .toList(),\n+);\n+\n+Map _$UserGroupAddSubgroupsEventToJson(\n+ UserGroupAddSubgroupsEvent instance,\n+) => {\n+ 'id': instance.id,\n+ 'type': instance.type,\n+ 'op': instance.op,\n+ 'group_id': instance.groupId,\n+ 'direct_subgroup_ids': instance.directSubgroupIds,\n+};\n+\n+UserGroupRemoveSubgroupsEvent _$UserGroupRemoveSubgroupsEventFromJson(\n+ Map json,\n+) => UserGroupRemoveSubgroupsEvent(\n+ id: (json['id'] as num).toInt(),\n+ groupId: (json['group_id'] as num).toInt(),\n+ directSubgroupIds: (json['direct_subgroup_ids'] as List)\n+ .map((e) => (e as num).toInt())\n+ .toList(),\n+);\n+\n+Map _$UserGroupRemoveSubgroupsEventToJson(\n+ UserGroupRemoveSubgroupsEvent instance,\n+) => {\n+ 'id': instance.id,\n+ 'type': instance.type,\n+ 'op': instance.op,\n+ 'group_id': instance.groupId,\n+ 'direct_subgroup_ids': instance.directSubgroupIds,\n+};\n+\n UserGroupRemoveEvent _$UserGroupRemoveEventFromJson(\n Map json,\n ) => UserGroupRemoveEvent(\n@@ -381,6 +461,8 @@ const _$ChannelPropertyNameEnumMap = {\n ChannelPropertyName.inviteOnly: 'invite_only',\n ChannelPropertyName.messageRetentionDays: 'message_retention_days',\n ChannelPropertyName.channelPostPolicy: 'stream_post_policy',\n+ ChannelPropertyName.canAddSubscribersGroup: 'can_add_subscribers_group',\n+ ChannelPropertyName.canSubscribeGroup: 'can_subscribe_group',\n ChannelPropertyName.streamWeeklyTraffic: 'stream_weekly_traffic',\n };\n \ndiff --git a/lib/api/model/initial_snapshot.dart b/lib/api/model/initial_snapshot.dart\nindex 50a9f0c243..26e1948d9d 100644\n--- a/lib/api/model/initial_snapshot.dart\n+++ b/lib/api/model/initial_snapshot.dart\n@@ -109,6 +109,9 @@ class InitialSnapshot {\n @JsonKey(readValue: _readUsersIsActiveFallbackTrue)\n final List crossRealmBots;\n \n+ // TODO(server): Get this API stabilized, to replace [SupportedPermissionSettings.fixture].\n+ // final SupportedPermissionSettings? serverSupportedPermissionSettings;\n+\n // TODO etc., etc.\n // If adding fields, keep them all in the order they appear in the API docs.\n \n@@ -389,3 +392,114 @@ class UnreadHuddleSnapshot {\n \n Map toJson() => _$UnreadHuddleSnapshotToJson(this);\n }\n+\n+/// Metadata about how to interpret the various group-based permission settings.\n+///\n+/// This is the type that [InitialSnapshot.serverSupportedPermissionSettings]\n+/// would have, according to the API as it exists as of 2025-08;\n+/// but that API is documented as unstable and subject to change.\n+///\n+/// For a useful value of this type, see [SupportedPermissionSettings.fixture].\n+///\n+/// For docs, search for \"d_perm\" in: https://zulip.com/api/register-queue\n+@JsonSerializable(fieldRename: FieldRename.snake)\n+class SupportedPermissionSettings {\n+ final Map realm;\n+ final Map stream;\n+ final Map group;\n+\n+ /// Metadata about how to interpret certain group-based permission settings,\n+ /// including all those that this client uses, based on \"current\" servers.\n+ ///\n+ /// \"Current\" here means as of when this code was written, or last updated;\n+ /// details in comments below. Naturally it'd be better to have an API to\n+ /// get this information from the actual server.\n+ ///\n+ /// Effectively we're counting on it being uncommon for the metadata for a\n+ /// given permission to ever change from one server version to the next,\n+ /// so that the values we take from one server version usually remain valid\n+ /// for all past and future server versions that have the corresponding\n+ /// permission at all.\n+ ///\n+ /// TODO(server): Stabilize [InitialSnapshot.serverSupportedPermissionSettings]\n+ /// or a similar API, and switch to using that. See thread:\n+ /// https://chat.zulip.org/#narrow/channel/378-api-design/topic/server_supported_permission_settings/near/2247549\n+ static SupportedPermissionSettings fixture = SupportedPermissionSettings(\n+ realm: {}, // Please go ahead and fill this in when we come to need it.\n+ group: {}, // Please go ahead and fill this in when we come to need it.\n+ stream: {\n+ // From the server's Stream.stream_permission_group_settings,\n+ // in zerver/models/streams.py. Current as of f9dc13014, 2025-08.\n+ \"can_add_subscribers_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ // default_group_name=SystemGroups.NOBODY,\n+ ),\n+ \"can_administer_channel_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ // default_group_name=\"stream_creator_or_nobody\",\n+ ),\n+ \"can_delete_any_message_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ // default_group_name=SystemGroups.NOBODY,\n+ ),\n+ \"can_delete_own_message_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ // default_group_name=SystemGroups.NOBODY,\n+ ),\n+ \"can_move_messages_out_of_channel_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ // default_group_name=SystemGroups.NOBODY,\n+ ),\n+ \"can_move_messages_within_channel_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ // default_group_name=SystemGroups.NOBODY,\n+ ),\n+ \"can_remove_subscribers_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ // default_group_name=SystemGroups.ADMINISTRATORS,\n+ ),\n+ \"can_send_message_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ // default_group_name=SystemGroups.EVERYONE,\n+ ),\n+ \"can_subscribe_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: false,\n+ // default_group_name=SystemGroups.NOBODY,\n+ ),\n+ \"can_resolve_topics_group\": PermissionSettingsItem(\n+ // allow_nobody_group=True,\n+ allowEveryoneGroup: true,\n+ // default_group_name=SystemGroups.NOBODY,\n+ ),\n+ },\n+ );\n+\n+ SupportedPermissionSettings({required this.realm, required this.stream, required this.group});\n+\n+ factory SupportedPermissionSettings.fromJson(Map json) =>\n+ _$SupportedPermissionSettingsFromJson(json);\n+\n+ Map toJson() => _$SupportedPermissionSettingsToJson(this);\n+}\n+\n+@JsonSerializable(fieldRename: FieldRename.snake)\n+class PermissionSettingsItem {\n+ final bool allowEveryoneGroup;\n+ // also other fields not yet used\n+\n+ PermissionSettingsItem({required this.allowEveryoneGroup});\n+\n+ factory PermissionSettingsItem.fromJson(Map json) =>\n+ _$PermissionSettingsItemFromJson(json);\n+\n+ Map toJson() => _$PermissionSettingsItemToJson(this);\n+}\ndiff --git a/lib/api/model/initial_snapshot.g.dart b/lib/api/model/initial_snapshot.g.dart\nindex d6de29713e..481b3184b7 100644\n--- a/lib/api/model/initial_snapshot.g.dart\n+++ b/lib/api/model/initial_snapshot.g.dart\n@@ -355,3 +355,38 @@ Map _$UnreadHuddleSnapshotToJson(\n 'user_ids_string': instance.userIdsString,\n 'unread_message_ids': instance.unreadMessageIds,\n };\n+\n+SupportedPermissionSettings _$SupportedPermissionSettingsFromJson(\n+ Map json,\n+) => SupportedPermissionSettings(\n+ realm: (json['realm'] as Map).map(\n+ (k, e) =>\n+ MapEntry(k, PermissionSettingsItem.fromJson(e as Map)),\n+ ),\n+ stream: (json['stream'] as Map).map(\n+ (k, e) =>\n+ MapEntry(k, PermissionSettingsItem.fromJson(e as Map)),\n+ ),\n+ group: (json['group'] as Map).map(\n+ (k, e) =>\n+ MapEntry(k, PermissionSettingsItem.fromJson(e as Map)),\n+ ),\n+);\n+\n+Map _$SupportedPermissionSettingsToJson(\n+ SupportedPermissionSettings instance,\n+) => {\n+ 'realm': instance.realm,\n+ 'stream': instance.stream,\n+ 'group': instance.group,\n+};\n+\n+PermissionSettingsItem _$PermissionSettingsItemFromJson(\n+ Map json,\n+) => PermissionSettingsItem(\n+ allowEveryoneGroup: json['allow_everyone_group'] as bool,\n+);\n+\n+Map _$PermissionSettingsItemToJson(\n+ PermissionSettingsItem instance,\n+) => {'allow_everyone_group': instance.allowEveryoneGroup};\ndiff --git a/lib/api/model/model.dart b/lib/api/model/model.dart\nindex 6f0e502a39..a821474325 100644\n--- a/lib/api/model/model.dart\n+++ b/lib/api/model/model.dart\n@@ -12,6 +12,50 @@ export 'reaction.dart';\n \n part 'model.g.dart';\n \n+/// A Zulip \"group-setting value\": https://zulip.com/api/group-setting-values\n+sealed class GroupSettingValue {\n+ const GroupSettingValue();\n+\n+ factory GroupSettingValue.fromJson(Object? json) {\n+ return switch (json) {\n+ int() => GroupSettingValueNamed.fromJson(json),\n+ Map() => GroupSettingValueNameless.fromJson(json),\n+ _ => throw FormatException(),\n+ };\n+ }\n+\n+ Object? toJson();\n+}\n+\n+class GroupSettingValueNamed extends GroupSettingValue {\n+ final int groupId;\n+\n+ const GroupSettingValueNamed(this.groupId);\n+\n+ factory GroupSettingValueNamed.fromJson(int json) => GroupSettingValueNamed(json);\n+\n+ @override\n+ int toJson() => groupId;\n+}\n+\n+@JsonSerializable(fieldRename: FieldRename.snake)\n+class GroupSettingValueNameless extends GroupSettingValue {\n+ // TODO(server): The API docs say these should be \"direct_member_ids\" and\n+ // \"direct_subgroup_ids\", but empirically they're \"direct_members\"\n+ // and \"direct_subgroups\". Discussion:\n+ // https://chat.zulip.org/#narrow/channel/378-api-design/topic/groups.20redesign/near/2247218\n+ final List directMembers;\n+ final List directSubgroups;\n+\n+ GroupSettingValueNameless({required this.directMembers, required this.directSubgroups});\n+\n+ factory GroupSettingValueNameless.fromJson(Map json) =>\n+ _$GroupSettingValueNamelessFromJson(json);\n+\n+ @override\n+ Map toJson() => _$GroupSettingValueNamelessToJson(this);\n+}\n+\n /// As in [InitialSnapshot.customProfileFields].\n ///\n /// For docs, search for \"custom_profile_fields:\"\n@@ -357,9 +401,8 @@ enum Emojiset {\n class UserGroup {\n final int id;\n \n- // TODO(#1687) to maintain members, also act on user deactivation: https://github.com/zulip/zulip-flutter/issues/662#issuecomment-2405845356\n- // List members; // TODO(#1687) track group members\n- // List directSubgroupIds; // TODO(#1687) track group members\n+ final Set members;\n+ final Set directSubgroupIds;\n \n String name;\n String description;\n@@ -377,6 +420,8 @@ class UserGroup {\n \n UserGroup({\n required this.id,\n+ required this.members,\n+ required this.directSubgroupIds,\n required this.name,\n required this.description,\n required this.isSystemGroup,\n@@ -596,7 +641,8 @@ class ZulipStream {\n ChannelPostPolicy channelPostPolicy;\n // final bool isAnnouncementOnly; // deprecated for `channelPostPolicy`; ignore\n \n- // GroupSettingsValue canRemoveSubscribersGroup; // TODO(#814)\n+ GroupSettingValue? canAddSubscribersGroup; // TODO(server-10)\n+ GroupSettingValue? canSubscribeGroup; // TODO(server-10)\n \n // TODO(server-8): added in FL 199, was previously only on [Subscription] objects\n int? streamWeeklyTraffic;\n@@ -613,6 +659,8 @@ class ZulipStream {\n required this.historyPublicToSubscribers,\n required this.messageRetentionDays,\n required this.channelPostPolicy,\n+ required this.canAddSubscribersGroup,\n+ required this.canSubscribeGroup,\n required this.streamWeeklyTraffic,\n });\n \n@@ -630,6 +678,8 @@ class ZulipStream {\n historyPublicToSubscribers: subscription.historyPublicToSubscribers,\n messageRetentionDays: subscription.messageRetentionDays,\n channelPostPolicy: subscription.channelPostPolicy,\n+ canAddSubscribersGroup: subscription.canAddSubscribersGroup,\n+ canSubscribeGroup: subscription.canSubscribeGroup,\n streamWeeklyTraffic: subscription.streamWeeklyTraffic,\n );\n }\n@@ -660,8 +710,8 @@ enum ChannelPropertyName {\n messageRetentionDays,\n @JsonValue('stream_post_policy')\n channelPostPolicy,\n- // canRemoveSubscribersGroup, // TODO(#814)\n- // canRemoveSubscribersGroupId, // TODO(#814) handle // TODO(server-8) remove\n+ canAddSubscribersGroup,\n+ canSubscribeGroup,\n streamWeeklyTraffic;\n \n /// Get a [ChannelPropertyName] from a raw, snake-case string we recognize, else null.\n@@ -741,6 +791,8 @@ class Subscription extends ZulipStream {\n required super.historyPublicToSubscribers,\n required super.messageRetentionDays,\n required super.channelPostPolicy,\n+ required super.canAddSubscribersGroup,\n+ required super.canSubscribeGroup,\n required super.streamWeeklyTraffic,\n required this.desktopNotifications,\n required this.emailNotifications,\ndiff --git a/lib/api/model/model.g.dart b/lib/api/model/model.g.dart\nindex e9cf30e5d2..b5bb32da2a 100644\n--- a/lib/api/model/model.g.dart\n+++ b/lib/api/model/model.g.dart\n@@ -8,6 +8,24 @@ part of 'model.dart';\n // JsonSerializableGenerator\n // **************************************************************************\n \n+GroupSettingValueNameless _$GroupSettingValueNamelessFromJson(\n+ Map json,\n+) => GroupSettingValueNameless(\n+ directMembers: (json['direct_members'] as List)\n+ .map((e) => (e as num).toInt())\n+ .toList(),\n+ directSubgroups: (json['direct_subgroups'] as List)\n+ .map((e) => (e as num).toInt())\n+ .toList(),\n+);\n+\n+Map _$GroupSettingValueNamelessToJson(\n+ GroupSettingValueNameless instance,\n+) => {\n+ 'direct_members': instance.directMembers,\n+ 'direct_subgroups': instance.directSubgroups,\n+};\n+\n CustomProfileField _$CustomProfileFieldFromJson(Map json) =>\n CustomProfileField(\n id: (json['id'] as num).toInt(),\n@@ -96,6 +114,12 @@ Map _$RealmEmojiItemToJson(RealmEmojiItem instance) =>\n \n UserGroup _$UserGroupFromJson(Map json) => UserGroup(\n id: (json['id'] as num).toInt(),\n+ members: (json['members'] as List)\n+ .map((e) => (e as num).toInt())\n+ .toSet(),\n+ directSubgroupIds: (json['direct_subgroup_ids'] as List)\n+ .map((e) => (e as num).toInt())\n+ .toSet(),\n name: json['name'] as String,\n description: json['description'] as String,\n isSystemGroup: json['is_system_group'] as bool,\n@@ -104,6 +128,8 @@ UserGroup _$UserGroupFromJson(Map json) => UserGroup(\n \n Map _$UserGroupToJson(UserGroup instance) => {\n 'id': instance.id,\n+ 'members': instance.members.toList(),\n+ 'direct_subgroup_ids': instance.directSubgroupIds.toList(),\n 'name': instance.name,\n 'description': instance.description,\n 'is_system_group': instance.isSystemGroup,\n@@ -224,6 +250,12 @@ ZulipStream _$ZulipStreamFromJson(Map json) => ZulipStream(\n _$ChannelPostPolicyEnumMap,\n json['stream_post_policy'],\n ),\n+ canAddSubscribersGroup: json['can_add_subscribers_group'] == null\n+ ? null\n+ : GroupSettingValue.fromJson(json['can_add_subscribers_group']),\n+ canSubscribeGroup: json['can_subscribe_group'] == null\n+ ? null\n+ : GroupSettingValue.fromJson(json['can_subscribe_group']),\n streamWeeklyTraffic: (json['stream_weekly_traffic'] as num?)?.toInt(),\n );\n \n@@ -240,6 +272,8 @@ Map _$ZulipStreamToJson(ZulipStream instance) =>\n 'history_public_to_subscribers': instance.historyPublicToSubscribers,\n 'message_retention_days': instance.messageRetentionDays,\n 'stream_post_policy': instance.channelPostPolicy,\n+ 'can_add_subscribers_group': instance.canAddSubscribersGroup,\n+ 'can_subscribe_group': instance.canSubscribeGroup,\n 'stream_weekly_traffic': instance.streamWeeklyTraffic,\n };\n \n@@ -266,6 +300,12 @@ Subscription _$SubscriptionFromJson(Map json) => Subscription(\n _$ChannelPostPolicyEnumMap,\n json['stream_post_policy'],\n ),\n+ canAddSubscribersGroup: json['can_add_subscribers_group'] == null\n+ ? null\n+ : GroupSettingValue.fromJson(json['can_add_subscribers_group']),\n+ canSubscribeGroup: json['can_subscribe_group'] == null\n+ ? null\n+ : GroupSettingValue.fromJson(json['can_subscribe_group']),\n streamWeeklyTraffic: (json['stream_weekly_traffic'] as num?)?.toInt(),\n desktopNotifications: json['desktop_notifications'] as bool?,\n emailNotifications: json['email_notifications'] as bool?,\n@@ -290,6 +330,8 @@ Map _$SubscriptionToJson(Subscription instance) =>\n 'history_public_to_subscribers': instance.historyPublicToSubscribers,\n 'message_retention_days': instance.messageRetentionDays,\n 'stream_post_policy': instance.channelPostPolicy,\n+ 'can_add_subscribers_group': instance.canAddSubscribersGroup,\n+ 'can_subscribe_group': instance.canSubscribeGroup,\n 'stream_weekly_traffic': instance.streamWeeklyTraffic,\n 'desktop_notifications': instance.desktopNotifications,\n 'email_notifications': instance.emailNotifications,\n@@ -449,6 +491,8 @@ const _$ChannelPropertyNameEnumMap = {\n ChannelPropertyName.inviteOnly: 'invite_only',\n ChannelPropertyName.messageRetentionDays: 'message_retention_days',\n ChannelPropertyName.channelPostPolicy: 'stream_post_policy',\n+ ChannelPropertyName.canAddSubscribersGroup: 'can_add_subscribers_group',\n+ ChannelPropertyName.canSubscribeGroup: 'can_subscribe_group',\n ChannelPropertyName.streamWeeklyTraffic: 'stream_weekly_traffic',\n };\n \ndiff --git a/lib/model/channel.dart b/lib/model/channel.dart\nindex 7a10d52f6b..8ef01054bd 100644\n--- a/lib/model/channel.dart\n+++ b/lib/model/channel.dart\n@@ -5,6 +5,7 @@ import 'package:flutter/foundation.dart';\n import '../api/model/events.dart';\n import '../api/model/initial_snapshot.dart';\n import '../api/model/model.dart';\n+import 'realm.dart';\n import 'store.dart';\n import 'user.dart';\n \n@@ -139,6 +140,44 @@ mixin ChannelStore on UserStore {\n }\n }\n \n+ bool selfHasContentAccess(ZulipStream channel) {\n+ // Compare web's stream_data.has_content_access.\n+ if (channel.isWebPublic) return true;\n+ if (channel is Subscription) return true;\n+ // Here web calls has_metadata_access... but that always returns true,\n+ // as its comment says.\n+ if (selfUser.role == UserRole.guest) return false;\n+ if (!channel.inviteOnly) return true;\n+ return _selfHasContentAccessViaGroupPermissions(channel);\n+ }\n+\n+ bool _selfHasContentAccessViaGroupPermissions(ZulipStream channel) {\n+ // Compare web's stream_data.has_content_access_via_group_permissions.\n+ // TODO(#814) try to clean up this logic; perhaps record more explicitly\n+ // what default/fallback value to use for a given group-based permission\n+ // on older servers.\n+\n+ if (channel.canAddSubscribersGroup != null\n+ && selfHasPermissionForGroupSetting(channel.canAddSubscribersGroup!,\n+ GroupSettingType.stream, 'can_add_subscribers_group')) {\n+ // The behavior before this permission was introduced was equivalent to\n+ // the \"nobody\" group.\n+ // TODO(server-10): simplify\n+ return true;\n+ }\n+\n+ if (channel.canSubscribeGroup != null\n+ && selfHasPermissionForGroupSetting(channel.canSubscribeGroup!,\n+ GroupSettingType.stream, 'can_subscribe_group')) {\n+ // The behavior before this permission was introduced was equivalent to\n+ // the \"nobody\" group.\n+ // TODO(server-10): simplify\n+ return true;\n+ }\n+\n+ return false;\n+ }\n+\n bool hasPostingPermission({\n required ZulipStream inChannel,\n required User user,\n@@ -337,6 +376,10 @@ class ChannelStoreImpl extends HasUserStore with ChannelStore {\n stream.messageRetentionDays = event.value as int?;\n case ChannelPropertyName.channelPostPolicy:\n stream.channelPostPolicy = event.value as ChannelPostPolicy;\n+ case ChannelPropertyName.canAddSubscribersGroup:\n+ stream.canAddSubscribersGroup = event.value as GroupSettingValue;\n+ case ChannelPropertyName.canSubscribeGroup:\n+ stream.canSubscribeGroup = event.value as GroupSettingValue;\n case ChannelPropertyName.streamWeeklyTraffic:\n stream.streamWeeklyTraffic = event.value as int?;\n }\ndiff --git a/lib/model/realm.dart b/lib/model/realm.dart\nindex d54e5a5467..02db21c56e 100644\n--- a/lib/model/realm.dart\n+++ b/lib/model/realm.dart\n@@ -4,6 +4,7 @@ import '../api/model/events.dart';\n import '../api/model/initial_snapshot.dart';\n import '../api/model/model.dart';\n import 'store.dart';\n+import 'user_group.dart';\n \n /// The portion of [PerAccountStore] for realm settings, server settings,\n /// and similar data about the whole realm or server.\n@@ -11,7 +12,10 @@ import 'store.dart';\n /// See also:\n /// * [RealmStoreImpl] for the implementation of this that does the work.\n /// * [HasRealmStore] for an implementation useful for other substores.\n-mixin RealmStore on PerAccountStoreBase {\n+mixin RealmStore on PerAccountStoreBase, UserGroupStore {\n+ @protected\n+ UserGroupStore get userGroupStore;\n+\n //|//////////////////////////////////////////////////////////////\n // Server settings, explicitly so named.\n \n@@ -117,8 +121,14 @@ mixin RealmStore on PerAccountStoreBase {\n }\n return topic;\n }\n+\n+ /// Whether the self-user has the given (group-based) permission.\n+ bool selfHasPermissionForGroupSetting(GroupSettingValue value,\n+ GroupSettingType type, String name);\n }\n \n+enum GroupSettingType { realm, stream, group }\n+\n mixin ProxyRealmStore on RealmStore {\n @protected\n RealmStore get realmStore;\n@@ -155,13 +165,16 @@ mixin ProxyRealmStore on RealmStore {\n Map get realmDefaultExternalAccounts => realmStore.realmDefaultExternalAccounts;\n @override\n List get customProfileFields => realmStore.customProfileFields;\n+ @override\n+ bool selfHasPermissionForGroupSetting(GroupSettingValue value, GroupSettingType type, String name) =>\n+ realmStore.selfHasPermissionForGroupSetting(value, type, name);\n }\n \n /// A base class for [PerAccountStore] substores that need access to [RealmStore]\n /// as well as to [CorePerAccountStore].\n-abstract class HasRealmStore extends PerAccountStoreBase with RealmStore, ProxyRealmStore {\n+abstract class HasRealmStore extends HasUserGroupStore with RealmStore, ProxyRealmStore {\n HasRealmStore({required RealmStore realm})\n- : realmStore = realm, super(core: realm.core);\n+ : realmStore = realm, super(groups: realm.userGroupStore);\n \n @protected\n @override\n@@ -169,11 +182,13 @@ abstract class HasRealmStore extends PerAccountStoreBase with RealmStore, ProxyR\n }\n \n /// The implementation of [RealmStore] that does the work.\n-class RealmStoreImpl extends PerAccountStoreBase with RealmStore {\n+class RealmStoreImpl extends HasUserGroupStore with RealmStore {\n RealmStoreImpl({\n- required super.core,\n+ required super.groups,\n required InitialSnapshot initialSnapshot,\n+ required User selfUser,\n }) :\n+ _selfUserRole = selfUser.role,\n serverPresencePingIntervalSeconds = initialSnapshot.serverPresencePingIntervalSeconds,\n serverPresenceOfflineThresholdSeconds = initialSnapshot.serverPresenceOfflineThresholdSeconds,\n serverTypingStartedExpiryPeriodMilliseconds = initialSnapshot.serverTypingStartedExpiryPeriodMilliseconds,\n@@ -191,6 +206,46 @@ class RealmStoreImpl extends PerAccountStoreBase with RealmStore {\n realmDefaultExternalAccounts = initialSnapshot.realmDefaultExternalAccounts,\n customProfileFields = _sortCustomProfileFields(initialSnapshot.customProfileFields);\n \n+ @override\n+ bool selfHasPermissionForGroupSetting(GroupSettingValue value,\n+ GroupSettingType type, String name) {\n+ // Compare web's settings_data.user_has_permission_for_group_setting.\n+ //\n+ // In the whole web app, there's just one caller for that function with\n+ // a user other than the self user: stream_data.can_post_messages_in_stream,\n+ // and only for get_current_user_and_their_bots_with_post_messages_permission,\n+ // with only the self-user's own bots as the arguments.\n+ // That exists for deciding whether to offer the \"Generate email address\"\n+ // button, and if so then which users to offer in the dropdown;\n+ // it's predicting whether /api/get-stream-email-address would succeed.\n+ if (_selfUserRole == UserRole.guest) {\n+ final config = _groupSettingConfig(type, name);\n+ if (!config.allowEveryoneGroup) return false;\n+ }\n+ return selfInGroupSetting(value);\n+ }\n+\n+ /// The metadata for how to interpret the given group-based permission setting.\n+ PermissionSettingsItem _groupSettingConfig(GroupSettingType type, String name) {\n+ final supportedSettings = SupportedPermissionSettings.fixture;\n+\n+ // Compare web's group_permission_settings.get_group_permission_setting_config.\n+ final configGroup = switch (type) {\n+ GroupSettingType.realm => supportedSettings.realm,\n+ GroupSettingType.stream => supportedSettings.stream,\n+ GroupSettingType.group => supportedSettings.group,\n+ };\n+ final config = configGroup[name];\n+ return config!; // TODO(log)\n+ }\n+\n+ /// The [User.role] of the self-user.\n+ ///\n+ /// The main home of this information is [UserStore]: `store.selfUser.role`.\n+ /// We need it here for interpreting some permission settings;\n+ /// so we denormalize it here to avoid a cycle between substores.\n+ UserRole _selfUserRole;\n+\n @override\n final int serverPresencePingIntervalSeconds;\n @override\n@@ -253,4 +308,11 @@ class RealmStoreImpl extends PerAccountStoreBase with RealmStore {\n void handleCustomProfileFieldsEvent(CustomProfileFieldsEvent event) {\n customProfileFields = _sortCustomProfileFields(event.fields);\n }\n+\n+ void handleRealmUserUpdateEvent(RealmUserUpdateEvent event) {\n+ // Compare [UserStoreImpl.handleRealmUserEvent].\n+ if (event.userId == selfUserId) {\n+ if (event.role != null) _selfUserRole = event.role!;\n+ }\n+ }\n }\ndiff --git a/lib/model/store.dart b/lib/model/store.dart\nindex c240d47920..71bf40f094 100644\n--- a/lib/model/store.dart\n+++ b/lib/model/store.dart\n@@ -496,15 +496,17 @@ class PerAccountStore extends PerAccountStoreBase with\n throw Exception(\"bad initial snapshot: self-user missing from user list\");\n }\n \n- final realm = RealmStoreImpl(core: core, initialSnapshot: initialSnapshot);\n+ final groups = UserGroupStoreImpl(core: core,\n+ groups: initialSnapshot.realmUserGroups);\n+ final realm = RealmStoreImpl(groups: groups, initialSnapshot: initialSnapshot,\n+ selfUser: selfUser);\n final users = UserStoreImpl(realm: realm, initialSnapshot: initialSnapshot,\n userMap: userMap);\n final channels = ChannelStoreImpl(users: users,\n initialSnapshot: initialSnapshot);\n return PerAccountStore._(\n core: core,\n- groups: UserGroupStoreImpl(core: core,\n- groups: initialSnapshot.realmUserGroups),\n+ groups: groups,\n realm: realm,\n emoji: EmojiStoreImpl(core: core,\n allRealmEmoji: initialSnapshot.realmEmoji),\n@@ -757,6 +759,8 @@ class PerAccountStore extends PerAccountStoreBase with\n \n case RealmUserUpdateEvent():\n assert(debugLog(\"server event: realm_user/update\"));\n+ _groups.handleRealmUserUpdateEvent(event);\n+ _realm.handleRealmUserUpdateEvent(event);\n _users.handleRealmUserEvent(event);\n autocompleteViewManager.handleRealmUserUpdateEvent(event);\n notifyListeners();\ndiff --git a/lib/model/user_group.dart b/lib/model/user_group.dart\nindex 2079b323ec..4fb52b6d49 100644\n--- a/lib/model/user_group.dart\n+++ b/lib/model/user_group.dart\n@@ -18,6 +18,10 @@ mixin UserGroupStore on PerAccountStoreBase {\n ///\n /// Consider using [activeGroups] instead.\n Iterable get allGroups;\n+\n+ /// Whether the self-user is a (transitive) member of the given group,\n+ /// a group-setting value.\n+ bool selfInGroupSetting(GroupSettingValue value);\n }\n \n mixin ProxyUserGroupStore on UserGroupStore {\n@@ -30,6 +34,18 @@ mixin ProxyUserGroupStore on UserGroupStore {\n Iterable get activeGroups => userGroupStore.activeGroups;\n @override\n Iterable get allGroups => userGroupStore.allGroups;\n+ @override\n+ bool selfInGroupSetting(GroupSettingValue value)\n+ => userGroupStore.selfInGroupSetting(value);\n+}\n+\n+abstract class HasUserGroupStore extends PerAccountStoreBase with UserGroupStore, ProxyUserGroupStore {\n+ HasUserGroupStore({required UserGroupStore groups})\n+ : userGroupStore = groups, super(core: groups.core);\n+\n+ @protected\n+ @override\n+ final UserGroupStore userGroupStore;\n }\n \n /// The implementation of [UserGroupStore] that does the work.\n@@ -55,8 +71,34 @@ class UserGroupStoreImpl extends PerAccountStoreBase with UserGroupStore {\n return _groups.values;\n }\n \n+ @override\n+ bool selfInGroupSetting(GroupSettingValue value) {\n+ return switch (value) {\n+ GroupSettingValueNamed() =>\n+ _selfInGroup(value.groupId),\n+ GroupSettingValueNameless() =>\n+ value.directMembers.contains(selfUserId)\n+ || value.directSubgroups.any(_selfInGroup),\n+ };\n+ }\n+\n+ bool _selfInGroup(int groupId) {\n+ final group = _groups[groupId];\n+ if (group == null) return false; // TODO(log); should know all groups\n+ // TODO(perf), TODO(#814): memoize which groups the self-user is in,\n+ // to save doing this depth-first search on each permission check\n+ return group.members.contains(selfUserId)\n+ || group.directSubgroupIds.any(_selfInGroup);\n+ }\n+\n final Map _groups;\n \n+ UserGroup? _expectGroup(int groupId) {\n+ final group = _groups[groupId];\n+ // TODO(log) if group not found\n+ return group;\n+ }\n+\n void handleUserGroupEvent(UserGroupEvent event) {\n switch (event) {\n case UserGroupAddEvent():\n@@ -66,14 +108,40 @@ class UserGroupStoreImpl extends PerAccountStoreBase with UserGroupStore {\n _groups.remove(event.groupId);\n \n case UserGroupUpdateEvent():\n- final group = _groups[event.groupId];\n- if (group == null) {\n- return; // TODO log\n- }\n+ final group = _expectGroup(event.groupId);\n+ if (group == null) return;\n final data = event.data;\n if (data.name != null) group.name = data.name!;\n if (data.description != null) group.description = data.description!;\n if (data.deactivated != null) group.deactivated = data.deactivated!;\n+\n+ case UserGroupAddMembersEvent():\n+ final group = _expectGroup(event.groupId);\n+ if (group == null) return;\n+ group.members.addAll(event.userIds);\n+\n+ case UserGroupRemoveMembersEvent():\n+ final group = _expectGroup(event.groupId);\n+ if (group == null) return;\n+ group.members.removeAll(event.userIds);\n+\n+ case UserGroupAddSubgroupsEvent():\n+ final group = _expectGroup(event.groupId);\n+ if (group == null) return;\n+ group.directSubgroupIds.addAll(event.directSubgroupIds);\n+\n+ case UserGroupRemoveSubgroupsEvent():\n+ final group = _expectGroup(event.groupId);\n+ if (group == null) return;\n+ group.directSubgroupIds.removeAll(event.directSubgroupIds);\n+ }\n+ }\n+\n+ void handleRealmUserUpdateEvent(RealmUserUpdateEvent event) {\n+ if (event.isActive == false) {\n+ for (final group in _groups.values) {\n+ group.members.remove(event.userId);\n+ }\n }\n }\n }\ndiff --git a/lib/widgets/action_sheet.dart b/lib/widgets/action_sheet.dart\nindex dcf82389bc..ce1be46000 100644\n--- a/lib/widgets/action_sheet.dart\n+++ b/lib/widgets/action_sheet.dart\n@@ -445,10 +445,11 @@ void showChannelActionSheet(BuildContext context, {\n && messageListPageNarrow.streamId == channelId;\n \n final unreadCount = store.unreads.countInChannelNarrow(channelId);\n- final isSubscribed = store.subscriptions[channelId] != null;\n+ final channel = store.streams[channelId];\n+ final isSubscribed = channel is Subscription;\n final buttonSections = [\n- if (!isSubscribed)\n- // TODO(#1786) check group-based can-subscribe permission\n+ if (!isSubscribed\n+ && channel != null && store.selfHasContentAccess(channel))\n [SubscribeButton(pageContext: pageContext, channelId: channelId)],\n [\n if (unreadCount > 0)\n", "test_patch": "diff --git a/test/example_data.dart b/test/example_data.dart\nindex 3e4da34b96..84d1abf6aa 100644\n--- a/test/example_data.dart\n+++ b/test/example_data.dart\n@@ -198,6 +198,8 @@ int _lastUserGroupId = 100;\n \n UserGroup userGroup({\n int? id,\n+ Iterable? members,\n+ Iterable? directSubgroupIds,\n String? name,\n String? description,\n bool isSystemGroup = false,\n@@ -205,6 +207,8 @@ UserGroup userGroup({\n }) {\n return UserGroup(\n id: id ??= _nextUserGroupId(),\n+ members: Set.of(members ?? []),\n+ directSubgroupIds: Set.of(directSubgroupIds ?? []),\n name: name ??= 'group-$id',\n description: description ?? 'A group named $name',\n isSystemGroup: isSystemGroup,\n@@ -212,6 +216,12 @@ UserGroup userGroup({\n );\n }\n \n+final UserGroup nobodyGroup = userGroup(\n+ isSystemGroup: true,\n+ name: 'role:nobody', description: 'Nobody',\n+ members: [], directSubgroupIds: [],\n+);\n+\n RealmEmojiItem realmEmojiItem({\n required String emojiCode,\n required String emojiName,\n@@ -433,6 +443,8 @@ ZulipStream stream({\n bool? historyPublicToSubscribers,\n int? messageRetentionDays,\n ChannelPostPolicy? channelPostPolicy,\n+ GroupSettingValue? canAddSubscribersGroup,\n+ GroupSettingValue? canSubscribeGroup,\n int? streamWeeklyTraffic,\n }) {\n _checkPositive(streamId, 'stream ID');\n@@ -452,6 +464,8 @@ ZulipStream stream({\n historyPublicToSubscribers: historyPublicToSubscribers ?? true,\n messageRetentionDays: messageRetentionDays,\n channelPostPolicy: channelPostPolicy ?? ChannelPostPolicy.any,\n+ canAddSubscribersGroup: canAddSubscribersGroup ?? GroupSettingValueNamed(nobodyGroup.id),\n+ canSubscribeGroup: canSubscribeGroup ?? GroupSettingValueNamed(nobodyGroup.id),\n streamWeeklyTraffic: streamWeeklyTraffic,\n );\n }\n@@ -490,6 +504,8 @@ Subscription subscription(\n historyPublicToSubscribers: stream.historyPublicToSubscribers,\n messageRetentionDays: stream.messageRetentionDays,\n channelPostPolicy: stream.channelPostPolicy,\n+ canAddSubscribersGroup: stream.canAddSubscribersGroup,\n+ canSubscribeGroup: stream.canSubscribeGroup,\n streamWeeklyTraffic: stream.streamWeeklyTraffic,\n desktopNotifications: desktopNotifications ?? false,\n emailNotifications: emailNotifications ?? false,\n@@ -1161,6 +1177,9 @@ ChannelUpdateEvent channelUpdateEvent(\n assert(value is int?);\n case ChannelPropertyName.channelPostPolicy:\n assert(value is ChannelPostPolicy);\n+ case ChannelPropertyName.canAddSubscribersGroup:\n+ case ChannelPropertyName.canSubscribeGroup:\n+ assert(value is GroupSettingValue);\n case ChannelPropertyName.streamWeeklyTraffic:\n assert(value is int?);\n }\ndiff --git a/test/model/realm_test.dart b/test/model/realm_test.dart\nindex 5aecfd289d..04ceb28855 100644\n--- a/test/model/realm_test.dart\n+++ b/test/model/realm_test.dart\n@@ -2,10 +2,88 @@ import 'package:checks/checks.dart';\n import 'package:test/scaffolding.dart';\n import 'package:zulip/api/model/events.dart';\n import 'package:zulip/api/model/model.dart';\n+import 'package:zulip/model/realm.dart';\n \n import '../example_data.dart' as eg;\n \n void main() {\n+ test('processTopicLikeServer', () {\n+ final emptyTopicDisplayName = eg.defaultRealmEmptyTopicDisplayName;\n+\n+ TopicName process(TopicName topic, int zulipFeatureLevel) {\n+ final account = eg.selfAccount.copyWith(zulipFeatureLevel: zulipFeatureLevel);\n+ final store = eg.store(account: account, initialSnapshot: eg.initialSnapshot(\n+ zulipFeatureLevel: zulipFeatureLevel,\n+ realmEmptyTopicDisplayName: emptyTopicDisplayName));\n+ return store.processTopicLikeServer(topic);\n+ }\n+\n+ void doCheck(TopicName topic, TopicName expected, int zulipFeatureLevel) {\n+ check(process(topic, zulipFeatureLevel)).equals(expected);\n+ }\n+\n+ check(() => process(eg.t(''), 333)).throws();\n+ doCheck(eg.t('(no topic)'), eg.t('(no topic)'), 333);\n+ doCheck(eg.t(emptyTopicDisplayName), eg.t(emptyTopicDisplayName), 333);\n+ doCheck(eg.t('other topic'), eg.t('other topic'), 333);\n+\n+ doCheck(eg.t(''), eg.t(''), 334);\n+ doCheck(eg.t('(no topic)'), eg.t('(no topic)'), 334);\n+ doCheck(eg.t(emptyTopicDisplayName), eg.t(''), 334);\n+ doCheck(eg.t('other topic'), eg.t('other topic'), 334);\n+\n+ doCheck(eg.t('(no topic)'), eg.t(''), 370);\n+ });\n+\n+ group('selfHasPermissionForGroupSetting', () {\n+ // Most of the implementation of this is in [UserGroupStore.selfInGroupSetting],\n+ // and is tested in more detail in user_group_test.dart .\n+\n+ bool hasPermission(User selfUser, UserGroup group, String permissionName) {\n+ final store = eg.store(selfUser: selfUser,\n+ initialSnapshot: eg.initialSnapshot(\n+ realmUsers: [selfUser], realmUserGroups: [group]));\n+ return store.selfHasPermissionForGroupSetting(\n+ GroupSettingValueNamed(group.id),\n+ GroupSettingType.stream, permissionName);\n+ }\n+\n+ test('not in group -> no permission', () {\n+ final selfUser = eg.user();\n+ final group = eg.userGroup(members: []);\n+ check(hasPermission(selfUser, group, 'can_subscribe_group'))\n+ .isFalse();\n+ });\n+\n+ test('in group -> has permission', () {\n+ final selfUser = eg.user();\n+ final group = eg.userGroup(members: [selfUser.userId]);\n+ check(hasPermission(selfUser, group, 'can_subscribe_group'))\n+ .isTrue();\n+ });\n+\n+ test('guest -> no permission, despite group', () {\n+ final selfUser = eg.user(role: UserRole.guest);\n+ final group = eg.userGroup(members: [selfUser.userId]);\n+ check(hasPermission(selfUser, group, 'can_subscribe_group'))\n+ .isFalse();\n+ });\n+\n+ test('guest -> still has permission, if allowEveryoneGroup', () {\n+ final selfUser = eg.user(role: UserRole.guest);\n+ final group = eg.userGroup(members: [selfUser.userId]);\n+ check(hasPermission(selfUser, group, 'can_send_message_group'))\n+ .isTrue();\n+ });\n+\n+ test('guest not in group -> no permission, even if allowEveryoneGroup', () {\n+ final selfUser = eg.user(role: UserRole.guest);\n+ final group = eg.userGroup(members: []);\n+ check(hasPermission(selfUser, group, 'can_send_message_group'))\n+ .isFalse();\n+ });\n+ });\n+\n group('customProfileFields', () {\n test('update clobbers old list', () async {\n final store = eg.store(initialSnapshot: eg.initialSnapshot(\n@@ -47,32 +125,4 @@ void main() {\n check(store.customProfileFields.map((f) => f.id)).deepEquals([2, 0, 1]);\n });\n });\n-\n- test('processTopicLikeServer', () {\n- final emptyTopicDisplayName = eg.defaultRealmEmptyTopicDisplayName;\n-\n- TopicName process(TopicName topic, int zulipFeatureLevel) {\n- final account = eg.selfAccount.copyWith(zulipFeatureLevel: zulipFeatureLevel);\n- final store = eg.store(account: account, initialSnapshot: eg.initialSnapshot(\n- zulipFeatureLevel: zulipFeatureLevel,\n- realmEmptyTopicDisplayName: emptyTopicDisplayName));\n- return store.processTopicLikeServer(topic);\n- }\n-\n- void doCheck(TopicName topic, TopicName expected, int zulipFeatureLevel) {\n- check(process(topic, zulipFeatureLevel)).equals(expected);\n- }\n-\n- check(() => process(eg.t(''), 333)).throws();\n- doCheck(eg.t('(no topic)'), eg.t('(no topic)'), 333);\n- doCheck(eg.t(emptyTopicDisplayName), eg.t(emptyTopicDisplayName), 333);\n- doCheck(eg.t('other topic'), eg.t('other topic'), 333);\n-\n- doCheck(eg.t(''), eg.t(''), 334);\n- doCheck(eg.t('(no topic)'), eg.t('(no topic)'), 334);\n- doCheck(eg.t(emptyTopicDisplayName), eg.t(''), 334);\n- doCheck(eg.t('other topic'), eg.t('other topic'), 334);\n-\n- doCheck(eg.t('(no topic)'), eg.t(''), 370);\n- });\n }\ndiff --git a/test/model/user_group_test.dart b/test/model/user_group_test.dart\nindex f05b3c3c32..0741f53b95 100644\n--- a/test/model/user_group_test.dart\n+++ b/test/model/user_group_test.dart\n@@ -2,6 +2,7 @@ import 'package:checks/checks.dart';\n import 'package:test_api/scaffolding.dart';\n import 'package:zulip/api/model/events.dart';\n import 'package:zulip/api/model/model.dart';\n+import 'package:zulip/model/store.dart';\n import 'package:zulip/model/user_group.dart';\n \n import '../api/model/model_checks.dart';\n@@ -92,6 +93,93 @@ void main() {\n }]);\n });\n \n+ group('membership', () {\n+ // These tests exercise membership via selfInGroupSetting, because that's\n+ // the main interface the app uses to consume group membership.\n+\n+ late PerAccountStore store;\n+\n+ void prepare(List groups, {List? users}) {\n+ store = eg.store(initialSnapshot: eg.initialSnapshot(\n+ realmUsers: users, realmUserGroups: groups));\n+ }\n+\n+ bool isMember(UserGroup group) {\n+ return store.selfInGroupSetting(GroupSettingValueNamed(group.id));\n+ }\n+\n+ test('initial', () {\n+ final groups = [];\n+ groups.add(eg.userGroup(members: [eg.selfUser.userId]));\n+ groups.add(eg.userGroup(members: [eg.user().userId]));\n+ groups.add(eg.userGroup(directSubgroupIds: [groups[0].id]));\n+ groups.add(eg.userGroup(directSubgroupIds: [groups[2].id]));\n+ groups.add(eg.userGroup(directSubgroupIds: [groups[1].id]));\n+\n+ prepare(groups);\n+ check(groups.map(isMember)).deepEquals([\n+ true,\n+ false,\n+ true,\n+ true,\n+ false,\n+ ]);\n+ });\n+\n+ test('UserGroupEvent', () async {\n+ final groups = List.generate(4, (_) => eg.userGroup());\n+ prepare(groups);\n+ check(groups.map(isMember)).deepEquals([false, false, false, false]);\n+\n+ // Add a membership.\n+ await store.handleEvent(UserGroupAddMembersEvent(id: 0,\n+ groupId: groups[0].id, userIds: [eg.selfUser.userId]));\n+ check(groups.map(isMember)).deepEquals([true, false, false, false]);\n+\n+ // Add a chain of transitive memberships.\n+ await store.handleEvent(UserGroupAddSubgroupsEvent(id: 0,\n+ groupId: groups[1].id, directSubgroupIds: [groups[0].id]));\n+ check(groups.map(isMember)).deepEquals([true, true, false, false]);\n+ await store.handleEvent(UserGroupAddSubgroupsEvent(id: 0,\n+ groupId: groups[2].id, directSubgroupIds: [groups[1].id]));\n+ check(groups.map(isMember)).deepEquals([true, true, true, false]);\n+\n+ // Cut the middle link of the chain.\n+ await store.handleEvent(UserGroupRemoveSubgroupsEvent(id: 0,\n+ groupId: groups[1].id, directSubgroupIds: [groups[0].id]));\n+ check(groups.map(isMember)).deepEquals([true, false, false, false]);\n+\n+ // Restore the middle link; cut the bottom link.\n+ await store.handleEvent(UserGroupAddSubgroupsEvent(id: 0,\n+ groupId: groups[1].id, directSubgroupIds: [groups[0].id]));\n+ check(groups.map(isMember)).deepEquals([true, true, true, false]);\n+ await store.handleEvent(UserGroupRemoveMembersEvent(id: 0,\n+ groupId: groups[0].id, userIds: [eg.selfUser.userId]));\n+ check(groups.map(isMember)).deepEquals([false, false, false, false]);\n+ });\n+\n+ test('RealmUserUpdateEvent', () async {\n+ // This test uses the membership data structure directly, because\n+ // selfInGroupSetting would only be affected if the self-user were\n+ // deactivated, and in that case we wouldn't be getting an event.\n+\n+ final user = eg.user();\n+ final group = eg.userGroup(members: [user.userId]);\n+ prepare(users: [eg.selfUser, user], [group]);\n+ check(store.getGroup(group.id)!.members).deepEquals([user.userId]);\n+\n+ // An update to a random irrelevant field has no effect.\n+ await store.handleEvent(RealmUserUpdateEvent(id: 0,\n+ userId: user.userId, fullName: 'New Name'));\n+ check(store.getGroup(group.id)!.members).deepEquals([user.userId]);\n+\n+ // But deactivating the user removes them from groups.\n+ await store.handleEvent(RealmUserUpdateEvent(id: 0,\n+ userId: user.userId, isActive: false));\n+ check(store.getGroup(group.id)!.members).isEmpty();\n+ });\n+ });\n+\n test('various fields make it through', () async {\n final store = eg.store(initialSnapshot: eg.initialSnapshot(\n realmUserGroups: [\n", "n2p_tests": "{\"/home/zulip-flutter/test/model/realm_test.dart: processTopicLikeServer\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_group_test.dart: UserGroupUpdateEvent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/realm_test.dart: selfHasPermissionForGroupSetting guest -> no permission, despite group\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_group_test.dart: initialize\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/realm_test.dart: selfHasPermissionForGroupSetting guest -> still has permission, if allowEveryoneGroup\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_group_test.dart: activeGroups, allGroups\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_group_test.dart: membership initial\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/realm_test.dart: selfHasPermissionForGroupSetting not in group -> no permission\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/realm_test.dart: customProfileFields update clobbers old list\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/realm_test.dart: selfHasPermissionForGroupSetting in group -> has permission\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_group_test.dart: UserGroupAddEvent, UserGroupRemoveEvent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_group_test.dart: membership RealmUserUpdateEvent\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_group_test.dart: getGroup\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/realm_test.dart: selfHasPermissionForGroupSetting guest not in group -> no permission, even if allowEveryoneGroup\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_group_test.dart: various fields make it through\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/realm_test.dart: customProfileFields sorts by displayInProfile\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/user_group_test.dart: membership UserGroupEvent\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1820", "org": "zulip", "repo": "zulip-flutter", "number": 1820, "state": "closed", "title": "content: Fix bugs where `TextSpan` styles clobber each other with `InlineContent.style` attributes", "body": "Fixes #806.\r\nFixes #1812.\r\nFixes #1817.\r\nFixes #1818.\r\n\r\nThere are other issues with inline-span styles:\r\n- #1813\r\n- #1819\r\n- (possibly more)\r\n\r\nbut I think those all involve `WidgetSpan`s in `InlineContent`'s span tree and can be addressed separately.\r\n\r\n| Before | After |\r\n| --- | --- |\r\n| \"image\" | \"image\" |\r\n| \"image\" | \"image\" |", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"d9ab0757c0133e474cbf8f8a6ee16b338f74b0d7\"}", "resolved_issues": "[{\"number\": 1817, \"title\": \"content: Bold text in strikethrough should have strikethrough line, but doesn't\", \"body\": null}, {\"number\": 806, \"title\": \"content: Inline code links should be rendered with the link color\", \"body\": \"We should fix inline code's color when it is a part of a link.\\r\\n\\r\\n| web (expected) | flutter |\\r\\n| - | - |\\r\\n| ![Screenshot from 2024-07-11 21-33-29](https://github.com/user-attachments/assets/256fd1d0-c627-428d-9706-59dd562da0bd) | ![1000013523](https://github.com/user-attachments/assets/fecc3c09-ddb5-4dd5-bfdc-1333990a99d7) |\\r\\n\\r\\nSince a recent change (https://github.com/zulip/zulip-flutter/commit/299c76be7), inline code links no longer have the ambient color and is always black. We want to fix this to match the behavior of the web app.\\r\\n\\r\\nFor reference, the web app [defines](https://github.com/zulip/zulip/blob/4d34a902c9c2c7df87ded0ce5a05df7ccf052c97/web/styles/app_variables.css#L494-L495) a separate CSS variable `--color-markdown-code-link`\\r\\n\\r\\n```css\\r\\n --color-markdown-link: hsl(200deg 100% 40%);\\r\\n --color-markdown-code-link: var(--color-markdown-link);\\r\\n```\\r\\n\\r\\nthat [applies to](https://github.com/zulip/zulip/blob/4d34a902c9c2c7df87ded0ce5a05df7ccf052c97/web/styles/rendered_markdown.css#L679C1-L685) inline code that appears inside a link:\\r\\n\\r\\n\\r\\n```\\r\\n & a {\\r\\n color: var(--color-markdown-link);\\r\\n text-decoration: none;\\r\\n\\r\\n & code {\\r\\n color: var(--color-markdown-code-link);\\r\\n }\\r\\n```\"}, {\"number\": 1812, \"title\": \"content: Inline code in a bold span should be bold (but isn't)\", \"body\": \"### References\\n* Related symptom: #1813 \\n* Related symptom: #806 \"}, {\"number\": 1818, \"title\": \"content: Unicode emoji in strikethrough should have strikethrough line, but doesn't\", \"body\": null}]", "lang": "dart", "problem_statement": "content: Bold text in strikethrough should have strikethrough line, but doesn't\n\ncontent: Inline code links should be rendered with the link color\nWe should fix inline code's color when it is a part of a link.\r\n\r\n| web (expected) | flutter |\r\n| - | - |\r\n| ![Screenshot from 2024-07-11 21-33-29](https://github.com/user-attachments/assets/256fd1d0-c627-428d-9706-59dd562da0bd) | ![1000013523](https://github.com/user-attachments/assets/fecc3c09-ddb5-4dd5-bfdc-1333990a99d7) |\r\n\r\nSince a recent change (https://github.com/zulip/zulip-flutter/commit/299c76be7), inline code links no longer have the ambient color and is always black. We want to fix this to match the behavior of the web app.\r\n\r\nFor reference, the web app [defines](https://github.com/zulip/zulip/blob/4d34a902c9c2c7df87ded0ce5a05df7ccf052c97/web/styles/app_variables.css#L494-L495) a separate CSS variable `--color-markdown-code-link`\r\n\r\n```css\r\n --color-markdown-link: hsl(200deg 100% 40%);\r\n --color-markdown-code-link: var(--color-markdown-link);\r\n```\r\n\r\nthat [applies to](https://github.com/zulip/zulip/blob/4d34a902c9c2c7df87ded0ce5a05df7ccf052c97/web/styles/rendered_markdown.css#L679C1-L685) inline code that appears inside a link:\r\n\r\n\r\n```\r\n & a {\r\n color: var(--color-markdown-link);\r\n text-decoration: none;\r\n\r\n & code {\r\n color: var(--color-markdown-code-link);\r\n }\r\n```\ncontent: Inline code in a bold span should be bold (but isn't)\n### References\n* Related symptom: #1813 \n* Related symptom: #806 \ncontent: Unicode emoji in strikethrough should have strikethrough line, but doesn't\n\n", "hints": "\n\n\n", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1820", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1817\", \"https://github.com/zulip/zulip-flutter/issues/806\", \"https://github.com/zulip/zulip-flutter/issues/1812\", \"https://github.com/zulip/zulip-flutter/issues/1818\"]", "test_command": "flutter test test/model/content_test.dart test/widgets/content_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/widgets/content.dart b/lib/widgets/content.dart\nindex 5851222a1c..3626d55ae4 100644\n--- a/lib/widgets/content.dart\n+++ b/lib/widgets/content.dart\n@@ -1127,8 +1127,7 @@ class _InlineContentBuilder {\n \n case UnicodeEmojiNode():\n return TextSpan(text: node.emojiUnicode, recognizer: _recognizer,\n- style: widget.style\n- .merge(ContentTheme.of(_context!).textStyleEmoji));\n+ style: ContentTheme.of(_context!).textStyleEmoji);\n \n case ImageEmojiNode():\n return WidgetSpan(alignment: PlaceholderAlignment.middle,\n@@ -1138,9 +1137,8 @@ class _InlineContentBuilder {\n final nodes = node.nodes;\n return nodes == null\n ? TextSpan(\n- style: widget.style\n- .merge(ContentTheme.of(_context!).textStyleInlineMath)\n- .apply(fontSizeFactor: kInlineCodeFontSizeFactor),\n+ style: ContentTheme.of(_context!).textStyleInlineMath\n+ .copyWith(fontSize: widget.style.fontSize! * kInlineCodeFontSizeFactor),\n children: [TextSpan(text: node.texSource)])\n : WidgetSpan(\n alignment: PlaceholderAlignment.baseline,\n@@ -1181,11 +1179,9 @@ class _InlineContentBuilder {\n // TODO `code`: find equivalent of web's `unicode-bidi: embed; direction: ltr`\n \n return _buildNodes(\n- style: widget.style\n- .merge(ContentTheme.of(_context!).textStyleInlineCode)\n- .apply(fontSizeFactor: kInlineCodeFontSizeFactor),\n- node.nodes,\n- );\n+ style: ContentTheme.of(_context!).textStyleInlineCode\n+ .copyWith(fontSize: widget.style.fontSize! * kInlineCodeFontSizeFactor),\n+ node.nodes);\n \n // Another fun solution -- we can in fact have a border! Like so:\n // TextStyle(\ndiff --git a/lib/widgets/text.dart b/lib/widgets/text.dart\nindex 13bd141772..f2f0edd968 100644\n--- a/lib/widgets/text.dart\n+++ b/lib/widgets/text.dart\n@@ -288,8 +288,11 @@ double bolderWght(double baseWght, {double by = 300}) {\n return clampDouble(baseWght + by, kWghtMin, kWghtMax);\n }\n \n-/// A [TextStyle] whose [FontVariation] \"wght\" and [TextStyle.fontWeight]\n-/// have been raised using [bolderWght].\n+/// A [TextStyle] with [FontVariation] \"wght\" and [TextStyle.fontWeight]\n+/// that have been raised from the input using [bolderWght].\n+///\n+/// Non-weight attributes in [style] are ignored\n+/// and will not appear in the result.\n ///\n /// [style] must have already been processed with [weightVariableTextStyle],\n /// and [by] must be positive.\n@@ -311,12 +314,9 @@ TextStyle bolderWghtTextStyle(TextStyle style, {double by = 300}) {\n \n final newWght = bolderWght(wghtFromTextStyle(style)!, by: by);\n \n- TextStyle result = style.copyWith(\n- fontVariations: style.fontVariations!.map((v) => v.axis == 'wght'\n- ? FontVariation('wght', newWght)\n- : v).toList(),\n- fontWeight: clampVariableFontWeight(newWght),\n- );\n+ TextStyle result = TextStyle(\n+ fontVariations: [FontVariation('wght', newWght)],\n+ fontWeight: clampVariableFontWeight(newWght));\n \n assert(() {\n result = result.copyWith(debugLabel: 'bolderWghtTextStyle(by: $by)');\n", "test_patch": "diff --git a/test/model/content_test.dart b/test/model/content_test.dart\nindex 9cabfbb3b8..84e3baed42 100644\n--- a/test/model/content_test.dart\n+++ b/test/model/content_test.dart\n@@ -85,6 +85,13 @@ class ContentExample {\n '

bold

',\n const StrongNode(nodes: [TextNode('bold')]));\n \n+ static final deleted = ContentExample.inline(\n+ 'deleted/strike-through',\n+ '~~strike through~~',\n+ expectedText: 'strike through',\n+ '

strike through

',\n+ const DeletedNode(nodes: [TextNode('strike through')]));\n+\n static final emphasis = ContentExample.inline(\n 'emphasis/italic',\n '*italic*',\n@@ -1535,10 +1542,7 @@ void main() async {\n \n testParseExample(ContentExample.strong);\n \n- testParseInline('parse deleted/strike-through',\n- // \"~~strike through~~\"\n- '

strike through

',\n- const DeletedNode(nodes: [TextNode('strike through')]));\n+ testParseExample(ContentExample.deleted);\n \n testParseExample(ContentExample.emphasis);\n \ndiff --git a/test/widgets/content_test.dart b/test/widgets/content_test.dart\nindex aef5ef3cc0..28af496c59 100644\n--- a/test/widgets/content_test.dart\n+++ b/test/widgets/content_test.dart\n@@ -186,11 +186,11 @@ void main() {\n /// [styleFinder] must return the [TextStyle] containing the \"wght\"\n /// (in [TextStyle.fontVariations]) and the [TextStyle.fontWeight]\n /// to be checked.\n- Future testFontWeight(String description, {\n+ void testFontWeight(String description, {\n required Widget content,\n required double expectedWght,\n required TextStyle Function(WidgetTester tester) styleFinder,\n- }) async {\n+ }) {\n for (final platformRequestsBold in [false, true]) {\n testWidgets(\n description + (platformRequestsBold ? ' (platform requests bold)' : ''),\n@@ -707,8 +707,18 @@ void main() {\n '\\n\\ntext\\n\\n\\n'\n ''),\n styleFinder: findWordBold);\n+\n+ testWidgets('has strike-through line in strike-through', (tester) async {\n+ // Regression test for: https://github.com/zulip/zulip-flutter/issues/1817\n+ await prepareContent(tester,\n+ plainContent('

bold

'));\n+ final style = mergedStyleOf(tester, 'bold');\n+ check(style!.decoration).equals(TextDecoration.lineThrough);\n+ });\n });\n \n+ testContentSmoke(ContentExample.deleted);\n+\n testContentSmoke(ContentExample.emphasis);\n \n group('inline code', () {\n@@ -719,6 +729,22 @@ void main() {\n targetHtml: 'code',\n targetFontSizeFinder: mkTargetFontSizeFinderFromPattern('code'));\n });\n+\n+ testFontWeight('is bold in bold span',\n+ // Regression test for: https://github.com/zulip/zulip-flutter/issues/1812\n+ expectedWght: 600,\n+ // **`bold`**\n+ content: plainContent('

bold

'),\n+ styleFinder: (tester) => mergedStyleOf(tester, 'bold')!,\n+ );\n+\n+ testWidgets('is link-colored in link span', (tester) async {\n+ // Regression test for: https://github.com/zulip/zulip-flutter/issues/806\n+ await prepareContent(tester,\n+ plainContent('

code

'));\n+ final style = mergedStyleOf(tester, 'code');\n+ check(style!.color).equals(const HSLColor.fromAHSL(1, 200, 1, 0.4).toColor());\n+ });\n });\n \n group('UserMention', () {\n@@ -980,6 +1006,14 @@ void main() {\n _ => throw StateError('unexpected platform in test'),\n });\n }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n+\n+ testWidgets('has strike-through line in strike-through', (tester) async {\n+ // Regression test for https://github.com/zulip/zulip-flutter/issues/1818\n+ await prepareContent(tester,\n+ plainContent('

foo:thumbs_up:bar

'));\n+ final style = mergedStyleOf(tester, '\\u{1f44d}');\n+ check(style!.decoration).equals(TextDecoration.lineThrough);\n+ });\n });\n \n group('inline math', () {\n@@ -1010,27 +1044,35 @@ void main() {\n });\n });\n \n- testWidgets('maintains font-size ratio with surrounding text, when falling back to TeX source', (tester) async {\n- const unsupportedHtml = ''\n- '\u03bb'\n- ' \\\\lambda '\n- ''\n- '' // Server doesn't generate this 'unknown' class.\n- ''\n- '\u03bb';\n- await checkFontSizeRatio(tester,\n- targetHtml: unsupportedHtml,\n- targetFontSizeFinder: mkTargetFontSizeFinderFromPattern(r'\\lambda'));\n- });\n+ group('fallback to displaying KaTeX source if unsupported KaTeX HTML', () {\n+ testContentSmoke(ContentExample.mathInlineUnknown);\n \n- testWidgets('displays KaTeX content', (tester) async {\n- await prepareContent(tester, plainContent(ContentExample.mathInline.html));\n- tester.widget(find.text('\u03bb', findRichText: true));\n- });\n+ assert(ContentExample.mathInlineUnknown.html.startsWith('

'));\n+ assert(ContentExample.mathInlineUnknown.html.endsWith('

'));\n+ final unsupportedKatexHtml = ContentExample.mathInlineUnknown.html\n+ .substring(3, ContentExample.mathInlineUnknown.html.length - 4);\n+ final expectedText = ContentExample.mathInlineUnknown.expectedText!;\n \n- testWidgets('fallback to displaying KaTeX source if unsupported KaTeX HTML', (tester) async {\n- await prepareContent(tester, plainContent(ContentExample.mathInlineUnknown.html));\n- tester.widget(find.text(r'\\lambda'));\n+ testWidgets('maintains font-size ratio with surrounding text, when falling back to TeX source', (tester) async {\n+ await checkFontSizeRatio(tester,\n+ targetHtml: unsupportedKatexHtml,\n+ targetFontSizeFinder: mkTargetFontSizeFinderFromPattern(expectedText));\n+ });\n+\n+ testFontWeight('is bold in bold span',\n+ // Regression test for: https://github.com/zulip/zulip-flutter/issues/1812\n+ expectedWght: 600,\n+ content: plainContent('

$unsupportedKatexHtml

'),\n+ styleFinder: (tester) => mergedStyleOf(tester, expectedText)!,\n+ );\n+\n+ testWidgets('is link-colored in link span', (tester) async {\n+ // Regression test for: https://github.com/zulip/zulip-flutter/issues/806\n+ await prepareContent(tester,\n+ plainContent('

$unsupportedKatexHtml

'));\n+ final style = mergedStyleOf(tester, expectedText);\n+ check(style!.color).equals(const HSLColor.fromAHSL(1, 200, 1, 0.4).toColor());\n+ });\n });\n });\n \n", "n2p_tests": "{}", "f2p_tests": "{\"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji has strike-through line in strike-through\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline code is link-colored in link span\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline code is bold in bold span (platform requests bold)\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math fallback to displaying KaTeX source if unsupported KaTeX HTML is link-colored in link span\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math fallback to displaying KaTeX source if unsupported KaTeX HTML is bold in bold span\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) has strike-through line in strike-through\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math fallback to displaying KaTeX source if unsupported KaTeX HTML is bold in bold span (platform requests bold)\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline code is bold in bold span\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList image with invalid src URL\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in table column header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: legacy plain channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in bold context\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h6 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in h1 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse headings plain h6\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: LinkNode parse #-mention of topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain user @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse plain group @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList content after image cluster\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList image cluster in implicit paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h3\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h4\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji smoke: Unicode emoji, encoded in span element, multiple codepoints\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse spoiler with rich header and content\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions link containing other spans\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock syntax highlighting: non-bold span (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse content after image cluster\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList single image loading placeholder\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table without any body cells in markdown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: smoke: quotation\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block with syntax highlighting\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math fallback to displaying KaTeX source if unsupported KaTeX HTML maintains font-size ratio with surrounding text, when falling back to TeX source\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block in quote\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler interactions: spoiler with tappable content (an image) in the header tap image\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageEmbedVideo video preview for vimeo embed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse nested lists, quotes, headings, code blocks\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math fallback to displaying KaTeX source if unsupported KaTeX HTML smoke: inline math\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: global times parse global time\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions follow browser preference setting to open URL (variant: TargetPlatform.android)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse headings amidst paragraphs\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse blank text nodes after code blocks\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode on internal links valid internal links are navigated to within app\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageTable text alignment in column; with link\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions relative links are resolved\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: InlineAudio tapping on audio link opens it in browser (variant: TargetPlatform.android)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions multiple links in paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: InlineAudio tapping on audio link opens it in browser (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: WebsitePreview smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse legacy plain channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table with bold and italic headers\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: RealmContentNetworkImage includes auth header if `src` on-realm\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageTable bold column header label (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions error dialog if platform cannot open link\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: global times handles missing attribute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: track links inside block-inline containers link in list item\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in spoiler header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: track links inside block-inline containers multiple links in paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse image cluster in implicit paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: legacy silent channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math smoke: inline math\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList multiple images\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList image as immediate child in implicit paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions link nested in other spans\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for youtube embed with thumbnail\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageInlineVideo tapping on preview opens lightbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline code maintains font-size ratio with surrounding text\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse custom emoji\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h4 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ListNodeWidget list uses correct text baseline alignment\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock smoke: math block\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler interactions: spoiler with tappable content (an image) in the header tap header away from expand/collapse icon (and image)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block between images\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in bold context (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji smoke: Unicode emoji, encoded in span element\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse Unicode emoji, not encoded in span element\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block without syntax highlighting\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: LinkNode parse #-mention of stream\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse legacy silent channel wildcard @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse impossible content after image cluster in implicit paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for user uploaded video\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse spoiler a header that has an image in it\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock smoke: code block with syntax highlighting\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in plain paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock displays KaTeX content\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: WebsitePreview smoke: without title\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageTable header row background color\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse audio inline no title\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse quotation\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in table column header (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse nested del, strong, em, code\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent @-topic, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in plain paragraph (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent group @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse lists implicit paragraph with internal
\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) smoke: strong/bold\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for vimeo embed with realm link previews enabled, (hypothetical) class name reorder\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent @-topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse lists explicit paragraphs\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock fallback to displaying KaTeX source if unsupported KaTeX HTML\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji smoke: Unicode emoji, not encoded in span element\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler interactions: spoiler with tappable content (an image) in the header tap header on expand/collapse icon\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock syntax highlighting: non-bold span\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block, with syntax highlighting and highlighted lines\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h1\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList single image no thumbnail\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain group @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Heading plain h6\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: global times handles DateTime.parse failure\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent @-topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions error dialog if invalid URL\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse lists parse ordered list with custom start\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList multiple images no thumbnails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse legacy website preview smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler smoke: spoiler with plain custom header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h1 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions can tap a link to open URL (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler smoke: spoiler with default header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse multiple images no thumbnails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain @-topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse multiple clusters of images\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageTable different text alignment in columns\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse inline code\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime maintains font-size ratio with surrounding text clock icon is scaled\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime clock icon and text are the same color: inside link\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse spoiler with default header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions follow browser preference setting to open URL (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block spans with multiple CSS classes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block unknown, fallback to TeX source\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock syntax highlighting: bold span\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in table column header (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ListNodeWidget ordered list markers are end-aligned\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Heading smoke test for h1, h2, h3, h4, h5\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention maintains font-size ratio with surrounding text\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImageEmoji smoke: custom emoji with invalid URL\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block, with an unknown span type\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for youtube embed with thumbnail, (hypothetical) class name reorder\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table with image\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime TwentyFourHourTimeMode.twentyFourHour\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse image as immediate child in implicit paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in spoiler header (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse deleted/strike-through\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image with invalid URL\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in h1\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse nested del, strong, em, link\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent channel wildcard @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse strong/bold\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse lists
    \": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions link inside HeadingNode\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline code smoke: inline code\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse plain user @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse audio inline\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: WebsitePreview smoke: without title or description\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse emphasis/italic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse Zulip extra emoji\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in plain paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse website preview without title\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime clock icon and text are the same color: common case\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock syntax highlighting: bold span (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image no dimensions\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: WebsitePreview smoke: without description\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse plain @-topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math blocks, multiple in quote\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table with multiple rows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math maintains font-size ratio with surrounding text\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse headings containing inline markup\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock smoke: code block without syntax highlighting\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block, multiline, with syntax highlighting\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse website preview smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse custom emoji with invalid URL\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler smoke: spoiler with rich header and content\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse Unicode emoji, encoded in span element, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageEmbedVideo video preview for youtube embed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math blocks, multiple in paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse headings h1, h2, h3, h4, h5\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageTable bold column header label\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent user @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table missing one body column in markdown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime TwentyFourHourTimeMode.twelveHour\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in spoiler header (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse
    in block context\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent user @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList multiple clusters of images\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse spoiler with plain custom header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image loading placeholder\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse parse thematic break (
    )\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse Unicode emoji, encoded in span element\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent group @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImageEmoji smoke: custom emoji\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image no thumbnail\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse a plain-text paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent group @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for user uploaded video, (hypothetical) class name reorder\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse
    inside a paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock smoke: code block spans with multiple CSS classes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: LinkNode parse link\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse lists parse ordered list with large start number\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent channel wildcard @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse multiple images\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime maintains font-size ratio with surrounding text text is scaled\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in table column header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse nested link, del, strong, em, code\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h3 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock smoke: code block, multiline, with syntax highlighting\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: all content examples are tested\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h2 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse legacy silent channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block, with an empty body\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h5 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions can tap a link to open URL (variant: TargetPlatform.android)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in spoiler header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ListNodeWidget ordered list with custom start\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table with links in cells\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h2\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: legacy silent channel wildcard @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table with different text alignment in columns\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse plain channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ThematicBreak smoke ThematicBreak\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ListNodeWidget ordered list markers have enough space to render completely\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImageEmoji smoke: Zulip extra emoji\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: global times handles unexpected timezone\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image external\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse two plain-text paragraphs\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent @-topic, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse inline math\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: RealmContentNetworkImage excludes auth header if `src` off-realm\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse Unicode emoji, encoded in span element, multiple codepoints\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji use emoji font (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for vimeo embed with realm link previews enabled\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: track links inside block-inline containers link in heading\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h5\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: RealmContentNetworkImage throws if no `PerAccountStoreWidget` ancestor\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table with single row\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji use emoji font (variant: TargetPlatform.android)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent user @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList single image\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime TwentyFourHourTimeMode.localeDefault\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse lists
      \": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: LinkNode parse message link\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode on internal links invalid internal links are opened in browser\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table with link; center aligned\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse website preview without description\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: smoke: deleted/strike-through\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in plain paragraph (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse website preview without title and description\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: smoke: emphasis/italic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h6\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video non-preview for attempted vimeo embed with realm link previews disabled\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1806", "org": "zulip", "repo": "zulip-flutter", "number": 1806, "state": "closed", "title": "Match insensitively to diacritics (autocomplete and new-DMs)", "body": "Fixes #237.\r\nFixes #1067.", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"e12673a24dfc3ffc4b37f251b62b9075bca41efa\"}", "resolved_issues": "[{\"number\": 237, \"title\": \"autocomplete: In @-mention results, match insensitively to diacritics\", \"body\": \"If there's a user with `\\u00c9tienne` in their name, we should still include it in the results for the query `etienne`.\\r\\n\\r\\nThe matching is already case-insensitive, but it should be insensitive to diacritics too.\"}, {\"number\": 1067, \"title\": \"For emoji autocomplete, match insensitively to diacritics\", \"body\": \"For emoji autocomplete, if the emoji's name has `\\u00e9` where the user's query has `e` or vice versa, we should treat that as a match. The semantics should match what the web app does.\\r\\n\\r\\nThis doesn't much arise for Unicode emoji, because for all the (small number of) Unicode emoji where a name has a diacritic, we also give the emoji an alternate name by removing the diacritics. It might come up for custom emoji in some realms.\\r\\n\\r\\n### Related issues\\r\\n* Similar but for @-mentions: #237\\r\\n* Prerequisite: #670\\r\\n\"}]", "lang": "dart", "problem_statement": "autocomplete: In @-mention results, match insensitively to diacritics\nIf there's a user with `\u00c9tienne` in their name, we should still include it in the results for the query `etienne`.\r\n\r\nThe matching is already case-insensitive, but it should be insensitive to diacritics too.\nFor emoji autocomplete, match insensitively to diacritics\nFor emoji autocomplete, if the emoji's name has `\u00e9` where the user's query has `e` or vice versa, we should treat that as a match. The semantics should match what the web app does.\r\n\r\nThis doesn't much arise for Unicode emoji, because for all the (small number of) Unicode emoji where a name has a diacritic, we also give the emoji an alternate name by removing the diacritics. It might come up for custom emoji in some realms.\r\n\r\n### Related issues\r\n* Similar but for @-mentions: #237\r\n* Prerequisite: #670\r\n\n", "hints": "(In principle this should also apply to user-group mentions, not just user mentions. User-group mention autocomplete hasn't been implemented yet: #233.)\nCan we use something like [diacritic](https://github.com/agilord/diacritic)?\r\nBTW I'm new here (and new to open source in general) so what is the policy when it comes to packages and dependencies?\nIt looks like that package consists of a hand-maintained set of mappings:\r\nhttps://github.com/agilord/diacritic/blob/8cc02fb838f69bfffd25a7629787267814669b28/lib/src/replacement_map.dart#L59-L60\r\nwith no particular documentation of where the list comes from. So that isn't something I'd be eager to rely on.\r\n\r\nThe Zulip web client and the legacy zulip-mobile app have functionality like this. So let's implement the same behavior they have.\r\n\r\nThat behavior has been stable for a long time and I'm not aware of any bug reports we've gotten about it. If we later learn about ways the behavior can be improved, we can make the improvement for web too at the same time.\r\n\n> The Zulip web client and the legacy zulip-mobile app have functionality like this. So let's implement the same behavior they have.\r\n\r\nAfter taking a look back at the mobile app [implementation for this feature](https://github.com/zulip/zulip-mobile/pull/5292/files) I found that it depends on [@zulip/shared](https://www.npmjs.com/package/@zulip/shared) to handle this. check:\r\nfile: [zulip-mobile/src/users/userHelpers.js](https://github.com/Fingel/zulip-mobile/blob/d73e7644f9a2cf3b61b827f10c9e10a38d35c9ae/src/users/userHelpers.js)\r\n```js\r\nimport * as typeahead from '@zulip/shared/js/typeahead';\r\n\r\nconst loweredFilter = filter.toLowerCase();\r\nconst isAscii = /^[a-z]+$/.test(loweredFilter);\r\nreturn users.filter(user => {\r\n const full_name = isAscii ? typeahead.remove_diacritics(user.full_name) : user.full_name;\r\n return user.user_id !== ownUserId && full_name.toLowerCase().startsWith(loweredFilter);\r\n});\r\n```\r\n\r\nWhich uses the convenient Js String built in method `normalize`\r\n\r\nfile: [@zulip/shared/lib/typeahead.js](https://www.npmjs.com/package/@zulip/shared?activeTab=code)\r\n```js\r\nconst unicode_marks = /\\p{M}/gu;\r\nexport function remove_diacritics(s) {\r\n return s.normalize(\"NFKD\").replace(unicode_marks, \"\");\r\n}\r\n```\r\nWhich unfortunately dart does not have *for now at least* so we might have to consider third party packages, I am still searching and evaluating the options but I found several candidates:\r\n* [unorm-dart](https://pub.dev/packages/unorm_dart)\r\n* [normalizer](https://pub.dev/packages/normalizer)\r\n\r\nSo I will do some research to be able make an educated suggestion\nUpdating this thread with a conclusion from [chat](https://chat.zulip.org/#narrow/channel/48-mobile/topic/deps.3A.20Add.20new.20package.20to.20handle.20diacritics/near/1770345) and the PR thread https://github.com/zulip/zulip-flutter/pull/588#issuecomment-2080022746 :\r\n\r\nWe'd use [`package:unorm_dart`](https://pub.dev/packages/unorm_dart) for this.\r\n\nWhen making the search \"fuzzy\" like this, ideally we'd prioritize non-fuzzy matches over fuzzy matches. (zulip/zulip#32634 gave me the idea to comment here; we can split this to a new issue if helpful.)\nThis came up in early post-launch feedback today: #1623\n@chrisbobbe just pinging this issue. We're a paying customer and this is disrespectful to some of our colleagues. Please don't mess with peoples names.\n\nI also find it disrespectful to be asked to upvote to prioritise - this is a very basic feature. \"Zulip is not able to mention people by name proper\" is a clear defect, not a future feature.\nAs part of the same work, let's also handle the possibility that the emoji's name has an upper-case letter where the query has lower case.\r\n\r\nThis one doesn't come up at all for Unicode emoji: all our names are in lower case. But again it might come up for custom emoji in some realms.\r\n\nWhen making the search \"fuzzy\" like this, ideally we'd prioritize non-fuzzy matches over fuzzy matches. (zulip/zulip#32634 gave me the idea to comment here; we can split this to a new issue if helpful.)\nHello @gnprice ,\nThis would be solution for the issue right?\n\nhttps://github.com/user-attachments/assets/28b02c43-ba54-48a8-b40a-40a0d13e94c1\nFrom the snippet in that demo, that looks like broadly the right sort of behavior. To tell whether it's an accurate solution would require more detail, like an implementation and its tests.\n\nThis is a post-launch issue, though \u2014 in fact it's in the M7 Future milestone, beyond M6 Post-launch. So we won't be able to spend time giving feedback on PRs for it until after the app has been launched.\n\nTo get clear idea of implementation I had created a PR.", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1806", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/237\", \"https://github.com/zulip/zulip-flutter/issues/1067\"]", "test_command": "flutter test test/model/autocomplete_test.dart test/model/emoji_test.dart test/widgets/new_dm_sheet_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/autocomplete.dart b/lib/model/autocomplete.dart\nindex 0b17f50b27..cf5c6b86e0 100644\n--- a/lib/model/autocomplete.dart\n+++ b/lib/model/autocomplete.dart\n@@ -2,6 +2,7 @@ import 'dart:math';\n \n import 'package:flutter/foundation.dart';\n import 'package:flutter/services.dart';\n+import 'package:unorm_dart/unorm_dart.dart' as unorm;\n \n import '../api/model/events.dart';\n import '../api/model/model.dart';\n@@ -643,9 +644,9 @@ class MentionAutocompleteView extends AutocompleteView _lowercaseWords;\n+ late final List _normalizedWords;\n+\n+ static final RegExp _regExpStripMarkCharacters = RegExp(r'\\p{M}', unicode: true);\n+\n+ static String lowercaseAndStripDiacritics(String input) {\n+ // Anders reports that this is what web does; see discussion:\n+ // https://chat.zulip.org/#narrow/channel/48-mobile/topic/deps.3A.20Add.20new.20package.20to.20handle.20diacritics/near/2244487\n+ final lowercase = input.toLowerCase();\n+ final compatibilityNormalized = unorm.nfkd(lowercase);\n+ return compatibilityNormalized.replaceAll(_regExpStripMarkCharacters, '');\n+ }\n \n /// Whether all of this query's words have matches in [words],\n- /// modulo case, that appear in order.\n+ /// insensitively to case and diacritics, that appear in order.\n ///\n /// A \"match\" means the word in [words] starts with the query word.\n ///\n- /// [words] must all be lowercased.\n+ /// [words] must all have been passed through [lowercaseAndStripDiacritics].\n bool _testContainsQueryWords(List words) {\n- // TODO(#237) test with diacritics stripped, where appropriate,\n- // and update dartdoc's summary line and its restriction about [words].\n int wordsIndex = 0;\n int queryWordsIndex = 0;\n while (true) {\n- if (queryWordsIndex == _lowercaseWords.length) {\n+ if (queryWordsIndex == _normalizedWords.length) {\n return true;\n }\n if (wordsIndex == words.length) {\n return false;\n }\n \n- if (words[wordsIndex].startsWith(_lowercaseWords[queryWordsIndex])) {\n+ if (words[wordsIndex].startsWith(_normalizedWords[queryWordsIndex])) {\n queryWordsIndex++;\n }\n wordsIndex++;\n@@ -825,9 +837,9 @@ class MentionAutocompleteQuery extends ComposeAutocompleteQuery {\n \n WildcardMentionAutocompleteResult? testWildcardOption(WildcardMentionOption wildcardOption, {\n required ZulipLocalizations localizations}) {\n- // TODO(#237): match insensitively to diacritics\n- final matches = wildcardOption.canonicalString.contains(_lowercase)\n- || wildcardOption.localizedCanonicalString(localizations).contains(_lowercase);\n+ final localized = wildcardOption.localizedCanonicalString(localizations);\n+ final matches = wildcardOption.canonicalString.contains(_normalized)\n+ || AutocompleteQuery.lowercaseAndStripDiacritics(localized).contains(_normalized);\n if (!matches) return null;\n return WildcardMentionAutocompleteResult(\n wildcardOption: wildcardOption, rank: _rankWildcardResult);\n@@ -857,8 +869,8 @@ class MentionAutocompleteQuery extends ComposeAutocompleteQuery {\n required String normalizedName,\n required List normalizedNameWords,\n }) {\n- if (normalizedName.startsWith(_lowercase)) {\n- if (normalizedName.length == _lowercase.length) {\n+ if (normalizedName.startsWith(_normalized)) {\n+ if (normalizedName.length == _normalized.length) {\n return NameMatchQuality.exact;\n } else {\n return NameMatchQuality.totalPrefix;\n@@ -873,17 +885,17 @@ class MentionAutocompleteQuery extends ComposeAutocompleteQuery {\n }\n \n bool _matchEmail(User user, AutocompleteDataCache cache) {\n- final lowercaseEmail = cache.normalizedEmailForUser(user);\n- if (lowercaseEmail == null) return false; // Email not known\n- return lowercaseEmail.startsWith(_lowercase);\n+ final normalizedEmail = cache.normalizedEmailForUser(user);\n+ if (normalizedEmail == null) return false; // Email not known\n+ return normalizedEmail.startsWith(_normalized);\n }\n \n MentionAutocompleteResult? testUserGroup(UserGroup userGroup, PerAccountStore store) {\n final cache = store.autocompleteViewManager.autocompleteDataCache;\n \n final nameMatchQuality = _matchName(\n- normalizedName: cache.lowercaseNameForUserGroup(userGroup),\n- normalizedNameWords: cache.lowercaseNameWordsForUserGroup(userGroup));\n+ normalizedName: cache.normalizedNameForUserGroup(userGroup),\n+ normalizedNameWords: cache.normalizedNameWordsForUserGroup(userGroup));\n \n if (nameMatchQuality == null) return null;\n \n@@ -970,12 +982,16 @@ extension WildcardMentionOptionExtension on WildcardMentionOption {\n /// but kept around in between autocomplete interactions.\n ///\n /// An instance of this class is managed by [AutocompleteViewManager].\n+// TODO(#1805) when splitting words, split on space characters that are likely\n+// to be used (e.g. U+3000 IDEOGRAPHIC SPACE);\n+// could check server language or just split on all kinds of spaces\n class AutocompleteDataCache {\n final Map _normalizedNamesByUser = {};\n \n /// The normalized `fullName` of [user].\n String normalizedNameForUser(User user) {\n- return _normalizedNamesByUser[user.userId] ??= user.fullName.toLowerCase();\n+ return _normalizedNamesByUser[user.userId]\n+ ??= AutocompleteQuery.lowercaseAndStripDiacritics(user.fullName);\n }\n \n final Map> _normalizedNameWordsByUser = {};\n@@ -989,21 +1005,25 @@ class AutocompleteDataCache {\n \n /// The normalized `deliveryEmail` of [user], or null if that's null.\n String? normalizedEmailForUser(User user) {\n- return _normalizedEmailsByUser[user.userId] ??= user.deliveryEmail?.toLowerCase();\n+ return _normalizedEmailsByUser[user.userId]\n+ ??= (user.deliveryEmail != null\n+ ? AutocompleteQuery.lowercaseAndStripDiacritics(user.deliveryEmail!)\n+ : null);\n }\n \n- final Map _lowercaseNamesByUserGroup = {};\n+ final Map _normalizedNamesByUserGroup = {};\n \n /// The normalized `name` of [userGroup].\n- String lowercaseNameForUserGroup(UserGroup userGroup) {\n- return _lowercaseNamesByUserGroup[userGroup.id] ??= userGroup.name.toLowerCase();\n+ String normalizedNameForUserGroup(UserGroup userGroup) {\n+ return _normalizedNamesByUserGroup[userGroup.id]\n+ ??= AutocompleteQuery.lowercaseAndStripDiacritics(userGroup.name);\n }\n \n- final Map> _lowercaseNameWordsByUserGroup = {};\n+ final Map> _normalizedNameWordsByUserGroup = {};\n \n- List lowercaseNameWordsForUserGroup(UserGroup userGroup) {\n- return _lowercaseNameWordsByUserGroup[userGroup.id]\n- ??= lowercaseNameForUserGroup(userGroup).split(' ');\n+ List normalizedNameWordsForUserGroup(UserGroup userGroup) {\n+ return _normalizedNameWordsByUserGroup[userGroup.id]\n+ ??= normalizedNameForUserGroup(userGroup).split(' ');\n }\n \n void invalidateUser(int userId) {\n@@ -1013,8 +1033,8 @@ class AutocompleteDataCache {\n }\n \n void invalidateUserGroup(int id) {\n- _lowercaseNamesByUserGroup.remove(id);\n- _lowercaseNameWordsByUserGroup.remove(id);\n+ _normalizedNamesByUserGroup.remove(id);\n+ _normalizedNameWordsByUserGroup.remove(id);\n }\n }\n \n@@ -1196,11 +1216,11 @@ class TopicAutocompleteQuery extends AutocompleteQuery {\n // TODO(#881): Sort by match relevance, like web does.\n \n if (topic.displayName == null) {\n- return store.realmEmptyTopicDisplayName.toLowerCase()\n- .contains(raw.toLowerCase());\n+ return AutocompleteQuery.lowercaseAndStripDiacritics(store.realmEmptyTopicDisplayName)\n+ .contains(_normalized);\n }\n return topic.displayName != raw\n- && topic.displayName!.toLowerCase().contains(raw.toLowerCase());\n+ && AutocompleteQuery.lowercaseAndStripDiacritics(topic.displayName!).contains(_normalized);\n }\n \n @override\ndiff --git a/lib/model/emoji.dart b/lib/model/emoji.dart\nindex 12424104bf..8d6a1cab0e 100644\n--- a/lib/model/emoji.dart\n+++ b/lib/model/emoji.dart\n@@ -74,11 +74,23 @@ final class EmojiCandidate {\n /// This might not be the only name this emoji has; see [aliases].\n final String emojiName;\n \n+ /// [emojiName], but via [AutocompleteQuery.lowercaseAndStripDiacritics]\n+ /// to support fuzzy matching.\n+ String get normalizedEmojiName => _normalizedEmojiName\n+ ??= AutocompleteQuery.lowercaseAndStripDiacritics(emojiName);\n+ String? _normalizedEmojiName;\n+\n /// Additional Zulip \"emoji name\" values for this emoji,\n /// to show in the emoji picker UI.\n Iterable get aliases => _aliases ?? const [];\n final List? _aliases;\n \n+ /// [aliases], but via [AutocompleteQuery.lowercaseAndStripDiacritics]\n+ /// to support fuzzy matching.\n+ Iterable get normalizedAliases => _normalizedAliases\n+ ??= aliases.map((alias) => AutocompleteQuery.lowercaseAndStripDiacritics(alias));\n+ Iterable? _normalizedAliases;\n+\n final EmojiDisplay emojiDisplay;\n \n EmojiCandidate({\n@@ -501,9 +513,8 @@ class EmojiAutocompleteQuery extends ComposeAutocompleteQuery {\n \n static const _separator = '_';\n \n- static String _adjustQuery(String raw) {\n- return raw.toLowerCase().replaceAll(' ', '_'); // TODO(#1067) remove diacritics too\n- }\n+ static String _adjustQuery(String raw) =>\n+ AutocompleteQuery.lowercaseAndStripDiacritics(raw.replaceAll(' ', '_'));\n \n @override\n EmojiAutocompleteView initViewModel({\n@@ -533,29 +544,28 @@ class EmojiAutocompleteQuery extends ComposeAutocompleteQuery {\n }\n }\n \n- EmojiMatchQuality? result = _matchName(candidate.emojiName);\n- for (final alias in candidate.aliases) {\n+ EmojiMatchQuality? result = _matchName(candidate.normalizedEmojiName);\n+ for (final normalizedAlias in candidate.normalizedAliases) {\n if (result == EmojiMatchQuality.best) return result;\n- result = EmojiMatchQuality.bestOf(result, _matchName(alias));\n+ result = EmojiMatchQuality.bestOf(result, _matchName(normalizedAlias));\n }\n return result;\n }\n \n- EmojiMatchQuality? _matchName(String emojiName) {\n+ EmojiMatchQuality? _matchName(String normalizedName) {\n // Compare query_matches_string_in_order in Zulip web:shared/src/typeahead.ts\n // for a Boolean version of this logic (match vs. no match),\n // and triage_raw in the same file web:shared/src/typeahead.ts\n // for the finer distinctions.\n // See also commentary in [_rankResult].\n \n- // TODO(#1067) this assumes emojiName is already lower-case (and no diacritics)\n- if (emojiName == _adjusted) return EmojiMatchQuality.exact;\n- if (emojiName.startsWith(_adjusted)) return EmojiMatchQuality.prefix;\n- if (emojiName.contains(_sepAdjusted)) return EmojiMatchQuality.wordAligned;\n+ if (normalizedName == _adjusted) return EmojiMatchQuality.exact;\n+ if (normalizedName.startsWith(_adjusted)) return EmojiMatchQuality.prefix;\n+ if (normalizedName.contains(_sepAdjusted)) return EmojiMatchQuality.wordAligned;\n if (!_adjusted.contains(_separator)) {\n // If the query is a single token (doesn't contain a separator),\n // allow a match anywhere in the string, too.\n- if (emojiName.contains(_adjusted)) return EmojiMatchQuality.other;\n+ if (normalizedName.contains(_adjusted)) return EmojiMatchQuality.other;\n } else {\n // Otherwise, require at least a word-aligned match.\n }\ndiff --git a/lib/widgets/autocomplete.dart b/lib/widgets/autocomplete.dart\nindex 5c853d2da0..e345969189 100644\n--- a/lib/widgets/autocomplete.dart\n+++ b/lib/widgets/autocomplete.dart\n@@ -208,7 +208,7 @@ class ComposeAutocomplete extends AutocompleteField with PerAccountStoreAwareStat\n void _updateFilteredUsers(PerAccountStore store) {\n final excludeSelfUser = selectedUserIds.isNotEmpty\n && !selectedUserIds.contains(store.selfUserId);\n- final searchTextLower = searchController.text.toLowerCase();\n+ final normalizedQuery =\n+ AutocompleteQuery.lowercaseAndStripDiacritics(searchController.text);\n \n final result = [];\n for (final user in sortedUsers) {\n if (excludeSelfUser && user.userId == store.selfUserId) continue;\n- if (user.fullName.toLowerCase().contains(searchTextLower)) {\n+ final normalizedName = AutocompleteQuery.lowercaseAndStripDiacritics(user.fullName);\n+ if (normalizedName.contains(normalizedQuery)) {\n result.add(user);\n }\n }\ndiff --git a/pubspec.lock b/pubspec.lock\nindex c52f5e6c1e..bc3cb33f00 100644\n--- a/pubspec.lock\n+++ b/pubspec.lock\n@@ -1115,6 +1115,14 @@ packages:\n url: \"https://pub.dev\"\n source: hosted\n version: \"1.4.0\"\n+ unorm_dart:\n+ dependency: \"direct main\"\n+ description:\n+ name: unorm_dart\n+ sha256: \"8e3870a1caa60bde8352f9597dd3535d8068613269444f8e35ea8925ec84c1f5\"\n+ url: \"https://pub.dev\"\n+ source: hosted\n+ version: \"0.3.1+1\"\n url_launcher:\n dependency: \"direct main\"\n description:\ndiff --git a/pubspec.yaml b/pubspec.yaml\nindex 9b1c3566c5..64b5a6b111 100644\n--- a/pubspec.yaml\n+++ b/pubspec.yaml\n@@ -65,6 +65,7 @@ dependencies:\n wakelock_plus: ^1.2.8\n zulip_plugin:\n path: ./packages/zulip_plugin\n+ unorm_dart: ^0.3.1+1\n # Keep list sorted when adding dependencies; it helps prevent merge conflicts.\n \n dependency_overrides:\n", "test_patch": "diff --git a/test/model/autocomplete_test.dart b/test/model/autocomplete_test.dart\nindex 20f8adb6be..a560512553 100644\n--- a/test/model/autocomplete_test.dart\n+++ b/test/model/autocomplete_test.dart\n@@ -27,9 +27,6 @@ import 'autocomplete_checks.dart';\n typedef MarkedTextParse = ({int? expectedSyntaxStart, TextEditingValue value});\n \n final zulipLocalizations = GlobalLocalizations.zulipLocalizations;\n-final zulipLocalizationsArabic =\n- lookupZulipLocalizations(ZulipLocalizations.supportedLocales\n- .firstWhere((locale) => locale.languageCode == 'ar'));\n \n void main() {\n ({int? expectedSyntaxStart, TextEditingValue value}) parseMarkedText(String markedText) {\n@@ -922,26 +919,49 @@ void main() {\n });\n }\n \n- final localizedTestCases = [\n- ('\u0627\u0644', channelNarrow, [WildcardMentionOption.all, WildcardMentionOption.topic]),\n- ('\u0627\u0644\u062c\u0645\u064a\u0639', topicNarrow, [WildcardMentionOption.all]),\n- ('\u0627\u0644\u0645\u0648\u0636\u0648\u0639', channelNarrow, [WildcardMentionOption.topic]),\n- ('\u0642', topicNarrow, [WildcardMentionOption.channel]),\n- ('\u062f\u0641\u0642', channelNarrow, [WildcardMentionOption.stream]),\n- ('\u0627\u0644\u0643\u0644', dmNarrow, [WildcardMentionOption.everyone]),\n+ WildcardTester wildcardTesterForLocale(bool Function(Locale) localePredicate) {\n+ final locale = ZulipLocalizations.supportedLocales.firstWhere(localePredicate);\n+ final localizations = lookupZulipLocalizations(locale);\n \n- ('top', channelNarrow, [WildcardMentionOption.topic]),\n- ('channel', topicNarrow, [WildcardMentionOption.channel]),\n- ('every', dmNarrow, [WildcardMentionOption.everyone]),\n- ];\n+ return (String query, Narrow narrow, List expected) {\n+ test('locale \"$locale\" -> query \"$query\" in ${narrow.runtimeType} -> $expected', () {\n+ check(getWildcardOptionsFor(query, narrow: narrow,\n+ localizations: localizations)).deepEquals(expected);\n+ });\n+ };\n+ }\n \n- for (final (String localizedQuery, Narrow narrow, List wildcardOptions) in localizedTestCases) {\n- test('different locale -> query \"$localizedQuery\" in ${narrow.runtimeType} -> $wildcardOptions', () async {\n- check(getWildcardOptionsFor(localizedQuery, narrow: narrow,\n- localizations: zulipLocalizationsArabic)).deepEquals(wildcardOptions);\n- });\n+ for (final option in WildcardMentionOption.values) {\n+ // These are hard-coded, and they happened to be lowercase and without\n+ // diacritics when written.\n+ // Throw if that changes, to not accidentally break fuzzy matching.\n+ check(option.canonicalString).equals(\n+ AutocompleteQuery.lowercaseAndStripDiacritics(option.canonicalString));\n }\n \n+ final testArabic = wildcardTesterForLocale((locale) => locale.languageCode == 'ar');\n+ testArabic('\u0627\u0644', channelNarrow, [WildcardMentionOption.all, WildcardMentionOption.topic]);\n+ testArabic('\u0627\u0644\u062c\u0645\u064a\u0639', topicNarrow, [WildcardMentionOption.all]);\n+ testArabic('\u0627\u0644\u0645\u0648\u0636\u0648\u0639', channelNarrow, [WildcardMentionOption.topic]);\n+ testArabic('\u0642', topicNarrow, [WildcardMentionOption.channel]);\n+ testArabic('\u062f\u0641\u0642', channelNarrow, [WildcardMentionOption.stream]);\n+ testArabic('\u0627\u0644\u0643\u0644', dmNarrow, [WildcardMentionOption.everyone]);\n+ testArabic('top', channelNarrow, [WildcardMentionOption.topic]);\n+ testArabic('channel', topicNarrow, [WildcardMentionOption.channel]);\n+ testArabic('every', dmNarrow, [WildcardMentionOption.everyone]);\n+\n+ final testEnglish = wildcardTesterForLocale((locale) => locale.languageCode == 'en');\n+ testEnglish('topic', topicNarrow, [WildcardMentionOption.topic]);\n+ testEnglish('Topic', topicNarrow, [WildcardMentionOption.topic]);\n+\n+ final testGerman = wildcardTesterForLocale((locale) => locale.languageCode == 'de');\n+ testGerman('Thema', topicNarrow, [WildcardMentionOption.topic]);\n+ testGerman('thema', topicNarrow, [WildcardMentionOption.topic]);\n+\n+ final testPolish = wildcardTesterForLocale((locale) => locale.languageCode == 'pl');\n+ testPolish('w\u0105tek', topicNarrow, [WildcardMentionOption.topic]);\n+ testPolish('watek', topicNarrow, [WildcardMentionOption.topic]);\n+\n test('no wildcards for a silent mention', () {\n check(getWildcardOptionsFor('', isSilent: true, narrow: channelNarrow))\n .isEmpty();\n@@ -1061,6 +1081,14 @@ void main() {\n check(rankOf(query, a)!).equals(rankOf(query, b)!);\n }\n \n+ void checkAllSameRank(String query, Iterable candidates) {\n+ // (i.e. throw here if it's not a match)\n+ final firstCandidateRank = rankOf(query, candidates.first)!;\n+\n+ final ranks = candidates.skip(1).map((candidate) => rankOf(query, candidate));\n+ check(ranks).every((it) => it.equals(firstCandidateRank));\n+ }\n+\n test('wildcards, then users', () {\n checkSameRank('', WildcardMentionOption.all, WildcardMentionOption.topic);\n checkPrecedes('', WildcardMentionOption.topic, eg.user());\n@@ -1073,13 +1101,28 @@ void main() {\n checkPrecedes(user.fullName, WildcardMentionOption.channel, user);\n });\n \n- test('user name matched case-insensitively', () {\n- final user1 = eg.user(fullName: 'Chris Bobbe');\n- final user2 = eg.user(fullName: 'chris bobbe');\n+ test('user name match is case- and diacritics-insensitive', () {\n+ final users = [\n+ eg.user(fullName: '\u00c9dith Piaf'),\n+ eg.user(fullName: '\u00e9dith piaf'),\n+ eg.user(fullName: 'Edith Piaf'),\n+ eg.user(fullName: 'edith piaf'),\n+ ];\n+\n+ checkAllSameRank('\u00c9dith Piaf', users); // exact\n+ checkAllSameRank('Edith Piaf', users); // exact\n+ checkAllSameRank('\u00e9dith piaf', users); // exact\n+ checkAllSameRank('edith piaf', users); // exact\n+\n+ checkAllSameRank('\u00c9dith Pi', users); // total-prefix\n+ checkAllSameRank('Edith Pi', users); // total-prefix\n+ checkAllSameRank('\u00e9dith pi', users); // total-prefix\n+ checkAllSameRank('edith pi', users); // total-prefix\n \n- checkSameRank('chris bobbe', user1, user2); // exact\n- checkSameRank('chris bo', user1, user2); // total-prefix\n- checkSameRank('chr bo', user1, user2); // word-prefixes\n+ checkAllSameRank('\u00c9d Pi', users); // word-prefixes\n+ checkAllSameRank('Ed Pi', users); // word-prefixes\n+ checkAllSameRank('\u00e9d pi', users); // word-prefixes\n+ checkAllSameRank('ed pi', users); // word-prefixes\n });\n \n test('user name match: exact over total-prefix', () {\n@@ -1096,13 +1139,16 @@ void main() {\n checkPrecedes('so m', user1, user2);\n });\n \n- test('group name matched case-insensitively', () {\n- final userGroup1 = eg.userGroup(name: 'Mobile Team');\n- final userGroup2 = eg.userGroup(name: 'mobile team');\n+ test('group name is case- and diacritics-insensitive', () {\n+ final userGroups = [\n+ eg.userGroup(name: 'Mobile Team'),\n+ eg.userGroup(name: 'mobile team'),\n+ eg.userGroup(name: 'm\u00f6bile team'),\n+ ];\n \n- checkSameRank('mobile team', userGroup1, userGroup2); // exact\n- checkSameRank('mobile te', userGroup1, userGroup2); // total-prefix\n- checkSameRank('mob te', userGroup1, userGroup2); // word-prefixes\n+ checkAllSameRank('mobile team', userGroups); // exact\n+ checkAllSameRank('mobile te', userGroups); // total-prefix\n+ checkAllSameRank('mob te', userGroups); // word-prefixes\n });\n \n test('group name match: exact over total-prefix', () {\n@@ -1119,16 +1165,19 @@ void main() {\n checkPrecedes('so m', userGroup1, userGroup2);\n });\n \n- test('email matched case-insensitively', () {\n+ test('email match is case- and diacritics-insensitive', () {\n // \"z\" name to prevent accidental name match with example data\n- final user1 = eg.user(fullName: 'z', deliveryEmail: 'email@example.com');\n- final user2 = eg.user(fullName: 'z', deliveryEmail: 'EmAiL@ExAmPlE.com');\n-\n- checkSameRank('email@example.com', user1, user2);\n- checkSameRank('email@e', user1, user2);\n- checkSameRank('email@', user1, user2);\n- checkSameRank('email', user1, user2);\n- checkSameRank('ema', user1, user2);\n+ final users = [\n+ eg.user(fullName: 'z', deliveryEmail: 'email@example.com'),\n+ eg.user(fullName: 'z', deliveryEmail: 'EmAiL@ExAmPlE.com'),\n+ eg.user(fullName: 'z', deliveryEmail: '\u0113mail@example.com'),\n+ ];\n+\n+ checkAllSameRank('email@example.com', users);\n+ checkAllSameRank('email@e', users);\n+ checkAllSameRank('email@', users);\n+ checkAllSameRank('email', users);\n+ checkAllSameRank('ema', users);\n });\n \n test('email match is by prefix only', () {\n@@ -1259,3 +1308,5 @@ void main() {\n });\n });\n }\n+\n+typedef WildcardTester = void Function(String query, Narrow narrow, List expected);\ndiff --git a/test/model/emoji_test.dart b/test/model/emoji_test.dart\nindex 5a89722d6e..6ce03854b7 100644\n--- a/test/model/emoji_test.dart\n+++ b/test/model/emoji_test.dart\n@@ -558,8 +558,10 @@ void main() {\n check(matchOfName('blue dia', 'large_blue_diamond')).wordAligned;\n });\n \n- test('query is lower-cased', () {\n+ test('case-insensitive', () {\n check(matchOfName('Smi', 'smile')).prefix;\n+ check(matchOfName('smi', 'SMILE')).prefix;\n+ check(matchOfName('SmI', 'sMiLe')).prefix;\n });\n \n test('query matches aliases same way as primary name', () {\n@@ -577,6 +579,8 @@ void main() {\n check(matchOfNames('blue_dia', ['x', 'large_blue_diamond'])).wordAligned;\n \n check(matchOfNames('Smi', ['x', 'smile'])).prefix;\n+ check(matchOfNames('smi', ['x', 'SMILE'])).prefix;\n+ check(matchOfNames('SmI', ['x', 'sMiLe'])).prefix;\n });\n \n test('best match among name and aliases prevails', () {\ndiff --git a/test/widgets/new_dm_sheet_test.dart b/test/widgets/new_dm_sheet_test.dart\nindex a11e862b48..aff2e8ba6e 100644\n--- a/test/widgets/new_dm_sheet_test.dart\n+++ b/test/widgets/new_dm_sheet_test.dart\n@@ -123,6 +123,7 @@ void main() {\n eg.user(fullName: 'Alice Anderson'),\n eg.user(fullName: 'Bob Brown'),\n eg.user(fullName: 'Charlie Carter'),\n+ eg.user(fullName: '\u00c9dith Piaf'),\n ];\n \n testWidgets('shows full list initially', (tester) async {\n@@ -130,7 +131,7 @@ void main() {\n check(findText(includePlaceholders: false, 'Alice Anderson')).findsOne();\n check(findText(includePlaceholders: false, 'Bob Brown')).findsOne();\n check(findText(includePlaceholders: false, 'Charlie Carter')).findsOne();\n- check(find.byIcon(ZulipIcons.check_circle_unchecked)).findsExactly(3);\n+ check(find.byIcon(ZulipIcons.check_circle_unchecked)).findsExactly(testUsers.length);\n check(find.byIcon(ZulipIcons.check_circle_checked)).findsNothing();\n });\n \n@@ -150,7 +151,7 @@ void main() {\n users: [...testUsers, deactivatedUser]);\n check(findText(includePlaceholders: false, 'Impostor Charlie')).findsNothing();\n check(findText(includePlaceholders: false, 'Charlie Carter')).findsOne();\n- check(find.byIcon(ZulipIcons.check_circle_unchecked)).findsExactly(3);\n+ check(find.byIcon(ZulipIcons.check_circle_unchecked)).findsExactly(testUsers.length);\n \n // \u2026 and after a query that would match their name.\n await tester.enterText(find.byType(TextField), 'Charlie');\n@@ -168,7 +169,7 @@ void main() {\n check(findText(includePlaceholders: false, 'Someone Muted')).findsNothing();\n check(findText(includePlaceholders: false, 'Muted user')).findsNothing();\n check(findText(includePlaceholders: false, 'Alice Anderson')).findsOne();\n- check(find.byIcon(ZulipIcons.check_circle_unchecked)).findsExactly(3);\n+ check(find.byIcon(ZulipIcons.check_circle_unchecked)).findsExactly(testUsers.length);\n \n // \u2026 and after a query. One which matches both the user's actual name and\n // the replacement text \"Muted user\", for good measure.\n@@ -178,13 +179,14 @@ void main() {\n check(findText(includePlaceholders: false, 'Muted user')).findsNothing();\n check(findText(includePlaceholders: false, 'Alice Anderson')).findsOne();\n check(findText(includePlaceholders: false, 'Charlie Carter')).findsOne();\n- check(find.byIcon(ZulipIcons.check_circle_unchecked)).findsExactly(2);\n+ check(findText(includePlaceholders: false, '\u00c9dith Piaf')).findsOne();\n+ check(find.byIcon(ZulipIcons.check_circle_unchecked)).findsExactly(3);\n });\n \n // TODO test sorting by recent-DMs\n // TODO test that scroll position resets on query change\n \n- testWidgets('search is case-insensitive', (tester) async {\n+ testWidgets('search is case- and diacritics-insensitive', (tester) async {\n await setupSheet(tester, users: testUsers);\n await tester.enterText(find.byType(TextField), 'alice');\n await tester.pump();\n@@ -193,6 +195,14 @@ void main() {\n await tester.enterText(find.byType(TextField), 'ALICE');\n await tester.pump();\n check(findText(includePlaceholders: false, 'Alice Anderson')).findsOne();\n+\n+ await tester.enterText(find.byType(TextField), 'alic\u00e9');\n+ await tester.pump();\n+ check(findText(includePlaceholders: false, 'Alice Anderson')).findsOne();\n+\n+ await tester.enterText(find.byType(TextField), 'edith');\n+ await tester.pump();\n+ check(findText(includePlaceholders: false, '\u00c9dith Piaf')).findsOne();\n });\n \n testWidgets('partial name and last name search handling', (tester) async {\n", "n2p_tests": "{\"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u2014~@_abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":<^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\" ~@abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:\\u30b3^\\\", query \\\"\\u30b3\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@me@zulip.com^\\\", query \\\"me@zulip.com\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u201c~@abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"^@_\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_^abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_me@^zulip.com^\\\", query \\\"me@zulip.com\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"email support@zulip.com^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u00ab~@_abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":-^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@me@^zulip.com^\\\", query \\\"me@zulip.com\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"!@#$%&*()_+\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@\\\\n^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"^:\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@^_\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"`@chris^\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_\\\\ud834^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_Rodion Romanovich Raskolniko^\\\", query \\\"Rodion Romanovich Raskolniko\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":(^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u3002~@_abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"`@_chris^\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_>^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@^me@zulip.com^\\\", query \\\"me@zulip.com\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":/^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":=^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"Ask @**^Chris Bobbe**\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@^abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:a b^\\\", query \\\"a b\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"email support@^\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:a ^\\\", query \\\"a \\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_a^bc^\\\", query \\\"abc\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"(~@_abc^\\\", query \\\"abc\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@ ^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"^hello @_chris^\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_^me@zulip.com^\\\", query \\\"me@zulip.com\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"Ask @**Chris Bobbe^**\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\\\\\\"~@abc^\\\", query \\\"abc\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@\\\\ud834^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_me@zulip.com^\\\", query \\\"me@zulip.com\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"Ask @_**^Chris Bobbe**\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@\\\\\\\"^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"Ask @_**Chris Bobbe**^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_\\u0600^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"^@abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_\\\\u0000^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_ab^c^\\\", query \\\"abc\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":-)^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@\\\\\\\\^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"email support@zulip^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"this:^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@\\u061c^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_\\\\\\\"^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"Ask @**Chris Bobbe**^\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"^@_abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@\\u0600^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~^@_^\\\", query \\\"\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_\\\\n^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"email support@^ with details of the issue\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@ab^c^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"support@zulip.com^\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"l\\u00e0 ~:^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"^@\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_\\\\\\\\^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@me^@zulip.com^\\\", query \\\"me@zulip.com\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@*^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\": ^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_*^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@`^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_me^@zulip.com^\\\", query \\\"me@zulip.com\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"l\\u00e0 : ^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@>^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@__^\\\", query \\\"_\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_\\u061c^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"Ask @**Chris^ Bobbe**\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\" ~@_abc^\\\", query \\\"abc\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u00ab~@abc^\\\", query \\\"abc\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~^@^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u3002~@abc^\\\", query \\\"abc\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"this: ~:s^\\\", query \\\"s\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"Please ask ~@_chris^\\\", query \\\"chris\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"Ask @_**Chris Bobbe^**\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u2014~@abc^\\\", query \\\"abc\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@Rodion Romanovich Raskolnikov^\\\", query \\\"Rodion Romanovich Raskolnikov\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"^:abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@a^bc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@ab^c\\\", query \\\"ab\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"email support@ with details of the issue^\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u201c~@_abc^\\\", query \\\"abc\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_`^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"^hello @chris^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"Ask @_**Chris^ Bobbe**\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_ab^c\\\", query \\\"ab\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"Please ask ~@chris bobbe^\\\", query \\\"chris bobbe\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@\\\\u0000^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"(~@abc^\\\", query \\\"abc\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\\\\\\"~@_abc^\\\", query \\\"abc\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: user filtering muted users excluded\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: user filtering search is case- and diacritics-insensitive\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: navigation to DM Narrow navigates to 1:1 DM\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: navigation to DM Narrow navigates to group DM\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates realm emoji overrides Unicode emoji\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: getUnicodeEmojiNameByCode happy path\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: user selection other user selection deselects self user\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: user selection tapping user chip deselects the user\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: user filtering shows filtered users based on search\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: user selection can select multiple users\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: user filtering shows empty state when no users match\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: user selection selecting and deselecting a user\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates realm emoji included only when active\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: User status emoji is not set, text is set -> text is not displayed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: getUnicodeEmojiNameByCode server emoji data present, emoji code not present\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: emojiDisplayFor realm emoji\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: User status emoji & text are set -> emoji is displayed, text is not\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates deactivated realm emoji cause no override of Unicode emoji\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: popularEmojiCandidates updates on first and subsequent setServerEmojiData\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: user selection other user selection hides self user\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: user filtering search text clears when user is selected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteView results update after query change\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: popularEmojiCandidates memoizes result, before setServerEmojiData\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: emojiDisplayFor Unicode emoji\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates memoizes result\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: emojiDisplayFor invalid Unicode emoji -> no crash\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: search field has focus when sheet opens\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates updates on RealmEmojiUpdateEvent\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: shows header with correct buttons\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: emojiDisplayFor :zulip:\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: user filtering partial name and last name search handling\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: user filtering shows full list initially\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: navigation to DM Narrow navigates to self DM\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates Unicode emoji with overridden aliases survives with remaining names\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates Unicode emoji with overridden primary name survives with remaining names\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: popularEmojiCandidates memoizes result, after setServerEmojiData\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates popular emoji appear in their canonical order\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/new_dm_sheet_test.dart: user filtering deactivated users excluded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates realm emoji tolerate name collisions\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates updates on setServerEmojiData\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1797", "org": "zulip", "repo": "zulip-flutter", "number": 1797, "state": "closed", "title": "startup: Add beta-complete dialog", "body": "Fixes #1603.\r\n\r\ncc @alya \r\n-----\r\n\r\n\"image\"\r\n\r\n\"image\"\r\n", "base": "{\"label\": \"zulip:beta-prelaunch\", \"ref\": \"beta-prelaunch\", \"sha\": \"888952bb73c1b999f37b2a9d36016935a78901dd\"}", "resolved_issues": "[{\"number\": 1603, \"title\": \"Update to old beta channel saying app has moved\", \"body\": \"Now that the app [has launched](https://blog.zulip.com/2025/06/17/flutter-mobile-app-launched/), we're publishing future releases to the main Zulip app's listings in the Play Store and App Store, and no longer to the listings (in the Play Store and TestFlight) that were for the Flutter app as a beta.\\n\\nPeople who were using the Flutter beta will therefore want to install the main Zulip app and switch to that, in order to keep getting new features and bugfixes. For those who don't see the announcement through other channels, it would be good to post it in the app itself.\\n\\n\\n### Implementation\\n\\nI think the shape this would take would be a small branch atop the last pre-launch beta version, v0.0.33, adding a dialog box using code similar to that in #1590.\\n\\n\\n### Spec\\n\\nTwo questions we'll need to pin down before shipping this:\\n* What should the text of the dialog box be?\\n* When should the dialog appear? Options include just once; or on every startup of the app; or some more-complicated description in between.\\n\\n\"}]", "lang": "dart", "problem_statement": "Update to old beta channel saying app has moved\nNow that the app [has launched](https://blog.zulip.com/2025/06/17/flutter-mobile-app-launched/), we're publishing future releases to the main Zulip app's listings in the Play Store and App Store, and no longer to the listings (in the Play Store and TestFlight) that were for the Flutter app as a beta.\n\nPeople who were using the Flutter beta will therefore want to install the main Zulip app and switch to that, in order to keep getting new features and bugfixes. For those who don't see the announcement through other channels, it would be good to post it in the app itself.\n\n\n### Implementation\n\nI think the shape this would take would be a small branch atop the last pre-launch beta version, v0.0.33, adding a dialog box using code similar to that in #1590.\n\n\n### Spec\n\nTwo questions we'll need to pin down before shipping this:\n* What should the text of the dialog box be?\n* When should the dialog appear? Options include just once; or on every startup of the app; or some more-complicated description in between.\n\n\n", "hints": "> * When should the dialog appear? Options include just once; or on every startup of the app; or some more-complicated description in between.\n\nI vote \"on every startup of the app\". It's easiest to implement, and I think the goal is to be assertive but stop short of a rug-pull where we just disable all the app's features.\nYep, that plan sounds good to me.", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1797", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1603\"]", "test_command": "flutter test test/notifications/open_test.dart test/widgets/app_test.dart test/widgets/home_test.dart test/widgets/login_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml\nindex 6ae781c17d..3adbb17987 100644\n--- a/.github/workflows/ci.yml\n+++ b/.github/workflows/ci.yml\n@@ -22,8 +22,14 @@ jobs:\n # so that Flutter knows its version and sees the constraint in our\n # pubspec is satisfied. It's uncommon for flutter/flutter to go\n # more than 100 commits between tags. Fetch 1000 for good measure.\n+ # TODO(upstream): Around 2025-05, Flutter upstream stopped making\n+ # tags within the main/master branch. Get that fixed:\n+ # https://github.com/zulip/zulip-flutter/issues/1710\n+ # Pending that, fetch more than 1000 commits.\n run: |\n- git clone --depth=1000 -b main https://github.com/flutter/flutter ~/flutter\n+ git clone --depth=3000 -b main https://github.com/flutter/flutter ~/flutter\n+ cd ~/flutter\n+ git --git-dir ~/flutter/.git checkout ee089d09b21ec3ccc20d179c5be100d2a9d9f866\n TZ=UTC git --git-dir ~/flutter/.git log -1 --format='%h | %ci | %s' --date=iso8601-local\n echo ~/flutter/bin >> \"$GITHUB_PATH\"\n \ndiff --git a/.github/workflows/update-translations.yml b/.github/workflows/update-translations.yml\nindex fb676042ff..7703fd6ec1 100644\n--- a/.github/workflows/update-translations.yml\n+++ b/.github/workflows/update-translations.yml\n@@ -29,8 +29,9 @@ jobs:\n # so that Flutter knows its version and sees the constraint in our\n # pubspec is satisfied. It's uncommon for flutter/flutter to go\n # more than 100 commits between tags. Fetch 1000 for good measure.\n+ # TODO(upstream): See ci.yml for why we fetch more than 1000.\n run: |\n- git clone --depth=1000 -b main https://github.com/flutter/flutter ~/flutter\n+ git clone --depth=3000 -b main https://github.com/flutter/flutter ~/flutter\n TZ=UTC git --git-dir ~/flutter/.git log -1 --format='%h | %ci | %s' --date=iso8601-local\n echo ~/flutter/bin >> \"$GITHUB_PATH\"\n \ndiff --git a/lib/widgets/app.dart b/lib/widgets/app.dart\nindex b1aa763ac8..d3e729f87b 100644\n--- a/lib/widgets/app.dart\n+++ b/lib/widgets/app.dart\n@@ -160,6 +160,10 @@ class _ZulipAppState extends State with WidgetsBindingObserver {\n void initState() {\n super.initState();\n WidgetsBinding.instance.addObserver(this);\n+\n+ // On every startup is fine; the goal is to be assertive but stop short of a\n+ // rug-pull where we just disable all the app's features.\n+ BetaCompleteDialog.show();\n }\n \n @override\ndiff --git a/lib/widgets/dialog.dart b/lib/widgets/dialog.dart\nindex 4d269cddba..4d6d3e8675 100644\n--- a/lib/widgets/dialog.dart\n+++ b/lib/widgets/dialog.dart\n@@ -1,7 +1,11 @@\n+import 'dart:async';\n+\n+import 'package:flutter/foundation.dart';\n import 'package:flutter/material.dart';\n \n import '../generated/l10n/zulip_localizations.dart';\n import 'actions.dart';\n+import 'app.dart';\n \n Widget _dialogActionText(String text) {\n return Text(\n@@ -112,3 +116,87 @@ DialogStatus showSuggestedActionDialog({\n ]));\n return DialogStatus(future);\n }\n+\n+bool debugDisableBetaCompleteDialog = false;\n+\n+/// A brief dialog box saying that this beta channel has ended,\n+/// offering a way to get the app from prod.\n+///\n+/// Shown on every startup.\n+class BetaCompleteDialog extends StatelessWidget {\n+ const BetaCompleteDialog._();\n+\n+ static void show() async {\n+ if (debugDisableBetaCompleteDialog) return;\n+\n+ final navigator = await ZulipApp.navigator;\n+ final context = navigator.context;\n+ assert(context.mounted);\n+ if (!context.mounted) return; // TODO(linter): this is impossible as there's no actual async gap, but the use_build_context_synchronously lint doesn't see that\n+\n+ switch (defaultTargetPlatform) {\n+ case TargetPlatform.android:\n+ case TargetPlatform.iOS:\n+ break;\n+ case TargetPlatform.macOS:\n+ case TargetPlatform.fuchsia:\n+ case TargetPlatform.linux:\n+ case TargetPlatform.windows:\n+ // Do nothing on these unsupported platforms.\n+ return;\n+ }\n+\n+ unawaited(showDialog(\n+ context: context,\n+ builder: (BuildContext context) => BetaCompleteDialog._()));\n+ }\n+\n+ Widget _linkButton(BuildContext context, {\n+ required String url,\n+ required String label,\n+ }) {\n+ return TextButton(\n+ onPressed: () {\n+ Navigator.pop(context);\n+ PlatformActions.launchUrl(context,\n+ Uri.parse(url));\n+ },\n+ child: _dialogActionText(label));\n+ }\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ final message = 'Thanks for being a beta tester of the new Zulip app!'\n+ ' This app became the main Zulip mobile app in June 2025,'\n+ ' and this beta version is no longer maintained.'\n+ ' We recommend uninstalling this beta after switching'\n+ ' to the main Zulip app, in order to get the latest features'\n+ ' and bug fixes.';\n+\n+ return AlertDialog(\n+ title: Text('Time to switch to the new app'),\n+ content: SingleChildScrollView(child: Text(message)),\n+ actions: [\n+ TextButton(\n+ onPressed: () => Navigator.pop(context),\n+ child: _dialogActionText('Got it')),\n+ ...(switch (defaultTargetPlatform) {\n+ TargetPlatform.android => [\n+ _linkButton(context,\n+ url: 'https://github.com/zulip/zulip-flutter/releases/latest',\n+ label: 'Download official APKs (less common)'),\n+ _linkButton(context,\n+ url: 'https://play.google.com/store/apps/details?id=com.zulipmobile',\n+ label: 'Open Google Play Store'),\n+ ],\n+ TargetPlatform.iOS => [\n+ _linkButton(context,\n+ url: 'https://apps.apple.com/app/zulip/id1203036395',\n+ label: 'Open App Store'),\n+ ],\n+ TargetPlatform.macOS || TargetPlatform.fuchsia\n+ || TargetPlatform.linux || TargetPlatform.windows => throw UnimplementedError(),\n+ }),\n+ ]);\n+ }\n+}\n", "test_patch": "diff --git a/test/notifications/open_test.dart b/test/notifications/open_test.dart\nindex a2c14ca20a..2e2eddc0b2 100644\n--- a/test/notifications/open_test.dart\n+++ b/test/notifications/open_test.dart\n@@ -13,6 +13,7 @@ import 'package:zulip/model/narrow.dart';\n import 'package:zulip/notifications/open.dart';\n import 'package:zulip/notifications/receive.dart';\n import 'package:zulip/widgets/app.dart';\n+import 'package:zulip/widgets/dialog.dart';\n import 'package:zulip/widgets/home.dart';\n import 'package:zulip/widgets/message_list.dart';\n import 'package:zulip/widgets/page.dart';\n@@ -76,6 +77,8 @@ void main() {\n final zulipLocalizations = GlobalLocalizations.zulipLocalizations;\n \n Future init({bool addSelfAccount = true}) async {\n+ debugDisableBetaCompleteDialog = true;\n+ addTearDown(() => debugDisableBetaCompleteDialog = false);\n if (addSelfAccount) {\n await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());\n }\ndiff --git a/test/widgets/app_test.dart b/test/widgets/app_test.dart\nindex 7b1388dbec..ccbed9cd5a 100644\n--- a/test/widgets/app_test.dart\n+++ b/test/widgets/app_test.dart\n@@ -7,6 +7,7 @@ import 'package:zulip/log.dart';\n import 'package:zulip/model/actions.dart';\n import 'package:zulip/model/database.dart';\n import 'package:zulip/widgets/app.dart';\n+import 'package:zulip/widgets/dialog.dart';\n import 'package:zulip/widgets/home.dart';\n import 'package:zulip/widgets/page.dart';\n \n@@ -27,6 +28,8 @@ void main() {\n late List> pushedRoutes = [];\n \n Future prepare(WidgetTester tester) async {\n+ debugDisableBetaCompleteDialog = true;\n+ addTearDown(() => debugDisableBetaCompleteDialog = false);\n addTearDown(testBinding.reset);\n \n pushedRoutes = [];\n@@ -64,6 +67,8 @@ void main() {\n late List> poppedRoutes;\n \n Future prepare(WidgetTester tester) async {\n+ debugDisableBetaCompleteDialog = true;\n+ addTearDown(() => debugDisableBetaCompleteDialog = false);\n addTearDown(testBinding.reset);\n \n pushedRoutes = [];\n@@ -279,6 +284,8 @@ void main() {\n });\n \n testWidgets('choosing an account clears the navigator stack', (tester) async {\n+ debugDisableBetaCompleteDialog = true;\n+ addTearDown(() => debugDisableBetaCompleteDialog = false);\n addTearDown(testBinding.reset);\n await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());\n await testBinding.globalStore.add(eg.otherAccount, eg.initialSnapshot());\n@@ -391,6 +398,8 @@ void main() {\n });\n \n testWidgets('reportErrorToUserBriefly with details', (tester) async {\n+ debugDisableBetaCompleteDialog = true;\n+ addTearDown(() => debugDisableBetaCompleteDialog = false);\n addTearDown(testBinding.reset);\n await tester.pumpWidget(const ZulipApp());\n const message = 'test error message';\n@@ -418,6 +427,8 @@ void main() {\n });\n \n Future prepareSnackBarWithDetails(WidgetTester tester, String message, String details) async {\n+ debugDisableBetaCompleteDialog = true;\n+ addTearDown(() => debugDisableBetaCompleteDialog = false);\n addTearDown(testBinding.reset);\n await tester.pumpWidget(const ZulipApp());\n await tester.pump();\n@@ -484,6 +495,8 @@ void main() {\n });\n \n testWidgets('reportErrorToUserModally', (tester) async {\n+ debugDisableBetaCompleteDialog = true;\n+ addTearDown(() => debugDisableBetaCompleteDialog = false);\n addTearDown(testBinding.reset);\n await tester.pumpWidget(const ZulipApp());\n const title = 'test title';\ndiff --git a/test/widgets/home_test.dart b/test/widgets/home_test.dart\nindex 1b5c8ad8b5..86a33cb699 100644\n--- a/test/widgets/home_test.dart\n+++ b/test/widgets/home_test.dart\n@@ -8,6 +8,7 @@ import 'package:zulip/model/store.dart';\n import 'package:zulip/widgets/about_zulip.dart';\n import 'package:zulip/widgets/app.dart';\n import 'package:zulip/widgets/app_bar.dart';\n+import 'package:zulip/widgets/dialog.dart';\n import 'package:zulip/widgets/home.dart';\n import 'package:zulip/widgets/icons.dart';\n import 'package:zulip/widgets/inbox.dart';\n@@ -48,6 +49,8 @@ void main () {\n ..onPopped = ((route, prevRoute) => lastPoppedRoute = route);\n \n Future prepare(WidgetTester tester) async {\n+ debugDisableBetaCompleteDialog = true;\n+ addTearDown(() => debugDisableBetaCompleteDialog = false);\n addTearDown(testBinding.reset);\n topRoute = null;\n previousTopRoute = null;\n@@ -272,6 +275,8 @@ void main () {\n });\n \n testWidgets('menu buttons dismiss the menu', (tester) async {\n+ debugDisableBetaCompleteDialog = true;\n+ addTearDown(() => debugDisableBetaCompleteDialog = false);\n addTearDown(testBinding.reset);\n topRoute = null;\n previousTopRoute = null;\n@@ -328,6 +333,8 @@ void main () {\n }\n \n Future prepare(WidgetTester tester) async {\n+ debugDisableBetaCompleteDialog = true;\n+ addTearDown(() => debugDisableBetaCompleteDialog = false);\n addTearDown(testBinding.reset);\n topRoute = null;\n previousTopRoute = null;\n@@ -521,6 +528,8 @@ void main () {\n });\n \n testWidgets('logging out while still loading', (tester) async {\n+ debugDisableBetaCompleteDialog = true;\n+ addTearDown(() => debugDisableBetaCompleteDialog = false);\n // Regression test for: https://github.com/zulip/zulip-flutter/issues/1219\n addTearDown(testBinding.reset);\n await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());\n@@ -537,6 +546,8 @@ void main () {\n });\n \n testWidgets('logging out after fully loaded', (tester) async {\n+ debugDisableBetaCompleteDialog = true;\n+ addTearDown(() => debugDisableBetaCompleteDialog = false);\n // Regression test for: https://github.com/zulip/zulip-flutter/issues/1219\n addTearDown(testBinding.reset);\n await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());\ndiff --git a/test/widgets/login_test.dart b/test/widgets/login_test.dart\nindex a5109ba5db..9cb646f11b 100644\n--- a/test/widgets/login_test.dart\n+++ b/test/widgets/login_test.dart\n@@ -12,6 +12,7 @@ import 'package:zulip/model/binding.dart';\n import 'package:zulip/model/database.dart';\n import 'package:zulip/model/localizations.dart';\n import 'package:zulip/widgets/app.dart';\n+import 'package:zulip/widgets/dialog.dart';\n import 'package:zulip/widgets/home.dart';\n import 'package:zulip/widgets/login.dart';\n import 'package:zulip/widgets/page.dart';\n@@ -83,6 +84,8 @@ void main() {\n \n Future prepare(WidgetTester tester,\n GetServerSettingsResult serverSettings) async {\n+ debugDisableBetaCompleteDialog = true;\n+ addTearDown(() => debugDisableBetaCompleteDialog = false);\n addTearDown(testBinding.reset);\n \n connection = testBinding.globalStore.apiConnection(\n", "n2p_tests": "{\"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenService stream message (variant: TargetPlatform.android)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: logging out after fully loaded\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: menu navigation bar menu buttons dismiss the menu\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: _LoadingPlaceholderPage after finishing loading, choose the loaded account\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: _LoadingPlaceholderPage while loading, choose a different account\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_test.dart: ZulipApp initial navigation when no accounts, go to choose account\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: bottom nav navigation preserve states when switching between views\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: logging out while still loading\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: _LoadingPlaceholderPage after finishing loading, go back from ChooseAccountPage\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_test.dart: error reporting reportErrorToUserBriefly dismissing SnackBar\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: _LoadingPlaceholderPage while loading, choosing an account disallows going back\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_test.dart: ChooseAccountPage log out user confirms logging out\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/login_test.dart: LoginPage username/password login logging into a second account\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: _LoadingPlaceholderPage smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: _LoadingPlaceholderPage while loading, go to nested levels of ChooseAccountPage\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/login_test.dart: LoginPage username/password login account already exists\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: menu _MyProfileButton\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: _LoadingPlaceholderPage \\\"Try another account\\\" button appears after timeout\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: menu cancel button dismisses the menu\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/login_test.dart: LoginPage web auth basic happy case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/login_test.dart: LoginPage username/password login basic happy case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: _LoadingPlaceholderPage while loading, go back from ChooseAccountPage\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1794", "org": "zulip", "repo": "zulip-flutter", "number": 1794, "state": "closed", "title": "action_sheet: Add 'Channel feed' button to channel action sheet", "body": "Fixes #1705.\r\n\r\n## Screenshots\r\n\r\n### From channel feed (no button)\r\n\r\n\"image\"\r\n\r\n### Not from channel feed (button)\r\n\r\n\"image\"\r\n\r\n\"image\"\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"edeb05df0614c4fc7d8868b2c9f4ee819dae2419\"}", "resolved_issues": "[{\"number\": 1705, \"title\": \"Add channel feed button to bottom sheet\", \"body\": \"To improve navigation, we should add a \\\"Channel feed\\\" link to the bottom sheet for channels.\\n\\nCZO: [#mobile > channel feed link in bottom sheet?](https://chat.zulip.org/#narrow/channel/48-mobile/topic/channel.20feed.20link.20in.20bottom.20sheet.3F/with/2219497)\"}]", "lang": "dart", "problem_statement": "Add channel feed button to bottom sheet\nTo improve navigation, we should add a \"Channel feed\" link to the bottom sheet for channels.\n\nCZO: [#mobile > channel feed link in bottom sheet?](https://chat.zulip.org/#narrow/channel/48-mobile/topic/channel.20feed.20link.20in.20bottom.20sheet.3F/with/2219497)\n", "hints": "It should probably be omitted if you're already on the channel's channel feed.\nOn web, we also omit it when just clicking on the channel name would take you to the channel feed. Might be fine to include the link on mobile, though, at least while the menu is short like it currently is.", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1794", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1705\"]", "test_command": "flutter test test/widgets/action_sheet_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/assets/l10n/app_en.arb b/assets/l10n/app_en.arb\nindex 56d906e233..776a866d3b 100644\n--- a/assets/l10n/app_en.arb\n+++ b/assets/l10n/app_en.arb\n@@ -116,6 +116,10 @@\n \"@actionSheetOptionListOfTopics\": {\n \"description\": \"Label for navigating to a channel's topic-list page.\"\n },\n+ \"actionSheetOptionChannelFeed\": \"Channel feed\",\n+ \"@actionSheetOptionChannelFeed\": {\n+ \"description\": \"Label for navigating to a channel's channel-feed page.\"\n+ },\n \"actionSheetOptionUnsubscribe\": \"Unsubscribe\",\n \"@actionSheetOptionUnsubscribe\": {\n \"description\": \"Label in the channel action sheet for unsubscribing from the channel.\"\ndiff --git a/lib/generated/l10n/zulip_localizations.dart b/lib/generated/l10n/zulip_localizations.dart\nindex 6ec90bba8c..238d336f39 100644\n--- a/lib/generated/l10n/zulip_localizations.dart\n+++ b/lib/generated/l10n/zulip_localizations.dart\n@@ -305,6 +305,12 @@ abstract class ZulipLocalizations {\n /// **'List of topics'**\n String get actionSheetOptionListOfTopics;\n \n+ /// Label for navigating to a channel's channel-feed page.\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Channel feed'**\n+ String get actionSheetOptionChannelFeed;\n+\n /// Label in the channel action sheet for unsubscribing from the channel.\n ///\n /// In en, this message translates to:\ndiff --git a/lib/generated/l10n/zulip_localizations_ar.dart b/lib/generated/l10n/zulip_localizations_ar.dart\nindex 1037cd6cdd..0ff35c4b5b 100644\n--- a/lib/generated/l10n/zulip_localizations_ar.dart\n+++ b/lib/generated/l10n/zulip_localizations_ar.dart\n@@ -102,6 +102,9 @@ class ZulipLocalizationsAr extends ZulipLocalizations {\n @override\n String get actionSheetOptionListOfTopics => 'List of topics';\n \n+ @override\n+ String get actionSheetOptionChannelFeed => 'Channel feed';\n+\n @override\n String get actionSheetOptionUnsubscribe => 'Unsubscribe';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_de.dart b/lib/generated/l10n/zulip_localizations_de.dart\nindex 3a4c7da9a5..fb47405921 100644\n--- a/lib/generated/l10n/zulip_localizations_de.dart\n+++ b/lib/generated/l10n/zulip_localizations_de.dart\n@@ -104,6 +104,9 @@ class ZulipLocalizationsDe extends ZulipLocalizations {\n @override\n String get actionSheetOptionListOfTopics => 'Themenliste';\n \n+ @override\n+ String get actionSheetOptionChannelFeed => 'Channel feed';\n+\n @override\n String get actionSheetOptionUnsubscribe => 'Deabonnieren';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_en.dart b/lib/generated/l10n/zulip_localizations_en.dart\nindex e3d201ba4f..2e94965a87 100644\n--- a/lib/generated/l10n/zulip_localizations_en.dart\n+++ b/lib/generated/l10n/zulip_localizations_en.dart\n@@ -102,6 +102,9 @@ class ZulipLocalizationsEn extends ZulipLocalizations {\n @override\n String get actionSheetOptionListOfTopics => 'List of topics';\n \n+ @override\n+ String get actionSheetOptionChannelFeed => 'Channel feed';\n+\n @override\n String get actionSheetOptionUnsubscribe => 'Unsubscribe';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_fr.dart b/lib/generated/l10n/zulip_localizations_fr.dart\nindex e0244f4b43..3766c7051e 100644\n--- a/lib/generated/l10n/zulip_localizations_fr.dart\n+++ b/lib/generated/l10n/zulip_localizations_fr.dart\n@@ -104,6 +104,9 @@ class ZulipLocalizationsFr extends ZulipLocalizations {\n @override\n String get actionSheetOptionListOfTopics => 'Liste des sujets';\n \n+ @override\n+ String get actionSheetOptionChannelFeed => 'Channel feed';\n+\n @override\n String get actionSheetOptionUnsubscribe => 'Unsubscribe';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_it.dart b/lib/generated/l10n/zulip_localizations_it.dart\nindex 0f1b6b350e..028f8680fb 100644\n--- a/lib/generated/l10n/zulip_localizations_it.dart\n+++ b/lib/generated/l10n/zulip_localizations_it.dart\n@@ -103,6 +103,9 @@ class ZulipLocalizationsIt extends ZulipLocalizations {\n @override\n String get actionSheetOptionListOfTopics => 'Elenco degli argomenti';\n \n+ @override\n+ String get actionSheetOptionChannelFeed => 'Channel feed';\n+\n @override\n String get actionSheetOptionUnsubscribe => 'Unsubscribe';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_ja.dart b/lib/generated/l10n/zulip_localizations_ja.dart\nindex 2bd2d6c68f..647b1f155d 100644\n--- a/lib/generated/l10n/zulip_localizations_ja.dart\n+++ b/lib/generated/l10n/zulip_localizations_ja.dart\n@@ -101,6 +101,9 @@ class ZulipLocalizationsJa extends ZulipLocalizations {\n @override\n String get actionSheetOptionListOfTopics => '\u30c8\u30d4\u30c3\u30af\u4e00\u89a7';\n \n+ @override\n+ String get actionSheetOptionChannelFeed => 'Channel feed';\n+\n @override\n String get actionSheetOptionUnsubscribe => 'Unsubscribe';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_nb.dart b/lib/generated/l10n/zulip_localizations_nb.dart\nindex 4e7b862eeb..36411b5274 100644\n--- a/lib/generated/l10n/zulip_localizations_nb.dart\n+++ b/lib/generated/l10n/zulip_localizations_nb.dart\n@@ -102,6 +102,9 @@ class ZulipLocalizationsNb extends ZulipLocalizations {\n @override\n String get actionSheetOptionListOfTopics => 'List of topics';\n \n+ @override\n+ String get actionSheetOptionChannelFeed => 'Channel feed';\n+\n @override\n String get actionSheetOptionUnsubscribe => 'Unsubscribe';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_pl.dart b/lib/generated/l10n/zulip_localizations_pl.dart\nindex db93e8f9ba..e4fdc40e60 100644\n--- a/lib/generated/l10n/zulip_localizations_pl.dart\n+++ b/lib/generated/l10n/zulip_localizations_pl.dart\n@@ -104,6 +104,9 @@ class ZulipLocalizationsPl extends ZulipLocalizations {\n @override\n String get actionSheetOptionListOfTopics => 'Lista w\u0105tk\u00f3w';\n \n+ @override\n+ String get actionSheetOptionChannelFeed => 'Channel feed';\n+\n @override\n String get actionSheetOptionUnsubscribe => 'Unsubscribe';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_ru.dart b/lib/generated/l10n/zulip_localizations_ru.dart\nindex 30bb44aa98..3b0d3e8cd8 100644\n--- a/lib/generated/l10n/zulip_localizations_ru.dart\n+++ b/lib/generated/l10n/zulip_localizations_ru.dart\n@@ -104,6 +104,9 @@ class ZulipLocalizationsRu extends ZulipLocalizations {\n @override\n String get actionSheetOptionListOfTopics => '\u0421\u043f\u0438\u0441\u043e\u043a \u0442\u0435\u043c';\n \n+ @override\n+ String get actionSheetOptionChannelFeed => 'Channel feed';\n+\n @override\n String get actionSheetOptionUnsubscribe => '\u041e\u0442\u043f\u0438\u0441\u0430\u0442\u044c\u0441\u044f';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_sk.dart b/lib/generated/l10n/zulip_localizations_sk.dart\nindex 3da8dbfa25..26be66502e 100644\n--- a/lib/generated/l10n/zulip_localizations_sk.dart\n+++ b/lib/generated/l10n/zulip_localizations_sk.dart\n@@ -102,6 +102,9 @@ class ZulipLocalizationsSk extends ZulipLocalizations {\n @override\n String get actionSheetOptionListOfTopics => 'List of topics';\n \n+ @override\n+ String get actionSheetOptionChannelFeed => 'Channel feed';\n+\n @override\n String get actionSheetOptionUnsubscribe => 'Unsubscribe';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_sl.dart b/lib/generated/l10n/zulip_localizations_sl.dart\nindex 86a7c52b06..782288eb49 100644\n--- a/lib/generated/l10n/zulip_localizations_sl.dart\n+++ b/lib/generated/l10n/zulip_localizations_sl.dart\n@@ -102,6 +102,9 @@ class ZulipLocalizationsSl extends ZulipLocalizations {\n @override\n String get actionSheetOptionListOfTopics => 'Seznam tem';\n \n+ @override\n+ String get actionSheetOptionChannelFeed => 'Channel feed';\n+\n @override\n String get actionSheetOptionUnsubscribe => 'Unsubscribe';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_uk.dart b/lib/generated/l10n/zulip_localizations_uk.dart\nindex 1c9bbe8f93..d263a8a9c0 100644\n--- a/lib/generated/l10n/zulip_localizations_uk.dart\n+++ b/lib/generated/l10n/zulip_localizations_uk.dart\n@@ -105,6 +105,9 @@ class ZulipLocalizationsUk extends ZulipLocalizations {\n @override\n String get actionSheetOptionListOfTopics => '\u0421\u043f\u0438\u0441\u043e\u043a \u0442\u0435\u043c';\n \n+ @override\n+ String get actionSheetOptionChannelFeed => 'Channel feed';\n+\n @override\n String get actionSheetOptionUnsubscribe => '\u0421\u043a\u0430\u0441\u0443\u0432\u0430\u0442\u0438 \u043f\u0456\u0434\u043f\u0438\u0441\u043a\u0443';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_zh.dart b/lib/generated/l10n/zulip_localizations_zh.dart\nindex 3133bc58f4..59fbc4b5d5 100644\n--- a/lib/generated/l10n/zulip_localizations_zh.dart\n+++ b/lib/generated/l10n/zulip_localizations_zh.dart\n@@ -102,6 +102,9 @@ class ZulipLocalizationsZh extends ZulipLocalizations {\n @override\n String get actionSheetOptionListOfTopics => 'List of topics';\n \n+ @override\n+ String get actionSheetOptionChannelFeed => 'Channel feed';\n+\n @override\n String get actionSheetOptionUnsubscribe => 'Unsubscribe';\n \ndiff --git a/lib/widgets/action_sheet.dart b/lib/widgets/action_sheet.dart\nindex cc56dedf08..56729e8bfc 100644\n--- a/lib/widgets/action_sheet.dart\n+++ b/lib/widgets/action_sheet.dart\n@@ -334,12 +334,19 @@ enum BottomSheetDismissButtonStyle {\n /// Show a sheet of actions you can take on a channel.\n ///\n /// Needs a [PageRoot] ancestor.\n+/// May or may not have a [MessageListPage] ancestor;\n+/// some callers are on that page and some aren't.\n void showChannelActionSheet(BuildContext context, {\n required int channelId,\n bool showTopicListButton = true,\n }) {\n final pageContext = PageRoot.contextOf(context);\n final store = PerAccountStoreWidget.of(pageContext);\n+ final messageListPageState = MessageListPage.maybeAncestorOf(pageContext);\n+\n+ final messageListPageNarrow = messageListPageState?.narrow;\n+ final isOnChannelFeed = messageListPageNarrow is ChannelNarrow\n+ && messageListPageNarrow.streamId == channelId;\n \n final unreadCount = store.unreads.countInChannelNarrow(channelId);\n final isSubscribed = store.subscriptions[channelId] != null;\n@@ -352,6 +359,8 @@ void showChannelActionSheet(BuildContext context, {\n MarkChannelAsReadButton(pageContext: pageContext, channelId: channelId),\n if (showTopicListButton)\n TopicListButton(pageContext: pageContext, channelId: channelId),\n+ if (!isOnChannelFeed)\n+ ChannelFeedButton(pageContext: pageContext, channelId: channelId),\n CopyChannelLinkButton(channelId: channelId, pageContext: pageContext)\n ],\n if (isSubscribed)\n@@ -452,6 +461,30 @@ class TopicListButton extends ActionSheetMenuItemButton {\n }\n }\n \n+class ChannelFeedButton extends ActionSheetMenuItemButton {\n+ const ChannelFeedButton({\n+ super.key,\n+ required this.channelId,\n+ required super.pageContext,\n+ });\n+\n+ final int channelId;\n+\n+ @override\n+ IconData get icon => ZulipIcons.message_feed;\n+\n+ @override\n+ String label(ZulipLocalizations zulipLocalizations) {\n+ return zulipLocalizations.actionSheetOptionChannelFeed;\n+ }\n+\n+ @override\n+ void onPressed() {\n+ Navigator.push(pageContext,\n+ MessageListPage.buildRoute(context: pageContext, narrow: ChannelNarrow(channelId)));\n+ }\n+}\n+\n class CopyChannelLinkButton extends ActionSheetMenuItemButton {\n const CopyChannelLinkButton({\n super.key,\ndiff --git a/lib/widgets/message_list.dart b/lib/widgets/message_list.dart\nindex dab793392b..6316655705 100644\n--- a/lib/widgets/message_list.dart\n+++ b/lib/widgets/message_list.dart\n@@ -206,14 +206,30 @@ class MessageListPage extends StatefulWidget {\n ///\n /// Uses the inefficient [BuildContext.findAncestorStateOfType];\n /// don't call this in a build method.\n- // If we do find ourselves wanting this in a build method, it won't be hard\n- // to enable that: we'd just need to add an [InheritedWidget] here.\n+ ///\n+ /// See also:\n+ /// * [maybeAncestorOf], which returns null instead of throwing\n+ /// when an ancestor [MessageListPageState] is not found.\n static MessageListPageState ancestorOf(BuildContext context) {\n- final state = context.findAncestorStateOfType<_MessageListPageState>();\n+ final state = maybeAncestorOf(context);\n assert(state != null, 'No MessageListPage ancestor');\n return state!;\n }\n \n+ /// The [MessageListPageState] above this context in the tree, if any.\n+ ///\n+ /// Uses the inefficient [BuildContext.findAncestorStateOfType];\n+ /// don't call this in a build method.\n+ ///\n+ /// See also:\n+ /// * [ancestorOf], which throws instead of returning null\n+ /// when an ancestor [MessageListPageState] is not found.\n+ // If we do find ourselves wanting this in a build method, it won't be hard\n+ // to enable that: we'd just need to add an [InheritedWidget] here.\n+ static MessageListPageState? maybeAncestorOf(BuildContext context) {\n+ return context.findAncestorStateOfType<_MessageListPageState>();\n+ }\n+\n final Narrow initNarrow;\n final int? initAnchorMessageId; // TODO(#1564) highlight target upon load\n \ndiff --git a/lib/widgets/topic_list.dart b/lib/widgets/topic_list.dart\nindex 61e16df6ec..16111fc678 100644\n--- a/lib/widgets/topic_list.dart\n+++ b/lib/widgets/topic_list.dart\n@@ -103,7 +103,10 @@ class _TopicListAppBarTitle extends StatelessWidget {\n child: GestureDetector(\n behavior: HitTestBehavior.translucent,\n onLongPress: () {\n- showChannelActionSheet(context, channelId: streamId);\n+ showChannelActionSheet(context,\n+ channelId: streamId,\n+ // We're already on the topic list.\n+ showTopicListButton: false);\n },\n child: Align(alignment: alignment,\n child: _buildStreamRow(context))));\n", "test_patch": "diff --git a/test/widgets/action_sheet_test.dart b/test/widgets/action_sheet_test.dart\nindex 83574786a7..8f4d614220 100644\n--- a/test/widgets/action_sheet_test.dart\n+++ b/test/widgets/action_sheet_test.dart\n@@ -34,6 +34,7 @@ import 'package:zulip/widgets/message_list.dart';\n import 'package:share_plus_platform_interface/method_channel/method_channel_share.dart';\n import 'package:zulip/widgets/read_receipts.dart';\n import 'package:zulip/widgets/subscription_list.dart';\n+import 'package:zulip/widgets/topic_list.dart';\n import 'package:zulip/widgets/user.dart';\n import '../api/fake_api.dart';\n \n@@ -180,7 +181,9 @@ void main() {\n }\n \n Future showFromInbox(WidgetTester tester) async {\n+ transitionDurationObserver = TransitionDurationObserver();\n await tester.pumpWidget(TestZulipApp(accountId: eg.selfAccount.id,\n+ navigatorObservers: [transitionDurationObserver],\n child: const HomePage()));\n await tester.pump();\n check(find.byType(InboxPageBody)).findsOne();\n@@ -201,16 +204,19 @@ void main() {\n await tester.pump(const Duration(milliseconds: 250));\n }\n \n- Future showFromAppBar(WidgetTester tester, {\n+ Future showFromMsglistAppBar(WidgetTester tester, {\n ZulipStream? channel,\n- List? messages,\n required Narrow narrow,\n }) async {\n channel ??= someChannel;\n- messages ??= [someMessage];\n \n connection.prepare(json: eg.newestGetMessagesResult(\n- foundOldest: true, messages: messages).toJson());\n+ foundOldest: true, messages: []).toJson());\n+ if (narrow case ChannelNarrow()) {\n+ // We auto-focus the topic input when there are no messages;\n+ // this is for topic autocomplete.\n+ connection.prepare(json: GetStreamTopicsResult(topics: []).toJson());\n+ }\n await tester.pumpWidget(TestZulipApp(\n accountId: eg.selfAccount.id,\n child: MessageListPage(\n@@ -240,6 +246,22 @@ void main() {\n await tester.pump(const Duration(milliseconds: 250));\n }\n \n+ Future showFromTopicListAppBar(WidgetTester tester) async {\n+ final transitionDurationObserver = TransitionDurationObserver();\n+\n+ connection.prepare(json: GetStreamTopicsResult(topics: []).toJson());\n+ await tester.pumpWidget(TestZulipApp(\n+ navigatorObservers: [transitionDurationObserver],\n+ accountId: eg.selfAccount.id,\n+ child: TopicListPage(streamId: someChannel.streamId)));\n+ await tester.pump();\n+\n+ await tester.longPress(find.descendant(\n+ of: find.byType(ZulipAppBar),\n+ matching: find.text(someChannel.name)));\n+ await transitionDurationObserver.pumpPastTransition(tester);\n+ }\n+\n final actionSheetFinder = find.byType(BottomSheet);\n Finder findButtonForLabel(String label) =>\n find.descendant(of: actionSheetFinder, matching: find.text(label));\n@@ -256,7 +278,6 @@ void main() {\n void checkButtons() {\n check(actionSheetFinder).findsOne();\n checkButton('Mark channel as read');\n- checkButton('List of topics');\n checkButton('Copy link to channel');\n }\n \n@@ -278,17 +299,17 @@ void main() {\n check(findButtonForLabel('Mark channel as read')).findsNothing();\n });\n \n- testWidgets('show from app bar in channel narrow', (tester) async {\n+ testWidgets('show from message-list app bar in channel narrow', (tester) async {\n await prepare();\n final narrow = ChannelNarrow(someChannel.streamId);\n- await showFromAppBar(tester, narrow: narrow);\n+ await showFromMsglistAppBar(tester, narrow: narrow);\n checkButtons();\n });\n \n- testWidgets('show from app bar in topic narrow', (tester) async {\n+ testWidgets('show from message-list app bar in topic narrow', (tester) async {\n await prepare();\n final narrow = eg.topicNarrow(someChannel.streamId, someTopic);\n- await showFromAppBar(tester, narrow: narrow);\n+ await showFromMsglistAppBar(tester, narrow: narrow);\n checkButtons();\n });\n \n@@ -297,6 +318,12 @@ void main() {\n await showFromRecipientHeader(tester, message: someMessage);\n checkButtons();\n });\n+\n+ testWidgets('show from topic-list app bar', (tester) async {\n+ await prepare();\n+ await showFromTopicListAppBar(tester);\n+ checkButtons();\n+ });\n });\n \n group('SubscribeButton', () {\n@@ -309,7 +336,7 @@ void main() {\n await prepare();\n final narrow = ChannelNarrow(someChannel.streamId);\n await store.removeSubscription(narrow.streamId);\n- await showFromAppBar(tester, narrow: narrow);\n+ await showFromMsglistAppBar(tester, narrow: narrow);\n checkButton('Subscribe');\n });\n \n@@ -317,7 +344,7 @@ void main() {\n await prepare();\n final narrow = ChannelNarrow(someChannel.streamId);\n check(store.subscriptions[narrow.streamId]).isNotNull();\n- await showFromAppBar(tester, narrow: narrow);\n+ await showFromMsglistAppBar(tester, narrow: narrow);\n checkNoButton('Subscribe');\n });\n \n@@ -325,7 +352,7 @@ void main() {\n await prepare();\n final narrow = ChannelNarrow(someChannel.streamId);\n await store.removeSubscription(narrow.streamId);\n- await showFromAppBar(tester, narrow: narrow);\n+ await showFromMsglistAppBar(tester, narrow: narrow);\n \n connection.prepare(json: {});\n await tapButton(tester);\n@@ -386,17 +413,80 @@ void main() {\n });\n });\n \n- testWidgets('TopicListButton', (tester) async {\n- await prepare();\n- await showFromAppBar(tester,\n- narrow: ChannelNarrow(someChannel.streamId));\n+ group('TopicListButton', () {\n+ testWidgets('not visible from app bar on topic list', (tester) async {\n+ await prepare();\n+ await showFromTopicListAppBar(tester);\n+ checkNoButton('List of topics');\n+ });\n \n- connection.prepare(json: GetStreamTopicsResult(topics: [\n- eg.getStreamTopicsEntry(name: 'some topic foo'),\n- ]).toJson());\n- await tester.tap(findButtonForLabel('List of topics'));\n- await tester.pumpAndSettle();\n- check(find.text('some topic foo')).findsOne();\n+ testWidgets('happy path from msglist app bar', (tester) async {\n+ await prepare();\n+ await showFromMsglistAppBar(tester,\n+ narrow: ChannelNarrow(someChannel.streamId));\n+\n+ connection.prepare(json: GetStreamTopicsResult(topics: [\n+ eg.getStreamTopicsEntry(name: 'some topic foo'),\n+ ]).toJson());\n+ await tester.tap(findButtonForLabel('List of topics'));\n+ await tester.pumpAndSettle();\n+ check(find.text('some topic foo')).findsOne();\n+ });\n+ });\n+\n+ group('ChannelFeedButton', () {\n+ Future tapButtonAndPump(WidgetTester tester) async {\n+ await tester.tap(findButtonForLabel('Channel feed'));\n+ await tester.pump(); // [MenuItemButton.onPressed] called in a post-frame callback: flutter/flutter@e4a39fa2e\n+ }\n+\n+ testWidgets('from inbox: visible', (tester) async {\n+ await prepare();\n+ await showFromInbox(tester);\n+ checkButton('Channel feed');\n+ });\n+\n+ testWidgets('from subscription list: visible', (tester) async {\n+ await prepare();\n+ await showFromSubscriptionList(tester);\n+ checkButton('Channel feed');\n+ });\n+\n+ testWidgets('from recipient header in combined feed: visible', (tester) async {\n+ await prepare();\n+ await showFromRecipientHeader(tester);\n+ checkButton('Channel feed');\n+ });\n+\n+ testWidgets('from app bar on topic list: visible', (tester) async {\n+ await prepare();\n+ await showFromTopicListAppBar(tester);\n+ checkButton('Channel feed');\n+ });\n+\n+ testWidgets('from msglist app bar on channel feed: not visible', (tester) async {\n+ await prepare();\n+ await showFromMsglistAppBar(tester, narrow: ChannelNarrow(someChannel.streamId));\n+ checkNoButton('Channel feed');\n+ });\n+\n+ // (The channel action sheet isn't reached from a recipient header\n+ // in the channel feed.)\n+\n+ testWidgets('navigates to channel feed', (tester) async {\n+ await prepare();\n+ await showFromInbox(tester);\n+\n+ connection.prepare(json: eg.newestGetMessagesResult(\n+ foundOldest: true, messages: []).toJson());\n+ // for topic autocomplete\n+ connection.prepare(json: GetStreamTopicsResult(topics: []).toJson());\n+ await tapButtonAndPump(tester);\n+ await transitionDurationObserver.pumpPastTransition(tester);\n+\n+ final appBar = tester.widget(find.byType(MessageListAppBarTitle)) as MessageListAppBarTitle;\n+ check(appBar.narrow).equals(ChannelNarrow(someChannel.streamId));\n+ });\n });\n \n group('CopyChannelLinkButton', () {\n@@ -416,7 +506,7 @@ void main() {\n testWidgets('copies channel link to clipboard', (tester) async {\n await prepare();\n final narrow = ChannelNarrow(someChannel.streamId);\n- await showFromAppBar(tester, narrow: narrow);\n+ await showFromMsglistAppBar(tester, narrow: narrow);\n \n await tapCopyChannelLinkButton(tester);\n await tester.pump(Duration.zero);\n@@ -436,7 +526,7 @@ void main() {\n await prepare();\n final narrow = ChannelNarrow(someChannel.streamId);\n check(store.subscriptions[narrow.streamId]).isNotNull();\n- await showFromAppBar(tester, narrow: narrow);\n+ await showFromMsglistAppBar(tester, narrow: narrow);\n checkButton('Unsubscribe');\n });\n \n@@ -444,19 +534,17 @@ void main() {\n await prepare();\n final narrow = ChannelNarrow(someChannel.streamId);\n await store.removeSubscription(narrow.streamId);\n- await showFromAppBar(tester, narrow: narrow);\n+ await showFromMsglistAppBar(tester, narrow: narrow);\n checkNoButton('Unsubscribe');\n });\n \n testWidgets('smoke, public channel', (tester) async {\n final channel = eg.stream(inviteOnly: false);\n- final message = eg.streamMessage(stream: channel);\n await prepare();\n await store.addStream(channel);\n await store.addSubscription(eg.subscription(channel));\n final narrow = ChannelNarrow(channel.streamId);\n- await showFromAppBar(tester,\n- channel: channel, narrow: narrow, messages: [message]);\n+ await showFromMsglistAppBar(tester, channel: channel, narrow: narrow);\n \n connection.prepare(json: {});\n await tapButton(tester);\n@@ -474,13 +562,11 @@ void main() {\n \n testWidgets('smoke, private channel', (tester) async {\n final channel = eg.stream(inviteOnly: true);\n- final message = eg.streamMessage(stream: channel);\n await prepare();\n await store.addStream(channel);\n await store.addSubscription(eg.subscription(channel));\n final narrow = ChannelNarrow(channel.streamId);\n- await showFromAppBar(tester,\n- channel: channel, narrow: narrow, messages: [message]);\n+ await showFromMsglistAppBar(tester, channel: channel, narrow: narrow);\n connection.takeRequests();\n \n connection.prepare(json: {});\n", "n2p_tests": "{}", "f2p_tests": "{\"channel action sheet ChannelFeedButton from app bar on topic list: visible\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from recipient header in combined feed: visible\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from inbox: visible\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from subscription list: visible\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"channel action sheet TopicListButton not visible from app bar on topic list\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton navigates to channel feed\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"message action sheet StarButton star success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet UnsubscribeButton channel subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet MarkChannelAsReadButton request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton mute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageTextButton success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: false, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from message-list app bar in channel narrow\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet header muted sender also shown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when topic is empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton unresolve: weird prefix\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from inbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ShareButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: true, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet SubscribeButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from inbox; message in Unreads but not in MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from recipient header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread visible if message is read\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet MarkTopicAsReadButton visible if topic has unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet CopyTopicLinkButton copies topic link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons absent if ServerEmojiData not loaded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons slight_smile removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in DM narrow smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: Instance of 'CombinedFeedNarrow', realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons smile removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet StarButton unstar success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton not offered in StarredMessagesNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads but not MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton unfollow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: ChannelNarrow(1), realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: true, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton tap button smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet UnrevealMutedMessageButton when pressed, unreveals the message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet header poll is rendered\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet UnsubscribeButton smoke, public channel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet StarButton star request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads and MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton not offered in MentionsNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ShareButton request succeeds; sharing succeeds\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet TopicListButton happy path from msglist app bar\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread onPressed on topic move, acts on new topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 0, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet header message sender and content shown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread not visible if message is not read\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons slight_smile request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton request fails with an error dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton not offered in CombinedFeedNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons slight_smile adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet UnsubscribeButton channel not subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet UnrevealMutedMessageButton visible if message is from muted sender and revealed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet ChannelFeedButton from msglist app bar on channel feed: not visible\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when msglist empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton unresolve: request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet MarkChannelAsReadButton happy path from inbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet UnrevealMutedMessageButton not visible if message is from normal sender (not muted)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageTextButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet MarkTopicAsReadButton not visible if topic has no unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from topic-list app bar\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton unresolve: happy path\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 10, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in topic narrow smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: false, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton unmute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet CopyChannelLinkButton copies channel link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: false, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ViewReactionsButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet UnsubscribeButton smoke, private channel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton unmuteInMutedChannel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ViewReactionsButton not visible if message has no reactions\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet MarkTopicAsReadButton marks topic as read when pressed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet SubscribeButton channel not subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from recipient header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread onPressed shows error when fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton handle empty topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show with no unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton resolve: request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread onPressed smoke test\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet SubscribeButton channel subscribed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons smile request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ViewReadReceiptsButton smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MessageActionSheetCancelButton pressing the button dismisses the action sheet\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton follow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons smile adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet StarButton unstar request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in topic narrow no error if user lost posting permission after action sheet opened\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from inbox; message in Unreads and in MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in DM narrow no error if recipient was deactivated while raw-content request in progress\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from message-list app bar in topic narrow\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ViewReadReceiptsButton realm-level read receipts disabled -> button is absent\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet CopyTopicLinkButton FL < 271 -> link doesn't contain \\\"with\\\" operator\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ShareButton request succeeds; sharing fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageLinkButton copies message link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 600, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in channel narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from subscription list\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageTextButton can show snackbar on success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1793", "org": "zulip", "repo": "zulip-flutter", "number": 1793, "state": "closed", "title": "Show last-active time on profile page", "body": "Fixes #1647.\r\n\r\nThere are probably ways the logic here can be improved. But we can do that in tandem with the relative times on the lightbox (#45), once we have ready access to CLDR data via FFI.\r\n\r\n~~Draft because I want to write some tests before merging; my manual testing hasn't reached all the different cases in this logic.~~", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"c6fcbf6e24c64736095704497c8fd7d5638a81fb\"}", "resolved_issues": "[{\"number\": 1647, \"title\": \"profile: Show when the user was last active\", \"body\": \"On a user's profile, we should show the time they were last known to be active, e.g., \\\"5 hours ago\\\". For how to format the time, see #45.\"}]", "lang": "dart", "problem_statement": "profile: Show when the user was last active\nOn a user's profile, we should show the time they were last known to be active, e.g., \"5 hours ago\". For how to format the time, see #45.\n", "hints": "Hi team \ud83d\udc4b,\n\nI'd love to work on this issue! I have experience with Flutter and handling datetime formatting. I can implement a user-friendly \"last active\" display using libraries like `timeago` or `intl` to show values such as:\n\nExample implementaion code using `timeago`:-\n```\nimport 'package:timeago/timeago.dart' as timeago;\n\nDateTime lastActiveTime = DateTime.parse(\"2025-07-20T16:47:00\"); // Example timestamp\nString lastSeen = timeago.format(lastActiveTime);\n\nText(\"Last active: $lastSeen\");\n```\n\nor if using a formatted date and time such as \"Yesterday at 4:47 PM\", best to go with `intl`\n\n- \"Just now\"\n- \"5 minutes ago\"\n- \"Yesterday at 4:47 PM\"\n- \"Last Monday at 2:30 PM\"\n\nIf assigned, I can get started right away and submit a PR soon.\nThanks for your interest in this issue! Please see the issue description for how we'd like this to be implemented, and why we don't want to use `timeago` or `intl`:\n\n> For how to format the time, see https://github.com/zulip/zulip-flutter/issues/45.", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1793", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1647\"]", "test_command": "flutter test test/widgets/profile_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/assets/l10n/app_en.arb b/assets/l10n/app_en.arb\nindex 66ef1ee004..dedffe9b47 100644\n--- a/assets/l10n/app_en.arb\n+++ b/assets/l10n/app_en.arb\n@@ -874,6 +874,50 @@\n \"@yesterday\": {\n \"description\": \"Term to use to reference the previous day.\"\n },\n+ \"userActiveNow\": \"Active now\",\n+ \"@userActiveNow\": {\n+ \"description\": \"Indicates a user is currently active on Zulip (not idle or offline)\"\n+ },\n+ \"userIdle\": \"Idle\",\n+ \"@userIdle\": {\n+ \"description\": \"Indicates a user is currently idle on Zulip (not active, but not offline)\"\n+ },\n+ \"userActiveMinutesAgo\": \"Active {minutes, plural, =1{1 minute} other{{minutes} minutes}} ago\",\n+ \"@userActiveMinutesAgo\": {\n+ \"description\": \"Indicates when a user was last active on Zulip (who is currently offline)\",\n+ \"placeholders\": {\n+ \"minutes\": {\"type\": \"int\", \"example\": \"5\"}\n+ }\n+ },\n+ \"userActiveHoursAgo\": \"Active {hours, plural, =1{1 hour} other{{hours} hours}} ago\",\n+ \"@userActiveHoursAgo\": {\n+ \"description\": \"Indicates when a user was last active on Zulip (who is currently offline)\",\n+ \"placeholders\": {\n+ \"hours\": {\"type\": \"int\", \"example\": \"5\"}\n+ }\n+ },\n+ \"userActiveYesterday\": \"Active yesterday\",\n+ \"@userActiveYesterday\": {\n+ \"description\": \"Indicates when a user was last active on Zulip (who is currently offline)\"\n+ },\n+ \"userActiveDaysAgo\": \"Active {days, plural, =1{1 day} other{{days} days}} ago\",\n+ \"@userActiveDaysAgo\": {\n+ \"description\": \"Indicates when a user was last active on Zulip (who is currently offline)\",\n+ \"placeholders\": {\n+ \"days\": {\"type\": \"int\", \"example\": \"5\"}\n+ }\n+ },\n+ \"userActiveDate\": \"Active {date}\",\n+ \"@userActiveDate\": {\n+ \"description\": \"Indicates the date when a user was last active on Zulip (who is currently offline).\\n\\nThe date might be day and month if recent, or day, month, and year if less recent.\",\n+ \"placeholders\": {\n+ \"date\": {\"type\": \"String\", \"example\": \"Aug 1, 2024\"}\n+ }\n+ },\n+ \"userNotActiveInYear\": \"Not active in the last year\",\n+ \"@userNotActiveInYear\": {\n+ \"description\": \"Indicates when a user was last active on Zulip (who is currently offline)\"\n+ },\n \"invisibleMode\": \"Invisible mode\",\n \"@invisibleMode\": {\n \"description\": \"Label for the 'Invisible mode' switch on the profile page.\"\ndiff --git a/lib/generated/l10n/zulip_localizations.dart b/lib/generated/l10n/zulip_localizations.dart\nindex 51166b29aa..8b0de0b1b3 100644\n--- a/lib/generated/l10n/zulip_localizations.dart\n+++ b/lib/generated/l10n/zulip_localizations.dart\n@@ -1301,6 +1301,56 @@ abstract class ZulipLocalizations {\n /// **'Yesterday'**\n String get yesterday;\n \n+ /// Indicates a user is currently active on Zulip (not idle or offline)\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Active now'**\n+ String get userActiveNow;\n+\n+ /// Indicates a user is currently idle on Zulip (not active, but not offline)\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Idle'**\n+ String get userIdle;\n+\n+ /// Indicates when a user was last active on Zulip (who is currently offline)\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Active {minutes, plural, =1{1 minute} other{{minutes} minutes}} ago'**\n+ String userActiveMinutesAgo(int minutes);\n+\n+ /// Indicates when a user was last active on Zulip (who is currently offline)\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Active {hours, plural, =1{1 hour} other{{hours} hours}} ago'**\n+ String userActiveHoursAgo(int hours);\n+\n+ /// Indicates when a user was last active on Zulip (who is currently offline)\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Active yesterday'**\n+ String get userActiveYesterday;\n+\n+ /// Indicates when a user was last active on Zulip (who is currently offline)\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Active {days, plural, =1{1 day} other{{days} days}} ago'**\n+ String userActiveDaysAgo(int days);\n+\n+ /// Indicates the date when a user was last active on Zulip (who is currently offline).\n+ ///\n+ /// The date might be day and month if recent, or day, month, and year if less recent.\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Active {date}'**\n+ String userActiveDate(String date);\n+\n+ /// Indicates when a user was last active on Zulip (who is currently offline)\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Not active in the last year'**\n+ String get userNotActiveInYear;\n+\n /// Label for the 'Invisible mode' switch on the profile page.\n ///\n /// In en, this message translates to:\ndiff --git a/lib/generated/l10n/zulip_localizations_ar.dart b/lib/generated/l10n/zulip_localizations_ar.dart\nindex bcf71ff75d..7c63614c82 100644\n--- a/lib/generated/l10n/zulip_localizations_ar.dart\n+++ b/lib/generated/l10n/zulip_localizations_ar.dart\n@@ -723,6 +723,56 @@ class ZulipLocalizationsAr extends ZulipLocalizations {\n @override\n String get yesterday => 'Yesterday';\n \n+ @override\n+ String get userActiveNow => 'Active now';\n+\n+ @override\n+ String get userIdle => 'Idle';\n+\n+ @override\n+ String userActiveMinutesAgo(int minutes) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ minutes,\n+ locale: localeName,\n+ other: '$minutes minutes',\n+ one: '1 minute',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveHoursAgo(int hours) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ hours,\n+ locale: localeName,\n+ other: '$hours hours',\n+ one: '1 hour',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String get userActiveYesterday => 'Active yesterday';\n+\n+ @override\n+ String userActiveDaysAgo(int days) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ days,\n+ locale: localeName,\n+ other: '$days days',\n+ one: '1 day',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveDate(String date) {\n+ return 'Active $date';\n+ }\n+\n+ @override\n+ String get userNotActiveInYear => 'Not active in the last year';\n+\n @override\n String get invisibleMode => 'Invisible mode';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_de.dart b/lib/generated/l10n/zulip_localizations_de.dart\nindex 5989434931..5d44111e4e 100644\n--- a/lib/generated/l10n/zulip_localizations_de.dart\n+++ b/lib/generated/l10n/zulip_localizations_de.dart\n@@ -745,6 +745,56 @@ class ZulipLocalizationsDe extends ZulipLocalizations {\n @override\n String get yesterday => 'Gestern';\n \n+ @override\n+ String get userActiveNow => 'Active now';\n+\n+ @override\n+ String get userIdle => 'Idle';\n+\n+ @override\n+ String userActiveMinutesAgo(int minutes) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ minutes,\n+ locale: localeName,\n+ other: '$minutes minutes',\n+ one: '1 minute',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveHoursAgo(int hours) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ hours,\n+ locale: localeName,\n+ other: '$hours hours',\n+ one: '1 hour',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String get userActiveYesterday => 'Active yesterday';\n+\n+ @override\n+ String userActiveDaysAgo(int days) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ days,\n+ locale: localeName,\n+ other: '$days days',\n+ one: '1 day',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveDate(String date) {\n+ return 'Active $date';\n+ }\n+\n+ @override\n+ String get userNotActiveInYear => 'Not active in the last year';\n+\n @override\n String get invisibleMode => 'Invisible mode';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_en.dart b/lib/generated/l10n/zulip_localizations_en.dart\nindex 1dc66ac100..3c96f8bdd2 100644\n--- a/lib/generated/l10n/zulip_localizations_en.dart\n+++ b/lib/generated/l10n/zulip_localizations_en.dart\n@@ -723,6 +723,56 @@ class ZulipLocalizationsEn extends ZulipLocalizations {\n @override\n String get yesterday => 'Yesterday';\n \n+ @override\n+ String get userActiveNow => 'Active now';\n+\n+ @override\n+ String get userIdle => 'Idle';\n+\n+ @override\n+ String userActiveMinutesAgo(int minutes) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ minutes,\n+ locale: localeName,\n+ other: '$minutes minutes',\n+ one: '1 minute',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveHoursAgo(int hours) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ hours,\n+ locale: localeName,\n+ other: '$hours hours',\n+ one: '1 hour',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String get userActiveYesterday => 'Active yesterday';\n+\n+ @override\n+ String userActiveDaysAgo(int days) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ days,\n+ locale: localeName,\n+ other: '$days days',\n+ one: '1 day',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveDate(String date) {\n+ return 'Active $date';\n+ }\n+\n+ @override\n+ String get userNotActiveInYear => 'Not active in the last year';\n+\n @override\n String get invisibleMode => 'Invisible mode';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_fr.dart b/lib/generated/l10n/zulip_localizations_fr.dart\nindex 84ddde19b4..31849002e9 100644\n--- a/lib/generated/l10n/zulip_localizations_fr.dart\n+++ b/lib/generated/l10n/zulip_localizations_fr.dart\n@@ -737,6 +737,56 @@ class ZulipLocalizationsFr extends ZulipLocalizations {\n @override\n String get yesterday => 'Yesterday';\n \n+ @override\n+ String get userActiveNow => 'Active now';\n+\n+ @override\n+ String get userIdle => 'Idle';\n+\n+ @override\n+ String userActiveMinutesAgo(int minutes) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ minutes,\n+ locale: localeName,\n+ other: '$minutes minutes',\n+ one: '1 minute',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveHoursAgo(int hours) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ hours,\n+ locale: localeName,\n+ other: '$hours hours',\n+ one: '1 hour',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String get userActiveYesterday => 'Active yesterday';\n+\n+ @override\n+ String userActiveDaysAgo(int days) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ days,\n+ locale: localeName,\n+ other: '$days days',\n+ one: '1 day',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveDate(String date) {\n+ return 'Active $date';\n+ }\n+\n+ @override\n+ String get userNotActiveInYear => 'Not active in the last year';\n+\n @override\n String get invisibleMode => 'Invisible mode';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_it.dart b/lib/generated/l10n/zulip_localizations_it.dart\nindex 43accf333c..c9cff2ec10 100644\n--- a/lib/generated/l10n/zulip_localizations_it.dart\n+++ b/lib/generated/l10n/zulip_localizations_it.dart\n@@ -738,6 +738,56 @@ class ZulipLocalizationsIt extends ZulipLocalizations {\n @override\n String get yesterday => 'Ieri';\n \n+ @override\n+ String get userActiveNow => 'Active now';\n+\n+ @override\n+ String get userIdle => 'Idle';\n+\n+ @override\n+ String userActiveMinutesAgo(int minutes) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ minutes,\n+ locale: localeName,\n+ other: '$minutes minutes',\n+ one: '1 minute',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveHoursAgo(int hours) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ hours,\n+ locale: localeName,\n+ other: '$hours hours',\n+ one: '1 hour',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String get userActiveYesterday => 'Active yesterday';\n+\n+ @override\n+ String userActiveDaysAgo(int days) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ days,\n+ locale: localeName,\n+ other: '$days days',\n+ one: '1 day',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveDate(String date) {\n+ return 'Active $date';\n+ }\n+\n+ @override\n+ String get userNotActiveInYear => 'Not active in the last year';\n+\n @override\n String get invisibleMode => 'Invisible mode';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_ja.dart b/lib/generated/l10n/zulip_localizations_ja.dart\nindex 01cfdfc1c7..19051577a2 100644\n--- a/lib/generated/l10n/zulip_localizations_ja.dart\n+++ b/lib/generated/l10n/zulip_localizations_ja.dart\n@@ -720,6 +720,56 @@ class ZulipLocalizationsJa extends ZulipLocalizations {\n @override\n String get yesterday => 'Yesterday';\n \n+ @override\n+ String get userActiveNow => 'Active now';\n+\n+ @override\n+ String get userIdle => 'Idle';\n+\n+ @override\n+ String userActiveMinutesAgo(int minutes) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ minutes,\n+ locale: localeName,\n+ other: '$minutes minutes',\n+ one: '1 minute',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveHoursAgo(int hours) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ hours,\n+ locale: localeName,\n+ other: '$hours hours',\n+ one: '1 hour',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String get userActiveYesterday => 'Active yesterday';\n+\n+ @override\n+ String userActiveDaysAgo(int days) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ days,\n+ locale: localeName,\n+ other: '$days days',\n+ one: '1 day',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveDate(String date) {\n+ return 'Active $date';\n+ }\n+\n+ @override\n+ String get userNotActiveInYear => 'Not active in the last year';\n+\n @override\n String get invisibleMode => 'Invisible mode';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_nb.dart b/lib/generated/l10n/zulip_localizations_nb.dart\nindex 1ee9cc4304..e1923091e7 100644\n--- a/lib/generated/l10n/zulip_localizations_nb.dart\n+++ b/lib/generated/l10n/zulip_localizations_nb.dart\n@@ -723,6 +723,56 @@ class ZulipLocalizationsNb extends ZulipLocalizations {\n @override\n String get yesterday => 'Yesterday';\n \n+ @override\n+ String get userActiveNow => 'Active now';\n+\n+ @override\n+ String get userIdle => 'Idle';\n+\n+ @override\n+ String userActiveMinutesAgo(int minutes) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ minutes,\n+ locale: localeName,\n+ other: '$minutes minutes',\n+ one: '1 minute',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveHoursAgo(int hours) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ hours,\n+ locale: localeName,\n+ other: '$hours hours',\n+ one: '1 hour',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String get userActiveYesterday => 'Active yesterday';\n+\n+ @override\n+ String userActiveDaysAgo(int days) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ days,\n+ locale: localeName,\n+ other: '$days days',\n+ one: '1 day',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveDate(String date) {\n+ return 'Active $date';\n+ }\n+\n+ @override\n+ String get userNotActiveInYear => 'Not active in the last year';\n+\n @override\n String get invisibleMode => 'Invisible mode';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_pl.dart b/lib/generated/l10n/zulip_localizations_pl.dart\nindex dae4675941..a56afc6c1c 100644\n--- a/lib/generated/l10n/zulip_localizations_pl.dart\n+++ b/lib/generated/l10n/zulip_localizations_pl.dart\n@@ -734,6 +734,56 @@ class ZulipLocalizationsPl extends ZulipLocalizations {\n @override\n String get yesterday => 'Wczoraj';\n \n+ @override\n+ String get userActiveNow => 'Active now';\n+\n+ @override\n+ String get userIdle => 'Idle';\n+\n+ @override\n+ String userActiveMinutesAgo(int minutes) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ minutes,\n+ locale: localeName,\n+ other: '$minutes minutes',\n+ one: '1 minute',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveHoursAgo(int hours) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ hours,\n+ locale: localeName,\n+ other: '$hours hours',\n+ one: '1 hour',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String get userActiveYesterday => 'Active yesterday';\n+\n+ @override\n+ String userActiveDaysAgo(int days) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ days,\n+ locale: localeName,\n+ other: '$days days',\n+ one: '1 day',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveDate(String date) {\n+ return 'Active $date';\n+ }\n+\n+ @override\n+ String get userNotActiveInYear => 'Not active in the last year';\n+\n @override\n String get invisibleMode => 'Tryb ukrycia';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_ru.dart b/lib/generated/l10n/zulip_localizations_ru.dart\nindex ce7d41533a..bf986a9da3 100644\n--- a/lib/generated/l10n/zulip_localizations_ru.dart\n+++ b/lib/generated/l10n/zulip_localizations_ru.dart\n@@ -739,6 +739,56 @@ class ZulipLocalizationsRu extends ZulipLocalizations {\n @override\n String get yesterday => '\u0412\u0447\u0435\u0440\u0430';\n \n+ @override\n+ String get userActiveNow => 'Active now';\n+\n+ @override\n+ String get userIdle => 'Idle';\n+\n+ @override\n+ String userActiveMinutesAgo(int minutes) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ minutes,\n+ locale: localeName,\n+ other: '$minutes minutes',\n+ one: '1 minute',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveHoursAgo(int hours) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ hours,\n+ locale: localeName,\n+ other: '$hours hours',\n+ one: '1 hour',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String get userActiveYesterday => 'Active yesterday';\n+\n+ @override\n+ String userActiveDaysAgo(int days) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ days,\n+ locale: localeName,\n+ other: '$days days',\n+ one: '1 day',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveDate(String date) {\n+ return 'Active $date';\n+ }\n+\n+ @override\n+ String get userNotActiveInYear => 'Not active in the last year';\n+\n @override\n String get invisibleMode => '\u0420\u0435\u0436\u0438\u043c \u043d\u0435\u0432\u0438\u0434\u0438\u043c\u043e\u0441\u0442\u0438';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_sk.dart b/lib/generated/l10n/zulip_localizations_sk.dart\nindex a9cb388332..ee0840259f 100644\n--- a/lib/generated/l10n/zulip_localizations_sk.dart\n+++ b/lib/generated/l10n/zulip_localizations_sk.dart\n@@ -725,6 +725,56 @@ class ZulipLocalizationsSk extends ZulipLocalizations {\n @override\n String get yesterday => 'V\u010dera';\n \n+ @override\n+ String get userActiveNow => 'Active now';\n+\n+ @override\n+ String get userIdle => 'Idle';\n+\n+ @override\n+ String userActiveMinutesAgo(int minutes) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ minutes,\n+ locale: localeName,\n+ other: '$minutes minutes',\n+ one: '1 minute',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveHoursAgo(int hours) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ hours,\n+ locale: localeName,\n+ other: '$hours hours',\n+ one: '1 hour',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String get userActiveYesterday => 'Active yesterday';\n+\n+ @override\n+ String userActiveDaysAgo(int days) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ days,\n+ locale: localeName,\n+ other: '$days days',\n+ one: '1 day',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveDate(String date) {\n+ return 'Active $date';\n+ }\n+\n+ @override\n+ String get userNotActiveInYear => 'Not active in the last year';\n+\n @override\n String get invisibleMode => 'Invisible mode';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_sl.dart b/lib/generated/l10n/zulip_localizations_sl.dart\nindex 0f45bd9e28..ec7e3c7c22 100644\n--- a/lib/generated/l10n/zulip_localizations_sl.dart\n+++ b/lib/generated/l10n/zulip_localizations_sl.dart\n@@ -749,6 +749,56 @@ class ZulipLocalizationsSl extends ZulipLocalizations {\n @override\n String get yesterday => 'V\u010deraj';\n \n+ @override\n+ String get userActiveNow => 'Active now';\n+\n+ @override\n+ String get userIdle => 'Idle';\n+\n+ @override\n+ String userActiveMinutesAgo(int minutes) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ minutes,\n+ locale: localeName,\n+ other: '$minutes minutes',\n+ one: '1 minute',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveHoursAgo(int hours) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ hours,\n+ locale: localeName,\n+ other: '$hours hours',\n+ one: '1 hour',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String get userActiveYesterday => 'Active yesterday';\n+\n+ @override\n+ String userActiveDaysAgo(int days) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ days,\n+ locale: localeName,\n+ other: '$days days',\n+ one: '1 day',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveDate(String date) {\n+ return 'Active $date';\n+ }\n+\n+ @override\n+ String get userNotActiveInYear => 'Not active in the last year';\n+\n @override\n String get invisibleMode => 'Invisible mode';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_uk.dart b/lib/generated/l10n/zulip_localizations_uk.dart\nindex 7950acfb15..4d8fc8ab9e 100644\n--- a/lib/generated/l10n/zulip_localizations_uk.dart\n+++ b/lib/generated/l10n/zulip_localizations_uk.dart\n@@ -738,6 +738,56 @@ class ZulipLocalizationsUk extends ZulipLocalizations {\n @override\n String get yesterday => '\u0423\u0447\u043e\u0440\u0430';\n \n+ @override\n+ String get userActiveNow => 'Active now';\n+\n+ @override\n+ String get userIdle => 'Idle';\n+\n+ @override\n+ String userActiveMinutesAgo(int minutes) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ minutes,\n+ locale: localeName,\n+ other: '$minutes minutes',\n+ one: '1 minute',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveHoursAgo(int hours) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ hours,\n+ locale: localeName,\n+ other: '$hours hours',\n+ one: '1 hour',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String get userActiveYesterday => 'Active yesterday';\n+\n+ @override\n+ String userActiveDaysAgo(int days) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ days,\n+ locale: localeName,\n+ other: '$days days',\n+ one: '1 day',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveDate(String date) {\n+ return 'Active $date';\n+ }\n+\n+ @override\n+ String get userNotActiveInYear => 'Not active in the last year';\n+\n @override\n String get invisibleMode => '\u041d\u0435\u0432\u0438\u0434\u0438\u043c\u0438\u0439 \u0440\u0435\u0436\u0438\u043c';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_zh.dart b/lib/generated/l10n/zulip_localizations_zh.dart\nindex 39e86f6960..6d6ba8579b 100644\n--- a/lib/generated/l10n/zulip_localizations_zh.dart\n+++ b/lib/generated/l10n/zulip_localizations_zh.dart\n@@ -723,6 +723,56 @@ class ZulipLocalizationsZh extends ZulipLocalizations {\n @override\n String get yesterday => 'Yesterday';\n \n+ @override\n+ String get userActiveNow => 'Active now';\n+\n+ @override\n+ String get userIdle => 'Idle';\n+\n+ @override\n+ String userActiveMinutesAgo(int minutes) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ minutes,\n+ locale: localeName,\n+ other: '$minutes minutes',\n+ one: '1 minute',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveHoursAgo(int hours) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ hours,\n+ locale: localeName,\n+ other: '$hours hours',\n+ one: '1 hour',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String get userActiveYesterday => 'Active yesterday';\n+\n+ @override\n+ String userActiveDaysAgo(int days) {\n+ String _temp0 = intl.Intl.pluralLogic(\n+ days,\n+ locale: localeName,\n+ other: '$days days',\n+ one: '1 day',\n+ );\n+ return 'Active $_temp0 ago';\n+ }\n+\n+ @override\n+ String userActiveDate(String date) {\n+ return 'Active $date';\n+ }\n+\n+ @override\n+ String get userNotActiveInYear => 'Not active in the last year';\n+\n @override\n String get invisibleMode => 'Invisible mode';\n \ndiff --git a/lib/model/presence.dart b/lib/model/presence.dart\nindex 590c2d3ceb..882f12031c 100644\n--- a/lib/model/presence.dart\n+++ b/lib/model/presence.dart\n@@ -96,8 +96,7 @@ class Presence extends HasRealmStore with ChangeNotifier {\n newUserInput: false);\n }\n if (!pingOnly) {\n- _map = result.presences!;\n- notifyListeners();\n+ _handlePresenceResponse(result.presences!);\n }\n }\n \n@@ -124,6 +123,16 @@ class Presence extends HasRealmStore with ChangeNotifier {\n super.dispose();\n }\n \n+ @visibleForTesting\n+ void debugHandlePresenceResponse(Map presences) {\n+ _handlePresenceResponse(presences);\n+ }\n+\n+ void _handlePresenceResponse(Map presences) {\n+ _map = presences;\n+ notifyListeners();\n+ }\n+\n /// The [PresenceStatus] for [userId], or null if the user is offline.\n PresenceStatus? presenceStatusForUser(int userId, {required DateTime utcNow}) {\n final now = utcNow.millisecondsSinceEpoch ~/ 1000;\n@@ -143,6 +152,31 @@ class Presence extends HasRealmStore with ChangeNotifier {\n }\n }\n \n+ /// The timestamp when the given user was \"last active\", if any.\n+ ///\n+ /// This is meaningful only when [presenceStatusForUser] is null.\n+ /// When that method returns active or idle, the user should be displayed\n+ /// with a description like \"Active now\" or \"Idle\" rather than\n+ /// one like \"Last active $duration ago\" that uses this timestamp.\n+ int? userLastActive(int userId) {\n+ // The corresponding implementation on web is complicated;\n+ // but the actual behavior seems to be this simple.\n+ //\n+ // In web, see buddy_data.user_last_seen_time_status; the last-active time\n+ // is used only when the status is offline (vs active or idle).\n+ // The timestamp comes via presence.last_active_date from the data structure\n+ // fed by presence.status_from_raw.\n+ //\n+ // That status_from_raw function sometimes uses idle_timestamp;\n+ // but only when status idle, where the timestamp will be ignored anyway.\n+ // It also consults the equivalent of [User.dateJoined] as a fallback,\n+ // for when processing a user who has \"never logged in\"... but it's\n+ // not clear that function ever gets called in such a case.\n+ // Those wrinkles aside, it always uses active_timestamp.\n+\n+ return _map[userId]?.activeTimestamp;\n+ }\n+\n void handlePresenceEvent(PresenceEvent event) {\n // TODO(#1618)\n }\ndiff --git a/lib/model/store.dart b/lib/model/store.dart\nindex 4f3e72442f..070c20fb27 100644\n--- a/lib/model/store.dart\n+++ b/lib/model/store.dart\n@@ -814,7 +814,8 @@ class PerAccountStore extends PerAccountStoreBase with\n typingStatus.handleTypingEvent(event);\n \n case PresenceEvent():\n- // TODO handle\n+ assert(debugLog(\"server event: presence ${event.userId}\"));\n+ // TODO(#1618) handle\n break;\n \n case ReactionEvent():\ndiff --git a/lib/widgets/profile.dart b/lib/widgets/profile.dart\nindex 461b2ec1b7..3748e39280 100644\n--- a/lib/widgets/profile.dart\n+++ b/lib/widgets/profile.dart\n@@ -1,13 +1,16 @@\n import 'dart:convert';\n \n import 'package:flutter/material.dart';\n+import 'package:intl/intl.dart';\n \n import '../api/model/model.dart';\n import '../api/route/settings.dart';\n import '../generated/l10n/zulip_localizations.dart';\n import '../log.dart';\n+import '../model/binding.dart';\n import '../model/content.dart';\n import '../model/narrow.dart';\n+import '../model/presence.dart';\n import 'app_bar.dart';\n import 'button.dart';\n import 'content.dart';\n@@ -42,7 +45,6 @@ class ProfilePage extends StatelessWidget {\n page: ProfilePage(userId: userId));\n }\n \n-\n @override\n Widget build(BuildContext context) {\n final zulipLocalizations = ZulipLocalizations.of(context);\n@@ -56,7 +58,9 @@ class ProfilePage extends StatelessWidget {\n .merge(weightVariableTextStyle(context, wght: 700));\n \n final userStatus = store.getUserStatus(userId);\n+\n final displayEmail = user.deliveryEmail;\n+\n final items = [\n Center(\n child: Avatar(\n@@ -93,6 +97,10 @@ class ProfilePage extends StatelessWidget {\n textAlign: TextAlign.center,\n style: TextStyle(fontSize: 18, height: 22 / 18,\n color: DesignVariables.of(context).userStatusText)),\n+ if (!user.isBot)\n+ _LastActiveTime(userId: userId),\n+\n+ const SizedBox(height: 8),\n if (displayEmail != null)\n Text(displayEmail,\n textAlign: TextAlign.center,\n@@ -139,6 +147,106 @@ class ProfilePage extends StatelessWidget {\n }\n }\n \n+class _LastActiveTime extends StatefulWidget {\n+ const _LastActiveTime({required this.userId});\n+\n+ final int userId;\n+\n+ @override\n+ State<_LastActiveTime> createState() => _LastActiveTimeState();\n+}\n+\n+class _LastActiveTimeState extends State<_LastActiveTime> with PerAccountStoreAwareStateMixin {\n+ Presence? model;\n+\n+ @override\n+ void onNewStore() {\n+ model?.removeListener(_modelChanged);\n+ model = PerAccountStoreWidget.of(context).presence\n+ ..addListener(_modelChanged);\n+ }\n+\n+ @override\n+ void dispose() {\n+ model!.removeListener(_modelChanged);\n+ super.dispose();\n+ }\n+\n+ void _modelChanged() {\n+ setState(() {\n+ // The actual state lives in [model].\n+ // This method was called because that just changed.\n+ });\n+ }\n+\n+ String _lastActiveText(ZulipLocalizations zulipLocalizations) {\n+ // TODO(#45): revise this relative-time logic in light of a future solution\n+ // for the lightbox, e.g. using ICU/CLDR via FFI. See discussion:\n+ // https://github.com/zulip/zulip-flutter/pull/1793#issuecomment-3169228753\n+\n+ // TODO(#293), TODO(#891): auto-rebuild as relative time changes\n+ final nowDate = ZulipBinding.instance.utcNow();\n+\n+ final status = model!.presenceStatusForUser(widget.userId,\n+ utcNow: nowDate);\n+ switch (status) {\n+ case PresenceStatus.active: return zulipLocalizations.userActiveNow;\n+ case PresenceStatus.idle: return zulipLocalizations.userIdle;\n+ case null: break; // handle below\n+ }\n+\n+ final timestamp = model!.userLastActive(widget.userId);\n+ if (timestamp == null) return zulipLocalizations.userNotActiveInYear;\n+\n+ // Compare web's timerender.last_seen_status_from_date.\n+ final now = nowDate.millisecondsSinceEpoch ~/ 1000;\n+ final ageSeconds = now - timestamp;\n+ if (ageSeconds <= 0) {\n+ // TODO or perhaps show full time, to help user in case of clock skew\n+ return zulipLocalizations.userActiveNow;\n+ } else if (ageSeconds < 60 * 60) {\n+ return zulipLocalizations.userActiveMinutesAgo(ageSeconds ~/ 60);\n+ } else if (ageSeconds < 24 * 60 * 60) {\n+ return zulipLocalizations.userActiveHoursAgo(ageSeconds ~/ (60 * 60));\n+ }\n+\n+ final todayNoon = nowDate.toLocal()\n+ .copyWith(hour: 12, minute: 0, second: 0, millisecond: 0, microsecond: 0);\n+ final presenceNoon = DateTime.fromMillisecondsSinceEpoch(\n+ timestamp * 1000, isUtc: false)\n+ .copyWith(hour: 12, minute: 0, second: 0, millisecond: 0, microsecond: 0);\n+ final ageCalendarDays = (todayNoon.difference(presenceNoon)\n+ .inSeconds / (24 * 60 * 60)).round();\n+ if (ageCalendarDays <= 0) {\n+ // The timestamp was at least 24 hours ago.\n+ // If it's somehow the same or a future calendar day, then this must be a\n+ // really messy time zone. Hopefully no real time zone makes this possible.\n+ return zulipLocalizations.userActiveYesterday;\n+ } else if (ageCalendarDays == 1) {\n+ return zulipLocalizations.userActiveYesterday;\n+ } else if (ageCalendarDays < 90) {\n+ return zulipLocalizations.userActiveDaysAgo(ageCalendarDays);\n+ }\n+\n+ final DateFormat format;\n+ if (presenceNoon.year == todayNoon.year) {\n+ format = DateFormat.MMMd();\n+ } else {\n+ format = DateFormat.yMMMd();\n+ }\n+ return zulipLocalizations.userActiveDate(format.format(presenceNoon));\n+ }\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n+ return Text(_lastActiveText(zulipLocalizations),\n+ textAlign: TextAlign.center,\n+ style: TextStyle(fontSize: 18, height: 22 / 18,\n+ color: DesignVariables.of(context).userStatusText));\n+ }\n+}\n+\n class _SetStatusButton extends StatelessWidget {\n const _SetStatusButton();\n \n", "test_patch": "diff --git a/test/widgets/profile_test.dart b/test/widgets/profile_test.dart\nindex a7b74356ab..c79e3fb5b9 100644\n--- a/test/widgets/profile_test.dart\n+++ b/test/widgets/profile_test.dart\n@@ -1,6 +1,7 @@\n import 'dart:io';\n \n import 'package:checks/checks.dart';\n+import 'package:clock/clock.dart';\n import 'package:flutter/material.dart';\n import 'package:flutter_checks/flutter_checks.dart';\n import 'package:flutter_test/flutter_test.dart';\n@@ -119,6 +120,87 @@ void main() {\n check(find.text(longString).evaluate()).isNotEmpty();\n });\n \n+ group('_LastActiveTime', () {\n+ Future update(WidgetTester tester, User user, {\n+ required int activeSeconds,\n+ int? idleSeconds,\n+ }) async {\n+ idleSeconds ??= activeSeconds + 3600;\n+ final now = clock.now().millisecondsSinceEpoch ~/ 1000;\n+ final presence = PerUserPresence(\n+ activeTimestamp: now - activeSeconds,\n+ idleTimestamp: now - idleSeconds,\n+ );\n+ store.presence.debugHandlePresenceResponse({user.userId: presence});\n+ await tester.pump();\n+ }\n+\n+ testWidgets('active, idle, never', (tester) async {\n+ final user = eg.user();\n+ await setupPage(tester, users: [user], pageUserId: user.userId);\n+ check(find.text('Not active in the last year')).findsOne();\n+\n+ await update(tester, user, activeSeconds: 3600, idleSeconds: 30);\n+ check(find.text('Idle')).findsOne();\n+\n+ await update(tester, user, activeSeconds: 30);\n+ check(find.text('Active now')).findsOne();\n+ });\n+\n+ testWidgets('various ages', (tester) async {\n+ final user = eg.user();\n+ await setupPage(tester, users: [user], pageUserId: user.userId);\n+\n+ // These tests could be more detailed in making sure the behavior is\n+ // exactly the way it currently is. But save that for a future where\n+ // we've made a pass over the logic to ensure we're happy with that spec.\n+\n+ await update(tester, user, activeSeconds: 10 * 60);\n+ check(find.text('Active 10 minutes ago')).findsOne();\n+\n+ await update(tester, user, activeSeconds: 61 * 60);\n+ check(find.text('Active 1 hour ago')).findsOne();\n+\n+ await update(tester, user, activeSeconds: 20 * 60 * 60);\n+ check(find.text('Active 20 hours ago')).findsOne();\n+\n+ await update(tester, user, activeSeconds: 24 * 60 * 60);\n+ check(find.text('Active yesterday')).findsOne();\n+\n+ await update(tester, user, activeSeconds: 2 * 24 * 60 * 60);\n+ check(find.text('Active 2 days ago')).findsOne();\n+\n+ await update(tester, user, activeSeconds: 80 * 24 * 60 * 60);\n+ check(find.text('Active 80 days ago')).findsOne();\n+ });\n+\n+ testWidgets('dates', (tester) async {\n+ final user = eg.user();\n+ await setupPage(tester, users: [user], pageUserId: user.userId);\n+\n+ final now = DateTime.parse('2025-08-01 12:00');\n+ await withClock(Clock.fixed(now), () async {\n+ await update(tester, user, activeSeconds: now.difference(\n+ DateTime.parse('2025-04-01 12:00')).inSeconds);\n+ check(find.text('Active Apr 1')).findsOne();\n+\n+ await update(tester, user, activeSeconds: now.difference(\n+ DateTime.parse('2024-04-01 12:00')).inSeconds);\n+ check(find.text('Active Apr 1, 2024')).findsOne();\n+ });\n+ });\n+\n+ testWidgets('omit for bots', (tester) async {\n+ final user = eg.user(isBot: true);\n+ await setupPage(tester, users: [user], pageUserId: user.userId);\n+ await update(tester, user, activeSeconds: 30);\n+ check(find.text('Active now')).findsNothing();\n+ check(find.textContaining('Active')).findsNothing();\n+ check(find.textContaining('Idle')).findsNothing();\n+ check(find.textContaining('Not active')).findsNothing();\n+ });\n+ });\n+\n group('custom profile fields', () {\n testWidgets('page builds; profile page renders with profileData', (tester) async {\n await setupPage(tester,\n", "n2p_tests": "{\"invisible mode smoke, turn on (variant: tapRow)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode request has an error (variant: tapRow)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode spam-tapping (variant: dragToggleThumb)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"_LastActiveTime active, idle, never\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"_LastActiveTime dates\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"custom profile fields page builds; user field with unknown user\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode smoke, turn off (variant: dragToggleThumb)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode without recent interaction, event causes immediate update, which sticks\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"_LastActiveTime omit for bots\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode smoke, turn on (variant: dragToggleThumb)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"user status non-self profile, status set: no status button, status info appears\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"user status self-profile not status text set: status button appears with a placeholder text inside it\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode event arrives after local-echo timeout (variant: tapRow)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode event arrives after local-echo timeout (variant: dragToggleThumb)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"custom profile fields page builds; user links render multiple avatars\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"page builds; dm links to correct narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode self-profile, but presence disabled in realm: does not appear\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode non-self profile: does not appear\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode self-profile: appears\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"custom profile fields page builds; ensure long customProfileFields do not overflow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode request has an error (variant: dragToggleThumb)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"custom profile fields page builds; user links to profile\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode smoke, turn off (variant: tapRow)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode request has an error (variant: tapToggle)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"page builds; profile page renders\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode smoke, turn off (variant: tapToggle)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode spam-tapping (variant: tapRow)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"custom profile fields page builds; user field with muted user\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"user status self-profile status set: status button appears with status info inside it\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"page builds; error page shows up if data is missing\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"custom profile fields page builds; link type will navigate\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"_LastActiveTime various ages\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"custom profile fields page builds; external link type navigates away\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode event arrives after local-echo timeout (variant: tapToggle)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"page builds; ensure long name does not overflow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode spam-tapping (variant: tapToggle)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"user status self-profile no status set: status button appears\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"invisible mode smoke, turn on (variant: tapToggle)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"custom profile fields page builds; profile page renders with profileData\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1777", "org": "zulip", "repo": "zulip-flutter", "number": 1777, "state": "closed", "title": "For uploads, use verbatim URL string from server", "body": "Fixes #1709.\r\n\r\n## Commit messages\r\n\r\n#### 314c83c09 api [nfc]: Rename field UploadFileResult.url from \"uri\"\r\n\r\nLike elsewhere in our codebase, use the standard term \"URL\":\r\n https://github.com/zulip/zulip-mobile/blob/main/docs/style.md#url-not-uri\r\n\r\n\r\n\r\n#### c7f336c1e compose [nfc]: Take a URL string at inlineLink, rather than a Uri object\r\n\r\nThis way this function is a more faithful wrapper of constructing\r\nthe actual Markdown syntax. The Markdown will have a URL string,\r\nafter all, so it's for the best to put this function's caller in\r\ncontrol of exactly what string that is.\r\n\r\n\r\n\r\n#### 2e06a67ff compose: For uploads, use verbatim URL string from server\r\n\r\nFixes #1709.\r\n\r\nRound-tripping through `Uri.parse` and `.toString()` had the effect\r\nof percent-encoding any non-ASCII characters in the given URL string.\r\nThe server expects, reasonably enough, that the client will refer to\r\nthe upload using the same URL string the server provided at upload\r\ntime; so do that.\r\n\r\n\r\n\r\n#### 6a35cc47f compose [nfc]: Simplify inlineLink by dropping null destination\r\n\r\nNow that the caller is passing a string instead of a Uri object, the\r\ncaller that wants an empty string here can just pass an empty string.\r\n\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"f9ea6c97390c7b07b6d1b9a36a1bad9991da19f8\"}", "resolved_issues": "[{\"number\": 1709, \"title\": \"Uploaded file's URL gets percent-encoded, breaking permissions\", \"body\": \"If someone sends a message with an uploaded file whose filename contains non-ASCII characters, we end up percent-encoding those characters in the URL in the message's link to the file.\\n\\nThe resulting behavior is that the file is visible to the person who originally sent it, but not to others who received the message, because the server doesn't recognize it as the same file when assigning permissions based on the message.\\n\\nThe URL comes from https://zulip.com/api/upload-file (i.e. `UploadFileResult.uri` \\u2014 which BTW we should rename to `url`). Currently we call `Uri.parse` on it, and then `.toString()` on the resulting `Uri` object, which has the effect of percent-encoding it. Instead, we should pass the original `uri`/`url` value through verbatim as a String.\\n\\n### References\\n* Original report: [#issues > unable to download files contain Korean letters @ \\ud83d\\udcac](https://chat.zulip.org/#narrow/channel/9-issues/topic/unable.20to.20download.20files.20contain.20Korean.20letters/near/2215859)\\n* Diagnosis: [#issues > unable to download files contain Korean letters @ \\ud83d\\udcac](https://chat.zulip.org/#narrow/channel/9-issues/topic/unable.20to.20download.20files.20contain.20Korean.20letters/near/2223217), and later [#issues > unable to download files contain Korean letters @ \\ud83d\\udcac](https://chat.zulip.org/#narrow/channel/9-issues/topic/unable.20to.20download.20files.20contain.20Korean.20letters/near/2223661)\"}]", "lang": "dart", "problem_statement": "Uploaded file's URL gets percent-encoded, breaking permissions\nIf someone sends a message with an uploaded file whose filename contains non-ASCII characters, we end up percent-encoding those characters in the URL in the message's link to the file.\n\nThe resulting behavior is that the file is visible to the person who originally sent it, but not to others who received the message, because the server doesn't recognize it as the same file when assigning permissions based on the message.\n\nThe URL comes from https://zulip.com/api/upload-file (i.e. `UploadFileResult.uri` \u2014 which BTW we should rename to `url`). Currently we call `Uri.parse` on it, and then `.toString()` on the resulting `Uri` object, which has the effect of percent-encoding it. Instead, we should pass the original `uri`/`url` value through verbatim as a String.\n\n### References\n* Original report: [#issues > unable to download files contain Korean letters @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/9-issues/topic/unable.20to.20download.20files.20contain.20Korean.20letters/near/2215859)\n* Diagnosis: [#issues > unable to download files contain Korean letters @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/9-issues/topic/unable.20to.20download.20files.20contain.20Korean.20letters/near/2223217), and later [#issues > unable to download files contain Korean letters @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/9-issues/topic/unable.20to.20download.20files.20contain.20Korean.20letters/near/2223661)\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/1777", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1709\"]", "test_command": "flutter test test/api/route/messages_test.dart test/model/compose_test.dart test/widgets/compose_box_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/api/route/messages.dart b/lib/api/route/messages.dart\nindex 05364951cd..44053bcc4a 100644\n--- a/lib/api/route/messages.dart\n+++ b/lib/api/route/messages.dart\n@@ -315,10 +315,11 @@ Future uploadFile(\n \n @JsonSerializable(fieldRename: FieldRename.snake)\n class UploadFileResult {\n- final String uri;\n+ @JsonKey(name: 'uri')\n+ final String url;\n \n UploadFileResult({\n- required this.uri,\n+ required this.url,\n });\n \n factory UploadFileResult.fromJson(Map json) =>\ndiff --git a/lib/api/route/messages.g.dart b/lib/api/route/messages.g.dart\nindex 0df3e678e6..306a58ca4d 100644\n--- a/lib/api/route/messages.g.dart\n+++ b/lib/api/route/messages.g.dart\n@@ -50,10 +50,10 @@ Map _$UpdateMessageResultToJson(\n ) => {};\n \n UploadFileResult _$UploadFileResultFromJson(Map json) =>\n- UploadFileResult(uri: json['uri'] as String);\n+ UploadFileResult(url: json['uri'] as String);\n \n Map _$UploadFileResultToJson(UploadFileResult instance) =>\n- {'uri': instance.uri};\n+ {'uri': instance.url};\n \n UpdateMessageFlagsResult _$UpdateMessageFlagsResultFromJson(\n Map json,\ndiff --git a/lib/model/compose.dart b/lib/model/compose.dart\nindex f1145e555f..09b02cb08c 100644\n--- a/lib/model/compose.dart\n+++ b/lib/model/compose.dart\n@@ -188,8 +188,8 @@ String wildcardMention(WildcardMentionOption wildcardOption, {\n /// result may be surprising.\n ///\n /// The part between \"(\" and \")\" is just a \"link destination\" (no \"link title\").\n-/// That destination is simply the stringified [destination], if provided.\n-/// If that has parentheses in it, the result may be surprising.\n+/// That destination is the string [destination].\n+/// If [destination] has parentheses in it, the result may be surprising.\n // TODO: Try harder to guarantee output that creates an inline link,\n // and in particular, the intended one. We could help with this by escaping\n // square brackets, perhaps with HTML character references:\n@@ -199,8 +199,8 @@ String wildcardMention(WildcardMentionOption wildcardOption, {\n // > Backtick code spans, autolinks, and raw HTML tags bind more tightly\n // > than the brackets in link text. Thus, for example, [foo`]` could not be\n // > a link text, since the second ] is part of a code span.\n-String inlineLink(String visibleText, Uri? destination) {\n- return '[$visibleText](${destination?.toString() ?? ''})';\n+String inlineLink(String visibleText, String destination) {\n+ return '[$visibleText]($destination)';\n }\n \n /// What we show while fetching the target message's raw Markdown.\n@@ -213,7 +213,7 @@ String quoteAndReplyPlaceholder(\n SendableNarrow.ofMessage(message, selfUserId: store.selfUserId),\n nearMessageId: message.id);\n return '${userMentionFromMessage(message, silent: true, users: store)} '\n- '${inlineLink('said', url)}: ' // TODO(#1285)\n+ '${inlineLink('said', url.toString())}: ' // TODO(#1285)\n '*${zulipLocalizations.composeBoxLoadingMessage(message.id)}*\\n';\n }\n \n@@ -237,6 +237,6 @@ String quoteAndReply(PerAccountStore store, {\n // and the extra noise won't much matter with the already probably-long\n // message link in there too.\n return '${userMentionFromMessage(message, silent: true, users: store)} '\n- '${inlineLink('said', url)}:\\n' // TODO(#1285)\n+ '${inlineLink('said', url.toString())}:\\n' // TODO(#1285)\n '${wrapWithBacktickFence(content: rawContent, infoString: 'quote')}';\n }\ndiff --git a/lib/widgets/compose_box.dart b/lib/widgets/compose_box.dart\nindex 6514631955..99eeef3b0d 100644\n--- a/lib/widgets/compose_box.dart\n+++ b/lib/widgets/compose_box.dart\n@@ -350,7 +350,7 @@ class ComposeContentController extends ComposeController\n final tag = _nextUploadTag;\n _nextUploadTag += 1;\n final linkText = zulipLocalizations.composeBoxUploadingFilename(filename);\n- final placeholder = inlineLink(linkText, null);\n+ final placeholder = inlineLink(linkText, '');\n _uploads[tag] = (filename: filename, placeholder: placeholder);\n notifyListeners(); // _uploads change could affect validationErrors\n value = value.replaced(insertionIndex(), '$placeholder\\n\\n');\n@@ -359,9 +359,9 @@ class ComposeContentController extends ComposeController\n \n /// Tells the controller that a file upload has ended, with success or error.\n ///\n- /// To indicate success, pass the URL to be used for the Markdown link.\n+ /// To indicate success, pass the URL string to be used for the Markdown link.\n /// If `url` is null, failure is assumed.\n- void registerUploadEnd(int tag, Uri? url) {\n+ void registerUploadEnd(int tag, String? url) {\n final val = _uploads[tag];\n assert(val != null, 'registerUploadEnd called twice for same tag');\n final (:filename, :placeholder) = val!;\n@@ -971,7 +971,7 @@ Future _uploadFiles({\n \n for (final (tag, file) in uploadsInProgress) {\n final _File(:content, :length, :filename, :mimeType) = file;\n- Uri? url;\n+ String? url;\n try {\n final result = await uploadFile(store.connection,\n content: content,\n@@ -979,7 +979,7 @@ Future _uploadFiles({\n filename: filename,\n contentType: mimeType,\n );\n- url = Uri.parse(result.uri);\n+ url = result.url;\n } catch (e) {\n if (!context.mounted) return;\n // TODO(#741): Specifically handle `413 Payload Too Large`\n", "test_patch": "diff --git a/test/api/route/messages_test.dart b/test/api/route/messages_test.dart\nindex f00bf4428f..a862b512b6 100644\n--- a/test/api/route/messages_test.dart\n+++ b/test/api/route/messages_test.dart\n@@ -567,7 +567,7 @@ void main() {\n required String? contentType,\n }) async {\n connection.prepare(json:\n- UploadFileResult(uri: '/user_uploads/1/4e/m2A3MSqFnWRLUf9SaPzQ0Up_/$filename').toJson());\n+ UploadFileResult(url: '/user_uploads/1/4e/m2A3MSqFnWRLUf9SaPzQ0Up_/$filename').toJson());\n await uploadFile(connection,\n content: Stream.fromIterable(content),\n length: length,\ndiff --git a/test/model/compose_test.dart b/test/model/compose_test.dart\nindex 2031b69d28..d7479f8ec5 100644\n--- a/test/model/compose_test.dart\n+++ b/test/model/compose_test.dart\n@@ -319,9 +319,9 @@ hello\n });\n \n test('inlineLink', () {\n- check(inlineLink('CZO', Uri.parse('https://chat.zulip.org/'))).equals('[CZO](https://chat.zulip.org/)');\n- check(inlineLink('Uploading file.txt\u2026', null)).equals('[Uploading file.txt\u2026]()');\n- check(inlineLink('IMG_2488.png', Uri.parse('/user_uploads/2/a3/ucEMyjxk90mcNF0y9rmW5XKO/IMG_2488.png')))\n+ check(inlineLink('CZO', 'https://chat.zulip.org/')).equals('[CZO](https://chat.zulip.org/)');\n+ check(inlineLink('Uploading file.txt\u2026', '')).equals('[Uploading file.txt\u2026]()');\n+ check(inlineLink('IMG_2488.png', '/user_uploads/2/a3/ucEMyjxk90mcNF0y9rmW5XKO/IMG_2488.png'))\n .equals('[IMG_2488.png](/user_uploads/2/a3/ucEMyjxk90mcNF0y9rmW5XKO/IMG_2488.png)');\n });\n \ndiff --git a/test/widgets/compose_box_test.dart b/test/widgets/compose_box_test.dart\nindex f39e74c138..d79acce925 100644\n--- a/test/widgets/compose_box_test.dart\n+++ b/test/widgets/compose_box_test.dart\n@@ -1070,7 +1070,7 @@ void main() {\n size: 12345,\n )]);\n connection.prepare(delay: const Duration(seconds: 1), json:\n- UploadFileResult(uri: '/user_uploads/1/4e/m2A3MSqFnWRLUf9SaPzQ0Up_/image.jpg').toJson());\n+ UploadFileResult(url: '/user_uploads/1/4e/m2A3MSqFnWRLUf9SaPzQ0Up_/image.jpg').toJson());\n \n await tester.tap(find.byIcon(ZulipIcons.image));\n await tester.pump();\n@@ -1129,7 +1129,7 @@ void main() {\n path: '/private/var/mobile/Containers/Data/Application/foo/tmp/image.jpg',\n );\n connection.prepare(delay: const Duration(seconds: 1), json:\n- UploadFileResult(uri: '/user_uploads/1/4e/m2A3MSqFnWRLUf9SaPzQ0Up_/image.jpg').toJson());\n+ UploadFileResult(url: '/user_uploads/1/4e/m2A3MSqFnWRLUf9SaPzQ0Up_/image.jpg').toJson());\n \n await tester.tap(find.byIcon(ZulipIcons.camera));\n await tester.pump();\n@@ -1168,6 +1168,34 @@ void main() {\n // target platform the test is simulating.\n // TODO(upstream): unskip after fix to https://github.com/flutter/flutter/issues/161073\n skip: Platform.isWindows);\n+\n+ testWidgets('use verbatim URL string from server, not re-encoded', (tester) async {\n+ // Regression test for: https://github.com/zulip/zulip-flutter/issues/1709\n+ TypingNotifier.debugEnable = false;\n+ addTearDown(TypingNotifier.debugReset);\n+\n+ final channel = eg.stream();\n+ final narrow = eg.topicNarrow(channel.streamId, 'a topic');\n+ await prepareComposeBox(tester, narrow: narrow, streams: [channel]);\n+\n+ testBinding.pickFilesResult = FilePickerResult([PlatformFile(\n+ readStream: Stream.fromIterable(['asdf'.codeUnits]),\n+ path: '/some/path/\ud55c\uad6d\uc5b4 \ud30c\uc77c.txt',\n+ name: '\ud55c\uad6d\uc5b4 \ud30c\uc77c.txt',\n+ size: 4,\n+ )]);\n+ connection.prepare(json: UploadFileResult(url:\n+ '/user_uploads/1/4e/m2A3MSqFnWRLUf9SaPzQ0Up_/\ud55c\uad6d\uc5b4 \ud30c\uc77c.txt').toJson());\n+ await tester.tap(find.byIcon(ZulipIcons.image));\n+ await tester.pump();\n+ check(controller!.content.text)\n+ .equals('[Uploading \ud55c\uad6d\uc5b4 \ud30c\uc77c.txt\u2026]()\\n\\n');\n+\n+ await tester.pump(Duration.zero);\n+ check(controller!.content.text)\n+ .equals('[\ud55c\uad6d\uc5b4 \ud30c\uc77c.txt]('\n+ '/user_uploads/1/4e/m2A3MSqFnWRLUf9SaPzQ0Up_/\ud55c\uad6d\uc5b4 \ud30c\uc77c.txt)\\n\\n');\n+ });\n });\n \n group('error banner', () {\n@@ -1833,7 +1861,7 @@ void main() {\n testBinding.pickFilesResult = FilePickerResult([\n PlatformFile(name: 'file.jpg', size: 1000, readStream: Stream.fromIterable(['asdf'.codeUnits]))]);\n connection.prepare(json:\n- UploadFileResult(uri: '/path/file.jpg').toJson());\n+ UploadFileResult(url: '/path/file.jpg').toJson());\n await tester.tap(find.byIcon(ZulipIcons.attach_file), warnIfMissed: false);\n await tester.pump(Duration.zero);\n checkNoErrorDialog(tester);\n", "n2p_tests": "{\"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation content code points not counted unnecessarily\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence whitespace around info string\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert in middle text start; two empty lines; insertion point; two empty lines\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices clearing text sends a \\\"typing stopped\\\" notice\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message tap Cancel during fetch-raw-content request: TopicNarrow(239, topic)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert at start multiple lines, last is complete; insert one line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert at start two empty lines; insert one line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence dangling opening fence\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy user gains privilege -> banner is replaced with the compose box\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users 1:1 DMs active user becomes deactivated -> compose box is replaced with a banner\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: auto focus ChannelNarrow, non-empty fetch\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message tap Cancel after fetch-raw-content request: ChannelNarrow(239)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: updateMessageFlagsForNarrow narrow uses resolveApiNarrowForServer to encode\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, content input has focus, then loses it\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: getMessage applyMarkdown false\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: getMessages narrow uses resolveApiNarrowForServer to encode\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with non-empty topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: sending to empty topic if topics are mandatory, reject \\\"(no topic)\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: getMessageCompat modern; message found\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: uploadFile without mime type\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to DmNarrow with self\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: message-send request response success\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention user userMentionFromMessage, unknown user\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention user `users` passed; user has unique fullName\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence three-, four-, and five-backtick blocks\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message interrupting new-message compose: ChannelNarrow(239)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert at end multiple lines, last is incomplete; insert one line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy error banner is shown in topic narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: removeReaction Zulip extra emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy compose box is shown in topic narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention user `users` passed; has two users with same fullName\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: sending to empty topic if topics are mandatory, reject `realmEmptyTopicDisplayName`\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent interrupting new-message compose: proceed through confirmation dialog\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users group DMs all deactivated users become active -> banner is replaced with the compose box\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention user `users` passed; has two same-name users but one of them is deactivated\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, content input has focus, then topic input gains focus\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation topic too-long topic is rejected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to TopicNarrow with non-empty topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert at end one line, incomplete; insert one line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert in middle text start; one empty line; insertion point; one empty line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, mandatory topics with non-empty but vacuous topics \\\"(no topic)\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message tap Cancel after fetch-raw-content request: DmNarrow(allRecipientIds: [1072, 1148])\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message fetch-raw-content fails: TopicNarrow(239, topic)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention wildcard\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded empty; insert one line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence backtick fences may be indented up to three spaces\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: getMessages smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: sendMessage legacy: when server does not support readBySender, sends a User-Agent the server will recognize\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert at start one line, incomplete; insert one line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox textCapitalization _StreamComposeBox\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox textCapitalization _FixedDestinationComposeBox\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent interrupting message edit: cancel confirmation dialog\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, mandatory topics legacy: with empty topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBoxState new-event-queue transition content input not cleared when store changes\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention user userMentionFromMessage, known user\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: TopicNarrow(239, topic), from action sheet\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices navigating away sends a \\\"typing stopped\\\" notice\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: addReaction unicode emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert at start multiple lines, last is complete; insert two lines\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: inlineLink\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert in middle text start; two empty lines; insertion point; one empty line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence code blocks marked by indentation or tilde fences don't affect result\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message interrupting new-message compose by tapping failed edit to restore: ChannelNarrow(239)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to group DmNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent restore content in DM narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert at end one empty line; insert one line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: ChannelNarrow(239), from restoring a failed edit\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, mandatory topics with empty topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message interrupting new-message compose: TopicNarrow(239, topic)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention user not silent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence no code blocks; incomplete final line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message interrupting new-message compose: DmNarrow(allRecipientIds: [1072, 1148])\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: removeReaction realm emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBoxTheme lerp light to dark, no crash\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert in middle text start; one empty line; insertion point; two empty lines\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: getMessageCompat legacy; message not found\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox content input scaling normal text scale factor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox content input scaling higher text scale factor exceeding threshold\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: addReaction Zulip extra emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: auto focus DmNarrow, non-empty fetch\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: ChannelNarrow(239), from action sheet\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices hitting send button sends a \\\"typing stopped\\\" notice\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices smoke ChannelNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation content too-long content is rejected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: getMessage Throws assertion error when FL <120\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: ApiNarrow.toJson\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy channel policy becomes stricter -> compose box is replaced with the banner\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: sending to empty topic empty topic -> \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, mandatory topics with non-empty but vacuous topics realm_empty_topic_display_name\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController ContentValidationError.empty requireNotEmpty: false\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: removeReaction unicode emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert at start multiple lines, last is incomplete; insert one line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence five-backtick block; incomplete final line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users group DMs at least one user becomes deactivated -> compose box is replaced with a banner\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: uploads use verbatim URL string from server, not re-encoded\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, topic input has focus\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: uploads attach from camera success\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: auto focus DmNarrow, empty fetch\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: updateMessage pure content change\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy channel policy becomes less strict -> banner is replaced with the compose box\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence multiple three-backtick blocks; one has info string\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices smoke DmNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence content consisting of blank lines\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: auto focus ChannelNarrow, empty fetch\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: updateMessage channel change\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence four-backtick block\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: uploads attach from media library success\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices smoke TopicNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, content input has focus\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent interrupting new-message compose: cancel confirmation dialog\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy error banner is shown in channel narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence single line with no code blocks\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert in middle middle of line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence five-backtick block\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: updateMessageFlagsForNarrow numeric anchor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence three-backtick block\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert at end multiple lines, last is complete; insert two lines\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: sendMessage when readBySender is null, sends a User-Agent we know the server will recognize\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded empty; insert two lines\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, mandatory topics with non-empty topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: sending to empty topic legacy: empty topic -> \\\"(no topic)\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: updateMessageFlags smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: getMessage allow empty topic name\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController ContentValidationError.empty requireNotEmpty: true (default)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: TopicNarrow(239, topic), from restoring a failed edit\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert in middle end of non-empty line, before non-empty line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert in middle start of non-empty line, after empty line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: auto focus TopicNarrow, non-empty fetch\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert at end one line, complete; insert one line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert at end multiple lines, last is complete; insert one line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: quoteAndReply / quoteAndReplyPlaceholder\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: sendMessage to DM conversation\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: sendMessage smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert in middle start of non-empty line, after non-empty line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: updateMessageFlagsForNarrow smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to TopicNarrow with empty topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: DmNarrow(allRecipientIds: [1072, 1148]), from restoring a failed edit\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: getMessage applyMarkdown true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: addReaction realm emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: Anchor.toJson\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: message-send request response ZulipApiException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert at start one empty line; insert one line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent restore content in topic narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory legacy: with empty topic, topic input has focus\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to 1:1 DmNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: sendMessage to DM conversation, with legacy type \\\"private\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation topic code points not counted unnecessarily\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users group DMs compose box replaced with a banner\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: sending to empty topic if topics are mandatory, reject empty topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent restore content and topic in channel narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory legacy: with empty topic, content input has focus\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent interrupting message edit: proceed through confirmation dialog\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: getMessageCompat legacy; message found\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: getMessageCompat modern; message not found\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox content input scaling lower text scale factor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: uploadFile with mime type\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices for content input, unfocusing sends a \\\"typing stopped\\\" notice\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users 1:1 DMs deactivated user becomes active -> banner is replaced with the compose box\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence multiple lines with no code blocks\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation topic max-length topic not rejected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices unfocusing app sends a \\\"typing stopped\\\" notice\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: sendMessage to stream\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message tap Cancel when editing from a restored failed edit: ChannelNarrow(239)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, topic input has focus, then loses it\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence fence ignored if info string has backtick\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices selection change sends a \\\"typing started\\\" notice\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: DmNarrow(allRecipientIds: [1072, 1148]), from action sheet\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: updateMessage topic/content change\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert at end two empty lines; insert one line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert at start one line, complete; insert one line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation content max-length content not rejected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention user silent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, topic input has focus, then content input gains focus\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users 1:1 DMs compose box replaced with a banner\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with non-empty but vacuous topic, topic input has focus\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: auto focus TopicNarrow, empty fetch\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention user userMentionFromMessage, muted user\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/messages_test.dart: getMessages numeric anchor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy compose box is shown in channel narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy user loses privilege -> compose box is replaced with the banner\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox content input scaling higher text scale factor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence with info string\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence empty content\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1775", "org": "zulip", "repo": "zulip-flutter", "number": 1775, "state": "closed", "title": "autocomplete: Support user-group mentions; match users by email; rank results by match quality", "body": "Fixes #236.\r\nFixes #233.\r\n\r\nScreenshots coming soon.\r\n\r\n\"image\"\r\n\r\n\"image\"\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"58181da915402e7a959895b0831d632e9ad2a075\"}", "resolved_issues": "[{\"number\": 233, \"title\": \"autocomplete: Support user-group @-mentions\", \"body\": \"With #207 being merged, we now have an @-mention autocomplete UI for user mentions! \\ud83c\\udf89\\n\\nWe should extend it to support autocompleting user-_group_ mentions, like `@*mobile*`.\\n\\n### Related issues\\n\\n- Prerequisite: #662\"}, {\"number\": 236, \"title\": \"autocomplete: Filter user-autocomplete results according to email match, not just name\", \"body\": \"Currently, typing `@cbobbe` in the compose box gives no user-mention autocomplete results, even though my user's email address starts with `cbobbe`. We should include a user in the results if the query matches the user's email address.\"}]", "lang": "dart", "problem_statement": "autocomplete: Support user-group @-mentions\nWith #207 being merged, we now have an @-mention autocomplete UI for user mentions! \ud83c\udf89\n\nWe should extend it to support autocompleting user-_group_ mentions, like `@*mobile*`.\n\n### Related issues\n\n- Prerequisite: #662\nautocomplete: Filter user-autocomplete results according to email match, not just name\nCurrently, typing `@cbobbe` in the compose box gives no user-mention autocomplete results, even though my user's email address starts with `cbobbe`. We should include a user in the results if the query matches the user's email address.\n", "hints": "When implementing this, we should be sure to exclude deactivated groups from the results.\r\n\r\nUntil recently, such groups weren't included in the data the server gave us in the first place. Now they are:\r\n* https://chat.zulip.org/#narrow/stream/378-api-design/topic/deactivated.20groups.20in.20.60GET.60.20endpoints/near/1940339\r\n* https://github.com/zulip/zulip-flutter/issues/662#issuecomment-2344818170\r\n* https://github.com/zulip/zulip/pull/30504\r\n\nRequested on CZO as a \"mini-blocker\" for a user's team: [#mobile > Flutter app: group tags @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/Flutter.20app.3A.20group.20tags/near/2196872)\nRequested [in the Rust community](https://rust-lang.zulipchat.com/#narrow/channel/122653-zulip/topic/new.20mobile.20app.20feedback/near/526415430).\nWe should show the email in the popup as well, at least when the user's email matches the query but the name doesn't", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1775", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/233\", \"https://github.com/zulip/zulip-flutter/issues/236\"]", "test_command": "flutter test test/model/autocomplete_test.dart test/model/compose_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/autocomplete.dart b/lib/model/autocomplete.dart\nindex fe344189de..0b17f50b27 100644\n--- a/lib/model/autocomplete.dart\n+++ b/lib/model/autocomplete.dart\n@@ -8,11 +8,11 @@ import '../api/model/model.dart';\n import '../api/route/channels.dart';\n import '../generated/l10n/zulip_localizations.dart';\n import '../widgets/compose_box.dart';\n+import 'algorithms.dart';\n import 'compose.dart';\n import 'emoji.dart';\n import 'narrow.dart';\n import 'store.dart';\n-import 'user.dart';\n \n extension ComposeContentAutocomplete on ComposeContentController {\n AutocompleteIntent? autocompleteIntent() {\n@@ -249,6 +249,14 @@ class AutocompleteViewManager {\n autocompleteDataCache.invalidateUser(event.userId);\n }\n \n+ void handleUserGroupRemoveEvent(UserGroupRemoveEvent event) {\n+ autocompleteDataCache.invalidateUserGroup(event.groupId);\n+ }\n+\n+ void handleUserGroupUpdateEvent(UserGroupUpdateEvent event) {\n+ autocompleteDataCache.invalidateUserGroup(event.groupId);\n+ }\n+\n /// Called when the app is reassembled during debugging, e.g. for hot reload.\n ///\n /// Calls [AutocompleteView.reassemble] for all that are registered.\n@@ -423,6 +431,7 @@ class MentionAutocompleteView extends AutocompleteView sortedUsers;\n+ final List sortedUserGroups;\n final ZulipLocalizations localizations;\n \n static List _usersByRelevance({\n@@ -455,18 +466,23 @@ class MentionAutocompleteView extends AutocompleteView _userGroupsByRelevance({required PerAccountStore store}) {\n+ return store.activeGroups\n+ // TODO(#1776) Follow new \"Who can mention this group\" setting instead\n+ .where((userGroup) => !userGroup.isSystemGroup)\n+ .toList()\n+ ..sort(_userGroupComparator(store: store));\n+ }\n+\n+ static int Function(UserGroup, UserGroup) _userGroupComparator({\n+ required PerAccountStore store,\n+ }) {\n+ // See also [MentionAutocompleteQuery._rankUserGroupResult];\n+ // that ranking takes precedence over this.\n+\n+ return (userGroupA, userGroupB) =>\n+ compareGroupsByAlphabeticalOrder(userGroupA, userGroupB, store: store);\n+ }\n+\n+ static int compareGroupsByAlphabeticalOrder(UserGroup userGroupA, UserGroup userGroupB,\n+ {required PerAccountStore store}) {\n+ final groupAName = store.autocompleteViewManager.autocompleteDataCache\n+ .lowercaseNameForUserGroup(userGroupA);\n+ final groupBName = store.autocompleteViewManager.autocompleteDataCache\n+ .lowercaseNameForUserGroup(userGroupB);\n+ return groupAName.compareTo(groupBName); // TODO(i18n): add locale-aware sorting\n+ }\n+\n void computeWildcardMentionResults({\n required List results,\n required bool isComposingChannelMessage,\n@@ -610,11 +656,10 @@ class MentionAutocompleteView extends AutocompleteView?> computeResults() async {\n- final results = [];\n+ final unsorted = [];\n // Give priority to wildcard mentions.\n- computeWildcardMentionResults(results: results,\n+ computeWildcardMentionResults(results: unsorted,\n isComposingChannelMessage: narrow is ChannelNarrow || narrow is TopicNarrow);\n \n if (await filterCandidates(filter: _testUser,\n- candidates: sortedUsers, results: results)) {\n+ candidates: sortedUsers, results: unsorted)) {\n return null;\n }\n- return results;\n+\n+ if (await filterCandidates(filter: _testUserGroup,\n+ candidates: sortedUserGroups, results: unsorted)) {\n+ return null;\n+ }\n+\n+ return bucketSort(unsorted,\n+ (r) => r.rank, numBuckets: MentionAutocompleteQuery._numResultRanks);\n }\n \n MentionAutocompleteResult? _testUser(MentionAutocompleteQuery query, User user) {\n- if (query.testUser(user, store.autocompleteViewManager.autocompleteDataCache, store)) {\n- return UserMentionAutocompleteResult(userId: user.userId);\n- }\n- return null;\n+ return query.testUser(user, store);\n+ }\n+\n+ MentionAutocompleteResult? _testUserGroup(MentionAutocompleteQuery query, UserGroup userGroup) {\n+ return query.testUserGroup(userGroup, store);\n }\n \n @override\n@@ -695,11 +748,15 @@ abstract class AutocompleteQuery {\n \n late final List _lowercaseWords;\n \n- /// Whether all of this query's words have matches in [words] that appear in order.\n+ /// Whether all of this query's words have matches in [words],\n+ /// modulo case, that appear in order.\n ///\n /// A \"match\" means the word in [words] starts with the query word.\n+ ///\n+ /// [words] must all be lowercased.\n bool _testContainsQueryWords(List words) {\n- // TODO(#237) test with diacritics stripped, where appropriate\n+ // TODO(#237) test with diacritics stripped, where appropriate,\n+ // and update dartdoc's summary line and its restriction about [words].\n int wordsIndex = 0;\n int queryWordsIndex = 0;\n while (true) {\n@@ -718,6 +775,24 @@ abstract class AutocompleteQuery {\n }\n }\n \n+/// The match quality of a [User.fullName] or [UserGroup.name]\n+/// to a mention autocomplete query.\n+///\n+/// All matches are case-insensitive.\n+enum NameMatchQuality {\n+ /// The query matches the whole name exactly.\n+ exact,\n+\n+ /// The name starts with the query.\n+ totalPrefix,\n+\n+ /// All of the query's words have matches in the words of the name\n+ /// that appear in order.\n+ ///\n+ /// A \"match\" means the word in the name starts with the query word.\n+ wordPrefixes,\n+}\n+\n /// Any autocomplete query in the compose box's content input.\n abstract class ComposeAutocompleteQuery extends AutocompleteQuery {\n ComposeAutocompleteQuery(super.raw);\n@@ -748,25 +823,122 @@ class MentionAutocompleteQuery extends ComposeAutocompleteQuery {\n store: store, localizations: localizations, narrow: narrow, query: this);\n }\n \n- bool testWildcardOption(WildcardMentionOption wildcardOption, {\n+ WildcardMentionAutocompleteResult? testWildcardOption(WildcardMentionOption wildcardOption, {\n required ZulipLocalizations localizations}) {\n // TODO(#237): match insensitively to diacritics\n- return wildcardOption.canonicalString.contains(_lowercase)\n+ final matches = wildcardOption.canonicalString.contains(_lowercase)\n || wildcardOption.localizedCanonicalString(localizations).contains(_lowercase);\n+ if (!matches) return null;\n+ return WildcardMentionAutocompleteResult(\n+ wildcardOption: wildcardOption, rank: _rankWildcardResult);\n }\n \n- bool testUser(User user, AutocompleteDataCache cache, UserStore store) {\n- if (!user.isActive) return false;\n- if (store.isUserMuted(user.userId)) return false;\n+ MentionAutocompleteResult? testUser(User user, PerAccountStore store) {\n+ if (!user.isActive) return null;\n+ if (store.isUserMuted(user.userId)) return null;\n+\n+ final cache = store.autocompleteViewManager.autocompleteDataCache;\n+ final nameMatchQuality = _matchName(\n+ normalizedName: cache.normalizedNameForUser(user),\n+ normalizedNameWords: cache.normalizedNameWordsForUser(user));\n+ bool? matchesEmail;\n+ if (nameMatchQuality == null) {\n+ matchesEmail = _matchEmail(user, cache);\n+ if (!matchesEmail) return null;\n+ }\n \n- // TODO(#236) test email too, not just name\n- return _testName(user, cache);\n+ return UserMentionAutocompleteResult(\n+ userId: user.userId,\n+ rank: _rankUserResult(user,\n+ nameMatchQuality: nameMatchQuality, matchesEmail: matchesEmail));\n }\n \n- bool _testName(User user, AutocompleteDataCache cache) {\n- return _testContainsQueryWords(cache.nameWordsForUser(user));\n+ NameMatchQuality? _matchName({\n+ required String normalizedName,\n+ required List normalizedNameWords,\n+ }) {\n+ if (normalizedName.startsWith(_lowercase)) {\n+ if (normalizedName.length == _lowercase.length) {\n+ return NameMatchQuality.exact;\n+ } else {\n+ return NameMatchQuality.totalPrefix;\n+ }\n+ }\n+\n+ if (_testContainsQueryWords(normalizedNameWords)) {\n+ return NameMatchQuality.wordPrefixes;\n+ }\n+\n+ return null;\n }\n \n+ bool _matchEmail(User user, AutocompleteDataCache cache) {\n+ final lowercaseEmail = cache.normalizedEmailForUser(user);\n+ if (lowercaseEmail == null) return false; // Email not known\n+ return lowercaseEmail.startsWith(_lowercase);\n+ }\n+\n+ MentionAutocompleteResult? testUserGroup(UserGroup userGroup, PerAccountStore store) {\n+ final cache = store.autocompleteViewManager.autocompleteDataCache;\n+\n+ final nameMatchQuality = _matchName(\n+ normalizedName: cache.lowercaseNameForUserGroup(userGroup),\n+ normalizedNameWords: cache.lowercaseNameWordsForUserGroup(userGroup));\n+\n+ if (nameMatchQuality == null) return null;\n+\n+ return UserGroupMentionAutocompleteResult(\n+ groupId: userGroup.id,\n+ rank: _rankUserGroupResult(userGroup, nameMatchQuality: nameMatchQuality));\n+ }\n+\n+ /// A measure of a wildcard result's quality in the context of the query,\n+ /// from 0 (best) to one less than [_numResultRanks].\n+ ///\n+ /// See also [_rankUserResult] and [_rankUserGroupResult].\n+ static const _rankWildcardResult = 0;\n+\n+ /// A measure of a user result's quality in the context of the query,\n+ /// from 0 (best) to one less than [_numResultRanks].\n+ ///\n+ /// When [nameMatchQuality] is non-null (the name matches),\n+ /// callers should skip computing [matchesEmail] and pass null for that.\n+ ///\n+ /// See also [_rankWildcardResult] and [_rankUserGroupResult].\n+ static int _rankUserResult(User user, {\n+ required NameMatchQuality? nameMatchQuality,\n+ required bool? matchesEmail,\n+ }) {\n+ if (nameMatchQuality != null) {\n+ assert(matchesEmail == null);\n+ return switch (nameMatchQuality) {\n+ NameMatchQuality.exact => 1,\n+ NameMatchQuality.totalPrefix => 2,\n+ NameMatchQuality.wordPrefixes => 3,\n+ };\n+ }\n+ assert(matchesEmail == true);\n+ return 7;\n+ }\n+\n+ /// A measure of a user-group result's quality in the context of the query,\n+ /// from 0 (best) to one less than [_numResultRanks].\n+ ///\n+ /// See also [_rankWildcardResult] and [_rankUserResult].\n+ static int _rankUserGroupResult(UserGroup userGroup, {\n+ required NameMatchQuality nameMatchQuality,\n+ }) {\n+ return switch (nameMatchQuality) {\n+ NameMatchQuality.exact => 4,\n+ NameMatchQuality.totalPrefix => 5,\n+ NameMatchQuality.wordPrefixes => 6,\n+ };\n+ }\n+\n+ /// The number of possible values returned by\n+ /// [_rankWildcardResult], [_rankUserResult], and [_rankUserGroupResult]..\n+ static const _numResultRanks = 8;\n+\n @override\n String toString() {\n return '${objectRuntimeType(this, 'MentionAutocompleteQuery')}(raw: $raw, silent: $silent})';\n@@ -801,20 +973,48 @@ extension WildcardMentionOptionExtension on WildcardMentionOption {\n class AutocompleteDataCache {\n final Map _normalizedNamesByUser = {};\n \n- /// The lowercase `fullName` of [user].\n+ /// The normalized `fullName` of [user].\n String normalizedNameForUser(User user) {\n return _normalizedNamesByUser[user.userId] ??= user.fullName.toLowerCase();\n }\n \n- final Map> _nameWordsByUser = {};\n+ final Map> _normalizedNameWordsByUser = {};\n+\n+ List normalizedNameWordsForUser(User user) {\n+ return _normalizedNameWordsByUser[user.userId]\n+ ??= normalizedNameForUser(user).split(' ');\n+ }\n+\n+ final Map _normalizedEmailsByUser = {};\n+\n+ /// The normalized `deliveryEmail` of [user], or null if that's null.\n+ String? normalizedEmailForUser(User user) {\n+ return _normalizedEmailsByUser[user.userId] ??= user.deliveryEmail?.toLowerCase();\n+ }\n+\n+ final Map _lowercaseNamesByUserGroup = {};\n+\n+ /// The normalized `name` of [userGroup].\n+ String lowercaseNameForUserGroup(UserGroup userGroup) {\n+ return _lowercaseNamesByUserGroup[userGroup.id] ??= userGroup.name.toLowerCase();\n+ }\n+\n+ final Map> _lowercaseNameWordsByUserGroup = {};\n \n- List nameWordsForUser(User user) {\n- return _nameWordsByUser[user.userId] ??= normalizedNameForUser(user).split(' ');\n+ List lowercaseNameWordsForUserGroup(UserGroup userGroup) {\n+ return _lowercaseNameWordsByUserGroup[userGroup.id]\n+ ??= lowercaseNameForUserGroup(userGroup).split(' ');\n }\n \n void invalidateUser(int userId) {\n _normalizedNamesByUser.remove(userId);\n- _nameWordsByUser.remove(userId);\n+ _normalizedNameWordsByUser.remove(userId);\n+ _normalizedEmailsByUser.remove(userId);\n+ }\n+\n+ void invalidateUserGroup(int id) {\n+ _lowercaseNamesByUserGroup.remove(id);\n+ _lowercaseNameWordsByUserGroup.remove(id);\n }\n }\n \n@@ -853,23 +1053,72 @@ class EmojiAutocompleteResult extends ComposeAutocompleteResult {\n /// This is abstract because there are several kinds of result\n /// that can all be offered in the same @-mention autocomplete interaction:\n /// a user, a wildcard, or a user group.\n-sealed class MentionAutocompleteResult extends ComposeAutocompleteResult {}\n+sealed class MentionAutocompleteResult extends ComposeAutocompleteResult {\n+ /// A measure of the result's quality in the context of the query.\n+ ///\n+ /// Used internally by [MentionAutocompleteView] for ranking the results.\n+ // See also [MentionAutocompleteView._usersByRelevance];\n+ // results with equal [rank] will appear in the order they were put in\n+ // by that method.\n+ //\n+ // Compare sort_recipients in Zulip web:\n+ // https://github.com/zulip/zulip/blob/afdf20c67/web/src/typeahead_helper.ts#L472\n+ //\n+ // Behavior we have that web doesn't and might like to follow:\n+ // - A \"word-prefixes\" match quality on user and user-group names:\n+ // see [NameMatchQuality.wordPrefixes], which we rank on.\n+ //\n+ // Behavior web has that seems undesired, which we don't plan to follow:\n+ // - Ranking humans above bots, even when the bots have higher relevance\n+ // and better match quality. If there's a bot participating in the\n+ // current conversation and I start typing its name, why wouldn't we want\n+ // that as a top result? Issue: https://github.com/zulip/zulip/issues/35467\n+ // - A \"word-boundary\" match quality on user and user-group names:\n+ // special rank when the whole query appears contiguously\n+ // right after a word-boundary character.\n+ // Our [NameMatchQuality.wordPrefixes] seems smarter.\n+ // - An \"exact\" match quality on emails: probably not worth its complexity.\n+ // Emails are much more uniform in their endings than users' names are,\n+ // so a prefix match should be adequate. (If I've typed \"email@example.co\",\n+ // that'll probably be the only result. There might be an \"email@example.com\",\n+ // and an \"exact\" match would downrank that, but still that's just two items\n+ // to scan through.)\n+ // - A \"word-boundary\" match quality on user emails:\n+ // \"words\" is a wrong abstraction when matching on emails.\n+ // - Ranking some case-sensitive matches differently from case-insensitive\n+ // matches. Users will expect a lowercase query to be adequate.\n+ int get rank;\n+}\n \n /// An autocomplete result for an @-mention of an individual user.\n class UserMentionAutocompleteResult extends MentionAutocompleteResult {\n- UserMentionAutocompleteResult({required this.userId});\n+ UserMentionAutocompleteResult({required this.userId, required this.rank});\n \n final int userId;\n+\n+ @override\n+ final int rank;\n }\n \n /// An autocomplete result for an @-mention of all the users in a conversation.\n class WildcardMentionAutocompleteResult extends MentionAutocompleteResult {\n- WildcardMentionAutocompleteResult({required this.wildcardOption});\n+ WildcardMentionAutocompleteResult({required this.wildcardOption, required this.rank});\n \n final WildcardMentionOption wildcardOption;\n+\n+ @override\n+ final int rank;\n }\n \n-// TODO(#233): // class UserGroupMentionAutocompleteResult extends MentionAutocompleteResult {\n+/// An autocomplete result for an @-mention of a user group.\n+class UserGroupMentionAutocompleteResult extends MentionAutocompleteResult {\n+ UserGroupMentionAutocompleteResult({required this.groupId, required this.rank});\n+\n+ final int groupId;\n+\n+ @override\n+ final int rank;\n+}\n \n /// An autocomplete interaction for choosing a topic for a message.\n class TopicAutocompleteView extends AutocompleteView {\ndiff --git a/lib/model/compose.dart b/lib/model/compose.dart\nindex 09b02cb08c..3a7a75976f 100644\n--- a/lib/model/compose.dart\n+++ b/lib/model/compose.dart\n@@ -181,6 +181,10 @@ String wildcardMention(WildcardMentionOption wildcardOption, {\n return '@**$name**';\n }\n \n+/// An @-mention of a user group, like @*mobile*.\n+String userGroupMention(String userGroupName, {bool silent = false}) =>\n+ '@${silent ? '_' : ''}*$userGroupName*';\n+\n /// https://spec.commonmark.org/0.30/#inline-link\n ///\n /// The \"link text\" is made by enclosing [visibleText] in square brackets.\ndiff --git a/lib/widgets/autocomplete.dart b/lib/widgets/autocomplete.dart\nindex 350eb86d56..5c853d2da0 100644\n--- a/lib/widgets/autocomplete.dart\n+++ b/lib/widgets/autocomplete.dart\n@@ -202,12 +202,30 @@ class ComposeAutocomplete extends AutocompleteField {\n@@ -20,6 +21,14 @@ extension UserMentionAutocompleteResultChecks on Subject get userId => has((r) => r.userId, 'userId');\n }\n \n+extension WildcardMentionAutocompleteResultChecks on Subject {\n+ Subject get wildcardOption => has((x) => x.wildcardOption, 'wildcardOption');\n+}\n+\n+extension UserGroupMentionAutocompleteResultChecks on Subject {\n+ Subject get groupId => has((r) => r.groupId, 'groupId');\n+}\n+\n extension TopicAutocompleteResultChecks on Subject {\n Subject get topic => has((r) => r.topic, 'topic');\n }\ndiff --git a/test/model/autocomplete_test.dart b/test/model/autocomplete_test.dart\nindex b95bb58ccb..92e5a81d9a 100644\n--- a/test/model/autocomplete_test.dart\n+++ b/test/model/autocomplete_test.dart\n@@ -320,21 +320,39 @@ void main() {\n for (int i = 1; i <= 2500; i++) {\n await store.addUser(eg.user(userId: i, email: 'user$i@example.com', fullName: 'User $i'));\n }\n+ for (int i = 1; i <= 2500; i++) {\n+ await store.addUserGroup(eg.userGroup(id: i, name: 'User Group $i'));\n+ }\n \n bool done = false;\n final view = MentionAutocompleteView.init(store: store, localizations: zulipLocalizations,\n narrow: narrow, query: MentionAutocompleteQuery('User 2222'));\n view.addListener(() { done = true; });\n \n+ // three batches for users\n+ await Future(() {});\n+ check(done).isFalse();\n+ await Future(() {});\n+ check(done).isFalse();\n+ await Future(() {});\n+ check(done).isFalse();\n+\n+ // three batches for user groups\n await Future(() {});\n check(done).isFalse();\n await Future(() {});\n check(done).isFalse();\n await Future(() {});\n check(done).isTrue();\n- check(view.results).single\n- .isA()\n- .userId.equals(2222);\n+\n+ check(view.results).deepEquals(>[\n+ (it) => it\n+ .isA()\n+ .userId.equals(2222),\n+ (it) => it\n+ .isA()\n+ .groupId.equals(2222),\n+ ]);\n });\n \n test('MentionAutocompleteView new query during computation replaces old', () async {\n@@ -343,6 +361,9 @@ void main() {\n for (int i = 1; i <= 1500; i++) {\n await store.addUser(eg.user(userId: i, email: 'user$i@example.com', fullName: 'User $i'));\n }\n+ for (int i = 1; i <= 1500; i++) {\n+ await store.addUserGroup(eg.userGroup(id: i, name: 'User Group $i'));\n+ }\n \n bool done = false;\n final view = MentionAutocompleteView.init(store: store, localizations: zulipLocalizations,\n@@ -353,21 +374,33 @@ void main() {\n check(done).isFalse();\n view.query = MentionAutocompleteQuery('User 234');\n \n- // \u2026new query goes through all batches\n+ // \u2026new query goes through all user batches\n+ await Future(() {});\n+ check(done).isFalse();\n+ await Future(() {});\n+ check(done).isFalse();\n+ // \u2026and all user-group batches\n await Future(() {});\n check(done).isFalse();\n await Future(() {});\n check(done).isTrue(); // new result is set\n- check(view.results).single\n- .isA()\n- .userId.equals(234);\n+\n+ void checkResult() {\n+ check(view.results).deepEquals(>[\n+ (it) => it\n+ .isA()\n+ .userId.equals(234),\n+ (it) => it\n+ .isA()\n+ .groupId.equals(234),\n+ ]);\n+ }\n+ checkResult();\n \n // new result sticks; it isn't clobbered with old query's result\n for (int i = 0; i < 10; i++) { // for good measure\n await Future(() {});\n- check(view.results).single\n- .isA()\n- .userId.equals(234);\n+ checkResult();\n }\n });\n \n@@ -403,76 +436,19 @@ void main() {\n ..not((results) => results.contains(11000));\n });\n \n- group('MentionAutocompleteQuery.testUser', () {\n- late PerAccountStore store;\n-\n- void doCheck(String rawQuery, User user, bool expected) {\n- final result = MentionAutocompleteQuery(rawQuery)\n- .testUser(user, AutocompleteDataCache(), store);\n- expected ? check(result).isTrue() : check(result).isFalse();\n- }\n-\n- test('user is always excluded when not active regardless of other criteria', () {\n- store = eg.store();\n-\n- doCheck('Full Name', eg.user(fullName: 'Full Name', isActive: false), false);\n- // When active then other criteria will be checked\n- doCheck('Full Name', eg.user(fullName: 'Full Name', isActive: true), true);\n- });\n-\n- test('user is always excluded when muted, regardless of other criteria', () async {\n- store = eg.store();\n- await store.setMutedUsers([1]);\n- doCheck('Full Name', eg.user(userId: 1, fullName: 'Full Name'), false);\n- // When not muted, then other criteria will be checked\n- doCheck('Full Name', eg.user(userId: 2, fullName: 'Full Name'), true);\n- });\n-\n- test('user is included if fullname words match the query', () {\n- store = eg.store();\n-\n- doCheck('', eg.user(fullName: 'Full Name'), true);\n- doCheck('', eg.user(fullName: ''), true); // Unlikely case, but should not crash\n- doCheck('Full Name', eg.user(fullName: 'Full Name'), true);\n- doCheck('full name', eg.user(fullName: 'Full Name'), true);\n- doCheck('Full Name', eg.user(fullName: 'full name'), true);\n- doCheck('Full', eg.user(fullName: 'Full Name'), true);\n- doCheck('Name', eg.user(fullName: 'Full Name'), true);\n- doCheck('Full Name', eg.user(fullName: 'Fully Named'), true);\n- doCheck('Full Four', eg.user(fullName: 'Full Name Four Words'), true);\n- doCheck('Name Words', eg.user(fullName: 'Full Name Four Words'), true);\n- doCheck('Full F', eg.user(fullName: 'Full Name Four Words'), true);\n- doCheck('F Four', eg.user(fullName: 'Full Name Four Words'), true);\n- doCheck('full full', eg.user(fullName: 'Full Full Name'), true);\n- doCheck('full full', eg.user(fullName: 'Full Name Full'), true);\n-\n- doCheck('F', eg.user(fullName: ''), false); // Unlikely case, but should not crash\n- doCheck('Fully Named', eg.user(fullName: 'Full Name'), false);\n- doCheck('Full Name', eg.user(fullName: 'Full'), false);\n- doCheck('Full Name', eg.user(fullName: 'Name'), false);\n- doCheck('ull ame', eg.user(fullName: 'Full Name'), false);\n- doCheck('ull Name', eg.user(fullName: 'Full Name'), false);\n- doCheck('Full ame', eg.user(fullName: 'Full Name'), false);\n- doCheck('Full Full', eg.user(fullName: 'Full Name'), false);\n- doCheck('Name Name', eg.user(fullName: 'Full Name'), false);\n- doCheck('Name Full', eg.user(fullName: 'Full Name'), false);\n- doCheck('Name Four Full Words', eg.user(fullName: 'Full Name Four Words'), false);\n- doCheck('F Full', eg.user(fullName: 'Full Name Four Words'), false);\n- doCheck('Four F', eg.user(fullName: 'Full Name Four Words'), false);\n- });\n- });\n-\n- group('MentionAutocompleteView sorting users results', () {\n+ group('MentionAutocompleteView sorting results', () {\n late PerAccountStore store;\n \n Future prepare({\n List users = const [],\n+ List userGroups = const [],\n List dmConversations = const [],\n List messages = const [],\n }) async {\n store = eg.store(initialSnapshot: eg.initialSnapshot(\n recentPrivateConversations: dmConversations));\n await store.addUsers(users);\n+ await store.addUserGroups(userGroups);\n await store.addMessages(messages);\n }\n \n@@ -805,18 +781,28 @@ void main() {\n final view = MentionAutocompleteView.init(store: store,\n localizations: zulipLocalizations, narrow: narrow, query: query);\n view.addListener(() { done = true; });\n- await Future(() {});\n+ await Future(() {}); // users\n+ await Future(() {}); // groups\n check(done).isTrue();\n final results = view.results;\n view.dispose();\n return results;\n }\n \n- Iterable getUsersFromResults(Iterable results)\n- => results.map((e) => (e as UserMentionAutocompleteResult).userId);\n+ Condition isUser(int userId) {\n+ return (it) => it.isA()\n+ .userId.equals(userId);\n+ }\n+\n+ Condition isUserGroup(int id) {\n+ return (it) => it.isA()\n+ .groupId.equals(id);\n+ }\n \n- Iterable getWildcardOptionsFromResults(Iterable results)\n- => results.map((e) => (e as WildcardMentionAutocompleteResult).wildcardOption);\n+ Condition isWildcard(WildcardMentionOption option) {\n+ return (it) => it.isA()\n+ .wildcardOption.equals(option);\n+ }\n \n final stream = eg.stream();\n const topic = 'topic';\n@@ -832,36 +818,48 @@ void main() {\n eg.user(userId: 7, fullName: 'User Seven'),\n ];\n \n- await prepare(users: users, messages: [\n- eg.streamMessage(id: 50, sender: users[1-1], stream: stream, topic: topic),\n- eg.streamMessage(id: 60, sender: users[5-1], stream: stream, topic: 'other $topic'),\n- ], dmConversations: [\n- RecentDmConversation(userIds: [4], maxMessageId: 300),\n- RecentDmConversation(userIds: [1], maxMessageId: 200),\n- RecentDmConversation(userIds: [1, 2], maxMessageId: 100),\n+ final userGroups = [\n+ eg.userGroup(id: 1, name: 'User Group One'),\n+ eg.userGroup(id: 2, name: 'User Group Two'),\n+ eg.userGroup(id: 3, name: 'User Group Three'),\n+ eg.userGroup(id: 4, name: 'User Group Four'),\n+ ];\n+\n+ await prepare(users: users, userGroups: userGroups, messages: [\n+ eg.streamMessage(sender: users[1-1], stream: stream, topic: topic),\n+ eg.streamMessage(sender: users[5-1], stream: stream, topic: 'other $topic'),\n+ eg.dmMessage(from: users[1-1], to: [users[2-1], eg.selfUser]),\n+ eg.dmMessage(from: users[1-1], to: [eg.selfUser]),\n+ eg.dmMessage(from: users[4-1], to: [eg.selfUser]),\n ]);\n \n- // Check the ranking of the full list of mentions.\n+ // Check the ranking of the full list of mentions,\n+ // i.e. the results for an empty query.\n // The order should be:\n- // 1. Wildcards before individual users.\n+ // 1. Wildcards before individual users; user groups (alphabetically) after.\n // 2. Users most recent in the current topic/stream.\n // 3. Users most recent in the DM conversations.\n // 4. Human vs. Bot users (human users come first).\n // 5. Users by name alphabetical order.\n- final results1 = await getResults(topicNarrow, MentionAutocompleteQuery(''));\n- check(getWildcardOptionsFromResults(results1.take(2)))\n- .deepEquals([WildcardMentionOption.all, WildcardMentionOption.topic]);\n- check(getUsersFromResults(results1.skip(2)))\n- .deepEquals([1, 5, 4, 2, 7, 3, 6]);\n+ // 6. User groups by name alphabetical order.\n+ check(await getResults(topicNarrow, MentionAutocompleteQuery(''))).deepEquals([\n+ isWildcard(WildcardMentionOption.all),\n+ isWildcard(WildcardMentionOption.topic),\n+ ...[1, 5, 4, 2, 7, 3, 6].map(isUser),\n+ ...[4, 1, 3, 2].map(isUserGroup),\n+ ]);\n \n // Check the ranking applies also to results filtered by a query.\n- final results2 = await getResults(topicNarrow, MentionAutocompleteQuery('t'));\n- check(getWildcardOptionsFromResults(results2.take(2)))\n- .deepEquals([WildcardMentionOption.stream, WildcardMentionOption.topic]);\n- check(getUsersFromResults(results2.skip(2))).deepEquals([2, 3]);\n- final results3 = await getResults(topicNarrow, MentionAutocompleteQuery('f'));\n- check(getWildcardOptionsFromResults(results3.take(0))).deepEquals([]);\n- check(getUsersFromResults(results3.skip(0))).deepEquals([5, 4]);\n+ check(await getResults(topicNarrow, MentionAutocompleteQuery('t'))).deepEquals([\n+ isWildcard(WildcardMentionOption.stream),\n+ isWildcard(WildcardMentionOption.topic),\n+ isUser(2), isUser(3), // 2 before 3 by DM recency\n+ isUserGroup(3), isUserGroup(2), // 3 before 2 by alphabet (\"\u2026Three\" before \"\u2026Two\")\n+ ]);\n+ check(await getResults(topicNarrow, MentionAutocompleteQuery('f'))).deepEquals([\n+ isUser(5), isUser(4),\n+ isUserGroup(4),\n+ ]);\n });\n });\n \n@@ -971,6 +969,187 @@ void main() {\n });\n });\n \n+ group('MentionAutocompleteQuery.testUser', () {\n+ late PerAccountStore store;\n+\n+ void doCheck(String rawQuery, User user, bool expected) {\n+ final result = MentionAutocompleteQuery(rawQuery).testUser(user, store);\n+ expected\n+ ? check(result).isA()\n+ : check(result).isNull();\n+ }\n+\n+ test('user is always excluded when not active regardless of other criteria', () {\n+ store = eg.store();\n+\n+ doCheck('Full Name', eg.user(fullName: 'Full Name', isActive: false), false);\n+ // When active then other criteria will be checked\n+ doCheck('Full Name', eg.user(fullName: 'Full Name', isActive: true), true);\n+ });\n+\n+ test('user is always excluded when muted, regardless of other criteria', () async {\n+ store = eg.store();\n+ await store.setMutedUsers([1]);\n+ doCheck('Full Name', eg.user(userId: 1, fullName: 'Full Name'), false);\n+ // When not muted, then other criteria will be checked\n+ doCheck('Full Name', eg.user(userId: 2, fullName: 'Full Name'), true);\n+ });\n+\n+ test('user is included if fullname words match the query', () {\n+ store = eg.store();\n+\n+ doCheck('', eg.user(fullName: 'Full Name'), true);\n+ doCheck('', eg.user(fullName: ''), true); // Unlikely case, but should not crash\n+ doCheck('Full Name', eg.user(fullName: 'Full Name'), true);\n+ doCheck('full name', eg.user(fullName: 'Full Name'), true);\n+ doCheck('Full Name', eg.user(fullName: 'full name'), true);\n+ doCheck('Full', eg.user(fullName: 'Full Name'), true);\n+ doCheck('Name', eg.user(fullName: 'Full Name'), true);\n+ doCheck('Full Name', eg.user(fullName: 'Fully Named'), true);\n+ doCheck('Full Four', eg.user(fullName: 'Full Name Four Words'), true);\n+ doCheck('Name Words', eg.user(fullName: 'Full Name Four Words'), true);\n+ doCheck('Full F', eg.user(fullName: 'Full Name Four Words'), true);\n+ doCheck('F Four', eg.user(fullName: 'Full Name Four Words'), true);\n+ doCheck('full full', eg.user(fullName: 'Full Full Name'), true);\n+ doCheck('full full', eg.user(fullName: 'Full Name Full'), true);\n+\n+ doCheck('F', eg.user(fullName: ''), false); // Unlikely case, but should not crash\n+ doCheck('Fully Named', eg.user(fullName: 'Full Name'), false);\n+ doCheck('Full Name', eg.user(fullName: 'Full'), false);\n+ doCheck('Full Name', eg.user(fullName: 'Name'), false);\n+ doCheck('ull ame', eg.user(fullName: 'Full Name'), false);\n+ doCheck('ull Name', eg.user(fullName: 'Full Name'), false);\n+ doCheck('Full ame', eg.user(fullName: 'Full Name'), false);\n+ doCheck('Full Full', eg.user(fullName: 'Full Name'), false);\n+ doCheck('Name Name', eg.user(fullName: 'Full Name'), false);\n+ doCheck('Name Full', eg.user(fullName: 'Full Name'), false);\n+ doCheck('Name Four Full Words', eg.user(fullName: 'Full Name Four Words'), false);\n+ doCheck('F Full', eg.user(fullName: 'Full Name Four Words'), false);\n+ doCheck('Four F', eg.user(fullName: 'Full Name Four Words'), false);\n+ });\n+ });\n+\n+ group('MentionAutocompleteQuery ranking', () {\n+ // This gets filled lazily, but never reset.\n+ // We're counting on this group's tests never doing anything to mutate it.\n+ PerAccountStore? store;\n+\n+ int? rankOf(String queryStr, Object candidate) {\n+ final query = MentionAutocompleteQuery(queryStr);\n+ final result = switch (candidate) {\n+ WildcardMentionOption() => query.testWildcardOption(candidate,\n+ localizations: GlobalLocalizations.zulipLocalizations),\n+ User() => query.testUser(candidate, (store ??= eg.store())),\n+ UserGroup() => query.testUserGroup(candidate, (store ??= eg.store())),\n+ _ => throw StateError('invalid candidate'),\n+ };\n+ return result?.rank;\n+ }\n+\n+ void checkPrecedes(String query, Object a, Object b) {\n+ check(rankOf(query, a)!).isLessThan(rankOf(query, b)!);\n+ }\n+\n+ void checkSameRank(String query, Object a, Object b) {\n+ check(rankOf(query, a)!).equals(rankOf(query, b)!);\n+ }\n+\n+ test('wildcards, then users', () {\n+ checkSameRank('', WildcardMentionOption.all, WildcardMentionOption.topic);\n+ checkPrecedes('', WildcardMentionOption.topic, eg.user());\n+ checkSameRank('', eg.user(), eg.user());\n+ });\n+\n+ test('wildcard-vs-user more significant than match quality', () {\n+ // Make the query an exact match for the user's name.\n+ final user = eg.user(fullName: 'Ann');\n+ checkPrecedes(user.fullName, WildcardMentionOption.channel, user);\n+ });\n+\n+ test('user name matched case-insensitively', () {\n+ final user1 = eg.user(fullName: 'Chris Bobbe');\n+ final user2 = eg.user(fullName: 'chris bobbe');\n+\n+ checkSameRank('chris bobbe', user1, user2); // exact\n+ checkSameRank('chris bo', user1, user2); // total-prefix\n+ checkSameRank('chr bo', user1, user2); // word-prefixes\n+ });\n+\n+ test('user name match: exact over total-prefix', () {\n+ final user1 = eg.user(fullName: 'Chris');\n+ final user2 = eg.user(fullName: 'Chris Bobbe');\n+\n+ checkPrecedes('chris', user1, user2);\n+ });\n+\n+ test('user name match: total-prefix over word-prefixes', () {\n+ final user1 = eg.user(fullName: 'So Many Ideas');\n+ final user2 = eg.user(fullName: 'Some Merry User');\n+\n+ checkPrecedes('so m', user1, user2);\n+ });\n+\n+ test('group name matched case-insensitively', () {\n+ final userGroup1 = eg.userGroup(name: 'Mobile Team');\n+ final userGroup2 = eg.userGroup(name: 'mobile team');\n+\n+ checkSameRank('mobile team', userGroup1, userGroup2); // exact\n+ checkSameRank('mobile te', userGroup1, userGroup2); // total-prefix\n+ checkSameRank('mob te', userGroup1, userGroup2); // word-prefixes\n+ });\n+\n+ test('group name match: exact over total-prefix', () {\n+ final userGroup1 = eg.userGroup(name: 'Mobile');\n+ final userGroup2 = eg.userGroup(name: 'Mobile Team');\n+\n+ checkPrecedes('mobile', userGroup1, userGroup2);\n+ });\n+\n+ test('group name match: total-prefix over word-prefixes', () {\n+ final userGroup1 = eg.userGroup(name: 'So Many Ideas');\n+ final userGroup2 = eg.userGroup(name: 'Some Merry Group');\n+\n+ checkPrecedes('so m', userGroup1, userGroup2);\n+ });\n+\n+ test('email matched case-insensitively', () {\n+ // \"z\" name to prevent accidental name match with example data\n+ final user1 = eg.user(fullName: 'z', deliveryEmail: 'email@example.com');\n+ final user2 = eg.user(fullName: 'z', deliveryEmail: 'EmAiL@ExAmPlE.com');\n+\n+ checkSameRank('email@example.com', user1, user2);\n+ checkSameRank('email@e', user1, user2);\n+ checkSameRank('email@', user1, user2);\n+ checkSameRank('email', user1, user2);\n+ checkSameRank('ema', user1, user2);\n+ });\n+\n+ test('email match is by prefix only', () {\n+ // \"z\" name to prevent accidental name match with example data\n+ final user = eg.user(fullName: 'z', deliveryEmail: 'email@example.com');\n+\n+ check(rankOf('e', user)).isNotNull();\n+ check(rankOf('mail', user)).isNull();\n+ check(rankOf('example', user)).isNull();\n+ check(rankOf('example.com', user)).isNull();\n+ });\n+\n+ test('full list of ranks', () {\n+ final user1 = eg.user(fullName: 'some user', deliveryEmail: 'email@example.com');\n+ final userGroup1 = eg.userGroup(name: 'some user group');\n+ check([\n+ rankOf('', WildcardMentionOption.all), // wildcard\n+ rankOf('some user', user1), // user, exact name match\n+ rankOf('some us', user1), // user, total-prefix name match\n+ rankOf('so us', user1), // user, word-prefixes name match\n+ rankOf('some user group', userGroup1), // user group, exact name match\n+ rankOf('some us', userGroup1), // user group, total-prefix name match\n+ rankOf('so us gr', userGroup1), // user group, word-prefixes name match\n+ rankOf('email', user1), // user, no name match, email match\n+ ]).deepEquals([0, 1, 2, 3, 4, 5, 6, 7]);\n+ });\n+ });\n+\n group('ComposeTopicAutocomplete.autocompleteIntent', () {\n void doTest(String markedText, TopicAutocompleteQuery? expectedQuery) {\n final parsed = parseMarkedText(markedText);\ndiff --git a/test/model/compose_test.dart b/test/model/compose_test.dart\nindex d7479f8ec5..23a2fe8971 100644\n--- a/test/model/compose_test.dart\n+++ b/test/model/compose_test.dart\n@@ -316,6 +316,22 @@ hello\n check(wildcardMention(WildcardMentionOption.topic, store: store()))\n .equals('@**topic**');\n });\n+\n+ group('user group', () {\n+ final userGroup = eg.userGroup(name: 'Group Name');\n+ test('not silent', () async {\n+ final store = eg.store();\n+ await store.addUserGroup(userGroup);\n+ check(userGroupMention(userGroup.name, silent: false))\n+ .equals('@*Group Name*');\n+ });\n+ test('silent', () async {\n+ final store = eg.store();\n+ await store.addUserGroup(userGroup);\n+ check(userGroupMention(userGroup.name, silent: true))\n+ .equals('@_*Group Name*');\n+ });\n+ });\n });\n \n test('inlineLink', () {\ndiff --git a/test/model/test_store.dart b/test/model/test_store.dart\nindex 18e41bcfb5..2d9b42e8d8 100644\n--- a/test/model/test_store.dart\n+++ b/test/model/test_store.dart\n@@ -267,6 +267,16 @@ extension PerAccountStoreTestExtension on PerAccountStore {\n }\n }\n \n+ Future addUserGroup(UserGroup userGroup) async {\n+ await handleEvent(UserGroupAddEvent(id: 1, group: userGroup));\n+ }\n+\n+ Future addUserGroups(Iterable userGroups) async {\n+ for (final userGroup in userGroups) {\n+ await addUserGroup(userGroup);\n+ }\n+ }\n+\n Future setMutedUsers(List userIds) async {\n await handleEvent(eg.mutedUsersEvent(userIds));\n }\n", "n2p_tests": "{\"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u2014~@_abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByBotStatus both users have the same bot status -> favor none\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence whitespace around info string\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u3002~:^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":<^\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_^abc\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults no wildcards for a silent mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults query \\\"c\\\" in ChannelNarrow -> [WildcardMentionOption.channel, WildcardMentionOption.topic]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults query \\\"t\\\" in TopicNarrow -> [WildcardMentionOption.stream, WildcardMentionOption.topic]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults different locale -> query \\\"\\u0627\\u0644\\u0643\\u0644\\\" in DmNarrow -> [WildcardMentionOption.everyone]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\" ~@abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults query \\\"topic etc\\\" in TopicNarrow -> []\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByBotStatus userA is bot, userB is human -> favor userB\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteQuery ranking user name match: exact over total-prefix\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":+1 ^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:\\u30b3^\\\", query \\\"\\u30b3\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@me@zulip.com^\\\", query \\\"me@zulip.com\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteQuery ranking wildcard-vs-user more significant than match quality\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults query \\\"a\\\" in DmNarrow -> [WildcardMentionOption.all]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByAlphabeticalOrder userB's fullName comes first than userA's fullName -> favor userB\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results ranking across signals DmNarrow: DM recency > human/bot > name, ignore this-conversation recency and stream recency\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u201c~@abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"^@_\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention user userMentionFromMessage, unknown user\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_^abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_me@^zulip.com^\\\", query \\\"me@zulip.com\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"email support@zulip.com^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u00ab~@_abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence three-, four-, and five-backtick blocks\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\",~:a^\\\", query \\\"a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults query \\\"\\\" in TopicNarrow -> [WildcardMentionOption.all, WildcardMentionOption.topic]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults different locale -> query \\\"every\\\" in DmNarrow -> [WildcardMentionOption.everyone]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults WildcardMentionOption.channel is not available before FL-247\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention user `users` passed; has two users with same fullName\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults WildcardMentionOption.topic is not available before FL-224\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"::^\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByRecency no activity in topic/stream -> favor none\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@me@^zulip.com^\\\", query \\\"me@zulip.com\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"!@#$%&*()_+\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@\\\\n^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults query \\\"\\\" in DmNarrow -> [WildcardMentionOption.all]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView yield between batches of 1000\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention user `users` passed; has two same-name users but one of them is deactivated\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteQuery ranking group name match: exact over total-prefix\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@^_\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\")~:a^\\\", query \\\"a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"`@chris^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"(~:^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByRecency no activity in topic -> favor user most recent in stream\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention wildcard\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence backtick fences may be indented up to three spaces\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":+2^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareRecentMessageIds one of a and b is null\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults different locale -> query \\\"channel\\\" in TopicNarrow -> [WildcardMentionOption.channel]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@abc ^\\\", query \\\"abc \\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByDms has no DMs with userA or userB -> prioritizes neither\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_abc^ ^\\\", query \\\"abc \\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_\\\\ud834^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@^abc ^\\\", query \\\"abc \\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results ranking across signals TopicNarrow: topic recency > stream recency > DM recency > human/bot > name\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention user userMentionFromMessage, known user\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":1+1^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: inlineLink\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\",~:^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteQuery.testUser user is always excluded when muted, regardless of other criteria\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":abc\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:\\u03c6^\\\", query \\\"\\u03c6\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:jack-o-l^\\\", query \\\"jack-o-l\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results ranking across signals StarredMessagesNarrow gives error\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"`@_chris^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView new query during computation replaces old\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_>^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults different locale -> query \\\"top\\\" in ChannelNarrow -> [WildcardMentionOption.topic]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: TopicAutocompleteView misc\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@^me@zulip.com^\\\", query \\\"me@zulip.com\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\".~:a^\\\", query \\\"a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults different locale -> query \\\"\\u0642\\\" in TopicNarrow -> [WildcardMentionOption.channel]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":/^\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults query \\\"channel\\\" in DmNarrow -> []\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":=^\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"Ask @**^Chris Bobbe**\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u00bb~:a^\\\", query \\\"a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@^abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"]~:a^\\\", query \\\"a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:a b^\\\", query \\\"a b\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention user not silent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\uff08~:^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteQuery.testUser user is included if fullname words match the query\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence no code blocks; incomplete final line\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"[~:a^\\\", query \\\"a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"email support@^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:a ^\\\", query \\\"a \\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults query \\\"\\\" in ChannelNarrow -> [WildcardMentionOption.all, WildcardMentionOption.topic]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults different locale -> query \\\"\\u0627\\u0644\\\" in ChannelNarrow -> [WildcardMentionOption.all, WildcardMentionOption.topic]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention user group not silent\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_a^bc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"(~@_abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_^abc ^\\\", query \\\"abc \\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@ ^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults query \\\"str\\\" in ChannelNarrow -> [WildcardMentionOption.stream]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"(~:a^\\\", query \\\"a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"^hello @_chris^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_^me@zulip.com^\\\", query \\\"me@zulip.com\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"Ask @**Chris Bobbe^**\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\")~:^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results ranking across signals CombinedFeedNarrow gives error\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\\\\\\"~@abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@abc^ ^\\\", query \\\"abc \\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@\\\\ud834^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_me@zulip.com^\\\", query \\\"me@zulip.com\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\uff09~:a^\\\", query \\\"a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_ab^c ^\\\", query \\\"abc \\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"Ask @_**^Chris Bobbe**\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@\\\\\\\"^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence five-backtick block; incomplete final line\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"Ask @_**Chris Bobbe**^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results final results end-to-end\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView mutating user store while in progress does not prevent query from finishing\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_\\u0600^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":-/^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults query \\\"topic\\\" in DmNarrow -> []\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"^@abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteQuery ranking email matched case-insensitively\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_\\\\u0000^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_ab^c^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:\\u0662^\\\", query \\\"\\u0662\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":-p^\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByAlphabeticalOrder userA's fullName comes first than userB's fullName -> favor userA\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeTopicAutocomplete.autocompleteIntent topic-input with text: produces: \": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence multiple three-backtick blocks; one has info string\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteQuery ranking group name match: total-prefix over word-prefixes\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@\\\\\\\\^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\".~:^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence content consisting of blank lines\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"8:30^\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"email support@zulip^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence four-backtick block\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults different locale -> query \\\"\\u0627\\u0644\\u062c\\u0645\\u064a\\u0639\\\" in TopicNarrow -> [WildcardMentionOption.all]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:+^\\\", query \\\"+\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"l\\u00e0 : ^\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults different locale -> query \\\"\\u0627\\u0644\\u0645\\u0648\\u0636\\u0648\\u0639\\\" in ChannelNarrow -> [WildcardMentionOption.topic]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence single line with no code blocks\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_\\\\\\\"^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"Ask @**Chris Bobbe**^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteQuery ranking full list of ranks\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence five-backtick block\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"^@_abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence empty content\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence three-backtick block\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:100^\\\", query \\\"100\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@\\u0600^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteQuery.testUser user is always excluded when not active regardless of other criteria\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u00ab~:^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults query \\\"topic\\\" in ChannelNarrow -> [WildcardMentionOption.topic]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\uff0c~:^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults query \\\"every\\\" in DmNarrow -> [WildcardMentionOption.everyone]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByDms has DMs with userB but not userA -> prioritizes userB\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByDms has DMs with userA and userB, latest with userB -> prioritizes userB\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"[~:^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByRecency favor most recent in topic ahead of most recent in stream\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~^@_^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_\\\\n^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeTopicAutocomplete.autocompleteIntent topic-input with text: a^bc produces: abc\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"email support@^ with details of the issue\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@ab^c^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByDms has DMs with userA and userB, latest with userA -> prioritizes userA\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:p^\\\", query \\\"p\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"support@zulip.com^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: TopicAutocompleteView getStreamTopics request\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView not starve timers\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareRecentMessageIds both a and b are non-null\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteQuery ranking email match is by prefix only\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView misc\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: quoteAndReply / quoteAndReplyPlaceholder\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteQuery ranking user name match: total-prefix over word-prefixes\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:\\uff11^\\\", query \\\"\\uff11\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@a^bc\\\", query \\\"a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"]~:^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"l\\u00e0 ~:^\\\", query \\\"\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults WildcardMentionOption.topic is available FL-224 onwards\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results ranking across signals MentionsNarrow gives error\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"^@\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_\\\\\\\\^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@me^@zulip.com^\\\", query \\\"me@zulip.com\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@*^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":\\\\n^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":-(^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults query \\\"stream\\\" in DmNarrow -> []\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults WildcardMentionOption.channel is available FL-247 onwards\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_*^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@`^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByDms has DMs with userA but not userB -> prioritizes userA\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteQuery ranking group name matched case-insensitively\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:a^\\\", query \\\"a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:+1^\\\", query \\\"+1\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results ranking across signals ChannelNarrow: stream recency > DM recency > human/bot > name\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_me^@zulip.com^\\\", query \\\"me@zulip.com\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByRecency no topic provided -> favor user most recent in stream\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareRecentMessageIds both of a and b are null\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"Ask @**Chris^ Bobbe**\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\" ~@_abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@>^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@__^\\\", query \\\"_\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_\\u061c^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeTopicAutocomplete.autocompleteIntent topic-input with text: abc^ produces: abc\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~^@^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: TopicAutocompleteView updates results when streams are loaded\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByDms has DMs with userA and userB, equally recent -> prioritizes neither\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"this: ~:s^\\\", query \\\"s\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\uff0c~:a^\\\", query \\\"a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteQuery ranking wildcards, then users\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:\\u7a7a^\\\", query \\\"\\u7a7a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"Ask @_**Chris Bobbe^**\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\":+100^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u2014~@abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByRecency favor user most recent in topic\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults different locale -> query \\\"\\u062f\\u0641\\u0642\\\" in ChannelNarrow -> [WildcardMentionOption.stream]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: TopicAutocompleteQuery.testTopic topic is included if it matches the query\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention user group silent\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~:e-m^\\\", query \\\"e-m\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteQuery ranking user name matched case-insensitively\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence multiple lines with no code blocks\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u00ab~:a^\\\", query \\\"a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults query \\\"ch\\\" in TopicNarrow -> [WildcardMentionOption.channel]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\uff09~:^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@^abc\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u00bb~:^\\\", query \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@a^bc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@ab^c\\\", query \\\"ab\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"email support@ with details of the issue^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByBotStatus userA is human, userB is bot -> favor userA\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence fence ignored if info string has backtick\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults query \\\"e\\\" in TopicNarrow -> [WildcardMentionOption.everyone]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_`^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\uff08~:a^\\\", query \\\"a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeTopicAutocomplete.autocompleteIntent topic-input with text: a^bc^ produces: abc\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"^hello @chris^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeTopicAutocomplete.autocompleteIntent topic-input with text: ^abc produces: abc\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"Ask @_**Chris^ Bobbe**\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_ab^c\\\", query \\\"ab\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"~@_abc ^\\\", query \\\"abc \\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView sorting results compareByAlphabeticalOrder both users have identical fullName -> favor none\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@\\\\u0000^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\u3002~:a^\\\", query \\\"a\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: mention user userMentionFromMessage, muted user\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"(~@abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent in \\\"\\\\\\\"~@_abc^\\\", query \\\"abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: MentionAutocompleteView.computeWildcardMentionResults query \\\"everyone\\\" in ChannelNarrow -> [WildcardMentionOption.everyone]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@_abc\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/compose_test.dart: wrapWithBacktickFence with info string\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/autocomplete_test.dart: ComposeContentController.autocompleteIntent no query in \\\"@\\u061c^\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1744", "org": "zulip", "repo": "zulip-flutter", "number": 1744, "state": "closed", "title": "new-dm: Exclude deactivated users", "body": "Fixes #1743.\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"0ce94c45f1951275734953ee795651241ec99fc3\"}", "resolved_issues": "[{\"number\": 1743, \"title\": \"Exclude deactivated users in new-DM screen\", \"body\": \"In the \\\"New DM\\\" screen, if you type a query that matches some deactivated users, they'll appear in the list.\\n\\nIf you then select them and go to the message list, the actual compose box is absent, replaced with an error banner \\u2014 because you can't actually send a DM to a deactivated user. So we should leave them out of the \\\"New DM\\\" screen's list of users in the first place.\\n\\n\"}]", "lang": "dart", "problem_statement": "Exclude deactivated users in new-DM screen\nIn the \"New DM\" screen, if you type a query that matches some deactivated users, they'll appear in the list.\n\nIf you then select them and go to the message list, the actual compose box is absent, replaced with an error banner \u2014 because you can't actually send a DM to a deactivated user. So we should leave them out of the \"New DM\" screen's list of users in the first place.\n\n\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/1744", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1743\"]", "test_command": "flutter test test/widgets/new_dm_sheet_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/user.dart b/lib/model/user.dart\nindex aa4666c359..7d195e3197 100644\n--- a/lib/model/user.dart\n+++ b/lib/model/user.dart\n@@ -35,7 +35,10 @@ mixin UserStore on PerAccountStoreBase, RealmStore {\n /// Consider using [userDisplayName].\n User? getUser(int userId);\n \n- /// All known users in the realm.\n+ /// All known users in the realm, including deactivated users.\n+ ///\n+ /// Before presenting these users in the UI, consider whether to exclude\n+ /// users who are deactivated (see [User.isActive]) or muted ([isUserMuted]).\n ///\n /// This may have a large number of elements, like tens of thousands.\n /// Consider [getUser] or other alternatives to iterating through this.\ndiff --git a/lib/widgets/new_dm_sheet.dart b/lib/widgets/new_dm_sheet.dart\nindex 682adea91c..93fbf5c354 100644\n--- a/lib/widgets/new_dm_sheet.dart\n+++ b/lib/widgets/new_dm_sheet.dart\n@@ -1,4 +1,3 @@\n-import 'package:collection/collection.dart';\n import 'package:flutter/material.dart';\n import '../api/model/model.dart';\n import '../generated/l10n/zulip_localizations.dart';\n@@ -69,9 +68,9 @@ class _NewDmPickerState extends State with PerAccountStoreAwareStat\n }\n \n void _initSortedUsers(PerAccountStore store) {\n- final sansMuted = store.allUsers\n- .whereNot((user) => store.isUserMuted(user.userId));\n- sortedUsers = List.from(sansMuted)\n+ final users = store.allUsers\n+ .where((user) => user.isActive && !store.isUserMuted(user.userId));\n+ sortedUsers = List.from(users)\n ..sort((a, b) => MentionAutocompleteView.compareByDms(a, b, store: store));\n _updateFilteredUsers(store);\n }\n", "test_patch": "diff --git a/test/widgets/new_dm_sheet_test.dart b/test/widgets/new_dm_sheet_test.dart\nindex ae77e9643f..a95d42dc1a 100644\n--- a/test/widgets/new_dm_sheet_test.dart\n+++ b/test/widgets/new_dm_sheet_test.dart\n@@ -116,24 +116,19 @@ void main() {\n });\n \n group('user filtering', () {\n- final mutedUser = eg.user(fullName: 'Someone Muted');\n final testUsers = [\n eg.user(fullName: 'Alice Anderson'),\n eg.user(fullName: 'Bob Brown'),\n eg.user(fullName: 'Charlie Carter'),\n- mutedUser,\n ];\n \n- testWidgets('shows all non-muted users initially', (tester) async {\n- await setupSheet(tester, users: testUsers, mutedUserIds: [mutedUser.userId]);\n+ testWidgets('shows full list initially', (tester) async {\n+ await setupSheet(tester, users: testUsers);\n check(findText(includePlaceholders: false, 'Alice Anderson')).findsOne();\n check(findText(includePlaceholders: false, 'Bob Brown')).findsOne();\n check(findText(includePlaceholders: false, 'Charlie Carter')).findsOne();\n-\n check(find.byIcon(ZulipIcons.check_circle_unchecked)).findsExactly(3);\n check(find.byIcon(ZulipIcons.check_circle_checked)).findsNothing();\n- check(findText(includePlaceholders: false, 'Someone Muted')).findsNothing();\n- check(findText(includePlaceholders: false, 'Muted user')).findsNothing();\n });\n \n testWidgets('shows filtered users based on search', (tester) async {\n@@ -145,6 +140,43 @@ void main() {\n check(findText(includePlaceholders: false, 'Bob Brown')).findsNothing();\n });\n \n+ testWidgets('deactivated users excluded', (tester) async {\n+ // Omit a deactivated user both before there's a query\u2026\n+ final deactivatedUser = eg.user(fullName: 'Impostor Charlie', isActive: false);\n+ await setupSheet(tester, users: [...testUsers, deactivatedUser]);\n+ check(findText(includePlaceholders: false, 'Impostor Charlie')).findsNothing();\n+ check(findText(includePlaceholders: false, 'Charlie Carter')).findsOne();\n+ check(find.byIcon(ZulipIcons.check_circle_unchecked)).findsExactly(3);\n+\n+ // \u2026 and after a query that would match their name.\n+ await tester.enterText(find.byType(TextField), 'Charlie');\n+ await tester.pump();\n+ check(findText(includePlaceholders: false, 'Impostor Charlie')).findsNothing();\n+ check(findText(includePlaceholders: false, 'Charlie Carter')).findsOne();\n+ check(find.byIcon(ZulipIcons.check_circle_unchecked)).findsExactly(1);\n+ });\n+\n+ testWidgets('muted users excluded', (tester) async {\n+ // Omit muted users both before there's a query\u2026\n+ final mutedUser = eg.user(fullName: 'Someone Muted');\n+ await setupSheet(tester,\n+ users: [...testUsers, mutedUser], mutedUserIds: [mutedUser.userId]);\n+ check(findText(includePlaceholders: false, 'Someone Muted')).findsNothing();\n+ check(findText(includePlaceholders: false, 'Muted user')).findsNothing();\n+ check(findText(includePlaceholders: false, 'Alice Anderson')).findsOne();\n+ check(find.byIcon(ZulipIcons.check_circle_unchecked)).findsExactly(3);\n+\n+ // \u2026 and after a query. One which matches both the user's actual name and\n+ // the replacement text \"Muted user\", for good measure.\n+ await tester.enterText(find.byType(TextField), 'e');\n+ await tester.pump();\n+ check(findText(includePlaceholders: false, 'Someone Muted')).findsNothing();\n+ check(findText(includePlaceholders: false, 'Muted user')).findsNothing();\n+ check(findText(includePlaceholders: false, 'Alice Anderson')).findsOne();\n+ check(findText(includePlaceholders: false, 'Charlie Carter')).findsOne();\n+ check(find.byIcon(ZulipIcons.check_circle_unchecked)).findsExactly(2);\n+ });\n+\n // TODO test sorting by recent-DMs\n // TODO test that scroll position resets on query change\n \n", "n2p_tests": "{}", "f2p_tests": "{\"user filtering deactivated users excluded\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"user filtering shows empty state when no users match\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"user filtering search is case-insensitive\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"navigation to DM Narrow navigates to self DM\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"User status emoji is not set, text is set -> text is not displayed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"user selection can select multiple users\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"user filtering search text clears when user is selected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"navigation to DM Narrow navigates to 1:1 DM\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"user filtering shows full list initially\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"user selection other user selection deselects self user\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"user filtering muted users excluded\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"search field has focus when sheet opens\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"user filtering partial name and last name search handling\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"User status emoji & text are set -> emoji is displayed, text is not\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"shows header with correct buttons\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"user selection tapping user chip deselects the user\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"user selection other user selection hides self user\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"navigation to DM Narrow navigates to group DM\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"user selection selecting and deselecting a user\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"user filtering shows filtered users based on search\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1730", "org": "zulip", "repo": "zulip-flutter", "number": 1730, "state": "closed", "title": "Follow user's time format setting (12 or 24 hour)", "body": "Fixes #1015.\r\n\r\ncc @alya for screenshots below.", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"3addf690bf1f4cb9f58484219cd6a28d2dd82c9d\"}", "resolved_issues": "[{\"number\": 1015, \"title\": \"ui: Follow `user_settings.twenty_four_hour_time`\", \"body\": \"When we show timestamps, for example on messages in the message list, we should format them according to the user's setting:\\n\\n- `user_settings.twenty_four_hour_time` true: \\\"13:52\\\"\\n- `user_settings.twenty_four_hour_time` false: \\\"1:52 PM\\\"\\n\\nThis is something we did in the zulip-mobile legacy app.\\n\\nIn addition to the timestamps on messages in the message list (which is the most visible and most important place), this should apply to everywhere else that we show a time of day to the user. To find other such places, try `git grep DateFormat`.\\n\\n### References\\n\\n- [Help center doc](https://zulip.com/help/change-the-time-format)\\n- `UserSettings.twentyFourHourTime` in lib/api/model/initial_snapshot.dart\\n- `UserSettingsUpdateEvent` in lib/api/model/events.dart\\n\"}]", "lang": "dart", "problem_statement": "ui: Follow `user_settings.twenty_four_hour_time`\nWhen we show timestamps, for example on messages in the message list, we should format them according to the user's setting:\n\n- `user_settings.twenty_four_hour_time` true: \"13:52\"\n- `user_settings.twenty_four_hour_time` false: \"1:52 PM\"\n\nThis is something we did in the zulip-mobile legacy app.\n\nIn addition to the timestamps on messages in the message list (which is the most visible and most important place), this should apply to everywhere else that we show a time of day to the user. To find other such places, try `git grep DateFormat`.\n\n### References\n\n- [Help center doc](https://zulip.com/help/change-the-time-format)\n- `UserSettings.twentyFourHourTime` in lib/api/model/initial_snapshot.dart\n- `UserSettingsUpdateEvent` in lib/api/model/events.dart\n\n", "hints": "I would like to work on this issue if it has not been assigned to anyone else.\nPlease see the Zulip project's guide to claiming an issue: https://zulip.readthedocs.io/en/latest/contributing/contributing.html#in-other-zulip-repositories\r\n\r\nIn particular:\r\n\r\n> In your comment, describe what part of the code you\u2019re modifying and how you plan to approach the problem, based on what you learned in steps 1\u20134 [above](https://zulip.readthedocs.io/en/latest/contributing/contributing.html#picking-an-issue-to-work-on).\nHi @chrisbobbe, \n\nI would like to take up this issue. \n\nI have started working on it and have achieved some successful results. \nYou can review my changes here: [Compare Changes](https://github.com/zulip/zulip-flutter/compare/main...Gaurav-Kushwaha-1225:zulip-flutter:Follow_UserSettings_Time). \nPlease permit me to continue working on this issue. \n\nAdditionally, I have taken screenshots after changing the `twenty_four_hour_time` preference in my account via the web app: \n\n| 12-Hour Format | 24-Hour Format | \n| -------------- | -------------- | \n| ![12-Hour](https://github.com/user-attachments/assets/a79a2511-0468-46b9-ba21-19b46966859f) | ![24-Hour](https://github.com/user-attachments/assets/bb02bc4c-3a19-4851-b8e7-e66a62246c92) | \n\nCurrently, some checks are failing. I will look into them once the issue is assigned to me. \n\nLooking forward to your feedback! \ud83d\ude80 \nRequested in launch feedback: https://chat.zulip.org/#narrow/stream/48-mobile/topic/12-hour.20time.20format/near/2216815", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1730", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1015\"]", "test_command": "flutter test test/api/route/settings_test.dart test/model/store_test.dart test/widgets/content_test.dart test/widgets/lightbox_test.dart test/widgets/message_list_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/api/model/events.dart b/lib/api/model/events.dart\nindex bb3d7245e0..6070616387 100644\n--- a/lib/api/model/events.dart\n+++ b/lib/api/model/events.dart\n@@ -175,6 +175,7 @@ class UserSettingsUpdateEvent extends Event {\n final value = json['value'];\n switch (UserSettingName.fromRawString(json['property'] as String)) {\n case UserSettingName.twentyFourHourTime:\n+ return TwentyFourHourTimeMode.fromApiValue(value as bool?);\n case UserSettingName.displayEmojiReactionUsers:\n return value as bool;\n case UserSettingName.emojiset:\ndiff --git a/lib/api/model/initial_snapshot.dart b/lib/api/model/initial_snapshot.dart\nindex 45b97745d6..d9734582c6 100644\n--- a/lib/api/model/initial_snapshot.dart\n+++ b/lib/api/model/initial_snapshot.dart\n@@ -259,7 +259,12 @@ class RecentDmConversation {\n /// in .\n @JsonSerializable(fieldRename: FieldRename.snake, createFieldMap: true)\n class UserSettings {\n- bool twentyFourHourTime;\n+ @JsonKey(\n+ fromJson: TwentyFourHourTimeMode.fromApiValue,\n+ toJson: TwentyFourHourTimeMode.staticToJson,\n+ )\n+ TwentyFourHourTimeMode twentyFourHourTime;\n+\n bool? displayEmojiReactionUsers; // TODO(server-6)\n Emojiset emojiset;\n bool presenceEnabled;\ndiff --git a/lib/api/model/initial_snapshot.g.dart b/lib/api/model/initial_snapshot.g.dart\nindex c8b50a7b78..32af6a1867 100644\n--- a/lib/api/model/initial_snapshot.g.dart\n+++ b/lib/api/model/initial_snapshot.g.dart\n@@ -230,7 +230,9 @@ Map _$RecentDmConversationToJson(\n };\n \n UserSettings _$UserSettingsFromJson(Map json) => UserSettings(\n- twentyFourHourTime: json['twenty_four_hour_time'] as bool,\n+ twentyFourHourTime: TwentyFourHourTimeMode.fromApiValue(\n+ json['twenty_four_hour_time'] as bool?,\n+ ),\n displayEmojiReactionUsers: json['display_emoji_reaction_users'] as bool?,\n emojiset: $enumDecode(_$EmojisetEnumMap, json['emojiset']),\n presenceEnabled: json['presence_enabled'] as bool,\n@@ -245,7 +247,9 @@ const _$UserSettingsFieldMap = {\n \n Map _$UserSettingsToJson(UserSettings instance) =>\n {\n- 'twenty_four_hour_time': instance.twentyFourHourTime,\n+ 'twenty_four_hour_time': TwentyFourHourTimeMode.staticToJson(\n+ instance.twentyFourHourTime,\n+ ),\n 'display_emoji_reaction_users': instance.displayEmojiReactionUsers,\n 'emojiset': instance.emojiset,\n 'presence_enabled': instance.presenceEnabled,\ndiff --git a/lib/api/model/model.dart b/lib/api/model/model.dart\nindex 4302a82c11..1009418d08 100644\n--- a/lib/api/model/model.dart\n+++ b/lib/api/model/model.dart\n@@ -298,6 +298,35 @@ enum UserSettingName {\n String toJson() => _$UserSettingNameEnumMap[this]!;\n }\n \n+/// A value from [UserSettings.twentyFourHourTime].\n+enum TwentyFourHourTimeMode {\n+ twelveHour(apiValue: false),\n+ twentyFourHour(apiValue: true),\n+\n+ /// The locale's default format (12-hour for en_US, 24-hour for fr_FR, etc.).\n+ // TODO(#1727) actually follow this\n+ // Not sent by current servers, but planned when most client installs accept it:\n+ // https://chat.zulip.org/#narrow/channel/378-api-design/topic/.60user_settings.2Etwenty_four_hour_time.60/near/2220696\n+ // TODO(server-future) Write down what server N starts sending null;\n+ // adjust the comment; leave a TODO(server-N) to delete the comment\n+ localeDefault(apiValue: null),\n+ ;\n+\n+ const TwentyFourHourTimeMode({required this.apiValue});\n+\n+ final bool? apiValue;\n+\n+ static bool? staticToJson(TwentyFourHourTimeMode instance) => instance.apiValue;\n+\n+ bool? toJson() => TwentyFourHourTimeMode.staticToJson(this);\n+\n+ static TwentyFourHourTimeMode fromApiValue(bool? value) => switch (value) {\n+ false => twelveHour,\n+ true => twentyFourHour,\n+ null => localeDefault,\n+ };\n+}\n+\n /// As in [UserSettings.emojiset].\n @JsonEnum(fieldRename: FieldRename.kebab, alwaysCreate: true)\n enum Emojiset {\ndiff --git a/lib/api/route/settings.dart b/lib/api/route/settings.dart\nindex 929a199d0b..4e98140d76 100644\n--- a/lib/api/route/settings.dart\n+++ b/lib/api/route/settings.dart\n@@ -9,12 +9,20 @@ Future updateSettings(ApiConnection connection, {\n for (final entry in newSettings.entries) {\n final name = entry.key;\n final valueRaw = entry.value;\n- final value = switch (name) {\n- UserSettingName.twentyFourHourTime => valueRaw as bool,\n- UserSettingName.displayEmojiReactionUsers => valueRaw as bool,\n- UserSettingName.emojiset => RawParameter((valueRaw as Emojiset).toJson()),\n- UserSettingName.presenceEnabled => valueRaw as bool,\n- };\n+ final Object? value;\n+ switch (name) {\n+ case UserSettingName.twentyFourHourTime:\n+ final mode = (valueRaw as TwentyFourHourTimeMode);\n+ // TODO(server-future) allow localeDefault for servers that support it\n+ assert(mode != TwentyFourHourTimeMode.localeDefault);\n+ value = mode.toJson();\n+ case UserSettingName.displayEmojiReactionUsers:\n+ value = valueRaw as bool;\n+ case UserSettingName.emojiset:\n+ value = RawParameter((valueRaw as Emojiset).toJson());\n+ case UserSettingName.presenceEnabled:\n+ value = valueRaw as bool;\n+ }\n params[name.toJson()] = value;\n }\n \ndiff --git a/lib/model/store.dart b/lib/model/store.dart\nindex 03ff13022a..a24550c406 100644\n--- a/lib/model/store.dart\n+++ b/lib/model/store.dart\n@@ -707,7 +707,7 @@ class PerAccountStore extends PerAccountStoreBase with\n }\n switch (event.property!) {\n case UserSettingName.twentyFourHourTime:\n- userSettings.twentyFourHourTime = event.value as bool;\n+ userSettings.twentyFourHourTime = event.value as TwentyFourHourTimeMode;\n case UserSettingName.displayEmojiReactionUsers:\n userSettings.displayEmojiReactionUsers = event.value as bool;\n case UserSettingName.emojiset:\ndiff --git a/lib/widgets/content.dart b/lib/widgets/content.dart\nindex 5d6dfa5084..5851222a1c 100644\n--- a/lib/widgets/content.dart\n+++ b/lib/widgets/content.dart\n@@ -1304,13 +1304,26 @@ class GlobalTime extends StatelessWidget {\n final GlobalTimeNode node;\n final TextStyle ambientTextStyle;\n \n- static final _dateFormat = intl.DateFormat('EEE, MMM d, y, h:mm a'); // TODO(i18n): localize date\n+ static final _format12 =\n+ intl.DateFormat('EEE, MMM d, y').addPattern('h:mm aa', ', ');\n+ static final _format24 =\n+ intl.DateFormat('EEE, MMM d, y').addPattern('Hm', ', ');\n+ static final _formatLocaleDefault =\n+ intl.DateFormat('EEE, MMM d, y').addPattern('jm', ', ');\n \n @override\n Widget build(BuildContext context) {\n+ final store = PerAccountStoreWidget.of(context);\n+ final twentyFourHourTimeMode = store.userSettings.twentyFourHourTime;\n // Design taken from css for `.rendered_markdown & time` in web,\n // see zulip:web/styles/rendered_markdown.css .\n- final text = _dateFormat.format(node.datetime.toLocal());\n+ // TODO(i18n): localize; see plan with ffi in #45\n+ final format = switch (twentyFourHourTimeMode) {\n+ TwentyFourHourTimeMode.twelveHour => _format12,\n+ TwentyFourHourTimeMode.twentyFourHour => _format24,\n+ TwentyFourHourTimeMode.localeDefault => _formatLocaleDefault,\n+ };\n+ final text = format.format(node.datetime.toLocal());\n final contentTheme = ContentTheme.of(context);\n return Padding(\n padding: const EdgeInsets.symmetric(horizontal: 2),\ndiff --git a/lib/widgets/lightbox.dart b/lib/widgets/lightbox.dart\nindex bf11522036..0a1fe78feb 100644\n--- a/lib/widgets/lightbox.dart\n+++ b/lib/widgets/lightbox.dart\n@@ -1,7 +1,6 @@\n import 'package:flutter/material.dart';\n import 'package:flutter/scheduler.dart';\n import 'package:flutter/services.dart';\n-import 'package:intl/intl.dart';\n import 'package:video_player/video_player.dart';\n \n import '../api/core.dart';\n@@ -12,6 +11,7 @@ import '../model/binding.dart';\n import 'actions.dart';\n import 'content.dart';\n import 'dialog.dart';\n+import 'message_list.dart';\n import 'page.dart';\n import 'store.dart';\n import 'user.dart';\n@@ -167,6 +167,7 @@ class _LightboxPageLayoutState extends State<_LightboxPageLayout> {\n \n @override\n Widget build(BuildContext context) {\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n final store = PerAccountStoreWidget.of(context);\n final themeData = Theme.of(context);\n \n@@ -176,11 +177,11 @@ class _LightboxPageLayoutState extends State<_LightboxPageLayout> {\n \n PreferredSizeWidget? appBar;\n if (_headerFooterVisible) {\n- // TODO(#45): Format with e.g. \"Yesterday at 4:47 PM\"\n- final timestampText = DateFormat\n- .yMMMd(/* TODO(#278): Pass selected language here, I think? */)\n- .add_Hms()\n- .format(DateTime.fromMillisecondsSinceEpoch(widget.message.timestamp * 1000));\n+ final timestampText = MessageTimestampStyle.lightbox\n+ .format(widget.message.timestamp,\n+ now: DateTime.now(),\n+ twentyFourHourTimeMode: store.userSettings.twentyFourHourTime,\n+ zulipLocalizations: zulipLocalizations);\n \n // We use plain [AppBar] instead of [ZulipAppBar], even though this page\n // has a [PerAccountStore], because:\ndiff --git a/lib/widgets/message_list.dart b/lib/widgets/message_list.dart\nindex eccdf8c6a6..e3b1d69d6e 100644\n--- a/lib/widgets/message_list.dart\n+++ b/lib/widgets/message_list.dart\n@@ -8,6 +8,7 @@ import 'package:intl/intl.dart' hide TextDirection;\n \n import '../api/model/model.dart';\n import '../generated/l10n/zulip_localizations.dart';\n+import '../model/binding.dart';\n import '../model/database.dart';\n import '../model/message.dart';\n import '../model/message_list.dart';\n@@ -1840,8 +1841,14 @@ class DateText extends StatelessWidget {\n \n @override\n Widget build(BuildContext context) {\n+ final store = PerAccountStoreWidget.of(context);\n final messageListTheme = MessageListTheme.of(context);\n final zulipLocalizations = ZulipLocalizations.of(context);\n+ final formattedTimestamp = MessageTimestampStyle.dateOnlyRelative.format(\n+ timestamp,\n+ now: ZulipBinding.instance.utcNow().toLocal(),\n+ twentyFourHourTimeMode: store.userSettings.twentyFourHourTime,\n+ zulipLocalizations: zulipLocalizations)!;\n return Text(\n style: TextStyle(\n color: messageListTheme.labelTime,\n@@ -1851,46 +1858,7 @@ class DateText extends StatelessWidget {\n // https://developer.mozilla.org/en-US/docs/Web/CSS/font-variant-caps#all-small-caps\n fontFeatures: const [FontFeature.enable('c2sc'), FontFeature.enable('smcp')],\n ),\n- formatHeaderDate(\n- zulipLocalizations,\n- DateTime.fromMillisecondsSinceEpoch(timestamp * 1000),\n- now: DateTime.now()));\n- }\n-}\n-\n-@visibleForTesting\n-String formatHeaderDate(\n- ZulipLocalizations zulipLocalizations,\n- DateTime dateTime, {\n- required DateTime now,\n-}) {\n- assert(!dateTime.isUtc && !now.isUtc,\n- '`dateTime` and `now` need to be in local time.');\n-\n- if (dateTime.year == now.year &&\n- dateTime.month == now.month &&\n- dateTime.day == now.day) {\n- return zulipLocalizations.today;\n- }\n-\n- final yesterday = now\n- .copyWith(hour: 12, minute: 0, second: 0, millisecond: 0, microsecond: 0)\n- .add(const Duration(days: -1));\n- if (dateTime.year == yesterday.year &&\n- dateTime.month == yesterday.month &&\n- dateTime.day == yesterday.day) {\n- return zulipLocalizations.yesterday;\n- }\n-\n- // If it is Dec 1 and you see a label that says `Dec 2`\n- // it could be misinterpreted as Dec 2 of the previous\n- // year. For times in the future, those still on the\n- // current day will show as today (handled above) and\n- // any dates beyond that show up with the year.\n- if (dateTime.year == now.year && dateTime.isBefore(now)) {\n- return DateFormat.MMMd().format(dateTime);\n- } else {\n- return DateFormat.yMMMd().format(dateTime);\n+ formattedTimestamp);\n }\n }\n \n@@ -1915,12 +1883,17 @@ class SenderRow extends StatelessWidget {\n \n @override\n Widget build(BuildContext context) {\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n final store = PerAccountStoreWidget.of(context);\n final messageListTheme = MessageListTheme.of(context);\n final designVariables = DesignVariables.of(context);\n \n final sender = store.getUser(message.senderId);\n- final timestamp = timestampStyle.format(message.timestamp);\n+ final timestamp = timestampStyle\n+ .format(message.timestamp,\n+ now: DateTime.now(),\n+ twentyFourHourTimeMode: store.userSettings.twentyFourHourTime,\n+ zulipLocalizations: zulipLocalizations);\n \n final showAsMuted = _showAsMuted(context, store);\n \n@@ -1982,11 +1955,14 @@ class SenderRow extends StatelessWidget {\n }\n }\n \n-// TODO centralize on this for wherever we show message timestamps\n enum MessageTimestampStyle {\n none,\n+ dateOnlyRelative,\n timeOnly,\n \n+ // TODO(#45): E.g. \"Yesterday at 4:47 PM\"; see details in #45\n+ lightbox,\n+\n /// The longest format, with full date and time as numbers, not \"Today\"/etc.\n ///\n /// For UI contexts focused just on the one message,\n@@ -2001,19 +1977,88 @@ enum MessageTimestampStyle {\n full,\n ;\n \n- static final _timeOnlyFormat = DateFormat('h:mm aa', 'en_US');\n- static final _fullFormat = DateFormat.yMMMd().add_jm();\n+ static String _formatDateOnlyRelative(\n+ DateTime dateTime, {\n+ required DateTime now,\n+ required ZulipLocalizations zulipLocalizations,\n+ }) {\n+ assert(!dateTime.isUtc && !now.isUtc,\n+ '`dateTime` and `now` need to be in local time.');\n+\n+ if (dateTime.year == now.year &&\n+ dateTime.month == now.month &&\n+ dateTime.day == now.day) {\n+ return zulipLocalizations.today;\n+ }\n+\n+ final yesterday = now\n+ .copyWith(hour: 12, minute: 0, second: 0, millisecond: 0, microsecond: 0)\n+ .add(const Duration(days: -1));\n+ if (dateTime.year == yesterday.year &&\n+ dateTime.month == yesterday.month &&\n+ dateTime.day == yesterday.day) {\n+ return zulipLocalizations.yesterday;\n+ }\n+\n+ // If it is Dec 1 and you see a label that says `Dec 2`\n+ // it could be misinterpreted as Dec 2 of the previous\n+ // year. For times in the future, those still on the\n+ // current day will show as today (handled above) and\n+ // any dates beyond that show up with the year.\n+ if (dateTime.year == now.year && dateTime.isBefore(now)) {\n+ return DateFormat.MMMd().format(dateTime);\n+ } else {\n+ return DateFormat.yMMMd().format(dateTime);\n+ }\n+ }\n+\n+ static final _timeFormat12 = DateFormat('h:mm aa');\n+ static final _timeFormat24 = DateFormat('Hm');\n+ static final _timeFormatLocaleDefault = DateFormat('jm');\n+ static final _timeFormat12WithSeconds = DateFormat('h:mm:ss aa');\n+ static final _timeFormat24WithSeconds = DateFormat('Hms');\n+ static final _timeFormatLocaleDefaultWithSeconds = DateFormat('jms');\n+\n+ static DateFormat _resolveTimeFormat(TwentyFourHourTimeMode mode) => switch (mode) {\n+ TwentyFourHourTimeMode.twelveHour => _timeFormat12,\n+ TwentyFourHourTimeMode.twentyFourHour => _timeFormat24,\n+ TwentyFourHourTimeMode.localeDefault => _timeFormatLocaleDefault,\n+ };\n+\n+ static DateFormat _resolveTimeFormatWithSeconds(TwentyFourHourTimeMode mode) => switch (mode) {\n+ TwentyFourHourTimeMode.twelveHour => _timeFormat12WithSeconds,\n+ TwentyFourHourTimeMode.twentyFourHour => _timeFormat24WithSeconds,\n+ TwentyFourHourTimeMode.localeDefault => _timeFormatLocaleDefaultWithSeconds,\n+ };\n \n /// Format a [Message.timestamp] for this mode.\n // TODO(i18n): locale-specific formatting (see #45 for a plan with ffi)\n- String? format(int messageTimestamp) {\n+ String? format(\n+ int messageTimestamp, {\n+ required DateTime now,\n+ required ZulipLocalizations zulipLocalizations,\n+ required TwentyFourHourTimeMode twentyFourHourTimeMode,\n+ }) {\n final asDateTime =\n DateTime.fromMillisecondsSinceEpoch(1000 * messageTimestamp);\n \n switch (this) {\n case none: return null;\n- case timeOnly: return _timeOnlyFormat.format(asDateTime);\n- case full: return _fullFormat.format(asDateTime);\n+ case dateOnlyRelative:\n+ return _formatDateOnlyRelative(asDateTime,\n+ now: now, zulipLocalizations: zulipLocalizations);\n+ case timeOnly:\n+ return _resolveTimeFormat(twentyFourHourTimeMode).format(asDateTime);\n+ case lightbox:\n+ return DateFormat\n+ .yMMMd()\n+ .addPattern(_resolveTimeFormatWithSeconds(twentyFourHourTimeMode).pattern)\n+ .format(asDateTime);\n+ case full:\n+ return DateFormat\n+ .yMMMd()\n+ .addPattern(_resolveTimeFormat(twentyFourHourTimeMode).pattern)\n+ .format(asDateTime);\n }\n }\n }\n", "test_patch": "diff --git a/test/api/route/settings_test.dart b/test/api/route/settings_test.dart\nindex d2808ece02..8b31caa646 100644\n--- a/test/api/route/settings_test.dart\n+++ b/test/api/route/settings_test.dart\n@@ -17,8 +17,8 @@ void main() {\n for (final name in UserSettingName.values) {\n switch (name) {\n case UserSettingName.twentyFourHourTime:\n- newSettings[name] = true;\n- expectedBodyFields['twenty_four_hour_time'] = 'true';\n+ newSettings[name] = TwentyFourHourTimeMode.twelveHour;\n+ expectedBodyFields['twenty_four_hour_time'] = 'false';\n case UserSettingName.displayEmojiReactionUsers:\n newSettings[name] = false;\n expectedBodyFields['display_emoji_reaction_users'] = 'false';\n@@ -38,4 +38,16 @@ void main() {\n ..bodyFields.deepEquals(expectedBodyFields);\n });\n });\n+\n+ test('TwentyFourHourTime.localeDefault', () async {\n+ return FakeApiConnection.with_((connection) async {\n+ connection.prepare(json: {});\n+\n+ // TODO(server-future) instead, check for twenty_four_hour_time: null\n+ // (could be an error-prone part of the JSONification)\n+ check(() => updateSettings(connection,\n+ newSettings: {UserSettingName.twentyFourHourTime: TwentyFourHourTimeMode.localeDefault})\n+ ).throws();\n+ });\n+ });\n }\ndiff --git a/test/example_data.dart b/test/example_data.dart\nindex c33c5fdfdc..b44108eb21 100644\n--- a/test/example_data.dart\n+++ b/test/example_data.dart\n@@ -1262,7 +1262,7 @@ InitialSnapshot initialSnapshot({\n streams: streams ?? [], // TODO add streams to default\n userStatuses: userStatuses ?? {},\n userSettings: userSettings ?? UserSettings(\n- twentyFourHourTime: false,\n+ twentyFourHourTime: TwentyFourHourTimeMode.twelveHour,\n displayEmojiReactionUsers: true,\n emojiset: Emojiset.google,\n presenceEnabled: true,\ndiff --git a/test/model/store_test.dart b/test/model/store_test.dart\nindex 240f2cbffd..c90b45a25f 100644\n--- a/test/model/store_test.dart\n+++ b/test/model/store_test.dart\n@@ -698,14 +698,16 @@ void main() {\n await preparePoll();\n \n // Pick some arbitrary event and check it gets processed on the store.\n- check(store.userSettings.twentyFourHourTime).isFalse();\n+ check(store.userSettings.twentyFourHourTime)\n+ .equals(TwentyFourHourTimeMode.twelveHour);\n connection.prepare(json: GetEventsResult(events: [\n UserSettingsUpdateEvent(id: 2,\n property: UserSettingName.twentyFourHourTime, value: true),\n ], queueId: null).toJson());\n updateMachine.debugAdvanceLoop();\n async.elapse(Duration.zero);\n- check(store.userSettings.twentyFourHourTime).isTrue();\n+ check(store.userSettings.twentyFourHourTime)\n+ .equals(TwentyFourHourTimeMode.twentyFourHour);\n }));\n \n void checkReload(FutureOr Function() prepareError, {\n@@ -735,14 +737,16 @@ void main() {\n // The new UpdateMachine updates the new store.\n updateMachine.debugPauseLoop();\n updateMachine.poll();\n- check(store.userSettings.twentyFourHourTime).isFalse();\n+ check(store.userSettings.twentyFourHourTime)\n+ .equals(TwentyFourHourTimeMode.twelveHour);\n connection.prepare(json: GetEventsResult(events: [\n UserSettingsUpdateEvent(id: 2,\n property: UserSettingName.twentyFourHourTime, value: true),\n ], queueId: null).toJson());\n updateMachine.debugAdvanceLoop();\n async.elapse(Duration.zero);\n- check(store.userSettings.twentyFourHourTime).isTrue();\n+ check(store.userSettings.twentyFourHourTime)\n+ .equals(TwentyFourHourTimeMode.twentyFourHour);\n });\n }\n \ndiff --git a/test/widgets/content_test.dart b/test/widgets/content_test.dart\nindex 0075f50b11..2b7eb45180 100644\n--- a/test/widgets/content_test.dart\n+++ b/test/widgets/content_test.dart\n@@ -7,6 +7,8 @@ import 'package:flutter_checks/flutter_checks.dart';\n import 'package:flutter_test/flutter_test.dart';\n import 'package:url_launcher/url_launcher.dart';\n import 'package:zulip/api/core.dart';\n+import 'package:zulip/api/model/initial_snapshot.dart';\n+import 'package:zulip/api/model/model.dart';\n import 'package:zulip/model/content.dart';\n import 'package:zulip/model/narrow.dart';\n import 'package:zulip/model/settings.dart';\n@@ -118,9 +120,13 @@ Widget plainContent(String html) {\n Future prepareContent(WidgetTester tester, Widget child, {\n List navObservers = const [],\n bool wrapWithPerAccountStoreWidget = false,\n+ InitialSnapshot? initialSnapshot,\n }) async {\n if (wrapWithPerAccountStoreWidget) {\n- await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());\n+ initialSnapshot ??= eg.initialSnapshot();\n+ await testBinding.globalStore.add(eg.selfAccount, initialSnapshot);\n+ } else {\n+ assert(initialSnapshot == null);\n }\n \n addTearDown(testBinding.reset);\n@@ -598,10 +604,12 @@ void main() {\n Future checkFontSizeRatio(WidgetTester tester, {\n required String targetHtml,\n required TargetFontSizeFinder targetFontSizeFinder,\n+ bool wrapWithPerAccountStoreWidget = false,\n }) async {\n- await prepareContent(tester, plainContent(\n- '

      header-plain $targetHtml

      \\n'\n- '

      paragraph-plain $targetHtml

      '));\n+ await prepareContent(tester, wrapWithPerAccountStoreWidget: wrapWithPerAccountStoreWidget,\n+ plainContent(\n+ '

      header-plain $targetHtml

      \\n'\n+ '

      paragraph-plain $targetHtml

      '));\n \n final headerRootSpan = tester.renderObject(find.textContaining('header')).text;\n final headerPlainStyle = mergedStyleOfSubstring(headerRootSpan, 'header-plain ');\n@@ -1071,16 +1079,52 @@ void main() {\n // the timezone of the environment running these tests. Accept here a wide\n // range of times. See comments in \"show dates\" test in\n // `test/widgets/message_list_test.dart`.\n- final renderedTextRegexp = RegExp(r'^(Tue, Jan 30|Wed, Jan 31), 2024, \\d+:\\d\\d [AP]M$');\n+ final renderedTextRegexp = RegExp(r'^(Tue, Jan 30|Wed, Jan 31), 2024, \\d+:\\d\\d(?: [AP]M)?$');\n+ final renderedTextRegexpTwelveHour = RegExp(r'^(Tue, Jan 30|Wed, Jan 31), 2024, \\d+:\\d\\d [AP]M$');\n+ final renderedTextRegexpTwentyFourHour = RegExp(r'^(Tue, Jan 30|Wed, Jan 31), 2024, \\d+:\\d\\d$');\n+\n+ Future prepare(\n+ WidgetTester tester,\n+ [TwentyFourHourTimeMode twentyFourHourTimeMode = TwentyFourHourTimeMode.localeDefault]\n+ ) async {\n+ final initialSnapshot = eg.initialSnapshot()\n+ ..userSettings.twentyFourHourTime = twentyFourHourTimeMode;\n+ await prepareContent(tester,\n+ // We use the self-account's time-format setting.\n+ wrapWithPerAccountStoreWidget: true,\n+ initialSnapshot: initialSnapshot,\n+ plainContent('

      $timeSpanHtml

      '));\n+ }\n \n testWidgets('smoke', (tester) async {\n- await prepareContent(tester, plainContent('

      $timeSpanHtml

      '));\n+ await prepare(tester);\n tester.widget(find.textContaining(renderedTextRegexp));\n });\n \n+ testWidgets('TwentyFourHourTimeMode.twelveHour', (tester) async {\n+ await prepare(tester, TwentyFourHourTimeMode.twelveHour);\n+ check(find.textContaining(renderedTextRegexpTwelveHour)).findsOne();\n+ });\n+\n+ testWidgets('TwentyFourHourTimeMode.twentyFourHour', (tester) async {\n+ await prepare(tester, TwentyFourHourTimeMode.twentyFourHour);\n+ check(find.textContaining(renderedTextRegexpTwentyFourHour)).findsOne();\n+ });\n+\n+ testWidgets('TwentyFourHourTimeMode.localeDefault', (tester) async {\n+ await prepare(tester, TwentyFourHourTimeMode.localeDefault);\n+ // This expectation holds as long as we're always formatting in en_US,\n+ // the default locale, which uses the twelve-hour format.\n+ // TODO(#1727) follow the actual locale; test with different locales\n+ check(find.textContaining(renderedTextRegexpTwelveHour)).findsOne();\n+ });\n+\n void testIconAndTextSameColor(String description, String html) {\n testWidgets('clock icon and text are the same color: $description', (tester) async {\n- await prepareContent(tester, plainContent(html));\n+ await prepareContent(tester,\n+ // We use the self-account's time-format setting.\n+ wrapWithPerAccountStoreWidget: true,\n+ plainContent(html));\n \n final icon = tester.widget(\n find.descendant(of: find.byType(GlobalTime),\n@@ -1100,6 +1144,8 @@ void main() {\n group('maintains font-size ratio with surrounding text', () {\n Future doCheck(WidgetTester tester, double Function(GlobalTime widget) sizeFromWidget) async {\n await checkFontSizeRatio(tester,\n+ // We use the self-account's time-format setting.\n+ wrapWithPerAccountStoreWidget: true,\n targetHtml: '',\n targetFontSizeFinder: (rootSpan) {\n late final double result;\ndiff --git a/test/widgets/lightbox_test.dart b/test/widgets/lightbox_test.dart\nindex fc013173e7..a7f6240852 100644\n--- a/test/widgets/lightbox_test.dart\n+++ b/test/widgets/lightbox_test.dart\n@@ -382,12 +382,12 @@ void main() {\n await setupPage(tester, message: message, thumbnailUrl: null, users: [sender]);\n check(store.getUser(sender.userId)).isNotNull();\n \n- checkAppBarNameAndDate(tester, 'Old name', 'Jul 23, 2024 23:12:24');\n+ checkAppBarNameAndDate(tester, 'Old name', 'Jul 23, 2024 11:12:24 PM');\n \n await store.handleEvent(RealmUserUpdateEvent(id: 1,\n userId: sender.userId, fullName: 'New name'));\n await tester.pump();\n- checkAppBarNameAndDate(tester, 'New name', 'Jul 23, 2024 23:12:24');\n+ checkAppBarNameAndDate(tester, 'New name', 'Jul 23, 2024 11:12:24 PM');\n \n debugNetworkImageHttpClientProvider = null;\n });\n@@ -400,7 +400,7 @@ void main() {\n await setupPage(tester, message: message, thumbnailUrl: null, users: []);\n check(store.getUser(sender.userId)).isNull();\n \n- checkAppBarNameAndDate(tester, 'Sender name', 'Jul 23, 2024 23:12:24');\n+ checkAppBarNameAndDate(tester, 'Sender name', 'Jul 23, 2024 11:12:24 PM');\n \n debugNetworkImageHttpClientProvider = null;\n });\ndiff --git a/test/widgets/message_list_test.dart b/test/widgets/message_list_test.dart\nindex a7c4b14dbf..3636861a2e 100644\n--- a/test/widgets/message_list_test.dart\n+++ b/test/widgets/message_list_test.dart\n@@ -2,6 +2,7 @@ import 'dart:convert';\n import 'dart:io';\n \n import 'package:checks/checks.dart';\n+import 'package:clock/clock.dart';\n import 'package:collection/collection.dart';\n import 'package:flutter/material.dart';\n import 'package:flutter/rendering.dart';\n@@ -1637,26 +1638,80 @@ void main() {\n });\n });\n \n- group('formatHeaderDate', () {\n- final zulipLocalizations = GlobalLocalizations.zulipLocalizations;\n- final now = DateTime.parse(\"2023-01-10 12:00\");\n- final testCases = [\n- (\"2023-01-10 12:00\", zulipLocalizations.today),\n- (\"2023-01-10 00:00\", zulipLocalizations.today),\n- (\"2023-01-10 23:59\", zulipLocalizations.today),\n- (\"2023-01-09 23:59\", zulipLocalizations.yesterday),\n- (\"2023-01-09 00:00\", zulipLocalizations.yesterday),\n- (\"2023-01-08 00:00\", \"Jan 8\"),\n- (\"2022-12-31 00:00\", \"Dec 31, 2022\"),\n- // Future times\n- (\"2023-01-10 19:00\", zulipLocalizations.today),\n- (\"2023-01-11 00:00\", \"Jan 11, 2023\"),\n- ];\n- for (final (dateTime, expected) in testCases) {\n- test('$dateTime returns $expected', () {\n- check(formatHeaderDate(zulipLocalizations, DateTime.parse(dateTime), now: now))\n- .equals(expected);\n- });\n+ group('MessageTimestampStyle', () {\n+ void doTests(\n+ MessageTimestampStyle style,\n+ List<(\n+ String timestampStr,\n+ String? expectedTwelveHour,\n+ String? expectedTwentyFourHour,\n+ )> cases, {\n+ DateTime? now,\n+ }) {\n+ now ??= DateTime.parse(\"2023-01-10 12:00\");\n+ for (final (timestampStr, expectedTwelveHour, expectedTwentyFourHour) in cases) {\n+ for (final mode in TwentyFourHourTimeMode.values) {\n+ final expected = switch (mode) {\n+ TwentyFourHourTimeMode.twelveHour => expectedTwelveHour,\n+ TwentyFourHourTimeMode.twentyFourHour => expectedTwentyFourHour,\n+ // This expectation will hold as long as we're always using the\n+ // default locale, en_US, which uses the twelve-hour format.\n+ // TODO(#1727) test with other locales\n+ TwentyFourHourTimeMode.localeDefault => expectedTwelveHour,\n+ };\n+\n+ test('${style.name} in ${mode.name}: $timestampStr returns $expected', () {\n+ addTearDown(testBinding.reset);\n+ final zulipLocalizations = GlobalLocalizations.zulipLocalizations;\n+\n+ withClock(Clock.fixed(now!), () {\n+ final timestamp = DateTime.parse(timestampStr)\n+ .millisecondsSinceEpoch ~/ 1000;\n+ final result = style.format(\n+ timestamp,\n+ now: testBinding.utcNow().toLocal(),\n+ twentyFourHourTimeMode: mode,\n+ zulipLocalizations: zulipLocalizations);\n+ check(result).equals(expected);\n+ });\n+ });\n+ }\n+ }\n+ }\n+\n+ for (final style in MessageTimestampStyle.values) {\n+ switch (style) {\n+ case MessageTimestampStyle.none:\n+ doTests(style, [('2023-01-10 12:00', null, null)]);\n+ case MessageTimestampStyle.dateOnlyRelative:\n+ final zulipLocalizations = GlobalLocalizations.zulipLocalizations;\n+ doTests(style,\n+ now: DateTime.parse(\"2023-01-10 12:00\"),\n+ [\n+ (\"2023-01-10 12:00\", zulipLocalizations.today, zulipLocalizations.today),\n+ (\"2023-01-10 00:00\", zulipLocalizations.today, zulipLocalizations.today),\n+ (\"2023-01-10 23:59\", zulipLocalizations.today, zulipLocalizations.today),\n+ (\"2023-01-09 23:59\", zulipLocalizations.yesterday, zulipLocalizations.yesterday),\n+ (\"2023-01-09 00:00\", zulipLocalizations.yesterday, zulipLocalizations.yesterday),\n+ (\"2023-01-08 00:00\", \"Jan 8\", \"Jan 8\"),\n+ (\"2022-12-31 00:00\", \"Dec 31, 2022\", \"Dec 31, 2022\"),\n+ // Future times\n+ (\"2023-01-10 19:00\", zulipLocalizations.today, zulipLocalizations.today),\n+ (\"2023-01-11 00:00\", \"Jan 11, 2023\", \"Jan 11, 2023\"),\n+ ]);\n+ case MessageTimestampStyle.timeOnly:\n+ doTests(style, [('2023-01-10 12:00', '12:00 PM', '12:00')]);\n+ case MessageTimestampStyle.lightbox:\n+ doTests(style,\n+ [('2023-01-10 12:00',\n+ 'Jan 10, 2023 12:00:00 PM',\n+ 'Jan 10, 2023 12:00:00')]);\n+ case MessageTimestampStyle.full:\n+ doTests(style,\n+ [('2023-01-10 12:00',\n+ 'Jan 10, 2023 12:00 PM',\n+ 'Jan 10, 2023 12:00')]);\n+ }\n }\n });\n \n", "n2p_tests": "{\"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll handles events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken on iOS, use provided app ID from packageInfo\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out during transient-error backoff\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads immediately on expired queue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out while loading; then fails; malformed response with ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error ignore expired queue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.load retries registerQueue on NetworkError\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on Server5xxException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount loading succeeds\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.removeAccount when store not loaded\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error eventually report Server5xxException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reload failure new store is not loaded, gets InitialSnapshot with ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken token already known (iOS)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on rate limit: status 429 ZulipApiException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount throws if missing queueId\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage narrow gets normalized from \\\"general chat\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccountSync\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.removeAccount when store loading\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reload failure new store is not loaded, gets HTTP 401 error instead\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.load updates account from snapshot\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report generic ZulipApiException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on NetworkException from SocketException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on generic NetworkException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/lightbox_test.dart: LightboxHero Hero animation occurs smoothly when opening lightbox from message list\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on rate limit: code RATE_LIMIT_HIT\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount concurrent case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error nicely report handleEvent error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount loading fails; malformed response with ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out while loading; then fails with HTTP status code 401\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ThematicBreak smoke ThematicBreak\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out while loading; then succeeds\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount loading fails with HTTP status code 401\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error eventually report generic NetworkException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on rate limit: status 429 MalformedServerResponseException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads on generic ZulipApiException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateAccount notifyListeners called\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateZulipVersionData\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report unexpected error within loop\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report MalformedServerResponseException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reload failure user logged out before new store is loaded\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error ignore NetworkException from SocketException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken token initially unknown (iOS)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads on handleEvent error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateAccount basic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out while loading; then succeeds; InitialSnapshot has ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads on unexpected error within loop\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateAccount reject changing id, realmUrl, or userId\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.load smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report rate limit: code RATE_LIMIT_HIT\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken token already known (Android)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.fetchEmojiData retries on failure\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reload failure new store is not loaded, gets malformed response with ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount sequential case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken token initially unknown (Android)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.removeAccount when store loaded\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.fetchEmojiData happy case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/settings_test.dart: TwentyFourHourTime.localeDefault\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: ZulipVersionData fromMalformedServerResponseException replace missing feature level with 0\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report rate limit: status 429 ZulipApiException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount loading succeeds; InitialSnapshot has ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/route/settings_test.dart: smoke updateSettings\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report rate limit: status 429 MalformedServerResponseException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads on MalformedServerResponseException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll loops on success\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1720", "org": "zulip", "repo": "zulip-flutter", "number": 1720, "state": "closed", "title": "Render KaTeX by default", "body": "Fixes #46. (By enabling the TeX support whose substance was added over a number of preceding PRs.)\r\n\r\nHere's a version of the commit I've included in each release recently, atop (previous versions of) #1559, to enable our KaTeX support. Now that #1559 and its preceding PRs (#1698, and others before that) are merged to main, this is ready to go to main too.\r\n\r\nThis was a minimal version for the release, just flipping the flag's default to true. But in general we should remove experimental flags from the codebase as soon as they're no longer relevant, to keep complexity from building up. (See the doc on [GlobalSettingType.experimentalFeatureFlag].) @rajveermalviya would you write a follow-up commit that removes this flag entirely, and cleans up the logic elsewhere which that makes possible to clean up?\r\n\r\n#### 5287d39b9 content: Render KaTeX by default, the way we have in recent releases\r\n\r\nThis is cherry-picked from commits we included in each of the last\r\nseveral releases, starting with 8f3723768 in v0.0.31.\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"fe186b29a624fb4c348416504cf7101f57d9350e\"}", "resolved_issues": "[{\"number\": 46, \"title\": \"TeX in the message list\", \"body\": \"Zulip's Markdown flavor supports TeX for mathematical notation, using [KaTeX](https://katex.org/). This will be one of the more complex message-content features for us to support.\\r\\n\\r\\nThe way this works for web and for the existing RN-based mobile client is:\\r\\n* KaTeX consists of some JavaScript code to convert TeX into HTML, and then some CSS to style that HTML. The KaTeX-generated HTML also has some per-element style attributes.\\r\\n* The server takes care of the conversion to HTML, by running the KaTeX JS code on Node. That HTML goes into the message's HTML content.\\r\\n* Then the web and RN-mobile clients ship with KaTeX's CSS, and include that in their styles.\\r\\n* Those clients also ship with the KaTeX JS code. They use that for local echo.\\r\\n\\r\\nWhat I think we'll want to do in Flutter is:\\r\\n* Skip TeX for local echo, and just show the source TeX. That seems fine.\\r\\n * If we implement a \\\"preview\\\" feature for before sending a message, then it'll be important to get the actual rendering there\\u2026 but even the web app relies on the server for its preview feature. So we'll do the same.\\r\\n* Then we'll consume KaTeX HTML and convert it into Flutter widgets, just like we consume other kinds of Zulip content HTML and convert it into Flutter widgets, in `lib/model/content.dart` and `lib/widgets/content.dart`.\\r\\n\\r\\nConverting the HTML to Flutter widgets will involve having code in `lib/widgets/content.dart` that is written to correspond to the KaTeX CSS, just like much of the existing code there is written to correspond to the Zulip markdown-content CSS.\\r\\n\\r\\nThat CSS is [a few hundred lines of code](https://github.com/KaTeX/KaTeX/blob/c5ac4c769588761fb68d89890998234e83fc1c1a/src/katex.less). It's written in Less; but looking at the compiled output, it's not much longer than that source, and most of the difference is highly repetitive. So the real amount of information there is about what's in that one source file. That file is also highly stable over time \\u2014 just as one might hope, given that TeX itself is famously extremely stable \\u2014 with the last non-NFC change 20 months ago, in 2021-07.\\r\\n\\r\\nSo while this won't be a small subproject, it's one where I'm pretty confident we can do it well.\\r\\n\"}]", "lang": "dart", "problem_statement": "TeX in the message list\nZulip's Markdown flavor supports TeX for mathematical notation, using [KaTeX](https://katex.org/). This will be one of the more complex message-content features for us to support.\r\n\r\nThe way this works for web and for the existing RN-based mobile client is:\r\n* KaTeX consists of some JavaScript code to convert TeX into HTML, and then some CSS to style that HTML. The KaTeX-generated HTML also has some per-element style attributes.\r\n* The server takes care of the conversion to HTML, by running the KaTeX JS code on Node. That HTML goes into the message's HTML content.\r\n* Then the web and RN-mobile clients ship with KaTeX's CSS, and include that in their styles.\r\n* Those clients also ship with the KaTeX JS code. They use that for local echo.\r\n\r\nWhat I think we'll want to do in Flutter is:\r\n* Skip TeX for local echo, and just show the source TeX. That seems fine.\r\n * If we implement a \"preview\" feature for before sending a message, then it'll be important to get the actual rendering there\u2026 but even the web app relies on the server for its preview feature. So we'll do the same.\r\n* Then we'll consume KaTeX HTML and convert it into Flutter widgets, just like we consume other kinds of Zulip content HTML and convert it into Flutter widgets, in `lib/model/content.dart` and `lib/widgets/content.dart`.\r\n\r\nConverting the HTML to Flutter widgets will involve having code in `lib/widgets/content.dart` that is written to correspond to the KaTeX CSS, just like much of the existing code there is written to correspond to the Zulip markdown-content CSS.\r\n\r\nThat CSS is [a few hundred lines of code](https://github.com/KaTeX/KaTeX/blob/c5ac4c769588761fb68d89890998234e83fc1c1a/src/katex.less). It's written in Less; but looking at the compiled output, it's not much longer than that source, and most of the difference is highly repetitive. So the real amount of information there is about what's in that one source file. That file is also highly stable over time \u2014 just as one might hope, given that TeX itself is famously extremely stable \u2014 with the last non-NFC change 20 months ago, in 2021-07.\r\n\r\nSo while this won't be a small subproject, it's one where I'm pretty confident we can do it well.\r\n\n", "hints": "We got a request for this as beta feedback in the Google Play Console:\r\n\r\n> Looks like there's no Latex support yet. This makes it a non-starter for our purposes unfortunately. Are there plans to bring that in soon?\nAnd again today:\r\n\r\n> Math doesn't work, glitches with links. I'll try again another time (love Zulip generally).\nIn the Lean community we [asked](https://leanprover.zulipchat.com/#narrow/channel/236604-Zulip-meta/topic/LaTeX.20display.20in.20mobile.20app/near/489857078) how disappointed people would be if the app were rolled out to all users before full support for TeX.\n\nOne user answered \"heavily disappointed\"; others reacted to that message suggesting they disagree.\n\nA different user \"wouldn't mind\" the current state, and another added:\n> I mean, I'm old enough to remember when people wrote latex in `sci.math.research` in their posts and it was just displayed like that anyway.\n\nSee discussion with an [idea](https://chat.zulip.org/#narrow/channel/48-mobile/topic/TeX.20formatting.20.23F46/near/2048201) from Tim:\n> So I think it would be possible to write the Flutter app logic to convert MathML into display rather than working with the HTML.\nIt's looking like we won't have all the features of KaTeX covered before we launch the new app in a few weeks ([#mobile-team > Flutter beta timeline @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/243-mobile-team/topic/Flutter.20beta.20timeline/near/2174273)). I think we can still cover most usage of it, though, with a respectable fallback behavior. Then we can pursue the remaining KaTeX features as follow-up issues.\n\nDetails in chat: [#mobile > TeX formatting #F46 @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/TeX.20formatting.20.23F46/near/2182738)\n", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1720", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/46\"]", "test_command": "flutter test test/model/content_test.dart test/widgets/content_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/settings.dart b/lib/model/settings.dart\nindex e8a309ac29..4e71224444 100644\n--- a/lib/model/settings.dart\n+++ b/lib/model/settings.dart\n@@ -178,7 +178,7 @@ enum BoolGlobalSetting {\n upgradeWelcomeDialogShown(GlobalSettingType.internal, false),\n \n /// An experimental flag to toggle rendering KaTeX content in messages.\n- renderKatex(GlobalSettingType.experimentalFeatureFlag, false),\n+ renderKatex(GlobalSettingType.experimentalFeatureFlag, true),\n \n /// An experimental flag to enable rendering KaTeX even when some\n /// errors are encountered.\n", "test_patch": "diff --git a/test/model/content_test.dart b/test/model/content_test.dart\nindex e4dd622b19..88bd11c66c 100644\n--- a/test/model/content_test.dart\n+++ b/test/model/content_test.dart\n@@ -512,7 +512,7 @@ class ContentExample {\n static final mathInline = ContentExample.inline(\n 'inline math',\n r\"$$ \\lambda $$\",\n- expectedText: r'\\lambda',\n+ expectedText: r'\u03bb',\n '

      '\n '\u03bb'\n ' \\\\lambda '\n@@ -532,7 +532,7 @@ class ContentExample {\n static const mathBlock = ContentExample(\n 'math block',\n \"```math\\n\\\\lambda\\n```\",\n- expectedText: r'\\lambda',\n+ expectedText: r'\u03bb',\n '

      '\n '\u03bb'\n '\\\\lambda'\ndiff --git a/test/widgets/content_test.dart b/test/widgets/content_test.dart\nindex 964d7e1208..46ed10079e 100644\n--- a/test/widgets/content_test.dart\n+++ b/test/widgets/content_test.dart\n@@ -558,7 +558,11 @@ void main() {\n group('MathBlock', () {\n testContentSmoke(ContentExample.mathBlock);\n \n- testWidgets('displays KaTeX source; experimental flag default', (tester) async {\n+ testWidgets('displays KaTeX source; experimental flag disabled', (tester) async {\n+ addTearDown(testBinding.reset);\n+ final globalSettings = testBinding.globalStore.settings;\n+ await globalSettings.setBool(BoolGlobalSetting.renderKatex, false);\n+\n await prepareContent(tester, plainContent(ContentExample.mathBlock.html));\n tester.widget(find.text(r'\\lambda', findRichText: true));\n });\n@@ -1102,6 +1106,23 @@ void main() {\n });\n \n testWidgets('maintains font-size ratio with surrounding text, when showing TeX source', (tester) async {\n+ const html = ''\n+ '\u03bb'\n+ ' \\\\lambda '\n+ '\u03bb';\n+ await checkFontSizeRatio(tester,\n+ targetHtml: html,\n+ targetFontSizeFinder: mkTargetFontSizeFinderFromPattern(r'\u03bb'));\n+ }, skip: true // TODO(#46): adapt this test\n+ // (it needs a more complex targetFontSizeFinder;\n+ // see other uses in this file for examples.)\n+ );\n+\n+ testWidgets('maintains font-size ratio with surrounding text, when showing TeX source', (tester) async {\n+ addTearDown(testBinding.reset);\n+ final globalSettings = testBinding.globalStore.settings;\n+ await globalSettings.setBool(BoolGlobalSetting.renderKatex, false);\n+\n const html = ''\n '\u03bb'\n ' \\\\lambda '\n@@ -1111,7 +1132,11 @@ void main() {\n targetFontSizeFinder: mkTargetFontSizeFinderFromPattern(r'\\lambda'));\n });\n \n- testWidgets('displays KaTeX source; experimental flag default', (tester) async {\n+ testWidgets('displays KaTeX source; experimental flag disabled', (tester) async {\n+ addTearDown(testBinding.reset);\n+ final globalSettings = testBinding.globalStore.settings;\n+ await globalSettings.setBool(BoolGlobalSetting.renderKatex, false);\n+\n await prepareContent(tester, plainContent(ContentExample.mathInline.html));\n tester.widget(find.text(r'\\lambda', findRichText: true));\n });\n", "n2p_tests": "{}", "f2p_tests": "{\"/home/zulip-flutter/test/widgets/content_test.dart: inline math smoke: inline math\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock smoke: math block\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList image with invalid src URL\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in table column header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: legacy plain channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in bold context\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h6 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in h1 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse headings plain h6\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: LinkNode parse #-mention of topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain user @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse plain group @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList content after image cluster\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList image cluster in implicit paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h3\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h4\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji smoke: Unicode emoji, encoded in span element, multiple codepoints\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse spoiler with rich header and content\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions link containing other spans\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock syntax highlighting: non-bold span (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse content after image cluster\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList single image loading placeholder\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table without any body cells in markdown\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: smoke: quotation\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block with syntax highlighting\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block in quote\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler interactions: spoiler with tappable content (an image) in the header tap image\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageEmbedVideo video preview for vimeo embed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse nested lists, quotes, headings, code blocks\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: global times parse global time\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions follow browser preference setting to open URL (variant: TargetPlatform.android)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse headings amidst paragraphs\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse blank text nodes after code blocks\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode on internal links valid internal links are navigated to within app\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions relative links are resolved\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions multiple links in paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse legacy plain channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block, KaTeX raisebox; single vlist-r, single vertical offset row\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table with bold and italic headers\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block, KaTeX superscript; single vlist-r, single vertical offset row\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions error dialog if platform cannot open link\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: global times handles missing attribute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: track links inside block-inline containers link in list item\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in spoiler header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math maintains font-size ratio with surrounding text, when showing TeX source\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block, KaTeX logo\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: track links inside block-inline containers multiple links in paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock characters render at specific offsets with specific size math block, KaTeX subsup script; two vlist-r, multiple vertical offset rows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse image cluster in implicit paragraph\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block; KaTeX different sizing\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: legacy silent channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock characters render at specific offsets with specific size math block, KaTeX subscript; two vlist-r, single vertical offset row\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList multiple images\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList image as immediate child in implicit paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions link nested in other spans\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageInlineVideo tapping on preview opens lightbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for youtube embed with thumbnail\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline code maintains font-size ratio with surrounding text\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse custom emoji\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h4 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ListNodeWidget list uses correct text baseline alignment\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler interactions: spoiler with tappable content (an image) in the header tap header away from expand/collapse icon (and image)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in bold context (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block between images\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji smoke: Unicode emoji, encoded in span element\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse Unicode emoji, not encoded in span element\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock characters render at specific offsets with specific size math block, KaTeX negative margins on a vlist row\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block without syntax highlighting\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: LinkNode parse #-mention of stream\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock characters render at specific offsets with specific size math block, KaTeX superscript; single vlist-r, single vertical offset row\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse legacy silent channel wildcard @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse impossible content after image cluster in implicit paragraph\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for user uploaded video\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse spoiler a header that has an image in it\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock displays KaTeX source; experimental flag disabled\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock smoke: code block with syntax highlighting\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in plain paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse audio inline no title\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse quotation\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in table column header (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse nested del, strong, em, code\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent @-topic, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in plain paragraph (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent group @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse lists implicit paragraph with internal
      \": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) smoke: strong/bold\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for vimeo embed with realm link previews enabled, (hypothetical) class name reorder\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent @-topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse lists explicit paragraphs\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji smoke: Unicode emoji, not encoded in span element\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler interactions: spoiler with tappable content (an image) in the header tap header on expand/collapse icon\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock syntax highlighting: non-bold span\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block, with syntax highlighting and highlighted lines\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h1\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList single image no thumbnail\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain group @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Heading plain h6\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: global times handles DateTime.parse failure\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent @-topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions error dialog if invalid URL\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse lists parse ordered list with custom start\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock characters render at specific offsets with specific size math block, KaTeX negative margin\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList multiple images no thumbnails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse legacy website preview smoke\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler smoke: spoiler with plain custom header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h1 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions can tap a link to open URL (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler smoke: spoiler with default header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse multiple images no thumbnails\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain @-topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse multiple clusters of images\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse inline code\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block, KaTeX negative margin\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block, KaTeX subscript; two vlist-r, single vertical offset row\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse spoiler with default header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions follow browser preference setting to open URL (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block spans with multiple CSS classes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock syntax highlighting: bold span\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in table column header (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ListNodeWidget ordered list markers are end-aligned\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Heading smoke test for h1, h2, h3, h4, h5\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention maintains font-size ratio with surrounding text\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block, with an unknown span type\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for youtube embed with thumbnail, (hypothetical) class name reorder\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table with image\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in spoiler header (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse image as immediate child in implicit paragraph\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse deleted/strike-through\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in h1\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image with invalid URL\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse nested del, strong, em, link\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent channel wildcard @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse strong/bold\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse lists

        \": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions link inside HeadingNode\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline code smoke: inline code\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse plain user @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse audio inline\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse emphasis/italic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse Zulip extra emoji\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in plain paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse website preview without title\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock syntax highlighting: bold span (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block; KaTeX space\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image no dimensions\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse plain @-topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock displays KaTeX content; experimental flag enabled\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock characters render at specific offsets with specific size math block, KaTeX raisebox; single vlist-r, single vertical offset row\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math blocks, multiple in quote\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table with multiple rows\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math maintains font-size ratio with surrounding text\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse headings containing inline markup\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock smoke: code block without syntax highlighting\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block, multiline, with syntax highlighting\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse website preview smoke\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse custom emoji with invalid URL\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Spoiler smoke: spoiler with rich header and content\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse Unicode emoji, encoded in span element, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageEmbedVideo video preview for youtube embed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math blocks, multiple in paragraph\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse headings h1, h2, h3, h4, h5\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent user @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock characters render at specific offsets with specific size math block; KaTeX delimiter sizing\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table missing one body column in markdown\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in spoiler header (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse
        in block context\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent user @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList multiple clusters of images\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse spoiler with plain custom header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image loading placeholder\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block; KaTeX nested sizing\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse parse thematic break (
        )\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse Unicode emoji, encoded in span element\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock characters render at specific offsets with specific size math block, KaTeX logo\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block, KaTeX subsup script; two vlist-r, multiple vertical offset rows\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent group @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock characters render at specific offsets with specific size math block; KaTeX different sizing\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image no thumbnail\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse a plain-text paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent group @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for user uploaded video, (hypothetical) class name reorder\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse
        inside a paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock smoke: code block spans with multiple CSS classes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: LinkNode parse link\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse lists parse ordered list with large start number\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent channel wildcard @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse multiple images\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in table column header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse nested link, del, strong, em, code\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h3 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock smoke: code block, multiline, with syntax highlighting\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: all content examples are tested\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock characters render at specific offsets with specific size math block; KaTeX nested sizing\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h2 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse legacy silent channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block; KaTeX delimiter sizing\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block, with an empty body\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h5 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock characters render at specific offsets with specific size math block; KaTeX space\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions can tap a link to open URL (variant: TargetPlatform.android)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in spoiler header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ListNodeWidget ordered list with custom start\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table with links in cells\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h2\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: legacy silent channel wildcard @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table with different text alignment in columns\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse plain channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ThematicBreak smoke ThematicBreak\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ListNodeWidget ordered list markers have enough space to render completely\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: global times handles unexpected timezone\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image external\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse two plain-text paragraphs\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent @-topic, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse inline math\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block, KaTeX negative margins on a vlist row\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse Unicode emoji, encoded in span element, multiple codepoints\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji use emoji font (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for vimeo embed with realm link previews enabled\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: track links inside block-inline containers link in heading\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h5\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table with single row\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji use emoji font (variant: TargetPlatform.android)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent user @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImage, MessageImageList single image\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse lists
          \": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: LinkNode parse message link\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode on internal links invalid internal links are opened in browser\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse table with link; center aligned\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse website preview without description\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in plain paragraph (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: smoke: emphasis/italic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse website preview without title and description\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h6\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video non-preview for attempted vimeo embed with realm link previews disabled\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1688", "org": "zulip", "repo": "zulip-flutter", "number": 1688, "state": "closed", "title": "Add user groups to store and API binding", "body": "Fixes #662, toward #233 user-group @-mentions.\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"37af86db63216f3693bc8ee649ef97aa6dd20b6e\"}", "resolved_issues": "[{\"number\": 662, \"title\": \"Store user groups\", \"body\": \"We should store the list of user groups in the realm, with their metadata ~~and their memberships~~, and keep the data up to date.\\n\\n(Memberships will be a separate issue: #1687.)\\n\\nThis data originates as `realm_user_groups` in the initial snapshot at https://zulip.com/api/register-queue#response , and is updated by events.\\n\\nAs a preparatory refactor, we'll move `PerAccountStore.users` (which is a `Map`, indexed by user ID) to live on a new type `UserStore`. This will closely follow the example of `streams` and `StreamStore`.\\n\\nThen the user groups will be added as an additional data structure on `UserStore`.\\n\\nThis is a prerequisite for features involving user groups, in particular:\\n* #233 \"}]", "lang": "dart", "problem_statement": "Store user groups\nWe should store the list of user groups in the realm, with their metadata ~~and their memberships~~, and keep the data up to date.\n\n(Memberships will be a separate issue: #1687.)\n\nThis data originates as `realm_user_groups` in the initial snapshot at https://zulip.com/api/register-queue#response , and is updated by events.\n\nAs a preparatory refactor, we'll move `PerAccountStore.users` (which is a `Map`, indexed by user ID) to live on a new type `UserStore`. This will closely follow the example of `streams` and `StreamStore`.\n\nThen the user groups will be added as an additional data structure on `UserStore`.\n\nThis is a prerequisite for features involving user groups, in particular:\n* #233 \n", "hints": "We're likely about to add a [client capability](https://zulip.com/api/register-queue#parameter-client_capabilities) on the server related to user groups, with a name like `allow_deactivated`:\r\nhttps://chat.zulip.org/#narrow/stream/378-api-design/topic/deactivated.20groups.20in.20.60GET.60.20endpoints/near/1940349\r\n\r\nSo when implementing this part of the API, we should start sending that client capability.\r\n\r\n(In general, we should always be sending all [client capabilities](https://zulip.com/api/register-queue#parameter-client_capabilities) that have been defined so far. That way we get the latest version of the API, rather than an API that's been adapted for older clients.)\r\n\nFor current servers since https://github.com/zulip/zulip/pull/29498 (server-10, ZFL 303), correctly maintaining user groups will also involve acting on RealmUserUpdateEvent.isActive. See the API docs for that property.\r\n\r\nChat thread: https://chat.zulip.org/#narrow/stream/378-api-design/topic/Groups.20events.20for.20deactivated.20users/near/1958907\r\n", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1688", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/662\"]", "test_command": "flutter test test/model/user_group_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/api/model/events.dart b/lib/api/model/events.dart\nindex 6fd21e5c9a..b3f3844366 100644\n--- a/lib/api/model/events.dart\n+++ b/lib/api/model/events.dart\n@@ -30,6 +30,14 @@ sealed class Event {\n default: return UnexpectedEvent.fromJson(json);\n }\n case 'custom_profile_fields': return CustomProfileFieldsEvent.fromJson(json);\n+ case 'user_group':\n+ switch (json['op'] as String) {\n+ case 'add': return UserGroupAddEvent.fromJson(json);\n+ case 'update': return UserGroupUpdateEvent.fromJson(json);\n+ // TODO(#1687): add_members, remove_members, add_subgroups, remove_subgroups\n+ case 'remove': return UserGroupRemoveEvent.fromJson(json);\n+ default: return UnexpectedEvent.fromJson(json);\n+ }\n case 'realm_user':\n switch (json['op'] as String) {\n case 'add': return RealmUserAddEvent.fromJson(json);\n@@ -206,6 +214,85 @@ class CustomProfileFieldsEvent extends Event {\n Map toJson() => _$CustomProfileFieldsEventToJson(this);\n }\n \n+/// A Zulip event of type `user_group`.\n+///\n+/// See API docs starting at:\n+/// https://zulip.com/api/get-events#user_group-add\n+sealed class UserGroupEvent extends Event {\n+ @override\n+ @JsonKey(includeToJson: true)\n+ String get type => 'user_group';\n+\n+ String get op;\n+\n+ UserGroupEvent({required super.id});\n+}\n+\n+/// A [UserGroupEvent] with op `add`: https://zulip.com/api/get-events#user_group-add\n+@JsonSerializable(fieldRename: FieldRename.snake)\n+class UserGroupAddEvent extends UserGroupEvent {\n+ @override\n+ @JsonKey(includeToJson: true)\n+ String get op => 'add';\n+\n+ final UserGroup group;\n+\n+ UserGroupAddEvent({required super.id, required this.group});\n+\n+ factory UserGroupAddEvent.fromJson(Map json) => _$UserGroupAddEventFromJson(json);\n+\n+ @override\n+ Map toJson() => _$UserGroupAddEventToJson(this);\n+}\n+\n+/// A [UserGroupEvent] with op `update`: https://zulip.com/api/get-events#user_group-update\n+@JsonSerializable(fieldRename: FieldRename.snake)\n+class UserGroupUpdateEvent extends UserGroupEvent {\n+ @override\n+ @JsonKey(includeToJson: true)\n+ String get op => 'update';\n+\n+ final int groupId;\n+ final UserGroupUpdateData data;\n+\n+ UserGroupUpdateEvent({required super.id, required this.groupId, required this.data});\n+\n+ factory UserGroupUpdateEvent.fromJson(Map json) => _$UserGroupUpdateEventFromJson(json);\n+\n+ @override\n+ Map toJson() => _$UserGroupUpdateEventToJson(this);\n+}\n+\n+@JsonSerializable(fieldRename: FieldRename.snake)\n+class UserGroupUpdateData {\n+ final String? name;\n+ final String? description;\n+ final bool? deactivated;\n+\n+ UserGroupUpdateData({required this.name, required this.description, required this.deactivated});\n+\n+ factory UserGroupUpdateData.fromJson(Map json) => _$UserGroupUpdateDataFromJson(json);\n+\n+ Map toJson() => _$UserGroupUpdateDataToJson(this);\n+}\n+\n+/// A [UserGroupEvent] with op `remove`: https://zulip.com/api/get-events#user_group-remove\n+@JsonSerializable(fieldRename: FieldRename.snake)\n+class UserGroupRemoveEvent extends UserGroupEvent {\n+ @override\n+ @JsonKey(includeToJson: true)\n+ String get op => 'remove';\n+\n+ final int groupId;\n+\n+ UserGroupRemoveEvent({required super.id, required this.groupId});\n+\n+ factory UserGroupRemoveEvent.fromJson(Map json) => _$UserGroupRemoveEventFromJson(json);\n+\n+ @override\n+ Map toJson() => _$UserGroupRemoveEventToJson(this);\n+}\n+\n /// A Zulip event of type `realm_user`.\n ///\n /// The corresponding API docs are in several places for\ndiff --git a/lib/api/model/events.g.dart b/lib/api/model/events.g.dart\nindex 2203b2d9df..31016c67ce 100644\n--- a/lib/api/model/events.g.dart\n+++ b/lib/api/model/events.g.dart\n@@ -86,6 +86,69 @@ Map _$CustomProfileFieldsEventToJson(\n 'fields': instance.fields,\n };\n \n+UserGroupAddEvent _$UserGroupAddEventFromJson(Map json) =>\n+ UserGroupAddEvent(\n+ id: (json['id'] as num).toInt(),\n+ group: UserGroup.fromJson(json['group'] as Map),\n+ );\n+\n+Map _$UserGroupAddEventToJson(UserGroupAddEvent instance) =>\n+ {\n+ 'id': instance.id,\n+ 'type': instance.type,\n+ 'op': instance.op,\n+ 'group': instance.group,\n+ };\n+\n+UserGroupUpdateEvent _$UserGroupUpdateEventFromJson(\n+ Map json,\n+) => UserGroupUpdateEvent(\n+ id: (json['id'] as num).toInt(),\n+ groupId: (json['group_id'] as num).toInt(),\n+ data: UserGroupUpdateData.fromJson(json['data'] as Map),\n+);\n+\n+Map _$UserGroupUpdateEventToJson(\n+ UserGroupUpdateEvent instance,\n+) => {\n+ 'id': instance.id,\n+ 'type': instance.type,\n+ 'op': instance.op,\n+ 'group_id': instance.groupId,\n+ 'data': instance.data,\n+};\n+\n+UserGroupUpdateData _$UserGroupUpdateDataFromJson(Map json) =>\n+ UserGroupUpdateData(\n+ name: json['name'] as String?,\n+ description: json['description'] as String?,\n+ deactivated: json['deactivated'] as bool?,\n+ );\n+\n+Map _$UserGroupUpdateDataToJson(\n+ UserGroupUpdateData instance,\n+) => {\n+ 'name': instance.name,\n+ 'description': instance.description,\n+ 'deactivated': instance.deactivated,\n+};\n+\n+UserGroupRemoveEvent _$UserGroupRemoveEventFromJson(\n+ Map json,\n+) => UserGroupRemoveEvent(\n+ id: (json['id'] as num).toInt(),\n+ groupId: (json['group_id'] as num).toInt(),\n+);\n+\n+Map _$UserGroupRemoveEventToJson(\n+ UserGroupRemoveEvent instance,\n+) => {\n+ 'id': instance.id,\n+ 'type': instance.type,\n+ 'op': instance.op,\n+ 'group_id': instance.groupId,\n+};\n+\n RealmUserAddEvent _$RealmUserAddEventFromJson(Map json) =>\n RealmUserAddEvent(\n id: (json['id'] as num).toInt(),\ndiff --git a/lib/api/model/initial_snapshot.dart b/lib/api/model/initial_snapshot.dart\nindex a9efdabdd5..d56c25b599 100644\n--- a/lib/api/model/initial_snapshot.dart\n+++ b/lib/api/model/initial_snapshot.dart\n@@ -56,6 +56,8 @@ class InitialSnapshot {\n \n final Map realmEmoji;\n \n+ final List realmUserGroups;\n+\n final List recentPrivateConversations;\n \n final List? savedSnippets; // TODO(server-10)\n@@ -149,6 +151,7 @@ class InitialSnapshot {\n required this.mutedUsers,\n required this.presences,\n required this.realmEmoji,\n+ required this.realmUserGroups,\n required this.recentPrivateConversations,\n required this.savedSnippets,\n required this.subscriptions,\ndiff --git a/lib/api/model/initial_snapshot.g.dart b/lib/api/model/initial_snapshot.g.dart\nindex c33c457226..fa3601bdd0 100644\n--- a/lib/api/model/initial_snapshot.g.dart\n+++ b/lib/api/model/initial_snapshot.g.dart\n@@ -54,6 +54,9 @@ InitialSnapshot _$InitialSnapshotFromJson(\n realmEmoji: (json['realm_emoji'] as Map).map(\n (k, e) => MapEntry(k, RealmEmojiItem.fromJson(e as Map)),\n ),\n+ realmUserGroups: (json['realm_user_groups'] as List)\n+ .map((e) => UserGroup.fromJson(e as Map))\n+ .toList(),\n recentPrivateConversations:\n (json['recent_private_conversations'] as List)\n .map((e) => RecentDmConversation.fromJson(e as Map))\n@@ -143,6 +146,7 @@ Map _$InitialSnapshotToJson(InitialSnapshot instance) =>\n 'muted_users': instance.mutedUsers,\n 'presences': instance.presences.map((k, e) => MapEntry(k.toString(), e)),\n 'realm_emoji': instance.realmEmoji,\n+ 'realm_user_groups': instance.realmUserGroups,\n 'recent_private_conversations': instance.recentPrivateConversations,\n 'saved_snippets': instance.savedSnippets,\n 'subscriptions': instance.subscriptions,\ndiff --git a/lib/api/model/model.dart b/lib/api/model/model.dart\nindex 6bb34c89f4..db490b0d34 100644\n--- a/lib/api/model/model.dart\n+++ b/lib/api/model/model.dart\n@@ -199,6 +199,42 @@ enum Emojiset {\n .map((key, value) => MapEntry(value, key));\n }\n \n+/// As in [InitialSnapshot.realmUserGroups] or [UserGroupAddEvent].\n+@JsonSerializable(fieldRename: FieldRename.snake)\n+class UserGroup {\n+ final int id;\n+\n+ // TODO(#1687) to maintain members, also act on user deactivation: https://github.com/zulip/zulip-flutter/issues/662#issuecomment-2405845356\n+ // List members; // TODO(#1687) track group members\n+ // List directSubgroupIds; // TODO(#1687) track group members\n+\n+ String name;\n+ String description;\n+\n+ // final int? dateCreated; // not using; ignore\n+ // final int? creatorId; // not using; ignore\n+\n+ final bool isSystemGroup;\n+\n+ // TODO(server-10): [deactivated] new in FL 290; previously no groups were deactivated\n+ @JsonKey(defaultValue: false)\n+ bool deactivated;\n+\n+ // TODO(#814): GroupSettingValue canAddMembersGroup, etc.; add to update event too\n+\n+ UserGroup({\n+ required this.id,\n+ required this.name,\n+ required this.description,\n+ required this.isSystemGroup,\n+ required this.deactivated,\n+ });\n+\n+ factory UserGroup.fromJson(Map json) => _$UserGroupFromJson(json);\n+\n+ Map toJson() => _$UserGroupToJson(this);\n+}\n+\n /// As in [InitialSnapshot.realmUsers], [InitialSnapshot.realmNonActiveUsers], and [InitialSnapshot.crossRealmBots].\n ///\n /// In the Zulip API, the items in realm_users, realm_non_active_users, and\ndiff --git a/lib/api/model/model.g.dart b/lib/api/model/model.g.dart\nindex eff1019cda..ff01aba57f 100644\n--- a/lib/api/model/model.g.dart\n+++ b/lib/api/model/model.g.dart\n@@ -94,6 +94,22 @@ Map _$RealmEmojiItemToJson(RealmEmojiItem instance) =>\n 'author_id': instance.authorId,\n };\n \n+UserGroup _$UserGroupFromJson(Map json) => UserGroup(\n+ id: (json['id'] as num).toInt(),\n+ name: json['name'] as String,\n+ description: json['description'] as String,\n+ isSystemGroup: json['is_system_group'] as bool,\n+ deactivated: json['deactivated'] as bool? ?? false,\n+);\n+\n+Map _$UserGroupToJson(UserGroup instance) => {\n+ 'id': instance.id,\n+ 'name': instance.name,\n+ 'description': instance.description,\n+ 'is_system_group': instance.isSystemGroup,\n+ 'deactivated': instance.deactivated,\n+};\n+\n User _$UserFromJson(Map json) => User(\n userId: (json['user_id'] as num).toInt(),\n deliveryEmail: json['delivery_email'] as String?,\ndiff --git a/lib/api/route/events.dart b/lib/api/route/events.dart\nindex bd14521c74..589a9b8cbf 100644\n--- a/lib/api/route/events.dart\n+++ b/lib/api/route/events.dart\n@@ -18,6 +18,7 @@ Future registerQueue(ApiConnection connection) {\n 'user_avatar_url_field_optional': false, // TODO(#254): turn on\n 'stream_typing_notifications': true,\n 'user_settings_object': true,\n+ 'include_deactivated_groups': true,\n 'empty_topic_name': true,\n },\n });\ndiff --git a/lib/model/store.dart b/lib/model/store.dart\nindex 483cbb1662..09729bad7b 100644\n--- a/lib/model/store.dart\n+++ b/lib/model/store.dart\n@@ -35,6 +35,7 @@ import 'settings.dart';\n import 'typing_status.dart';\n import 'unreads.dart';\n import 'user.dart';\n+import 'user_group.dart';\n \n export 'package:drift/drift.dart' show Value;\n export 'database.dart' show Account, AccountsCompanion, AccountAlreadyExistsException;\n@@ -433,7 +434,14 @@ Uri? tryResolveUrl(Uri baseUrl, String reference) {\n /// This class does not attempt to poll an event queue\n /// to keep the data up to date. For that behavior, see\n /// [UpdateMachine].\n-class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStore, SavedSnippetStore, UserStore, ChannelStore, MessageStore {\n+class PerAccountStore extends PerAccountStoreBase with\n+ ChangeNotifier,\n+ UserGroupStore, ProxyUserGroupStore,\n+ EmojiStore,\n+ SavedSnippetStore,\n+ UserStore,\n+ ChannelStore,\n+ MessageStore {\n /// Construct a store for the user's data, starting from the given snapshot.\n ///\n /// The global store must already have been updated with\n@@ -475,6 +483,8 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor\n final channels = ChannelStoreImpl(initialSnapshot: initialSnapshot);\n return PerAccountStore._(\n core: core,\n+ groups: UserGroupStoreImpl(core: core,\n+ groups: initialSnapshot.realmUserGroups),\n serverPresencePingIntervalSeconds: initialSnapshot.serverPresencePingIntervalSeconds,\n serverPresenceOfflineThresholdSeconds: initialSnapshot.serverPresenceOfflineThresholdSeconds,\n realmWildcardMentionPolicy: initialSnapshot.realmWildcardMentionPolicy,\n@@ -524,6 +534,7 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor\n \n PerAccountStore._({\n required super.core,\n+ required UserGroupStoreImpl groups,\n required this.serverPresencePingIntervalSeconds,\n required this.serverPresenceOfflineThresholdSeconds,\n required this.realmWildcardMentionPolicy,\n@@ -549,7 +560,8 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor\n required this.unreads,\n required this.recentDmConversationsView,\n required this.recentSenders,\n- }) : _realmEmptyTopicDisplayName = realmEmptyTopicDisplayName,\n+ }) : _groups = groups,\n+ _realmEmptyTopicDisplayName = realmEmptyTopicDisplayName,\n _emoji = emoji,\n _savedSnippets = savedSnippets,\n _users = users,\n@@ -582,6 +594,13 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor\n ////////////////////////////////\n // Data attached to the realm or the server.\n \n+ // (User groups come before even realm settings,\n+ // because they'll be used for interpreting many realm settings.)\n+ @protected\n+ @override\n+ UserGroupStore get userGroupStore => _groups;\n+ final UserGroupStoreImpl _groups;\n+\n final int serverPresencePingIntervalSeconds;\n final int serverPresenceOfflineThresholdSeconds;\n \n@@ -901,6 +920,11 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor\n customProfileFields = _sortCustomProfileFields(event.fields);\n notifyListeners();\n \n+ case UserGroupEvent():\n+ assert(debugLog(\"server event: user_group/${event.op}\"));\n+ _groups.handleUserGroupEvent(event);\n+ notifyListeners();\n+\n case RealmUserAddEvent():\n assert(debugLog(\"server event: realm_user/add\"));\n _users.handleRealmUserEvent(event);\ndiff --git a/lib/model/user_group.dart b/lib/model/user_group.dart\nnew file mode 100644\nindex 0000000000..2079b323ec\n--- /dev/null\n+++ b/lib/model/user_group.dart\n@@ -0,0 +1,79 @@\n+import 'package:flutter/foundation.dart';\n+\n+import '../api/model/events.dart';\n+import '../api/model/model.dart';\n+import 'store.dart';\n+\n+/// The portion of [PerAccountStore] describing user groups.\n+mixin UserGroupStore on PerAccountStoreBase {\n+ /// The user group with the given ID, if any.\n+ UserGroup? getGroup(int userGroupId);\n+\n+ /// All non-deactivated user groups in the realm.\n+ ///\n+ /// For when deactivated groups are desired too, see [allGroups].\n+ Iterable get activeGroups;\n+\n+ /// All user groups in the realm, even those deactivated.\n+ ///\n+ /// Consider using [activeGroups] instead.\n+ Iterable get allGroups;\n+}\n+\n+mixin ProxyUserGroupStore on UserGroupStore {\n+ @protected\n+ UserGroupStore get userGroupStore;\n+\n+ @override\n+ UserGroup? getGroup(int userGroupId) => userGroupStore.getGroup(userGroupId);\n+ @override\n+ Iterable get activeGroups => userGroupStore.activeGroups;\n+ @override\n+ Iterable get allGroups => userGroupStore.allGroups;\n+}\n+\n+/// The implementation of [UserGroupStore] that does the work.\n+class UserGroupStoreImpl extends PerAccountStoreBase with UserGroupStore {\n+ UserGroupStoreImpl({required super.core, required List groups})\n+ : _groups = {\n+ for (final group in groups)\n+ group.id: group,\n+ };\n+\n+ @override\n+ UserGroup? getGroup(int userGroupId) {\n+ return _groups[userGroupId];\n+ }\n+\n+ @override\n+ Iterable get activeGroups {\n+ return _groups.values.where((group) => !group.deactivated);\n+ }\n+\n+ @override\n+ Iterable get allGroups {\n+ return _groups.values;\n+ }\n+\n+ final Map _groups;\n+\n+ void handleUserGroupEvent(UserGroupEvent event) {\n+ switch (event) {\n+ case UserGroupAddEvent():\n+ _groups[event.group.id] = event.group;\n+\n+ case UserGroupRemoveEvent():\n+ _groups.remove(event.groupId);\n+\n+ case UserGroupUpdateEvent():\n+ final group = _groups[event.groupId];\n+ if (group == null) {\n+ return; // TODO log\n+ }\n+ final data = event.data;\n+ if (data.name != null) group.name = data.name!;\n+ if (data.description != null) group.description = data.description!;\n+ if (data.deactivated != null) group.deactivated = data.deactivated!;\n+ }\n+ }\n+}\n", "test_patch": "diff --git a/test/api/model/model_checks.dart b/test/api/model/model_checks.dart\nindex 262395d955..36b6396c97 100644\n--- a/test/api/model/model_checks.dart\n+++ b/test/api/model/model_checks.dart\n@@ -2,6 +2,14 @@ import 'package:checks/checks.dart';\n import 'package:zulip/api/model/model.dart';\n import 'package:zulip/api/model/submessage.dart';\n \n+extension UserGroupChecks on Subject {\n+ Subject get id => has((x) => x.id, 'id');\n+ Subject get name => has((x) => x.name, 'name');\n+ Subject get description => has((x) => x.description, 'description');\n+ Subject get isSystemGroup => has((x) => x.isSystemGroup, 'isSystemGroup');\n+ Subject get deactivated => has((x) => x.deactivated, 'deactivated');\n+}\n+\n extension UserChecks on Subject {\n Subject get userId => has((x) => x.userId, 'userId');\n Subject get deliveryEmail => has((x) => x.deliveryEmail, 'deliveryEmail');\ndiff --git a/test/example_data.dart b/test/example_data.dart\nindex ad4b8bb6fe..d46652506a 100644\n--- a/test/example_data.dart\n+++ b/test/example_data.dart\n@@ -166,6 +166,26 @@ ServerEmojiData serverEmojiDataPopularLegacy = ServerEmojiData(codeToNames: {\n '1f419': ['octopus'],\n });\n \n+/// A fresh user-group ID, from a random but always strictly increasing sequence.\n+int _nextUserGroupId() => (_lastUserGroupId += 1 + Random().nextInt(10));\n+int _lastUserGroupId = 100;\n+\n+UserGroup userGroup({\n+ int? id,\n+ String? name,\n+ String? description,\n+ bool isSystemGroup = false,\n+ bool deactivated = false,\n+}) {\n+ return UserGroup(\n+ id: id ??= _nextUserGroupId(),\n+ name: name ??= 'group-$id',\n+ description: description ?? 'A group named $name',\n+ isSystemGroup: isSystemGroup,\n+ deactivated: deactivated,\n+ );\n+}\n+\n RealmEmojiItem realmEmojiItem({\n required String emojiCode,\n required String emojiName,\n@@ -1112,6 +1132,7 @@ InitialSnapshot initialSnapshot({\n List? mutedUsers,\n Map? presences,\n Map? realmEmoji,\n+ List? realmUserGroups,\n List? recentPrivateConversations,\n List? savedSnippets,\n List? subscriptions,\n@@ -1153,6 +1174,7 @@ InitialSnapshot initialSnapshot({\n mutedUsers: mutedUsers ?? [],\n presences: presences ?? {},\n realmEmoji: realmEmoji ?? {},\n+ realmUserGroups: realmUserGroups ?? [],\n recentPrivateConversations: recentPrivateConversations ?? [],\n savedSnippets: savedSnippets ?? [],\n subscriptions: subscriptions ?? [], // TODO add subscriptions to default\ndiff --git a/test/model/user_group_test.dart b/test/model/user_group_test.dart\nnew file mode 100644\nindex 0000000000..f05b3c3c32\n--- /dev/null\n+++ b/test/model/user_group_test.dart\n@@ -0,0 +1,119 @@\n+import 'package:checks/checks.dart';\n+import 'package:test_api/scaffolding.dart';\n+import 'package:zulip/api/model/events.dart';\n+import 'package:zulip/api/model/model.dart';\n+import 'package:zulip/model/user_group.dart';\n+\n+import '../api/model/model_checks.dart';\n+import '../example_data.dart' as eg;\n+import '../stdlib_checks.dart';\n+\n+void main() {\n+ List sorted(Iterable groups) {\n+ return groups.toList()..sort((a, b) => a.id.compareTo(b.id));\n+ }\n+\n+ void checkGroupsEqual(UserGroupStore store, Iterable expected) {\n+ check(sorted(store.allGroups)).jsonEquals(expected);\n+ }\n+\n+ test('initialize', () {\n+ final groups = [eg.userGroup(), eg.userGroup()];\n+ final store = eg.store(initialSnapshot: eg.initialSnapshot(\n+ realmUserGroups: groups));\n+ checkGroupsEqual(store, groups);\n+ });\n+\n+ test('getGroup', () {\n+ final group1 = eg.userGroup();\n+ final group2 = eg.userGroup();\n+ final store = eg.store(initialSnapshot: eg.initialSnapshot(\n+ realmUserGroups: [group1, group2]));\n+ check(store.getGroup(group1.id)).jsonEquals(group1);\n+ check(store.getGroup(group2.id)).jsonEquals(group2);\n+ check(store.getGroup(eg.userGroup().id)).isNull();\n+ });\n+\n+ test('activeGroups, allGroups', () async {\n+ final group1 = eg.userGroup(deactivated: false);\n+ final group2 = eg.userGroup(deactivated: true);\n+ final group3 = eg.userGroup(deactivated: false);\n+ final store = eg.store(initialSnapshot: eg.initialSnapshot(\n+ realmUserGroups: [group1, group2, group3]));\n+ check(sorted(store.allGroups)).jsonEquals([group1, group2, group3]);\n+ check(sorted(store.activeGroups)).jsonEquals([group1, group3]);\n+\n+ await store.handleEvent(UserGroupUpdateEvent(id: 1, groupId: group1.id,\n+ data: UserGroupUpdateData(name: null, description: null, deactivated: true)));\n+ check(sorted(store.activeGroups)).jsonEquals([group3]);\n+ });\n+\n+ test('UserGroupAddEvent, UserGroupRemoveEvent', () async {\n+ final group1 = eg.userGroup();\n+ final store = eg.store(initialSnapshot: eg.initialSnapshot(\n+ realmUserGroups: [group1]));\n+ checkGroupsEqual(store, [group1]);\n+\n+ final group2 = eg.userGroup();\n+ await store.handleEvent(UserGroupAddEvent(id: 1, group: group2));\n+ checkGroupsEqual(store, [group1, group2]);\n+\n+ await store.handleEvent(UserGroupRemoveEvent(id: 2, groupId: group1.id));\n+ checkGroupsEqual(store, [group2]);\n+ });\n+\n+ test('UserGroupUpdateEvent', () async {\n+ final store = eg.store();\n+ final group = eg.userGroup(\n+ name: 'a group', description: 'is a group', deactivated: false);\n+ await store.handleEvent(UserGroupAddEvent(id: 1, group: group));\n+ checkGroupsEqual(store, [group]);\n+\n+ // Handles all the properties being updated at once.\n+ await store.handleEvent(UserGroupUpdateEvent(id: 2, groupId: group.id,\n+ data: UserGroupUpdateData(name: 'revised group',\n+ description: 'different description', deactivated: true)));\n+ checkGroupsEqual(store, [{\n+ ...group.toJson(),\n+ 'name': 'revised group',\n+ 'description': 'different description',\n+ 'deactivated': true,\n+ }]);\n+\n+ // Handles some properties being null, still updating the one that's present.\n+ await store.handleEvent(UserGroupUpdateEvent(id: 2, groupId: group.id,\n+ data: UserGroupUpdateData(name: null,\n+ description: null, deactivated: false)));\n+ checkGroupsEqual(store, [{\n+ ...group.toJson(),\n+ 'name': 'revised group',\n+ 'description': 'different description',\n+ 'deactivated': false,\n+ }]);\n+ });\n+\n+ test('various fields make it through', () async {\n+ final store = eg.store(initialSnapshot: eg.initialSnapshot(\n+ realmUserGroups: [\n+ eg.userGroup(id: 3, name: 'some group', description: 'this is a group',\n+ isSystemGroup: true, deactivated: false),\n+ ]));\n+ await store.handleEvent(UserGroupAddEvent(id: 1, group: eg.userGroup(\n+ id: 5, name: 'a different group', description: 'also a group',\n+ isSystemGroup: false, deactivated: true)));\n+ check(sorted(store.allGroups)).deepEquals(>[\n+ (it) => it.isA()\n+ ..id.equals(3)\n+ ..name.equals('some group')\n+ ..description.equals('this is a group')\n+ ..isSystemGroup.isTrue()\n+ ..deactivated.isFalse(),\n+ (it) => it.isA()\n+ ..id.equals(5)\n+ ..name.equals('a different group')\n+ ..description.equals('also a group')\n+ ..isSystemGroup.isFalse()\n+ ..deactivated.isTrue(),\n+ ]);\n+ });\n+}\n", "n2p_tests": "{\"activeGroups, allGroups\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"initialize\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"various fields make it through\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"getGroup\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"UserGroupAddEvent, UserGroupRemoveEvent\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"UserGroupUpdateEvent\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1686", "org": "zulip", "repo": "zulip-flutter", "number": 1686, "state": "closed", "title": "store: Pass `dont_block` in first poll attempt after a failure", "body": "Fixes #979.\r\n\r\nDiscussion:\r\n https://github.com/zulip/zulip-flutter/issues/979#issuecomment-2993296322\r\n\r\n------\r\n\r\nTested manually, with and without this change:\r\n\r\n1. Log out from CZO (too active; events coming in frequently); connect to a not-very-active org\r\n\r\n2. Make an artificial network error in the `getEvents` binding:\r\n\r\n```diff\r\ndiff --git lib/api/route/events.dart lib/api/route/events.dart\r\nindex bd14521c7..da7bf4fea 100644\r\n--- lib/api/route/events.dart\r\n+++ lib/api/route/events.dart\r\n@@ -1,6 +1,7 @@\r\n import 'package:json_annotation/json_annotation.dart';\r\n \r\n import '../core.dart';\r\n+import '../exception.dart';\r\n import '../model/events.dart';\r\n import '../model/initial_snapshot.dart';\r\n \r\n@@ -27,6 +28,7 @@ Future registerQueue(ApiConnection connection) {\r\n Future getEvents(ApiConnection connection, {\r\n required String queueId, int? lastEventId, bool? dontBlock,\r\n }) {\r\n+ throw NetworkException(routeName: 'foo', message: 'foo', cause: 'foo');\r\n return connection.get('getEvents', GetEventsResult.fromJson, 'events', {\r\n 'queue_id': RawParameter(queueId),\r\n if (lastEventId != null) 'last_event_id': lastEventId,\r\n```\r\n\r\n3. Watch the logs to see retries going by\r\n4. Comment out the `throw NetworkException` line and do a hot-reload\r\n5. Watch the logs for `dont_block` in the `GET /events`, and watch the app to see if the loading indicator goes away quickly\r\n - Without the change, I don't see `dont_block`, and the loading indicator doesn't go away until the next event comes in\r\n - With the change, I see `dont_block`, and the loading indicator goes away quickly", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"4b75025cfa95222cee7df9084c4b8963d810ac4c\"}", "resolved_issues": "[{\"number\": 979, \"title\": \"Loading indicator slow to go away when returning to app, though in fact up to date\", \"body\": \"We added a loading indicator in #852 that appears when even queue polling fails with any error.\\r\\n\\r\\nHowever, it seems that the loading indicator can stay on even the event queue is doing fine, and does not go away until you get a new event.\\r\\n\\r\\nI don't have a consistent way to reproduce this, but what I did was basically:\\r\\n\\r\\n1. Leave the app on and lock the phone\\r\\n2. After a while, unlock the phone\\r\\n3. Observe if the loading indicator stays there longer than usual\\r\\n4. Try to do something (like starring a message), and the loading indicator should go away promptly\\r\\n\\r\\nMy guess is that when the event queue goes stale, `isLoading` gets set to true. When we do get the new event queue, we do not set `isLoading` back to false.\"}]", "lang": "dart", "problem_statement": "Loading indicator slow to go away when returning to app, though in fact up to date\nWe added a loading indicator in #852 that appears when even queue polling fails with any error.\r\n\r\nHowever, it seems that the loading indicator can stay on even the event queue is doing fine, and does not go away until you get a new event.\r\n\r\nI don't have a consistent way to reproduce this, but what I did was basically:\r\n\r\n1. Leave the app on and lock the phone\r\n2. After a while, unlock the phone\r\n3. Observe if the loading indicator stays there longer than usual\r\n4. Try to do something (like starring a message), and the loading indicator should go away promptly\r\n\r\nMy guess is that when the event queue goes stale, `isLoading` gets set to true. When we do get the new event queue, we do not set `isLoading` back to false.\n", "hints": "Thanks for the report!\r\n\r\nI don't think I've seen this symptom myself yet. It sounds reminiscent of this other event-queue-related symptom I saw once back in July:\r\n* #809\r\n\r\nbut I haven't seen that one since then either.\r\n\r\nI think this won't be actionable until we hear more reports of it happening, so I'll push it out to the post-launch milestone. If we do see or hear of it again, this thread will help us aggregate those reports.\r\n\nI happened to see this symptom yesterday during development, and thanks to seeing the debug log I think I have a diagnosis. This was on my Pixel 8 running Android 15, while connected by USB to my desktop for debugging.\r\n\r\nWhat happens is:\r\n* The device goes to sleep, perhaps while the app was in the foreground.\r\n* The app actually keeps running \u2014 one can tell because it keeps printing log messages to the console.\r\n* But it isn't able to make network requests.\r\n * The symptom of this is that the requests fail with SocketException, generally with DNS errors that it can't find `chat.zulip.org` (or whatever the host is).\r\n * We'd previously seen that those errors are common; that's why they're the one type of transient failure we silenced from reporting to the user, in #868.\r\n * In retrospect this makes sense as a compromise for the OS to choose: let the foreground app keep running, at least for a little while, in case the user wakes the device right back up again; but disable the network, because the wifi radio and especially the cell radio are expensive for the battery.\r\n* So our event-poll loop keeps getting failures, and backs off farther and farther. So far, so good.\r\n* Now the user wakes the device, and the app is able to use the network again. Two things go wrong that both contribute to this symptom.\r\n* First, we may be in the middle of a long backoff. So it could be up to 10 seconds (typically more like 3 seconds) before we make the next request. During the remaining backoff time, the loading indicator will continue; and we won't learn of new events, even events that already happened while we were offline.\r\n * This first issue, I was basically already aware of. It'd be good to fix but isn't the main cause of the symptom this thread is about.\r\n* Then, once the current backoff expires and we do make a new request\u2026 _that request may take up to a minute to return_, even if the network and server are functioning ideally. Until the request completes, we keep the loading indicator going.\r\n * This is the new point which I hadn't thought of before I saw it happening yesterday.\r\n * Specifically this happens if there are no events waiting for us, and no new events show up. After all, our event-polling is a long-poll \u2014 the point of which is that the server may sit on the request a long time, so that when it does have something to say it can send a response immediately.\r\n * The only reason this ends even at a minute is because the server sends a \"heartbeat\" event just for the sake of making a response, as a workaround for some network intermediaries breaking connections that sit silently for longer than that.\r\n * That's why starring a message stops the loading indicator: it generates an event, causing the server to send a response.\r\n * While this issue is active, the app's data is actually up to date \u2014 if there were news for us, the server would have responded with it already. So the only problem is that we're showing the loading indicator, making it look out of date. In that sense it's milder than the first issue above.\r\n * On the other hand, this one can last much longer \u2014 it'll routinely be almost one minute, if the realm isn't busy. So in that sense it's more severe.\r\n\r\nSo, now that we have a diagnosis, moving this issue earlier. I think it's still a post-launch issue, though \u2014 I wouldn't hold up shipping the app for it.\r\n\nThis behavior continues to bug me sometimes, even though I know exactly what's happening.\n\nIt also came up today from a user trying the beta: https://github.com/zulip/zulip-flutter/issues/1525#issuecomment-2920818667\nI just discovered the `dont_block` param of `GET /events`: https://zulip.com/api/get-events#parameter-dont_block\n\nFrom reading its doc, I think the fix is to pass `true` for that, in the first poll request after a failure? (Currently on mobile; I can explain more later if needed.)\nInteresting! Yeah, that might be all that's needed.", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1686", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/979\"]", "test_command": "flutter test test/model/store_test.dart test/widgets/app_bar_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/store.dart b/lib/model/store.dart\nindex 13a999aa37..9973cbc33e 100644\n--- a/lib/model/store.dart\n+++ b/lib/model/store.dart\n@@ -582,12 +582,12 @@ class PerAccountStore extends PerAccountStoreBase with\n _updateMachine = value;\n }\n \n- bool get isLoading => _isLoading;\n- bool _isLoading = false;\n+ bool get isRecoveringEventStream => _isRecoveringEventStream;\n+ bool _isRecoveringEventStream = false;\n @visibleForTesting\n- set isLoading(bool value) {\n- if (_isLoading == value) return;\n- _isLoading = value;\n+ set isRecoveringEventStream(bool value) {\n+ if (_isRecoveringEventStream == value) return;\n+ _isRecoveringEventStream = value;\n notifyListeners();\n }\n \n@@ -1437,7 +1437,13 @@ class UpdateMachine {\n final GetEventsResult result;\n try {\n result = await getEvents(store.connection,\n- queueId: store.queueId, lastEventId: lastEventId);\n+ queueId: store.queueId,\n+ lastEventId: lastEventId,\n+ // If the UI shows we're busy getting event-polling to work again,\n+ // ask the server to tell us immediately that it's working again,\n+ // rather than waiting for an event, which could take up to a minute\n+ // in the case of a heartbeat event. See #979.\n+ dontBlock: store.isRecoveringEventStream ? true : null);\n if (_disposed) return;\n } catch (e, stackTrace) {\n if (_disposed) return;\n@@ -1504,14 +1510,14 @@ class UpdateMachine {\n // if we stayed at the max backoff interval; partway toward what would\n // happen if we weren't backing off at all.\n //\n- // But at least for [getEvents] requests, as here, it should be OK,\n- // because this is a long-poll. That means a typical successful request\n- // takes a long time to come back; in fact longer than our max backoff\n- // duration (which is 10 seconds). So if we're getting a mix of successes\n- // and failures, the successes themselves should space out the requests.\n+ // Successful retries won't actually space out the requests, because retries\n+ // are done with the `dont_block` param, asking the server to respond\n+ // immediately instead of waiting through the long-poll period.\n+ // (See comments on that code for why this behavior is helpful.)\n+ // If server logs show pressure from too many requests, we can investigate.\n _pollBackoffMachine = null;\n \n- store.isLoading = false;\n+ store.isRecoveringEventStream = false;\n _accumulatedTransientFailureCount = 0;\n reportErrorToUserBriefly(null);\n }\n@@ -1530,7 +1536,7 @@ class UpdateMachine {\n /// * [_handlePollError], which handles errors from the rest of [poll]\n /// and errors this method rethrows.\n Future _handlePollRequestError(Object error, StackTrace stackTrace) async {\n- store.isLoading = true;\n+ store.isRecoveringEventStream = true;\n \n if (error is! ApiRequestException) {\n // Some unexpected error, outside even making the HTTP request.\n@@ -1588,7 +1594,7 @@ class UpdateMachine {\n // or an unexpected exception representing a bug in our code or the server.\n // Either way, the show must go on. So reload server data from scratch.\n \n- store.isLoading = true;\n+ store.isRecoveringEventStream = true;\n \n bool isUnexpected;\n // TODO(#1054): handle auth failure\ndiff --git a/lib/widgets/app_bar.dart b/lib/widgets/app_bar.dart\nindex f548557681..77f77ba7e2 100644\n--- a/lib/widgets/app_bar.dart\n+++ b/lib/widgets/app_bar.dart\n@@ -79,7 +79,7 @@ class _ZulipAppBarBottom extends StatelessWidget implements PreferredSizeWidget\n @override\n Widget build(BuildContext context) {\n final store = PerAccountStoreWidget.of(context);\n- if (!store.isLoading) return const SizedBox.shrink();\n+ if (!store.isRecoveringEventStream) return const SizedBox.shrink();\n return LinearProgressIndicator(minHeight: 4.0, backgroundColor: backgroundColor);\n }\n }\n", "test_patch": "diff --git a/test/model/store_checks.dart b/test/model/store_checks.dart\nindex 93e24dffdd..c157ac2190 100644\n--- a/test/model/store_checks.dart\n+++ b/test/model/store_checks.dart\n@@ -45,7 +45,7 @@ extension GlobalStoreChecks on Subject {\n \n extension PerAccountStoreChecks on Subject {\n Subject get connection => has((x) => x.connection, 'connection');\n- Subject get isLoading => has((x) => x.isLoading, 'isLoading');\n+ Subject get isRecoveringEventStream => has((x) => x.isRecoveringEventStream, 'isRecoveringEventStream');\n Subject get realmUrl => has((x) => x.realmUrl, 'realmUrl');\n Subject get zulipVersion => has((x) => x.zulipVersion, 'zulipVersion');\n Subject get realmMandatoryTopics => has((x) => x.realmMandatoryTopics, 'realmMandatoryTopics');\ndiff --git a/test/model/store_test.dart b/test/model/store_test.dart\nindex 3736064f84..5ce42626cf 100644\n--- a/test/model/store_test.dart\n+++ b/test/model/store_test.dart\n@@ -782,13 +782,14 @@ void main() {\n updateMachine.poll();\n }\n \n- void checkLastRequest({required int lastEventId}) {\n+ void checkLastRequest({required int lastEventId, bool expectDontBlock = false}) {\n check(connection.takeRequests()).single.isA()\n ..method.equals('GET')\n ..url.path.equals('/api/v1/events')\n ..url.queryParameters.deepEquals({\n 'queue_id': store.queueId,\n 'last_event_id': lastEventId.toString(),\n+ if (expectDontBlock) 'dont_block': 'true',\n });\n }\n \n@@ -841,7 +842,7 @@ void main() {\n await prepareError();\n updateMachine.debugAdvanceLoop();\n async.elapse(Duration.zero);\n- check(store).isLoading.isTrue();\n+ check(store).isRecoveringEventStream.isTrue();\n \n if (expectBackoff) {\n // The reload doesn't happen immediately; there's a timer.\n@@ -853,7 +854,7 @@ void main() {\n // The global store has a new store.\n check(globalStore.perAccountSync(store.accountId)).not((it) => it.identicalTo(store));\n updateFromGlobalStore();\n- check(store).isLoading.isFalse();\n+ check(store).isRecoveringEventStream.isFalse();\n \n // The new UpdateMachine updates the new store.\n updateMachine.debugPauseLoop();\n@@ -878,8 +879,8 @@ void main() {\n prepareError();\n updateMachine.debugAdvanceLoop();\n async.elapse(Duration.zero);\n- checkLastRequest(lastEventId: 1);\n- check(store).isLoading.isTrue();\n+ checkLastRequest(lastEventId: 1, expectDontBlock: false);\n+ check(store).isRecoveringEventStream.isTrue();\n \n // Polling doesn't resume immediately; there's a timer.\n check(async.pendingTimers).length.equals(1);\n@@ -893,9 +894,9 @@ void main() {\n HeartbeatEvent(id: 2),\n ], queueId: null).toJson());\n async.flushTimers();\n- checkLastRequest(lastEventId: 1);\n+ checkLastRequest(lastEventId: 1, expectDontBlock: true);\n check(updateMachine.lastEventId).equals(2);\n- check(store).isLoading.isFalse();\n+ check(store).isRecoveringEventStream.isFalse();\n });\n }\n \n@@ -1032,11 +1033,13 @@ void main() {\n await preparePoll(lastEventId: 1);\n }\n \n- void pollAndFail(FakeAsync async, {bool shouldCheckRequest = true}) {\n+ void pollAndFail(FakeAsync async, {bool shouldCheckRequest = true, bool expectDontBlock = false}) {\n updateMachine.debugAdvanceLoop();\n async.elapse(Duration.zero);\n- if (shouldCheckRequest) checkLastRequest(lastEventId: 1);\n- check(store).isLoading.isTrue();\n+ if (shouldCheckRequest) {\n+ checkLastRequest(lastEventId: 1, expectDontBlock: expectDontBlock);\n+ }\n+ check(store).isRecoveringEventStream.isTrue();\n }\n \n Subject checkReported(void Function() prepareError) {\n@@ -1054,9 +1057,11 @@ void main() {\n return awaitFakeAsync((async) async {\n await prepare();\n \n+ bool expectDontBlock = false;\n for (int i = 0; i < UpdateMachine.transientFailureCountNotifyThreshold; i++) {\n prepareError();\n- pollAndFail(async);\n+ pollAndFail(async, expectDontBlock: expectDontBlock);\n+ expectDontBlock = true;\n check(takeLastReportedError()).isNull();\n async.flushTimers();\n if (!identical(store, globalStore.perAccountSync(store.accountId))) {\n@@ -1064,11 +1069,14 @@ void main() {\n updateFromGlobalStore();\n updateMachine.debugPauseLoop();\n updateMachine.poll();\n+ // Loading indicator is cleared on successful /register;\n+ // we don't need dont_block for the new queue's first poll.\n+ expectDontBlock = false;\n }\n }\n \n prepareError();\n- pollAndFail(async);\n+ pollAndFail(async, expectDontBlock: expectDontBlock);\n return check(takeLastReportedError()).isNotNull();\n });\n }\n@@ -1077,9 +1085,11 @@ void main() {\n return awaitFakeAsync((async) async {\n await prepare();\n \n+ bool expectDontBlock = false;\n for (int i = 0; i < UpdateMachine.transientFailureCountNotifyThreshold; i++) {\n prepareError();\n- pollAndFail(async);\n+ pollAndFail(async, expectDontBlock: expectDontBlock);\n+ expectDontBlock = true;\n check(takeLastReportedError()).isNull();\n async.flushTimers();\n if (!identical(store, globalStore.perAccountSync(store.accountId))) {\n@@ -1087,11 +1097,14 @@ void main() {\n updateFromGlobalStore();\n updateMachine.debugPauseLoop();\n updateMachine.poll();\n+ // Loading indicator is cleared on successful /register;\n+ // we don't need dont_block for the new queue's first poll.\n+ expectDontBlock = false;\n }\n }\n \n prepareError();\n- pollAndFail(async);\n+ pollAndFail(async, expectDontBlock: expectDontBlock);\n // Still no error reported, even after the same number of iterations\n // where other errors get reported (as [checkLateReported] checks).\n check(takeLastReportedError()).isNull();\n@@ -1186,7 +1199,7 @@ void main() {\n globalStore.clearCachedApiConnections();\n updateMachine.debugAdvanceLoop();\n async.elapse(Duration.zero); // the bad-event-queue error arrives\n- check(store).isLoading.isTrue();\n+ check(store).isRecoveringEventStream.isTrue();\n }\n \n test('user logged out before new store is loaded', () => awaitFakeAsync((async) async {\ndiff --git a/test/widgets/app_bar_test.dart b/test/widgets/app_bar_test.dart\nindex 099471d4f7..f4178b455a 100644\n--- a/test/widgets/app_bar_test.dart\n+++ b/test/widgets/app_bar_test.dart\n@@ -31,7 +31,7 @@ void main() {\n await tester.pumpAndSettle();\n final rectBefore = tester.getRect(find.byType(ZulipAppBar));\n check(finder.evaluate()).isEmpty();\n- store.isLoading = true;\n+ store.isRecoveringEventStream = true;\n \n await tester.pump();\n check(tester.getRect(find.byType(ZulipAppBar))).equals(rectBefore);\n", "n2p_tests": "{\"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out during transient-error backoff\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: buildTitle's willCenterTitle agrees with Material AppBar android\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out while loading; then fails; malformed response with ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: buildTitle's willCenterTitle agrees with Material AppBar ios, theme false\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount loading succeeds\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.removeAccount when store not loaded\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: buildTitle's willCenterTitle agrees with Material AppBar ios, theme true, param false\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount throws if missing queueId\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccountSync\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: buildTitle's willCenterTitle agrees with Material AppBar ios, no actions\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: show progress indicator when loading\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.removeAccount when store loading\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: buildTitle's willCenterTitle agrees with Material AppBar ios\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: buildTitle's willCenterTitle agrees with Material AppBar android, theme true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount concurrent case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: buildTitle's willCenterTitle agrees with Material AppBar ios, three actions\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount loading fails; malformed response with ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out while loading; then fails with HTTP status code 401\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: buildTitle's willCenterTitle agrees with Material AppBar android, param true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out while loading; then succeeds\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount loading fails with HTTP status code 401\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: buildTitle's willCenterTitle agrees with Material AppBar android, theme false, param true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: buildTitle's willCenterTitle agrees with Material AppBar ios, theme false, param true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: buildTitle's willCenterTitle agrees with Material AppBar ios, two actions\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateAccount notifyListeners called\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateZulipVersionData\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: buildTitle's willCenterTitle agrees with Material AppBar android, theme true, param false\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateAccount basic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out while loading; then succeeds; InitialSnapshot has ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateAccount reject changing id, realmUrl, or userId\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount sequential case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: buildTitle's willCenterTitle agrees with Material AppBar ios, param false\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: buildTitle's willCenterTitle agrees with Material AppBar ios, one action\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: buildTitle's willCenterTitle agrees with Material AppBar ios, two actions but param true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.removeAccount when store loaded\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount loading succeeds; InitialSnapshot has ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_bar_test.dart: buildTitle's willCenterTitle agrees with Material AppBar ios, two actions but theme true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1650", "org": "zulip", "repo": "zulip-flutter", "number": 1650, "state": "closed", "title": "msglist: Friendlier placeholder text when narrow has no messages (simple version)", "body": "Splitting this out from #1640, so it can be merged soon.\r\n\r\nFixes #1555.\r\n\r\nFor now, the text simply says \"There are no messages here.\" We'll add per-narrow logic later, but this is an improvement over the current appearance which just says \"No earlier messages.\" (Earlier than what?)", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"b509c24a87c1096d85f716f60ab3a1741644a676\"}", "resolved_issues": "[{\"number\": 1555, \"title\": \"msglist: Friendlier placeholder text when narrow has no messages\", \"body\": \"When a message list has no messages, we currently just show \\\"No earlier messages\\\". Screenshots for the narrows currently supported in the message-list page:\\n\\n| Combined feed | Channel | Topic | DM (1:1) | DM (self) | DM (group) | Starred messages | Mentions |\\n| --- | --- | --- | --- | --- | --- | --- | --- |\\n| \\\"Image\\\" | \\\"Image\\\" | \\\"Image\\\" | \\\"Image\\\" | \\\"Image\\\" | \\\"Image\\\" | \\\"Image\\\" | \\\"Image\\\" | \\\"Image\\\" |\\n\\nThis issue is to show a simple message for all message-list pages. Conditional per-narrow logic is tracked in #1653 for later.\\n\\nFor the design, let's aim for consistency with #1552, which is based on the Figma (but excludes some graphics; #1551).\\n\\ncc @alya\"}]", "lang": "dart", "problem_statement": "msglist: Friendlier placeholder text when narrow has no messages\nWhen a message list has no messages, we currently just show \"No earlier messages\". Screenshots for the narrows currently supported in the message-list page:\n\n| Combined feed | Channel | Topic | DM (1:1) | DM (self) | DM (group) | Starred messages | Mentions |\n| --- | --- | --- | --- | --- | --- | --- | --- |\n| \"Image\" | \"Image\" | \"Image\" | \"Image\" | \"Image\" | \"Image\" | \"Image\" | \"Image\" | \"Image\" |\n\nThis issue is to show a simple message for all message-list pages. Conditional per-narrow logic is tracked in #1653 for later.\n\nFor the design, let's aim for consistency with #1552, which is based on the Figma (but excludes some graphics; #1551).\n\ncc @alya\n", "hints": "\"There are no messages here.\" is the default placeholder on web, which seems more clear (\"earlier than what?\").\n\n\nBut if it's comparably easy to do specific messages depending on the view, I would just copy whatever we have on web. If we don't like some of them, we can discuss that and change the web one too, but it might as well be consistent.\nMakes sense. This may interact with Greg's work on #82 / #80, so I'll hold off on this for now. (Normally I'd go ahead because new-DM #127 will make this more visible.)", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1650", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1555\"]", "test_command": "flutter test test/widgets/message_list_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/assets/l10n/app_en.arb b/assets/l10n/app_en.arb\nindex d7fd14303b..9b6c5f6532 100644\n--- a/assets/l10n/app_en.arb\n+++ b/assets/l10n/app_en.arb\n@@ -530,6 +530,10 @@\n \"others\": {\"type\": \"String\", \"example\": \"Alice, Bob\"}\n }\n },\n+ \"emptyMessageList\": \"There are no messages here.\",\n+ \"@emptyMessageList\": {\n+ \"description\": \"Placeholder for some message-list pages when there are no messages.\"\n+ },\n \"messageListGroupYouWithYourself\": \"Messages with yourself\",\n \"@messageListGroupYouWithYourself\": {\n \"description\": \"Message list recipient header for a DM group that only includes yourself.\"\ndiff --git a/lib/generated/l10n/zulip_localizations.dart b/lib/generated/l10n/zulip_localizations.dart\nindex 3887e381a2..85e6b1bbe9 100644\n--- a/lib/generated/l10n/zulip_localizations.dart\n+++ b/lib/generated/l10n/zulip_localizations.dart\n@@ -845,6 +845,12 @@ abstract class ZulipLocalizations {\n /// **'DMs with {others}'**\n String dmsWithOthersPageTitle(String others);\n \n+ /// Placeholder for some message-list pages when there are no messages.\n+ ///\n+ /// In en, this message translates to:\n+ /// **'There are no messages here.'**\n+ String get emptyMessageList;\n+\n /// Message list recipient header for a DM group that only includes yourself.\n ///\n /// In en, this message translates to:\ndiff --git a/lib/generated/l10n/zulip_localizations_ar.dart b/lib/generated/l10n/zulip_localizations_ar.dart\nindex a4e972abc4..29eeaa84b7 100644\n--- a/lib/generated/l10n/zulip_localizations_ar.dart\n+++ b/lib/generated/l10n/zulip_localizations_ar.dart\n@@ -434,6 +434,9 @@ class ZulipLocalizationsAr extends ZulipLocalizations {\n return 'DMs with $others';\n }\n \n+ @override\n+ String get emptyMessageList => 'There are no messages here.';\n+\n @override\n String get messageListGroupYouWithYourself => 'Messages with yourself';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_de.dart b/lib/generated/l10n/zulip_localizations_de.dart\nindex 8ca5d081e3..a54262e964 100644\n--- a/lib/generated/l10n/zulip_localizations_de.dart\n+++ b/lib/generated/l10n/zulip_localizations_de.dart\n@@ -449,6 +449,9 @@ class ZulipLocalizationsDe extends ZulipLocalizations {\n return 'DNs mit $others';\n }\n \n+ @override\n+ String get emptyMessageList => 'There are no messages here.';\n+\n @override\n String get messageListGroupYouWithYourself => 'Nachrichten mit dir selbst';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_en.dart b/lib/generated/l10n/zulip_localizations_en.dart\nindex f065d5f59c..9cca30a3e1 100644\n--- a/lib/generated/l10n/zulip_localizations_en.dart\n+++ b/lib/generated/l10n/zulip_localizations_en.dart\n@@ -434,6 +434,9 @@ class ZulipLocalizationsEn extends ZulipLocalizations {\n return 'DMs with $others';\n }\n \n+ @override\n+ String get emptyMessageList => 'There are no messages here.';\n+\n @override\n String get messageListGroupYouWithYourself => 'Messages with yourself';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_it.dart b/lib/generated/l10n/zulip_localizations_it.dart\nindex 8fc5df768b..451c959345 100644\n--- a/lib/generated/l10n/zulip_localizations_it.dart\n+++ b/lib/generated/l10n/zulip_localizations_it.dart\n@@ -445,6 +445,9 @@ class ZulipLocalizationsIt extends ZulipLocalizations {\n return 'MD con $others';\n }\n \n+ @override\n+ String get emptyMessageList => 'There are no messages here.';\n+\n @override\n String get messageListGroupYouWithYourself => 'Messaggi con te stesso';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_ja.dart b/lib/generated/l10n/zulip_localizations_ja.dart\nindex eccff7ea5d..ccdfad4001 100644\n--- a/lib/generated/l10n/zulip_localizations_ja.dart\n+++ b/lib/generated/l10n/zulip_localizations_ja.dart\n@@ -434,6 +434,9 @@ class ZulipLocalizationsJa extends ZulipLocalizations {\n return 'DMs with $others';\n }\n \n+ @override\n+ String get emptyMessageList => 'There are no messages here.';\n+\n @override\n String get messageListGroupYouWithYourself => 'Messages with yourself';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_nb.dart b/lib/generated/l10n/zulip_localizations_nb.dart\nindex 69557352b5..bd708f0b7c 100644\n--- a/lib/generated/l10n/zulip_localizations_nb.dart\n+++ b/lib/generated/l10n/zulip_localizations_nb.dart\n@@ -434,6 +434,9 @@ class ZulipLocalizationsNb extends ZulipLocalizations {\n return 'DMs with $others';\n }\n \n+ @override\n+ String get emptyMessageList => 'There are no messages here.';\n+\n @override\n String get messageListGroupYouWithYourself => 'Messages with yourself';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_pl.dart b/lib/generated/l10n/zulip_localizations_pl.dart\nindex 21e8f3e478..e744825644 100644\n--- a/lib/generated/l10n/zulip_localizations_pl.dart\n+++ b/lib/generated/l10n/zulip_localizations_pl.dart\n@@ -443,6 +443,9 @@ class ZulipLocalizationsPl extends ZulipLocalizations {\n return 'DM z $others';\n }\n \n+ @override\n+ String get emptyMessageList => 'There are no messages here.';\n+\n @override\n String get messageListGroupYouWithYourself => 'Zapiski na w\u0142asne konto';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_ru.dart b/lib/generated/l10n/zulip_localizations_ru.dart\nindex f4f25c7d20..a980357a8e 100644\n--- a/lib/generated/l10n/zulip_localizations_ru.dart\n+++ b/lib/generated/l10n/zulip_localizations_ru.dart\n@@ -443,6 +443,9 @@ class ZulipLocalizationsRu extends ZulipLocalizations {\n return '\u041b\u0421 \u0441 $others';\n }\n \n+ @override\n+ String get emptyMessageList => 'There are no messages here.';\n+\n @override\n String get messageListGroupYouWithYourself => '\u0421\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \u0441 \u0441\u043e\u0431\u043e\u0439';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_sk.dart b/lib/generated/l10n/zulip_localizations_sk.dart\nindex 4558dcd872..afb6d05654 100644\n--- a/lib/generated/l10n/zulip_localizations_sk.dart\n+++ b/lib/generated/l10n/zulip_localizations_sk.dart\n@@ -434,6 +434,9 @@ class ZulipLocalizationsSk extends ZulipLocalizations {\n return 'DMs with $others';\n }\n \n+ @override\n+ String get emptyMessageList => 'There are no messages here.';\n+\n @override\n String get messageListGroupYouWithYourself => 'Messages with yourself';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_sl.dart b/lib/generated/l10n/zulip_localizations_sl.dart\nindex e6f4275f77..2cb377a57b 100644\n--- a/lib/generated/l10n/zulip_localizations_sl.dart\n+++ b/lib/generated/l10n/zulip_localizations_sl.dart\n@@ -455,6 +455,9 @@ class ZulipLocalizationsSl extends ZulipLocalizations {\n return 'Neposredna sporo\u010dila z $others';\n }\n \n+ @override\n+ String get emptyMessageList => 'There are no messages here.';\n+\n @override\n String get messageListGroupYouWithYourself => 'Sporo\u010dila sebi';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_uk.dart b/lib/generated/l10n/zulip_localizations_uk.dart\nindex 98ba4b11e1..ab35988c35 100644\n--- a/lib/generated/l10n/zulip_localizations_uk.dart\n+++ b/lib/generated/l10n/zulip_localizations_uk.dart\n@@ -445,6 +445,9 @@ class ZulipLocalizationsUk extends ZulipLocalizations {\n return '\u041e\u0441\u043e\u0431\u0438\u0441\u0442\u0456 \u043f\u043e\u0432\u0456\u0434\u043e\u043c\u043b\u0435\u043d\u043d\u044f \u0437 $others';\n }\n \n+ @override\n+ String get emptyMessageList => 'There are no messages here.';\n+\n @override\n String get messageListGroupYouWithYourself => '\u041f\u043e\u0432\u0456\u0434\u043e\u043c\u043b\u0435\u043d\u043d\u044f \u0437 \u0441\u043e\u0431\u043e\u044e';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_zh.dart b/lib/generated/l10n/zulip_localizations_zh.dart\nindex b15d029eb1..58330028ad 100644\n--- a/lib/generated/l10n/zulip_localizations_zh.dart\n+++ b/lib/generated/l10n/zulip_localizations_zh.dart\n@@ -434,6 +434,9 @@ class ZulipLocalizationsZh extends ZulipLocalizations {\n return 'DMs with $others';\n }\n \n+ @override\n+ String get emptyMessageList => 'There are no messages here.';\n+\n @override\n String get messageListGroupYouWithYourself => 'Messages with yourself';\n \ndiff --git a/lib/widgets/home.dart b/lib/widgets/home.dart\nindex 9a0850e0b9..88d3bf5d2e 100644\n--- a/lib/widgets/home.dart\n+++ b/lib/widgets/home.dart\n@@ -148,40 +148,6 @@ class _HomePageState extends State {\n }\n }\n \n-/// A \"no content here\" message, for the Inbox, Subscriptions, and DMs pages.\n-///\n-/// This should go near the root of the \"page body\"'s widget subtree.\n-/// In particular, it handles the horizontal device insets.\n-/// (The vertical insets are handled externally, by the app bar and bottom nav.)\n-class PageBodyEmptyContentPlaceholder extends StatelessWidget {\n- const PageBodyEmptyContentPlaceholder({super.key, required this.message});\n-\n- final String message;\n-\n- @override\n- Widget build(BuildContext context) {\n- final designVariables = DesignVariables.of(context);\n-\n- return SafeArea(\n- minimum: EdgeInsets.symmetric(horizontal: 24),\n- child: Padding(\n- padding: EdgeInsets.only(top: 48, bottom: 16),\n- child: Align(\n- alignment: Alignment.topCenter,\n- // TODO leading and trailing elements, like in Figma (given as SVGs):\n- // https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=5957-167736&m=dev\n- child: Text(\n- textAlign: TextAlign.center,\n- style: TextStyle(\n- color: designVariables.labelSearchPrompt,\n- fontSize: 17,\n- height: 23 / 17,\n- ).merge(weightVariableTextStyle(context, wght: 500)),\n- message))));\n- }\n-}\n-\n-\n const kTryAnotherAccountWaitPeriod = Duration(seconds: 5);\n \n class _LoadingPlaceholderPage extends StatefulWidget {\ndiff --git a/lib/widgets/inbox.dart b/lib/widgets/inbox.dart\nindex 7f101a81ce..d00cabb9dc 100644\n--- a/lib/widgets/inbox.dart\n+++ b/lib/widgets/inbox.dart\n@@ -6,9 +6,9 @@ import '../model/narrow.dart';\n import '../model/recent_dm_conversations.dart';\n import '../model/unreads.dart';\n import 'action_sheet.dart';\n-import 'home.dart';\n import 'icons.dart';\n import 'message_list.dart';\n+import 'page.dart';\n import 'sticky_header.dart';\n import 'store.dart';\n import 'text.dart';\ndiff --git a/lib/widgets/message_list.dart b/lib/widgets/message_list.dart\nindex f0ecbe10a1..b14a9fe5ce 100644\n--- a/lib/widgets/message_list.dart\n+++ b/lib/widgets/message_list.dart\n@@ -859,8 +859,15 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n \n @override\n Widget build(BuildContext context) {\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n+\n if (!model.fetched) return const Center(child: CircularProgressIndicator());\n \n+ if (model.items.isEmpty && model.haveNewest && model.haveOldest) {\n+ return PageBodyEmptyContentPlaceholder(\n+ message: zulipLocalizations.emptyMessageList);\n+ }\n+\n // Pad the left and right insets, for small devices in landscape.\n return SafeArea(\n // Don't let this be the place we pad the bottom inset. When there's\ndiff --git a/lib/widgets/page.dart b/lib/widgets/page.dart\nindex a2c6fe52a1..35bdf34923 100644\n--- a/lib/widgets/page.dart\n+++ b/lib/widgets/page.dart\n@@ -2,6 +2,8 @@\n import 'package:flutter/material.dart';\n \n import 'store.dart';\n+import 'text.dart';\n+import 'theme.dart';\n \n /// An [InheritedWidget] for near the root of a page's widget subtree,\n /// providing its [BuildContext].\n@@ -210,3 +212,40 @@ class LoadingPlaceholderPage extends StatelessWidget {\n );\n }\n }\n+\n+/// A \"no content here\" message for when a page has no content to show.\n+///\n+/// Suitable for the inbox, the message-list page, etc.\n+///\n+/// This handles the horizontal device insets\n+/// and the bottom inset when needed (in a message list with no compose box).\n+/// The top inset is handled externally by the app bar.\n+// TODO(#311) If the message list gets a bottom nav, the bottom inset will\n+// always be handled externally too; simplify implementation and dartdoc.\n+class PageBodyEmptyContentPlaceholder extends StatelessWidget {\n+ const PageBodyEmptyContentPlaceholder({super.key, required this.message});\n+\n+ final String message;\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ final designVariables = DesignVariables.of(context);\n+\n+ return SafeArea(\n+ minimum: EdgeInsets.fromLTRB(24, 0, 24, 16),\n+ child: Padding(\n+ padding: EdgeInsets.only(top: 48),\n+ child: Align(\n+ alignment: Alignment.topCenter,\n+ // TODO leading and trailing elements, like in Figma (given as SVGs):\n+ // https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=5957-167736&m=dev\n+ child: Text(\n+ textAlign: TextAlign.center,\n+ style: TextStyle(\n+ color: designVariables.labelSearchPrompt,\n+ fontSize: 17,\n+ height: 23 / 17,\n+ ).merge(weightVariableTextStyle(context, wght: 500)),\n+ message))));\n+ }\n+}\ndiff --git a/lib/widgets/recent_dm_conversations.dart b/lib/widgets/recent_dm_conversations.dart\nindex 5758a39d76..97c53ac4b1 100644\n--- a/lib/widgets/recent_dm_conversations.dart\n+++ b/lib/widgets/recent_dm_conversations.dart\n@@ -5,10 +5,10 @@ import '../model/narrow.dart';\n import '../model/recent_dm_conversations.dart';\n import '../model/unreads.dart';\n import 'content.dart';\n-import 'home.dart';\n import 'icons.dart';\n import 'message_list.dart';\n import 'new_dm_sheet.dart';\n+import 'page.dart';\n import 'store.dart';\n import 'text.dart';\n import 'theme.dart';\ndiff --git a/lib/widgets/subscription_list.dart b/lib/widgets/subscription_list.dart\nindex 8a7bd9b9b5..ff3db94391 100644\n--- a/lib/widgets/subscription_list.dart\n+++ b/lib/widgets/subscription_list.dart\n@@ -5,9 +5,9 @@ import '../generated/l10n/zulip_localizations.dart';\n import '../model/narrow.dart';\n import '../model/unreads.dart';\n import 'action_sheet.dart';\n-import 'home.dart';\n import 'icons.dart';\n import 'message_list.dart';\n+import 'page.dart';\n import 'store.dart';\n import 'text.dart';\n import 'theme.dart';\n", "test_patch": "diff --git a/test/widgets/message_list_test.dart b/test/widgets/message_list_test.dart\nindex f1961fc809..dbcdf5ff1d 100644\n--- a/test/widgets/message_list_test.dart\n+++ b/test/widgets/message_list_test.dart\n@@ -129,6 +129,9 @@ void main() {\n return findScrollView(tester).controller;\n }\n \n+ final contentInputFinder = find.byWidgetPredicate(\n+ (widget) => widget is TextField && widget.controller is ComposeContentController);\n+\n group('MessageListPage', () {\n testWidgets('ancestorOf finds page state from message', (tester) async {\n await setupMessageListPage(tester,\n@@ -346,6 +349,36 @@ void main() {\n });\n });\n \n+ group('no-messages placeholder', () {\n+ final findPlaceholder = find.byType(PageBodyEmptyContentPlaceholder);\n+\n+ testWidgets('Combined feed', (tester) async {\n+ await setupMessageListPage(tester, narrow: CombinedFeedNarrow(), messages: []);\n+ check(\n+ find.descendant(\n+ of: findPlaceholder,\n+ matching: find.textContaining('There are no messages here.')),\n+ ).findsOne();\n+ });\n+\n+ testWidgets('when `messages` empty but `outboxMessages` not empty, show outboxes, not placeholder', (tester) async {\n+ final channel = eg.stream();\n+ await setupMessageListPage(tester,\n+ narrow: TopicNarrow(channel.streamId, eg.t('topic')),\n+ streams: [channel],\n+ messages: []);\n+ check(findPlaceholder).findsOne();\n+\n+ connection.prepare(json: SendMessageResult(id: 1).toJson());\n+ await tester.enterText(contentInputFinder, 'asdfjkl;');\n+ await tester.tap(find.byIcon(ZulipIcons.send));\n+ await tester.pump(kLocalEchoDebounceDuration);\n+\n+ check(findPlaceholder).findsNothing();\n+ check(find.text('asdfjkl;')).findsOne();\n+ });\n+ });\n+\n group('presents message content appropriately', () {\n testWidgets('content not asked to consume insets (including bottom), even without compose box', (tester) async {\n // Regression test for: https://github.com/zulip/zulip-flutter/issues/736\n@@ -1837,9 +1870,6 @@ void main() {\n final topicNarrow = eg.topicNarrow(stream.streamId, topic);\n const content = 'outbox message content';\n \n- final contentInputFinder = find.byWidgetPredicate(\n- (widget) => widget is TextField && widget.controller is ComposeContentController);\n-\n Finder outboxMessageFinder = find.widgetWithText(\n OutboxMessageWithPossibleSender, content, skipOffstage: true);\n \n", "n2p_tests": "{\"app bar show topic visibility policy for topic narrows\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fetch initial batch of messages topic permalink with message move\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"MessageListPage MessageListPageState.narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"app bar channel icon in channel row; web-public: true, invite-only: false\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"MessageListPage ancestorOf throws when not a descendant of MessageListPage\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"presents message content appropriately content not asked to consume insets (including bottom), even without compose box\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"app bar has topic-list action for topic narrows\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fetch older messages on scroll observe double-fetch glitch\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"smoke test for light/dark/lerped\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"app bar channel icon in channel row; web-public: false, invite-only: false\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"no-messages placeholder when `messages` empty but `outboxMessages` not empty, show outboxes, not placeholder\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"MessageListPage dispose MessageListView when logged out\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"MessageListPage composeBoxState null when no compose box\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"app bar shows \\\"Muted user\\\" label for muted users in DM narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"app bar has topic-list action for channel narrows\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fetch initial batch of messages topic permalink without message move\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"MessageListPage dispose MessageListView when event queue expired\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fetch older messages on scroll basic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"MessageListPage composeBoxState finds compose box\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"MessageListPage ancestorOf finds page state from message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"app bar handle empty topics\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"app bar has channel-feed action for topic narrows\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"app bar channel icon in channel row; web-public: false, invite-only: true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"no-messages placeholder Combined feed\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1625", "org": "zulip", "repo": "zulip-flutter", "number": 1625, "state": "closed", "title": "msglist: Use icon for topic-list button in app bar", "body": "Our initial implementation of https://github.com/zulip/zulip-flutter/issues/1158, in https://github.com/zulip/zulip-flutter/pull/1500, uses the word \"TOPICS\" for the app-bar action/button leading to the topic-list page, following the design in Figma.\r\n\r\nWe want to change it to use a \"list\" icon instead. This is in order to let it occupy less space, especially in languages where the translation of \"TOPICS\" might be long.\r\n\r\n| light | dark |\r\n|----|----|\r\n| ![Simulator Screenshot - iPhone 16 Pro - 2025-06-25 at 17 01 07](https://github.com/user-attachments/assets/a275f2b1-dadd-4175-94b1-f28b02fb0ca8) | ![Simulator Screenshot - iPhone 16 Pro - 2025-06-25 at 17 01 53](https://github.com/user-attachments/assets/8d9b7df9-b96b-4938-9403-a2f9ec019703) |\r\n| ![Simulator Screenshot - iPhone 16 Pro - 2025-06-25 at 17 01 30](https://github.com/user-attachments/assets/f3172c28-e669-4e4f-b84c-d330893d2a5f) | ![Simulator Screenshot - iPhone 16 Pro - 2025-06-25 at 17 01 45](https://github.com/user-attachments/assets/15dacf95-a025-41be-8b1e-675163f09864) |\r\n\r\nresolves #1532", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"79e0ca0834eda73840872535f0a950abcc9a4fba\"}", "resolved_issues": "[{\"number\": 1532, \"title\": \"Use icon for topic-list button in app bar\", \"body\": \"Our initial implementation of #1158, in #1500, uses the word \\\"TOPICS\\\" for the app-bar action/button leading to the topic-list page, following the design in Figma.\\n\\nWe want to change it to use a \\\"list\\\" icon instead. This is in order to let it occupy less space, especially in languages where the translation of \\\"TOPICS\\\" might be long.\\n\\n### References\\n* Chat thread: [#mobile > Flutter beta: missing topic list @ \\ud83d\\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/Flutter.20beta.3A.20missing.20topic.20list/near/2181445)\"}]", "lang": "dart", "problem_statement": "Use icon for topic-list button in app bar\nOur initial implementation of #1158, in #1500, uses the word \"TOPICS\" for the app-bar action/button leading to the topic-list page, following the design in Figma.\n\nWe want to change it to use a \"list\" icon instead. This is in order to let it occupy less space, especially in languages where the translation of \"TOPICS\" might be long.\n\n### References\n* Chat thread: [#mobile > Flutter beta: missing topic list @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/Flutter.20beta.3A.20missing.20topic.20list/near/2181445)\n", "hints": "Do we know which specific icon we want?\n\nCurrent \"TOPICS\" button:\n\n\"Image\"\n\nCould be replaced with, e.g.:\n\nhttps://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=8996-27909&m=dev\n\n\"Image\"\n\n(are those two identical?)\n\nOr e.g.:\n\n\"Image\"\n\ncc @terpimost @alya \nhttps://github.com/zulip/zulip/pull/34890 is a Help Center PR that's written for the app before this change; we should update it after this change lands :)\n> Do we know which specific icon we want?\n> \n> Current \"TOPICS\" button:\n> \"Image\"\n> \n> Could be replaced with, e.g.:\n> \n> https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=8996-27909&m=dev\n> \"Image\"\n> \n> (are those two identical?)\n> \n> Or e.g.:\n> \"Image\"\n> \n> cc [@terpimost](https://github.com/terpimost) [@alya](https://github.com/alya)\n\n@chrisbobbe Judging from `assets/icons/topics.svg`, the first icon is the correct one.\n#1625\n@gnprice \nCould you assign this issue to me?\nI went through a difficult time mentally earlier and couldn't reply sooner, but I'm all set now.", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1625", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1532\"]", "test_command": "flutter test test/widgets/message_list_test.dart test/widgets/topic_list_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/assets/l10n/app_de.arb b/assets/l10n/app_de.arb\nindex aa89465183..819b687ea4 100644\n--- a/assets/l10n/app_de.arb\n+++ b/assets/l10n/app_de.arb\n@@ -427,9 +427,9 @@\n }\n }\n },\n- \"topicsButtonLabel\": \"THEMEN\",\n- \"@topicsButtonLabel\": {\n- \"description\": \"Label for message list button leading to topic-list page. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)\"\n+ \"topicsButtonTooltip\": \"Themen\",\n+ \"@topicsButtonTooltip\": {\n+ \"description\": \"Tooltip for button to navigate to topic-list page.\"\n },\n \"markReadOnScrollSettingTitle\": \"Nachrichten beim Scrollen als gelesen markieren\",\n \"@markReadOnScrollSettingTitle\": {\ndiff --git a/assets/l10n/app_en.arb b/assets/l10n/app_en.arb\nindex b4ad14149a..653f956596 100644\n--- a/assets/l10n/app_en.arb\n+++ b/assets/l10n/app_en.arb\n@@ -853,9 +853,9 @@\n \"@mainMenuMyProfile\": {\n \"description\": \"Label for main-menu button leading to the user's own profile.\"\n },\n- \"topicsButtonLabel\": \"TOPICS\",\n- \"@topicsButtonLabel\": {\n- \"description\": \"Label for message list button leading to topic-list page. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)\"\n+ \"topicsButtonTooltip\": \"Topics\",\n+ \"@topicsButtonTooltip\": {\n+ \"description\": \"Tooltip for button to navigate to topic-list page.\"\n },\n \"channelFeedButtonTooltip\": \"Channel feed\",\n \"@channelFeedButtonTooltip\": {\ndiff --git a/assets/l10n/app_it.arb b/assets/l10n/app_it.arb\nindex 6771c4368d..ad9ece2ce2 100644\n--- a/assets/l10n/app_it.arb\n+++ b/assets/l10n/app_it.arb\n@@ -949,9 +949,9 @@\n \"@mainMenuMyProfile\": {\n \"description\": \"Label for main-menu button leading to the user's own profile.\"\n },\n- \"topicsButtonLabel\": \"ARGOMENTI\",\n- \"@topicsButtonLabel\": {\n- \"description\": \"Label for message list button leading to topic-list page. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)\"\n+ \"topicsButtonTooltip\": \"Argomenti\",\n+ \"@topicsButtonTooltip\": {\n+ \"description\": \"Tooltip for button to navigate to topic-list page.\"\n },\n \"reactedEmojiSelfUser\": \"Tu\",\n \"@reactedEmojiSelfUser\": {\ndiff --git a/assets/l10n/app_pl.arb b/assets/l10n/app_pl.arb\nindex e35905b5ba..8aca7248a5 100644\n--- a/assets/l10n/app_pl.arb\n+++ b/assets/l10n/app_pl.arb\n@@ -1061,9 +1061,9 @@\n \"@composeBoxBannerButtonSave\": {\n \"description\": \"Label text for the 'Save' button in the compose-box banner when you are editing a message.\"\n },\n- \"topicsButtonLabel\": \"W\u0104TKI\",\n- \"@topicsButtonLabel\": {\n- \"description\": \"Label for message list button leading to topic-list page. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)\"\n+ \"topicsButtonTooltip\": \"W\u0105tki\",\n+ \"@topicsButtonTooltip\": {\n+ \"description\": \"Tooltip for button to navigate to topic-list page.\"\n },\n \"actionSheetOptionListOfTopics\": \"Lista w\u0105tk\u00f3w\",\n \"@actionSheetOptionListOfTopics\": {\ndiff --git a/assets/l10n/app_ru.arb b/assets/l10n/app_ru.arb\nindex fd066813d2..a45e84a2f8 100644\n--- a/assets/l10n/app_ru.arb\n+++ b/assets/l10n/app_ru.arb\n@@ -1065,9 +1065,9 @@\n \"@actionSheetOptionListOfTopics\": {\n \"description\": \"Label for navigating to a channel's topic-list page.\"\n },\n- \"topicsButtonLabel\": \"\u0422\u0415\u041c\u042b\",\n- \"@topicsButtonLabel\": {\n- \"description\": \"Label for message list button leading to topic-list page. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)\"\n+ \"topicsButtonTooltip\": \"\u0422\u0435\u043c\u044b\",\n+ \"@topicsButtonTooltip\": {\n+ \"description\": \"Tooltip for button to navigate to topic-list page.\"\n },\n \"newDmSheetSearchHintEmpty\": \"\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439\",\n \"@newDmSheetSearchHintEmpty\": {\ndiff --git a/assets/l10n/app_sl.arb b/assets/l10n/app_sl.arb\nindex 6131411e54..8b0dfad5db 100644\n--- a/assets/l10n/app_sl.arb\n+++ b/assets/l10n/app_sl.arb\n@@ -731,9 +731,9 @@\n \"@mainMenuMyProfile\": {\n \"description\": \"Label for main-menu button leading to the user's own profile.\"\n },\n- \"topicsButtonLabel\": \"TEME\",\n- \"@topicsButtonLabel\": {\n- \"description\": \"Label for message list button leading to topic-list page. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)\"\n+ \"topicsButtonTooltip\": \"Teme\",\n+ \"@topicsButtonTooltip\": {\n+ \"description\": \"Tooltip for button to navigate to topic-list page.\"\n },\n \"channelFeedButtonTooltip\": \"Sporo\u010dila kanala\",\n \"@channelFeedButtonTooltip\": {\ndiff --git a/assets/l10n/app_uk.arb b/assets/l10n/app_uk.arb\nindex 6a6c217cd6..a83421c686 100644\n--- a/assets/l10n/app_uk.arb\n+++ b/assets/l10n/app_uk.arb\n@@ -1031,9 +1031,9 @@\n \"@editAlreadyInProgressTitle\": {\n \"description\": \"Error title when a message edit cannot be saved because there is another edit already in progress.\"\n },\n- \"topicsButtonLabel\": \"\u0422\u0415\u041c\u0418\",\n- \"@topicsButtonLabel\": {\n- \"description\": \"Label for message list button leading to topic-list page. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)\"\n+ \"topicsButtonTooltip\": \"\u0422\u0435\u043c\u0438\",\n+ \"@topicsButtonTooltip\": {\n+ \"description\": \"Tooltip for button to navigate to topic-list page.\"\n },\n \"actionSheetOptionHideMutedMessage\": \"\u0421\u0445\u043e\u0432\u0430\u0442\u0438 \u0437\u0430\u0433\u043b\u0443\u0448\u0435\u043d\u0435 \u043f\u043e\u0432\u0456\u0434\u043e\u043c\u043b\u0435\u043d\u043d\u044f\",\n \"@actionSheetOptionHideMutedMessage\": {\ndiff --git a/assets/l10n/app_zh_Hans_CN.arb b/assets/l10n/app_zh_Hans_CN.arb\nindex 806f96eda9..e47d033f4b 100644\n--- a/assets/l10n/app_zh_Hans_CN.arb\n+++ b/assets/l10n/app_zh_Hans_CN.arb\n@@ -1083,9 +1083,9 @@\n \"@mainMenuMyProfile\": {\n \"description\": \"Label for main-menu button leading to the user's own profile.\"\n },\n- \"topicsButtonLabel\": \"\u8bdd\u9898\",\n- \"@topicsButtonLabel\": {\n- \"description\": \"Label for message list button leading to topic-list page. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)\"\n+ \"topicsButtonTooltip\": \"\u8bdd\u9898\",\n+ \"@topicsButtonTooltip\": {\n+ \"description\": \"Tooltip for button to navigate to topic-list page.\"\n },\n \"notifSelfUser\": \"\u60a8\",\n \"@notifSelfUser\": {\ndiff --git a/assets/l10n/app_zh_Hant_TW.arb b/assets/l10n/app_zh_Hant_TW.arb\nindex 651a3d15f8..7fe1f37b91 100644\n--- a/assets/l10n/app_zh_Hant_TW.arb\n+++ b/assets/l10n/app_zh_Hant_TW.arb\n@@ -423,9 +423,9 @@\n }\n }\n },\n- \"topicsButtonLabel\": \"\u8a71\u984c\",\n- \"@topicsButtonLabel\": {\n- \"description\": \"Label for message list button leading to topic-list page. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)\"\n+ \"topicsButtonTooltip\": \"\u8a71\u984c\",\n+ \"@topicsButtonTooltip\": {\n+ \"description\": \"Tooltip for button to navigate to topic-list page.\"\n },\n \"themeSettingLight\": \"\u6dfa\u8272\u4e3b\u984c\",\n \"@themeSettingLight\": {\ndiff --git a/lib/generated/l10n/zulip_localizations.dart b/lib/generated/l10n/zulip_localizations.dart\nindex bdd5d60bdb..db7bd64173 100644\n--- a/lib/generated/l10n/zulip_localizations.dart\n+++ b/lib/generated/l10n/zulip_localizations.dart\n@@ -1293,11 +1293,11 @@ abstract class ZulipLocalizations {\n /// **'My profile'**\n String get mainMenuMyProfile;\n \n- /// Label for message list button leading to topic-list page. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)\n+ /// Tooltip for button to navigate to topic-list page.\n ///\n /// In en, this message translates to:\n- /// **'TOPICS'**\n- String get topicsButtonLabel;\n+ /// **'Topics'**\n+ String get topicsButtonTooltip;\n \n /// Tooltip for button to navigate to a given channel's feed\n ///\ndiff --git a/lib/generated/l10n/zulip_localizations_ar.dart b/lib/generated/l10n/zulip_localizations_ar.dart\nindex 22e1f04fc4..e1b7e2cf52 100644\n--- a/lib/generated/l10n/zulip_localizations_ar.dart\n+++ b/lib/generated/l10n/zulip_localizations_ar.dart\n@@ -699,7 +699,7 @@ class ZulipLocalizationsAr extends ZulipLocalizations {\n String get mainMenuMyProfile => 'My profile';\n \n @override\n- String get topicsButtonLabel => 'TOPICS';\n+ String get topicsButtonTooltip => 'Topics';\n \n @override\n String get channelFeedButtonTooltip => 'Channel feed';\ndiff --git a/lib/generated/l10n/zulip_localizations_de.dart b/lib/generated/l10n/zulip_localizations_de.dart\nindex 74e5402693..de313355d4 100644\n--- a/lib/generated/l10n/zulip_localizations_de.dart\n+++ b/lib/generated/l10n/zulip_localizations_de.dart\n@@ -719,7 +719,7 @@ class ZulipLocalizationsDe extends ZulipLocalizations {\n String get mainMenuMyProfile => 'Mein Profil';\n \n @override\n- String get topicsButtonLabel => 'THEMEN';\n+ String get topicsButtonTooltip => 'Themen';\n \n @override\n String get channelFeedButtonTooltip => 'Kanal-Feed';\ndiff --git a/lib/generated/l10n/zulip_localizations_en.dart b/lib/generated/l10n/zulip_localizations_en.dart\nindex cad9183a94..4a0d148c2b 100644\n--- a/lib/generated/l10n/zulip_localizations_en.dart\n+++ b/lib/generated/l10n/zulip_localizations_en.dart\n@@ -699,7 +699,7 @@ class ZulipLocalizationsEn extends ZulipLocalizations {\n String get mainMenuMyProfile => 'My profile';\n \n @override\n- String get topicsButtonLabel => 'TOPICS';\n+ String get topicsButtonTooltip => 'Topics';\n \n @override\n String get channelFeedButtonTooltip => 'Channel feed';\ndiff --git a/lib/generated/l10n/zulip_localizations_it.dart b/lib/generated/l10n/zulip_localizations_it.dart\nindex 5f85cce756..5bb56b6f41 100644\n--- a/lib/generated/l10n/zulip_localizations_it.dart\n+++ b/lib/generated/l10n/zulip_localizations_it.dart\n@@ -714,7 +714,7 @@ class ZulipLocalizationsIt extends ZulipLocalizations {\n String get mainMenuMyProfile => 'Il mio profilo';\n \n @override\n- String get topicsButtonLabel => 'ARGOMENTI';\n+ String get topicsButtonTooltip => 'Argomenti';\n \n @override\n String get channelFeedButtonTooltip => 'Feed del canale';\ndiff --git a/lib/generated/l10n/zulip_localizations_ja.dart b/lib/generated/l10n/zulip_localizations_ja.dart\nindex b2eb5fc7b0..4c49121785 100644\n--- a/lib/generated/l10n/zulip_localizations_ja.dart\n+++ b/lib/generated/l10n/zulip_localizations_ja.dart\n@@ -699,7 +699,7 @@ class ZulipLocalizationsJa extends ZulipLocalizations {\n String get mainMenuMyProfile => 'My profile';\n \n @override\n- String get topicsButtonLabel => 'TOPICS';\n+ String get topicsButtonTooltip => 'Topics';\n \n @override\n String get channelFeedButtonTooltip => 'Channel feed';\ndiff --git a/lib/generated/l10n/zulip_localizations_nb.dart b/lib/generated/l10n/zulip_localizations_nb.dart\nindex 8744729a26..c0353e1789 100644\n--- a/lib/generated/l10n/zulip_localizations_nb.dart\n+++ b/lib/generated/l10n/zulip_localizations_nb.dart\n@@ -699,7 +699,7 @@ class ZulipLocalizationsNb extends ZulipLocalizations {\n String get mainMenuMyProfile => 'My profile';\n \n @override\n- String get topicsButtonLabel => 'TOPICS';\n+ String get topicsButtonTooltip => 'Topics';\n \n @override\n String get channelFeedButtonTooltip => 'Channel feed';\ndiff --git a/lib/generated/l10n/zulip_localizations_pl.dart b/lib/generated/l10n/zulip_localizations_pl.dart\nindex 1471e2736e..92407f9783 100644\n--- a/lib/generated/l10n/zulip_localizations_pl.dart\n+++ b/lib/generated/l10n/zulip_localizations_pl.dart\n@@ -709,7 +709,7 @@ class ZulipLocalizationsPl extends ZulipLocalizations {\n String get mainMenuMyProfile => 'M\u00f3j profil';\n \n @override\n- String get topicsButtonLabel => 'W\u0104TKI';\n+ String get topicsButtonTooltip => 'W\u0105tki';\n \n @override\n String get channelFeedButtonTooltip => 'Strumie\u0144 kana\u0142u';\ndiff --git a/lib/generated/l10n/zulip_localizations_ru.dart b/lib/generated/l10n/zulip_localizations_ru.dart\nindex 20c6a54bb6..8d174186d1 100644\n--- a/lib/generated/l10n/zulip_localizations_ru.dart\n+++ b/lib/generated/l10n/zulip_localizations_ru.dart\n@@ -713,7 +713,7 @@ class ZulipLocalizationsRu extends ZulipLocalizations {\n String get mainMenuMyProfile => '\u041c\u043e\u0439 \u043f\u0440\u043e\u0444\u0438\u043b\u044c';\n \n @override\n- String get topicsButtonLabel => '\u0422\u0415\u041c\u042b';\n+ String get topicsButtonTooltip => '\u0422\u0435\u043c\u044b';\n \n @override\n String get channelFeedButtonTooltip => '\u041b\u0435\u043d\u0442\u0430 \u043a\u0430\u043d\u0430\u043b\u0430';\ndiff --git a/lib/generated/l10n/zulip_localizations_sk.dart b/lib/generated/l10n/zulip_localizations_sk.dart\nindex 24797fad32..b73d4bee18 100644\n--- a/lib/generated/l10n/zulip_localizations_sk.dart\n+++ b/lib/generated/l10n/zulip_localizations_sk.dart\n@@ -701,7 +701,7 @@ class ZulipLocalizationsSk extends ZulipLocalizations {\n String get mainMenuMyProfile => 'M\u00f4j profil';\n \n @override\n- String get topicsButtonLabel => 'TOPICS';\n+ String get topicsButtonTooltip => 'Topics';\n \n @override\n String get channelFeedButtonTooltip => 'Channel feed';\ndiff --git a/lib/generated/l10n/zulip_localizations_sl.dart b/lib/generated/l10n/zulip_localizations_sl.dart\nindex c298af9351..39de9af735 100644\n--- a/lib/generated/l10n/zulip_localizations_sl.dart\n+++ b/lib/generated/l10n/zulip_localizations_sl.dart\n@@ -724,7 +724,7 @@ class ZulipLocalizationsSl extends ZulipLocalizations {\n String get mainMenuMyProfile => 'Moj profil';\n \n @override\n- String get topicsButtonLabel => 'TEME';\n+ String get topicsButtonTooltip => 'Teme';\n \n @override\n String get channelFeedButtonTooltip => 'Sporo\u010dila kanala';\ndiff --git a/lib/generated/l10n/zulip_localizations_uk.dart b/lib/generated/l10n/zulip_localizations_uk.dart\nindex 82e07f3634..74edee1d1e 100644\n--- a/lib/generated/l10n/zulip_localizations_uk.dart\n+++ b/lib/generated/l10n/zulip_localizations_uk.dart\n@@ -712,7 +712,7 @@ class ZulipLocalizationsUk extends ZulipLocalizations {\n String get mainMenuMyProfile => '\u041c\u0456\u0439 \u043f\u0440\u043e\u0444\u0456\u043b\u044c';\n \n @override\n- String get topicsButtonLabel => '\u0422\u0415\u041c\u0418';\n+ String get topicsButtonTooltip => '\u0422\u0435\u043c\u0438';\n \n @override\n String get channelFeedButtonTooltip => '\u0421\u0442\u0440\u0456\u0447\u043a\u0430 \u043a\u0430\u043d\u0430\u043b\u0443';\ndiff --git a/lib/generated/l10n/zulip_localizations_zh.dart b/lib/generated/l10n/zulip_localizations_zh.dart\nindex a5ab16e499..d6b673fae4 100644\n--- a/lib/generated/l10n/zulip_localizations_zh.dart\n+++ b/lib/generated/l10n/zulip_localizations_zh.dart\n@@ -699,7 +699,7 @@ class ZulipLocalizationsZh extends ZulipLocalizations {\n String get mainMenuMyProfile => 'My profile';\n \n @override\n- String get topicsButtonLabel => 'TOPICS';\n+ String get topicsButtonTooltip => 'Topics';\n \n @override\n String get channelFeedButtonTooltip => 'Channel feed';\n@@ -1534,7 +1534,7 @@ class ZulipLocalizationsZhHansCn extends ZulipLocalizationsZh {\n String get mainMenuMyProfile => '\u4e2a\u4eba\u8d44\u6599';\n \n @override\n- String get topicsButtonLabel => '\u8bdd\u9898';\n+ String get topicsButtonTooltip => '\u8bdd\u9898';\n \n @override\n String get channelFeedButtonTooltip => '\u9891\u9053\u8ba2\u9605';\n@@ -2084,7 +2084,7 @@ class ZulipLocalizationsZhHantTw extends ZulipLocalizationsZh {\n String get channelsPageTitle => '\u983b\u9053';\n \n @override\n- String get topicsButtonLabel => '\u8a71\u984c';\n+ String get topicsButtonTooltip => '\u8a71\u984c';\n \n @override\n String get channelFeedButtonTooltip => '\u983b\u9053\u994b\u7d66';\ndiff --git a/lib/widgets/message_list.dart b/lib/widgets/message_list.dart\nindex de890bfc6b..00fca21b16 100644\n--- a/lib/widgets/message_list.dart\n+++ b/lib/widgets/message_list.dart\n@@ -459,24 +459,12 @@ class _TopicListButton extends StatelessWidget {\n @override\n Widget build(BuildContext context) {\n final zulipLocalizations = ZulipLocalizations.of(context);\n- final designVariables = DesignVariables.of(context);\n- return GestureDetector(\n- onTap: () {\n- Navigator.of(context).push(TopicListPage.buildRoute(\n- context: context, streamId: streamId));\n- },\n- behavior: HitTestBehavior.opaque,\n- child: Padding(\n- padding: EdgeInsetsDirectional.fromSTEB(12, 8, 12, 8),\n- child: Center(child: Text(zulipLocalizations.topicsButtonLabel,\n- style: TextStyle(\n- color: designVariables.icon,\n- fontSize: 18,\n- height: 19 / 18,\n- // This is equivalent to css `all-small-caps`, see:\n- // https://developer.mozilla.org/en-US/docs/Web/CSS/font-variant-caps#all-small-caps\n- fontFeatures: const [FontFeature.enable('c2sc'), FontFeature.enable('smcp')],\n- ).merge(weightVariableTextStyle(context, wght: 600))))));\n+ return IconButton(\n+ icon: const Icon(ZulipIcons.topics),\n+ tooltip: zulipLocalizations.topicsButtonTooltip,\n+ onPressed: () => Navigator.push(context,\n+ TopicListPage.buildRoute(context: context,\n+ streamId: streamId)));\n }\n }\n \n", "test_patch": "diff --git a/test/widgets/message_list_test.dart b/test/widgets/message_list_test.dart\nindex 70d204a101..d068e12ed5 100644\n--- a/test/widgets/message_list_test.dart\n+++ b/test/widgets/message_list_test.dart\n@@ -288,7 +288,7 @@ void main() {\n connection.prepare(json: GetStreamTopicsResult(topics: [\n eg.getStreamTopicsEntry(name: 'topic foo'),\n ]).toJson());\n- await tester.tap(find.text('TOPICS'));\n+ await tester.tap(find.byIcon(ZulipIcons.topics));\n await tester.pump(); // tap the button\n await tester.pump(Duration.zero); // wait for request\n check(find.descendant(\n@@ -323,7 +323,7 @@ void main() {\n connection.prepare(json: GetStreamTopicsResult(topics: [\n eg.getStreamTopicsEntry(name: 'topic foo'),\n ]).toJson());\n- await tester.tap(find.text('TOPICS'));\n+ await tester.tap(find.byIcon(ZulipIcons.topics));\n await tester.pump(); // tap the button\n await tester.pump(Duration.zero); // wait for request\n check(find.descendant(\ndiff --git a/test/widgets/topic_list_test.dart b/test/widgets/topic_list_test.dart\nindex f87ddaf1ee..1cd9c4bb26 100644\n--- a/test/widgets/topic_list_test.dart\n+++ b/test/widgets/topic_list_test.dart\n@@ -142,7 +142,7 @@ void main() {\n // Tap \"TOPICS\" button navigating to the topic-list page\u2026\n connection.prepare(json: GetStreamTopicsResult(\n topics: [eg.getStreamTopicsEntry(name: 'topic A')]).toJson());\n- await tester.tap(find.text('TOPICS'));\n+ await tester.tap(find.byIcon(ZulipIcons.topics));\n await tester.pump();\n await tester.pump(Duration.zero);\n check(find.text('topic A')).findsOne();\n@@ -154,7 +154,7 @@ void main() {\n // \u2026 then back to the topic-list page, expecting to fetch again.\n connection.prepare(json: GetStreamTopicsResult(\n topics: [eg.getStreamTopicsEntry(name: 'topic B')]).toJson());\n- await tester.tap(find.text('TOPICS'));\n+ await tester.tap(find.byIcon(ZulipIcons.topics));\n await tester.pump();\n await tester.pump(Duration.zero);\n check(find.text('topic A')).findsNothing();\n", "n2p_tests": "{\"/home/zulip-flutter/test/widgets/topic_list_test.dart: handle empty topics\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/topic_list_test.dart: unreads with and without unread mentions\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar channel icon in channel row; web-public: false, invite-only: true\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/topic_list_test.dart: topic visibility unmuted\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/topic_list_test.dart: topic visibility muted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/topic_list_test.dart: topic visibility followed\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/topic_list_test.dart: sort topics by maxId\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar has topic-list action for topic narrows\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar has topic-list action for channel narrows\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage ancestorOf finds page state from message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/topic_list_test.dart: app bar navigate to channel feed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch initial batch of messages topic permalink without message move\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: smoke test for light/dark/lerped\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: no-messages placeholder Search, non-empty keyword\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/topic_list_test.dart: show topic action sheet\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/topic_list_test.dart: app bar show channel action sheet\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar shows \\\"Muted user\\\" label for muted users in DM narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: no-messages placeholder Search, empty keyword\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch older messages on scroll basic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar has channel-feed action for topic narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch older messages on scroll observe double-fetch glitch\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: no-messages placeholder Combined feed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch initial batch of messages topic permalink with message move\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar show topic visibility policy for topic narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: presents message content appropriately content not asked to consume insets (including bottom), even without compose box\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage MessageListPageState.narrow\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: no-messages placeholder when `messages` empty but `outboxMessages` not empty, show outboxes, not placeholder\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/topic_list_test.dart: app bar unknown channel name\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1624", "org": "zulip", "repo": "zulip-flutter", "number": 1624, "state": "closed", "title": "Show message content, sender, and timestamp in message action sheet", "body": "Fixes #217.\r\n\r\nWe've had some complaints about not being able to see the timestamps of messages in a run of messages from the same sender, e.g.:\r\n\r\n[#mobile > Sent time not visible @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/Sent.20time.20not.20visible/near/2201862)\r\n> There is a \"message sent\" time shown in an upper right hand corner of the message. But when the messages are sent by bot, the time is only shown for the first message of the day. The old android app at least shown the time when tapped on the message, but I haven't found a way how to display the time here.\r\n\r\nWe have #457 for how to offer that in a really quick interaction. But this PR lets you get that information, and it aligns with a different part of the Figma, namely #217. As discussed: [#mobile > Sent time not visible @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/Sent.20time.20not.20visible/near/2202542)\r\n\r\n(edit: all but one of these screenshots are outdated in the timestamp format; the one with the full date and time is current)\r\n\r\n| Light | Dark |\r\n| --- | --- |\r\n| \"image\" | \"image\" |\r\n| \"image\" | \"image\" |\r\n| \"image\" | \"image\" |\r\n\r\nThis revision leaves the message completely interactable; you can open images in the lightbox, open and close spoilers, etc.; that seemed most straightforward to implement. It does not implement text selection of the content; that's requested in the Figma, and #10 is for that, and I've left a TODO for it.", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"9cc34cd7ef36684831632840139df178c7cc13b8\"}", "resolved_issues": "[{\"number\": 217, \"title\": \"Show message text in bottom sheet\", \"body\": \"In the redesigned message bottom sheet #90 from @terpimost, the top of the message sheet shows the message you're acting on.\\r\\n\\r\\nWe've left that part out of the scope of #90; this is a follow-up issue for adding it. See Figma design:\\r\\nhttps://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=3483-29796&m=dev\\r\\n![image](https://github.com/user-attachments/assets/1909713a-337f-4be5-8fa4-6bb04c3f52e2)\\r\\n\\r\\nand quoting a note from there:\\r\\n> The message is exactly the same as in the feed. It shouldn\\u2019t be just a picture, because we want to allow TEXT SELECTION HERE.\\r\\n\\r\\nSee also the notes to the right of there in the Figma design, about scrolling behavior.\\r\\n\\r\\n\\r\\n#### Implementation\\r\\n\\r\\nI expect this will involve reusing most of the implementation of MessageWithPossibleSender. That will probably require some refactoring, in order to make the relevant parts reusable without other aspects that aren't desired here.\\r\\n\\r\\nAlso if the message in its original context in the message list didn't show the sender, we'll want to still show the sender here.\\r\\n\\r\\n
          Old ideas\\r\\n\\r\\nIn the redesigned message bottom sheet #90 from @terpimost, the top of the message sheet shows the text of the message you're acting on (cutting it off at two lines). This is helpful when the message itself isn't visible, which becomes more and more likely as we add more actions to the bottom sheet.\\r\\n\\r\\nI'm splitting this out from the rest of #90, because the concept of \\\"the text of the message\\\" is actually a bit slippery and raises some product/design questions.\\r\\n\\r\\n* We could use the message's Markdown source. But that isn't great for this UI context: it may have a bunch of markup that obscures what the message actually says.\\r\\n * Consider in particular the case where the message starts with a quote-reply.\\r\\n * Consider also a message that starts with one short paragraph like \\\"Yes.\\\", and then has more details in a second paragraph. The first two lines of the Markdown source will be just \\\"Yes.\\\" followed by a blank line. That's not very informative, and we might want to show more text than that.\\r\\n\\r\\n If we decide we're OK with that, there's a second pitfall which we'll need to pick a response to: we don't normally keep around the Markdown source for all the messages we have, only the rendered HTML. On the occasions where we need Markdown source (like for generating a quote-and-reply), we make a separate request to the server to get it. We can do that here\\u2026 but then we need to decide what to show when that request hasn't completed yet, which will be at least a frame or two and often more.\\r\\n * We could delay the whole bottom sheet. That seems bad.\\r\\n * We could show nothing; when the text arrives, the top edge of the bottom sheet jumps up to make room.\\r\\n * We could show a blank space; when the text arrives, it pops into existence in the top area of the bottom sheet. Until it arrives, that area looks oddly blank.\\r\\n * We could show a [CircularProgressIndicator](https://api.flutter.dev/flutter/material/CircularProgressIndicator-class.html), or another loading indicator. Might feel noisy; this message text isn't meant to be a point of focus, just a helpful bit of context in the nature of a breadcrumb.\\r\\n\\r\\n* We could use the message's HTML. That will definitely have a bunch of cluttery-feeling markup, more so than the Markdown. On the other hand we have it immediately and don't have to wait.\\r\\n\\r\\n* We could introduce some new notion of a \\\"text summary\\\" of a message's content: we'd walk the content parse tree, and try to generate something like its plain text without markup. This will require some work to define just what we want and to implement it.\\r\\n\\r\\n
          \\r\\n\"}]", "lang": "dart", "problem_statement": "Show message text in bottom sheet\nIn the redesigned message bottom sheet #90 from @terpimost, the top of the message sheet shows the message you're acting on.\r\n\r\nWe've left that part out of the scope of #90; this is a follow-up issue for adding it. See Figma design:\r\nhttps://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=3483-29796&m=dev\r\n![image](https://github.com/user-attachments/assets/1909713a-337f-4be5-8fa4-6bb04c3f52e2)\r\n\r\nand quoting a note from there:\r\n> The message is exactly the same as in the feed. It shouldn\u2019t be just a picture, because we want to allow TEXT SELECTION HERE.\r\n\r\nSee also the notes to the right of there in the Figma design, about scrolling behavior.\r\n\r\n\r\n#### Implementation\r\n\r\nI expect this will involve reusing most of the implementation of MessageWithPossibleSender. That will probably require some refactoring, in order to make the relevant parts reusable without other aspects that aren't desired here.\r\n\r\nAlso if the message in its original context in the message list didn't show the sender, we'll want to still show the sender here.\r\n\r\n
          Old ideas\r\n\r\nIn the redesigned message bottom sheet #90 from @terpimost, the top of the message sheet shows the text of the message you're acting on (cutting it off at two lines). This is helpful when the message itself isn't visible, which becomes more and more likely as we add more actions to the bottom sheet.\r\n\r\nI'm splitting this out from the rest of #90, because the concept of \"the text of the message\" is actually a bit slippery and raises some product/design questions.\r\n\r\n* We could use the message's Markdown source. But that isn't great for this UI context: it may have a bunch of markup that obscures what the message actually says.\r\n * Consider in particular the case where the message starts with a quote-reply.\r\n * Consider also a message that starts with one short paragraph like \"Yes.\", and then has more details in a second paragraph. The first two lines of the Markdown source will be just \"Yes.\" followed by a blank line. That's not very informative, and we might want to show more text than that.\r\n\r\n If we decide we're OK with that, there's a second pitfall which we'll need to pick a response to: we don't normally keep around the Markdown source for all the messages we have, only the rendered HTML. On the occasions where we need Markdown source (like for generating a quote-and-reply), we make a separate request to the server to get it. We can do that here\u2026 but then we need to decide what to show when that request hasn't completed yet, which will be at least a frame or two and often more.\r\n * We could delay the whole bottom sheet. That seems bad.\r\n * We could show nothing; when the text arrives, the top edge of the bottom sheet jumps up to make room.\r\n * We could show a blank space; when the text arrives, it pops into existence in the top area of the bottom sheet. Until it arrives, that area looks oddly blank.\r\n * We could show a [CircularProgressIndicator](https://api.flutter.dev/flutter/material/CircularProgressIndicator-class.html), or another loading indicator. Might feel noisy; this message text isn't meant to be a point of focus, just a helpful bit of context in the nature of a breadcrumb.\r\n\r\n* We could use the message's HTML. That will definitely have a bunch of cluttery-feeling markup, more so than the Markdown. On the other hand we have it immediately and don't have to wait.\r\n\r\n* We could introduce some new notion of a \"text summary\" of a message's content: we'd walk the content parse tree, and try to generate something like its plain text without markup. This will require some work to define just what we want and to implement it.\r\n\r\n
          \r\n\n", "hints": "Another option is to take a screenshot of the rendered message on which user has clicked and show top part of that, cutting out the rest:\r\n\"image\"\r\nIt might be ok to copy that with a background:\r\n\"image\"\r\n\nHmm yeah, that's an interesting idea. That'd be a good experiment to try.\r\n", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1624", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/217\"]", "test_command": "flutter test test/widgets/action_sheet_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/content.dart b/lib/model/content.dart\nindex 79f3181963..e80247325f 100644\n--- a/lib/model/content.dart\n+++ b/lib/model/content.dart\n@@ -1927,3 +1927,9 @@ class _ZulipContentParser {\n ZulipContent parseContent(String html) {\n return _ZulipContentParser().parse(html);\n }\n+\n+ZulipMessageContent parseMessageContent(Message message) {\n+ final poll = message.poll;\n+ if (poll != null) return PollContent(poll);\n+ return parseContent(message.content);\n+}\ndiff --git a/lib/model/message_list.dart b/lib/model/message_list.dart\nindex 9128617b13..8e2a183fa7 100644\n--- a/lib/model/message_list.dart\n+++ b/lib/model/message_list.dart\n@@ -257,16 +257,10 @@ mixin _MessageSequence {\n }\n }\n \n- ZulipMessageContent _parseMessageContent(Message message) {\n- final poll = message.poll;\n- if (poll != null) return PollContent(poll);\n- return parseContent(message.content);\n- }\n-\n /// Update data derived from the content of the index-th message.\n void _reparseContent(int index) {\n final message = messages[index];\n- final content = _parseMessageContent(message);\n+ final content = parseMessageContent(message);\n contents[index] = content;\n \n final itemIndex = findItemWithMessageId(message.id);\n@@ -283,7 +277,7 @@ mixin _MessageSequence {\n void _addMessage(Message message) {\n assert(contents.length == messages.length);\n messages.add(message);\n- contents.add(_parseMessageContent(message));\n+ contents.add(parseMessageContent(message));\n assert(contents.length == messages.length);\n _processMessage(messages.length - 1);\n }\n@@ -362,7 +356,7 @@ mixin _MessageSequence {\n assert(contents.length == messages.length);\n messages.insertAll(index, toInsert);\n contents.insertAll(index, toInsert.map(\n- (message) => _parseMessageContent(message)));\n+ (message) => parseMessageContent(message)));\n assert(contents.length == messages.length);\n if (index <= middleMessage) {\n middleMessage += messages.length - oldLength;\n@@ -425,7 +419,7 @@ mixin _MessageSequence {\n void _recompute() {\n assert(contents.length == messages.length);\n contents.clear();\n- contents.addAll(messages.map((message) => _parseMessageContent(message)));\n+ contents.addAll(messages.map((message) => parseMessageContent(message)));\n assert(contents.length == messages.length);\n _reprocessAll();\n }\ndiff --git a/lib/widgets/action_sheet.dart b/lib/widgets/action_sheet.dart\nindex d040ea8bcf..abc3522b5e 100644\n--- a/lib/widgets/action_sheet.dart\n+++ b/lib/widgets/action_sheet.dart\n@@ -13,12 +13,14 @@ import '../api/route/channels.dart';\n import '../api/route/messages.dart';\n import '../generated/l10n/zulip_localizations.dart';\n import '../model/binding.dart';\n+import '../model/content.dart';\n import '../model/emoji.dart';\n import '../model/internal_link.dart';\n import '../model/narrow.dart';\n import 'actions.dart';\n import 'color.dart';\n import 'compose_box.dart';\n+import 'content.dart';\n import 'dialog.dart';\n import 'emoji.dart';\n import 'emoji_reaction.dart';\n@@ -32,11 +34,15 @@ import 'theme.dart';\n import 'topic_list.dart';\n \n void _showActionSheet(\n- BuildContext context, {\n+ BuildContext pageContext, {\n+ Widget? header,\n required List optionButtons,\n }) {\n+ // Could omit this if we need _showActionSheet outside a per-account context.\n+ final accountId = PerAccountStoreWidget.accountIdOf(pageContext);\n+\n showModalBottomSheet(\n- context: context,\n+ context: pageContext,\n // Clip.hardEdge looks bad; Clip.antiAliasWithSaveLayer looks pixel-perfect\n // on my iPhone 13 Pro but is marked as \"much slower\":\n // https://api.flutter.dev/flutter/dart-ui/Clip.html\n@@ -44,27 +50,52 @@ void _showActionSheet(\n useSafeArea: true,\n isScrollControlled: true,\n builder: (BuildContext _) {\n- return Semantics(\n- role: SemanticsRole.menu,\n- child: SafeArea(\n- minimum: const EdgeInsets.only(bottom: 16),\n- child: Padding(\n- padding: const EdgeInsets.fromLTRB(16, 0, 16, 0),\n+ final designVariables = DesignVariables.of(pageContext);\n+ return PerAccountStoreWidget(\n+ accountId: accountId,\n+ child: Semantics(\n+ role: SemanticsRole.menu,\n+ child: SafeArea(\n+ minimum: const EdgeInsets.only(bottom: 16),\n child: Column(\n- crossAxisAlignment: CrossAxisAlignment.stretch,\n mainAxisSize: MainAxisSize.min,\n children: [\n- // TODO(#217): show message text\n- Flexible(child: InsetShadowBox(\n- top: 8, bottom: 8,\n- color: DesignVariables.of(context).bgContextMenu,\n- child: SingleChildScrollView(\n- padding: const EdgeInsets.only(top: 16, bottom: 8),\n- child: ClipRRect(\n- borderRadius: BorderRadius.circular(7),\n- child: Column(spacing: 1,\n- children: optionButtons))))),\n- const ActionSheetCancelButton(),\n+ if (header != null)\n+ Flexible(\n+ // TODO(upstream) Enforce a flex ratio (e.g. 1:3)\n+ // only when the header height plus the buttons' height\n+ // exceeds available space. Otherwise let one or the other\n+ // grow to fill available space even if it breaks the ratio.\n+ // Needs support for separate properties like `flex-grow`\n+ // and `flex-shrink`.\n+ flex: 1,\n+ child: InsetShadowBox(\n+ top: 8, bottom: 8,\n+ color: designVariables.bgContextMenu,\n+ child: SingleChildScrollView(\n+ padding: EdgeInsets.symmetric(vertical: 8),\n+ child: header)))\n+ else\n+ SizedBox(height: 8),\n+ Flexible(\n+ flex: 3,\n+ child: Padding(\n+ padding: const EdgeInsets.fromLTRB(16, 0, 16, 0),\n+ child: Column(\n+ crossAxisAlignment: CrossAxisAlignment.stretch,\n+ mainAxisSize: MainAxisSize.min,\n+ children: [\n+ Flexible(child: InsetShadowBox(\n+ top: 8, bottom: 8,\n+ color: designVariables.bgContextMenu,\n+ child: SingleChildScrollView(\n+ padding: const EdgeInsets.symmetric(vertical: 8),\n+ child: ClipRRect(\n+ borderRadius: BorderRadius.circular(7),\n+ child: Column(spacing: 1,\n+ children: optionButtons))))),\n+ const ActionSheetCancelButton(),\n+ ]))),\n ]))));\n });\n }\n@@ -609,7 +640,42 @@ void showMessageActionSheet({required BuildContext context, required Message mes\n EditButton(message: message, pageContext: pageContext),\n ];\n \n- _showActionSheet(pageContext, optionButtons: optionButtons);\n+ _showActionSheet(pageContext,\n+ optionButtons: optionButtons,\n+ header: _MessageActionSheetHeader(message: message));\n+}\n+\n+class _MessageActionSheetHeader extends StatelessWidget {\n+ const _MessageActionSheetHeader({required this.message});\n+\n+ final Message message;\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ final designVariables = DesignVariables.of(context);\n+\n+ // TODO this seems to lose the hero animation when opening an image;\n+ // investigate.\n+ // TODO should we close the sheet before opening a narrow link?\n+ // On popping the pushed narrow route, the sheet is still open.\n+\n+ return Container(\n+ // TODO(#647) use different color for highlighted messages\n+ // TODO(#681) use different color for DM messages\n+ color: designVariables.bgMessageRegular,\n+ padding: EdgeInsets.symmetric(vertical: 4),\n+ child: Column(\n+ spacing: 4,\n+ children: [\n+ SenderRow(message: message,\n+ timestampStyle: MessageTimestampStyle.full),\n+ Padding(\n+ padding: const EdgeInsets.symmetric(horizontal: 16),\n+ // TODO(#10) offer text selection; the Figma asks for it here:\n+ // https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=3483-30210&m=dev\n+ child: MessageContent(message: message, content: parseMessageContent(message))),\n+ ]));\n+ }\n }\n \n abstract class MessageActionSheetMenuItemButton extends ActionSheetMenuItemButton {\n@@ -927,7 +993,7 @@ class UnrevealMutedMessageButton extends MessageActionSheetMenuItemButton {\n @override\n void onPressed() {\n // The message should have been revealed in order to reach this action sheet.\n- assert(MessageListPage.revealedMutedMessagesOf(pageContext)\n+ assert(MessageListPage.maybeRevealedMutedMessagesOf(pageContext)!\n .isMutedMessageRevealed(message.id));\n findMessageListPage().unrevealMutedMessage(message.id);\n }\ndiff --git a/lib/widgets/message_list.dart b/lib/widgets/message_list.dart\nindex 00fca21b16..eb0b972337 100644\n--- a/lib/widgets/message_list.dart\n+++ b/lib/widgets/message_list.dart\n@@ -175,19 +175,19 @@ class MessageListPage extends StatefulWidget {\n initNarrow: narrow, initAnchorMessageId: initAnchorMessageId));\n }\n \n- /// The \"revealed\" state of a message from a muted sender.\n+ /// The \"revealed\" state of a message from a muted sender,\n+ /// if there is a [MessageListPage] ancestor, else null.\n ///\n /// This is updated via [MessageListPageState.revealMutedMessage]\n /// and [MessageListPageState.unrevealMutedMessage].\n ///\n /// Uses the efficient [BuildContext.dependOnInheritedWidgetOfExactType],\n /// so this is safe to call in a build method.\n- static RevealedMutedMessagesState revealedMutedMessagesOf(BuildContext context) {\n+ static RevealedMutedMessagesState? maybeRevealedMutedMessagesOf(BuildContext context) {\n final state =\n context.dependOnInheritedWidgetOfExactType<_RevealedMutedMessagesProvider>()\n ?.state;\n- assert(state != null, 'No MessageListPage ancestor');\n- return state!;\n+ return state;\n }\n \n /// The [MessageListPageState] above this context in the tree.\n@@ -1880,21 +1880,23 @@ String formatHeaderDate(\n }\n }\n \n-// TODO(i18n): web seems to ignore locale in formatting time, but we could do better\n-final _kMessageTimestampFormat = DateFormat('h:mm aa', 'en_US');\n-\n-class _SenderRow extends StatelessWidget {\n- const _SenderRow({required this.message, required this.showTimestamp});\n+class SenderRow extends StatelessWidget {\n+ const SenderRow({super.key, required this.message, required this.timestampStyle});\n \n final MessageBase message;\n- final bool showTimestamp;\n+ final MessageTimestampStyle timestampStyle;\n \n bool _showAsMuted(BuildContext context, PerAccountStore store) {\n final message = this.message;\n if (!store.isUserMuted(message.senderId)) return false;\n if (message is! Message) return false; // i.e., if an outbox message\n- return !MessageListPage.revealedMutedMessagesOf(context)\n- .isMutedMessageRevealed(message.id);\n+ final revealedMutedMessagesState =\n+ MessageListPage.maybeRevealedMutedMessagesOf(context);\n+ // The \"unrevealed\" state only exists in the message list,\n+ // and we show a sender row in at least one place outside the message list\n+ // (the message action sheet).\n+ if (revealedMutedMessagesState == null) return false;\n+ return !revealedMutedMessagesState.isMutedMessageRevealed(message.id);\n }\n \n @override\n@@ -1904,8 +1906,7 @@ class _SenderRow extends StatelessWidget {\n final designVariables = DesignVariables.of(context);\n \n final sender = store.getUser(message.senderId);\n- final time = _kMessageTimestampFormat\n- .format(DateTime.fromMillisecondsSinceEpoch(1000 * message.timestamp));\n+ final timestamp = timestampStyle.format(message.timestamp);\n \n final showAsMuted = _showAsMuted(context, store);\n \n@@ -1951,9 +1952,9 @@ class _SenderRow extends StatelessWidget {\n ),\n ],\n ]))),\n- if (showTimestamp) ...[\n+ if (timestamp != null) ...[\n const SizedBox(width: 4),\n- Text(time,\n+ Text(timestamp,\n style: TextStyle(\n color: messageListTheme.labelTime,\n fontSize: 16,\n@@ -1965,6 +1966,42 @@ class _SenderRow extends StatelessWidget {\n }\n }\n \n+// TODO centralize on this for wherever we show message timestamps\n+enum MessageTimestampStyle {\n+ none,\n+ timeOnly,\n+\n+ /// The longest format, with full date and time as numbers, not \"Today\"/etc.\n+ ///\n+ /// For UI contexts focused just on the one message,\n+ /// or as a tooltip on a shorter-formatted timestamp.\n+ ///\n+ /// The detail won't always be needed, but this format makes mental timezone\n+ /// conversions easier, which is helpful when the user is thinking about\n+ /// business hours on a different continent,\n+ /// or traveling and they know their device timezone setting is wrong, etc.\n+ // TODO(design) show \"Today\"/etc. after all? Discussion:\n+ // https://github.com/zulip/zulip-flutter/pull/1624#issuecomment-3050296488\n+ full,\n+ ;\n+\n+ static final _timeOnlyFormat = DateFormat('h:mm aa', 'en_US');\n+ static final _fullFormat = DateFormat.yMMMd().add_jm();\n+\n+ /// Format a [Message.timestamp] for this mode.\n+ // TODO(i18n): locale-specific formatting (see #45 for a plan with ffi)\n+ String? format(int messageTimestamp) {\n+ final asDateTime =\n+ DateTime.fromMillisecondsSinceEpoch(1000 * messageTimestamp);\n+\n+ switch (this) {\n+ case none: return null;\n+ case timeOnly: return _timeOnlyFormat.format(asDateTime);\n+ case full: return _fullFormat.format(asDateTime);\n+ }\n+ }\n+}\n+\n /// A Zulip message, showing the sender's name and avatar if specified.\n // Design referenced from:\n // - https://github.com/zulip/zulip-mobile/issues/5511\n@@ -2036,7 +2073,7 @@ class MessageWithPossibleSender extends StatelessWidget {\n };\n \n final showAsMuted = store.isUserMuted(message.senderId)\n- && !MessageListPage.revealedMutedMessagesOf(context)\n+ && !MessageListPage.maybeRevealedMutedMessagesOf(context)!\n .isMutedMessageRevealed(message.id);\n \n return GestureDetector(\n@@ -2055,7 +2092,8 @@ class MessageWithPossibleSender extends StatelessWidget {\n padding: const EdgeInsets.only(top: 4),\n child: Column(children: [\n if (item.showSender)\n- _SenderRow(message: message, showTimestamp: true),\n+ SenderRow(message: message,\n+ timestampStyle: MessageTimestampStyle.timeOnly),\n Row(\n crossAxisAlignment: CrossAxisAlignment.baseline,\n textBaseline: localizedTextBaseline(context),\n@@ -2218,7 +2256,7 @@ class OutboxMessageWithPossibleSender extends StatelessWidget {\n padding: const EdgeInsets.only(top: 4),\n child: Column(children: [\n if (item.showSender)\n- _SenderRow(message: message, showTimestamp: false),\n+ SenderRow(message: message, timestampStyle: MessageTimestampStyle.none),\n Padding(\n padding: const EdgeInsets.symmetric(horizontal: 16),\n child: Column(crossAxisAlignment: CrossAxisAlignment.stretch,\n", "test_patch": "diff --git a/test/widgets/action_sheet_test.dart b/test/widgets/action_sheet_test.dart\nindex b2a3ed1de0..177aa43503 100644\n--- a/test/widgets/action_sheet_test.dart\n+++ b/test/widgets/action_sheet_test.dart\n@@ -38,6 +38,7 @@ import '../api/fake_api.dart';\n import '../example_data.dart' as eg;\n import '../flutter_checks.dart';\n import '../model/binding.dart';\n+import '../model/content_test.dart';\n import '../model/test_store.dart';\n import '../stdlib_checks.dart';\n import '../test_clipboard.dart';\n@@ -860,6 +861,81 @@ void main() {\n });\n \n group('message action sheet', () {\n+ group('header', () {\n+ void checkSenderAndTimestampShown(WidgetTester tester, {required int senderId}) {\n+ check(find.descendant(\n+ of: find.byType(BottomSheet),\n+ matching: find.byWidgetPredicate(\n+ (widget) => widget is Avatar && widget.userId == senderId))\n+ ).findsOne();\n+ final expectedTimestampColor = MessageListTheme.of(\n+ tester.element(find.byType(BottomSheet))).labelTime;\n+ // TODO check the timestamp text itself, when it's convenient to do so:\n+ // https://github.com/zulip/zulip-flutter/pull/1624#discussion_r2181383754\n+ check(find.descendant(\n+ of: find.byType(BottomSheet),\n+ matching: find.byWidgetPredicate((widget) =>\n+ widget is Text\n+ && widget.style?.color == expectedTimestampColor\n+ && (widget.style?.fontFeatures?.contains(FontFeature.enable('c2sc')) ?? false)))\n+ ).findsOne();\n+ }\n+\n+ testWidgets('message sender and content shown', (tester) async {\n+ final message = eg.streamMessage(\n+ timestamp: 1671409088,\n+ content: ContentExample.userMentionPlain.html);\n+ await setupToMessageActionSheet(tester,\n+ message: message,\n+ narrow: TopicNarrow.ofMessage(message));\n+ checkSenderAndTimestampShown(tester, senderId: message.senderId);\n+ check(find.descendant(\n+ of: find.byType(BottomSheet),\n+ matching: find.byType(UserMention))\n+ ).findsOne();\n+ });\n+\n+ testWidgets('muted sender also shown', (tester) async {\n+ final message = eg.streamMessage(\n+ timestamp: 1671409088,\n+ content: ContentExample.userMentionPlain.html);\n+ await setupToMessageActionSheet(tester,\n+ message: message,\n+ narrow: TopicNarrow.ofMessage(message),\n+ mutedUserIds: [message.senderId],\n+ beforeLongPress: () async {\n+ check(find.byType(MessageContent)).findsNothing();\n+ await tester.tap(\n+ find.widgetWithText(ZulipWebUiKitButton, 'Reveal message'));\n+ await tester.pump();\n+ check(find.byType(MessageContent)).findsOne();\n+ },\n+ );\n+ checkSenderAndTimestampShown(tester, senderId: message.senderId);\n+ check(find.descendant(\n+ of: find.byType(BottomSheet),\n+ matching: find.byType(UserMention))\n+ ).findsOne();\n+ });\n+\n+ testWidgets('poll is rendered', (tester) async {\n+ final submessageContent = eg.pollWidgetData(\n+ question: 'poll', options: ['First option', 'Second option']);\n+ final message = eg.streamMessage(\n+ timestamp: 1671409088,\n+ sender: eg.selfUser,\n+ submessages: [eg.submessage(content: submessageContent)]);\n+ await setupToMessageActionSheet(tester,\n+ message: message,\n+ narrow: TopicNarrow.ofMessage(message));\n+ checkSenderAndTimestampShown(tester, senderId: message.senderId);\n+ check(find.descendant(\n+ of: find.byType(BottomSheet),\n+ matching: find.text('First option'))\n+ ).findsOne();\n+ });\n+ });\n+\n group('ReactionButtons', () {\n testWidgets('absent if ServerEmojiData not loaded', (tester) async {\n final message = eg.streamMessage();\n@@ -1651,7 +1727,11 @@ void main() {\n connection.prepare(json: GetMessageResult(\n message: eg.streamMessage(content: 'foo')).toJson());\n await tapEdit(tester);\n- await tester.pump(Duration.zero);\n+ await tester.pump();\n+ // Default duration of bottom-sheet exit animation,\n+ // plus 1ms fudge factor (why needed?)\n+ // TODO(#1668) get this dynamically instead of hard-coding\n+ await tester.pump(Duration(milliseconds: 200 + 1));\n await tester.enterText(find.byWidgetPredicate(\n (widget) => widget is TextField && widget.controller?.text == 'foo'),\n 'bar');\n", "n2p_tests": "{}", "f2p_tests": "{\"message action sheet header muted sender also shown\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"message action sheet header poll is rendered\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"message action sheet header message sender and content shown\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"message action sheet StarButton star success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet MarkChannelAsReadButton request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton mute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageTextButton success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: false, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when topic is empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton unresolve: weird prefix\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from inbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ShareButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: true, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from inbox; message in Unreads but not in MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from recipient header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread visible if message is read\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet MarkTopicAsReadButton visible if topic has unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons absent if ServerEmojiData not loaded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons slight_smile removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in DM narrow smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: Instance of 'CombinedFeedNarrow', realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons smile removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet StarButton unstar success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton not offered in StarredMessagesNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads but not MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton unfollow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: ChannelNarrow(1), realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: true, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton tap button smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet UnrevealMutedMessageButton when pressed, unreveals the message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton not offered in MentionsNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet StarButton star request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads and MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ShareButton request succeeds; sharing succeeds\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread onPressed on topic move, acts on new topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 0, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread not visible if message is not read\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons slight_smile request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton request fails with an error dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton not offered in CombinedFeedNarrow (composing to reply is not yet supported)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons slight_smile adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet UnrevealMutedMessageButton visible if message is from muted sender and revealed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when msglist empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton unresolve: request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet MarkChannelAsReadButton happy path from inbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet UnrevealMutedMessageButton not visible if message is from normal sender (not muted)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageTextButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet MarkTopicAsReadButton not visible if topic has no unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton unresolve: happy path\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 10, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from app bar in channel narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in topic narrow smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet TopicListButton\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: false, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton unmute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: false, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton unmuteInMutedChannel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet MarkTopicAsReadButton marks topic as read when pressed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from recipient header\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread onPressed shows error when fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton handle empty topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show with no unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet ResolveUnresolveButton resolve: request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MarkAsUnread onPressed smoke test\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons smile request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from app bar in topic narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet MessageActionSheetCancelButton pressing the button dismisses the action sheet\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton follow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons smile adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet StarButton unstar request has an error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in topic narrow no error if user lost posting permission after action sheet opened\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet showTopicActionSheet show from inbox; message in Unreads and in MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in DM narrow no error if recipient was deactivated while raw-content request in progress\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons octopus request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons tada removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ShareButton request succeeds; sharing fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageLinkButton copies message link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 600, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons heart adding success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet QuoteAndReplyButton in channel narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"channel action sheet showChannelActionSheet show from subscription list\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons +1 removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet ReactionButtons working_on_it request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"message action sheet CopyMessageTextButton can show snackbar on success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1590", "org": "zulip", "repo": "zulip-flutter", "number": 1590, "state": "closed", "title": "Welcome dialog on upgrade from legacy app", "body": "Fixes #1580.\r\n\r\nStacked atop #1588.\r\n\r\nI believe this works correctly. Some tests would be nice to write, but are less critical than for #1070 / #1588.\r\n\r\n### Screenshots\r\n| dark | light |\r\n| --- | --- |\r\n| ![Screenshot_20250614_235102](https://github.com/user-attachments/assets/270c8ae0-34cd-40cb-941d-92f223c8919a) | ![Screenshot_20250614_235205](https://github.com/user-attachments/assets/efba7666-3874-4c78-851a-5b685a36052e) |\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"6dc5a80d740d3ccd5ed3dc49c37b6da8c25b9977\"}", "resolved_issues": "[{\"number\": 1580, \"title\": \"Show a welcome dialog on upgrading from legacy app\", \"body\": \"When this app launches for the first time in an install that previously held the legacy app (following the launch, cf #715), we should show a brief dialog box to acknowledge the obvious that the app will look quite different, and to offer more information.\\n\\nHere's text for the dialog box (written by @alya):\\n\\n> ### Welcome to the new Zulip app!\\n>\\n> You\\u2019ll find a familiar experience in a faster, sleeker package. Check out the [announcement blog post](https://)!\\n>\\n> [Let\\u2019s go]\\n\\nThe link will be to a URL under `https://blog.zulip.com/\\u2026` which we've picked in advance, and which will redirect to the blog post once it goes up. (The blog post won't yet be up when we're preparing the release build, so its actual URL won't yet be final, hence the indirection.)\\n\\nA key step in this issue is to determine whether the app was upgraded from the legacy app. We'll have that information as a side effect of #1070, so I expect to implement this issue next after that one.\\n\"}]", "lang": "dart", "problem_statement": "Show a welcome dialog on upgrading from legacy app\nWhen this app launches for the first time in an install that previously held the legacy app (following the launch, cf #715), we should show a brief dialog box to acknowledge the obvious that the app will look quite different, and to offer more information.\n\nHere's text for the dialog box (written by @alya):\n\n> ### Welcome to the new Zulip app!\n>\n> You\u2019ll find a familiar experience in a faster, sleeker package. Check out the [announcement blog post](https://)!\n>\n> [Let\u2019s go]\n\nThe link will be to a URL under `https://blog.zulip.com/\u2026` which we've picked in advance, and which will redirect to the blog post once it goes up. (The blog post won't yet be up when we're preparing the release build, so its actual URL won't yet be final, hence the indirection.)\n\nA key step in this issue is to determine whether the app was upgraded from the legacy app. We'll have that information as a side effect of #1070, so I expect to implement this issue next after that one.\n\n", "hints": "#1285 blocks doing links in prose, if it's translated. (In fact I'm not sure offhand how to make a link in _un_-translated text, except in the context of Zulip message content, and we don't have #488 yet.)\n\nWe can give the dialog an extra action button though. (For the implementation, maybe `showSuggestedActionDialog` does what we'd want?)\nHmm true.\n\nGiven that, I think the most expedient thing is if the link is a whole paragraph of its own. Then it can be its own Text widget, wrapped in a gesture detector with an onPressed that opens the URL. (And a separate string for translation.)\n\nTo fit that constraint, how about:\n> You\u2019ll find a familiar experience in a faster, sleeker package.\n>\n> [Check out the announcement blog post!](https://blog.zulip.com/)\n\n", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1590", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1580\"]", "test_command": "flutter test test/model/database_test.dart test/widgets/dialog_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/database.dart b/lib/model/database.dart\nindex 2811ae27d2..ca84fc949c 100644\n--- a/lib/model/database.dart\n+++ b/lib/model/database.dart\n@@ -31,6 +31,9 @@ class GlobalSettings extends Table {\n Column get markReadOnScroll => textEnum()\n .nullable()();\n \n+ Column get legacyUpgradeState => textEnum()\n+ .nullable()();\n+\n // If adding a new column to this table, consider whether [BoolGlobalSettings]\n // can do the job instead (by adding a value to the [BoolGlobalSetting] enum).\n // That way is more convenient, when it works, because\n@@ -126,7 +129,7 @@ class AppDatabase extends _$AppDatabase {\n // information on using the build_runner.\n // * Write a migration in `_migrationSteps` below.\n // * Write tests.\n- static const int latestSchemaVersion = 8; // See note.\n+ static const int latestSchemaVersion = 9; // See note.\n \n @override\n int get schemaVersion => latestSchemaVersion;\n@@ -189,6 +192,15 @@ class AppDatabase extends _$AppDatabase {\n await m.addColumn(schema.globalSettings,\n schema.globalSettings.markReadOnScroll);\n },\n+ from8To9: (m, schema) async {\n+ await m.addColumn(schema.globalSettings,\n+ schema.globalSettings.legacyUpgradeState);\n+ // Earlier versions of this app weren't built to be installed over\n+ // the legacy app. So if upgrading from an earlier version of this app,\n+ // assume there wasn't also the legacy app before that.\n+ await m.database.update(schema.globalSettings).write(\n+ RawValuesInsertable({'legacy_upgrade_state': Constant('noLegacy')}));\n+ }\n );\n \n Future _createLatestSchema(Migrator m) async {\n@@ -196,6 +208,7 @@ class AppDatabase extends _$AppDatabase {\n await m.createAll();\n // Corresponds to `from4to5` above.\n await into(globalSettings).insert(GlobalSettingsCompanion());\n+ // Corresponds to (but differs from) part of `from8To9` above.\n await migrateLegacyAppData(this);\n }\n \ndiff --git a/lib/model/database.g.dart b/lib/model/database.g.dart\nindex d78f7ede84..6fdbec74f8 100644\n--- a/lib/model/database.g.dart\n+++ b/lib/model/database.g.dart\n@@ -57,11 +57,24 @@ class $GlobalSettingsTable extends GlobalSettings\n $GlobalSettingsTable.$convertermarkReadOnScrolln,\n );\n @override\n+ late final GeneratedColumnWithTypeConverter\n+ legacyUpgradeState =\n+ GeneratedColumn(\n+ 'legacy_upgrade_state',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ ).withConverter(\n+ $GlobalSettingsTable.$converterlegacyUpgradeStaten,\n+ );\n+ @override\n List get $columns => [\n themeSetting,\n browserPreference,\n visitFirstUnread,\n markReadOnScroll,\n+ legacyUpgradeState,\n ];\n @override\n String get aliasedName => _alias ?? actualTableName;\n@@ -101,6 +114,13 @@ class $GlobalSettingsTable extends GlobalSettings\n data['${effectivePrefix}mark_read_on_scroll'],\n ),\n ),\n+ legacyUpgradeState: $GlobalSettingsTable.$converterlegacyUpgradeStaten\n+ .fromSql(\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}legacy_upgrade_state'],\n+ ),\n+ ),\n );\n }\n \n@@ -141,6 +161,14 @@ class $GlobalSettingsTable extends GlobalSettings\n $convertermarkReadOnScrolln = JsonTypeConverter2.asNullable(\n $convertermarkReadOnScroll,\n );\n+ static JsonTypeConverter2\n+ $converterlegacyUpgradeState = const EnumNameConverter(\n+ LegacyUpgradeState.values,\n+ );\n+ static JsonTypeConverter2\n+ $converterlegacyUpgradeStaten = JsonTypeConverter2.asNullable(\n+ $converterlegacyUpgradeState,\n+ );\n }\n \n class GlobalSettingsData extends DataClass\n@@ -149,11 +177,13 @@ class GlobalSettingsData extends DataClass\n final BrowserPreference? browserPreference;\n final VisitFirstUnreadSetting? visitFirstUnread;\n final MarkReadOnScrollSetting? markReadOnScroll;\n+ final LegacyUpgradeState? legacyUpgradeState;\n const GlobalSettingsData({\n this.themeSetting,\n this.browserPreference,\n this.visitFirstUnread,\n this.markReadOnScroll,\n+ this.legacyUpgradeState,\n });\n @override\n Map toColumns(bool nullToAbsent) {\n@@ -184,6 +214,13 @@ class GlobalSettingsData extends DataClass\n ),\n );\n }\n+ if (!nullToAbsent || legacyUpgradeState != null) {\n+ map['legacy_upgrade_state'] = Variable(\n+ $GlobalSettingsTable.$converterlegacyUpgradeStaten.toSql(\n+ legacyUpgradeState,\n+ ),\n+ );\n+ }\n return map;\n }\n \n@@ -201,6 +238,9 @@ class GlobalSettingsData extends DataClass\n markReadOnScroll: markReadOnScroll == null && nullToAbsent\n ? const Value.absent()\n : Value(markReadOnScroll),\n+ legacyUpgradeState: legacyUpgradeState == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(legacyUpgradeState),\n );\n }\n \n@@ -219,6 +259,8 @@ class GlobalSettingsData extends DataClass\n .fromJson(serializer.fromJson(json['visitFirstUnread'])),\n markReadOnScroll: $GlobalSettingsTable.$convertermarkReadOnScrolln\n .fromJson(serializer.fromJson(json['markReadOnScroll'])),\n+ legacyUpgradeState: $GlobalSettingsTable.$converterlegacyUpgradeStaten\n+ .fromJson(serializer.fromJson(json['legacyUpgradeState'])),\n );\n }\n @override\n@@ -243,6 +285,11 @@ class GlobalSettingsData extends DataClass\n markReadOnScroll,\n ),\n ),\n+ 'legacyUpgradeState': serializer.toJson(\n+ $GlobalSettingsTable.$converterlegacyUpgradeStaten.toJson(\n+ legacyUpgradeState,\n+ ),\n+ ),\n };\n }\n \n@@ -251,6 +298,7 @@ class GlobalSettingsData extends DataClass\n Value browserPreference = const Value.absent(),\n Value visitFirstUnread = const Value.absent(),\n Value markReadOnScroll = const Value.absent(),\n+ Value legacyUpgradeState = const Value.absent(),\n }) => GlobalSettingsData(\n themeSetting: themeSetting.present ? themeSetting.value : this.themeSetting,\n browserPreference: browserPreference.present\n@@ -262,6 +310,9 @@ class GlobalSettingsData extends DataClass\n markReadOnScroll: markReadOnScroll.present\n ? markReadOnScroll.value\n : this.markReadOnScroll,\n+ legacyUpgradeState: legacyUpgradeState.present\n+ ? legacyUpgradeState.value\n+ : this.legacyUpgradeState,\n );\n GlobalSettingsData copyWithCompanion(GlobalSettingsCompanion data) {\n return GlobalSettingsData(\n@@ -277,6 +328,9 @@ class GlobalSettingsData extends DataClass\n markReadOnScroll: data.markReadOnScroll.present\n ? data.markReadOnScroll.value\n : this.markReadOnScroll,\n+ legacyUpgradeState: data.legacyUpgradeState.present\n+ ? data.legacyUpgradeState.value\n+ : this.legacyUpgradeState,\n );\n }\n \n@@ -286,7 +340,8 @@ class GlobalSettingsData extends DataClass\n ..write('themeSetting: $themeSetting, ')\n ..write('browserPreference: $browserPreference, ')\n ..write('visitFirstUnread: $visitFirstUnread, ')\n- ..write('markReadOnScroll: $markReadOnScroll')\n+ ..write('markReadOnScroll: $markReadOnScroll, ')\n+ ..write('legacyUpgradeState: $legacyUpgradeState')\n ..write(')'))\n .toString();\n }\n@@ -297,6 +352,7 @@ class GlobalSettingsData extends DataClass\n browserPreference,\n visitFirstUnread,\n markReadOnScroll,\n+ legacyUpgradeState,\n );\n @override\n bool operator ==(Object other) =>\n@@ -305,7 +361,8 @@ class GlobalSettingsData extends DataClass\n other.themeSetting == this.themeSetting &&\n other.browserPreference == this.browserPreference &&\n other.visitFirstUnread == this.visitFirstUnread &&\n- other.markReadOnScroll == this.markReadOnScroll);\n+ other.markReadOnScroll == this.markReadOnScroll &&\n+ other.legacyUpgradeState == this.legacyUpgradeState);\n }\n \n class GlobalSettingsCompanion extends UpdateCompanion {\n@@ -313,12 +370,14 @@ class GlobalSettingsCompanion extends UpdateCompanion {\n final Value browserPreference;\n final Value visitFirstUnread;\n final Value markReadOnScroll;\n+ final Value legacyUpgradeState;\n final Value rowid;\n const GlobalSettingsCompanion({\n this.themeSetting = const Value.absent(),\n this.browserPreference = const Value.absent(),\n this.visitFirstUnread = const Value.absent(),\n this.markReadOnScroll = const Value.absent(),\n+ this.legacyUpgradeState = const Value.absent(),\n this.rowid = const Value.absent(),\n });\n GlobalSettingsCompanion.insert({\n@@ -326,6 +385,7 @@ class GlobalSettingsCompanion extends UpdateCompanion {\n this.browserPreference = const Value.absent(),\n this.visitFirstUnread = const Value.absent(),\n this.markReadOnScroll = const Value.absent(),\n+ this.legacyUpgradeState = const Value.absent(),\n this.rowid = const Value.absent(),\n });\n static Insertable custom({\n@@ -333,6 +393,7 @@ class GlobalSettingsCompanion extends UpdateCompanion {\n Expression? browserPreference,\n Expression? visitFirstUnread,\n Expression? markReadOnScroll,\n+ Expression? legacyUpgradeState,\n Expression? rowid,\n }) {\n return RawValuesInsertable({\n@@ -340,6 +401,8 @@ class GlobalSettingsCompanion extends UpdateCompanion {\n if (browserPreference != null) 'browser_preference': browserPreference,\n if (visitFirstUnread != null) 'visit_first_unread': visitFirstUnread,\n if (markReadOnScroll != null) 'mark_read_on_scroll': markReadOnScroll,\n+ if (legacyUpgradeState != null)\n+ 'legacy_upgrade_state': legacyUpgradeState,\n if (rowid != null) 'rowid': rowid,\n });\n }\n@@ -349,6 +412,7 @@ class GlobalSettingsCompanion extends UpdateCompanion {\n Value? browserPreference,\n Value? visitFirstUnread,\n Value? markReadOnScroll,\n+ Value? legacyUpgradeState,\n Value? rowid,\n }) {\n return GlobalSettingsCompanion(\n@@ -356,6 +420,7 @@ class GlobalSettingsCompanion extends UpdateCompanion {\n browserPreference: browserPreference ?? this.browserPreference,\n visitFirstUnread: visitFirstUnread ?? this.visitFirstUnread,\n markReadOnScroll: markReadOnScroll ?? this.markReadOnScroll,\n+ legacyUpgradeState: legacyUpgradeState ?? this.legacyUpgradeState,\n rowid: rowid ?? this.rowid,\n );\n }\n@@ -389,6 +454,13 @@ class GlobalSettingsCompanion extends UpdateCompanion {\n ),\n );\n }\n+ if (legacyUpgradeState.present) {\n+ map['legacy_upgrade_state'] = Variable(\n+ $GlobalSettingsTable.$converterlegacyUpgradeStaten.toSql(\n+ legacyUpgradeState.value,\n+ ),\n+ );\n+ }\n if (rowid.present) {\n map['rowid'] = Variable(rowid.value);\n }\n@@ -402,6 +474,7 @@ class GlobalSettingsCompanion extends UpdateCompanion {\n ..write('browserPreference: $browserPreference, ')\n ..write('visitFirstUnread: $visitFirstUnread, ')\n ..write('markReadOnScroll: $markReadOnScroll, ')\n+ ..write('legacyUpgradeState: $legacyUpgradeState, ')\n ..write('rowid: $rowid')\n ..write(')'))\n .toString();\n@@ -1248,6 +1321,7 @@ typedef $$GlobalSettingsTableCreateCompanionBuilder =\n Value browserPreference,\n Value visitFirstUnread,\n Value markReadOnScroll,\n+ Value legacyUpgradeState,\n Value rowid,\n });\n typedef $$GlobalSettingsTableUpdateCompanionBuilder =\n@@ -1256,6 +1330,7 @@ typedef $$GlobalSettingsTableUpdateCompanionBuilder =\n Value browserPreference,\n Value visitFirstUnread,\n Value markReadOnScroll,\n+ Value legacyUpgradeState,\n Value rowid,\n });\n \n@@ -1299,6 +1374,16 @@ class $$GlobalSettingsTableFilterComposer\n column: $table.markReadOnScroll,\n builder: (column) => ColumnWithTypeConverterFilters(column),\n );\n+\n+ ColumnWithTypeConverterFilters<\n+ LegacyUpgradeState?,\n+ LegacyUpgradeState,\n+ String\n+ >\n+ get legacyUpgradeState => $composableBuilder(\n+ column: $table.legacyUpgradeState,\n+ builder: (column) => ColumnWithTypeConverterFilters(column),\n+ );\n }\n \n class $$GlobalSettingsTableOrderingComposer\n@@ -1329,6 +1414,11 @@ class $$GlobalSettingsTableOrderingComposer\n column: $table.markReadOnScroll,\n builder: (column) => ColumnOrderings(column),\n );\n+\n+ ColumnOrderings get legacyUpgradeState => $composableBuilder(\n+ column: $table.legacyUpgradeState,\n+ builder: (column) => ColumnOrderings(column),\n+ );\n }\n \n class $$GlobalSettingsTableAnnotationComposer\n@@ -1363,6 +1453,12 @@ class $$GlobalSettingsTableAnnotationComposer\n column: $table.markReadOnScroll,\n builder: (column) => column,\n );\n+\n+ GeneratedColumnWithTypeConverter\n+ get legacyUpgradeState => $composableBuilder(\n+ column: $table.legacyUpgradeState,\n+ builder: (column) => column,\n+ );\n }\n \n class $$GlobalSettingsTableTableManager\n@@ -1409,12 +1505,15 @@ class $$GlobalSettingsTableTableManager\n const Value.absent(),\n Value markReadOnScroll =\n const Value.absent(),\n+ Value legacyUpgradeState =\n+ const Value.absent(),\n Value rowid = const Value.absent(),\n }) => GlobalSettingsCompanion(\n themeSetting: themeSetting,\n browserPreference: browserPreference,\n visitFirstUnread: visitFirstUnread,\n markReadOnScroll: markReadOnScroll,\n+ legacyUpgradeState: legacyUpgradeState,\n rowid: rowid,\n ),\n createCompanionCallback:\n@@ -1426,12 +1525,15 @@ class $$GlobalSettingsTableTableManager\n const Value.absent(),\n Value markReadOnScroll =\n const Value.absent(),\n+ Value legacyUpgradeState =\n+ const Value.absent(),\n Value rowid = const Value.absent(),\n }) => GlobalSettingsCompanion.insert(\n themeSetting: themeSetting,\n browserPreference: browserPreference,\n visitFirstUnread: visitFirstUnread,\n markReadOnScroll: markReadOnScroll,\n+ legacyUpgradeState: legacyUpgradeState,\n rowid: rowid,\n ),\n withReferenceMapper: (p0) => p0\ndiff --git a/lib/model/legacy_app_data.dart b/lib/model/legacy_app_data.dart\nindex f3b94395ff..215248c776 100644\n--- a/lib/model/legacy_app_data.dart\n+++ b/lib/model/legacy_app_data.dart\n@@ -26,10 +26,12 @@ Future migrateLegacyAppData(AppDatabase db) async {\n final legacyData = await readLegacyAppData();\n if (legacyData == null) {\n assert(debugLog(\"... no legacy app data found.\"));\n+ await _setLegacyUpgradeState(db, LegacyUpgradeState.noLegacy);\n return;\n }\n \n assert(debugLog(\"Found settings: ${legacyData.settings?.toJson()}\"));\n+ await _setLegacyUpgradeState(db, LegacyUpgradeState.found);\n final settings = legacyData.settings;\n if (settings != null) {\n await db.update(db.globalSettings).write(GlobalSettingsCompanion(\n@@ -106,6 +108,12 @@ Future migrateLegacyAppData(AppDatabase db) async {\n }\n \n assert(debugLog(\"Done migrating legacy app data.\"));\n+ await _setLegacyUpgradeState(db, LegacyUpgradeState.migrated);\n+}\n+\n+Future _setLegacyUpgradeState(AppDatabase db, LegacyUpgradeState value) async {\n+ await db.update(db.globalSettings).write(GlobalSettingsCompanion(\n+ legacyUpgradeState: drift.Value(value)));\n }\n \n Future readLegacyAppData() async {\ndiff --git a/lib/model/schema_versions.g.dart b/lib/model/schema_versions.g.dart\nindex 5712a94fbb..782b9409e2 100644\n--- a/lib/model/schema_versions.g.dart\n+++ b/lib/model/schema_versions.g.dart\n@@ -517,6 +517,84 @@ i1.GeneratedColumn _column_14(String aliasedName) =>\n true,\n type: i1.DriftSqlType.string,\n );\n+\n+final class Schema9 extends i0.VersionedSchema {\n+ Schema9({required super.database}) : super(version: 9);\n+ @override\n+ late final List entities = [\n+ globalSettings,\n+ boolGlobalSettings,\n+ accounts,\n+ ];\n+ late final Shape6 globalSettings = Shape6(\n+ source: i0.VersionedTable(\n+ entityName: 'global_settings',\n+ withoutRowId: false,\n+ isStrict: false,\n+ tableConstraints: [],\n+ columns: [_column_9, _column_10, _column_13, _column_14, _column_15],\n+ attachedDatabase: database,\n+ ),\n+ alias: null,\n+ );\n+ late final Shape3 boolGlobalSettings = Shape3(\n+ source: i0.VersionedTable(\n+ entityName: 'bool_global_settings',\n+ withoutRowId: false,\n+ isStrict: false,\n+ tableConstraints: ['PRIMARY KEY(name)'],\n+ columns: [_column_11, _column_12],\n+ attachedDatabase: database,\n+ ),\n+ alias: null,\n+ );\n+ late final Shape0 accounts = Shape0(\n+ source: i0.VersionedTable(\n+ entityName: 'accounts',\n+ withoutRowId: false,\n+ isStrict: false,\n+ tableConstraints: [\n+ 'UNIQUE(realm_url, user_id)',\n+ 'UNIQUE(realm_url, email)',\n+ ],\n+ columns: [\n+ _column_0,\n+ _column_1,\n+ _column_2,\n+ _column_3,\n+ _column_4,\n+ _column_5,\n+ _column_6,\n+ _column_7,\n+ _column_8,\n+ ],\n+ attachedDatabase: database,\n+ ),\n+ alias: null,\n+ );\n+}\n+\n+class Shape6 extends i0.VersionedTable {\n+ Shape6({required super.source, required super.alias}) : super.aliased();\n+ i1.GeneratedColumn get themeSetting =>\n+ columnsByName['theme_setting']! as i1.GeneratedColumn;\n+ i1.GeneratedColumn get browserPreference =>\n+ columnsByName['browser_preference']! as i1.GeneratedColumn;\n+ i1.GeneratedColumn get visitFirstUnread =>\n+ columnsByName['visit_first_unread']! as i1.GeneratedColumn;\n+ i1.GeneratedColumn get markReadOnScroll =>\n+ columnsByName['mark_read_on_scroll']! as i1.GeneratedColumn;\n+ i1.GeneratedColumn get legacyUpgradeState =>\n+ columnsByName['legacy_upgrade_state']! as i1.GeneratedColumn;\n+}\n+\n+i1.GeneratedColumn _column_15(String aliasedName) =>\n+ i1.GeneratedColumn(\n+ 'legacy_upgrade_state',\n+ aliasedName,\n+ true,\n+ type: i1.DriftSqlType.string,\n+ );\n i0.MigrationStepWithVersion migrationSteps({\n required Future Function(i1.Migrator m, Schema2 schema) from1To2,\n required Future Function(i1.Migrator m, Schema3 schema) from2To3,\n@@ -525,6 +603,7 @@ i0.MigrationStepWithVersion migrationSteps({\n required Future Function(i1.Migrator m, Schema6 schema) from5To6,\n required Future Function(i1.Migrator m, Schema7 schema) from6To7,\n required Future Function(i1.Migrator m, Schema8 schema) from7To8,\n+ required Future Function(i1.Migrator m, Schema9 schema) from8To9,\n }) {\n return (currentVersion, database) async {\n switch (currentVersion) {\n@@ -563,6 +642,11 @@ i0.MigrationStepWithVersion migrationSteps({\n final migrator = i1.Migrator(database, schema);\n await from7To8(migrator, schema);\n return 8;\n+ case 8:\n+ final schema = Schema9(database: database);\n+ final migrator = i1.Migrator(database, schema);\n+ await from8To9(migrator, schema);\n+ return 9;\n default:\n throw ArgumentError.value('Unknown migration from $currentVersion');\n }\n@@ -577,6 +661,7 @@ i1.OnUpgrade stepByStep({\n required Future Function(i1.Migrator m, Schema6 schema) from5To6,\n required Future Function(i1.Migrator m, Schema7 schema) from6To7,\n required Future Function(i1.Migrator m, Schema8 schema) from7To8,\n+ required Future Function(i1.Migrator m, Schema9 schema) from8To9,\n }) => i0.VersionedSchema.stepByStepHelper(\n step: migrationSteps(\n from1To2: from1To2,\n@@ -586,5 +671,6 @@ i1.OnUpgrade stepByStep({\n from5To6: from5To6,\n from6To7: from6To7,\n from7To8: from7To8,\n+ from8To9: from8To9,\n ),\n );\ndiff --git a/lib/model/settings.dart b/lib/model/settings.dart\nindex 298980a395..81777d988d 100644\n--- a/lib/model/settings.dart\n+++ b/lib/model/settings.dart\n@@ -87,6 +87,24 @@ enum MarkReadOnScrollSetting {\n static MarkReadOnScrollSetting _default = conversations;\n }\n \n+/// The outcome, or in-progress status, of migrating data from the legacy app.\n+enum LegacyUpgradeState {\n+ /// It's not yet known whether there was data from the legacy app.\n+ unknown,\n+\n+ /// No legacy data was found.\n+ noLegacy,\n+\n+ /// Legacy data was found, but not yet migrated into this app's database.\n+ found,\n+\n+ /// Legacy data was found and migrated.\n+ migrated,\n+ ;\n+\n+ static LegacyUpgradeState _default = unknown;\n+}\n+\n /// A general category of account-independent setting the user might set.\n ///\n /// Different kinds of settings call for different treatment in the UI,\n@@ -101,6 +119,9 @@ enum GlobalSettingType {\n /// we give it a placeholder value which isn't a real setting.\n placeholder,\n \n+ /// Describes a pseudo-setting not directly exposed in the UI.\n+ internal,\n+\n /// Describes a setting which enables an in-progress feature of the app.\n ///\n /// Sometimes when building a complex feature it's useful to merge PRs that\n@@ -152,6 +173,10 @@ enum BoolGlobalSetting {\n /// (Having one stable value in this enum is also handy for tests.)\n placeholderIgnore(GlobalSettingType.placeholder, false),\n \n+ /// A pseudo-setting recording whether the user has been shown the\n+ /// welcome dialog for upgrading from the legacy app.\n+ upgradeWelcomeDialogShown(GlobalSettingType.internal, false),\n+\n /// An experimental flag to toggle rendering KaTeX content in messages.\n renderKatex(GlobalSettingType.experimentalFeatureFlag, false),\n \n@@ -324,6 +349,11 @@ class GlobalSettingsStore extends ChangeNotifier {\n };\n }\n \n+ /// The outcome, or in-progress status, of migrating data from the legacy app.\n+ LegacyUpgradeState get legacyUpgradeState {\n+ return _data.legacyUpgradeState ?? LegacyUpgradeState._default;\n+ }\n+\n /// The user's choice of the given bool-valued setting, or our default for it.\n ///\n /// See also [setBool].\ndiff --git a/lib/widgets/app.dart b/lib/widgets/app.dart\nindex b1aa763ac8..d3ed5c463d 100644\n--- a/lib/widgets/app.dart\n+++ b/lib/widgets/app.dart\n@@ -160,6 +160,7 @@ class _ZulipAppState extends State with WidgetsBindingObserver {\n void initState() {\n super.initState();\n WidgetsBinding.instance.addObserver(this);\n+ UpgradeWelcomeDialog.maybeShow();\n }\n \n @override\ndiff --git a/lib/widgets/dialog.dart b/lib/widgets/dialog.dart\nindex 4d269cddba..e635071cc9 100644\n--- a/lib/widgets/dialog.dart\n+++ b/lib/widgets/dialog.dart\n@@ -1,7 +1,11 @@\n import 'package:flutter/material.dart';\n \n import '../generated/l10n/zulip_localizations.dart';\n+import '../model/settings.dart';\n import 'actions.dart';\n+import 'app.dart';\n+import 'content.dart';\n+import 'store.dart';\n \n Widget _dialogActionText(String text) {\n return Text(\n@@ -112,3 +116,69 @@ DialogStatus showSuggestedActionDialog({\n ]));\n return DialogStatus(future);\n }\n+\n+/// A brief dialog box welcoming the user to this new Zulip app,\n+/// shown upon upgrading from the legacy app.\n+class UpgradeWelcomeDialog extends StatelessWidget {\n+ const UpgradeWelcomeDialog._();\n+\n+ static void maybeShow() async {\n+ final navigator = await ZulipApp.navigator;\n+ final context = navigator.context;\n+ assert(context.mounted);\n+ if (!context.mounted) return; // TODO(linter): this is impossible as there's no actual async gap, but the use_build_context_synchronously lint doesn't see that\n+\n+ final globalSettings = GlobalStoreWidget.settingsOf(context);\n+ switch (globalSettings.legacyUpgradeState) {\n+ case LegacyUpgradeState.noLegacy:\n+ // This install didn't replace the legacy app.\n+ return;\n+\n+ case LegacyUpgradeState.unknown:\n+ // Not clear if this replaced the legacy app;\n+ // skip the dialog that would assume it had.\n+ // TODO(log)\n+ return;\n+\n+ case LegacyUpgradeState.found:\n+ case LegacyUpgradeState.migrated:\n+ // This install replaced the legacy app.\n+ // Show the dialog, if we haven't already.\n+ if (globalSettings.getBool(BoolGlobalSetting.upgradeWelcomeDialogShown)) {\n+ return;\n+ }\n+ }\n+\n+ final future = showDialog(\n+ context: context,\n+ builder: (context) => UpgradeWelcomeDialog._());\n+\n+ await future; // Wait for the dialog to be dismissed.\n+\n+ await globalSettings.setBool(BoolGlobalSetting.upgradeWelcomeDialogShown, true);\n+ }\n+\n+ static const String _announcementUrl =\n+ 'https://blog.zulip.com/flutter-mobile-app-launch';\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n+ return AlertDialog(\n+ title: Text(zulipLocalizations.upgradeWelcomeDialogTitle),\n+ content: SingleChildScrollView(\n+ child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [\n+ Text(zulipLocalizations.upgradeWelcomeDialogMessage),\n+ GestureDetector(\n+ onTap: () => PlatformActions.launchUrl(context,\n+ Uri.parse(_announcementUrl)),\n+ child: Text(\n+ style: TextStyle(color: ContentTheme.of(context).colorLink),\n+ zulipLocalizations.upgradeWelcomeDialogLinkText)),\n+ ])),\n+ actions: [\n+ TextButton(onPressed: () => Navigator.pop(context),\n+ child: Text(zulipLocalizations.upgradeWelcomeDialogDismiss)),\n+ ]);\n+ }\n+}\n", "test_patch": "diff --git a/test/model/database_test.dart b/test/model/database_test.dart\nindex e6e2b729be..e89bd569db 100644\n--- a/test/model/database_test.dart\n+++ b/test/model/database_test.dart\n@@ -326,6 +326,8 @@ void main() {\n check(globalSettings.browserPreference).isNull();\n await after.close();\n });\n+\n+ // TODO(#1593) test upgrade to v9: legacyUpgradeState set to noLegacy\n });\n }\n \ndiff --git a/test/model/schemas/drift_schema_v9.json b/test/model/schemas/drift_schema_v9.json\nnew file mode 100644\nindex 0000000000..e425bc89c8\n--- /dev/null\n+++ b/test/model/schemas/drift_schema_v9.json\n@@ -0,0 +1,1 @@\n+{\"_meta\":{\"description\":\"This file contains a serialized version of schema entities for drift.\",\"version\":\"1.2.0\"},\"options\":{\"store_date_time_values_as_text\":false},\"entities\":[{\"id\":0,\"references\":[],\"type\":\"table\",\"data\":{\"name\":\"global_settings\",\"was_declared_in_moor\":false,\"columns\":[{\"name\":\"theme_setting\",\"getter_name\":\"themeSetting\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const EnumNameConverter(ThemeSetting.values)\",\"dart_type_name\":\"ThemeSetting\"}},{\"name\":\"browser_preference\",\"getter_name\":\"browserPreference\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const EnumNameConverter(BrowserPreference.values)\",\"dart_type_name\":\"BrowserPreference\"}},{\"name\":\"visit_first_unread\",\"getter_name\":\"visitFirstUnread\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const EnumNameConverter(VisitFirstUnreadSetting.values)\",\"dart_type_name\":\"VisitFirstUnreadSetting\"}},{\"name\":\"mark_read_on_scroll\",\"getter_name\":\"markReadOnScroll\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const EnumNameConverter(MarkReadOnScrollSetting.values)\",\"dart_type_name\":\"MarkReadOnScrollSetting\"}},{\"name\":\"legacy_upgrade_state\",\"getter_name\":\"legacyUpgradeState\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const EnumNameConverter(LegacyUpgradeState.values)\",\"dart_type_name\":\"LegacyUpgradeState\"}}],\"is_virtual\":false,\"without_rowid\":false,\"constraints\":[]}},{\"id\":1,\"references\":[],\"type\":\"table\",\"data\":{\"name\":\"bool_global_settings\",\"was_declared_in_moor\":false,\"columns\":[{\"name\":\"name\",\"getter_name\":\"name\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"value\",\"getter_name\":\"value\",\"moor_type\":\"bool\",\"nullable\":false,\"customConstraints\":null,\"defaultConstraints\":\"CHECK (\\\"value\\\" IN (0, 1))\",\"dialectAwareDefaultConstraints\":{\"sqlite\":\"CHECK (\\\"value\\\" IN (0, 1))\"},\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]}],\"is_virtual\":false,\"without_rowid\":false,\"constraints\":[],\"explicit_pk\":[\"name\"]}},{\"id\":2,\"references\":[],\"type\":\"table\",\"data\":{\"name\":\"accounts\",\"was_declared_in_moor\":false,\"columns\":[{\"name\":\"id\",\"getter_name\":\"id\",\"moor_type\":\"int\",\"nullable\":false,\"customConstraints\":null,\"defaultConstraints\":\"PRIMARY KEY AUTOINCREMENT\",\"dialectAwareDefaultConstraints\":{\"sqlite\":\"PRIMARY KEY AUTOINCREMENT\"},\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[\"auto-increment\"]},{\"name\":\"realm_url\",\"getter_name\":\"realmUrl\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const UriConverter()\",\"dart_type_name\":\"Uri\"}},{\"name\":\"user_id\",\"getter_name\":\"userId\",\"moor_type\":\"int\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"email\",\"getter_name\":\"email\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"api_key\",\"getter_name\":\"apiKey\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"zulip_version\",\"getter_name\":\"zulipVersion\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"zulip_merge_base\",\"getter_name\":\"zulipMergeBase\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"zulip_feature_level\",\"getter_name\":\"zulipFeatureLevel\",\"moor_type\":\"int\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"acked_push_token\",\"getter_name\":\"ackedPushToken\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]}],\"is_virtual\":false,\"without_rowid\":false,\"constraints\":[],\"unique_keys\":[[\"realm_url\",\"user_id\"],[\"realm_url\",\"email\"]]}}]}\n\\ No newline at end of file\ndiff --git a/test/model/schemas/schema.dart b/test/model/schemas/schema.dart\nindex 746206e453..413b4408c4 100644\n--- a/test/model/schemas/schema.dart\n+++ b/test/model/schemas/schema.dart\n@@ -11,6 +11,7 @@ import 'schema_v5.dart' as v5;\n import 'schema_v6.dart' as v6;\n import 'schema_v7.dart' as v7;\n import 'schema_v8.dart' as v8;\n+import 'schema_v9.dart' as v9;\n \n class GeneratedHelper implements SchemaInstantiationHelper {\n @override\n@@ -32,10 +33,12 @@ class GeneratedHelper implements SchemaInstantiationHelper {\n return v7.DatabaseAtV7(db);\n case 8:\n return v8.DatabaseAtV8(db);\n+ case 9:\n+ return v9.DatabaseAtV9(db);\n default:\n throw MissingSchemaException(version, versions);\n }\n }\n \n- static const versions = const [1, 2, 3, 4, 5, 6, 7, 8];\n+ static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9];\n }\ndiff --git a/test/model/schemas/schema_v9.dart b/test/model/schemas/schema_v9.dart\nnew file mode 100644\nindex 0000000000..d036e3a26f\n--- /dev/null\n+++ b/test/model/schemas/schema_v9.dart\n@@ -0,0 +1,1014 @@\n+// dart format width=80\n+// GENERATED CODE, DO NOT EDIT BY HAND.\n+// ignore_for_file: type=lint\n+import 'package:drift/drift.dart';\n+\n+class GlobalSettings extends Table\n+ with TableInfo {\n+ @override\n+ final GeneratedDatabase attachedDatabase;\n+ final String? _alias;\n+ GlobalSettings(this.attachedDatabase, [this._alias]);\n+ late final GeneratedColumn themeSetting = GeneratedColumn(\n+ 'theme_setting',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ late final GeneratedColumn browserPreference =\n+ GeneratedColumn(\n+ 'browser_preference',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ late final GeneratedColumn visitFirstUnread = GeneratedColumn(\n+ 'visit_first_unread',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ late final GeneratedColumn markReadOnScroll = GeneratedColumn(\n+ 'mark_read_on_scroll',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ late final GeneratedColumn legacyUpgradeState =\n+ GeneratedColumn(\n+ 'legacy_upgrade_state',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ @override\n+ List get $columns => [\n+ themeSetting,\n+ browserPreference,\n+ visitFirstUnread,\n+ markReadOnScroll,\n+ legacyUpgradeState,\n+ ];\n+ @override\n+ String get aliasedName => _alias ?? actualTableName;\n+ @override\n+ String get actualTableName => $name;\n+ static const String $name = 'global_settings';\n+ @override\n+ Set get $primaryKey => const {};\n+ @override\n+ GlobalSettingsData map(Map data, {String? tablePrefix}) {\n+ final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';\n+ return GlobalSettingsData(\n+ themeSetting: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}theme_setting'],\n+ ),\n+ browserPreference: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}browser_preference'],\n+ ),\n+ visitFirstUnread: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}visit_first_unread'],\n+ ),\n+ markReadOnScroll: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}mark_read_on_scroll'],\n+ ),\n+ legacyUpgradeState: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}legacy_upgrade_state'],\n+ ),\n+ );\n+ }\n+\n+ @override\n+ GlobalSettings createAlias(String alias) {\n+ return GlobalSettings(attachedDatabase, alias);\n+ }\n+}\n+\n+class GlobalSettingsData extends DataClass\n+ implements Insertable {\n+ final String? themeSetting;\n+ final String? browserPreference;\n+ final String? visitFirstUnread;\n+ final String? markReadOnScroll;\n+ final String? legacyUpgradeState;\n+ const GlobalSettingsData({\n+ this.themeSetting,\n+ this.browserPreference,\n+ this.visitFirstUnread,\n+ this.markReadOnScroll,\n+ this.legacyUpgradeState,\n+ });\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ if (!nullToAbsent || themeSetting != null) {\n+ map['theme_setting'] = Variable(themeSetting);\n+ }\n+ if (!nullToAbsent || browserPreference != null) {\n+ map['browser_preference'] = Variable(browserPreference);\n+ }\n+ if (!nullToAbsent || visitFirstUnread != null) {\n+ map['visit_first_unread'] = Variable(visitFirstUnread);\n+ }\n+ if (!nullToAbsent || markReadOnScroll != null) {\n+ map['mark_read_on_scroll'] = Variable(markReadOnScroll);\n+ }\n+ if (!nullToAbsent || legacyUpgradeState != null) {\n+ map['legacy_upgrade_state'] = Variable(legacyUpgradeState);\n+ }\n+ return map;\n+ }\n+\n+ GlobalSettingsCompanion toCompanion(bool nullToAbsent) {\n+ return GlobalSettingsCompanion(\n+ themeSetting: themeSetting == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(themeSetting),\n+ browserPreference: browserPreference == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(browserPreference),\n+ visitFirstUnread: visitFirstUnread == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(visitFirstUnread),\n+ markReadOnScroll: markReadOnScroll == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(markReadOnScroll),\n+ legacyUpgradeState: legacyUpgradeState == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(legacyUpgradeState),\n+ );\n+ }\n+\n+ factory GlobalSettingsData.fromJson(\n+ Map json, {\n+ ValueSerializer? serializer,\n+ }) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return GlobalSettingsData(\n+ themeSetting: serializer.fromJson(json['themeSetting']),\n+ browserPreference: serializer.fromJson(\n+ json['browserPreference'],\n+ ),\n+ visitFirstUnread: serializer.fromJson(json['visitFirstUnread']),\n+ markReadOnScroll: serializer.fromJson(json['markReadOnScroll']),\n+ legacyUpgradeState: serializer.fromJson(\n+ json['legacyUpgradeState'],\n+ ),\n+ );\n+ }\n+ @override\n+ Map toJson({ValueSerializer? serializer}) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return {\n+ 'themeSetting': serializer.toJson(themeSetting),\n+ 'browserPreference': serializer.toJson(browserPreference),\n+ 'visitFirstUnread': serializer.toJson(visitFirstUnread),\n+ 'markReadOnScroll': serializer.toJson(markReadOnScroll),\n+ 'legacyUpgradeState': serializer.toJson(legacyUpgradeState),\n+ };\n+ }\n+\n+ GlobalSettingsData copyWith({\n+ Value themeSetting = const Value.absent(),\n+ Value browserPreference = const Value.absent(),\n+ Value visitFirstUnread = const Value.absent(),\n+ Value markReadOnScroll = const Value.absent(),\n+ Value legacyUpgradeState = const Value.absent(),\n+ }) => GlobalSettingsData(\n+ themeSetting: themeSetting.present ? themeSetting.value : this.themeSetting,\n+ browserPreference: browserPreference.present\n+ ? browserPreference.value\n+ : this.browserPreference,\n+ visitFirstUnread: visitFirstUnread.present\n+ ? visitFirstUnread.value\n+ : this.visitFirstUnread,\n+ markReadOnScroll: markReadOnScroll.present\n+ ? markReadOnScroll.value\n+ : this.markReadOnScroll,\n+ legacyUpgradeState: legacyUpgradeState.present\n+ ? legacyUpgradeState.value\n+ : this.legacyUpgradeState,\n+ );\n+ GlobalSettingsData copyWithCompanion(GlobalSettingsCompanion data) {\n+ return GlobalSettingsData(\n+ themeSetting: data.themeSetting.present\n+ ? data.themeSetting.value\n+ : this.themeSetting,\n+ browserPreference: data.browserPreference.present\n+ ? data.browserPreference.value\n+ : this.browserPreference,\n+ visitFirstUnread: data.visitFirstUnread.present\n+ ? data.visitFirstUnread.value\n+ : this.visitFirstUnread,\n+ markReadOnScroll: data.markReadOnScroll.present\n+ ? data.markReadOnScroll.value\n+ : this.markReadOnScroll,\n+ legacyUpgradeState: data.legacyUpgradeState.present\n+ ? data.legacyUpgradeState.value\n+ : this.legacyUpgradeState,\n+ );\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('GlobalSettingsData(')\n+ ..write('themeSetting: $themeSetting, ')\n+ ..write('browserPreference: $browserPreference, ')\n+ ..write('visitFirstUnread: $visitFirstUnread, ')\n+ ..write('markReadOnScroll: $markReadOnScroll, ')\n+ ..write('legacyUpgradeState: $legacyUpgradeState')\n+ ..write(')'))\n+ .toString();\n+ }\n+\n+ @override\n+ int get hashCode => Object.hash(\n+ themeSetting,\n+ browserPreference,\n+ visitFirstUnread,\n+ markReadOnScroll,\n+ legacyUpgradeState,\n+ );\n+ @override\n+ bool operator ==(Object other) =>\n+ identical(this, other) ||\n+ (other is GlobalSettingsData &&\n+ other.themeSetting == this.themeSetting &&\n+ other.browserPreference == this.browserPreference &&\n+ other.visitFirstUnread == this.visitFirstUnread &&\n+ other.markReadOnScroll == this.markReadOnScroll &&\n+ other.legacyUpgradeState == this.legacyUpgradeState);\n+}\n+\n+class GlobalSettingsCompanion extends UpdateCompanion {\n+ final Value themeSetting;\n+ final Value browserPreference;\n+ final Value visitFirstUnread;\n+ final Value markReadOnScroll;\n+ final Value legacyUpgradeState;\n+ final Value rowid;\n+ const GlobalSettingsCompanion({\n+ this.themeSetting = const Value.absent(),\n+ this.browserPreference = const Value.absent(),\n+ this.visitFirstUnread = const Value.absent(),\n+ this.markReadOnScroll = const Value.absent(),\n+ this.legacyUpgradeState = const Value.absent(),\n+ this.rowid = const Value.absent(),\n+ });\n+ GlobalSettingsCompanion.insert({\n+ this.themeSetting = const Value.absent(),\n+ this.browserPreference = const Value.absent(),\n+ this.visitFirstUnread = const Value.absent(),\n+ this.markReadOnScroll = const Value.absent(),\n+ this.legacyUpgradeState = const Value.absent(),\n+ this.rowid = const Value.absent(),\n+ });\n+ static Insertable custom({\n+ Expression? themeSetting,\n+ Expression? browserPreference,\n+ Expression? visitFirstUnread,\n+ Expression? markReadOnScroll,\n+ Expression? legacyUpgradeState,\n+ Expression? rowid,\n+ }) {\n+ return RawValuesInsertable({\n+ if (themeSetting != null) 'theme_setting': themeSetting,\n+ if (browserPreference != null) 'browser_preference': browserPreference,\n+ if (visitFirstUnread != null) 'visit_first_unread': visitFirstUnread,\n+ if (markReadOnScroll != null) 'mark_read_on_scroll': markReadOnScroll,\n+ if (legacyUpgradeState != null)\n+ 'legacy_upgrade_state': legacyUpgradeState,\n+ if (rowid != null) 'rowid': rowid,\n+ });\n+ }\n+\n+ GlobalSettingsCompanion copyWith({\n+ Value? themeSetting,\n+ Value? browserPreference,\n+ Value? visitFirstUnread,\n+ Value? markReadOnScroll,\n+ Value? legacyUpgradeState,\n+ Value? rowid,\n+ }) {\n+ return GlobalSettingsCompanion(\n+ themeSetting: themeSetting ?? this.themeSetting,\n+ browserPreference: browserPreference ?? this.browserPreference,\n+ visitFirstUnread: visitFirstUnread ?? this.visitFirstUnread,\n+ markReadOnScroll: markReadOnScroll ?? this.markReadOnScroll,\n+ legacyUpgradeState: legacyUpgradeState ?? this.legacyUpgradeState,\n+ rowid: rowid ?? this.rowid,\n+ );\n+ }\n+\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ if (themeSetting.present) {\n+ map['theme_setting'] = Variable(themeSetting.value);\n+ }\n+ if (browserPreference.present) {\n+ map['browser_preference'] = Variable(browserPreference.value);\n+ }\n+ if (visitFirstUnread.present) {\n+ map['visit_first_unread'] = Variable(visitFirstUnread.value);\n+ }\n+ if (markReadOnScroll.present) {\n+ map['mark_read_on_scroll'] = Variable(markReadOnScroll.value);\n+ }\n+ if (legacyUpgradeState.present) {\n+ map['legacy_upgrade_state'] = Variable(legacyUpgradeState.value);\n+ }\n+ if (rowid.present) {\n+ map['rowid'] = Variable(rowid.value);\n+ }\n+ return map;\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('GlobalSettingsCompanion(')\n+ ..write('themeSetting: $themeSetting, ')\n+ ..write('browserPreference: $browserPreference, ')\n+ ..write('visitFirstUnread: $visitFirstUnread, ')\n+ ..write('markReadOnScroll: $markReadOnScroll, ')\n+ ..write('legacyUpgradeState: $legacyUpgradeState, ')\n+ ..write('rowid: $rowid')\n+ ..write(')'))\n+ .toString();\n+ }\n+}\n+\n+class BoolGlobalSettings extends Table\n+ with TableInfo {\n+ @override\n+ final GeneratedDatabase attachedDatabase;\n+ final String? _alias;\n+ BoolGlobalSettings(this.attachedDatabase, [this._alias]);\n+ late final GeneratedColumn name = GeneratedColumn(\n+ 'name',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn value = GeneratedColumn(\n+ 'value',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.bool,\n+ requiredDuringInsert: true,\n+ defaultConstraints: GeneratedColumn.constraintIsAlways(\n+ 'CHECK (\"value\" IN (0, 1))',\n+ ),\n+ );\n+ @override\n+ List get $columns => [name, value];\n+ @override\n+ String get aliasedName => _alias ?? actualTableName;\n+ @override\n+ String get actualTableName => $name;\n+ static const String $name = 'bool_global_settings';\n+ @override\n+ Set get $primaryKey => {name};\n+ @override\n+ BoolGlobalSettingsData map(Map data, {String? tablePrefix}) {\n+ final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';\n+ return BoolGlobalSettingsData(\n+ name: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}name'],\n+ )!,\n+ value: attachedDatabase.typeMapping.read(\n+ DriftSqlType.bool,\n+ data['${effectivePrefix}value'],\n+ )!,\n+ );\n+ }\n+\n+ @override\n+ BoolGlobalSettings createAlias(String alias) {\n+ return BoolGlobalSettings(attachedDatabase, alias);\n+ }\n+}\n+\n+class BoolGlobalSettingsData extends DataClass\n+ implements Insertable {\n+ final String name;\n+ final bool value;\n+ const BoolGlobalSettingsData({required this.name, required this.value});\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ map['name'] = Variable(name);\n+ map['value'] = Variable(value);\n+ return map;\n+ }\n+\n+ BoolGlobalSettingsCompanion toCompanion(bool nullToAbsent) {\n+ return BoolGlobalSettingsCompanion(name: Value(name), value: Value(value));\n+ }\n+\n+ factory BoolGlobalSettingsData.fromJson(\n+ Map json, {\n+ ValueSerializer? serializer,\n+ }) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return BoolGlobalSettingsData(\n+ name: serializer.fromJson(json['name']),\n+ value: serializer.fromJson(json['value']),\n+ );\n+ }\n+ @override\n+ Map toJson({ValueSerializer? serializer}) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return {\n+ 'name': serializer.toJson(name),\n+ 'value': serializer.toJson(value),\n+ };\n+ }\n+\n+ BoolGlobalSettingsData copyWith({String? name, bool? value}) =>\n+ BoolGlobalSettingsData(\n+ name: name ?? this.name,\n+ value: value ?? this.value,\n+ );\n+ BoolGlobalSettingsData copyWithCompanion(BoolGlobalSettingsCompanion data) {\n+ return BoolGlobalSettingsData(\n+ name: data.name.present ? data.name.value : this.name,\n+ value: data.value.present ? data.value.value : this.value,\n+ );\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('BoolGlobalSettingsData(')\n+ ..write('name: $name, ')\n+ ..write('value: $value')\n+ ..write(')'))\n+ .toString();\n+ }\n+\n+ @override\n+ int get hashCode => Object.hash(name, value);\n+ @override\n+ bool operator ==(Object other) =>\n+ identical(this, other) ||\n+ (other is BoolGlobalSettingsData &&\n+ other.name == this.name &&\n+ other.value == this.value);\n+}\n+\n+class BoolGlobalSettingsCompanion\n+ extends UpdateCompanion {\n+ final Value name;\n+ final Value value;\n+ final Value rowid;\n+ const BoolGlobalSettingsCompanion({\n+ this.name = const Value.absent(),\n+ this.value = const Value.absent(),\n+ this.rowid = const Value.absent(),\n+ });\n+ BoolGlobalSettingsCompanion.insert({\n+ required String name,\n+ required bool value,\n+ this.rowid = const Value.absent(),\n+ }) : name = Value(name),\n+ value = Value(value);\n+ static Insertable custom({\n+ Expression? name,\n+ Expression? value,\n+ Expression? rowid,\n+ }) {\n+ return RawValuesInsertable({\n+ if (name != null) 'name': name,\n+ if (value != null) 'value': value,\n+ if (rowid != null) 'rowid': rowid,\n+ });\n+ }\n+\n+ BoolGlobalSettingsCompanion copyWith({\n+ Value? name,\n+ Value? value,\n+ Value? rowid,\n+ }) {\n+ return BoolGlobalSettingsCompanion(\n+ name: name ?? this.name,\n+ value: value ?? this.value,\n+ rowid: rowid ?? this.rowid,\n+ );\n+ }\n+\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ if (name.present) {\n+ map['name'] = Variable(name.value);\n+ }\n+ if (value.present) {\n+ map['value'] = Variable(value.value);\n+ }\n+ if (rowid.present) {\n+ map['rowid'] = Variable(rowid.value);\n+ }\n+ return map;\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('BoolGlobalSettingsCompanion(')\n+ ..write('name: $name, ')\n+ ..write('value: $value, ')\n+ ..write('rowid: $rowid')\n+ ..write(')'))\n+ .toString();\n+ }\n+}\n+\n+class Accounts extends Table with TableInfo {\n+ @override\n+ final GeneratedDatabase attachedDatabase;\n+ final String? _alias;\n+ Accounts(this.attachedDatabase, [this._alias]);\n+ late final GeneratedColumn id = GeneratedColumn(\n+ 'id',\n+ aliasedName,\n+ false,\n+ hasAutoIncrement: true,\n+ type: DriftSqlType.int,\n+ requiredDuringInsert: false,\n+ defaultConstraints: GeneratedColumn.constraintIsAlways(\n+ 'PRIMARY KEY AUTOINCREMENT',\n+ ),\n+ );\n+ late final GeneratedColumn realmUrl = GeneratedColumn(\n+ 'realm_url',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn userId = GeneratedColumn(\n+ 'user_id',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.int,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn email = GeneratedColumn(\n+ 'email',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn apiKey = GeneratedColumn(\n+ 'api_key',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn zulipVersion = GeneratedColumn(\n+ 'zulip_version',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn zulipMergeBase = GeneratedColumn(\n+ 'zulip_merge_base',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ late final GeneratedColumn zulipFeatureLevel = GeneratedColumn(\n+ 'zulip_feature_level',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.int,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn ackedPushToken = GeneratedColumn(\n+ 'acked_push_token',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ @override\n+ List get $columns => [\n+ id,\n+ realmUrl,\n+ userId,\n+ email,\n+ apiKey,\n+ zulipVersion,\n+ zulipMergeBase,\n+ zulipFeatureLevel,\n+ ackedPushToken,\n+ ];\n+ @override\n+ String get aliasedName => _alias ?? actualTableName;\n+ @override\n+ String get actualTableName => $name;\n+ static const String $name = 'accounts';\n+ @override\n+ Set get $primaryKey => {id};\n+ @override\n+ List> get uniqueKeys => [\n+ {realmUrl, userId},\n+ {realmUrl, email},\n+ ];\n+ @override\n+ AccountsData map(Map data, {String? tablePrefix}) {\n+ final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';\n+ return AccountsData(\n+ id: attachedDatabase.typeMapping.read(\n+ DriftSqlType.int,\n+ data['${effectivePrefix}id'],\n+ )!,\n+ realmUrl: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}realm_url'],\n+ )!,\n+ userId: attachedDatabase.typeMapping.read(\n+ DriftSqlType.int,\n+ data['${effectivePrefix}user_id'],\n+ )!,\n+ email: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}email'],\n+ )!,\n+ apiKey: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}api_key'],\n+ )!,\n+ zulipVersion: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}zulip_version'],\n+ )!,\n+ zulipMergeBase: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}zulip_merge_base'],\n+ ),\n+ zulipFeatureLevel: attachedDatabase.typeMapping.read(\n+ DriftSqlType.int,\n+ data['${effectivePrefix}zulip_feature_level'],\n+ )!,\n+ ackedPushToken: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}acked_push_token'],\n+ ),\n+ );\n+ }\n+\n+ @override\n+ Accounts createAlias(String alias) {\n+ return Accounts(attachedDatabase, alias);\n+ }\n+}\n+\n+class AccountsData extends DataClass implements Insertable {\n+ final int id;\n+ final String realmUrl;\n+ final int userId;\n+ final String email;\n+ final String apiKey;\n+ final String zulipVersion;\n+ final String? zulipMergeBase;\n+ final int zulipFeatureLevel;\n+ final String? ackedPushToken;\n+ const AccountsData({\n+ required this.id,\n+ required this.realmUrl,\n+ required this.userId,\n+ required this.email,\n+ required this.apiKey,\n+ required this.zulipVersion,\n+ this.zulipMergeBase,\n+ required this.zulipFeatureLevel,\n+ this.ackedPushToken,\n+ });\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ map['id'] = Variable(id);\n+ map['realm_url'] = Variable(realmUrl);\n+ map['user_id'] = Variable(userId);\n+ map['email'] = Variable(email);\n+ map['api_key'] = Variable(apiKey);\n+ map['zulip_version'] = Variable(zulipVersion);\n+ if (!nullToAbsent || zulipMergeBase != null) {\n+ map['zulip_merge_base'] = Variable(zulipMergeBase);\n+ }\n+ map['zulip_feature_level'] = Variable(zulipFeatureLevel);\n+ if (!nullToAbsent || ackedPushToken != null) {\n+ map['acked_push_token'] = Variable(ackedPushToken);\n+ }\n+ return map;\n+ }\n+\n+ AccountsCompanion toCompanion(bool nullToAbsent) {\n+ return AccountsCompanion(\n+ id: Value(id),\n+ realmUrl: Value(realmUrl),\n+ userId: Value(userId),\n+ email: Value(email),\n+ apiKey: Value(apiKey),\n+ zulipVersion: Value(zulipVersion),\n+ zulipMergeBase: zulipMergeBase == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(zulipMergeBase),\n+ zulipFeatureLevel: Value(zulipFeatureLevel),\n+ ackedPushToken: ackedPushToken == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(ackedPushToken),\n+ );\n+ }\n+\n+ factory AccountsData.fromJson(\n+ Map json, {\n+ ValueSerializer? serializer,\n+ }) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return AccountsData(\n+ id: serializer.fromJson(json['id']),\n+ realmUrl: serializer.fromJson(json['realmUrl']),\n+ userId: serializer.fromJson(json['userId']),\n+ email: serializer.fromJson(json['email']),\n+ apiKey: serializer.fromJson(json['apiKey']),\n+ zulipVersion: serializer.fromJson(json['zulipVersion']),\n+ zulipMergeBase: serializer.fromJson(json['zulipMergeBase']),\n+ zulipFeatureLevel: serializer.fromJson(json['zulipFeatureLevel']),\n+ ackedPushToken: serializer.fromJson(json['ackedPushToken']),\n+ );\n+ }\n+ @override\n+ Map toJson({ValueSerializer? serializer}) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return {\n+ 'id': serializer.toJson(id),\n+ 'realmUrl': serializer.toJson(realmUrl),\n+ 'userId': serializer.toJson(userId),\n+ 'email': serializer.toJson(email),\n+ 'apiKey': serializer.toJson(apiKey),\n+ 'zulipVersion': serializer.toJson(zulipVersion),\n+ 'zulipMergeBase': serializer.toJson(zulipMergeBase),\n+ 'zulipFeatureLevel': serializer.toJson(zulipFeatureLevel),\n+ 'ackedPushToken': serializer.toJson(ackedPushToken),\n+ };\n+ }\n+\n+ AccountsData copyWith({\n+ int? id,\n+ String? realmUrl,\n+ int? userId,\n+ String? email,\n+ String? apiKey,\n+ String? zulipVersion,\n+ Value zulipMergeBase = const Value.absent(),\n+ int? zulipFeatureLevel,\n+ Value ackedPushToken = const Value.absent(),\n+ }) => AccountsData(\n+ id: id ?? this.id,\n+ realmUrl: realmUrl ?? this.realmUrl,\n+ userId: userId ?? this.userId,\n+ email: email ?? this.email,\n+ apiKey: apiKey ?? this.apiKey,\n+ zulipVersion: zulipVersion ?? this.zulipVersion,\n+ zulipMergeBase: zulipMergeBase.present\n+ ? zulipMergeBase.value\n+ : this.zulipMergeBase,\n+ zulipFeatureLevel: zulipFeatureLevel ?? this.zulipFeatureLevel,\n+ ackedPushToken: ackedPushToken.present\n+ ? ackedPushToken.value\n+ : this.ackedPushToken,\n+ );\n+ AccountsData copyWithCompanion(AccountsCompanion data) {\n+ return AccountsData(\n+ id: data.id.present ? data.id.value : this.id,\n+ realmUrl: data.realmUrl.present ? data.realmUrl.value : this.realmUrl,\n+ userId: data.userId.present ? data.userId.value : this.userId,\n+ email: data.email.present ? data.email.value : this.email,\n+ apiKey: data.apiKey.present ? data.apiKey.value : this.apiKey,\n+ zulipVersion: data.zulipVersion.present\n+ ? data.zulipVersion.value\n+ : this.zulipVersion,\n+ zulipMergeBase: data.zulipMergeBase.present\n+ ? data.zulipMergeBase.value\n+ : this.zulipMergeBase,\n+ zulipFeatureLevel: data.zulipFeatureLevel.present\n+ ? data.zulipFeatureLevel.value\n+ : this.zulipFeatureLevel,\n+ ackedPushToken: data.ackedPushToken.present\n+ ? data.ackedPushToken.value\n+ : this.ackedPushToken,\n+ );\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('AccountsData(')\n+ ..write('id: $id, ')\n+ ..write('realmUrl: $realmUrl, ')\n+ ..write('userId: $userId, ')\n+ ..write('email: $email, ')\n+ ..write('apiKey: $apiKey, ')\n+ ..write('zulipVersion: $zulipVersion, ')\n+ ..write('zulipMergeBase: $zulipMergeBase, ')\n+ ..write('zulipFeatureLevel: $zulipFeatureLevel, ')\n+ ..write('ackedPushToken: $ackedPushToken')\n+ ..write(')'))\n+ .toString();\n+ }\n+\n+ @override\n+ int get hashCode => Object.hash(\n+ id,\n+ realmUrl,\n+ userId,\n+ email,\n+ apiKey,\n+ zulipVersion,\n+ zulipMergeBase,\n+ zulipFeatureLevel,\n+ ackedPushToken,\n+ );\n+ @override\n+ bool operator ==(Object other) =>\n+ identical(this, other) ||\n+ (other is AccountsData &&\n+ other.id == this.id &&\n+ other.realmUrl == this.realmUrl &&\n+ other.userId == this.userId &&\n+ other.email == this.email &&\n+ other.apiKey == this.apiKey &&\n+ other.zulipVersion == this.zulipVersion &&\n+ other.zulipMergeBase == this.zulipMergeBase &&\n+ other.zulipFeatureLevel == this.zulipFeatureLevel &&\n+ other.ackedPushToken == this.ackedPushToken);\n+}\n+\n+class AccountsCompanion extends UpdateCompanion {\n+ final Value id;\n+ final Value realmUrl;\n+ final Value userId;\n+ final Value email;\n+ final Value apiKey;\n+ final Value zulipVersion;\n+ final Value zulipMergeBase;\n+ final Value zulipFeatureLevel;\n+ final Value ackedPushToken;\n+ const AccountsCompanion({\n+ this.id = const Value.absent(),\n+ this.realmUrl = const Value.absent(),\n+ this.userId = const Value.absent(),\n+ this.email = const Value.absent(),\n+ this.apiKey = const Value.absent(),\n+ this.zulipVersion = const Value.absent(),\n+ this.zulipMergeBase = const Value.absent(),\n+ this.zulipFeatureLevel = const Value.absent(),\n+ this.ackedPushToken = const Value.absent(),\n+ });\n+ AccountsCompanion.insert({\n+ this.id = const Value.absent(),\n+ required String realmUrl,\n+ required int userId,\n+ required String email,\n+ required String apiKey,\n+ required String zulipVersion,\n+ this.zulipMergeBase = const Value.absent(),\n+ required int zulipFeatureLevel,\n+ this.ackedPushToken = const Value.absent(),\n+ }) : realmUrl = Value(realmUrl),\n+ userId = Value(userId),\n+ email = Value(email),\n+ apiKey = Value(apiKey),\n+ zulipVersion = Value(zulipVersion),\n+ zulipFeatureLevel = Value(zulipFeatureLevel);\n+ static Insertable custom({\n+ Expression? id,\n+ Expression? realmUrl,\n+ Expression? userId,\n+ Expression? email,\n+ Expression? apiKey,\n+ Expression? zulipVersion,\n+ Expression? zulipMergeBase,\n+ Expression? zulipFeatureLevel,\n+ Expression? ackedPushToken,\n+ }) {\n+ return RawValuesInsertable({\n+ if (id != null) 'id': id,\n+ if (realmUrl != null) 'realm_url': realmUrl,\n+ if (userId != null) 'user_id': userId,\n+ if (email != null) 'email': email,\n+ if (apiKey != null) 'api_key': apiKey,\n+ if (zulipVersion != null) 'zulip_version': zulipVersion,\n+ if (zulipMergeBase != null) 'zulip_merge_base': zulipMergeBase,\n+ if (zulipFeatureLevel != null) 'zulip_feature_level': zulipFeatureLevel,\n+ if (ackedPushToken != null) 'acked_push_token': ackedPushToken,\n+ });\n+ }\n+\n+ AccountsCompanion copyWith({\n+ Value? id,\n+ Value? realmUrl,\n+ Value? userId,\n+ Value? email,\n+ Value? apiKey,\n+ Value? zulipVersion,\n+ Value? zulipMergeBase,\n+ Value? zulipFeatureLevel,\n+ Value? ackedPushToken,\n+ }) {\n+ return AccountsCompanion(\n+ id: id ?? this.id,\n+ realmUrl: realmUrl ?? this.realmUrl,\n+ userId: userId ?? this.userId,\n+ email: email ?? this.email,\n+ apiKey: apiKey ?? this.apiKey,\n+ zulipVersion: zulipVersion ?? this.zulipVersion,\n+ zulipMergeBase: zulipMergeBase ?? this.zulipMergeBase,\n+ zulipFeatureLevel: zulipFeatureLevel ?? this.zulipFeatureLevel,\n+ ackedPushToken: ackedPushToken ?? this.ackedPushToken,\n+ );\n+ }\n+\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ if (id.present) {\n+ map['id'] = Variable(id.value);\n+ }\n+ if (realmUrl.present) {\n+ map['realm_url'] = Variable(realmUrl.value);\n+ }\n+ if (userId.present) {\n+ map['user_id'] = Variable(userId.value);\n+ }\n+ if (email.present) {\n+ map['email'] = Variable(email.value);\n+ }\n+ if (apiKey.present) {\n+ map['api_key'] = Variable(apiKey.value);\n+ }\n+ if (zulipVersion.present) {\n+ map['zulip_version'] = Variable(zulipVersion.value);\n+ }\n+ if (zulipMergeBase.present) {\n+ map['zulip_merge_base'] = Variable(zulipMergeBase.value);\n+ }\n+ if (zulipFeatureLevel.present) {\n+ map['zulip_feature_level'] = Variable(zulipFeatureLevel.value);\n+ }\n+ if (ackedPushToken.present) {\n+ map['acked_push_token'] = Variable(ackedPushToken.value);\n+ }\n+ return map;\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('AccountsCompanion(')\n+ ..write('id: $id, ')\n+ ..write('realmUrl: $realmUrl, ')\n+ ..write('userId: $userId, ')\n+ ..write('email: $email, ')\n+ ..write('apiKey: $apiKey, ')\n+ ..write('zulipVersion: $zulipVersion, ')\n+ ..write('zulipMergeBase: $zulipMergeBase, ')\n+ ..write('zulipFeatureLevel: $zulipFeatureLevel, ')\n+ ..write('ackedPushToken: $ackedPushToken')\n+ ..write(')'))\n+ .toString();\n+ }\n+}\n+\n+class DatabaseAtV9 extends GeneratedDatabase {\n+ DatabaseAtV9(QueryExecutor e) : super(e);\n+ late final GlobalSettings globalSettings = GlobalSettings(this);\n+ late final BoolGlobalSettings boolGlobalSettings = BoolGlobalSettings(this);\n+ late final Accounts accounts = Accounts(this);\n+ @override\n+ Iterable> get allTables =>\n+ allSchemaEntities.whereType>();\n+ @override\n+ List get allSchemaEntities => [\n+ globalSettings,\n+ boolGlobalSettings,\n+ accounts,\n+ ];\n+ @override\n+ int get schemaVersion => 9;\n+}\ndiff --git a/test/widgets/dialog_test.dart b/test/widgets/dialog_test.dart\nindex c86aae478e..1980f619f3 100644\n--- a/test/widgets/dialog_test.dart\n+++ b/test/widgets/dialog_test.dart\n@@ -73,4 +73,6 @@ void main() {\n await check(dialog.result).completes((it) => it.equals(null));\n });\n });\n+\n+ // TODO(#1594): test UpgradeWelcomeDialog\n }\n", "n2p_tests": "{\"/home/zulip-flutter/test/model/database_test.dart: migrations (tearDownAll)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v6 to latest (v9)\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v4 to latest (v9)\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v2 to latest (v9)\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v8 to latest (v9)\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v8 to v9\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v1 to latest (v9)\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v3 to latest (v9)\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v5 to latest (v9)\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v7 to latest (v9)\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v3 to v4\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations upgrade to v2, with data\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v4 to v5\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v2 to v3\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests does not crash if multiple global settings rows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests BoolGlobalSettings delete, then get\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests create account with same realm and userId \": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/dialog_test.dart: showSuggestedActionDialog tap outside dialog area\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/dialog_test.dart: showSuggestedActionDialog tap action button\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/dialog_test.dart: showErrorDialog tap \\\"Learn more\\\" button\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations downgrading\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v1 to v2\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests create account\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/dialog_test.dart: showSuggestedActionDialog tap cancel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations upgrade to v5: with existing GlobalSettings row, do nothing\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations upgrade to v5: with no existing GlobalSettings row, insert one\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v5 to v6\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests create account with same realm and email\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v7 to v8\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations (setUpAll)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests BoolGlobalSettings get ignores unknown names\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations upgrade to v4, with data\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests initialize GlobalSettings with defaults\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests GlobalSettings updates work\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v6 to v7\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests BoolGlobalSettings delete is idempotent\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests BoolGlobalSettings insert, then get\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests BoolGlobalSettings insert replaces\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1574", "org": "zulip", "repo": "zulip-flutter", "number": 1574, "state": "closed", "title": "Implement mark-as-read-on-scroll, v1", "body": "(edited)\r\n\r\nFixes #81. \ud83c\udf89\r\n\r\nStill to do, but can be soon-after-launch:\r\n\r\n- #1583\r\n- #685 ", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"a0241e0155ce0d253207cb2778a72b6f7de50c7d\"}", "resolved_issues": "[{\"number\": 81, \"title\": \"Mark messages as read on scroll, configurably\", \"body\": \"This Zulip feature: https://zulip.com/help/marking-messages-as-read#configure-whether-messages-are-automatically-marked-as-read\\r\\n\\r\\nThat means:\\r\\n* When scrolling through messages that are unread, by default mark them as read with a request to the server.\\r\\n* Control that behavior with a local setting \\\"Mark messages as read on scroll\\\", with three values: https://zulip.com/help/marking-messages-as-read#configure-whether-messages-are-automatically-marked-as-read\\r\\n* Unlike most everything else in the Zulip data model, apply \\\"latency compensation\\\" when marking messages as read on scroll, meaning eagerly apply the change to the local UI rather than wait for the server to acknowledge it with an event.\\r\\n * Specifically, eagerly fade out the unread-message markers in the message list.\\r\\n\\r\\nThat local setting should go in the app's database on the device, from #13.\\r\\n\\r\\nThis should come after:\\r\\n* #79\\r\\n* #80 \\r\\n\"}]", "lang": "dart", "problem_statement": "Mark messages as read on scroll, configurably\nThis Zulip feature: https://zulip.com/help/marking-messages-as-read#configure-whether-messages-are-automatically-marked-as-read\r\n\r\nThat means:\r\n* When scrolling through messages that are unread, by default mark them as read with a request to the server.\r\n* Control that behavior with a local setting \"Mark messages as read on scroll\", with three values: https://zulip.com/help/marking-messages-as-read#configure-whether-messages-are-automatically-marked-as-read\r\n* Unlike most everything else in the Zulip data model, apply \"latency compensation\" when marking messages as read on scroll, meaning eagerly apply the change to the local UI rather than wait for the server to acknowledge it with an event.\r\n * Specifically, eagerly fade out the unread-message markers in the message list.\r\n\r\nThat local setting should go in the app's database on the device, from #13.\r\n\r\nThis should come after:\r\n* #79\r\n* #80 \r\n\n", "hints": "> Specifically, eagerly fade out the unread-message markers in the message list.\r\n\r\nWe might go further and eagerly update the model itself.\r\n* The zulip-mobile RN app doesn't do this; the consequence is that it looks kind of glitchy as the \"N unreads\" banner at the top of the message list doesn't update or disappear in sync with the unread markers.\r\n* I'm not actually sure what the web app does.\r\n* The downside is that if we eagerly update the model, then it's no longer part of a coherent snapshot together with the rest of our model \u2014 we'd be giving up some of the consistency provided by the Zulip event system. \r\n\r\nThere are a couple of approaches we could take to that consistency question, but we should think through the consequences. So, leaving that out of scope for this issue.\r\n\nWe've had a request for this as beta feedback: https://chat.zulip.org/#narrow/channel/48-mobile/topic/mobile.20beta.20feedback/near/2000430\r\n\r\n> Is there a way to turn on `Mark messages as read on scroll` in this beta? I'd gladly use beta app more often, but it bugs me out to tap Mark messages as read every time.\nAnd [some more requests](https://chat.zulip.org/#narrow/channel/48-mobile/topic/marking.20read/near/2018451):\r\n\r\n> here's another vote for prioritizing \"Mark messages as read on scroll\" support in the Flutter app.\r\n\r\n> [\u2026] FWIW this is the main reason why I have not switched to the beta app. I'm subscribed to all channels here, and the fact that I have to continually mark messages as read manually makes the beta app very tedious for me to use -- I am manually marking hundreds if not thousands of messages as read every day.", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1574", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/81\"]", "test_command": "flutter test test/model/settings_test.dart test/widgets/action_sheet_test.dart test/widgets/autocomplete_test.dart test/widgets/compose_box_test.dart test/widgets/emoji_reaction_test.dart test/widgets/lightbox_test.dart test/widgets/message_list_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/assets/l10n/app_en.arb b/assets/l10n/app_en.arb\nindex e20d220aba..e03f421761 100644\n--- a/assets/l10n/app_en.arb\n+++ b/assets/l10n/app_en.arb\n@@ -971,6 +971,30 @@\n \"@initialAnchorSettingNewestAlways\": {\n \"description\": \"Label for a value of setting controlling initial anchor of message list.\"\n },\n+ \"markReadOnScrollSettingTitle\": \"Mark messages as read on scroll\",\n+ \"@markReadOnScrollSettingTitle\": {\n+ \"description\": \"Title of setting controlling which message-list views should mark read on scroll.\"\n+ },\n+ \"markReadOnScrollSettingDescription\": \"When scrolling through messages, should they automatically be marked as read?\",\n+ \"@markReadOnScrollSettingDescription\": {\n+ \"description\": \"Description of setting controlling which message-list views should mark read on scroll.\"\n+ },\n+ \"markReadOnScrollSettingAlways\": \"Always\",\n+ \"@markReadOnScrollSettingAlways\": {\n+ \"description\": \"Label for a value of setting controlling which message-list views should mark read on scroll.\"\n+ },\n+ \"markReadOnScrollSettingNever\": \"Never\",\n+ \"@markReadOnScrollSettingNever\": {\n+ \"description\": \"Label for a value of setting controlling which message-list views should mark read on scroll.\"\n+ },\n+ \"markReadOnScrollSettingConversations\": \"Only in conversation views\",\n+ \"@markReadOnScrollSettingConversations\": {\n+ \"description\": \"Label for a value of setting controlling which message-list views should mark read on scroll.\"\n+ },\n+ \"markReadOnScrollSettingConversationsDescription\": \"Messages will be automatically marked as read only when viewing a single topic or direct message conversation.\",\n+ \"@markReadOnScrollSettingConversationsDescription\": {\n+ \"description\": \"Description for a value of setting controlling which message-list views should mark read on scroll.\"\n+ },\n \"experimentalFeatureSettingsPageTitle\": \"Experimental features\",\n \"@experimentalFeatureSettingsPageTitle\": {\n \"description\": \"Title of settings page for experimental, in-development features\"\ndiff --git a/lib/generated/l10n/zulip_localizations.dart b/lib/generated/l10n/zulip_localizations.dart\nindex 7f6ed24d64..c13cdd3a9f 100644\n--- a/lib/generated/l10n/zulip_localizations.dart\n+++ b/lib/generated/l10n/zulip_localizations.dart\n@@ -1449,6 +1449,42 @@ abstract class ZulipLocalizations {\n /// **'Newest message'**\n String get initialAnchorSettingNewestAlways;\n \n+ /// Title of setting controlling which message-list views should mark read on scroll.\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Mark messages as read on scroll'**\n+ String get markReadOnScrollSettingTitle;\n+\n+ /// Description of setting controlling which message-list views should mark read on scroll.\n+ ///\n+ /// In en, this message translates to:\n+ /// **'When scrolling through messages, should they automatically be marked as read?'**\n+ String get markReadOnScrollSettingDescription;\n+\n+ /// Label for a value of setting controlling which message-list views should mark read on scroll.\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Always'**\n+ String get markReadOnScrollSettingAlways;\n+\n+ /// Label for a value of setting controlling which message-list views should mark read on scroll.\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Never'**\n+ String get markReadOnScrollSettingNever;\n+\n+ /// Label for a value of setting controlling which message-list views should mark read on scroll.\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Only in conversation views'**\n+ String get markReadOnScrollSettingConversations;\n+\n+ /// Description for a value of setting controlling which message-list views should mark read on scroll.\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Messages will be automatically marked as read only when viewing a single topic or direct message conversation.'**\n+ String get markReadOnScrollSettingConversationsDescription;\n+\n /// Title of settings page for experimental, in-development features\n ///\n /// In en, this message translates to:\ndiff --git a/lib/generated/l10n/zulip_localizations_ar.dart b/lib/generated/l10n/zulip_localizations_ar.dart\nindex 5965ddf7a9..c47095ee06 100644\n--- a/lib/generated/l10n/zulip_localizations_ar.dart\n+++ b/lib/generated/l10n/zulip_localizations_ar.dart\n@@ -790,6 +790,27 @@ class ZulipLocalizationsAr extends ZulipLocalizations {\n @override\n String get initialAnchorSettingNewestAlways => 'Newest message';\n \n+ @override\n+ String get markReadOnScrollSettingTitle => 'Mark messages as read on scroll';\n+\n+ @override\n+ String get markReadOnScrollSettingDescription =>\n+ 'When scrolling through messages, should they automatically be marked as read?';\n+\n+ @override\n+ String get markReadOnScrollSettingAlways => 'Always';\n+\n+ @override\n+ String get markReadOnScrollSettingNever => 'Never';\n+\n+ @override\n+ String get markReadOnScrollSettingConversations =>\n+ 'Only in conversation views';\n+\n+ @override\n+ String get markReadOnScrollSettingConversationsDescription =>\n+ 'Messages will be automatically marked as read only when viewing a single topic or direct message conversation.';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Experimental features';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_de.dart b/lib/generated/l10n/zulip_localizations_de.dart\nindex d7120eb264..301f70d34d 100644\n--- a/lib/generated/l10n/zulip_localizations_de.dart\n+++ b/lib/generated/l10n/zulip_localizations_de.dart\n@@ -790,6 +790,27 @@ class ZulipLocalizationsDe extends ZulipLocalizations {\n @override\n String get initialAnchorSettingNewestAlways => 'Newest message';\n \n+ @override\n+ String get markReadOnScrollSettingTitle => 'Mark messages as read on scroll';\n+\n+ @override\n+ String get markReadOnScrollSettingDescription =>\n+ 'When scrolling through messages, should they automatically be marked as read?';\n+\n+ @override\n+ String get markReadOnScrollSettingAlways => 'Always';\n+\n+ @override\n+ String get markReadOnScrollSettingNever => 'Never';\n+\n+ @override\n+ String get markReadOnScrollSettingConversations =>\n+ 'Only in conversation views';\n+\n+ @override\n+ String get markReadOnScrollSettingConversationsDescription =>\n+ 'Messages will be automatically marked as read only when viewing a single topic or direct message conversation.';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Experimental features';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_en.dart b/lib/generated/l10n/zulip_localizations_en.dart\nindex 6830703b27..52e4393767 100644\n--- a/lib/generated/l10n/zulip_localizations_en.dart\n+++ b/lib/generated/l10n/zulip_localizations_en.dart\n@@ -790,6 +790,27 @@ class ZulipLocalizationsEn extends ZulipLocalizations {\n @override\n String get initialAnchorSettingNewestAlways => 'Newest message';\n \n+ @override\n+ String get markReadOnScrollSettingTitle => 'Mark messages as read on scroll';\n+\n+ @override\n+ String get markReadOnScrollSettingDescription =>\n+ 'When scrolling through messages, should they automatically be marked as read?';\n+\n+ @override\n+ String get markReadOnScrollSettingAlways => 'Always';\n+\n+ @override\n+ String get markReadOnScrollSettingNever => 'Never';\n+\n+ @override\n+ String get markReadOnScrollSettingConversations =>\n+ 'Only in conversation views';\n+\n+ @override\n+ String get markReadOnScrollSettingConversationsDescription =>\n+ 'Messages will be automatically marked as read only when viewing a single topic or direct message conversation.';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Experimental features';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_it.dart b/lib/generated/l10n/zulip_localizations_it.dart\nindex 84f094451e..084eedfbbc 100644\n--- a/lib/generated/l10n/zulip_localizations_it.dart\n+++ b/lib/generated/l10n/zulip_localizations_it.dart\n@@ -790,6 +790,27 @@ class ZulipLocalizationsIt extends ZulipLocalizations {\n @override\n String get initialAnchorSettingNewestAlways => 'Newest message';\n \n+ @override\n+ String get markReadOnScrollSettingTitle => 'Mark messages as read on scroll';\n+\n+ @override\n+ String get markReadOnScrollSettingDescription =>\n+ 'When scrolling through messages, should they automatically be marked as read?';\n+\n+ @override\n+ String get markReadOnScrollSettingAlways => 'Always';\n+\n+ @override\n+ String get markReadOnScrollSettingNever => 'Never';\n+\n+ @override\n+ String get markReadOnScrollSettingConversations =>\n+ 'Only in conversation views';\n+\n+ @override\n+ String get markReadOnScrollSettingConversationsDescription =>\n+ 'Messages will be automatically marked as read only when viewing a single topic or direct message conversation.';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Experimental features';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_ja.dart b/lib/generated/l10n/zulip_localizations_ja.dart\nindex 5526921c24..1fdc2f585d 100644\n--- a/lib/generated/l10n/zulip_localizations_ja.dart\n+++ b/lib/generated/l10n/zulip_localizations_ja.dart\n@@ -790,6 +790,27 @@ class ZulipLocalizationsJa extends ZulipLocalizations {\n @override\n String get initialAnchorSettingNewestAlways => 'Newest message';\n \n+ @override\n+ String get markReadOnScrollSettingTitle => 'Mark messages as read on scroll';\n+\n+ @override\n+ String get markReadOnScrollSettingDescription =>\n+ 'When scrolling through messages, should they automatically be marked as read?';\n+\n+ @override\n+ String get markReadOnScrollSettingAlways => 'Always';\n+\n+ @override\n+ String get markReadOnScrollSettingNever => 'Never';\n+\n+ @override\n+ String get markReadOnScrollSettingConversations =>\n+ 'Only in conversation views';\n+\n+ @override\n+ String get markReadOnScrollSettingConversationsDescription =>\n+ 'Messages will be automatically marked as read only when viewing a single topic or direct message conversation.';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Experimental features';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_nb.dart b/lib/generated/l10n/zulip_localizations_nb.dart\nindex 5751493e04..4bdd16533d 100644\n--- a/lib/generated/l10n/zulip_localizations_nb.dart\n+++ b/lib/generated/l10n/zulip_localizations_nb.dart\n@@ -790,6 +790,27 @@ class ZulipLocalizationsNb extends ZulipLocalizations {\n @override\n String get initialAnchorSettingNewestAlways => 'Newest message';\n \n+ @override\n+ String get markReadOnScrollSettingTitle => 'Mark messages as read on scroll';\n+\n+ @override\n+ String get markReadOnScrollSettingDescription =>\n+ 'When scrolling through messages, should they automatically be marked as read?';\n+\n+ @override\n+ String get markReadOnScrollSettingAlways => 'Always';\n+\n+ @override\n+ String get markReadOnScrollSettingNever => 'Never';\n+\n+ @override\n+ String get markReadOnScrollSettingConversations =>\n+ 'Only in conversation views';\n+\n+ @override\n+ String get markReadOnScrollSettingConversationsDescription =>\n+ 'Messages will be automatically marked as read only when viewing a single topic or direct message conversation.';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Experimental features';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_pl.dart b/lib/generated/l10n/zulip_localizations_pl.dart\nindex 89d9be82b0..3943e5c01d 100644\n--- a/lib/generated/l10n/zulip_localizations_pl.dart\n+++ b/lib/generated/l10n/zulip_localizations_pl.dart\n@@ -801,6 +801,27 @@ class ZulipLocalizationsPl extends ZulipLocalizations {\n @override\n String get initialAnchorSettingNewestAlways => 'Newest message';\n \n+ @override\n+ String get markReadOnScrollSettingTitle => 'Mark messages as read on scroll';\n+\n+ @override\n+ String get markReadOnScrollSettingDescription =>\n+ 'When scrolling through messages, should they automatically be marked as read?';\n+\n+ @override\n+ String get markReadOnScrollSettingAlways => 'Always';\n+\n+ @override\n+ String get markReadOnScrollSettingNever => 'Never';\n+\n+ @override\n+ String get markReadOnScrollSettingConversations =>\n+ 'Only in conversation views';\n+\n+ @override\n+ String get markReadOnScrollSettingConversationsDescription =>\n+ 'Messages will be automatically marked as read only when viewing a single topic or direct message conversation.';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Funkcje eksperymentalne';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_ru.dart b/lib/generated/l10n/zulip_localizations_ru.dart\nindex a7f088b027..13a6729b9b 100644\n--- a/lib/generated/l10n/zulip_localizations_ru.dart\n+++ b/lib/generated/l10n/zulip_localizations_ru.dart\n@@ -804,6 +804,27 @@ class ZulipLocalizationsRu extends ZulipLocalizations {\n @override\n String get initialAnchorSettingNewestAlways => 'Newest message';\n \n+ @override\n+ String get markReadOnScrollSettingTitle => 'Mark messages as read on scroll';\n+\n+ @override\n+ String get markReadOnScrollSettingDescription =>\n+ 'When scrolling through messages, should they automatically be marked as read?';\n+\n+ @override\n+ String get markReadOnScrollSettingAlways => 'Always';\n+\n+ @override\n+ String get markReadOnScrollSettingNever => 'Never';\n+\n+ @override\n+ String get markReadOnScrollSettingConversations =>\n+ 'Only in conversation views';\n+\n+ @override\n+ String get markReadOnScrollSettingConversationsDescription =>\n+ 'Messages will be automatically marked as read only when viewing a single topic or direct message conversation.';\n+\n @override\n String get experimentalFeatureSettingsPageTitle =>\n '\u042d\u043a\u0441\u043f\u0435\u0440\u0438\u043c\u0435\u043d\u0442\u0430\u043b\u044c\u043d\u044b\u0435 \u0444\u0443\u043d\u043a\u0446\u0438\u0438';\ndiff --git a/lib/generated/l10n/zulip_localizations_sk.dart b/lib/generated/l10n/zulip_localizations_sk.dart\nindex 6e8365012e..29e203cccb 100644\n--- a/lib/generated/l10n/zulip_localizations_sk.dart\n+++ b/lib/generated/l10n/zulip_localizations_sk.dart\n@@ -792,6 +792,27 @@ class ZulipLocalizationsSk extends ZulipLocalizations {\n @override\n String get initialAnchorSettingNewestAlways => 'Newest message';\n \n+ @override\n+ String get markReadOnScrollSettingTitle => 'Mark messages as read on scroll';\n+\n+ @override\n+ String get markReadOnScrollSettingDescription =>\n+ 'When scrolling through messages, should they automatically be marked as read?';\n+\n+ @override\n+ String get markReadOnScrollSettingAlways => 'Always';\n+\n+ @override\n+ String get markReadOnScrollSettingNever => 'Never';\n+\n+ @override\n+ String get markReadOnScrollSettingConversations =>\n+ 'Only in conversation views';\n+\n+ @override\n+ String get markReadOnScrollSettingConversationsDescription =>\n+ 'Messages will be automatically marked as read only when viewing a single topic or direct message conversation.';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Experimental features';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_sl.dart b/lib/generated/l10n/zulip_localizations_sl.dart\nindex 89dd4d28ca..c69ff12045 100644\n--- a/lib/generated/l10n/zulip_localizations_sl.dart\n+++ b/lib/generated/l10n/zulip_localizations_sl.dart\n@@ -812,6 +812,27 @@ class ZulipLocalizationsSl extends ZulipLocalizations {\n @override\n String get initialAnchorSettingNewestAlways => 'Newest message';\n \n+ @override\n+ String get markReadOnScrollSettingTitle => 'Mark messages as read on scroll';\n+\n+ @override\n+ String get markReadOnScrollSettingDescription =>\n+ 'When scrolling through messages, should they automatically be marked as read?';\n+\n+ @override\n+ String get markReadOnScrollSettingAlways => 'Always';\n+\n+ @override\n+ String get markReadOnScrollSettingNever => 'Never';\n+\n+ @override\n+ String get markReadOnScrollSettingConversations =>\n+ 'Only in conversation views';\n+\n+ @override\n+ String get markReadOnScrollSettingConversationsDescription =>\n+ 'Messages will be automatically marked as read only when viewing a single topic or direct message conversation.';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Eksperimentalne funkcije';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_uk.dart b/lib/generated/l10n/zulip_localizations_uk.dart\nindex 5f8f37f617..6c5e7264d1 100644\n--- a/lib/generated/l10n/zulip_localizations_uk.dart\n+++ b/lib/generated/l10n/zulip_localizations_uk.dart\n@@ -805,6 +805,27 @@ class ZulipLocalizationsUk extends ZulipLocalizations {\n @override\n String get initialAnchorSettingNewestAlways => 'Newest message';\n \n+ @override\n+ String get markReadOnScrollSettingTitle => 'Mark messages as read on scroll';\n+\n+ @override\n+ String get markReadOnScrollSettingDescription =>\n+ 'When scrolling through messages, should they automatically be marked as read?';\n+\n+ @override\n+ String get markReadOnScrollSettingAlways => 'Always';\n+\n+ @override\n+ String get markReadOnScrollSettingNever => 'Never';\n+\n+ @override\n+ String get markReadOnScrollSettingConversations =>\n+ 'Only in conversation views';\n+\n+ @override\n+ String get markReadOnScrollSettingConversationsDescription =>\n+ 'Messages will be automatically marked as read only when viewing a single topic or direct message conversation.';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => '\u0415\u043a\u0441\u043f\u0435\u0440\u0438\u043c\u0435\u043d\u0442\u0430\u043b\u044c\u043d\u0456 \u0444\u0443\u043d\u043a\u0446\u0456\u0457';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_zh.dart b/lib/generated/l10n/zulip_localizations_zh.dart\nindex bbe12e4038..d61e7cd6e3 100644\n--- a/lib/generated/l10n/zulip_localizations_zh.dart\n+++ b/lib/generated/l10n/zulip_localizations_zh.dart\n@@ -790,6 +790,27 @@ class ZulipLocalizationsZh extends ZulipLocalizations {\n @override\n String get initialAnchorSettingNewestAlways => 'Newest message';\n \n+ @override\n+ String get markReadOnScrollSettingTitle => 'Mark messages as read on scroll';\n+\n+ @override\n+ String get markReadOnScrollSettingDescription =>\n+ 'When scrolling through messages, should they automatically be marked as read?';\n+\n+ @override\n+ String get markReadOnScrollSettingAlways => 'Always';\n+\n+ @override\n+ String get markReadOnScrollSettingNever => 'Never';\n+\n+ @override\n+ String get markReadOnScrollSettingConversations =>\n+ 'Only in conversation views';\n+\n+ @override\n+ String get markReadOnScrollSettingConversationsDescription =>\n+ 'Messages will be automatically marked as read only when viewing a single topic or direct message conversation.';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Experimental features';\n \ndiff --git a/lib/model/database.dart b/lib/model/database.dart\nindex f7d85b4b95..e20380b9e7 100644\n--- a/lib/model/database.dart\n+++ b/lib/model/database.dart\n@@ -27,6 +27,9 @@ class GlobalSettings extends Table {\n Column get visitFirstUnread => textEnum()\n .nullable()();\n \n+ Column get markReadOnScroll => textEnum()\n+ .nullable()();\n+\n // If adding a new column to this table, consider whether [BoolGlobalSettings]\n // can do the job instead (by adding a value to the [BoolGlobalSetting] enum).\n // That way is more convenient, when it works, because\n@@ -122,7 +125,7 @@ class AppDatabase extends _$AppDatabase {\n // information on using the build_runner.\n // * Write a migration in `_migrationSteps` below.\n // * Write tests.\n- static const int latestSchemaVersion = 7; // See note.\n+ static const int latestSchemaVersion = 8; // See note.\n \n @override\n int get schemaVersion => latestSchemaVersion;\n@@ -181,6 +184,10 @@ class AppDatabase extends _$AppDatabase {\n await m.addColumn(schema.globalSettings,\n schema.globalSettings.visitFirstUnread);\n },\n+ from7To8: (m, schema) async {\n+ await m.addColumn(schema.globalSettings,\n+ schema.globalSettings.markReadOnScroll);\n+ },\n );\n \n Future _createLatestSchema(Migrator m) async {\ndiff --git a/lib/model/database.g.dart b/lib/model/database.g.dart\nindex 9ff8b71b65..d78f7ede84 100644\n--- a/lib/model/database.g.dart\n+++ b/lib/model/database.g.dart\n@@ -45,10 +45,23 @@ class $GlobalSettingsTable extends GlobalSettings\n $GlobalSettingsTable.$convertervisitFirstUnreadn,\n );\n @override\n+ late final GeneratedColumnWithTypeConverter\n+ markReadOnScroll =\n+ GeneratedColumn(\n+ 'mark_read_on_scroll',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ ).withConverter(\n+ $GlobalSettingsTable.$convertermarkReadOnScrolln,\n+ );\n+ @override\n List get $columns => [\n themeSetting,\n browserPreference,\n visitFirstUnread,\n+ markReadOnScroll,\n ];\n @override\n String get aliasedName => _alias ?? actualTableName;\n@@ -81,6 +94,13 @@ class $GlobalSettingsTable extends GlobalSettings\n data['${effectivePrefix}visit_first_unread'],\n ),\n ),\n+ markReadOnScroll: $GlobalSettingsTable.$convertermarkReadOnScrolln\n+ .fromSql(\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}mark_read_on_scroll'],\n+ ),\n+ ),\n );\n }\n \n@@ -113,6 +133,14 @@ class $GlobalSettingsTable extends GlobalSettings\n $convertervisitFirstUnreadn = JsonTypeConverter2.asNullable(\n $convertervisitFirstUnread,\n );\n+ static JsonTypeConverter2\n+ $convertermarkReadOnScroll = const EnumNameConverter(\n+ MarkReadOnScrollSetting.values,\n+ );\n+ static JsonTypeConverter2\n+ $convertermarkReadOnScrolln = JsonTypeConverter2.asNullable(\n+ $convertermarkReadOnScroll,\n+ );\n }\n \n class GlobalSettingsData extends DataClass\n@@ -120,10 +148,12 @@ class GlobalSettingsData extends DataClass\n final ThemeSetting? themeSetting;\n final BrowserPreference? browserPreference;\n final VisitFirstUnreadSetting? visitFirstUnread;\n+ final MarkReadOnScrollSetting? markReadOnScroll;\n const GlobalSettingsData({\n this.themeSetting,\n this.browserPreference,\n this.visitFirstUnread,\n+ this.markReadOnScroll,\n });\n @override\n Map toColumns(bool nullToAbsent) {\n@@ -147,6 +177,13 @@ class GlobalSettingsData extends DataClass\n ),\n );\n }\n+ if (!nullToAbsent || markReadOnScroll != null) {\n+ map['mark_read_on_scroll'] = Variable(\n+ $GlobalSettingsTable.$convertermarkReadOnScrolln.toSql(\n+ markReadOnScroll,\n+ ),\n+ );\n+ }\n return map;\n }\n \n@@ -161,6 +198,9 @@ class GlobalSettingsData extends DataClass\n visitFirstUnread: visitFirstUnread == null && nullToAbsent\n ? const Value.absent()\n : Value(visitFirstUnread),\n+ markReadOnScroll: markReadOnScroll == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(markReadOnScroll),\n );\n }\n \n@@ -177,6 +217,8 @@ class GlobalSettingsData extends DataClass\n .fromJson(serializer.fromJson(json['browserPreference'])),\n visitFirstUnread: $GlobalSettingsTable.$convertervisitFirstUnreadn\n .fromJson(serializer.fromJson(json['visitFirstUnread'])),\n+ markReadOnScroll: $GlobalSettingsTable.$convertermarkReadOnScrolln\n+ .fromJson(serializer.fromJson(json['markReadOnScroll'])),\n );\n }\n @override\n@@ -196,6 +238,11 @@ class GlobalSettingsData extends DataClass\n visitFirstUnread,\n ),\n ),\n+ 'markReadOnScroll': serializer.toJson(\n+ $GlobalSettingsTable.$convertermarkReadOnScrolln.toJson(\n+ markReadOnScroll,\n+ ),\n+ ),\n };\n }\n \n@@ -203,6 +250,7 @@ class GlobalSettingsData extends DataClass\n Value themeSetting = const Value.absent(),\n Value browserPreference = const Value.absent(),\n Value visitFirstUnread = const Value.absent(),\n+ Value markReadOnScroll = const Value.absent(),\n }) => GlobalSettingsData(\n themeSetting: themeSetting.present ? themeSetting.value : this.themeSetting,\n browserPreference: browserPreference.present\n@@ -211,6 +259,9 @@ class GlobalSettingsData extends DataClass\n visitFirstUnread: visitFirstUnread.present\n ? visitFirstUnread.value\n : this.visitFirstUnread,\n+ markReadOnScroll: markReadOnScroll.present\n+ ? markReadOnScroll.value\n+ : this.markReadOnScroll,\n );\n GlobalSettingsData copyWithCompanion(GlobalSettingsCompanion data) {\n return GlobalSettingsData(\n@@ -223,6 +274,9 @@ class GlobalSettingsData extends DataClass\n visitFirstUnread: data.visitFirstUnread.present\n ? data.visitFirstUnread.value\n : this.visitFirstUnread,\n+ markReadOnScroll: data.markReadOnScroll.present\n+ ? data.markReadOnScroll.value\n+ : this.markReadOnScroll,\n );\n }\n \n@@ -231,50 +285,61 @@ class GlobalSettingsData extends DataClass\n return (StringBuffer('GlobalSettingsData(')\n ..write('themeSetting: $themeSetting, ')\n ..write('browserPreference: $browserPreference, ')\n- ..write('visitFirstUnread: $visitFirstUnread')\n+ ..write('visitFirstUnread: $visitFirstUnread, ')\n+ ..write('markReadOnScroll: $markReadOnScroll')\n ..write(')'))\n .toString();\n }\n \n @override\n- int get hashCode =>\n- Object.hash(themeSetting, browserPreference, visitFirstUnread);\n+ int get hashCode => Object.hash(\n+ themeSetting,\n+ browserPreference,\n+ visitFirstUnread,\n+ markReadOnScroll,\n+ );\n @override\n bool operator ==(Object other) =>\n identical(this, other) ||\n (other is GlobalSettingsData &&\n other.themeSetting == this.themeSetting &&\n other.browserPreference == this.browserPreference &&\n- other.visitFirstUnread == this.visitFirstUnread);\n+ other.visitFirstUnread == this.visitFirstUnread &&\n+ other.markReadOnScroll == this.markReadOnScroll);\n }\n \n class GlobalSettingsCompanion extends UpdateCompanion {\n final Value themeSetting;\n final Value browserPreference;\n final Value visitFirstUnread;\n+ final Value markReadOnScroll;\n final Value rowid;\n const GlobalSettingsCompanion({\n this.themeSetting = const Value.absent(),\n this.browserPreference = const Value.absent(),\n this.visitFirstUnread = const Value.absent(),\n+ this.markReadOnScroll = const Value.absent(),\n this.rowid = const Value.absent(),\n });\n GlobalSettingsCompanion.insert({\n this.themeSetting = const Value.absent(),\n this.browserPreference = const Value.absent(),\n this.visitFirstUnread = const Value.absent(),\n+ this.markReadOnScroll = const Value.absent(),\n this.rowid = const Value.absent(),\n });\n static Insertable custom({\n Expression? themeSetting,\n Expression? browserPreference,\n Expression? visitFirstUnread,\n+ Expression? markReadOnScroll,\n Expression? rowid,\n }) {\n return RawValuesInsertable({\n if (themeSetting != null) 'theme_setting': themeSetting,\n if (browserPreference != null) 'browser_preference': browserPreference,\n if (visitFirstUnread != null) 'visit_first_unread': visitFirstUnread,\n+ if (markReadOnScroll != null) 'mark_read_on_scroll': markReadOnScroll,\n if (rowid != null) 'rowid': rowid,\n });\n }\n@@ -283,12 +348,14 @@ class GlobalSettingsCompanion extends UpdateCompanion {\n Value? themeSetting,\n Value? browserPreference,\n Value? visitFirstUnread,\n+ Value? markReadOnScroll,\n Value? rowid,\n }) {\n return GlobalSettingsCompanion(\n themeSetting: themeSetting ?? this.themeSetting,\n browserPreference: browserPreference ?? this.browserPreference,\n visitFirstUnread: visitFirstUnread ?? this.visitFirstUnread,\n+ markReadOnScroll: markReadOnScroll ?? this.markReadOnScroll,\n rowid: rowid ?? this.rowid,\n );\n }\n@@ -315,6 +382,13 @@ class GlobalSettingsCompanion extends UpdateCompanion {\n ),\n );\n }\n+ if (markReadOnScroll.present) {\n+ map['mark_read_on_scroll'] = Variable(\n+ $GlobalSettingsTable.$convertermarkReadOnScrolln.toSql(\n+ markReadOnScroll.value,\n+ ),\n+ );\n+ }\n if (rowid.present) {\n map['rowid'] = Variable(rowid.value);\n }\n@@ -327,6 +401,7 @@ class GlobalSettingsCompanion extends UpdateCompanion {\n ..write('themeSetting: $themeSetting, ')\n ..write('browserPreference: $browserPreference, ')\n ..write('visitFirstUnread: $visitFirstUnread, ')\n+ ..write('markReadOnScroll: $markReadOnScroll, ')\n ..write('rowid: $rowid')\n ..write(')'))\n .toString();\n@@ -1172,6 +1247,7 @@ typedef $$GlobalSettingsTableCreateCompanionBuilder =\n Value themeSetting,\n Value browserPreference,\n Value visitFirstUnread,\n+ Value markReadOnScroll,\n Value rowid,\n });\n typedef $$GlobalSettingsTableUpdateCompanionBuilder =\n@@ -1179,6 +1255,7 @@ typedef $$GlobalSettingsTableUpdateCompanionBuilder =\n Value themeSetting,\n Value browserPreference,\n Value visitFirstUnread,\n+ Value markReadOnScroll,\n Value rowid,\n });\n \n@@ -1212,6 +1289,16 @@ class $$GlobalSettingsTableFilterComposer\n column: $table.visitFirstUnread,\n builder: (column) => ColumnWithTypeConverterFilters(column),\n );\n+\n+ ColumnWithTypeConverterFilters<\n+ MarkReadOnScrollSetting?,\n+ MarkReadOnScrollSetting,\n+ String\n+ >\n+ get markReadOnScroll => $composableBuilder(\n+ column: $table.markReadOnScroll,\n+ builder: (column) => ColumnWithTypeConverterFilters(column),\n+ );\n }\n \n class $$GlobalSettingsTableOrderingComposer\n@@ -1237,6 +1324,11 @@ class $$GlobalSettingsTableOrderingComposer\n column: $table.visitFirstUnread,\n builder: (column) => ColumnOrderings(column),\n );\n+\n+ ColumnOrderings get markReadOnScroll => $composableBuilder(\n+ column: $table.markReadOnScroll,\n+ builder: (column) => ColumnOrderings(column),\n+ );\n }\n \n class $$GlobalSettingsTableAnnotationComposer\n@@ -1265,6 +1357,12 @@ class $$GlobalSettingsTableAnnotationComposer\n column: $table.visitFirstUnread,\n builder: (column) => column,\n );\n+\n+ GeneratedColumnWithTypeConverter\n+ get markReadOnScroll => $composableBuilder(\n+ column: $table.markReadOnScroll,\n+ builder: (column) => column,\n+ );\n }\n \n class $$GlobalSettingsTableTableManager\n@@ -1309,11 +1407,14 @@ class $$GlobalSettingsTableTableManager\n const Value.absent(),\n Value visitFirstUnread =\n const Value.absent(),\n+ Value markReadOnScroll =\n+ const Value.absent(),\n Value rowid = const Value.absent(),\n }) => GlobalSettingsCompanion(\n themeSetting: themeSetting,\n browserPreference: browserPreference,\n visitFirstUnread: visitFirstUnread,\n+ markReadOnScroll: markReadOnScroll,\n rowid: rowid,\n ),\n createCompanionCallback:\n@@ -1323,11 +1424,14 @@ class $$GlobalSettingsTableTableManager\n const Value.absent(),\n Value visitFirstUnread =\n const Value.absent(),\n+ Value markReadOnScroll =\n+ const Value.absent(),\n Value rowid = const Value.absent(),\n }) => GlobalSettingsCompanion.insert(\n themeSetting: themeSetting,\n browserPreference: browserPreference,\n visitFirstUnread: visitFirstUnread,\n+ markReadOnScroll: markReadOnScroll,\n rowid: rowid,\n ),\n withReferenceMapper: (p0) => p0\ndiff --git a/lib/model/message.dart b/lib/model/message.dart\nindex 1dfe421368..9e9e45ca6a 100644\n--- a/lib/model/message.dart\n+++ b/lib/model/message.dart\n@@ -1,10 +1,11 @@\n import 'dart:async';\n-import 'dart:collection';\n import 'dart:convert';\n \n+import 'package:collection/collection.dart';\n import 'package:crypto/crypto.dart';\n import 'package:flutter/foundation.dart';\n \n+import '../api/exception.dart';\n import '../api/model/events.dart';\n import '../api/model/model.dart';\n import '../api/route/messages.dart';\n@@ -28,6 +29,8 @@ mixin MessageStore {\n void registerMessageList(MessageListView view);\n void unregisterMessageList(MessageListView view);\n \n+ void markReadFromScroll(Iterable messageIds);\n+\n Future sendMessage({\n required MessageDestination destination,\n required String content,\n@@ -180,6 +183,67 @@ class MessageStoreImpl extends PerAccountStoreBase with MessageStore, _OutboxMes\n _disposed = true;\n }\n \n+ static const _markReadOnScrollBatchSize = 1000;\n+ static const _markReadOnScrollDebounceDuration = Duration(milliseconds: 500);\n+ final _markReadOnScrollQueue = _MarkReadOnScrollQueue();\n+ bool _markReadOnScrollBusy = false;\n+\n+ /// Returns true on success, false on failure.\n+ Future _sendMarkReadOnScrollRequest(List toSend) async {\n+ assert(toSend.isNotEmpty);\n+\n+ // TODO(#1581) mark as read locally for latency compensation\n+ // (in Unreads and on the message objects)\n+ try {\n+ await updateMessageFlags(connection,\n+ messages: toSend,\n+ op: UpdateMessageFlagsOp.add,\n+ flag: MessageFlag.read);\n+ } on ApiRequestException {\n+ // TODO(#1581) un-mark as read locally?\n+ return false;\n+ }\n+ return true;\n+ }\n+\n+ @override\n+ void markReadFromScroll(Iterable messageIds) async {\n+ assert(!_disposed);\n+ _markReadOnScrollQueue.addAll(messageIds);\n+ if (_markReadOnScrollBusy) return;\n+\n+ _markReadOnScrollBusy = true;\n+ try {\n+ do {\n+ final toSend = [];\n+ int numFromQueue = 0;\n+ for (final messageId in _markReadOnScrollQueue.iterable) {\n+ if (toSend.length == _markReadOnScrollBatchSize) {\n+ break;\n+ }\n+ final message = messages[messageId];\n+ if (message != null && !message.flags.contains(MessageFlag.read)) {\n+ toSend.add(message.id);\n+ }\n+ numFromQueue++;\n+ }\n+\n+ if (toSend.isEmpty || await _sendMarkReadOnScrollRequest(toSend)) {\n+ if (_disposed) return;\n+ _markReadOnScrollQueue.removeFirstN(numFromQueue);\n+ }\n+ if (_disposed) return;\n+\n+ await Future.delayed(_markReadOnScrollDebounceDuration);\n+ if (_disposed) return;\n+ } while (_markReadOnScrollQueue.isNotEmpty);\n+ } finally {\n+ if (!_disposed) {\n+ _markReadOnScrollBusy = false;\n+ }\n+ }\n+ }\n+\n @override\n Future sendMessage({required MessageDestination destination, required String content}) {\n assert(!_disposed);\n@@ -517,6 +581,34 @@ class MessageStoreImpl extends PerAccountStoreBase with MessageStore, _OutboxMes\n }\n }\n \n+class _MarkReadOnScrollQueue {\n+ _MarkReadOnScrollQueue();\n+\n+ bool get isNotEmpty => _queue.isNotEmpty;\n+\n+ final _set = {};\n+ final _queue = QueueList();\n+\n+ /// Add [messageIds] to the end of the queue,\n+ /// if they aren't already in the queue.\n+ void addAll(Iterable messageIds) {\n+ for (final messageId in messageIds) {\n+ if (_set.add(messageId)) {\n+ _queue.add(messageId);\n+ }\n+ }\n+ }\n+\n+ Iterable get iterable => _queue;\n+\n+ void removeFirstN(int n) {\n+ for (int i = 0; i < n; i++) {\n+ if (_queue.isEmpty) break;\n+ _set.remove(_queue.removeFirst());\n+ }\n+ }\n+}\n+\n /// The duration an outbox message stays hidden to the user.\n ///\n /// See [OutboxMessageState.waiting].\ndiff --git a/lib/model/message_list.dart b/lib/model/message_list.dart\nindex a7aff0dcbc..f30d7fac0a 100644\n--- a/lib/model/message_list.dart\n+++ b/lib/model/message_list.dart\n@@ -222,6 +222,17 @@ mixin _MessageSequence {\n return binarySearchByKey(items, messageId, _compareItemToMessageId);\n }\n \n+ Iterable? getMessagesRange(int firstMessageId, int lastMessageId) {\n+ assert(firstMessageId <= lastMessageId);\n+ final firstIndex = _findMessageWithId(firstMessageId);\n+ final lastIndex = _findMessageWithId(lastMessageId);\n+ if (firstIndex == -1 || lastIndex == -1) {\n+ // TODO(log)\n+ return null;\n+ }\n+ return messages.getRange(firstIndex, lastIndex + 1);\n+ }\n+\n static int _compareItemToMessageId(MessageListItem item, int messageId) {\n switch (item) {\n case MessageListRecipientHeaderItem(:var message):\ndiff --git a/lib/model/schema_versions.g.dart b/lib/model/schema_versions.g.dart\nindex 4fcfc67a06..5712a94fbb 100644\n--- a/lib/model/schema_versions.g.dart\n+++ b/lib/model/schema_versions.g.dart\n@@ -441,6 +441,82 @@ i1.GeneratedColumn _column_13(String aliasedName) =>\n true,\n type: i1.DriftSqlType.string,\n );\n+\n+final class Schema8 extends i0.VersionedSchema {\n+ Schema8({required super.database}) : super(version: 8);\n+ @override\n+ late final List entities = [\n+ globalSettings,\n+ boolGlobalSettings,\n+ accounts,\n+ ];\n+ late final Shape5 globalSettings = Shape5(\n+ source: i0.VersionedTable(\n+ entityName: 'global_settings',\n+ withoutRowId: false,\n+ isStrict: false,\n+ tableConstraints: [],\n+ columns: [_column_9, _column_10, _column_13, _column_14],\n+ attachedDatabase: database,\n+ ),\n+ alias: null,\n+ );\n+ late final Shape3 boolGlobalSettings = Shape3(\n+ source: i0.VersionedTable(\n+ entityName: 'bool_global_settings',\n+ withoutRowId: false,\n+ isStrict: false,\n+ tableConstraints: ['PRIMARY KEY(name)'],\n+ columns: [_column_11, _column_12],\n+ attachedDatabase: database,\n+ ),\n+ alias: null,\n+ );\n+ late final Shape0 accounts = Shape0(\n+ source: i0.VersionedTable(\n+ entityName: 'accounts',\n+ withoutRowId: false,\n+ isStrict: false,\n+ tableConstraints: [\n+ 'UNIQUE(realm_url, user_id)',\n+ 'UNIQUE(realm_url, email)',\n+ ],\n+ columns: [\n+ _column_0,\n+ _column_1,\n+ _column_2,\n+ _column_3,\n+ _column_4,\n+ _column_5,\n+ _column_6,\n+ _column_7,\n+ _column_8,\n+ ],\n+ attachedDatabase: database,\n+ ),\n+ alias: null,\n+ );\n+}\n+\n+class Shape5 extends i0.VersionedTable {\n+ Shape5({required super.source, required super.alias}) : super.aliased();\n+ i1.GeneratedColumn get themeSetting =>\n+ columnsByName['theme_setting']! as i1.GeneratedColumn;\n+ i1.GeneratedColumn get browserPreference =>\n+ columnsByName['browser_preference']! as i1.GeneratedColumn;\n+ i1.GeneratedColumn get visitFirstUnread =>\n+ columnsByName['visit_first_unread']! as i1.GeneratedColumn;\n+ i1.GeneratedColumn get markReadOnScroll =>\n+ columnsByName['mark_read_on_scroll']! as i1.GeneratedColumn;\n+}\n+\n+i1.GeneratedColumn _column_14(String aliasedName) =>\n+ i1.GeneratedColumn(\n+ 'mark_read_on_scroll',\n+ aliasedName,\n+ true,\n+ type: i1.DriftSqlType.string,\n+ );\n i0.MigrationStepWithVersion migrationSteps({\n required Future Function(i1.Migrator m, Schema2 schema) from1To2,\n required Future Function(i1.Migrator m, Schema3 schema) from2To3,\n@@ -448,6 +524,7 @@ i0.MigrationStepWithVersion migrationSteps({\n required Future Function(i1.Migrator m, Schema5 schema) from4To5,\n required Future Function(i1.Migrator m, Schema6 schema) from5To6,\n required Future Function(i1.Migrator m, Schema7 schema) from6To7,\n+ required Future Function(i1.Migrator m, Schema8 schema) from7To8,\n }) {\n return (currentVersion, database) async {\n switch (currentVersion) {\n@@ -481,6 +558,11 @@ i0.MigrationStepWithVersion migrationSteps({\n final migrator = i1.Migrator(database, schema);\n await from6To7(migrator, schema);\n return 7;\n+ case 7:\n+ final schema = Schema8(database: database);\n+ final migrator = i1.Migrator(database, schema);\n+ await from7To8(migrator, schema);\n+ return 8;\n default:\n throw ArgumentError.value('Unknown migration from $currentVersion');\n }\n@@ -494,6 +576,7 @@ i1.OnUpgrade stepByStep({\n required Future Function(i1.Migrator m, Schema5 schema) from4To5,\n required Future Function(i1.Migrator m, Schema6 schema) from5To6,\n required Future Function(i1.Migrator m, Schema7 schema) from6To7,\n+ required Future Function(i1.Migrator m, Schema8 schema) from7To8,\n }) => i0.VersionedSchema.stepByStepHelper(\n step: migrationSteps(\n from1To2: from1To2,\n@@ -502,5 +585,6 @@ i1.OnUpgrade stepByStep({\n from4To5: from4To5,\n from5To6: from5To6,\n from6To7: from6To7,\n+ from7To8: from7To8,\n ),\n );\ndiff --git a/lib/model/settings.dart b/lib/model/settings.dart\nindex d3393292a6..298980a395 100644\n--- a/lib/model/settings.dart\n+++ b/lib/model/settings.dart\n@@ -67,6 +67,26 @@ enum VisitFirstUnreadSetting {\n static VisitFirstUnreadSetting _default = conversations;\n }\n \n+/// The user's choice of which message-list views should\n+/// automatically mark messages as read when scrolling through them.\n+///\n+/// This can be overridden by local state: for example, if you've just tapped\n+/// \"Mark as unread from here\" the view will stop marking as read automatically,\n+/// regardless of this setting.\n+enum MarkReadOnScrollSetting {\n+ /// All views.\n+ always,\n+\n+ /// Only conversation views.\n+ conversations,\n+\n+ /// No views.\n+ never;\n+\n+ /// The effective value of this setting if the user hasn't set it.\n+ static MarkReadOnScrollSetting _default = conversations;\n+}\n+\n /// A general category of account-independent setting the user might set.\n ///\n /// Different kinds of settings call for different treatment in the UI,\n@@ -277,6 +297,33 @@ class GlobalSettingsStore extends ChangeNotifier {\n };\n }\n \n+ /// The user's choice of [MarkReadOnScrollSetting], applying our default.\n+ ///\n+ /// See also [markReadOnScrollForNarrow] and [setMarkReadOnScroll].\n+ MarkReadOnScrollSetting get markReadOnScroll {\n+ return _data.markReadOnScroll ?? MarkReadOnScrollSetting._default;\n+ }\n+\n+ /// Set [markReadOnScroll], persistently for future runs of the app.\n+ Future setMarkReadOnScroll(MarkReadOnScrollSetting value) async {\n+ await _update(GlobalSettingsCompanion(markReadOnScroll: Value(value)));\n+ }\n+\n+ /// The value that [markReadOnScroll] works out to for the given narrow.\n+ bool markReadOnScrollForNarrow(Narrow narrow) {\n+ return switch (markReadOnScroll) {\n+ MarkReadOnScrollSetting.always => true,\n+ MarkReadOnScrollSetting.never => false,\n+ MarkReadOnScrollSetting.conversations => switch (narrow) {\n+ TopicNarrow() || DmNarrow()\n+ => true,\n+ CombinedFeedNarrow() || ChannelNarrow()\n+ || MentionsNarrow() || StarredMessagesNarrow()\n+ => false,\n+ },\n+ };\n+ }\n+\n /// The user's choice of the given bool-valued setting, or our default for it.\n ///\n /// See also [setBool].\ndiff --git a/lib/model/store.dart b/lib/model/store.dart\nindex 5171807a8e..8fad731f5c 100644\n--- a/lib/model/store.dart\n+++ b/lib/model/store.dart\n@@ -758,6 +758,9 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor\n void unregisterMessageList(MessageListView view) =>\n _messages.unregisterMessageList(view);\n @override\n+ void markReadFromScroll(Iterable messageIds) =>\n+ _messages.markReadFromScroll(messageIds);\n+ @override\n Future sendMessage({required MessageDestination destination, required String content}) {\n assert(!_disposed);\n return _messages.sendMessage(destination: destination, content: content);\ndiff --git a/lib/widgets/action_sheet.dart b/lib/widgets/action_sheet.dart\nindex 5c29b590de..a78ba323c7 100644\n--- a/lib/widgets/action_sheet.dart\n+++ b/lib/widgets/action_sheet.dart\n@@ -896,9 +896,11 @@ class MarkAsUnreadButton extends MessageActionSheetMenuItemButton {\n }\n \n @override void onPressed() async {\n- final narrow = findMessageListPage().narrow;\n+ final messageListPage = findMessageListPage();\n unawaited(ZulipAction.markNarrowAsUnreadFromMessage(pageContext,\n- message, narrow));\n+ message, messageListPage.narrow));\n+ // TODO should we alert the user about this change somehow? A snackbar?\n+ messageListPage.markReadOnScroll = false;\n }\n }\n \ndiff --git a/lib/widgets/message_list.dart b/lib/widgets/message_list.dart\nindex 14c33ad5fd..75c8b5cee0 100644\n--- a/lib/widgets/message_list.dart\n+++ b/lib/widgets/message_list.dart\n@@ -5,6 +5,7 @@ import 'package:intl/intl.dart' hide TextDirection;\n \n import '../api/model/model.dart';\n import '../generated/l10n/zulip_localizations.dart';\n+import '../model/database.dart';\n import '../model/message.dart';\n import '../model/message_list.dart';\n import '../model/narrow.dart';\n@@ -139,6 +140,14 @@ abstract class MessageListPageState {\n ///\n /// This is null if [MessageList] has not mounted yet.\n MessageListView? get model;\n+\n+ /// This view's decision whether to mark read on scroll,\n+ /// overriding [GlobalSettings.markReadOnScroll].\n+ ///\n+ /// For example, this is set to false after pressing\n+ /// \"Mark as unread from here\" in the message action sheet.\n+ bool? get markReadOnScroll;\n+ set markReadOnScroll(bool? value);\n }\n \n class MessageListPage extends StatefulWidget {\n@@ -172,6 +181,32 @@ class MessageListPage extends StatefulWidget {\n \n @override\n State createState() => _MessageListPageState();\n+\n+ /// In debug mode, controls whether mark-read-on-scroll is enabled,\n+ /// overriding [GlobalSettings.markReadOnScroll]\n+ /// and [MessageListPageState.markReadOnScroll].\n+ ///\n+ /// Outside of debug mode, this is always true and the setter has no effect.\n+ static bool get debugEnableMarkReadOnScroll {\n+ bool result = true;\n+ assert(() {\n+ result = _debugEnableMarkReadOnScroll;\n+ return true;\n+ }());\n+ return result;\n+ }\n+ static bool _debugEnableMarkReadOnScroll = true;\n+ static set debugEnableMarkReadOnScroll(bool value) {\n+ assert(() {\n+ _debugEnableMarkReadOnScroll = value;\n+ return true;\n+ }());\n+ }\n+\n+ @visibleForTesting\n+ static void debugReset() {\n+ _debugEnableMarkReadOnScroll = true;\n+ }\n }\n \n class _MessageListPageState extends State implements MessageListPageState {\n@@ -186,6 +221,16 @@ class _MessageListPageState extends State implements MessageLis\n MessageListView? get model => _messageListKey.currentState?.model;\n final GlobalKey<_MessageListState> _messageListKey = GlobalKey();\n \n+ @override\n+ bool? get markReadOnScroll => _markReadOnScroll;\n+ bool? _markReadOnScroll;\n+ @override\n+ set markReadOnScroll(bool? value) {\n+ setState(() {\n+ _markReadOnScroll = value;\n+ });\n+ }\n+\n @override\n void initState() {\n super.initState();\n@@ -298,6 +343,7 @@ class _MessageListPageState extends State implements MessageLis\n narrow: narrow,\n initAnchor: initAnchor,\n onNarrowChanged: _narrowChanged,\n+ markReadOnScroll: markReadOnScroll,\n ))),\n if (ComposeBox.hasComposeBox(narrow))\n ComposeBox(key: _composeBoxKey, narrow: narrow)\n@@ -503,17 +549,21 @@ class MessageList extends StatefulWidget {\n required this.narrow,\n required this.initAnchor,\n required this.onNarrowChanged,\n+ required this.markReadOnScroll,\n });\n \n final Narrow narrow;\n final Anchor initAnchor;\n final void Function(Narrow newNarrow) onNarrowChanged;\n+ final bool? markReadOnScroll;\n \n @override\n State createState() => _MessageListState();\n }\n \n class _MessageListState extends State with PerAccountStoreAwareStateMixin {\n+ final GlobalKey _scrollViewKey = GlobalKey();\n+\n MessageListView get model => _model!;\n MessageListView? _model;\n \n@@ -552,6 +602,17 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n bool _prevFetched = false;\n \n void _modelChanged() {\n+ // When you're scrolling quickly, our mark-as-read requests include the\n+ // messages *between* _messagesRecentlyInViewport and the messages currently\n+ // in view, so that messages don't get left out because you were scrolling\n+ // so fast that they never rendered onscreen.\n+ //\n+ // Here, the onscreen messages might be totally different,\n+ // and not because of scrolling; e.g. because the narrow changed.\n+ // Avoid \"filling in\" a mark-as-read request with totally wrong messages,\n+ // by forgetting the old range.\n+ _messagesRecentlyInViewport = null;\n+\n if (model.narrow != widget.narrow) {\n // Either:\n // - A message move event occurred, where propagate mode is\n@@ -576,7 +637,120 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n _prevFetched = model.fetched;\n }\n \n+ /// Find the range of message IDs on screen, as a (first, last) tuple,\n+ /// or null if no messages are onscreen.\n+ ///\n+ /// A message is considered onscreen if its bottom edge is in the viewport.\n+ ///\n+ /// Ignores outbox messages.\n+ (int, int)? _findMessagesInViewport() {\n+ final scrollViewElement = _scrollViewKey.currentContext as Element;\n+ final scrollViewRenderObject = scrollViewElement.renderObject as RenderBox;\n+\n+ int? first;\n+ int? last;\n+ void visit(Element element) {\n+ final widget = element.widget;\n+ switch (widget) {\n+ case RecipientHeader():\n+ case DateSeparator():\n+ case MarkAsReadWidget():\n+ // MessageItems won't be descendants of these\n+ return;\n+\n+ case MessageItem(item: MessageListOutboxMessageItem()):\n+ return; // ignore outbox\n+\n+ case MessageItem(item: MessageListMessageItem(:final message)):\n+ final isInViewport = _isMessageItemInViewport(\n+ element, scrollViewRenderObject: scrollViewRenderObject);\n+ if (isInViewport) {\n+ if (first == null) {\n+ assert(last == null);\n+ first = message.id;\n+ last = message.id;\n+ return;\n+ }\n+ if (message.id < first!) {\n+ first = message.id;\n+ }\n+ if (last! < message.id) {\n+ last = message.id;\n+ }\n+ }\n+ return; // no need to look for more MessageItems inside this one\n+\n+ default:\n+ element.visitChildElements(visit);\n+ }\n+ }\n+ scrollViewElement.visitChildElements(visit);\n+\n+ if (first == null) {\n+ assert(last == null);\n+ return null;\n+ }\n+ return (first!, last!);\n+ }\n+\n+ bool _isMessageItemInViewport(\n+ Element element, {\n+ required RenderBox scrollViewRenderObject,\n+ }) {\n+ assert(element.widget is MessageItem\n+ && (element.widget as MessageItem).item is MessageListMessageItem);\n+ final viewportHeight = scrollViewRenderObject.size.height;\n+\n+ final messageRenderObject = element.renderObject as RenderBox;\n+\n+ final messageBottom = messageRenderObject.localToGlobal(\n+ Offset(0, messageRenderObject.size.height),\n+ ancestor: scrollViewRenderObject).dy;\n+\n+ return 0 < messageBottom && messageBottom <= viewportHeight;\n+ }\n+\n+ (int, int)? _messagesRecentlyInViewport;\n+\n+ void _markReadFromScroll() {\n+ final currentRange = _findMessagesInViewport();\n+ if (currentRange == null) return;\n+\n+ final (currentFirst, currentLast) = currentRange;\n+ final (prevFirst, prevLast) = _messagesRecentlyInViewport ?? (null, null);\n+\n+ // (\"Hull\" as in the \"convex hull\" around the old and new ranges.)\n+ final firstOfHull = switch ((prevFirst, currentFirst)) {\n+ (int previous, int current) => previous < current ? previous : current,\n+ ( _, int current) => current,\n+ };\n+\n+ final lastOfHull = switch ((prevLast, currentLast)) {\n+ (int previous, int current) => previous > current ? previous : current,\n+ ( _, int current) => current,\n+ };\n+\n+ final sublist = model.getMessagesRange(firstOfHull, lastOfHull);\n+ if (sublist == null) {\n+ _messagesRecentlyInViewport = null;\n+ return;\n+ }\n+ model.store.markReadFromScroll(sublist.map((message) => message.id));\n+\n+ _messagesRecentlyInViewport = currentRange;\n+ }\n+\n+ bool _effectiveMarkReadOnScroll() {\n+ if (!MessageListPage.debugEnableMarkReadOnScroll) return false;\n+ return widget.markReadOnScroll\n+ ?? GlobalStoreWidget.settingsOf(context).markReadOnScrollForNarrow(widget.narrow);\n+ }\n+\n void _handleScrollMetrics(ScrollMetrics scrollMetrics) {\n+ if (_effectiveMarkReadOnScroll()) {\n+ _markReadFromScroll();\n+ }\n+\n if (scrollMetrics.extentAfter == 0) {\n _scrollToBottomVisible.value = false;\n } else {\n@@ -745,6 +919,8 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n }\n \n return MessageListScrollView(\n+ key: _scrollViewKey,\n+\n // TODO: Offer `ScrollViewKeyboardDismissBehavior.interactive` (or\n // similar) if that is ever offered:\n // https://github.com/flutter/flutter/issues/57609#issuecomment-1355340849\ndiff --git a/lib/widgets/settings.dart b/lib/widgets/settings.dart\nindex 449be11313..394415a8be 100644\n--- a/lib/widgets/settings.dart\n+++ b/lib/widgets/settings.dart\n@@ -24,6 +24,7 @@ class SettingsPage extends StatelessWidget {\n const _ThemeSetting(),\n const _BrowserPreferenceSetting(),\n const _VisitFirstUnreadSetting(),\n+ const _MarkReadOnScrollSetting(),\n if (GlobalSettingsStore.experimentalFeatureFlags.isNotEmpty)\n ListTile(\n title: Text(zulipLocalizations.experimentalFeatureSettingsPageTitle),\n@@ -150,6 +151,86 @@ class VisitFirstUnreadSettingPage extends StatelessWidget {\n }\n }\n \n+class _MarkReadOnScrollSetting extends StatelessWidget {\n+ const _MarkReadOnScrollSetting();\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n+ final globalSettings = GlobalStoreWidget.settingsOf(context);\n+ return ListTile(\n+ title: Text(zulipLocalizations.markReadOnScrollSettingTitle),\n+ subtitle: Text(MarkReadOnScrollSettingPage._valueDisplayName(\n+ globalSettings.markReadOnScroll, zulipLocalizations: zulipLocalizations)),\n+ onTap: () => Navigator.push(context,\n+ MarkReadOnScrollSettingPage.buildRoute()));\n+ }\n+}\n+\n+class MarkReadOnScrollSettingPage extends StatelessWidget {\n+ const MarkReadOnScrollSettingPage({super.key});\n+\n+ static WidgetRoute buildRoute() {\n+ return MaterialWidgetRoute(page: const MarkReadOnScrollSettingPage());\n+ }\n+\n+ static String _valueDisplayName(MarkReadOnScrollSetting value, {\n+ required ZulipLocalizations zulipLocalizations,\n+ }) {\n+ return switch (value) {\n+ MarkReadOnScrollSetting.always =>\n+ zulipLocalizations.markReadOnScrollSettingAlways,\n+ MarkReadOnScrollSetting.conversations =>\n+ zulipLocalizations.markReadOnScrollSettingConversations,\n+ MarkReadOnScrollSetting.never =>\n+ zulipLocalizations.markReadOnScrollSettingNever,\n+ };\n+ }\n+\n+ static String? _valueDescription(MarkReadOnScrollSetting value, {\n+ required ZulipLocalizations zulipLocalizations,\n+ }) {\n+ return switch (value) {\n+ MarkReadOnScrollSetting.always => null,\n+ MarkReadOnScrollSetting.conversations =>\n+ zulipLocalizations.markReadOnScrollSettingConversationsDescription,\n+ MarkReadOnScrollSetting.never => null,\n+ };\n+ }\n+\n+ void _handleChange(BuildContext context, MarkReadOnScrollSetting? value) {\n+ if (value == null) return; // TODO(log); can this actually happen? how?\n+ final globalSettings = GlobalStoreWidget.settingsOf(context);\n+ globalSettings.setMarkReadOnScroll(value);\n+ }\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n+ final globalSettings = GlobalStoreWidget.settingsOf(context);\n+ return Scaffold(\n+ appBar: AppBar(title: Text(zulipLocalizations.markReadOnScrollSettingTitle)),\n+ body: Column(children: [\n+ ListTile(title: Text(zulipLocalizations.markReadOnScrollSettingDescription)),\n+ for (final value in MarkReadOnScrollSetting.values)\n+ RadioListTile.adaptive(\n+ title: Text(_valueDisplayName(value,\n+ zulipLocalizations: zulipLocalizations)),\n+ subtitle: () {\n+ final result = _valueDescription(value,\n+ zulipLocalizations: zulipLocalizations);\n+ return result == null ? null : Text(result);\n+ }(),\n+ value: value,\n+ // TODO(#1545) stop using the deprecated members\n+ // ignore: deprecated_member_use\n+ groupValue: globalSettings.markReadOnScroll,\n+ // ignore: deprecated_member_use\n+ onChanged: (newValue) => _handleChange(context, newValue)),\n+ ]));\n+ }\n+}\n+\n class ExperimentalFeaturesPage extends StatelessWidget {\n const ExperimentalFeaturesPage({super.key});\n \n", "test_patch": "diff --git a/test/model/schemas/drift_schema_v8.json b/test/model/schemas/drift_schema_v8.json\nnew file mode 100644\nindex 0000000000..62f8ca43d0\n--- /dev/null\n+++ b/test/model/schemas/drift_schema_v8.json\n@@ -0,0 +1,1 @@\n+{\"_meta\":{\"description\":\"This file contains a serialized version of schema entities for drift.\",\"version\":\"1.2.0\"},\"options\":{\"store_date_time_values_as_text\":false},\"entities\":[{\"id\":0,\"references\":[],\"type\":\"table\",\"data\":{\"name\":\"global_settings\",\"was_declared_in_moor\":false,\"columns\":[{\"name\":\"theme_setting\",\"getter_name\":\"themeSetting\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const EnumNameConverter(ThemeSetting.values)\",\"dart_type_name\":\"ThemeSetting\"}},{\"name\":\"browser_preference\",\"getter_name\":\"browserPreference\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const EnumNameConverter(BrowserPreference.values)\",\"dart_type_name\":\"BrowserPreference\"}},{\"name\":\"visit_first_unread\",\"getter_name\":\"visitFirstUnread\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const EnumNameConverter(VisitFirstUnreadSetting.values)\",\"dart_type_name\":\"VisitFirstUnreadSetting\"}},{\"name\":\"mark_read_on_scroll\",\"getter_name\":\"markReadOnScroll\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const EnumNameConverter(MarkReadOnScrollSetting.values)\",\"dart_type_name\":\"MarkReadOnScrollSetting\"}}],\"is_virtual\":false,\"without_rowid\":false,\"constraints\":[]}},{\"id\":1,\"references\":[],\"type\":\"table\",\"data\":{\"name\":\"bool_global_settings\",\"was_declared_in_moor\":false,\"columns\":[{\"name\":\"name\",\"getter_name\":\"name\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"value\",\"getter_name\":\"value\",\"moor_type\":\"bool\",\"nullable\":false,\"customConstraints\":null,\"defaultConstraints\":\"CHECK (\\\"value\\\" IN (0, 1))\",\"dialectAwareDefaultConstraints\":{\"sqlite\":\"CHECK (\\\"value\\\" IN (0, 1))\"},\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]}],\"is_virtual\":false,\"without_rowid\":false,\"constraints\":[],\"explicit_pk\":[\"name\"]}},{\"id\":2,\"references\":[],\"type\":\"table\",\"data\":{\"name\":\"accounts\",\"was_declared_in_moor\":false,\"columns\":[{\"name\":\"id\",\"getter_name\":\"id\",\"moor_type\":\"int\",\"nullable\":false,\"customConstraints\":null,\"defaultConstraints\":\"PRIMARY KEY AUTOINCREMENT\",\"dialectAwareDefaultConstraints\":{\"sqlite\":\"PRIMARY KEY AUTOINCREMENT\"},\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[\"auto-increment\"]},{\"name\":\"realm_url\",\"getter_name\":\"realmUrl\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const UriConverter()\",\"dart_type_name\":\"Uri\"}},{\"name\":\"user_id\",\"getter_name\":\"userId\",\"moor_type\":\"int\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"email\",\"getter_name\":\"email\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"api_key\",\"getter_name\":\"apiKey\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"zulip_version\",\"getter_name\":\"zulipVersion\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"zulip_merge_base\",\"getter_name\":\"zulipMergeBase\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"zulip_feature_level\",\"getter_name\":\"zulipFeatureLevel\",\"moor_type\":\"int\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"acked_push_token\",\"getter_name\":\"ackedPushToken\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]}],\"is_virtual\":false,\"without_rowid\":false,\"constraints\":[],\"unique_keys\":[[\"realm_url\",\"user_id\"],[\"realm_url\",\"email\"]]}}]}\n\\ No newline at end of file\ndiff --git a/test/model/schemas/schema.dart b/test/model/schemas/schema.dart\nindex 87de9194d3..746206e453 100644\n--- a/test/model/schemas/schema.dart\n+++ b/test/model/schemas/schema.dart\n@@ -10,6 +10,7 @@ import 'schema_v4.dart' as v4;\n import 'schema_v5.dart' as v5;\n import 'schema_v6.dart' as v6;\n import 'schema_v7.dart' as v7;\n+import 'schema_v8.dart' as v8;\n \n class GeneratedHelper implements SchemaInstantiationHelper {\n @override\n@@ -29,10 +30,12 @@ class GeneratedHelper implements SchemaInstantiationHelper {\n return v6.DatabaseAtV6(db);\n case 7:\n return v7.DatabaseAtV7(db);\n+ case 8:\n+ return v8.DatabaseAtV8(db);\n default:\n throw MissingSchemaException(version, versions);\n }\n }\n \n- static const versions = const [1, 2, 3, 4, 5, 6, 7];\n+ static const versions = const [1, 2, 3, 4, 5, 6, 7, 8];\n }\ndiff --git a/test/model/schemas/schema_v8.dart b/test/model/schemas/schema_v8.dart\nnew file mode 100644\nindex 0000000000..fb17863b15\n--- /dev/null\n+++ b/test/model/schemas/schema_v8.dart\n@@ -0,0 +1,967 @@\n+// dart format width=80\n+// GENERATED CODE, DO NOT EDIT BY HAND.\n+// ignore_for_file: type=lint\n+import 'package:drift/drift.dart';\n+\n+class GlobalSettings extends Table\n+ with TableInfo {\n+ @override\n+ final GeneratedDatabase attachedDatabase;\n+ final String? _alias;\n+ GlobalSettings(this.attachedDatabase, [this._alias]);\n+ late final GeneratedColumn themeSetting = GeneratedColumn(\n+ 'theme_setting',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ late final GeneratedColumn browserPreference =\n+ GeneratedColumn(\n+ 'browser_preference',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ late final GeneratedColumn visitFirstUnread = GeneratedColumn(\n+ 'visit_first_unread',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ late final GeneratedColumn markReadOnScroll = GeneratedColumn(\n+ 'mark_read_on_scroll',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ @override\n+ List get $columns => [\n+ themeSetting,\n+ browserPreference,\n+ visitFirstUnread,\n+ markReadOnScroll,\n+ ];\n+ @override\n+ String get aliasedName => _alias ?? actualTableName;\n+ @override\n+ String get actualTableName => $name;\n+ static const String $name = 'global_settings';\n+ @override\n+ Set get $primaryKey => const {};\n+ @override\n+ GlobalSettingsData map(Map data, {String? tablePrefix}) {\n+ final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';\n+ return GlobalSettingsData(\n+ themeSetting: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}theme_setting'],\n+ ),\n+ browserPreference: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}browser_preference'],\n+ ),\n+ visitFirstUnread: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}visit_first_unread'],\n+ ),\n+ markReadOnScroll: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}mark_read_on_scroll'],\n+ ),\n+ );\n+ }\n+\n+ @override\n+ GlobalSettings createAlias(String alias) {\n+ return GlobalSettings(attachedDatabase, alias);\n+ }\n+}\n+\n+class GlobalSettingsData extends DataClass\n+ implements Insertable {\n+ final String? themeSetting;\n+ final String? browserPreference;\n+ final String? visitFirstUnread;\n+ final String? markReadOnScroll;\n+ const GlobalSettingsData({\n+ this.themeSetting,\n+ this.browserPreference,\n+ this.visitFirstUnread,\n+ this.markReadOnScroll,\n+ });\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ if (!nullToAbsent || themeSetting != null) {\n+ map['theme_setting'] = Variable(themeSetting);\n+ }\n+ if (!nullToAbsent || browserPreference != null) {\n+ map['browser_preference'] = Variable(browserPreference);\n+ }\n+ if (!nullToAbsent || visitFirstUnread != null) {\n+ map['visit_first_unread'] = Variable(visitFirstUnread);\n+ }\n+ if (!nullToAbsent || markReadOnScroll != null) {\n+ map['mark_read_on_scroll'] = Variable(markReadOnScroll);\n+ }\n+ return map;\n+ }\n+\n+ GlobalSettingsCompanion toCompanion(bool nullToAbsent) {\n+ return GlobalSettingsCompanion(\n+ themeSetting: themeSetting == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(themeSetting),\n+ browserPreference: browserPreference == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(browserPreference),\n+ visitFirstUnread: visitFirstUnread == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(visitFirstUnread),\n+ markReadOnScroll: markReadOnScroll == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(markReadOnScroll),\n+ );\n+ }\n+\n+ factory GlobalSettingsData.fromJson(\n+ Map json, {\n+ ValueSerializer? serializer,\n+ }) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return GlobalSettingsData(\n+ themeSetting: serializer.fromJson(json['themeSetting']),\n+ browserPreference: serializer.fromJson(\n+ json['browserPreference'],\n+ ),\n+ visitFirstUnread: serializer.fromJson(json['visitFirstUnread']),\n+ markReadOnScroll: serializer.fromJson(json['markReadOnScroll']),\n+ );\n+ }\n+ @override\n+ Map toJson({ValueSerializer? serializer}) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return {\n+ 'themeSetting': serializer.toJson(themeSetting),\n+ 'browserPreference': serializer.toJson(browserPreference),\n+ 'visitFirstUnread': serializer.toJson(visitFirstUnread),\n+ 'markReadOnScroll': serializer.toJson(markReadOnScroll),\n+ };\n+ }\n+\n+ GlobalSettingsData copyWith({\n+ Value themeSetting = const Value.absent(),\n+ Value browserPreference = const Value.absent(),\n+ Value visitFirstUnread = const Value.absent(),\n+ Value markReadOnScroll = const Value.absent(),\n+ }) => GlobalSettingsData(\n+ themeSetting: themeSetting.present ? themeSetting.value : this.themeSetting,\n+ browserPreference: browserPreference.present\n+ ? browserPreference.value\n+ : this.browserPreference,\n+ visitFirstUnread: visitFirstUnread.present\n+ ? visitFirstUnread.value\n+ : this.visitFirstUnread,\n+ markReadOnScroll: markReadOnScroll.present\n+ ? markReadOnScroll.value\n+ : this.markReadOnScroll,\n+ );\n+ GlobalSettingsData copyWithCompanion(GlobalSettingsCompanion data) {\n+ return GlobalSettingsData(\n+ themeSetting: data.themeSetting.present\n+ ? data.themeSetting.value\n+ : this.themeSetting,\n+ browserPreference: data.browserPreference.present\n+ ? data.browserPreference.value\n+ : this.browserPreference,\n+ visitFirstUnread: data.visitFirstUnread.present\n+ ? data.visitFirstUnread.value\n+ : this.visitFirstUnread,\n+ markReadOnScroll: data.markReadOnScroll.present\n+ ? data.markReadOnScroll.value\n+ : this.markReadOnScroll,\n+ );\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('GlobalSettingsData(')\n+ ..write('themeSetting: $themeSetting, ')\n+ ..write('browserPreference: $browserPreference, ')\n+ ..write('visitFirstUnread: $visitFirstUnread, ')\n+ ..write('markReadOnScroll: $markReadOnScroll')\n+ ..write(')'))\n+ .toString();\n+ }\n+\n+ @override\n+ int get hashCode => Object.hash(\n+ themeSetting,\n+ browserPreference,\n+ visitFirstUnread,\n+ markReadOnScroll,\n+ );\n+ @override\n+ bool operator ==(Object other) =>\n+ identical(this, other) ||\n+ (other is GlobalSettingsData &&\n+ other.themeSetting == this.themeSetting &&\n+ other.browserPreference == this.browserPreference &&\n+ other.visitFirstUnread == this.visitFirstUnread &&\n+ other.markReadOnScroll == this.markReadOnScroll);\n+}\n+\n+class GlobalSettingsCompanion extends UpdateCompanion {\n+ final Value themeSetting;\n+ final Value browserPreference;\n+ final Value visitFirstUnread;\n+ final Value markReadOnScroll;\n+ final Value rowid;\n+ const GlobalSettingsCompanion({\n+ this.themeSetting = const Value.absent(),\n+ this.browserPreference = const Value.absent(),\n+ this.visitFirstUnread = const Value.absent(),\n+ this.markReadOnScroll = const Value.absent(),\n+ this.rowid = const Value.absent(),\n+ });\n+ GlobalSettingsCompanion.insert({\n+ this.themeSetting = const Value.absent(),\n+ this.browserPreference = const Value.absent(),\n+ this.visitFirstUnread = const Value.absent(),\n+ this.markReadOnScroll = const Value.absent(),\n+ this.rowid = const Value.absent(),\n+ });\n+ static Insertable custom({\n+ Expression? themeSetting,\n+ Expression? browserPreference,\n+ Expression? visitFirstUnread,\n+ Expression? markReadOnScroll,\n+ Expression? rowid,\n+ }) {\n+ return RawValuesInsertable({\n+ if (themeSetting != null) 'theme_setting': themeSetting,\n+ if (browserPreference != null) 'browser_preference': browserPreference,\n+ if (visitFirstUnread != null) 'visit_first_unread': visitFirstUnread,\n+ if (markReadOnScroll != null) 'mark_read_on_scroll': markReadOnScroll,\n+ if (rowid != null) 'rowid': rowid,\n+ });\n+ }\n+\n+ GlobalSettingsCompanion copyWith({\n+ Value? themeSetting,\n+ Value? browserPreference,\n+ Value? visitFirstUnread,\n+ Value? markReadOnScroll,\n+ Value? rowid,\n+ }) {\n+ return GlobalSettingsCompanion(\n+ themeSetting: themeSetting ?? this.themeSetting,\n+ browserPreference: browserPreference ?? this.browserPreference,\n+ visitFirstUnread: visitFirstUnread ?? this.visitFirstUnread,\n+ markReadOnScroll: markReadOnScroll ?? this.markReadOnScroll,\n+ rowid: rowid ?? this.rowid,\n+ );\n+ }\n+\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ if (themeSetting.present) {\n+ map['theme_setting'] = Variable(themeSetting.value);\n+ }\n+ if (browserPreference.present) {\n+ map['browser_preference'] = Variable(browserPreference.value);\n+ }\n+ if (visitFirstUnread.present) {\n+ map['visit_first_unread'] = Variable(visitFirstUnread.value);\n+ }\n+ if (markReadOnScroll.present) {\n+ map['mark_read_on_scroll'] = Variable(markReadOnScroll.value);\n+ }\n+ if (rowid.present) {\n+ map['rowid'] = Variable(rowid.value);\n+ }\n+ return map;\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('GlobalSettingsCompanion(')\n+ ..write('themeSetting: $themeSetting, ')\n+ ..write('browserPreference: $browserPreference, ')\n+ ..write('visitFirstUnread: $visitFirstUnread, ')\n+ ..write('markReadOnScroll: $markReadOnScroll, ')\n+ ..write('rowid: $rowid')\n+ ..write(')'))\n+ .toString();\n+ }\n+}\n+\n+class BoolGlobalSettings extends Table\n+ with TableInfo {\n+ @override\n+ final GeneratedDatabase attachedDatabase;\n+ final String? _alias;\n+ BoolGlobalSettings(this.attachedDatabase, [this._alias]);\n+ late final GeneratedColumn name = GeneratedColumn(\n+ 'name',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn value = GeneratedColumn(\n+ 'value',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.bool,\n+ requiredDuringInsert: true,\n+ defaultConstraints: GeneratedColumn.constraintIsAlways(\n+ 'CHECK (\"value\" IN (0, 1))',\n+ ),\n+ );\n+ @override\n+ List get $columns => [name, value];\n+ @override\n+ String get aliasedName => _alias ?? actualTableName;\n+ @override\n+ String get actualTableName => $name;\n+ static const String $name = 'bool_global_settings';\n+ @override\n+ Set get $primaryKey => {name};\n+ @override\n+ BoolGlobalSettingsData map(Map data, {String? tablePrefix}) {\n+ final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';\n+ return BoolGlobalSettingsData(\n+ name: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}name'],\n+ )!,\n+ value: attachedDatabase.typeMapping.read(\n+ DriftSqlType.bool,\n+ data['${effectivePrefix}value'],\n+ )!,\n+ );\n+ }\n+\n+ @override\n+ BoolGlobalSettings createAlias(String alias) {\n+ return BoolGlobalSettings(attachedDatabase, alias);\n+ }\n+}\n+\n+class BoolGlobalSettingsData extends DataClass\n+ implements Insertable {\n+ final String name;\n+ final bool value;\n+ const BoolGlobalSettingsData({required this.name, required this.value});\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ map['name'] = Variable(name);\n+ map['value'] = Variable(value);\n+ return map;\n+ }\n+\n+ BoolGlobalSettingsCompanion toCompanion(bool nullToAbsent) {\n+ return BoolGlobalSettingsCompanion(name: Value(name), value: Value(value));\n+ }\n+\n+ factory BoolGlobalSettingsData.fromJson(\n+ Map json, {\n+ ValueSerializer? serializer,\n+ }) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return BoolGlobalSettingsData(\n+ name: serializer.fromJson(json['name']),\n+ value: serializer.fromJson(json['value']),\n+ );\n+ }\n+ @override\n+ Map toJson({ValueSerializer? serializer}) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return {\n+ 'name': serializer.toJson(name),\n+ 'value': serializer.toJson(value),\n+ };\n+ }\n+\n+ BoolGlobalSettingsData copyWith({String? name, bool? value}) =>\n+ BoolGlobalSettingsData(\n+ name: name ?? this.name,\n+ value: value ?? this.value,\n+ );\n+ BoolGlobalSettingsData copyWithCompanion(BoolGlobalSettingsCompanion data) {\n+ return BoolGlobalSettingsData(\n+ name: data.name.present ? data.name.value : this.name,\n+ value: data.value.present ? data.value.value : this.value,\n+ );\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('BoolGlobalSettingsData(')\n+ ..write('name: $name, ')\n+ ..write('value: $value')\n+ ..write(')'))\n+ .toString();\n+ }\n+\n+ @override\n+ int get hashCode => Object.hash(name, value);\n+ @override\n+ bool operator ==(Object other) =>\n+ identical(this, other) ||\n+ (other is BoolGlobalSettingsData &&\n+ other.name == this.name &&\n+ other.value == this.value);\n+}\n+\n+class BoolGlobalSettingsCompanion\n+ extends UpdateCompanion {\n+ final Value name;\n+ final Value value;\n+ final Value rowid;\n+ const BoolGlobalSettingsCompanion({\n+ this.name = const Value.absent(),\n+ this.value = const Value.absent(),\n+ this.rowid = const Value.absent(),\n+ });\n+ BoolGlobalSettingsCompanion.insert({\n+ required String name,\n+ required bool value,\n+ this.rowid = const Value.absent(),\n+ }) : name = Value(name),\n+ value = Value(value);\n+ static Insertable custom({\n+ Expression? name,\n+ Expression? value,\n+ Expression? rowid,\n+ }) {\n+ return RawValuesInsertable({\n+ if (name != null) 'name': name,\n+ if (value != null) 'value': value,\n+ if (rowid != null) 'rowid': rowid,\n+ });\n+ }\n+\n+ BoolGlobalSettingsCompanion copyWith({\n+ Value? name,\n+ Value? value,\n+ Value? rowid,\n+ }) {\n+ return BoolGlobalSettingsCompanion(\n+ name: name ?? this.name,\n+ value: value ?? this.value,\n+ rowid: rowid ?? this.rowid,\n+ );\n+ }\n+\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ if (name.present) {\n+ map['name'] = Variable(name.value);\n+ }\n+ if (value.present) {\n+ map['value'] = Variable(value.value);\n+ }\n+ if (rowid.present) {\n+ map['rowid'] = Variable(rowid.value);\n+ }\n+ return map;\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('BoolGlobalSettingsCompanion(')\n+ ..write('name: $name, ')\n+ ..write('value: $value, ')\n+ ..write('rowid: $rowid')\n+ ..write(')'))\n+ .toString();\n+ }\n+}\n+\n+class Accounts extends Table with TableInfo {\n+ @override\n+ final GeneratedDatabase attachedDatabase;\n+ final String? _alias;\n+ Accounts(this.attachedDatabase, [this._alias]);\n+ late final GeneratedColumn id = GeneratedColumn(\n+ 'id',\n+ aliasedName,\n+ false,\n+ hasAutoIncrement: true,\n+ type: DriftSqlType.int,\n+ requiredDuringInsert: false,\n+ defaultConstraints: GeneratedColumn.constraintIsAlways(\n+ 'PRIMARY KEY AUTOINCREMENT',\n+ ),\n+ );\n+ late final GeneratedColumn realmUrl = GeneratedColumn(\n+ 'realm_url',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn userId = GeneratedColumn(\n+ 'user_id',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.int,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn email = GeneratedColumn(\n+ 'email',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn apiKey = GeneratedColumn(\n+ 'api_key',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn zulipVersion = GeneratedColumn(\n+ 'zulip_version',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn zulipMergeBase = GeneratedColumn(\n+ 'zulip_merge_base',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ late final GeneratedColumn zulipFeatureLevel = GeneratedColumn(\n+ 'zulip_feature_level',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.int,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn ackedPushToken = GeneratedColumn(\n+ 'acked_push_token',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ @override\n+ List get $columns => [\n+ id,\n+ realmUrl,\n+ userId,\n+ email,\n+ apiKey,\n+ zulipVersion,\n+ zulipMergeBase,\n+ zulipFeatureLevel,\n+ ackedPushToken,\n+ ];\n+ @override\n+ String get aliasedName => _alias ?? actualTableName;\n+ @override\n+ String get actualTableName => $name;\n+ static const String $name = 'accounts';\n+ @override\n+ Set get $primaryKey => {id};\n+ @override\n+ List> get uniqueKeys => [\n+ {realmUrl, userId},\n+ {realmUrl, email},\n+ ];\n+ @override\n+ AccountsData map(Map data, {String? tablePrefix}) {\n+ final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';\n+ return AccountsData(\n+ id: attachedDatabase.typeMapping.read(\n+ DriftSqlType.int,\n+ data['${effectivePrefix}id'],\n+ )!,\n+ realmUrl: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}realm_url'],\n+ )!,\n+ userId: attachedDatabase.typeMapping.read(\n+ DriftSqlType.int,\n+ data['${effectivePrefix}user_id'],\n+ )!,\n+ email: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}email'],\n+ )!,\n+ apiKey: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}api_key'],\n+ )!,\n+ zulipVersion: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}zulip_version'],\n+ )!,\n+ zulipMergeBase: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}zulip_merge_base'],\n+ ),\n+ zulipFeatureLevel: attachedDatabase.typeMapping.read(\n+ DriftSqlType.int,\n+ data['${effectivePrefix}zulip_feature_level'],\n+ )!,\n+ ackedPushToken: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}acked_push_token'],\n+ ),\n+ );\n+ }\n+\n+ @override\n+ Accounts createAlias(String alias) {\n+ return Accounts(attachedDatabase, alias);\n+ }\n+}\n+\n+class AccountsData extends DataClass implements Insertable {\n+ final int id;\n+ final String realmUrl;\n+ final int userId;\n+ final String email;\n+ final String apiKey;\n+ final String zulipVersion;\n+ final String? zulipMergeBase;\n+ final int zulipFeatureLevel;\n+ final String? ackedPushToken;\n+ const AccountsData({\n+ required this.id,\n+ required this.realmUrl,\n+ required this.userId,\n+ required this.email,\n+ required this.apiKey,\n+ required this.zulipVersion,\n+ this.zulipMergeBase,\n+ required this.zulipFeatureLevel,\n+ this.ackedPushToken,\n+ });\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ map['id'] = Variable(id);\n+ map['realm_url'] = Variable(realmUrl);\n+ map['user_id'] = Variable(userId);\n+ map['email'] = Variable(email);\n+ map['api_key'] = Variable(apiKey);\n+ map['zulip_version'] = Variable(zulipVersion);\n+ if (!nullToAbsent || zulipMergeBase != null) {\n+ map['zulip_merge_base'] = Variable(zulipMergeBase);\n+ }\n+ map['zulip_feature_level'] = Variable(zulipFeatureLevel);\n+ if (!nullToAbsent || ackedPushToken != null) {\n+ map['acked_push_token'] = Variable(ackedPushToken);\n+ }\n+ return map;\n+ }\n+\n+ AccountsCompanion toCompanion(bool nullToAbsent) {\n+ return AccountsCompanion(\n+ id: Value(id),\n+ realmUrl: Value(realmUrl),\n+ userId: Value(userId),\n+ email: Value(email),\n+ apiKey: Value(apiKey),\n+ zulipVersion: Value(zulipVersion),\n+ zulipMergeBase: zulipMergeBase == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(zulipMergeBase),\n+ zulipFeatureLevel: Value(zulipFeatureLevel),\n+ ackedPushToken: ackedPushToken == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(ackedPushToken),\n+ );\n+ }\n+\n+ factory AccountsData.fromJson(\n+ Map json, {\n+ ValueSerializer? serializer,\n+ }) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return AccountsData(\n+ id: serializer.fromJson(json['id']),\n+ realmUrl: serializer.fromJson(json['realmUrl']),\n+ userId: serializer.fromJson(json['userId']),\n+ email: serializer.fromJson(json['email']),\n+ apiKey: serializer.fromJson(json['apiKey']),\n+ zulipVersion: serializer.fromJson(json['zulipVersion']),\n+ zulipMergeBase: serializer.fromJson(json['zulipMergeBase']),\n+ zulipFeatureLevel: serializer.fromJson(json['zulipFeatureLevel']),\n+ ackedPushToken: serializer.fromJson(json['ackedPushToken']),\n+ );\n+ }\n+ @override\n+ Map toJson({ValueSerializer? serializer}) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return {\n+ 'id': serializer.toJson(id),\n+ 'realmUrl': serializer.toJson(realmUrl),\n+ 'userId': serializer.toJson(userId),\n+ 'email': serializer.toJson(email),\n+ 'apiKey': serializer.toJson(apiKey),\n+ 'zulipVersion': serializer.toJson(zulipVersion),\n+ 'zulipMergeBase': serializer.toJson(zulipMergeBase),\n+ 'zulipFeatureLevel': serializer.toJson(zulipFeatureLevel),\n+ 'ackedPushToken': serializer.toJson(ackedPushToken),\n+ };\n+ }\n+\n+ AccountsData copyWith({\n+ int? id,\n+ String? realmUrl,\n+ int? userId,\n+ String? email,\n+ String? apiKey,\n+ String? zulipVersion,\n+ Value zulipMergeBase = const Value.absent(),\n+ int? zulipFeatureLevel,\n+ Value ackedPushToken = const Value.absent(),\n+ }) => AccountsData(\n+ id: id ?? this.id,\n+ realmUrl: realmUrl ?? this.realmUrl,\n+ userId: userId ?? this.userId,\n+ email: email ?? this.email,\n+ apiKey: apiKey ?? this.apiKey,\n+ zulipVersion: zulipVersion ?? this.zulipVersion,\n+ zulipMergeBase: zulipMergeBase.present\n+ ? zulipMergeBase.value\n+ : this.zulipMergeBase,\n+ zulipFeatureLevel: zulipFeatureLevel ?? this.zulipFeatureLevel,\n+ ackedPushToken: ackedPushToken.present\n+ ? ackedPushToken.value\n+ : this.ackedPushToken,\n+ );\n+ AccountsData copyWithCompanion(AccountsCompanion data) {\n+ return AccountsData(\n+ id: data.id.present ? data.id.value : this.id,\n+ realmUrl: data.realmUrl.present ? data.realmUrl.value : this.realmUrl,\n+ userId: data.userId.present ? data.userId.value : this.userId,\n+ email: data.email.present ? data.email.value : this.email,\n+ apiKey: data.apiKey.present ? data.apiKey.value : this.apiKey,\n+ zulipVersion: data.zulipVersion.present\n+ ? data.zulipVersion.value\n+ : this.zulipVersion,\n+ zulipMergeBase: data.zulipMergeBase.present\n+ ? data.zulipMergeBase.value\n+ : this.zulipMergeBase,\n+ zulipFeatureLevel: data.zulipFeatureLevel.present\n+ ? data.zulipFeatureLevel.value\n+ : this.zulipFeatureLevel,\n+ ackedPushToken: data.ackedPushToken.present\n+ ? data.ackedPushToken.value\n+ : this.ackedPushToken,\n+ );\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('AccountsData(')\n+ ..write('id: $id, ')\n+ ..write('realmUrl: $realmUrl, ')\n+ ..write('userId: $userId, ')\n+ ..write('email: $email, ')\n+ ..write('apiKey: $apiKey, ')\n+ ..write('zulipVersion: $zulipVersion, ')\n+ ..write('zulipMergeBase: $zulipMergeBase, ')\n+ ..write('zulipFeatureLevel: $zulipFeatureLevel, ')\n+ ..write('ackedPushToken: $ackedPushToken')\n+ ..write(')'))\n+ .toString();\n+ }\n+\n+ @override\n+ int get hashCode => Object.hash(\n+ id,\n+ realmUrl,\n+ userId,\n+ email,\n+ apiKey,\n+ zulipVersion,\n+ zulipMergeBase,\n+ zulipFeatureLevel,\n+ ackedPushToken,\n+ );\n+ @override\n+ bool operator ==(Object other) =>\n+ identical(this, other) ||\n+ (other is AccountsData &&\n+ other.id == this.id &&\n+ other.realmUrl == this.realmUrl &&\n+ other.userId == this.userId &&\n+ other.email == this.email &&\n+ other.apiKey == this.apiKey &&\n+ other.zulipVersion == this.zulipVersion &&\n+ other.zulipMergeBase == this.zulipMergeBase &&\n+ other.zulipFeatureLevel == this.zulipFeatureLevel &&\n+ other.ackedPushToken == this.ackedPushToken);\n+}\n+\n+class AccountsCompanion extends UpdateCompanion {\n+ final Value id;\n+ final Value realmUrl;\n+ final Value userId;\n+ final Value email;\n+ final Value apiKey;\n+ final Value zulipVersion;\n+ final Value zulipMergeBase;\n+ final Value zulipFeatureLevel;\n+ final Value ackedPushToken;\n+ const AccountsCompanion({\n+ this.id = const Value.absent(),\n+ this.realmUrl = const Value.absent(),\n+ this.userId = const Value.absent(),\n+ this.email = const Value.absent(),\n+ this.apiKey = const Value.absent(),\n+ this.zulipVersion = const Value.absent(),\n+ this.zulipMergeBase = const Value.absent(),\n+ this.zulipFeatureLevel = const Value.absent(),\n+ this.ackedPushToken = const Value.absent(),\n+ });\n+ AccountsCompanion.insert({\n+ this.id = const Value.absent(),\n+ required String realmUrl,\n+ required int userId,\n+ required String email,\n+ required String apiKey,\n+ required String zulipVersion,\n+ this.zulipMergeBase = const Value.absent(),\n+ required int zulipFeatureLevel,\n+ this.ackedPushToken = const Value.absent(),\n+ }) : realmUrl = Value(realmUrl),\n+ userId = Value(userId),\n+ email = Value(email),\n+ apiKey = Value(apiKey),\n+ zulipVersion = Value(zulipVersion),\n+ zulipFeatureLevel = Value(zulipFeatureLevel);\n+ static Insertable custom({\n+ Expression? id,\n+ Expression? realmUrl,\n+ Expression? userId,\n+ Expression? email,\n+ Expression? apiKey,\n+ Expression? zulipVersion,\n+ Expression? zulipMergeBase,\n+ Expression? zulipFeatureLevel,\n+ Expression? ackedPushToken,\n+ }) {\n+ return RawValuesInsertable({\n+ if (id != null) 'id': id,\n+ if (realmUrl != null) 'realm_url': realmUrl,\n+ if (userId != null) 'user_id': userId,\n+ if (email != null) 'email': email,\n+ if (apiKey != null) 'api_key': apiKey,\n+ if (zulipVersion != null) 'zulip_version': zulipVersion,\n+ if (zulipMergeBase != null) 'zulip_merge_base': zulipMergeBase,\n+ if (zulipFeatureLevel != null) 'zulip_feature_level': zulipFeatureLevel,\n+ if (ackedPushToken != null) 'acked_push_token': ackedPushToken,\n+ });\n+ }\n+\n+ AccountsCompanion copyWith({\n+ Value? id,\n+ Value? realmUrl,\n+ Value? userId,\n+ Value? email,\n+ Value? apiKey,\n+ Value? zulipVersion,\n+ Value? zulipMergeBase,\n+ Value? zulipFeatureLevel,\n+ Value? ackedPushToken,\n+ }) {\n+ return AccountsCompanion(\n+ id: id ?? this.id,\n+ realmUrl: realmUrl ?? this.realmUrl,\n+ userId: userId ?? this.userId,\n+ email: email ?? this.email,\n+ apiKey: apiKey ?? this.apiKey,\n+ zulipVersion: zulipVersion ?? this.zulipVersion,\n+ zulipMergeBase: zulipMergeBase ?? this.zulipMergeBase,\n+ zulipFeatureLevel: zulipFeatureLevel ?? this.zulipFeatureLevel,\n+ ackedPushToken: ackedPushToken ?? this.ackedPushToken,\n+ );\n+ }\n+\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ if (id.present) {\n+ map['id'] = Variable(id.value);\n+ }\n+ if (realmUrl.present) {\n+ map['realm_url'] = Variable(realmUrl.value);\n+ }\n+ if (userId.present) {\n+ map['user_id'] = Variable(userId.value);\n+ }\n+ if (email.present) {\n+ map['email'] = Variable(email.value);\n+ }\n+ if (apiKey.present) {\n+ map['api_key'] = Variable(apiKey.value);\n+ }\n+ if (zulipVersion.present) {\n+ map['zulip_version'] = Variable(zulipVersion.value);\n+ }\n+ if (zulipMergeBase.present) {\n+ map['zulip_merge_base'] = Variable(zulipMergeBase.value);\n+ }\n+ if (zulipFeatureLevel.present) {\n+ map['zulip_feature_level'] = Variable(zulipFeatureLevel.value);\n+ }\n+ if (ackedPushToken.present) {\n+ map['acked_push_token'] = Variable(ackedPushToken.value);\n+ }\n+ return map;\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('AccountsCompanion(')\n+ ..write('id: $id, ')\n+ ..write('realmUrl: $realmUrl, ')\n+ ..write('userId: $userId, ')\n+ ..write('email: $email, ')\n+ ..write('apiKey: $apiKey, ')\n+ ..write('zulipVersion: $zulipVersion, ')\n+ ..write('zulipMergeBase: $zulipMergeBase, ')\n+ ..write('zulipFeatureLevel: $zulipFeatureLevel, ')\n+ ..write('ackedPushToken: $ackedPushToken')\n+ ..write(')'))\n+ .toString();\n+ }\n+}\n+\n+class DatabaseAtV8 extends GeneratedDatabase {\n+ DatabaseAtV8(QueryExecutor e) : super(e);\n+ late final GlobalSettings globalSettings = GlobalSettings(this);\n+ late final BoolGlobalSettings boolGlobalSettings = BoolGlobalSettings(this);\n+ late final Accounts accounts = Accounts(this);\n+ @override\n+ Iterable> get allTables =>\n+ allSchemaEntities.whereType>();\n+ @override\n+ List get allSchemaEntities => [\n+ globalSettings,\n+ boolGlobalSettings,\n+ accounts,\n+ ];\n+ @override\n+ int get schemaVersion => 8;\n+}\ndiff --git a/test/model/settings_test.dart b/test/model/settings_test.dart\nindex 89956323e2..b4842ecd04 100644\n--- a/test/model/settings_test.dart\n+++ b/test/model/settings_test.dart\n@@ -80,6 +80,9 @@ void main() {\n // TODO(#1571) test visitFirstUnread applies default\n // TODO(#1571) test shouldVisitFirstUnread\n \n+ // TODO(#1583) test markReadOnScroll applies default\n+ // TODO(#1583) test markReadOnScrollForNarrow\n+\n group('getBool/setBool', () {\n test('get from default', () {\n final globalSettings = eg.globalStore(boolGlobalSettings: {}).settings;\ndiff --git a/test/widgets/action_sheet_test.dart b/test/widgets/action_sheet_test.dart\nindex 16cc36b096..ebb6cb9b71 100644\n--- a/test/widgets/action_sheet_test.dart\n+++ b/test/widgets/action_sheet_test.dart\n@@ -114,6 +114,7 @@ Future setupToMessageActionSheet(WidgetTester tester, {\n void main() {\n TestZulipBinding.ensureInitialized();\n TestWidgetsFlutterBinding.ensureInitialized();\n+ MessageListPage.debugEnableMarkReadOnScroll = false;\n \n void prepareRawContentResponseSuccess({\n required Message message,\ndiff --git a/test/widgets/autocomplete_test.dart b/test/widgets/autocomplete_test.dart\nindex b4ff007a8d..573921b663 100644\n--- a/test/widgets/autocomplete_test.dart\n+++ b/test/widgets/autocomplete_test.dart\n@@ -145,6 +145,7 @@ typedef ExpectedEmoji = (String label, EmojiDisplay display);\n \n void main() {\n TestZulipBinding.ensureInitialized();\n+ MessageListPage.debugEnableMarkReadOnScroll = false;\n \n group('@-mentions', () {\n \ndiff --git a/test/widgets/compose_box_test.dart b/test/widgets/compose_box_test.dart\nindex 70f0913316..76305610c6 100644\n--- a/test/widgets/compose_box_test.dart\n+++ b/test/widgets/compose_box_test.dart\n@@ -43,6 +43,7 @@ import 'test_app.dart';\n \n void main() {\n TestZulipBinding.ensureInitialized();\n+ MessageListPage.debugEnableMarkReadOnScroll = false;\n \n late PerAccountStore store;\n late FakeApiConnection connection;\ndiff --git a/test/widgets/emoji_reaction_test.dart b/test/widgets/emoji_reaction_test.dart\nindex de3ad7227c..9ff4849b1b 100644\n--- a/test/widgets/emoji_reaction_test.dart\n+++ b/test/widgets/emoji_reaction_test.dart\n@@ -36,6 +36,7 @@ import 'text_test.dart';\n \n void main() {\n TestZulipBinding.ensureInitialized();\n+ MessageListPage.debugEnableMarkReadOnScroll = false;\n \n late PerAccountStore store;\n late FakeApiConnection connection;\ndiff --git a/test/widgets/lightbox_test.dart b/test/widgets/lightbox_test.dart\nindex fda7122123..3165222c45 100644\n--- a/test/widgets/lightbox_test.dart\n+++ b/test/widgets/lightbox_test.dart\n@@ -203,6 +203,7 @@ class FakeVideoPlayerPlatform extends Fake\n \n void main() {\n TestZulipBinding.ensureInitialized();\n+ MessageListPage.debugEnableMarkReadOnScroll = false;\n \n group('LightboxHero', () {\n late PerAccountStore store;\ndiff --git a/test/widgets/message_list_test.dart b/test/widgets/message_list_test.dart\nindex f048bf437d..fd8dd6f10b 100644\n--- a/test/widgets/message_list_test.dart\n+++ b/test/widgets/message_list_test.dart\n@@ -52,6 +52,7 @@ import 'test_app.dart';\n \n void main() {\n TestZulipBinding.ensureInitialized();\n+ MessageListPage.debugEnableMarkReadOnScroll = false;\n \n late PerAccountStore store;\n late FakeApiConnection connection;\n", "n2p_tests": "{\"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation content code points not counted unnecessarily\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users 1:1 DMs active user becomes deactivated -> compose box is replaced with a banner\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: message-send request response success\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/emoji_reaction_test.dart: ReactionChipsList smoke (self user): show names when few / google / rtl / text scale: 0.8235\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet StarButton star success\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/emoji_reaction_test.dart: EmojiPicker request has an error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/autocomplete_test.dart: TopicAutocomplete options appear, disappear, and change correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar has topic-list action for channel narrows\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when msglist empty\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar has channel-feed action for topic narrows\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent interrupting message edit: cancel confirmation dialog\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices navigating away sends a \\\"typing stopped\\\" notice\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/emoji_reaction_test.dart: ReactionChipsList smoke (many, varied): show names when few / text / rtl / text scale: 1.3529\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage dispose MessageListView when event queue expired\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton unresolve: weird prefix\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/lightbox_test.dart: _ImageLightboxPage header and footer hidden and shown by tapping image\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton unresolve: happy path\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/emoji_reaction_test.dart: Smoke test for light/dark/lerped\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation content too-long content is rejected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/emoji_reaction_test.dart: ReactionChipsList smoke (many, varied): show names when few / text / rtl / text scale: 0.8235\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/autocomplete_test.dart: @-mentions user options appear, disappear, and change correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton mute\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage MessageListPageState.narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from app bar\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: auto focus ChannelNarrow, empty fetch\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from inbox; message in Unreads and in MessageStore\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent interrupting new-message compose: cancel confirmation dialog\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: sending to empty topic legacy: empty topic -> \\\"(no topic)\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: auto focus TopicNarrow, non-empty fetch\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada removing success; useLegacy: true\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/lightbox_test.dart: _ImageLightboxPage app bar shows sender avatar\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/emoji_reaction_test.dart: EmojiPicker show, search\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when topic is empty\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation topic code points not counted unnecessarily\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent interrupting message edit: proceed through confirmation dialog\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: DmNarrow(allRecipientIds: [1069, 1133]), from restoring a failed edit\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/emoji_reaction_test.dart: EmojiPicker adding success\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton unresolve: request fails\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus request has an error; useLegacy: true\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: TopicNarrow(227, topic), from action sheet\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices selection change sends a \\\"typing started\\\" notice\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/emoji_reaction_test.dart: EmojiPicker handle view paddings with bottom view padding\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with non-empty but vacuous topic, topic input has focus\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: auto focus TopicNarrow, empty fetch\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/lightbox_test.dart: VideoLightboxPage shows a VideoPlayer, and video is playing\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: ChannelNarrow(227), from action sheet\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: auto focus ChannelNarrow, non-empty fetch\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/autocomplete_test.dart: emoji show, update, choose\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/lightbox_test.dart: _ImageLightboxPage app bar shows sender name and date\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation topic too-long topic is rejected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch older messages on scroll basic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox textCapitalization _StreamComposeBox\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet showChannelActionSheet show from inbox\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/autocomplete_test.dart: emoji text emoji means just show text\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/emoji_reaction_test.dart: EmojiPicker handle view paddings no view padding\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton unfollow\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it adding success; useLegacy: false\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox content input scaling normal text scale factor\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/autocomplete_test.dart: TopicAutocomplete autocomplete to realmEmptyTopicDisplayName sets topic to empty string\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: sending to empty topic empty topic -> \\\"\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton request fails with an error dialog\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: ChannelNarrow(227), from restoring a failed edit\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, topic input has focus\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage ancestorOf finds page state from message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/lightbox_test.dart: _ImageLightboxPage shows image\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it request has an error; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: DmNarrow(allRecipientIds: [1069, 1133]), from action sheet\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/lightbox_test.dart: VideoLightboxPage ensure slider doesn't flicker right after it is moved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/autocomplete_test.dart: TopicAutocomplete match realmEmptyTopicDisplayName in autocomplete\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/emoji_reaction_test.dart: ReactionChipsList smoke (same reaction, different users, with one unknown user): show names when few / text / rtl / text scale: 0.8235\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/autocomplete_test.dart: TopicAutocomplete text selection is reset on choosing an option\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/emoji_reaction_test.dart: ReactionChipsList smoke (many, varied): show names when few / google / rtl / text scale: 0.8235\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/lightbox_test.dart: LightboxHero Hero animation occurs smoothly when opening lightbox from message list\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: sending to empty topic if topics are mandatory, reject empty topic\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox content input scaling lower text scale factor\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/lightbox_test.dart: VideoLightboxPage ensure 'seekTo' is called only once\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads but not MessageStore\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation content max-length content not rejected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, topic input has focus, then content input gains focus\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart request has an error; useLegacy: false\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy compose box is shown in channel narrow\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{\"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is external; follow the user preference (iOS)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is null; use our per-platform defaults for non-HTTP links (Android)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getBool/setBool get from initial load\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: setThemeSetting smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is inApp; use platform default for non-http links (Android)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is external; follow the user preference (Android)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is inApp; follow the user preference for http links (iOS)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is inApp; use platform default for non-http links (iOS)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is null; use our per-platform defaults for HTTP links (Android)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is null; use our per-platform defaults for HTTP links (iOS)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getBool/setBool set to null -> revert to default\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: setThemeSetting should notify listeners\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is null; use our per-platform defaults for non-HTTP links (iOS)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getBool/setBool get from default\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is inApp; follow the user preference for http links (Android)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getBool/setBool set, get\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1566", "org": "zulip", "repo": "zulip-flutter", "number": 1566, "state": "closed", "title": "anchors 10/n: Open /near/ links at message", "body": "Fixes #82.\r\n\r\nThis is the next round after #1515 \u2014 and completes #82, as well as bringing us close to #80. (These changes were previously sent as part of #1517.)\r\n\r\nThis branch is a draft only because of a lack of tests. The changes it does have are ready for review.\r\n\r\nThis doesn't implement the other aspect of the behavior of /near/ links, i.e. to follow the message if it's been moved to another conversation. That's tracked as #683.\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"211b545f35ab85301e1be68d8f352d69afd69e4b\"}", "resolved_issues": "[{\"number\": 82, \"title\": \"Open a message list in the middle of history, when requested\", \"body\": \"When the user takes an action that should navigate to a particular \\\"anchor\\\" message (like through #73 internal links, #76 deep links, or a notification), we should take them straight to that message, rather than to the latest message or first unread message in the narrow.\\r\\n\\r\\nThis is a feature the zulip-mobile RN app lacks: https://github.com/zulip/zulip-mobile/issues/3604 . (That's for internal links, but the app doesn't have it for notifications either \\u2014 see `narrowToNotification` which passes no anchor to `doNarrow` \\u2014 and doesn't have deep links.)\\r\\n\\r\\nThere are two parts to this:\\r\\n* Fetch the messages around the desired anchor, rather than around the latest message or the first unread.\\r\\n* Control the scroll position so that we show the desired anchor message.\\r\\n\\r\\nThis has a lot in common with:\\r\\n* #80\\r\\n\\r\\nThis issue has fewer prerequisites technically than #80 \\u2014 no need for #79 first. On the other hand it has more prerequisites before there's a UX context where it makes sense: it'd need either #73, #76, or notifications, all of which are more complex than #79.\"}]", "lang": "dart", "problem_statement": "Open a message list in the middle of history, when requested\nWhen the user takes an action that should navigate to a particular \"anchor\" message (like through #73 internal links, #76 deep links, or a notification), we should take them straight to that message, rather than to the latest message or first unread message in the narrow.\r\n\r\nThis is a feature the zulip-mobile RN app lacks: https://github.com/zulip/zulip-mobile/issues/3604 . (That's for internal links, but the app doesn't have it for notifications either \u2014 see `narrowToNotification` which passes no anchor to `doNarrow` \u2014 and doesn't have deep links.)\r\n\r\nThere are two parts to this:\r\n* Fetch the messages around the desired anchor, rather than around the latest message or the first unread.\r\n* Control the scroll position so that we show the desired anchor message.\r\n\r\nThis has a lot in common with:\r\n* #80\r\n\r\nThis issue has fewer prerequisites technically than #80 \u2014 no need for #79 first. On the other hand it has more prerequisites before there's a UX context where it makes sense: it'd need either #73, #76, or notifications, all of which are more complex than #79.\n", "hints": "Started working on this.\n\nhttps://chat.zulip.org/#narrow/channel/516-mobile-dev-help/topic/Control.20scroll.20position.20on.20new.20and.20newly-fetched.20messages\n\nhttps://github.com/user-attachments/assets/a379256e-3208-48b5-960c-7740a06fe497\n\nhttps://github.com/user-attachments/assets/9feec67c-380e-4e92-9631-37a58ec8d8ab\n\n\nThis came up in beta feedback: [#mobile > Flutter Beta: Some Feedback @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/Flutter.20Beta.3A.20Some.20Feedback/near/2153404)", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1566", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/82\"]", "test_command": "flutter test test/model/internal_link_test.dart test/model/message_list_test.dart test/widgets/content_test.dart test/widgets/message_list_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/internal_link.dart b/lib/model/internal_link.dart\nindex 749f60698c..a552f1679f 100644\n--- a/lib/model/internal_link.dart\n+++ b/lib/model/internal_link.dart\n@@ -109,22 +109,43 @@ Uri narrowLink(PerAccountStore store, Narrow narrow, {int? nearMessageId}) {\n return result;\n }\n \n-/// A [Narrow] from a given URL, on `store`'s realm.\n+/// The result of parsing some URL within a Zulip realm,\n+/// when the URL corresponds to some page in this app.\n+sealed class InternalLink {\n+ InternalLink({required this.realmUrl});\n+\n+ final Uri realmUrl;\n+}\n+\n+/// The result of parsing some URL that points to a narrow on a Zulip realm,\n+/// when the narrow is of a type that this app understands.\n+class NarrowLink extends InternalLink {\n+ NarrowLink(this.narrow, this.nearMessageId, {required super.realmUrl});\n+\n+ final Narrow narrow;\n+ final int? nearMessageId;\n+}\n+\n+/// Try to parse the given URL as a page in this app, on `store`'s realm.\n ///\n /// `url` must already be a result from [PerAccountStore.tryResolveUrl]\n /// on `store`.\n ///\n-/// Returns `null` if any of the operator/operand pairs are invalid.\n+/// Returns null if the URL isn't on this realm,\n+/// or isn't a valid Zulip URL,\n+/// or isn't currently supported as leading to a page in this app.\n ///\n+/// In particular this will return null if `url` is a `/#narrow/\u2026` URL\n+/// and any of the operator/operand pairs are invalid.\n /// Since narrow links can combine operators in ways our [Narrow] type can't\n /// represent, this can also return null for valid narrow links.\n ///\n /// This can also return null for some valid narrow links that our Narrow\n /// type *could* accurately represent. We should try to understand these\n-/// better, but some kinds will be rare, even unheard-of:\n+/// better, but some kinds will be rare, even unheard-of. For example:\n /// #narrow/stream/1-announce/stream/1-announce (duplicated operator)\n // TODO(#252): handle all valid narrow links, returning a search narrow\n-Narrow? parseInternalLink(Uri url, PerAccountStore store) {\n+InternalLink? parseInternalLink(Uri url, PerAccountStore store) {\n if (!_isInternalLink(url, store.realmUrl)) return null;\n \n final (category, segments) = _getCategoryAndSegmentsFromFragment(url.fragment);\n@@ -155,7 +176,7 @@ bool _isInternalLink(Uri url, Uri realmUrl) {\n return (category, segments);\n }\n \n-Narrow? _interpretNarrowSegments(List segments, PerAccountStore store) {\n+NarrowLink? _interpretNarrowSegments(List segments, PerAccountStore store) {\n assert(segments.isNotEmpty);\n assert(segments.length.isEven);\n \n@@ -164,6 +185,7 @@ Narrow? _interpretNarrowSegments(List segments, PerAccountStore store) {\n ApiNarrowDm? dmElement;\n ApiNarrowWith? withElement;\n Set isElementOperands = {};\n+ int? nearMessageId;\n \n for (var i = 0; i < segments.length; i += 2) {\n final (operator, negated) = _parseOperator(segments[i]);\n@@ -201,14 +223,18 @@ Narrow? _interpretNarrowSegments(List segments, PerAccountStore store) {\n // It is fine to have duplicates of the same [IsOperand].\n isElementOperands.add(IsOperand.fromRawString(operand));\n \n- case _NarrowOperator.near: // TODO(#82): support for near\n- continue;\n+ case _NarrowOperator.near:\n+ if (nearMessageId != null) return null;\n+ final messageId = int.tryParse(operand, radix: 10);\n+ if (messageId == null) return null;\n+ nearMessageId = messageId;\n \n case _NarrowOperator.unknown:\n return null;\n }\n }\n \n+ final Narrow? narrow;\n if (isElementOperands.isNotEmpty) {\n if (streamElement != null || topicElement != null || dmElement != null || withElement != null) {\n return null;\n@@ -216,9 +242,9 @@ Narrow? _interpretNarrowSegments(List segments, PerAccountStore store) {\n if (isElementOperands.length > 1) return null;\n switch (isElementOperands.single) {\n case IsOperand.mentioned:\n- return const MentionsNarrow();\n+ narrow = const MentionsNarrow();\n case IsOperand.starred:\n- return const StarredMessagesNarrow();\n+ narrow = const StarredMessagesNarrow();\n case IsOperand.dm:\n case IsOperand.private:\n case IsOperand.alerted:\n@@ -230,17 +256,20 @@ Narrow? _interpretNarrowSegments(List segments, PerAccountStore store) {\n }\n } else if (dmElement != null) {\n if (streamElement != null || topicElement != null || withElement != null) return null;\n- return DmNarrow.withUsers(dmElement.operand, selfUserId: store.selfUserId);\n+ narrow = DmNarrow.withUsers(dmElement.operand, selfUserId: store.selfUserId);\n } else if (streamElement != null) {\n final streamId = streamElement.operand;\n if (topicElement != null) {\n- return TopicNarrow(streamId, topicElement.operand, with_: withElement?.operand);\n+ narrow = TopicNarrow(streamId, topicElement.operand, with_: withElement?.operand);\n } else {\n if (withElement != null) return null;\n- return ChannelNarrow(streamId);\n+ narrow = ChannelNarrow(streamId);\n }\n+ } else {\n+ return null;\n }\n- return null;\n+\n+ return NarrowLink(narrow, nearMessageId, realmUrl: store.realmUrl);\n }\n \n @JsonEnum(fieldRename: FieldRename.kebab, alwaysCreate: true)\ndiff --git a/lib/model/message_list.dart b/lib/model/message_list.dart\nindex 2617f18b68..458478f248 100644\n--- a/lib/model/message_list.dart\n+++ b/lib/model/message_list.dart\n@@ -479,7 +479,7 @@ class MessageListView with ChangeNotifier, _MessageSequence {\n /// which might be made internally by this class in order to\n /// fetch the messages from scratch, e.g. after certain events.\n Anchor get anchor => _anchor;\n- final Anchor _anchor;\n+ Anchor _anchor;\n \n void _register() {\n store.registerMessageList(this);\n@@ -756,6 +756,20 @@ class MessageListView with ChangeNotifier, _MessageSequence {\n }\n }\n \n+ /// Reset this view to start from the newest messages.\n+ ///\n+ /// This will set [anchor] to [AnchorCode.newest],\n+ /// and cause messages to be re-fetched from scratch.\n+ void jumpToEnd() {\n+ assert(fetched);\n+ assert(!haveNewest);\n+ assert(anchor != AnchorCode.newest);\n+ _anchor = AnchorCode.newest;\n+ _reset();\n+ notifyListeners();\n+ fetchInitial();\n+ }\n+\n /// Add [outboxMessage] if it belongs to the view.\n void addOutboxMessage(OutboxMessage outboxMessage) {\n // TODO(#1441) implement this\ndiff --git a/lib/notifications/display.dart b/lib/notifications/display.dart\nindex 081a2cf633..6e2585e135 100644\n--- a/lib/notifications/display.dart\n+++ b/lib/notifications/display.dart\n@@ -513,7 +513,7 @@ class NotificationDisplayManager {\n \n return MessageListPage.buildRoute(\n accountId: account.id,\n- // TODO(#82): Open at specific message, not just conversation\n+ // TODO(#1565): Open at specific message, not just conversation\n narrow: payload.narrow);\n }\n \ndiff --git a/lib/widgets/content.dart b/lib/widgets/content.dart\nindex 62801ab867..44411434fd 100644\n--- a/lib/widgets/content.dart\n+++ b/lib/widgets/content.dart\n@@ -1536,15 +1536,18 @@ void _launchUrl(BuildContext context, String urlString) async {\n return;\n }\n \n- final internalNarrow = parseInternalLink(url, store);\n- if (internalNarrow != null) {\n- unawaited(Navigator.push(context,\n- MessageListPage.buildRoute(context: context,\n- narrow: internalNarrow)));\n- return;\n+ final internalLink = parseInternalLink(url, store);\n+ assert(internalLink == null || internalLink.realmUrl == store.realmUrl);\n+ switch (internalLink) {\n+ case NarrowLink():\n+ unawaited(Navigator.push(context,\n+ MessageListPage.buildRoute(context: context,\n+ narrow: internalLink.narrow,\n+ initAnchorMessageId: internalLink.nearMessageId)));\n+\n+ case null:\n+ await PlatformActions.launchUrl(context, url);\n }\n-\n- await PlatformActions.launchUrl(context, url);\n }\n \n /// Like [Image.network], but includes [authHeader] if [src] is on-realm.\ndiff --git a/lib/widgets/message_list.dart b/lib/widgets/message_list.dart\nindex aa9684b7f2..e1c24249c5 100644\n--- a/lib/widgets/message_list.dart\n+++ b/lib/widgets/message_list.dart\n@@ -141,12 +141,17 @@ abstract class MessageListPageState {\n }\n \n class MessageListPage extends StatefulWidget {\n- const MessageListPage({super.key, required this.initNarrow});\n+ const MessageListPage({\n+ super.key,\n+ required this.initNarrow,\n+ this.initAnchorMessageId,\n+ });\n \n static AccountRoute buildRoute({int? accountId, BuildContext? context,\n- required Narrow narrow}) {\n+ required Narrow narrow, int? initAnchorMessageId}) {\n return MaterialAccountWidgetRoute(accountId: accountId, context: context,\n- page: MessageListPage(initNarrow: narrow));\n+ page: MessageListPage(\n+ initNarrow: narrow, initAnchorMessageId: initAnchorMessageId));\n }\n \n /// The [MessageListPageState] above this context in the tree.\n@@ -162,6 +167,7 @@ class MessageListPage extends StatefulWidget {\n }\n \n final Narrow initNarrow;\n+ final int? initAnchorMessageId; // TODO(#1564) highlight target upon load\n \n @override\n State createState() => _MessageListPageState();\n@@ -240,6 +246,10 @@ class _MessageListPageState extends State implements MessageLis\n actions.add(_TopicListButton(streamId: streamId));\n }\n \n+ // TODO(#80): default to anchor firstUnread, instead of newest\n+ final initAnchor = widget.initAnchorMessageId == null\n+ ? AnchorCode.newest : NumericAnchor(widget.initAnchorMessageId!);\n+\n // Insert a PageRoot here, to provide a context that can be used for\n // MessageListPage.ancestorOf.\n return PageRoot(child: Scaffold(\n@@ -259,7 +269,8 @@ class _MessageListPageState extends State implements MessageLis\n // we matched to the Figma in 21dbae120. See another frame, which uses that:\n // https://www.figma.com/file/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=147%3A9088&mode=dev\n body: Builder(\n- builder: (BuildContext context) => Column(\n+ builder: (BuildContext context) {\n+ return Column(\n // Children are expected to take the full horizontal space\n // and handle the horizontal device insets.\n // The bottom inset should be handled by the last child only.\n@@ -279,11 +290,13 @@ class _MessageListPageState extends State implements MessageLis\n child: MessageList(\n key: _messageListKey,\n narrow: narrow,\n+ initAnchor: initAnchor,\n onNarrowChanged: _narrowChanged,\n ))),\n if (ComposeBox.hasComposeBox(narrow))\n ComposeBox(key: _composeBoxKey, narrow: narrow)\n- ]))));\n+ ]);\n+ })));\n }\n }\n \n@@ -479,9 +492,15 @@ const kFetchMessagesBufferPixels = (kMessageListFetchBatchSize / 2) * _kShortMes\n /// When there is no [ComposeBox], also takes responsibility\n /// for dealing with the bottom inset.\n class MessageList extends StatefulWidget {\n- const MessageList({super.key, required this.narrow, required this.onNarrowChanged});\n+ const MessageList({\n+ super.key,\n+ required this.narrow,\n+ required this.initAnchor,\n+ required this.onNarrowChanged,\n+ });\n \n final Narrow narrow;\n+ final Anchor initAnchor;\n final void Function(Narrow newNarrow) onNarrowChanged;\n \n @override\n@@ -504,8 +523,9 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n \n @override\n void onNewStore() { // TODO(#464) try to keep using old model until new one gets messages\n+ final anchor = _model == null ? widget.initAnchor : _model!.anchor;\n _model?.dispose();\n- _initModel(PerAccountStoreWidget.of(context));\n+ _initModel(PerAccountStoreWidget.of(context), anchor);\n }\n \n @override\n@@ -516,10 +536,7 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n super.dispose();\n }\n \n- void _initModel(PerAccountStore store) {\n- // TODO(#82): get anchor as page/route argument, instead of using newest\n- // TODO(#80): default to anchor firstUnread, instead of newest\n- final anchor = AnchorCode.newest;\n+ void _initModel(PerAccountStore store, Anchor anchor) {\n _model = MessageListView.init(store: store,\n narrow: widget.narrow, anchor: anchor);\n model.addListener(_modelChanged);\n@@ -537,6 +554,7 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n // redirected us to the new location of the operand message ID.\n widget.onNarrowChanged(model.narrow);\n }\n+ // TODO when model reset, reset scroll\n setState(() {\n // The actual state lives in the [MessageListView] model.\n // This method was called because that just changed.\n@@ -568,6 +586,9 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n // still not yet updated to account for the newly-added messages.\n model.fetchOlder();\n }\n+ if (scrollMetrics.extentAfter < kFetchMessagesBufferPixels) {\n+ model.fetchNewer();\n+ }\n }\n \n void _scrollChanged() {\n@@ -618,6 +639,7 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n // MessageList's dartdoc.\n child: SafeArea(\n child: ScrollToBottomButton(\n+ model: model,\n scrollController: scrollController,\n visible: _scrollToBottomVisible))),\n ])))));\n@@ -753,13 +775,21 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n }\n \n Widget _buildEndCap() {\n- return Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [\n- TypingStatusWidget(narrow: widget.narrow),\n- MarkAsReadWidget(narrow: widget.narrow),\n- // To reinforce that the end of the feed has been reached:\n- // https://chat.zulip.org/#narrow/stream/243-mobile-team/topic/flutter.3A.20Mark-as-read/near/1680603\n- const SizedBox(height: 36),\n- ]);\n+ if (model.haveNewest) {\n+ return Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [\n+ TypingStatusWidget(narrow: widget.narrow),\n+ // TODO perhaps offer mark-as-read even when not done fetching?\n+ MarkAsReadWidget(narrow: widget.narrow),\n+ // To reinforce that the end of the feed has been reached:\n+ // https://chat.zulip.org/#narrow/stream/243-mobile-team/topic/flutter.3A.20Mark-as-read/near/1680603\n+ const SizedBox(height: 36),\n+ ]);\n+ } else if (model.busyFetchingMore) {\n+ // See [_buildStartCap] for why this condition shows a loading indicator.\n+ return const _MessageListLoadingMore();\n+ } else {\n+ return SizedBox.shrink();\n+ }\n }\n \n Widget _buildItem(MessageListItem data) {\n@@ -809,13 +839,40 @@ class _MessageListLoadingMore extends StatelessWidget {\n }\n \n class ScrollToBottomButton extends StatelessWidget {\n- const ScrollToBottomButton({super.key, required this.scrollController, required this.visible});\n+ const ScrollToBottomButton({\n+ super.key,\n+ required this.model,\n+ required this.scrollController,\n+ required this.visible,\n+ });\n \n- final ValueNotifier visible;\n+ final MessageListView model;\n final MessageListScrollController scrollController;\n+ final ValueNotifier visible;\n \n void _scrollToBottom() {\n- scrollController.position.scrollToEnd();\n+ if (model.haveNewest) {\n+ // Scrolling smoothly from here to the bottom won't require any requests\n+ // to the server.\n+ // It also probably isn't *that* far away: the user must have scrolled\n+ // here from there (or from near enough that a fetch reached there),\n+ // so scrolling back there -- at top speed -- shouldn't take too long.\n+ // Go for it.\n+ scrollController.position.scrollToEnd();\n+ } else {\n+ // This message list doesn't have the messages for the bottom of history.\n+ // There could be quite a lot of history between here and there --\n+ // for example, at first unread in the combined feed or a busy channel,\n+ // for a user who has some old unreads going back months and years.\n+ // In that case trying to scroll smoothly to the bottom is hopeless.\n+ //\n+ // Given that there were at least 100 messages between this message list's\n+ // initial anchor and the end of history (or else `fetchInitial` would\n+ // have reached the end at the outset), that situation is very likely.\n+ // Even if the end is close by, it's at least one fetch away.\n+ // Instead of scrolling, jump to the end, which is always just one fetch.\n+ model.jumpToEnd();\n+ }\n }\n \n @override\n", "test_patch": "diff --git a/test/model/internal_link_test.dart b/test/model/internal_link_test.dart\nindex 611cc3ece0..824def8cc2 100644\n--- a/test/model/internal_link_test.dart\n+++ b/test/model/internal_link_test.dart\n@@ -160,7 +160,14 @@ void main() {\n test(urlString, () async {\n final store = await setupStore(realmUrl: realmUrl, streams: streams, users: users);\n final url = store.tryResolveUrl(urlString)!;\n- check(parseInternalLink(url, store)).equals(expected);\n+ final result = parseInternalLink(url, store);\n+ if (expected == null) {\n+ check(result).isNull();\n+ } else {\n+ check(result).isA()\n+ ..realmUrl.equals(realmUrl)\n+ ..narrow.equals(expected);\n+ }\n });\n }\n }\n@@ -258,6 +265,9 @@ void main() {\n final url = store.tryResolveUrl(urlString)!;\n final result = parseInternalLink(url, store);\n check(result != null).equals(expected);\n+ if (result != null) {\n+ check(result).realmUrl.equals(realmUrl);\n+ }\n });\n }\n }\n@@ -370,6 +380,8 @@ void main() {\n }\n });\n \n+ // TODO(#1570): test parsing /near/ operator\n+\n group('unexpected link shapes are rejected', () {\n final testCases = [\n ('/#narrow/stream/name/topic/', null), // missing operand\n@@ -564,3 +576,11 @@ void main() {\n });\n });\n }\n+\n+extension InternalLinkChecks on Subject {\n+ Subject get realmUrl => has((x) => x.realmUrl, 'realmUrl');\n+}\n+\n+extension NarrowLinkChecks on Subject {\n+ Subject get narrow => has((x) => x.narrow, 'narrow');\n+}\ndiff --git a/test/model/message_list_test.dart b/test/model/message_list_test.dart\nindex d58de664d8..0eb30c1cbb 100644\n--- a/test/model/message_list_test.dart\n+++ b/test/model/message_list_test.dart\n@@ -566,6 +566,8 @@ void main() {\n });\n });\n \n+ // TODO(#1569): test jumpToEnd\n+\n group('MessageEvent', () {\n test('in narrow', () async {\n final stream = eg.stream();\ndiff --git a/test/widgets/content_test.dart b/test/widgets/content_test.dart\nindex a788225aac..b5150a54ee 100644\n--- a/test/widgets/content_test.dart\n+++ b/test/widgets/content_test.dart\n@@ -1032,6 +1032,8 @@ void main() {\n .page.isA().initNarrow.equals(const ChannelNarrow(1));\n });\n \n+ // TODO(#1570): test links with /near/ go to the specific message\n+\n testWidgets('invalid internal links are opened in browser', (tester) async {\n // Link is invalid due to `topic` operator missing an operand.\n final pushedRoutes = await prepare(tester,\ndiff --git a/test/widgets/message_list_test.dart b/test/widgets/message_list_test.dart\nindex 3b3b01b323..c8928a13ad 100644\n--- a/test/widgets/message_list_test.dart\n+++ b/test/widgets/message_list_test.dart\n@@ -59,6 +59,7 @@ void main() {\n bool foundOldest = true,\n int? messageCount,\n List? messages,\n+ GetMessagesResult? fetchResult,\n List? streams,\n List? users,\n List? subscriptions,\n@@ -83,12 +84,17 @@ void main() {\n // prepare message list data\n await store.addUser(eg.selfUser);\n await store.addUsers(users ?? []);\n- assert((messageCount == null) != (messages == null));\n- messages ??= List.generate(messageCount!, (index) {\n- return eg.streamMessage(sender: eg.selfUser);\n- });\n- connection.prepare(json:\n- eg.newestGetMessagesResult(foundOldest: foundOldest, messages: messages).toJson());\n+ if (fetchResult != null) {\n+ assert(foundOldest && messageCount == null && messages == null);\n+ } else {\n+ assert((messageCount == null) != (messages == null));\n+ messages ??= List.generate(messageCount!, (index) {\n+ return eg.streamMessage(sender: eg.selfUser);\n+ });\n+ fetchResult = eg.newestGetMessagesResult(\n+ foundOldest: foundOldest, messages: messages);\n+ }\n+ connection.prepare(json: fetchResult.toJson());\n \n await tester.pumpWidget(TestZulipApp(accountId: selfAccount.id,\n skipAssertAccountExists: skipAssertAccountExists,\n@@ -368,6 +374,10 @@ void main() {\n });\n \n group('fetch initial batch of messages', () {\n+ // TODO(#1569): test effect of initAnchorMessageId\n+ // TODO(#1569): test that after jumpToEnd, then new store causing new fetch,\n+ // new post-jump anchor prevails over initAnchorMessageId\n+\n group('topic permalink', () {\n final someStream = eg.stream();\n const someTopic = 'some topic';\n@@ -445,6 +455,10 @@ void main() {\n });\n \n group('fetch older messages on scroll', () {\n+ // TODO(#1569): test fetch newer messages on scroll, too;\n+ // in particular test it happens even when near top as well as bottom\n+ // (because may have haveOldest true but haveNewest false)\n+\n int? itemCount(WidgetTester tester) =>\n findScrollView(tester).semanticChildCount;\n \n@@ -656,6 +670,8 @@ void main() {\n check(isButtonVisible(tester)).equals(false);\n });\n \n+ // TODO(#1569): test choice of jumpToEnd vs. scrollToEnd\n+\n testWidgets('scrolls at reasonable, constant speed', (tester) async {\n const maxSpeed = 8000.0;\n const distance = 40000.0;\n@@ -692,6 +708,63 @@ void main() {\n });\n });\n \n+ // TODO test markers at start of list (`_buildStartCap`)\n+\n+ group('markers at end of list', () {\n+ final findLoadingIndicator = find.byType(CircularProgressIndicator);\n+\n+ testWidgets('spacer when have newest', (tester) async {\n+ final messages = List.generate(10,\n+ (i) => eg.streamMessage(content: '

          message $i

          '));\n+ await setupMessageListPage(tester, narrow: CombinedFeedNarrow(),\n+ fetchResult: eg.nearGetMessagesResult(anchor: messages.last.id,\n+ foundOldest: true, foundNewest: true, messages: messages));\n+ check(findMessageListScrollController(tester)!.position)\n+ .extentAfter.equals(0);\n+\n+ // There's no loading indicator.\n+ check(findLoadingIndicator).findsNothing();\n+ // The last message is spaced above the bottom of the viewport.\n+ check(tester.getRect(find.text('message 9')))\n+ .bottom..isGreaterThan(400)..isLessThan(570);\n+ });\n+\n+ testWidgets('loading indicator displaces spacer etc.', (tester) async {\n+ await setupMessageListPage(tester, narrow: CombinedFeedNarrow(),\n+ skipPumpAndSettle: true,\n+ // TODO(#1569) fix realism of this data: foundNewest false should mean\n+ // some messages found after anchor (and then we might need to scroll\n+ // to cause fetching newer messages).\n+ fetchResult: eg.nearGetMessagesResult(anchor: 1000,\n+ foundOldest: true, foundNewest: false,\n+ messages: List.generate(10,\n+ (i) => eg.streamMessage(id: 100 + i, content: '

          message $i

          '))));\n+ await tester.pump();\n+\n+ // The message list will immediately start fetching newer messages.\n+ connection.prepare(json: eg.newerGetMessagesResult(\n+ anchor: 109, foundNewest: true, messages: List.generate(100,\n+ (i) => eg.streamMessage(id: 110 + i))).toJson());\n+ await tester.pump(Duration(milliseconds: 10));\n+ await tester.pump();\n+\n+ // There's a loading indicator.\n+ check(findLoadingIndicator).findsOne();\n+ // It's at the bottom.\n+ check(findMessageListScrollController(tester)!.position)\n+ .extentAfter.equals(0);\n+ final loadingIndicatorRect = tester.getRect(findLoadingIndicator);\n+ check(loadingIndicatorRect).bottom.isGreaterThan(575);\n+ // The last message is shortly above it; no spacer or anything else.\n+ check(tester.getRect(find.text('message 9')))\n+ .bottom.isGreaterThan(loadingIndicatorRect.top - 36); // TODO(#1569) where's this space going?\n+ await tester.pumpAndSettle();\n+ });\n+\n+ // TODO(#1569) test no typing status or mark-read button when not haveNewest\n+ // (even without loading indicator)\n+ });\n+\n group('TypingStatusWidget', () {\n final users = [eg.selfUser, eg.otherUser, eg.thirdUser, eg.fourthUser];\n final finder = find.descendant(\n", "n2p_tests": "{\"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects triple slash: https://example.com///#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/dm/<...>\\\" returns expected DmNarrow /#narrow/dm/1,2-group/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in bold context\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent correctly decodes MediaWiki-style dot-encoded strings \\\"some.arbitrary_text\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/dm/17327-Chris-Bobbe-(Test-Account)/is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric stream ID and topic: #narrow/channel/123-a/topic/topic1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/resolved/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent parses correctly in stream and topic operands /#narrow/channel/some_stream\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/dm/<...>\\\" returns expected DmNarrow /#narrow/dm/a.40b.2Ecom.2Ec.2Ed.2Ecom/with/4\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>\\\" returns expected ChannelNarrow /#narrow/stream/stream/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink edge cases on malformed stream link: reject #narrow/stream/-1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric stream ID and topic: #narrow/stream/123-a/topic/topic1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong path: user_uploads/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/resolved/is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink edge cases on malformed stream link: reject #narrow/stream/1nonsense-general\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchOlder handles servers not understanding includeAnchor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink unexpected link shapes are rejected /#narrow/channel/name/unknown/operand/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink Both `stream` and `channel` can be used interchangeably /#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/stream/subject/topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/pm-with/<...>\\\" returns expected DmNarrow /#narrow/pm-with/a.40b.2Ecom.2Ec.2Ed.2Ecom/near/3\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/dm/17327-Chris-Bobbe-(Test-Account)/is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/unknown\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more nop when already fetching newer\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/unread/is/unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode on internal links valid internal links are navigated to within app\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink unexpected link shapes are rejected /#narrow/stream/name/topic/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink with historic links for stream with hyphens or even looking like new-style #narrow/stream/311/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects double slash: https://example.com//#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions multiple links in paragraph\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong domain, realm-like path, narrow-like fragment: https://web.archive.org/web/*/https://example.com/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/alerted/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/dm/17327-Chris-Bobbe-(Test-Account)/is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent parses correctly in stream and topic operands /#narrow/stream/some_stream/topic/some.2Etopic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in spoiler header\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/stream/subject/topic/with/333\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/check/topic/test/is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects odd scheme, wrong domain, realm-like path, narrow-like fragment: ftp://web.archive.org/web/*/https://example.com/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchOlder nop when already haveOldest true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent correctly decodes MediaWiki-style dot-encoded strings \\\".C2.AF.5C_(.E3.83.84)_.2F.C2.AF\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink CombinedFeedNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: legacy silent channel wildcard @-mention\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/unread/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent correctly decodes MediaWiki-style dot-encoded strings \\\"some.text\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong path: user_uploads/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink Both `stream` and `channel` can be used interchangeably /#narrow/stream/check/topic/test\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/pm-with/<...>\\\" returns expected DmNarrow /#narrow/pm-with/1,2-group/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/dm/17327-Chris-Bobbe-(Test-Account)/is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent correctly decodes MediaWiki-style dot-encoded strings \\\".88.99.AA.BB\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageInlineVideo tapping on preview opens lightbox\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink edge cases basic #narrow/channel/1-general\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent parses correctly in stream and topic operands /#narrow/channel/some.2Estream\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts legacy: stream name, no ID, topic: #narrow/stream/check/topic/topic1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent parses correctly in stream and topic operands /#narrow/channel/some_stream/topic/some.2Etopic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/followed/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/-is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock smoke: math block\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong domain: https://another.com/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/stream/subject/topic/with/asdf\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/unknown/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/topic/test/is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage ancestorOf throws when not a descendant of MessageListPage\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink edge cases if stream not found, use stream ID anyway #narrow/stream/123-topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts legacy: stream name, no ID: #narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/mobile/subject/topic/with/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent parses correctly in stream and topic operands /#narrow/stream/some.2Estream\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric pm user IDs (new operator): #narrow/dm/123-mark\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/starred/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/topic/test/is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent parses correctly in stream and topic operands /#narrow/channel/some_stream/topic/some_topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/unknown\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/-is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/stream/subject/topic/with/asdf\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink ChannelNarrow / TopicNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/check/topic/test\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric stream ID: #narrow/stream/123-check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>\\\" returns expected ChannelNarrow /#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) smoke: strong/bold\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/mentioned/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink unexpected link shapes are rejected /#narrow/stream/name/unknown/operand/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent parses correctly in stream and topic operands /#narrow/stream/some_stream\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/mobile/topic/topic/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/check/topic/test\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink edge cases on malformed stream link: reject #narrow/stream/-general\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/dm/17327-Chris-Bobbe-(Test-Account)/is/unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/-is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain group @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts legacy: stream name, no ID: #narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/check/topic/test/is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Heading plain h6\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/mobile/subject/topic/with/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts ipv4 address: http://192.168.0.1/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/topic/test/is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions error dialog if invalid URL\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink with historic links for stream with hyphens or even looking like new-style #narrow/channel/test-team/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/dm/17327-Chris-Bobbe-(Test-Account)/is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/pm-with/<...>\\\" returns expected DmNarrow /#narrow/pm-with/1,2-group\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/-is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/followed/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>\\\" returns expected ChannelNarrow /#narrow/channel/stream/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/topic/test/is/unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/alerted/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink edge cases on stream link with wrong name, ID wins #narrow/channel/1-\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink normalize links to always include a \\\"/\\\" after hostname\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/topic/test/is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink unexpected link shapes are rejected /#narrow/channel/name/topic/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/check/topic/test/is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink edge cases on stream link with wrong name, ID wins #narrow/channel/1-nonsense\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/topic/test/is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent parses correctly in stream and topic operands /#narrow/stream/some_stream/topic/some.20topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/private/is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/dm/<...>\\\" returns expected DmNarrow /#narrow/dm/a.40b.2Ecom.2Ec.2Ed.2Ecom/near/3\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch older messages on scroll observe double-fetch glitch\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink Both `stream` and `channel` can be used interchangeably /#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink Both `stream` and `channel` can be used interchangeably /#narrow/channel/check/topic/test\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/unknown/is/unknown\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/-is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong fragment: #nope\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink Both `stream` and `channel` can be used interchangeably /#narrow/stream/check/topic/test/near/378333\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchNewer nop when already haveNewest true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/dm/17327-Chris-Bobbe-(Test-Account)/is/unknown\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects triple slash: https://example.com///#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink with historic links for stream with hyphens or even looking like new-style #narrow/stream/311-/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/unread/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/check/topic/test/is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong domain, realm-like path, narrow-like fragment: https://web.archive.org/web/*/https://example.com/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects same domain, realm-like path, narrow-like fragment: web/*/https://example.com/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/mobile/topic/topic/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent parses correctly in stream and topic operands /#narrow/stream/some.20stream\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink edge cases basic #narrow/stream/1-general\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink edge cases if stream not found, use stream ID anyway #narrow/channel/123-topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/dm/<...>\\\" returns expected DmNarrow /#narrow/dm/1,2-group\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink edge cases on malformed stream link: reject #narrow/channel/-1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/private/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/topic/test/is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink edge cases on malformed stream link: reject #narrow/channel/1nonsense-general\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric pm user IDs (old operator): #narrow/pm-with/123-mark\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/dm/is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/stream/topic/topic/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with port: https://example.com:444/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/followed/is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>\\\" returns expected ChannelNarrow /#narrow/stream/topic/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent correctly decodes MediaWiki-style dot-encoded strings \\\"some.2gtext\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/unknown\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong domain: https://another.com/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/stream/subject/topic/with/333\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/mentioned/is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric stream ID: #narrow/channel/123-check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more nop during backoff\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/stream/topic/topic/with/22\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/dm/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/pm-with/<...>\\\" returns expected DmNarrow /#narrow/pm-with/1,2-group/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/check/topic/test/is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/starred/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink edge cases on malformed stream link: reject #narrow/channel/-general\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/dm/<...>\\\" returns expected DmNarrow /#narrow/dm/1,2-group/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/-is/unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/-is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/stream/subject/topic/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/unknown/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/check/topic/test/is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink with historic links for stream with hyphens or even looking like new-style #narrow/channel/311/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/-is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink edge cases on stream link with wrong name, ID wins #narrow/stream/1-\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts legacy: stream name, no ID, topic: #narrow/channel/check/topic/topic1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink with historic links for stream with hyphens or even looking like new-style #narrow/stream/test-team/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent correctly decodes MediaWiki-style dot-encoded strings \\\"some_text\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink MentionsNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent parses correctly in stream and topic operands /#narrow/stream/some_stream/topic/some_topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/dm/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects double slash: https://example.com//#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/mobile/subject/topic/near/378333\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/dm/17327-Chris-Bobbe-(Test-Account)/is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/check/topic/test/is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in table column header\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h3 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink again topic link parsing on old topic link, with dot-encoding #narrow/channel/general/topic/topic\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with port: https://example.com:444/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/private/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>\\\" returns expected ChannelNarrow /#narrow/channel/topic/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/alerted/is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects #narrowly: #narrowly/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink edge cases on stream link with wrong name, ID wins #narrow/stream/1-nonsense\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/stream/subject/topic/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/pm-with/<...>\\\" returns expected DmNarrow /#narrow/pm-with/a.40b.2Ecom.2Ec.2Ed.2Ecom/with/3\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h5 (platform requests bold)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/resolved/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/starred/is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/mobile/subject/topic/near/378333\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in spoiler header\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/topic/test/is/unknown\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/stream/topic/topic/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/topic/test/is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/mentioned/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink Both `stream` and `channel` can be used interchangeably /#narrow/channel/check/topic/test/near/378333\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink DmNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent parses correctly in stream and topic operands /#narrow/channel/some_stream/topic/some.20topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent correctly decodes MediaWiki-style dot-encoded strings \\\"na.C3.AFvet.C3.A9\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects same domain, realm-like path, narrow-like fragment: web/*/https://example.com/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent correctly decodes MediaWiki-style dot-encoded strings \\\"some.2Etext\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink StarredMessagesNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts punycodable host: https://example.\\u092d\\u093e\\u0930\\u0924/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/unknown\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/check/topic/test/is/unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/stream/topic/topic/with/22\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects odd scheme, wrong domain, realm-like path, narrow-like fragment: ftp://web.archive.org/web/*/https://example.com/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent parses correctly in stream and topic operands /#narrow/channel/some.20stream\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>\\\" returns expected ChannelNarrow /#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts ipv4 address: http://192.168.0.1/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji use emoji font (variant: TargetPlatform.iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/check/topic/test/is/unknown\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: decodeHashComponent correctly decodes MediaWiki-style dot-encoded strings \\\"some.20text\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/-is/unknown\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts punycodable host: https://example.\\u092d\\u093e\\u0930\\u0924/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/stream/subject/topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: smoke: emphasis/italic\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/dm/17327-Chris-Bobbe-(Test-Account)/is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{\"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial recent senders track all the messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar has topic-list action for channel narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MathBlock displays KaTeX content with nested sizing\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar has channel-feed action for topic narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage dispose MessageListView when event queue expired\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial short history\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage composeBoxState finds compose box\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar channel icon in channel row; web-public: true, invite-only: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch initial batch of messages topic permalink with message move\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: presents message content appropriately content not asked to consume insets (including bottom), even without compose box\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage MessageListPageState.narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: smoke test for light/dark/lerped\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial sends proper anchor newest\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial early in history\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar show topic visibility policy for topic narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch initial batch of messages topic permalink without message move\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial topic permalinks if no redirect, we still remove \\\"with\\\" element\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchNewer smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar has topic-list action for topic narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage dispose MessageListView when logged out\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial sends proper anchor oldest\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch older messages on scroll basic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar handle empty topics\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial smoke TopicNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial sends proper anchor numeric\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more nop when already fetching older\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageEmbedVideo video preview for youtube embed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage ancestorOf finds page state from message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial sends proper anchor firstUnread\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar channel icon in channel row; web-public: false, invite-only: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar channel icon in channel row; web-public: false, invite-only: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchOlder smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ThematicBreak smoke ThematicBreak\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial smoke CombinedFeedNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage composeBoxState null when no compose box\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial topic permalinks if redirect, we follow it and remove \\\"with\\\" element\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial no messages found\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1517", "org": "zulip", "repo": "zulip-flutter", "number": 1517, "state": "closed", "title": "anchors n/n: Open at first unread", "body": "Fixes #80.\r\n\r\nThis is stacked atop #1566.\r\n\r\nThis is marked as a draft only because of a lack of tests. The functionality is fully implemented, and otherwise ready for review.\r\n\r\n---\r\n\r\nThis implementation has one key difference from the legacy app and from the original plan for #80:\r\n\r\nWhen fetching at first unread, it turns out the resulting /api/get-messages request can be quite slow, if the user's first unread is far back in history (e.g. in combined feed or a busy channel). This seems to be on the server side \u2014 probably it's just a naturally slower query for the database to handle.\r\n\r\nIn retrospect this is probably a major contributor (though far from the only one) to why the legacy RN app has always felt slow to me.\r\n\r\nIn this PR, fetching at first unread therefore (a) is controlled by a setting, and (b) by default is done only for conversation views, not interleaved views.\r\n\r\nIf I turn the setting to \"always go to first unread\", opening my combined feed on chat.zulip.org takes multiple seconds. But then if I tap the \"go to bottom\" button, it loads the newest messages like usual, and that is zippy like zulip-flutter has always been. (Also if I scroll around in history, even way back in the vicinity of the first unread, it remains as zippy as always.)\r\n\r\nWithout that setting (or if the default were \"always go to first unread\"), this would be a substantial regression relative to zulip-flutter main for users who have old unreads, and would give up a large part of this app's ability to impress users with its zippy handling of messages.\r\n\r\n---\r\n\r\nPrevious notes about the portion that now belongs to #1566:\r\n\r\nThe main remaining work this branch needs is tests. There are also some directly user-visible aspects still to do:\r\n* When opening a /near/ link, this PR ensures the feed opens with the target message in view. But it'd be good to visibly highlight the specific message, e.g. by having its background blink once or twice.\r\n\r\n That will probably be a post-launch follow-up \u2014 the lack of it isn't a regression relative to either zulip-flutter main, or the legacy app.\r\n (\u2192 Filed as #1564.)\r\n\r\n* When opening a /near/ link, this doesn't implement following where the message has been moved to.\r\n\r\n That's #683. Currently M6 but arguably should be M5b; either way, won't block this, and most likely won't happen before launch (which is coming soon).\r\n\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"211b545f35ab85301e1be68d8f352d69afd69e4b\"}", "resolved_issues": "[{\"number\": 80, \"title\": \"Open message list at first unread, rather than latest message\", \"body\": \"When navigating to a message list, our default behavior (if there isn't a specific message we're asked to go to) should be to show the first unread message, if any, and the messages around it.\\r\\n\\r\\nThis means\\r\\n* fetching around the `first_unread` anchor (https://zulip.com/api/get-messages), rather than `latest`;\\r\\n* controlling the scroll position so that we show the first unread, if any, and the latest messages otherwise.\\r\\n\\r\\nThis should probably come after:\\r\\n* #79\\r\\n\\r\\nA followup is:\\r\\n* #81\\r\\n\"}, {\"number\": 82, \"title\": \"Open a message list in the middle of history, when requested\", \"body\": \"When the user takes an action that should navigate to a particular \\\"anchor\\\" message (like through #73 internal links, #76 deep links, or a notification), we should take them straight to that message, rather than to the latest message or first unread message in the narrow.\\r\\n\\r\\nThis is a feature the zulip-mobile RN app lacks: https://github.com/zulip/zulip-mobile/issues/3604 . (That's for internal links, but the app doesn't have it for notifications either \\u2014 see `narrowToNotification` which passes no anchor to `doNarrow` \\u2014 and doesn't have deep links.)\\r\\n\\r\\nThere are two parts to this:\\r\\n* Fetch the messages around the desired anchor, rather than around the latest message or the first unread.\\r\\n* Control the scroll position so that we show the desired anchor message.\\r\\n\\r\\nThis has a lot in common with:\\r\\n* #80\\r\\n\\r\\nThis issue has fewer prerequisites technically than #80 \\u2014 no need for #79 first. On the other hand it has more prerequisites before there's a UX context where it makes sense: it'd need either #73, #76, or notifications, all of which are more complex than #79.\"}]", "lang": "dart", "problem_statement": "Open message list at first unread, rather than latest message\nWhen navigating to a message list, our default behavior (if there isn't a specific message we're asked to go to) should be to show the first unread message, if any, and the messages around it.\r\n\r\nThis means\r\n* fetching around the `first_unread` anchor (https://zulip.com/api/get-messages), rather than `latest`;\r\n* controlling the scroll position so that we show the first unread, if any, and the latest messages otherwise.\r\n\r\nThis should probably come after:\r\n* #79\r\n\r\nA followup is:\r\n* #81\r\n\nOpen a message list in the middle of history, when requested\nWhen the user takes an action that should navigate to a particular \"anchor\" message (like through #73 internal links, #76 deep links, or a notification), we should take them straight to that message, rather than to the latest message or first unread message in the narrow.\r\n\r\nThis is a feature the zulip-mobile RN app lacks: https://github.com/zulip/zulip-mobile/issues/3604 . (That's for internal links, but the app doesn't have it for notifications either \u2014 see `narrowToNotification` which passes no anchor to `doNarrow` \u2014 and doesn't have deep links.)\r\n\r\nThere are two parts to this:\r\n* Fetch the messages around the desired anchor, rather than around the latest message or the first unread.\r\n* Control the scroll position so that we show the desired anchor message.\r\n\r\nThis has a lot in common with:\r\n* #80\r\n\r\nThis issue has fewer prerequisites technically than #80 \u2014 no need for #79 first. On the other hand it has more prerequisites before there's a UX context where it makes sense: it'd need either #73, #76, or notifications, all of which are more complex than #79.\n", "hints": "\nStarted working on this.\n\nhttps://chat.zulip.org/#narrow/channel/516-mobile-dev-help/topic/Control.20scroll.20position.20on.20new.20and.20newly-fetched.20messages\n\nhttps://github.com/user-attachments/assets/a379256e-3208-48b5-960c-7740a06fe497\n\nhttps://github.com/user-attachments/assets/9feec67c-380e-4e92-9631-37a58ec8d8ab\n\n\nThis came up in beta feedback: [#mobile > Flutter Beta: Some Feedback @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/Flutter.20Beta.3A.20Some.20Feedback/near/2153404)", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1517", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/80\", \"https://github.com/zulip/zulip-flutter/issues/82\"]", "test_command": "flutter test test/model/internal_link_test.dart test/model/message_list_test.dart test/model/settings_test.dart test/widgets/content_test.dart test/widgets/message_list_test.dart test/widgets/settings_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/assets/l10n/app_en.arb b/assets/l10n/app_en.arb\nindex fb62815eef..1f070feb19 100644\n--- a/assets/l10n/app_en.arb\n+++ b/assets/l10n/app_en.arb\n@@ -951,6 +951,26 @@\n \"@pollWidgetOptionsMissing\": {\n \"description\": \"Text to display for a poll when it has no options\"\n },\n+ \"initialAnchorSettingTitle\": \"Open message feeds at\",\n+ \"@initialAnchorSettingTitle\": {\n+ \"description\": \"Title of setting controlling initial anchor of message list.\"\n+ },\n+ \"initialAnchorSettingDescription\": \"You can choose whether message feeds open at your first unread message or at the newest messages.\",\n+ \"@initialAnchorSettingDescription\": {\n+ \"description\": \"Description of setting controlling initial anchor of message list.\"\n+ },\n+ \"initialAnchorSettingFirstUnreadAlways\": \"First unread message\",\n+ \"@initialAnchorSettingFirstUnreadAlways\": {\n+ \"description\": \"Label for a value of setting controlling initial anchor of message list.\"\n+ },\n+ \"initialAnchorSettingFirstUnreadConversations\": \"First unread message in single conversations, newest message elsewhere\",\n+ \"@initialAnchorSettingFirstUnreadConversations\": {\n+ \"description\": \"Label for a value of setting controlling initial anchor of message list.\"\n+ },\n+ \"initialAnchorSettingNewestAlways\": \"Newest message\",\n+ \"@initialAnchorSettingNewestAlways\": {\n+ \"description\": \"Label for a value of setting controlling initial anchor of message list.\"\n+ },\n \"experimentalFeatureSettingsPageTitle\": \"Experimental features\",\n \"@experimentalFeatureSettingsPageTitle\": {\n \"description\": \"Title of settings page for experimental, in-development features\"\ndiff --git a/lib/generated/l10n/zulip_localizations.dart b/lib/generated/l10n/zulip_localizations.dart\nindex c990e54155..28f4eee3ba 100644\n--- a/lib/generated/l10n/zulip_localizations.dart\n+++ b/lib/generated/l10n/zulip_localizations.dart\n@@ -1415,6 +1415,36 @@ abstract class ZulipLocalizations {\n /// **'This poll has no options yet.'**\n String get pollWidgetOptionsMissing;\n \n+ /// Title of setting controlling initial anchor of message list.\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Open message feeds at'**\n+ String get initialAnchorSettingTitle;\n+\n+ /// Description of setting controlling initial anchor of message list.\n+ ///\n+ /// In en, this message translates to:\n+ /// **'You can choose whether message feeds open at your first unread message or at the newest messages.'**\n+ String get initialAnchorSettingDescription;\n+\n+ /// Label for a value of setting controlling initial anchor of message list.\n+ ///\n+ /// In en, this message translates to:\n+ /// **'First unread message'**\n+ String get initialAnchorSettingFirstUnreadAlways;\n+\n+ /// Label for a value of setting controlling initial anchor of message list.\n+ ///\n+ /// In en, this message translates to:\n+ /// **'First unread message in single conversations, newest message elsewhere'**\n+ String get initialAnchorSettingFirstUnreadConversations;\n+\n+ /// Label for a value of setting controlling initial anchor of message list.\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Newest message'**\n+ String get initialAnchorSettingNewestAlways;\n+\n /// Title of settings page for experimental, in-development features\n ///\n /// In en, this message translates to:\ndiff --git a/lib/generated/l10n/zulip_localizations_ar.dart b/lib/generated/l10n/zulip_localizations_ar.dart\nindex 50f55ee551..104cc16822 100644\n--- a/lib/generated/l10n/zulip_localizations_ar.dart\n+++ b/lib/generated/l10n/zulip_localizations_ar.dart\n@@ -773,6 +773,23 @@ class ZulipLocalizationsAr extends ZulipLocalizations {\n @override\n String get pollWidgetOptionsMissing => 'This poll has no options yet.';\n \n+ @override\n+ String get initialAnchorSettingTitle => 'Open message feeds at';\n+\n+ @override\n+ String get initialAnchorSettingDescription =>\n+ 'You can choose whether message feeds open at your first unread message or at the newest messages.';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadAlways => 'First unread message';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadConversations =>\n+ 'First unread message in single conversations, newest message elsewhere';\n+\n+ @override\n+ String get initialAnchorSettingNewestAlways => 'Newest message';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Experimental features';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_de.dart b/lib/generated/l10n/zulip_localizations_de.dart\nindex 43a5becc51..0abb3c2e55 100644\n--- a/lib/generated/l10n/zulip_localizations_de.dart\n+++ b/lib/generated/l10n/zulip_localizations_de.dart\n@@ -773,6 +773,23 @@ class ZulipLocalizationsDe extends ZulipLocalizations {\n @override\n String get pollWidgetOptionsMissing => 'This poll has no options yet.';\n \n+ @override\n+ String get initialAnchorSettingTitle => 'Open message feeds at';\n+\n+ @override\n+ String get initialAnchorSettingDescription =>\n+ 'You can choose whether message feeds open at your first unread message or at the newest messages.';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadAlways => 'First unread message';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadConversations =>\n+ 'First unread message in single conversations, newest message elsewhere';\n+\n+ @override\n+ String get initialAnchorSettingNewestAlways => 'Newest message';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Experimental features';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_en.dart b/lib/generated/l10n/zulip_localizations_en.dart\nindex de74e5d0e7..d5201bad84 100644\n--- a/lib/generated/l10n/zulip_localizations_en.dart\n+++ b/lib/generated/l10n/zulip_localizations_en.dart\n@@ -773,6 +773,23 @@ class ZulipLocalizationsEn extends ZulipLocalizations {\n @override\n String get pollWidgetOptionsMissing => 'This poll has no options yet.';\n \n+ @override\n+ String get initialAnchorSettingTitle => 'Open message feeds at';\n+\n+ @override\n+ String get initialAnchorSettingDescription =>\n+ 'You can choose whether message feeds open at your first unread message or at the newest messages.';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadAlways => 'First unread message';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadConversations =>\n+ 'First unread message in single conversations, newest message elsewhere';\n+\n+ @override\n+ String get initialAnchorSettingNewestAlways => 'Newest message';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Experimental features';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_ja.dart b/lib/generated/l10n/zulip_localizations_ja.dart\nindex 3d96c28e2f..69a2e97816 100644\n--- a/lib/generated/l10n/zulip_localizations_ja.dart\n+++ b/lib/generated/l10n/zulip_localizations_ja.dart\n@@ -773,6 +773,23 @@ class ZulipLocalizationsJa extends ZulipLocalizations {\n @override\n String get pollWidgetOptionsMissing => 'This poll has no options yet.';\n \n+ @override\n+ String get initialAnchorSettingTitle => 'Open message feeds at';\n+\n+ @override\n+ String get initialAnchorSettingDescription =>\n+ 'You can choose whether message feeds open at your first unread message or at the newest messages.';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadAlways => 'First unread message';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadConversations =>\n+ 'First unread message in single conversations, newest message elsewhere';\n+\n+ @override\n+ String get initialAnchorSettingNewestAlways => 'Newest message';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Experimental features';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_nb.dart b/lib/generated/l10n/zulip_localizations_nb.dart\nindex 029c385574..66198f6a40 100644\n--- a/lib/generated/l10n/zulip_localizations_nb.dart\n+++ b/lib/generated/l10n/zulip_localizations_nb.dart\n@@ -773,6 +773,23 @@ class ZulipLocalizationsNb extends ZulipLocalizations {\n @override\n String get pollWidgetOptionsMissing => 'This poll has no options yet.';\n \n+ @override\n+ String get initialAnchorSettingTitle => 'Open message feeds at';\n+\n+ @override\n+ String get initialAnchorSettingDescription =>\n+ 'You can choose whether message feeds open at your first unread message or at the newest messages.';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadAlways => 'First unread message';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadConversations =>\n+ 'First unread message in single conversations, newest message elsewhere';\n+\n+ @override\n+ String get initialAnchorSettingNewestAlways => 'Newest message';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Experimental features';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_pl.dart b/lib/generated/l10n/zulip_localizations_pl.dart\nindex 0752efa496..b0189c01fc 100644\n--- a/lib/generated/l10n/zulip_localizations_pl.dart\n+++ b/lib/generated/l10n/zulip_localizations_pl.dart\n@@ -784,6 +784,23 @@ class ZulipLocalizationsPl extends ZulipLocalizations {\n @override\n String get pollWidgetOptionsMissing => 'Ta sonda nie ma opcji do wyboru.';\n \n+ @override\n+ String get initialAnchorSettingTitle => 'Open message feeds at';\n+\n+ @override\n+ String get initialAnchorSettingDescription =>\n+ 'You can choose whether message feeds open at your first unread message or at the newest messages.';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadAlways => 'First unread message';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadConversations =>\n+ 'First unread message in single conversations, newest message elsewhere';\n+\n+ @override\n+ String get initialAnchorSettingNewestAlways => 'Newest message';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Funkcje eksperymentalne';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_ru.dart b/lib/generated/l10n/zulip_localizations_ru.dart\nindex 22d2d7a337..063b3c01e4 100644\n--- a/lib/generated/l10n/zulip_localizations_ru.dart\n+++ b/lib/generated/l10n/zulip_localizations_ru.dart\n@@ -787,6 +787,23 @@ class ZulipLocalizationsRu extends ZulipLocalizations {\n @override\n String get pollWidgetOptionsMissing => '\u0412 \u043e\u043f\u0440\u043e\u0441\u0435 \u043f\u043e\u043a\u0430 \u043d\u0435\u0442 \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u043e\u0432 \u043e\u0442\u0432\u0435\u0442\u0430.';\n \n+ @override\n+ String get initialAnchorSettingTitle => 'Open message feeds at';\n+\n+ @override\n+ String get initialAnchorSettingDescription =>\n+ 'You can choose whether message feeds open at your first unread message or at the newest messages.';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadAlways => 'First unread message';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadConversations =>\n+ 'First unread message in single conversations, newest message elsewhere';\n+\n+ @override\n+ String get initialAnchorSettingNewestAlways => 'Newest message';\n+\n @override\n String get experimentalFeatureSettingsPageTitle =>\n '\u042d\u043a\u0441\u043f\u0435\u0440\u0438\u043c\u0435\u043d\u0442\u0430\u043b\u044c\u043d\u044b\u0435 \u0444\u0443\u043d\u043a\u0446\u0438\u0438';\ndiff --git a/lib/generated/l10n/zulip_localizations_sk.dart b/lib/generated/l10n/zulip_localizations_sk.dart\nindex 132a5355e9..ec7a8f36e4 100644\n--- a/lib/generated/l10n/zulip_localizations_sk.dart\n+++ b/lib/generated/l10n/zulip_localizations_sk.dart\n@@ -775,6 +775,23 @@ class ZulipLocalizationsSk extends ZulipLocalizations {\n @override\n String get pollWidgetOptionsMissing => 'This poll has no options yet.';\n \n+ @override\n+ String get initialAnchorSettingTitle => 'Open message feeds at';\n+\n+ @override\n+ String get initialAnchorSettingDescription =>\n+ 'You can choose whether message feeds open at your first unread message or at the newest messages.';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadAlways => 'First unread message';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadConversations =>\n+ 'First unread message in single conversations, newest message elsewhere';\n+\n+ @override\n+ String get initialAnchorSettingNewestAlways => 'Newest message';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Experimental features';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_uk.dart b/lib/generated/l10n/zulip_localizations_uk.dart\nindex d76cbec6d9..af57ca0f86 100644\n--- a/lib/generated/l10n/zulip_localizations_uk.dart\n+++ b/lib/generated/l10n/zulip_localizations_uk.dart\n@@ -787,6 +787,23 @@ class ZulipLocalizationsUk extends ZulipLocalizations {\n String get pollWidgetOptionsMissing =>\n '\u0423 \u0446\u044c\u043e\u043c\u0443 \u043e\u043f\u0438\u0442\u0443\u0432\u0430\u043d\u043d\u0456 \u0449\u0435 \u043d\u0435\u043c\u0430\u0454 \u0432\u0430\u0440\u0456\u0430\u043d\u0442\u0456\u0432.';\n \n+ @override\n+ String get initialAnchorSettingTitle => 'Open message feeds at';\n+\n+ @override\n+ String get initialAnchorSettingDescription =>\n+ 'You can choose whether message feeds open at your first unread message or at the newest messages.';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadAlways => 'First unread message';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadConversations =>\n+ 'First unread message in single conversations, newest message elsewhere';\n+\n+ @override\n+ String get initialAnchorSettingNewestAlways => 'Newest message';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => '\u0415\u043a\u0441\u043f\u0435\u0440\u0438\u043c\u0435\u043d\u0442\u0430\u043b\u044c\u043d\u0456 \u0444\u0443\u043d\u043a\u0446\u0456\u0457';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_zh.dart b/lib/generated/l10n/zulip_localizations_zh.dart\nindex 4e74b4c95c..3b425dcea1 100644\n--- a/lib/generated/l10n/zulip_localizations_zh.dart\n+++ b/lib/generated/l10n/zulip_localizations_zh.dart\n@@ -773,6 +773,23 @@ class ZulipLocalizationsZh extends ZulipLocalizations {\n @override\n String get pollWidgetOptionsMissing => 'This poll has no options yet.';\n \n+ @override\n+ String get initialAnchorSettingTitle => 'Open message feeds at';\n+\n+ @override\n+ String get initialAnchorSettingDescription =>\n+ 'You can choose whether message feeds open at your first unread message or at the newest messages.';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadAlways => 'First unread message';\n+\n+ @override\n+ String get initialAnchorSettingFirstUnreadConversations =>\n+ 'First unread message in single conversations, newest message elsewhere';\n+\n+ @override\n+ String get initialAnchorSettingNewestAlways => 'Newest message';\n+\n @override\n String get experimentalFeatureSettingsPageTitle => 'Experimental features';\n \ndiff --git a/lib/model/database.dart b/lib/model/database.dart\nindex 57910e7a50..f7d85b4b95 100644\n--- a/lib/model/database.dart\n+++ b/lib/model/database.dart\n@@ -24,6 +24,9 @@ class GlobalSettings extends Table {\n Column get browserPreference => textEnum()\n .nullable()();\n \n+ Column get visitFirstUnread => textEnum()\n+ .nullable()();\n+\n // If adding a new column to this table, consider whether [BoolGlobalSettings]\n // can do the job instead (by adding a value to the [BoolGlobalSetting] enum).\n // That way is more convenient, when it works, because\n@@ -119,7 +122,7 @@ class AppDatabase extends _$AppDatabase {\n // information on using the build_runner.\n // * Write a migration in `_migrationSteps` below.\n // * Write tests.\n- static const int latestSchemaVersion = 6; // See note.\n+ static const int latestSchemaVersion = 7; // See note.\n \n @override\n int get schemaVersion => latestSchemaVersion;\n@@ -174,6 +177,10 @@ class AppDatabase extends _$AppDatabase {\n from5To6: (m, schema) async {\n await m.createTable(schema.boolGlobalSettings);\n },\n+ from6To7: (m, schema) async {\n+ await m.addColumn(schema.globalSettings,\n+ schema.globalSettings.visitFirstUnread);\n+ },\n );\n \n Future _createLatestSchema(Migrator m) async {\ndiff --git a/lib/model/database.g.dart b/lib/model/database.g.dart\nindex 99752bdd62..19c9f35c5a 100644\n--- a/lib/model/database.g.dart\n+++ b/lib/model/database.g.dart\n@@ -32,7 +32,22 @@ class $GlobalSettingsTable extends GlobalSettings\n $GlobalSettingsTable.$converterbrowserPreferencen,\n );\n @override\n- List get $columns => [themeSetting, browserPreference];\n+ late final GeneratedColumnWithTypeConverter\n+ visitFirstUnread = GeneratedColumn(\n+ 'visit_first_unread',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ ).withConverter(\n+ $GlobalSettingsTable.$convertervisitFirstUnreadn,\n+ );\n+ @override\n+ List get $columns => [\n+ themeSetting,\n+ browserPreference,\n+ visitFirstUnread,\n+ ];\n @override\n String get aliasedName => _alias ?? actualTableName;\n @override\n@@ -57,6 +72,13 @@ class $GlobalSettingsTable extends GlobalSettings\n data['${effectivePrefix}browser_preference'],\n ),\n ),\n+ visitFirstUnread: $GlobalSettingsTable.$convertervisitFirstUnreadn\n+ .fromSql(\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}visit_first_unread'],\n+ ),\n+ ),\n );\n }\n \n@@ -81,13 +103,26 @@ class $GlobalSettingsTable extends GlobalSettings\n $converterbrowserPreferencen = JsonTypeConverter2.asNullable(\n $converterbrowserPreference,\n );\n+ static JsonTypeConverter2\n+ $convertervisitFirstUnread = const EnumNameConverter(\n+ VisitFirstUnreadSetting.values,\n+ );\n+ static JsonTypeConverter2\n+ $convertervisitFirstUnreadn = JsonTypeConverter2.asNullable(\n+ $convertervisitFirstUnread,\n+ );\n }\n \n class GlobalSettingsData extends DataClass\n implements Insertable {\n final ThemeSetting? themeSetting;\n final BrowserPreference? browserPreference;\n- const GlobalSettingsData({this.themeSetting, this.browserPreference});\n+ final VisitFirstUnreadSetting? visitFirstUnread;\n+ const GlobalSettingsData({\n+ this.themeSetting,\n+ this.browserPreference,\n+ this.visitFirstUnread,\n+ });\n @override\n Map toColumns(bool nullToAbsent) {\n final map = {};\n@@ -103,6 +138,13 @@ class GlobalSettingsData extends DataClass\n ),\n );\n }\n+ if (!nullToAbsent || visitFirstUnread != null) {\n+ map['visit_first_unread'] = Variable(\n+ $GlobalSettingsTable.$convertervisitFirstUnreadn.toSql(\n+ visitFirstUnread,\n+ ),\n+ );\n+ }\n return map;\n }\n \n@@ -116,6 +158,10 @@ class GlobalSettingsData extends DataClass\n browserPreference == null && nullToAbsent\n ? const Value.absent()\n : Value(browserPreference),\n+ visitFirstUnread:\n+ visitFirstUnread == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(visitFirstUnread),\n );\n }\n \n@@ -130,6 +176,8 @@ class GlobalSettingsData extends DataClass\n ),\n browserPreference: $GlobalSettingsTable.$converterbrowserPreferencen\n .fromJson(serializer.fromJson(json['browserPreference'])),\n+ visitFirstUnread: $GlobalSettingsTable.$convertervisitFirstUnreadn\n+ .fromJson(serializer.fromJson(json['visitFirstUnread'])),\n );\n }\n @override\n@@ -144,18 +192,28 @@ class GlobalSettingsData extends DataClass\n browserPreference,\n ),\n ),\n+ 'visitFirstUnread': serializer.toJson(\n+ $GlobalSettingsTable.$convertervisitFirstUnreadn.toJson(\n+ visitFirstUnread,\n+ ),\n+ ),\n };\n }\n \n GlobalSettingsData copyWith({\n Value themeSetting = const Value.absent(),\n Value browserPreference = const Value.absent(),\n+ Value visitFirstUnread = const Value.absent(),\n }) => GlobalSettingsData(\n themeSetting: themeSetting.present ? themeSetting.value : this.themeSetting,\n browserPreference:\n browserPreference.present\n ? browserPreference.value\n : this.browserPreference,\n+ visitFirstUnread:\n+ visitFirstUnread.present\n+ ? visitFirstUnread.value\n+ : this.visitFirstUnread,\n );\n GlobalSettingsData copyWithCompanion(GlobalSettingsCompanion data) {\n return GlobalSettingsData(\n@@ -167,6 +225,10 @@ class GlobalSettingsData extends DataClass\n data.browserPreference.present\n ? data.browserPreference.value\n : this.browserPreference,\n+ visitFirstUnread:\n+ data.visitFirstUnread.present\n+ ? data.visitFirstUnread.value\n+ : this.visitFirstUnread,\n );\n }\n \n@@ -174,43 +236,51 @@ class GlobalSettingsData extends DataClass\n String toString() {\n return (StringBuffer('GlobalSettingsData(')\n ..write('themeSetting: $themeSetting, ')\n- ..write('browserPreference: $browserPreference')\n+ ..write('browserPreference: $browserPreference, ')\n+ ..write('visitFirstUnread: $visitFirstUnread')\n ..write(')'))\n .toString();\n }\n \n @override\n- int get hashCode => Object.hash(themeSetting, browserPreference);\n+ int get hashCode =>\n+ Object.hash(themeSetting, browserPreference, visitFirstUnread);\n @override\n bool operator ==(Object other) =>\n identical(this, other) ||\n (other is GlobalSettingsData &&\n other.themeSetting == this.themeSetting &&\n- other.browserPreference == this.browserPreference);\n+ other.browserPreference == this.browserPreference &&\n+ other.visitFirstUnread == this.visitFirstUnread);\n }\n \n class GlobalSettingsCompanion extends UpdateCompanion {\n final Value themeSetting;\n final Value browserPreference;\n+ final Value visitFirstUnread;\n final Value rowid;\n const GlobalSettingsCompanion({\n this.themeSetting = const Value.absent(),\n this.browserPreference = const Value.absent(),\n+ this.visitFirstUnread = const Value.absent(),\n this.rowid = const Value.absent(),\n });\n GlobalSettingsCompanion.insert({\n this.themeSetting = const Value.absent(),\n this.browserPreference = const Value.absent(),\n+ this.visitFirstUnread = const Value.absent(),\n this.rowid = const Value.absent(),\n });\n static Insertable custom({\n Expression? themeSetting,\n Expression? browserPreference,\n+ Expression? visitFirstUnread,\n Expression? rowid,\n }) {\n return RawValuesInsertable({\n if (themeSetting != null) 'theme_setting': themeSetting,\n if (browserPreference != null) 'browser_preference': browserPreference,\n+ if (visitFirstUnread != null) 'visit_first_unread': visitFirstUnread,\n if (rowid != null) 'rowid': rowid,\n });\n }\n@@ -218,11 +288,13 @@ class GlobalSettingsCompanion extends UpdateCompanion {\n GlobalSettingsCompanion copyWith({\n Value? themeSetting,\n Value? browserPreference,\n+ Value? visitFirstUnread,\n Value? rowid,\n }) {\n return GlobalSettingsCompanion(\n themeSetting: themeSetting ?? this.themeSetting,\n browserPreference: browserPreference ?? this.browserPreference,\n+ visitFirstUnread: visitFirstUnread ?? this.visitFirstUnread,\n rowid: rowid ?? this.rowid,\n );\n }\n@@ -242,6 +314,13 @@ class GlobalSettingsCompanion extends UpdateCompanion {\n ),\n );\n }\n+ if (visitFirstUnread.present) {\n+ map['visit_first_unread'] = Variable(\n+ $GlobalSettingsTable.$convertervisitFirstUnreadn.toSql(\n+ visitFirstUnread.value,\n+ ),\n+ );\n+ }\n if (rowid.present) {\n map['rowid'] = Variable(rowid.value);\n }\n@@ -253,6 +332,7 @@ class GlobalSettingsCompanion extends UpdateCompanion {\n return (StringBuffer('GlobalSettingsCompanion(')\n ..write('themeSetting: $themeSetting, ')\n ..write('browserPreference: $browserPreference, ')\n+ ..write('visitFirstUnread: $visitFirstUnread, ')\n ..write('rowid: $rowid')\n ..write(')'))\n .toString();\n@@ -1109,12 +1189,14 @@ typedef $$GlobalSettingsTableCreateCompanionBuilder =\n GlobalSettingsCompanion Function({\n Value themeSetting,\n Value browserPreference,\n+ Value visitFirstUnread,\n Value rowid,\n });\n typedef $$GlobalSettingsTableUpdateCompanionBuilder =\n GlobalSettingsCompanion Function({\n Value themeSetting,\n Value browserPreference,\n+ Value visitFirstUnread,\n Value rowid,\n });\n \n@@ -1138,6 +1220,16 @@ class $$GlobalSettingsTableFilterComposer\n column: $table.browserPreference,\n builder: (column) => ColumnWithTypeConverterFilters(column),\n );\n+\n+ ColumnWithTypeConverterFilters<\n+ VisitFirstUnreadSetting?,\n+ VisitFirstUnreadSetting,\n+ String\n+ >\n+ get visitFirstUnread => $composableBuilder(\n+ column: $table.visitFirstUnread,\n+ builder: (column) => ColumnWithTypeConverterFilters(column),\n+ );\n }\n \n class $$GlobalSettingsTableOrderingComposer\n@@ -1158,6 +1250,11 @@ class $$GlobalSettingsTableOrderingComposer\n column: $table.browserPreference,\n builder: (column) => ColumnOrderings(column),\n );\n+\n+ ColumnOrderings get visitFirstUnread => $composableBuilder(\n+ column: $table.visitFirstUnread,\n+ builder: (column) => ColumnOrderings(column),\n+ );\n }\n \n class $$GlobalSettingsTableAnnotationComposer\n@@ -1180,6 +1277,12 @@ class $$GlobalSettingsTableAnnotationComposer\n column: $table.browserPreference,\n builder: (column) => column,\n );\n+\n+ GeneratedColumnWithTypeConverter\n+ get visitFirstUnread => $composableBuilder(\n+ column: $table.visitFirstUnread,\n+ builder: (column) => column,\n+ );\n }\n \n class $$GlobalSettingsTableTableManager\n@@ -1226,10 +1329,13 @@ class $$GlobalSettingsTableTableManager\n Value themeSetting = const Value.absent(),\n Value browserPreference =\n const Value.absent(),\n+ Value visitFirstUnread =\n+ const Value.absent(),\n Value rowid = const Value.absent(),\n }) => GlobalSettingsCompanion(\n themeSetting: themeSetting,\n browserPreference: browserPreference,\n+ visitFirstUnread: visitFirstUnread,\n rowid: rowid,\n ),\n createCompanionCallback:\n@@ -1237,10 +1343,13 @@ class $$GlobalSettingsTableTableManager\n Value themeSetting = const Value.absent(),\n Value browserPreference =\n const Value.absent(),\n+ Value visitFirstUnread =\n+ const Value.absent(),\n Value rowid = const Value.absent(),\n }) => GlobalSettingsCompanion.insert(\n themeSetting: themeSetting,\n browserPreference: browserPreference,\n+ visitFirstUnread: visitFirstUnread,\n rowid: rowid,\n ),\n withReferenceMapper:\ndiff --git a/lib/model/internal_link.dart b/lib/model/internal_link.dart\nindex 749f60698c..a552f1679f 100644\n--- a/lib/model/internal_link.dart\n+++ b/lib/model/internal_link.dart\n@@ -109,22 +109,43 @@ Uri narrowLink(PerAccountStore store, Narrow narrow, {int? nearMessageId}) {\n return result;\n }\n \n-/// A [Narrow] from a given URL, on `store`'s realm.\n+/// The result of parsing some URL within a Zulip realm,\n+/// when the URL corresponds to some page in this app.\n+sealed class InternalLink {\n+ InternalLink({required this.realmUrl});\n+\n+ final Uri realmUrl;\n+}\n+\n+/// The result of parsing some URL that points to a narrow on a Zulip realm,\n+/// when the narrow is of a type that this app understands.\n+class NarrowLink extends InternalLink {\n+ NarrowLink(this.narrow, this.nearMessageId, {required super.realmUrl});\n+\n+ final Narrow narrow;\n+ final int? nearMessageId;\n+}\n+\n+/// Try to parse the given URL as a page in this app, on `store`'s realm.\n ///\n /// `url` must already be a result from [PerAccountStore.tryResolveUrl]\n /// on `store`.\n ///\n-/// Returns `null` if any of the operator/operand pairs are invalid.\n+/// Returns null if the URL isn't on this realm,\n+/// or isn't a valid Zulip URL,\n+/// or isn't currently supported as leading to a page in this app.\n ///\n+/// In particular this will return null if `url` is a `/#narrow/\u2026` URL\n+/// and any of the operator/operand pairs are invalid.\n /// Since narrow links can combine operators in ways our [Narrow] type can't\n /// represent, this can also return null for valid narrow links.\n ///\n /// This can also return null for some valid narrow links that our Narrow\n /// type *could* accurately represent. We should try to understand these\n-/// better, but some kinds will be rare, even unheard-of:\n+/// better, but some kinds will be rare, even unheard-of. For example:\n /// #narrow/stream/1-announce/stream/1-announce (duplicated operator)\n // TODO(#252): handle all valid narrow links, returning a search narrow\n-Narrow? parseInternalLink(Uri url, PerAccountStore store) {\n+InternalLink? parseInternalLink(Uri url, PerAccountStore store) {\n if (!_isInternalLink(url, store.realmUrl)) return null;\n \n final (category, segments) = _getCategoryAndSegmentsFromFragment(url.fragment);\n@@ -155,7 +176,7 @@ bool _isInternalLink(Uri url, Uri realmUrl) {\n return (category, segments);\n }\n \n-Narrow? _interpretNarrowSegments(List segments, PerAccountStore store) {\n+NarrowLink? _interpretNarrowSegments(List segments, PerAccountStore store) {\n assert(segments.isNotEmpty);\n assert(segments.length.isEven);\n \n@@ -164,6 +185,7 @@ Narrow? _interpretNarrowSegments(List segments, PerAccountStore store) {\n ApiNarrowDm? dmElement;\n ApiNarrowWith? withElement;\n Set isElementOperands = {};\n+ int? nearMessageId;\n \n for (var i = 0; i < segments.length; i += 2) {\n final (operator, negated) = _parseOperator(segments[i]);\n@@ -201,14 +223,18 @@ Narrow? _interpretNarrowSegments(List segments, PerAccountStore store) {\n // It is fine to have duplicates of the same [IsOperand].\n isElementOperands.add(IsOperand.fromRawString(operand));\n \n- case _NarrowOperator.near: // TODO(#82): support for near\n- continue;\n+ case _NarrowOperator.near:\n+ if (nearMessageId != null) return null;\n+ final messageId = int.tryParse(operand, radix: 10);\n+ if (messageId == null) return null;\n+ nearMessageId = messageId;\n \n case _NarrowOperator.unknown:\n return null;\n }\n }\n \n+ final Narrow? narrow;\n if (isElementOperands.isNotEmpty) {\n if (streamElement != null || topicElement != null || dmElement != null || withElement != null) {\n return null;\n@@ -216,9 +242,9 @@ Narrow? _interpretNarrowSegments(List segments, PerAccountStore store) {\n if (isElementOperands.length > 1) return null;\n switch (isElementOperands.single) {\n case IsOperand.mentioned:\n- return const MentionsNarrow();\n+ narrow = const MentionsNarrow();\n case IsOperand.starred:\n- return const StarredMessagesNarrow();\n+ narrow = const StarredMessagesNarrow();\n case IsOperand.dm:\n case IsOperand.private:\n case IsOperand.alerted:\n@@ -230,17 +256,20 @@ Narrow? _interpretNarrowSegments(List segments, PerAccountStore store) {\n }\n } else if (dmElement != null) {\n if (streamElement != null || topicElement != null || withElement != null) return null;\n- return DmNarrow.withUsers(dmElement.operand, selfUserId: store.selfUserId);\n+ narrow = DmNarrow.withUsers(dmElement.operand, selfUserId: store.selfUserId);\n } else if (streamElement != null) {\n final streamId = streamElement.operand;\n if (topicElement != null) {\n- return TopicNarrow(streamId, topicElement.operand, with_: withElement?.operand);\n+ narrow = TopicNarrow(streamId, topicElement.operand, with_: withElement?.operand);\n } else {\n if (withElement != null) return null;\n- return ChannelNarrow(streamId);\n+ narrow = ChannelNarrow(streamId);\n }\n+ } else {\n+ return null;\n }\n- return null;\n+\n+ return NarrowLink(narrow, nearMessageId, realmUrl: store.realmUrl);\n }\n \n @JsonEnum(fieldRename: FieldRename.kebab, alwaysCreate: true)\ndiff --git a/lib/model/message_list.dart b/lib/model/message_list.dart\nindex 2617f18b68..458478f248 100644\n--- a/lib/model/message_list.dart\n+++ b/lib/model/message_list.dart\n@@ -479,7 +479,7 @@ class MessageListView with ChangeNotifier, _MessageSequence {\n /// which might be made internally by this class in order to\n /// fetch the messages from scratch, e.g. after certain events.\n Anchor get anchor => _anchor;\n- final Anchor _anchor;\n+ Anchor _anchor;\n \n void _register() {\n store.registerMessageList(this);\n@@ -756,6 +756,20 @@ class MessageListView with ChangeNotifier, _MessageSequence {\n }\n }\n \n+ /// Reset this view to start from the newest messages.\n+ ///\n+ /// This will set [anchor] to [AnchorCode.newest],\n+ /// and cause messages to be re-fetched from scratch.\n+ void jumpToEnd() {\n+ assert(fetched);\n+ assert(!haveNewest);\n+ assert(anchor != AnchorCode.newest);\n+ _anchor = AnchorCode.newest;\n+ _reset();\n+ notifyListeners();\n+ fetchInitial();\n+ }\n+\n /// Add [outboxMessage] if it belongs to the view.\n void addOutboxMessage(OutboxMessage outboxMessage) {\n // TODO(#1441) implement this\ndiff --git a/lib/model/schema_versions.g.dart b/lib/model/schema_versions.g.dart\nindex 9bfa74f627..4fcfc67a06 100644\n--- a/lib/model/schema_versions.g.dart\n+++ b/lib/model/schema_versions.g.dart\n@@ -367,12 +367,87 @@ i1.GeneratedColumn _column_12(String aliasedName) =>\n 'CHECK (\"value\" IN (0, 1))',\n ),\n );\n+\n+final class Schema7 extends i0.VersionedSchema {\n+ Schema7({required super.database}) : super(version: 7);\n+ @override\n+ late final List entities = [\n+ globalSettings,\n+ boolGlobalSettings,\n+ accounts,\n+ ];\n+ late final Shape4 globalSettings = Shape4(\n+ source: i0.VersionedTable(\n+ entityName: 'global_settings',\n+ withoutRowId: false,\n+ isStrict: false,\n+ tableConstraints: [],\n+ columns: [_column_9, _column_10, _column_13],\n+ attachedDatabase: database,\n+ ),\n+ alias: null,\n+ );\n+ late final Shape3 boolGlobalSettings = Shape3(\n+ source: i0.VersionedTable(\n+ entityName: 'bool_global_settings',\n+ withoutRowId: false,\n+ isStrict: false,\n+ tableConstraints: ['PRIMARY KEY(name)'],\n+ columns: [_column_11, _column_12],\n+ attachedDatabase: database,\n+ ),\n+ alias: null,\n+ );\n+ late final Shape0 accounts = Shape0(\n+ source: i0.VersionedTable(\n+ entityName: 'accounts',\n+ withoutRowId: false,\n+ isStrict: false,\n+ tableConstraints: [\n+ 'UNIQUE(realm_url, user_id)',\n+ 'UNIQUE(realm_url, email)',\n+ ],\n+ columns: [\n+ _column_0,\n+ _column_1,\n+ _column_2,\n+ _column_3,\n+ _column_4,\n+ _column_5,\n+ _column_6,\n+ _column_7,\n+ _column_8,\n+ ],\n+ attachedDatabase: database,\n+ ),\n+ alias: null,\n+ );\n+}\n+\n+class Shape4 extends i0.VersionedTable {\n+ Shape4({required super.source, required super.alias}) : super.aliased();\n+ i1.GeneratedColumn get themeSetting =>\n+ columnsByName['theme_setting']! as i1.GeneratedColumn;\n+ i1.GeneratedColumn get browserPreference =>\n+ columnsByName['browser_preference']! as i1.GeneratedColumn;\n+ i1.GeneratedColumn get visitFirstUnread =>\n+ columnsByName['visit_first_unread']! as i1.GeneratedColumn;\n+}\n+\n+i1.GeneratedColumn _column_13(String aliasedName) =>\n+ i1.GeneratedColumn(\n+ 'visit_first_unread',\n+ aliasedName,\n+ true,\n+ type: i1.DriftSqlType.string,\n+ );\n i0.MigrationStepWithVersion migrationSteps({\n required Future Function(i1.Migrator m, Schema2 schema) from1To2,\n required Future Function(i1.Migrator m, Schema3 schema) from2To3,\n required Future Function(i1.Migrator m, Schema4 schema) from3To4,\n required Future Function(i1.Migrator m, Schema5 schema) from4To5,\n required Future Function(i1.Migrator m, Schema6 schema) from5To6,\n+ required Future Function(i1.Migrator m, Schema7 schema) from6To7,\n }) {\n return (currentVersion, database) async {\n switch (currentVersion) {\n@@ -401,6 +476,11 @@ i0.MigrationStepWithVersion migrationSteps({\n final migrator = i1.Migrator(database, schema);\n await from5To6(migrator, schema);\n return 6;\n+ case 6:\n+ final schema = Schema7(database: database);\n+ final migrator = i1.Migrator(database, schema);\n+ await from6To7(migrator, schema);\n+ return 7;\n default:\n throw ArgumentError.value('Unknown migration from $currentVersion');\n }\n@@ -413,6 +493,7 @@ i1.OnUpgrade stepByStep({\n required Future Function(i1.Migrator m, Schema4 schema) from3To4,\n required Future Function(i1.Migrator m, Schema5 schema) from4To5,\n required Future Function(i1.Migrator m, Schema6 schema) from5To6,\n+ required Future Function(i1.Migrator m, Schema7 schema) from6To7,\n }) => i0.VersionedSchema.stepByStepHelper(\n step: migrationSteps(\n from1To2: from1To2,\n@@ -420,5 +501,6 @@ i1.OnUpgrade stepByStep({\n from3To4: from3To4,\n from4To5: from4To5,\n from5To6: from5To6,\n+ from6To7: from6To7,\n ),\n );\ndiff --git a/lib/model/settings.dart b/lib/model/settings.dart\nindex 5fd2fec9f8..d3393292a6 100644\n--- a/lib/model/settings.dart\n+++ b/lib/model/settings.dart\n@@ -3,6 +3,7 @@ import 'package:flutter/foundation.dart';\n import '../generated/l10n/zulip_localizations.dart';\n import 'binding.dart';\n import 'database.dart';\n+import 'narrow.dart';\n import 'store.dart';\n \n /// The user's choice of visual theme for the app.\n@@ -45,6 +46,27 @@ enum BrowserPreference {\n external,\n }\n \n+/// The user's choice of when to open a message list at their first unread,\n+/// rather than at the newest message.\n+///\n+/// This setting has no effect when navigating to a specific message:\n+/// in that case the message list opens at that message,\n+/// regardless of this setting.\n+enum VisitFirstUnreadSetting {\n+ /// Always go to the first unread, rather than the newest message.\n+ always,\n+\n+ /// Go to the first unread in conversations,\n+ /// and the newest in interleaved views.\n+ conversations,\n+\n+ /// Always go to the newest message, rather than the first unread.\n+ never;\n+\n+ /// The effective value of this setting if the user hasn't set it.\n+ static VisitFirstUnreadSetting _default = conversations;\n+}\n+\n /// A general category of account-independent setting the user might set.\n ///\n /// Different kinds of settings call for different treatment in the UI,\n@@ -119,7 +141,7 @@ enum BoolGlobalSetting {\n \n // Former settings which might exist in the database,\n // whose names should therefore not be reused:\n- // (this list is empty so far)\n+ // openFirstUnread // v0.0.30\n ;\n \n const BoolGlobalSetting(this.type, this.default_);\n@@ -228,6 +250,33 @@ class GlobalSettingsStore extends ChangeNotifier {\n }\n }\n \n+ /// The user's choice of [VisitFirstUnreadSetting], applying our default.\n+ ///\n+ /// See also [shouldVisitFirstUnread] and [setVisitFirstUnread].\n+ VisitFirstUnreadSetting get visitFirstUnread {\n+ return _data.visitFirstUnread ?? VisitFirstUnreadSetting._default;\n+ }\n+\n+ /// Set [visitFirstUnread], persistently for future runs of the app.\n+ Future setVisitFirstUnread(VisitFirstUnreadSetting value) async {\n+ await _update(GlobalSettingsCompanion(visitFirstUnread: Value(value)));\n+ }\n+\n+ /// The value that [visitFirstUnread] works out to for the given narrow.\n+ bool shouldVisitFirstUnread({required Narrow narrow}) {\n+ return switch (visitFirstUnread) {\n+ VisitFirstUnreadSetting.always => true,\n+ VisitFirstUnreadSetting.never => false,\n+ VisitFirstUnreadSetting.conversations => switch (narrow) {\n+ TopicNarrow() || DmNarrow()\n+ => true,\n+ CombinedFeedNarrow() || ChannelNarrow()\n+ || MentionsNarrow() || StarredMessagesNarrow()\n+ => false,\n+ },\n+ };\n+ }\n+\n /// The user's choice of the given bool-valued setting, or our default for it.\n ///\n /// See also [setBool].\ndiff --git a/lib/notifications/display.dart b/lib/notifications/display.dart\nindex 081a2cf633..6e2585e135 100644\n--- a/lib/notifications/display.dart\n+++ b/lib/notifications/display.dart\n@@ -513,7 +513,7 @@ class NotificationDisplayManager {\n \n return MessageListPage.buildRoute(\n accountId: account.id,\n- // TODO(#82): Open at specific message, not just conversation\n+ // TODO(#1565): Open at specific message, not just conversation\n narrow: payload.narrow);\n }\n \ndiff --git a/lib/widgets/content.dart b/lib/widgets/content.dart\nindex 62801ab867..44411434fd 100644\n--- a/lib/widgets/content.dart\n+++ b/lib/widgets/content.dart\n@@ -1536,15 +1536,18 @@ void _launchUrl(BuildContext context, String urlString) async {\n return;\n }\n \n- final internalNarrow = parseInternalLink(url, store);\n- if (internalNarrow != null) {\n- unawaited(Navigator.push(context,\n- MessageListPage.buildRoute(context: context,\n- narrow: internalNarrow)));\n- return;\n+ final internalLink = parseInternalLink(url, store);\n+ assert(internalLink == null || internalLink.realmUrl == store.realmUrl);\n+ switch (internalLink) {\n+ case NarrowLink():\n+ unawaited(Navigator.push(context,\n+ MessageListPage.buildRoute(context: context,\n+ narrow: internalLink.narrow,\n+ initAnchorMessageId: internalLink.nearMessageId)));\n+\n+ case null:\n+ await PlatformActions.launchUrl(context, url);\n }\n-\n- await PlatformActions.launchUrl(context, url);\n }\n \n /// Like [Image.network], but includes [authHeader] if [src] is on-realm.\ndiff --git a/lib/widgets/message_list.dart b/lib/widgets/message_list.dart\nindex aa9684b7f2..513043fea6 100644\n--- a/lib/widgets/message_list.dart\n+++ b/lib/widgets/message_list.dart\n@@ -141,12 +141,17 @@ abstract class MessageListPageState {\n }\n \n class MessageListPage extends StatefulWidget {\n- const MessageListPage({super.key, required this.initNarrow});\n+ const MessageListPage({\n+ super.key,\n+ required this.initNarrow,\n+ this.initAnchorMessageId,\n+ });\n \n static AccountRoute buildRoute({int? accountId, BuildContext? context,\n- required Narrow narrow}) {\n+ required Narrow narrow, int? initAnchorMessageId}) {\n return MaterialAccountWidgetRoute(accountId: accountId, context: context,\n- page: MessageListPage(initNarrow: narrow));\n+ page: MessageListPage(\n+ initNarrow: narrow, initAnchorMessageId: initAnchorMessageId));\n }\n \n /// The [MessageListPageState] above this context in the tree.\n@@ -162,6 +167,7 @@ class MessageListPage extends StatefulWidget {\n }\n \n final Narrow initNarrow;\n+ final int? initAnchorMessageId; // TODO(#1564) highlight target upon load\n \n @override\n State createState() => _MessageListPageState();\n@@ -240,6 +246,15 @@ class _MessageListPageState extends State implements MessageLis\n actions.add(_TopicListButton(streamId: streamId));\n }\n \n+ final Anchor initAnchor;\n+ if (widget.initAnchorMessageId != null) {\n+ initAnchor = NumericAnchor(widget.initAnchorMessageId!);\n+ } else {\n+ final globalSettings = GlobalStoreWidget.settingsOf(context);\n+ final useFirstUnread = globalSettings.shouldVisitFirstUnread(narrow: narrow);\n+ initAnchor = useFirstUnread ? AnchorCode.firstUnread : AnchorCode.newest;\n+ }\n+\n // Insert a PageRoot here, to provide a context that can be used for\n // MessageListPage.ancestorOf.\n return PageRoot(child: Scaffold(\n@@ -259,7 +274,8 @@ class _MessageListPageState extends State implements MessageLis\n // we matched to the Figma in 21dbae120. See another frame, which uses that:\n // https://www.figma.com/file/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=147%3A9088&mode=dev\n body: Builder(\n- builder: (BuildContext context) => Column(\n+ builder: (BuildContext context) {\n+ return Column(\n // Children are expected to take the full horizontal space\n // and handle the horizontal device insets.\n // The bottom inset should be handled by the last child only.\n@@ -279,11 +295,13 @@ class _MessageListPageState extends State implements MessageLis\n child: MessageList(\n key: _messageListKey,\n narrow: narrow,\n+ initAnchor: initAnchor,\n onNarrowChanged: _narrowChanged,\n ))),\n if (ComposeBox.hasComposeBox(narrow))\n ComposeBox(key: _composeBoxKey, narrow: narrow)\n- ]))));\n+ ]);\n+ })));\n }\n }\n \n@@ -479,9 +497,15 @@ const kFetchMessagesBufferPixels = (kMessageListFetchBatchSize / 2) * _kShortMes\n /// When there is no [ComposeBox], also takes responsibility\n /// for dealing with the bottom inset.\n class MessageList extends StatefulWidget {\n- const MessageList({super.key, required this.narrow, required this.onNarrowChanged});\n+ const MessageList({\n+ super.key,\n+ required this.narrow,\n+ required this.initAnchor,\n+ required this.onNarrowChanged,\n+ });\n \n final Narrow narrow;\n+ final Anchor initAnchor;\n final void Function(Narrow newNarrow) onNarrowChanged;\n \n @override\n@@ -504,8 +528,9 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n \n @override\n void onNewStore() { // TODO(#464) try to keep using old model until new one gets messages\n+ final anchor = _model == null ? widget.initAnchor : _model!.anchor;\n _model?.dispose();\n- _initModel(PerAccountStoreWidget.of(context));\n+ _initModel(PerAccountStoreWidget.of(context), anchor);\n }\n \n @override\n@@ -516,10 +541,7 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n super.dispose();\n }\n \n- void _initModel(PerAccountStore store) {\n- // TODO(#82): get anchor as page/route argument, instead of using newest\n- // TODO(#80): default to anchor firstUnread, instead of newest\n- final anchor = AnchorCode.newest;\n+ void _initModel(PerAccountStore store, Anchor anchor) {\n _model = MessageListView.init(store: store,\n narrow: widget.narrow, anchor: anchor);\n model.addListener(_modelChanged);\n@@ -537,6 +559,7 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n // redirected us to the new location of the operand message ID.\n widget.onNarrowChanged(model.narrow);\n }\n+ // TODO when model reset, reset scroll\n setState(() {\n // The actual state lives in the [MessageListView] model.\n // This method was called because that just changed.\n@@ -568,6 +591,9 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n // still not yet updated to account for the newly-added messages.\n model.fetchOlder();\n }\n+ if (scrollMetrics.extentAfter < kFetchMessagesBufferPixels) {\n+ model.fetchNewer();\n+ }\n }\n \n void _scrollChanged() {\n@@ -618,6 +644,7 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n // MessageList's dartdoc.\n child: SafeArea(\n child: ScrollToBottomButton(\n+ model: model,\n scrollController: scrollController,\n visible: _scrollToBottomVisible))),\n ])))));\n@@ -753,13 +780,21 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n }\n \n Widget _buildEndCap() {\n- return Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [\n- TypingStatusWidget(narrow: widget.narrow),\n- MarkAsReadWidget(narrow: widget.narrow),\n- // To reinforce that the end of the feed has been reached:\n- // https://chat.zulip.org/#narrow/stream/243-mobile-team/topic/flutter.3A.20Mark-as-read/near/1680603\n- const SizedBox(height: 36),\n- ]);\n+ if (model.haveNewest) {\n+ return Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [\n+ TypingStatusWidget(narrow: widget.narrow),\n+ // TODO perhaps offer mark-as-read even when not done fetching?\n+ MarkAsReadWidget(narrow: widget.narrow),\n+ // To reinforce that the end of the feed has been reached:\n+ // https://chat.zulip.org/#narrow/stream/243-mobile-team/topic/flutter.3A.20Mark-as-read/near/1680603\n+ const SizedBox(height: 36),\n+ ]);\n+ } else if (model.busyFetchingMore) {\n+ // See [_buildStartCap] for why this condition shows a loading indicator.\n+ return const _MessageListLoadingMore();\n+ } else {\n+ return SizedBox.shrink();\n+ }\n }\n \n Widget _buildItem(MessageListItem data) {\n@@ -809,13 +844,40 @@ class _MessageListLoadingMore extends StatelessWidget {\n }\n \n class ScrollToBottomButton extends StatelessWidget {\n- const ScrollToBottomButton({super.key, required this.scrollController, required this.visible});\n+ const ScrollToBottomButton({\n+ super.key,\n+ required this.model,\n+ required this.scrollController,\n+ required this.visible,\n+ });\n \n- final ValueNotifier visible;\n+ final MessageListView model;\n final MessageListScrollController scrollController;\n+ final ValueNotifier visible;\n \n void _scrollToBottom() {\n- scrollController.position.scrollToEnd();\n+ if (model.haveNewest) {\n+ // Scrolling smoothly from here to the bottom won't require any requests\n+ // to the server.\n+ // It also probably isn't *that* far away: the user must have scrolled\n+ // here from there (or from near enough that a fetch reached there),\n+ // so scrolling back there -- at top speed -- shouldn't take too long.\n+ // Go for it.\n+ scrollController.position.scrollToEnd();\n+ } else {\n+ // This message list doesn't have the messages for the bottom of history.\n+ // There could be quite a lot of history between here and there --\n+ // for example, at first unread in the combined feed or a busy channel,\n+ // for a user who has some old unreads going back months and years.\n+ // In that case trying to scroll smoothly to the bottom is hopeless.\n+ //\n+ // Given that there were at least 100 messages between this message list's\n+ // initial anchor and the end of history (or else `fetchInitial` would\n+ // have reached the end at the outset), that situation is very likely.\n+ // Even if the end is close by, it's at least one fetch away.\n+ // Instead of scrolling, jump to the end, which is always just one fetch.\n+ model.jumpToEnd();\n+ }\n }\n \n @override\ndiff --git a/lib/widgets/settings.dart b/lib/widgets/settings.dart\nindex a96fb82928..449be11313 100644\n--- a/lib/widgets/settings.dart\n+++ b/lib/widgets/settings.dart\n@@ -23,6 +23,7 @@ class SettingsPage extends StatelessWidget {\n body: Column(children: [\n const _ThemeSetting(),\n const _BrowserPreferenceSetting(),\n+ const _VisitFirstUnreadSetting(),\n if (GlobalSettingsStore.experimentalFeatureFlags.isNotEmpty)\n ListTile(\n title: Text(zulipLocalizations.experimentalFeatureSettingsPageTitle),\n@@ -85,6 +86,70 @@ class _BrowserPreferenceSetting extends StatelessWidget {\n }\n }\n \n+class _VisitFirstUnreadSetting extends StatelessWidget {\n+ const _VisitFirstUnreadSetting();\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n+ final globalSettings = GlobalStoreWidget.settingsOf(context);\n+ return ListTile(\n+ title: Text(zulipLocalizations.initialAnchorSettingTitle),\n+ subtitle: Text(VisitFirstUnreadSettingPage._valueDisplayName(\n+ globalSettings.visitFirstUnread, zulipLocalizations: zulipLocalizations)),\n+ onTap: () => Navigator.push(context,\n+ VisitFirstUnreadSettingPage.buildRoute()));\n+ }\n+}\n+\n+class VisitFirstUnreadSettingPage extends StatelessWidget {\n+ const VisitFirstUnreadSettingPage({super.key});\n+\n+ static WidgetRoute buildRoute() {\n+ return MaterialWidgetRoute(page: const VisitFirstUnreadSettingPage());\n+ }\n+\n+ static String _valueDisplayName(VisitFirstUnreadSetting value, {\n+ required ZulipLocalizations zulipLocalizations,\n+ }) {\n+ return switch (value) {\n+ VisitFirstUnreadSetting.always =>\n+ zulipLocalizations.initialAnchorSettingFirstUnreadAlways,\n+ VisitFirstUnreadSetting.conversations =>\n+ zulipLocalizations.initialAnchorSettingFirstUnreadConversations,\n+ VisitFirstUnreadSetting.never =>\n+ zulipLocalizations.initialAnchorSettingNewestAlways,\n+ };\n+ }\n+\n+ void _handleChange(BuildContext context, VisitFirstUnreadSetting? value) {\n+ if (value == null) return; // TODO(log); can this actually happen? how?\n+ final globalSettings = GlobalStoreWidget.settingsOf(context);\n+ globalSettings.setVisitFirstUnread(value);\n+ }\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n+ final globalSettings = GlobalStoreWidget.settingsOf(context);\n+ return Scaffold(\n+ appBar: AppBar(title: Text(zulipLocalizations.initialAnchorSettingTitle)),\n+ body: Column(children: [\n+ ListTile(title: Text(zulipLocalizations.initialAnchorSettingDescription)),\n+ for (final value in VisitFirstUnreadSetting.values)\n+ RadioListTile.adaptive(\n+ title: Text(_valueDisplayName(value,\n+ zulipLocalizations: zulipLocalizations)),\n+ value: value,\n+ // TODO(#1545) stop using the deprecated members\n+ // ignore: deprecated_member_use\n+ groupValue: globalSettings.visitFirstUnread,\n+ // ignore: deprecated_member_use\n+ onChanged: (newValue) => _handleChange(context, newValue)),\n+ ]));\n+ }\n+}\n+\n class ExperimentalFeaturesPage extends StatelessWidget {\n const ExperimentalFeaturesPage({super.key});\n \n", "test_patch": "diff --git a/test/model/internal_link_test.dart b/test/model/internal_link_test.dart\nindex 611cc3ece0..824def8cc2 100644\n--- a/test/model/internal_link_test.dart\n+++ b/test/model/internal_link_test.dart\n@@ -160,7 +160,14 @@ void main() {\n test(urlString, () async {\n final store = await setupStore(realmUrl: realmUrl, streams: streams, users: users);\n final url = store.tryResolveUrl(urlString)!;\n- check(parseInternalLink(url, store)).equals(expected);\n+ final result = parseInternalLink(url, store);\n+ if (expected == null) {\n+ check(result).isNull();\n+ } else {\n+ check(result).isA()\n+ ..realmUrl.equals(realmUrl)\n+ ..narrow.equals(expected);\n+ }\n });\n }\n }\n@@ -258,6 +265,9 @@ void main() {\n final url = store.tryResolveUrl(urlString)!;\n final result = parseInternalLink(url, store);\n check(result != null).equals(expected);\n+ if (result != null) {\n+ check(result).realmUrl.equals(realmUrl);\n+ }\n });\n }\n }\n@@ -370,6 +380,8 @@ void main() {\n }\n });\n \n+ // TODO(#1570): test parsing /near/ operator\n+\n group('unexpected link shapes are rejected', () {\n final testCases = [\n ('/#narrow/stream/name/topic/', null), // missing operand\n@@ -564,3 +576,11 @@ void main() {\n });\n });\n }\n+\n+extension InternalLinkChecks on Subject {\n+ Subject get realmUrl => has((x) => x.realmUrl, 'realmUrl');\n+}\n+\n+extension NarrowLinkChecks on Subject {\n+ Subject get narrow => has((x) => x.narrow, 'narrow');\n+}\ndiff --git a/test/model/message_list_test.dart b/test/model/message_list_test.dart\nindex d58de664d8..0eb30c1cbb 100644\n--- a/test/model/message_list_test.dart\n+++ b/test/model/message_list_test.dart\n@@ -566,6 +566,8 @@ void main() {\n });\n });\n \n+ // TODO(#1569): test jumpToEnd\n+\n group('MessageEvent', () {\n test('in narrow', () async {\n final stream = eg.stream();\ndiff --git a/test/model/schemas/drift_schema_v7.json b/test/model/schemas/drift_schema_v7.json\nnew file mode 100644\nindex 0000000000..28ceaac619\n--- /dev/null\n+++ b/test/model/schemas/drift_schema_v7.json\n@@ -0,0 +1,1 @@\n+{\"_meta\":{\"description\":\"This file contains a serialized version of schema entities for drift.\",\"version\":\"1.2.0\"},\"options\":{\"store_date_time_values_as_text\":false},\"entities\":[{\"id\":0,\"references\":[],\"type\":\"table\",\"data\":{\"name\":\"global_settings\",\"was_declared_in_moor\":false,\"columns\":[{\"name\":\"theme_setting\",\"getter_name\":\"themeSetting\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const EnumNameConverter(ThemeSetting.values)\",\"dart_type_name\":\"ThemeSetting\"}},{\"name\":\"browser_preference\",\"getter_name\":\"browserPreference\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const EnumNameConverter(BrowserPreference.values)\",\"dart_type_name\":\"BrowserPreference\"}},{\"name\":\"visit_first_unread\",\"getter_name\":\"visitFirstUnread\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const EnumNameConverter(VisitFirstUnreadSetting.values)\",\"dart_type_name\":\"VisitFirstUnreadSetting\"}}],\"is_virtual\":false,\"without_rowid\":false,\"constraints\":[]}},{\"id\":1,\"references\":[],\"type\":\"table\",\"data\":{\"name\":\"bool_global_settings\",\"was_declared_in_moor\":false,\"columns\":[{\"name\":\"name\",\"getter_name\":\"name\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"value\",\"getter_name\":\"value\",\"moor_type\":\"bool\",\"nullable\":false,\"customConstraints\":null,\"defaultConstraints\":\"CHECK (\\\"value\\\" IN (0, 1))\",\"dialectAwareDefaultConstraints\":{\"sqlite\":\"CHECK (\\\"value\\\" IN (0, 1))\"},\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]}],\"is_virtual\":false,\"without_rowid\":false,\"constraints\":[],\"explicit_pk\":[\"name\"]}},{\"id\":2,\"references\":[],\"type\":\"table\",\"data\":{\"name\":\"accounts\",\"was_declared_in_moor\":false,\"columns\":[{\"name\":\"id\",\"getter_name\":\"id\",\"moor_type\":\"int\",\"nullable\":false,\"customConstraints\":null,\"defaultConstraints\":\"PRIMARY KEY AUTOINCREMENT\",\"dialectAwareDefaultConstraints\":{\"sqlite\":\"PRIMARY KEY AUTOINCREMENT\"},\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[\"auto-increment\"]},{\"name\":\"realm_url\",\"getter_name\":\"realmUrl\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const UriConverter()\",\"dart_type_name\":\"Uri\"}},{\"name\":\"user_id\",\"getter_name\":\"userId\",\"moor_type\":\"int\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"email\",\"getter_name\":\"email\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"api_key\",\"getter_name\":\"apiKey\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"zulip_version\",\"getter_name\":\"zulipVersion\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"zulip_merge_base\",\"getter_name\":\"zulipMergeBase\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"zulip_feature_level\",\"getter_name\":\"zulipFeatureLevel\",\"moor_type\":\"int\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"acked_push_token\",\"getter_name\":\"ackedPushToken\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]}],\"is_virtual\":false,\"without_rowid\":false,\"constraints\":[],\"unique_keys\":[[\"realm_url\",\"user_id\"],[\"realm_url\",\"email\"]]}}]}\n\\ No newline at end of file\ndiff --git a/test/model/schemas/schema.dart b/test/model/schemas/schema.dart\nindex d59002bf56..87de9194d3 100644\n--- a/test/model/schemas/schema.dart\n+++ b/test/model/schemas/schema.dart\n@@ -9,6 +9,7 @@ import 'schema_v3.dart' as v3;\n import 'schema_v4.dart' as v4;\n import 'schema_v5.dart' as v5;\n import 'schema_v6.dart' as v6;\n+import 'schema_v7.dart' as v7;\n \n class GeneratedHelper implements SchemaInstantiationHelper {\n @override\n@@ -26,10 +27,12 @@ class GeneratedHelper implements SchemaInstantiationHelper {\n return v5.DatabaseAtV5(db);\n case 6:\n return v6.DatabaseAtV6(db);\n+ case 7:\n+ return v7.DatabaseAtV7(db);\n default:\n throw MissingSchemaException(version, versions);\n }\n }\n \n- static const versions = const [1, 2, 3, 4, 5, 6];\n+ static const versions = const [1, 2, 3, 4, 5, 6, 7];\n }\ndiff --git a/test/model/schemas/schema_v7.dart b/test/model/schemas/schema_v7.dart\nnew file mode 100644\nindex 0000000000..dd3951b800\n--- /dev/null\n+++ b/test/model/schemas/schema_v7.dart\n@@ -0,0 +1,942 @@\n+// dart format width=80\n+// GENERATED CODE, DO NOT EDIT BY HAND.\n+// ignore_for_file: type=lint\n+import 'package:drift/drift.dart';\n+\n+class GlobalSettings extends Table\n+ with TableInfo {\n+ @override\n+ final GeneratedDatabase attachedDatabase;\n+ final String? _alias;\n+ GlobalSettings(this.attachedDatabase, [this._alias]);\n+ late final GeneratedColumn themeSetting = GeneratedColumn(\n+ 'theme_setting',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ late final GeneratedColumn browserPreference =\n+ GeneratedColumn(\n+ 'browser_preference',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ late final GeneratedColumn visitFirstUnread = GeneratedColumn(\n+ 'visit_first_unread',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ @override\n+ List get $columns => [\n+ themeSetting,\n+ browserPreference,\n+ visitFirstUnread,\n+ ];\n+ @override\n+ String get aliasedName => _alias ?? actualTableName;\n+ @override\n+ String get actualTableName => $name;\n+ static const String $name = 'global_settings';\n+ @override\n+ Set get $primaryKey => const {};\n+ @override\n+ GlobalSettingsData map(Map data, {String? tablePrefix}) {\n+ final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';\n+ return GlobalSettingsData(\n+ themeSetting: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}theme_setting'],\n+ ),\n+ browserPreference: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}browser_preference'],\n+ ),\n+ visitFirstUnread: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}visit_first_unread'],\n+ ),\n+ );\n+ }\n+\n+ @override\n+ GlobalSettings createAlias(String alias) {\n+ return GlobalSettings(attachedDatabase, alias);\n+ }\n+}\n+\n+class GlobalSettingsData extends DataClass\n+ implements Insertable {\n+ final String? themeSetting;\n+ final String? browserPreference;\n+ final String? visitFirstUnread;\n+ const GlobalSettingsData({\n+ this.themeSetting,\n+ this.browserPreference,\n+ this.visitFirstUnread,\n+ });\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ if (!nullToAbsent || themeSetting != null) {\n+ map['theme_setting'] = Variable(themeSetting);\n+ }\n+ if (!nullToAbsent || browserPreference != null) {\n+ map['browser_preference'] = Variable(browserPreference);\n+ }\n+ if (!nullToAbsent || visitFirstUnread != null) {\n+ map['visit_first_unread'] = Variable(visitFirstUnread);\n+ }\n+ return map;\n+ }\n+\n+ GlobalSettingsCompanion toCompanion(bool nullToAbsent) {\n+ return GlobalSettingsCompanion(\n+ themeSetting:\n+ themeSetting == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(themeSetting),\n+ browserPreference:\n+ browserPreference == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(browserPreference),\n+ visitFirstUnread:\n+ visitFirstUnread == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(visitFirstUnread),\n+ );\n+ }\n+\n+ factory GlobalSettingsData.fromJson(\n+ Map json, {\n+ ValueSerializer? serializer,\n+ }) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return GlobalSettingsData(\n+ themeSetting: serializer.fromJson(json['themeSetting']),\n+ browserPreference: serializer.fromJson(\n+ json['browserPreference'],\n+ ),\n+ visitFirstUnread: serializer.fromJson(json['visitFirstUnread']),\n+ );\n+ }\n+ @override\n+ Map toJson({ValueSerializer? serializer}) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return {\n+ 'themeSetting': serializer.toJson(themeSetting),\n+ 'browserPreference': serializer.toJson(browserPreference),\n+ 'visitFirstUnread': serializer.toJson(visitFirstUnread),\n+ };\n+ }\n+\n+ GlobalSettingsData copyWith({\n+ Value themeSetting = const Value.absent(),\n+ Value browserPreference = const Value.absent(),\n+ Value visitFirstUnread = const Value.absent(),\n+ }) => GlobalSettingsData(\n+ themeSetting: themeSetting.present ? themeSetting.value : this.themeSetting,\n+ browserPreference:\n+ browserPreference.present\n+ ? browserPreference.value\n+ : this.browserPreference,\n+ visitFirstUnread:\n+ visitFirstUnread.present\n+ ? visitFirstUnread.value\n+ : this.visitFirstUnread,\n+ );\n+ GlobalSettingsData copyWithCompanion(GlobalSettingsCompanion data) {\n+ return GlobalSettingsData(\n+ themeSetting:\n+ data.themeSetting.present\n+ ? data.themeSetting.value\n+ : this.themeSetting,\n+ browserPreference:\n+ data.browserPreference.present\n+ ? data.browserPreference.value\n+ : this.browserPreference,\n+ visitFirstUnread:\n+ data.visitFirstUnread.present\n+ ? data.visitFirstUnread.value\n+ : this.visitFirstUnread,\n+ );\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('GlobalSettingsData(')\n+ ..write('themeSetting: $themeSetting, ')\n+ ..write('browserPreference: $browserPreference, ')\n+ ..write('visitFirstUnread: $visitFirstUnread')\n+ ..write(')'))\n+ .toString();\n+ }\n+\n+ @override\n+ int get hashCode =>\n+ Object.hash(themeSetting, browserPreference, visitFirstUnread);\n+ @override\n+ bool operator ==(Object other) =>\n+ identical(this, other) ||\n+ (other is GlobalSettingsData &&\n+ other.themeSetting == this.themeSetting &&\n+ other.browserPreference == this.browserPreference &&\n+ other.visitFirstUnread == this.visitFirstUnread);\n+}\n+\n+class GlobalSettingsCompanion extends UpdateCompanion {\n+ final Value themeSetting;\n+ final Value browserPreference;\n+ final Value visitFirstUnread;\n+ final Value rowid;\n+ const GlobalSettingsCompanion({\n+ this.themeSetting = const Value.absent(),\n+ this.browserPreference = const Value.absent(),\n+ this.visitFirstUnread = const Value.absent(),\n+ this.rowid = const Value.absent(),\n+ });\n+ GlobalSettingsCompanion.insert({\n+ this.themeSetting = const Value.absent(),\n+ this.browserPreference = const Value.absent(),\n+ this.visitFirstUnread = const Value.absent(),\n+ this.rowid = const Value.absent(),\n+ });\n+ static Insertable custom({\n+ Expression? themeSetting,\n+ Expression? browserPreference,\n+ Expression? visitFirstUnread,\n+ Expression? rowid,\n+ }) {\n+ return RawValuesInsertable({\n+ if (themeSetting != null) 'theme_setting': themeSetting,\n+ if (browserPreference != null) 'browser_preference': browserPreference,\n+ if (visitFirstUnread != null) 'visit_first_unread': visitFirstUnread,\n+ if (rowid != null) 'rowid': rowid,\n+ });\n+ }\n+\n+ GlobalSettingsCompanion copyWith({\n+ Value? themeSetting,\n+ Value? browserPreference,\n+ Value? visitFirstUnread,\n+ Value? rowid,\n+ }) {\n+ return GlobalSettingsCompanion(\n+ themeSetting: themeSetting ?? this.themeSetting,\n+ browserPreference: browserPreference ?? this.browserPreference,\n+ visitFirstUnread: visitFirstUnread ?? this.visitFirstUnread,\n+ rowid: rowid ?? this.rowid,\n+ );\n+ }\n+\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ if (themeSetting.present) {\n+ map['theme_setting'] = Variable(themeSetting.value);\n+ }\n+ if (browserPreference.present) {\n+ map['browser_preference'] = Variable(browserPreference.value);\n+ }\n+ if (visitFirstUnread.present) {\n+ map['visit_first_unread'] = Variable(visitFirstUnread.value);\n+ }\n+ if (rowid.present) {\n+ map['rowid'] = Variable(rowid.value);\n+ }\n+ return map;\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('GlobalSettingsCompanion(')\n+ ..write('themeSetting: $themeSetting, ')\n+ ..write('browserPreference: $browserPreference, ')\n+ ..write('visitFirstUnread: $visitFirstUnread, ')\n+ ..write('rowid: $rowid')\n+ ..write(')'))\n+ .toString();\n+ }\n+}\n+\n+class BoolGlobalSettings extends Table\n+ with TableInfo {\n+ @override\n+ final GeneratedDatabase attachedDatabase;\n+ final String? _alias;\n+ BoolGlobalSettings(this.attachedDatabase, [this._alias]);\n+ late final GeneratedColumn name = GeneratedColumn(\n+ 'name',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn value = GeneratedColumn(\n+ 'value',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.bool,\n+ requiredDuringInsert: true,\n+ defaultConstraints: GeneratedColumn.constraintIsAlways(\n+ 'CHECK (\"value\" IN (0, 1))',\n+ ),\n+ );\n+ @override\n+ List get $columns => [name, value];\n+ @override\n+ String get aliasedName => _alias ?? actualTableName;\n+ @override\n+ String get actualTableName => $name;\n+ static const String $name = 'bool_global_settings';\n+ @override\n+ Set get $primaryKey => {name};\n+ @override\n+ BoolGlobalSettingsData map(Map data, {String? tablePrefix}) {\n+ final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';\n+ return BoolGlobalSettingsData(\n+ name:\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}name'],\n+ )!,\n+ value:\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.bool,\n+ data['${effectivePrefix}value'],\n+ )!,\n+ );\n+ }\n+\n+ @override\n+ BoolGlobalSettings createAlias(String alias) {\n+ return BoolGlobalSettings(attachedDatabase, alias);\n+ }\n+}\n+\n+class BoolGlobalSettingsData extends DataClass\n+ implements Insertable {\n+ final String name;\n+ final bool value;\n+ const BoolGlobalSettingsData({required this.name, required this.value});\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ map['name'] = Variable(name);\n+ map['value'] = Variable(value);\n+ return map;\n+ }\n+\n+ BoolGlobalSettingsCompanion toCompanion(bool nullToAbsent) {\n+ return BoolGlobalSettingsCompanion(name: Value(name), value: Value(value));\n+ }\n+\n+ factory BoolGlobalSettingsData.fromJson(\n+ Map json, {\n+ ValueSerializer? serializer,\n+ }) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return BoolGlobalSettingsData(\n+ name: serializer.fromJson(json['name']),\n+ value: serializer.fromJson(json['value']),\n+ );\n+ }\n+ @override\n+ Map toJson({ValueSerializer? serializer}) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return {\n+ 'name': serializer.toJson(name),\n+ 'value': serializer.toJson(value),\n+ };\n+ }\n+\n+ BoolGlobalSettingsData copyWith({String? name, bool? value}) =>\n+ BoolGlobalSettingsData(\n+ name: name ?? this.name,\n+ value: value ?? this.value,\n+ );\n+ BoolGlobalSettingsData copyWithCompanion(BoolGlobalSettingsCompanion data) {\n+ return BoolGlobalSettingsData(\n+ name: data.name.present ? data.name.value : this.name,\n+ value: data.value.present ? data.value.value : this.value,\n+ );\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('BoolGlobalSettingsData(')\n+ ..write('name: $name, ')\n+ ..write('value: $value')\n+ ..write(')'))\n+ .toString();\n+ }\n+\n+ @override\n+ int get hashCode => Object.hash(name, value);\n+ @override\n+ bool operator ==(Object other) =>\n+ identical(this, other) ||\n+ (other is BoolGlobalSettingsData &&\n+ other.name == this.name &&\n+ other.value == this.value);\n+}\n+\n+class BoolGlobalSettingsCompanion\n+ extends UpdateCompanion {\n+ final Value name;\n+ final Value value;\n+ final Value rowid;\n+ const BoolGlobalSettingsCompanion({\n+ this.name = const Value.absent(),\n+ this.value = const Value.absent(),\n+ this.rowid = const Value.absent(),\n+ });\n+ BoolGlobalSettingsCompanion.insert({\n+ required String name,\n+ required bool value,\n+ this.rowid = const Value.absent(),\n+ }) : name = Value(name),\n+ value = Value(value);\n+ static Insertable custom({\n+ Expression? name,\n+ Expression? value,\n+ Expression? rowid,\n+ }) {\n+ return RawValuesInsertable({\n+ if (name != null) 'name': name,\n+ if (value != null) 'value': value,\n+ if (rowid != null) 'rowid': rowid,\n+ });\n+ }\n+\n+ BoolGlobalSettingsCompanion copyWith({\n+ Value? name,\n+ Value? value,\n+ Value? rowid,\n+ }) {\n+ return BoolGlobalSettingsCompanion(\n+ name: name ?? this.name,\n+ value: value ?? this.value,\n+ rowid: rowid ?? this.rowid,\n+ );\n+ }\n+\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ if (name.present) {\n+ map['name'] = Variable(name.value);\n+ }\n+ if (value.present) {\n+ map['value'] = Variable(value.value);\n+ }\n+ if (rowid.present) {\n+ map['rowid'] = Variable(rowid.value);\n+ }\n+ return map;\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('BoolGlobalSettingsCompanion(')\n+ ..write('name: $name, ')\n+ ..write('value: $value, ')\n+ ..write('rowid: $rowid')\n+ ..write(')'))\n+ .toString();\n+ }\n+}\n+\n+class Accounts extends Table with TableInfo {\n+ @override\n+ final GeneratedDatabase attachedDatabase;\n+ final String? _alias;\n+ Accounts(this.attachedDatabase, [this._alias]);\n+ late final GeneratedColumn id = GeneratedColumn(\n+ 'id',\n+ aliasedName,\n+ false,\n+ hasAutoIncrement: true,\n+ type: DriftSqlType.int,\n+ requiredDuringInsert: false,\n+ defaultConstraints: GeneratedColumn.constraintIsAlways(\n+ 'PRIMARY KEY AUTOINCREMENT',\n+ ),\n+ );\n+ late final GeneratedColumn realmUrl = GeneratedColumn(\n+ 'realm_url',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn userId = GeneratedColumn(\n+ 'user_id',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.int,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn email = GeneratedColumn(\n+ 'email',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn apiKey = GeneratedColumn(\n+ 'api_key',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn zulipVersion = GeneratedColumn(\n+ 'zulip_version',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn zulipMergeBase = GeneratedColumn(\n+ 'zulip_merge_base',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ late final GeneratedColumn zulipFeatureLevel = GeneratedColumn(\n+ 'zulip_feature_level',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.int,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn ackedPushToken = GeneratedColumn(\n+ 'acked_push_token',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ @override\n+ List get $columns => [\n+ id,\n+ realmUrl,\n+ userId,\n+ email,\n+ apiKey,\n+ zulipVersion,\n+ zulipMergeBase,\n+ zulipFeatureLevel,\n+ ackedPushToken,\n+ ];\n+ @override\n+ String get aliasedName => _alias ?? actualTableName;\n+ @override\n+ String get actualTableName => $name;\n+ static const String $name = 'accounts';\n+ @override\n+ Set get $primaryKey => {id};\n+ @override\n+ List> get uniqueKeys => [\n+ {realmUrl, userId},\n+ {realmUrl, email},\n+ ];\n+ @override\n+ AccountsData map(Map data, {String? tablePrefix}) {\n+ final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';\n+ return AccountsData(\n+ id:\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.int,\n+ data['${effectivePrefix}id'],\n+ )!,\n+ realmUrl:\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}realm_url'],\n+ )!,\n+ userId:\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.int,\n+ data['${effectivePrefix}user_id'],\n+ )!,\n+ email:\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}email'],\n+ )!,\n+ apiKey:\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}api_key'],\n+ )!,\n+ zulipVersion:\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}zulip_version'],\n+ )!,\n+ zulipMergeBase: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}zulip_merge_base'],\n+ ),\n+ zulipFeatureLevel:\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.int,\n+ data['${effectivePrefix}zulip_feature_level'],\n+ )!,\n+ ackedPushToken: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}acked_push_token'],\n+ ),\n+ );\n+ }\n+\n+ @override\n+ Accounts createAlias(String alias) {\n+ return Accounts(attachedDatabase, alias);\n+ }\n+}\n+\n+class AccountsData extends DataClass implements Insertable {\n+ final int id;\n+ final String realmUrl;\n+ final int userId;\n+ final String email;\n+ final String apiKey;\n+ final String zulipVersion;\n+ final String? zulipMergeBase;\n+ final int zulipFeatureLevel;\n+ final String? ackedPushToken;\n+ const AccountsData({\n+ required this.id,\n+ required this.realmUrl,\n+ required this.userId,\n+ required this.email,\n+ required this.apiKey,\n+ required this.zulipVersion,\n+ this.zulipMergeBase,\n+ required this.zulipFeatureLevel,\n+ this.ackedPushToken,\n+ });\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ map['id'] = Variable(id);\n+ map['realm_url'] = Variable(realmUrl);\n+ map['user_id'] = Variable(userId);\n+ map['email'] = Variable(email);\n+ map['api_key'] = Variable(apiKey);\n+ map['zulip_version'] = Variable(zulipVersion);\n+ if (!nullToAbsent || zulipMergeBase != null) {\n+ map['zulip_merge_base'] = Variable(zulipMergeBase);\n+ }\n+ map['zulip_feature_level'] = Variable(zulipFeatureLevel);\n+ if (!nullToAbsent || ackedPushToken != null) {\n+ map['acked_push_token'] = Variable(ackedPushToken);\n+ }\n+ return map;\n+ }\n+\n+ AccountsCompanion toCompanion(bool nullToAbsent) {\n+ return AccountsCompanion(\n+ id: Value(id),\n+ realmUrl: Value(realmUrl),\n+ userId: Value(userId),\n+ email: Value(email),\n+ apiKey: Value(apiKey),\n+ zulipVersion: Value(zulipVersion),\n+ zulipMergeBase:\n+ zulipMergeBase == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(zulipMergeBase),\n+ zulipFeatureLevel: Value(zulipFeatureLevel),\n+ ackedPushToken:\n+ ackedPushToken == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(ackedPushToken),\n+ );\n+ }\n+\n+ factory AccountsData.fromJson(\n+ Map json, {\n+ ValueSerializer? serializer,\n+ }) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return AccountsData(\n+ id: serializer.fromJson(json['id']),\n+ realmUrl: serializer.fromJson(json['realmUrl']),\n+ userId: serializer.fromJson(json['userId']),\n+ email: serializer.fromJson(json['email']),\n+ apiKey: serializer.fromJson(json['apiKey']),\n+ zulipVersion: serializer.fromJson(json['zulipVersion']),\n+ zulipMergeBase: serializer.fromJson(json['zulipMergeBase']),\n+ zulipFeatureLevel: serializer.fromJson(json['zulipFeatureLevel']),\n+ ackedPushToken: serializer.fromJson(json['ackedPushToken']),\n+ );\n+ }\n+ @override\n+ Map toJson({ValueSerializer? serializer}) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return {\n+ 'id': serializer.toJson(id),\n+ 'realmUrl': serializer.toJson(realmUrl),\n+ 'userId': serializer.toJson(userId),\n+ 'email': serializer.toJson(email),\n+ 'apiKey': serializer.toJson(apiKey),\n+ 'zulipVersion': serializer.toJson(zulipVersion),\n+ 'zulipMergeBase': serializer.toJson(zulipMergeBase),\n+ 'zulipFeatureLevel': serializer.toJson(zulipFeatureLevel),\n+ 'ackedPushToken': serializer.toJson(ackedPushToken),\n+ };\n+ }\n+\n+ AccountsData copyWith({\n+ int? id,\n+ String? realmUrl,\n+ int? userId,\n+ String? email,\n+ String? apiKey,\n+ String? zulipVersion,\n+ Value zulipMergeBase = const Value.absent(),\n+ int? zulipFeatureLevel,\n+ Value ackedPushToken = const Value.absent(),\n+ }) => AccountsData(\n+ id: id ?? this.id,\n+ realmUrl: realmUrl ?? this.realmUrl,\n+ userId: userId ?? this.userId,\n+ email: email ?? this.email,\n+ apiKey: apiKey ?? this.apiKey,\n+ zulipVersion: zulipVersion ?? this.zulipVersion,\n+ zulipMergeBase:\n+ zulipMergeBase.present ? zulipMergeBase.value : this.zulipMergeBase,\n+ zulipFeatureLevel: zulipFeatureLevel ?? this.zulipFeatureLevel,\n+ ackedPushToken:\n+ ackedPushToken.present ? ackedPushToken.value : this.ackedPushToken,\n+ );\n+ AccountsData copyWithCompanion(AccountsCompanion data) {\n+ return AccountsData(\n+ id: data.id.present ? data.id.value : this.id,\n+ realmUrl: data.realmUrl.present ? data.realmUrl.value : this.realmUrl,\n+ userId: data.userId.present ? data.userId.value : this.userId,\n+ email: data.email.present ? data.email.value : this.email,\n+ apiKey: data.apiKey.present ? data.apiKey.value : this.apiKey,\n+ zulipVersion:\n+ data.zulipVersion.present\n+ ? data.zulipVersion.value\n+ : this.zulipVersion,\n+ zulipMergeBase:\n+ data.zulipMergeBase.present\n+ ? data.zulipMergeBase.value\n+ : this.zulipMergeBase,\n+ zulipFeatureLevel:\n+ data.zulipFeatureLevel.present\n+ ? data.zulipFeatureLevel.value\n+ : this.zulipFeatureLevel,\n+ ackedPushToken:\n+ data.ackedPushToken.present\n+ ? data.ackedPushToken.value\n+ : this.ackedPushToken,\n+ );\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('AccountsData(')\n+ ..write('id: $id, ')\n+ ..write('realmUrl: $realmUrl, ')\n+ ..write('userId: $userId, ')\n+ ..write('email: $email, ')\n+ ..write('apiKey: $apiKey, ')\n+ ..write('zulipVersion: $zulipVersion, ')\n+ ..write('zulipMergeBase: $zulipMergeBase, ')\n+ ..write('zulipFeatureLevel: $zulipFeatureLevel, ')\n+ ..write('ackedPushToken: $ackedPushToken')\n+ ..write(')'))\n+ .toString();\n+ }\n+\n+ @override\n+ int get hashCode => Object.hash(\n+ id,\n+ realmUrl,\n+ userId,\n+ email,\n+ apiKey,\n+ zulipVersion,\n+ zulipMergeBase,\n+ zulipFeatureLevel,\n+ ackedPushToken,\n+ );\n+ @override\n+ bool operator ==(Object other) =>\n+ identical(this, other) ||\n+ (other is AccountsData &&\n+ other.id == this.id &&\n+ other.realmUrl == this.realmUrl &&\n+ other.userId == this.userId &&\n+ other.email == this.email &&\n+ other.apiKey == this.apiKey &&\n+ other.zulipVersion == this.zulipVersion &&\n+ other.zulipMergeBase == this.zulipMergeBase &&\n+ other.zulipFeatureLevel == this.zulipFeatureLevel &&\n+ other.ackedPushToken == this.ackedPushToken);\n+}\n+\n+class AccountsCompanion extends UpdateCompanion {\n+ final Value id;\n+ final Value realmUrl;\n+ final Value userId;\n+ final Value email;\n+ final Value apiKey;\n+ final Value zulipVersion;\n+ final Value zulipMergeBase;\n+ final Value zulipFeatureLevel;\n+ final Value ackedPushToken;\n+ const AccountsCompanion({\n+ this.id = const Value.absent(),\n+ this.realmUrl = const Value.absent(),\n+ this.userId = const Value.absent(),\n+ this.email = const Value.absent(),\n+ this.apiKey = const Value.absent(),\n+ this.zulipVersion = const Value.absent(),\n+ this.zulipMergeBase = const Value.absent(),\n+ this.zulipFeatureLevel = const Value.absent(),\n+ this.ackedPushToken = const Value.absent(),\n+ });\n+ AccountsCompanion.insert({\n+ this.id = const Value.absent(),\n+ required String realmUrl,\n+ required int userId,\n+ required String email,\n+ required String apiKey,\n+ required String zulipVersion,\n+ this.zulipMergeBase = const Value.absent(),\n+ required int zulipFeatureLevel,\n+ this.ackedPushToken = const Value.absent(),\n+ }) : realmUrl = Value(realmUrl),\n+ userId = Value(userId),\n+ email = Value(email),\n+ apiKey = Value(apiKey),\n+ zulipVersion = Value(zulipVersion),\n+ zulipFeatureLevel = Value(zulipFeatureLevel);\n+ static Insertable custom({\n+ Expression? id,\n+ Expression? realmUrl,\n+ Expression? userId,\n+ Expression? email,\n+ Expression? apiKey,\n+ Expression? zulipVersion,\n+ Expression? zulipMergeBase,\n+ Expression? zulipFeatureLevel,\n+ Expression? ackedPushToken,\n+ }) {\n+ return RawValuesInsertable({\n+ if (id != null) 'id': id,\n+ if (realmUrl != null) 'realm_url': realmUrl,\n+ if (userId != null) 'user_id': userId,\n+ if (email != null) 'email': email,\n+ if (apiKey != null) 'api_key': apiKey,\n+ if (zulipVersion != null) 'zulip_version': zulipVersion,\n+ if (zulipMergeBase != null) 'zulip_merge_base': zulipMergeBase,\n+ if (zulipFeatureLevel != null) 'zulip_feature_level': zulipFeatureLevel,\n+ if (ackedPushToken != null) 'acked_push_token': ackedPushToken,\n+ });\n+ }\n+\n+ AccountsCompanion copyWith({\n+ Value? id,\n+ Value? realmUrl,\n+ Value? userId,\n+ Value? email,\n+ Value? apiKey,\n+ Value? zulipVersion,\n+ Value? zulipMergeBase,\n+ Value? zulipFeatureLevel,\n+ Value? ackedPushToken,\n+ }) {\n+ return AccountsCompanion(\n+ id: id ?? this.id,\n+ realmUrl: realmUrl ?? this.realmUrl,\n+ userId: userId ?? this.userId,\n+ email: email ?? this.email,\n+ apiKey: apiKey ?? this.apiKey,\n+ zulipVersion: zulipVersion ?? this.zulipVersion,\n+ zulipMergeBase: zulipMergeBase ?? this.zulipMergeBase,\n+ zulipFeatureLevel: zulipFeatureLevel ?? this.zulipFeatureLevel,\n+ ackedPushToken: ackedPushToken ?? this.ackedPushToken,\n+ );\n+ }\n+\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ if (id.present) {\n+ map['id'] = Variable(id.value);\n+ }\n+ if (realmUrl.present) {\n+ map['realm_url'] = Variable(realmUrl.value);\n+ }\n+ if (userId.present) {\n+ map['user_id'] = Variable(userId.value);\n+ }\n+ if (email.present) {\n+ map['email'] = Variable(email.value);\n+ }\n+ if (apiKey.present) {\n+ map['api_key'] = Variable(apiKey.value);\n+ }\n+ if (zulipVersion.present) {\n+ map['zulip_version'] = Variable(zulipVersion.value);\n+ }\n+ if (zulipMergeBase.present) {\n+ map['zulip_merge_base'] = Variable(zulipMergeBase.value);\n+ }\n+ if (zulipFeatureLevel.present) {\n+ map['zulip_feature_level'] = Variable(zulipFeatureLevel.value);\n+ }\n+ if (ackedPushToken.present) {\n+ map['acked_push_token'] = Variable(ackedPushToken.value);\n+ }\n+ return map;\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('AccountsCompanion(')\n+ ..write('id: $id, ')\n+ ..write('realmUrl: $realmUrl, ')\n+ ..write('userId: $userId, ')\n+ ..write('email: $email, ')\n+ ..write('apiKey: $apiKey, ')\n+ ..write('zulipVersion: $zulipVersion, ')\n+ ..write('zulipMergeBase: $zulipMergeBase, ')\n+ ..write('zulipFeatureLevel: $zulipFeatureLevel, ')\n+ ..write('ackedPushToken: $ackedPushToken')\n+ ..write(')'))\n+ .toString();\n+ }\n+}\n+\n+class DatabaseAtV7 extends GeneratedDatabase {\n+ DatabaseAtV7(QueryExecutor e) : super(e);\n+ late final GlobalSettings globalSettings = GlobalSettings(this);\n+ late final BoolGlobalSettings boolGlobalSettings = BoolGlobalSettings(this);\n+ late final Accounts accounts = Accounts(this);\n+ @override\n+ Iterable> get allTables =>\n+ allSchemaEntities.whereType>();\n+ @override\n+ List get allSchemaEntities => [\n+ globalSettings,\n+ boolGlobalSettings,\n+ accounts,\n+ ];\n+ @override\n+ int get schemaVersion => 7;\n+}\ndiff --git a/test/model/settings_test.dart b/test/model/settings_test.dart\nindex ad739f5d4b..89956323e2 100644\n--- a/test/model/settings_test.dart\n+++ b/test/model/settings_test.dart\n@@ -77,6 +77,9 @@ void main() {\n // TODO integration tests with sqlite\n });\n \n+ // TODO(#1571) test visitFirstUnread applies default\n+ // TODO(#1571) test shouldVisitFirstUnread\n+\n group('getBool/setBool', () {\n test('get from default', () {\n final globalSettings = eg.globalStore(boolGlobalSettings: {}).settings;\ndiff --git a/test/widgets/content_test.dart b/test/widgets/content_test.dart\nindex a788225aac..b5150a54ee 100644\n--- a/test/widgets/content_test.dart\n+++ b/test/widgets/content_test.dart\n@@ -1032,6 +1032,8 @@ void main() {\n .page.isA().initNarrow.equals(const ChannelNarrow(1));\n });\n \n+ // TODO(#1570): test links with /near/ go to the specific message\n+\n testWidgets('invalid internal links are opened in browser', (tester) async {\n // Link is invalid due to `topic` operator missing an operand.\n final pushedRoutes = await prepare(tester,\ndiff --git a/test/widgets/message_list_test.dart b/test/widgets/message_list_test.dart\nindex 3b3b01b323..5ba2712e76 100644\n--- a/test/widgets/message_list_test.dart\n+++ b/test/widgets/message_list_test.dart\n@@ -59,6 +59,7 @@ void main() {\n bool foundOldest = true,\n int? messageCount,\n List? messages,\n+ GetMessagesResult? fetchResult,\n List? streams,\n List? users,\n List? subscriptions,\n@@ -83,12 +84,17 @@ void main() {\n // prepare message list data\n await store.addUser(eg.selfUser);\n await store.addUsers(users ?? []);\n- assert((messageCount == null) != (messages == null));\n- messages ??= List.generate(messageCount!, (index) {\n- return eg.streamMessage(sender: eg.selfUser);\n- });\n- connection.prepare(json:\n- eg.newestGetMessagesResult(foundOldest: foundOldest, messages: messages).toJson());\n+ if (fetchResult != null) {\n+ assert(foundOldest && messageCount == null && messages == null);\n+ } else {\n+ assert((messageCount == null) != (messages == null));\n+ messages ??= List.generate(messageCount!, (index) {\n+ return eg.streamMessage(sender: eg.selfUser);\n+ });\n+ fetchResult = eg.newestGetMessagesResult(\n+ foundOldest: foundOldest, messages: messages);\n+ }\n+ connection.prepare(json: fetchResult.toJson());\n \n await tester.pumpWidget(TestZulipApp(accountId: selfAccount.id,\n skipAssertAccountExists: skipAssertAccountExists,\n@@ -368,6 +374,11 @@ void main() {\n });\n \n group('fetch initial batch of messages', () {\n+ // TODO(#1571): test effect of visitFirstUnread setting\n+ // TODO(#1569): test effect of initAnchorMessageId\n+ // TODO(#1569): test that after jumpToEnd, then new store causing new fetch,\n+ // new post-jump anchor prevails over initAnchorMessageId\n+\n group('topic permalink', () {\n final someStream = eg.stream();\n const someTopic = 'some topic';\n@@ -402,7 +413,7 @@ void main() {\n ..url.path.equals('/api/v1/messages')\n ..url.queryParameters.deepEquals({\n 'narrow': jsonEncode(narrow.apiEncode()),\n- 'anchor': AnchorCode.newest.toJson(),\n+ 'anchor': AnchorCode.firstUnread.toJson(),\n 'num_before': kMessageListFetchBatchSize.toString(),\n 'num_after': kMessageListFetchBatchSize.toString(),\n 'allow_empty_topic_name': 'true',\n@@ -435,7 +446,7 @@ void main() {\n ..url.path.equals('/api/v1/messages')\n ..url.queryParameters.deepEquals({\n 'narrow': jsonEncode(narrow.apiEncode()),\n- 'anchor': AnchorCode.newest.toJson(),\n+ 'anchor': AnchorCode.firstUnread.toJson(),\n 'num_before': kMessageListFetchBatchSize.toString(),\n 'num_after': kMessageListFetchBatchSize.toString(),\n 'allow_empty_topic_name': 'true',\n@@ -445,6 +456,10 @@ void main() {\n });\n \n group('fetch older messages on scroll', () {\n+ // TODO(#1569): test fetch newer messages on scroll, too;\n+ // in particular test it happens even when near top as well as bottom\n+ // (because may have haveOldest true but haveNewest false)\n+\n int? itemCount(WidgetTester tester) =>\n findScrollView(tester).semanticChildCount;\n \n@@ -656,6 +671,8 @@ void main() {\n check(isButtonVisible(tester)).equals(false);\n });\n \n+ // TODO(#1569): test choice of jumpToEnd vs. scrollToEnd\n+\n testWidgets('scrolls at reasonable, constant speed', (tester) async {\n const maxSpeed = 8000.0;\n const distance = 40000.0;\n@@ -692,6 +709,63 @@ void main() {\n });\n });\n \n+ // TODO test markers at start of list (`_buildStartCap`)\n+\n+ group('markers at end of list', () {\n+ final findLoadingIndicator = find.byType(CircularProgressIndicator);\n+\n+ testWidgets('spacer when have newest', (tester) async {\n+ final messages = List.generate(10,\n+ (i) => eg.streamMessage(content: '

          message $i

          '));\n+ await setupMessageListPage(tester, narrow: CombinedFeedNarrow(),\n+ fetchResult: eg.nearGetMessagesResult(anchor: messages.last.id,\n+ foundOldest: true, foundNewest: true, messages: messages));\n+ check(findMessageListScrollController(tester)!.position)\n+ .extentAfter.equals(0);\n+\n+ // There's no loading indicator.\n+ check(findLoadingIndicator).findsNothing();\n+ // The last message is spaced above the bottom of the viewport.\n+ check(tester.getRect(find.text('message 9')))\n+ .bottom..isGreaterThan(400)..isLessThan(570);\n+ });\n+\n+ testWidgets('loading indicator displaces spacer etc.', (tester) async {\n+ await setupMessageListPage(tester, narrow: CombinedFeedNarrow(),\n+ skipPumpAndSettle: true,\n+ // TODO(#1569) fix realism of this data: foundNewest false should mean\n+ // some messages found after anchor (and then we might need to scroll\n+ // to cause fetching newer messages).\n+ fetchResult: eg.nearGetMessagesResult(anchor: 1000,\n+ foundOldest: true, foundNewest: false,\n+ messages: List.generate(10,\n+ (i) => eg.streamMessage(id: 100 + i, content: '

          message $i

          '))));\n+ await tester.pump();\n+\n+ // The message list will immediately start fetching newer messages.\n+ connection.prepare(json: eg.newerGetMessagesResult(\n+ anchor: 109, foundNewest: true, messages: List.generate(100,\n+ (i) => eg.streamMessage(id: 110 + i))).toJson());\n+ await tester.pump(Duration(milliseconds: 10));\n+ await tester.pump();\n+\n+ // There's a loading indicator.\n+ check(findLoadingIndicator).findsOne();\n+ // It's at the bottom.\n+ check(findMessageListScrollController(tester)!.position)\n+ .extentAfter.equals(0);\n+ final loadingIndicatorRect = tester.getRect(findLoadingIndicator);\n+ check(loadingIndicatorRect).bottom.isGreaterThan(575);\n+ // The last message is shortly above it; no spacer or anything else.\n+ check(tester.getRect(find.text('message 9')))\n+ .bottom.isGreaterThan(loadingIndicatorRect.top - 36); // TODO(#1569) where's this space going?\n+ await tester.pumpAndSettle();\n+ });\n+\n+ // TODO(#1569) test no typing status or mark-read button when not haveNewest\n+ // (even without loading indicator)\n+ });\n+\n group('TypingStatusWidget', () {\n final users = [eg.selfUser, eg.otherUser, eg.thirdUser, eg.fourthUser];\n final finder = find.descendant(\ndiff --git a/test/widgets/settings_test.dart b/test/widgets/settings_test.dart\nindex 46df165ecc..96fd62feeb 100644\n--- a/test/widgets/settings_test.dart\n+++ b/test/widgets/settings_test.dart\n@@ -127,6 +127,8 @@ void main() {\n }, variant: TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n });\n \n+ // TODO(#1571): test visitFirstUnread setting UI\n+\n // TODO maybe test GlobalSettingType.experimentalFeatureFlag settings\n // Or maybe not; after all, it's a developer-facing feature, so\n // should be low risk.\n", "n2p_tests": "{\"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects triple slash: https://example.com///#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/dm/<...>\\\" returns expected DmNarrow /#narrow/dm/1,2-group/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h6 (platform requests bold)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/dm/17327-Chris-Bobbe-(Test-Account)/is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: middleMessage maintained on fetchOlder\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric stream ID and topic: #narrow/channel/123-a/topic/topic1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/resolved/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient stream messages vs DMs, no match\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient DMs match just if same recipients\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is external; follow the user preference (iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/dm/<...>\\\" returns expected DmNarrow /#narrow/dm/a.40b.2Ecom.2Ec.2Ed.2Ecom/with/4\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>\\\" returns expected ChannelNarrow /#narrow/stream/stream/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink edge cases on malformed stream link: reject #narrow/stream/-1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric stream ID and topic: #narrow/stream/123-a/topic/topic1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong path: user_uploads/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/resolved/is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is null; use our per-platform defaults for non-HTTP links (Android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink Both `stream` and `channel` can be used interchangeably /#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/stream/subject/topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/pm-with/<...>\\\" returns expected DmNarrow /#narrow/pm-with/a.40b.2Ecom.2Ec.2Ed.2Ecom/near/3\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/dm/17327-Chris-Bobbe-(Test-Account)/is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/unread/is/unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode on internal links valid internal links are navigated to within app\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects double slash: https://example.com//#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions multiple links in paragraph\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong domain, realm-like path, narrow-like fragment: https://web.archive.org/web/*/https://example.com/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/alerted/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage composeBoxState finds compose box\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/dm/17327-Chris-Bobbe-(Test-Account)/is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient topics compared case-insensitively same non-cased chars\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink with historic links on old stream link #narrow/channel/topic/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/stream/subject/topic/with/333\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/check/topic/test/is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink again topic link parsing on old topic link, with dot-encoding #narrow/channel/general/topic/google.2Ecom\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects odd scheme, wrong domain, realm-like path, narrow-like fragment: ftp://web.archive.org/web/*/https://example.com/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink CombinedFeedNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/unread/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: showSender is maintained correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong path: user_uploads/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink Both `stream` and `channel` can be used interchangeably /#narrow/stream/check/topic/test\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/pm-with/<...>\\\" returns expected DmNarrow /#narrow/pm-with/1,2-group/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/dm/17327-Chris-Bobbe-(Test-Account)/is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts legacy: stream name, no ID, topic: #narrow/stream/check/topic/topic1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/followed/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient topics compared case-insensitively having different CJK characters\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/-is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in bold context (platform requests bold)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong domain: https://another.com/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/stream/subject/topic/with/asdf\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/topic/test/is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts legacy: stream name, no ID: #narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/mobile/subject/topic/with/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric pm user IDs (new operator): #narrow/dm/123-mark\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/starred/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/topic/test/is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/-is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: middleMessage maintained on messages deleted, bottom empty\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/stream/subject/topic/with/asdf\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink ChannelNarrow / TopicNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/check/topic/test\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric stream ID: #narrow/stream/123-check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in plain paragraph (platform requests bold)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>\\\" returns expected ChannelNarrow /#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/mentioned/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient stream messages match just if same stream/topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/mobile/topic/topic/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/check/topic/test\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink again DM link parsing on group PM link including self #narrow/pm-with/1,2,1043-group\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/-is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts legacy: stream name, no ID: #narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/check/topic/test/is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Heading plain h6\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/mobile/subject/topic/with/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts ipv4 address: http://192.168.0.1/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/topic/test/is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent @-topic\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient topics compared case-insensitively same case, mixed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/dm/17327-Chris-Bobbe-(Test-Account)/is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/pm-with/<...>\\\" returns expected DmNarrow /#narrow/pm-with/1,2-group\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/-is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink with historic links for stream with hyphens or even looking like new-style #narrow/channel/--help/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/followed/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient topics compared case-insensitively different case, same diacritics\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>\\\" returns expected ChannelNarrow /#narrow/channel/stream/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink with historic links on old stream link #narrow/stream/check.API/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/alerted/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: setThemeSetting smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink normalize links to always include a \\\"/\\\" after hostname\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/topic/test/is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: middleMessage maintained on messages muted, bottom empty\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/check/topic/test/is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/topic/test/is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/private/is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: handle content parsing into subclasses of ZulipMessageContent PollContent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: middleMessage maintained on fetchOlder, from top empty\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink again topic link parsing on old topic link, with dot-encoding #narrow/stream/general/topic/google.2Ecom\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is inApp; use platform default for non-http links (Android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/dm/<...>\\\" returns expected DmNarrow /#narrow/dm/a.40b.2Ecom.2Ec.2Ed.2Ecom/near/3\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink Both `stream` and `channel` can be used interchangeably /#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink Both `stream` and `channel` can be used interchangeably /#narrow/channel/check/topic/test\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: Heading smoke test for h1, h2, h3, h4, h5\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/-is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: recipient headers are maintained consistently\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong fragment: #nope\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink Both `stream` and `channel` can be used interchangeably /#narrow/stream/check/topic/test/near/378333\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects triple slash: https://example.com///#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink with historic links on old stream link #narrow/channel/check.API/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/unread/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: handle content parsing into subclasses of ZulipMessageContent ZulipContent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/check/topic/test/is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions link inside HeadingNode\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong domain, realm-like path, narrow-like fragment: https://web.archive.org/web/*/https://example.com/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects same domain, realm-like path, narrow-like fragment: web/*/https://example.com/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/mobile/topic/topic/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient topics compared case-insensitively same case, all upper\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/dm/<...>\\\" returns expected DmNarrow /#narrow/dm/1,2-group\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink edge cases on malformed stream link: reject #narrow/channel/-1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/private/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/topic/test/is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient topics compared case-insensitively different case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric pm user IDs (old operator): #narrow/pm-with/123-mark\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/dm/is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/stream/topic/topic/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with port: https://example.com:444/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/followed/is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>\\\" returns expected ChannelNarrow /#narrow/stream/topic/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is inApp; follow the user preference for http links (iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects wrong domain: https://another.com/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/stream/subject/topic/with/333\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink again topic link parsing basic #narrow/stream/204-general/topic/(no.20topic)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/mentioned/is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with numeric stream ID: #narrow/channel/123-check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/stream/topic/topic/with/22\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is inApp; use platform default for non-http links (iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/dm/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/pm-with/<...>\\\" returns expected DmNarrow /#narrow/pm-with/1,2-group/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/check/topic/test/is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/starred/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/dm/<...>\\\" returns expected DmNarrow /#narrow/dm/1,2-group/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink again topic link parsing on old topic link, with dot-encoding #narrow/channel/general/topic/(no.20topic)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient topics compared case-insensitively same case, all lower\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/-is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/stream/subject/topic/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/check/topic/test/is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/-is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts legacy: stream name, no ID, topic: #narrow/channel/check/topic/topic1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink MentionsNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/dm/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects double slash: https://example.com//#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is null; use our per-platform defaults for HTTP links (iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent channel wildcard @-mention, class order reversed\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/mobile/subject/topic/near/378333\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/dm/17327-Chris-Bobbe-(Test-Account)/is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/check/topic/test/is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient topics compared case-insensitively same letters, different diacritics\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts with port: https://example.com:444/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/private/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>\\\" returns expected ChannelNarrow /#narrow/channel/topic/\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/alerted/is/alerted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesSameDay\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects #narrowly: #narrowly/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/stream/subject/topic/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/pm-with/<...>\\\" returns expected DmNarrow /#narrow/pm-with/a.40b.2Ecom.2Ec.2Ed.2Ecom/with/3\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h5 (platform requests bold)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/resolved/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/starred/is/starred\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: middleMessage maintained on MessageEvent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/stream/mobile/subject/topic/near/378333\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/stream/topic/topic/near/1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/topic/test/is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ListNodeWidget ordered list with custom start\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/mentioned/with/2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink Both `stream` and `channel` can be used interchangeably /#narrow/channel/check/topic/test/near/378333\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink DmNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects same domain, realm-like path, narrow-like fragment: web/*/https://example.com/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage composeBoxState null when no compose box\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: narrowLink StarredMessagesNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: middleMessage maintained on messages muted, including anchor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts punycodable host: https://example.\\u092d\\u093e\\u0930\\u0924/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is inApp; follow the user preference for http links (Android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/stream/topic/topic/with/22\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal rejects odd scheme, wrong domain, realm-like path, narrow-like fragment: ftp://web.archive.org/web/*/https://example.com/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/7-test-here/is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>\\\" returns expected ChannelNarrow /#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts ipv4 address: http://192.168.0.1/#narrow/stream/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/channel/7-test-here/is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: middleMessage maintained on messages deleted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: middleMessage maintained on messages muted, not including anchor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink is-internal accepts punycodable host: https://example.\\u092d\\u093e\\u0930\\u0924/#narrow/channel/check\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/dm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink \\\"/#narrow/stream/<...>/topic/<...>\\\" returns expected TopicNarrow /#narrow/channel/stream/subject/topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/dm/17327-Chris-Bobbe-(Test-Account)/is/private\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/internal_link_test.dart: parseInternalLink /#narrow/is/<...> returns corresponding narrow /#narrow/stream/check/topic/test/is/mentioned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch initial batch of messages topic permalink with message move\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch initial batch of messages topic permalink without message move\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial recent senders track all the messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in table column header\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow moved from narrow: should remove moved messages (channel, topic) -> (new channel, new topic)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent not in narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: middleMessage maintained on fetchInitial empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent in ChannelNarrow, use stream visibility\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved fetch races fetchOlder backoff A starts, _reset, move fetch finishes, fetchOlder backoff B starts, fetchOlder backoff A ends\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/settings_test.dart: ThemeSetting follow system setting when themeSetting is null\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in combined feed narrow internal move between topics\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: regression tests for #455 ReactionEvent is applied even when message not in any msglists\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: stream/topic muting in ChannelNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar has topic-list action for channel narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchOlder handles servers not understanding includeAnchor\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar has channel-feed action for topic narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow handle move event before initial fetch\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved fetch races fetchInitial, _reset, initial fetch finishes, move fetch finishes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more nop when already fetching newer\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial short history\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow follow to the new narrow when propagateMode = changeAll\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: DeleteMessageEvent non-consecutive message deletion\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar channel icon in channel row; web-public: true, invite-only: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in spoiler header\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchOlder nop when already haveOldest true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfMessagePresent message absent (newer than window)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent while in mid-history\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved fetch races fetchOlder #1, _reset, move fetch finishes, fetchOlder #2, fetchOlder #1 finishes, fetchOlder #2 finishes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved fetch races fetchOlder, _reset, fetchOlder returns, move fetch finishes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow do not follow when propagateMode = changeAll\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: middleMessage maintained on fetchInitial empty due to muting\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchNewer handles servers not understanding includeAnchor\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: presents message content appropriately content not asked to consume insets (including bottom), even without compose box\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow follow to the new narrow when propagateMode = changeLater\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent in DmNarrow, do nothing (smoke test)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: smoke test for light/dark/lerped\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: stream/topic muting in MentionsNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfMessagePresent message absent\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in plain paragraph\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial sends proper anchor newest\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/settings_test.dart: BrowserPreference use our per-platform default browser preference (variant: TargetPlatform.iOS)\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in combined feed narrow internal move between channels\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: regression tests for #455 UpdateMessageFlagsEvent is applied even when message not in any msglists\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow old channel -> channel: refetch\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial early in history\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/settings_test.dart: BrowserPreference use our per-platform default browser preference (variant: TargetPlatform.android)\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar show topic visibility policy for topic narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: reassemble\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow do not follow when propagateMode = changeOne\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/settings_test.dart: BrowserPreference smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfMessagePresent message present\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfAnyMessagePresent some messages present\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more TODO fetchNewer recent senders track all the messages\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: DeleteMessageEvent in narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial topic permalinks if no redirect, we still remove \\\"with\\\" element\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions can tap a link to open URL (variant: TargetPlatform.iOS)\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchNewer smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar has topic-list action for topic narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow do not follow when propagateMode = changeLater\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: regression tests for #455 reaction events handled once, even when message is in two message lists\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent in narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: regression tests for #455 UpdateMessageEvent (edit) is applied even when message not in any msglists\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch older messages on scroll observe double-fetch glitch\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchOlder recent senders track all the messages\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow unrelated channel -> unrelated channel: unaffected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage dispose MessageListView when logged out\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow moved from narrow: should remove moved messages (channel, topic) -> (channel, new topic)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchNewer nop when already haveNewest true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfAnyMessagePresent all messages present\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow channel -> channel: internal move\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow moved from narrow: should remove moved messages (channel, topic) -> (new channel, topic)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: middleMessage maintained on fetchInitial, anchor in middle\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent unmute a topic before initial fetch completes -> do nothing\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent mute a visible topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved fetch races fetchOlder, _reset, move fetch finishes, fetchOlder returns\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow unrelated channel -> new channel: unaffected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow channel -> new channel: remove moved messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch older messages on scroll basic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow irrelevant moves (old channel, topic) - > (unrelated channel, topic)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent in CombinedFeedNarrow, use combined-feed visibility\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow irrelevant moves (channel, old topic) -> (channel, unrelated topic)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar handle empty topics\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfAnyMessagePresent no messages present\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: middleMessage maintained on fetchInitial, anchor past end\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial smoke TopicNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial sends proper anchor numeric\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more nop when already fetching older\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow moved into narrow: should refetch messages (channel, old topic) -> (channel, topic)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more nop during backoff\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: DeleteMessageEvent complete message deletion\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: DeleteMessageEvent not in narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: stream/topic muting in StarredMessagesNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow moved into narrow: should refetch messages (old channel, old topic) -> (channel, topic)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow do not follow to the new narrow when propagateMode = changeOne\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent before fetch\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: DeleteMessageEvent not all in narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is null; use our per-platform defaults for HTTP links (Android)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent unmute a topic -> refetch from scratch\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage ancestorOf finds page state from message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial sends proper anchor firstUnread\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar channel icon in channel row; web-public: false, invite-only: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messageContentChanged message present\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/settings_test.dart: ThemeSetting smoke\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar channel icon in channel row; web-public: false, invite-only: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent in TopicNarrow, stay visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetching more fetchOlder smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: stream/topic muting in CombinedFeedNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ThematicBreak smoke ThematicBreak\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial smoke CombinedFeedNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved fetch races fetchInitial, _reset, move fetch finishes, initial fetch finishes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial topic permalinks if redirect, we follow it and remove \\\"with\\\" element\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow moved into narrow: should refetch messages (old channel, topic) -> (channel, topic)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial no messages found\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent no affected messages -> no notification\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messageContentChanged message absent\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfMessagePresent message absent (older than window)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: stream/topic muting in TopicNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1507", "org": "zulip", "repo": "zulip-flutter", "number": 1507, "state": "closed", "title": "anchors 8/n: Let new messages accumulate in bottom sliver", "body": "Fixes #83. (As the \"90% solution\"; see https://github.com/zulip/zulip-flutter/issues/83#issuecomment-2917864412.)\r\n\r\nThis is the next round after #1468.\r\n\r\nAfter this PR, not only does the last message from the initial fetch go into the bottom sliver, but it remains there even while new messages arrive as events, and those new messages go into the bottom sliver below it.\r\n\r\nThe main motivation for this change is that it brings us closer to having a `fetchNewer` method, and therefore to being able to have the message list start out in the middle of history, #82. Along the way it also gives us the \"90% solution\" described in #83, so that new messages don't cause everything on the screen to jump up when you're already scrolled up in history.\r\n\r\n\r\n## Selected commit messages\r\n\r\n#### f4b6e41fb msglist test: Ensure later errors get reported in full too\r\n\r\nOtherwise, if several different test cases in this file fail due to\r\nchecks failing inside checkInvariants, then only the first one gets\r\nreported in detail with the comparison and the stack trace.\r\n\r\n\r\n#### 48983a347 msglist [nfc]: Move sliver boundary into the view-model\r\n\r\nThis will allow the model to maintain it over time as newer messages\r\narrive or get fetched.\r\n\r\n\r\n#### e21f6012f msglist: Let new messages accumulate in bottom sliver\r\n\r\nThis is NFC for the behavior at initial fetch. But thereafter, with\r\nthis change, messages never move between slivers, and new messages\r\ngo into the bottom sliver.\r\n\r\nI believe the main user-visible consequence of this change is that if\r\nthe user is scrolled up in history and then a new message comes in,\r\nthe new message will no longer cause all the messages to shift upward.\r\nThis is the \"90% solution\" to #83.\r\n\r\nOn the other hand, if the user is scrolled all the way to the end,\r\nthen they still remain that way when a new message comes in --\r\nthere's specific logic to ensure that in MessageListScrollPosition,\r\nand an existing test in test/widgets/message_list_test.dart verifies\r\nit end to end.\r\n\r\nThe main motivation for this change is that it brings us closer to\r\nhaving a `fetchNewer` method, and therefore to being able to have the\r\nmessage list start out in the middle of history.\r\n\r\nThis change also allows us to revert a portion of fca651bf5, where\r\na test had had to be weakened slightly because messages began to\r\nget moved between slivers.\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"77ab9300a83045d6336946d73d55b3792c046413\"}", "resolved_issues": "[{\"number\": 83, \"title\": \"Control scroll position on new and newly-fetched messages\", \"body\": \"Currently if you're looking at the message list and then a new message comes in, you'll see the messages on the screen jump. This is exactly the right thing (*) if you're scrolled to the bottom \\u2014 the new message appears at the bottom, and the existing messages all move up to make room. But if you're scrolled further up, then we should keep steady on the screen the messages you're looking at.\\n\\nInstead, the current behavior is that you see all the messages jump up.\\n\\nFundamentally what's happening is that we use a (variant of a) [ListView](https://api.flutter.dev/flutter/widgets/ListView-class.html), which models the contents as a sequence of items indexed 0, 1, 2, 3, etc.; and then we pass `reverse: true` so that item 0 is shown at the bottom, and interpret item index `i` as \\\"the i'th message in the list, counting zero-based from the end\\\". So if we're looking around item 37 (the message 37 slots from the end), and then a new message arrives, then as far as the ListView knows we should still be looking around item 37 \\u2014 but that's now the message that was item 36 a moment ago.\\n\\nA good 90% solution here would be to build the message list out of two list slivers facing back to back, rather than one list sliver facing upward. This is a standard Flutter solution for having a list that grows in both directions; see [example in the CustomScrollView doc](https://api.flutter.dev/flutter/widgets/CustomScrollView-class.html#widgets.CustomScrollView.2).\\n\\n(The list sliver class in that example is `SliverList`, which corresponds to a basic `ListView`. We'd use our `SliverStickyHeaderList`, which corresponds to our `StickyHeaderListView`.)\\n\\n(*) Well, possibly it'd be better to have some kind of sliding animation rather than a sudden jump. But that'd be its own issue. This issue is about the new state of things that would be the endpoint of any animation.\\n\\n---\\n\\nNotes on possible followups:\\n(**edit:** These were filed as #1536.)\\n\\nThat two-sliver solution would completely solve the problem for adding more messages (or removing messages) at the very top or bottom, which covers (a) `message` events and (b) fetching messages on scroll, #78. We'd still have some jumps on (c) deleting messages, or moving them away, when they're not the very oldest or latest; (d) moving messages into the middle of the list; (e) likely on some cases of editing messages so that their height changes; (f) similarly on a message going from no reactions to some reactions or back, or other changes that affect its displayed height.\\n\\nFor (c) and (d), I think the Flutter API has the hooks we'd need (we'd make our own implementation of `RenderSliverBoxChildManager`), but fundamentally it's a subtle problem; in particular we'd need a richer data structure for the list of messages than a `List` or `Queue`.\\n\\nFor (e) and (f), and for that matter as a possible alternative solution for (c) and (d) or even (a) and (b), I believe we could use a [ScrollController](https://api.flutter.dev/flutter/widgets/ScrollController-class.html). When something changes, we'd calculate what the right scroll position is in the new state of things, and call `jumpTo` to go there. Or perhaps we'd override [`ScrollController.createScrollPosition`](https://api.flutter.dev/flutter/widgets/ScrollController/createScrollPosition.html)? The example of `PageController`, mentioned in that doc, sounds potentially promising as a model.\\n\"}]", "lang": "dart", "problem_statement": "Control scroll position on new and newly-fetched messages\nCurrently if you're looking at the message list and then a new message comes in, you'll see the messages on the screen jump. This is exactly the right thing (*) if you're scrolled to the bottom \u2014 the new message appears at the bottom, and the existing messages all move up to make room. But if you're scrolled further up, then we should keep steady on the screen the messages you're looking at.\n\nInstead, the current behavior is that you see all the messages jump up.\n\nFundamentally what's happening is that we use a (variant of a) [ListView](https://api.flutter.dev/flutter/widgets/ListView-class.html), which models the contents as a sequence of items indexed 0, 1, 2, 3, etc.; and then we pass `reverse: true` so that item 0 is shown at the bottom, and interpret item index `i` as \"the i'th message in the list, counting zero-based from the end\". So if we're looking around item 37 (the message 37 slots from the end), and then a new message arrives, then as far as the ListView knows we should still be looking around item 37 \u2014 but that's now the message that was item 36 a moment ago.\n\nA good 90% solution here would be to build the message list out of two list slivers facing back to back, rather than one list sliver facing upward. This is a standard Flutter solution for having a list that grows in both directions; see [example in the CustomScrollView doc](https://api.flutter.dev/flutter/widgets/CustomScrollView-class.html#widgets.CustomScrollView.2).\n\n(The list sliver class in that example is `SliverList`, which corresponds to a basic `ListView`. We'd use our `SliverStickyHeaderList`, which corresponds to our `StickyHeaderListView`.)\n\n(*) Well, possibly it'd be better to have some kind of sliding animation rather than a sudden jump. But that'd be its own issue. This issue is about the new state of things that would be the endpoint of any animation.\n\n---\n\nNotes on possible followups:\n(**edit:** These were filed as #1536.)\n\nThat two-sliver solution would completely solve the problem for adding more messages (or removing messages) at the very top or bottom, which covers (a) `message` events and (b) fetching messages on scroll, #78. We'd still have some jumps on (c) deleting messages, or moving them away, when they're not the very oldest or latest; (d) moving messages into the middle of the list; (e) likely on some cases of editing messages so that their height changes; (f) similarly on a message going from no reactions to some reactions or back, or other changes that affect its displayed height.\n\nFor (c) and (d), I think the Flutter API has the hooks we'd need (we'd make our own implementation of `RenderSliverBoxChildManager`), but fundamentally it's a subtle problem; in particular we'd need a richer data structure for the list of messages than a `List` or `Queue`.\n\nFor (e) and (f), and for that matter as a possible alternative solution for (c) and (d) or even (a) and (b), I believe we could use a [ScrollController](https://api.flutter.dev/flutter/widgets/ScrollController-class.html). When something changes, we'd calculate what the right scroll position is in the new state of things, and call `jumpTo` to go there. Or perhaps we'd override [`ScrollController.createScrollPosition`](https://api.flutter.dev/flutter/widgets/ScrollController/createScrollPosition.html)? The example of `PageController`, mentioned in that doc, sounds potentially promising as a model.\n\n", "hints": "This 90% solution:\n\n> A good 90% solution here would be to build the message list out of two list slivers facing back to back, rather than one list sliver facing upward.\n\nwill happen as part of #82. So this issue tracks going further than that.", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1507", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/83\"]", "test_command": "flutter test test/model/message_list_test.dart test/widgets/message_list_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/message_list.dart b/lib/model/message_list.dart\nindex 2f8777d3ed..f2a45b78aa 100644\n--- a/lib/model/message_list.dart\n+++ b/lib/model/message_list.dart\n@@ -70,11 +70,26 @@ mixin _MessageSequence {\n /// A sequence number for invalidating stale fetches.\n int generation = 0;\n \n- /// The messages.\n+ /// The known messages in the list.\n+ ///\n+ /// This may or may not represent all the message history that\n+ /// conceptually belongs in this message list.\n+ /// That information is expressed in [fetched] and [haveOldest].\n+ ///\n+ /// See also [middleMessage], an index which divides this list\n+ /// into a top slice and a bottom slice.\n ///\n /// See also [contents] and [items].\n final List messages = [];\n \n+ /// An index into [messages] dividing it into a top slice and a bottom slice.\n+ ///\n+ /// The indices 0 to before [middleMessage] are the top slice of [messages],\n+ /// and the indices from [middleMessage] to the end are the bottom slice.\n+ ///\n+ /// The corresponding item index is [middleItem].\n+ int middleMessage = 0;\n+\n /// Whether [messages] and [items] represent the results of a fetch.\n ///\n /// This allows the UI to distinguish \"still working on fetching messages\"\n@@ -133,8 +148,23 @@ mixin _MessageSequence {\n /// This information is completely derived from [messages] and\n /// the flags [haveOldest], [fetchingOlder] and [fetchOlderCoolingDown].\n /// It exists as an optimization, to memoize that computation.\n+ ///\n+ /// See also [middleItem], an index which divides this list\n+ /// into a top slice and a bottom slice.\n final QueueList items = QueueList();\n \n+ /// An index into [items] dividing it into a top slice and a bottom slice.\n+ ///\n+ /// The indices 0 to before [middleItem] are the top slice of [items],\n+ /// and the indices from [middleItem] to the end are the bottom slice.\n+ ///\n+ /// The top and bottom slices of [items] correspond to\n+ /// the top and bottom slices of [messages] respectively.\n+ /// Either the bottom slices of both [items] and [messages] are empty,\n+ /// or the first item in the bottom slice of [items] is a [MessageListMessageItem]\n+ /// for the first message in the bottom slice of [messages].\n+ int middleItem = 0;\n+\n int _findMessageWithId(int messageId) {\n return binarySearchByKey(messages, messageId,\n (message, messageId) => message.id.compareTo(messageId));\n@@ -202,6 +232,7 @@ mixin _MessageSequence {\n candidate++;\n assert(contents.length == messages.length);\n while (candidate < messages.length) {\n+ if (candidate == middleMessage) middleMessage = target;\n if (test(messages[candidate])) {\n candidate++;\n continue;\n@@ -210,6 +241,7 @@ mixin _MessageSequence {\n contents[target] = contents[candidate];\n target++; candidate++;\n }\n+ if (candidate == middleMessage) middleMessage = target;\n messages.length = target;\n contents.length = target;\n assert(contents.length == messages.length);\n@@ -232,6 +264,13 @@ mixin _MessageSequence {\n }\n if (messagesToRemoveById.isEmpty) return false;\n \n+ if (middleMessage == messages.length) {\n+ middleMessage -= messagesToRemoveById.length;\n+ } else {\n+ final middleMessageId = messages[middleMessage].id;\n+ middleMessage -= messagesToRemoveById\n+ .where((id) => id < middleMessageId).length;\n+ }\n assert(contents.length == messages.length);\n messages.removeWhere((message) => messagesToRemoveById.contains(message.id));\n contents.removeWhere((content) => contentToRemove.contains(content));\n@@ -246,11 +285,15 @@ mixin _MessageSequence {\n // On a Pixel 5, a batch of 100 messages takes ~15-20ms in _insertAllMessages.\n // (Before that, ~2-5ms in jsonDecode and 0ms in fromJson,\n // so skip worrying about those steps.)\n+ final oldLength = messages.length;\n assert(contents.length == messages.length);\n messages.insertAll(index, toInsert);\n contents.insertAll(index, toInsert.map(\n (message) => _parseMessageContent(message)));\n assert(contents.length == messages.length);\n+ if (index <= middleMessage) {\n+ middleMessage += messages.length - oldLength;\n+ }\n _reprocessAll();\n }\n \n@@ -258,6 +301,7 @@ mixin _MessageSequence {\n void _reset() {\n generation += 1;\n messages.clear();\n+ middleMessage = 0;\n _fetched = false;\n _haveOldest = false;\n _fetchingOlder = false;\n@@ -265,6 +309,7 @@ mixin _MessageSequence {\n _fetchOlderCooldownBackoffMachine = null;\n contents.clear();\n items.clear();\n+ middleItem = 0;\n }\n \n /// Redo all computations from scratch, based on [messages].\n@@ -304,6 +349,7 @@ mixin _MessageSequence {\n canShareSender = (prevMessageItem.message.senderId == message.senderId);\n }\n }\n+ if (index == middleMessage) middleItem = items.length;\n items.add(MessageListMessageItem(message, content,\n showSender: !canShareSender, isLastInBlock: true));\n }\n@@ -314,6 +360,7 @@ mixin _MessageSequence {\n for (var i = 0; i < messages.length; i++) {\n _processMessage(i);\n }\n+ if (middleMessage == messages.length) middleItem = items.length;\n }\n }\n \n@@ -453,13 +500,18 @@ class MessageListView with ChangeNotifier, _MessageSequence {\n allowEmptyTopicName: true,\n );\n if (this.generation > generation) return;\n+\n _adjustNarrowForTopicPermalink(result.messages.firstOrNull);\n+\n store.reconcileMessages(result.messages);\n store.recentSenders.handleMessages(result.messages); // TODO(#824)\n+\n+ // We'll make the bottom slice start at the last visible message, if any.\n for (final message in result.messages) {\n- if (_messageVisible(message)) {\n- _addMessage(message);\n- }\n+ if (!_messageVisible(message)) continue;\n+ middleMessage = messages.length;\n+ _addMessage(message);\n+ // Now [middleMessage] is the last message (the one just added).\n }\n _fetched = true;\n _haveOldest = result.foundOldest;\ndiff --git a/lib/widgets/message_list.dart b/lib/widgets/message_list.dart\nindex 72f646cc65..dcd063a62a 100644\n--- a/lib/widgets/message_list.dart\n+++ b/lib/widgets/message_list.dart\n@@ -573,10 +573,9 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n // The list has two slivers: a top sliver growing upward,\n // and a bottom sliver growing downward.\n // Each sliver has some of the items from `model.items`.\n- const maxBottomItems = 1;\n final totalItems = model.items.length;\n- final bottomItems = totalItems <= maxBottomItems ? totalItems : maxBottomItems;\n- final topItems = totalItems - bottomItems;\n+ final topItems = model.middleItem;\n+ final bottomItems = totalItems - topItems;\n \n // The top sliver has its child 0 as the item just before the\n // sliver boundary, child 1 as the item before that, and so on.\n", "test_patch": "diff --git a/test/model/message_list_test.dart b/test/model/message_list_test.dart\nindex bb85556ae9..ac41d771ec 100644\n--- a/test/model/message_list_test.dart\n+++ b/test/model/message_list_test.dart\n@@ -1,6 +1,8 @@\n import 'dart:convert';\n \n import 'package:checks/checks.dart';\n+import 'package:collection/collection.dart';\n+import 'package:flutter/foundation.dart';\n import 'package:http/http.dart' as http;\n import 'package:test/scaffolding.dart';\n import 'package:zulip/api/backoff.dart';\n@@ -27,6 +29,24 @@ const newestResult = eg.newestGetMessagesResult;\n const olderResult = eg.olderGetMessagesResult;\n \n void main() {\n+ // Arrange for errors caught within the Flutter framework to be printed\n+ // unconditionally, rather than throttled as they normally are in an app.\n+ //\n+ // When using `testWidgets` from flutter_test, this is done automatically;\n+ // compare the [FlutterError.dumpErrorToConsole] call sites,\n+ // and [FlutterError.onError=] and [debugPrint=] call sites, in flutter_test.\n+ //\n+ // This test file is unusual in needing this manual arrangement; it's needed\n+ // because these aren't widget tests, and yet do have some failures arise as\n+ // exceptions that get caught by the framework: namely, when [checkInvariants]\n+ // throws from within an `addListener` callback. Those exceptions get caught\n+ // by [ChangeNotifier.notifyListeners] and reported there through\n+ // [FlutterError.reportError].\n+ debugPrint = debugPrintSynchronously;\n+ FlutterError.onError = (details) {\n+ FlutterError.dumpErrorToConsole(details, forceReport: true);\n+ };\n+\n // These variables are the common state operated on by each test.\n // Each test case calls [prepare] to initialize them.\n late Subscription subscription;\n@@ -97,6 +117,14 @@ void main() {\n });\n }\n \n+ void checkHasMessageIds(Iterable messageIds) {\n+ check(model.messages.map((m) => m.id)).deepEquals(messageIds);\n+ }\n+\n+ void checkHasMessages(Iterable messages) {\n+ checkHasMessageIds(messages.map((e) => e.id));\n+ }\n+\n group('fetchInitial', () {\n final someChannel = eg.stream();\n const someTopic = 'some topic';\n@@ -420,10 +448,6 @@ void main() {\n await setVisibility(policy);\n }\n \n- void checkHasMessageIds(Iterable messageIds) {\n- check(model.messages.map((m) => m.id)).deepEquals(messageIds);\n- }\n-\n test('mute a visible topic', () async {\n await prepare(narrow: const CombinedFeedNarrow());\n await prepareMutes();\n@@ -624,11 +648,11 @@ void main() {\n check(model).messages.length.equals(30);\n await store.handleEvent(eg.deleteMessageEvent(messagesToDelete));\n checkNotifiedOnce();\n- check(model.messages.map((message) => message.id)).deepEquals([\n+ checkHasMessages([\n ...messages.sublist(0, 2),\n ...messages.sublist(5, 10),\n ...messages.sublist(15),\n- ].map((message) => message.id));\n+ ]);\n });\n });\n \n@@ -731,10 +755,6 @@ void main() {\n final stream = eg.stream();\n final otherStream = eg.stream();\n \n- void checkHasMessages(Iterable messages) {\n- check(model.messages.map((e) => e.id)).deepEquals(messages.map((e) => e.id));\n- }\n-\n Future prepareNarrow(Narrow narrow, List? messages) async {\n await prepare(narrow: narrow);\n for (final streamToAdd in [stream, otherStream]) {\n@@ -1438,8 +1458,7 @@ void main() {\n eg.dmMessage( id: 205, from: eg.otherUser, to: [eg.selfUser]),\n ]);\n final expected = [];\n- check(model.messages.map((m) => m.id))\n- .deepEquals(expected..addAll([201, 203, 205]));\n+ checkHasMessageIds(expected..addAll([201, 203, 205]));\n \n // \u2026 and on fetchOlder\u2026\n connection.prepare(json: olderResult(\n@@ -1452,34 +1471,33 @@ void main() {\n ]).toJson());\n await model.fetchOlder();\n checkNotified(count: 2);\n- check(model.messages.map((m) => m.id))\n- .deepEquals(expected..insertAll(0, [101, 103, 105]));\n+ checkHasMessageIds(expected..insertAll(0, [101, 103, 105]));\n \n // \u2026 and on MessageEvent.\n await store.addMessage(\n eg.streamMessage(id: 301, stream: stream1, topic: 'A'));\n checkNotifiedOnce();\n- check(model.messages.map((m) => m.id)).deepEquals(expected..add(301));\n+ checkHasMessageIds(expected..add(301));\n \n await store.addMessage(\n eg.streamMessage(id: 302, stream: stream1, topic: 'B'));\n checkNotNotified();\n- check(model.messages.map((m) => m.id)).deepEquals(expected);\n+ checkHasMessageIds(expected);\n \n await store.addMessage(\n eg.streamMessage(id: 303, stream: stream2, topic: 'C'));\n checkNotifiedOnce();\n- check(model.messages.map((m) => m.id)).deepEquals(expected..add(303));\n+ checkHasMessageIds(expected..add(303));\n \n await store.addMessage(\n eg.streamMessage(id: 304, stream: stream2, topic: 'D'));\n checkNotNotified();\n- check(model.messages.map((m) => m.id)).deepEquals(expected);\n+ checkHasMessageIds(expected);\n \n await store.addMessage(\n eg.dmMessage(id: 305, from: eg.otherUser, to: [eg.selfUser]));\n checkNotifiedOnce();\n- check(model.messages.map((m) => m.id)).deepEquals(expected..add(305));\n+ checkHasMessageIds(expected..add(305));\n });\n \n test('in ChannelNarrow', () async {\n@@ -1497,8 +1515,7 @@ void main() {\n eg.streamMessage(id: 203, stream: stream, topic: 'C'),\n ]);\n final expected = [];\n- check(model.messages.map((m) => m.id))\n- .deepEquals(expected..addAll([201, 202]));\n+ checkHasMessageIds(expected..addAll([201, 202]));\n \n // \u2026 and on fetchOlder\u2026\n connection.prepare(json: olderResult(\n@@ -1509,24 +1526,23 @@ void main() {\n ]).toJson());\n await model.fetchOlder();\n checkNotified(count: 2);\n- check(model.messages.map((m) => m.id))\n- .deepEquals(expected..insertAll(0, [101, 102]));\n+ checkHasMessageIds(expected..insertAll(0, [101, 102]));\n \n // \u2026 and on MessageEvent.\n await store.addMessage(\n eg.streamMessage(id: 301, stream: stream, topic: 'A'));\n checkNotifiedOnce();\n- check(model.messages.map((m) => m.id)).deepEquals(expected..add(301));\n+ checkHasMessageIds(expected..add(301));\n \n await store.addMessage(\n eg.streamMessage(id: 302, stream: stream, topic: 'B'));\n checkNotifiedOnce();\n- check(model.messages.map((m) => m.id)).deepEquals(expected..add(302));\n+ checkHasMessageIds(expected..add(302));\n \n await store.addMessage(\n eg.streamMessage(id: 303, stream: stream, topic: 'C'));\n checkNotNotified();\n- check(model.messages.map((m) => m.id)).deepEquals(expected);\n+ checkHasMessageIds(expected);\n });\n \n test('in TopicNarrow', () async {\n@@ -1541,8 +1557,7 @@ void main() {\n eg.streamMessage(id: 201, stream: stream, topic: 'A'),\n ]);\n final expected = [];\n- check(model.messages.map((m) => m.id))\n- .deepEquals(expected..addAll([201]));\n+ checkHasMessageIds(expected..addAll([201]));\n \n // \u2026 and on fetchOlder\u2026\n connection.prepare(json: olderResult(\n@@ -1551,14 +1566,13 @@ void main() {\n ]).toJson());\n await model.fetchOlder();\n checkNotified(count: 2);\n- check(model.messages.map((m) => m.id))\n- .deepEquals(expected..insertAll(0, [101]));\n+ checkHasMessageIds(expected..insertAll(0, [101]));\n \n // \u2026 and on MessageEvent.\n await store.addMessage(\n eg.streamMessage(id: 301, stream: stream, topic: 'A'));\n checkNotifiedOnce();\n- check(model.messages.map((m) => m.id)).deepEquals(expected..add(301));\n+ checkHasMessageIds(expected..add(301));\n });\n \n test('in MentionsNarrow', () async {\n@@ -1581,23 +1595,21 @@ void main() {\n // Check filtering on fetchInitial\u2026\n await prepareMessages(foundOldest: false, messages: getMessages(201));\n final expected = [];\n- check(model.messages.map((m) => m.id))\n- .deepEquals(expected..addAll([201, 202, 203]));\n+ checkHasMessageIds(expected..addAll([201, 202, 203]));\n \n // \u2026 and on fetchOlder\u2026\n connection.prepare(json: olderResult(\n anchor: 201, foundOldest: true, messages: getMessages(101)).toJson());\n await model.fetchOlder();\n checkNotified(count: 2);\n- check(model.messages.map((m) => m.id))\n- .deepEquals(expected..insertAll(0, [101, 102, 103]));\n+ checkHasMessageIds(expected..insertAll(0, [101, 102, 103]));\n \n // \u2026 and on MessageEvent.\n final messages = getMessages(301);\n for (var i = 0; i < 3; i += 1) {\n await store.addMessage(messages[i]);\n checkNotifiedOnce();\n- check(model.messages.map((m) => m.id)).deepEquals(expected..add(301 + i));\n+ checkHasMessageIds(expected..add(301 + i));\n }\n });\n \n@@ -1619,24 +1631,230 @@ void main() {\n // Check filtering on fetchInitial\u2026\n await prepareMessages(foundOldest: false, messages: getMessages(201));\n final expected = [];\n- check(model.messages.map((m) => m.id))\n- .deepEquals(expected..addAll([201, 202]));\n+ checkHasMessageIds(expected..addAll([201, 202]));\n \n // \u2026 and on fetchOlder\u2026\n connection.prepare(json: olderResult(\n anchor: 201, foundOldest: true, messages: getMessages(101)).toJson());\n await model.fetchOlder();\n checkNotified(count: 2);\n- check(model.messages.map((m) => m.id))\n- .deepEquals(expected..insertAll(0, [101, 102]));\n+ checkHasMessageIds(expected..insertAll(0, [101, 102]));\n \n // \u2026 and on MessageEvent.\n final messages = getMessages(301);\n for (var i = 0; i < 2; i += 1) {\n await store.addMessage(messages[i]);\n checkNotifiedOnce();\n- check(model.messages.map((m) => m.id)).deepEquals(expected..add(301 + i));\n+ checkHasMessageIds(expected..add(301 + i));\n+ }\n+ });\n+ });\n+\n+ group('middleMessage maintained', () {\n+ // In [checkInvariants] we verify that messages don't move from the\n+ // top to the bottom slice or vice versa.\n+ // Most of these test cases rely on that for all the checks they need.\n+\n+ test('on fetchInitial empty', () async {\n+ await prepare(narrow: const CombinedFeedNarrow());\n+ await prepareMessages(foundOldest: true, messages: []);\n+ check(model)..messages.isEmpty()\n+ ..middleMessage.equals(0);\n+ });\n+\n+ test('on fetchInitial empty due to muting', () async {\n+ await prepare(narrow: const CombinedFeedNarrow());\n+ final stream = eg.stream();\n+ await store.addStream(stream);\n+ await store.addSubscription(eg.subscription(stream, isMuted: true));\n+ await prepareMessages(foundOldest: true, messages: [\n+ eg.streamMessage(stream: stream),\n+ ]);\n+ check(model)..messages.isEmpty()\n+ ..middleMessage.equals(0);\n+ });\n+\n+ test('on fetchInitial not empty', () async {\n+ await prepare(narrow: const CombinedFeedNarrow());\n+ final stream1 = eg.stream();\n+ final stream2 = eg.stream();\n+ await store.addStreams([stream1, stream2]);\n+ await store.addSubscription(eg.subscription(stream1));\n+ await store.addSubscription(eg.subscription(stream2, isMuted: true));\n+ final messages = [\n+ eg.streamMessage(stream: stream1), eg.streamMessage(stream: stream2),\n+ eg.streamMessage(stream: stream1), eg.streamMessage(stream: stream2),\n+ eg.streamMessage(stream: stream1), eg.streamMessage(stream: stream2),\n+ eg.streamMessage(stream: stream1), eg.streamMessage(stream: stream2),\n+ eg.streamMessage(stream: stream1), eg.streamMessage(stream: stream2),\n+ ];\n+ await prepareMessages(foundOldest: true, messages: messages);\n+ // The anchor message is the last visible message\u2026\n+ check(model)\n+ ..messages.length.equals(5)\n+ ..middleMessage.equals(model.messages.length - 1)\n+ // \u2026 even though that's not the last message that was in the response.\n+ ..messages[model.middleMessage].id\n+ .equals(messages[messages.length - 2].id);\n+ });\n+\n+ /// Like [prepareMessages], but arrange for the given top and bottom slices.\n+ Future prepareMessageSplit(List top, List bottom, {\n+ bool foundOldest = true,\n+ }) async {\n+ assert(bottom.isNotEmpty); // could handle this too if necessary\n+ await prepareMessages(foundOldest: foundOldest, messages: [\n+ ...top,\n+ bottom.first,\n+ ]);\n+ if (bottom.length > 1) {\n+ await store.addMessages(bottom.skip(1));\n+ checkNotifiedOnce();\n }\n+ check(model)\n+ ..messages.length.equals(top.length + bottom.length)\n+ ..middleMessage.equals(top.length);\n+ }\n+\n+ test('on fetchOlder', () async {\n+ await prepare(narrow: const CombinedFeedNarrow());\n+ final stream = eg.stream();\n+ await store.addStream(stream);\n+ await store.addSubscription(eg.subscription(stream));\n+ await prepareMessageSplit(foundOldest: false,\n+ [eg.streamMessage(id: 100, stream: stream)],\n+ [eg.streamMessage(id: 101, stream: stream)]);\n+\n+ connection.prepare(json: olderResult(anchor: 100, foundOldest: true,\n+ messages: List.generate(5, (i) =>\n+ eg.streamMessage(id: 95 + i, stream: stream))).toJson());\n+ await model.fetchOlder();\n+ checkNotified(count: 2);\n+ });\n+\n+ test('on fetchOlder, from top empty', () async {\n+ await prepare(narrow: const CombinedFeedNarrow());\n+ final stream = eg.stream();\n+ await store.addStream(stream);\n+ await store.addSubscription(eg.subscription(stream));\n+ await prepareMessageSplit(foundOldest: false,\n+ [], [eg.streamMessage(id: 100, stream: stream)]);\n+\n+ connection.prepare(json: olderResult(anchor: 100, foundOldest: true,\n+ messages: List.generate(5, (i) =>\n+ eg.streamMessage(id: 95 + i, stream: stream))).toJson());\n+ await model.fetchOlder();\n+ checkNotified(count: 2);\n+ // The messages from fetchOlder should go in the top sliver, always.\n+ check(model).middleMessage.equals(5);\n+ });\n+\n+ test('on MessageEvent', () async {\n+ await prepare(narrow: const CombinedFeedNarrow());\n+ final stream = eg.stream();\n+ await store.addStream(stream);\n+ await store.addSubscription(eg.subscription(stream));\n+ await prepareMessageSplit(foundOldest: false,\n+ [eg.streamMessage(stream: stream)],\n+ [eg.streamMessage(stream: stream)]);\n+\n+ await store.addMessage(eg.streamMessage(stream: stream));\n+ checkNotifiedOnce();\n+ });\n+\n+ test('on messages muted, including anchor', () async {\n+ await prepare(narrow: const CombinedFeedNarrow());\n+ final stream = eg.stream();\n+ await store.addStream(stream);\n+ await store.addSubscription(eg.subscription(stream));\n+ await prepareMessageSplit([\n+ eg.streamMessage(stream: stream, topic: 'foo'),\n+ eg.streamMessage(stream: stream, topic: 'bar'),\n+ ], [\n+ eg.streamMessage(stream: stream, topic: 'bar'),\n+ eg.streamMessage(stream: stream, topic: 'foo'),\n+ ]);\n+\n+ await store.handleEvent(eg.userTopicEvent(\n+ stream.streamId, 'bar', UserTopicVisibilityPolicy.muted));\n+ checkNotifiedOnce();\n+ });\n+\n+ test('on messages muted, not including anchor', () async {\n+ await prepare(narrow: const CombinedFeedNarrow());\n+ final stream = eg.stream();\n+ await store.addStream(stream);\n+ await store.addSubscription(eg.subscription(stream));\n+ await prepareMessageSplit([\n+ eg.streamMessage(stream: stream, topic: 'foo'),\n+ eg.streamMessage(stream: stream, topic: 'bar'),\n+ ], [\n+ eg.streamMessage(stream: stream, topic: 'foo'),\n+ ]);\n+\n+ await store.handleEvent(eg.userTopicEvent(\n+ stream.streamId, 'bar', UserTopicVisibilityPolicy.muted));\n+ checkNotifiedOnce();\n+ });\n+\n+ test('on messages muted, bottom empty', () async {\n+ await prepare(narrow: const CombinedFeedNarrow());\n+ final stream = eg.stream();\n+ await store.addStream(stream);\n+ await store.addSubscription(eg.subscription(stream));\n+ await prepareMessageSplit([\n+ eg.streamMessage(stream: stream, topic: 'foo'),\n+ eg.streamMessage(stream: stream, topic: 'bar'),\n+ ], [\n+ eg.streamMessage(stream: stream, topic: 'third'),\n+ ]);\n+\n+ await store.handleEvent(eg.deleteMessageEvent([\n+ model.messages.last as StreamMessage]));\n+ checkNotifiedOnce();\n+ check(model).middleMessage.equals(model.messages.length);\n+\n+ await store.handleEvent(eg.userTopicEvent(\n+ stream.streamId, 'bar', UserTopicVisibilityPolicy.muted));\n+ checkNotifiedOnce();\n+ });\n+\n+ test('on messages deleted', () async {\n+ await prepare(narrow: const CombinedFeedNarrow());\n+ final stream = eg.stream();\n+ await store.addStream(stream);\n+ await store.addSubscription(eg.subscription(stream));\n+ final messages = [\n+ eg.streamMessage(id: 1, stream: stream),\n+ eg.streamMessage(id: 2, stream: stream),\n+ eg.streamMessage(id: 3, stream: stream),\n+ eg.streamMessage(id: 4, stream: stream),\n+ ];\n+ await prepareMessageSplit(messages.sublist(0, 2), messages.sublist(2));\n+\n+ await store.handleEvent(eg.deleteMessageEvent(messages.sublist(1, 3)));\n+ checkNotifiedOnce();\n+ });\n+\n+ test('on messages deleted, bottom empty', () async {\n+ await prepare(narrow: const CombinedFeedNarrow());\n+ final stream = eg.stream();\n+ await store.addStream(stream);\n+ await store.addSubscription(eg.subscription(stream));\n+ final messages = [\n+ eg.streamMessage(id: 1, stream: stream),\n+ eg.streamMessage(id: 2, stream: stream),\n+ eg.streamMessage(id: 3, stream: stream),\n+ eg.streamMessage(id: 4, stream: stream),\n+ ];\n+ await prepareMessageSplit(messages.sublist(0, 3), messages.sublist(3));\n+\n+ await store.handleEvent(eg.deleteMessageEvent(messages.sublist(3)));\n+ checkNotifiedOnce();\n+ check(model).middleMessage.equals(model.messages.length);\n+\n+ await store.handleEvent(eg.deleteMessageEvent(messages.sublist(1, 2)));\n+ checkNotifiedOnce();\n });\n });\n \n@@ -1913,6 +2131,10 @@ void main() {\n });\n }\n \n+MessageListView? _lastModel;\n+List? _lastMessages;\n+int? _lastMiddleMessage;\n+\n void checkInvariants(MessageListView model) {\n if (!model.fetched) {\n check(model)\n@@ -1951,6 +2173,25 @@ void checkInvariants(MessageListView model) {\n check(isSortedWithoutDuplicates(model.messages.map((m) => m.id).toList()))\n .isTrue();\n \n+ check(model).middleMessage\n+ ..isGreaterOrEqual(0)\n+ ..isLessOrEqual(model.messages.length);\n+\n+ if (identical(model, _lastModel)\n+ && model.generation == _lastModel!.generation) {\n+ // All messages that were present, and still are, should be on the same side\n+ // of `middleMessage` (still top or bottom slice respectively) as they were.\n+ _checkNoIntersection(ListSlice(model.messages, 0, model.middleMessage),\n+ ListSlice(_lastMessages!, _lastMiddleMessage!, _lastMessages!.length),\n+ because: 'messages moved from bottom slice to top slice');\n+ _checkNoIntersection(ListSlice(_lastMessages!, 0, _lastMiddleMessage!),\n+ ListSlice(model.messages, model.middleMessage, model.messages.length),\n+ because: 'messages moved from top slice to bottom slice');\n+ }\n+ _lastModel = model;\n+ _lastMessages = model.messages.toList();\n+ _lastMiddleMessage = model.middleMessage;\n+\n check(model).contents.length.equals(model.messages.length);\n for (int i = 0; i < model.contents.length; i++) {\n final poll = model.messages[i].poll;\n@@ -1988,6 +2229,27 @@ void checkInvariants(MessageListView model) {\n });\n }\n check(model.items).length.equals(i);\n+\n+ check(model).middleItem\n+ ..isGreaterOrEqual(0)\n+ ..isLessOrEqual(model.items.length);\n+ if (model.middleItem == model.items.length) {\n+ check(model.middleMessage).equals(model.messages.length);\n+ } else {\n+ check(model.items[model.middleItem]).isA()\n+ .message.identicalTo(model.messages[model.middleMessage]);\n+ }\n+}\n+\n+void _checkNoIntersection(List xs, List ys, {String? because}) {\n+ // Both lists are sorted by ID. As an optimization, bet on all or nearly all\n+ // of the first list having smaller IDs than all or nearly all of the other.\n+ if (xs.isEmpty || ys.isEmpty) return;\n+ if (xs.last.id < ys.first.id) return;\n+ final yCandidates = Set.of(ys.takeWhile((m) => m.id <= xs.last.id));\n+ final intersection = xs.reversed.takeWhile((m) => ys.first.id <= m.id)\n+ .where(yCandidates.contains);\n+ check(intersection, because: because).isEmpty();\n }\n \n extension MessageListRecipientHeaderItemChecks on Subject {\n@@ -2013,8 +2275,10 @@ extension MessageListViewChecks on Subject {\n Subject get store => has((x) => x.store, 'store');\n Subject get narrow => has((x) => x.narrow, 'narrow');\n Subject> get messages => has((x) => x.messages, 'messages');\n+ Subject get middleMessage => has((x) => x.middleMessage, 'middleMessage');\n Subject> get contents => has((x) => x.contents, 'contents');\n Subject> get items => has((x) => x.items, 'items');\n+ Subject get middleItem => has((x) => x.middleItem, 'middleItem');\n Subject get fetched => has((x) => x.fetched, 'fetched');\n Subject get haveOldest => has((x) => x.haveOldest, 'haveOldest');\n Subject get fetchingOlder => has((x) => x.fetchingOlder, 'fetchingOlder');\ndiff --git a/test/widgets/message_list_test.dart b/test/widgets/message_list_test.dart\nindex 69a7204827..df05b4f0cc 100644\n--- a/test/widgets/message_list_test.dart\n+++ b/test/widgets/message_list_test.dart\n@@ -462,23 +462,61 @@ void main() {\n // [MessageListScrollView], in scrolling_test.dart .\n \n testWidgets('sticks to end upon new message', (tester) async {\n- await setupMessageListPage(tester,\n- messages: List.generate(10, (_) => eg.streamMessage(content: '

          a

          ')));\n+ await setupMessageListPage(tester, messages: List.generate(10,\n+ (i) => eg.streamMessage(content: '

          message $i

          ')));\n final controller = findMessageListScrollController(tester)!;\n+ final findMiddleMessage = find.text('message 5');\n \n- // Starts at end, and with room to scroll up.\n- check(controller.position)\n- ..extentAfter.equals(0)\n- ..extentBefore.isGreaterThan(0);\n- final oldPosition = controller.position.pixels;\n+ // Started out scrolled to the bottom.\n+ check(controller.position).extentAfter.equals(0);\n+ final scrollPixels = controller.position.pixels;\n+\n+ // Note the position of some mid-screen message.\n+ final messageRect = tester.getRect(findMiddleMessage);\n+ check(messageRect)..top.isGreaterThan(0)..bottom.isLessThan(600);\n \n- // On new message, position remains at end\u2026\n+ // When a new message arrives, the existing message moves up\u2026\n await store.addMessage(eg.streamMessage(content: '

          a

          b

          '));\n await tester.pump();\n+ check(tester.getRect(findMiddleMessage))\n+ ..top.isLessThan(messageRect.top)\n+ ..height.isCloseTo(messageRect.height, Tolerance().distance);\n+ // \u2026 because the position remains at the end\u2026\n check(controller.position)\n ..extentAfter.equals(0)\n // \u2026 even though that means a bigger number now.\n- ..pixels.isGreaterThan(oldPosition);\n+ ..pixels.isGreaterThan(scrollPixels);\n+ });\n+\n+ testWidgets('preserves visible messages upon new message, when not at end', (tester) async {\n+ await setupMessageListPage(tester, messages: List.generate(10,\n+ (i) => eg.streamMessage(content: '

          message $i

          ')));\n+ final controller = findMessageListScrollController(tester)!;\n+ final findMiddleMessage = find.text('message 5');\n+\n+ // Started at bottom. Scroll up a bit.\n+ check(controller.position).extentAfter.equals(0);\n+ controller.position.jumpTo(controller.position.pixels - 100);\n+ await tester.pump();\n+ check(controller.position).extentAfter.equals(100);\n+ final scrollPixels = controller.position.pixels;\n+\n+ // Note the position of some mid-screen message.\n+ final messageRect = tester.getRect(findMiddleMessage);\n+ check(messageRect)..top.isGreaterThan(0)..bottom.isLessThan(600);\n+\n+ // When a new message arrives, the existing message doesn't shift\u2026\n+ await store.addMessage(eg.streamMessage(content: '

          a

          b

          '));\n+ await tester.pump();\n+ check(tester.getRect(findMiddleMessage)).equals(messageRect);\n+ // \u2026 because the scroll position value remained the same\u2026\n+ check(controller.position)\n+ ..pixels.equals(scrollPixels)\n+ // \u2026 even though there's now more content off screen below.\n+ // (This last check relies on the fact that the old extentAfter is small,\n+ // less than cacheExtent, so that the new content is only barely offscreen,\n+ // it gets built, and the new extentAfter reflects it.)\n+ ..extentAfter.isGreaterThan(100);\n });\n });\n \n@@ -1594,15 +1632,8 @@ void main() {\n // as the number of items changes in MessageList. See\n // `findChildIndexCallback` passed into [SliverStickyHeaderList]\n // at [_MessageListState._buildListView].\n-\n- // TODO(#82): Cut paddingMessage. It's there to paper over a glitch:\n- // the _UnreadMarker animation *does* get interrupted in the case where\n- // the message gets pushed from one sliver to the other. See:\n- // https://github.com/zulip/zulip-flutter/pull/1436#issuecomment-2756738779\n- // That case will no longer exist when #82 is complete.\n final message = eg.streamMessage(flags: []);\n- final paddingMessage = eg.streamMessage();\n- await setupMessageListPage(tester, messages: [message, paddingMessage]);\n+ await setupMessageListPage(tester, messages: [message]);\n check(getAnimation(tester, message.id))\n ..value.equals(1.0)\n ..status.equals(AnimationStatus.dismissed);\n@@ -1626,11 +1657,10 @@ void main() {\n ..status.equals(AnimationStatus.forward);\n \n // introduce new message\n- check(find.byType(MessageItem)).findsExactly(2);\n final newMessage = eg.streamMessage(flags:[MessageFlag.read]);\n await store.addMessage(newMessage);\n await tester.pump(); // process handleEvent\n- check(find.byType(MessageItem)).findsExactly(3);\n+ check(find.byType(MessageItem)).findsExactly(2);\n check(getAnimation(tester, message.id))\n ..value.isGreaterThan(0.0)\n ..value.isLessThan(1.0)\n", "n2p_tests": "{\"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent unmute a topic -> refetch from scratch\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial recent senders track all the messages\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial smoke CombinedFeedNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial short history\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfMessagePresent message present\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfAnyMessagePresent all messages present\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfAnyMessagePresent some messages present\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow moved from narrow: should remove moved messages (channel, topic) -> (new channel, topic)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow channel -> channel: internal move\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial smoke TopicNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: DeleteMessageEvent in narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent in DmNarrow, do nothing (smoke test)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: DeleteMessageEvent non-consecutive message deletion\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial topic permalinks if no redirect, we still remove \\\"with\\\" element\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: DeleteMessageEvent not all in narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchOlder nop during backoff\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfAnyMessagePresent no messages present\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow moved into narrow: should refetch messages (channel, old topic) -> (channel, topic)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent not in narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent unmute a topic before initial fetch completes -> do nothing\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfMessagePresent message absent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messageContentChanged message present\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent in ChannelNarrow, use stream visibility\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial topic permalinks if redirect, we follow it and remove \\\"with\\\" element\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent mute a visible topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: DeleteMessageEvent complete message deletion\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfMessagePresent message absent (newer than window)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow moved into narrow: should refetch messages (old channel, topic) -> (channel, topic)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchOlder smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in combined feed narrow internal move between topics\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial no messages found\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in combined feed narrow internal move between channels\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent no affected messages -> no notification\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: DeleteMessageEvent not in narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow unrelated channel -> new channel: unaffected\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow do not follow when propagateMode = changeLater\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchOlder nop when already haveOldest true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent in TopicNarrow, stay visible\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messageContentChanged message absent\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent in narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchOlder nop when already fetching\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchOlder handles servers not understanding includeAnchor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow old channel -> channel: refetch\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow channel -> new channel: remove moved messages\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfMessagePresent message absent (older than window)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow do not follow when propagateMode = changeAll\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchOlder recent senders track all the messages\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow moved into narrow: should refetch messages (old channel, old topic) -> (channel, topic)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow unrelated channel -> unrelated channel: unaffected\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent in CombinedFeedNarrow, use combined-feed visibility\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent before fetch\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow do not follow when propagateMode = changeOne\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{\"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage ancestorOf finds page state from message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage composeBoxState null when no compose box\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage dispose MessageListView when event queue expired\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch initial batch of messages topic permalink without message move\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage composeBoxState finds compose box\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: smoke test for light/dark/lerped\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch older messages on scroll basic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage MessageListPageState.narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar has channel-feed action for topic narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch older messages on scroll observe double-fetch glitch\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch initial batch of messages topic permalink with message move\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar show topic visibility policy for topic narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: presents message content appropriately content not asked to consume insets (including bottom), even without compose box\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage dispose MessageListView when logged out\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar handle empty topics\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage ancestorOf throws when not a descendant of MessageListPage\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1453", "org": "zulip", "repo": "zulip-flutter", "number": 1453, "state": "closed", "title": "local echo (7/7): Support simplified version of local echo", "body": "Fixes #1441.\r\n\r\nStacked atop #1472.\r\n\r\n(This branch can be used to preview the full implementation)\r\n\r\n
          \r\n\r\n screenshots \r\n\r\n| message sent | got message event |\r\n| - | - |\r\n| ![sending-success-before](https://github.com/user-attachments/assets/9682f14c-152c-44da-b571-cfa01e9a9849) | ![sending-success-after](https://github.com/user-attachments/assets/069cb811-d7aa-405a-97fb-9c0b173d0950) |\r\n\r\n| message failed to send | message content tapped | recipient headers |\r\n| - | - | - |\r\n| ![send-failed](https://github.com/user-attachments/assets/cda06163-7ae5-42b6-b6ec-b7ef67a7b5a2) | ![sent-failed-interacted](https://github.com/user-attachments/assets/51840a33-57da-4322-8761-6ec785120eee) | ![recipient-headers](https://github.com/user-attachments/assets/987dc35a-4278-4ce6-9d34-d10510d1aacc) |\r\n\r\n
          \r\n\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"3ef9de648cf88c8c21fd8e7fff87d96b75126bd0\"}", "resolved_issues": "[{\"number\": 1441, \"title\": \"Simplified local echo, with retry\", \"body\": \"### Background\\n\\nThis is a new proposed spec for handling the same user need as the following previous issue:\\n* #720 \\n\\nThe point is to better handle the case where you type out a message and hit send, and it fails because you don't have working network at that moment. The current behavior is pretty unpleasant when it hits: the message you wrote is just gone.\\n\\nOur previous plan, described in #720, didn't work out (https://github.com/zulip/zulip-flutter/issues/720#issuecomment-2529905664). I think ultimately the way to solve this will be to have local echo #576, showing the still-being-sent message in the message list, along with an outbox system #133 for retrying send. But doing local echo in full will be a substantial task, and an outbox system is tricky to get right.\\n\\nSo, for launch, here's a simplified approach.\\n\\n### Spec\\n\\n* We do a limited, placeholder, form of local echo: just show something like \\\"(Sending message\\u2026)\\\" where the message's content would go. (Or maybe the message source, as plain text.) This bypasses all the work of interpreting Zulip Markdown.\\n\\n To avoid this causing an annoying flicker whenever you actually do have a good connection to the server, we'll put this on a debounce timer: it only appears once it's been perhaps 300ms since the start of the send request, or sooner if the send request fails (as described below).\\n\\n (This part is anticipated in #576 as one of the interim options there.)\\n\\n* Then if a message fails to send, we show on the local-echo placeholder an option that lets you recover it. (Similarly perhaps if it's been a while, like 10s, since trying to send and the request hasn't completed one way or another.)\\n\\n You might want to retry sending, or just copy the text to save elsewhere. To cover both options, it can take the text and just put it back in the compose box. (If there's already something there, the recovered message can go at the end, leaving the user the choice of what to do.) The placeholder in the message list then disappears.\\n\\n This is a bit like the sort of outbox system described in #133. It's simpler because there's no internal retry, which cuts out the `should-send` state and all its edges. An outbox-message starts at `sending`; goes to `sent` or `failed`; then gets removed.\\n\\n\\n\\n### Design\\n\\nWe don't have an exact design for this in Figma. See the existing designs for editing a message:\\nhttps://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=4010-6347&m=dev\\n\\nSee also discussion at [#mobile > handle failed send @ \\ud83d\\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/handle.20failed.20send/near/2128883); and use `#mobile-design` for discussing design questions that arise.\\n\\n\\n### Implementation\\n\\nThe data structures for the outstanding send requests will live on the message store. Like with other data there, that means the data structures will be fields on `MessageStoreImpl`, exposed via methods on `MessageStore`, so that code elsewhere in the app invokes the methods directly on the `PerAccountStore`.\\n\\n(The existing method `sendMessage` should move from `PerAccountStore` to `MessageStore`.)\\n\\nFor a state diagram of the behavior of each send request, see [#mobile > handle failed send @ \\ud83d\\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/handle.20failed.20send/near/2128824).\\n\\n\\n### References\\n* Previous issue: #720\\n* Related issues (for more-expansive versions of the different parts of this plan):\\n #576 \\n #133\\n* [#mobile > handle failed send @ \\ud83d\\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/handle.20failed.20send/near/2128777)\\n\"}]", "lang": "dart", "problem_statement": "Simplified local echo, with retry\n### Background\n\nThis is a new proposed spec for handling the same user need as the following previous issue:\n* #720 \n\nThe point is to better handle the case where you type out a message and hit send, and it fails because you don't have working network at that moment. The current behavior is pretty unpleasant when it hits: the message you wrote is just gone.\n\nOur previous plan, described in #720, didn't work out (https://github.com/zulip/zulip-flutter/issues/720#issuecomment-2529905664). I think ultimately the way to solve this will be to have local echo #576, showing the still-being-sent message in the message list, along with an outbox system #133 for retrying send. But doing local echo in full will be a substantial task, and an outbox system is tricky to get right.\n\nSo, for launch, here's a simplified approach.\n\n### Spec\n\n* We do a limited, placeholder, form of local echo: just show something like \"(Sending message\u2026)\" where the message's content would go. (Or maybe the message source, as plain text.) This bypasses all the work of interpreting Zulip Markdown.\n\n To avoid this causing an annoying flicker whenever you actually do have a good connection to the server, we'll put this on a debounce timer: it only appears once it's been perhaps 300ms since the start of the send request, or sooner if the send request fails (as described below).\n\n (This part is anticipated in #576 as one of the interim options there.)\n\n* Then if a message fails to send, we show on the local-echo placeholder an option that lets you recover it. (Similarly perhaps if it's been a while, like 10s, since trying to send and the request hasn't completed one way or another.)\n\n You might want to retry sending, or just copy the text to save elsewhere. To cover both options, it can take the text and just put it back in the compose box. (If there's already something there, the recovered message can go at the end, leaving the user the choice of what to do.) The placeholder in the message list then disappears.\n\n This is a bit like the sort of outbox system described in #133. It's simpler because there's no internal retry, which cuts out the `should-send` state and all its edges. An outbox-message starts at `sending`; goes to `sent` or `failed`; then gets removed.\n\n\n\n### Design\n\nWe don't have an exact design for this in Figma. See the existing designs for editing a message:\nhttps://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=4010-6347&m=dev\n\nSee also discussion at [#mobile > handle failed send @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/handle.20failed.20send/near/2128883); and use `#mobile-design` for discussing design questions that arise.\n\n\n### Implementation\n\nThe data structures for the outstanding send requests will live on the message store. Like with other data there, that means the data structures will be fields on `MessageStoreImpl`, exposed via methods on `MessageStore`, so that code elsewhere in the app invokes the methods directly on the `PerAccountStore`.\n\n(The existing method `sendMessage` should move from `PerAccountStore` to `MessageStore`.)\n\nFor a state diagram of the behavior of each send request, see [#mobile > handle failed send @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/handle.20failed.20send/near/2128824).\n\n\n### References\n* Previous issue: #720\n* Related issues (for more-expansive versions of the different parts of this plan):\n #576 \n #133\n* [#mobile > handle failed send @ \ud83d\udcac](https://chat.zulip.org/#narrow/channel/48-mobile/topic/handle.20failed.20send/near/2128777)\n\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/1453", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1441\"]", "test_command": "flutter test test/widgets/compose_box_test.dart test/widgets/message_list_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/assets/l10n/app_en.arb b/assets/l10n/app_en.arb\nindex 1f070feb19..0d3f273d16 100644\n--- a/assets/l10n/app_en.arb\n+++ b/assets/l10n/app_en.arb\n@@ -385,9 +385,9 @@\n \"@discardDraftForEditConfirmationDialogMessage\": {\n \"description\": \"Message for a confirmation dialog for discarding message text that was typed into the compose box, when editing a message.\"\n },\n- \"discardDraftForMessageNotSentConfirmationDialogMessage\": \"When you restore a message not sent, the content that was previously in the compose box is discarded.\",\n- \"@discardDraftForMessageNotSentConfirmationDialogMessage\": {\n- \"description\": \"Message for a confirmation dialog when restoring a message not sent, for discarding message text that was typed into the compose box.\"\n+ \"discardDraftForOutboxConfirmationDialogMessage\": \"When you restore an unsent message, the content that was previously in the compose box is discarded.\",\n+ \"@discardDraftForOutboxConfirmationDialogMessage\": {\n+ \"description\": \"Message for a confirmation dialog when restoring an outbox message, for discarding message text that was typed into the compose box.\"\n },\n \"discardDraftConfirmationDialogConfirmButton\": \"Discard\",\n \"@discardDraftConfirmationDialogConfirmButton\": {\ndiff --git a/assets/l10n/app_pl.arb b/assets/l10n/app_pl.arb\nindex 0569169d4c..982ca98be4 100644\n--- a/assets/l10n/app_pl.arb\n+++ b/assets/l10n/app_pl.arb\n@@ -1113,10 +1113,6 @@\n \"@messageNotSentLabel\": {\n \"description\": \"Text on a message in the message list saying that a send message request failed. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)\"\n },\n- \"discardDraftForMessageNotSentConfirmationDialogMessage\": \"Odzyskanie wiadomo\u015bci, kt\u00f3ra nie zosta\u0142a wys\u0142ana, skutkuje wyczyszczeniem zawarto\u015bci pola dodania wpisu.\",\n- \"@discardDraftForMessageNotSentConfirmationDialogMessage\": {\n- \"description\": \"Message for a confirmation dialog when restoring a message not sent, for discarding message text that was typed into the compose box.\"\n- },\n \"errorNotificationOpenAccountNotFound\": \"Nie odnaleziono konta powi\u0105zanego z tym powiadomieniem.\",\n \"@errorNotificationOpenAccountNotFound\": {\n \"description\": \"Error message when the account associated with the notification could not be found\"\ndiff --git a/assets/l10n/app_ru.arb b/assets/l10n/app_ru.arb\nindex b752df8dab..eb79229d04 100644\n--- a/assets/l10n/app_ru.arb\n+++ b/assets/l10n/app_ru.arb\n@@ -1105,10 +1105,6 @@\n \"@newDmFabButtonLabel\": {\n \"description\": \"Label for the floating action button (FAB) that opens the new DM sheet.\"\n },\n- \"discardDraftForMessageNotSentConfirmationDialogMessage\": \"\u041f\u0440\u0438 \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0438 \u043d\u0435\u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u043d\u043e\u0433\u043e \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \u0442\u0435\u043a\u0441\u0442 \u0432 \u043f\u043e\u043b\u0435 \u0432\u0432\u043e\u0434\u0430 \u0442\u0435\u043a\u0441\u0442\u0430 \u0431\u0443\u0434\u0435\u0442 \u0443\u0442\u0440\u0430\u0447\u0435\u043d.\",\n- \"@discardDraftForMessageNotSentConfirmationDialogMessage\": {\n- \"description\": \"Message for a confirmation dialog when restoring a message not sent, for discarding message text that was typed into the compose box.\"\n- },\n \"newDmSheetScreenTitle\": \"\u041d\u043e\u0432\u043e\u0435 \u041b\u0421\",\n \"@newDmSheetScreenTitle\": {\n \"description\": \"Title displayed at the top of the new DM screen.\"\ndiff --git a/lib/generated/l10n/zulip_localizations.dart b/lib/generated/l10n/zulip_localizations.dart\nindex 28f4eee3ba..68d47c3787 100644\n--- a/lib/generated/l10n/zulip_localizations.dart\n+++ b/lib/generated/l10n/zulip_localizations.dart\n@@ -655,11 +655,11 @@ abstract class ZulipLocalizations {\n /// **'When you edit a message, the content that was previously in the compose box is discarded.'**\n String get discardDraftForEditConfirmationDialogMessage;\n \n- /// Message for a confirmation dialog when restoring a message not sent, for discarding message text that was typed into the compose box.\n+ /// Message for a confirmation dialog when restoring an outbox message, for discarding message text that was typed into the compose box.\n ///\n /// In en, this message translates to:\n- /// **'When you restore a message not sent, the content that was previously in the compose box is discarded.'**\n- String get discardDraftForMessageNotSentConfirmationDialogMessage;\n+ /// **'When you restore an unsent message, the content that was previously in the compose box is discarded.'**\n+ String get discardDraftForOutboxConfirmationDialogMessage;\n \n /// Label for the 'Discard' button on a confirmation dialog for discarding message text that was typed into the compose box.\n ///\ndiff --git a/lib/generated/l10n/zulip_localizations_ar.dart b/lib/generated/l10n/zulip_localizations_ar.dart\nindex 104cc16822..2910711c42 100644\n--- a/lib/generated/l10n/zulip_localizations_ar.dart\n+++ b/lib/generated/l10n/zulip_localizations_ar.dart\n@@ -325,8 +325,8 @@ class ZulipLocalizationsAr extends ZulipLocalizations {\n 'When you edit a message, the content that was previously in the compose box is discarded.';\n \n @override\n- String get discardDraftForMessageNotSentConfirmationDialogMessage =>\n- 'When you restore a message not sent, the content that was previously in the compose box is discarded.';\n+ String get discardDraftForOutboxConfirmationDialogMessage =>\n+ 'When you restore an unsent message, the content that was previously in the compose box is discarded.';\n \n @override\n String get discardDraftConfirmationDialogConfirmButton => 'Discard';\ndiff --git a/lib/generated/l10n/zulip_localizations_de.dart b/lib/generated/l10n/zulip_localizations_de.dart\nindex 0abb3c2e55..a01b813f0f 100644\n--- a/lib/generated/l10n/zulip_localizations_de.dart\n+++ b/lib/generated/l10n/zulip_localizations_de.dart\n@@ -325,8 +325,8 @@ class ZulipLocalizationsDe extends ZulipLocalizations {\n 'When you edit a message, the content that was previously in the compose box is discarded.';\n \n @override\n- String get discardDraftForMessageNotSentConfirmationDialogMessage =>\n- 'When you restore a message not sent, the content that was previously in the compose box is discarded.';\n+ String get discardDraftForOutboxConfirmationDialogMessage =>\n+ 'When you restore an unsent message, the content that was previously in the compose box is discarded.';\n \n @override\n String get discardDraftConfirmationDialogConfirmButton => 'Discard';\ndiff --git a/lib/generated/l10n/zulip_localizations_en.dart b/lib/generated/l10n/zulip_localizations_en.dart\nindex d5201bad84..9f41726924 100644\n--- a/lib/generated/l10n/zulip_localizations_en.dart\n+++ b/lib/generated/l10n/zulip_localizations_en.dart\n@@ -325,8 +325,8 @@ class ZulipLocalizationsEn extends ZulipLocalizations {\n 'When you edit a message, the content that was previously in the compose box is discarded.';\n \n @override\n- String get discardDraftForMessageNotSentConfirmationDialogMessage =>\n- 'When you restore a message not sent, the content that was previously in the compose box is discarded.';\n+ String get discardDraftForOutboxConfirmationDialogMessage =>\n+ 'When you restore an unsent message, the content that was previously in the compose box is discarded.';\n \n @override\n String get discardDraftConfirmationDialogConfirmButton => 'Discard';\ndiff --git a/lib/generated/l10n/zulip_localizations_ja.dart b/lib/generated/l10n/zulip_localizations_ja.dart\nindex 69a2e97816..7d800ac7a8 100644\n--- a/lib/generated/l10n/zulip_localizations_ja.dart\n+++ b/lib/generated/l10n/zulip_localizations_ja.dart\n@@ -325,8 +325,8 @@ class ZulipLocalizationsJa extends ZulipLocalizations {\n 'When you edit a message, the content that was previously in the compose box is discarded.';\n \n @override\n- String get discardDraftForMessageNotSentConfirmationDialogMessage =>\n- 'When you restore a message not sent, the content that was previously in the compose box is discarded.';\n+ String get discardDraftForOutboxConfirmationDialogMessage =>\n+ 'When you restore an unsent message, the content that was previously in the compose box is discarded.';\n \n @override\n String get discardDraftConfirmationDialogConfirmButton => 'Discard';\ndiff --git a/lib/generated/l10n/zulip_localizations_nb.dart b/lib/generated/l10n/zulip_localizations_nb.dart\nindex 66198f6a40..5d6c814002 100644\n--- a/lib/generated/l10n/zulip_localizations_nb.dart\n+++ b/lib/generated/l10n/zulip_localizations_nb.dart\n@@ -325,8 +325,8 @@ class ZulipLocalizationsNb extends ZulipLocalizations {\n 'When you edit a message, the content that was previously in the compose box is discarded.';\n \n @override\n- String get discardDraftForMessageNotSentConfirmationDialogMessage =>\n- 'When you restore a message not sent, the content that was previously in the compose box is discarded.';\n+ String get discardDraftForOutboxConfirmationDialogMessage =>\n+ 'When you restore an unsent message, the content that was previously in the compose box is discarded.';\n \n @override\n String get discardDraftConfirmationDialogConfirmButton => 'Discard';\ndiff --git a/lib/generated/l10n/zulip_localizations_pl.dart b/lib/generated/l10n/zulip_localizations_pl.dart\nindex b0189c01fc..efa03e9f48 100644\n--- a/lib/generated/l10n/zulip_localizations_pl.dart\n+++ b/lib/generated/l10n/zulip_localizations_pl.dart\n@@ -333,8 +333,8 @@ class ZulipLocalizationsPl extends ZulipLocalizations {\n 'Miej na uwadze, \u017ce przechodz\u0105c do zmiany wiadomo\u015bci wyczy\u015bcisz okno nowej wiadomo\u015bci.';\n \n @override\n- String get discardDraftForMessageNotSentConfirmationDialogMessage =>\n- 'Odzyskanie wiadomo\u015bci, kt\u00f3ra nie zosta\u0142a wys\u0142ana, skutkuje wyczyszczeniem zawarto\u015bci pola dodania wpisu.';\n+ String get discardDraftForOutboxConfirmationDialogMessage =>\n+ 'When you restore an unsent message, the content that was previously in the compose box is discarded.';\n \n @override\n String get discardDraftConfirmationDialogConfirmButton => 'Odrzu\u0107';\ndiff --git a/lib/generated/l10n/zulip_localizations_ru.dart b/lib/generated/l10n/zulip_localizations_ru.dart\nindex 063b3c01e4..9d7b09ded9 100644\n--- a/lib/generated/l10n/zulip_localizations_ru.dart\n+++ b/lib/generated/l10n/zulip_localizations_ru.dart\n@@ -334,8 +334,8 @@ class ZulipLocalizationsRu extends ZulipLocalizations {\n '\u041f\u0440\u0438 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0438 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \u0442\u0435\u043a\u0441\u0442 \u0438\u0437 \u043f\u043e\u043b\u044f \u0434\u043b\u044f \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0443\u0434\u0430\u043b\u044f\u0435\u0442\u0441\u044f.';\n \n @override\n- String get discardDraftForMessageNotSentConfirmationDialogMessage =>\n- '\u041f\u0440\u0438 \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0438 \u043d\u0435\u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u043d\u043e\u0433\u043e \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \u0442\u0435\u043a\u0441\u0442 \u0432 \u043f\u043e\u043b\u0435 \u0432\u0432\u043e\u0434\u0430 \u0442\u0435\u043a\u0441\u0442\u0430 \u0431\u0443\u0434\u0435\u0442 \u0443\u0442\u0440\u0430\u0447\u0435\u043d.';\n+ String get discardDraftForOutboxConfirmationDialogMessage =>\n+ 'When you restore an unsent message, the content that was previously in the compose box is discarded.';\n \n @override\n String get discardDraftConfirmationDialogConfirmButton => '\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c';\ndiff --git a/lib/generated/l10n/zulip_localizations_sk.dart b/lib/generated/l10n/zulip_localizations_sk.dart\nindex ec7a8f36e4..51aace2d53 100644\n--- a/lib/generated/l10n/zulip_localizations_sk.dart\n+++ b/lib/generated/l10n/zulip_localizations_sk.dart\n@@ -325,8 +325,8 @@ class ZulipLocalizationsSk extends ZulipLocalizations {\n 'When you edit a message, the content that was previously in the compose box is discarded.';\n \n @override\n- String get discardDraftForMessageNotSentConfirmationDialogMessage =>\n- 'When you restore a message not sent, the content that was previously in the compose box is discarded.';\n+ String get discardDraftForOutboxConfirmationDialogMessage =>\n+ 'When you restore an unsent message, the content that was previously in the compose box is discarded.';\n \n @override\n String get discardDraftConfirmationDialogConfirmButton => 'Discard';\ndiff --git a/lib/generated/l10n/zulip_localizations_uk.dart b/lib/generated/l10n/zulip_localizations_uk.dart\nindex af57ca0f86..97b5e26af1 100644\n--- a/lib/generated/l10n/zulip_localizations_uk.dart\n+++ b/lib/generated/l10n/zulip_localizations_uk.dart\n@@ -334,8 +334,8 @@ class ZulipLocalizationsUk extends ZulipLocalizations {\n 'When you edit a message, the content that was previously in the compose box is discarded.';\n \n @override\n- String get discardDraftForMessageNotSentConfirmationDialogMessage =>\n- 'When you restore a message not sent, the content that was previously in the compose box is discarded.';\n+ String get discardDraftForOutboxConfirmationDialogMessage =>\n+ 'When you restore an unsent message, the content that was previously in the compose box is discarded.';\n \n @override\n String get discardDraftConfirmationDialogConfirmButton => 'Discard';\ndiff --git a/lib/generated/l10n/zulip_localizations_zh.dart b/lib/generated/l10n/zulip_localizations_zh.dart\nindex 3b425dcea1..e72db65ad7 100644\n--- a/lib/generated/l10n/zulip_localizations_zh.dart\n+++ b/lib/generated/l10n/zulip_localizations_zh.dart\n@@ -325,8 +325,8 @@ class ZulipLocalizationsZh extends ZulipLocalizations {\n 'When you edit a message, the content that was previously in the compose box is discarded.';\n \n @override\n- String get discardDraftForMessageNotSentConfirmationDialogMessage =>\n- 'When you restore a message not sent, the content that was previously in the compose box is discarded.';\n+ String get discardDraftForOutboxConfirmationDialogMessage =>\n+ 'When you restore an unsent message, the content that was previously in the compose box is discarded.';\n \n @override\n String get discardDraftConfirmationDialogConfirmButton => 'Discard';\ndiff --git a/lib/model/message.dart b/lib/model/message.dart\nindex e8cfa6e6e1..1dfe421368 100644\n--- a/lib/model/message.dart\n+++ b/lib/model/message.dart\n@@ -881,9 +881,8 @@ mixin _OutboxMessageStore on PerAccountStoreBase {\n void _handleMessageEventOutbox(MessageEvent event) {\n if (event.localMessageId != null) {\n final localMessageId = int.parse(event.localMessageId!, radix: 10);\n- // The outbox message can be missing if the user removes it (to be\n- // implemented in #1441) before the event arrives.\n- // Nothing to do in that case.\n+ // The outbox message can be missing if the user removes it before the\n+ // event arrives. Nothing to do in that case.\n _outboxMessages.remove(localMessageId);\n _outboxMessageDebounceTimers.remove(localMessageId)?.cancel();\n _outboxMessageWaitPeriodTimers.remove(localMessageId)?.cancel();\ndiff --git a/lib/widgets/compose_box.dart b/lib/widgets/compose_box.dart\nindex 57bf1d0a5c..a53d628a2c 100644\n--- a/lib/widgets/compose_box.dart\n+++ b/lib/widgets/compose_box.dart\n@@ -13,6 +13,7 @@ import '../api/route/messages.dart';\n import '../generated/l10n/zulip_localizations.dart';\n import '../model/binding.dart';\n import '../model/compose.dart';\n+import '../model/message.dart';\n import '../model/narrow.dart';\n import '../model/store.dart';\n import 'actions.dart';\n@@ -1288,15 +1289,8 @@ class _SendButtonState extends State<_SendButton> {\n final content = controller.content.textNormalized;\n \n controller.content.clear();\n- // The following `stoppedComposing` call is currently redundant,\n- // because clearing input sends a \"typing stopped\" notice.\n- // It will be necessary once we resolve #720.\n- store.typingNotifier.stoppedComposing();\n \n try {\n- // TODO(#720) clear content input only on success response;\n- // while waiting, put input(s) and send button into a disabled\n- // \"working on it\" state (letting input text be selected for copying).\n await store.sendMessage(destination: widget.getDestination(), content: content);\n } on ApiRequestException catch (e) {\n if (!mounted) return;\n@@ -1388,7 +1382,6 @@ class _ComposeBoxContainer extends StatelessWidget {\n border: Border(top: BorderSide(color: designVariables.borderBar)),\n boxShadow: ComposeBoxTheme.of(context).boxShadow,\n ),\n- // TODO(#720) try a Stack for the overlaid linear progress indicator\n child: Material(\n color: designVariables.composeBoxBg,\n child: Column(\n@@ -1746,10 +1739,10 @@ class _ErrorBanner extends _Banner {\n \n @override\n Widget? buildTrailing(context) {\n- // TODO(#720) \"x\" button goes here.\n- // 24px square with 8px touchable padding in all directions?\n- // and `bool get padEnd => false`; see Figma:\n- // https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=4031-17029&m=dev\n+ // An \"x\" button can go here.\n+ // 24px square with 8px touchable padding in all directions?\n+ // and `bool get padEnd => false`; see Figma:\n+ // https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=4031-17029&m=dev\n return null;\n }\n }\n@@ -1848,6 +1841,16 @@ class ComposeBox extends StatefulWidget {\n abstract class ComposeBoxState extends State {\n ComposeBoxController get controller;\n \n+ /// Fills the compose box with the content of an [OutboxMessage]\n+ /// for a failed [sendMessage] request.\n+ ///\n+ /// If there is already text in the compose box, gives a confirmation dialog\n+ /// to confirm that it is OK to discard that text.\n+ ///\n+ /// [localMessageId], as in [OutboxMessage.localMessageId], must be present\n+ /// in the message store.\n+ void restoreMessageNotSent(int localMessageId);\n+\n /// Switch the compose box to editing mode.\n ///\n /// If there is already text in the compose box, gives a confirmation dialog\n@@ -1869,6 +1872,29 @@ class _ComposeBoxState extends State with PerAccountStoreAwareStateM\n @override ComposeBoxController get controller => _controller!;\n ComposeBoxController? _controller;\n \n+ @override\n+ void restoreMessageNotSent(int localMessageId) async {\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n+\n+ final abort = await _abortBecauseContentInputNotEmpty(\n+ dialogMessage: zulipLocalizations.discardDraftForOutboxConfirmationDialogMessage);\n+ if (abort || !mounted) return;\n+\n+ final store = PerAccountStoreWidget.of(context);\n+ final outboxMessage = store.takeOutboxMessage(localMessageId);\n+ setState(() {\n+ _setNewController(store);\n+ final controller = this.controller;\n+ controller\n+ ..content.value = TextEditingValue(text: outboxMessage.contentMarkdown)\n+ ..contentFocusNode.requestFocus();\n+ if (controller is StreamComposeBoxController) {\n+ controller.topic.setTopic(\n+ (outboxMessage.conversation as StreamConversation).topic);\n+ }\n+ });\n+ }\n+\n @override\n void startEditInteraction(int messageId) async {\n final zulipLocalizations = ZulipLocalizations.of(context);\n@@ -1949,7 +1975,8 @@ class _ComposeBoxState extends State with PerAccountStoreAwareStateM\n // TODO timeout this request?\n if (!mounted) return;\n if (!identical(controller, emptyEditController)) {\n- // user tapped Cancel during the fetch-raw-content request\n+ // During the fetch-raw-content request, the user tapped Cancel\n+ // or tapped a failed message edit or failed outbox message to restore.\n // TODO in this case we don't want the error dialog caused by\n // ZulipAction.fetchRawContentWithFeedback; suppress that\n return;\n@@ -2087,11 +2114,6 @@ class _ComposeBoxState extends State with PerAccountStoreAwareStateM\n }\n }\n \n- // TODO(#720) dismissable message-send error, maybe something like:\n- // if (controller.sendMessageError.value != null) {\n- // errorBanner = _ErrorBanner(label:\n- // ZulipLocalizations.of(context).errorSendMessageTimeout);\n- // }\n return ComposeBoxInheritedWidget.fromComposeBoxState(this,\n child: _ComposeBoxContainer(body: body, banner: banner));\n }\ndiff --git a/lib/widgets/message_list.dart b/lib/widgets/message_list.dart\nindex b49e64a474..a34a25bb37 100644\n--- a/lib/widgets/message_list.dart\n+++ b/lib/widgets/message_list.dart\n@@ -5,6 +5,7 @@ import 'package:intl/intl.dart' hide TextDirection;\n \n import '../api/model/model.dart';\n import '../generated/l10n/zulip_localizations.dart';\n+import '../model/message.dart';\n import '../model/message_list.dart';\n import '../model/narrow.dart';\n import '../model/store.dart';\n@@ -1748,19 +1749,113 @@ class OutboxMessageWithPossibleSender extends StatelessWidget {\n @override\n Widget build(BuildContext context) {\n final message = item.message;\n+ final localMessageId = message.localMessageId;\n+\n+ // This is adapted from [MessageContent].\n+ // TODO(#576): Offer InheritedMessage ancestor once we are ready\n+ // to support local echoing images and lightbox.\n+ Widget content = DefaultTextStyle(\n+ style: ContentTheme.of(context).textStylePlainParagraph,\n+ child: BlockContentList(nodes: item.content.nodes));\n+\n+ switch (message.state) {\n+ case OutboxMessageState.hidden:\n+ throw StateError('Hidden OutboxMessage messages should not appear in message lists');\n+ case OutboxMessageState.waiting:\n+ break;\n+ case OutboxMessageState.failed:\n+ case OutboxMessageState.waitPeriodExpired:\n+ // TODO(#576): When we support rendered-content local echo,\n+ // use IgnorePointer along with this faded appearance,\n+ // like we do for the failed-message-edit state\n+ content = _RestoreOutboxMessageGestureDetector(\n+ localMessageId: localMessageId,\n+ child: Opacity(opacity: 0.6, child: content));\n+ }\n+\n return Padding(\n- padding: const EdgeInsets.symmetric(vertical: 4),\n+ padding: const EdgeInsets.only(top: 4),\n child: Column(children: [\n if (item.showSender)\n _SenderRow(message: message, showTimestamp: false),\n Padding(\n padding: const EdgeInsets.symmetric(horizontal: 16),\n- // This is adapted from [MessageContent].\n- // TODO(#576): Offer InheritedMessage ancestor once we are ready\n- // to support local echoing images and lightbox.\n- child: DefaultTextStyle(\n- style: ContentTheme.of(context).textStylePlainParagraph,\n- child: BlockContentList(nodes: item.content.nodes))),\n+ child: Column(crossAxisAlignment: CrossAxisAlignment.stretch,\n+ children: [\n+ content,\n+ _OutboxMessageStatusRow(\n+ localMessageId: localMessageId, outboxMessageState: message.state),\n+ ])),\n ]));\n }\n }\n+\n+class _OutboxMessageStatusRow extends StatelessWidget {\n+ const _OutboxMessageStatusRow({\n+ required this.localMessageId,\n+ required this.outboxMessageState,\n+ });\n+\n+ final int localMessageId;\n+ final OutboxMessageState outboxMessageState;\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ switch (outboxMessageState) {\n+ case OutboxMessageState.hidden:\n+ assert(false,\n+ 'Hidden OutboxMessage messages should not appear in message lists');\n+ return SizedBox.shrink();\n+\n+ case OutboxMessageState.waiting:\n+ final designVariables = DesignVariables.of(context);\n+ return Padding(\n+ padding: const EdgeInsetsGeometry.only(bottom: 2),\n+ child: LinearProgressIndicator(\n+ minHeight: 2,\n+ color: designVariables.foreground.withFadedAlpha(0.5),\n+ backgroundColor: designVariables.foreground.withFadedAlpha(0.2)));\n+\n+ case OutboxMessageState.failed:\n+ case OutboxMessageState.waitPeriodExpired:\n+ final designVariables = DesignVariables.of(context);\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n+ return Padding(\n+ padding: const EdgeInsets.only(bottom: 4),\n+ child: _RestoreOutboxMessageGestureDetector(\n+ localMessageId: localMessageId,\n+ child: Text(\n+ zulipLocalizations.messageNotSentLabel,\n+ textAlign: TextAlign.end,\n+ style: TextStyle(\n+ color: designVariables.btnLabelAttLowIntDanger,\n+ fontSize: 12,\n+ height: 12 / 12,\n+ letterSpacing: proportionalLetterSpacing(\n+ context, 0.05, baseFontSize: 12)))));\n+ }\n+ }\n+}\n+\n+class _RestoreOutboxMessageGestureDetector extends StatelessWidget {\n+ const _RestoreOutboxMessageGestureDetector({\n+ required this.localMessageId,\n+ required this.child,\n+ });\n+\n+ final int localMessageId;\n+ final Widget child;\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ return GestureDetector(\n+ behavior: HitTestBehavior.opaque,\n+ onTap: () {\n+ final composeBoxState = MessageListPage.ancestorOf(context).composeBoxState;\n+ // TODO(#1518) allow restore-outbox-message from any message-list page\n+ if (composeBoxState == null) return;\n+ composeBoxState.restoreMessageNotSent(localMessageId);\n+ },\n+ child: child);\n+ }\n+}\n", "test_patch": "diff --git a/test/widgets/compose_box_test.dart b/test/widgets/compose_box_test.dart\nindex c25b00793e..70f0913316 100644\n--- a/test/widgets/compose_box_test.dart\n+++ b/test/widgets/compose_box_test.dart\n@@ -1530,6 +1530,165 @@ void main() {\n }\n }\n \n+ group('restoreMessageNotSent', () {\n+ final channel = eg.stream();\n+ final topic = 'topic';\n+ final topicNarrow = eg.topicNarrow(channel.streamId, topic);\n+\n+ final failedMessageContent = 'failed message';\n+ final failedMessageFinder = find.widgetWithText(\n+ OutboxMessageWithPossibleSender, failedMessageContent, skipOffstage: true);\n+\n+ Future prepareMessageNotSent(WidgetTester tester, {\n+ required Narrow narrow,\n+ List otherUsers = const [],\n+ }) async {\n+ TypingNotifier.debugEnable = false;\n+ addTearDown(TypingNotifier.debugReset);\n+ await prepareComposeBox(tester,\n+ narrow: narrow, streams: [channel], otherUsers: otherUsers);\n+\n+ if (narrow is ChannelNarrow) {\n+ connection.prepare(json: GetStreamTopicsResult(topics: []).toJson());\n+ await enterTopic(tester, narrow: narrow, topic: topic);\n+ }\n+ await enterContent(tester, failedMessageContent);\n+ connection.prepare(httpException: SocketException('error'));\n+ await tester.tap(find.byIcon(ZulipIcons.send));\n+ await tester.pump(Duration.zero);\n+ check(state).controller.content.text.equals('');\n+\n+ await tester.tap(find.byWidget(checkErrorDialog(tester,\n+ expectedTitle: 'Message not sent')));\n+ await tester.pump();\n+ check(failedMessageFinder).findsOne();\n+ }\n+\n+ testWidgets('restore content in DM narrow', (tester) async {\n+ final dmNarrow = DmNarrow.withUser(\n+ eg.otherUser.userId, selfUserId: eg.selfUser.userId);\n+ await prepareMessageNotSent(tester, narrow: dmNarrow, otherUsers: [eg.otherUser]);\n+\n+ await tester.tap(failedMessageFinder);\n+ await tester.pump();\n+ check(state).controller\n+ ..content.text.equals(failedMessageContent)\n+ ..contentFocusNode.hasFocus.isTrue();\n+ });\n+\n+ testWidgets('restore content in topic narrow', (tester) async {\n+ await prepareMessageNotSent(tester, narrow: topicNarrow);\n+\n+ await tester.tap(failedMessageFinder);\n+ await tester.pump();\n+ check(state).controller\n+ ..content.text.equals(failedMessageContent)\n+ ..contentFocusNode.hasFocus.isTrue();\n+ });\n+\n+ testWidgets('restore content and topic in channel narrow', (tester) async {\n+ final channelNarrow = ChannelNarrow(channel.streamId);\n+ await prepareMessageNotSent(tester, narrow: channelNarrow);\n+\n+ await tester.enterText(topicInputFinder, 'topic before restoring');\n+ check(state).controller.isA()\n+ ..topic.text.equals('topic before restoring')\n+ ..content.text.isNotNull().isEmpty();\n+\n+ await tester.tap(failedMessageFinder);\n+ await tester.pump();\n+ check(state).controller.isA()\n+ ..topic.text.equals(topic)\n+ ..content.text.equals(failedMessageContent)\n+ ..contentFocusNode.hasFocus.isTrue();\n+ });\n+\n+ Future expectAndHandleDiscardForMessageNotSentConfirmation(\n+ WidgetTester tester, {\n+ required bool shouldContinue,\n+ }) {\n+ return expectAndHandleDiscardConfirmation(tester,\n+ expectedMessage: 'When you restore an unsent message, the content that was previously in the compose box is discarded.',\n+ shouldContinue: shouldContinue);\n+ }\n+\n+ testWidgets('interrupting new-message compose: proceed through confirmation dialog', (tester) async {\n+ await prepareMessageNotSent(tester, narrow: topicNarrow);\n+ await enterContent(tester, 'composing something');\n+\n+ await tester.tap(failedMessageFinder);\n+ await tester.pump();\n+ check(state).controller.content.text.equals('composing something');\n+\n+ await expectAndHandleDiscardForMessageNotSentConfirmation(tester,\n+ shouldContinue: true);\n+ await tester.pump();\n+ check(state).controller.content.text.equals(failedMessageContent);\n+ });\n+\n+ testWidgets('interrupting new-message compose: cancel confirmation dialog', (tester) async {\n+ await prepareMessageNotSent(tester, narrow: topicNarrow);\n+ await enterContent(tester, 'composing something');\n+\n+ await tester.tap(failedMessageFinder);\n+ await tester.pump();\n+ check(state).controller.content.text.equals('composing something');\n+\n+ await expectAndHandleDiscardForMessageNotSentConfirmation(tester,\n+ shouldContinue: false);\n+ await tester.pump();\n+ check(state).controller.content.text.equals('composing something');\n+ });\n+\n+ testWidgets('interrupting message edit: proceed through confirmation dialog', (tester) async {\n+ await prepareMessageNotSent(tester, narrow: topicNarrow);\n+\n+ final messageToEdit = eg.streamMessage(\n+ sender: eg.selfUser, stream: channel, topic: topic,\n+ content: 'message to edit');\n+ await store.addMessage(messageToEdit);\n+ await tester.pump();\n+\n+ await startEditInteractionFromActionSheet(tester, messageId: messageToEdit.id,\n+ originalRawContent: 'message to edit',\n+ delay: Duration.zero);\n+ await tester.pump(const Duration(milliseconds: 250)); // bottom-sheet animation\n+\n+ await tester.tap(failedMessageFinder);\n+ await tester.pump();\n+ check(state).controller.content.text.equals('message to edit');\n+\n+ await expectAndHandleDiscardForMessageNotSentConfirmation(tester,\n+ shouldContinue: true);\n+ await tester.pump();\n+ check(state).controller.content.text.equals(failedMessageContent);\n+ });\n+\n+ testWidgets('interrupting message edit: cancel confirmation dialog', (tester) async {\n+ await prepareMessageNotSent(tester, narrow: topicNarrow);\n+\n+ final messageToEdit = eg.streamMessage(\n+ sender: eg.selfUser, stream: channel, topic: topic,\n+ content: 'message to edit');\n+ await store.addMessage(messageToEdit);\n+ await tester.pump();\n+\n+ await startEditInteractionFromActionSheet(tester, messageId: messageToEdit.id,\n+ originalRawContent: 'message to edit',\n+ delay: Duration.zero);\n+ await tester.pump(const Duration(milliseconds: 250)); // bottom-sheet animation\n+\n+ await tester.tap(failedMessageFinder);\n+ await tester.pump();\n+ check(state).controller.content.text.equals('message to edit');\n+\n+ await expectAndHandleDiscardForMessageNotSentConfirmation(tester,\n+ shouldContinue: false);\n+ await tester.pump();\n+ check(state).controller.content.text.equals('message to edit');\n+ });\n+ });\n+\n group('edit message', () {\n final channel = eg.stream();\n final topic = 'topic';\ndiff --git a/test/widgets/message_list_test.dart b/test/widgets/message_list_test.dart\nindex 01e40cf7cf..8ead103d68 100644\n--- a/test/widgets/message_list_test.dart\n+++ b/test/widgets/message_list_test.dart\n@@ -1,4 +1,5 @@\n import 'dart:convert';\n+import 'dart:io';\n \n import 'package:checks/checks.dart';\n import 'package:collection/collection.dart';\n@@ -1638,6 +1639,13 @@ void main() {\n Finder outboxMessageFinder = find.widgetWithText(\n OutboxMessageWithPossibleSender, content, skipOffstage: true);\n \n+ Finder messageNotSentFinder = find.descendant(\n+ of: find.byType(OutboxMessageWithPossibleSender),\n+ matching: find.text('MESSAGE NOT SENT')).hitTestable();\n+ Finder loadingIndicatorFinder = find.descendant(\n+ of: find.byType(OutboxMessageWithPossibleSender),\n+ matching: find.byType(LinearProgressIndicator)).hitTestable();\n+\n Future sendMessageAndSucceed(WidgetTester tester, {\n Duration delay = Duration.zero,\n }) async {\n@@ -1647,18 +1655,142 @@ void main() {\n await tester.pump(Duration.zero);\n }\n \n+ Future sendMessageAndFail(WidgetTester tester, {\n+ Duration delay = Duration.zero,\n+ }) async {\n+ connection.prepare(httpException: SocketException('error'), delay: delay);\n+ await tester.enterText(contentInputFinder, content);\n+ await tester.tap(find.byIcon(ZulipIcons.send));\n+ await tester.pump(Duration.zero);\n+ }\n+\n+ Future dismissErrorDialog(WidgetTester tester) async {\n+ await tester.tap(find.byWidget(\n+ checkErrorDialog(tester, expectedTitle: 'Message not sent')));\n+ await tester.pump(Duration(milliseconds: 250));\n+ }\n+\n+ Future checkTapRestoreMessage(WidgetTester tester) async {\n+ final state = tester.state(find.byType(ComposeBox));\n+ check(store.outboxMessages).values.single;\n+ check(outboxMessageFinder).findsOne();\n+ check(messageNotSentFinder).findsOne();\n+ check(state).controller.content.text.isNotNull().isEmpty();\n+\n+ // Tap the message. This should put its content back into the compose box\n+ // and remove it.\n+ await tester.tap(outboxMessageFinder);\n+ await tester.pump();\n+ check(store.outboxMessages).isEmpty();\n+ check(outboxMessageFinder).findsNothing();\n+ check(state).controller.content.text.equals(content);\n+ }\n+\n+ Future checkTapNotRestoreMessage(WidgetTester tester) async {\n+ check(store.outboxMessages).values.single;\n+ check(outboxMessageFinder).findsOne();\n+\n+ // the message should ignore the pointer event\n+ await tester.tap(outboxMessageFinder, warnIfMissed: false);\n+ await tester.pump();\n+ check(store.outboxMessages).values.single;\n+ check(outboxMessageFinder).findsOne();\n+ }\n+\n // State transitions are tested more thoroughly in\n // test/model/message_test.dart .\n \n- testWidgets('hidden -> waiting, outbox message appear', (tester) async {\n+ testWidgets('hidden -> waiting', (tester) async {\n await setupMessageListPage(tester,\n narrow: topicNarrow, streams: [stream],\n messages: []);\n+\n await sendMessageAndSucceed(tester);\n check(outboxMessageFinder).findsNothing();\n \n await tester.pump(kLocalEchoDebounceDuration);\n check(outboxMessageFinder).findsOne();\n+ check(loadingIndicatorFinder).findsOne();\n+ // The outbox message is still in waiting state;\n+ // tapping does not restore it.\n+ await checkTapNotRestoreMessage(tester);\n+ });\n+\n+ testWidgets('hidden -> failed, tap to restore message', (tester) async {\n+ await setupMessageListPage(tester,\n+ narrow: topicNarrow, streams: [stream],\n+ messages: []);\n+ // Send a message and fail. Dismiss the error dialog as it pops up.\n+ await sendMessageAndFail(tester);\n+ await dismissErrorDialog(tester);\n+ check(messageNotSentFinder).findsOne();\n+\n+ await checkTapRestoreMessage(tester);\n+ });\n+\n+ testWidgets('hidden -> failed, tapping does nothing if compose box is not offered', (tester) async {\n+ Route? lastPoppedRoute;\n+ final navObserver = TestNavigatorObserver()\n+ ..onPopped = (route, prevRoute) => lastPoppedRoute = route;\n+\n+ final messages = [eg.streamMessage(\n+ stream: stream, topic: topic, content: content)];\n+ await setupMessageListPage(tester,\n+ narrow: const CombinedFeedNarrow(),\n+ streams: [stream], subscriptions: [eg.subscription(stream)],\n+ navObservers: [navObserver],\n+ messages: messages);\n+\n+ // Navigate to a message list page in a topic narrow,\n+ // which has a compose box.\n+ connection.prepare(json:\n+ eg.newestGetMessagesResult(foundOldest: true, messages: messages).toJson());\n+ await tester.tap(find.widgetWithText(RecipientHeader, topic));\n+ await tester.pump(); // handle tap\n+ await tester.pump(); // wait for navigation\n+ check(contentInputFinder).findsOne();\n+\n+ await sendMessageAndFail(tester);\n+ await dismissErrorDialog(tester);\n+ // Navigate back to the message list page without a compose box,\n+ // where the failed to send message should be visible.\n+\n+ await tester.pageBack();\n+ check(lastPoppedRoute)\n+ .isA().page\n+ .isA()\n+ .initNarrow.equals(TopicNarrow(stream.streamId, eg.t(topic)));\n+ await tester.pump(); // handle tap\n+ await tester.pump((lastPoppedRoute as TransitionRoute).reverseTransitionDuration);\n+ check(contentInputFinder).findsNothing();\n+ check(messageNotSentFinder).findsOne();\n+\n+ // Tap the failed to send message.\n+ // This should not remove it from the message list.\n+ await checkTapNotRestoreMessage(tester);\n+ });\n+\n+ testWidgets('waiting -> waitPeriodExpired, tap to restore message', (tester) async {\n+ await setupMessageListPage(tester,\n+ narrow: topicNarrow, streams: [stream],\n+ messages: []);\n+ await sendMessageAndFail(tester,\n+ delay: kSendMessageOfferRestoreWaitPeriod + const Duration(seconds: 1));\n+ await tester.pump(kSendMessageOfferRestoreWaitPeriod);\n+ final localMessageId = store.outboxMessages.keys.single;\n+ check(messageNotSentFinder).findsOne();\n+\n+ await checkTapRestoreMessage(tester);\n+\n+ // While `localMessageId` is no longer in store, there should be no error\n+ // when a message event refers to it.\n+ await store.handleEvent(eg.messageEvent(\n+ eg.streamMessage(stream: stream, topic: 'topic'),\n+ localMessageId: localMessageId));\n+\n+ // The [sendMessage] request fails; there is no outbox message affected.\n+ await tester.pump(Duration(seconds: 1));\n+ check(messageNotSentFinder).findsNothing();\n });\n });\n \n", "n2p_tests": "{\"/home/zulip-flutter/test/widgets/compose_box_test.dart: auto focus ChannelNarrow, empty fetch\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage composeBoxState finds compose box\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, mandatory topics with non-empty topic\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: auto focus TopicNarrow, non-empty fetch\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar channel icon in channel row; web-public: false, invite-only: false\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeContentController insertPadded insert at end one line, incomplete; insert one line\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, topic input has focus\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{\"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation content code points not counted unnecessarily\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage ancestorOf finds page state from message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation topic code points not counted unnecessarily\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch initial batch of messages topic permalink without message move\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: auto focus ChannelNarrow, non-empty fetch\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar channel icon in channel row; web-public: false, invite-only: true\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: smoke test for light/dark/lerped\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar channel icon in channel row; web-public: true, invite-only: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar has topic-list action for topic narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation topic max-length topic not rejected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation content too-long content is rejected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, topic input has focus, then loses it\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar has topic-list action for channel narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation topic too-long topic is rejected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation content max-length content not rejected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, topic input has focus, then content input gains focus\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch older messages on scroll basic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with non-empty but vacuous topic, topic input has focus\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch initial batch of messages topic permalink with message move\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar show topic visibility policy for topic narrows\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage MessageListPageState.narrow\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: MessageListPage ancestorOf throws when not a descendant of MessageListPage\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1451", "org": "zulip", "repo": "zulip-flutter", "number": 1451, "state": "closed", "title": "notif: Use live value for app ID on registering APNs token", "body": "Fixes #407 \r\n\r\nChanges made:\r\n- Replaced the hardcoded app bundle ID with `packageInfo.packageName`.\r\n- Added a new test that sets a specific appId via packageInfo and confirms it\u2019s used in a notification request.\r\n\r\nThe first change caused the \"token initially unknown\" test in `store_test.dart` to fail due to the added asynchronous call to `ZulipBinding.instance.packageInfo`, which delayed the completion of `registerToken`.\r\n\r\nTo resolve this, a `flushMicrotasks` was added after `await startFuture` in the test to ensure `_registerNotificationToken` completes before the test checks for the request.\r\n\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"5c812e703cff0aa7b689b2095e0b10574e97313e\"}", "resolved_issues": "[{\"number\": 407, \"title\": \"notif: Use live value for app ID on registering APNs token\", \"body\": \"In my draft for #321 I have a TODO like this:\\r\\n```dart\\r\\n case TargetPlatform.iOS:\\r\\n const appBundleId = 'com.zulip.flutter'; // TODO find actual value live\\r\\n await registerApnsToken(connection, token: token, appid: appBundleId);\\r\\n```\\r\\n\\r\\nThis will be just fine as long as the app ID is indeed `com.zulip.flutter`. That means it will basically be fine right through the beta period, until we start rolling this app out as the new version of `org.zulip.Zulip` (the app ID currently occupied by the zulip-mobile RN app).\\r\\n\\r\\nThe fix is easy, locally:\\r\\n```dart\\r\\n final appBundleId = (await PackageInfo.fromPlatform()).packageName;\\r\\n```\\r\\n\\r\\nThe one wrinkle is that that version breaks tests, because it's directly calling a plugin. To fix it, we'll want to indirect `PackageInfo.fromPlatform` through a method on `ZulipBinding`, like we've done for other plugins. This still isn't hard, but given the impending beta, I'm deferring it for now.\\r\\n\"}]", "lang": "dart", "problem_statement": "notif: Use live value for app ID on registering APNs token\nIn my draft for #321 I have a TODO like this:\r\n```dart\r\n case TargetPlatform.iOS:\r\n const appBundleId = 'com.zulip.flutter'; // TODO find actual value live\r\n await registerApnsToken(connection, token: token, appid: appBundleId);\r\n```\r\n\r\nThis will be just fine as long as the app ID is indeed `com.zulip.flutter`. That means it will basically be fine right through the beta period, until we start rolling this app out as the new version of `org.zulip.Zulip` (the app ID currently occupied by the zulip-mobile RN app).\r\n\r\nThe fix is easy, locally:\r\n```dart\r\n final appBundleId = (await PackageInfo.fromPlatform()).packageName;\r\n```\r\n\r\nThe one wrinkle is that that version breaks tests, because it's directly calling a plugin. To fix it, we'll want to indirect `PackageInfo.fromPlatform` through a method on `ZulipBinding`, like we've done for other plugins. This still isn't hard, but given the impending beta, I'm deferring it for now.\r\n\n", "hints": "My approach to solve the issue:\n\n1. Update ZulipBinding to provide package info: Add a method in ZulipBinding to return the package name. This method will wrap the call to PackageInfo.fromPlatform() and make it test-friendly.\n\n2. Override the method in TestZulipBinding: In the TestZulipBinding, override getAppBundleId to return a mock or predefined value for testing.\n\n3. Refactor the code to use getAppBundleId: Replace direct calls to PackageInfo.fromPlatform() with the new getAppBundleId method from ZulipBinding. Like this (final appBundleId = await ZulipBinding.instance.getAppBundleId();).\n\n4. Write a test for the above logic.\nI have started working on the issue and would like to claim it.\r\nI will be making changes to the Zulip binding class and its corresponding test class. Adding packageInfo wrapper for bundleID.\r\nPlus will be adding test for the same.", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1451", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/407\"]", "test_command": "flutter test test/api/core_test.dart test/model/store_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/binding.dart b/lib/model/binding.dart\nindex 94435631ac..198e0ae119 100644\n--- a/lib/model/binding.dart\n+++ b/lib/model/binding.dart\n@@ -310,10 +310,12 @@ class LinuxDeviceInfo implements BaseDeviceInfo {\n class PackageInfo {\n final String version;\n final String buildNumber;\n+ final String packageName;\n \n const PackageInfo({\n required this.version,\n required this.buildNumber,\n+ required this.packageName,\n });\n }\n \n@@ -427,6 +429,7 @@ class LiveZulipBinding extends ZulipBinding {\n _syncPackageInfo = PackageInfo(\n version: info.version,\n buildNumber: info.buildNumber,\n+ packageName: info.packageName,\n );\n } catch (e, st) {\n assert(debugLog('Failed to prefetch package info: $e\\n$st')); // TODO(log)\ndiff --git a/lib/notifications/receive.dart b/lib/notifications/receive.dart\nindex 738bb98a2e..d60469ff30 100644\n--- a/lib/notifications/receive.dart\n+++ b/lib/notifications/receive.dart\n@@ -149,8 +149,10 @@ class NotificationService {\n await addFcmToken(connection, token: token);\n \n case TargetPlatform.iOS:\n- const appBundleId = 'com.zulip.flutter'; // TODO(#407) find actual value live\n- await addApnsToken(connection, token: token, appid: appBundleId);\n+ final packageInfo = await ZulipBinding.instance.packageInfo;\n+ await addApnsToken(connection,\n+ token: token,\n+ appid: packageInfo!.packageName);\n \n case TargetPlatform.linux:\n case TargetPlatform.macOS:\n", "test_patch": "diff --git a/test/api/core_test.dart b/test/api/core_test.dart\nindex 297dcfc441..e2c6e72ecb 100644\n--- a/test/api/core_test.dart\n+++ b/test/api/core_test.dart\n@@ -460,7 +460,7 @@ void main() {\n });\n }\n \n- const packageInfo = PackageInfo(version: '0.0.1', buildNumber: '1');\n+ final packageInfo = eg.packageInfo(version: '0.0.1', buildNumber: '1');\n \n const testCases = [\n ('ZulipFlutter/0.0.1+1 (Android 14)', AndroidDeviceInfo(release: '14', sdkInt: 34), ),\ndiff --git a/test/example_data.dart b/test/example_data.dart\nindex f31337d303..fc3acfc5a4 100644\n--- a/test/example_data.dart\n+++ b/test/example_data.dart\n@@ -10,6 +10,7 @@ import 'package:zulip/api/model/submessage.dart';\n import 'package:zulip/api/route/messages.dart';\n import 'package:zulip/api/route/realm.dart';\n import 'package:zulip/api/route/channels.dart';\n+import 'package:zulip/model/binding.dart';\n import 'package:zulip/model/database.dart';\n import 'package:zulip/model/narrow.dart';\n import 'package:zulip/model/settings.dart';\n@@ -994,3 +995,15 @@ UpdateMachine updateMachine({\n return UpdateMachine.fromInitialSnapshot(\n store: store, initialSnapshot: initialSnapshot);\n }\n+\n+PackageInfo packageInfo({\n+ String? version,\n+ String? buildNumber,\n+ String? packageName,\n+}) {\n+ return PackageInfo(\n+ version: version ?? '1.0.0',\n+ buildNumber: buildNumber ?? '1',\n+ packageName: packageName ?? 'com.example.app',\n+ );\n+}\ndiff --git a/test/model/binding.dart b/test/model/binding.dart\nindex ced2a4d4b3..31f5738ddf 100644\n--- a/test/model/binding.dart\n+++ b/test/model/binding.dart\n@@ -260,7 +260,7 @@ class TestZulipBinding extends ZulipBinding {\n \n /// The value that `ZulipBinding.instance.packageInfo` should return.\n PackageInfo packageInfoResult = _defaultPackageInfo;\n- static const _defaultPackageInfo = PackageInfo(version: '0.0.1', buildNumber: '1');\n+ static final _defaultPackageInfo = eg.packageInfo();\n \n void _resetPackageInfo() {\n packageInfoResult = _defaultPackageInfo;\ndiff --git a/test/model/store_test.dart b/test/model/store_test.dart\nindex 1dfbb51273..ef0a7a72be 100644\n--- a/test/model/store_test.dart\n+++ b/test/model/store_test.dart\n@@ -1291,6 +1291,7 @@ void main() {\n addTearDown(testBinding.reset);\n testBinding.firebaseMessagingInitialToken = '012abc';\n addTearDown(NotificationService.debugReset);\n+ testBinding.packageInfoResult = eg.packageInfo(packageName: 'com.zulip.flutter');\n await NotificationService.instance.start();\n \n // On store startup, send the token.\n@@ -1318,6 +1319,7 @@ void main() {\n addTearDown(testBinding.reset);\n testBinding.firebaseMessagingInitialToken = '012abc';\n addTearDown(NotificationService.debugReset);\n+ testBinding.packageInfoResult = eg.packageInfo(packageName: 'com.zulip.flutter');\n final startFuture = NotificationService.instance.start();\n \n // TODO this test is a bit brittle in its interaction with asynchrony;\n@@ -1336,6 +1338,7 @@ void main() {\n // When the token later appears, send it.\n connection.prepare(json: {});\n await startFuture;\n+ async.flushMicrotasks();\n if (defaultTargetPlatform == TargetPlatform.android) {\n checkLastRequestFcm(token: '012abc');\n } else {\n@@ -1350,6 +1353,22 @@ void main() {\n checkLastRequestFcm(token: '456def');\n }\n }));\n+\n+ test('on iOS, use provided app ID from packageInfo', () => awaitFakeAsync((async) async {\n+ final origTargetPlatform = debugDefaultTargetPlatformOverride;\n+ addTearDown(() => debugDefaultTargetPlatformOverride = origTargetPlatform);\n+ debugDefaultTargetPlatformOverride = TargetPlatform.iOS;\n+ addTearDown(testBinding.reset);\n+ testBinding.firebaseMessagingInitialToken = '012abc';\n+ testBinding.packageInfoResult = eg.packageInfo(packageName: 'com.example.test');\n+ addTearDown(NotificationService.debugReset);\n+ await NotificationService.instance.start();\n+\n+ prepareStore();\n+ connection.prepare(json: {});\n+ await updateMachine.registerNotificationToken();\n+ checkLastRequestApns(token: '012abc', appid: 'com.example.test');\n+ }));\n });\n \n group('ZulipVersionData', () {\n", "n2p_tests": "{\"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll handles events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken on iOS, use provided app ID from packageInfo\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out during transient-error backoff\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: API 5xx errors\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: API 4xx errors, malformed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads immediately on expired queue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: ApiConnection user-agent matches ZulipFlutter/0.0.1+1 (Android 14)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPassedWaitingPeriod user joined at 2024-11-25T10:00+00:00 hasn't passed waiting period by 2024-11-27 09:59:00.000Z\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: ApiConnection.delete\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: ApiConnection user-agent matches ZulipFlutter/0.0.1+1 (Linux; Fedora Linux)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPassedWaitingPeriod user joined at 2024-11-25T10:00+00:00 has passed waiting period by 2024-11-27 10:00:00.000Z\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"guest\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out while loading; then fails; malformed response with ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error ignore expired queue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: ApiConnection.postFileFromStream\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.load retries registerQueue on NetworkError\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on Server5xxException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount loading succeeds\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: API errors of unexpected HTTP status codes\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.removeAccount when store not loaded\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"administrator\\\" user can post in channel with \\\"moderators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"administrator\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error eventually report Server5xxException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reload failure new store is not loaded, gets InitialSnapshot with ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken token already known (iOS)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on rate limit: status 429 ZulipApiException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount throws if missing queueId\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"member\\\" user can't post in channel with \\\"administrators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccountSync\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPassedWaitingPeriod user joined at 2024-11-25T10:00+00:00 hasn't passed waiting period by 2024-11-26 10:00:00.000Z\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: API network errors\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.removeAccount when store loading\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"member\\\" user can't post in channel with \\\"moderators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reload failure new store is not loaded, gets HTTP 401 error instead\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.load updates account from snapshot\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"moderator\\\" user can post in channel with \\\"moderators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"unknown\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"member\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report generic ZulipApiException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on NetworkException from SocketException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"unknown\\\" user can post in channel with \\\"administrators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"administrator\\\" user can post in channel with \\\"administrators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: ApiConnection.post\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on generic NetworkException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: API success result\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: ApiConnection.get\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"administrator\\\" user can post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"member\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"guest\\\" user can't post in channel with \\\"moderators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"administrator\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"owner\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: ApiConnection user-agent matches ZulipFlutter/0.0.1+1 (iOS 17.4)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"unknown\\\" user can post in channel with \\\"moderators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"member\\\" user posting in a channel with \\\"fullMembers\\\" policy not a \\\"full\\\" member -> cannot post in the channel\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on rate limit: code RATE_LIMIT_HIT\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount concurrent case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.sendMessage smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error nicely report handleEvent error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount loading fails; malformed response with ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"owner\\\" user can post in channel with \\\"administrators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out while loading; then fails with HTTP status code 401\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"owner\\\" user can post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"member\\\" user posting in a channel with \\\"fullMembers\\\" policy a \\\"full\\\" member -> can post in the channel\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"unknown\\\" user can post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out while loading; then succeeds\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"moderator\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount loading fails with HTTP status code 401\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPassedWaitingPeriod user joined at 2024-11-25T10:00+00:00 has passed waiting period by 2027-08-22 07:00:00.000Z\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error eventually report generic NetworkException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: malformed API success responses: exception preserves details\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on rate limit: status 429 MalformedServerResponseException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: ApiConnection.patch\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"guest\\\" user can't post in channel with \\\"administrators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads on generic ZulipApiException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateAccount notifyListeners called\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateZulipVersionData\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report unexpected error within loop\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken token initially unknown (iOS)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reload failure user logged out before new store is loaded\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report MalformedServerResponseException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: ApiConnection user-agent matches ZulipFlutter/0.0.1+1 (macOS 14.5.0)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error ignore NetworkException from SocketException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPassedWaitingPeriod user joined at 2024-11-25T10:00+00:00 hasn't passed waiting period by 2024-11-25 10:00:00.000Z\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads on handleEvent error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: auth auth headers sent by default\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads on unexpected error within loop\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateAccount basic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out while loading; then succeeds; InitialSnapshot has ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateAccount reject changing id, realmUrl, or userId\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.load smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: auth auth headers omitted if useAuth false\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report rate limit: code RATE_LIMIT_HIT\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken token already known (Android)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: ApiConnection user-agent matches ZulipFlutter/0.0.1+1 (Linux; Fedora Linux 40)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.fetchEmojiData retries on failure\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"moderator\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reload failure new store is not loaded, gets malformed response with ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount sequential case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"moderator\\\" user can't post in channel with \\\"administrators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: ApiConnection user-agent matches ZulipFlutter/0.0.1+1 (Windows)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"unknown\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: malformed API success responses\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: API 4xx errors, well formed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"moderator\\\" user can post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken token initially unknown (Android)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.removeAccount when store loaded\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.fetchEmojiData happy case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"owner\\\" user can post in channel with \\\"moderators\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: ZulipVersionData fromMalformedServerResponseException replace missing feature level with 0\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report rate limit: status 429 ZulipApiException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount loading succeeds; InitialSnapshot has ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report rate limit: status 429 MalformedServerResponseException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"guest\\\" user can't post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"guest\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads on MalformedServerResponseException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"owner\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll loops on success\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/core_test.dart: auth send rejects off-realm URL (with default useAuth)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1428", "org": "zulip", "repo": "zulip-flutter", "number": 1428, "state": "closed", "title": "Fix DB downgrades to match creating from scratch", "body": "Fixes #1427.\r\n\r\nPrerequisite for #1421.\r\n\r\n## Selected commit messages\r\n\r\n#### f64450168 db test: Fix migration tests to use intended source versions\r\n\r\nThe `fromVersion` reference inside this test body, for each of the\r\ntest cases, was referring to the same one, mutable `fromVersion`\r\nvariable. So by the time any of them ran, its value was 5, and they\r\ntested migrating from 5 to 2, 5 to 3, 5 to 4, 5 to 5 respectively.\r\nMeanwhile the test names reflected the intended migrations, because\r\nthe names were computed eagerly, reading the value of `fromVersion`\r\nbefore moving on to the next iteration.\r\n\r\nTo fix the issue, make a fresh `fromVersion` binding inside each\r\niteration of the loop.\r\n\r\n\r\n#### 8ed6c5b8e db [nfc]: Assert downgrades are always to current version\r\n\r\nAnd adjust a test to make that true in tests too.\r\n\r\n\r\n#### e90ea1055 db [nfc]: Simplify downgrades by using that target is latest\r\n\r\nAs explained in the parent commit, and asserted just above the\r\n_dropAndCreateAll call site, this fact always holds. That lets\r\nus simplify how downgrades work, and as a bonus cut one step\r\nfrom the checklist for making schema updates.\r\n\r\nThis reverts some of the changes made in 601936da7.\r\n\r\n\r\n#### 4d8a667fb db: Cut transaction wrappers within migrations\r\n\r\nNo transactions here will do any good if the changes aren't in a\r\ntransaction with the `PRAGMA user_version =` statements that update\r\nthe database's record of what version the schema is at, and therefore\r\nof which migrations might be needed.\r\n\r\nAnd if Drift is setting up for us such a transaction, it'll\r\nnecessarily enclose the whole migration anyway.\r\n\r\n\r\n#### f03630805 db: Fix downgrades so they match creating from scratch\r\n\r\nFixes #1427.\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"47f3e6aa52265bd0dadd1b82d11c62dba9d9286f\"}", "resolved_issues": "[{\"number\": 1427, \"title\": \"Schema downgrades fail (from future schema versions)\", \"body\": \"In #1416, we should have adjusted `AppDatabase._dropAndCreateAll` to reflect the change that PR made to the `onCreate` in `migration`, making it insert the GlobalSettings row.\\r\\n\\r\\n(Originally noticed this at https://github.com/zulip/zulip-flutter/issues/1421#issuecomment-2737882493 .)\\r\\n\\r\\nWithout that adjustment, if you switch to a branch (like #1421) with a later schema version, then back to schema version 5 \\u2014 only really possible as a developer \\u2014 you get this error at startup:\\r\\n```\\r\\nE/flutter (15620): [ERROR:flutter/runtime/dart_vm_initializer.cc(40)] Unhandled Exception: Bad state: No element\\r\\nE/flutter (15620): #0 List.single (dart:core-patch/growable_array.dart:358:22)\\r\\nE/flutter (15620): #1 Selectable.getSingle (package:drift/src/runtime/query_builder/statements/query.dart:239:26)\\r\\nE/flutter (15620): \\r\\nE/flutter (15620): #2 AppDatabase.getGlobalSettings (package:zulip/model/database.dart:186:12)\\r\\nE/flutter (15620): \\r\\nE/flutter (15620): #3 LiveGlobalStore.load (package:zulip/model/store.dart:886:28)\\r\\nE/flutter (15620): \\r\\nE/flutter (15620): #4 _GlobalStoreWidgetState.initState. (package:zulip/widgets/store.dart:89:21)\\r\\nE/flutter (15620): \\r\\n```\\r\\nand the app fails to get past the loading screen.\\r\\n\\r\\n### Workaround\\r\\n\\r\\nTo unwedge from that state, you can switch to a version before schema version 5 (e.g., to this week's v0.0.27 release) and then forward again; or uninstall the app and reinstall.\\r\\n\"}]", "lang": "dart", "problem_statement": "Schema downgrades fail (from future schema versions)\nIn #1416, we should have adjusted `AppDatabase._dropAndCreateAll` to reflect the change that PR made to the `onCreate` in `migration`, making it insert the GlobalSettings row.\r\n\r\n(Originally noticed this at https://github.com/zulip/zulip-flutter/issues/1421#issuecomment-2737882493 .)\r\n\r\nWithout that adjustment, if you switch to a branch (like #1421) with a later schema version, then back to schema version 5 \u2014 only really possible as a developer \u2014 you get this error at startup:\r\n```\r\nE/flutter (15620): [ERROR:flutter/runtime/dart_vm_initializer.cc(40)] Unhandled Exception: Bad state: No element\r\nE/flutter (15620): #0 List.single (dart:core-patch/growable_array.dart:358:22)\r\nE/flutter (15620): #1 Selectable.getSingle (package:drift/src/runtime/query_builder/statements/query.dart:239:26)\r\nE/flutter (15620): \r\nE/flutter (15620): #2 AppDatabase.getGlobalSettings (package:zulip/model/database.dart:186:12)\r\nE/flutter (15620): \r\nE/flutter (15620): #3 LiveGlobalStore.load (package:zulip/model/store.dart:886:28)\r\nE/flutter (15620): \r\nE/flutter (15620): #4 _GlobalStoreWidgetState.initState. (package:zulip/widgets/store.dart:89:21)\r\nE/flutter (15620): \r\n```\r\nand the app fails to get past the loading screen.\r\n\r\n### Workaround\r\n\r\nTo unwedge from that state, you can switch to a version before schema version 5 (e.g., to this week's v0.0.27 release) and then forward again; or uninstall the app and reinstall.\r\n\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/1428", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1427\"]", "test_command": "flutter test test/model/database_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/database.dart b/lib/model/database.dart\nindex 6393294438..ed6cba5f74 100644\n--- a/lib/model/database.dart\n+++ b/lib/model/database.dart\n@@ -68,65 +68,44 @@ class UriConverter extends TypeConverter {\n @override Uri fromSql(String fromDb) => Uri.parse(fromDb);\n }\n \n-// TODO(drift): generate this\n-VersionedSchema _getSchema({\n- required DatabaseConnectionUser database,\n- required int schemaVersion,\n-}) {\n- switch (schemaVersion) {\n- case 2:\n- return Schema2(database: database);\n- case 3:\n- return Schema3(database: database);\n- case 4:\n- return Schema4(database: database);\n- case 5:\n- return Schema5(database: database);\n- default:\n- throw Exception('unknown schema version: $schemaVersion');\n- }\n-}\n-\n @DriftDatabase(tables: [GlobalSettings, Accounts])\n class AppDatabase extends _$AppDatabase {\n AppDatabase(super.e);\n \n // When updating the schema:\n- // * Make the change in the table classes, and bump schemaVersion.\n+ // * Make the change in the table classes, and bump latestSchemaVersion.\n // * Export the new schema and generate test migrations with drift:\n // $ tools/check --fix drift\n // and generate database code with build_runner.\n // See ../../README.md#generated-files for more\n // information on using the build_runner.\n- // * Update [_getSchema] to handle the new schemaVersion.\n // * Write a migration in `_migrationSteps` below.\n // * Write tests.\n+ static const int latestSchemaVersion = 5; // See note.\n+\n @override\n- int get schemaVersion => 5; // See note.\n-\n- static Future _dropAndCreateAll(Migrator m, {\n- required int schemaVersion,\n- }) async {\n- await m.database.transaction(() async {\n- final query = m.database.customSelect(\n- \"SELECT name FROM sqlite_master WHERE type='table'\");\n- for (final row in await query.get()) {\n- final data = row.data;\n- final tableName = data['name'] as String;\n- // Skip sqlite-internal tables. See for comparison:\n- // https://www.sqlite.org/fileformat2.html#intschema\n- // https://github.com/simolus3/drift/blob/0901c984a/drift_dev/lib/src/services/schema/verifier_common.dart#L9-L22\n- if (tableName.startsWith('sqlite_')) continue;\n- // No need to worry about SQL injection; this table name\n- // was already a table name in the database, not something\n- // that should be affected by user data.\n- await m.database.customStatement('DROP TABLE $tableName');\n- }\n- final schema = _getSchema(database: m.database, schemaVersion: schemaVersion);\n- for (final entity in schema.entities) {\n- await m.create(entity);\n- }\n- });\n+ int get schemaVersion => latestSchemaVersion;\n+\n+ /// Drop all tables, indexes, etc., in the database.\n+ ///\n+ /// This includes tables that aren't known to the schema, for example because\n+ /// they were defined by a future (perhaps experimental) version of the app\n+ /// before switching back to the version currently running.\n+ static Future _dropAll(Migrator m) async {\n+ final query = m.database.customSelect(\n+ \"SELECT name FROM sqlite_master WHERE type='table'\");\n+ for (final row in await query.get()) {\n+ final data = row.data;\n+ final tableName = data['name'] as String;\n+ // Skip sqlite-internal tables. See for comparison:\n+ // https://www.sqlite.org/fileformat2.html#intschema\n+ // https://github.com/simolus3/drift/blob/0901c984a/drift_dev/lib/src/services/schema/verifier_common.dart#L9-L22\n+ if (tableName.startsWith('sqlite_')) continue;\n+ // No need to worry about SQL injection; this table name\n+ // was already a table name in the database, not something\n+ // that should be affected by user data.\n+ await m.database.customStatement('DROP TABLE $tableName');\n+ }\n }\n \n static final MigrationStepWithVersion _migrationSteps = migrationSteps(\n@@ -145,37 +124,45 @@ class AppDatabase extends _$AppDatabase {\n // This migration ensures there is a row in GlobalSettings.\n // (If the app already ran at schema 3 or 4, there will be;\n // if not, there won't be before this point.)\n- await m.database.transaction(() async {\n- final rows = await m.database.select(schema.globalSettings).get();\n- if (rows.isEmpty) {\n- await m.database.into(schema.globalSettings).insert(\n- // No field values; just use the defaults for both fields.\n- // (This is like `GlobalSettingsCompanion.insert()`, but\n- // without dependence on the current schema.)\n- RawValuesInsertable({}));\n- }\n- });\n+ final rows = await m.database.select(schema.globalSettings).get();\n+ if (rows.isEmpty) {\n+ await m.database.into(schema.globalSettings).insert(\n+ // No field values; just use the defaults for both fields.\n+ // (This is like `GlobalSettingsCompanion.insert()`, but\n+ // without dependence on the current schema.)\n+ RawValuesInsertable({}));\n+ }\n },\n );\n \n+ Future _createLatestSchema(Migrator m) async {\n+ await m.createAll();\n+ // Corresponds to `from4to5` above.\n+ await into(globalSettings).insert(GlobalSettingsCompanion());\n+ }\n+\n @override\n MigrationStrategy get migration {\n return MigrationStrategy(\n- onCreate: (Migrator m) async {\n- await m.createAll();\n- // Corresponds to `from4to5` above.\n- await into(globalSettings).insert(GlobalSettingsCompanion());\n- },\n+ onCreate: _createLatestSchema,\n onUpgrade: (Migrator m, int from, int to) async {\n if (from > to) {\n // This should only ever happen in dev. As a dev convenience,\n // drop everything from the database and start over.\n // TODO(log): log schema downgrade as an error\n assert(debugLog('Downgrading schema from v$from to v$to.'));\n- await _dropAndCreateAll(m, schemaVersion: to);\n+\n+ // In the actual app, the target schema version is always\n+ // the latest version as of the code that's being run.\n+ // Migrating to earlier versions is useful only for isolating steps\n+ // in migration tests; we can forego that for testing downgrades.\n+ assert(to == latestSchemaVersion);\n+\n+ await _dropAll(m);\n+ await _createLatestSchema(m);\n return;\n }\n- assert(1 <= from && from <= to && to <= schemaVersion);\n+ assert(1 <= from && from <= to && to <= latestSchemaVersion);\n \n await m.runMigrationSteps(from: from, to: to, steps: _migrationSteps);\n });\n", "test_patch": "diff --git a/test/model/database_test.dart b/test/model/database_test.dart\nindex c6245bc5cc..3d7e8f170d 100644\n--- a/test/model/database_test.dart\n+++ b/test/model/database_test.dart\n@@ -127,7 +127,8 @@ void main() {\n });\n \n test('downgrading', () async {\n- final schema = await verifier.schemaAt(2);\n+ final toVersion = AppDatabase.latestSchemaVersion;\n+ final schema = await verifier.schemaAt(toVersion);\n \n // This simulates the scenario during development when running the app\n // with a future schema version that has additional tables and columns.\n@@ -135,17 +136,19 @@ void main() {\n await before.customStatement('CREATE TABLE test_extra (num int)');\n await before.customStatement('ALTER TABLE accounts ADD extra_column int');\n await check(verifier.migrateAndValidate(\n- before, 2, validateDropped: true)).throws();\n+ before, toVersion, validateDropped: true)).throws();\n // Override the schema version by modifying the underlying value\n // drift internally keeps track of in the database.\n // TODO(drift): Expose a better interface for testing this.\n- await before.customStatement('PRAGMA user_version = 999;');\n+ await before.customStatement('PRAGMA user_version = ${toVersion + 1};');\n await before.close();\n \n // Simulate starting up the app, with an older schema version that\n // does not have the extra tables and columns.\n final after = AppDatabase(schema.newConnection());\n- await verifier.migrateAndValidate(after, 2, validateDropped: true);\n+ await verifier.migrateAndValidate(after, toVersion, validateDropped: true);\n+ // Check that a custom migration/setup step of ours got run too.\n+ check(await after.getGlobalSettings()).themeSetting.isNull();\n await after.close();\n });\n \n@@ -153,15 +156,16 @@ void main() {\n const versions = GeneratedHelper.versions;\n final latestVersion = versions.last;\n \n- int fromVersion = versions.first;\n+ int prev = versions.first;\n for (final toVersion in versions.skip(1)) {\n+ final fromVersion = prev;\n test('from v$fromVersion to v$toVersion', () async {\n final connection = await verifier.startAt(fromVersion);\n final db = AppDatabase(connection);\n await verifier.migrateAndValidate(db, toVersion);\n await db.close();\n });\n- fromVersion = toVersion;\n+ prev = toVersion;\n }\n \n for (final fromVersion in versions) {\n", "n2p_tests": "{\"migrations migrate without data from v1 to v2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"migrations downgrading\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"migrations upgrade to v5: with existing GlobalSettings row, do nothing\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"migrations (setUpAll)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"non-migration tests does not crash if multiple global settings rows\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"non-migration tests initialize GlobalSettings with defaults\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"non-migration tests create account with same realm and userId \": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"migrations upgrade to v4, with data\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"migrations migrate without data from v3 to v4\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"migrations migrate without data from v4 to v5\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"migrations migrate without data from v4 to latest (v5)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"non-migration tests GlobalSettings updates work\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"non-migration tests create account with same realm and email\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"migrations upgrade to v5: with no existing GlobalSettings row, insert one\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"migrations upgrade to v2, with data\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"migrations migrate without data from v2 to latest (v5)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"migrations migrate without data from v3 to latest (v5)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"migrations (tearDownAll)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"migrations migrate without data from v2 to v3\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"non-migration tests create account\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"migrations migrate without data from v1 to latest (v5)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1400", "org": "zulip", "repo": "zulip-flutter", "number": 1400, "state": "closed", "title": "Support setting browser preference", "body": "Fixes #1228.\r\n\r\nThis is taken from #1167, addressing the reviews there.", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"4409c1c39459e64c5a90c445845cc8687613a3da\"}", "resolved_issues": "[{\"number\": 1228, \"title\": \"Offer \\\"Open links with in-app browser\\\" setting\", \"body\": \"Like we do in the legacy apps.\\r\\n\\r\\nAn instance of:\\r\\n- #97\"}]", "lang": "dart", "problem_statement": "Offer \"Open links with in-app browser\" setting\nLike we do in the legacy apps.\r\n\r\nAn instance of:\r\n- #97\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/1400", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1228\"]", "test_command": "flutter test test/model/database_test.dart test/model/settings_test.dart test/widgets/content_test.dart test/widgets/profile_test.dart test/widgets/settings_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/assets/l10n/app_en.arb b/assets/l10n/app_en.arb\nindex 7f37a00dad..1973f5fab7 100644\n--- a/assets/l10n/app_en.arb\n+++ b/assets/l10n/app_en.arb\n@@ -811,6 +811,10 @@\n \"@themeSettingSystem\": {\n \"description\": \"Label for system theme setting.\"\n },\n+ \"openLinksWithInAppBrowser\": \"Open links with in-app browser\",\n+ \"@openLinksWithInAppBrowser\": {\n+ \"description\": \"Label for toggling setting to open links with in-app browser\"\n+ },\n \"pollWidgetQuestionMissing\": \"No question.\",\n \"@pollWidgetQuestionMissing\": {\n \"description\": \"Text to display for a poll when the question is missing\"\ndiff --git a/lib/generated/l10n/zulip_localizations.dart b/lib/generated/l10n/zulip_localizations.dart\nindex 2f03458e05..d4bdd2db47 100644\n--- a/lib/generated/l10n/zulip_localizations.dart\n+++ b/lib/generated/l10n/zulip_localizations.dart\n@@ -1185,6 +1185,12 @@ abstract class ZulipLocalizations {\n /// **'System'**\n String get themeSettingSystem;\n \n+ /// Label for toggling setting to open links with in-app browser\n+ ///\n+ /// In en, this message translates to:\n+ /// **'Open links with in-app browser'**\n+ String get openLinksWithInAppBrowser;\n+\n /// Text to display for a poll when the question is missing\n ///\n /// In en, this message translates to:\ndiff --git a/lib/generated/l10n/zulip_localizations_ar.dart b/lib/generated/l10n/zulip_localizations_ar.dart\nindex fd7905924b..5d76c0bfae 100644\n--- a/lib/generated/l10n/zulip_localizations_ar.dart\n+++ b/lib/generated/l10n/zulip_localizations_ar.dart\n@@ -634,6 +634,9 @@ class ZulipLocalizationsAr extends ZulipLocalizations {\n @override\n String get themeSettingSystem => 'System';\n \n+ @override\n+ String get openLinksWithInAppBrowser => 'Open links with in-app browser';\n+\n @override\n String get pollWidgetQuestionMissing => 'No question.';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_en.dart b/lib/generated/l10n/zulip_localizations_en.dart\nindex 1d19cfc7b0..17df08bfd5 100644\n--- a/lib/generated/l10n/zulip_localizations_en.dart\n+++ b/lib/generated/l10n/zulip_localizations_en.dart\n@@ -634,6 +634,9 @@ class ZulipLocalizationsEn extends ZulipLocalizations {\n @override\n String get themeSettingSystem => 'System';\n \n+ @override\n+ String get openLinksWithInAppBrowser => 'Open links with in-app browser';\n+\n @override\n String get pollWidgetQuestionMissing => 'No question.';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_ja.dart b/lib/generated/l10n/zulip_localizations_ja.dart\nindex 58a4a1de59..9baef2dbae 100644\n--- a/lib/generated/l10n/zulip_localizations_ja.dart\n+++ b/lib/generated/l10n/zulip_localizations_ja.dart\n@@ -634,6 +634,9 @@ class ZulipLocalizationsJa extends ZulipLocalizations {\n @override\n String get themeSettingSystem => 'System';\n \n+ @override\n+ String get openLinksWithInAppBrowser => 'Open links with in-app browser';\n+\n @override\n String get pollWidgetQuestionMissing => 'No question.';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_nb.dart b/lib/generated/l10n/zulip_localizations_nb.dart\nindex a5bba71bd1..fb3ca10833 100644\n--- a/lib/generated/l10n/zulip_localizations_nb.dart\n+++ b/lib/generated/l10n/zulip_localizations_nb.dart\n@@ -634,6 +634,9 @@ class ZulipLocalizationsNb extends ZulipLocalizations {\n @override\n String get themeSettingSystem => 'System';\n \n+ @override\n+ String get openLinksWithInAppBrowser => 'Open links with in-app browser';\n+\n @override\n String get pollWidgetQuestionMissing => 'No question.';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_pl.dart b/lib/generated/l10n/zulip_localizations_pl.dart\nindex e78e60dcb2..45ad091f43 100644\n--- a/lib/generated/l10n/zulip_localizations_pl.dart\n+++ b/lib/generated/l10n/zulip_localizations_pl.dart\n@@ -634,6 +634,9 @@ class ZulipLocalizationsPl extends ZulipLocalizations {\n @override\n String get themeSettingSystem => 'System';\n \n+ @override\n+ String get openLinksWithInAppBrowser => 'Open links with in-app browser';\n+\n @override\n String get pollWidgetQuestionMissing => 'Brak pytania.';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_ru.dart b/lib/generated/l10n/zulip_localizations_ru.dart\nindex e4bd460f72..946fe8c231 100644\n--- a/lib/generated/l10n/zulip_localizations_ru.dart\n+++ b/lib/generated/l10n/zulip_localizations_ru.dart\n@@ -634,6 +634,9 @@ class ZulipLocalizationsRu extends ZulipLocalizations {\n @override\n String get themeSettingSystem => 'System';\n \n+ @override\n+ String get openLinksWithInAppBrowser => 'Open links with in-app browser';\n+\n @override\n String get pollWidgetQuestionMissing => '\u041d\u0435\u0442 \u0432\u043e\u043f\u0440\u043e\u0441\u0430.';\n \ndiff --git a/lib/generated/l10n/zulip_localizations_sk.dart b/lib/generated/l10n/zulip_localizations_sk.dart\nindex 9ec68077ae..90d71704f9 100644\n--- a/lib/generated/l10n/zulip_localizations_sk.dart\n+++ b/lib/generated/l10n/zulip_localizations_sk.dart\n@@ -634,6 +634,9 @@ class ZulipLocalizationsSk extends ZulipLocalizations {\n @override\n String get themeSettingSystem => 'System';\n \n+ @override\n+ String get openLinksWithInAppBrowser => 'Open links with in-app browser';\n+\n @override\n String get pollWidgetQuestionMissing => 'Bez ot\u00e1zky.';\n \ndiff --git a/lib/model/database.dart b/lib/model/database.dart\nindex 263c1ab989..027cec9958 100644\n--- a/lib/model/database.dart\n+++ b/lib/model/database.dart\n@@ -18,6 +18,9 @@ part 'database.g.dart';\n class GlobalSettings extends Table {\n Column get themeSetting => textEnum()\n .nullable()();\n+\n+ Column get browserPreference => textEnum()\n+ .nullable()();\n }\n \n /// The table of [Account] records in the app's database.\n@@ -73,6 +76,8 @@ VersionedSchema _getSchema({\n return Schema2(database: database);\n case 3:\n return Schema3(database: database);\n+ case 4:\n+ return Schema4(database: database);\n default:\n throw Exception('unknown schema version: $schemaVersion');\n }\n@@ -93,7 +98,7 @@ class AppDatabase extends _$AppDatabase {\n // * Write a migration in `onUpgrade` below.\n // * Write tests.\n @override\n- int get schemaVersion => 3; // See note.\n+ int get schemaVersion => 4; // See note.\n \n Future _dropAndCreateAll(Migrator m, {\n required int schemaVersion,\n@@ -145,6 +150,10 @@ class AppDatabase extends _$AppDatabase {\n from2To3: (m, schema) async {\n await m.createTable(schema.globalSettings);\n },\n+ from3To4: (m, schema) async {\n+ await m.addColumn(\n+ schema.globalSettings, schema.globalSettings.browserPreference);\n+ },\n ));\n });\n }\ndiff --git a/lib/model/database.g.dart b/lib/model/database.g.dart\nindex fcb5292aa6..9c0946af5b 100644\n--- a/lib/model/database.g.dart\n+++ b/lib/model/database.g.dart\n@@ -21,7 +21,18 @@ class $GlobalSettingsTable extends GlobalSettings\n requiredDuringInsert: false,\n ).withConverter($GlobalSettingsTable.$converterthemeSettingn);\n @override\n- List get $columns => [themeSetting];\n+ late final GeneratedColumnWithTypeConverter\n+ browserPreference = GeneratedColumn(\n+ 'browser_preference',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ ).withConverter(\n+ $GlobalSettingsTable.$converterbrowserPreferencen,\n+ );\n+ @override\n+ List get $columns => [themeSetting, browserPreference];\n @override\n String get aliasedName => _alias ?? actualTableName;\n @override\n@@ -39,6 +50,13 @@ class $GlobalSettingsTable extends GlobalSettings\n data['${effectivePrefix}theme_setting'],\n ),\n ),\n+ browserPreference: $GlobalSettingsTable.$converterbrowserPreferencen\n+ .fromSql(\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}browser_preference'],\n+ ),\n+ ),\n );\n }\n \n@@ -55,12 +73,21 @@ class $GlobalSettingsTable extends GlobalSettings\n $converterthemeSettingn = JsonTypeConverter2.asNullable(\n $converterthemeSetting,\n );\n+ static JsonTypeConverter2\n+ $converterbrowserPreference = const EnumNameConverter(\n+ BrowserPreference.values,\n+ );\n+ static JsonTypeConverter2\n+ $converterbrowserPreferencen = JsonTypeConverter2.asNullable(\n+ $converterbrowserPreference,\n+ );\n }\n \n class GlobalSettingsData extends DataClass\n implements Insertable {\n final ThemeSetting? themeSetting;\n- const GlobalSettingsData({this.themeSetting});\n+ final BrowserPreference? browserPreference;\n+ const GlobalSettingsData({this.themeSetting, this.browserPreference});\n @override\n Map toColumns(bool nullToAbsent) {\n final map = {};\n@@ -69,6 +96,13 @@ class GlobalSettingsData extends DataClass\n $GlobalSettingsTable.$converterthemeSettingn.toSql(themeSetting),\n );\n }\n+ if (!nullToAbsent || browserPreference != null) {\n+ map['browser_preference'] = Variable(\n+ $GlobalSettingsTable.$converterbrowserPreferencen.toSql(\n+ browserPreference,\n+ ),\n+ );\n+ }\n return map;\n }\n \n@@ -78,6 +112,10 @@ class GlobalSettingsData extends DataClass\n themeSetting == null && nullToAbsent\n ? const Value.absent()\n : Value(themeSetting),\n+ browserPreference:\n+ browserPreference == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(browserPreference),\n );\n }\n \n@@ -90,6 +128,8 @@ class GlobalSettingsData extends DataClass\n themeSetting: $GlobalSettingsTable.$converterthemeSettingn.fromJson(\n serializer.fromJson(json['themeSetting']),\n ),\n+ browserPreference: $GlobalSettingsTable.$converterbrowserPreferencen\n+ .fromJson(serializer.fromJson(json['browserPreference'])),\n );\n }\n @override\n@@ -99,13 +139,23 @@ class GlobalSettingsData extends DataClass\n 'themeSetting': serializer.toJson(\n $GlobalSettingsTable.$converterthemeSettingn.toJson(themeSetting),\n ),\n+ 'browserPreference': serializer.toJson(\n+ $GlobalSettingsTable.$converterbrowserPreferencen.toJson(\n+ browserPreference,\n+ ),\n+ ),\n };\n }\n \n GlobalSettingsData copyWith({\n Value themeSetting = const Value.absent(),\n+ Value browserPreference = const Value.absent(),\n }) => GlobalSettingsData(\n themeSetting: themeSetting.present ? themeSetting.value : this.themeSetting,\n+ browserPreference:\n+ browserPreference.present\n+ ? browserPreference.value\n+ : this.browserPreference,\n );\n GlobalSettingsData copyWithCompanion(GlobalSettingsCompanion data) {\n return GlobalSettingsData(\n@@ -113,52 +163,66 @@ class GlobalSettingsData extends DataClass\n data.themeSetting.present\n ? data.themeSetting.value\n : this.themeSetting,\n+ browserPreference:\n+ data.browserPreference.present\n+ ? data.browserPreference.value\n+ : this.browserPreference,\n );\n }\n \n @override\n String toString() {\n return (StringBuffer('GlobalSettingsData(')\n- ..write('themeSetting: $themeSetting')\n+ ..write('themeSetting: $themeSetting, ')\n+ ..write('browserPreference: $browserPreference')\n ..write(')'))\n .toString();\n }\n \n @override\n- int get hashCode => themeSetting.hashCode;\n+ int get hashCode => Object.hash(themeSetting, browserPreference);\n @override\n bool operator ==(Object other) =>\n identical(this, other) ||\n- (other is GlobalSettingsData && other.themeSetting == this.themeSetting);\n+ (other is GlobalSettingsData &&\n+ other.themeSetting == this.themeSetting &&\n+ other.browserPreference == this.browserPreference);\n }\n \n class GlobalSettingsCompanion extends UpdateCompanion {\n final Value themeSetting;\n+ final Value browserPreference;\n final Value rowid;\n const GlobalSettingsCompanion({\n this.themeSetting = const Value.absent(),\n+ this.browserPreference = const Value.absent(),\n this.rowid = const Value.absent(),\n });\n GlobalSettingsCompanion.insert({\n this.themeSetting = const Value.absent(),\n+ this.browserPreference = const Value.absent(),\n this.rowid = const Value.absent(),\n });\n static Insertable custom({\n Expression? themeSetting,\n+ Expression? browserPreference,\n Expression? rowid,\n }) {\n return RawValuesInsertable({\n if (themeSetting != null) 'theme_setting': themeSetting,\n+ if (browserPreference != null) 'browser_preference': browserPreference,\n if (rowid != null) 'rowid': rowid,\n });\n }\n \n GlobalSettingsCompanion copyWith({\n Value? themeSetting,\n+ Value? browserPreference,\n Value? rowid,\n }) {\n return GlobalSettingsCompanion(\n themeSetting: themeSetting ?? this.themeSetting,\n+ browserPreference: browserPreference ?? this.browserPreference,\n rowid: rowid ?? this.rowid,\n );\n }\n@@ -171,6 +235,13 @@ class GlobalSettingsCompanion extends UpdateCompanion {\n $GlobalSettingsTable.$converterthemeSettingn.toSql(themeSetting.value),\n );\n }\n+ if (browserPreference.present) {\n+ map['browser_preference'] = Variable(\n+ $GlobalSettingsTable.$converterbrowserPreferencen.toSql(\n+ browserPreference.value,\n+ ),\n+ );\n+ }\n if (rowid.present) {\n map['rowid'] = Variable(rowid.value);\n }\n@@ -181,6 +252,7 @@ class GlobalSettingsCompanion extends UpdateCompanion {\n String toString() {\n return (StringBuffer('GlobalSettingsCompanion(')\n ..write('themeSetting: $themeSetting, ')\n+ ..write('browserPreference: $browserPreference, ')\n ..write('rowid: $rowid')\n ..write(')'))\n .toString();\n@@ -804,11 +876,13 @@ abstract class _$AppDatabase extends GeneratedDatabase {\n typedef $$GlobalSettingsTableCreateCompanionBuilder =\n GlobalSettingsCompanion Function({\n Value themeSetting,\n+ Value browserPreference,\n Value rowid,\n });\n typedef $$GlobalSettingsTableUpdateCompanionBuilder =\n GlobalSettingsCompanion Function({\n Value themeSetting,\n+ Value browserPreference,\n Value rowid,\n });\n \n@@ -826,6 +900,12 @@ class $$GlobalSettingsTableFilterComposer\n column: $table.themeSetting,\n builder: (column) => ColumnWithTypeConverterFilters(column),\n );\n+\n+ ColumnWithTypeConverterFilters\n+ get browserPreference => $composableBuilder(\n+ column: $table.browserPreference,\n+ builder: (column) => ColumnWithTypeConverterFilters(column),\n+ );\n }\n \n class $$GlobalSettingsTableOrderingComposer\n@@ -841,6 +921,11 @@ class $$GlobalSettingsTableOrderingComposer\n column: $table.themeSetting,\n builder: (column) => ColumnOrderings(column),\n );\n+\n+ ColumnOrderings get browserPreference => $composableBuilder(\n+ column: $table.browserPreference,\n+ builder: (column) => ColumnOrderings(column),\n+ );\n }\n \n class $$GlobalSettingsTableAnnotationComposer\n@@ -857,6 +942,12 @@ class $$GlobalSettingsTableAnnotationComposer\n column: $table.themeSetting,\n builder: (column) => column,\n );\n+\n+ GeneratedColumnWithTypeConverter\n+ get browserPreference => $composableBuilder(\n+ column: $table.browserPreference,\n+ builder: (column) => column,\n+ );\n }\n \n class $$GlobalSettingsTableTableManager\n@@ -901,17 +992,23 @@ class $$GlobalSettingsTableTableManager\n updateCompanionCallback:\n ({\n Value themeSetting = const Value.absent(),\n+ Value browserPreference =\n+ const Value.absent(),\n Value rowid = const Value.absent(),\n }) => GlobalSettingsCompanion(\n themeSetting: themeSetting,\n+ browserPreference: browserPreference,\n rowid: rowid,\n ),\n createCompanionCallback:\n ({\n Value themeSetting = const Value.absent(),\n+ Value browserPreference =\n+ const Value.absent(),\n Value rowid = const Value.absent(),\n }) => GlobalSettingsCompanion.insert(\n themeSetting: themeSetting,\n+ browserPreference: browserPreference,\n rowid: rowid,\n ),\n withReferenceMapper:\ndiff --git a/lib/model/schema_versions.g.dart b/lib/model/schema_versions.g.dart\nindex bb5a62475a..aa2dec5a0c 100644\n--- a/lib/model/schema_versions.g.dart\n+++ b/lib/model/schema_versions.g.dart\n@@ -181,9 +181,70 @@ i1.GeneratedColumn _column_9(String aliasedName) =>\n true,\n type: i1.DriftSqlType.string,\n );\n+\n+final class Schema4 extends i0.VersionedSchema {\n+ Schema4({required super.database}) : super(version: 4);\n+ @override\n+ late final List entities = [\n+ globalSettings,\n+ accounts,\n+ ];\n+ late final Shape2 globalSettings = Shape2(\n+ source: i0.VersionedTable(\n+ entityName: 'global_settings',\n+ withoutRowId: false,\n+ isStrict: false,\n+ tableConstraints: [],\n+ columns: [_column_9, _column_10],\n+ attachedDatabase: database,\n+ ),\n+ alias: null,\n+ );\n+ late final Shape0 accounts = Shape0(\n+ source: i0.VersionedTable(\n+ entityName: 'accounts',\n+ withoutRowId: false,\n+ isStrict: false,\n+ tableConstraints: [\n+ 'UNIQUE(realm_url, user_id)',\n+ 'UNIQUE(realm_url, email)',\n+ ],\n+ columns: [\n+ _column_0,\n+ _column_1,\n+ _column_2,\n+ _column_3,\n+ _column_4,\n+ _column_5,\n+ _column_6,\n+ _column_7,\n+ _column_8,\n+ ],\n+ attachedDatabase: database,\n+ ),\n+ alias: null,\n+ );\n+}\n+\n+class Shape2 extends i0.VersionedTable {\n+ Shape2({required super.source, required super.alias}) : super.aliased();\n+ i1.GeneratedColumn get themeSetting =>\n+ columnsByName['theme_setting']! as i1.GeneratedColumn;\n+ i1.GeneratedColumn get browserPreference =>\n+ columnsByName['browser_preference']! as i1.GeneratedColumn;\n+}\n+\n+i1.GeneratedColumn _column_10(String aliasedName) =>\n+ i1.GeneratedColumn(\n+ 'browser_preference',\n+ aliasedName,\n+ true,\n+ type: i1.DriftSqlType.string,\n+ );\n i0.MigrationStepWithVersion migrationSteps({\n required Future Function(i1.Migrator m, Schema2 schema) from1To2,\n required Future Function(i1.Migrator m, Schema3 schema) from2To3,\n+ required Future Function(i1.Migrator m, Schema4 schema) from3To4,\n }) {\n return (currentVersion, database) async {\n switch (currentVersion) {\n@@ -197,6 +258,11 @@ i0.MigrationStepWithVersion migrationSteps({\n final migrator = i1.Migrator(database, schema);\n await from2To3(migrator, schema);\n return 3;\n+ case 3:\n+ final schema = Schema4(database: database);\n+ final migrator = i1.Migrator(database, schema);\n+ await from3To4(migrator, schema);\n+ return 4;\n default:\n throw ArgumentError.value('Unknown migration from $currentVersion');\n }\n@@ -206,6 +272,11 @@ i0.MigrationStepWithVersion migrationSteps({\n i1.OnUpgrade stepByStep({\n required Future Function(i1.Migrator m, Schema2 schema) from1To2,\n required Future Function(i1.Migrator m, Schema3 schema) from2To3,\n+ required Future Function(i1.Migrator m, Schema4 schema) from3To4,\n }) => i0.VersionedSchema.stepByStepHelper(\n- step: migrationSteps(from1To2: from1To2, from2To3: from2To3),\n+ step: migrationSteps(\n+ from1To2: from1To2,\n+ from2To3: from2To3,\n+ from3To4: from3To4,\n+ ),\n );\ndiff --git a/lib/model/settings.dart b/lib/model/settings.dart\nindex 535d06aa01..928eb0e1cd 100644\n--- a/lib/model/settings.dart\n+++ b/lib/model/settings.dart\n@@ -1,4 +1,8 @@\n+import 'package:flutter/foundation.dart';\n+\n import '../generated/l10n/zulip_localizations.dart';\n+import 'binding.dart';\n+import 'database.dart';\n \n /// The user's choice of visual theme for the app.\n ///\n@@ -24,3 +28,54 @@ enum ThemeSetting {\n };\n }\n }\n+\n+/// What browser the user has set to use for opening links in messages.\n+///\n+/// Renaming existing enum values will invalidate the database.\n+/// Write a migration if such a change is necessary.\n+enum BrowserPreference {\n+ /// Use the in-app browser for HTTP links.\n+ ///\n+ /// For other types of links (e.g. mailto) where a browser won't work,\n+ /// this falls back to [UrlLaunchMode.platformDefault].\n+ inApp,\n+\n+ /// Use the user's default browser app.\n+ external,\n+}\n+\n+extension GlobalSettingsHelpers on GlobalSettingsData {\n+ BrowserPreference get effectiveBrowserPreference {\n+ if (browserPreference != null) return browserPreference!;\n+ return switch (defaultTargetPlatform) {\n+ // On iOS we prefer UrlLaunchMode.externalApplication because (for\n+ // HTTP URLs) UrlLaunchMode.platformDefault uses SFSafariViewController,\n+ // which gives an awkward UX as described here:\n+ // https://chat.zulip.org/#narrow/stream/48-mobile/topic/in-app.20browser/near/1169118\n+ TargetPlatform.iOS => BrowserPreference.external,\n+\n+ // On Android we prefer an in-app browser. See discussion from 2021:\n+ // https://chat.zulip.org/#narrow/channel/48-mobile/topic/in-app.20browser/near/1169095\n+ // That's also the `url_launcher` default (at least as of 2025).\n+ _ => BrowserPreference.inApp,\n+ };\n+ }\n+\n+ UrlLaunchMode getUrlLaunchMode(Uri url) {\n+ switch (effectiveBrowserPreference) {\n+ case BrowserPreference.inApp:\n+ if (!(url.scheme == 'https' || url.scheme == 'http')) {\n+ // For URLs on non-HTTP schemes such as `mailto`,\n+ // `url_launcher.launchUrl` rejects `inAppBrowserView` with an error:\n+ // https://github.com/flutter/packages/blob/9cc6f370/packages/url_launcher/url_launcher/lib/src/url_launcher_uri.dart#L46-L51\n+ // TODO(upstream/url_launcher): should fall back in this case instead\n+ // (as the `launchUrl` doc already says it may do).\n+ return UrlLaunchMode.platformDefault;\n+ }\n+ return UrlLaunchMode.inAppBrowserView;\n+\n+ case BrowserPreference.external:\n+ return UrlLaunchMode.externalApplication;\n+ }\n+ }\n+}\ndiff --git a/lib/widgets/content.dart b/lib/widgets/content.dart\nindex 55b5331c3c..afafd03e8c 100644\n--- a/lib/widgets/content.dart\n+++ b/lib/widgets/content.dart\n@@ -1,7 +1,6 @@\n import 'dart:async';\n \n import 'package:flutter/cupertino.dart';\n-import 'package:flutter/foundation.dart';\n import 'package:flutter/gestures.dart';\n import 'package:flutter/material.dart';\n import 'package:flutter/rendering.dart';\n@@ -16,6 +15,7 @@ import '../model/avatar_url.dart';\n import '../model/binding.dart';\n import '../model/content.dart';\n import '../model/internal_link.dart';\n+import '../model/settings.dart';\n import 'code_block.dart';\n import 'dialog.dart';\n import 'icons.dart';\n@@ -1439,18 +1439,12 @@ void _launchUrl(BuildContext context, String urlString) async {\n return;\n }\n \n+ final globalSettings = GlobalStoreWidget.of(context).globalSettings;\n bool launched = false;\n String? errorMessage;\n try {\n launched = await ZulipBinding.instance.launchUrl(url,\n- mode: switch (defaultTargetPlatform) {\n- // On iOS we prefer LaunchMode.externalApplication because (for\n- // HTTP URLs) LaunchMode.platformDefault uses SFSafariViewController,\n- // which gives an awkward UX as described here:\n- // https://chat.zulip.org/#narrow/stream/48-mobile/topic/in-app.20browser/near/1169118\n- TargetPlatform.iOS => UrlLaunchMode.externalApplication,\n- _ => UrlLaunchMode.platformDefault,\n- });\n+ mode: globalSettings.getUrlLaunchMode(url));\n } on PlatformException catch (e) {\n errorMessage = e.message;\n }\ndiff --git a/lib/widgets/settings.dart b/lib/widgets/settings.dart\nindex 8ece4d0578..7777759c4f 100644\n--- a/lib/widgets/settings.dart\n+++ b/lib/widgets/settings.dart\n@@ -24,6 +24,7 @@ class SettingsPage extends StatelessWidget {\n title: Text(zulipLocalizations.settingsPageTitle)),\n body: Column(children: [\n const _ThemeSetting(),\n+ const _BrowserPreferenceSetting(),\n ]));\n }\n }\n@@ -54,3 +55,26 @@ class _ThemeSetting extends StatelessWidget {\n ]);\n }\n }\n+\n+class _BrowserPreferenceSetting extends StatelessWidget {\n+ const _BrowserPreferenceSetting();\n+\n+ void _handleChange(BuildContext context, bool newOpenLinksWithInAppBrowser) {\n+ GlobalStoreWidget.of(context).updateGlobalSettings(\n+ GlobalSettingsCompanion(browserPreference: Value(\n+ newOpenLinksWithInAppBrowser ? BrowserPreference.inApp\n+ : BrowserPreference.external)));\n+ }\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n+ final openLinksWithInAppBrowser =\n+ GlobalStoreWidget.of(context).globalSettings.effectiveBrowserPreference\n+ == BrowserPreference.inApp;\n+ return SwitchListTile.adaptive(\n+ title: Text(zulipLocalizations.openLinksWithInAppBrowser),\n+ value: openLinksWithInAppBrowser,\n+ onChanged: (newValue) => _handleChange(context, newValue));\n+ }\n+}\n", "test_patch": "diff --git a/test/example_data.dart b/test/example_data.dart\nindex 03cabbda97..955f5dacfb 100644\n--- a/test/example_data.dart\n+++ b/test/example_data.dart\n@@ -880,9 +880,11 @@ ChannelUpdateEvent channelUpdateEvent(\n \n GlobalSettingsData globalSettings({\n ThemeSetting? themeSetting,\n+ BrowserPreference? browserPreference,\n }) {\n return GlobalSettingsData(\n themeSetting: themeSetting,\n+ browserPreference: browserPreference,\n );\n }\n \ndiff --git a/test/flutter_checks.dart b/test/flutter_checks.dart\nindex 2f3eac042f..49e402d158 100644\n--- a/test/flutter_checks.dart\n+++ b/test/flutter_checks.dart\n@@ -176,6 +176,10 @@ extension RadioListTileChecks on Subject> {\n Subject get checked => has((x) => x.checked, 'checked');\n }\n \n+extension SwitchListTileChecks on Subject {\n+ Subject get value => has((x) => x.value, 'value');\n+}\n+\n extension ThemeDataChecks on Subject {\n Subject get brightness => has((x) => x.brightness, 'brightness');\n }\ndiff --git a/test/model/database_test.dart b/test/model/database_test.dart\nindex 90dbcbddf1..28441e13ec 100644\n--- a/test/model/database_test.dart\n+++ b/test/model/database_test.dart\n@@ -9,6 +9,8 @@ import 'package:zulip/model/settings.dart';\n import 'schemas/schema.dart';\n import 'schemas/schema_v1.dart' as v1;\n import 'schemas/schema_v2.dart' as v2;\n+import 'schemas/schema_v3.dart' as v3;\n+import 'schemas/schema_v4.dart' as v4;\n import 'store_checks.dart';\n \n void main() {\n@@ -204,6 +206,25 @@ void main() {\n });\n await after.close();\n });\n+\n+ test('upgrade to v4, with data', () async {\n+ final schema = await verifier.schemaAt(3);\n+ final before = v3.DatabaseAtV3(schema.newConnection());\n+ await before.into(before.globalSettings).insert(\n+ v3.GlobalSettingsCompanion.insert(\n+ themeSetting: Value(ThemeSetting.light.name)));\n+ await before.close();\n+\n+ final db = AppDatabase(schema.newConnection());\n+ await verifier.migrateAndValidate(db, 4);\n+ await db.close();\n+\n+ final after = v4.DatabaseAtV4(schema.newConnection());\n+ final globalSettings = await after.select(after.globalSettings).getSingle();\n+ check(globalSettings.themeSetting).equals(ThemeSetting.light.name);\n+ check(globalSettings.browserPreference).isNull();\n+ await after.close();\n+ });\n });\n }\n \ndiff --git a/test/model/schemas/drift_schema_v4.json b/test/model/schemas/drift_schema_v4.json\nnew file mode 100644\nindex 0000000000..718222de66\n--- /dev/null\n+++ b/test/model/schemas/drift_schema_v4.json\n@@ -0,0 +1,1 @@\n+{\"_meta\":{\"description\":\"This file contains a serialized version of schema entities for drift.\",\"version\":\"1.2.0\"},\"options\":{\"store_date_time_values_as_text\":false},\"entities\":[{\"id\":0,\"references\":[],\"type\":\"table\",\"data\":{\"name\":\"global_settings\",\"was_declared_in_moor\":false,\"columns\":[{\"name\":\"theme_setting\",\"getter_name\":\"themeSetting\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const EnumNameConverter(ThemeSetting.values)\",\"dart_type_name\":\"ThemeSetting\"}},{\"name\":\"browser_preference\",\"getter_name\":\"browserPreference\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const EnumNameConverter(BrowserPreference.values)\",\"dart_type_name\":\"BrowserPreference\"}}],\"is_virtual\":false,\"without_rowid\":false,\"constraints\":[]}},{\"id\":1,\"references\":[],\"type\":\"table\",\"data\":{\"name\":\"accounts\",\"was_declared_in_moor\":false,\"columns\":[{\"name\":\"id\",\"getter_name\":\"id\",\"moor_type\":\"int\",\"nullable\":false,\"customConstraints\":null,\"defaultConstraints\":\"PRIMARY KEY AUTOINCREMENT\",\"dialectAwareDefaultConstraints\":{\"sqlite\":\"PRIMARY KEY AUTOINCREMENT\"},\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[\"auto-increment\"]},{\"name\":\"realm_url\",\"getter_name\":\"realmUrl\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[],\"type_converter\":{\"dart_expr\":\"const UriConverter()\",\"dart_type_name\":\"Uri\"}},{\"name\":\"user_id\",\"getter_name\":\"userId\",\"moor_type\":\"int\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"email\",\"getter_name\":\"email\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"api_key\",\"getter_name\":\"apiKey\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"zulip_version\",\"getter_name\":\"zulipVersion\",\"moor_type\":\"string\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"zulip_merge_base\",\"getter_name\":\"zulipMergeBase\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"zulip_feature_level\",\"getter_name\":\"zulipFeatureLevel\",\"moor_type\":\"int\",\"nullable\":false,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]},{\"name\":\"acked_push_token\",\"getter_name\":\"ackedPushToken\",\"moor_type\":\"string\",\"nullable\":true,\"customConstraints\":null,\"default_dart\":null,\"default_client_dart\":null,\"dsl_features\":[]}],\"is_virtual\":false,\"without_rowid\":false,\"constraints\":[],\"unique_keys\":[[\"realm_url\",\"user_id\"],[\"realm_url\",\"email\"]]}}]}\n\\ No newline at end of file\ndiff --git a/test/model/schemas/schema.dart b/test/model/schemas/schema.dart\nindex 209e70d788..22131b11bb 100644\n--- a/test/model/schemas/schema.dart\n+++ b/test/model/schemas/schema.dart\n@@ -6,6 +6,7 @@ import 'package:drift/internal/migrations.dart';\n import 'schema_v1.dart' as v1;\n import 'schema_v2.dart' as v2;\n import 'schema_v3.dart' as v3;\n+import 'schema_v4.dart' as v4;\n \n class GeneratedHelper implements SchemaInstantiationHelper {\n @override\n@@ -17,10 +18,12 @@ class GeneratedHelper implements SchemaInstantiationHelper {\n return v2.DatabaseAtV2(db);\n case 3:\n return v3.DatabaseAtV3(db);\n+ case 4:\n+ return v4.DatabaseAtV4(db);\n default:\n throw MissingSchemaException(version, versions);\n }\n }\n \n- static const versions = const [1, 2, 3];\n+ static const versions = const [1, 2, 3, 4];\n }\ndiff --git a/test/model/schemas/schema_v4.dart b/test/model/schemas/schema_v4.dart\nnew file mode 100644\nindex 0000000000..e53e4fbe2a\n--- /dev/null\n+++ b/test/model/schemas/schema_v4.dart\n@@ -0,0 +1,700 @@\n+// dart format width=80\n+// GENERATED CODE, DO NOT EDIT BY HAND.\n+// ignore_for_file: type=lint\n+import 'package:drift/drift.dart';\n+\n+class GlobalSettings extends Table\n+ with TableInfo {\n+ @override\n+ final GeneratedDatabase attachedDatabase;\n+ final String? _alias;\n+ GlobalSettings(this.attachedDatabase, [this._alias]);\n+ late final GeneratedColumn themeSetting = GeneratedColumn(\n+ 'theme_setting',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ late final GeneratedColumn browserPreference =\n+ GeneratedColumn(\n+ 'browser_preference',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ @override\n+ List get $columns => [themeSetting, browserPreference];\n+ @override\n+ String get aliasedName => _alias ?? actualTableName;\n+ @override\n+ String get actualTableName => $name;\n+ static const String $name = 'global_settings';\n+ @override\n+ Set get $primaryKey => const {};\n+ @override\n+ GlobalSettingsData map(Map data, {String? tablePrefix}) {\n+ final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';\n+ return GlobalSettingsData(\n+ themeSetting: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}theme_setting'],\n+ ),\n+ browserPreference: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}browser_preference'],\n+ ),\n+ );\n+ }\n+\n+ @override\n+ GlobalSettings createAlias(String alias) {\n+ return GlobalSettings(attachedDatabase, alias);\n+ }\n+}\n+\n+class GlobalSettingsData extends DataClass\n+ implements Insertable {\n+ final String? themeSetting;\n+ final String? browserPreference;\n+ const GlobalSettingsData({this.themeSetting, this.browserPreference});\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ if (!nullToAbsent || themeSetting != null) {\n+ map['theme_setting'] = Variable(themeSetting);\n+ }\n+ if (!nullToAbsent || browserPreference != null) {\n+ map['browser_preference'] = Variable(browserPreference);\n+ }\n+ return map;\n+ }\n+\n+ GlobalSettingsCompanion toCompanion(bool nullToAbsent) {\n+ return GlobalSettingsCompanion(\n+ themeSetting:\n+ themeSetting == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(themeSetting),\n+ browserPreference:\n+ browserPreference == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(browserPreference),\n+ );\n+ }\n+\n+ factory GlobalSettingsData.fromJson(\n+ Map json, {\n+ ValueSerializer? serializer,\n+ }) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return GlobalSettingsData(\n+ themeSetting: serializer.fromJson(json['themeSetting']),\n+ browserPreference: serializer.fromJson(\n+ json['browserPreference'],\n+ ),\n+ );\n+ }\n+ @override\n+ Map toJson({ValueSerializer? serializer}) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return {\n+ 'themeSetting': serializer.toJson(themeSetting),\n+ 'browserPreference': serializer.toJson(browserPreference),\n+ };\n+ }\n+\n+ GlobalSettingsData copyWith({\n+ Value themeSetting = const Value.absent(),\n+ Value browserPreference = const Value.absent(),\n+ }) => GlobalSettingsData(\n+ themeSetting: themeSetting.present ? themeSetting.value : this.themeSetting,\n+ browserPreference:\n+ browserPreference.present\n+ ? browserPreference.value\n+ : this.browserPreference,\n+ );\n+ GlobalSettingsData copyWithCompanion(GlobalSettingsCompanion data) {\n+ return GlobalSettingsData(\n+ themeSetting:\n+ data.themeSetting.present\n+ ? data.themeSetting.value\n+ : this.themeSetting,\n+ browserPreference:\n+ data.browserPreference.present\n+ ? data.browserPreference.value\n+ : this.browserPreference,\n+ );\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('GlobalSettingsData(')\n+ ..write('themeSetting: $themeSetting, ')\n+ ..write('browserPreference: $browserPreference')\n+ ..write(')'))\n+ .toString();\n+ }\n+\n+ @override\n+ int get hashCode => Object.hash(themeSetting, browserPreference);\n+ @override\n+ bool operator ==(Object other) =>\n+ identical(this, other) ||\n+ (other is GlobalSettingsData &&\n+ other.themeSetting == this.themeSetting &&\n+ other.browserPreference == this.browserPreference);\n+}\n+\n+class GlobalSettingsCompanion extends UpdateCompanion {\n+ final Value themeSetting;\n+ final Value browserPreference;\n+ final Value rowid;\n+ const GlobalSettingsCompanion({\n+ this.themeSetting = const Value.absent(),\n+ this.browserPreference = const Value.absent(),\n+ this.rowid = const Value.absent(),\n+ });\n+ GlobalSettingsCompanion.insert({\n+ this.themeSetting = const Value.absent(),\n+ this.browserPreference = const Value.absent(),\n+ this.rowid = const Value.absent(),\n+ });\n+ static Insertable custom({\n+ Expression? themeSetting,\n+ Expression? browserPreference,\n+ Expression? rowid,\n+ }) {\n+ return RawValuesInsertable({\n+ if (themeSetting != null) 'theme_setting': themeSetting,\n+ if (browserPreference != null) 'browser_preference': browserPreference,\n+ if (rowid != null) 'rowid': rowid,\n+ });\n+ }\n+\n+ GlobalSettingsCompanion copyWith({\n+ Value? themeSetting,\n+ Value? browserPreference,\n+ Value? rowid,\n+ }) {\n+ return GlobalSettingsCompanion(\n+ themeSetting: themeSetting ?? this.themeSetting,\n+ browserPreference: browserPreference ?? this.browserPreference,\n+ rowid: rowid ?? this.rowid,\n+ );\n+ }\n+\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ if (themeSetting.present) {\n+ map['theme_setting'] = Variable(themeSetting.value);\n+ }\n+ if (browserPreference.present) {\n+ map['browser_preference'] = Variable(browserPreference.value);\n+ }\n+ if (rowid.present) {\n+ map['rowid'] = Variable(rowid.value);\n+ }\n+ return map;\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('GlobalSettingsCompanion(')\n+ ..write('themeSetting: $themeSetting, ')\n+ ..write('browserPreference: $browserPreference, ')\n+ ..write('rowid: $rowid')\n+ ..write(')'))\n+ .toString();\n+ }\n+}\n+\n+class Accounts extends Table with TableInfo {\n+ @override\n+ final GeneratedDatabase attachedDatabase;\n+ final String? _alias;\n+ Accounts(this.attachedDatabase, [this._alias]);\n+ late final GeneratedColumn id = GeneratedColumn(\n+ 'id',\n+ aliasedName,\n+ false,\n+ hasAutoIncrement: true,\n+ type: DriftSqlType.int,\n+ requiredDuringInsert: false,\n+ defaultConstraints: GeneratedColumn.constraintIsAlways(\n+ 'PRIMARY KEY AUTOINCREMENT',\n+ ),\n+ );\n+ late final GeneratedColumn realmUrl = GeneratedColumn(\n+ 'realm_url',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn userId = GeneratedColumn(\n+ 'user_id',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.int,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn email = GeneratedColumn(\n+ 'email',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn apiKey = GeneratedColumn(\n+ 'api_key',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn zulipVersion = GeneratedColumn(\n+ 'zulip_version',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn zulipMergeBase = GeneratedColumn(\n+ 'zulip_merge_base',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ late final GeneratedColumn zulipFeatureLevel = GeneratedColumn(\n+ 'zulip_feature_level',\n+ aliasedName,\n+ false,\n+ type: DriftSqlType.int,\n+ requiredDuringInsert: true,\n+ );\n+ late final GeneratedColumn ackedPushToken = GeneratedColumn(\n+ 'acked_push_token',\n+ aliasedName,\n+ true,\n+ type: DriftSqlType.string,\n+ requiredDuringInsert: false,\n+ );\n+ @override\n+ List get $columns => [\n+ id,\n+ realmUrl,\n+ userId,\n+ email,\n+ apiKey,\n+ zulipVersion,\n+ zulipMergeBase,\n+ zulipFeatureLevel,\n+ ackedPushToken,\n+ ];\n+ @override\n+ String get aliasedName => _alias ?? actualTableName;\n+ @override\n+ String get actualTableName => $name;\n+ static const String $name = 'accounts';\n+ @override\n+ Set get $primaryKey => {id};\n+ @override\n+ List> get uniqueKeys => [\n+ {realmUrl, userId},\n+ {realmUrl, email},\n+ ];\n+ @override\n+ AccountsData map(Map data, {String? tablePrefix}) {\n+ final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';\n+ return AccountsData(\n+ id:\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.int,\n+ data['${effectivePrefix}id'],\n+ )!,\n+ realmUrl:\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}realm_url'],\n+ )!,\n+ userId:\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.int,\n+ data['${effectivePrefix}user_id'],\n+ )!,\n+ email:\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}email'],\n+ )!,\n+ apiKey:\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}api_key'],\n+ )!,\n+ zulipVersion:\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}zulip_version'],\n+ )!,\n+ zulipMergeBase: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}zulip_merge_base'],\n+ ),\n+ zulipFeatureLevel:\n+ attachedDatabase.typeMapping.read(\n+ DriftSqlType.int,\n+ data['${effectivePrefix}zulip_feature_level'],\n+ )!,\n+ ackedPushToken: attachedDatabase.typeMapping.read(\n+ DriftSqlType.string,\n+ data['${effectivePrefix}acked_push_token'],\n+ ),\n+ );\n+ }\n+\n+ @override\n+ Accounts createAlias(String alias) {\n+ return Accounts(attachedDatabase, alias);\n+ }\n+}\n+\n+class AccountsData extends DataClass implements Insertable {\n+ final int id;\n+ final String realmUrl;\n+ final int userId;\n+ final String email;\n+ final String apiKey;\n+ final String zulipVersion;\n+ final String? zulipMergeBase;\n+ final int zulipFeatureLevel;\n+ final String? ackedPushToken;\n+ const AccountsData({\n+ required this.id,\n+ required this.realmUrl,\n+ required this.userId,\n+ required this.email,\n+ required this.apiKey,\n+ required this.zulipVersion,\n+ this.zulipMergeBase,\n+ required this.zulipFeatureLevel,\n+ this.ackedPushToken,\n+ });\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ map['id'] = Variable(id);\n+ map['realm_url'] = Variable(realmUrl);\n+ map['user_id'] = Variable(userId);\n+ map['email'] = Variable(email);\n+ map['api_key'] = Variable(apiKey);\n+ map['zulip_version'] = Variable(zulipVersion);\n+ if (!nullToAbsent || zulipMergeBase != null) {\n+ map['zulip_merge_base'] = Variable(zulipMergeBase);\n+ }\n+ map['zulip_feature_level'] = Variable(zulipFeatureLevel);\n+ if (!nullToAbsent || ackedPushToken != null) {\n+ map['acked_push_token'] = Variable(ackedPushToken);\n+ }\n+ return map;\n+ }\n+\n+ AccountsCompanion toCompanion(bool nullToAbsent) {\n+ return AccountsCompanion(\n+ id: Value(id),\n+ realmUrl: Value(realmUrl),\n+ userId: Value(userId),\n+ email: Value(email),\n+ apiKey: Value(apiKey),\n+ zulipVersion: Value(zulipVersion),\n+ zulipMergeBase:\n+ zulipMergeBase == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(zulipMergeBase),\n+ zulipFeatureLevel: Value(zulipFeatureLevel),\n+ ackedPushToken:\n+ ackedPushToken == null && nullToAbsent\n+ ? const Value.absent()\n+ : Value(ackedPushToken),\n+ );\n+ }\n+\n+ factory AccountsData.fromJson(\n+ Map json, {\n+ ValueSerializer? serializer,\n+ }) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return AccountsData(\n+ id: serializer.fromJson(json['id']),\n+ realmUrl: serializer.fromJson(json['realmUrl']),\n+ userId: serializer.fromJson(json['userId']),\n+ email: serializer.fromJson(json['email']),\n+ apiKey: serializer.fromJson(json['apiKey']),\n+ zulipVersion: serializer.fromJson(json['zulipVersion']),\n+ zulipMergeBase: serializer.fromJson(json['zulipMergeBase']),\n+ zulipFeatureLevel: serializer.fromJson(json['zulipFeatureLevel']),\n+ ackedPushToken: serializer.fromJson(json['ackedPushToken']),\n+ );\n+ }\n+ @override\n+ Map toJson({ValueSerializer? serializer}) {\n+ serializer ??= driftRuntimeOptions.defaultSerializer;\n+ return {\n+ 'id': serializer.toJson(id),\n+ 'realmUrl': serializer.toJson(realmUrl),\n+ 'userId': serializer.toJson(userId),\n+ 'email': serializer.toJson(email),\n+ 'apiKey': serializer.toJson(apiKey),\n+ 'zulipVersion': serializer.toJson(zulipVersion),\n+ 'zulipMergeBase': serializer.toJson(zulipMergeBase),\n+ 'zulipFeatureLevel': serializer.toJson(zulipFeatureLevel),\n+ 'ackedPushToken': serializer.toJson(ackedPushToken),\n+ };\n+ }\n+\n+ AccountsData copyWith({\n+ int? id,\n+ String? realmUrl,\n+ int? userId,\n+ String? email,\n+ String? apiKey,\n+ String? zulipVersion,\n+ Value zulipMergeBase = const Value.absent(),\n+ int? zulipFeatureLevel,\n+ Value ackedPushToken = const Value.absent(),\n+ }) => AccountsData(\n+ id: id ?? this.id,\n+ realmUrl: realmUrl ?? this.realmUrl,\n+ userId: userId ?? this.userId,\n+ email: email ?? this.email,\n+ apiKey: apiKey ?? this.apiKey,\n+ zulipVersion: zulipVersion ?? this.zulipVersion,\n+ zulipMergeBase:\n+ zulipMergeBase.present ? zulipMergeBase.value : this.zulipMergeBase,\n+ zulipFeatureLevel: zulipFeatureLevel ?? this.zulipFeatureLevel,\n+ ackedPushToken:\n+ ackedPushToken.present ? ackedPushToken.value : this.ackedPushToken,\n+ );\n+ AccountsData copyWithCompanion(AccountsCompanion data) {\n+ return AccountsData(\n+ id: data.id.present ? data.id.value : this.id,\n+ realmUrl: data.realmUrl.present ? data.realmUrl.value : this.realmUrl,\n+ userId: data.userId.present ? data.userId.value : this.userId,\n+ email: data.email.present ? data.email.value : this.email,\n+ apiKey: data.apiKey.present ? data.apiKey.value : this.apiKey,\n+ zulipVersion:\n+ data.zulipVersion.present\n+ ? data.zulipVersion.value\n+ : this.zulipVersion,\n+ zulipMergeBase:\n+ data.zulipMergeBase.present\n+ ? data.zulipMergeBase.value\n+ : this.zulipMergeBase,\n+ zulipFeatureLevel:\n+ data.zulipFeatureLevel.present\n+ ? data.zulipFeatureLevel.value\n+ : this.zulipFeatureLevel,\n+ ackedPushToken:\n+ data.ackedPushToken.present\n+ ? data.ackedPushToken.value\n+ : this.ackedPushToken,\n+ );\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('AccountsData(')\n+ ..write('id: $id, ')\n+ ..write('realmUrl: $realmUrl, ')\n+ ..write('userId: $userId, ')\n+ ..write('email: $email, ')\n+ ..write('apiKey: $apiKey, ')\n+ ..write('zulipVersion: $zulipVersion, ')\n+ ..write('zulipMergeBase: $zulipMergeBase, ')\n+ ..write('zulipFeatureLevel: $zulipFeatureLevel, ')\n+ ..write('ackedPushToken: $ackedPushToken')\n+ ..write(')'))\n+ .toString();\n+ }\n+\n+ @override\n+ int get hashCode => Object.hash(\n+ id,\n+ realmUrl,\n+ userId,\n+ email,\n+ apiKey,\n+ zulipVersion,\n+ zulipMergeBase,\n+ zulipFeatureLevel,\n+ ackedPushToken,\n+ );\n+ @override\n+ bool operator ==(Object other) =>\n+ identical(this, other) ||\n+ (other is AccountsData &&\n+ other.id == this.id &&\n+ other.realmUrl == this.realmUrl &&\n+ other.userId == this.userId &&\n+ other.email == this.email &&\n+ other.apiKey == this.apiKey &&\n+ other.zulipVersion == this.zulipVersion &&\n+ other.zulipMergeBase == this.zulipMergeBase &&\n+ other.zulipFeatureLevel == this.zulipFeatureLevel &&\n+ other.ackedPushToken == this.ackedPushToken);\n+}\n+\n+class AccountsCompanion extends UpdateCompanion {\n+ final Value id;\n+ final Value realmUrl;\n+ final Value userId;\n+ final Value email;\n+ final Value apiKey;\n+ final Value zulipVersion;\n+ final Value zulipMergeBase;\n+ final Value zulipFeatureLevel;\n+ final Value ackedPushToken;\n+ const AccountsCompanion({\n+ this.id = const Value.absent(),\n+ this.realmUrl = const Value.absent(),\n+ this.userId = const Value.absent(),\n+ this.email = const Value.absent(),\n+ this.apiKey = const Value.absent(),\n+ this.zulipVersion = const Value.absent(),\n+ this.zulipMergeBase = const Value.absent(),\n+ this.zulipFeatureLevel = const Value.absent(),\n+ this.ackedPushToken = const Value.absent(),\n+ });\n+ AccountsCompanion.insert({\n+ this.id = const Value.absent(),\n+ required String realmUrl,\n+ required int userId,\n+ required String email,\n+ required String apiKey,\n+ required String zulipVersion,\n+ this.zulipMergeBase = const Value.absent(),\n+ required int zulipFeatureLevel,\n+ this.ackedPushToken = const Value.absent(),\n+ }) : realmUrl = Value(realmUrl),\n+ userId = Value(userId),\n+ email = Value(email),\n+ apiKey = Value(apiKey),\n+ zulipVersion = Value(zulipVersion),\n+ zulipFeatureLevel = Value(zulipFeatureLevel);\n+ static Insertable custom({\n+ Expression? id,\n+ Expression? realmUrl,\n+ Expression? userId,\n+ Expression? email,\n+ Expression? apiKey,\n+ Expression? zulipVersion,\n+ Expression? zulipMergeBase,\n+ Expression? zulipFeatureLevel,\n+ Expression? ackedPushToken,\n+ }) {\n+ return RawValuesInsertable({\n+ if (id != null) 'id': id,\n+ if (realmUrl != null) 'realm_url': realmUrl,\n+ if (userId != null) 'user_id': userId,\n+ if (email != null) 'email': email,\n+ if (apiKey != null) 'api_key': apiKey,\n+ if (zulipVersion != null) 'zulip_version': zulipVersion,\n+ if (zulipMergeBase != null) 'zulip_merge_base': zulipMergeBase,\n+ if (zulipFeatureLevel != null) 'zulip_feature_level': zulipFeatureLevel,\n+ if (ackedPushToken != null) 'acked_push_token': ackedPushToken,\n+ });\n+ }\n+\n+ AccountsCompanion copyWith({\n+ Value? id,\n+ Value? realmUrl,\n+ Value? userId,\n+ Value? email,\n+ Value? apiKey,\n+ Value? zulipVersion,\n+ Value? zulipMergeBase,\n+ Value? zulipFeatureLevel,\n+ Value? ackedPushToken,\n+ }) {\n+ return AccountsCompanion(\n+ id: id ?? this.id,\n+ realmUrl: realmUrl ?? this.realmUrl,\n+ userId: userId ?? this.userId,\n+ email: email ?? this.email,\n+ apiKey: apiKey ?? this.apiKey,\n+ zulipVersion: zulipVersion ?? this.zulipVersion,\n+ zulipMergeBase: zulipMergeBase ?? this.zulipMergeBase,\n+ zulipFeatureLevel: zulipFeatureLevel ?? this.zulipFeatureLevel,\n+ ackedPushToken: ackedPushToken ?? this.ackedPushToken,\n+ );\n+ }\n+\n+ @override\n+ Map toColumns(bool nullToAbsent) {\n+ final map = {};\n+ if (id.present) {\n+ map['id'] = Variable(id.value);\n+ }\n+ if (realmUrl.present) {\n+ map['realm_url'] = Variable(realmUrl.value);\n+ }\n+ if (userId.present) {\n+ map['user_id'] = Variable(userId.value);\n+ }\n+ if (email.present) {\n+ map['email'] = Variable(email.value);\n+ }\n+ if (apiKey.present) {\n+ map['api_key'] = Variable(apiKey.value);\n+ }\n+ if (zulipVersion.present) {\n+ map['zulip_version'] = Variable(zulipVersion.value);\n+ }\n+ if (zulipMergeBase.present) {\n+ map['zulip_merge_base'] = Variable(zulipMergeBase.value);\n+ }\n+ if (zulipFeatureLevel.present) {\n+ map['zulip_feature_level'] = Variable(zulipFeatureLevel.value);\n+ }\n+ if (ackedPushToken.present) {\n+ map['acked_push_token'] = Variable(ackedPushToken.value);\n+ }\n+ return map;\n+ }\n+\n+ @override\n+ String toString() {\n+ return (StringBuffer('AccountsCompanion(')\n+ ..write('id: $id, ')\n+ ..write('realmUrl: $realmUrl, ')\n+ ..write('userId: $userId, ')\n+ ..write('email: $email, ')\n+ ..write('apiKey: $apiKey, ')\n+ ..write('zulipVersion: $zulipVersion, ')\n+ ..write('zulipMergeBase: $zulipMergeBase, ')\n+ ..write('zulipFeatureLevel: $zulipFeatureLevel, ')\n+ ..write('ackedPushToken: $ackedPushToken')\n+ ..write(')'))\n+ .toString();\n+ }\n+}\n+\n+class DatabaseAtV4 extends GeneratedDatabase {\n+ DatabaseAtV4(QueryExecutor e) : super(e);\n+ late final GlobalSettings globalSettings = GlobalSettings(this);\n+ late final Accounts accounts = Accounts(this);\n+ @override\n+ Iterable> get allTables =>\n+ allSchemaEntities.whereType>();\n+ @override\n+ List get allSchemaEntities => [\n+ globalSettings,\n+ accounts,\n+ ];\n+ @override\n+ int get schemaVersion => 4;\n+}\ndiff --git a/test/model/settings_test.dart b/test/model/settings_test.dart\nnew file mode 100644\nindex 0000000000..e4e0def398\n--- /dev/null\n+++ b/test/model/settings_test.dart\n@@ -0,0 +1,53 @@\n+import 'package:checks/checks.dart';\n+import 'package:flutter/foundation.dart';\n+import 'package:flutter_test/flutter_test.dart';\n+import 'package:zulip/model/binding.dart';\n+import 'package:zulip/model/settings.dart';\n+\n+import '../example_data.dart' as eg;\n+import 'store_checks.dart';\n+import 'store_test.dart';\n+\n+void main() {\n+ final httpLink = Uri.parse('http://chat.zulip.org');\n+ final nonHttpLink = Uri.parse('mailto:chat@zulip.org');\n+\n+ group('getUrlLaunchMode', () {\n+ testAndroidIos('globalSettings.browserPreference is null; use our per-platform defaults for HTTP links', () {\n+ final globalStore = eg.globalStore(globalSettings: eg.globalSettings(\n+ browserPreference: null));\n+ check(globalStore).globalSettings.getUrlLaunchMode(httpLink).equals(\n+ defaultTargetPlatform == TargetPlatform.android\n+ ? UrlLaunchMode.inAppBrowserView : UrlLaunchMode.externalApplication);\n+ });\n+\n+ testAndroidIos('globalSettings.browserPreference is null; use our per-platform defaults for non-HTTP links', () {\n+ final globalStore = eg.globalStore(globalSettings: eg.globalSettings(\n+ browserPreference: null));\n+ check(globalStore).globalSettings.getUrlLaunchMode(nonHttpLink).equals(\n+ defaultTargetPlatform == TargetPlatform.android\n+ ? UrlLaunchMode.platformDefault : UrlLaunchMode.externalApplication);\n+ });\n+\n+ testAndroidIos('globalSettings.browserPreference is inApp; follow the user preference for http links', () {\n+ final globalStore = eg.globalStore(globalSettings: eg.globalSettings(\n+ browserPreference: BrowserPreference.inApp));\n+ check(globalStore).globalSettings.getUrlLaunchMode(httpLink).equals(\n+ UrlLaunchMode.inAppBrowserView);\n+ });\n+\n+ testAndroidIos('globalSettings.browserPreference is inApp; use platform default for non-http links', () {\n+ final globalStore = eg.globalStore(globalSettings: eg.globalSettings(\n+ browserPreference: BrowserPreference.inApp));\n+ check(globalStore).globalSettings.getUrlLaunchMode(nonHttpLink).equals(\n+ UrlLaunchMode.platformDefault);\n+ });\n+\n+ testAndroidIos('globalSettings.browserPreference is external; follow the user preference', () {\n+ final globalStore = eg.globalStore(globalSettings: eg.globalSettings(\n+ browserPreference: BrowserPreference.external));\n+ check(globalStore).globalSettings.getUrlLaunchMode(httpLink).equals(\n+ UrlLaunchMode.externalApplication);\n+ });\n+ });\n+}\ndiff --git a/test/model/store_checks.dart b/test/model/store_checks.dart\nindex 5b05935572..96edf05d41 100644\n--- a/test/model/store_checks.dart\n+++ b/test/model/store_checks.dart\n@@ -3,6 +3,7 @@ import 'package:zulip/api/core.dart';\n import 'package:zulip/api/model/initial_snapshot.dart';\n import 'package:zulip/api/model/model.dart';\n import 'package:zulip/model/autocomplete.dart';\n+import 'package:zulip/model/binding.dart';\n import 'package:zulip/model/database.dart';\n import 'package:zulip/model/recent_dm_conversations.dart';\n import 'package:zulip/model/settings.dart';\n@@ -31,6 +32,9 @@ extension GlobalStoreChecks on Subject {\n \n extension GlobalSettingsDataChecks on Subject {\n Subject get themeSetting => has((x) => x.themeSetting, 'themeSetting');\n+ Subject get browserPreference => has((x) => x.browserPreference, 'browserPreference');\n+ Subject get effectiveBrowserPreference => has((x) => x.effectiveBrowserPreference, 'effectiveBrowserPreference');\n+ Subject getUrlLaunchMode(Uri url) => has((x) => x.getUrlLaunchMode(url), 'getUrlLaunchMode');\n }\n \n extension PerAccountStoreChecks on Subject {\ndiff --git a/test/widgets/content_test.dart b/test/widgets/content_test.dart\nindex 88f94a002e..c2bb5fee4f 100644\n--- a/test/widgets/content_test.dart\n+++ b/test/widgets/content_test.dart\n@@ -9,6 +9,7 @@ import 'package:url_launcher/url_launcher.dart';\n import 'package:zulip/api/core.dart';\n import 'package:zulip/model/content.dart';\n import 'package:zulip/model/narrow.dart';\n+import 'package:zulip/model/settings.dart';\n import 'package:zulip/model/store.dart';\n import 'package:zulip/widgets/content.dart';\n import 'package:zulip/widgets/icons.dart';\n@@ -521,7 +522,7 @@ void main() {\n final expectedLaunchUrl = expectedVideo.hrefUrl;\n await tester.tap(find.byIcon(Icons.play_arrow_rounded));\n check(testBinding.takeLaunchUrlCalls())\n- .single.equals((url: Uri.parse(expectedLaunchUrl), mode: LaunchMode.platformDefault));\n+ .single.equals((url: Uri.parse(expectedLaunchUrl), mode: LaunchMode.inAppBrowserView));\n }\n \n testWidgets('video preview for youtube embed', (tester) async {\n@@ -793,11 +794,23 @@ void main() {\n await tapText(tester, find.text('hello'));\n \n final expectedLaunchMode = defaultTargetPlatform == TargetPlatform.iOS ?\n- LaunchMode.externalApplication : LaunchMode.platformDefault;\n+ LaunchMode.externalApplication : LaunchMode.inAppBrowserView;\n check(testBinding.takeLaunchUrlCalls())\n .single.equals((url: Uri.parse('https://example/'), mode: expectedLaunchMode));\n }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n \n+ testWidgets('follow browser preference setting to open URL', (tester) async {\n+ await testBinding.globalStore.updateGlobalSettings(\n+ eg.globalSettings(\n+ browserPreference: BrowserPreference.inApp).toCompanion(false));\n+ await prepare(tester,\n+ '

          hello

          ');\n+\n+ await tapText(tester, find.text('hello'));\n+ check(testBinding.takeLaunchUrlCalls()).single.equals((\n+ url: Uri.parse('https://example/'), mode: LaunchMode.inAppBrowserView));\n+ }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n+\n testWidgets('multiple links in paragraph', (tester) async {\n const fontSize = kBaseFontSize;\n \n@@ -811,11 +824,11 @@ void main() {\n \n await tester.tapAt(base.translate(1*fontSize, 0)); // \"fXo bar baz\"\n check(testBinding.takeLaunchUrlCalls())\n- .single.equals((url: Uri.parse('https://a/'), mode: LaunchMode.platformDefault));\n+ .single.equals((url: Uri.parse('https://a/'), mode: LaunchMode.inAppBrowserView));\n \n await tester.tapAt(base.translate(9*fontSize, 0)); // \"foo bar bXz\"\n check(testBinding.takeLaunchUrlCalls())\n- .single.equals((url: Uri.parse('https://b/'), mode: LaunchMode.platformDefault));\n+ .single.equals((url: Uri.parse('https://b/'), mode: LaunchMode.inAppBrowserView));\n });\n \n testWidgets('link nested in other spans', (tester) async {\n@@ -823,7 +836,7 @@ void main() {\n '

          word

          ');\n await tapText(tester, find.text('word'));\n check(testBinding.takeLaunchUrlCalls())\n- .single.equals((url: Uri.parse('https://a/'), mode: LaunchMode.platformDefault));\n+ .single.equals((url: Uri.parse('https://a/'), mode: LaunchMode.inAppBrowserView));\n });\n \n testWidgets('link containing other spans', (tester) async {\n@@ -836,11 +849,11 @@ void main() {\n \n await tester.tapAt(base.translate(1*fontSize, 0)); // \"tXo words\"\n check(testBinding.takeLaunchUrlCalls())\n- .single.equals((url: Uri.parse('https://a/'), mode: LaunchMode.platformDefault));\n+ .single.equals((url: Uri.parse('https://a/'), mode: LaunchMode.inAppBrowserView));\n \n await tester.tapAt(base.translate(6*fontSize, 0)); // \"two woXds\"\n check(testBinding.takeLaunchUrlCalls())\n- .single.equals((url: Uri.parse('https://a/'), mode: LaunchMode.platformDefault));\n+ .single.equals((url: Uri.parse('https://a/'), mode: LaunchMode.inAppBrowserView));\n });\n \n testWidgets('relative links are resolved', (tester) async {\n@@ -848,7 +861,7 @@ void main() {\n '

          word

          ');\n await tapText(tester, find.text('word'));\n check(testBinding.takeLaunchUrlCalls())\n- .single.equals((url: Uri.parse('${eg.realmUrl}a/b?c#d'), mode: LaunchMode.platformDefault));\n+ .single.equals((url: Uri.parse('${eg.realmUrl}a/b?c#d'), mode: LaunchMode.inAppBrowserView));\n });\n \n testWidgets('link inside HeadingNode', (tester) async {\n@@ -856,7 +869,7 @@ void main() {\n '
          word
          ');\n await tapText(tester, find.text('word'));\n check(testBinding.takeLaunchUrlCalls())\n- .single.equals((url: Uri.parse('https://a/'), mode: LaunchMode.platformDefault));\n+ .single.equals((url: Uri.parse('https://a/'), mode: LaunchMode.inAppBrowserView));\n });\n \n testWidgets('error dialog if invalid link', (tester) async {\n@@ -910,7 +923,7 @@ void main() {\n await tapText(tester, find.text('invalid'));\n final expectedUrl = eg.realmUrl.resolve('/#narrow/stream/1-check/topic');\n check(testBinding.takeLaunchUrlCalls())\n- .single.equals((url: expectedUrl, mode: LaunchMode.platformDefault));\n+ .single.equals((url: expectedUrl, mode: LaunchMode.inAppBrowserView));\n check(pushedRoutes).isEmpty();\n });\n });\n@@ -1060,11 +1073,11 @@ void main() {\n \n await tester.tap(find.text('Zulip \u2014 organized team chat'));\n check(testBinding.takeLaunchUrlCalls())\n- .single.equals((url: url, mode: LaunchMode.platformDefault));\n+ .single.equals((url: url, mode: LaunchMode.inAppBrowserView));\n \n await tester.tap(find.byType(RealmContentNetworkImage));\n check(testBinding.takeLaunchUrlCalls())\n- .single.equals((url: url, mode: LaunchMode.platformDefault));\n+ .single.equals((url: url, mode: LaunchMode.inAppBrowserView));\n debugNetworkImageHttpClientProvider = null;\n });\n \n@@ -1078,7 +1091,7 @@ void main() {\n \n await tester.tap(find.byType(RealmContentNetworkImage));\n check(testBinding.takeLaunchUrlCalls())\n- .single.equals((url: url, mode: LaunchMode.platformDefault));\n+ .single.equals((url: url, mode: LaunchMode.inAppBrowserView));\n debugNetworkImageHttpClientProvider = null;\n });\n \n@@ -1088,11 +1101,11 @@ void main() {\n \n await tester.tap(find.text('Zulip \u2014 organized team chat'));\n check(testBinding.takeLaunchUrlCalls())\n- .single.equals((url: url, mode: LaunchMode.platformDefault));\n+ .single.equals((url: url, mode: LaunchMode.inAppBrowserView));\n \n await tester.tap(find.byType(RealmContentNetworkImage));\n check(testBinding.takeLaunchUrlCalls())\n- .single.equals((url: url, mode: LaunchMode.platformDefault));\n+ .single.equals((url: url, mode: LaunchMode.inAppBrowserView));\n debugNetworkImageHttpClientProvider = null;\n });\n \n@@ -1102,7 +1115,7 @@ void main() {\n \n await tester.tap(find.byType(RealmContentNetworkImage));\n check(testBinding.takeLaunchUrlCalls())\n- .single.equals((url: url, mode: LaunchMode.platformDefault));\n+ .single.equals((url: url, mode: LaunchMode.inAppBrowserView));\n debugNetworkImageHttpClientProvider = null;\n });\n });\ndiff --git a/test/widgets/profile_test.dart b/test/widgets/profile_test.dart\nindex 38f6c223e3..30f6433528 100644\n--- a/test/widgets/profile_test.dart\n+++ b/test/widgets/profile_test.dart\n@@ -164,7 +164,7 @@ void main() {\n await tester.tap(find.text(testUrl));\n check(testBinding.takeLaunchUrlCalls()).single.equals((\n url: Uri.parse(testUrl),\n- mode: LaunchMode.platformDefault,\n+ mode: LaunchMode.inAppBrowserView,\n ));\n });\n \n@@ -191,7 +191,7 @@ void main() {\n await tester.tap(find.text('externalValue'));\n check(testBinding.takeLaunchUrlCalls()).single.equals((\n url: Uri.parse('http://example/externalValue'),\n- mode: LaunchMode.platformDefault,\n+ mode: LaunchMode.inAppBrowserView,\n ));\n });\n \ndiff --git a/test/widgets/settings_test.dart b/test/widgets/settings_test.dart\nindex 2eb59d2c14..65336479eb 100644\n--- a/test/widgets/settings_test.dart\n+++ b/test/widgets/settings_test.dart\n@@ -83,4 +83,49 @@ void main() {\n debugBrightnessOverride = null;\n });\n });\n+\n+ group('BrowserPreference', () {\n+ Finder useInAppBrowserSwitchFinder = find.ancestor(\n+ of: find.text('Open links with in-app browser'),\n+ matching: find.byType(SwitchListTile));\n+\n+ void checkSwitchAndGlobalSettings(WidgetTester tester, {\n+ required bool checked,\n+ required BrowserPreference? expectedBrowserPreference,\n+ }) {\n+ check(tester.widget(useInAppBrowserSwitchFinder))\n+ .value.equals(checked);\n+ check(testBinding.globalStore)\n+ .globalSettings.browserPreference.equals(expectedBrowserPreference);\n+ }\n+\n+ testWidgets('smoke', (tester) async {\n+ await testBinding.globalStore.updateGlobalSettings(\n+ eg.globalSettings(\n+ browserPreference: BrowserPreference.external).toCompanion(false));\n+ await prepare(tester);\n+ checkSwitchAndGlobalSettings(tester,\n+ checked: false, expectedBrowserPreference: BrowserPreference.external);\n+\n+ await tester.tap(useInAppBrowserSwitchFinder);\n+ await tester.pump();\n+ checkSwitchAndGlobalSettings(tester,\n+ checked: true, expectedBrowserPreference: BrowserPreference.inApp);\n+ });\n+\n+ testWidgets('use our per-platform default browser preference', (tester) async {\n+ await prepare(tester);\n+ bool expectInApp = defaultTargetPlatform == TargetPlatform.android;\n+ checkSwitchAndGlobalSettings(tester,\n+ checked: expectInApp, expectedBrowserPreference: null);\n+\n+ await tester.tap(useInAppBrowserSwitchFinder);\n+ await tester.pump();\n+ expectInApp = !expectInApp;\n+ checkSwitchAndGlobalSettings(tester,\n+ checked: expectInApp,\n+ expectedBrowserPreference: expectInApp\n+ ? BrowserPreference.inApp : BrowserPreference.external);\n+ }, variant: TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n+ });\n }\n", "n2p_tests": "{\"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is null; use our per-platform defaults for HTTP links (Android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in spoiler header (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in h1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in table column header\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: legacy plain channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in bold context\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is null; use our per-platform defaults for HTTP links (iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h6 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests does not crash if multiple global settings rows\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent channel wildcard @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v2 to latest (v4)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in h1 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain user @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime maintains font-size ratio with surrounding text text is scaled\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in table column header\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: AvatarImage smoke with invalid URL\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h3 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is null; use our per-platform defaults for non-HTTP links (iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock smoke: code block with syntax highlighting\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions link inside HeadingNode\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions error dialog if invalid link\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in plain paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/settings_test.dart: ThemeSetting smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: WebsitePreview smoke: without title\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h3\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h2 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is external; follow the user preference (iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v1 to latest (v4)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageTable header row background color\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h4\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/settings_test.dart: BrowserPreference use our per-platform default browser preference (variant: TargetPlatform.iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline code smoke: inline code\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/settings_test.dart: ThemeSetting follow system setting when themeSetting is null\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji smoke: Unicode emoji, encoded in span element, multiple codepoints\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/profile_test.dart: ProfilePage page builds; ensure long name does not overflow\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in table column header (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions link containing other spans\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock syntax highlighting: non-bold span (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h5 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in plain paragraph (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is null; use our per-platform defaults for non-HTTP links (Android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: AvatarImage relative URL, larger size\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: AvatarImage smoke with absolute URL\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: WebsitePreview smoke: without title or description\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime clock icon and text are the same color: common case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations (setUpAll)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions can tap a link to open URL (variant: TargetPlatform.android)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in spoiler header\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji smoke: Unicode emoji, not encoded in span element\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/settings_test.dart: BrowserPreference use our per-platform default browser preference (variant: TargetPlatform.android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: WebsitePreview smoke: without description\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: AvatarImage absolute URL, larger size\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations upgrade to v4, with data\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests initialize GlobalSettings with defaults\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: legacy silent channel wildcard @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests ensure single GlobalSettings row\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations (tearDownAll)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math maintains font-size ratio with surrounding text\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain group @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is external; follow the user preference (Android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions follow browser preference setting to open URL (variant: TargetPlatform.android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/settings_test.dart: BrowserPreference smoke\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v3 to v4\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: ThematicBreak smoke ThematicBreak\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode on internal links valid internal links are navigated to within app\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageTable text alignment in column; with link\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations upgrade to v2, with data\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions relative links are resolved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: CodeBlock smoke: code block without syntax highlighting\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent @-topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions multiple links in paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v2 to v3\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: WebsitePreview smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImageEmoji smoke: Zulip extra emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is inApp; follow the user preference for http links (iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: RealmContentNetworkImage includes auth header if `src` on-realm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageTable bold column header label (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is inApp; follow the user preference for http links (Android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests create account with same realm and userId \": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent @-topic, class order reversed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h1 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions can tap a link to open URL (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations downgrading\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in spoiler header\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: plain @-topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageTable bold column header label\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v1 to v2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests create account\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: RealmContentNetworkImage excludes auth header if `src` off-realm\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/profile_test.dart: ProfilePage page builds; profile page renders\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent user @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji use emoji font (variant: TargetPlatform.iOS)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is inApp; use platform default for non-http links (iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: legacy silent channel wildcard @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline math smoke: inline math\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h5\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: RealmContentNetworkImage throws if no `PerAccountStoreWidget` ancestor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageTable different text alignment in columns\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji use emoji font (variant: TargetPlatform.android)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: migrations migrate without data from v3 to latest (v4)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in spoiler header (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime maintains font-size ratio with surrounding text clock icon is scaled\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions link nested in other spans\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: GlobalTime clock icon and text are the same color: inside link\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode on internal links invalid internal links are opened in browser\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/database_test.dart: non-migration tests create account with same realm and email\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: inline code maintains font-size ratio with surrounding text\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h4 (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: LinkNode interactions follow browser preference setting to open URL (variant: TargetPlatform.iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/settings_test.dart: getUrlLaunchMode globalSettings.browserPreference is inApp; use platform default for non-http links (Android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in bold context (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UnicodeEmoji smoke: Unicode emoji, encoded in span element\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in different kind of span in table column header (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: smoke: emphasis/italic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention silent or non-self mention in plain paragraph (platform requests bold)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: strong (bold) in h6\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: AvatarImage smoke with relative URL\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImageEmoji smoke: custom emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention maintains font-size ratio with surrounding text\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: MessageImageEmoji smoke: custom emoji with invalid URL\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/profile_test.dart: ProfilePage page builds; user links render multiple avatars\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/content_test.dart: UserMention smoke: silent group @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1379", "org": "zulip", "repo": "zulip-flutter", "number": 1379, "state": "closed", "title": "notif ios: Handle opening of conversation on tap; take 2", "body": "Fixes #1147.\r\n\r\n2nd attempt, first attempt was #1261. This one uses pigeon to move most of the notification payload handling to dart side (and doesn't use/rely on `zulip://notification` URL).", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"11f05dc3747f6383473fbafec20ebe575b9fc94e\"}", "resolved_issues": "[{\"number\": 1147, \"title\": \"ios notifs: Support tapping a notification to open the conversation\", \"body\": \"Like #123, but for iOS.\\r\\n\\r\\nWhen you tap a new-message notification, we should open the message's conversation.\"}]", "lang": "dart", "problem_statement": "ios notifs: Support tapping a notification to open the conversation\nLike #123, but for iOS.\r\n\r\nWhen you tap a new-message notification, we should open the message's conversation.\n", "hints": "Beta feedback requesting this: https://chat.zulip.org/#narrow/channel/48-mobile/topic/beta.20feedback.3A.20.28ios.29.20notifications.20should.20open.20conversation/near/2067876", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1379", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1147\"]", "test_command": "flutter test test/model/store_test.dart test/notifications/display_test.dart test/notifications/open_test.dart test/widgets/store_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/android/app/src/main/kotlin/com/zulip/flutter/Notifications.g.kt b/android/app/src/main/kotlin/com/zulip/flutter/AndroidNotifications.g.kt\nsimilarity index 94%\nrename from android/app/src/main/kotlin/com/zulip/flutter/Notifications.g.kt\nrename to android/app/src/main/kotlin/com/zulip/flutter/AndroidNotifications.g.kt\nindex f4862e2b0b..39207e3470 100644\n--- a/android/app/src/main/kotlin/com/zulip/flutter/Notifications.g.kt\n+++ b/android/app/src/main/kotlin/com/zulip/flutter/AndroidNotifications.g.kt\n@@ -13,7 +13,7 @@ import io.flutter.plugin.common.StandardMethodCodec\n import io.flutter.plugin.common.StandardMessageCodec\n import java.io.ByteArrayOutputStream\n import java.nio.ByteBuffer\n-private object NotificationsPigeonUtils {\n+private object AndroidNotificationsPigeonUtils {\n \n fun wrapResult(result: Any?): List {\n return listOf(result)\n@@ -128,7 +128,7 @@ data class NotificationChannel (\n if (this === other) {\n return true\n }\n- return NotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n+ return AndroidNotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n \n override fun hashCode(): Int = toList().hashCode()\n }\n@@ -171,7 +171,7 @@ data class AndroidIntent (\n if (this === other) {\n return true\n }\n- return NotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n+ return AndroidNotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n \n override fun hashCode(): Int = toList().hashCode()\n }\n@@ -215,7 +215,7 @@ data class PendingIntent (\n if (this === other) {\n return true\n }\n- return NotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n+ return AndroidNotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n \n override fun hashCode(): Int = toList().hashCode()\n }\n@@ -249,7 +249,7 @@ data class InboxStyle (\n if (this === other) {\n return true\n }\n- return NotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n+ return AndroidNotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n \n override fun hashCode(): Int = toList().hashCode()\n }\n@@ -299,7 +299,7 @@ data class Person (\n if (this === other) {\n return true\n }\n- return NotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n+ return AndroidNotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n \n override fun hashCode(): Int = toList().hashCode()\n }\n@@ -339,7 +339,7 @@ data class MessagingStyleMessage (\n if (this === other) {\n return true\n }\n- return NotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n+ return AndroidNotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n \n override fun hashCode(): Int = toList().hashCode()\n }\n@@ -382,7 +382,7 @@ data class MessagingStyle (\n if (this === other) {\n return true\n }\n- return NotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n+ return AndroidNotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n \n override fun hashCode(): Int = toList().hashCode()\n }\n@@ -419,7 +419,7 @@ data class Notification (\n if (this === other) {\n return true\n }\n- return NotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n+ return AndroidNotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n \n override fun hashCode(): Int = toList().hashCode()\n }\n@@ -459,7 +459,7 @@ data class StatusBarNotification (\n if (this === other) {\n return true\n }\n- return NotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n+ return AndroidNotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n \n override fun hashCode(): Int = toList().hashCode()\n }\n@@ -509,11 +509,11 @@ data class StoredNotificationSound (\n if (this === other) {\n return true\n }\n- return NotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n+ return AndroidNotificationsPigeonUtils.deepEquals(toList(), other.toList()) }\n \n override fun hashCode(): Int = toList().hashCode()\n }\n-private open class NotificationsPigeonCodec : StandardMessageCodec() {\n+private open class AndroidNotificationsPigeonCodec : StandardMessageCodec() {\n override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {\n return when (type) {\n 129.toByte() -> {\n@@ -721,7 +721,7 @@ interface AndroidNotificationHostApi {\n companion object {\n /** The codec used by AndroidNotificationHostApi. */\n val codec: MessageCodec by lazy {\n- NotificationsPigeonCodec()\n+ AndroidNotificationsPigeonCodec()\n }\n /** Sets up an instance of `AndroidNotificationHostApi` to handle messages through the `binaryMessenger`. */\n @JvmOverloads\n@@ -737,7 +737,7 @@ interface AndroidNotificationHostApi {\n api.createNotificationChannel(channelArg)\n listOf(null)\n } catch (exception: Throwable) {\n- NotificationsPigeonUtils.wrapError(exception)\n+ AndroidNotificationsPigeonUtils.wrapError(exception)\n }\n reply.reply(wrapped)\n }\n@@ -752,7 +752,7 @@ interface AndroidNotificationHostApi {\n val wrapped: List = try {\n listOf(api.getNotificationChannels())\n } catch (exception: Throwable) {\n- NotificationsPigeonUtils.wrapError(exception)\n+ AndroidNotificationsPigeonUtils.wrapError(exception)\n }\n reply.reply(wrapped)\n }\n@@ -770,7 +770,7 @@ interface AndroidNotificationHostApi {\n api.deleteNotificationChannel(channelIdArg)\n listOf(null)\n } catch (exception: Throwable) {\n- NotificationsPigeonUtils.wrapError(exception)\n+ AndroidNotificationsPigeonUtils.wrapError(exception)\n }\n reply.reply(wrapped)\n }\n@@ -785,7 +785,7 @@ interface AndroidNotificationHostApi {\n val wrapped: List = try {\n listOf(api.listStoredSoundsInNotificationsDirectory())\n } catch (exception: Throwable) {\n- NotificationsPigeonUtils.wrapError(exception)\n+ AndroidNotificationsPigeonUtils.wrapError(exception)\n }\n reply.reply(wrapped)\n }\n@@ -803,7 +803,7 @@ interface AndroidNotificationHostApi {\n val wrapped: List = try {\n listOf(api.copySoundResourceToMediaStore(targetFileDisplayNameArg, sourceResourceNameArg))\n } catch (exception: Throwable) {\n- NotificationsPigeonUtils.wrapError(exception)\n+ AndroidNotificationsPigeonUtils.wrapError(exception)\n }\n reply.reply(wrapped)\n }\n@@ -835,7 +835,7 @@ interface AndroidNotificationHostApi {\n api.notify(tagArg, idArg, autoCancelArg, channelIdArg, colorArg, contentIntentArg, contentTextArg, contentTitleArg, extrasArg, groupKeyArg, inboxStyleArg, isGroupSummaryArg, messagingStyleArg, numberArg, smallIconResourceNameArg)\n listOf(null)\n } catch (exception: Throwable) {\n- NotificationsPigeonUtils.wrapError(exception)\n+ AndroidNotificationsPigeonUtils.wrapError(exception)\n }\n reply.reply(wrapped)\n }\n@@ -852,7 +852,7 @@ interface AndroidNotificationHostApi {\n val wrapped: List = try {\n listOf(api.getActiveNotificationMessagingStyleByTag(tagArg))\n } catch (exception: Throwable) {\n- NotificationsPigeonUtils.wrapError(exception)\n+ AndroidNotificationsPigeonUtils.wrapError(exception)\n }\n reply.reply(wrapped)\n }\n@@ -869,7 +869,7 @@ interface AndroidNotificationHostApi {\n val wrapped: List = try {\n listOf(api.getActiveNotifications(desiredExtrasArg))\n } catch (exception: Throwable) {\n- NotificationsPigeonUtils.wrapError(exception)\n+ AndroidNotificationsPigeonUtils.wrapError(exception)\n }\n reply.reply(wrapped)\n }\n@@ -888,7 +888,7 @@ interface AndroidNotificationHostApi {\n api.cancel(tagArg, idArg)\n listOf(null)\n } catch (exception: Throwable) {\n- NotificationsPigeonUtils.wrapError(exception)\n+ AndroidNotificationsPigeonUtils.wrapError(exception)\n }\n reply.reply(wrapped)\n }\ndiff --git a/docs/howto/push-notifications-ios-simulator.md b/docs/howto/push-notifications-ios-simulator.md\nnew file mode 100644\nindex 0000000000..d54bb20491\n--- /dev/null\n+++ b/docs/howto/push-notifications-ios-simulator.md\n@@ -0,0 +1,300 @@\n+# Testing Push Notifications on iOS Simulator\n+\n+For documentation on testing push notifications on Android or a real\n+iOS device, see https://github.com/zulip/zulip-mobile/blob/main/docs/howto/push-notifications.md\n+\n+This doc describes how to test client-side changes on iOS Simulator.\n+It will demonstrate how to use APNs payloads the server sends to\n+the Apple Push Notification service to show notifications on iOS\n+Simulator.\n+\n+\n+### Contents\n+\n+* [Trigger a notification on the iOS Simulator](#trigger-notification)\n+* [Canned APNs payloads](#canned-payloads)\n+* [Produce sample APNs payloads](#produce-payload)\n+\n+\n+
          \n+\n+## Trigger a notification on the iOS Simulator\n+\n+The iOS Simulator permits delivering a notification payload\n+artificially, as if APNs had delivered it to the device,\n+but without actually involving APNs or any other server.\n+\n+As input for this operation, you'll need an APNs payload,\n+i.e. a JSON blob representing what APNs might deliver to the app\n+for a notification.\n+\n+To get an APNs payload, you can generate one from a Zulip dev server\n+by following the [instructions in a section below](#produce-payload),\n+or you can use one of the payloads included\n+in this document [below](#canned-payloads).\n+\n+\n+### 1. Determine the device ID of the iOS Simulator\n+\n+To receive a notification on the iOS Simulator, we need to first\n+determine the device ID of the iOS Simulator, to specify which\n+Simulator instance we want to push the payload to.\n+\n+```shell-session\n+$ xcrun simctl list devices booted\n+```\n+\n+
          \n+Example output:\n+\n+```shell-session\n+$ xcrun simctl list devices booted\n+== Devices ==\n+-- iOS 18.3 --\n+ iPhone 16 Pro (90CC33B2-679B-4053-B380-7B986A29F28C) (Booted)\n+```\n+\n+
          \n+\n+\n+### 2. Trigger a notification by pushing the payload to the iOS Simulator\n+\n+By running the following command with a valid APNs payload, you should\n+receive a notification on the iOS Simulator for the zulip-flutter app.\n+Tapping on the notification should route to the respective conversation.\n+\n+```shell-session\n+$ xcrun simctl push [device-id] com.zulip.flutter [payload json path]\n+```\n+\n+
          \n+Example output:\n+\n+```shell-session\n+$ xcrun simctl push 90CC33B2-679B-4053-B380-7B986A29F28C com.zulip.flutter ./dm.json\n+Notification sent to 'com.zulip.flutter'\n+```\n+\n+
          \n+\n+\n+
          \n+\n+## Canned APNs payloads\n+\n+The following pre-canned APNs payloads can be used in case you don't\n+have one.\n+\n+These canned payloads were generated from\n+Zulip Server 11.0-dev+git 8fd04b0f0, API Feature Level 377,\n+in April 2025.\n+The `user_id` is that of `iago@zulip.com` in the Zulip dev environment.\n+\n+These canned payloads assume that EXTERNAL_HOST has its default value\n+for the dev server. If you've\n+[set EXTERNAL_HOST to use an IP address](https://github.com/zulip/zulip-mobile/blob/main/docs/howto/dev-server.md#4-set-external_host)\n+in order to enable your device to connect to the dev server, you'll\n+need to adjust the `realm_url` fields. You can do this by a\n+find-and-replace for `localhost`; for example,\n+`perl -i -0pe s/localhost/10.0.2.2/g tmp/*.json` after saving the\n+canned payloads to files `tmp/*.json`.\n+\n+
          \n+Payload: dm.json\n+\n+```json\n+{\n+ \"aps\": {\n+ \"alert\": {\n+ \"title\": \"Zoe\",\n+ \"subtitle\": \"\",\n+ \"body\": \"But wouldn't that show you contextually who is in the audience before you have to open the compose box?\"\n+ },\n+ \"sound\": \"default\",\n+ \"badge\": 0,\n+ },\n+ \"zulip\": {\n+ \"server\": \"zulipdev.com:9991\",\n+ \"realm_id\": 2,\n+ \"realm_uri\": \"http://localhost:9991\",\n+ \"realm_url\": \"http://localhost:9991\",\n+ \"realm_name\": \"Zulip Dev\",\n+ \"user_id\": 11,\n+ \"sender_id\": 7,\n+ \"sender_email\": \"user7@zulipdev.com\",\n+ \"time\": 1740890583,\n+ \"recipient_type\": \"private\",\n+ \"message_ids\": [\n+ 87\n+ ]\n+ }\n+}\n+```\n+\n+
          \n+\n+
          \n+Payload: group_dm.json\n+\n+```json\n+{\n+ \"aps\": {\n+ \"alert\": {\n+ \"title\": \"Othello, the Moor of Venice, Polonius (guest), Iago\",\n+ \"subtitle\": \"Othello, the Moor of Venice:\",\n+ \"body\": \"Sit down awhile; And let us once again assail your ears, That are so fortified against our story What we have two nights seen.\"\n+ },\n+ \"sound\": \"default\",\n+ \"badge\": 0,\n+ },\n+ \"zulip\": {\n+ \"server\": \"zulipdev.com:9991\",\n+ \"realm_id\": 2,\n+ \"realm_uri\": \"http://localhost:9991\",\n+ \"realm_url\": \"http://localhost:9991\",\n+ \"realm_name\": \"Zulip Dev\",\n+ \"user_id\": 11,\n+ \"sender_id\": 12,\n+ \"sender_email\": \"user12@zulipdev.com\",\n+ \"time\": 1740533641,\n+ \"recipient_type\": \"private\",\n+ \"pm_users\": \"11,12,13\",\n+ \"message_ids\": [\n+ 17\n+ ]\n+ }\n+}\n+```\n+\n+
          \n+\n+
          \n+Payload: stream.json\n+\n+```json\n+{\n+ \"aps\": {\n+ \"alert\": {\n+ \"title\": \"#devel > plotter\",\n+ \"subtitle\": \"Desdemona:\",\n+ \"body\": \"Despite the fact that such a claim at first glance seems counterintuitive, it is derived from known results. Electrical engineering follows a cycle of four phases: location, refinement, visualization, and evaluation.\"\n+ },\n+ \"sound\": \"default\",\n+ \"badge\": 0,\n+ },\n+ \"zulip\": {\n+ \"server\": \"zulipdev.com:9991\",\n+ \"realm_id\": 2,\n+ \"realm_uri\": \"http://localhost:9991\",\n+ \"realm_url\": \"http://localhost:9991\",\n+ \"realm_name\": \"Zulip Dev\",\n+ \"user_id\": 11,\n+ \"sender_id\": 9,\n+ \"sender_email\": \"user9@zulipdev.com\",\n+ \"time\": 1740558997,\n+ \"recipient_type\": \"stream\",\n+ \"stream\": \"devel\",\n+ \"stream_id\": 11,\n+ \"topic\": \"plotter\",\n+ \"message_ids\": [\n+ 40\n+ ]\n+ }\n+}\n+```\n+\n+
          \n+\n+\n+
          \n+\n+## Produce sample APNs payloads\n+\n+### 1. Set up dev server\n+\n+To set up and run the dev server on the same Mac machine that hosts\n+the iOS Simulator, follow Zulip's\n+[standard instructions](https://zulip.readthedocs.io/en/latest/development/setup-recommended.html)\n+for setting up a dev server.\n+\n+If you want to run the dev server on a different machine than the Mac\n+host, you'll need to follow extra steps\n+[documented here](https://github.com/zulip/zulip-mobile/blob/main/docs/howto/dev-server.md)\n+to make it possible for the app running on the iOS Simulator to\n+connect to the dev server.\n+\n+\n+### 2. Set up the dev user to receive mobile notifications.\n+\n+We'll use the devlogin user `iago@zulip.com` to test notifications.\n+Log in to that user by going to `/devlogin` on that server on Web.\n+\n+Then follow the steps [here](https://zulip.com/help/mobile-notifications)\n+to enable Mobile Notifications for \"Channels\".\n+\n+\n+### 3. Log in as the dev user on zulip-flutter.\n+\n+\n+\n+To log in as this user in the Flutter app, you'll need the password\n+that was generated by the development server. You can print the\n+password by running this command inside your `vagrant ssh` shell:\n+```\n+$ ./manage.py print_initial_password iago@zulip.com\n+```\n+\n+Then run the app on the iOS Simulator, accept the permission to\n+receive push notifications, and then log in as the dev user\n+(`iago@zulip.com`).\n+\n+\n+### 4. Edit the server code to log the notification payload.\n+\n+We need to retrieve the APNs payload the server generates and sends\n+to the bouncer. To do that we can add a log statement after the\n+server completes generating the payload in `zerver/lib/push_notifications.py`:\n+\n+```diff\n+ apns_payload = get_message_payload_apns(\n+ user_profile,\n+ message,\n+ trigger,\n+ mentioned_user_group_id,\n+ mentioned_user_group_name,\n+ can_access_sender,\n+ )\n+ gcm_payload, gcm_options = get_message_payload_gcm(\n+ user_profile, message, mentioned_user_group_id, mentioned_user_group_name, can_access_sender\n+ )\n+ logger.info(\"Sending push notifications to mobile clients for user %s\", user_profile_id)\n++ logger.info(\"APNS payload %s\", orjson.dumps(apns_payload).decode())\n+\n+ android_devices = list(\n+ PushDeviceToken.objects.filter(user=user_profile, kind=PushDeviceToken.FCM).order_by(\"id\")\n+```\n+\n+\n+### 5. Send messages to the dev user\n+\n+To generate notifications to the dev user `iago@zulip.com` we need to\n+send messages from another user. For a variety of different types of\n+payloads try sending a message in a topic, a message in a group DM,\n+and one in one-one DM. Then look for the payloads in the server logs\n+by searching for \"APNS payload\".\n+\n+\n+### 6. Transform and save the payload to a file\n+\n+The payload JSON recorded in the steps above is in the form the\n+Zulip server sends to the bouncer. The bouncer restructures this\n+slightly to produce the actual payload which it sends to APNs,\n+and which APNs delivers to the app on the device.\n+To apply the same restructuring, run the payload through\n+the following `jq` command:\n+\n+```shell-session\n+$ echo '{\"alert\":{\"title\": ...' \\\n+ | jq '{aps: {alert, sound, badge}, zulip: .custom.zulip}' \\\n+ > payload.json\n+```\ndiff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj\nindex b4928e2220..7df051a142 100644\n--- a/ios/Runner.xcodeproj/project.pbxproj\n+++ b/ios/Runner.xcodeproj/project.pbxproj\n@@ -13,6 +13,7 @@\n \t\t97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };\n \t\t97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };\n \t\t97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };\n+\t\tB34E9F092D776BEB0009AED2 /* Notifications.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = B34E9F082D776BEB0009AED2 /* Notifications.g.swift */; };\n \t\tF311C174AF9C005CE4AADD72 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EAE3F3F518B95B7BFEB4FE7 /* Pods_Runner.framework */; };\n /* End PBXBuildFile section */\n \n@@ -48,6 +49,7 @@\n \t\t97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = \"\"; };\n \t\t97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = \"\"; };\n \t\t97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = \"\"; };\n+\t\tB34E9F082D776BEB0009AED2 /* Notifications.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notifications.g.swift; sourceTree = \"\"; };\n \t\tB3AF53A72CA20BD10039801D /* Zulip.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Zulip.xcconfig; path = Flutter/Zulip.xcconfig; sourceTree = \"\"; };\n /* End PBXFileReference section */\n \n@@ -115,6 +117,7 @@\n \t\t\t\t1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,\n \t\t\t\t1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,\n \t\t\t\t74858FAE1ED2DC5600515810 /* AppDelegate.swift */,\n+\t\t\t\tB34E9F082D776BEB0009AED2 /* Notifications.g.swift */,\n \t\t\t\t74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,\n \t\t\t);\n \t\t\tpath = Runner;\n@@ -297,6 +300,7 @@\n \t\t\tbuildActionMask = 2147483647;\n \t\t\tfiles = (\n \t\t\t\t74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,\n+\t\t\t\tB34E9F092D776BEB0009AED2 /* Notifications.g.swift in Sources */,\n \t\t\t\t1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,\n \t\t\t);\n \t\t\trunOnlyForDeploymentPostprocessing = 0;\ndiff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift\nindex b636303481..eefed07cd6 100644\n--- a/ios/Runner/AppDelegate.swift\n+++ b/ios/Runner/AppDelegate.swift\n@@ -3,11 +3,64 @@ import Flutter\n \n @main\n @objc class AppDelegate: FlutterAppDelegate {\n+ private var notificationTapEventListener: NotificationTapEventListener?\n+\n override func application(\n _ application: UIApplication,\n didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?\n ) -> Bool {\n GeneratedPluginRegistrant.register(with: self)\n+ let controller = window?.rootViewController as! FlutterViewController\n+\n+ // Retrieve the remote notification payload from launch options;\n+ // this will be null if the launch wasn't triggered by a notification.\n+ let notificationPayload = launchOptions?[.remoteNotification] as? [AnyHashable : Any]\n+ let api = NotificationHostApiImpl(notificationPayload.map { NotificationDataFromLaunch(payload: $0) })\n+ NotificationHostApiSetup.setUp(binaryMessenger: controller.binaryMessenger, api: api)\n+\n+ notificationTapEventListener = NotificationTapEventListener()\n+ NotificationTapEventsStreamHandler.register(with: controller.binaryMessenger, streamHandler: notificationTapEventListener!)\n+\n+ UNUserNotificationCenter.current().delegate = self\n+\n return super.application(application, didFinishLaunchingWithOptions: launchOptions)\n }\n+\n+ override func userNotificationCenter(\n+ _ center: UNUserNotificationCenter,\n+ didReceive response: UNNotificationResponse,\n+ withCompletionHandler completionHandler: @escaping () -> Void\n+ ) {\n+ if response.actionIdentifier == UNNotificationDefaultActionIdentifier {\n+ let userInfo = response.notification.request.content.userInfo\n+ notificationTapEventListener!.onNotificationTapEvent(payload: userInfo)\n+ }\n+ completionHandler()\n+ }\n+}\n+\n+private class NotificationHostApiImpl: NotificationHostApi {\n+ private let maybeDataFromLaunch: NotificationDataFromLaunch?\n+\n+ init(_ maybeDataFromLaunch: NotificationDataFromLaunch?) {\n+ self.maybeDataFromLaunch = maybeDataFromLaunch\n+ }\n+\n+ func getNotificationDataFromLaunch() -> NotificationDataFromLaunch? {\n+ maybeDataFromLaunch\n+ }\n+}\n+\n+// Adapted from Pigeon's Swift example for @EventChannelApi:\n+// https://github.com/flutter/packages/blob/2dff6213a/packages/pigeon/example/app/ios/Runner/AppDelegate.swift#L49-L74\n+class NotificationTapEventListener: NotificationTapEventsStreamHandler {\n+ var eventSink: PigeonEventSink?\n+\n+ override func onListen(withArguments arguments: Any?, sink: PigeonEventSink) {\n+ eventSink = sink\n+ }\n+\n+ func onNotificationTapEvent(payload: [AnyHashable : Any]) {\n+ eventSink?.success(NotificationTapEvent(payload: payload))\n+ }\n }\ndiff --git a/ios/Runner/Notifications.g.swift b/ios/Runner/Notifications.g.swift\nnew file mode 100644\nindex 0000000000..40db818d33\n--- /dev/null\n+++ b/ios/Runner/Notifications.g.swift\n@@ -0,0 +1,335 @@\n+// Autogenerated from Pigeon (v25.3.1), do not edit directly.\n+// See also: https://pub.dev/packages/pigeon\n+\n+import Foundation\n+\n+#if os(iOS)\n+ import Flutter\n+#elseif os(macOS)\n+ import FlutterMacOS\n+#else\n+ #error(\"Unsupported platform.\")\n+#endif\n+\n+/// Error class for passing custom error details to Dart side.\n+final class PigeonError: Error {\n+ let code: String\n+ let message: String?\n+ let details: Sendable?\n+\n+ init(code: String, message: String?, details: Sendable?) {\n+ self.code = code\n+ self.message = message\n+ self.details = details\n+ }\n+\n+ var localizedDescription: String {\n+ return\n+ \"PigeonError(code: \\(code), message: \\(message ?? \"\"), details: \\(details ?? \"\")\"\n+ }\n+}\n+\n+private func wrapResult(_ result: Any?) -> [Any?] {\n+ return [result]\n+}\n+\n+private func wrapError(_ error: Any) -> [Any?] {\n+ if let pigeonError = error as? PigeonError {\n+ return [\n+ pigeonError.code,\n+ pigeonError.message,\n+ pigeonError.details,\n+ ]\n+ }\n+ if let flutterError = error as? FlutterError {\n+ return [\n+ flutterError.code,\n+ flutterError.message,\n+ flutterError.details,\n+ ]\n+ }\n+ return [\n+ \"\\(error)\",\n+ \"\\(type(of: error))\",\n+ \"Stacktrace: \\(Thread.callStackSymbols)\",\n+ ]\n+}\n+\n+private func isNullish(_ value: Any?) -> Bool {\n+ return value is NSNull || value == nil\n+}\n+\n+private func nilOrValue(_ value: Any?) -> T? {\n+ if value is NSNull { return nil }\n+ return value as! T?\n+}\n+\n+func deepEqualsNotifications(_ lhs: Any?, _ rhs: Any?) -> Bool {\n+ let cleanLhs = nilOrValue(lhs) as Any?\n+ let cleanRhs = nilOrValue(rhs) as Any?\n+ switch (cleanLhs, cleanRhs) {\n+ case (nil, nil):\n+ return true\n+\n+ case (nil, _), (_, nil):\n+ return false\n+\n+ case is (Void, Void):\n+ return true\n+\n+ case let (cleanLhsHashable, cleanRhsHashable) as (AnyHashable, AnyHashable):\n+ return cleanLhsHashable == cleanRhsHashable\n+\n+ case let (cleanLhsArray, cleanRhsArray) as ([Any?], [Any?]):\n+ guard cleanLhsArray.count == cleanRhsArray.count else { return false }\n+ for (index, element) in cleanLhsArray.enumerated() {\n+ if !deepEqualsNotifications(element, cleanRhsArray[index]) {\n+ return false\n+ }\n+ }\n+ return true\n+\n+ case let (cleanLhsDictionary, cleanRhsDictionary) as ([AnyHashable: Any?], [AnyHashable: Any?]):\n+ guard cleanLhsDictionary.count == cleanRhsDictionary.count else { return false }\n+ for (key, cleanLhsValue) in cleanLhsDictionary {\n+ guard cleanRhsDictionary.index(forKey: key) != nil else { return false }\n+ if !deepEqualsNotifications(cleanLhsValue, cleanRhsDictionary[key]!) {\n+ return false\n+ }\n+ }\n+ return true\n+\n+ default:\n+ // Any other type shouldn't be able to be used with pigeon. File an issue if you find this to be untrue.\n+ return false\n+ }\n+}\n+\n+func deepHashNotifications(value: Any?, hasher: inout Hasher) {\n+ if let valueList = value as? [AnyHashable] {\n+ for item in valueList { deepHashNotifications(value: item, hasher: &hasher) }\n+ return\n+ }\n+\n+ if let valueDict = value as? [AnyHashable: AnyHashable] {\n+ for key in valueDict.keys { \n+ hasher.combine(key)\n+ deepHashNotifications(value: valueDict[key]!, hasher: &hasher)\n+ }\n+ return\n+ }\n+\n+ if let hashableValue = value as? AnyHashable {\n+ hasher.combine(hashableValue.hashValue)\n+ }\n+\n+ return hasher.combine(String(describing: value))\n+}\n+\n+ \n+\n+/// Generated class from Pigeon that represents data sent in messages.\n+struct NotificationDataFromLaunch: Hashable {\n+ /// The raw payload that is attached to the notification,\n+ /// holding the information required to carry out the navigation.\n+ ///\n+ /// See [NotificationHostApi.getNotificationDataFromLaunch].\n+ var payload: [AnyHashable?: Any?]\n+\n+\n+ // swift-format-ignore: AlwaysUseLowerCamelCase\n+ static func fromList(_ pigeonVar_list: [Any?]) -> NotificationDataFromLaunch? {\n+ let payload = pigeonVar_list[0] as! [AnyHashable?: Any?]\n+\n+ return NotificationDataFromLaunch(\n+ payload: payload\n+ )\n+ }\n+ func toList() -> [Any?] {\n+ return [\n+ payload\n+ ]\n+ }\n+ static func == (lhs: NotificationDataFromLaunch, rhs: NotificationDataFromLaunch) -> Bool {\n+ return deepEqualsNotifications(lhs.toList(), rhs.toList()) }\n+ func hash(into hasher: inout Hasher) {\n+ deepHashNotifications(value: toList(), hasher: &hasher)\n+ }\n+}\n+\n+/// Generated class from Pigeon that represents data sent in messages.\n+struct NotificationTapEvent: Hashable {\n+ /// The raw payload that is attached to the notification,\n+ /// holding the information required to carry out the navigation.\n+ ///\n+ /// See [notificationTapEvents].\n+ var payload: [AnyHashable?: Any?]\n+\n+\n+ // swift-format-ignore: AlwaysUseLowerCamelCase\n+ static func fromList(_ pigeonVar_list: [Any?]) -> NotificationTapEvent? {\n+ let payload = pigeonVar_list[0] as! [AnyHashable?: Any?]\n+\n+ return NotificationTapEvent(\n+ payload: payload\n+ )\n+ }\n+ func toList() -> [Any?] {\n+ return [\n+ payload\n+ ]\n+ }\n+ static func == (lhs: NotificationTapEvent, rhs: NotificationTapEvent) -> Bool {\n+ return deepEqualsNotifications(lhs.toList(), rhs.toList()) }\n+ func hash(into hasher: inout Hasher) {\n+ deepHashNotifications(value: toList(), hasher: &hasher)\n+ }\n+}\n+\n+private class NotificationsPigeonCodecReader: FlutterStandardReader {\n+ override func readValue(ofType type: UInt8) -> Any? {\n+ switch type {\n+ case 129:\n+ return NotificationDataFromLaunch.fromList(self.readValue() as! [Any?])\n+ case 130:\n+ return NotificationTapEvent.fromList(self.readValue() as! [Any?])\n+ default:\n+ return super.readValue(ofType: type)\n+ }\n+ }\n+}\n+\n+private class NotificationsPigeonCodecWriter: FlutterStandardWriter {\n+ override func writeValue(_ value: Any) {\n+ if let value = value as? NotificationDataFromLaunch {\n+ super.writeByte(129)\n+ super.writeValue(value.toList())\n+ } else if let value = value as? NotificationTapEvent {\n+ super.writeByte(130)\n+ super.writeValue(value.toList())\n+ } else {\n+ super.writeValue(value)\n+ }\n+ }\n+}\n+\n+private class NotificationsPigeonCodecReaderWriter: FlutterStandardReaderWriter {\n+ override func reader(with data: Data) -> FlutterStandardReader {\n+ return NotificationsPigeonCodecReader(data: data)\n+ }\n+\n+ override func writer(with data: NSMutableData) -> FlutterStandardWriter {\n+ return NotificationsPigeonCodecWriter(data: data)\n+ }\n+}\n+\n+class NotificationsPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {\n+ static let shared = NotificationsPigeonCodec(readerWriter: NotificationsPigeonCodecReaderWriter())\n+}\n+\n+var notificationsPigeonMethodCodec = FlutterStandardMethodCodec(readerWriter: NotificationsPigeonCodecReaderWriter());\n+\n+/// Generated protocol from Pigeon that represents a handler of messages from Flutter.\n+protocol NotificationHostApi {\n+ /// Retrieves notification data if the app was launched by tapping on a notification.\n+ ///\n+ /// Returns `launchOptions.remoteNotification`,\n+ /// which is the raw APNs data dictionary\n+ /// if the app launch was opened by a notification tap,\n+ /// else null. See Apple doc:\n+ /// https://developer.apple.com/documentation/uikit/uiapplication/launchoptionskey/remotenotification\n+ func getNotificationDataFromLaunch() throws -> NotificationDataFromLaunch?\n+}\n+\n+/// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.\n+class NotificationHostApiSetup {\n+ static var codec: FlutterStandardMessageCodec { NotificationsPigeonCodec.shared }\n+ /// Sets up an instance of `NotificationHostApi` to handle messages through the `binaryMessenger`.\n+ static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NotificationHostApi?, messageChannelSuffix: String = \"\") {\n+ let channelSuffix = messageChannelSuffix.count > 0 ? \".\\(messageChannelSuffix)\" : \"\"\n+ /// Retrieves notification data if the app was launched by tapping on a notification.\n+ ///\n+ /// Returns `launchOptions.remoteNotification`,\n+ /// which is the raw APNs data dictionary\n+ /// if the app launch was opened by a notification tap,\n+ /// else null. See Apple doc:\n+ /// https://developer.apple.com/documentation/uikit/uiapplication/launchoptionskey/remotenotification\n+ let getNotificationDataFromLaunchChannel = FlutterBasicMessageChannel(name: \"dev.flutter.pigeon.zulip.NotificationHostApi.getNotificationDataFromLaunch\\(channelSuffix)\", binaryMessenger: binaryMessenger, codec: codec)\n+ if let api = api {\n+ getNotificationDataFromLaunchChannel.setMessageHandler { _, reply in\n+ do {\n+ let result = try api.getNotificationDataFromLaunch()\n+ reply(wrapResult(result))\n+ } catch {\n+ reply(wrapError(error))\n+ }\n+ }\n+ } else {\n+ getNotificationDataFromLaunchChannel.setMessageHandler(nil)\n+ }\n+ }\n+}\n+\n+private class PigeonStreamHandler: NSObject, FlutterStreamHandler {\n+ private let wrapper: PigeonEventChannelWrapper\n+ private var pigeonSink: PigeonEventSink? = nil\n+\n+ init(wrapper: PigeonEventChannelWrapper) {\n+ self.wrapper = wrapper\n+ }\n+\n+ func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink)\n+ -> FlutterError?\n+ {\n+ pigeonSink = PigeonEventSink(events)\n+ wrapper.onListen(withArguments: arguments, sink: pigeonSink!)\n+ return nil\n+ }\n+\n+ func onCancel(withArguments arguments: Any?) -> FlutterError? {\n+ pigeonSink = nil\n+ wrapper.onCancel(withArguments: arguments)\n+ return nil\n+ }\n+}\n+\n+class PigeonEventChannelWrapper {\n+ func onListen(withArguments arguments: Any?, sink: PigeonEventSink) {}\n+ func onCancel(withArguments arguments: Any?) {}\n+}\n+\n+class PigeonEventSink {\n+ private let sink: FlutterEventSink\n+\n+ init(_ sink: @escaping FlutterEventSink) {\n+ self.sink = sink\n+ }\n+\n+ func success(_ value: ReturnType) {\n+ sink(value)\n+ }\n+\n+ func error(code: String, message: String?, details: Any?) {\n+ sink(FlutterError(code: code, message: message, details: details))\n+ }\n+\n+ func endOfStream() {\n+ sink(FlutterEndOfEventStream)\n+ }\n+\n+}\n+\n+class NotificationTapEventsStreamHandler: PigeonEventChannelWrapper {\n+ static func register(with messenger: FlutterBinaryMessenger,\n+ instanceName: String = \"\",\n+ streamHandler: NotificationTapEventsStreamHandler) {\n+ var channelName = \"dev.flutter.pigeon.zulip.NotificationEventChannelApi.notificationTapEvents\"\n+ if !instanceName.isEmpty {\n+ channelName += \".\\(instanceName)\"\n+ }\n+ let internalStreamHandler = PigeonStreamHandler(wrapper: streamHandler)\n+ let channel = FlutterEventChannel(name: channelName, binaryMessenger: messenger, codec: notificationsPigeonMethodCodec)\n+ channel.setStreamHandler(internalStreamHandler)\n+ }\n+}\n+ \ndiff --git a/lib/host/notifications.dart b/lib/host/notifications.dart\nnew file mode 100644\nindex 0000000000..6c3e593e2c\n--- /dev/null\n+++ b/lib/host/notifications.dart\n@@ -0,0 +1,1 @@\n+export './notifications.g.dart';\ndiff --git a/lib/host/notifications.g.dart b/lib/host/notifications.g.dart\nnew file mode 100644\nindex 0000000000..a83b67c804\n--- /dev/null\n+++ b/lib/host/notifications.g.dart\n@@ -0,0 +1,210 @@\n+// Autogenerated from Pigeon (v25.3.1), do not edit directly.\n+// See also: https://pub.dev/packages/pigeon\n+// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers\n+\n+import 'dart:async';\n+import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List;\n+\n+import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer;\n+import 'package:flutter/services.dart';\n+\n+PlatformException _createConnectionError(String channelName) {\n+ return PlatformException(\n+ code: 'channel-error',\n+ message: 'Unable to establish connection on channel: \"$channelName\".',\n+ );\n+}\n+bool _deepEquals(Object? a, Object? b) {\n+ if (a is List && b is List) {\n+ return a.length == b.length &&\n+ a.indexed\n+ .every(((int, dynamic) item) => _deepEquals(item.$2, b[item.$1]));\n+ }\n+ if (a is Map && b is Map) {\n+ return a.length == b.length && a.entries.every((MapEntry entry) =>\n+ (b as Map).containsKey(entry.key) &&\n+ _deepEquals(entry.value, b[entry.key]));\n+ }\n+ return a == b;\n+}\n+\n+\n+class NotificationDataFromLaunch {\n+ NotificationDataFromLaunch({\n+ required this.payload,\n+ });\n+\n+ /// The raw payload that is attached to the notification,\n+ /// holding the information required to carry out the navigation.\n+ ///\n+ /// See [NotificationHostApi.getNotificationDataFromLaunch].\n+ Map payload;\n+\n+ List _toList() {\n+ return [\n+ payload,\n+ ];\n+ }\n+\n+ Object encode() {\n+ return _toList(); }\n+\n+ static NotificationDataFromLaunch decode(Object result) {\n+ result as List;\n+ return NotificationDataFromLaunch(\n+ payload: (result[0] as Map?)!.cast(),\n+ );\n+ }\n+\n+ @override\n+ // ignore: avoid_equals_and_hash_code_on_mutable_classes\n+ bool operator ==(Object other) {\n+ if (other is! NotificationDataFromLaunch || other.runtimeType != runtimeType) {\n+ return false;\n+ }\n+ if (identical(this, other)) {\n+ return true;\n+ }\n+ return _deepEquals(encode(), other.encode());\n+ }\n+\n+ @override\n+ // ignore: avoid_equals_and_hash_code_on_mutable_classes\n+ int get hashCode => Object.hashAll(_toList())\n+;\n+}\n+\n+class NotificationTapEvent {\n+ NotificationTapEvent({\n+ required this.payload,\n+ });\n+\n+ /// The raw payload that is attached to the notification,\n+ /// holding the information required to carry out the navigation.\n+ ///\n+ /// See [notificationTapEvents].\n+ Map payload;\n+\n+ List _toList() {\n+ return [\n+ payload,\n+ ];\n+ }\n+\n+ Object encode() {\n+ return _toList(); }\n+\n+ static NotificationTapEvent decode(Object result) {\n+ result as List;\n+ return NotificationTapEvent(\n+ payload: (result[0] as Map?)!.cast(),\n+ );\n+ }\n+\n+ @override\n+ // ignore: avoid_equals_and_hash_code_on_mutable_classes\n+ bool operator ==(Object other) {\n+ if (other is! NotificationTapEvent || other.runtimeType != runtimeType) {\n+ return false;\n+ }\n+ if (identical(this, other)) {\n+ return true;\n+ }\n+ return _deepEquals(encode(), other.encode());\n+ }\n+\n+ @override\n+ // ignore: avoid_equals_and_hash_code_on_mutable_classes\n+ int get hashCode => Object.hashAll(_toList())\n+;\n+}\n+\n+\n+class _PigeonCodec extends StandardMessageCodec {\n+ const _PigeonCodec();\n+ @override\n+ void writeValue(WriteBuffer buffer, Object? value) {\n+ if (value is int) {\n+ buffer.putUint8(4);\n+ buffer.putInt64(value);\n+ } else if (value is NotificationDataFromLaunch) {\n+ buffer.putUint8(129);\n+ writeValue(buffer, value.encode());\n+ } else if (value is NotificationTapEvent) {\n+ buffer.putUint8(130);\n+ writeValue(buffer, value.encode());\n+ } else {\n+ super.writeValue(buffer, value);\n+ }\n+ }\n+\n+ @override\n+ Object? readValueOfType(int type, ReadBuffer buffer) {\n+ switch (type) {\n+ case 129: \n+ return NotificationDataFromLaunch.decode(readValue(buffer)!);\n+ case 130: \n+ return NotificationTapEvent.decode(readValue(buffer)!);\n+ default:\n+ return super.readValueOfType(type, buffer);\n+ }\n+ }\n+}\n+\n+const StandardMethodCodec pigeonMethodCodec = StandardMethodCodec(_PigeonCodec());\n+\n+class NotificationHostApi {\n+ /// Constructor for [NotificationHostApi]. The [binaryMessenger] named argument is\n+ /// available for dependency injection. If it is left null, the default\n+ /// BinaryMessenger will be used which routes to the host platform.\n+ NotificationHostApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})\n+ : pigeonVar_binaryMessenger = binaryMessenger,\n+ pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';\n+ final BinaryMessenger? pigeonVar_binaryMessenger;\n+\n+ static const MessageCodec pigeonChannelCodec = _PigeonCodec();\n+\n+ final String pigeonVar_messageChannelSuffix;\n+\n+ /// Retrieves notification data if the app was launched by tapping on a notification.\n+ ///\n+ /// Returns `launchOptions.remoteNotification`,\n+ /// which is the raw APNs data dictionary\n+ /// if the app launch was opened by a notification tap,\n+ /// else null. See Apple doc:\n+ /// https://developer.apple.com/documentation/uikit/uiapplication/launchoptionskey/remotenotification\n+ Future getNotificationDataFromLaunch() async {\n+ final String pigeonVar_channelName = 'dev.flutter.pigeon.zulip.NotificationHostApi.getNotificationDataFromLaunch$pigeonVar_messageChannelSuffix';\n+ final BasicMessageChannel pigeonVar_channel = BasicMessageChannel(\n+ pigeonVar_channelName,\n+ pigeonChannelCodec,\n+ binaryMessenger: pigeonVar_binaryMessenger,\n+ );\n+ final Future pigeonVar_sendFuture = pigeonVar_channel.send(null);\n+ final List? pigeonVar_replyList =\n+ await pigeonVar_sendFuture as List?;\n+ if (pigeonVar_replyList == null) {\n+ throw _createConnectionError(pigeonVar_channelName);\n+ } else if (pigeonVar_replyList.length > 1) {\n+ throw PlatformException(\n+ code: pigeonVar_replyList[0]! as String,\n+ message: pigeonVar_replyList[1] as String?,\n+ details: pigeonVar_replyList[2],\n+ );\n+ } else {\n+ return (pigeonVar_replyList[0] as NotificationDataFromLaunch?);\n+ }\n+ }\n+}\n+\n+Stream notificationTapEvents( {String instanceName = ''}) {\n+ if (instanceName.isNotEmpty) {\n+ instanceName = '.$instanceName';\n+ }\n+ final EventChannel notificationTapEventsChannel =\n+ EventChannel('dev.flutter.pigeon.zulip.NotificationEventChannelApi.notificationTapEvents$instanceName', pigeonMethodCodec);\n+ return notificationTapEventsChannel.receiveBroadcastStream().map((dynamic event) {\n+ return event as NotificationTapEvent;\n+ });\n+}\n+ \ndiff --git a/lib/model/binding.dart b/lib/model/binding.dart\nindex fb3add46da..4d1a0adaac 100644\n--- a/lib/model/binding.dart\n+++ b/lib/model/binding.dart\n@@ -11,6 +11,7 @@ import 'package:url_launcher/url_launcher.dart' as url_launcher;\n import 'package:wakelock_plus/wakelock_plus.dart' as wakelock_plus;\n \n import '../host/android_notifications.dart';\n+import '../host/notifications.dart' as notif_pigeon;\n import '../log.dart';\n import '../widgets/store.dart';\n import 'store.dart';\n@@ -180,6 +181,9 @@ abstract class ZulipBinding {\n /// Wraps the [AndroidNotificationHostApi] constructor.\n AndroidNotificationHostApi get androidNotificationHost;\n \n+ /// Wraps the [notif_pigeon.NotificationHostApi] class.\n+ NotificationPigeonApi get notificationPigeonApi;\n+\n /// Pick files from the media library, via package:file_picker.\n ///\n /// This wraps [file_picker.pickFiles].\n@@ -324,6 +328,19 @@ class PackageInfo {\n });\n }\n \n+// Pigeon generates methods under `@EventChannelApi` annotated classes\n+// in global scope of the generated file. This is a helper class to\n+// namespace the notification related Pigeon API under a single class.\n+class NotificationPigeonApi {\n+ final _hostApi = notif_pigeon.NotificationHostApi();\n+\n+ Future getNotificationDataFromLaunch() =>\n+ _hostApi.getNotificationDataFromLaunch();\n+\n+ Stream notificationTapEventsStream() =>\n+ notif_pigeon.notificationTapEvents();\n+}\n+\n /// A concrete binding for use in the live application.\n ///\n /// The global store returned by [getGlobalStore], and consequently by\n@@ -469,6 +486,9 @@ class LiveZulipBinding extends ZulipBinding {\n @override\n AndroidNotificationHostApi get androidNotificationHost => AndroidNotificationHostApi();\n \n+ @override\n+ NotificationPigeonApi get notificationPigeonApi => NotificationPigeonApi();\n+\n @override\n Future pickFiles({\n bool allowMultiple = false,\ndiff --git a/lib/notifications/display.dart b/lib/notifications/display.dart\nindex 6e2585e135..0a3de1689a 100644\n--- a/lib/notifications/display.dart\n+++ b/lib/notifications/display.dart\n@@ -3,24 +3,18 @@ import 'dart:io';\n \n import 'package:collection/collection.dart';\n import 'package:flutter/foundation.dart';\n-import 'package:flutter/widgets.dart' hide Notification;\n import 'package:http/http.dart' as http;\n \n import '../api/model/model.dart';\n import '../api/notifications.dart';\n-import '../generated/l10n/zulip_localizations.dart';\n import '../host/android_notifications.dart';\n import '../log.dart';\n import '../model/binding.dart';\n import '../model/localizations.dart';\n import '../model/narrow.dart';\n-import '../widgets/app.dart';\n import '../widgets/color.dart';\n-import '../widgets/dialog.dart';\n-import '../widgets/message_list.dart';\n-import '../widgets/page.dart';\n-import '../widgets/store.dart';\n import '../widgets/theme.dart';\n+import 'open.dart';\n \n AndroidNotificationHostApi get _androidHost => ZulipBinding.instance.androidNotificationHost;\n \n@@ -302,7 +296,7 @@ class NotificationDisplayManager {\n TopicNarrow(streamId, topic),\n FcmMessageDmRecipient(:var allRecipientIds) =>\n DmNarrow(allRecipientIds: allRecipientIds, selfUserId: data.userId),\n- }).buildUrl();\n+ }).buildAndroidNotificationUrl();\n \n await _androidHost.notify(\n id: kNotificationId,\n@@ -481,62 +475,6 @@ class NotificationDisplayManager {\n \n static String _personKey(Uri realmUrl, int userId) => \"$realmUrl|$userId\";\n \n- /// Provides the route and the account ID by parsing the notification URL.\n- ///\n- /// The URL must have been generated using [NotificationOpenPayload.buildUrl]\n- /// while creating the notification.\n- ///\n- /// Returns null and shows an error dialog if the associated account is not\n- /// found in the global store.\n- static AccountRoute? routeForNotification({\n- required BuildContext context,\n- required Uri url,\n- }) {\n- assert(defaultTargetPlatform == TargetPlatform.android);\n-\n- final globalStore = GlobalStoreWidget.of(context);\n-\n- assert(debugLog('got notif: url: $url'));\n- assert(url.scheme == 'zulip' && url.host == 'notification');\n- final payload = NotificationOpenPayload.parseUrl(url);\n-\n- final account = globalStore.accounts.firstWhereOrNull(\n- (account) => account.realmUrl.origin == payload.realmUrl.origin\n- && account.userId == payload.userId);\n- if (account == null) { // TODO(log)\n- final zulipLocalizations = ZulipLocalizations.of(context);\n- showErrorDialog(context: context,\n- title: zulipLocalizations.errorNotificationOpenTitle,\n- message: zulipLocalizations.errorNotificationOpenAccountNotFound);\n- return null;\n- }\n-\n- return MessageListPage.buildRoute(\n- accountId: account.id,\n- // TODO(#1565): Open at specific message, not just conversation\n- narrow: payload.narrow);\n- }\n-\n- /// Navigates to the [MessageListPage] of the specific conversation\n- /// given the `zulip://notification/\u2026` Android intent data URL,\n- /// generated with [NotificationOpenPayload.buildUrl] while creating\n- /// the notification.\n- static Future navigateForNotification(Uri url) async {\n- assert(defaultTargetPlatform == TargetPlatform.android);\n- assert(debugLog('opened notif: url: $url'));\n-\n- NavigatorState navigator = await ZulipApp.navigator;\n- final context = navigator.context;\n- assert(context.mounted);\n- if (!context.mounted) return; // TODO(linter): this is impossible as there's no actual async gap, but the use_build_context_synchronously lint doesn't see that\n-\n- final route = routeForNotification(context: context, url: url);\n- if (route == null) return; // TODO(log)\n-\n- // TODO(nav): Better interact with existing nav stack on notif open\n- unawaited(navigator.push(route));\n- }\n-\n static Future _fetchBitmap(Uri url) async {\n try {\n // TODO timeout to prevent waiting indefinitely\n@@ -550,86 +488,3 @@ class NotificationDisplayManager {\n return null;\n }\n }\n-\n-/// The information contained in 'zulip://notification/\u2026' internal\n-/// Android intent data URL, used for notification-open flow.\n-class NotificationOpenPayload {\n- final Uri realmUrl;\n- final int userId;\n- final Narrow narrow;\n-\n- NotificationOpenPayload({\n- required this.realmUrl,\n- required this.userId,\n- required this.narrow,\n- });\n-\n- factory NotificationOpenPayload.parseUrl(Uri url) {\n- if (url case Uri(\n- scheme: 'zulip',\n- host: 'notification',\n- queryParameters: {\n- 'realm_url': var realmUrlStr,\n- 'user_id': var userIdStr,\n- 'narrow_type': var narrowType,\n- // In case of narrowType == 'topic':\n- // 'channel_id' and 'topic' handled below.\n-\n- // In case of narrowType == 'dm':\n- // 'all_recipient_ids' handled below.\n- },\n- )) {\n- final realmUrl = Uri.parse(realmUrlStr);\n- final userId = int.parse(userIdStr, radix: 10);\n-\n- final Narrow narrow;\n- switch (narrowType) {\n- case 'topic':\n- final channelIdStr = url.queryParameters['channel_id']!;\n- final channelId = int.parse(channelIdStr, radix: 10);\n- final topicStr = url.queryParameters['topic']!;\n- narrow = TopicNarrow(channelId, TopicName(topicStr));\n- case 'dm':\n- final allRecipientIdsStr = url.queryParameters['all_recipient_ids']!;\n- final allRecipientIds = allRecipientIdsStr.split(',')\n- .map((idStr) => int.parse(idStr, radix: 10))\n- .toList(growable: false);\n- narrow = DmNarrow(allRecipientIds: allRecipientIds, selfUserId: userId);\n- default:\n- throw const FormatException();\n- }\n-\n- return NotificationOpenPayload(\n- realmUrl: realmUrl,\n- userId: userId,\n- narrow: narrow,\n- );\n- } else {\n- // TODO(dart): simplify after https://github.com/dart-lang/language/issues/2537\n- throw const FormatException();\n- }\n- }\n-\n- Uri buildUrl() {\n- return Uri(\n- scheme: 'zulip',\n- host: 'notification',\n- queryParameters: {\n- 'realm_url': realmUrl.toString(),\n- 'user_id': userId.toString(),\n- ...(switch (narrow) {\n- TopicNarrow(streamId: var channelId, :var topic) => {\n- 'narrow_type': 'topic',\n- 'channel_id': channelId.toString(),\n- 'topic': topic.apiName,\n- },\n- DmNarrow(:var allRecipientIds) => {\n- 'narrow_type': 'dm',\n- 'all_recipient_ids': allRecipientIds.join(','),\n- },\n- _ => throw UnsupportedError('Found an unexpected Narrow of type ${narrow.runtimeType}.'),\n- })\n- },\n- );\n- }\n-}\ndiff --git a/lib/notifications/open.dart b/lib/notifications/open.dart\nnew file mode 100644\nindex 0000000000..2eb281473c\n--- /dev/null\n+++ b/lib/notifications/open.dart\n@@ -0,0 +1,346 @@\n+import 'dart:async';\n+import 'dart:convert';\n+\n+import 'package:collection/collection.dart';\n+import 'package:flutter/foundation.dart';\n+import 'package:flutter/widgets.dart';\n+\n+import '../api/model/model.dart';\n+import '../generated/l10n/zulip_localizations.dart';\n+import '../host/notifications.dart';\n+import '../log.dart';\n+import '../model/binding.dart';\n+import '../model/narrow.dart';\n+import '../widgets/app.dart';\n+import '../widgets/dialog.dart';\n+import '../widgets/message_list.dart';\n+import '../widgets/page.dart';\n+import '../widgets/store.dart';\n+\n+NotificationPigeonApi get _notifPigeonApi => ZulipBinding.instance.notificationPigeonApi;\n+\n+/// Responds to the user opening a notification.\n+class NotificationOpenService {\n+ static NotificationOpenService get instance => (_instance ??= NotificationOpenService._());\n+ static NotificationOpenService? _instance;\n+\n+ NotificationOpenService._();\n+\n+ /// Reset the state of the [NotificationNavigationService], for testing.\n+ static void debugReset() {\n+ _instance = null;\n+ }\n+\n+ NotificationDataFromLaunch? _notifDataFromLaunch;\n+\n+ /// A [Future] that completes to signal that the initialization of\n+ /// [NotificationNavigationService] has completed\n+ /// (with either success or failure).\n+ ///\n+ /// Null if [start] hasn't been called.\n+ Future? get initialized => _initializedSignal?.future;\n+\n+ Completer? _initializedSignal;\n+\n+ Future start() async {\n+ assert(_initializedSignal == null);\n+ _initializedSignal = Completer();\n+ try {\n+ switch (defaultTargetPlatform) {\n+ case TargetPlatform.iOS:\n+ _notifDataFromLaunch = await _notifPigeonApi.getNotificationDataFromLaunch();\n+ _notifPigeonApi.notificationTapEventsStream()\n+ .listen(_navigateForNotification);\n+\n+ case TargetPlatform.android:\n+ // Do nothing; we do notification routing differently on Android.\n+ // TODO migrate Android to use the new Pigeon API.\n+ break;\n+\n+ case TargetPlatform.fuchsia:\n+ case TargetPlatform.linux:\n+ case TargetPlatform.macOS:\n+ case TargetPlatform.windows:\n+ // Do nothing; we don't offer notifications on these platforms.\n+ break;\n+ }\n+ } finally {\n+ _initializedSignal!.complete();\n+ }\n+ }\n+\n+ /// Provides the route to open if the app was launched through a tap on\n+ /// a notification.\n+ ///\n+ /// Returns null if app launch wasn't triggered by a notification, or if\n+ /// an error occurs while determining the route for the notification.\n+ /// In the latter case an error dialog is also shown.\n+ ///\n+ /// The context argument should be a descendant of the app's main [Navigator].\n+ AccountRoute? routeForNotificationFromLaunch({required BuildContext context}) {\n+ assert(defaultTargetPlatform == TargetPlatform.iOS);\n+ final data = _notifDataFromLaunch;\n+ if (data == null) return null;\n+ assert(debugLog('opened notif: ${jsonEncode(data.payload)}'));\n+\n+ final notifNavData = _tryParseIosApnsPayload(context, data.payload);\n+ if (notifNavData == null) return null; // TODO(log)\n+\n+ return routeForNotification(context: context, data: notifNavData);\n+ }\n+\n+ /// Provides the route to open by parsing the notification payload.\n+ ///\n+ /// Returns null and shows an error dialog if the associated account is not\n+ /// found in the global store.\n+ ///\n+ /// The context argument should be a descendant of the app's main [Navigator].\n+ static AccountRoute? routeForNotification({\n+ required BuildContext context,\n+ required NotificationOpenPayload data,\n+ }) {\n+ final globalStore = GlobalStoreWidget.of(context);\n+\n+ final account = globalStore.accounts.firstWhereOrNull(\n+ (account) => account.realmUrl.origin == data.realmUrl.origin\n+ && account.userId == data.userId);\n+ if (account == null) { // TODO(log)\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n+ showErrorDialog(context: context,\n+ title: zulipLocalizations.errorNotificationOpenTitle,\n+ message: zulipLocalizations.errorNotificationOpenAccountNotFound);\n+ return null;\n+ }\n+\n+ return MessageListPage.buildRoute(\n+ accountId: account.id,\n+ // TODO(#1565): Open at specific message, not just conversation\n+ narrow: data.narrow);\n+ }\n+\n+ /// Navigates to the [MessageListPage] of the specific conversation\n+ /// for the provided payload that was attached while creating the\n+ /// notification.\n+ static Future _navigateForNotification(NotificationTapEvent event) async {\n+ assert(defaultTargetPlatform == TargetPlatform.iOS);\n+ assert(debugLog('opened notif: ${jsonEncode(event.payload)}'));\n+\n+ NavigatorState navigator = await ZulipApp.navigator;\n+ final context = navigator.context;\n+ assert(context.mounted);\n+ if (!context.mounted) return; // TODO(linter): this is impossible as there's no actual async gap, but the use_build_context_synchronously lint doesn't see that\n+\n+ final notifNavData = _tryParseIosApnsPayload(context, event.payload);\n+ if (notifNavData == null) return; // TODO(log)\n+ final route = routeForNotification(context: context, data: notifNavData);\n+ if (route == null) return; // TODO(log)\n+\n+ // TODO(nav): Better interact with existing nav stack on notif open\n+ unawaited(navigator.push(route));\n+ }\n+\n+ /// Navigates to the [MessageListPage] of the specific conversation\n+ /// given the `zulip://notification/\u2026` Android intent data URL,\n+ /// generated with [NotificationOpenPayload.buildAndroidNotificationUrl]\n+ /// while creating the notification.\n+ static Future navigateForAndroidNotificationUrl(Uri url) async {\n+ assert(defaultTargetPlatform == TargetPlatform.android);\n+ assert(debugLog('opened notif: url: $url'));\n+\n+ NavigatorState navigator = await ZulipApp.navigator;\n+ final context = navigator.context;\n+ assert(context.mounted);\n+ if (!context.mounted) return; // TODO(linter): this is impossible as there's no actual async gap, but the use_build_context_synchronously lint doesn't see that\n+\n+ assert(url.scheme == 'zulip' && url.host == 'notification');\n+ final data = tryParseAndroidNotificationUrl(context: context, url: url);\n+ if (data == null) return; // TODO(log)\n+ final route = routeForNotification(context: context, data: data);\n+ if (route == null) return; // TODO(log)\n+\n+ // TODO(nav): Better interact with existing nav stack on notif open\n+ unawaited(navigator.push(route));\n+ }\n+\n+ static NotificationOpenPayload? _tryParseIosApnsPayload(\n+ BuildContext context,\n+ Map payload,\n+ ) {\n+ try {\n+ return NotificationOpenPayload.parseIosApnsPayload(payload);\n+ } on FormatException catch (e, st) {\n+ assert(debugLog('$e\\n$st'));\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n+ showErrorDialog(context: context,\n+ title: zulipLocalizations.errorNotificationOpenTitle);\n+ return null;\n+ }\n+ }\n+\n+ static NotificationOpenPayload? tryParseAndroidNotificationUrl({\n+ required BuildContext context,\n+ required Uri url,\n+ }) {\n+ try {\n+ return NotificationOpenPayload.parseAndroidNotificationUrl(url);\n+ } on FormatException catch (e, st) {\n+ assert(debugLog('$e\\n$st'));\n+ final zulipLocalizations = ZulipLocalizations.of(context);\n+ showErrorDialog(context: context,\n+ title: zulipLocalizations.errorNotificationOpenTitle);\n+ return null;\n+ }\n+ }\n+}\n+\n+/// The data from a notification that describes what to do\n+/// when the user opens the notification.\n+class NotificationOpenPayload {\n+ final Uri realmUrl;\n+ final int userId;\n+ final Narrow narrow;\n+\n+ NotificationOpenPayload({\n+ required this.realmUrl,\n+ required this.userId,\n+ required this.narrow,\n+ });\n+\n+ /// Parses the iOS APNs payload and retrieves the information\n+ /// required for navigation.\n+ factory NotificationOpenPayload.parseIosApnsPayload(Map payload) {\n+ if (payload case {\n+ 'zulip': {\n+ 'user_id': final int userId,\n+ 'sender_id': final int senderId,\n+ } && final zulipData,\n+ }) {\n+ final eventType = zulipData['event'];\n+ if (eventType != null && eventType != 'message') {\n+ // On Android, we also receive \"remove\" notification messages, tagged\n+ // with an `event` field with value 'remove'. As of Zulip Server 10,\n+ // however, these are not yet sent to iOS devices, and we don't have a\n+ // way to handle them even if they were.\n+ //\n+ // The messages we currently do receive, and can handle, are analogous\n+ // to Android notification messages of event type 'message'. On the\n+ // assumption that some future version of the Zulip server will send\n+ // explicit event types in APNs messages, accept messages with that\n+ // `event` value, but no other.\n+ throw const FormatException();\n+ }\n+\n+ final realmUrl = switch (zulipData) {\n+ {'realm_url': final String value} => value,\n+ {'realm_uri': final String value} => value,\n+ _ => throw const FormatException(),\n+ };\n+\n+ final narrow = switch (zulipData) {\n+ {\n+ 'recipient_type': 'stream',\n+ // TODO(server-5) remove this comment.\n+ // We require 'stream_id' here but that is new from Server 5.0,\n+ // resulting in failure on pre-5.0 servers.\n+ 'stream_id': final int streamId,\n+ 'topic': final String topic,\n+ } =>\n+ TopicNarrow(streamId, TopicName(topic)),\n+\n+ {'recipient_type': 'private', 'pm_users': final String pmUsers} =>\n+ DmNarrow(\n+ allRecipientIds: pmUsers\n+ .split(',')\n+ .map((e) => int.parse(e, radix: 10))\n+ .toList(growable: false)\n+ ..sort(),\n+ selfUserId: userId),\n+\n+ {'recipient_type': 'private'} =>\n+ DmNarrow.withUser(senderId, selfUserId: userId),\n+\n+ _ => throw const FormatException(),\n+ };\n+\n+ return NotificationOpenPayload(\n+ realmUrl: Uri.parse(realmUrl),\n+ userId: userId,\n+ narrow: narrow);\n+ } else {\n+ // TODO(dart): simplify after https://github.com/dart-lang/language/issues/2537\n+ throw const FormatException();\n+ }\n+ }\n+\n+ /// Parses the internal Android notification url, that was created using\n+ /// [buildAndroidNotificationUrl], and retrieves the information required\n+ /// for navigation.\n+ factory NotificationOpenPayload.parseAndroidNotificationUrl(Uri url) {\n+ if (url case Uri(\n+ scheme: 'zulip',\n+ host: 'notification',\n+ queryParameters: {\n+ 'realm_url': var realmUrlStr,\n+ 'user_id': var userIdStr,\n+ 'narrow_type': var narrowType,\n+ // In case of narrowType == 'topic':\n+ // 'channel_id' and 'topic' handled below.\n+\n+ // In case of narrowType == 'dm':\n+ // 'all_recipient_ids' handled below.\n+ },\n+ )) {\n+ final realmUrl = Uri.parse(realmUrlStr);\n+ final userId = int.parse(userIdStr, radix: 10);\n+\n+ final Narrow narrow;\n+ switch (narrowType) {\n+ case 'topic':\n+ final channelIdStr = url.queryParameters['channel_id']!;\n+ final channelId = int.parse(channelIdStr, radix: 10);\n+ final topicStr = url.queryParameters['topic']!;\n+ narrow = TopicNarrow(channelId, TopicName(topicStr));\n+ case 'dm':\n+ final allRecipientIdsStr = url.queryParameters['all_recipient_ids']!;\n+ final allRecipientIds = allRecipientIdsStr.split(',')\n+ .map((idStr) => int.parse(idStr, radix: 10))\n+ .toList(growable: false);\n+ narrow = DmNarrow(allRecipientIds: allRecipientIds, selfUserId: userId);\n+ default:\n+ throw const FormatException();\n+ }\n+\n+ return NotificationOpenPayload(\n+ realmUrl: realmUrl,\n+ userId: userId,\n+ narrow: narrow,\n+ );\n+ } else {\n+ // TODO(dart): simplify after https://github.com/dart-lang/language/issues/2537\n+ throw const FormatException();\n+ }\n+ }\n+\n+ Uri buildAndroidNotificationUrl() {\n+ return Uri(\n+ scheme: 'zulip',\n+ host: 'notification',\n+ queryParameters: {\n+ 'realm_url': realmUrl.toString(),\n+ 'user_id': userId.toString(),\n+ ...(switch (narrow) {\n+ TopicNarrow(streamId: var channelId, :var topic) => {\n+ 'narrow_type': 'topic',\n+ 'channel_id': channelId.toString(),\n+ 'topic': topic.apiName,\n+ },\n+ DmNarrow(:var allRecipientIds) => {\n+ 'narrow_type': 'dm',\n+ 'all_recipient_ids': allRecipientIds.join(','),\n+ },\n+ _ => throw UnsupportedError('Found an unexpected Narrow of type ${narrow.runtimeType}.'),\n+ })\n+ },\n+ );\n+ }\n+}\ndiff --git a/lib/notifications/receive.dart b/lib/notifications/receive.dart\nindex d60469ff30..212b0f5f0d 100644\n--- a/lib/notifications/receive.dart\n+++ b/lib/notifications/receive.dart\n@@ -8,6 +8,7 @@ import '../firebase_options.dart';\n import '../log.dart';\n import '../model/binding.dart';\n import 'display.dart';\n+import 'open.dart';\n \n @pragma('vm:entry-point')\n class NotificationService {\n@@ -24,6 +25,7 @@ class NotificationService {\n instance.token.dispose();\n _instance = null;\n assert(debugBackgroundIsolateIsLive = true);\n+ NotificationOpenService.debugReset();\n }\n \n /// Whether a background isolate should initialize [LiveZulipBinding].\n@@ -77,6 +79,8 @@ class NotificationService {\n await _getFcmToken();\n \n case TargetPlatform.iOS: // TODO(#324): defer requesting notif permission\n+ await NotificationOpenService.instance.start();\n+\n await ZulipBinding.instance.firebaseInitializeApp(\n options: kFirebaseOptionsIos);\n \ndiff --git a/lib/widgets/app.dart b/lib/widgets/app.dart\nindex 54ba92588b..b1aa763ac8 100644\n--- a/lib/widgets/app.dart\n+++ b/lib/widgets/app.dart\n@@ -9,7 +9,7 @@ import '../log.dart';\n import '../model/actions.dart';\n import '../model/localizations.dart';\n import '../model/store.dart';\n-import '../notifications/display.dart';\n+import '../notifications/open.dart';\n import 'about_zulip.dart';\n import 'dialog.dart';\n import 'home.dart';\n@@ -168,27 +168,45 @@ class _ZulipAppState extends State with WidgetsBindingObserver {\n super.dispose();\n }\n \n- List> _handleGenerateInitialRoutes(String initialRoute) {\n- // The `_ZulipAppState.context` lacks the required ancestors. Instead\n- // we use the Navigator which should be available when this callback is\n- // called and it's context should have the required ancestors.\n- final context = ZulipApp.navigatorKey.currentContext!;\n+ AccountRoute? _initialRouteIos(BuildContext context) {\n+ return NotificationOpenService.instance\n+ .routeForNotificationFromLaunch(context: context);\n+ }\n \n+ // TODO migrate Android's notification navigation to use the new Pigeon API.\n+ AccountRoute? _initialRouteAndroid(\n+ BuildContext context,\n+ String initialRoute,\n+ ) {\n final initialRouteUrl = Uri.tryParse(initialRoute);\n if (initialRouteUrl case Uri(scheme: 'zulip', host: 'notification')) {\n- final route = NotificationDisplayManager.routeForNotification(\n+ assert(debugLog('got notif: url: $initialRouteUrl'));\n+ final data = NotificationOpenService.tryParseAndroidNotificationUrl(\n context: context,\n url: initialRouteUrl);\n+ if (data == null) return null; // TODO(log)\n+ return NotificationOpenService.routeForNotification(\n+ context: context,\n+ data: data);\n+ }\n+\n+ return null;\n+ }\n+\n+ List> _handleGenerateInitialRoutes(String initialRoute) {\n+ // The `_ZulipAppState.context` lacks the required ancestors. Instead\n+ // we use the Navigator which should be available when this callback is\n+ // called and its context should have the required ancestors.\n+ final context = ZulipApp.navigatorKey.currentContext!;\n \n- if (route != null) {\n- return [\n- HomePage.buildRoute(accountId: route.accountId),\n- route,\n- ];\n- } else {\n- // The account didn't match any existing accounts,\n- // fall through to show the default route below.\n- }\n+ final route = defaultTargetPlatform == TargetPlatform.iOS\n+ ? _initialRouteIos(context)\n+ : _initialRouteAndroid(context, initialRoute);\n+ if (route != null) {\n+ return [\n+ HomePage.buildRoute(accountId: route.accountId),\n+ route,\n+ ];\n }\n \n final globalStore = GlobalStoreWidget.of(context);\n@@ -209,7 +227,7 @@ class _ZulipAppState extends State with WidgetsBindingObserver {\n await LoginPage.handleWebAuthUrl(url);\n return true;\n case Uri(scheme: 'zulip', host: 'notification') && var url:\n- await NotificationDisplayManager.navigateForNotification(url);\n+ await NotificationOpenService.navigateForAndroidNotificationUrl(url);\n return true;\n }\n return super.didPushRouteInformation(routeInformation);\n@@ -218,6 +236,7 @@ class _ZulipAppState extends State with WidgetsBindingObserver {\n @override\n Widget build(BuildContext context) {\n return GlobalStoreWidget(\n+ blockingFuture: NotificationOpenService.instance.initialized,\n child: Builder(builder: (context) {\n return MaterialApp(\n onGenerateTitle: (BuildContext context) {\ndiff --git a/lib/widgets/dialog.dart b/lib/widgets/dialog.dart\nindex 08ce8f08c7..4d269cddba 100644\n--- a/lib/widgets/dialog.dart\n+++ b/lib/widgets/dialog.dart\n@@ -52,10 +52,12 @@ class DialogStatus {\n ///\n /// Prose in [message] should have final punctuation:\n /// https://github.com/zulip/zulip-flutter/pull/1498#issuecomment-2853578577\n+///\n+/// The context argument should be a descendant of the app's main [Navigator].\n // This API is inspired by [ScaffoldManager.showSnackBar]. We wrap\n // [showDialog]'s return value, a [Future], inside [DialogStatus]\n // whose documentation can be accessed. This helps avoid confusion when\n-// intepreting the meaning of the [Future].\n+// interpreting the meaning of the [Future].\n DialogStatus showErrorDialog({\n required BuildContext context,\n required String title,\n@@ -86,6 +88,8 @@ DialogStatus showErrorDialog({\n /// If the dialog was canceled,\n /// either with the cancel button or by tapping outside the dialog's area,\n /// it completes with null.\n+///\n+/// The context argument should be a descendant of the app's main [Navigator].\n DialogStatus showSuggestedActionDialog({\n required BuildContext context,\n required String title,\ndiff --git a/lib/widgets/store.dart b/lib/widgets/store.dart\nindex ab287b745a..f5fe4d3cc6 100644\n--- a/lib/widgets/store.dart\n+++ b/lib/widgets/store.dart\n@@ -18,10 +18,18 @@ import 'page.dart';\n class GlobalStoreWidget extends StatefulWidget {\n const GlobalStoreWidget({\n super.key,\n+ this.blockingFuture,\n this.placeholder = const LoadingPlaceholder(),\n required this.child,\n });\n \n+ /// An additional future to await before showing the child.\n+ ///\n+ /// If [blockingFuture] is non-null, then this widget will build [child]\n+ /// only after the future completes. This widget's behavior is not affected\n+ /// by whether the future's completion is with a value or with an error.\n+ final Future? blockingFuture;\n+\n final Widget placeholder;\n final Widget child;\n \n@@ -87,6 +95,9 @@ class _GlobalStoreWidgetState extends State {\n super.initState();\n (() async {\n final store = await ZulipBinding.instance.getGlobalStoreUniquely();\n+ if (widget.blockingFuture != null) {\n+ await widget.blockingFuture!.catchError((_) {});\n+ }\n setState(() {\n this.store = store;\n });\ndiff --git a/pigeon/android_notifications.dart b/pigeon/android_notifications.dart\nnew file mode 100644\nindex 0000000000..901369001c\n--- /dev/null\n+++ b/pigeon/android_notifications.dart\n@@ -0,0 +1,306 @@\n+import 'package:pigeon/pigeon.dart';\n+\n+// To rebuild this pigeon's output after editing this file,\n+// run `tools/check pigeon --fix`.\n+@ConfigurePigeon(PigeonOptions(\n+ dartOut: 'lib/host/android_notifications.g.dart',\n+ kotlinOut: 'android/app/src/main/kotlin/com/zulip/flutter/AndroidNotifications.g.kt',\n+ kotlinOptions: KotlinOptions(package: 'com.zulip.flutter'),\n+))\n+\n+/// Corresponds to `androidx.core.app.NotificationChannelCompat`\n+///\n+/// See: https://developer.android.com/reference/androidx/core/app/NotificationChannelCompat\n+class NotificationChannel {\n+ /// Corresponds to `androidx.core.app.NotificationChannelCompat.Builder`\n+ ///\n+ /// See: https://developer.android.com/reference/androidx/core/app/NotificationChannelCompat.Builder\n+ NotificationChannel({\n+ required this.id,\n+ required this.importance,\n+ this.name,\n+ this.lightsEnabled,\n+ this.soundUrl,\n+ this.vibrationPattern,\n+ });\n+\n+ final String id;\n+\n+ /// Specifies the importance level of notifications\n+ /// to be posted on this channel.\n+ ///\n+ /// Must be a valid constant from [NotificationImportance].\n+ final int importance;\n+\n+ final String? name;\n+ final bool? lightsEnabled;\n+ final String? soundUrl;\n+ final Int64List? vibrationPattern;\n+}\n+\n+/// Corresponds to `android.content.Intent`\n+///\n+/// See:\n+/// https://developer.android.com/reference/android/content/Intent\n+/// https://developer.android.com/reference/android/content/Intent#Intent(java.lang.String,%20android.net.Uri,%20android.content.Context,%20java.lang.Class%3C?%3E)\n+class AndroidIntent {\n+ AndroidIntent({required this.action, required this.dataUrl, this.flags = 0});\n+\n+ final String action;\n+ final String dataUrl;\n+\n+ /// A combination of flags from [IntentFlag].\n+ final int flags;\n+}\n+\n+/// Corresponds to `android.app.PendingIntent`.\n+///\n+/// See: https://developer.android.com/reference/android/app/PendingIntent\n+class PendingIntent {\n+ /// Corresponds to `PendingIntent.getActivity`.\n+ PendingIntent({required this.requestCode, required this.intent, required this.flags});\n+\n+ final int requestCode;\n+ final AndroidIntent intent;\n+\n+ /// A combination of flags from [PendingIntent.flags], and others associated\n+ /// with `Intent`; see Android docs for `PendingIntent.getActivity`.\n+ final int flags;\n+}\n+\n+/// Corresponds to `androidx.core.app.NotificationCompat.InboxStyle`\n+///\n+/// See: https://developer.android.com/reference/androidx/core/app/NotificationCompat.InboxStyle\n+class InboxStyle {\n+ InboxStyle({required this.summaryText});\n+\n+ final String summaryText;\n+}\n+\n+/// Corresponds to `androidx.core.app.Person`\n+///\n+/// See: https://developer.android.com/reference/androidx/core/app/Person\n+class Person {\n+ Person({\n+ required this.iconBitmap,\n+ required this.key,\n+ required this.name,\n+ });\n+\n+ /// An icon for this person.\n+ ///\n+ /// This should be compressed image data, in a format to be passed\n+ /// to `androidx.core.graphics.drawable.IconCompat.createWithData`.\n+ /// Supported formats include JPEG, PNG, and WEBP.\n+ ///\n+ /// See:\n+ /// https://developer.android.com/reference/androidx/core/graphics/drawable/IconCompat#createWithData(byte[],int,int)\n+ final Uint8List? iconBitmap;\n+\n+ final String key;\n+ final String name;\n+}\n+\n+/// Corresponds to `androidx.core.app.NotificationCompat.MessagingStyle.Message`\n+///\n+/// See: https://developer.android.com/reference/androidx/core/app/NotificationCompat.MessagingStyle.Message\n+class MessagingStyleMessage {\n+ MessagingStyleMessage({\n+ required this.text,\n+ required this.timestampMs,\n+ required this.person,\n+ });\n+\n+ final String text;\n+ final int timestampMs;\n+ final Person person;\n+}\n+\n+/// Corresponds to `androidx.core.app.NotificationCompat.MessagingStyle`\n+///\n+/// See: https://developer.android.com/reference/androidx/core/app/NotificationCompat.MessagingStyle\n+class MessagingStyle {\n+ MessagingStyle({\n+ required this.user,\n+ required this.conversationTitle,\n+ required this.isGroupConversation,\n+ required this.messages,\n+ });\n+\n+ final Person user;\n+ final String? conversationTitle;\n+ final List messages;\n+ final bool isGroupConversation;\n+}\n+\n+/// Corresponds to `android.app.Notification`\n+///\n+/// See: https://developer.android.com/reference/kotlin/android/app/Notification\n+class Notification {\n+ Notification({required this.group, required this.extras});\n+\n+ final String group;\n+ final Map extras;\n+ // Various other properties too; add them if needed.\n+}\n+\n+/// Corresponds to `android.service.notification.StatusBarNotification`\n+///\n+/// See: https://developer.android.com/reference/android/service/notification/StatusBarNotification\n+class StatusBarNotification {\n+ StatusBarNotification({required this.id, required this.tag, required this.notification});\n+\n+ final int id;\n+ final String tag;\n+ final Notification notification;\n+\n+ // Ignore `groupKey` and `key`. While the `.groupKey` contains the\n+ // `.notification.group`, and the `.key` contains the `.id` and `.tag`,\n+ // they also have more stuff added on (and their structure doesn't seem to\n+ // be documented.)\n+ // final String? groupKey;\n+ // final String? key;\n+\n+ // Various other properties too; add them if needed.\n+}\n+\n+/// Represents details about a notification sound stored in the\n+/// shared media store.\n+///\n+/// Returned as a list entry by\n+/// [AndroidNotificationHostApi.listStoredSoundsInNotificationsDirectory].\n+class StoredNotificationSound {\n+ StoredNotificationSound({\n+ required this.fileName,\n+ required this.isOwned,\n+ required this.contentUrl,\n+ });\n+\n+ /// The display name of the sound file.\n+ final String fileName;\n+\n+ /// Specifies whether this file was created by the app.\n+ ///\n+ /// It is true if the `MediaStore.Audio.Media.OWNER_PACKAGE_NAME` key in the\n+ /// metadata matches the app's package name.\n+ final bool isOwned;\n+\n+ /// A `content://\u2026` URL pointing to the sound file.\n+ final String contentUrl;\n+}\n+\n+@HostApi()\n+abstract class AndroidNotificationHostApi {\n+ /// Corresponds to `androidx.core.app.NotificationManagerCompat.createNotificationChannel`.\n+ ///\n+ /// See: https://developer.android.com/reference/androidx/core/app/NotificationManagerCompat#createNotificationChannel(androidx.core.app.NotificationChannelCompat)\n+ void createNotificationChannel(NotificationChannel channel);\n+\n+ /// Corresponds to `androidx.core.app.NotificationManagerCompat.getNotificationChannelsCompat`.\n+ ///\n+ /// See: https://developer.android.com/reference/kotlin/androidx/core/app/NotificationManagerCompat#getNotificationChannelsCompat()\n+ List getNotificationChannels();\n+\n+ /// Corresponds to `androidx.core.app.NotificationManagerCompat.deleteNotificationChannel`\n+ ///\n+ /// See: https://developer.android.com/reference/kotlin/androidx/core/app/NotificationManagerCompat#deleteNotificationChannel(java.lang.String)\n+ void deleteNotificationChannel(String channelId);\n+\n+ /// The list of notification sound files present under `Notifications/Zulip/`\n+ /// in the device's shared media storage,\n+ /// found with `android.content.ContentResolver.query`.\n+ ///\n+ /// This is a complex ad-hoc method.\n+ /// For detailed behavior, see its implementation.\n+ ///\n+ /// Requires minimum of Android 10 (API 29) or higher.\n+ ///\n+ /// See: https://developer.android.com/reference/android/content/ContentResolver#query(android.net.Uri,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String)\n+ List listStoredSoundsInNotificationsDirectory();\n+\n+ /// Wraps `android.content.ContentResolver.insert` combined with\n+ /// `android.content.ContentResolver.openOutputStream` and\n+ /// `android.content.res.Resources.openRawResource`.\n+ ///\n+ /// Copies a raw resource audio file to `Notifications/Zulip/`\n+ /// directory in device's shared media storage. Returns the URL\n+ /// of the target file in media store.\n+ ///\n+ /// Requires minimum of Android 10 (API 29) or higher.\n+ ///\n+ /// See:\n+ /// https://developer.android.com/reference/android/content/ContentResolver#insert(android.net.Uri,%20android.content.ContentValues)\n+ /// https://developer.android.com/reference/android/content/ContentResolver#openOutputStream(android.net.Uri)\n+ /// https://developer.android.com/reference/android/content/res/Resources#openRawResource(int)\n+ String copySoundResourceToMediaStore({required String targetFileDisplayName, required String sourceResourceName});\n+\n+ /// Corresponds to `android.app.NotificationManager.notify`,\n+ /// combined with `androidx.core.app.NotificationCompat.Builder`.\n+ ///\n+ /// The arguments `tag` and `id` go to the `notify` call.\n+ /// The rest go to method calls on the builder.\n+ ///\n+ /// The `color` should be in the form 0xAARRGGBB.\n+ /// See [ColorExtension.argbInt].\n+ ///\n+ /// The `smallIconResourceName` is passed to `android.content.res.Resources.getIdentifier`\n+ /// to get a resource ID to pass to `Builder.setSmallIcon`.\n+ /// Whatever name is passed there must appear in keep.xml too:\n+ /// see https://github.com/zulip/zulip-flutter/issues/528 .\n+ ///\n+ /// See:\n+ /// https://developer.android.com/reference/kotlin/android/app/NotificationManager.html#notify\n+ /// https://developer.android.com/reference/androidx/core/app/NotificationCompat.Builder\n+ // TODO(pigeon): Try ProxyApi for Notification objects, once that exists for Kotlin.\n+ // As of 2024-03, ProxyApi is actively being implemented; the Dart side just landed.\n+ // https://github.com/flutter/flutter/issues/134777\n+ void notify({\n+ String? tag,\n+ required int id,\n+\n+ // The remaining arguments go to method calls on NotificationCompat.Builder.\n+ bool? autoCancel,\n+ required String channelId,\n+ int? color,\n+ PendingIntent? contentIntent,\n+ String? contentText,\n+ String? contentTitle,\n+ Map? extras,\n+ String? groupKey,\n+ InboxStyle? inboxStyle,\n+ bool? isGroupSummary,\n+ MessagingStyle? messagingStyle,\n+ int? number,\n+ String? smallIconResourceName,\n+ // NotificationCompat.Builder has lots more methods; add as needed.\n+ // Keep them alphabetized, for easy comparison with that class's docs.\n+ });\n+\n+ /// Wraps `androidx.core.app.NotificationManagerCompat.getActiveNotifications`,\n+ /// combined with `androidx.core.app.NotificationCompat.MessagingStyle.extractMessagingStyleFromNotification`.\n+ ///\n+ /// Returns the messaging style, if any, of an active notification\n+ /// that has tag `tag`. If there are several such notifications,\n+ /// an arbitrary one of them is used.\n+ /// Returns null if there are no such notifications.\n+ ///\n+ /// See:\n+ /// https://developer.android.com/reference/kotlin/androidx/core/app/NotificationManagerCompat#getActiveNotifications()\n+ /// https://developer.android.com/reference/kotlin/androidx/core/app/NotificationCompat.MessagingStyle#extractMessagingStyleFromNotification(android.app.Notification)\n+ MessagingStyle? getActiveNotificationMessagingStyleByTag(String tag);\n+\n+ /// Corresponds to `androidx.core.app.NotificationManagerCompat.getActiveNotifications`.\n+ ///\n+ /// The keys of entries to fetch from notification's extras bundle must be\n+ /// specified in the [desiredExtras] list. If this list is empty, then\n+ /// [Notifications.extras] will also be empty. If value of the matched entry\n+ /// is not of type string or is null, then that entry will be skipped.\n+ ///\n+ /// See: https://developer.android.com/reference/kotlin/androidx/core/app/NotificationManagerCompat?hl=en#getActiveNotifications()\n+ List getActiveNotifications({required List desiredExtras});\n+\n+ /// Corresponds to `androidx.core.app.NotificationManagerCompat.cancel`.\n+ ///\n+ /// See: https://developer.android.com/reference/kotlin/androidx/core/app/NotificationManagerCompat?hl=en#cancel(java.lang.String,int)\n+ void cancel({String? tag, required int id});\n+}\ndiff --git a/pigeon/notifications.dart b/pigeon/notifications.dart\nindex 708ae4efb5..66c1bd2e71 100644\n--- a/pigeon/notifications.dart\n+++ b/pigeon/notifications.dart\n@@ -3,304 +3,51 @@ import 'package:pigeon/pigeon.dart';\n // To rebuild this pigeon's output after editing this file,\n // run `tools/check pigeon --fix`.\n @ConfigurePigeon(PigeonOptions(\n- dartOut: 'lib/host/android_notifications.g.dart',\n- kotlinOut: 'android/app/src/main/kotlin/com/zulip/flutter/Notifications.g.kt',\n- kotlinOptions: KotlinOptions(package: 'com.zulip.flutter'),\n+ dartOut: 'lib/host/notifications.g.dart',\n+ swiftOut: 'ios/Runner/Notifications.g.swift',\n ))\n \n-/// Corresponds to `androidx.core.app.NotificationChannelCompat`\n-///\n-/// See: https://developer.android.com/reference/androidx/core/app/NotificationChannelCompat\n-class NotificationChannel {\n- /// Corresponds to `androidx.core.app.NotificationChannelCompat.Builder`\n- ///\n- /// See: https://developer.android.com/reference/androidx/core/app/NotificationChannelCompat.Builder\n- NotificationChannel({\n- required this.id,\n- required this.importance,\n- this.name,\n- this.lightsEnabled,\n- this.soundUrl,\n- this.vibrationPattern,\n- });\n-\n- final String id;\n+class NotificationDataFromLaunch {\n+ const NotificationDataFromLaunch({required this.payload});\n \n- /// Specifies the importance level of notifications\n- /// to be posted on this channel.\n+ /// The raw payload that is attached to the notification,\n+ /// holding the information required to carry out the navigation.\n ///\n- /// Must be a valid constant from [NotificationImportance].\n- final int importance;\n-\n- final String? name;\n- final bool? lightsEnabled;\n- final String? soundUrl;\n- final Int64List? vibrationPattern;\n-}\n-\n-/// Corresponds to `android.content.Intent`\n-///\n-/// See:\n-/// https://developer.android.com/reference/android/content/Intent\n-/// https://developer.android.com/reference/android/content/Intent#Intent(java.lang.String,%20android.net.Uri,%20android.content.Context,%20java.lang.Class%3C?%3E)\n-class AndroidIntent {\n- AndroidIntent({required this.action, required this.dataUrl, this.flags = 0});\n-\n- final String action;\n- final String dataUrl;\n-\n- /// A combination of flags from [IntentFlag].\n- final int flags;\n-}\n-\n-/// Corresponds to `android.app.PendingIntent`.\n-///\n-/// See: https://developer.android.com/reference/android/app/PendingIntent\n-class PendingIntent {\n- /// Corresponds to `PendingIntent.getActivity`.\n- PendingIntent({required this.requestCode, required this.intent, required this.flags});\n-\n- final int requestCode;\n- final AndroidIntent intent;\n-\n- /// A combination of flags from [PendingIntent.flags], and others associated\n- /// with `Intent`; see Android docs for `PendingIntent.getActivity`.\n- final int flags;\n-}\n-\n-/// Corresponds to `androidx.core.app.NotificationCompat.InboxStyle`\n-///\n-/// See: https://developer.android.com/reference/androidx/core/app/NotificationCompat.InboxStyle\n-class InboxStyle {\n- InboxStyle({required this.summaryText});\n-\n- final String summaryText;\n+ /// See [NotificationHostApi.getNotificationDataFromLaunch].\n+ final Map payload;\n }\n \n-/// Corresponds to `androidx.core.app.Person`\n-///\n-/// See: https://developer.android.com/reference/androidx/core/app/Person\n-class Person {\n- Person({\n- required this.iconBitmap,\n- required this.key,\n- required this.name,\n- });\n+class NotificationTapEvent {\n+ const NotificationTapEvent({required this.payload});\n \n- /// An icon for this person.\n+ /// The raw payload that is attached to the notification,\n+ /// holding the information required to carry out the navigation.\n ///\n- /// This should be compressed image data, in a format to be passed\n- /// to `androidx.core.graphics.drawable.IconCompat.createWithData`.\n- /// Supported formats include JPEG, PNG, and WEBP.\n- ///\n- /// See:\n- /// https://developer.android.com/reference/androidx/core/graphics/drawable/IconCompat#createWithData(byte[],int,int)\n- final Uint8List? iconBitmap;\n-\n- final String key;\n- final String name;\n-}\n-\n-/// Corresponds to `androidx.core.app.NotificationCompat.MessagingStyle.Message`\n-///\n-/// See: https://developer.android.com/reference/androidx/core/app/NotificationCompat.MessagingStyle.Message\n-class MessagingStyleMessage {\n- MessagingStyleMessage({\n- required this.text,\n- required this.timestampMs,\n- required this.person,\n- });\n-\n- final String text;\n- final int timestampMs;\n- final Person person;\n-}\n-\n-/// Corresponds to `androidx.core.app.NotificationCompat.MessagingStyle`\n-///\n-/// See: https://developer.android.com/reference/androidx/core/app/NotificationCompat.MessagingStyle\n-class MessagingStyle {\n- MessagingStyle({\n- required this.user,\n- required this.conversationTitle,\n- required this.isGroupConversation,\n- required this.messages,\n- });\n-\n- final Person user;\n- final String? conversationTitle;\n- final List messages;\n- final bool isGroupConversation;\n-}\n-\n-/// Corresponds to `android.app.Notification`\n-///\n-/// See: https://developer.android.com/reference/kotlin/android/app/Notification\n-class Notification {\n- Notification({required this.group, required this.extras});\n-\n- final String group;\n- final Map extras;\n- // Various other properties too; add them if needed.\n-}\n-\n-/// Corresponds to `android.service.notification.StatusBarNotification`\n-///\n-/// See: https://developer.android.com/reference/android/service/notification/StatusBarNotification\n-class StatusBarNotification {\n- StatusBarNotification({required this.id, required this.tag, required this.notification});\n-\n- final int id;\n- final String tag;\n- final Notification notification;\n-\n- // Ignore `groupKey` and `key`. While the `.groupKey` contains the\n- // `.notification.group`, and the `.key` contains the `.id` and `.tag`,\n- // they also have more stuff added on (and their structure doesn't seem to\n- // be documented.)\n- // final String? groupKey;\n- // final String? key;\n-\n- // Various other properties too; add them if needed.\n-}\n-\n-/// Represents details about a notification sound stored in the\n-/// shared media store.\n-///\n-/// Returned as a list entry by\n-/// [AndroidNotificationHostApi.listStoredSoundsInNotificationsDirectory].\n-class StoredNotificationSound {\n- StoredNotificationSound({\n- required this.fileName,\n- required this.isOwned,\n- required this.contentUrl,\n- });\n-\n- /// The display name of the sound file.\n- final String fileName;\n-\n- /// Specifies whether this file was created by the app.\n- ///\n- /// It is true if the `MediaStore.Audio.Media.OWNER_PACKAGE_NAME` key in the\n- /// metadata matches the app's package name.\n- final bool isOwned;\n-\n- /// A `content://\u2026` URL pointing to the sound file.\n- final String contentUrl;\n+ /// See [notificationTapEvents].\n+ final Map payload;\n }\n \n @HostApi()\n-abstract class AndroidNotificationHostApi {\n- /// Corresponds to `androidx.core.app.NotificationManagerCompat.createNotificationChannel`.\n- ///\n- /// See: https://developer.android.com/reference/androidx/core/app/NotificationManagerCompat#createNotificationChannel(androidx.core.app.NotificationChannelCompat)\n- void createNotificationChannel(NotificationChannel channel);\n-\n- /// Corresponds to `androidx.core.app.NotificationManagerCompat.getNotificationChannelsCompat`.\n- ///\n- /// See: https://developer.android.com/reference/kotlin/androidx/core/app/NotificationManagerCompat#getNotificationChannelsCompat()\n- List getNotificationChannels();\n-\n- /// Corresponds to `androidx.core.app.NotificationManagerCompat.deleteNotificationChannel`\n- ///\n- /// See: https://developer.android.com/reference/kotlin/androidx/core/app/NotificationManagerCompat#deleteNotificationChannel(java.lang.String)\n- void deleteNotificationChannel(String channelId);\n-\n- /// The list of notification sound files present under `Notifications/Zulip/`\n- /// in the device's shared media storage,\n- /// found with `android.content.ContentResolver.query`.\n- ///\n- /// This is a complex ad-hoc method.\n- /// For detailed behavior, see its implementation.\n- ///\n- /// Requires minimum of Android 10 (API 29) or higher.\n- ///\n- /// See: https://developer.android.com/reference/android/content/ContentResolver#query(android.net.Uri,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String)\n- List listStoredSoundsInNotificationsDirectory();\n-\n- /// Wraps `android.content.ContentResolver.insert` combined with\n- /// `android.content.ContentResolver.openOutputStream` and\n- /// `android.content.res.Resources.openRawResource`.\n- ///\n- /// Copies a raw resource audio file to `Notifications/Zulip/`\n- /// directory in device's shared media storage. Returns the URL\n- /// of the target file in media store.\n- ///\n- /// Requires minimum of Android 10 (API 29) or higher.\n- ///\n- /// See:\n- /// https://developer.android.com/reference/android/content/ContentResolver#insert(android.net.Uri,%20android.content.ContentValues)\n- /// https://developer.android.com/reference/android/content/ContentResolver#openOutputStream(android.net.Uri)\n- /// https://developer.android.com/reference/android/content/res/Resources#openRawResource(int)\n- String copySoundResourceToMediaStore({required String targetFileDisplayName, required String sourceResourceName});\n-\n- /// Corresponds to `android.app.NotificationManager.notify`,\n- /// combined with `androidx.core.app.NotificationCompat.Builder`.\n- ///\n- /// The arguments `tag` and `id` go to the `notify` call.\n- /// The rest go to method calls on the builder.\n- ///\n- /// The `color` should be in the form 0xAARRGGBB.\n- /// See [ColorExtension.argbInt].\n- ///\n- /// The `smallIconResourceName` is passed to `android.content.res.Resources.getIdentifier`\n- /// to get a resource ID to pass to `Builder.setSmallIcon`.\n- /// Whatever name is passed there must appear in keep.xml too:\n- /// see https://github.com/zulip/zulip-flutter/issues/528 .\n- ///\n- /// See:\n- /// https://developer.android.com/reference/kotlin/android/app/NotificationManager.html#notify\n- /// https://developer.android.com/reference/androidx/core/app/NotificationCompat.Builder\n- // TODO(pigeon): Try ProxyApi for Notification objects, once that exists for Kotlin.\n- // As of 2024-03, ProxyApi is actively being implemented; the Dart side just landed.\n- // https://github.com/flutter/flutter/issues/134777\n- void notify({\n- String? tag,\n- required int id,\n-\n- // The remaining arguments go to method calls on NotificationCompat.Builder.\n- bool? autoCancel,\n- required String channelId,\n- int? color,\n- PendingIntent? contentIntent,\n- String? contentText,\n- String? contentTitle,\n- Map? extras,\n- String? groupKey,\n- InboxStyle? inboxStyle,\n- bool? isGroupSummary,\n- MessagingStyle? messagingStyle,\n- int? number,\n- String? smallIconResourceName,\n- // NotificationCompat.Builder has lots more methods; add as needed.\n- // Keep them alphabetized, for easy comparison with that class's docs.\n- });\n-\n- /// Wraps `androidx.core.app.NotificationManagerCompat.getActiveNotifications`,\n- /// combined with `androidx.core.app.NotificationCompat.MessagingStyle.extractMessagingStyleFromNotification`.\n- ///\n- /// Returns the messaging style, if any, of an active notification\n- /// that has tag `tag`. If there are several such notifications,\n- /// an arbitrary one of them is used.\n- /// Returns null if there are no such notifications.\n- ///\n- /// See:\n- /// https://developer.android.com/reference/kotlin/androidx/core/app/NotificationManagerCompat#getActiveNotifications()\n- /// https://developer.android.com/reference/kotlin/androidx/core/app/NotificationCompat.MessagingStyle#extractMessagingStyleFromNotification(android.app.Notification)\n- MessagingStyle? getActiveNotificationMessagingStyleByTag(String tag);\n-\n- /// Corresponds to `androidx.core.app.NotificationManagerCompat.getActiveNotifications`.\n- ///\n- /// The keys of entries to fetch from notification's extras bundle must be\n- /// specified in the [desiredExtras] list. If this list is empty, then\n- /// [Notifications.extras] will also be empty. If value of the matched entry\n- /// is not of type string or is null, then that entry will be skipped.\n- ///\n- /// See: https://developer.android.com/reference/kotlin/androidx/core/app/NotificationManagerCompat?hl=en#getActiveNotifications()\n- List getActiveNotifications({required List desiredExtras});\n-\n- /// Corresponds to `androidx.core.app.NotificationManagerCompat.cancel`.\n- ///\n- /// See: https://developer.android.com/reference/kotlin/androidx/core/app/NotificationManagerCompat?hl=en#cancel(java.lang.String,int)\n- void cancel({String? tag, required int id});\n+abstract class NotificationHostApi {\n+ /// Retrieves notification data if the app was launched by tapping on a notification.\n+ ///\n+ /// Returns `launchOptions.remoteNotification`,\n+ /// which is the raw APNs data dictionary\n+ /// if the app launch was opened by a notification tap,\n+ /// else null. See Apple doc:\n+ /// https://developer.apple.com/documentation/uikit/uiapplication/launchoptionskey/remotenotification\n+ NotificationDataFromLaunch? getNotificationDataFromLaunch();\n+}\n+\n+@EventChannelApi()\n+abstract class NotificationEventChannelApi {\n+ /// An event stream that emits a notification payload when the app\n+ /// encounters a notification tap, while the app is running.\n+ ///\n+ /// Emits an event when\n+ /// `userNotificationCenter(_:didReceive:withCompletionHandler:)` gets\n+ /// called, indicating that the user has tapped on a notification. The\n+ /// emitted payload will be the raw APNs data dictionary from the\n+ /// `UNNotificationResponse` passed to that method.\n+ NotificationTapEvent notificationTapEvents();\n }\n", "test_patch": "diff --git a/test/model/binding.dart b/test/model/binding.dart\nindex 2c70b68826..839242c1ce 100644\n--- a/test/model/binding.dart\n+++ b/test/model/binding.dart\n@@ -8,6 +8,7 @@ import 'package:flutter/services.dart';\n import 'package:test/fake.dart';\n import 'package:url_launcher/url_launcher.dart' as url_launcher;\n import 'package:zulip/host/android_notifications.dart';\n+import 'package:zulip/host/notifications.dart';\n import 'package:zulip/model/binding.dart';\n import 'package:zulip/model/store.dart';\n import 'package:zulip/widgets/app.dart';\n@@ -311,14 +312,18 @@ class TestZulipBinding extends ZulipBinding {\n \n void _resetNotifications() {\n _androidNotificationHostApi = null;\n+ _notificationPigeonApi = null;\n }\n \n+ @override\n+ FakeAndroidNotificationHostApi get androidNotificationHost =>\n+ (_androidNotificationHostApi ??= FakeAndroidNotificationHostApi());\n FakeAndroidNotificationHostApi? _androidNotificationHostApi;\n \n @override\n- FakeAndroidNotificationHostApi get androidNotificationHost {\n- return (_androidNotificationHostApi ??= FakeAndroidNotificationHostApi());\n- }\n+ FakeNotificationPigeonApi get notificationPigeonApi =>\n+ (_notificationPigeonApi ??= FakeNotificationPigeonApi());\n+ FakeNotificationPigeonApi? _notificationPigeonApi;\n \n /// The value that `ZulipBinding.instance.pickFiles()` should return.\n ///\n@@ -756,6 +761,32 @@ class FakeAndroidNotificationHostApi implements AndroidNotificationHostApi {\n }\n }\n \n+class FakeNotificationPigeonApi implements NotificationPigeonApi {\n+ NotificationDataFromLaunch? _notificationDataFromLaunch;\n+\n+ /// Populates the notification data for launch to be returned\n+ /// by [getNotificationDataFromLaunch].\n+ void setNotificationDataFromLaunch(NotificationDataFromLaunch? data) {\n+ _notificationDataFromLaunch = data;\n+ }\n+\n+ @override\n+ Future getNotificationDataFromLaunch() async =>\n+ _notificationDataFromLaunch;\n+\n+ StreamController? _notificationTapEventsStreamController;\n+\n+ void addNotificationTapEvent(NotificationTapEvent event) {\n+ _notificationTapEventsStreamController!.add(event);\n+ }\n+\n+ @override\n+ Stream notificationTapEventsStream() {\n+ _notificationTapEventsStreamController ??= StreamController();\n+ return _notificationTapEventsStreamController!.stream;\n+ }\n+}\n+\n typedef AndroidNotificationHostApiNotifyCall = ({\n String? tag,\n int id,\ndiff --git a/test/model/store_test.dart b/test/model/store_test.dart\nindex 0b303b53e2..c3aadb1171 100644\n--- a/test/model/store_test.dart\n+++ b/test/model/store_test.dart\n@@ -1293,8 +1293,8 @@ void main() {\n // (This is probably the common case.)\n addTearDown(testBinding.reset);\n testBinding.firebaseMessagingInitialToken = '012abc';\n- addTearDown(NotificationService.debugReset);\n testBinding.packageInfoResult = eg.packageInfo(packageName: 'com.zulip.flutter');\n+ addTearDown(NotificationService.debugReset);\n await NotificationService.instance.start();\n \n // On store startup, send the token.\n@@ -1321,8 +1321,8 @@ void main() {\n // request for the token is still pending.\n addTearDown(testBinding.reset);\n testBinding.firebaseMessagingInitialToken = '012abc';\n- addTearDown(NotificationService.debugReset);\n testBinding.packageInfoResult = eg.packageInfo(packageName: 'com.zulip.flutter');\n+ addTearDown(NotificationService.debugReset);\n final startFuture = NotificationService.instance.start();\n \n // TODO this test is a bit brittle in its interaction with asynchrony;\ndiff --git a/test/notifications/display_test.dart b/test/notifications/display_test.dart\nindex ffb5d345d8..7fe04c73ee 100644\n--- a/test/notifications/display_test.dart\n+++ b/test/notifications/display_test.dart\n@@ -1,4 +1,3 @@\n-import 'dart:async';\n import 'dart:io';\n import 'dart:typed_data';\n \n@@ -6,7 +5,6 @@ import 'package:checks/checks.dart';\n import 'package:collection/collection.dart';\n import 'package:fake_async/fake_async.dart';\n import 'package:firebase_messaging/firebase_messaging.dart';\n-import 'package:flutter/material.dart' hide Notification;\n import 'package:flutter_test/flutter_test.dart';\n import 'package:http/http.dart' as http;\n import 'package:http/testing.dart' as http_testing;\n@@ -18,24 +16,15 @@ import 'package:zulip/model/localizations.dart';\n import 'package:zulip/model/narrow.dart';\n import 'package:zulip/model/store.dart';\n import 'package:zulip/notifications/display.dart';\n+import 'package:zulip/notifications/open.dart';\n import 'package:zulip/notifications/receive.dart';\n-import 'package:zulip/widgets/app.dart';\n import 'package:zulip/widgets/color.dart';\n-import 'package:zulip/widgets/home.dart';\n-import 'package:zulip/widgets/message_list.dart';\n-import 'package:zulip/widgets/page.dart';\n import 'package:zulip/widgets/theme.dart';\n \n import '../example_data.dart' as eg;\n import '../fake_async.dart';\n import '../model/binding.dart';\n-import '../model/narrow_checks.dart';\n-import '../stdlib_checks.dart';\n import '../test_images.dart';\n-import '../test_navigation.dart';\n-import '../widgets/dialog_checks.dart';\n-import '../widgets/message_list_checks.dart';\n-import '../widgets/page_checks.dart';\n \n MessageFcmMessage messageFcmMessage(\n Message zulipMessage, {\n@@ -354,7 +343,7 @@ void main() {\n TopicNarrow(streamId, topic),\n FcmMessageDmRecipient(:var allRecipientIds) =>\n DmNarrow(allRecipientIds: allRecipientIds, selfUserId: data.userId),\n- }).buildUrl();\n+ }).buildAndroidNotificationUrl();\n \n final messageStyleMessagesChecks =\n messageStyleMessages.mapIndexed((i, messageData) {\n@@ -1034,423 +1023,6 @@ void main() {\n check(testBinding.androidNotificationHost.activeNotifications).isEmpty();\n })));\n });\n-\n- group('NotificationDisplayManager open', () {\n- late List> pushedRoutes;\n-\n- void takeStartingRoutes({Account? account, bool withAccount = true}) {\n- account ??= eg.selfAccount;\n- final expected = >[\n- if (withAccount)\n- (it) => it.isA()\n- ..accountId.equals(account!.id)\n- ..page.isA()\n- else\n- (it) => it.isA().page.isA(),\n- ];\n- check(pushedRoutes.take(expected.length)).deepEquals(expected);\n- pushedRoutes.removeRange(0, expected.length);\n- }\n-\n- Future prepare(WidgetTester tester,\n- {bool early = false, bool withAccount = true}) async {\n- await init(addSelfAccount: false);\n- pushedRoutes = [];\n- final testNavObserver = TestNavigatorObserver()\n- ..onPushed = (route, prevRoute) => pushedRoutes.add(route);\n- // This uses [ZulipApp] instead of [TestZulipApp] because notification\n- // logic uses `await ZulipApp.navigator`.\n- await tester.pumpWidget(ZulipApp(navigatorObservers: [testNavObserver]));\n- if (early) {\n- check(pushedRoutes).isEmpty();\n- return;\n- }\n- await tester.pump();\n- takeStartingRoutes(withAccount: withAccount);\n- check(pushedRoutes).isEmpty();\n- }\n-\n- Future openNotification(WidgetTester tester, Account account, Message message) async {\n- final data = messageFcmMessage(message, account: account);\n- final intentDataUrl = NotificationOpenPayload(\n- realmUrl: data.realmUrl,\n- userId: data.userId,\n- narrow: switch (data.recipient) {\n- FcmMessageChannelRecipient(:var streamId, :var topic) =>\n- TopicNarrow(streamId, topic),\n- FcmMessageDmRecipient(:var allRecipientIds) =>\n- DmNarrow(allRecipientIds: allRecipientIds, selfUserId: data.userId),\n- }).buildUrl();\n- unawaited(\n- WidgetsBinding.instance.handlePushRoute(intentDataUrl.toString()));\n- await tester.idle(); // let navigateForNotification find navigator\n- }\n-\n- void matchesNavigation(Subject> route, Account account, Message message) {\n- route.isA()\n- ..accountId.equals(account.id)\n- ..page.isA()\n- .initNarrow.equals(SendableNarrow.ofMessage(message,\n- selfUserId: account.userId));\n- }\n-\n- Future checkOpenNotification(WidgetTester tester, Account account, Message message) async {\n- await openNotification(tester, account, message);\n- matchesNavigation(check(pushedRoutes).single, account, message);\n- pushedRoutes.clear();\n- }\n-\n- testWidgets('stream message', (tester) async {\n- addTearDown(testBinding.reset);\n- await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());\n- await prepare(tester);\n- await checkOpenNotification(tester, eg.selfAccount, eg.streamMessage());\n- });\n-\n- testWidgets('direct message', (tester) async {\n- addTearDown(testBinding.reset);\n- await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());\n- await prepare(tester);\n- await checkOpenNotification(tester, eg.selfAccount,\n- eg.dmMessage(from: eg.otherUser, to: [eg.selfUser]));\n- });\n-\n- testWidgets('account queried by realmUrl origin component', (tester) async {\n- addTearDown(testBinding.reset);\n- await testBinding.globalStore.add(\n- eg.selfAccount.copyWith(realmUrl: Uri.parse('http://chat.example')),\n- eg.initialSnapshot());\n- await prepare(tester);\n-\n- await checkOpenNotification(tester,\n- eg.selfAccount.copyWith(realmUrl: Uri.parse('http://chat.example/')),\n- eg.streamMessage());\n- await checkOpenNotification(tester,\n- eg.selfAccount.copyWith(realmUrl: Uri.parse('http://chat.example')),\n- eg.streamMessage());\n- });\n-\n- testWidgets('no accounts', (tester) async {\n- await prepare(tester, withAccount: false);\n- await openNotification(tester, eg.selfAccount, eg.streamMessage());\n- await tester.pump();\n- check(pushedRoutes.single).isA>();\n- await tester.tap(find.byWidget(checkErrorDialog(tester,\n- expectedTitle: zulipLocalizations.errorNotificationOpenTitle,\n- expectedMessage: zulipLocalizations.errorNotificationOpenAccountNotFound)));\n- });\n-\n- testWidgets('mismatching account', (tester) async {\n- addTearDown(testBinding.reset);\n- await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());\n- await prepare(tester);\n- await openNotification(tester, eg.otherAccount, eg.streamMessage());\n- await tester.pump();\n- check(pushedRoutes.single).isA>();\n- await tester.tap(find.byWidget(checkErrorDialog(tester,\n- expectedTitle: zulipLocalizations.errorNotificationOpenTitle,\n- expectedMessage: zulipLocalizations.errorNotificationOpenAccountNotFound)));\n- });\n-\n- testWidgets('find account among several', (tester) async {\n- addTearDown(testBinding.reset);\n- final realmUrlA = Uri.parse('https://a-chat.example/');\n- final realmUrlB = Uri.parse('https://chat-b.example/');\n- final user1 = eg.user();\n- final user2 = eg.user();\n- final accounts = [\n- eg.account(id: 1001, realmUrl: realmUrlA, user: user1),\n- eg.account(id: 1002, realmUrl: realmUrlA, user: user2),\n- eg.account(id: 1003, realmUrl: realmUrlB, user: user1),\n- eg.account(id: 1004, realmUrl: realmUrlB, user: user2),\n- ];\n- for (final account in accounts) {\n- await testBinding.globalStore.add(account, eg.initialSnapshot());\n- }\n- await prepare(tester);\n-\n- await checkOpenNotification(tester, accounts[0], eg.streamMessage());\n- await checkOpenNotification(tester, accounts[1], eg.streamMessage());\n- await checkOpenNotification(tester, accounts[2], eg.streamMessage());\n- await checkOpenNotification(tester, accounts[3], eg.streamMessage());\n- });\n-\n- testWidgets('wait for app to become ready', (tester) async {\n- addTearDown(testBinding.reset);\n- await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());\n- await prepare(tester, early: true);\n- final message = eg.streamMessage();\n- await openNotification(tester, eg.selfAccount, message);\n- // The app should still not be ready (or else this test won't work right).\n- check(ZulipApp.ready.value).isFalse();\n- check(ZulipApp.navigatorKey.currentState).isNull();\n- // And the openNotification hasn't caused any navigation yet.\n- check(pushedRoutes).isEmpty();\n-\n- // Now let the GlobalStore get loaded and the app's main UI get mounted.\n- await tester.pump();\n- // The navigator first pushes the starting routes\u2026\n- takeStartingRoutes();\n- // \u2026 and then the one the notification leads to.\n- matchesNavigation(check(pushedRoutes).single, eg.selfAccount, message);\n- });\n-\n- testWidgets('at app launch', (tester) async {\n- addTearDown(testBinding.reset);\n- // Set up a value for `PlatformDispatcher.defaultRouteName` to return,\n- // for determining the intial route.\n- final account = eg.selfAccount;\n- final message = eg.streamMessage();\n- final data = messageFcmMessage(message, account: account);\n- final intentDataUrl = NotificationOpenPayload(\n- realmUrl: data.realmUrl,\n- userId: data.userId,\n- narrow: switch (data.recipient) {\n- FcmMessageChannelRecipient(:var streamId, :var topic) =>\n- TopicNarrow(streamId, topic),\n- FcmMessageDmRecipient(:var allRecipientIds) =>\n- DmNarrow(allRecipientIds: allRecipientIds, selfUserId: data.userId),\n- }).buildUrl();\n- addTearDown(tester.binding.platformDispatcher.clearDefaultRouteNameTestValue);\n- tester.binding.platformDispatcher.defaultRouteNameTestValue = intentDataUrl.toString();\n-\n- // Now start the app.\n- await testBinding.globalStore.add(account, eg.initialSnapshot());\n- await prepare(tester, early: true);\n- check(pushedRoutes).isEmpty(); // GlobalStore hasn't loaded yet\n-\n- // Once the app is ready, we navigate to the conversation.\n- await tester.pump();\n- takeStartingRoutes();\n- matchesNavigation(check(pushedRoutes).single, account, message);\n- });\n-\n- testWidgets('uses associated account as initial account; if initial route', (tester) async {\n- addTearDown(testBinding.reset);\n-\n- final accountA = eg.selfAccount;\n- final accountB = eg.otherAccount;\n- final message = eg.streamMessage();\n- final data = messageFcmMessage(message, account: accountB);\n- await testBinding.globalStore.add(accountA, eg.initialSnapshot());\n- await testBinding.globalStore.add(accountB, eg.initialSnapshot());\n-\n- final intentDataUrl = NotificationOpenPayload(\n- realmUrl: data.realmUrl,\n- userId: data.userId,\n- narrow: switch (data.recipient) {\n- FcmMessageChannelRecipient(:var streamId, :var topic) =>\n- TopicNarrow(streamId, topic),\n- FcmMessageDmRecipient(:var allRecipientIds) =>\n- DmNarrow(allRecipientIds: allRecipientIds, selfUserId: data.userId),\n- }).buildUrl();\n- addTearDown(tester.binding.platformDispatcher.clearDefaultRouteNameTestValue);\n- tester.binding.platformDispatcher.defaultRouteNameTestValue = intentDataUrl.toString();\n-\n- await prepare(tester, early: true);\n- check(pushedRoutes).isEmpty(); // GlobalStore hasn't loaded yet\n-\n- await tester.pump();\n- takeStartingRoutes(account: accountB);\n- matchesNavigation(check(pushedRoutes).single, accountB, message);\n- });\n- });\n-\n- group('NotificationOpenPayload', () {\n- test('smoke round-trip', () {\n- // DM narrow\n- var payload = NotificationOpenPayload(\n- realmUrl: Uri.parse('http://chat.example'),\n- userId: 1001,\n- narrow: DmNarrow(allRecipientIds: [1001, 1002], selfUserId: 1001),\n- );\n- var url = payload.buildUrl();\n- check(NotificationOpenPayload.parseUrl(url))\n- ..realmUrl.equals(payload.realmUrl)\n- ..userId.equals(payload.userId)\n- ..narrow.equals(payload.narrow);\n-\n- // Topic narrow\n- payload = NotificationOpenPayload(\n- realmUrl: Uri.parse('http://chat.example'),\n- userId: 1001,\n- narrow: eg.topicNarrow(1, 'topic A'),\n- );\n- url = payload.buildUrl();\n- check(NotificationOpenPayload.parseUrl(url))\n- ..realmUrl.equals(payload.realmUrl)\n- ..userId.equals(payload.userId)\n- ..narrow.equals(payload.narrow);\n- });\n-\n- test('buildUrl: smoke DM', () {\n- final url = NotificationOpenPayload(\n- realmUrl: Uri.parse('http://chat.example'),\n- userId: 1001,\n- narrow: DmNarrow(allRecipientIds: [1001, 1002], selfUserId: 1001),\n- ).buildUrl();\n- check(url)\n- ..scheme.equals('zulip')\n- ..host.equals('notification')\n- ..queryParameters.deepEquals({\n- 'realm_url': 'http://chat.example',\n- 'user_id': '1001',\n- 'narrow_type': 'dm',\n- 'all_recipient_ids': '1001,1002',\n- });\n- });\n-\n- test('buildUrl: smoke topic', () {\n- final url = NotificationOpenPayload(\n- realmUrl: Uri.parse('http://chat.example'),\n- userId: 1001,\n- narrow: eg.topicNarrow(1, 'topic A'),\n- ).buildUrl();\n- check(url)\n- ..scheme.equals('zulip')\n- ..host.equals('notification')\n- ..queryParameters.deepEquals({\n- 'realm_url': 'http://chat.example',\n- 'user_id': '1001',\n- 'narrow_type': 'topic',\n- 'channel_id': '1',\n- 'topic': 'topic A',\n- });\n- });\n-\n- test('parse: smoke DM', () {\n- final url = Uri(\n- scheme: 'zulip',\n- host: 'notification',\n- queryParameters: {\n- 'realm_url': 'http://chat.example',\n- 'user_id': '1001',\n- 'narrow_type': 'dm',\n- 'all_recipient_ids': '1001,1002',\n- });\n- check(NotificationOpenPayload.parseUrl(url))\n- ..realmUrl.equals(Uri.parse('http://chat.example'))\n- ..userId.equals(1001)\n- ..narrow.which((it) => it.isA()\n- ..allRecipientIds.deepEquals([1001, 1002])\n- ..otherRecipientIds.deepEquals([1002]));\n- });\n-\n- test('parse: smoke topic', () {\n- final url = Uri(\n- scheme: 'zulip',\n- host: 'notification',\n- queryParameters: {\n- 'realm_url': 'http://chat.example',\n- 'user_id': '1001',\n- 'narrow_type': 'topic',\n- 'channel_id': '1',\n- 'topic': 'topic A',\n- });\n- check(NotificationOpenPayload.parseUrl(url))\n- ..realmUrl.equals(Uri.parse('http://chat.example'))\n- ..userId.equals(1001)\n- ..narrow.which((it) => it.isA()\n- ..streamId.equals(1)\n- ..topic.equals(eg.t('topic A')));\n- });\n-\n- test('parse: fails when missing any expected query parameters', () {\n- final testCases = >[\n- {\n- // 'realm_url': 'http://chat.example',\n- 'user_id': '1001',\n- 'narrow_type': 'topic',\n- 'channel_id': '1',\n- 'topic': 'topic A',\n- },\n- {\n- 'realm_url': 'http://chat.example',\n- // 'user_id': '1001',\n- 'narrow_type': 'topic',\n- 'channel_id': '1',\n- 'topic': 'topic A',\n- },\n- {\n- 'realm_url': 'http://chat.example',\n- 'user_id': '1001',\n- // 'narrow_type': 'topic',\n- 'channel_id': '1',\n- 'topic': 'topic A',\n- },\n- {\n- 'realm_url': 'http://chat.example',\n- 'user_id': '1001',\n- 'narrow_type': 'topic',\n- // 'channel_id': '1',\n- 'topic': 'topic A',\n- },\n- {\n- 'realm_url': 'http://chat.example',\n- 'user_id': '1001',\n- 'narrow_type': 'topic',\n- 'channel_id': '1',\n- // 'topic': 'topic A',\n- },\n- {\n- 'realm_url': 'http://chat.example',\n- 'user_id': '1001',\n- // 'narrow_type': 'dm',\n- 'all_recipient_ids': '1001,1002',\n- },\n- {\n- 'realm_url': 'http://chat.example',\n- 'user_id': '1001',\n- 'narrow_type': 'dm',\n- // 'all_recipient_ids': '1001,1002',\n- },\n- ];\n- for (final params in testCases) {\n- check(() => NotificationOpenPayload.parseUrl(Uri(\n- scheme: 'zulip',\n- host: 'notification',\n- queryParameters: params,\n- )))\n- // Missing 'realm_url', 'user_id' and 'narrow_type'\n- // throws 'FormatException'.\n- // Missing 'channel_id', 'topic', when narrow_type == 'topic'\n- // throws 'TypeError'.\n- // Missing 'all_recipient_ids', when narrow_type == 'dm'\n- // throws 'TypeError'.\n- .throws();\n- }\n- });\n-\n- test('parse: fails when scheme is not \"zulip\"', () {\n- final url = Uri(\n- scheme: 'http',\n- host: 'notification',\n- queryParameters: {\n- 'realm_url': 'http://chat.example',\n- 'user_id': '1001',\n- 'narrow_type': 'topic',\n- 'channel_id': '1',\n- 'topic': 'topic A',\n- });\n- check(() => NotificationOpenPayload.parseUrl(url))\n- .throws();\n- });\n-\n- test('parse: fails when host is not \"notification\"', () {\n- final url = Uri(\n- scheme: 'zulip',\n- host: 'example',\n- queryParameters: {\n- 'realm_url': 'http://chat.example',\n- 'user_id': '1001',\n- 'narrow_type': 'topic',\n- 'channel_id': '1',\n- 'topic': 'topic A',\n- });\n- check(() => NotificationOpenPayload.parseUrl(url))\n- .throws();\n- });\n- });\n }\n \n extension on Subject {\n@@ -1530,9 +1102,3 @@ extension on Subject {\n Subject get notification => has((x) => x.notification, 'notification');\n Subject get tag => has((x) => x.tag, 'tag');\n }\n-\n-extension on Subject {\n- Subject get realmUrl => has((x) => x.realmUrl, 'realmUrl');\n- Subject get userId => has((x) => x.userId, 'userId');\n- Subject get narrow => has((x) => x.narrow, 'narrow');\n-}\ndiff --git a/test/notifications/open_test.dart b/test/notifications/open_test.dart\nnew file mode 100644\nindex 0000000000..a2c14ca20a\n--- /dev/null\n+++ b/test/notifications/open_test.dart\n@@ -0,0 +1,577 @@\n+import 'dart:async';\n+\n+import 'package:checks/checks.dart';\n+import 'package:flutter/foundation.dart';\n+import 'package:flutter/material.dart';\n+import 'package:flutter_test/flutter_test.dart';\n+import 'package:zulip/api/model/model.dart';\n+import 'package:zulip/api/notifications.dart';\n+import 'package:zulip/host/notifications.dart';\n+import 'package:zulip/model/database.dart';\n+import 'package:zulip/model/localizations.dart';\n+import 'package:zulip/model/narrow.dart';\n+import 'package:zulip/notifications/open.dart';\n+import 'package:zulip/notifications/receive.dart';\n+import 'package:zulip/widgets/app.dart';\n+import 'package:zulip/widgets/home.dart';\n+import 'package:zulip/widgets/message_list.dart';\n+import 'package:zulip/widgets/page.dart';\n+\n+import '../example_data.dart' as eg;\n+import '../model/binding.dart';\n+import '../model/narrow_checks.dart';\n+import '../stdlib_checks.dart';\n+import '../test_navigation.dart';\n+import '../widgets/dialog_checks.dart';\n+import '../widgets/message_list_checks.dart';\n+import '../widgets/page_checks.dart';\n+import 'display_test.dart';\n+\n+Map messageApnsPayload(\n+ Message zulipMessage, {\n+ String? streamName,\n+ Account? account,\n+}) {\n+ account ??= eg.selfAccount;\n+ return {\n+ \"aps\": {\n+ \"alert\": {\n+ \"title\": \"test\",\n+ \"subtitle\": \"test\",\n+ \"body\": zulipMessage.content,\n+ },\n+ \"sound\": \"default\",\n+ \"badge\": 0,\n+ },\n+ \"zulip\": {\n+ \"server\": \"zulip.example.cloud\",\n+ \"realm_id\": 4,\n+ \"realm_uri\": account.realmUrl.toString(),\n+ \"realm_url\": account.realmUrl.toString(),\n+ \"realm_name\": \"Test\",\n+ \"user_id\": account.userId,\n+ \"sender_id\": zulipMessage.senderId,\n+ \"sender_email\": zulipMessage.senderEmail,\n+ \"time\": zulipMessage.timestamp,\n+ \"message_ids\": [zulipMessage.id],\n+ ...(switch (zulipMessage) {\n+ StreamMessage(:var streamId, :var topic) => {\n+ \"recipient_type\": \"stream\",\n+ \"stream_id\": streamId,\n+ if (streamName != null) \"stream\": streamName,\n+ \"topic\": topic,\n+ },\n+ DmMessage(allRecipientIds: [_, _, _, ...]) => {\n+ \"recipient_type\": \"private\",\n+ \"pm_users\": zulipMessage.allRecipientIds.join(\",\"),\n+ },\n+ DmMessage() => {\"recipient_type\": \"private\"},\n+ }),\n+ },\n+ };\n+}\n+\n+void main() {\n+ TestZulipBinding.ensureInitialized();\n+ final zulipLocalizations = GlobalLocalizations.zulipLocalizations;\n+\n+ Future init({bool addSelfAccount = true}) async {\n+ if (addSelfAccount) {\n+ await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());\n+ }\n+ addTearDown(testBinding.reset);\n+ testBinding.firebaseMessagingInitialToken = '012abc';\n+ addTearDown(NotificationService.debugReset);\n+ NotificationService.debugBackgroundIsolateIsLive = false;\n+ await NotificationService.instance.start();\n+ }\n+\n+ group('NotificationOpenService', () {\n+ late List> pushedRoutes;\n+\n+ void takeStartingRoutes({Account? account, bool withAccount = true}) {\n+ account ??= eg.selfAccount;\n+ final expected = >[\n+ if (withAccount)\n+ (it) => it.isA()\n+ ..accountId.equals(account!.id)\n+ ..page.isA()\n+ else\n+ (it) => it.isA().page.isA(),\n+ ];\n+ check(pushedRoutes.take(expected.length)).deepEquals(expected);\n+ pushedRoutes.removeRange(0, expected.length);\n+ }\n+\n+ Future prepare(WidgetTester tester,\n+ {bool early = false, bool withAccount = true}) async {\n+ await init(addSelfAccount: false);\n+ pushedRoutes = [];\n+ final testNavObserver = TestNavigatorObserver()\n+ ..onPushed = (route, prevRoute) => pushedRoutes.add(route);\n+ // This uses [ZulipApp] instead of [TestZulipApp] because notification\n+ // logic uses `await ZulipApp.navigator`.\n+ await tester.pumpWidget(ZulipApp(navigatorObservers: [testNavObserver]));\n+ if (early) {\n+ check(pushedRoutes).isEmpty();\n+ return;\n+ }\n+ await tester.pump();\n+ takeStartingRoutes(withAccount: withAccount);\n+ check(pushedRoutes).isEmpty();\n+ }\n+\n+ Uri androidNotificationUrlForMessage(Account account, Message message) {\n+ final data = messageFcmMessage(message, account: account);\n+ return NotificationOpenPayload(\n+ realmUrl: data.realmUrl,\n+ userId: data.userId,\n+ narrow: switch (data.recipient) {\n+ FcmMessageChannelRecipient(:var streamId, :var topic) =>\n+ TopicNarrow(streamId, topic),\n+ FcmMessageDmRecipient(:var allRecipientIds) =>\n+ DmNarrow(allRecipientIds: allRecipientIds, selfUserId: data.userId),\n+ }).buildAndroidNotificationUrl();\n+ }\n+\n+ Future openNotification(WidgetTester tester, Account account, Message message) async {\n+ switch (defaultTargetPlatform) {\n+ case TargetPlatform.android:\n+ final intentDataUrl = androidNotificationUrlForMessage(account, message);\n+ unawaited(\n+ WidgetsBinding.instance.handlePushRoute(intentDataUrl.toString()));\n+ await tester.idle(); // let navigateForNotification find navigator\n+\n+ case TargetPlatform.iOS:\n+ final payload = messageApnsPayload(message, account: account);\n+ testBinding.notificationPigeonApi.addNotificationTapEvent(\n+ NotificationTapEvent(payload: payload));\n+ await tester.idle(); // let navigateForNotification find navigator\n+\n+ default:\n+ throw UnsupportedError('Unsupported target platform: \"$defaultTargetPlatform\"');\n+ }\n+ }\n+\n+ void setupNotificationDataForLaunch(WidgetTester tester, Account account, Message message) {\n+ switch (defaultTargetPlatform) {\n+ case TargetPlatform.android:\n+ // Set up a value for `PlatformDispatcher.defaultRouteName` to return,\n+ // for determining the initial route.\n+ final intentDataUrl = androidNotificationUrlForMessage(account, message);\n+ addTearDown(tester.binding.platformDispatcher.clearDefaultRouteNameTestValue);\n+ tester.binding.platformDispatcher.defaultRouteNameTestValue = intentDataUrl.toString();\n+\n+ case TargetPlatform.iOS:\n+ // Set up a value to return for\n+ // `notificationPigeonApi.getNotificationDataFromLaunch`.\n+ final payload = messageApnsPayload(message, account: account);\n+ testBinding.notificationPigeonApi.setNotificationDataFromLaunch(\n+ NotificationDataFromLaunch(payload: payload));\n+\n+ default:\n+ throw UnsupportedError('Unsupported target platform: \"$defaultTargetPlatform\"');\n+ }\n+ }\n+\n+ void matchesNavigation(Subject> route, Account account, Message message) {\n+ route.isA()\n+ ..accountId.equals(account.id)\n+ ..page.isA()\n+ .initNarrow.equals(SendableNarrow.ofMessage(message,\n+ selfUserId: account.userId));\n+ }\n+\n+ Future checkOpenNotification(WidgetTester tester, Account account, Message message) async {\n+ await openNotification(tester, account, message);\n+ matchesNavigation(check(pushedRoutes).single, account, message);\n+ pushedRoutes.clear();\n+ }\n+\n+ testWidgets('stream message', (tester) async {\n+ addTearDown(testBinding.reset);\n+ await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());\n+ await prepare(tester);\n+ await checkOpenNotification(tester, eg.selfAccount, eg.streamMessage());\n+ }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n+\n+ testWidgets('direct message', (tester) async {\n+ addTearDown(testBinding.reset);\n+ await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());\n+ await prepare(tester);\n+ await checkOpenNotification(tester, eg.selfAccount,\n+ eg.dmMessage(from: eg.otherUser, to: [eg.selfUser]));\n+ }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n+\n+ testWidgets('account queried by realmUrl origin component', (tester) async {\n+ addTearDown(testBinding.reset);\n+ await testBinding.globalStore.add(\n+ eg.selfAccount.copyWith(realmUrl: Uri.parse('http://chat.example')),\n+ eg.initialSnapshot());\n+ await prepare(tester);\n+\n+ await checkOpenNotification(tester,\n+ eg.selfAccount.copyWith(realmUrl: Uri.parse('http://chat.example/')),\n+ eg.streamMessage());\n+ await checkOpenNotification(tester,\n+ eg.selfAccount.copyWith(realmUrl: Uri.parse('http://chat.example')),\n+ eg.streamMessage());\n+ }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n+\n+ testWidgets('no accounts', (tester) async {\n+ await prepare(tester, withAccount: false);\n+ await openNotification(tester, eg.selfAccount, eg.streamMessage());\n+ await tester.pump();\n+ check(pushedRoutes.single).isA>();\n+ await tester.tap(find.byWidget(checkErrorDialog(tester,\n+ expectedTitle: zulipLocalizations.errorNotificationOpenTitle,\n+ expectedMessage: zulipLocalizations.errorNotificationOpenAccountNotFound)));\n+ }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n+\n+ testWidgets('mismatching account', (tester) async {\n+ addTearDown(testBinding.reset);\n+ await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());\n+ await prepare(tester);\n+ await openNotification(tester, eg.otherAccount, eg.streamMessage());\n+ await tester.pump();\n+ check(pushedRoutes.single).isA>();\n+ await tester.tap(find.byWidget(checkErrorDialog(tester,\n+ expectedTitle: zulipLocalizations.errorNotificationOpenTitle,\n+ expectedMessage: zulipLocalizations.errorNotificationOpenAccountNotFound)));\n+ }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n+\n+ testWidgets('find account among several', (tester) async {\n+ addTearDown(testBinding.reset);\n+ final realmUrlA = Uri.parse('https://a-chat.example/');\n+ final realmUrlB = Uri.parse('https://chat-b.example/');\n+ final user1 = eg.user();\n+ final user2 = eg.user();\n+ final accounts = [\n+ eg.account(id: 1001, realmUrl: realmUrlA, user: user1),\n+ eg.account(id: 1002, realmUrl: realmUrlA, user: user2),\n+ eg.account(id: 1003, realmUrl: realmUrlB, user: user1),\n+ eg.account(id: 1004, realmUrl: realmUrlB, user: user2),\n+ ];\n+ for (final account in accounts) {\n+ await testBinding.globalStore.add(account, eg.initialSnapshot());\n+ }\n+ await prepare(tester);\n+\n+ await checkOpenNotification(tester, accounts[0], eg.streamMessage());\n+ await checkOpenNotification(tester, accounts[1], eg.streamMessage());\n+ await checkOpenNotification(tester, accounts[2], eg.streamMessage());\n+ await checkOpenNotification(tester, accounts[3], eg.streamMessage());\n+ }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n+\n+ testWidgets('wait for app to become ready', (tester) async {\n+ addTearDown(testBinding.reset);\n+ await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());\n+ await prepare(tester, early: true);\n+ final message = eg.streamMessage();\n+ await openNotification(tester, eg.selfAccount, message);\n+ // The app should still not be ready (or else this test won't work right).\n+ check(ZulipApp.ready.value).isFalse();\n+ check(ZulipApp.navigatorKey.currentState).isNull();\n+ // And the openNotification hasn't caused any navigation yet.\n+ check(pushedRoutes).isEmpty();\n+\n+ // Now let the GlobalStore get loaded and the app's main UI get mounted.\n+ await tester.pump();\n+ // The navigator first pushes the starting routes\u2026\n+ takeStartingRoutes();\n+ // \u2026 and then the one the notification leads to.\n+ matchesNavigation(check(pushedRoutes).single, eg.selfAccount, message);\n+ }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n+\n+ testWidgets('at app launch', (tester) async {\n+ addTearDown(testBinding.reset);\n+ final account = eg.selfAccount;\n+ final message = eg.streamMessage();\n+ setupNotificationDataForLaunch(tester, account, message);\n+\n+ // Now start the app.\n+ await testBinding.globalStore.add(account, eg.initialSnapshot());\n+ await prepare(tester, early: true);\n+ check(pushedRoutes).isEmpty(); // GlobalStore hasn't loaded yet\n+\n+ // Once the app is ready, we navigate to the conversation.\n+ await tester.pump();\n+ takeStartingRoutes();\n+ matchesNavigation(check(pushedRoutes).single, account, message);\n+ }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n+\n+ testWidgets('uses associated account as initial account; if initial route', (tester) async {\n+ addTearDown(testBinding.reset);\n+\n+ final accountA = eg.selfAccount;\n+ final accountB = eg.otherAccount;\n+ final message = eg.streamMessage();\n+ await testBinding.globalStore.add(accountA, eg.initialSnapshot());\n+ await testBinding.globalStore.add(accountB, eg.initialSnapshot());\n+ setupNotificationDataForLaunch(tester, accountB, message);\n+\n+ await prepare(tester, early: true);\n+ check(pushedRoutes).isEmpty(); // GlobalStore hasn't loaded yet\n+\n+ await tester.pump();\n+ takeStartingRoutes(account: accountB);\n+ matchesNavigation(check(pushedRoutes).single, accountB, message);\n+ }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n+ });\n+\n+ group('NotificationOpenPayload', () {\n+ test('android: smoke round-trip', () {\n+ // DM narrow\n+ var payload = NotificationOpenPayload(\n+ realmUrl: Uri.parse('http://chat.example'),\n+ userId: 1001,\n+ narrow: DmNarrow(allRecipientIds: [1001, 1002], selfUserId: 1001),\n+ );\n+ var url = payload.buildAndroidNotificationUrl();\n+ check(NotificationOpenPayload.parseAndroidNotificationUrl(url))\n+ ..realmUrl.equals(payload.realmUrl)\n+ ..userId.equals(payload.userId)\n+ ..narrow.equals(payload.narrow);\n+\n+ // Topic narrow\n+ payload = NotificationOpenPayload(\n+ realmUrl: Uri.parse('http://chat.example'),\n+ userId: 1001,\n+ narrow: eg.topicNarrow(1, 'topic A'),\n+ );\n+ url = payload.buildAndroidNotificationUrl();\n+ check(NotificationOpenPayload.parseAndroidNotificationUrl(url))\n+ ..realmUrl.equals(payload.realmUrl)\n+ ..userId.equals(payload.userId)\n+ ..narrow.equals(payload.narrow);\n+ });\n+\n+ group('parseIosApnsPayload', () {\n+ test('smoke one-one DM', () {\n+ final userA = eg.user(userId: 1001);\n+ final userB = eg.user(userId: 1002);\n+ final account = eg.account(\n+ realmUrl: Uri.parse('http://chat.example'),\n+ user: userA);\n+ final payload = messageApnsPayload(eg.dmMessage(from: userB, to: [userA]),\n+ account: account);\n+ check(NotificationOpenPayload.parseIosApnsPayload(payload))\n+ ..realmUrl.equals(Uri.parse('http://chat.example'))\n+ ..userId.equals(1001)\n+ ..narrow.which((it) => it.isA()\n+ ..otherRecipientIds.deepEquals([1002]));\n+ });\n+\n+ test('smoke group DM', () {\n+ final userA = eg.user(userId: 1001);\n+ final userB = eg.user(userId: 1002);\n+ final userC = eg.user(userId: 1003);\n+ final account = eg.account(\n+ realmUrl: Uri.parse('http://chat.example'),\n+ user: userA);\n+ final payload = messageApnsPayload(eg.dmMessage(from: userC, to: [userA, userB]),\n+ account: account);\n+ check(NotificationOpenPayload.parseIosApnsPayload(payload))\n+ ..realmUrl.equals(Uri.parse('http://chat.example'))\n+ ..userId.equals(1001)\n+ ..narrow.which((it) => it.isA()\n+ ..otherRecipientIds.deepEquals([1002, 1003]));\n+ });\n+\n+ test('smoke topic message', () {\n+ final userA = eg.user(userId: 1001);\n+ final account = eg.account(\n+ realmUrl: Uri.parse('http://chat.example'),\n+ user: userA);\n+ final payload = messageApnsPayload(eg.streamMessage(\n+ stream: eg.stream(streamId: 1),\n+ topic: 'topic A'),\n+ account: account);\n+ check(NotificationOpenPayload.parseIosApnsPayload(payload))\n+ ..realmUrl.equals(Uri.parse('http://chat.example'))\n+ ..userId.equals(1001)\n+ ..narrow.which((it) => it.isA()\n+ ..streamId.equals(1)\n+ ..topic.equals(TopicName('topic A')));\n+ });\n+ });\n+\n+ group('buildAndroidNotificationUrl', () {\n+ test('smoke DM', () {\n+ final url = NotificationOpenPayload(\n+ realmUrl: Uri.parse('http://chat.example'),\n+ userId: 1001,\n+ narrow: DmNarrow(allRecipientIds: [1001, 1002], selfUserId: 1001),\n+ ).buildAndroidNotificationUrl();\n+ check(url)\n+ ..scheme.equals('zulip')\n+ ..host.equals('notification')\n+ ..queryParameters.deepEquals({\n+ 'realm_url': 'http://chat.example',\n+ 'user_id': '1001',\n+ 'narrow_type': 'dm',\n+ 'all_recipient_ids': '1001,1002',\n+ });\n+ });\n+\n+ test('smoke topic', () {\n+ final url = NotificationOpenPayload(\n+ realmUrl: Uri.parse('http://chat.example'),\n+ userId: 1001,\n+ narrow: eg.topicNarrow(1, 'topic A'),\n+ ).buildAndroidNotificationUrl();\n+ check(url)\n+ ..scheme.equals('zulip')\n+ ..host.equals('notification')\n+ ..queryParameters.deepEquals({\n+ 'realm_url': 'http://chat.example',\n+ 'user_id': '1001',\n+ 'narrow_type': 'topic',\n+ 'channel_id': '1',\n+ 'topic': 'topic A',\n+ });\n+ });\n+ });\n+\n+ group('parseAndroidNotificationUrl', () {\n+ test('smoke DM', () {\n+ final url = Uri(\n+ scheme: 'zulip',\n+ host: 'notification',\n+ queryParameters: {\n+ 'realm_url': 'http://chat.example',\n+ 'user_id': '1001',\n+ 'narrow_type': 'dm',\n+ 'all_recipient_ids': '1001,1002',\n+ });\n+ check(NotificationOpenPayload.parseAndroidNotificationUrl(url))\n+ ..realmUrl.equals(Uri.parse('http://chat.example'))\n+ ..userId.equals(1001)\n+ ..narrow.which((it) => it.isA()\n+ ..allRecipientIds.deepEquals([1001, 1002])\n+ ..otherRecipientIds.deepEquals([1002]));\n+ });\n+\n+ test('smoke topic', () {\n+ final url = Uri(\n+ scheme: 'zulip',\n+ host: 'notification',\n+ queryParameters: {\n+ 'realm_url': 'http://chat.example',\n+ 'user_id': '1001',\n+ 'narrow_type': 'topic',\n+ 'channel_id': '1',\n+ 'topic': 'topic A',\n+ });\n+ check(NotificationOpenPayload.parseAndroidNotificationUrl(url))\n+ ..realmUrl.equals(Uri.parse('http://chat.example'))\n+ ..userId.equals(1001)\n+ ..narrow.which((it) => it.isA()\n+ ..streamId.equals(1)\n+ ..topic.equals(eg.t('topic A')));\n+ });\n+\n+ test('fails when missing any expected query parameters', () {\n+ final testCases = >[\n+ {\n+ // 'realm_url': 'http://chat.example',\n+ 'user_id': '1001',\n+ 'narrow_type': 'topic',\n+ 'channel_id': '1',\n+ 'topic': 'topic A',\n+ },\n+ {\n+ 'realm_url': 'http://chat.example',\n+ // 'user_id': '1001',\n+ 'narrow_type': 'topic',\n+ 'channel_id': '1',\n+ 'topic': 'topic A',\n+ },\n+ {\n+ 'realm_url': 'http://chat.example',\n+ 'user_id': '1001',\n+ // 'narrow_type': 'topic',\n+ 'channel_id': '1',\n+ 'topic': 'topic A',\n+ },\n+ {\n+ 'realm_url': 'http://chat.example',\n+ 'user_id': '1001',\n+ 'narrow_type': 'topic',\n+ // 'channel_id': '1',\n+ 'topic': 'topic A',\n+ },\n+ {\n+ 'realm_url': 'http://chat.example',\n+ 'user_id': '1001',\n+ 'narrow_type': 'topic',\n+ 'channel_id': '1',\n+ // 'topic': 'topic A',\n+ },\n+ {\n+ 'realm_url': 'http://chat.example',\n+ 'user_id': '1001',\n+ // 'narrow_type': 'dm',\n+ 'all_recipient_ids': '1001,1002',\n+ },\n+ {\n+ 'realm_url': 'http://chat.example',\n+ 'user_id': '1001',\n+ 'narrow_type': 'dm',\n+ // 'all_recipient_ids': '1001,1002',\n+ },\n+ ];\n+ for (final params in testCases) {\n+ check(() => NotificationOpenPayload.parseAndroidNotificationUrl(Uri(\n+ scheme: 'zulip',\n+ host: 'notification',\n+ queryParameters: params,\n+ )))\n+ // Missing 'realm_url', 'user_id' and 'narrow_type'\n+ // throws 'FormatException'.\n+ // Missing 'channel_id', 'topic', when narrow_type == 'topic'\n+ // throws 'TypeError'.\n+ // Missing 'all_recipient_ids', when narrow_type == 'dm'\n+ // throws 'TypeError'.\n+ .throws();\n+ }\n+ });\n+\n+ test('fails when scheme is not \"zulip\"', () {\n+ final url = Uri(\n+ scheme: 'http',\n+ host: 'notification',\n+ queryParameters: {\n+ 'realm_url': 'http://chat.example',\n+ 'user_id': '1001',\n+ 'narrow_type': 'topic',\n+ 'channel_id': '1',\n+ 'topic': 'topic A',\n+ });\n+ check(() => NotificationOpenPayload.parseAndroidNotificationUrl(url))\n+ .throws();\n+ });\n+\n+ test('fails when host is not \"notification\"', () {\n+ final url = Uri(\n+ scheme: 'zulip',\n+ host: 'example',\n+ queryParameters: {\n+ 'realm_url': 'http://chat.example',\n+ 'user_id': '1001',\n+ 'narrow_type': 'topic',\n+ 'channel_id': '1',\n+ 'topic': 'topic A',\n+ });\n+ check(() => NotificationOpenPayload.parseAndroidNotificationUrl(url))\n+ .throws();\n+ });\n+ });\n+ });\n+}\n+\n+extension on Subject {\n+ Subject get realmUrl => has((x) => x.realmUrl, 'realmUrl');\n+ Subject get userId => has((x) => x.userId, 'userId');\n+ Subject get narrow => has((x) => x.narrow, 'narrow');\n+}\ndiff --git a/test/widgets/store_test.dart b/test/widgets/store_test.dart\nindex f8da5e24a0..54490ede93 100644\n--- a/test/widgets/store_test.dart\n+++ b/test/widgets/store_test.dart\n@@ -70,12 +70,12 @@ void main() {\n return const SizedBox.shrink();\n })));\n // First, shows a loading page instead of child.\n- check(tester.any(find.byType(CircularProgressIndicator))).isTrue();\n+ check(find.byType(CircularProgressIndicator)).findsOne();\n check(globalStore).isNull();\n \n await tester.pump();\n // Then after loading, mounts child instead, with provided store.\n- check(tester.any(find.byType(CircularProgressIndicator))).isFalse();\n+ check(find.byType(CircularProgressIndicator)).findsNothing();\n check(globalStore).identicalTo(testBinding.globalStore);\n \n await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());\n@@ -84,6 +84,56 @@ void main() {\n .equals((accountId: eg.selfAccount.id, account: eg.selfAccount));\n });\n \n+ testWidgets('GlobalStoreWidget awaits blockingFuture', (tester) async {\n+ addTearDown(testBinding.reset);\n+\n+ final completer = Completer();\n+ await tester.pumpWidget(Directionality(textDirection: TextDirection.ltr,\n+ child: GlobalStoreWidget(\n+ blockingFuture: completer.future,\n+ child: Text('done'))));\n+\n+ await tester.pump();\n+ await tester.pump();\n+ await tester.pump();\n+ // Even after the store must have loaded,\n+ // still shows loading page while blockingFuture is pending.\n+ check(find.byType(CircularProgressIndicator)).findsOne();\n+ check(find.text('done')).findsNothing();\n+\n+ // Once blockingFuture completes\u2026\n+ completer.complete();\n+ await tester.pump();\n+ // \u2026 mounts child instead of the loading page.\n+ check(find.byType(CircularProgressIndicator)).findsNothing();\n+ check(find.text('done')).findsOne();\n+ });\n+\n+ testWidgets('GlobalStoreWidget handles failed blockingFuture like success', (tester) async {\n+ addTearDown(testBinding.reset);\n+\n+ final completer = Completer();\n+ await tester.pumpWidget(Directionality(textDirection: TextDirection.ltr,\n+ child: GlobalStoreWidget(\n+ blockingFuture: completer.future,\n+ child: Text('done'))));\n+\n+ await tester.pump();\n+ await tester.pump();\n+ await tester.pump();\n+ // Even after the store must have loaded,\n+ // still shows loading page while blockingFuture is pending.\n+ check(find.byType(CircularProgressIndicator)).findsOne();\n+ check(find.text('done')).findsNothing();\n+\n+ // Once blockingFuture completes, even with an error\u2026\n+ completer.completeError(Exception('oops'));\n+ await tester.pump();\n+ // \u2026 mounts child instead of the loading page.\n+ check(find.byType(CircularProgressIndicator)).findsNothing();\n+ check(find.text('done')).findsOne();\n+ });\n+\n testWidgets('GlobalStoreWidget.of updates dependents', (tester) async {\n addTearDown(testBinding.reset);\n \n", "n2p_tests": "{\"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll handles events\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken on iOS, use provided app ID from packageInfo\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenService at app launch (variant: TargetPlatform.android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out during transient-error backoff\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPassedWaitingPeriod user joined at 2024-11-25T10:00+00:00 hasn't passed waiting period by 2024-11-27 09:59:00.000Z\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPassedWaitingPeriod user joined at 2024-11-25T10:00+00:00 has passed waiting period by 2024-11-27 10:00:00.000Z\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenPayload parseAndroidNotificationUrl smoke topic\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"guest\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenPayload parseIosApnsPayload smoke one-one DM\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out while loading; then fails; malformed response with ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show remove: different realm URLs but same user-ids and same message-ids\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenPayload parseAndroidNotificationUrl fails when host is not \\\"notification\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on Server5xxException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount loading succeeds\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.removeAccount when store not loaded\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"administrator\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show removeNotificationsForAccount: removes notifications\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show 1:1 DM\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reload failure new store is not loaded, gets InitialSnapshot with ancient server version\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken token already known (iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount throws if missing queueId\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccountSync\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPassedWaitingPeriod user joined at 2024-11-25T10:00+00:00 hasn't passed waiting period by 2024-11-26 10:00:00.000Z\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show 1:1 DM: title updates when sender name changes\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenService wait for app to become ready (variant: TargetPlatform.android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.removeAccount when store loading\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenPayload parseAndroidNotificationUrl smoke DM\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.load updates account from snapshot\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"unknown\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenService uses associated account as initial account; if initial route (variant: TargetPlatform.android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"member\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show remove: clears conversation only if the removal event is for the last message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report generic ZulipApiException\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on NetworkException from SocketException\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show group DM: 3 users\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show removeNotificationsForAccount: leaves notifications for other accounts (same realm URL)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenPayload parseIosApnsPayload smoke topic message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show stream message: stream name omitted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"member\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show remove: clears summary notification only if all conversation notifications are cleared\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"owner\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"administrator\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on rate limit: code RATE_LIMIT_HIT\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount concurrent case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.sendMessage smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error nicely report handleEvent error\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show 1:1 DM: sender avatar loading fails, local error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount loading fails; malformed response with ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenService uses associated account as initial account; if initial route (variant: TargetPlatform.iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out while loading; then fails with HTTP status code 401\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenService stream message (variant: TargetPlatform.android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"unknown\\\" user can post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out while loading; then succeeds\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount loading fails with HTTP status code 401\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"moderator\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPassedWaitingPeriod user joined at 2024-11-25T10:00+00:00 has passed waiting period by 2027-08-22 07:00:00.000Z\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationChannelManager create channel smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/store_test.dart: PerAccountStoreWidget.routeToRemoveOnLogout logged-out account's routes removed from nav; other accounts' remain\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show group DM: more than 3 users\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on rate limit: status 429 MalformedServerResponseException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenPayload buildAndroidNotificationUrl smoke DM\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show 1:1 DM: conversation stays same when sender email changes\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/store_test.dart: PerAccountStoreAwareStateMixin\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show remove: smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenService find account among several (variant: TargetPlatform.android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show 1:1 DM: sender avatar loading fails, remote error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show self-DM\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenPayload parseAndroidNotificationUrl fails when missing any expected query parameters\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateAccount notifyListeners called\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateZulipVersionData\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken token initially unknown (iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reload failure user logged out before new store is loaded\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report MalformedServerResponseException\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenPayload parseIosApnsPayload smoke group DM\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPassedWaitingPeriod user joined at 2024-11-25T10:00+00:00 hasn't passed waiting period by 2024-11-25 10:00:00.000Z\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads on handleEvent error\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateAccount basic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show remove: different user-ids but same realm URL and same message-ids\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount account is logged out while loading; then succeeds; InitialSnapshot has ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateAccount reject changing id, realmUrl, or userId\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.load smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads on unexpected error within loop\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken token already known (Android)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenService wait for app to become ready (variant: TargetPlatform.iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"moderator\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reload failure new store is not loaded, gets malformed response with ancient server version\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount sequential case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenPayload android: smoke round-trip\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenService at app launch (variant: TargetPlatform.iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationChannelManager create channel obsolete channels are removed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"unknown\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken token initially unknown (Android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show group DM: title updates with latest sender\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.removeAccount when store loaded\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.fetchEmojiData happy case\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show stream message: multiple messages, same topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: ZulipVersionData fromMalformedServerResponseException replace missing feature level with 0\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report rate limit: status 429 ZulipApiException\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenPayload parseAndroidNotificationUrl fails when scheme is not \\\"zulip\\\"\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount loading succeeds; InitialSnapshot has ancient server version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/open_test.dart: NotificationOpenPayload buildAndroidNotificationUrl smoke topic\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"guest\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads on MalformedServerResponseException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/notifications/display_test.dart: NotificationDisplayManager show removeNotificationsForAccount leaves notifications for other accounts (same user-ids)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"owner\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll loops on success\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1340", "org": "zulip", "repo": "zulip-flutter", "number": 1340, "state": "closed", "title": "store: Ensure sole ownership of MessageListView", "body": "Fixes #1358.\r\n\r\nPerAccountStore shouldn't be an owner of the MessageListView elements.\r\n\r\nIts relationship to MessageListView is similar to that of AutocompleteViewManager to MentionAutocompleteView (#645).\r\n\r\nWith two owners, the MessageListView can be disposed twice:\r\n\r\n1. before the frame is rendered, `removeAccount` disposes the `PerAccountStoreWidget`, which disposes the `MessageListView`; `_MessageListState` is not yet disposed;\r\n\r\n2. during build, because `store` is set to `null`, `PerAccountStoreWidget` gets rebuilt. `_MessageListState`, a descendent of it, is no longer in the render tree;\r\n\r\n3. during finalization, `_MessageListState` tries to dispose the `MessageListView`.\r\n\r\nThis removes regression tests added for #810, because `MessageStoreImpl.dispose` no longer exists. `MessageListView` does not get disposed unless there is a `_MessageListState` owner.\r\n\r\nFor reproduction, I created a testing branch with #1183 stacked on top of this, but has the fix reverted:\r\n\r\n- Checkout https://github.com/PIG208/zulip-flutter/pull/1.\r\n- Go to any `MessageListPage`\r\n- Invalidate the API key (by regenerating it on web, for example)\r\n\r\nYou should see the following error:\r\n\r\n```\r\n======== Exception caught by widgets library =======================================================\r\nThe following assertion was thrown while finalizing the widget tree:\r\n'package:zulip/model/message.dart': Failed assertion: line 54 pos 12: 'removed': is not true.\r\n\r\nWhen the exception was thrown, this was the stack: \r\n#2 MessageStoreImpl.unregisterMessageList (package:zulip/model/message.dart:54:12)\r\n#3 PerAccountStore.unregisterMessageList (package:zulip/model/store.dart:540:15)\r\n#4 MessageListView.dispose (package:zulip/model/message_list.dart:427:11)\r\n#5 _MessageListState.dispose (package:zulip/widgets/message_list.dart:491:12)\r\n#6 StatefulElement.unmount (package:flutter/src/widgets/framework.dart:5940:11)\r\n#7 _InactiveElements._unmount (package:flutter/src/widgets/framework.dart:2085:13)\r\n#8 _InactiveElements._unmount. (package:flutter/src/widgets/framework.dart:2083:7)\r\n#9 ComponentElement.visitChildren (package:flutter/src/widgets/framework.dart:5781:14)\r\n(elided 2 frames from class _AssertionError)\r\n====================================================================================================\r\n```\r\n\r\n[CZO discussion](https://chat.zulip.org/#narrow/channel/243-mobile-team/topic/.60MentionAutocompleteView.2Edispose.60/near/2083074)", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"1e8397be156ab603a89c2b024a12d4e2028e1acc\"}", "resolved_issues": "[{\"number\": 1358, \"title\": \"MessageListView could be disposed twice\", \"body\": \"This is the issue thread for the bug fixed by:\\n* #1340 \\n\\nSee also chat thread:\\nhttps://chat.zulip.org/#narrow/channel/243-mobile-team/topic/MessageListView.20lifecycle/near/2083074\\n\\nI believe this was a crash bug \\u2014 the stack trace in #1340 was while the Flutter framework is updating the element tree, and I think an exception there can leave things in an inconsistent state where the app no longer responds normally. Not sure of that, though.\\n\\nOTOH it's probably hard to trigger: as far as I know we never heard from someone running into symptoms from it, and learned about it instead because @PIG208 was studying the code as part of work on #1183.\\n\"}]", "lang": "dart", "problem_statement": "MessageListView could be disposed twice\nThis is the issue thread for the bug fixed by:\n* #1340 \n\nSee also chat thread:\nhttps://chat.zulip.org/#narrow/channel/243-mobile-team/topic/MessageListView.20lifecycle/near/2083074\n\nI believe this was a crash bug \u2014 the stack trace in #1340 was while the Flutter framework is updating the element tree, and I think an exception there can leave things in an inconsistent state where the app no longer responds normally. Not sure of that, though.\n\nOTOH it's probably hard to trigger: as far as I know we never heard from someone running into symptoms from it, and learned about it instead because @PIG208 was studying the code as part of work on #1183.\n\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/1340", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1358\"]", "test_command": "flutter test test/model/actions_test.dart test/model/message_test.dart test/model/store_test.dart test/widgets/actions_test.dart test/widgets/home_test.dart test/widgets/message_list_test.dart test/widgets/store_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/actions.dart b/lib/model/actions.dart\nnew file mode 100644\nindex 0000000000..a88eea0777\n--- /dev/null\n+++ b/lib/model/actions.dart\n@@ -0,0 +1,36 @@\n+import 'dart:async';\n+\n+import '../notifications/receive.dart';\n+import 'store.dart';\n+\n+// TODO: Make this a part of GlobalStore\n+Future logOutAccount(GlobalStore globalStore, int accountId) async {\n+ final account = globalStore.getAccount(accountId);\n+ if (account == null) return; // TODO(log)\n+\n+ // Unawaited, to not block removing the account on this request.\n+ unawaited(unregisterToken(globalStore, accountId));\n+\n+ await globalStore.removeAccount(accountId);\n+}\n+\n+Future unregisterToken(GlobalStore globalStore, int accountId) async {\n+ final account = globalStore.getAccount(accountId);\n+ if (account == null) return; // TODO(log)\n+\n+ // TODO(#322) use actual acked push token; until #322, this is just null.\n+ final token = account.ackedPushToken\n+ // Try the current token as a fallback; maybe the server has registered\n+ // it and we just haven't recorded that fact in the client.\n+ ?? NotificationService.instance.token.value;\n+ if (token == null) return;\n+\n+ final connection = globalStore.apiConnectionFromAccount(account);\n+ try {\n+ await NotificationService.unregisterToken(connection, token: token);\n+ } catch (e) {\n+ // TODO retry? handle failures?\n+ } finally {\n+ connection.close();\n+ }\n+}\ndiff --git a/lib/model/message.dart b/lib/model/message.dart\nindex f228d6da91..84f3bbc3e5 100644\n--- a/lib/model/message.dart\n+++ b/lib/model/message.dart\n@@ -61,12 +61,20 @@ class MessageStoreImpl with MessageStore {\n }\n \n void dispose() {\n- // When a MessageListView is disposed, it removes itself from the Set\n- // `MessageStoreImpl._messageListViews`. Instead of iterating on that Set,\n- // iterate on a copy, to avoid concurrent modifications.\n- for (final view in _messageListViews.toList()) {\n- view.dispose();\n- }\n+ // Not disposing the [MessageListView]s here, because they are owned by\n+ // (i.e., they get [dispose]d by) the [_MessageListState], including in the\n+ // case where the [PerAccountStore] is replaced.\n+ //\n+ // TODO: Add assertions that the [MessageListView]s are indeed disposed, by\n+ // first ensuring that [PerAccountStore] is only disposed after those with\n+ // references to it are disposed, then reinstating this `dispose` method.\n+ //\n+ // We can't add the assertions as-is because the sequence of events\n+ // guarantees that `PerAccountStore` is disposed (when that happens,\n+ // [GlobalStore] notifies its listeners, causing widgets dependent on the\n+ // [InheritedNotifier] to rebuild in the next frame) before the owner's\n+ // `dispose` or `onNewStore` is called. Discussion:\n+ // https://chat.zulip.org/#narrow/channel/243-mobile-team/topic/MessageListView.20lifecycle/near/2086893\n }\n \n @override\ndiff --git a/lib/widgets/actions.dart b/lib/widgets/actions.dart\nindex 86c6e44875..2df502ec6c 100644\n--- a/lib/widgets/actions.dart\n+++ b/lib/widgets/actions.dart\n@@ -15,44 +15,9 @@ import '../api/model/narrow.dart';\n import '../api/route/messages.dart';\n import '../generated/l10n/zulip_localizations.dart';\n import '../model/narrow.dart';\n-import '../model/store.dart';\n-import '../notifications/receive.dart';\n import 'dialog.dart';\n import 'store.dart';\n \n-Future logOutAccount(BuildContext context, int accountId) async {\n- final globalStore = GlobalStoreWidget.of(context);\n-\n- final account = globalStore.getAccount(accountId);\n- if (account == null) return; // TODO(log)\n-\n- // Unawaited, to not block removing the account on this request.\n- unawaited(unregisterToken(globalStore, accountId));\n-\n- await globalStore.removeAccount(accountId);\n-}\n-\n-Future unregisterToken(GlobalStore globalStore, int accountId) async {\n- final account = globalStore.getAccount(accountId);\n- if (account == null) return; // TODO(log)\n-\n- // TODO(#322) use actual acked push token; until #322, this is just null.\n- final token = account.ackedPushToken\n- // Try the current token as a fallback; maybe the server has registered\n- // it and we just haven't recorded that fact in the client.\n- ?? NotificationService.instance.token.value;\n- if (token == null) return;\n-\n- final connection = globalStore.apiConnectionFromAccount(account);\n- try {\n- await NotificationService.unregisterToken(connection, token: token);\n- } catch (e) {\n- // TODO retry? handle failures?\n- } finally {\n- connection.close();\n- }\n-}\n-\n Future markNarrowAsRead(BuildContext context, Narrow narrow) async {\n final store = PerAccountStoreWidget.of(context);\n final connection = store.connection;\ndiff --git a/lib/widgets/app.dart b/lib/widgets/app.dart\nindex 9fa82144a1..2ad35e3e53 100644\n--- a/lib/widgets/app.dart\n+++ b/lib/widgets/app.dart\n@@ -6,11 +6,11 @@ import 'package:flutter/scheduler.dart';\n \n import '../generated/l10n/zulip_localizations.dart';\n import '../log.dart';\n+import '../model/actions.dart';\n import '../model/localizations.dart';\n import '../model/store.dart';\n import '../notifications/display.dart';\n import 'about_zulip.dart';\n-import 'actions.dart';\n import 'dialog.dart';\n import 'home.dart';\n import 'login.dart';\n@@ -265,7 +265,7 @@ class ChooseAccountPage extends StatelessWidget {\n actionButtonText: zulipLocalizations.logOutConfirmationDialogConfirmButton,\n onActionButtonPress: () {\n // TODO error handling if db write fails?\n- logOutAccount(context, accountId);\n+ logOutAccount(GlobalStoreWidget.of(context), accountId);\n });\n },\n child: Text(zulipLocalizations.chooseAccountPageLogOutButton)),\ndiff --git a/lib/widgets/message_list.dart b/lib/widgets/message_list.dart\nindex 57259640b1..4d0ff00072 100644\n--- a/lib/widgets/message_list.dart\n+++ b/lib/widgets/message_list.dart\n@@ -483,6 +483,7 @@ class _MessageListState extends State with PerAccountStoreAwareStat\n \n @override\n void onNewStore() { // TODO(#464) try to keep using old model until new one gets messages\n+ model?.dispose();\n _initModel(PerAccountStoreWidget.of(context));\n }\n \n", "test_patch": "diff --git a/test/model/actions_test.dart b/test/model/actions_test.dart\nnew file mode 100644\nindex 0000000000..e24bb3223c\n--- /dev/null\n+++ b/test/model/actions_test.dart\n@@ -0,0 +1,188 @@\n+import 'package:checks/checks.dart';\n+import 'package:flutter/foundation.dart';\n+import 'package:flutter_test/flutter_test.dart';\n+import 'package:http/http.dart' as http;\n+import 'package:zulip/api/exception.dart';\n+import 'package:zulip/model/actions.dart';\n+import 'package:zulip/model/store.dart';\n+import 'package:zulip/notifications/receive.dart';\n+\n+import '../api/fake_api.dart';\n+import '../example_data.dart' as eg;\n+import '../fake_async.dart';\n+import '../model/binding.dart';\n+import '../model/store_checks.dart';\n+import '../model/test_store.dart';\n+import '../stdlib_checks.dart';\n+import 'store_test.dart';\n+\n+void main() {\n+ TestZulipBinding.ensureInitialized();\n+\n+ late PerAccountStore store;\n+ late FakeApiConnection connection;\n+\n+ Future prepare({String? ackedPushToken = '123'}) async {\n+ addTearDown(testBinding.reset);\n+ final selfAccount = eg.selfAccount.copyWith(ackedPushToken: Value(ackedPushToken));\n+ await testBinding.globalStore.add(selfAccount, eg.initialSnapshot());\n+ store = await testBinding.globalStore.perAccount(selfAccount.id);\n+ connection = store.connection as FakeApiConnection;\n+ }\n+\n+ /// Creates and caches a new [FakeApiConnection] in [TestGlobalStore].\n+ ///\n+ /// In live code, [unregisterToken] makes a new [ApiConnection] for the\n+ /// unregister-token request instead of reusing the store's connection.\n+ /// To enable callers to prepare responses for that request, this function\n+ /// creates a new [FakeApiConnection] and caches it in [TestGlobalStore]\n+ /// for [unregisterToken] to pick up.\n+ ///\n+ /// Call this instead of just turning on\n+ /// [TestGlobalStore.useCachedApiConnections] so that [unregisterToken]\n+ /// doesn't try to call `close` twice on the same connection instance,\n+ /// which isn't allowed. (Once by the unregister-token code\n+ /// and once as part of removing the account.)\n+ FakeApiConnection separateConnection() {\n+ testBinding.globalStore\n+ ..clearCachedApiConnections()\n+ ..useCachedApiConnections = true;\n+ return testBinding.globalStore\n+ .apiConnectionFromAccount(eg.selfAccount) as FakeApiConnection;\n+ }\n+\n+ String unregisterApiPathForPlatform(TargetPlatform platform) {\n+ return switch (platform) {\n+ TargetPlatform.android => '/api/v1/users/me/android_gcm_reg_id',\n+ TargetPlatform.iOS => '/api/v1/users/me/apns_device_token',\n+ _ => throw Error(),\n+ };\n+ }\n+\n+ void checkSingleUnregisterRequest(\n+ FakeApiConnection connection, {\n+ String? expectedToken,\n+ }) {\n+ final subject = check(connection.takeRequests()).single.isA()\n+ ..method.equals('DELETE')\n+ ..url.path.equals(unregisterApiPathForPlatform(defaultTargetPlatform));\n+ if (expectedToken != null) {\n+ subject.bodyFields.deepEquals({'token': expectedToken});\n+ }\n+ }\n+\n+ group('logOutAccount', () {\n+ test('smoke', () => awaitFakeAsync((async) async {\n+ await prepare();\n+ check(testBinding.globalStore).accountIds.single.equals(eg.selfAccount.id);\n+ const unregisterDelay = Duration(seconds: 5);\n+ assert(unregisterDelay > TestGlobalStore.removeAccountDuration);\n+ final newConnection = separateConnection()\n+ ..prepare(delay: unregisterDelay, json: {'msg': '', 'result': 'success'});\n+\n+ final future = logOutAccount(testBinding.globalStore, eg.selfAccount.id);\n+ // Unregister-token request and account removal dispatched together\n+ checkSingleUnregisterRequest(newConnection);\n+ check(testBinding.globalStore.takeDoRemoveAccountCalls())\n+ .single.equals(eg.selfAccount.id);\n+\n+ async.elapse(TestGlobalStore.removeAccountDuration);\n+ await future;\n+ // Account removal not blocked on unregister-token response\n+ check(testBinding.globalStore).accountIds.isEmpty();\n+ check(connection.isOpen).isFalse();\n+ check(newConnection.isOpen).isTrue(); // still busy with unregister-token\n+\n+ async.elapse(unregisterDelay - TestGlobalStore.removeAccountDuration);\n+ check(newConnection.isOpen).isFalse();\n+ }));\n+\n+ test('unregister request has an error', () => awaitFakeAsync((async) async {\n+ await prepare();\n+ check(testBinding.globalStore).accountIds.single.equals(eg.selfAccount.id);\n+ const unregisterDelay = Duration(seconds: 5);\n+ assert(unregisterDelay > TestGlobalStore.removeAccountDuration);\n+ final exception = ZulipApiException(\n+ httpStatus: 401,\n+ code: 'UNAUTHORIZED',\n+ data: {\"result\": \"error\", \"msg\": \"Invalid API key\", \"code\": \"UNAUTHORIZED\"},\n+ routeName: 'removeEtcEtcToken',\n+ message: 'Invalid API key',\n+ );\n+ final newConnection = separateConnection()\n+ ..prepare(delay: unregisterDelay, exception: exception);\n+\n+ final future = logOutAccount(testBinding.globalStore, eg.selfAccount.id);\n+ // Unregister-token request and account removal dispatched together\n+ checkSingleUnregisterRequest(newConnection);\n+ check(testBinding.globalStore.takeDoRemoveAccountCalls())\n+ .single.equals(eg.selfAccount.id);\n+\n+ async.elapse(TestGlobalStore.removeAccountDuration);\n+ await future;\n+ // Account removal not blocked on unregister-token response\n+ check(testBinding.globalStore).accountIds.isEmpty();\n+ check(connection.isOpen).isFalse();\n+ check(newConnection.isOpen).isTrue(); // for the unregister-token request\n+\n+ async.elapse(unregisterDelay - TestGlobalStore.removeAccountDuration);\n+ check(newConnection.isOpen).isFalse();\n+ }));\n+ });\n+\n+ group('unregisterToken', () {\n+ testAndroidIos('smoke, happy path', () => awaitFakeAsync((async) async {\n+ await prepare(ackedPushToken: '123');\n+\n+ final newConnection = separateConnection()\n+ ..prepare(json: {'msg': '', 'result': 'success'});\n+ final future = unregisterToken(testBinding.globalStore, eg.selfAccount.id);\n+ async.elapse(Duration.zero);\n+ await future;\n+ checkSingleUnregisterRequest(newConnection, expectedToken: '123');\n+ check(newConnection.isOpen).isFalse();\n+ }));\n+\n+ test('fallback to current token if acked is missing', () => awaitFakeAsync((async) async {\n+ await prepare(ackedPushToken: null);\n+ NotificationService.instance.token = ValueNotifier('asdf');\n+\n+ final newConnection = separateConnection()\n+ ..prepare(json: {'msg': '', 'result': 'success'});\n+ final future = unregisterToken(testBinding.globalStore, eg.selfAccount.id);\n+ async.elapse(Duration.zero);\n+ await future;\n+ checkSingleUnregisterRequest(newConnection, expectedToken: 'asdf');\n+ check(newConnection.isOpen).isFalse();\n+ }));\n+\n+ test('no error if acked token and current token both missing', () => awaitFakeAsync((async) async {\n+ await prepare(ackedPushToken: null);\n+ NotificationService.instance.token = ValueNotifier(null);\n+\n+ final newConnection = separateConnection();\n+ final future = unregisterToken(testBinding.globalStore, eg.selfAccount.id);\n+ async.flushTimers();\n+ await future;\n+ check(newConnection.takeRequests()).isEmpty();\n+ }));\n+\n+ test('connection closed if request errors', () => awaitFakeAsync((async) async {\n+ await prepare(ackedPushToken: '123');\n+\n+ final newConnection = separateConnection()\n+ ..prepare(exception: ZulipApiException(\n+ httpStatus: 401,\n+ code: 'UNAUTHORIZED',\n+ data: {\"result\": \"error\", \"msg\": \"Invalid API key\", \"code\": \"UNAUTHORIZED\"},\n+ routeName: 'removeEtcEtcToken',\n+ message: 'Invalid API key',\n+ ));\n+ final future = unregisterToken(testBinding.globalStore, eg.selfAccount.id);\n+ async.elapse(Duration.zero);\n+ await future;\n+ checkSingleUnregisterRequest(newConnection, expectedToken: '123');\n+ check(newConnection.isOpen).isFalse();\n+ }));\n+ });\n+}\ndiff --git a/test/model/message_test.dart b/test/model/message_test.dart\nindex 43f17be61a..9c9a940d42 100644\n--- a/test/model/message_test.dart\n+++ b/test/model/message_test.dart\n@@ -77,18 +77,6 @@ void main() {\n checkNotified(count: messageList.fetched ? messages.length : 0);\n }\n \n- test('disposing multiple registered MessageListView instances', () async {\n- // Regression test for: https://github.com/zulip/zulip-flutter/issues/810\n- await prepare(narrow: const MentionsNarrow());\n- MessageListView.init(store: store, narrow: const StarredMessagesNarrow());\n- check(store.debugMessageListViews).length.equals(2);\n-\n- // When disposing, the [MessageListView]s are expected to unregister\n- // themselves from the message store.\n- store.dispose();\n- check(store.debugMessageListViews).isEmpty();\n- });\n-\n group('reconcileMessages', () {\n test('from empty', () async {\n await prepare();\ndiff --git a/test/model/store_test.dart b/test/model/store_test.dart\nindex c8c6b4c266..bc393d6d6f 100644\n--- a/test/model/store_test.dart\n+++ b/test/model/store_test.dart\n@@ -12,8 +12,6 @@ import 'package:zulip/api/model/model.dart';\n import 'package:zulip/api/route/events.dart';\n import 'package:zulip/api/route/messages.dart';\n import 'package:zulip/api/route/realm.dart';\n-import 'package:zulip/model/message_list.dart';\n-import 'package:zulip/model/narrow.dart';\n import 'package:zulip/log.dart';\n import 'package:zulip/model/store.dart';\n import 'package:zulip/notifications/receive.dart';\n@@ -824,25 +822,6 @@ void main() {\n checkReload(prepareHandleEventError);\n });\n \n- test('expired queue disposes registered MessageListView instances', () => awaitFakeAsync((async) async {\n- // Regression test for: https://github.com/zulip/zulip-flutter/issues/810\n- await preparePoll();\n-\n- // Make sure there are [MessageListView]s in the message store.\n- MessageListView.init(store: store, narrow: const MentionsNarrow());\n- MessageListView.init(store: store, narrow: const StarredMessagesNarrow());\n- check(store.debugMessageListViews).length.equals(2);\n-\n- // Let the server expire the event queue.\n- prepareExpiredEventQueue();\n- updateMachine.debugAdvanceLoop();\n- async.elapse(Duration.zero);\n-\n- // The old store's [MessageListView]s have been disposed.\n- // (And no exception was thrown; that was #810.)\n- check(store.debugMessageListViews).isEmpty();\n- }));\n-\n group('report error', () {\n String? lastReportedError;\n String? takeLastReportedError() {\ndiff --git a/test/widgets/actions_test.dart b/test/widgets/actions_test.dart\nindex 5a957c44e0..290d6f3e53 100644\n--- a/test/widgets/actions_test.dart\n+++ b/test/widgets/actions_test.dart\n@@ -1,13 +1,9 @@\n-import 'dart:async';\n import 'dart:convert';\n \n import 'package:checks/checks.dart';\n-import 'package:flutter/foundation.dart';\n import 'package:flutter/material.dart';\n-import 'package:flutter_checks/flutter_checks.dart';\n import 'package:flutter_test/flutter_test.dart';\n import 'package:http/http.dart' as http;\n-import 'package:zulip/api/exception.dart';\n import 'package:zulip/api/model/initial_snapshot.dart';\n import 'package:zulip/api/model/model.dart';\n import 'package:zulip/api/model/narrow.dart';\n@@ -15,20 +11,13 @@ import 'package:zulip/api/route/messages.dart';\n import 'package:zulip/model/localizations.dart';\n import 'package:zulip/model/narrow.dart';\n import 'package:zulip/model/store.dart';\n-import 'package:zulip/notifications/receive.dart';\n import 'package:zulip/widgets/actions.dart';\n-import 'package:zulip/widgets/app.dart';\n-import 'package:zulip/widgets/inbox.dart';\n-import 'package:zulip/widgets/page.dart';\n \n import '../api/fake_api.dart';\n import '../example_data.dart' as eg;\n import '../model/binding.dart';\n-import '../model/store_checks.dart';\n-import '../model/test_store.dart';\n import '../model/unreads_checks.dart';\n import '../stdlib_checks.dart';\n-import '../test_navigation.dart';\n import 'dialog_checks.dart';\n import 'test_app.dart';\n \n@@ -59,228 +48,6 @@ void main() {\n context = tester.element(find.byType(Placeholder));\n }\n \n- /// Creates and caches a new [FakeApiConnection] in [TestGlobalStore].\n- ///\n- /// In live code, [unregisterToken] makes a new [ApiConnection] for the\n- /// unregister-token request instead of reusing the store's connection.\n- /// To enable callers to prepare responses for that request, this function\n- /// creates a new [FakeApiConnection] and caches it in [TestGlobalStore]\n- /// for [unregisterToken] to pick up.\n- ///\n- /// Call this instead of just turning on\n- /// [TestGlobalStore.useCachedApiConnections] so that [unregisterToken]\n- /// doesn't try to call `close` twice on the same connection instance,\n- /// which isn't allowed. (Once by the unregister-token code\n- /// and once as part of removing the account.)\n- FakeApiConnection separateConnection() {\n- testBinding.globalStore\n- ..clearCachedApiConnections()\n- ..useCachedApiConnections = true;\n- return testBinding.globalStore\n- .apiConnectionFromAccount(eg.selfAccount) as FakeApiConnection;\n- }\n-\n- String unregisterApiPathForPlatform(TargetPlatform platform) {\n- return switch (platform) {\n- TargetPlatform.android => '/api/v1/users/me/android_gcm_reg_id',\n- TargetPlatform.iOS => '/api/v1/users/me/apns_device_token',\n- _ => throw Error(),\n- };\n- }\n-\n- void checkSingleUnregisterRequest(\n- FakeApiConnection connection, {\n- String? expectedToken,\n- }) {\n- final subject = check(connection.takeRequests()).single.isA()\n- ..method.equals('DELETE')\n- ..url.path.equals(unregisterApiPathForPlatform(defaultTargetPlatform));\n- if (expectedToken != null) {\n- subject.bodyFields.deepEquals({'token': expectedToken});\n- }\n- }\n-\n- group('logOutAccount', () {\n- testWidgets('smoke', (tester) async {\n- await prepare(tester, skipAssertAccountExists: true);\n- check(testBinding.globalStore).accountIds.single.equals(eg.selfAccount.id);\n- const unregisterDelay = Duration(seconds: 5);\n- assert(unregisterDelay > TestGlobalStore.removeAccountDuration);\n- final newConnection = separateConnection()\n- ..prepare(delay: unregisterDelay, json: {'msg': '', 'result': 'success'});\n-\n- final future = logOutAccount(context, eg.selfAccount.id);\n- // Unregister-token request and account removal dispatched together\n- checkSingleUnregisterRequest(newConnection);\n- check(testBinding.globalStore.takeDoRemoveAccountCalls())\n- .single.equals(eg.selfAccount.id);\n-\n- await tester.pump(TestGlobalStore.removeAccountDuration);\n- await future;\n- // Account removal not blocked on unregister-token response\n- check(testBinding.globalStore).accountIds.isEmpty();\n- check(connection.isOpen).isFalse();\n- check(newConnection.isOpen).isTrue(); // still busy with unregister-token\n-\n- await tester.pump(unregisterDelay - TestGlobalStore.removeAccountDuration);\n- check(newConnection.isOpen).isFalse();\n- });\n-\n- testWidgets('unregister request has an error', (tester) async {\n- await prepare(tester, skipAssertAccountExists: true);\n- check(testBinding.globalStore).accountIds.single.equals(eg.selfAccount.id);\n- const unregisterDelay = Duration(seconds: 5);\n- assert(unregisterDelay > TestGlobalStore.removeAccountDuration);\n- final exception = ZulipApiException(\n- httpStatus: 401,\n- code: 'UNAUTHORIZED',\n- data: {\"result\": \"error\", \"msg\": \"Invalid API key\", \"code\": \"UNAUTHORIZED\"},\n- routeName: 'removeEtcEtcToken',\n- message: 'Invalid API key',\n- );\n- final newConnection = separateConnection()\n- ..prepare(delay: unregisterDelay, exception: exception);\n-\n- final future = logOutAccount(context, eg.selfAccount.id);\n- // Unregister-token request and account removal dispatched together\n- checkSingleUnregisterRequest(newConnection);\n- check(testBinding.globalStore.takeDoRemoveAccountCalls())\n- .single.equals(eg.selfAccount.id);\n-\n- await tester.pump(TestGlobalStore.removeAccountDuration);\n- await future;\n- // Account removal not blocked on unregister-token response\n- check(testBinding.globalStore).accountIds.isEmpty();\n- check(connection.isOpen).isFalse();\n- check(newConnection.isOpen).isTrue(); // for the unregister-token request\n-\n- await tester.pump(unregisterDelay - TestGlobalStore.removeAccountDuration);\n- check(newConnection.isOpen).isFalse();\n- });\n-\n- testWidgets(\"logged-out account's routes removed from nav; other accounts' remain\", (tester) async {\n- Future makeUnreadTopicInInbox(int accountId, String topic) async {\n- final stream = eg.stream();\n- final message = eg.streamMessage(stream: stream, topic: topic);\n- final store = await testBinding.globalStore.perAccount(accountId);\n- await store.addStream(stream);\n- await store.addSubscription(eg.subscription(stream));\n- await store.addMessage(message);\n- await tester.pump();\n- }\n-\n- addTearDown(testBinding.reset);\n-\n- final account1 = eg.account(id: 1, user: eg.user());\n- final account2 = eg.account(id: 2, user: eg.user());\n- await testBinding.globalStore.add(account1, eg.initialSnapshot());\n- await testBinding.globalStore.add(account2, eg.initialSnapshot());\n-\n- final testNavObserver = TestNavigatorObserver();\n- await tester.pumpWidget(ZulipApp(navigatorObservers: [testNavObserver]));\n- await tester.pump();\n- final navigator = await ZulipApp.navigator;\n- navigator.popUntil((_) => false); // clear starting routes\n- await tester.pumpAndSettle();\n-\n- final pushedRoutes = >[];\n- testNavObserver.onPushed = (route, prevRoute) => pushedRoutes.add(route);\n- // TODO(#737): switch to a realistic setup:\n- // https://github.com/zulip/zulip-flutter/pull/1076#discussion_r1874124363\n- final account1Route = MaterialAccountWidgetRoute(\n- accountId: account1.id, page: const InboxPageBody());\n- final account2Route = MaterialAccountWidgetRoute(\n- accountId: account2.id, page: const InboxPageBody());\n- unawaited(navigator.push(account1Route));\n- unawaited(navigator.push(account2Route));\n- await tester.pumpAndSettle();\n- check(pushedRoutes).deepEquals([account1Route, account2Route]);\n-\n- await makeUnreadTopicInInbox(account1.id, 'topic in account1');\n- final findAccount1PageContent = find.text('topic in account1', skipOffstage: false);\n-\n- await makeUnreadTopicInInbox(account2.id, 'topic in account2');\n- final findAccount2PageContent = find.text('topic in account2', skipOffstage: false);\n-\n- final findLoadingPage = find.byType(LoadingPlaceholderPage, skipOffstage: false);\n-\n- check(findAccount1PageContent).findsOne();\n- check(findLoadingPage).findsNothing();\n-\n- final removedRoutes = >[];\n- testNavObserver.onRemoved = (route, prevRoute) => removedRoutes.add(route);\n-\n- final context = tester.element(find.byType(MaterialApp));\n- final future = logOutAccount(context, account1.id);\n- await tester.pump(TestGlobalStore.removeAccountDuration);\n- await future;\n- check(removedRoutes).single.identicalTo(account1Route);\n- check(findAccount1PageContent).findsNothing();\n- check(findLoadingPage).findsOne();\n-\n- await tester.pump();\n- check(findAccount1PageContent).findsNothing();\n- check(findLoadingPage).findsNothing();\n- check(findAccount2PageContent).findsOne();\n- });\n- });\n-\n- group('unregisterToken', () {\n- testWidgets('smoke, happy path', (tester) async {\n- await prepare(tester, ackedPushToken: '123');\n-\n- final newConnection = separateConnection()\n- ..prepare(json: {'msg': '', 'result': 'success'});\n- final future = unregisterToken(testBinding.globalStore, eg.selfAccount.id);\n- await tester.pump(Duration.zero);\n- await future;\n- checkSingleUnregisterRequest(newConnection, expectedToken: '123');\n- check(newConnection.isOpen).isFalse();\n- }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n-\n- testWidgets('fallback to current token if acked is missing', (tester) async {\n- await prepare(tester, ackedPushToken: null);\n- NotificationService.instance.token = ValueNotifier('asdf');\n-\n- final newConnection = separateConnection()\n- ..prepare(json: {'msg': '', 'result': 'success'});\n- final future = unregisterToken(testBinding.globalStore, eg.selfAccount.id);\n- await tester.pump(Duration.zero);\n- await future;\n- checkSingleUnregisterRequest(newConnection, expectedToken: 'asdf');\n- check(newConnection.isOpen).isFalse();\n- });\n-\n- testWidgets('no error if acked token and current token both missing', (tester) async {\n- await prepare(tester, ackedPushToken: null);\n- NotificationService.instance.token = ValueNotifier(null);\n-\n- final newConnection = separateConnection();\n- final future = unregisterToken(testBinding.globalStore, eg.selfAccount.id);\n- await tester.pumpAndSettle();\n- await future;\n- check(newConnection.takeRequests()).isEmpty();\n- });\n-\n- testWidgets('connection closed if request errors', (tester) async {\n- await prepare(tester, ackedPushToken: '123');\n-\n- final newConnection = separateConnection()\n- ..prepare(exception: ZulipApiException(\n- httpStatus: 401,\n- code: 'UNAUTHORIZED',\n- data: {\"result\": \"error\", \"msg\": \"Invalid API key\", \"code\": \"UNAUTHORIZED\"},\n- routeName: 'removeEtcEtcToken',\n- message: 'Invalid API key',\n- ));\n- final future = unregisterToken(testBinding.globalStore, eg.selfAccount.id);\n- await tester.pump(Duration.zero);\n- await future;\n- checkSingleUnregisterRequest(newConnection, expectedToken: '123');\n- check(newConnection.isOpen).isFalse();\n- });\n- });\n-\n group('markNarrowAsRead', () {\n testWidgets('smoke test on modern server', (tester) async {\n final narrow = TopicNarrow.ofMessage(eg.streamMessage());\ndiff --git a/test/widgets/home_test.dart b/test/widgets/home_test.dart\nindex 5bb789727f..1525355766 100644\n--- a/test/widgets/home_test.dart\n+++ b/test/widgets/home_test.dart\n@@ -3,10 +3,10 @@ import 'package:flutter/material.dart';\n import 'package:flutter_checks/flutter_checks.dart';\n import 'package:flutter_test/flutter_test.dart';\n import 'package:zulip/api/model/events.dart';\n+import 'package:zulip/model/actions.dart';\n import 'package:zulip/model/narrow.dart';\n import 'package:zulip/model/store.dart';\n import 'package:zulip/widgets/about_zulip.dart';\n-import 'package:zulip/widgets/actions.dart';\n import 'package:zulip/widgets/app.dart';\n import 'package:zulip/widgets/app_bar.dart';\n import 'package:zulip/widgets/home.dart';\n@@ -453,8 +453,7 @@ void main () {\n await tester.pump(); // wait for the loading page\n checkOnLoadingPage();\n \n- final element = tester.element(find.byType(MaterialApp));\n- final future = logOutAccount(element, eg.selfAccount.id);\n+ final future = logOutAccount(testBinding.globalStore, eg.selfAccount.id);\n await tester.pump(TestGlobalStore.removeAccountDuration);\n await future;\n // No error expected from briefly not having\n@@ -471,8 +470,7 @@ void main () {\n await tester.pump(); // wait for store\n checkOnHomePage(tester, expectedAccount: eg.selfAccount);\n \n- final element = tester.element(find.byType(HomePage));\n- final future = logOutAccount(element, eg.selfAccount.id);\n+ final future = logOutAccount(testBinding.globalStore, eg.selfAccount.id);\n await tester.pump(TestGlobalStore.removeAccountDuration);\n await future;\n // No error expected from briefly not having\ndiff --git a/test/widgets/message_list_test.dart b/test/widgets/message_list_test.dart\nindex b3cc208463..3f79f8cae6 100644\n--- a/test/widgets/message_list_test.dart\n+++ b/test/widgets/message_list_test.dart\n@@ -7,11 +7,13 @@ import 'package:flutter/rendering.dart';\n import 'package:flutter_checks/flutter_checks.dart';\n import 'package:flutter_test/flutter_test.dart';\n import 'package:http/http.dart' as http;\n+import 'package:zulip/api/exception.dart';\n import 'package:zulip/api/model/events.dart';\n import 'package:zulip/api/model/initial_snapshot.dart';\n import 'package:zulip/api/model/model.dart';\n import 'package:zulip/api/model/narrow.dart';\n import 'package:zulip/api/route/messages.dart';\n+import 'package:zulip/model/actions.dart';\n import 'package:zulip/model/localizations.dart';\n import 'package:zulip/model/narrow.dart';\n import 'package:zulip/model/store.dart';\n@@ -56,6 +58,7 @@ void main() {\n List? subscriptions,\n UnreadMessagesSnapshot? unreadMsgs,\n List navObservers = const [],\n+ bool skipAssertAccountExists = false,\n }) async {\n TypingNotifier.debugEnable = false;\n addTearDown(TypingNotifier.debugReset);\n@@ -77,6 +80,7 @@ void main() {\n eg.newestGetMessagesResult(foundOldest: foundOldest, messages: messages).toJson());\n \n await tester.pumpWidget(TestZulipApp(accountId: eg.selfAccount.id,\n+ skipAssertAccountExists: skipAssertAccountExists,\n navigatorObservers: navObservers,\n child: MessageListPage(initNarrow: narrow)));\n \n@@ -130,6 +134,47 @@ void main() {\n final state = MessageListPage.ancestorOf(tester.element(find.text(\"a message\")));\n check(state.composeBoxController).isNull();\n });\n+\n+ testWidgets('dispose MessageListView when event queue expired', (tester) async {\n+ final message = eg.streamMessage();\n+ await setupMessageListPage(tester, messages: [message]);\n+ final oldViewModel = store.debugMessageListViews.single;\n+ final updateMachine = store.updateMachine!;\n+ updateMachine.debugPauseLoop();\n+ updateMachine.poll();\n+\n+ updateMachine.debugPrepareLoopError(ZulipApiException(\n+ routeName: 'events', httpStatus: 400, code: 'BAD_EVENT_QUEUE_ID',\n+ data: {'queue_id': updateMachine.queueId}, message: 'Bad event queue ID.'));\n+ updateMachine.debugAdvanceLoop();\n+ await tester.pump();\n+ // Event queue has been replaced; but the [MessageList] hasn't been\n+ // rebuilt yet.\n+ final newStore = testBinding.globalStore.perAccountSync(eg.selfAccount.id)!;\n+ check(connection.isOpen).isFalse(); // indicates that the old store has been disposed\n+ check(store.debugMessageListViews).single.equals(oldViewModel);\n+ check(newStore.debugMessageListViews).isEmpty();\n+\n+ (newStore.connection as FakeApiConnection).prepare(json: eg.newestGetMessagesResult(\n+ foundOldest: true, messages: [message]).toJson());\n+ await tester.pump();\n+ await tester.pump(Duration.zero);\n+ // As [MessageList] rebuilds, the old view model gets disposed and\n+ // replaced with a fresh one.\n+ check(store.debugMessageListViews).isEmpty();\n+ check(newStore.debugMessageListViews).single.not((it) => it.equals(oldViewModel));\n+ });\n+\n+ testWidgets('dispose MessageListView when logged out', (tester) async {\n+ await setupMessageListPage(tester,\n+ messages: [eg.streamMessage()], skipAssertAccountExists: true);\n+ check(store.debugMessageListViews).single;\n+\n+ final future = logOutAccount(testBinding.globalStore, eg.selfAccount.id);\n+ await tester.pump(TestGlobalStore.removeAccountDuration);\n+ await future;\n+ check(store.debugMessageListViews).isEmpty();\n+ });\n });\n \n group('app bar', () {\ndiff --git a/test/widgets/store_test.dart b/test/widgets/store_test.dart\nindex e2d7821ae3..7e70f01a19 100644\n--- a/test/widgets/store_test.dart\n+++ b/test/widgets/store_test.dart\n@@ -1,13 +1,22 @@\n+import 'dart:async';\n+\n import 'package:checks/checks.dart';\n import 'package:flutter/material.dart';\n+import 'package:flutter_checks/flutter_checks.dart';\n import 'package:flutter_test/flutter_test.dart';\n+import 'package:zulip/model/actions.dart';\n import 'package:zulip/model/store.dart';\n+import 'package:zulip/widgets/app.dart';\n+import 'package:zulip/widgets/inbox.dart';\n+import 'package:zulip/widgets/page.dart';\n import 'package:zulip/widgets/store.dart';\n \n import '../flutter_checks.dart';\n import '../model/binding.dart';\n import '../example_data.dart' as eg;\n import '../model/store_checks.dart';\n+import '../model/test_store.dart';\n+import '../test_navigation.dart';\n \n /// A widget whose state uses [PerAccountStoreAwareStateMixin].\n class MyWidgetWithMixin extends StatefulWidget {\n@@ -167,6 +176,71 @@ void main() {\n tester.widget(find.text('found store, account: ${eg.selfAccount.id}'));\n });\n \n+ testWidgets(\"PerAccountStoreWidget.routeToRemoveOnLogout logged-out account's routes removed from nav; other accounts' remain\", (tester) async {\n+ Future makeUnreadTopicInInbox(int accountId, String topic) async {\n+ final stream = eg.stream();\n+ final message = eg.streamMessage(stream: stream, topic: topic);\n+ final store = await testBinding.globalStore.perAccount(accountId);\n+ await store.addStream(stream);\n+ await store.addSubscription(eg.subscription(stream));\n+ await store.addMessage(message);\n+ await tester.pump();\n+ }\n+\n+ addTearDown(testBinding.reset);\n+\n+ final account1 = eg.account(id: 1, user: eg.user());\n+ final account2 = eg.account(id: 2, user: eg.user());\n+ await testBinding.globalStore.add(account1, eg.initialSnapshot());\n+ await testBinding.globalStore.add(account2, eg.initialSnapshot());\n+\n+ final testNavObserver = TestNavigatorObserver();\n+ await tester.pumpWidget(ZulipApp(navigatorObservers: [testNavObserver]));\n+ await tester.pump();\n+ final navigator = await ZulipApp.navigator;\n+ navigator.popUntil((_) => false); // clear starting routes\n+ await tester.pumpAndSettle();\n+\n+ final pushedRoutes = >[];\n+ testNavObserver.onPushed = (route, prevRoute) => pushedRoutes.add(route);\n+ // TODO(#737): switch to a realistic setup:\n+ // https://github.com/zulip/zulip-flutter/pull/1076#discussion_r1874124363\n+ final account1Route = MaterialAccountWidgetRoute(\n+ accountId: account1.id, page: const InboxPageBody());\n+ final account2Route = MaterialAccountWidgetRoute(\n+ accountId: account2.id, page: const InboxPageBody());\n+ unawaited(navigator.push(account1Route));\n+ unawaited(navigator.push(account2Route));\n+ await tester.pumpAndSettle();\n+ check(pushedRoutes).deepEquals([account1Route, account2Route]);\n+\n+ await makeUnreadTopicInInbox(account1.id, 'topic in account1');\n+ final findAccount1PageContent = find.text('topic in account1', skipOffstage: false);\n+\n+ await makeUnreadTopicInInbox(account2.id, 'topic in account2');\n+ final findAccount2PageContent = find.text('topic in account2', skipOffstage: false);\n+\n+ final findLoadingPage = find.byType(LoadingPlaceholderPage, skipOffstage: false);\n+\n+ check(findAccount1PageContent).findsOne();\n+ check(findLoadingPage).findsNothing();\n+\n+ final removedRoutes = >[];\n+ testNavObserver.onRemoved = (route, prevRoute) => removedRoutes.add(route);\n+\n+ final future = logOutAccount(testBinding.globalStore, account1.id);\n+ await tester.pump(TestGlobalStore.removeAccountDuration);\n+ await future;\n+ check(removedRoutes).single.identicalTo(account1Route);\n+ check(findAccount1PageContent).findsNothing();\n+ check(findLoadingPage).findsOne();\n+\n+ await tester.pump();\n+ check(findAccount1PageContent).findsNothing();\n+ check(findLoadingPage).findsNothing();\n+ check(findAccount2PageContent).findsOne();\n+ });\n+\n testWidgets('PerAccountStoreAwareStateMixin', (tester) async {\n final widgetWithMixinKey = GlobalKey();\n final accountId = eg.selfAccount.id;\n", "n2p_tests": "{\"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll handles events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads immediately on expired queue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error ignore expired queue\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken token already known (iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/actions_test.dart: logOutAccount smoke\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.load updates account from snapshot\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: fetch older messages on scroll basic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: app bar has channel-feed action for topic narrows\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/actions_test.dart: unregisterToken connection closed if request errors\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on rate limit: code RATE_LIMIT_HIT\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.sendMessage smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error eventually report generic NetworkException\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: bottom nav navigation preserve states when switching between views\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on rate limit: status 429 MalformedServerResponseException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report unexpected error within loop\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: menu navigation bar menu buttons control navigation states\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken token initially unknown (iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/actions_test.dart: unregisterToken fallback to current token if acked is missing\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads on unexpected error within loop\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.load smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/actions_test.dart: unregisterToken smoke, happy path (Android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/actions_test.dart: logOutAccount unregister request has an error\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report rate limit: status 429 ZulipApiException\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report rate limit: status 429 MalformedServerResponseException\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.load retries registerQueue on NetworkError\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/actions_test.dart: unregisterToken no error if acked token and current token both missing\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on Server5xxException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/message_list_test.dart: smoke test for light/dark/lerped\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error eventually report Server5xxException\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on rate limit: status 429 ZulipApiException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: menu navigation bar menu buttons dismiss the menu\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report generic ZulipApiException\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on NetworkException from SocketException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/actions_test.dart: unregisterToken smoke, happy path (iOS)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll retries on generic NetworkException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error nicely report handleEvent error\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: _LoadingPlaceholderPage while loading, go back from ChooseAccountPage\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/store_test.dart: PerAccountStoreWidget.routeToRemoveOnLogout logged-out account's routes removed from nav; other accounts' remain\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads on generic ZulipApiException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report MalformedServerResponseException\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error ignore NetworkException from SocketException\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads on handleEvent error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll report error report rate limit: code RATE_LIMIT_HIT\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken token already known (Android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.fetchEmojiData retries on failure\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.registerNotificationToken token initially unknown (Android)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.fetchEmojiData happy case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/home_test.dart: menu navigation states reflect on navigation bar menu buttons\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll reloads on MalformedServerResponseException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: UpdateMachine.poll loops on success\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{\"/home/zulip-flutter/test/model/message_test.dart: handleMessageEvent from empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent rendering-only update does not change timestamp\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPassedWaitingPeriod user joined at 2024-11-25T10:00+00:00 hasn't passed waiting period by 2024-11-27 09:59:00.000Z\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handle Poll related events handleSubmessageEvent message is unknown\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: reconcileMessages from not-empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handle Poll related events handleSubmessageEvent message has no submessages\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/actions_test.dart: markNarrowAsRead smoke test on modern server\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.removeAccount when store not loaded\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"administrator\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handle Poll related events handleSubmessageEvent new option event option with duplicate text ignored\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"member\\\" user can't post in channel with \\\"administrators\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccountSync\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPassedWaitingPeriod user joined at 2024-11-25T10:00+00:00 hasn't passed waiting period by 2024-11-26 10:00:00.000Z\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageFlagsEvent add flag other flags not clobbered\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.removeAccount when store loading\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"member\\\" user can't post in channel with \\\"moderators\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handle Poll related events handleSubmessageEvent question event update question\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"unknown\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageFlagsEvent add flag all: true; we have some known messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"unknown\\\" user can post in channel with \\\"administrators\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handle Poll related events handleSubmessageEvent ignore submessage event with malformed content\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"administrator\\\" user can post in channel with \\\"administrators\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"administrator\\\" user can post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"guest\\\" user can't post in channel with \\\"moderators\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"owner\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageFlagsEvent remove flag other flags not affected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"unknown\\\" user can post in channel with \\\"moderators\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount concurrent case\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handle Poll related events handleSubmessageEvent vote event remove votes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handle Poll related events handleSubmessageEvent vote event vote for unknown options\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageFlagsEvent add flag affected message, unaffected message, absent message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: reconcileMessages from empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handle Poll related events handleMessageEvent with initial submessages content with invalid widget_type\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"owner\\\" user can post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"member\\\" user posting in a channel with \\\"fullMembers\\\" policy a \\\"full\\\" member -> can post in the channel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent Handle message edit state update message is both moved and updated\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent rendering-only update does not change timestamp (for old server versions)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPassedWaitingPeriod user joined at 2024-11-25T10:00+00:00 has passed waiting period by 2027-08-22 07:00:00.000Z\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageFlagsEvent remove flag message is unknown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleDeleteMessageEvent delete an unknown message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateAccount notifyListeners called\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleReactionEvent add reaction\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPassedWaitingPeriod user joined at 2024-11-25T10:00+00:00 hasn't passed waiting period by 2024-11-25 10:00:00.000Z\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageFlagsEvent remove flag affected message, unaffected message, absent message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent Handle message edit state update message topic unresolved update\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.perAccount sequential case\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"moderator\\\" user can't post in channel with \\\"administrators\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.removeAccount when store loaded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"owner\\\" user can post in channel with \\\"moderators\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.handleEvent RealmUserUpdateEvent deliveryEmail\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"owner\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"guest\\\" user can't post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handle Poll related events handleSubmessageEvent question event unauthorized question edits\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPassedWaitingPeriod user joined at 2024-11-25T10:00+00:00 has passed waiting period by 2024-11-27 10:00:00.000Z\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleReactionEvent remove reaction\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"guest\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent Handle message edit state update message topic moved update\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"administrator\\\" user can post in channel with \\\"moderators\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleReactionEvent add reaction; message is unknown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleReactionEvent remove reaction; message is unknown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent ignore when message unknown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent Handle message edit state update message topic resolved update\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleMessageEvent from not-empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handle Poll related events handleSubmessageEvent new option event option index limit exceeded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"moderator\\\" user can post in channel with \\\"moderators\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent update timestamps on all messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"member\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent Handle message edit state update message topic both unresolved and edited update\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"member\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"member\\\" user posting in a channel with \\\"fullMembers\\\" policy not a \\\"full\\\" member -> cannot post in the channel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleDeleteMessageEvent delete an unknown message with a known message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleMessageEvent new message clobbers old on ID collision\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"owner\\\" user can post in channel with \\\"administrators\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handle Poll related events handleSubmessageEvent new option event add option\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"unknown\\\" user can post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"moderator\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageFlagsEvent add flag all: true; we don't know about any messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"guest\\\" user can't post in channel with \\\"administrators\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateAccount basic\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: GlobalStore.updateAccount reject changing id, realmUrl, or userId\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent update a message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handle Poll related events handleSubmessageEvent vote event add votes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent Handle message edit state update message topic both resolved and edited update\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"moderator\\\" user can post in channel with \\\"unknown\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"unknown\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent Handle message edit state update message stream moved without topic change\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleDeleteMessageEvent delete messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: reconcileMessages on ID collision, new message does not clobber old in store.messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"moderator\\\" user can post in channel with \\\"fullMembers\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageEvent Handle message edit state update message not moved update\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"guest\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_test.dart: handleUpdateMessageFlagsEvent add flag message is unknown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/store_test.dart: PerAccountStore.hasPostingPermission \\\"administrator\\\" user can post in channel with \\\"any\\\" policy\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1312", "org": "zulip", "repo": "zulip-flutter", "number": 1312, "state": "closed", "title": "anchors 2/n: Fix three sticky-header bugs", "body": "Fixes #1309.\r\nFixes #725. (which is the same underlying bug)\r\n\r\nIn addition to that live bug in the app (involving scrollOffsetCorrection, which we previously weren't handling), the last two commits in this branch fix a couple of bugs in the `sticky_header` library that were latent bugs in the app \u2014 they can only trigger once we start having two slivers share space in the list. That's a scenario we'll need as part of #80 / #82, as seen for example in #1169 (fyi @rajveermalviya).\r\n\r\nSpecifically, when both slivers are visible, the version in main\r\n* will fail to show the sticky header for the top sliver;\r\n* and will show a sticky header for the bottom sliver.\r\n\r\nAfter this PR, there's one remaining bug I'm aware of that affects sticky headers in the presence of multiple slivers: ~~if the top sliver should show a header, but the header doesn't fit within the sliver's share of the viewport, then the header will get pushed off screen even if it has `allowOverflow` true. Concretely for the message list, this means that the last message in the top sliver will fail to share its recipient header with the first message in the bottom sliver, even if they're meant to share a recipient header.~~\r\n\r\n**edit:** @chrisbobbe showed me the current symptom is a bit different from this. Rather than get pushed off screen, the header will have its bottom part covered up by the bottom sliver. The fix doesn't change, though.\r\n\r\nI have a draft fix for that bug too, and I believe it works, but it still needs tests and a bit of other polishing-up. So it'll come as a separate PR later.\r\n\r\nThis is the long-awaited followup to #496, from a year ago this week. The two fixes here involving multiple slivers, as well as the upcoming fix coming in another PR, were all in the draft branch I had then. The scrollOffsetCorrection fix (which fixes the two live bugs) is new today, after I took a fresh look last week at some of the underlying framework code as part of trying to really understand what this `performLayout` method needs to do clearly enough to get to an implementation I'm confident is correct.\r\n\r\n\r\n# Selected commit messages\r\n\r\n#### 4b290452b sticky_header: Add example app\r\n\r\nThis is adapted lightly from an example app I made back in the first\r\nweek of the zulip-flutter project, 2022-12-23, as part of developing\r\nthe sticky_header library.\r\n\r\nThe example app was extremely helpful then for experimenting with\r\nchanges and seeing the effects visually and interactively, as well as\r\nfor print-debugging such experiments. So let's get it into the tree.\r\n\r\nThe main reason I didn't send the example app back then is that it\r\nwas a whole stand-alone app tree under example/, complete with all\r\nthe stuff in android/ and ios/ and so on that `flutter create` spits\r\nout for setting up a Flutter app. That's pretty voluminous: well\r\nover 100 different files totalling about 1.1MB on disk. I did't\r\nwant to permanently burden the repo with all that, nor have to\r\nmaintain it all over time.\r\n\r\nHappily, I realized today that we can skip that, and still have a\r\nperfectly good example app, by reusing that infrastructure from the\r\nactual Zulip app. That way all we need is a Dart file with a `main`\r\nfunction, corresponding to the old example's `lib/main.dart` which\r\nwas the only not-from-the-template code in the whole example app.\r\n\r\nSo here it is. Other than moving the Dart file and discarding the\r\nrest, the code I wrote back then has been updated to our current\r\nformatting style; adjusted slightly for changes in Flutter's\r\nMaterial widgets; and updated for changes I made to the\r\nsticky_header API after that first week.\r\n\r\n\r\n#### 3de58fe3e sticky_header [nfc]: Add asserts from studying possible child geometry; note a bug\r\n\r\nThe logic below -- particularly in the allowOverflow true case,\r\nwhere it constructs a new SliverGeometry from scratch -- has been\r\nimplicitly relying on several of these facts already. These\r\nwouldn't be true of an arbitrary sliver child; but this sliver knows\r\nwhat type of child it actually has, and they are true of that one.\r\nSo write down the specific assumptions we can take from that.\r\n\r\nReading through [RenderSliverList.performLayout] to see what it can\r\nproduce as the child geometry also made clear there's another case\r\nthat this method isn't currently correctly handling at all: the case\r\nwhere scrollOffsetCorrection is non-null. Filed an issue for that;\r\nadd a todo-comment for it.\r\n\r\n\r\n#### 075a8cd79 sticky_header: Handle scrollOffsetCorrection\r\n\r\nFixes #1309.\r\nFixes #725.\r\n\r\nThis is necessary when scrolling back to the origin over items that\r\ngrew taller while off screen (and beyond the 250px of near-on-screen\r\ncached items). For example that can happen because a message was\r\nedited, or because new messages came in that were taller than those\r\npreviously present.\r\n\r\n\r\n#### de2006098 sticky_header: Fix _findChildAtEnd when viewport partly consumed already\r\n\r\nIn particular this will affect the upper sliver (with older messages)\r\nin the message list, when we start using two slivers there in earnest.\r\n\r\n\r\n#### 7583bb4b0 sticky_header: Avoid header at sliver/sliver boundary\r\n\r\n\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"c66a9053eed5ce60a010ceefea98f92e6f09c43f\"}", "resolved_issues": "[{\"number\": 1309, \"title\": \"Gap in message list\", \"body\": \"There's a symptom I've seen happen just a couple of times, and just now while working on the sticky-header code (for #82) I realized what's causing it and how to fix it.\\n\\nRepro recipe:\\n* Scroll up in history, a screenful or two past some message that you sent and can still edit.\\n* From a different client, edit that message to be much taller than it was.\\n* Scroll back down quickly, say by using the scroll-to-end button.\\n\\nThe result might look like this:\\n| Actual | Expected |\\n|--------|--------|\\n| ![Image](https://github.com/user-attachments/assets/9d2040fa-8071-4420-be2d-3a7e683b8e64) | ![Image](https://github.com/user-attachments/assets/e2b084b2-545a-4648-964c-049b95c1b432) | \\n\\nNote the big gap above the \\\"3\\\" message; the recipient header at the very bottom of the list; and the recipient header out of order relative to the message (it has the wrong text for any later message).\\n\\nOther times the gap can be smaller, like the height of a short message.\\n\\nI saw a similar gap as part of #725. It's possible the cause of this issue was also the root cause of #725.\\n\\n### Diagnosis\\n\\nThe cause of the issue is that the sticky-header implementation isn't properly handling one aspect of the sliver layout protocol. Specifically, when `_RenderSliverStickyHeaderListInner.performLayout` produces a `SliverGeometry` with `scrollOffsetCorrection` non-null, `_RenderSliverStickyHeaderList.performLayout` is swallowing that information instead of passing it on to its parent.\\n\\nI'll send a fix as part of the sticky-headers PR I'm developing for #82.\\n\"}, {\"number\": 725, \"title\": \"Freeze in scrolling message list, null parentData.layoutOffset\", \"body\": \"Using the app today, I was scrolling in the message list and then it froze \\u2014 stopped responding to my attempts to scroll.\\r\\n\\r\\nI went and connected the phone to my desktop and looked at logcat. It shows the following stack trace:\\r\\n```\\r\\nNull check operator used on a null value\\r\\n#0 _RenderSliverStickyHeaderListInner._findChildAtEnd (package:zulip/widgets/sticky_header.dart:719)\\r\\n#1 _RenderSliverStickyHeaderListInner.performLayout (package:zulip/widgets/sticky_header.dart:740)\\r\\n#2 RenderObject.layout (package:flutter/src/rendering/object.dart:2577)\\r\\n#3 _RenderSliverStickyHeaderList.performLayout (package:zulip/widgets/sticky_header.dart:556)\\r\\n#4 RenderObject.layout (package:flutter/src/rendering/object.dart:2577)\\r\\n#5 RenderViewportBase.layoutChildSequence (package:flutter/src/rendering/viewport.dart:601)\\r\\n#6 RenderViewport._attemptLayout (package:flutter/src/rendering/viewport.dart:1497)\\r\\n#7 RenderViewport.performLayout (package:flutter/src/rendering/viewport.dart:1427)\\r\\n#8 RenderObject._layoutWithoutResize (package:flutter/src/rendering/object.dart:2416)\\r\\n#9 PipelineOwner.flushLayout (package:flutter/src/rendering/object.dart:1052)\\r\\n#10 PipelineOwner.flushLayout (package:flutter/src/rendering/object.dart:1065)\\r\\n#11 RendererBinding.drawFrame (package:flutter/src/rendering/binding.dart:602)\\r\\n#12 WidgetsBinding.drawFrame (package:flutter/src/widgets/binding.dart:1164)\\r\\n#13 RendererBinding._handlePersistentFrameCallback (package:flutter/src/rendering/binding.dart:468)\\r\\n#14 SchedulerBinding._invokeFrameCallback (package:flutter/src/scheduler/binding.dart:1392)\\r\\n#15 SchedulerBinding.handleDrawFrame (package:flutter/src/scheduler/binding.dart:1313)\\r\\n#16 SchedulerBinding._handleDrawFrame (package:flutter/src/scheduler/binding.dart:1171)\\r\\n#17 _invoke (dart:ui/hooks.dart:312)\\r\\n#18 PlatformDispatcher._drawFrame (dart:ui/platform_dispatcher.dart:419)\\r\\n#19 _drawFrame (dart:ui/hooks.dart:283)\\r\\n```\\r\\n\\r\\nThen over time after that there's this error, again and again many times:\\r\\n```\\r\\nAnother exception was thrown: Instance of 'DiagnosticsProperty'\\r\\n```\\r\\nThere's a fresh burst of those any time I touch the screen and try to scroll, or when \\r\\n\\r\\n---\\r\\n\\r\\nThe stack trace shows the exception is from our `sticky_header` library. The null value in question seems to be the `parentData.layoutOffset` below, quoting some code ending on the line that has the `!` that blew up:\\r\\n```dart\\r\\n RenderBox? child;\\r\\n for (child = lastChild; ; child = childBefore(child)) {\\r\\n if (child == null) {\\r\\n // Ran out of children.\\r\\n return null;\\r\\n }\\r\\n final parentData = child.parentData! as SliverMultiBoxAdaptorParentData;\\r\\n assert(parentData.layoutOffset != null);\\r\\n if (endOffset > parentData.layoutOffset! + child.size.onAxis(constraints.axis)) {\\r\\n```\\r\\n\\r\\nSo this function is assuming that the children have their `parentData` all set up, including `layoutOffset`, but there's a child that doesn't have that. I haven't debugged further.\\r\\n\\r\\n---\\r\\n\\r\\nFurther observations from the context and symptoms:\\r\\n* The app had been open a while earlier, showing the message list in question (namely \\\"Combined feed\\\"). Then it was in the background and I re-opened it.\\r\\n * Probably it was over 10 minutes, so the app would have re-loaded data from scratch.\\r\\n * It's possible that the immediate trigger for the bug was when the new data arrived and we swapped out the PerAccountStore. That causes the message list to go back to being empty and re-fetch its messages from scratch (#464).\\r\\n* When the freeze happened, I was scrolled up a few screenfuls in the history.\\r\\n* The visible state on the screen was a bit funny-looking: mostly full of messages as normal, but with a gray gap at the bottom.\\r\\n* The app didn't crash or completely stop. As new messages subsequently come in, the message list keeps updating to show new messages. (At some point it jumped to the bottom of the history.)\\r\\n * The visible state continues to look funny with variations on the original: mostly full of messages, but with a gray gap somewhere between them.\\r\\n * Specifically at the moment it looks like one of the recipient headers, the one for the 4th out of 5 messages currently visible, is replaced with a gray gap that's about the height the recipient header should be. (I compared with the same narrow on web to see that there's no messages missing.)\\r\\n * At another time there was a much wider gray gap, immediately after a recipient header. So perhaps a message itself was being replaced with a gray gap. \\u2026 OK, and now I'm seeing that again, and indeed it's one message missing. \\u2026 And now again, and it's a message missing which isn't immediately after a recipient header (it's between two messages).\\r\\n* Although it's updating in response to server events, nothing I do when I try to interact with the message list has any effect: not scrolling (as mentioned), nor touching a link, nor a recipient header, nor an image. They all just trigger another `Another exception was thrown: Instance of 'DiagnosticsProperty'` in the log.\\r\\n* After all those observations, I touched the back button at top left of the app, and it worked immediately. Then I navigated back into \\\"Combined feed\\\", and it's working normally.\\r\\n\\r\\n\\r\\nSo my best guess for how to potentially reproduce the issue is:\\r\\n* Scroll up a few screenfuls in history.\\r\\n* Have the `PerAccountState` get swapped out for a new one. (To do this without waiting 10 minutes, one can fiddle with the retry logic in `UpdateMachine.poll`.)\\r\\n\\r\\n---\\r\\n\\r\\n(Meanwhile the \\\"Instance of 'DiagnosticsProperty'\\\" error messages are a bit of a mystery. Those seem like there's probably a bug in error-reporting somewhere, which would be good to fix in order to better enable debugging other bugs, like this one.)\\r\\n\"}]", "lang": "dart", "problem_statement": "Gap in message list\nThere's a symptom I've seen happen just a couple of times, and just now while working on the sticky-header code (for #82) I realized what's causing it and how to fix it.\n\nRepro recipe:\n* Scroll up in history, a screenful or two past some message that you sent and can still edit.\n* From a different client, edit that message to be much taller than it was.\n* Scroll back down quickly, say by using the scroll-to-end button.\n\nThe result might look like this:\n| Actual | Expected |\n|--------|--------|\n| ![Image](https://github.com/user-attachments/assets/9d2040fa-8071-4420-be2d-3a7e683b8e64) | ![Image](https://github.com/user-attachments/assets/e2b084b2-545a-4648-964c-049b95c1b432) | \n\nNote the big gap above the \"3\" message; the recipient header at the very bottom of the list; and the recipient header out of order relative to the message (it has the wrong text for any later message).\n\nOther times the gap can be smaller, like the height of a short message.\n\nI saw a similar gap as part of #725. It's possible the cause of this issue was also the root cause of #725.\n\n### Diagnosis\n\nThe cause of the issue is that the sticky-header implementation isn't properly handling one aspect of the sliver layout protocol. Specifically, when `_RenderSliverStickyHeaderListInner.performLayout` produces a `SliverGeometry` with `scrollOffsetCorrection` non-null, `_RenderSliverStickyHeaderList.performLayout` is swallowing that information instead of passing it on to its parent.\n\nI'll send a fix as part of the sticky-headers PR I'm developing for #82.\n\nFreeze in scrolling message list, null parentData.layoutOffset\nUsing the app today, I was scrolling in the message list and then it froze \u2014 stopped responding to my attempts to scroll.\r\n\r\nI went and connected the phone to my desktop and looked at logcat. It shows the following stack trace:\r\n```\r\nNull check operator used on a null value\r\n#0 _RenderSliverStickyHeaderListInner._findChildAtEnd (package:zulip/widgets/sticky_header.dart:719)\r\n#1 _RenderSliverStickyHeaderListInner.performLayout (package:zulip/widgets/sticky_header.dart:740)\r\n#2 RenderObject.layout (package:flutter/src/rendering/object.dart:2577)\r\n#3 _RenderSliverStickyHeaderList.performLayout (package:zulip/widgets/sticky_header.dart:556)\r\n#4 RenderObject.layout (package:flutter/src/rendering/object.dart:2577)\r\n#5 RenderViewportBase.layoutChildSequence (package:flutter/src/rendering/viewport.dart:601)\r\n#6 RenderViewport._attemptLayout (package:flutter/src/rendering/viewport.dart:1497)\r\n#7 RenderViewport.performLayout (package:flutter/src/rendering/viewport.dart:1427)\r\n#8 RenderObject._layoutWithoutResize (package:flutter/src/rendering/object.dart:2416)\r\n#9 PipelineOwner.flushLayout (package:flutter/src/rendering/object.dart:1052)\r\n#10 PipelineOwner.flushLayout (package:flutter/src/rendering/object.dart:1065)\r\n#11 RendererBinding.drawFrame (package:flutter/src/rendering/binding.dart:602)\r\n#12 WidgetsBinding.drawFrame (package:flutter/src/widgets/binding.dart:1164)\r\n#13 RendererBinding._handlePersistentFrameCallback (package:flutter/src/rendering/binding.dart:468)\r\n#14 SchedulerBinding._invokeFrameCallback (package:flutter/src/scheduler/binding.dart:1392)\r\n#15 SchedulerBinding.handleDrawFrame (package:flutter/src/scheduler/binding.dart:1313)\r\n#16 SchedulerBinding._handleDrawFrame (package:flutter/src/scheduler/binding.dart:1171)\r\n#17 _invoke (dart:ui/hooks.dart:312)\r\n#18 PlatformDispatcher._drawFrame (dart:ui/platform_dispatcher.dart:419)\r\n#19 _drawFrame (dart:ui/hooks.dart:283)\r\n```\r\n\r\nThen over time after that there's this error, again and again many times:\r\n```\r\nAnother exception was thrown: Instance of 'DiagnosticsProperty'\r\n```\r\nThere's a fresh burst of those any time I touch the screen and try to scroll, or when \r\n\r\n---\r\n\r\nThe stack trace shows the exception is from our `sticky_header` library. The null value in question seems to be the `parentData.layoutOffset` below, quoting some code ending on the line that has the `!` that blew up:\r\n```dart\r\n RenderBox? child;\r\n for (child = lastChild; ; child = childBefore(child)) {\r\n if (child == null) {\r\n // Ran out of children.\r\n return null;\r\n }\r\n final parentData = child.parentData! as SliverMultiBoxAdaptorParentData;\r\n assert(parentData.layoutOffset != null);\r\n if (endOffset > parentData.layoutOffset! + child.size.onAxis(constraints.axis)) {\r\n```\r\n\r\nSo this function is assuming that the children have their `parentData` all set up, including `layoutOffset`, but there's a child that doesn't have that. I haven't debugged further.\r\n\r\n---\r\n\r\nFurther observations from the context and symptoms:\r\n* The app had been open a while earlier, showing the message list in question (namely \"Combined feed\"). Then it was in the background and I re-opened it.\r\n * Probably it was over 10 minutes, so the app would have re-loaded data from scratch.\r\n * It's possible that the immediate trigger for the bug was when the new data arrived and we swapped out the PerAccountStore. That causes the message list to go back to being empty and re-fetch its messages from scratch (#464).\r\n* When the freeze happened, I was scrolled up a few screenfuls in the history.\r\n* The visible state on the screen was a bit funny-looking: mostly full of messages as normal, but with a gray gap at the bottom.\r\n* The app didn't crash or completely stop. As new messages subsequently come in, the message list keeps updating to show new messages. (At some point it jumped to the bottom of the history.)\r\n * The visible state continues to look funny with variations on the original: mostly full of messages, but with a gray gap somewhere between them.\r\n * Specifically at the moment it looks like one of the recipient headers, the one for the 4th out of 5 messages currently visible, is replaced with a gray gap that's about the height the recipient header should be. (I compared with the same narrow on web to see that there's no messages missing.)\r\n * At another time there was a much wider gray gap, immediately after a recipient header. So perhaps a message itself was being replaced with a gray gap. \u2026 OK, and now I'm seeing that again, and indeed it's one message missing. \u2026 And now again, and it's a message missing which isn't immediately after a recipient header (it's between two messages).\r\n* Although it's updating in response to server events, nothing I do when I try to interact with the message list has any effect: not scrolling (as mentioned), nor touching a link, nor a recipient header, nor an image. They all just trigger another `Another exception was thrown: Instance of 'DiagnosticsProperty'` in the log.\r\n* After all those observations, I touched the back button at top left of the app, and it worked immediately. Then I navigated back into \"Combined feed\", and it's working normally.\r\n\r\n\r\nSo my best guess for how to potentially reproduce the issue is:\r\n* Scroll up a few screenfuls in history.\r\n* Have the `PerAccountState` get swapped out for a new one. (To do this without waiting 10 minutes, one can fiddle with the retry logic in `UpdateMachine.poll`.)\r\n\r\n---\r\n\r\n(Meanwhile the \"Instance of 'DiagnosticsProperty'\" error messages are a bit of a mystery. Those seem like there's probably a bug in error-reporting somewhere, which would be good to fix in order to better enable debugging other bugs, like this one.)\r\n\n", "hints": "\nMoving this to the post-launch milestone because it's only ever happened the one time as far as I know, and it's been a couple of months since then.\r\n\r\nIf we see it another time or two, or hear a user report of it, we can bump it back up in priority.", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1312", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1309\", \"https://github.com/zulip/zulip-flutter/issues/725\"]", "test_command": "flutter test test/widgets/sticky_header_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/example/sticky_header.dart b/lib/example/sticky_header.dart\nnew file mode 100644\nindex 0000000000..3fa2185c1a\n--- /dev/null\n+++ b/lib/example/sticky_header.dart\n@@ -0,0 +1,428 @@\n+/// Example app for exercising the sticky_header library.\n+///\n+/// This is useful when developing changes to [StickyHeaderListView],\n+/// [SliverStickyHeaderList], and [StickyHeaderItem],\n+/// for experimenting visually with changes.\n+///\n+/// To use this example app, run the command:\n+/// flutter run lib/example/sticky_header.dart\n+/// or run this file from your IDE.\n+///\n+/// One inconvenience: this means the example app will use the same app ID\n+/// as the actual Zulip app. The app's data remains untouched, though, so\n+/// a normal `flutter run` will put things back as they were.\n+/// This inconvenience could be fixed with a bit more work: we'd use\n+/// `flutter run --flavor`, and define an Android flavor in build.gradle\n+/// and an Xcode scheme in the iOS build config\n+/// so as to set the app ID differently.\n+library;\n+\n+import 'package:flutter/material.dart';\n+\n+import '../widgets/sticky_header.dart';\n+\n+/// Example page using [StickyHeaderListView] and [StickyHeaderItem] in a\n+/// vertically-scrolling list.\n+class ExampleVertical extends StatelessWidget {\n+ ExampleVertical({\n+ super.key,\n+ required this.title,\n+ this.reverse = false,\n+ this.headerDirection = AxisDirection.down,\n+ }) : assert(axisDirectionToAxis(headerDirection) == Axis.vertical);\n+\n+ final String title;\n+ final bool reverse;\n+ final AxisDirection headerDirection;\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ final headerAtBottom = axisDirectionIsReversed(headerDirection);\n+\n+ const numSections = 100;\n+ const numPerSection = 10;\n+ return Scaffold(\n+ appBar: AppBar(title: Text(title)),\n+\n+ // Invoke StickyHeaderListView the same way you'd invoke ListView.\n+ // The constructor takes the same arguments.\n+ body: StickyHeaderListView.separated(\n+ reverse: reverse,\n+ reverseHeader: headerAtBottom,\n+ itemCount: numSections,\n+ separatorBuilder: (context, i) => const SizedBox.shrink(),\n+\n+ // Use StickyHeaderItem as an item widget in the ListView.\n+ // A header will float over the item as needed in order to\n+ // \"stick\" at the edge of the viewport.\n+ //\n+ // You can also include non-StickyHeaderItem items in the list.\n+ // They'll behave just like in a plain ListView.\n+ //\n+ // Each StickyHeaderItem needs to be an item directly in the list, not\n+ // wrapped inside other widgets that affect layout, in order to get\n+ // the sticky-header behavior.\n+ itemBuilder: (context, i) => StickyHeaderItem(\n+ header: WideHeader(i: i),\n+ child: Column(\n+ verticalDirection: headerAtBottom\n+ ? VerticalDirection.up : VerticalDirection.down,\n+ children: List.generate(\n+ numPerSection + 1, (j) {\n+ if (j == 0) return WideHeader(i: i);\n+ return WideItem(i: i, j: j-1);\n+ })))));\n+ }\n+}\n+\n+/// Example page using [StickyHeaderListView] and [StickyHeaderItem] in a\n+/// horizontally-scrolling list.\n+class ExampleHorizontal extends StatelessWidget {\n+ ExampleHorizontal({\n+ super.key,\n+ required this.title,\n+ this.reverse = false,\n+ required this.headerDirection,\n+ }) : assert(axisDirectionToAxis(headerDirection) == Axis.horizontal);\n+\n+ final String title;\n+ final bool reverse;\n+ final AxisDirection headerDirection;\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ final headerAtRight = axisDirectionIsReversed(headerDirection);\n+ const numSections = 100;\n+ const numPerSection = 10;\n+ return Scaffold(\n+ appBar: AppBar(title: Text(title)),\n+ body: StickyHeaderListView.separated(\n+\n+ // StickyHeaderListView and StickyHeaderItem also work for horizontal\n+ // scrolling. Pass `scrollDirection: Axis.horizontal` to the\n+ // StickyHeaderListView constructor, just like for ListView.\n+ scrollDirection: Axis.horizontal,\n+ reverse: reverse,\n+ reverseHeader: headerAtRight,\n+ itemCount: numSections,\n+ separatorBuilder: (context, i) => const SizedBox.shrink(),\n+ itemBuilder: (context, i) => StickyHeaderItem(\n+ header: TallHeader(i: i),\n+ child: Row(\n+ textDirection: headerAtRight ? TextDirection.rtl : TextDirection.ltr,\n+ children: List.generate(\n+ numPerSection + 1,\n+ (j) {\n+ if (j == 0) return TallHeader(i: i);\n+ return TallItem(i: i, j: j-1, numPerSection: numPerSection);\n+ })))));\n+ }\n+}\n+\n+/// An experimental example approximating the Zulip message list.\n+class ExampleVerticalDouble extends StatelessWidget {\n+ const ExampleVerticalDouble({\n+ super.key,\n+ required this.title,\n+ // this.reverse = false,\n+ // this.headerDirection = AxisDirection.down,\n+ }); // : assert(axisDirectionToAxis(headerDirection) == Axis.vertical);\n+\n+ final String title;\n+ // final bool reverse;\n+ // final AxisDirection headerDirection;\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ const centerSliverKey = ValueKey('center sliver');\n+ const numSections = 100;\n+ const numBottomSections = 2;\n+ const numPerSection = 10;\n+ return Scaffold(\n+ appBar: AppBar(title: Text(title)),\n+ body: CustomScrollView(\n+ semanticChildCount: numSections,\n+ anchor: 0.5,\n+ center: centerSliverKey,\n+ slivers: [\n+ SliverStickyHeaderList(\n+ headerPlacement: HeaderPlacement.scrollingStart,\n+ delegate: SliverChildBuilderDelegate(\n+ childCount: numSections - numBottomSections,\n+ (context, i) {\n+ final ii = i + numBottomSections;\n+ return StickyHeaderItem(\n+ header: WideHeader(i: ii),\n+ child: Column(\n+ children: List.generate(numPerSection + 1, (j) {\n+ if (j == 0) return WideHeader(i: ii);\n+ return WideItem(i: ii, j: j-1);\n+ })));\n+ })),\n+ SliverStickyHeaderList(\n+ key: centerSliverKey,\n+ headerPlacement: HeaderPlacement.scrollingStart,\n+ delegate: SliverChildBuilderDelegate(\n+ childCount: numBottomSections,\n+ (context, i) {\n+ final ii = numBottomSections - 1 - i;\n+ return StickyHeaderItem(\n+ header: WideHeader(i: ii),\n+ child: Column(\n+ children: List.generate(numPerSection + 1, (j) {\n+ if (j == 0) return WideHeader(i: ii);\n+ return WideItem(i: ii, j: j-1);\n+ })));\n+ })),\n+ ]));\n+ }\n+}\n+\n+////////////////////////////////////////////////////////////////////////////\n+//\n+// That's it!\n+//\n+// The rest of this file is boring infrastructure for navigating to the\n+// different examples, and for having some content to put inside them.\n+//\n+////////////////////////////////////////////////////////////////////////////\n+\n+class WideHeader extends StatelessWidget {\n+ const WideHeader({super.key, required this.i});\n+\n+ final int i;\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ return Material(\n+ color: Theme.of(context).colorScheme.primaryContainer,\n+ child: ListTile(\n+ title: Text(\"Section ${i + 1}\",\n+ style: TextStyle(\n+ color: Theme.of(context).colorScheme.onPrimaryContainer))));\n+ }\n+}\n+\n+class WideItem extends StatelessWidget {\n+ const WideItem({super.key, required this.i, required this.j});\n+\n+ final int i;\n+ final int j;\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ return ListTile(title: Text(\"Item ${i + 1}.${j + 1}\"));\n+ }\n+}\n+\n+class TallHeader extends StatelessWidget {\n+ const TallHeader({super.key, required this.i});\n+\n+ final int i;\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ final contents = Column(children: [\n+ Text(\"Section ${i + 1}\",\n+ style: TextStyle(\n+ fontWeight: FontWeight.bold,\n+ color: Theme.of(context).colorScheme.onPrimaryContainer)),\n+ const SizedBox(height: 8),\n+ const Expanded(child: SizedBox.shrink()),\n+ const SizedBox(height: 8),\n+ const Text(\"end\"),\n+ ]);\n+\n+ return Container(\n+ alignment: Alignment.center,\n+ child: Card(\n+ color: Theme.of(context).colorScheme.primaryContainer,\n+ child: Padding(padding: const EdgeInsets.all(8), child: contents)));\n+ }\n+}\n+\n+class TallItem extends StatelessWidget {\n+ const TallItem({super.key,\n+ required this.i,\n+ required this.j,\n+ required this.numPerSection,\n+ });\n+\n+ final int i;\n+ final int j;\n+ final int numPerSection;\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ final heightFactor = (1 + j) / numPerSection;\n+\n+ final contents = Column(children: [\n+ Text(\"Item ${i + 1}.${j + 1}\"),\n+ const SizedBox(height: 8),\n+ Expanded(\n+ child: FractionallySizedBox(\n+ heightFactor: heightFactor,\n+ child: ColoredBox(\n+ color: Theme.of(context).colorScheme.secondary,\n+ child: const SizedBox(width: 4)))),\n+ const SizedBox(height: 8),\n+ const Text(\"end\"),\n+ ]);\n+\n+ return Container(\n+ alignment: Alignment.center,\n+ child: Card(\n+ child: Padding(padding: const EdgeInsets.all(8), child: contents)));\n+ }\n+}\n+\n+enum _ExampleType { vertical, horizontal }\n+\n+class MainPage extends StatelessWidget {\n+ const MainPage({super.key});\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ final verticalItems = [\n+ _buildItem(context, _ExampleType.vertical,\n+ primary: true,\n+ title: 'Scroll down, headers at top (a standard list)',\n+ headerDirection: AxisDirection.down),\n+ _buildItem(context, _ExampleType.vertical,\n+ title: 'Scroll up, headers at top',\n+ reverse: true,\n+ headerDirection: AxisDirection.down),\n+ _buildItem(context, _ExampleType.vertical,\n+ title: 'Scroll down, headers at bottom',\n+ headerDirection: AxisDirection.up),\n+ _buildItem(context, _ExampleType.vertical,\n+ title: 'Scroll up, headers at bottom',\n+ reverse: true,\n+ headerDirection: AxisDirection.up),\n+ ];\n+ final horizontalItems = [\n+ _buildItem(context, _ExampleType.horizontal,\n+ title: 'Scroll right, headers at left',\n+ headerDirection: AxisDirection.right),\n+ _buildItem(context, _ExampleType.horizontal,\n+ title: 'Scroll left, headers at left',\n+ reverse: true,\n+ headerDirection: AxisDirection.right),\n+ _buildItem(context, _ExampleType.horizontal,\n+ title: 'Scroll right, headers at right',\n+ headerDirection: AxisDirection.left),\n+ _buildItem(context, _ExampleType.horizontal,\n+ title: 'Scroll left, headers at right',\n+ reverse: true,\n+ headerDirection: AxisDirection.left),\n+ ];\n+ final otherItems = [\n+ _buildButton(context,\n+ title: 'Double slivers',\n+ page: ExampleVerticalDouble(title: 'Double slivers')),\n+ ];\n+ return Scaffold(\n+ appBar: AppBar(title: const Text('Sticky Headers example')),\n+ body: CustomScrollView(slivers: [\n+ SliverToBoxAdapter(\n+ child: Padding(\n+ padding: const EdgeInsets.only(top: 24),\n+ child: Center(\n+ child: Text(\"Vertical lists\",\n+ style: Theme.of(context).textTheme.headlineMedium)))),\n+ SliverPadding(\n+ padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),\n+ sliver: SliverGrid.count(\n+ childAspectRatio: 2,\n+ crossAxisCount: 2,\n+ children: verticalItems)),\n+ SliverToBoxAdapter(\n+ child: Padding(\n+ padding: const EdgeInsets.only(top: 24),\n+ child: Center(\n+ child: Text(\"Horizontal lists\",\n+ style: Theme.of(context).textTheme.headlineMedium)))),\n+ SliverPadding(\n+ padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),\n+ sliver: SliverGrid.count(\n+ childAspectRatio: 2,\n+ crossAxisCount: 2,\n+ children: horizontalItems)),\n+ SliverToBoxAdapter(\n+ child: Padding(\n+ padding: const EdgeInsets.only(top: 24),\n+ child: Center(\n+ child: Text(\"Other examples\",\n+ style: Theme.of(context).textTheme.headlineMedium)))),\n+ SliverPadding(\n+ padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),\n+ sliver: SliverGrid.count(\n+ childAspectRatio: 2,\n+ crossAxisCount: 2,\n+ children: otherItems)),\n+ ]));\n+ }\n+\n+ Widget _buildItem(BuildContext context, _ExampleType exampleType, {\n+ required String title,\n+ bool reverse = false,\n+ required AxisDirection headerDirection,\n+ bool primary = false,\n+ }) {\n+ Widget page;\n+ switch (exampleType) {\n+ case _ExampleType.vertical:\n+ page = ExampleVertical(\n+ title: title, reverse: reverse, headerDirection: headerDirection);\n+ break;\n+ case _ExampleType.horizontal:\n+ page = ExampleHorizontal(\n+ title: title, reverse: reverse, headerDirection: headerDirection);\n+ break;\n+ }\n+ return _buildButton(context, title: title, page: page);\n+ }\n+\n+ Widget _buildButton(BuildContext context, {\n+ bool primary = false,\n+ required String title,\n+ required Widget page,\n+ }) {\n+ var label = Text(title,\n+ textAlign: TextAlign.center,\n+ style: TextStyle(\n+ inherit: true,\n+ fontSize: Theme.of(context).textTheme.titleMedium?.fontSize));\n+ var buttonStyle = primary\n+ ? null\n+ : ElevatedButton.styleFrom(\n+ foregroundColor: Theme.of(context).colorScheme.onSecondary,\n+ backgroundColor: Theme.of(context).colorScheme.secondary);\n+ return Container(\n+ padding: const EdgeInsets.all(16),\n+ child: ElevatedButton(\n+ style: buttonStyle,\n+ onPressed: () => Navigator.of(context)\n+ .push(MaterialPageRoute(builder: (_) => page)),\n+ child: label));\n+ }\n+}\n+\n+class ExampleApp extends StatelessWidget {\n+ const ExampleApp({super.key});\n+\n+ @override\n+ Widget build(BuildContext context) {\n+ return MaterialApp(\n+ title: 'Sticky Headers example',\n+ theme: ThemeData(\n+ colorScheme:\n+ ColorScheme.fromSeed(seedColor: const Color(0xff3366cc))),\n+ home: const MainPage(),\n+ );\n+ }\n+}\n+\n+void main() {\n+ runApp(const ExampleApp());\n+}\ndiff --git a/lib/widgets/sticky_header.dart b/lib/widgets/sticky_header.dart\nindex 356a056094..24eeb8d518 100644\n--- a/lib/widgets/sticky_header.dart\n+++ b/lib/widgets/sticky_header.dart\n@@ -489,6 +489,11 @@ class _RenderSliverStickyHeaderList extends RenderSliver with RenderSliverHelper\n if (_header != null) adoptChild(_header!);\n }\n \n+ /// This sliver's child sliver, a modified [RenderSliverList].\n+ ///\n+ /// The child manages the items in the list (deferring to [RenderSliverList]);\n+ /// and identifies which list item, if any, should be consulted\n+ /// for a sticky header.\n _RenderSliverStickyHeaderListInner? get child => _child;\n _RenderSliverStickyHeaderListInner? _child;\n set child(_RenderSliverStickyHeaderListInner? value) {\n@@ -552,44 +557,74 @@ class _RenderSliverStickyHeaderList extends RenderSliver with RenderSliverHelper\n \n @override\n void performLayout() {\n+ // First, lay out the child sliver. This does all the normal work of\n+ // [RenderSliverList], then calls [_rebuildHeader] on this sliver\n+ // so that [header] and [_headerEndBound] are up to date.\n assert(child != null);\n child!.layout(constraints, parentUsesSize: true);\n SliverGeometry geometry = child!.geometry!;\n \n+ if (geometry.scrollOffsetCorrection != null) {\n+ this.geometry = geometry;\n+ return;\n+ }\n+\n+ // We assume [child]'s geometry is free of certain complications.\n+ // Probably most or all of these *could* be handled if necessary, just at\n+ // the cost of further complicating this code. Fortunately they aren't,\n+ // because [RenderSliverList.performLayout] never has these complications.\n+ assert(geometry.paintOrigin == 0);\n+ assert(geometry.layoutExtent == geometry.paintExtent);\n+ assert(geometry.hitTestExtent == geometry.paintExtent);\n+ assert(geometry.visible == (geometry.paintExtent > 0));\n+ assert(geometry.maxScrollObstructionExtent == 0);\n+ assert(geometry.crossAxisExtent == null);\n+ final childExtent = geometry.layoutExtent;\n+\n if (header != null) {\n header!.layout(constraints.asBoxConstraints(), parentUsesSize: true);\n-\n final headerExtent = header!.size.onAxis(constraints.axis);\n+\n final double headerOffset;\n if (_headerEndBound == null) {\n- final paintedHeaderSize = calculatePaintOffset(constraints, from: 0, to: headerExtent);\n- final cacheExtent = calculateCacheOffset(constraints, from: 0, to: headerExtent);\n-\n- assert(0 <= paintedHeaderSize && paintedHeaderSize.isFinite);\n+ // The header's item has [StickyHeaderItem.allowOverflow] true.\n+ // Show the header in full, with one edge at the edge of the viewport,\n+ // even if the (visible part of the) item is smaller than the header,\n+ // and even if the whole child sliver is smaller than the header.\n \n+ final paintedHeaderSize = calculatePaintOffset(constraints, from: 0, to: headerExtent);\n geometry = SliverGeometry( // TODO review interaction with other slivers\n scrollExtent: geometry.scrollExtent,\n- layoutExtent: geometry.layoutExtent,\n- paintExtent: math.max(geometry.paintExtent, paintedHeaderSize),\n- cacheExtent: math.max(geometry.cacheExtent, cacheExtent),\n+ layoutExtent: childExtent,\n+ paintExtent: math.max(childExtent, paintedHeaderSize),\n maxPaintExtent: math.max(geometry.maxPaintExtent, headerExtent),\n- hitTestExtent: math.max(geometry.hitTestExtent, paintedHeaderSize),\n hasVisualOverflow: geometry.hasVisualOverflow\n || headerExtent > constraints.remainingPaintExtent,\n+\n+ // The cache extent is an extension of layout, not paint; it controls\n+ // where the next sliver should start laying out content. (See\n+ // [SliverConstraints.remainingCacheExtent].) The header isn't meant\n+ // to affect where the next sliver gets laid out, so it shouldn't\n+ // affect the cache extent.\n+ cacheExtent: geometry.cacheExtent,\n );\n \n headerOffset = _headerAtCoordinateEnd()\n- ? geometry.layoutExtent - headerExtent\n+ ? childExtent - headerExtent\n : 0.0;\n } else {\n+ // The header's item has [StickyHeaderItem.allowOverflow] false.\n+ // Keep the header within the item, pushing the header partly out of\n+ // the viewport if the item's visible part is smaller than the header.\n+\n // The limiting edge of the header's item,\n // in the outer, non-scrolling coordinates.\n final endBoundAbsolute = axisDirectionIsReversed(constraints.growthAxisDirection)\n- ? geometry.layoutExtent - (_headerEndBound! - constraints.scrollOffset)\n+ ? childExtent - (_headerEndBound! - constraints.scrollOffset)\n : _headerEndBound! - constraints.scrollOffset;\n \n headerOffset = _headerAtCoordinateEnd()\n- ? math.max(geometry.layoutExtent - headerExtent, endBoundAbsolute)\n+ ? math.max(childExtent - headerExtent, endBoundAbsolute)\n : math.min(0.0, endBoundAbsolute - headerExtent);\n }\n \n@@ -706,7 +741,10 @@ class _RenderSliverStickyHeaderListInner extends RenderSliverList {\n ///\n /// This means (child start) < (viewport end) <= (child end).\n RenderBox? _findChildAtEnd() {\n- final endOffset = constraints.scrollOffset + constraints.viewportMainAxisExtent;\n+ /// The end of the visible area available to this sliver,\n+ /// in this sliver's \"scroll offset\" coordinates.\n+ final endOffset = constraints.scrollOffset\n+ + constraints.remainingPaintExtent;\n \n RenderBox? child;\n for (child = lastChild; ; child = childBefore(child)) {\n@@ -736,10 +774,23 @@ class _RenderSliverStickyHeaderListInner extends RenderSliverList {\n \n final RenderBox? child;\n switch (widget.headerPlacement._byGrowth(constraints.growthDirection)) {\n+ case _HeaderGrowthPlacement.growthStart:\n+ if (constraints.remainingPaintExtent < constraints.viewportMainAxisExtent) {\n+ // Part of the viewport is occupied already by other slivers. The way\n+ // a RenderViewport does layout means that the already-occupied part is\n+ // the part that's before this sliver in the growth direction.\n+ // Which means that's the place where the header would go.\n+ child = null;\n+ } else {\n+ child = _findChildAtStart();\n+ }\n case _HeaderGrowthPlacement.growthEnd:\n+ // The edge this sliver wants to place a header at is the one where\n+ // this sliver is free to run all the way to the viewport's edge; any\n+ // further slivers in that direction will be laid out after this one.\n+ // So if this sliver placed a child there, it's at the edge of the\n+ // whole viewport and should determine a header.\n child = _findChildAtEnd();\n- case _HeaderGrowthPlacement.growthStart:\n- child = _findChildAtStart();\n }\n \n (parent! as _RenderSliverStickyHeaderList)._rebuildHeader(child);\n", "test_patch": "diff --git a/test/widgets/sticky_header_test.dart b/test/widgets/sticky_header_test.dart\nindex fc363c71e8..c283652ae1 100644\n--- a/test/widgets/sticky_header_test.dart\n+++ b/test/widgets/sticky_header_test.dart\n@@ -103,6 +103,116 @@ void main() {\n }\n }\n }\n+\n+ testWidgets('sticky headers: propagate scrollOffsetCorrection properly', (tester) async {\n+ Widget page(Widget Function(BuildContext, int) itemBuilder) {\n+ return Directionality(textDirection: TextDirection.ltr,\n+ child: StickyHeaderListView.builder(\n+ cacheExtent: 0,\n+ itemCount: 10, itemBuilder: itemBuilder));\n+ }\n+\n+ await tester.pumpWidget(page((context, i) =>\n+ StickyHeaderItem(\n+ allowOverflow: true,\n+ header: _Header(i, height: 40),\n+ child: _Item(i, height: 200))));\n+ check(tester.getTopLeft(find.text(\"Item 2\"))).equals(Offset(0, 400));\n+\n+ // Scroll down (dragging up) to get item 0 off screen.\n+ await tester.drag(find.text(\"Item 2\"), Offset(0, -300));\n+ await tester.pump();\n+ check(tester.getTopLeft(find.text(\"Item 2\"))).equals(Offset(0, 100));\n+\n+ // Make the off-screen item 0 taller, so scrolling back up will underflow.\n+ await tester.pumpWidget(page((context, i) =>\n+ StickyHeaderItem(\n+ allowOverflow: true,\n+ header: _Header(i, height: 40),\n+ child: _Item(i, height: i == 0 ? 400 : 200))));\n+ // Confirm the change in item 0's height hasn't already been applied,\n+ // as it would if the item were within the viewport or its cache area.\n+ check(tester.getTopLeft(find.text(\"Item 2\"))).equals(Offset(0, 100));\n+\n+ // Scroll back up (dragging down). This will cause a correction as the list\n+ // discovers that moving 300px up doesn't reach the start anymore.\n+ await tester.drag(find.text(\"Item 2\"), Offset(0, 300));\n+\n+ // As a bonus, mark one of the already-visible items as needing layout.\n+ // (In a real app, this would typically happen because some state changed.)\n+ tester.firstElement(find.widgetWithText(SizedBox, \"Item 2\"))\n+ .renderObject!.markNeedsLayout();\n+\n+ // If scrollOffsetCorrection doesn't get propagated to the viewport, this\n+ // pump will record an exception (causing the test to fail at the end)\n+ // because the marked item won't get laid out.\n+ await tester.pump();\n+ check(tester.getTopLeft(find.text(\"Item 2\"))).equals(Offset(0, 400));\n+\n+ // Moreover if scrollOffsetCorrection doesn't get propagated, this item\n+ // will get placed at zero rather than properly extend up off screen.\n+ check(tester.getTopLeft(find.text(\"Item 0\"))).equals(Offset(0, -200));\n+ });\n+\n+ testWidgets('sliver only part of viewport, header at end', (tester) async {\n+ const centerKey = ValueKey('center');\n+ final controller = ScrollController();\n+ await tester.pumpWidget(Directionality(textDirection: TextDirection.ltr,\n+ child: CustomScrollView(\n+ controller: controller,\n+ anchor: 0.5,\n+ center: centerKey,\n+ slivers: [\n+ SliverStickyHeaderList(\n+ headerPlacement: HeaderPlacement.scrollingStart,\n+ delegate: SliverChildListDelegate(\n+ List.generate(100, (i) => StickyHeaderItem(\n+ header: _Header(99 - i, height: 20),\n+ child: _Item(99 - i, height: 100))))),\n+ SliverStickyHeaderList(\n+ key: centerKey,\n+ headerPlacement: HeaderPlacement.scrollingStart,\n+ delegate: SliverChildListDelegate(\n+ List.generate(100, (i) => StickyHeaderItem(\n+ header: _Header(100 + i, height: 20),\n+ child: _Item(100 + i, height: 100))))),\n+ ])));\n+\n+ final overallSize = tester.getSize(find.byType(CustomScrollView));\n+ final extent = overallSize.onAxis(Axis.vertical);\n+ assert(extent == 600);\n+\n+ void checkState(int index, {required double item, required double header}) {\n+ final itemElement = tester.firstElement(find.byElementPredicate((element) {\n+ if (element.widget is! _Item) return false;\n+ final renderObject = element.renderObject as RenderBox;\n+ return (renderObject.size.contains(renderObject.globalToLocal(\n+ Offset(overallSize.width / 2, 1)\n+ )));\n+ }));\n+ final itemWidget = itemElement.widget as _Item;\n+ check(itemWidget.index).equals(index);\n+ check(_headerIndex(tester)).equals(index);\n+ check((itemElement.renderObject as RenderBox).localToGlobal(Offset(0, 0)))\n+ .equals(Offset(0, item));\n+ check(tester.getTopLeft(find.byType(_Header))).equals(Offset(0, header));\n+ }\n+\n+ check(controller.offset).equals(0);\n+ checkState( 97, item: 0, header: 0);\n+\n+ controller.jumpTo(-5);\n+ await tester.pump();\n+ checkState( 96, item: -95, header: -15);\n+\n+ controller.jumpTo(-600);\n+ await tester.pump();\n+ checkState( 91, item: 0, header: 0);\n+\n+ controller.jumpTo(600);\n+ await tester.pump();\n+ checkState(103, item: 0, header: 0);\n+ });\n }\n \n Future _checkSequence(\n@@ -174,7 +284,6 @@ Future _checkSequence(\n final expectedHeaderIndex = first\n ? (scrollOffset / 100).floor()\n : (extent ~/ 100 - 1) + (scrollOffset / 100).ceil();\n- // print(\"$scrollOffset, $extent, $expectedHeaderIndex\");\n check(tester.widget<_Item>(itemFinder).index).equals(expectedHeaderIndex);\n check(_headerIndex(tester)).equals(expectedHeaderIndex);\n \n", "n2p_tests": "{}", "f2p_tests": "{\"sticky headers: propagate scrollOffsetCorrection properly\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"sliver only part of viewport, header at end\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"sticky headers: RTL scroll forward, header at end, GrowthDirection.forward, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: RTL scroll forward, header at end, GrowthDirection.reverse, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: LTR scroll forward, header at start, GrowthDirection.reverse, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: LTR scroll forward, header at start, GrowthDirection.forward, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: RTL scroll forward, header at end, GrowthDirection.forward, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: RTL scroll backward, header at start, GrowthDirection.forward, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: LTR scroll backward, header at end, GrowthDirection.reverse, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: LTR scroll backward, header at end, GrowthDirection.forward, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: LTR scroll forward, header at start, GrowthDirection.reverse, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll down, header at top, GrowthDirection.forward, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll up, header at bottom, GrowthDirection.reverse, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll up, header at bottom, GrowthDirection.reverse, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll up, header at bottom, GrowthDirection.forward, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: LTR scroll forward, header at end, GrowthDirection.forward, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll down, header at bottom, GrowthDirection.reverse, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll down, header at top, GrowthDirection.reverse, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll up, header at top, GrowthDirection.forward, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll down, header at bottom, GrowthDirection.forward, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll down, header at top, GrowthDirection.forward, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: RTL scroll backward, header at start, GrowthDirection.forward, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: LTR scroll forward, header at end, GrowthDirection.forward, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll up, headers overflow items, explicit version\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: RTL scroll backward, header at end, GrowthDirection.forward, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: LTR scroll backward, header at end, GrowthDirection.forward, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: LTR scroll forward, header at end, GrowthDirection.reverse, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll up, header at top, GrowthDirection.reverse, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: LTR scroll forward, header at start, GrowthDirection.forward, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: RTL scroll backward, header at end, GrowthDirection.forward, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll up, header at top, GrowthDirection.reverse, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: LTR scroll forward, header at end, GrowthDirection.reverse, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: LTR scroll backward, header at start, GrowthDirection.forward, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: LTR scroll backward, header at start, GrowthDirection.reverse, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: RTL scroll forward, header at start, GrowthDirection.forward, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll up, header at bottom, GrowthDirection.forward, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: RTL scroll forward, header at start, GrowthDirection.reverse, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll up, headers bounded by items, semi-explicit version\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: RTL scroll forward, header at start, GrowthDirection.reverse, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll up, header at top, GrowthDirection.forward, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll down, header at top, GrowthDirection.reverse, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: LTR scroll backward, header at start, GrowthDirection.reverse, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: LTR scroll backward, header at start, GrowthDirection.forward, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: RTL scroll backward, header at start, GrowthDirection.reverse, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: RTL scroll forward, header at start, GrowthDirection.forward, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: RTL scroll backward, header at start, GrowthDirection.reverse, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: LTR scroll backward, header at end, GrowthDirection.reverse, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: RTL scroll backward, header at end, GrowthDirection.reverse, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll down, header at bottom, GrowthDirection.forward, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: scroll down, header at bottom, GrowthDirection.reverse, headers overflow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: RTL scroll forward, header at end, GrowthDirection.reverse, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"sticky headers: RTL scroll backward, header at end, GrowthDirection.reverse, headers bounded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1311", "org": "zulip", "repo": "zulip-flutter", "number": 1311, "state": "closed", "title": "Handle moved messages for unreads", "body": "Fixes #901. (**edit**, after splitting that issue.)\r\n\r\nWork toward #901\r\n\r\nI prioritized updating unreads data for moved messages because it is more visible after supporting the resolve/unresolve topic actions. Updating recent senders data will be a follow-up to this.", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"b0307378c4b513d3fe320259be34ab61df49dfa6\"}", "resolved_issues": "[{\"number\": 901, \"title\": \"Handle moved messages in unreads data\", \"body\": \"With #787 we implemented most of #150, handling moved messages. But as that PR description said:\\n> Fixes most of https://github.com/zulip/zulip-flutter/issues/150. (After this lands we should do a quick scan to identify anything else that needs updating on message moves \\u2014 there are several new data structures in the store that we've merged in recent weeks.)\\n\\nThen we didn't do that scan.\\n\\nPlaces that still need updating on message moves include:\\n- [x] `Unreads` (which has a TODO comment for it)\\n- [x] ~~`RecentSenders` (that's one of those recently-merged data structures)~~ \\u2192 split to its own issue: #1460 \\n- \\u2026 OK and I think that's it, having now scanned through what's in the store. (Another recently-merged data structure is `RecentDmConversationsView`, but that's only about DMs and those can't be moved.)\\n\\nRelated issues:\\n\\n- #862\"}]", "lang": "dart", "problem_statement": "Handle moved messages in unreads data\nWith #787 we implemented most of #150, handling moved messages. But as that PR description said:\n> Fixes most of https://github.com/zulip/zulip-flutter/issues/150. (After this lands we should do a quick scan to identify anything else that needs updating on message moves \u2014 there are several new data structures in the store that we've merged in recent weeks.)\n\nThen we didn't do that scan.\n\nPlaces that still need updating on message moves include:\n- [x] `Unreads` (which has a TODO comment for it)\n- [x] ~~`RecentSenders` (that's one of those recently-merged data structures)~~ \u2192 split to its own issue: #1460 \n- \u2026 OK and I think that's it, having now scanned through what's in the store. (Another recently-merged data structure is `RecentDmConversationsView`, but that's only about DMs and those can't be moved.)\n\nRelated issues:\n\n- #862\n", "hints": "The key user-facing scenario where this comes up, which I happened to see again earlier today:\r\n* You're reading messages in Combined feed.\r\n* A topic gets resolved, containing some unread messages.\r\n* The messages are still unread, and shown with the blue unread marker at left. If you tap the recipient header to navigate to their conversation, the unread marker appears, as it should.\r\n* But the conversation *doesn't* have a mark-as-read button. As a result there's no way for you to dismiss those unread markers (short of marking read the entire combined feed, or entire channel).\r\n\r\nWhat's happening is that the `Unreads` data structure still has the messages under their old, unresolved topic; so when viewing the new resolved topic, it finds no unreads for that topic.\r\n\nI will work on this next as with #1301 this scenario might come up more often.\n`TypingStatus` also refers to data that can be moved (`TopicNarrow`s), but it appears that the web app doesn't move an active typing indicator even if propagate mode is 'all'. It could be a deliberate UX or a known/unknown issue. Anyway, this is pretty subtle and we shouldn't need to consider it when working on this.", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1311", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/901\"]", "test_command": "flutter test test/api/model/events_test.dart test/model/message_list_test.dart test/model/unreads_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/api/model/events.dart b/lib/api/model/events.dart\nindex 9faa3d367e..985f5b5803 100644\n--- a/lib/api/model/events.dart\n+++ b/lib/api/model/events.dart\n@@ -718,16 +718,8 @@ class UpdateMessageEvent extends Event {\n \n // final String? streamName; // ignore\n \n- @JsonKey(name: 'stream_id')\n- final int? origStreamId;\n- final int? newStreamId;\n-\n- final PropagateMode? propagateMode;\n-\n- @JsonKey(name: 'orig_subject')\n- final TopicName? origTopic;\n- @JsonKey(name: 'subject')\n- final TopicName? newTopic;\n+ @JsonKey(readValue: _readMoveData, fromJson: UpdateMessageMoveData.tryParseFromJson, includeToJson: false)\n+ final UpdateMessageMoveData? moveData;\n \n // final List topicLinks; // TODO handle\n \n@@ -747,11 +739,7 @@ class UpdateMessageEvent extends Event {\n required this.messageIds,\n required this.flags,\n required this.editTimestamp,\n- required this.origStreamId,\n- required this.newStreamId,\n- required this.propagateMode,\n- required this.origTopic,\n- required this.newTopic,\n+ required this.moveData,\n required this.origContent,\n required this.origRenderedContent,\n required this.content,\n@@ -759,6 +747,12 @@ class UpdateMessageEvent extends Event {\n required this.isMeMessage,\n });\n \n+ static Map _readMoveData(Map json, String key) {\n+ // Parsing [UpdateMessageMoveData] requires `json`, not the default `json[key]`.\n+ assert(json is Map); // value came through `fromJson` with this type\n+ return json as Map;\n+ }\n+\n factory UpdateMessageEvent.fromJson(Map json) =>\n _$UpdateMessageEventFromJson(json);\n \n@@ -766,6 +760,72 @@ class UpdateMessageEvent extends Event {\n Map toJson() => _$UpdateMessageEventToJson(this);\n }\n \n+/// Data structure representing a message move.\n+class UpdateMessageMoveData {\n+ final int origStreamId;\n+ final int newStreamId;\n+ final TopicName origTopic;\n+ final TopicName newTopic;\n+ final PropagateMode propagateMode;\n+\n+ UpdateMessageMoveData({\n+ required this.origStreamId,\n+ required this.newStreamId,\n+ required this.origTopic,\n+ required this.newTopic,\n+ required this.propagateMode,\n+ }) : assert(newStreamId != origStreamId || newTopic != origTopic);\n+\n+ /// Try to extract [UpdateMessageMoveData] from the JSON object for an\n+ /// [UpdateMessageEvent].\n+ ///\n+ /// Returns `null` if there was no message move.\n+ ///\n+ /// Throws an error if the data is malformed.\n+ // When parsing this, 'stream_id', which is also present when there was only\n+ // a content edit, cannot be recovered if this ends up returning `null`.\n+ // This may matter if we ever need 'stream_id' when no message move occurred.\n+ static UpdateMessageMoveData? tryParseFromJson(Map json) {\n+ final origStreamId = (json['stream_id'] as num?)?.toInt();\n+ final newStreamIdRaw = (json['new_stream_id'] as num?)?.toInt();\n+ final newStreamId = newStreamIdRaw ?? origStreamId;\n+\n+ final origTopic = json['orig_subject'] == null ? null\n+ : TopicName.fromJson(json['orig_subject'] as String);\n+ final newTopicRaw = json['subject'] == null ? null\n+ : TopicName.fromJson(json['subject'] as String);\n+ final newTopic = newTopicRaw ?? origTopic;\n+\n+ final propagateModeString = json['propagate_mode'] as String?;\n+ final propagateMode = propagateModeString == null ? null\n+ : PropagateMode.fromRawString(propagateModeString);\n+\n+ if (newStreamId == origStreamId && newTopic == origTopic) {\n+ if (propagateMode != null) {\n+ throw FormatException(\n+ 'Malformed UpdateMessageEvent: incoherent message-move fields; '\n+ 'propagate_mode present but no new channel or topic');\n+ }\n+ return null;\n+ }\n+\n+ return UpdateMessageMoveData(\n+ // The `stream_id` field (aka origStreamId) is documented to be present on moves;\n+ // newStreamId should not be null either because it falls back to origStreamId.\n+ origStreamId: origStreamId!,\n+ newStreamId: newStreamId!,\n+\n+ // The `orig_subject` field (aka origTopic) is documented to be present on moves;\n+ // newTopic should not be null either because it falls back to origTopic.\n+ origTopic: origTopic!,\n+ newTopic: newTopic!,\n+\n+ // The `propagate_mode` field (aka propagateMode) is documented to be present on moves.\n+ propagateMode: propagateMode!,\n+ );\n+ }\n+}\n+\n /// A Zulip event of type `delete_message`: https://zulip.com/api/get-events#delete_message\n @JsonSerializable(fieldRename: FieldRename.snake)\n class DeleteMessageEvent extends Event {\ndiff --git a/lib/api/model/events.g.dart b/lib/api/model/events.g.dart\nindex d0b0cc7b1b..c5b56d013a 100644\n--- a/lib/api/model/events.g.dart\n+++ b/lib/api/model/events.g.dart\n@@ -443,20 +443,10 @@ UpdateMessageEvent _$UpdateMessageEventFromJson(Map json) =>\n .map((e) => $enumDecode(_$MessageFlagEnumMap, e))\n .toList(),\n editTimestamp: (json['edit_timestamp'] as num?)?.toInt(),\n- origStreamId: (json['stream_id'] as num?)?.toInt(),\n- newStreamId: (json['new_stream_id'] as num?)?.toInt(),\n- propagateMode: $enumDecodeNullable(\n- _$PropagateModeEnumMap,\n- json['propagate_mode'],\n+ moveData: UpdateMessageMoveData.tryParseFromJson(\n+ UpdateMessageEvent._readMoveData(json, 'move_data')\n+ as Map,\n ),\n- origTopic:\n- json['orig_subject'] == null\n- ? null\n- : TopicName.fromJson(json['orig_subject'] as String),\n- newTopic:\n- json['subject'] == null\n- ? null\n- : TopicName.fromJson(json['subject'] as String),\n origContent: json['orig_content'] as String?,\n origRenderedContent: json['orig_rendered_content'] as String?,\n content: json['content'] as String?,\n@@ -474,11 +464,6 @@ Map _$UpdateMessageEventToJson(UpdateMessageEvent instance) =>\n 'message_ids': instance.messageIds,\n 'flags': instance.flags,\n 'edit_timestamp': instance.editTimestamp,\n- 'stream_id': instance.origStreamId,\n- 'new_stream_id': instance.newStreamId,\n- 'propagate_mode': instance.propagateMode,\n- 'orig_subject': instance.origTopic,\n- 'subject': instance.newTopic,\n 'orig_content': instance.origContent,\n 'orig_rendered_content': instance.origRenderedContent,\n 'content': instance.content,\n@@ -497,12 +482,6 @@ const _$MessageFlagEnumMap = {\n MessageFlag.unknown: 'unknown',\n };\n \n-const _$PropagateModeEnumMap = {\n- PropagateMode.changeOne: 'change_one',\n- PropagateMode.changeLater: 'change_later',\n- PropagateMode.changeAll: 'change_all',\n-};\n-\n DeleteMessageEvent _$DeleteMessageEventFromJson(Map json) =>\n DeleteMessageEvent(\n id: (json['id'] as num).toInt(),\ndiff --git a/lib/api/model/model.dart b/lib/api/model/model.dart\nindex fad8ddc5bc..5c94626584 100644\n--- a/lib/api/model/model.dart\n+++ b/lib/api/model/model.dart\n@@ -954,4 +954,15 @@ enum PropagateMode {\n changeAll;\n \n String toJson() => _$PropagateModeEnumMap[this]!;\n+\n+ /// Get a [PropagateMode] from a raw string. Throws if the string is\n+ /// unrecognized.\n+ ///\n+ /// Example:\n+ /// 'change_one' -> PropagateMode.changeOne\n+ static PropagateMode fromRawString(String raw) => _byRawString[raw]!;\n+\n+ // _$\u2026EnumMap is thanks to `alwaysCreate: true` and `fieldRename: FieldRename.snake`\n+ static final _byRawString = _$PropagateModeEnumMap\n+ .map((key, value) => MapEntry(value, key));\n }\ndiff --git a/lib/model/message.dart b/lib/model/message.dart\nindex 84f3bbc3e5..d1886b810f 100644\n--- a/lib/model/message.dart\n+++ b/lib/model/message.dart\n@@ -169,48 +169,17 @@ class MessageStoreImpl with MessageStore {\n }\n \n void _handleUpdateMessageEventMove(UpdateMessageEvent event) {\n- // The interaction between the fields of these events are a bit tricky.\n- // For reference, see: https://zulip.com/api/get-events#update_message\n-\n- final origStreamId = event.origStreamId;\n- final newStreamId = event.newStreamId; // null if topic-only move\n- final origTopic = event.origTopic;\n- final newTopic = event.newTopic;\n- final propagateMode = event.propagateMode;\n-\n- if (origTopic == null) {\n+ final messageMove = event.moveData;\n+ if (messageMove == null) {\n // There was no move.\n- assert(() {\n- if (newStreamId != null && origStreamId != null\n- && newStreamId != origStreamId) {\n- // This should be impossible; `orig_subject` (aka origTopic) is\n- // documented to be present when either the stream or topic changed.\n- debugLog('Malformed UpdateMessageEvent: stream move but no origTopic'); // TODO(log)\n- }\n- return true;\n- }());\n return;\n }\n \n- if (newStreamId == null && newTopic == null) {\n- // If neither the channel nor topic name changed, nothing moved.\n- // In that case `orig_subject` (aka origTopic) should have been null.\n- assert(debugLog('Malformed UpdateMessageEvent: move but no newStreamId or newTopic')); // TODO(log)\n- return;\n- }\n- if (origStreamId == null) {\n- // The `stream_id` field (aka origStreamId) is documented to be present on moves.\n- assert(debugLog('Malformed UpdateMessageEvent: move but no origStreamId')); // TODO(log)\n- return;\n- }\n- if (propagateMode == null) {\n- // The `propagate_mode` field (aka propagateMode) is documented to be present on moves.\n- assert(debugLog('Malformed UpdateMessageEvent: move but no propagateMode')); // TODO(log)\n- return;\n- }\n+ final UpdateMessageMoveData(\n+ :origStreamId, :newStreamId, :origTopic, :newTopic) = messageMove;\n \n- final wasResolveOrUnresolve = (newStreamId == null\n- && MessageEditState.topicMoveWasResolveOrUnresolve(origTopic, newTopic!));\n+ final wasResolveOrUnresolve = newStreamId == origStreamId\n+ && MessageEditState.topicMoveWasResolveOrUnresolve(origTopic, newTopic);\n \n for (final messageId in event.messageIds) {\n final message = messages[messageId];\n@@ -221,14 +190,14 @@ class MessageStoreImpl with MessageStore {\n continue;\n }\n \n- if (newStreamId != null) {\n+ if (newStreamId != origStreamId) {\n message.streamId = newStreamId;\n // See [StreamMessage.displayRecipient] on why the invalidation is\n // needed.\n message.displayRecipient = null;\n }\n \n- if (newTopic != null) {\n+ if (newTopic != origTopic) {\n message.topic = newTopic;\n }\n \n@@ -239,14 +208,7 @@ class MessageStoreImpl with MessageStore {\n }\n \n for (final view in _messageListViews) {\n- view.messagesMoved(\n- origStreamId: origStreamId,\n- newStreamId: newStreamId ?? origStreamId,\n- origTopic: origTopic,\n- newTopic: newTopic ?? origTopic,\n- messageIds: event.messageIds,\n- propagateMode: propagateMode,\n- );\n+ view.messagesMoved(messageMove: messageMove, messageIds: event.messageIds);\n }\n }\n \ndiff --git a/lib/model/message_list.dart b/lib/model/message_list.dart\nindex ea120cd72e..a1df255cb2 100644\n--- a/lib/model/message_list.dart\n+++ b/lib/model/message_list.dart\n@@ -720,13 +720,12 @@ class MessageListView with ChangeNotifier, _MessageSequence {\n }\n \n void messagesMoved({\n- required int origStreamId,\n- required int newStreamId,\n- required TopicName origTopic,\n- required TopicName newTopic,\n+ required UpdateMessageMoveData messageMove,\n required List messageIds,\n- required PropagateMode propagateMode,\n }) {\n+ final UpdateMessageMoveData(\n+ :origStreamId, :newStreamId, :origTopic, :newTopic, :propagateMode,\n+ ) = messageMove;\n switch (narrow) {\n case DmNarrow():\n // DMs can't be moved (nor created by moves),\ndiff --git a/lib/model/unreads.dart b/lib/model/unreads.dart\nindex 1fcea3f83c..34b4492013 100644\n--- a/lib/model/unreads.dart\n+++ b/lib/model/unreads.dart\n@@ -259,10 +259,8 @@ class Unreads extends ChangeNotifier {\n (f) => f == MessageFlag.mentioned || f == MessageFlag.wildcardMentioned,\n );\n \n- // We assume this event can't signal a change in a message's 'read' flag.\n- // TODO can it actually though, when it's about messages being moved into an\n- // unsubscribed stream?\n- // https://chat.zulip.org/#narrow/stream/378-api-design/topic/mark-as-read.20events.20with.20message.20moves.3F/near/1639957\n+ // We expect the event's 'read' flag to be boring,\n+ // matching the message's local unread state.\n final bool isRead = event.flags.contains(MessageFlag.read);\n assert(() {\n final isUnreadLocally = isUnread(messageId);\n@@ -272,6 +270,17 @@ class Unreads extends ChangeNotifier {\n // We were going to check something but can't; shrug.\n if (isUnreadLocally == null) return true;\n \n+ final newChannelId = event.moveData?.newStreamId;\n+ if (newChannelId != null && !channelStore.subscriptions.containsKey(newChannelId)) {\n+ // When unread messages are moved to an unsubscribed channel, the server\n+ // marks them as read without sending a mark-as-read event. Clients are\n+ // asked to special-case this by marking them as read, which we do in\n+ // _handleMessageMove. That contract is clear enough and doesn't involve\n+ // this event's 'read' flag, so don't bother logging about the flag;\n+ // its behavior seems like an implementation detail that could change.\n+ return true;\n+ }\n+\n if (isUnreadLocally != isUnreadInEvent) {\n // If this happens, then either:\n // - the server and client have been out of sync about the message's\n@@ -296,13 +305,39 @@ class Unreads extends ChangeNotifier {\n madeAnyUpdate |= mentions.add(messageId);\n }\n \n- // TODO(#901) handle moved messages\n+ madeAnyUpdate |= _handleMessageMove(event);\n \n if (madeAnyUpdate) {\n notifyListeners();\n }\n }\n \n+ bool _handleMessageMove(UpdateMessageEvent event) {\n+ if (event.moveData == null) {\n+ // No moved messages.\n+ return false;\n+ }\n+ final UpdateMessageMoveData(\n+ :origStreamId, :newStreamId, :origTopic, :newTopic) = event.moveData!;\n+\n+ final messageToMoveIds = _popAllInStreamTopic(\n+ event.messageIds.toSet(), origStreamId, origTopic)?..sort();\n+\n+ if (messageToMoveIds == null || messageToMoveIds.isEmpty) return false;\n+ assert(event.messageIds.toSet().containsAll(messageToMoveIds));\n+\n+ if (!channelStore.subscriptions.containsKey(newStreamId)) {\n+ // Unreads moved to an unsubscribed channel; just drop them.\n+ // See also:\n+ // https://chat.zulip.org/#narrow/channel/378-api-design/topic/mark-as-read.20events.20with.20message.20moves.3F/near/2101926\n+ return true;\n+ }\n+\n+ _addAllInStreamTopic(messageToMoveIds, newStreamId, newTopic);\n+\n+ return true;\n+ }\n+\n void handleDeleteMessageEvent(DeleteMessageEvent event) {\n mentions.removeAll(event.messageIds);\n final messageIdsSet = Set.of(event.messageIds);\n@@ -455,6 +490,8 @@ class Unreads extends ChangeNotifier {\n \n // [messageIds] must be sorted ascending and without duplicates.\n void _addAllInStreamTopic(QueueList messageIds, int streamId, TopicName topic) {\n+ assert(messageIds.isNotEmpty);\n+ assert(isSortedWithoutDuplicates(messageIds));\n final topics = streams[streamId] ??= {};\n topics.update(topic,\n ifAbsent: () => messageIds,\n@@ -504,6 +541,49 @@ class Unreads extends ChangeNotifier {\n }\n }\n \n+ /// Remove unread stream messages contained in `incomingMessageIds`, with\n+ /// the matching `streamId` and `topic`.\n+ ///\n+ /// Returns the removed message IDs, or `null` if no messages are affected.\n+ ///\n+ /// Use [_removeAllInStreamTopic] if the removed message IDs are not needed.\n+ // Part of this is adapted from [ListBase.removeWhere].\n+ QueueList? _popAllInStreamTopic(Set incomingMessageIds, int streamId, TopicName topic) {\n+ final topics = streams[streamId];\n+ if (topics == null) return null;\n+ final messageIds = topics[topic];\n+ if (messageIds == null) return null;\n+\n+ final retainedMessageIds = messageIds.whereNot(\n+ (id) => incomingMessageIds.contains(id)).toList();\n+\n+ if (retainedMessageIds.isEmpty) {\n+ // This is an optimization for the case when all messages in the\n+ // conversation are removed, which avoids making a copy of `messageIds`\n+ // unnecessarily.\n+ topics.remove(topic);\n+ if (topics.isEmpty) {\n+ streams.remove(streamId);\n+ }\n+ return messageIds;\n+ }\n+\n+ QueueList? poppedMessageIds;\n+ if (retainedMessageIds.length != messageIds.length) {\n+ poppedMessageIds = QueueList.from(\n+ messageIds.where((id) => incomingMessageIds.contains(id)));\n+ messageIds.setRange(0, retainedMessageIds.length, retainedMessageIds);\n+ messageIds.length = retainedMessageIds.length;\n+ }\n+ if (messageIds.isEmpty) {\n+ topics.remove(topic);\n+ if (topics.isEmpty) {\n+ streams.remove(streamId);\n+ }\n+ }\n+ return poppedMessageIds;\n+ }\n+\n // TODO use efficient model lookups\n bool _slowIsPresentInDms(int messageId) {\n return dms.values.any((ids) => ids.contains(messageId));\n", "test_patch": "diff --git a/test/api/model/events_checks.dart b/test/api/model/events_checks.dart\nindex c1fa0a117f..12d74479de 100644\n--- a/test/api/model/events_checks.dart\n+++ b/test/api/model/events_checks.dart\n@@ -48,11 +48,7 @@ extension UpdateMessageEventChecks on Subject {\n Subject> get messageIds => has((e) => e.messageIds, 'messageIds');\n Subject> get flags => has((e) => e.flags, 'flags');\n Subject get editTimestamp => has((e) => e.editTimestamp, 'editTimestamp');\n- Subject get origStreamId => has((e) => e.origStreamId, 'origStreamId');\n- Subject get newStreamId => has((e) => e.newStreamId, 'newStreamId');\n- Subject get propagateMode => has((e) => e.propagateMode, 'propagateMode');\n- Subject get origTopic => has((e) => e.origTopic, 'origTopic');\n- Subject get newTopic => has((e) => e.newTopic, 'newTopic');\n+ Subject get moveData => has((e) => e.moveData, 'moveData');\n Subject get origContent => has((e) => e.origContent, 'origContent');\n Subject get origRenderedContent => has((e) => e.origRenderedContent, 'origRenderedContent');\n Subject get content => has((e) => e.content, 'content');\n@@ -60,6 +56,14 @@ extension UpdateMessageEventChecks on Subject {\n Subject get isMeMessage => has((e) => e.isMeMessage, 'isMeMessage');\n }\n \n+extension UpdateMessageMoveDataChecks on Subject {\n+ Subject get origStreamId => has((e) => e.origStreamId, 'origStreamId');\n+ Subject get newStreamId => has((e) => e.newStreamId, 'newStreamId');\n+ Subject get origTopic => has((e) => e.origTopic, 'origTopic');\n+ Subject get newTopic => has((e) => e.newTopic, 'newTopic');\n+ Subject get propagateMode => has((e) => e.propagateMode, 'propagateMode');\n+}\n+\n extension DeleteMessageEventChecks on Subject {\n Subject get messageType => has((e) => e.messageType, 'messageType');\n }\ndiff --git a/test/api/model/events_test.dart b/test/api/model/events_test.dart\nindex 51b36350cc..7cdfa94eff 100644\n--- a/test/api/model/events_test.dart\n+++ b/test/api/model/events_test.dart\n@@ -101,24 +101,106 @@ void main() {\n 'edit_timestamp': 1718741351,\n 'stream_id': eg.stream().streamId,\n };\n+ final baseMoveJson = { ...baseJson,\n+ 'orig_subject': 'foo',\n+ 'propagate_mode': 'change_all',\n+ };\n+\n+ test('smoke moveData', () {\n+ check(Event.fromJson({ ...baseMoveJson,\n+ 'stream_id': 1,\n+ 'new_stream_id': 2,\n+ 'orig_subject': 'foo',\n+ 'subject': 'bar',\n+ 'propagate_mode': 'change_all',\n+ })).isA().moveData.isNotNull()\n+ ..origStreamId.equals(1)\n+ ..newStreamId.equals(2)\n+ ..origTopic.equals(const TopicName('foo'))\n+ ..newTopic.equals(const TopicName('bar'))\n+ ..propagateMode.equals(PropagateMode.changeAll);\n+ });\n \n test('stream_id -> origStreamId', () {\n- check(Event.fromJson({ ...baseJson,\n+ check(Event.fromJson({ ...baseMoveJson,\n 'stream_id': 1,\n 'new_stream_id': 2,\n- }) as UpdateMessageEvent)\n+ })).isA().moveData.isNotNull()\n ..origStreamId.equals(1)\n ..newStreamId.equals(2);\n });\n \n test('orig_subject -> origTopic, subject -> newTopic', () {\n- check(Event.fromJson({ ...baseJson,\n+ check(Event.fromJson({ ...baseMoveJson,\n 'orig_subject': 'foo',\n 'subject': 'bar',\n- }) as UpdateMessageEvent)\n+ })).isA().moveData.isNotNull()\n ..origTopic.equals(const TopicName('foo'))\n ..newTopic.equals(const TopicName('bar'));\n });\n+\n+ test('new channel, same topic: fill in newTopic', () {\n+ // The server omits 'subject' in this situation.\n+ check(Event.fromJson({ ...baseMoveJson,\n+ 'stream_id': 1,\n+ 'new_stream_id': 2,\n+ 'orig_subject': 'foo',\n+ 'subject': null,\n+ })).isA().moveData.isNotNull()\n+ ..origTopic.equals(const TopicName('foo'))\n+ ..newTopic.equals(const TopicName('foo'));\n+ });\n+\n+ test('same channel, new topic; fill in newStreamId', () {\n+ // The server omits 'new_stream_id' in this situation.\n+ check(Event.fromJson({ ...baseMoveJson,\n+ 'stream_id': 1,\n+ 'new_stream_id': null,\n+ 'orig_subject': 'foo',\n+ 'subject': 'bar',\n+ })).isA().moveData.isNotNull()\n+ ..origStreamId.equals(1)\n+ ..newStreamId.equals(1);\n+ });\n+\n+ test('no message move', () {\n+ check(Event.fromJson({ ...baseJson,\n+ 'orig_content': 'foo',\n+ 'orig_rendered_content': 'foo',\n+ 'content': 'bar',\n+ 'rendered_content': 'bar',\n+ })).isA().moveData.isNull();\n+ });\n+\n+ test('stream move but no orig_subject', () {\n+ check(() => Event.fromJson({ ...baseMoveJson,\n+ 'stream_id': 1,\n+ 'new_stream_id': 2,\n+ 'orig_subject': null,\n+ })).throws();\n+ });\n+\n+ test('move but no subject or new_stream_id', () {\n+ check(() => Event.fromJson({ ...baseMoveJson,\n+ 'new_stream_id': null,\n+ 'subject': null,\n+ })).throws();\n+ });\n+\n+ test('move but no orig_stream_id', () {\n+ check(() => Event.fromJson({ ...baseMoveJson,\n+ 'stream_id': null,\n+ 'new_stream_id': 2,\n+ })).throws();\n+ });\n+\n+ test('move but no propagate_mode', () {\n+ check(() => Event.fromJson({ ...baseMoveJson,\n+ 'orig_subject': 'foo',\n+ 'subject': 'bar',\n+ 'propagate_mode': null,\n+ })).throws();\n+ });\n });\n \n test('delete_message: require streamId and topic for stream messages', () {\ndiff --git a/test/api/model/model_checks.dart b/test/api/model/model_checks.dart\nindex 8b39b1ad57..77995466ce 100644\n--- a/test/api/model/model_checks.dart\n+++ b/test/api/model/model_checks.dart\n@@ -53,6 +53,7 @@ extension TopicNameChecks on Subject {\n \n extension StreamMessageChecks on Subject {\n Subject get displayRecipient => has((e) => e.displayRecipient, 'displayRecipient');\n+ Subject get streamId => has((e) => e.streamId, 'streamId');\n Subject get topic => has((e) => e.topic, 'topic');\n }\n \ndiff --git a/test/example_data.dart b/test/example_data.dart\nindex 955f5dacfb..cfb333baec 100644\n--- a/test/example_data.dart\n+++ b/test/example_data.dart\n@@ -655,11 +655,7 @@ UpdateMessageEvent updateMessageEditEvent(\n messageIds: [messageId],\n flags: flags ?? origMessage.flags,\n editTimestamp: editTimestamp ?? 1234567890, // TODO generate timestamp\n- origStreamId: origMessage is StreamMessage ? origMessage.streamId : null,\n- newStreamId: null,\n- propagateMode: null,\n- origTopic: null,\n- newTopic: null,\n+ moveData: null,\n origContent: 'some probably-mismatched old Markdown',\n origRenderedContent: origMessage.content,\n content: 'some probably-mismatched new Markdown',\n@@ -681,8 +677,6 @@ UpdateMessageEvent _updateMessageMoveEvent(\n }) {\n _checkPositive(origStreamId, 'stream ID');\n _checkPositive(newStreamId, 'stream ID');\n- assert(newTopic != origTopic\n- || (newStreamId != null && newStreamId != origStreamId));\n assert(messageIds.isNotEmpty);\n return UpdateMessageEvent(\n id: 0,\n@@ -692,11 +686,13 @@ UpdateMessageEvent _updateMessageMoveEvent(\n messageIds: messageIds,\n flags: flags,\n editTimestamp: 1234567890, // TODO generate timestamp\n- origStreamId: origStreamId,\n- newStreamId: newStreamId,\n- propagateMode: propagateMode,\n- origTopic: origTopic,\n- newTopic: newTopic,\n+ moveData: UpdateMessageMoveData(\n+ origStreamId: origStreamId,\n+ newStreamId: newStreamId ?? origStreamId,\n+ origTopic: origTopic,\n+ newTopic: newTopic ?? origTopic,\n+ propagateMode: propagateMode,\n+ ),\n origContent: origContent,\n origRenderedContent: origContent,\n content: newContent,\ndiff --git a/test/model/message_list_test.dart b/test/model/message_list_test.dart\nindex da286f3ef5..92c08ddd6b 100644\n--- a/test/model/message_list_test.dart\n+++ b/test/model/message_list_test.dart\n@@ -825,11 +825,14 @@ void main() {\n });\n \n test('unrelated channel -> new channel: unaffected', () async {\n+ final thirdStream = eg.stream();\n await prepareNarrow(narrow, initialMessages);\n+ await store.addStream(thirdStream);\n+ await store.addSubscription(eg.subscription(thirdStream));\n \n await store.handleEvent(eg.updateMessageEventMoveFrom(\n origMessages: otherChannelMovedMessages,\n- newStreamId: otherStream.streamId,\n+ newStreamId: thirdStream.streamId,\n ));\n checkHasMessages(initialMessages);\n checkNotNotified();\ndiff --git a/test/model/unreads_test.dart b/test/model/unreads_test.dart\nindex 40e074dcaa..9a2e899ba7 100644\n--- a/test/model/unreads_test.dart\n+++ b/test/model/unreads_test.dart\n@@ -469,6 +469,175 @@ void main() {\n }\n }\n });\n+\n+ group('moves', () {\n+ final origChannel = eg.stream();\n+ const origTopic = 'origTopic';\n+ const newTopic = 'newTopic';\n+\n+ late List readMessages;\n+ late List unreadMessages;\n+\n+ Future prepareStore() async {\n+ prepare();\n+ await channelStore.addStream(origChannel);\n+ await channelStore.addSubscription(eg.subscription(origChannel));\n+ readMessages = List.generate(10,\n+ (_) => eg.streamMessage(stream: origChannel, topic: origTopic,\n+ flags: [MessageFlag.read]));\n+ unreadMessages = List.generate(10,\n+ (_) => eg.streamMessage(stream: origChannel, topic: origTopic));\n+ }\n+\n+ List copyMessagesWith(Iterable messages, {\n+ ZulipStream? newChannel,\n+ String? newTopic,\n+ }) {\n+ assert(newChannel != null || newTopic != null);\n+ return messages.map((message) => StreamMessage.fromJson(\n+ message.toJson()\n+ ..['stream_id'] = newChannel?.streamId ?? message.streamId\n+ ..['subject'] = newTopic ?? message.topic\n+ )).toList();\n+ }\n+\n+ test('moved messages = unread messages', () async {\n+ await prepareStore();\n+ final newChannel = eg.stream();\n+ await channelStore.addStream(newChannel);\n+ await channelStore.addSubscription(eg.subscription(newChannel));\n+ fillWithMessages(unreadMessages);\n+ final originalMessageIds =\n+ model.streams[origChannel.streamId]![TopicName(origTopic)]!;\n+\n+ model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(\n+ origMessages: unreadMessages,\n+ newStreamId: newChannel.streamId,\n+ newTopicStr: newTopic));\n+ checkNotifiedOnce();\n+ checkMatchesMessages(copyMessagesWith(unreadMessages,\n+ newChannel: newChannel, newTopic: newTopic));\n+ final newMessageIds =\n+ model.streams[newChannel.streamId]![TopicName(newTopic)]!;\n+ // Check we successfully avoided making a copy of the list.\n+ check(originalMessageIds).identicalTo(newMessageIds);\n+ });\n+\n+ test('moved messages \u2282 read messages', () async {\n+ await prepareStore();\n+ final messagesToMove = readMessages.take(2).toList();\n+ fillWithMessages(unreadMessages + readMessages);\n+\n+ model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(\n+ origMessages: messagesToMove,\n+ newTopicStr: newTopic));\n+ checkNotNotified();\n+ checkMatchesMessages(unreadMessages);\n+ });\n+\n+ test('moved messages \u2282 unread messages', () async {\n+ await prepareStore();\n+ final messagesToMove = unreadMessages.take(2).toList();\n+ fillWithMessages(unreadMessages + readMessages);\n+\n+ model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(\n+ origMessages: messagesToMove,\n+ newTopicStr: newTopic));\n+ checkNotifiedOnce();\n+ checkMatchesMessages([\n+ ...copyMessagesWith(messagesToMove, newTopic: newTopic),\n+ ...unreadMessages.skip(2),\n+ ]);\n+ });\n+\n+ test('moved messages \u2229 unread messages \u2260 \u00d8, moved messages \u2229 read messages \u2260 \u00d8, moved messages \u2285 unread messages', () async {\n+ await prepareStore();\n+ final messagesToMove = [unreadMessages.first, readMessages.first];\n+ fillWithMessages(unreadMessages + readMessages);\n+\n+ model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(\n+ origMessages: messagesToMove,\n+ newTopicStr: newTopic));\n+ checkNotifiedOnce();\n+ checkMatchesMessages([\n+ ...copyMessagesWith(unreadMessages.take(1), newTopic: newTopic),\n+ ...unreadMessages.skip(1),\n+ ]);\n+ });\n+\n+ test('moved messages \u2283 unread messages', () async {\n+ await prepareStore();\n+ final messagesToMove = unreadMessages + readMessages.take(2).toList();\n+ fillWithMessages(unreadMessages + readMessages);\n+ final originalMessageIds =\n+ model.streams[origChannel.streamId]![TopicName(origTopic)]!;\n+\n+ model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(\n+ origMessages: messagesToMove,\n+ newTopicStr: newTopic));\n+ checkNotifiedOnce();\n+ checkMatchesMessages(copyMessagesWith(unreadMessages, newTopic: newTopic));\n+ final newMessageIds =\n+ model.streams[origChannel.streamId]![TopicName(newTopic)]!;\n+ // Check we successfully avoided making a copy of the list.\n+ check(originalMessageIds).identicalTo(newMessageIds);\n+ });\n+\n+ test('moving to unsubscribed channels drops the unreads', () async {\n+ await prepareStore();\n+ final unsubscribedChannel = eg.stream();\n+ await channelStore.addStream(unsubscribedChannel);\n+ assert(!channelStore.subscriptions.containsKey(\n+ unsubscribedChannel.streamId));\n+ fillWithMessages(unreadMessages);\n+\n+ model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(\n+ origMessages: unreadMessages,\n+ newStreamId: unsubscribedChannel.streamId));\n+ checkNotifiedOnce();\n+ checkMatchesMessages([]);\n+ });\n+\n+ test('tolerates unsorted messages', () async {\n+ await prepareStore();\n+ final unreadMessages = List.generate(10, (i) =>\n+ eg.streamMessage(\n+ id: 1000 - i, stream: origChannel, topic: origTopic));\n+ fillWithMessages(unreadMessages);\n+\n+ model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(\n+ origMessages: unreadMessages,\n+ newTopicStr: newTopic));\n+ checkNotifiedOnce();\n+ checkMatchesMessages(copyMessagesWith(unreadMessages, newTopic: newTopic));\n+ });\n+\n+ test('tolerates unreads unknown to the model', () async {\n+ await prepareStore();\n+ fillWithMessages(unreadMessages);\n+\n+ final unknownChannel = eg.stream();\n+ assert(!channelStore.streams.containsKey(unknownChannel.streamId));\n+ final unknownUnreadMessage = eg.streamMessage(\n+ stream: unknownChannel, topic: origTopic);\n+\n+ model.handleUpdateMessageEvent(eg.updateMessageEventMoveFrom(\n+ origMessages: [unknownUnreadMessage],\n+ newTopicStr: newTopic));\n+ checkNotNotified();\n+ checkMatchesMessages(unreadMessages);\n+ });\n+\n+ test('message edit but no move', () async {\n+ await prepareStore();\n+ fillWithMessages(unreadMessages);\n+\n+ model.handleUpdateMessageEvent(eg.updateMessageEditEvent(\n+ unreadMessages.first));\n+ checkNotNotified();\n+ checkMatchesMessages(unreadMessages);\n+ });\n+ });\n });\n \n \n", "n2p_tests": "{\"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow moved from narrow: should remove moved messages (channel, topic) -> (channel, new topic)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent unmute a topic -> refetch from scratch\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial recent senders track all the messages\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: user_settings: all known settings have event handling\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow moved from narrow: should remove moved messages (channel, topic) -> (new channel, new topic)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfAnyMessagePresent all messages present\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message orig_subject -> origTopic, subject -> newTopic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: typing status event private -> direct\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: constructor empty\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: typing status event direct type sort recipient ids\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow moved from narrow: should remove moved messages (channel, topic) -> (new channel, topic)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow channel -> channel: internal move\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent in DmNarrow, do nothing (smoke test)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: handle content parsing into subclasses of ZulipMessageContent ZulipContent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent moves moved messages = unread messages\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient stream messages vs DMs, no match\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient DMs match just if same recipients\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: stream/topic muting in MentionsNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient topics compared case-insensitively same letters, different diacritics\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfMessagePresent message absent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messageContentChanged message present\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent in ChannelNarrow, use stream visibility\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent, not in narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message same channel, new topic; fill in newStreamId\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent mute a visible topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message move but no orig_stream_id\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved fetch races fetchOlder backoff A starts, _reset, move fetch finishes, fetchOlder backoff B starts, fetchOlder backoff A ends\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: recipient headers are maintained consistently\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: subscription/remove: deserialize stream_ids correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message no message move\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesSameDay\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in combined feed narrow internal move between topics\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved fetch races fetchOlder, _reset, move fetch finishes, fetchOlder returns\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: regression tests for #455 ReactionEvent is applied even when message not in any msglists\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in combined feed narrow internal move between channels\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: stream/topic muting in ChannelNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow unrelated channel -> new channel: unaffected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: regression tests for #455 UpdateMessageFlagsEvent is applied even when message not in any msglists\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent mentions unread stream message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in 1:1 narrow; new in different narrow (group)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent in TopicNarrow, stay visible\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in group narrow; new in same narrow\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient topics compared case-insensitively same case, all upper\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow channel -> new channel: remove moved messages\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient topics compared case-insensitively different case\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow old channel -> channel: refetch\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: count helpers countInCombinedFeedNarrow\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: delete_message: require streamId and topic for stream messages\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow irrelevant moves (old channel, topic) - > (unrelated channel, topic)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in self 1:1 narrow; new in different narrow (group)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient stream messages match just if same stream/topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchOlder recent senders track all the messages\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow do not follow to the new narrow when propagateMode = changeOne\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: stream/topic muting in CombinedFeedNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent moves message edit but no move\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent in CombinedFeedNarrow, use combined-feed visibility\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: realm_user/update delivery_email absent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow irrelevant moves (channel, old topic) -> (channel, unrelated topic)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: reassemble\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow do not follow when propagateMode = changeOne\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfAnyMessagePresent no messages present\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchOlder nop during backoff\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow handle move event before initial fetch\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved fetch races fetchInitial, _reset, initial fetch finishes, move fetch finishes\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent, before fetch\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message move but no subject or new_stream_id\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message move but no propagate_mode\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial smoke CombinedFeedNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: subscription/update: convert color correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial short history\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfMessagePresent message present\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow follow to the new narrow when propagateMode = changeAll\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: typing status event stream type missing streamId/topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfAnyMessagePresent some messages present\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient topics compared case-insensitively same case, mixed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial smoke TopicNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: DeleteMessageEvent in narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: DeleteMessageEvent non-consecutive message deletion\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial topic permalinks if no redirect, we still remove \\\"with\\\" element\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent moves moved messages \\u2229 unread messages \\u2260 \\u00d8, moved messages \\u2229 read messages \\u2260 \\u00d8, moved messages \\u2285 unread messages\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent read / stream / not direct mentioned / not wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: MessageEvent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent mentions unread stream message (but read state unknown to model)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow moved into narrow: should refetch messages (channel, old topic) -> (channel, topic)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved fetch races fetchInitial, _reset, move fetch finishes, initial fetch finishes\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient topics compared case-insensitively same non-cased chars\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient topics compared case-insensitively different case, same diacritics\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message stream move but no orig_subject\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent remove irrelevant flags; unread / not mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial topic permalinks if redirect, we follow it and remove \\\"with\\\" element\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: DeleteMessageEvent complete message deletion\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfMessagePresent message absent (newer than window)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved fetch races fetchOlder #1, _reset, move fetch finishes, fetchOlder #2, fetchOlder #1 finishes, fetchOlder #2 finishes\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchOlder smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow moved into narrow: should refetch messages (old channel, topic) -> (channel, topic)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent mentions read stream message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message_flags/remove private -> direct\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message new channel, same topic: fill in newTopic\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved fetch races fetchOlder, _reset, fetchOlder returns, move fetch finishes\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message stream_id -> origStreamId\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchInitial no messages found\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: DeleteMessageEvent not in narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: showSender is maintained correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: UserTopicEvent no affected messages -> no notification\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: typing status event private type missing recipient\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleDeleteMessageEvent delete read (or unknown) stream message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow do not follow when propagateMode = changeLater\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: regression tests for #455 reaction events handled once, even when message is in two message lists\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchOlder nop when already haveOldest true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent mark as unread tolerates unsorted event.messages: DM messages\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent moves moved messages \\u2283 unread messages\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messageContentChanged message absent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: realm_user/update delivery_email a string\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: message: move flags into message object\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: realm_user/update delivery_email null\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: handle content parsing into subclasses of ZulipMessageContent PollContent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow do not follow when propagateMode = changeAll\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient topics compared case-insensitively same case, all lower\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: haveSameRecipient topics compared case-insensitively having different CJK characters\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchOlder nop when already fetching\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: fetchOlder handles servers not understanding includeAnchor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: delete_message: private -> direct\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: notifyListenersIfMessagePresent message absent (older than window)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: regression tests for #455 UpdateMessageEvent (edit) is applied even when message not in any msglists\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: stream/topic muting in StarredMessagesNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message_flags/remove require messageDetails in mark-as-unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: stream/topic muting in TopicNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow moved into narrow: should refetch messages (old channel, old topic) -> (channel, topic)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in group narrow; new in different narrow (1:1)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent mentions read stream message (but read state unknown to model)\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in channel narrow unrelated channel -> unrelated channel: unaffected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: typing status event direct message typing events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message smoke moveData\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: DeleteMessageEvent not all in narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/message_list_test.dart: messagesMoved in topic narrow follow to the new narrow when propagateMode = changeLater\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1266", "org": "zulip", "repo": "zulip-flutter", "number": 1266, "state": "closed", "title": "Distinguish a TopicName type from plain String", "body": "Toward #1250.\r\nFixes #1205.\r\n\r\nThis PR introduces a new type `TopicName` as a Dart \"extension type\":\r\nhttps://dart.dev/language/extension-types\r\nAt runtime it's just a String \u2014 so there's no performance cost to it \u2014 but the type-checker tracks the distinction.\r\n\r\nThis lets us readily find all the spots in the code that need to adapt to show \"*general chat*\" for #1250: it's exactly the use sites of the new `TopicName.displayName`. (With one possible loophole involving string interpolation; see the last commit message below.)\r\n\r\nThis series is nearly NFC; each commit is NFC except the first two prep commits, which are nearly so.\r\n\r\n## Selected commit messages\r\n\r\napi: Explicitly ignore topics on DMs\r\n\r\nThe topic/subject field on DMs carries no information in the current\r\nAPI, and we already never actually look at it, as demonstrated by\r\nthe lack of changes in the rest of the tree in this commit. Clean\r\nup the type definitions in the API a bit by making that explicit.\r\n\r\nThis is NFC except in the case where a server were to not send this\r\nfield at all for a DM (or to send a non-string value). In that case\r\nthe old code would reject the server's response as malformed, and\r\nthe new code after this commit would accept it because it doesn't\r\nlook for the field.\r\n\r\n---\r\n\r\napi [nfc]: Introduce TopicName extension type\r\n\r\nWe'll use this to make a type-level distinction between a string\r\nthat's being used to name a topic, and just any old string.\r\nThat will help us in particular with #1250 the \"general chat\"\r\nfeature, where the way we show a topic name to the user stops being\r\nnecessarily just the same string that it appears as in the API.\r\n\r\nThe next phase will be to migrate a bunch of places in our code\r\nto refer to TopicName when that's what they mean, instead of just\r\nString.\r\n\r\nDuring this phase, a TopicName can be freely used as a String, but\r\nnot vice versa. So we'll do the migrations mostly in order of the\r\ndata flow, from upstream to downstream. That will allow us to do\r\nthem over a series of individually coherent commits, with a minimum\r\nof occasions where we temporarily introduce a conversion that won't\r\nbe needed in the final result.\r\n\r\nThat means: first, test data; then topics returned from the API to\r\nour code; then our internal models; then back to the API, this time\r\nfor topics passed to the API from our code.\r\n\r\nAfter we have the type in place all over where it belongs, we'll\r\nstart making use of the distinction, and then enforcing it.\r\n\r\n---\r\n\r\napi [nfc]: Use TopicName type across request parameters\r\n\r\nThis completes the conversion to use the TopicName type in the\r\nplaces where it belongs.\r\n\r\nNext, we'll start making use of this new type distinction: instead\r\nof using a TopicName implicitly as a String, we'll introduce members\r\ncorresponding to the different ways a topic name is used which are\r\ngoing to start having different behavior in the future.\r\n\r\nAfter that's complete, we can start enforcing the distinction in\r\norder to catch accidental future implicit uses as a String.\r\n\r\n---\r\n\r\napi [nfc]: Introduce TopicName.apiName, and use for making API requests\r\n\r\n---\r\n\r\napi [nfc]: Use TopicName.apiName for constructing narrow links\r\n\r\n---\r\n\r\nnotif [nfc]: Use TopicName.apiName for encoding NotificationOpenPayload\r\n\r\nThis isn't part of the Zulip server API -- it's entirely between the\r\n`buildUrl` and `parseUrl` of this class, and we could make up whatever\r\nencoding we like. But the API name of the topic is the natural thing\r\nto use.\r\n\r\n---\r\n\r\napi [nfc]: Factor out TopicName.canonicalize\r\n\r\n---\r\n\r\napi [nfc]: Introduce TopicName.displayName, and use where needed\r\n\r\nEach of these call sites will need to be updated for #1250. Those\r\nsites can now be found by listing the references to this getter.\r\n\r\nAs a bonus the type-checker will point out most of the places that\r\nneed updates, because this getter will become nullable. (The\r\nexceptions are where it's used in a string interpolation, because\r\n`null.toString()` is valid and returns \"null\".)\r\n\r\n---\r\n\r\napi [nfc]: Seal the TopicName migration by making non-transparent\r\n\r\nWe're now explicitly using apiName, canonicalize, or displayName in\r\neach of the places where we had been implicitly treating a topic name\r\nas a String. Let the type-checker catch any future regressions on\r\nthat front, by removing \"implements String\".\r\n\r\nMore precisely, I *think* we've covered each such place. The\r\nloophole is that Object methods can still be called, including\r\ntoString, so an interpolation like \"${channelName} > ${topic}\" won't\r\nbe flagged by the analyzer. I found some such interpolations with a\r\ngrep, but that's necessarily heuristic and there could be more.\r\nSo the analyzer won't give us quite as much help here as we'd like;\r\nbut it'll give quite a bit, and this is the most I see how to do.\r\n\r\nWithout the \"implements String\", a TopicName value can no longer be\r\nimplicitly converted to String or have String methods called on it.\r\nInstead the type-checker will require any code that has such a value\r\nto call one of the members we've declared on TopicName (or a member\r\nof Object) in order to do anything with it. That way the code will\r\nbe explicit about whether it needs the API name, or the display\r\nname, or the canonicalized form for making equality comparisons.\r\n\r\nAnd that in turn will enable us to make \"display name\" behave\r\ndifferently from \"API name\", for #1250 the \"general chat\" feature,\r\nwith a reliable way of tracking down which sites need which version.\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"35d83f2192b3b6ae41b89d9ed2367e738e9ff12c\"}", "resolved_issues": "[{\"number\": 1205, \"title\": \"android: Notification grouping should treat topics case-insensitively\", \"body\": \"We use Android's \\\"inbox style\\\" notifications (this was #128 / PR #718) to group notifications by conversation.\\r\\n\\r\\nFor channel messages, this means grouping messages by topic. Topics in Zulip are meant to be case-insensitive, so we should ignore case for that grouping. For example, messages with the topic \\\"move to Zulip\\\" or the topic \\\"move to zulip\\\" should all be grouped together.[^1]\\r\\n\\r\\nOther issues where we should be treating topics case-insensitively but we're not:\\r\\n\\r\\n- #980\\r\\n- #739\\r\\n\\r\\nSee our notification-display code for getting a message's \\\"conversation key\\\". It just takes the topic literally without normalizing it by case:\\r\\n\\r\\n```dart\\r\\n static String _conversationKey(MessageFcmMessage data, String groupKey) {\\r\\n final conversation = switch (data.recipient) {\\r\\n FcmMessageChannelRecipient(:var streamId, :var topic) => 'stream:$streamId:$topic',\\r\\n FcmMessageDmRecipient(:var allRecipientIds) => 'dm:${allRecipientIds.join(',')}',\\r\\n };\\r\\n return '$groupKey|$conversation';\\r\\n }\\r\\n```\\r\\n\\r\\n[^1]: As they are in the message list in the web app. By using \\\"Copy link to message\\\", you can see that [this](https://chat.zulip.org/#narrow/channel/7-test-here/topic/move.20to.20Zulip/near/2016957) and [this](https://chat.zulip.org/#narrow/channel/7-test-here/topic/move.20to.20zulip/near/2016958) message have those topics that only differ by case. But they both appear in the message list as though they both have topic \\\"move to Zulip\\\". \\\"image\\\"\"}]", "lang": "dart", "problem_statement": "android: Notification grouping should treat topics case-insensitively\nWe use Android's \"inbox style\" notifications (this was #128 / PR #718) to group notifications by conversation.\r\n\r\nFor channel messages, this means grouping messages by topic. Topics in Zulip are meant to be case-insensitive, so we should ignore case for that grouping. For example, messages with the topic \"move to Zulip\" or the topic \"move to zulip\" should all be grouped together.[^1]\r\n\r\nOther issues where we should be treating topics case-insensitively but we're not:\r\n\r\n- #980\r\n- #739\r\n\r\nSee our notification-display code for getting a message's \"conversation key\". It just takes the topic literally without normalizing it by case:\r\n\r\n```dart\r\n static String _conversationKey(MessageFcmMessage data, String groupKey) {\r\n final conversation = switch (data.recipient) {\r\n FcmMessageChannelRecipient(:var streamId, :var topic) => 'stream:$streamId:$topic',\r\n FcmMessageDmRecipient(:var allRecipientIds) => 'dm:${allRecipientIds.join(',')}',\r\n };\r\n return '$groupKey|$conversation';\r\n }\r\n```\r\n\r\n[^1]: As they are in the message list in the web app. By using \"Copy link to message\", you can see that [this](https://chat.zulip.org/#narrow/channel/7-test-here/topic/move.20to.20Zulip/near/2016957) and [this](https://chat.zulip.org/#narrow/channel/7-test-here/topic/move.20to.20zulip/near/2016958) message have those topics that only differ by case. But they both appear in the message list as though they both have topic \"move to Zulip\". \"image\"\n", "hints": "> See our notification-display code for getting a message's \"conversation key\". It just takes the topic literally without normalizing it by case:\r\n\r\n(I assume the server isn't normalizing it for us.)\nGenerally, the server always tries to preserve case when passing data around, since you often do want to display with the case the user entered, even when normalizing for comparisons. So doing `.lower()` needs to happen in clients where they are trying to group messages by topic, rather than display topics.", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1266", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1205\"]", "test_command": "flutter test test/api/model/events_test.dart test/api/model/initial_snapshot_test.dart test/api/model/model_test.dart test/api/notifications_test.dart test/api/route/channels_test.dart test/api/route/messages_test.dart test/api/route/typing_test.dart test/model/autocomplete_test.dart test/model/channel_test.dart test/model/internal_link_test.dart test/model/message_list_test.dart test/model/message_test.dart test/model/recent_senders_test.dart test/model/store_test.dart test/model/typing_status_test.dart test/model/unreads_test.dart test/notifications/display_test.dart test/widgets/action_sheet_test.dart test/widgets/autocomplete_test.dart test/widgets/compose_box_test.dart test/widgets/message_list_test.dart test/widgets/subscription_list_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/api/model/events.dart b/lib/api/model/events.dart\nindex 837aab120f..f543144ce1 100644\n--- a/lib/api/model/events.dart\n+++ b/lib/api/model/events.dart\n@@ -645,7 +645,7 @@ class UserTopicEvent extends Event {\n String get type => 'user_topic';\n \n final int streamId;\n- final String topicName;\n+ final TopicName topicName;\n final int lastUpdated;\n final UserTopicVisibilityPolicy visibilityPolicy;\n \n@@ -725,9 +725,9 @@ class UpdateMessageEvent extends Event {\n final PropagateMode? propagateMode;\n \n @JsonKey(name: 'orig_subject')\n- final String? origTopic;\n+ final TopicName? origTopic;\n @JsonKey(name: 'subject')\n- final String? newTopic;\n+ final TopicName? newTopic;\n \n // final List topicLinks; // TODO handle\n \n@@ -788,7 +788,7 @@ class DeleteMessageEvent extends Event {\n @MessageTypeConverter()\n final MessageType messageType;\n final int? streamId;\n- final String? topic;\n+ final TopicName? topic;\n \n DeleteMessageEvent({\n required super.id,\n@@ -924,7 +924,7 @@ class UpdateMessageFlagsMessageDetail {\n final bool? mentioned;\n final List? userIds;\n final int? streamId;\n- final String? topic;\n+ final TopicName? topic;\n \n UpdateMessageFlagsMessageDetail({\n required this.type,\n@@ -1002,7 +1002,7 @@ class TypingEvent extends Event {\n @JsonKey(name: 'recipients', fromJson: _recipientIdsFromJson)\n final List? recipientIds;\n final int? streamId;\n- final String? topic;\n+ final TopicName? topic;\n \n TypingEvent({\n required super.id,\ndiff --git a/lib/api/model/events.g.dart b/lib/api/model/events.g.dart\nindex 8f11b8b655..9229bf9757 100644\n--- a/lib/api/model/events.g.dart\n+++ b/lib/api/model/events.g.dart\n@@ -389,7 +389,7 @@ UserTopicEvent _$UserTopicEventFromJson(Map json) =>\n UserTopicEvent(\n id: (json['id'] as num).toInt(),\n streamId: (json['stream_id'] as num).toInt(),\n- topicName: json['topic_name'] as String,\n+ topicName: TopicName.fromJson(json['topic_name'] as String),\n lastUpdated: (json['last_updated'] as num).toInt(),\n visibilityPolicy: $enumDecode(\n _$UserTopicVisibilityPolicyEnumMap, json['visibility_policy']),\n@@ -430,8 +430,12 @@ UpdateMessageEvent _$UpdateMessageEventFromJson(Map json) =>\n newStreamId: (json['new_stream_id'] as num?)?.toInt(),\n propagateMode:\n $enumDecodeNullable(_$PropagateModeEnumMap, json['propagate_mode']),\n- origTopic: json['orig_subject'] as String?,\n- newTopic: json['subject'] as String?,\n+ origTopic: json['orig_subject'] == null\n+ ? null\n+ : TopicName.fromJson(json['orig_subject'] as String),\n+ newTopic: json['subject'] == null\n+ ? null\n+ : TopicName.fromJson(json['subject'] as String),\n origContent: json['orig_content'] as String?,\n origRenderedContent: json['orig_rendered_content'] as String?,\n content: json['content'] as String?,\n@@ -487,7 +491,9 @@ DeleteMessageEvent _$DeleteMessageEventFromJson(Map json) =>\n messageType:\n const MessageTypeConverter().fromJson(json['message_type'] as String),\n streamId: (json['stream_id'] as num?)?.toInt(),\n- topic: json['topic'] as String?,\n+ topic: json['topic'] == null\n+ ? null\n+ : TopicName.fromJson(json['topic'] as String),\n );\n \n Map _$DeleteMessageEventToJson(DeleteMessageEvent instance) =>\n@@ -561,7 +567,9 @@ UpdateMessageFlagsMessageDetail _$UpdateMessageFlagsMessageDetailFromJson(\n ?.map((e) => (e as num).toInt())\n .toList(),\n streamId: (json['stream_id'] as num?)?.toInt(),\n- topic: json['topic'] as String?,\n+ topic: json['topic'] == null\n+ ? null\n+ : TopicName.fromJson(json['topic'] as String),\n );\n \n Map _$UpdateMessageFlagsMessageDetailToJson(\n@@ -609,7 +617,9 @@ TypingEvent _$TypingEventFromJson(Map json) => TypingEvent(\n senderId: (TypingEvent._readSenderId(json, 'sender_id') as num).toInt(),\n recipientIds: TypingEvent._recipientIdsFromJson(json['recipients']),\n streamId: (json['stream_id'] as num?)?.toInt(),\n- topic: json['topic'] as String?,\n+ topic: json['topic'] == null\n+ ? null\n+ : TopicName.fromJson(json['topic'] as String),\n );\n \n Map _$TypingEventToJson(TypingEvent instance) =>\ndiff --git a/lib/api/model/initial_snapshot.dart b/lib/api/model/initial_snapshot.dart\nindex 6be0cadda9..efe7a79ebc 100644\n--- a/lib/api/model/initial_snapshot.dart\n+++ b/lib/api/model/initial_snapshot.dart\n@@ -231,7 +231,7 @@ class UserSettings {\n @JsonSerializable(fieldRename: FieldRename.snake)\n class UserTopicItem {\n final int streamId;\n- final String topicName;\n+ final TopicName topicName;\n final int lastUpdated;\n @JsonKey(unknownEnumValue: UserTopicVisibilityPolicy.unknown)\n final UserTopicVisibilityPolicy visibilityPolicy;\n@@ -310,7 +310,7 @@ class UnreadDmSnapshot {\n /// An item in [UnreadMessagesSnapshot.channels].\n @JsonSerializable(fieldRename: FieldRename.snake)\n class UnreadChannelSnapshot {\n- final String topic;\n+ final TopicName topic;\n final int streamId;\n final List unreadMessageIds;\n \ndiff --git a/lib/api/model/initial_snapshot.g.dart b/lib/api/model/initial_snapshot.g.dart\nindex 75472c1d7f..445bb8fdb6 100644\n--- a/lib/api/model/initial_snapshot.g.dart\n+++ b/lib/api/model/initial_snapshot.g.dart\n@@ -188,7 +188,7 @@ const _$EmojisetEnumMap = {\n UserTopicItem _$UserTopicItemFromJson(Map json) =>\n UserTopicItem(\n streamId: (json['stream_id'] as num).toInt(),\n- topicName: json['topic_name'] as String,\n+ topicName: TopicName.fromJson(json['topic_name'] as String),\n lastUpdated: (json['last_updated'] as num).toInt(),\n visibilityPolicy: $enumDecode(\n _$UserTopicVisibilityPolicyEnumMap, json['visibility_policy'],\n@@ -260,7 +260,7 @@ Map _$UnreadDmSnapshotToJson(UnreadDmSnapshot instance) =>\n UnreadChannelSnapshot _$UnreadChannelSnapshotFromJson(\n Map json) =>\n UnreadChannelSnapshot(\n- topic: json['topic'] as String,\n+ topic: TopicName.fromJson(json['topic'] as String),\n streamId: (json['stream_id'] as num).toInt(),\n unreadMessageIds: (json['unread_message_ids'] as List)\n .map((e) => (e as num).toInt())\ndiff --git a/lib/api/model/model.dart b/lib/api/model/model.dart\nindex b36e1f2490..e55dc1d1f0 100644\n--- a/lib/api/model/model.dart\n+++ b/lib/api/model/model.dart\n@@ -556,11 +556,11 @@ sealed class Message {\n final String senderFullName;\n final int senderId;\n final String senderRealmStr;\n- @JsonKey(name: 'subject')\n- String topic;\n+\n /// Poll data if \"submessages\" describe a poll, `null` otherwise.\n @JsonKey(name: 'submessages', readValue: _readPoll, fromJson: Poll.fromJson, toJson: Poll.toJson)\n Poll? poll;\n+\n final int timestamp;\n String get type;\n \n@@ -613,7 +613,6 @@ sealed class Message {\n required this.senderFullName,\n required this.senderId,\n required this.senderRealmStr,\n- required this.topic,\n required this.timestamp,\n required this.flags,\n required this.matchContent,\n@@ -656,6 +655,38 @@ enum MessageFlag {\n String toJson() => _$MessageFlagEnumMap[this]!;\n }\n \n+/// The name of a Zulip topic.\n+// TODO(dart): Can we forbid calling Object members on this extension type?\n+// (The lack of \"implements Object\" ought to do that, but doesn't.)\n+// In particular an interpolation \"foo > $topic\" is a bug we'd like to catch.\n+// TODO(dart): Can we forbid using this extension type as a key in a Map?\n+// (The lack of \"implements Object\" arguably should do that, but doesn't.)\n+// Using as a Map key is almost certainly a bug because it won't case-fold;\n+// see for example #739, #980, #1205.\n+extension type const TopicName(String _value) {\n+ /// The string this topic is identified by in the Zulip API.\n+ ///\n+ /// This should be used in constructing HTTP requests to the server,\n+ /// but rarely for other purposes. See [displayName] and [canonicalize].\n+ String get apiName => _value;\n+\n+ /// The string this topic is displayed as to the user in our UI.\n+ ///\n+ /// At the moment this always equals [apiName].\n+ /// In the future this will become null for the \"general chat\" topic (#1250),\n+ /// so that UI code can identify when it needs to represent the topic\n+ /// specially in the way prescribed for \"general chat\".\n+ // TODO(#1250) carry out that plan\n+ String get displayName => _value;\n+\n+ /// The key to use for \"same topic as\" comparisons.\n+ String canonicalize() => apiName.toLowerCase();\n+\n+ TopicName.fromJson(this._value);\n+\n+ String toJson() => apiName;\n+}\n+\n @JsonSerializable(fieldRename: FieldRename.snake)\n class StreamMessage extends Message {\n @override\n@@ -667,8 +698,16 @@ class StreamMessage extends Message {\n // invalidated.\n @JsonKey(required: true, disallowNullValue: true)\n String? displayRecipient;\n+\n int streamId;\n \n+ // The topic/subject is documented to be present on DMs too, just empty.\n+ // We ignore it on DMs; if a future server introduces distinct topics in DMs,\n+ // that will need new UI that we'll design then as part of that feature,\n+ // and ignoring the topics seems as good a fallback behavior as any.\n+ @JsonKey(name: 'subject')\n+ TopicName topic;\n+\n StreamMessage({\n required super.client,\n required super.content,\n@@ -683,13 +722,13 @@ class StreamMessage extends Message {\n required super.senderFullName,\n required super.senderId,\n required super.senderRealmStr,\n- required super.topic,\n required super.timestamp,\n required super.flags,\n required super.matchContent,\n required super.matchTopic,\n required this.displayRecipient,\n required this.streamId,\n+ required this.topic,\n });\n \n factory StreamMessage.fromJson(Map json) =>\n@@ -786,7 +825,6 @@ class DmMessage extends Message {\n required super.senderFullName,\n required super.senderId,\n required super.senderRealmStr,\n- required super.topic,\n required super.timestamp,\n required super.flags,\n required super.matchContent,\n@@ -817,14 +855,14 @@ enum MessageEditState {\n /// The Zulip \"resolved topics\" feature is implemented by renaming the topic;\n /// but for purposes of [Message.editState], we want to ignore such renames.\n /// This method identifies topic moves that should be ignored in that context.\n- static bool topicMoveWasResolveOrUnresolve(String topic, String prevTopic) {\n- if (topic.startsWith(_resolvedTopicPrefix)\n- && topic.substring(_resolvedTopicPrefix.length) == prevTopic) {\n+ static bool topicMoveWasResolveOrUnresolve(TopicName topic, TopicName prevTopic) {\n+ if (topic.apiName.startsWith(_resolvedTopicPrefix)\n+ && topic.apiName.substring(_resolvedTopicPrefix.length) == prevTopic.apiName) {\n return true;\n }\n \n- if (prevTopic.startsWith(_resolvedTopicPrefix)\n- && prevTopic.substring(_resolvedTopicPrefix.length) == topic) {\n+ if (prevTopic.apiName.startsWith(_resolvedTopicPrefix)\n+ && prevTopic.apiName.substring(_resolvedTopicPrefix.length) == topic.apiName) {\n return true;\n }\n \n@@ -857,8 +895,10 @@ enum MessageEditState {\n }\n \n // TODO(server-5) prev_subject was the old name of prev_topic on pre-5.0 servers\n- final prevTopic = (entry['prev_topic'] ?? entry['prev_subject']) as String?;\n- final topic = entry['topic'] as String?;\n+ final prevTopicStr = (entry['prev_topic'] ?? entry['prev_subject']) as String?;\n+ final prevTopic = prevTopicStr == null ? null : TopicName.fromJson(prevTopicStr);\n+ final topicStr = entry['topic'] as String?;\n+ final topic = topicStr == null ? null : TopicName.fromJson(topicStr);\n if (prevTopic != null) {\n // TODO(server-5) pre-5.0 servers do not have the 'topic' field\n if (topic == null) {\ndiff --git a/lib/api/model/model.g.dart b/lib/api/model/model.g.dart\nindex 2c5adbe15c..c8434a0fa8 100644\n--- a/lib/api/model/model.g.dart\n+++ b/lib/api/model/model.g.dart\n@@ -267,13 +267,13 @@ StreamMessage _$StreamMessageFromJson(Map json) {\n senderFullName: json['sender_full_name'] as String,\n senderId: (json['sender_id'] as num).toInt(),\n senderRealmStr: json['sender_realm_str'] as String,\n- topic: json['subject'] as String,\n timestamp: (json['timestamp'] as num).toInt(),\n flags: Message._flagsFromJson(json['flags']),\n matchContent: json['match_content'] as String?,\n matchTopic: json['match_subject'] as String?,\n displayRecipient: json['display_recipient'] as String?,\n streamId: (json['stream_id'] as num).toInt(),\n+ topic: TopicName.fromJson(json['subject'] as String),\n )..poll = Poll.fromJson(Message._readPoll(json, 'submessages'));\n }\n \n@@ -292,7 +292,6 @@ Map _$StreamMessageToJson(StreamMessage instance) =>\n 'sender_full_name': instance.senderFullName,\n 'sender_id': instance.senderId,\n 'sender_realm_str': instance.senderRealmStr,\n- 'subject': instance.topic,\n 'submessages': Poll.toJson(instance.poll),\n 'timestamp': instance.timestamp,\n 'flags': instance.flags,\n@@ -302,6 +301,7 @@ Map _$StreamMessageToJson(StreamMessage instance) =>\n if (instance.displayRecipient case final value?)\n 'display_recipient': value,\n 'stream_id': instance.streamId,\n+ 'subject': instance.topic,\n };\n \n const _$MessageEditStateEnumMap = {\n@@ -338,7 +338,6 @@ DmMessage _$DmMessageFromJson(Map json) => DmMessage(\n senderFullName: json['sender_full_name'] as String,\n senderId: (json['sender_id'] as num).toInt(),\n senderRealmStr: json['sender_realm_str'] as String,\n- topic: json['subject'] as String,\n timestamp: (json['timestamp'] as num).toInt(),\n flags: Message._flagsFromJson(json['flags']),\n matchContent: json['match_content'] as String?,\n@@ -361,7 +360,6 @@ Map _$DmMessageToJson(DmMessage instance) => {\n 'sender_full_name': instance.senderFullName,\n 'sender_id': instance.senderId,\n 'sender_realm_str': instance.senderRealmStr,\n- 'subject': instance.topic,\n 'submessages': Poll.toJson(instance.poll),\n 'timestamp': instance.timestamp,\n 'flags': instance.flags,\ndiff --git a/lib/api/model/narrow.dart b/lib/api/model/narrow.dart\nindex 3ec08a4fe4..8082ac64ff 100644\n--- a/lib/api/model/narrow.dart\n+++ b/lib/api/model/narrow.dart\n@@ -1,5 +1,7 @@\n import 'package:json_annotation/json_annotation.dart';\n \n+import 'model.dart';\n+\n part 'narrow.g.dart';\n \n typedef ApiNarrow = List;\n@@ -26,7 +28,37 @@ ApiNarrow resolveDmElements(ApiNarrow narrow, int zulipFeatureLevel) {\n /// please add more as needed.\n sealed class ApiNarrowElement {\n String get operator;\n- Object get operand;\n+\n+ /// The operand of this narrow filter.\n+ ///\n+ /// The base-class getter [ApiNarrowElement.operand] returns `dynamic`,\n+ /// and its value should only be used for encoding as JSON, for use in a\n+ /// request to the Zulip server.\n+ ///\n+ /// For any operations that depend more specifically on the operand's type,\n+ /// do not use run-time type checks on the value of [operand]; instead, make\n+ /// a run-time type check (e.g. with `switch`) on the [ApiNarrowElement]\n+ /// itself, and use the [operand] getter of the specific subtype.\n+ ///\n+ /// That makes a difference because [ApiNarrowTopic.operand] has type\n+ /// [TopicName]; at runtime a [TopicName] is indistinguishable from [String],\n+ /// but an [ApiNarrowTopic] can still be distinguished from other subclasses.\n+ //\n+ // We can't just write [Object] here; if we do, the compiler rejects the\n+ // override in ApiNarrowTopic because TopicName can't be assigned to Object.\n+ // The reason that could be bad is that a caller of [ApiNarrowElement.operand]\n+ // could take the result and call Object members on it, like toString, even\n+ // though TopicName doesn't declare those members.\n+ //\n+ // In this case that's fine because the only plausible thing to do with\n+ // a generic [ApiNarrowElement.operand] is to encode it as JSON anyway,\n+ // which behaves just fine on TopicName.\n+ //\n+ // ... Even if it weren't fine, in the case of Object this protection is\n+ // thoroughly undermined already: code that has a TopicName can call Object\n+ // members on it directly. See comments at [TopicName].\n+ dynamic get operand; // see justification for `dynamic` above\n+\n final bool negated;\n \n ApiNarrowElement({this.negated = false});\n@@ -54,12 +86,12 @@ class ApiNarrowStream extends ApiNarrowElement {\n class ApiNarrowTopic extends ApiNarrowElement {\n @override String get operator => 'topic';\n \n- @override final String operand;\n+ @override final TopicName operand;\n \n ApiNarrowTopic(this.operand, {super.negated});\n \n factory ApiNarrowTopic.fromJson(Map json) => ApiNarrowTopic(\n- json['operand'] as String,\n+ TopicName.fromJson(json['operand'] as String),\n negated: json['negated'] as bool? ?? false,\n );\n }\ndiff --git a/lib/api/notifications.dart b/lib/api/notifications.dart\nindex 2337c0456e..6d028aa267 100644\n--- a/lib/api/notifications.dart\n+++ b/lib/api/notifications.dart\n@@ -1,6 +1,8 @@\n \n import 'package:json_annotation/json_annotation.dart';\n \n+import 'model/model.dart';\n+\n part 'notifications.g.dart';\n \n /// Parsed version of an FCM message, of any type.\n@@ -187,7 +189,7 @@ class FcmMessageChannelRecipient extends FcmMessageRecipient {\n @JsonKey(name: 'stream')\n final String? streamName;\n \n- final String topic;\n+ final TopicName topic;\n \n FcmMessageChannelRecipient({required this.streamId, required this.streamName, required this.topic});\n \ndiff --git a/lib/api/notifications.g.dart b/lib/api/notifications.g.dart\nindex 4a9752a9af..b56412f1fd 100644\n--- a/lib/api/notifications.g.dart\n+++ b/lib/api/notifications.g.dart\n@@ -47,7 +47,7 @@ FcmMessageChannelRecipient _$FcmMessageChannelRecipientFromJson(\n FcmMessageChannelRecipient(\n streamId: const _IntConverter().fromJson(json['stream_id'] as String),\n streamName: json['stream'] as String?,\n- topic: json['topic'] as String,\n+ topic: TopicName.fromJson(json['topic'] as String),\n );\n \n RemoveFcmMessage _$RemoveFcmMessageFromJson(Map json) =>\ndiff --git a/lib/api/route/channels.dart b/lib/api/route/channels.dart\nindex 00832f7fd0..bfa46f5ab8 100644\n--- a/lib/api/route/channels.dart\n+++ b/lib/api/route/channels.dart\n@@ -28,7 +28,7 @@ class GetStreamTopicsResult {\n @JsonSerializable(fieldRename: FieldRename.snake)\n class GetStreamTopicsEntry {\n final int maxId;\n- final String name;\n+ final TopicName name;\n \n GetStreamTopicsEntry({\n required this.maxId,\n@@ -46,7 +46,7 @@ class GetStreamTopicsEntry {\n // TODO(server-7): remove this and just use updateUserTopic\n Future updateUserTopicCompat(ApiConnection connection, {\n required int streamId,\n- required String topic,\n+ required TopicName topic,\n required UserTopicVisibilityPolicy visibilityPolicy,\n }) {\n final useLegacyApi = connection.zulipFeatureLevel! < 170;\n@@ -59,7 +59,7 @@ Future updateUserTopicCompat(ApiConnection connection, {\n // https://zulip.com/api/mute-topic\n return connection.patch('muteTopic', (_) {}, 'users/me/subscriptions/muted_topics', {\n 'stream_id': streamId,\n- 'topic': RawParameter(topic),\n+ 'topic': RawParameter(topic.apiName),\n 'op': RawParameter(op),\n });\n } else {\n@@ -76,14 +76,14 @@ Future updateUserTopicCompat(ApiConnection connection, {\n // TODO(server-7) remove FL 170+ mention in doc, and the related `assert`\n Future updateUserTopic(ApiConnection connection, {\n required int streamId,\n- required String topic,\n+ required TopicName topic,\n required UserTopicVisibilityPolicy visibilityPolicy,\n }) {\n assert(visibilityPolicy != UserTopicVisibilityPolicy.unknown);\n assert(connection.zulipFeatureLevel! >= 170);\n return connection.post('updateUserTopic', (_) {}, 'user_topics', {\n 'stream_id': streamId,\n- 'topic': RawParameter(topic),\n+ 'topic': RawParameter(topic.apiName),\n 'visibility_policy': visibilityPolicy,\n });\n }\ndiff --git a/lib/api/route/channels.g.dart b/lib/api/route/channels.g.dart\nindex 561b43f005..4a5f7009c3 100644\n--- a/lib/api/route/channels.g.dart\n+++ b/lib/api/route/channels.g.dart\n@@ -26,7 +26,7 @@ GetStreamTopicsEntry _$GetStreamTopicsEntryFromJson(\n Map json) =>\n GetStreamTopicsEntry(\n maxId: (json['max_id'] as num).toInt(),\n- name: json['name'] as String,\n+ name: TopicName.fromJson(json['name'] as String),\n );\n \n Map _$GetStreamTopicsEntryToJson(\ndiff --git a/lib/api/route/messages.dart b/lib/api/route/messages.dart\nindex 26fd80f3ac..ea7421733e 100644\n--- a/lib/api/route/messages.dart\n+++ b/lib/api/route/messages.dart\n@@ -186,7 +186,7 @@ Future sendMessage(\n StreamDestination() => {\n 'type': RawParameter('stream'),\n 'to': destination.streamId,\n- 'topic': RawParameter(destination.topic),\n+ 'topic': RawParameter(destination.topic.apiName),\n },\n DmDestination() => {\n 'type': supportsTypeDirect ? RawParameter('direct') : RawParameter('private'),\n@@ -231,7 +231,7 @@ class StreamDestination extends MessageDestination {\n const StreamDestination(this.streamId, this.topic);\n \n final int streamId;\n- final String topic;\n+ final TopicName topic;\n }\n \n /// A DM conversation, for specifying to [sendMessage].\n@@ -449,10 +449,10 @@ Future markStreamAsRead(ApiConnection connection, {\n // TODO(server-6): Remove as deprecated by updateMessageFlagsForNarrow\n Future markTopicAsRead(ApiConnection connection, {\n required int streamId,\n- required String topicName,\n+ required TopicName topicName,\n }) {\n return connection.post('markTopicAsRead', (_) {}, 'mark_topic_as_read', {\n 'stream_id': streamId,\n- 'topic_name': RawParameter(topicName),\n+ 'topic_name': RawParameter(topicName.apiName),\n });\n }\ndiff --git a/lib/api/route/typing.dart b/lib/api/route/typing.dart\nindex b9f8503172..8e2e5dae6b 100644\n--- a/lib/api/route/typing.dart\n+++ b/lib/api/route/typing.dart\n@@ -17,7 +17,7 @@ Future setTypingStatus(ApiConnection connection, {\n 'type': RawParameter(supportsTypeChannel ? 'channel' : 'stream'),\n if (supportsStreamId) 'stream_id': destination.streamId\n else 'to': [destination.streamId],\n- 'topic': RawParameter(destination.topic),\n+ 'topic': RawParameter(destination.topic.apiName),\n });\n case DmDestination():\n final supportsDirect = connection.zulipFeatureLevel! >= 174; // TODO(server-7)\ndiff --git a/lib/model/autocomplete.dart b/lib/model/autocomplete.dart\nindex 5b66a6d52a..cd651bdc65 100644\n--- a/lib/model/autocomplete.dart\n+++ b/lib/model/autocomplete.dart\n@@ -485,7 +485,7 @@ class MentionAutocompleteView extends AutocompleteView _topics = [];\n+ Iterable _topics = [];\n bool _isFetching = false;\n \n /// Fetches topics of the current stream narrow, expected to fetch\n@@ -843,7 +843,7 @@ class TopicAutocompleteView extends AutocompleteView> get debugTopicVisibility;\n+ Map> get debugTopicVisibility;\n \n /// Whether this topic should appear when already focusing on its stream.\n ///\n@@ -63,7 +63,7 @@ mixin ChannelStore {\n ///\n /// For UI contexts that are not specific to a particular stream, see\n /// [isTopicVisible].\n- bool isTopicVisibleInStream(int streamId, String topic) {\n+ bool isTopicVisibleInStream(int streamId, TopicName topic) {\n return _isTopicVisibleInStream(topicVisibilityPolicy(streamId, topic));\n }\n \n@@ -100,7 +100,7 @@ mixin ChannelStore {\n ///\n /// For UI contexts that are specific to a particular stream, see\n /// [isTopicVisibleInStream].\n- bool isTopicVisible(int streamId, String topic) {\n+ bool isTopicVisible(int streamId, TopicName topic) {\n return _isTopicVisible(streamId, topicVisibilityPolicy(streamId, topic));\n }\n \n@@ -171,7 +171,7 @@ class ChannelStoreImpl with ChannelStore {\n streams.putIfAbsent(stream.streamId, () => stream);\n }\n \n- final topicVisibility = >{};\n+ final topicVisibility = >{};\n for (final item in initialSnapshot.userTopics ?? const []) {\n if (_warnInvalidVisibilityPolicy(item.visibilityPolicy)) {\n // Not a value we expect. Keep it out of our data structures. // TODO(log)\n@@ -204,12 +204,12 @@ class ChannelStoreImpl with ChannelStore {\n final Map subscriptions;\n \n @override\n- Map> get debugTopicVisibility => topicVisibility;\n+ Map> get debugTopicVisibility => topicVisibility;\n \n- final Map> topicVisibility;\n+ final Map> topicVisibility;\n \n @override\n- UserTopicVisibilityPolicy topicVisibilityPolicy(int streamId, String topic) {\n+ UserTopicVisibilityPolicy topicVisibilityPolicy(int streamId, TopicName topic) {\n return topicVisibility[streamId]?[topic] ?? UserTopicVisibilityPolicy.none;\n }\n \ndiff --git a/lib/model/internal_link.dart b/lib/model/internal_link.dart\nindex a5dd23c2a2..db11115cf3 100644\n--- a/lib/model/internal_link.dart\n+++ b/lib/model/internal_link.dart\n@@ -1,6 +1,7 @@\n import 'package:flutter/foundation.dart';\n import 'package:json_annotation/json_annotation.dart';\n \n+import '../api/model/model.dart';\n import '../api/model/narrow.dart';\n import 'narrow.dart';\n import 'store.dart';\n@@ -76,7 +77,7 @@ Uri narrowLink(PerAccountStore store, Narrow narrow, {int? nearMessageId}) {\n final slugifiedName = _encodeHashComponent(name.replaceAll(' ', '-'));\n fragment.write('$streamId-$slugifiedName');\n case ApiNarrowTopic():\n- fragment.write(_encodeHashComponent(element.operand));\n+ fragment.write(_encodeHashComponent(element.operand.apiName));\n case ApiNarrowDmModern():\n final suffix = element.operand.length >= 3 ? 'group' : 'dm';\n fragment.write('${element.operand.join(',')}-$suffix');\n@@ -178,7 +179,7 @@ Narrow? _interpretNarrowSegments(List segments, PerAccountStore store) {\n if (topicElement != null) return null;\n final String? topic = decodeHashComponent(operand);\n if (topic == null) return null;\n- topicElement = ApiNarrowTopic(topic, negated: negated);\n+ topicElement = ApiNarrowTopic(TopicName(topic), negated: negated);\n \n case _NarrowOperator.dm:\n case _NarrowOperator.pmWith:\ndiff --git a/lib/model/message_list.dart b/lib/model/message_list.dart\nindex ecfb16c2b9..670785ac4e 100644\n--- a/lib/model/message_list.dart\n+++ b/lib/model/message_list.dart\n@@ -352,7 +352,7 @@ mixin _MessageSequence {\n bool haveSameRecipient(Message prevMessage, Message message) {\n if (prevMessage is StreamMessage && message is StreamMessage) {\n if (prevMessage.streamId != message.streamId) return false;\n- if (prevMessage.topic.toLowerCase() != message.topic.toLowerCase()) return false;\n+ if (prevMessage.topic.canonicalize() != message.topic.canonicalize()) return false;\n } else if (prevMessage is DmMessage && message is DmMessage) {\n if (!_equalIdSequences(prevMessage.allRecipientIds, message.allRecipientIds)) {\n return false;\n@@ -686,8 +686,8 @@ class MessageListView with ChangeNotifier, _MessageSequence {\n void messagesMoved({\n required int origStreamId,\n required int newStreamId,\n- required String origTopic,\n- required String newTopic,\n+ required TopicName origTopic,\n+ required TopicName newTopic,\n required List messageIds,\n required PropagateMode propagateMode,\n }) {\ndiff --git a/lib/model/narrow.dart b/lib/model/narrow.dart\nindex 1553750849..9e29808ceb 100644\n--- a/lib/model/narrow.dart\n+++ b/lib/model/narrow.dart\n@@ -99,7 +99,7 @@ class TopicNarrow extends Narrow implements SendableNarrow {\n }\n \n final int streamId;\n- final String topic;\n+ final TopicName topic;\n \n @override\n bool containsMessage(Message message) {\n@@ -114,7 +114,7 @@ class TopicNarrow extends Narrow implements SendableNarrow {\n StreamDestination get destination => StreamDestination(streamId, topic);\n \n @override\n- String toString() => 'TopicNarrow($streamId, $topic)';\n+ String toString() => 'TopicNarrow($streamId, ${topic.displayName})';\n \n @override\n bool operator ==(Object other) {\ndiff --git a/lib/model/recent_senders.dart b/lib/model/recent_senders.dart\nindex d075d05eee..a5c4bca778 100644\n--- a/lib/model/recent_senders.dart\n+++ b/lib/model/recent_senders.dart\n@@ -16,7 +16,7 @@ class RecentSenders {\n \n // topicSenders[streamId][topic][senderId] = MessageIdTracker\n @visibleForTesting\n- final Map>> topicSenders = {};\n+ final Map>> topicSenders = {};\n \n /// The latest message the given user sent to the given stream,\n /// or null if no such message is known.\n@@ -29,7 +29,7 @@ class RecentSenders {\n /// or null if no such message is known.\n int? latestMessageIdOfSenderInTopic({\n required int streamId,\n- required String topic,\n+ required TopicName topic,\n required int senderId,\n }) => topicSenders[streamId]?[topic]?[senderId]?.maxId;\n \n@@ -38,7 +38,7 @@ class RecentSenders {\n /// The messages must be sorted by [Message.id] ascending.\n void handleMessages(List messages) {\n final messagesByUserInStream = <(int, int), QueueList>{};\n- final messagesByUserInTopic = <(int, String, int), QueueList>{};\n+ final messagesByUserInTopic = <(int, TopicName, int), QueueList>{};\n for (final message in messages) {\n if (message is! StreamMessage) continue;\n final StreamMessage(:streamId, :topic, :senderId, id: int messageId) = message;\ndiff --git a/lib/model/store.dart b/lib/model/store.dart\nindex 58a8a70615..56aef85172 100644\n--- a/lib/model/store.dart\n+++ b/lib/model/store.dart\n@@ -466,10 +466,10 @@ class PerAccountStore extends ChangeNotifier with EmojiStore, ChannelStore, Mess\n @override\n Map get subscriptions => _channels.subscriptions;\n @override\n- UserTopicVisibilityPolicy topicVisibilityPolicy(int streamId, String topic) =>\n+ UserTopicVisibilityPolicy topicVisibilityPolicy(int streamId, TopicName topic) =>\n _channels.topicVisibilityPolicy(streamId, topic);\n @override\n- Map> get debugTopicVisibility =>\n+ Map> get debugTopicVisibility =>\n _channels.debugTopicVisibility;\n \n final ChannelStoreImpl _channels;\ndiff --git a/lib/model/unreads.dart b/lib/model/unreads.dart\nindex 4f1ddc603c..1fcea3f83c 100644\n--- a/lib/model/unreads.dart\n+++ b/lib/model/unreads.dart\n@@ -40,7 +40,7 @@ class Unreads extends ChangeNotifier {\n required int selfUserId,\n required ChannelStore channelStore,\n }) {\n- final streams = >>{};\n+ final streams = >>{};\n final dms = >{};\n final mentions = Set.of(initial.mentions);\n \n@@ -86,7 +86,7 @@ class Unreads extends ChangeNotifier {\n // int count;\n \n /// Unread stream messages, as: stream ID \u2192 topic \u2192 message IDs (sorted).\n- final Map>> streams;\n+ final Map>> streams;\n \n /// Unread DM messages, as: DM narrow \u2192 message IDs (sorted).\n final Map> dms;\n@@ -185,7 +185,7 @@ class Unreads extends ChangeNotifier {\n return c;\n }\n \n- int countInTopicNarrow(int streamId, String topic) {\n+ int countInTopicNarrow(int streamId, TopicName topic) {\n final topics = streams[streamId];\n return topics?[topic]?.length ?? 0;\n }\n@@ -365,7 +365,7 @@ class Unreads extends ChangeNotifier {\n _slowRemoveAllInDms(messageIdsSet);\n }\n case UpdateMessageFlagsRemoveEvent():\n- final newlyUnreadInStreams = >>{};\n+ final newlyUnreadInStreams = >>{};\n final newlyUnreadInDms = >{};\n for (final messageId in event.messages) {\n final detail = event.messageDetails![messageId];\n@@ -449,12 +449,12 @@ class Unreads extends ChangeNotifier {\n );\n }\n \n- void _addLastInStreamTopic(int messageId, int streamId, String topic) {\n+ void _addLastInStreamTopic(int messageId, int streamId, TopicName topic) {\n ((streams[streamId] ??= {})[topic] ??= QueueList()).addLast(messageId);\n }\n \n // [messageIds] must be sorted ascending and without duplicates.\n- void _addAllInStreamTopic(QueueList messageIds, int streamId, String topic) {\n+ void _addAllInStreamTopic(QueueList messageIds, int streamId, TopicName topic) {\n final topics = streams[streamId] ??= {};\n topics.update(topic,\n ifAbsent: () => messageIds,\n@@ -469,7 +469,7 @@ class Unreads extends ChangeNotifier {\n void _slowRemoveAllInStreams(Set idsToRemove) {\n final newlyEmptyStreams = [];\n for (final MapEntry(key: streamId, value: topics) in streams.entries) {\n- final newlyEmptyTopics = [];\n+ final newlyEmptyTopics = [];\n for (final MapEntry(key: topic, value: messageIds) in topics.entries) {\n messageIds.removeWhere((id) => idsToRemove.contains(id));\n if (messageIds.isEmpty) {\n@@ -488,7 +488,7 @@ class Unreads extends ChangeNotifier {\n }\n }\n \n- void _removeAllInStreamTopic(Set incomingMessageIds, int streamId, String topic) {\n+ void _removeAllInStreamTopic(Set incomingMessageIds, int streamId, TopicName topic) {\n final topics = streams[streamId];\n if (topics == null) return;\n final messageIds = topics[topic];\ndiff --git a/lib/notifications/display.dart b/lib/notifications/display.dart\nindex 46ea95486a..30d30e9021 100644\n--- a/lib/notifications/display.dart\n+++ b/lib/notifications/display.dart\n@@ -6,6 +6,7 @@ import 'package:collection/collection.dart';\n import 'package:flutter/foundation.dart';\n import 'package:flutter/widgets.dart' hide Notification;\n \n+import '../api/model/model.dart';\n import '../api/notifications.dart';\n import '../generated/l10n/zulip_localizations.dart';\n import '../host/android_notifications.dart';\n@@ -263,9 +264,9 @@ class NotificationDisplayManager {\n // the first.\n messagingStyle.conversationTitle = switch (data.recipient) {\n FcmMessageChannelRecipient(:var streamName?, :var topic) =>\n- '#$streamName > $topic',\n+ '#$streamName > ${topic.displayName}',\n FcmMessageChannelRecipient(:var topic) =>\n- '#(unknown channel) > $topic', // TODO get stream name from data\n+ '#(unknown channel) > ${topic.displayName}', // TODO get stream name from data\n FcmMessageDmRecipient(:var allRecipientIds) when allRecipientIds.length > 2 =>\n zulipLocalizations.notifGroupDmConversationLabel(\n data.senderFullName, allRecipientIds.length - 2), // TODO use others' names, from data\n@@ -442,7 +443,7 @@ class NotificationDisplayManager {\n \n static String _conversationKey(MessageFcmMessage data, String groupKey) {\n final conversation = switch (data.recipient) {\n- FcmMessageChannelRecipient(:var streamId, :var topic) => 'stream:$streamId:$topic',\n+ FcmMessageChannelRecipient(:var streamId, :var topic) => 'stream:$streamId:${topic.canonicalize()}',\n FcmMessageDmRecipient(:var allRecipientIds) => 'dm:${allRecipientIds.join(',')}',\n };\n return '$groupKey|$conversation';\n@@ -538,8 +539,8 @@ class NotificationOpenPayload {\n case 'topic':\n final channelIdStr = url.queryParameters['channel_id']!;\n final channelId = int.parse(channelIdStr, radix: 10);\n- final topic = url.queryParameters['topic']!;\n- narrow = TopicNarrow(channelId, topic);\n+ final topicStr = url.queryParameters['topic']!;\n+ narrow = TopicNarrow(channelId, TopicName(topicStr));\n case 'dm':\n final allRecipientIdsStr = url.queryParameters['all_recipient_ids']!;\n final allRecipientIds = allRecipientIdsStr.split(',')\n@@ -572,7 +573,7 @@ class NotificationOpenPayload {\n TopicNarrow(streamId: var channelId, :var topic) => {\n 'narrow_type': 'topic',\n 'channel_id': channelId.toString(),\n- 'topic': topic,\n+ 'topic': topic.apiName,\n },\n DmNarrow(:var allRecipientIds) => {\n 'narrow_type': 'dm',\ndiff --git a/lib/widgets/action_sheet.dart b/lib/widgets/action_sheet.dart\nindex fca61d4810..b89e9fbdb3 100644\n--- a/lib/widgets/action_sheet.dart\n+++ b/lib/widgets/action_sheet.dart\n@@ -151,7 +151,7 @@ class ActionSheetCancelButton extends StatelessWidget {\n /// Show a sheet of actions you can take on a topic.\n void showTopicActionSheet(BuildContext context, {\n required int channelId,\n- required String topic,\n+ required TopicName topic,\n }) {\n final store = PerAccountStoreWidget.of(context);\n final subscription = store.subscriptions[channelId];\n@@ -633,6 +633,7 @@ class QuoteAndReplyButton extends MessageActionSheetMenuItemButton {\n \n @override void onPressed() async {\n final zulipLocalizations = ZulipLocalizations.of(pageContext);\n+ final message = this.message;\n \n var composeBoxController = findMessageListPage().composeBoxController;\n // The compose box doesn't null out its controller; it's either always null\n@@ -644,7 +645,7 @@ class QuoteAndReplyButton extends MessageActionSheetMenuItemButton {\n && composeBoxController.topic.textNormalized == kNoTopicTopic\n && message is StreamMessage\n ) {\n- composeBoxController.topic.value = TextEditingValue(text: message.topic);\n+ composeBoxController.topic.setTopic(message.topic);\n }\n \n // This inserts a \"[Quoting\u2026]\" placeholder into the content input,\ndiff --git a/lib/widgets/autocomplete.dart b/lib/widgets/autocomplete.dart\nindex a1e5289b01..ba921e7f08 100644\n--- a/lib/widgets/autocomplete.dart\n+++ b/lib/widgets/autocomplete.dart\n@@ -321,13 +321,8 @@ class TopicAutocomplete extends AutocompleteField {\n TopicValidationError.tooLong,\n ];\n }\n+\n+ void setTopic(TopicName newTopic) {\n+ value = TextEditingValue(text: newTopic.displayName);\n+ }\n }\n \n enum ContentValidationError {\n@@ -486,7 +490,7 @@ class _StreamContentInputState extends State<_StreamContentInput> {\n ?? zulipLocalizations.composeBoxUnknownChannelName;\n return _ContentInput(\n narrow: widget.narrow,\n- destination: TopicNarrow(widget.narrow.streamId, _topicTextNormalized),\n+ destination: TopicNarrow(widget.narrow.streamId, TopicName(_topicTextNormalized)),\n controller: widget.controller,\n hintText: zulipLocalizations.composeBoxChannelContentHint(streamName, _topicTextNormalized));\n }\n@@ -546,7 +550,8 @@ class _FixedDestinationContentInput extends StatelessWidget {\n final store = PerAccountStoreWidget.of(context);\n final streamName = store.streams[streamId]?.name\n ?? zulipLocalizations.composeBoxUnknownChannelName;\n- return zulipLocalizations.composeBoxChannelContentHint(streamName, topic);\n+ return zulipLocalizations.composeBoxChannelContentHint(\n+ streamName, topic.displayName);\n \n case DmNarrow(otherRecipientIds: []): // The self-1:1 thread.\n return zulipLocalizations.composeBoxSelfDmContentHint;\n@@ -1151,7 +1156,7 @@ class _StreamComposeBoxBody extends _ComposeBoxBody {\n @override Widget buildSendButton() => _SendButton(\n controller: controller,\n getDestination: () => StreamDestination(\n- narrow.streamId, controller.topic.textNormalized),\n+ narrow.streamId, TopicName(controller.topic.textNormalized)),\n );\n }\n \ndiff --git a/lib/widgets/inbox.dart b/lib/widgets/inbox.dart\nindex 12ec8751a1..04d5246195 100644\n--- a/lib/widgets/inbox.dart\n+++ b/lib/widgets/inbox.dart\n@@ -132,7 +132,7 @@ class _InboxPageState extends State with PerAccountStoreAwareStat\n });\n \n for (final MapEntry(key: streamId, value: topics) in sortedUnreadStreams) {\n- final topicItems = <(String, int, bool, int)>[];\n+ final topicItems = <(TopicName, int, bool, int)>[];\n int countInStream = 0;\n bool streamHasMention = false;\n for (final MapEntry(key: topic, value: messageIds) in topics.entries) {\n@@ -192,7 +192,7 @@ class _StreamSectionData extends _InboxSectionData {\n final int streamId;\n final int count;\n final bool hasMention;\n- final List<(String, int, bool, int)> items;\n+ final List<(TopicName, int, bool, int)> items;\n \n const _StreamSectionData(this.streamId, this.count, this.hasMention, this.items);\n }\n@@ -487,7 +487,7 @@ class _TopicItem extends StatelessWidget {\n });\n \n final int streamId;\n- final String topic;\n+ final TopicName topic;\n final int count;\n final bool hasMention;\n \n@@ -524,7 +524,7 @@ class _TopicItem extends StatelessWidget {\n ),\n maxLines: 2,\n overflow: TextOverflow.ellipsis,\n- topic))),\n+ topic.displayName))),\n const SizedBox(width: 12),\n if (hasMention) const _IconMarker(icon: ZulipIcons.at_sign),\n // TODO(design) copies the \"@\" marker color; is there a better color?\ndiff --git a/lib/widgets/message_list.dart b/lib/widgets/message_list.dart\nindex 8c32a12115..f5416e3ccf 100644\n--- a/lib/widgets/message_list.dart\n+++ b/lib/widgets/message_list.dart\n@@ -334,7 +334,7 @@ class MessageListAppBarTitle extends StatelessWidget {\n \n Widget _buildTopicRow(BuildContext context, {\n required ZulipStream? stream,\n- required String topic,\n+ required TopicName topic,\n }) {\n final store = PerAccountStoreWidget.of(context);\n final designVariables = DesignVariables.of(context);\n@@ -344,7 +344,7 @@ class MessageListAppBarTitle extends StatelessWidget {\n return Row(\n mainAxisSize: MainAxisSize.min,\n children: [\n- Flexible(child: Text(topic, style: const TextStyle(\n+ Flexible(child: Text(topic.displayName, style: const TextStyle(\n fontSize: 13,\n ).merge(weightVariableTextStyle(context)))),\n if (icon != null)\n@@ -1091,7 +1091,7 @@ class StreamMessageRecipientHeader extends StatelessWidget {\n child: Row(\n children: [\n Flexible(\n- child: Text(topic,\n+ child: Text(topic.displayName,\n // TODO: Give a way to see the whole topic (maybe a\n // long-press interaction?)\n overflow: TextOverflow.ellipsis,\n", "test_patch": "diff --git a/test/api/model/events_checks.dart b/test/api/model/events_checks.dart\nindex f95c6b4362..c1fa0a117f 100644\n--- a/test/api/model/events_checks.dart\n+++ b/test/api/model/events_checks.dart\n@@ -51,8 +51,8 @@ extension UpdateMessageEventChecks on Subject {\n Subject get origStreamId => has((e) => e.origStreamId, 'origStreamId');\n Subject get newStreamId => has((e) => e.newStreamId, 'newStreamId');\n Subject get propagateMode => has((e) => e.propagateMode, 'propagateMode');\n- Subject get origTopic => has((e) => e.origTopic, 'origTopic');\n- Subject get newTopic => has((e) => e.newTopic, 'newTopic');\n+ Subject get origTopic => has((e) => e.origTopic, 'origTopic');\n+ Subject get newTopic => has((e) => e.newTopic, 'newTopic');\n Subject get origContent => has((e) => e.origContent, 'origContent');\n Subject get origRenderedContent => has((e) => e.origRenderedContent, 'origRenderedContent');\n Subject get content => has((e) => e.content, 'content');\n@@ -77,7 +77,7 @@ extension TypingEventChecks on Subject {\n Subject get senderId => has((e) => e.senderId, 'senderId');\n Subject?> get recipientIds => has((e) => e.recipientIds, 'recipientIds');\n Subject get streamId => has((e) => e.streamId, 'streamId');\n- Subject get topic => has((e) => e.topic, 'topic');\n+ Subject get topic => has((e) => e.topic, 'topic');\n }\n \n extension HeartbeatEventChecks on Subject {\ndiff --git a/test/api/model/events_test.dart b/test/api/model/events_test.dart\nindex 0f1f52f843..51b36350cc 100644\n--- a/test/api/model/events_test.dart\n+++ b/test/api/model/events_test.dart\n@@ -116,8 +116,8 @@ void main() {\n 'orig_subject': 'foo',\n 'subject': 'bar',\n }) as UpdateMessageEvent)\n- ..origTopic.equals('foo')\n- ..newTopic.equals('bar');\n+ ..origTopic.equals(const TopicName('foo'))\n+ ..newTopic.equals(const TopicName('bar'));\n });\n });\n \ndiff --git a/test/api/model/initial_snapshot_test.dart b/test/api/model/initial_snapshot_test.dart\nindex 7b441de779..3228602fff 100644\n--- a/test/api/model/initial_snapshot_test.dart\n+++ b/test/api/model/initial_snapshot_test.dart\n@@ -1,6 +1,7 @@\n import 'package:checks/checks.dart';\n import 'package:test/scaffolding.dart';\n import 'package:zulip/api/model/initial_snapshot.dart';\n+import 'package:zulip/api/model/model.dart';\n \n import '../../stdlib_checks.dart';\n \n@@ -20,7 +21,7 @@ void main() {\n \n check(snapshot.channels).single.jsonEquals(\n UnreadChannelSnapshot(\n- topic: 'topic name', streamId: 1,\n+ topic: const TopicName('topic name'), streamId: 1,\n unreadMessageIds: [1, 2]));\n });\n \ndiff --git a/test/api/model/model_checks.dart b/test/api/model/model_checks.dart\nindex 6a3eee8c8c..8b39b1ad57 100644\n--- a/test/api/model/model_checks.dart\n+++ b/test/api/model/model_checks.dart\n@@ -38,7 +38,6 @@ extension MessageChecks on Subject {\n Subject get senderFullName => has((e) => e.senderFullName, 'senderFullName');\n Subject get senderId => has((e) => e.senderId, 'senderId');\n Subject get senderRealmStr => has((e) => e.senderRealmStr, 'senderRealmStr');\n- Subject get topic => has((e) => e.topic, 'topic');\n Subject get poll => has((e) => e.poll, 'poll');\n Subject get timestamp => has((e) => e.timestamp, 'timestamp');\n Subject get type => has((e) => e.type, 'type');\n@@ -47,8 +46,14 @@ extension MessageChecks on Subject {\n Subject get matchTopic => has((e) => e.matchTopic, 'matchTopic');\n }\n \n+extension TopicNameChecks on Subject {\n+ Subject get apiName => has((x) => x.apiName, 'apiName');\n+ Subject get displayName => has((x) => x.displayName, 'displayName');\n+}\n+\n extension StreamMessageChecks on Subject {\n Subject get displayRecipient => has((e) => e.displayRecipient, 'displayRecipient');\n+ Subject get topic => has((e) => e.topic, 'topic');\n }\n \n extension ReactionsChecks on Subject {\ndiff --git a/test/api/model/model_test.dart b/test/api/model/model_test.dart\nindex b3636b5ed6..5013b9c6c1 100644\n--- a/test/api/model/model_test.dart\n+++ b/test/api/model/model_test.dart\n@@ -89,7 +89,8 @@ void main() {\n check(baseStreamJson()).not((it) => it.containsKey('topic'));\n check(Message.fromJson(baseStreamJson()\n ..['subject'] = 'hello'\n- )).topic.equals('hello');\n+ )).isA()\n+ .topic.equals(const TopicName('hello'));\n });\n \n test('match_subject -> matchTopic', () {\ndiff --git a/test/api/notifications_test.dart b/test/api/notifications_test.dart\nindex fd4465f33a..53240d7b09 100644\n--- a/test/api/notifications_test.dart\n+++ b/test/api/notifications_test.dart\n@@ -1,5 +1,6 @@\n import 'package:checks/checks.dart';\n import 'package:test/scaffolding.dart';\n+import 'package:zulip/api/model/model.dart';\n import 'package:zulip/api/notifications.dart';\n \n import '../stdlib_checks.dart';\n@@ -81,7 +82,7 @@ void main() {\n ..recipient.isA().which((it) => it\n ..streamId.equals(42)\n ..streamName.equals(streamJson['stream']!)\n- ..topic.equals(streamJson['topic']!))\n+ ..topic.jsonEquals(streamJson['topic']!))\n ..content.equals(streamJson['content']!)\n ..time.equals(1546300800);\n \n@@ -279,7 +280,7 @@ extension MessageFcmMessageChecks on Subject {\n extension FcmMessageChannelRecipientChecks on Subject {\n Subject get streamId => has((x) => x.streamId, 'streamId');\n Subject get streamName => has((x) => x.streamName, 'streamName');\n- Subject get topic => has((x) => x.topic, 'topic');\n+ Subject get topic => has((x) => x.topic, 'topic');\n }\n \n extension FcmMessageDmRecipientChecks on Subject {\ndiff --git a/test/api/route/channels_test.dart b/test/api/route/channels_test.dart\nindex d86c9447fe..011dc508c5 100644\n--- a/test/api/route/channels_test.dart\n+++ b/test/api/route/channels_test.dart\n@@ -12,7 +12,7 @@ void main() {\n return FakeApiConnection.with_((connection) async {\n connection.prepare(json: {});\n await updateUserTopic(connection,\n- streamId: 1, topic: 'topic',\n+ streamId: 1, topic: const TopicName('topic'),\n visibilityPolicy: UserTopicVisibilityPolicy.followed);\n check(connection.takeRequests()).single.isA()\n ..method.equals('POST')\n@@ -28,7 +28,7 @@ void main() {\n test('updateUserTopic only accepts valid visibility policy', () {\n return FakeApiConnection.with_((connection) async {\n check(() => updateUserTopic(connection,\n- streamId: 1, topic: 'topic',\n+ streamId: 1, topic: const TopicName('topic'),\n visibilityPolicy: UserTopicVisibilityPolicy.unknown),\n ).throws();\n });\n@@ -38,7 +38,7 @@ void main() {\n return FakeApiConnection.with_((connection) async {\n connection.prepare(json: {});\n await updateUserTopicCompat(connection,\n- streamId: 1, topic: 'topic',\n+ streamId: 1, topic: const TopicName('topic'),\n visibilityPolicy: UserTopicVisibilityPolicy.followed);\n check(connection.takeRequests()).single.isA()\n ..method.equals('POST')\n@@ -55,7 +55,7 @@ void main() {\n test('updateUserTopic throws AssertionError when FL < 170', () {\n return FakeApiConnection.with_(zulipFeatureLevel: 169, (connection) async {\n check(() => updateUserTopic(connection,\n- streamId: 1, topic: 'topic',\n+ streamId: 1, topic: const TopicName('topic'),\n visibilityPolicy: UserTopicVisibilityPolicy.muted),\n ).throws();\n });\n@@ -64,7 +64,7 @@ void main() {\n test('updateUserTopicCompat throws UnsupportedError on unsupported policy', () {\n return FakeApiConnection.with_(zulipFeatureLevel: 169, (connection) async {\n check(() => updateUserTopicCompat(connection,\n- streamId: 1, topic: 'topic',\n+ streamId: 1, topic: const TopicName('topic'),\n visibilityPolicy: UserTopicVisibilityPolicy.followed),\n ).throws();\n });\n@@ -74,7 +74,7 @@ void main() {\n return FakeApiConnection.with_(zulipFeatureLevel: 169, (connection) async {\n connection.prepare(json: {});\n await updateUserTopicCompat(connection,\n- streamId: 1, topic: 'topic',\n+ streamId: 1, topic: const TopicName('topic'),\n visibilityPolicy: UserTopicVisibilityPolicy.none);\n check(connection.takeRequests()).single.isA()\n ..method.equals('PATCH')\n@@ -91,7 +91,7 @@ void main() {\n return FakeApiConnection.with_(zulipFeatureLevel: 169, (connection) async {\n connection.prepare(json: {});\n await updateUserTopicCompat(connection,\n- streamId: 1, topic: 'topic',\n+ streamId: 1, topic: const TopicName('topic'),\n visibilityPolicy: UserTopicVisibilityPolicy.muted);\n check(connection.takeRequests()).single.isA()\n ..method.equals('PATCH')\ndiff --git a/test/api/route/messages_test.dart b/test/api/route/messages_test.dart\nindex c634c87ff7..eb8fbdac29 100644\n--- a/test/api/route/messages_test.dart\n+++ b/test/api/route/messages_test.dart\n@@ -184,7 +184,7 @@ void main() {\n checkNarrow(const ChannelNarrow(12).apiEncode(), jsonEncode([\n {'operator': 'stream', 'operand': 12},\n ]));\n- checkNarrow(const TopicNarrow(12, 'stuff').apiEncode(), jsonEncode([\n+ checkNarrow(eg.topicNarrow(12, 'stuff').apiEncode(), jsonEncode([\n {'operator': 'stream', 'operand': 12},\n {'operator': 'topic', 'operand': 'stuff'},\n ]));\n@@ -328,7 +328,7 @@ void main() {\n test('smoke', () {\n return FakeApiConnection.with_((connection) async {\n await checkSendMessage(connection,\n- destination: const StreamDestination(streamId, topic), content: content,\n+ destination: StreamDestination(streamId, eg.t(topic)), content: content,\n queueId: 'abc:123',\n localId: '456',\n readBySender: true,\n@@ -347,7 +347,7 @@ void main() {\n test('to stream', () {\n return FakeApiConnection.with_((connection) async {\n await checkSendMessage(connection,\n- destination: const StreamDestination(streamId, topic), content: content,\n+ destination: StreamDestination(streamId, eg.t(topic)), content: content,\n readBySender: true,\n expectedBodyFields: {\n 'type': 'stream',\n@@ -391,7 +391,7 @@ void main() {\n test('when readBySender is null, sends a User-Agent we know the server will recognize', () {\n return FakeApiConnection.with_((connection) async {\n await checkSendMessage(connection,\n- destination: const StreamDestination(streamId, topic), content: content,\n+ destination: StreamDestination(streamId, eg.t(topic)), content: content,\n readBySender: null,\n expectedBodyFields: {\n 'type': 'stream',\n@@ -406,7 +406,7 @@ void main() {\n test('legacy: when server does not support readBySender, sends a User-Agent the server will recognize', () {\n return FakeApiConnection.with_(zulipFeatureLevel: 235, (connection) async {\n await checkSendMessage(connection,\n- destination: const StreamDestination(streamId, topic), content: content,\n+ destination: StreamDestination(streamId, eg.t(topic)), content: content,\n readBySender: true,\n expectedBodyFields: {\n 'type': 'stream',\n@@ -743,7 +743,7 @@ void main() {\n }) async {\n connection.prepare(json: {});\n await markTopicAsRead(connection,\n- streamId: streamId, topicName: topicName);\n+ streamId: streamId, topicName: eg.t(topicName));\n check(connection.lastRequest).isA()\n ..method.equals('POST')\n ..url.path.equals('/api/v1/mark_topic_as_read')\ndiff --git a/test/api/route/typing_test.dart b/test/api/route/typing_test.dart\nindex 0d933e6f54..551f1a5a4e 100644\n--- a/test/api/route/typing_test.dart\n+++ b/test/api/route/typing_test.dart\n@@ -4,6 +4,7 @@ import 'package:http/http.dart' as http;\n import 'package:checks/checks.dart';\n import 'package:flutter_test/flutter_test.dart';\n import 'package:zulip/api/model/events.dart';\n+import 'package:zulip/api/model/model.dart';\n import 'package:zulip/api/route/messages.dart';\n import 'package:zulip/api/route/typing.dart';\n \n@@ -31,7 +32,7 @@ void main() {\n Future checkSetTypingStatusForTopic(TypingOp op, String expectedOp) {\n return FakeApiConnection.with_((connection) {\n return checkSetTypingStatus(connection, op,\n- destination: const StreamDestination(streamId, topic),\n+ destination: const StreamDestination(streamId, TopicName(topic)),\n expectedBodyFields: {\n 'op': expectedOp,\n 'type': 'channel',\n@@ -64,7 +65,7 @@ void main() {\n test('legacy: use \"stream\" instead of \"channel\"', () {\n return FakeApiConnection.with_(zulipFeatureLevel: 247, (connection) {\n return checkSetTypingStatus(connection, TypingOp.start,\n- destination: const StreamDestination(streamId, topic),\n+ destination: const StreamDestination(streamId, TopicName(topic)),\n expectedBodyFields: {\n 'op': 'start',\n 'type': 'stream',\n@@ -77,7 +78,7 @@ void main() {\n test('legacy: use to=[streamId] instead of stream_id=streamId', () {\n return FakeApiConnection.with_(zulipFeatureLevel: 214, (connection) {\n return checkSetTypingStatus(connection, TypingOp.start,\n- destination: const StreamDestination(streamId, topic),\n+ destination: const StreamDestination(streamId, TopicName(topic)),\n expectedBodyFields: {\n 'op': 'start',\n 'type': 'stream',\ndiff --git a/test/example_data.dart b/test/example_data.dart\nindex d071307ec4..0e45321632 100644\n--- a/test/example_data.dart\n+++ b/test/example_data.dart\n@@ -241,7 +241,8 @@ const _stream = stream;\n \n GetStreamTopicsEntry getStreamTopicsEntry({int? maxId, String? name}) {\n maxId ??= 123;\n- return GetStreamTopicsEntry(maxId: maxId, name: name ?? 'Test Topic #$maxId');\n+ return GetStreamTopicsEntry(maxId: maxId,\n+ name: TopicName(name ?? 'Test Topic #$maxId'));\n }\n \n /// Construct an example subscription from a stream.\n@@ -283,11 +284,20 @@ Subscription subscription(\n );\n }\n \n+/// The [TopicName] constructor, but shorter.\n+///\n+/// Useful in test code that mentions a lot of topics in a compact format.\n+TopicName t(String apiName) => TopicName(apiName);\n+\n+TopicNarrow topicNarrow(int channelId, String topicName) {\n+ return TopicNarrow(channelId, TopicName(topicName));\n+}\n+\n UserTopicItem userTopicItem(\n ZulipStream stream, String topic, UserTopicVisibilityPolicy policy) {\n return UserTopicItem(\n streamId: stream.streamId,\n- topicName: topic,\n+ topicName: TopicName(topic),\n lastUpdated: 1234567890,\n visibilityPolicy: policy,\n );\n@@ -519,6 +529,18 @@ Submessage submessage({\n // Aggregate data structures.\n //\n \n+UnreadChannelSnapshot unreadChannelMsgs({\n+ required String topic,\n+ required int streamId,\n+ required List unreadMessageIds,\n+}) {\n+ return UnreadChannelSnapshot(\n+ topic: TopicName(topic),\n+ streamId: streamId,\n+ unreadMessageIds: unreadMessageIds,\n+ );\n+}\n+\n UnreadMessagesSnapshot unreadMsgs({\n int? count,\n List? dms,\n@@ -547,7 +569,7 @@ UserTopicEvent userTopicEvent(\n return UserTopicEvent(\n id: 1,\n streamId: streamId,\n- topicName: topic,\n+ topicName: TopicName(topic),\n lastUpdated: 1234567890,\n visibilityPolicy: visibilityPolicy,\n );\n@@ -605,8 +627,8 @@ UpdateMessageEvent _updateMessageMoveEvent(\n List messageIds, {\n required int origStreamId,\n int? newStreamId,\n- required String origTopic,\n- String? newTopic,\n+ required TopicName origTopic,\n+ TopicName? newTopic,\n String? origContent,\n String? newContent,\n required List flags,\n@@ -642,12 +664,15 @@ UpdateMessageEvent _updateMessageMoveEvent(\n UpdateMessageEvent updateMessageEventMoveFrom({\n required List origMessages,\n int? newStreamId,\n- String? newTopic,\n+ TopicName? newTopic,\n+ String? newTopicStr,\n String? newContent,\n PropagateMode propagateMode = PropagateMode.changeOne,\n }) {\n _checkPositive(newStreamId, 'stream ID');\n assert(origMessages.isNotEmpty);\n+ assert(newTopic == null || newTopicStr == null);\n+ newTopic ??= newTopicStr == null ? null : TopicName(newTopicStr);\n final origMessage = origMessages.first;\n // Only present on content change.\n final origContent = (newContent != null) ? origMessage.content : null;\n@@ -667,12 +692,15 @@ UpdateMessageEvent updateMessageEventMoveFrom({\n UpdateMessageEvent updateMessageEventMoveTo({\n required List newMessages,\n int? origStreamId,\n- String? origTopic,\n+ TopicName? origTopic,\n+ String? origTopicStr,\n String? origContent,\n PropagateMode propagateMode = PropagateMode.changeOne,\n }) {\n _checkPositive(origStreamId, 'stream ID');\n assert(newMessages.isNotEmpty);\n+ assert(origTopic == null || origTopicStr == null);\n+ origTopic ??= origTopicStr == null ? null : TopicName(origTopicStr);\n final newMessage = newMessages.first;\n // Only present on topic move.\n final newTopic = (origTopic != null) ? newMessage.topic : null;\ndiff --git a/test/flutter_checks.dart b/test/flutter_checks.dart\nindex 4e4ae7d986..505f5189f2 100644\n--- a/test/flutter_checks.dart\n+++ b/test/flutter_checks.dart\n@@ -66,6 +66,12 @@ extension TextChecks on Subject {\n Subject get style => has((t) => t.style, 'style');\n }\n \n+extension TextEditingValueChecks on Subject {\n+ Subject get text => has((x) => x.text, 'text');\n+ Subject get selection => has((x) => x.selection, 'selection');\n+ Subject get composing => has((x) => x.composing, 'composing');\n+}\n+\n extension TextEditingControllerChecks on Subject {\n Subject get text => has((t) => t.text, 'text');\n }\ndiff --git a/test/model/autocomplete_checks.dart b/test/model/autocomplete_checks.dart\nindex cb94735894..ec8acbe500 100644\n--- a/test/model/autocomplete_checks.dart\n+++ b/test/model/autocomplete_checks.dart\n@@ -1,4 +1,5 @@\n import 'package:checks/checks.dart';\n+import 'package:zulip/api/model/model.dart';\n import 'package:zulip/model/autocomplete.dart';\n import 'package:zulip/widgets/compose_box.dart';\n \n@@ -20,5 +21,5 @@ extension UserMentionAutocompleteResultChecks on Subject {\n- Subject get topic => has((r) => r.topic, 'topic');\n+ Subject get topic => has((r) => r.topic, 'topic');\n }\ndiff --git a/test/model/autocomplete_test.dart b/test/model/autocomplete_test.dart\nindex 9d6667ca3f..d6ed9574e0 100644\n--- a/test/model/autocomplete_test.dart\n+++ b/test/model/autocomplete_test.dart\n@@ -481,10 +481,11 @@ void main() {\n }\n \n int compareAB({required String? topic}) {\n+ final realTopic = topic == null ? null : TopicName(topic);\n final resultAB = MentionAutocompleteView.compareByRecency(userA, userB,\n- streamId: stream.streamId, topic: topic, store: store);\n+ streamId: stream.streamId, topic: realTopic, store: store);\n final resultBA = MentionAutocompleteView.compareByRecency(userB, userA,\n- streamId: stream.streamId, topic: topic, store: store);\n+ streamId: stream.streamId, topic: realTopic, store: store);\n switch (resultAB) {\n case <0: check(resultBA).isGreaterThan(0);\n case >0: check(resultBA).isLessThan(0);\n@@ -659,7 +660,7 @@ void main() {\n eg.user(fullName: 'b', isBot: true),\n ];\n final stream = eg.stream();\n- final narrow = TopicNarrow(stream.streamId, 'this');\n+ final narrow = eg.topicNarrow(stream.streamId, 'this');\n await prepare(users: users, messages: [\n eg.streamMessage(sender: users[1], stream: stream, topic: 'this'),\n eg.streamMessage(sender: users[0], stream: stream, topic: 'this'),\n@@ -790,7 +791,7 @@ void main() {\n \n final stream = eg.stream();\n const topic = 'topic';\n- final topicNarrow = TopicNarrow(stream.streamId, topic);\n+ final topicNarrow = eg.topicNarrow(stream.streamId, topic);\n \n final users = [\n eg.user(userId: 1, fullName: 'User One'),\n@@ -900,7 +901,7 @@ void main() {\n \n group('TopicAutocompleteQuery.testTopic', () {\n void doCheck(String rawQuery, String topic, bool expected) {\n- final result = TopicAutocompleteQuery(rawQuery).testTopic(topic);\n+ final result = TopicAutocompleteQuery(rawQuery).testTopic(eg.t(topic));\n expected ? check(result).isTrue() : check(result).isFalse();\n }\n \ndiff --git a/test/model/channel_test.dart b/test/model/channel_test.dart\nindex 14a9f69ea3..f22ac7cc8f 100644\n--- a/test/model/channel_test.dart\n+++ b/test/model/channel_test.dart\n@@ -123,14 +123,14 @@ void main() {\n group('getter topicVisibilityPolicy', () {\n test('with nothing for stream', () {\n final store = eg.store();\n- check(store.topicVisibilityPolicy(stream1.streamId, 'topic'))\n+ check(store.topicVisibilityPolicy(stream1.streamId, eg.t('topic')))\n .equals(UserTopicVisibilityPolicy.none);\n });\n \n test('with nothing for topic', () async {\n final store = eg.store();\n await store.addUserTopic(stream1, 'other topic', UserTopicVisibilityPolicy.muted);\n- check(store.topicVisibilityPolicy(stream1.streamId, 'topic'))\n+ check(store.topicVisibilityPolicy(stream1.streamId, eg.t('topic')))\n .equals(UserTopicVisibilityPolicy.none);\n });\n \n@@ -142,7 +142,7 @@ void main() {\n UserTopicVisibilityPolicy.followed,\n ]) {\n await store.addUserTopic(stream1, 'topic', policy);\n- check(store.topicVisibilityPolicy(stream1.streamId, 'topic'))\n+ check(store.topicVisibilityPolicy(stream1.streamId, eg.t('topic')))\n .equals(policy);\n }\n });\n@@ -153,23 +153,23 @@ void main() {\n final store = eg.store();\n await store.addStream(stream1);\n await store.addSubscription(eg.subscription(stream1));\n- check(store.isTopicVisibleInStream(stream1.streamId, 'topic')).isTrue();\n- check(store.isTopicVisible (stream1.streamId, 'topic')).isTrue();\n+ check(store.isTopicVisibleInStream(stream1.streamId, eg.t('topic'))).isTrue();\n+ check(store.isTopicVisible (stream1.streamId, eg.t('topic'))).isTrue();\n });\n \n test('with policy none, stream muted', () async {\n final store = eg.store();\n await store.addStream(stream1);\n await store.addSubscription(eg.subscription(stream1, isMuted: true));\n- check(store.isTopicVisibleInStream(stream1.streamId, 'topic')).isTrue();\n- check(store.isTopicVisible (stream1.streamId, 'topic')).isFalse();\n+ check(store.isTopicVisibleInStream(stream1.streamId, eg.t('topic'))).isTrue();\n+ check(store.isTopicVisible (stream1.streamId, eg.t('topic'))).isFalse();\n });\n \n test('with policy none, stream unsubscribed', () async {\n final store = eg.store();\n await store.addStream(stream1);\n- check(store.isTopicVisibleInStream(stream1.streamId, 'topic')).isTrue();\n- check(store.isTopicVisible (stream1.streamId, 'topic')).isFalse();\n+ check(store.isTopicVisibleInStream(stream1.streamId, eg.t('topic'))).isTrue();\n+ check(store.isTopicVisible (stream1.streamId, eg.t('topic'))).isFalse();\n });\n \n test('with policy muted', () async {\n@@ -177,8 +177,8 @@ void main() {\n await store.addStream(stream1);\n await store.addSubscription(eg.subscription(stream1));\n await store.addUserTopic(stream1, 'topic', UserTopicVisibilityPolicy.muted);\n- check(store.isTopicVisibleInStream(stream1.streamId, 'topic')).isFalse();\n- check(store.isTopicVisible (stream1.streamId, 'topic')).isFalse();\n+ check(store.isTopicVisibleInStream(stream1.streamId, eg.t('topic'))).isFalse();\n+ check(store.isTopicVisible (stream1.streamId, eg.t('topic'))).isFalse();\n });\n \n test('with policy unmuted', () async {\n@@ -186,8 +186,8 @@ void main() {\n await store.addStream(stream1);\n await store.addSubscription(eg.subscription(stream1, isMuted: true));\n await store.addUserTopic(stream1, 'topic', UserTopicVisibilityPolicy.unmuted);\n- check(store.isTopicVisibleInStream(stream1.streamId, 'topic')).isTrue();\n- check(store.isTopicVisible (stream1.streamId, 'topic')).isTrue();\n+ check(store.isTopicVisibleInStream(stream1.streamId, eg.t('topic'))).isTrue();\n+ check(store.isTopicVisible (stream1.streamId, eg.t('topic'))).isTrue();\n });\n \n test('with policy followed', () async {\n@@ -195,8 +195,8 @@ void main() {\n await store.addStream(stream1);\n await store.addSubscription(eg.subscription(stream1, isMuted: true));\n await store.addUserTopic(stream1, 'topic', UserTopicVisibilityPolicy.followed);\n- check(store.isTopicVisibleInStream(stream1.streamId, 'topic')).isTrue();\n- check(store.isTopicVisible (stream1.streamId, 'topic')).isTrue();\n+ check(store.isTopicVisibleInStream(stream1.streamId, eg.t('topic'))).isTrue();\n+ check(store.isTopicVisible (stream1.streamId, eg.t('topic'))).isTrue();\n });\n });\n \n@@ -265,16 +265,16 @@ void main() {\n eg.subscription(stream1, isMuted: streamMuted));\n }\n await store.handleEvent(mkEvent(oldPolicy));\n- final oldVisibleInStream = store.isTopicVisibleInStream(stream1.streamId, 'topic');\n- final oldVisible = store.isTopicVisible(stream1.streamId, 'topic');\n+ final oldVisibleInStream = store.isTopicVisibleInStream(stream1.streamId, eg.t('topic'));\n+ final oldVisible = store.isTopicVisible(stream1.streamId, eg.t('topic'));\n \n final event = mkEvent(newPolicy);\n final willChangeInStream = store.willChangeIfTopicVisibleInStream(event);\n final willChange = store.willChangeIfTopicVisible(event);\n \n await store.handleEvent(event);\n- final newVisibleInStream = store.isTopicVisibleInStream(stream1.streamId, 'topic');\n- final newVisible = store.isTopicVisible(stream1.streamId, 'topic');\n+ final newVisibleInStream = store.isTopicVisibleInStream(stream1.streamId, eg.t('topic'));\n+ final newVisible = store.isTopicVisible(stream1.streamId, eg.t('topic'));\n \n VisibilityEffect fromOldNew(bool oldVisible, bool newVisible) {\n if (newVisible == oldVisible) return VisibilityEffect.none;\n@@ -384,13 +384,13 @@ void main() {\n eg.userTopicItem(stream, 'topic 2', UserTopicVisibilityPolicy.unmuted),\n eg.userTopicItem(stream, 'topic 3', UserTopicVisibilityPolicy.followed),\n ]));\n- check(store.topicVisibilityPolicy(stream.streamId, 'topic 1'))\n+ check(store.topicVisibilityPolicy(stream.streamId, eg.t('topic 1')))\n .equals(UserTopicVisibilityPolicy.muted);\n- check(store.topicVisibilityPolicy(stream.streamId, 'topic 2'))\n+ check(store.topicVisibilityPolicy(stream.streamId, eg.t('topic 2')))\n .equals(UserTopicVisibilityPolicy.unmuted);\n- check(store.topicVisibilityPolicy(stream.streamId, 'topic 3'))\n+ check(store.topicVisibilityPolicy(stream.streamId, eg.t('topic 3')))\n .equals(UserTopicVisibilityPolicy.followed);\n- check(store.topicVisibilityPolicy(stream.streamId, 'topic 4'))\n+ check(store.topicVisibilityPolicy(stream.streamId, eg.t('topic 4')))\n .equals(UserTopicVisibilityPolicy.none);\n });\n });\ndiff --git a/test/model/internal_link_test.dart b/test/model/internal_link_test.dart\nindex 3949339321..eb91e35855 100644\n--- a/test/model/internal_link_test.dart\n+++ b/test/model/internal_link_test.dart\n@@ -72,7 +72,7 @@ void main() {\n await store.addStream(eg.stream(streamId: streamId, name: name));\n final narrow = topic == null\n ? ChannelNarrow(streamId)\n- : TopicNarrow(streamId, topic);\n+ : eg.topicNarrow(streamId, topic);\n check(narrowLink(store, narrow, nearMessageId: nearMessageId))\n .equals(store.realmUrl.resolve(expectedFragment));\n }\n@@ -281,28 +281,28 @@ void main() {\n });\n \n group('\"/#narrow/stream/<...>/topic/<...>\" returns expected TopicNarrow', () {\n- const testCases = [\n- ('/#narrow/stream/check/topic/test', TopicNarrow(1, 'test')),\n- ('/#narrow/stream/mobile/subject/topic/near/378333', TopicNarrow(3, 'topic')),\n- ('/#narrow/stream/mobile/subject/topic/with/1', TopicNarrow(3, 'topic')),\n- ('/#narrow/stream/mobile/topic/topic/', TopicNarrow(3, 'topic')),\n- ('/#narrow/stream/stream/topic/topic/near/1', TopicNarrow(5, 'topic')),\n- ('/#narrow/stream/stream/topic/topic/with/22', TopicNarrow(5, 'topic')),\n- ('/#narrow/stream/stream/subject/topic/near/1', TopicNarrow(5, 'topic')),\n- ('/#narrow/stream/stream/subject/topic/with/333', TopicNarrow(5, 'topic')),\n- ('/#narrow/stream/stream/subject/topic', TopicNarrow(5, 'topic')),\n+ final testCases = [\n+ ('/#narrow/stream/check/topic/test', eg.topicNarrow(1, 'test')),\n+ ('/#narrow/stream/mobile/subject/topic/near/378333', eg.topicNarrow(3, 'topic')),\n+ ('/#narrow/stream/mobile/subject/topic/with/1', eg.topicNarrow(3, 'topic')),\n+ ('/#narrow/stream/mobile/topic/topic/', eg.topicNarrow(3, 'topic')),\n+ ('/#narrow/stream/stream/topic/topic/near/1', eg.topicNarrow(5, 'topic')),\n+ ('/#narrow/stream/stream/topic/topic/with/22', eg.topicNarrow(5, 'topic')),\n+ ('/#narrow/stream/stream/subject/topic/near/1', eg.topicNarrow(5, 'topic')),\n+ ('/#narrow/stream/stream/subject/topic/with/333', eg.topicNarrow(5, 'topic')),\n+ ('/#narrow/stream/stream/subject/topic', eg.topicNarrow(5, 'topic')),\n ];\n testExpectedNarrows(testCases, streams: streams);\n });\n \n group('Both `stream` and `channel` can be used interchangeably', () {\n- const testCases = [\n- ('/#narrow/stream/check', ChannelNarrow(1)),\n- ('/#narrow/channel/check', ChannelNarrow(1)),\n- ('/#narrow/stream/check/topic/test', TopicNarrow(1, 'test')),\n- ('/#narrow/channel/check/topic/test', TopicNarrow(1, 'test')),\n- ('/#narrow/stream/check/topic/test/near/378333', TopicNarrow(1, 'test')),\n- ('/#narrow/channel/check/topic/test/near/378333', TopicNarrow(1, 'test')),\n+ final testCases = [\n+ ('/#narrow/stream/check', const ChannelNarrow(1)),\n+ ('/#narrow/channel/check', const ChannelNarrow(1)),\n+ ('/#narrow/stream/check/topic/test', eg.topicNarrow(1, 'test')),\n+ ('/#narrow/channel/check/topic/test', eg.topicNarrow(1, 'test')),\n+ ('/#narrow/stream/check/topic/test/near/378333', eg.topicNarrow(1, 'test')),\n+ ('/#narrow/channel/check/topic/test/near/378333', eg.topicNarrow(1, 'test')),\n ];\n testExpectedNarrows(testCases, streams: streams);\n });\n@@ -414,13 +414,13 @@ void main() {\n eg.stream(streamId: 2, name: 'some stream'),\n eg.stream(streamId: 3, name: 'some.stream'),\n ];\n- const testCases = [\n- ('/#narrow/stream/some_stream', ChannelNarrow(1)),\n- ('/#narrow/stream/some.20stream', ChannelNarrow(2)),\n- ('/#narrow/stream/some.2Estream', ChannelNarrow(3)),\n- ('/#narrow/stream/some_stream/topic/some_topic', TopicNarrow(1, 'some_topic')),\n- ('/#narrow/stream/some_stream/topic/some.20topic', TopicNarrow(1, 'some topic')),\n- ('/#narrow/stream/some_stream/topic/some.2Etopic', TopicNarrow(1, 'some.topic')),\n+ final testCases = [\n+ ('/#narrow/stream/some_stream', const ChannelNarrow(1)),\n+ ('/#narrow/stream/some.20stream', const ChannelNarrow(2)),\n+ ('/#narrow/stream/some.2Estream', const ChannelNarrow(3)),\n+ ('/#narrow/stream/some_stream/topic/some_topic', eg.topicNarrow(1, 'some_topic')),\n+ ('/#narrow/stream/some_stream/topic/some.20topic', eg.topicNarrow(1, 'some topic')),\n+ ('/#narrow/stream/some_stream/topic/some.2Etopic', eg.topicNarrow(1, 'some.topic')),\n ];\n testExpectedNarrows(testCases, streams: streams);\n });\n@@ -518,8 +518,8 @@ void main() {\n return '#narrow/stream/${stream.streamId}-${stream.name}/topic/$operand';\n }\n final testCases = [\n- (mkUrlString('(no.20topic)'), TopicNarrow(stream.streamId, '(no topic)')),\n- (mkUrlString('lunch'), TopicNarrow(stream.streamId, 'lunch')),\n+ (mkUrlString('(no.20topic)'), eg.topicNarrow(stream.streamId, '(no topic)')),\n+ (mkUrlString('lunch'), eg.topicNarrow(stream.streamId, 'lunch')),\n ];\n testExpectedNarrows(testCases, streams: [stream]);\n });\n@@ -529,12 +529,12 @@ void main() {\n return '#narrow/stream/${stream.name}/topic/$operand';\n }\n final testCases = [\n- (mkUrlString('(no.20topic)'), TopicNarrow(stream.streamId, '(no topic)')),\n- (mkUrlString('google.2Ecom'), TopicNarrow(stream.streamId, 'google.com')),\n+ (mkUrlString('(no.20topic)'), eg.topicNarrow(stream.streamId, '(no topic)')),\n+ (mkUrlString('google.2Ecom'), eg.topicNarrow(stream.streamId, 'google.com')),\n (mkUrlString('google.com'), null),\n- (mkUrlString('topic.20name'), TopicNarrow(stream.streamId, 'topic name')),\n- (mkUrlString('stream'), TopicNarrow(stream.streamId, 'stream')),\n- (mkUrlString('topic'), TopicNarrow(stream.streamId, 'topic')),\n+ (mkUrlString('topic.20name'), eg.topicNarrow(stream.streamId, 'topic name')),\n+ (mkUrlString('stream'), eg.topicNarrow(stream.streamId, 'stream')),\n+ (mkUrlString('topic'), eg.topicNarrow(stream.streamId, 'topic')),\n ];\n testExpectedNarrows(testCases, streams: [stream]);\n });\ndiff --git a/test/model/message_list_test.dart b/test/model/message_list_test.dart\nindex e92b2489b3..6a1d103c84 100644\n--- a/test/model/message_list_test.dart\n+++ b/test/model/message_list_test.dart\n@@ -440,7 +440,7 @@ void main() {\n });\n \n test('in TopicNarrow, stay visible', () async {\n- await prepare(narrow: TopicNarrow(stream.streamId, topic));\n+ await prepare(narrow: eg.topicNarrow(stream.streamId, topic));\n await prepareMutes();\n await prepareMessages(foundOldest: true, messages: [\n eg.streamMessage(id: 1, stream: stream, topic: topic),\n@@ -720,7 +720,7 @@ void main() {\n \n await store.handleEvent(eg.updateMessageEventMoveFrom(\n origMessages: movedMessages,\n- newTopic: 'new',\n+ newTopicStr: 'new',\n ));\n checkHasMessages(initialMessages + movedMessages);\n checkNotified(count: 2);\n@@ -738,7 +738,7 @@ void main() {\n \n await store.handleEvent(eg.updateMessageEventMoveFrom(\n origMessages: movedMessages,\n- newTopic: 'new',\n+ newTopicStr: 'new',\n ));\n checkHasMessages(initialMessages + movedMessages);\n checkNotified(count: 2);\n@@ -752,7 +752,7 @@ void main() {\n messages: initialMessages + movedMessages,\n ).toJson());\n await store.handleEvent(eg.updateMessageEventMoveTo(\n- origTopic: 'orig topic',\n+ origTopicStr: 'orig topic',\n origStreamId: otherStream.streamId,\n newMessages: movedMessages,\n ));\n@@ -770,7 +770,7 @@ void main() {\n \n await store.handleEvent(eg.updateMessageEventMoveFrom(\n origMessages: movedMessages,\n- newTopic: 'new',\n+ newTopicStr: 'new',\n newStreamId: otherStream.streamId,\n ));\n checkHasMessages(initialMessages);\n@@ -793,7 +793,7 @@ void main() {\n \n await store.handleEvent(eg.updateMessageEventMoveFrom(\n origMessages: otherChannelMovedMessages,\n- newTopic: 'new',\n+ newTopicStr: 'new',\n ));\n checkHasMessages(initialMessages);\n checkNotNotified();\n@@ -807,7 +807,7 @@ void main() {\n ).toJson());\n await store.handleEvent(eg.updateMessageEventMoveFrom(\n origMessages: movedMessages,\n- newTopic: 'new',\n+ newTopicStr: 'new',\n newStreamId: otherStream.streamId,\n propagateMode: propagateMode,\n ));\n@@ -832,7 +832,7 @@ void main() {\n });\n \n group('in topic narrow', () {\n- final narrow = TopicNarrow(stream.streamId, 'topic');\n+ final narrow = eg.topicNarrow(stream.streamId, 'topic');\n final initialMessages = List.generate(5, (i) => eg.streamMessage(stream: stream, topic: 'topic'));\n final movedMessages = List.generate(5, (i) => eg.streamMessage(stream: stream, topic: 'topic'));\n final otherTopicMovedMessages = List.generate(5, (i) => eg.streamMessage(stream: stream, topic: 'other topic'));\n@@ -855,7 +855,7 @@ void main() {\n ).toJson());\n await store.handleEvent(eg.updateMessageEventMoveTo(\n origStreamId: origStreamId,\n- origTopic: origTopic,\n+ origTopicStr: origTopic,\n newMessages: movedMessages,\n ));\n check(model).fetched.isFalse();\n@@ -883,7 +883,7 @@ void main() {\n await store.handleEvent(eg.updateMessageEventMoveFrom(\n origMessages: movedMessages,\n newStreamId: newStreamId,\n- newTopic: newTopic,\n+ newTopicStr: newTopic,\n ));\n checkHasMessages(initialMessages);\n checkNotifiedOnce();\n@@ -896,7 +896,7 @@ void main() {\n await prepareNarrow(narrow, initialMessages);\n \n await store.handleEvent(eg.updateMessageEventMoveTo(\n- origTopic: 'other',\n+ origTopicStr: 'other',\n newMessages: otherTopicMovedMessages,\n ));\n check(model).fetched.isTrue();\n@@ -925,7 +925,7 @@ void main() {\n ).toJson());\n await store.handleEvent(eg.updateMessageEventMoveFrom(\n origMessages: movedMessages,\n- newTopic: 'new',\n+ newTopicStr: 'new',\n newStreamId: otherStream.streamId,\n propagateMode: propagateMode,\n ));\n@@ -937,21 +937,21 @@ void main() {\n handleMoveEvent(PropagateMode.changeOne);\n checkNotNotified();\n checkHasMessages(initialMessages);\n- check(model).narrow.equals(TopicNarrow(stream.streamId, 'topic'));\n+ check(model).narrow.equals(eg.topicNarrow(stream.streamId, 'topic'));\n });\n \n test('follow to the new narrow when propagateMode = changeLater', () {\n handleMoveEvent(PropagateMode.changeLater);\n checkNotifiedOnce();\n checkHasMessages(movedMessages);\n- check(model).narrow.equals(TopicNarrow(otherStream.streamId, 'new'));\n+ check(model).narrow.equals(eg.topicNarrow(otherStream.streamId, 'new'));\n });\n \n test('follow to the new narrow when propagateMode = changeAll', () {\n handleMoveEvent(PropagateMode.changeAll);\n checkNotifiedOnce();\n checkHasMessages(movedMessages);\n- check(model).narrow.equals(TopicNarrow(otherStream.streamId, 'new'));\n+ check(model).narrow.equals(eg.topicNarrow(otherStream.streamId, 'new'));\n });\n \n test('handle move event before initial fetch', () => awaitFakeAsync((async) async {\n@@ -969,11 +969,11 @@ void main() {\n check(model).fetched.isFalse();\n checkHasMessages([]);\n await store.handleEvent(eg.updateMessageEventMoveTo(\n- origTopic: 'topic',\n+ origTopicStr: 'topic',\n newMessages: [followedMessage],\n propagateMode: PropagateMode.changeAll,\n ));\n- check(model).narrow.equals(TopicNarrow(stream.streamId, 'new'));\n+ check(model).narrow.equals(eg.topicNarrow(stream.streamId, 'new'));\n \n async.elapse(const Duration(seconds: 2));\n checkHasMessages([followedMessage]);\n@@ -1255,7 +1255,7 @@ void main() {\n \n int notifiedCount2 = 0;\n final model2 = MessageListView.init(store: store,\n- narrow: TopicNarrow(stream.streamId, 'hello'))\n+ narrow: eg.topicNarrow(stream.streamId, 'hello'))\n ..addListener(() => notifiedCount2++);\n \n for (final m in [model1, model2]) {\n@@ -1481,7 +1481,7 @@ void main() {\n \n test('in TopicNarrow', () async {\n final stream = eg.stream();\n- await prepare(narrow: TopicNarrow(stream.streamId, 'A'));\n+ await prepare(narrow: eg.topicNarrow(stream.streamId, 'A'));\n await store.addStream(stream);\n await store.addSubscription(eg.subscription(stream, isMuted: true));\n await store.addUserTopic(stream, 'A', UserTopicVisibilityPolicy.muted);\ndiff --git a/test/model/message_test.dart b/test/model/message_test.dart\nindex c1fad15ac7..43f17be61a 100644\n--- a/test/model/message_test.dart\n+++ b/test/model/message_test.dart\n@@ -320,7 +320,7 @@ void main() {\n final originalDisplayRecipient = origMessages[0].displayRecipient!;\n await store.handleEvent(eg.updateMessageEventMoveFrom(\n origMessages: origMessages,\n- newTopic: 'new topic'));\n+ newTopicStr: 'new topic'));\n checkNotified(count: 2);\n check(store).messages.values.every(((message) =>\n message.isA()\n@@ -332,7 +332,7 @@ void main() {\n await prepareOrigMessages(origTopic: 'new topic');\n await store.handleEvent(eg.updateMessageEventMoveFrom(\n origMessages: origMessages,\n- newTopic: '\u2714 new topic'));\n+ newTopicStr: '\u2714 new topic'));\n checkNotified(count: 2);\n check(store).messages.values.every(((message) => message.editState.equals(MessageEditState.none)));\n });\n@@ -341,7 +341,7 @@ void main() {\n await prepareOrigMessages(origTopic: '\u2714 new topic');\n await store.handleEvent(eg.updateMessageEventMoveFrom(\n origMessages: origMessages,\n- newTopic: 'new topic'));\n+ newTopicStr: 'new topic'));\n checkNotified(count: 2);\n check(store).messages.values.every(((message) => message.editState.equals(MessageEditState.none)));\n });\n@@ -350,7 +350,7 @@ void main() {\n await prepareOrigMessages(origTopic: 'new topic');\n await store.handleEvent(eg.updateMessageEventMoveFrom(\n origMessages: origMessages,\n- newTopic: '\u2714 new topic 2'));\n+ newTopicStr: '\u2714 new topic 2'));\n checkNotified(count: 2);\n check(store).messages.values.every(((message) => message.editState.equals(MessageEditState.moved)));\n });\n@@ -359,7 +359,7 @@ void main() {\n await prepareOrigMessages(origTopic: '\u2714 new topic');\n await store.handleEvent(eg.updateMessageEventMoveFrom(\n origMessages: origMessages,\n- newTopic: 'new topic 2'));\n+ newTopicStr: 'new topic 2'));\n checkNotified(count: 2);\n check(store).messages.values.every(((message) => message.editState.equals(MessageEditState.moved)));\n });\ndiff --git a/test/model/narrow_checks.dart b/test/model/narrow_checks.dart\nindex 241547d782..ce65de854d 100644\n--- a/test/model/narrow_checks.dart\n+++ b/test/model/narrow_checks.dart\n@@ -1,5 +1,6 @@\n \n import 'package:checks/checks.dart';\n+import 'package:zulip/api/model/model.dart';\n import 'package:zulip/api/model/narrow.dart';\n import 'package:zulip/model/narrow.dart';\n \n@@ -14,5 +15,5 @@ extension DmNarrowChecks on Subject {\n \n extension TopicNarrowChecks on Subject {\n Subject get streamId => has((x) => x.streamId, 'streamId');\n- Subject get topic => has((x) => x.topic, 'topic');\n+ Subject get topic => has((x) => x.topic, 'topic');\n }\ndiff --git a/test/model/recent_senders_test.dart b/test/model/recent_senders_test.dart\nindex 2da516e11c..602362cbcc 100644\n--- a/test/model/recent_senders_test.dart\n+++ b/test/model/recent_senders_test.dart\n@@ -7,7 +7,7 @@ import '../example_data.dart' as eg;\n /// [messages] should be sorted by [id] ascending.\n void checkMatchesMessages(RecentSenders model, List messages) {\n final Map>> messagesByUserInStream = {};\n- final Map>>> messagesByUserInTopic = {};\n+ final Map>>> messagesByUserInTopic = {};\n for (final message in messages) {\n if (message is! StreamMessage) {\n throw UnsupportedError('Message of type ${message.runtimeType} is not expected.');\n@@ -199,15 +199,15 @@ void main() {\n model.handleMessages(messages);\n \n check(model.latestMessageIdOfSenderInTopic(streamId: 1,\n- topic: 'a', senderId: 10)).equals(300);\n+ topic: eg.t('a'), senderId: 10)).equals(300);\n // No message of user 20 in topic \"a\".\n check(model.latestMessageIdOfSenderInTopic(streamId: 1,\n- topic: 'a', senderId: 20)).equals(null);\n+ topic: eg.t('a'), senderId: 20)).equals(null);\n // No message in topic \"b\" at all.\n check(model.latestMessageIdOfSenderInTopic(streamId: 1,\n- topic: 'b', senderId: 10)).equals(null);\n+ topic: eg.t('b'), senderId: 10)).equals(null);\n // No message in stream 2 at all.\n check(model.latestMessageIdOfSenderInTopic(streamId: 2,\n- topic: 'a', senderId: 10)).equals(null);\n+ topic: eg.t('a'), senderId: 10)).equals(null);\n });\n }\ndiff --git a/test/model/store_test.dart b/test/model/store_test.dart\nindex 10e8698360..c8c6b4c266 100644\n--- a/test/model/store_test.dart\n+++ b/test/model/store_test.dart\n@@ -386,7 +386,7 @@ void main() {\n final stream = eg.stream();\n connection.prepare(json: SendMessageResult(id: 12345).toJson());\n await store.sendMessage(\n- destination: StreamDestination(stream.streamId, 'world'),\n+ destination: StreamDestination(stream.streamId, eg.t('world')),\n content: 'hello');\n check(connection.takeRequests()).single.isA()\n ..method.equals('POST')\ndiff --git a/test/model/typing_status_test.dart b/test/model/typing_status_test.dart\nindex 45348afb01..4061301366 100644\n--- a/test/model/typing_status_test.dart\n+++ b/test/model/typing_status_test.dart\n@@ -35,7 +35,7 @@ void checkSetTypingStatusRequests(\n 'type': 'channel',\n 'op': op.toJson(),\n 'stream_id': narrow.streamId.toString(),\n- 'topic': narrow.topic}),\n+ 'topic': narrow.topic.apiName}),\n DmNarrow() => conditionTypingRequest({\n 'type': 'direct',\n 'op': op.toJson(),\n@@ -94,7 +94,7 @@ void main() {\n }\n \n final stream = eg.stream();\n- final topicNarrow = TopicNarrow(stream.streamId, 'foo');\n+ final topicNarrow = eg.topicNarrow(stream.streamId, 'foo');\n \n final dmNarrow = DmNarrow.withUser(eg.otherUser.userId, selfUserId: eg.selfUser.userId);\n final groupNarrow = DmNarrow.withOtherUsers(\n@@ -272,7 +272,7 @@ void main() {\n final channel = eg.stream();\n await store.addStream(channel);\n await store.addSubscription(eg.subscription(channel));\n- narrow = TopicNarrow(channel.streamId, 'topic');\n+ narrow = eg.topicNarrow(channel.streamId, 'topic');\n }\n \n /// Prepares store and triggers a \"typing started\" notice.\ndiff --git a/test/model/unreads_checks.dart b/test/model/unreads_checks.dart\nindex 836e497b2b..ac4d64846a 100644\n--- a/test/model/unreads_checks.dart\n+++ b/test/model/unreads_checks.dart\n@@ -1,10 +1,11 @@\n import 'package:checks/checks.dart';\n import 'package:collection/collection.dart';\n+import 'package:zulip/api/model/model.dart';\n import 'package:zulip/model/narrow.dart';\n import 'package:zulip/model/unreads.dart';\n \n extension UnreadsChecks on Subject {\n- Subject>>> get streams => has((u) => u.streams, 'streams');\n+ Subject>>> get streams => has((u) => u.streams, 'streams');\n Subject>> get dms => has((u) => u.dms, 'dms');\n Subject> get mentions => has((u) => u.mentions, 'mentions');\n Subject get oldUnreadsMissing => has((u) => u.oldUnreadsMissing, 'oldUnreadsMissing');\ndiff --git a/test/model/unreads_test.dart b/test/model/unreads_test.dart\nindex f5eab5a845..40e074dcaa 100644\n--- a/test/model/unreads_test.dart\n+++ b/test/model/unreads_test.dart\n@@ -58,7 +58,7 @@ void main() {\n assert(Set.of(messages.map((m) => m.id)).length == messages.length,\n 'checkMatchesMessages: duplicate messages in test input');\n \n- final Map>> expectedStreams = {};\n+ final Map>> expectedStreams = {};\n final Map> expectedDms = {};\n final Set expectedMentions = {};\n for (final message in messages) {\n@@ -114,10 +114,10 @@ void main() {\n prepare(initial: UnreadMessagesSnapshot(\n count: 0,\n channels: [\n- UnreadChannelSnapshot(streamId: stream1.streamId, topic: 'a', unreadMessageIds: [1, 2]),\n- UnreadChannelSnapshot(streamId: stream1.streamId, topic: 'b', unreadMessageIds: [3, 4]),\n- UnreadChannelSnapshot(streamId: stream2.streamId, topic: 'b', unreadMessageIds: [5, 6]),\n- UnreadChannelSnapshot(streamId: stream2.streamId, topic: 'c', unreadMessageIds: [7, 8]),\n+ eg.unreadChannelMsgs(streamId: stream1.streamId, topic: 'a', unreadMessageIds: [1, 2]),\n+ eg.unreadChannelMsgs(streamId: stream1.streamId, topic: 'b', unreadMessageIds: [3, 4]),\n+ eg.unreadChannelMsgs(streamId: stream2.streamId, topic: 'b', unreadMessageIds: [5, 6]),\n+ eg.unreadChannelMsgs(streamId: stream2.streamId, topic: 'c', unreadMessageIds: [7, 8]),\n ],\n dms: [\n UnreadDmSnapshot(otherUserId: 1, unreadMessageIds: [9, 10]),\n@@ -204,7 +204,7 @@ void main() {\n prepare();\n fillWithMessages(List.generate(7, (i) => eg.streamMessage(\n stream: stream, topic: 'a', flags: [])));\n- check(model.countInTopicNarrow(stream.streamId, 'a')).equals(7);\n+ check(model.countInTopicNarrow(stream.streamId, eg.t('a'))).equals(7);\n });\n \n test('countInDmNarrow', () {\n@@ -538,7 +538,7 @@ void main() {\n messageIds: [11, 12],\n messageType: MessageType.stream,\n streamId: stream1.streamId,\n- topic: 'a',\n+ topic: eg.t('a'),\n ));\n checkNotifiedOnce();\n checkMatchesMessages(expectedRemainingMessages..removeAll([message11, message12]));\n@@ -547,7 +547,7 @@ void main() {\n messageIds: [13, 14],\n messageType: MessageType.stream,\n streamId: stream2.streamId,\n- topic: 'b',\n+ topic: eg.t('b'),\n ));\n checkNotifiedOnce();\n checkMatchesMessages(expectedRemainingMessages..removeAll([message13, message14]));\n@@ -1029,7 +1029,7 @@ void main() {\n type: MessageType.stream,\n mentioned: false,\n streamId: stream.streamId,\n- topic: topic,\n+ topic: eg.t(topic),\n userIds: null,\n ),\n // message 2 and 3 have their details missing\ndiff --git a/test/notifications/display_test.dart b/test/notifications/display_test.dart\nindex cb49a5f8a8..32d8254d6d 100644\n--- a/test/notifications/display_test.dart\n+++ b/test/notifications/display_test.dart\n@@ -540,21 +540,47 @@ void main() {\n messageStyleMessages: [data1],\n expectedIsGroupConversation: true,\n expectedTitle: '#${stream.name} > $topicA',\n- expectedTagComponent: 'stream:${stream.streamId}:$topicA');\n+ expectedTagComponent: 'stream:${stream.streamId}:${topicA.toLowerCase()}');\n \n receiveFcmMessage(async, data2);\n checkNotification(data2,\n messageStyleMessages: [data2],\n expectedIsGroupConversation: true,\n expectedTitle: '#${stream.name} > $topicB',\n- expectedTagComponent: 'stream:${stream.streamId}:$topicB');\n+ expectedTagComponent: 'stream:${stream.streamId}:${topicB.toLowerCase()}');\n \n receiveFcmMessage(async, data3);\n checkNotification(data3,\n messageStyleMessages: [data1, data3],\n expectedIsGroupConversation: true,\n expectedTitle: '#${stream.name} > $topicA',\n- expectedTagComponent: 'stream:${stream.streamId}:$topicA');\n+ expectedTagComponent: 'stream:${stream.streamId}:${topicA.toLowerCase()}');\n+ })));\n+\n+ test('stream message: topic changes only case', () => runWithHttpClient(() => awaitFakeAsync((async) async {\n+ await init();\n+ final stream = eg.stream();\n+ const topic1 = 'A ToPic';\n+ const topic2 = 'a TOpic';\n+ final message1 = eg.streamMessage(topic: topic1, stream: stream);\n+ final data1 = messageFcmMessage(message1, streamName: stream.name);\n+ final message2 = eg.streamMessage(topic: topic2, stream: stream);\n+ final data2 = messageFcmMessage(message2, streamName: stream.name);\n+\n+ receiveFcmMessage(async, data1);\n+ checkNotification(data1,\n+ messageStyleMessages: [data1],\n+ expectedIsGroupConversation: true,\n+ expectedTitle: '#${stream.name} > $topic1',\n+ expectedTagComponent: 'stream:${stream.streamId}:a topic');\n+\n+ receiveFcmMessage(async, data2);\n+ checkNotification(data2,\n+ messageStyleMessages: [data1, data2],\n+ expectedIsGroupConversation: true,\n+ // Title updates with latest casing of topic.\n+ expectedTitle: '#${stream.name} > $topic2',\n+ expectedTagComponent: 'stream:${stream.streamId}:a topic');\n })));\n \n test('stream message: conversation stays same when stream is renamed', () => runWithHttpClient(() => awaitFakeAsync((async) async {\n@@ -781,6 +807,7 @@ void main() {\n final data2 = messageFcmMessage(message2, streamName: stream.name);\n final message3 = eg.streamMessage(stream: stream, topic: topicA);\n final data3 = messageFcmMessage(message3, streamName: stream.name);\n+ final conversationKey = 'stream:${stream.streamId}:${topicA.toLowerCase()}';\n final expectedGroupKey = '${data1.realmUrl}|${data1.userId}';\n \n check(testBinding.androidNotificationHost.activeNotifications).isEmpty();\n@@ -789,14 +816,14 @@ void main() {\n receiveFcmMessage(async, data2);\n receiveFcmMessage(async, data3);\n check(testBinding.androidNotificationHost.activeNotifications).deepEquals(>[\n- conditionActiveNotif(data3, 'stream:${stream.streamId}:$topicA'),\n+ conditionActiveNotif(data3, conversationKey),\n conditionSummaryActiveNotif(expectedGroupKey),\n ]);\n \n // A RemoveFcmMessage for the first two messages; the notification stays.\n receiveFcmMessage(async, removeFcmMessage([message1, message2]));\n check(testBinding.androidNotificationHost.activeNotifications).deepEquals(>[\n- conditionActiveNotif(data3, 'stream:${stream.streamId}:$topicA'),\n+ conditionActiveNotif(data3, conversationKey),\n conditionSummaryActiveNotif(expectedGroupKey),\n ]);\n \n@@ -808,13 +835,17 @@ void main() {\n test('remove: clears summary notification only if all conversation notifications are cleared', () => runWithHttpClient(() => awaitFakeAsync((async) async {\n await init();\n final stream = eg.stream();\n+\n const topicA = 'Topic A';\n final message1 = eg.streamMessage(stream: stream, topic: topicA);\n final data1 = messageFcmMessage(message1, streamName: stream.name);\n+ final conversationKey1 = 'stream:${stream.streamId}:${topicA.toLowerCase()}';\n+ final expectedGroupKey = '${data1.realmUrl}|${data1.userId}';\n+\n const topicB = 'Topic B';\n final message2 = eg.streamMessage(stream: stream, topic: topicB);\n final data2 = messageFcmMessage(message2, streamName: stream.name);\n- final expectedGroupKey = '${data1.realmUrl}|${data1.userId}';\n+ final conversationKey2 = 'stream:${stream.streamId}:${topicB.toLowerCase()}';\n \n check(testBinding.androidNotificationHost.activeNotifications).isEmpty();\n \n@@ -822,16 +853,16 @@ void main() {\n receiveFcmMessage(async, data1);\n receiveFcmMessage(async, data2);\n check(testBinding.androidNotificationHost.activeNotifications).deepEquals(>[\n- conditionActiveNotif(data1, 'stream:${stream.streamId}:$topicA'),\n+ conditionActiveNotif(data1, conversationKey1),\n conditionSummaryActiveNotif(expectedGroupKey),\n- conditionActiveNotif(data2, 'stream:${stream.streamId}:$topicB'),\n+ conditionActiveNotif(data2, conversationKey2),\n ]);\n \n // A RemoveFcmMessage for first conversation; only clears the first conversation notif.\n receiveFcmMessage(async, removeFcmMessage([message1]));\n check(testBinding.androidNotificationHost.activeNotifications).deepEquals(>[\n conditionSummaryActiveNotif(expectedGroupKey),\n- conditionActiveNotif(data2, 'stream:${stream.streamId}:$topicB'),\n+ conditionActiveNotif(data2, conversationKey2),\n ]);\n \n // Then a RemoveFcmMessage for the only remaining conversation;\n@@ -844,6 +875,7 @@ void main() {\n await init();\n final stream = eg.stream();\n const topic = 'Some Topic';\n+ final conversationKey = 'stream:${stream.streamId}:some topic';\n \n final account1 = eg.account(\n realmUrl: Uri.parse('https://1.chat.example'),\n@@ -868,15 +900,15 @@ void main() {\n receiveFcmMessage(async, data1);\n receiveFcmMessage(async, data2);\n check(testBinding.androidNotificationHost.activeNotifications).deepEquals(>[\n- conditionActiveNotif(data1, 'stream:${stream.streamId}:$topic'),\n+ conditionActiveNotif(data1, conversationKey),\n conditionSummaryActiveNotif(groupKey1),\n- conditionActiveNotif(data2, 'stream:${stream.streamId}:$topic'),\n+ conditionActiveNotif(data2, conversationKey),\n conditionSummaryActiveNotif(groupKey2),\n ]);\n \n receiveFcmMessage(async, removeFcmMessage([message1], account: account1));\n check(testBinding.androidNotificationHost.activeNotifications).deepEquals(>[\n- conditionActiveNotif(data2, 'stream:${stream.streamId}:$topic'),\n+ conditionActiveNotif(data2, conversationKey),\n conditionSummaryActiveNotif(groupKey2),\n ]);\n \n@@ -889,6 +921,7 @@ void main() {\n final realmUrl = eg.realmUrl;\n final stream = eg.stream();\n const topic = 'Some Topic';\n+ final conversationKey = 'stream:${stream.streamId}:some topic';\n \n final account1 = eg.account(id: 1001, user: eg.user(userId: 1001), realmUrl: realmUrl);\n final message1 = eg.streamMessage(id: 1000, stream: stream, topic: topic);\n@@ -907,15 +940,15 @@ void main() {\n receiveFcmMessage(async, data1);\n receiveFcmMessage(async, data2);\n check(testBinding.androidNotificationHost.activeNotifications).deepEquals(>[\n- conditionActiveNotif(data1, 'stream:${stream.streamId}:$topic'),\n+ conditionActiveNotif(data1, conversationKey),\n conditionSummaryActiveNotif(groupKey1),\n- conditionActiveNotif(data2, 'stream:${stream.streamId}:$topic'),\n+ conditionActiveNotif(data2, conversationKey),\n conditionSummaryActiveNotif(groupKey2),\n ]);\n \n receiveFcmMessage(async, removeFcmMessage([message1], account: account1));\n check(testBinding.androidNotificationHost.activeNotifications).deepEquals(>[\n- conditionActiveNotif(data2, 'stream:${stream.streamId}:$topic'),\n+ conditionActiveNotif(data2, conversationKey),\n conditionSummaryActiveNotif(groupKey2),\n ]);\n \n@@ -1116,7 +1149,7 @@ void main() {\n payload = NotificationOpenPayload(\n realmUrl: Uri.parse('http://chat.example'),\n userId: 1001,\n- narrow: const TopicNarrow(1, 'topic A'),\n+ narrow: eg.topicNarrow(1, 'topic A'),\n );\n url = payload.buildUrl();\n check(NotificationOpenPayload.parseUrl(url))\n@@ -1146,7 +1179,7 @@ void main() {\n final url = NotificationOpenPayload(\n realmUrl: Uri.parse('http://chat.example'),\n userId: 1001,\n- narrow: const TopicNarrow(1, 'topic A'),\n+ narrow: eg.topicNarrow(1, 'topic A'),\n ).buildUrl();\n check(url)\n ..scheme.equals('zulip')\n@@ -1194,7 +1227,7 @@ void main() {\n ..userId.equals(1001)\n ..narrow.which((it) => it.isA()\n ..streamId.equals(1)\n- ..topic.equals('topic A'));\n+ ..topic.equals(eg.t('topic A')));\n });\n \n test('parse: fails when missing any expected query parameters', () {\ndiff --git a/test/widgets/action_sheet_test.dart b/test/widgets/action_sheet_test.dart\nindex cf19bc3e9f..c10957363e 100644\n--- a/test/widgets/action_sheet_test.dart\n+++ b/test/widgets/action_sheet_test.dart\n@@ -145,7 +145,7 @@ void main() {\n foundOldest: true, messages: [message]).toJson());\n await tester.pumpWidget(TestZulipApp(accountId: eg.selfAccount.id,\n child: MessageListPage(\n- initNarrow: TopicNarrow(channel.streamId, topic))));\n+ initNarrow: eg.topicNarrow(channel.streamId, topic))));\n // global store, per-account store, and message list get loaded\n await tester.pumpAndSettle();\n \n@@ -214,7 +214,7 @@ void main() {\n eg.streamMessage(stream: channel, topic: topic)]).toJson());\n await tester.pumpWidget(TestZulipApp(accountId: account.id,\n child: MessageListPage(\n- initNarrow: TopicNarrow(channel.streamId, topic))));\n+ initNarrow: eg.topicNarrow(channel.streamId, topic))));\n await tester.pumpAndSettle();\n \n await tester.longPress(find.descendant(\n@@ -809,7 +809,7 @@ void main() {\n connection.prepare(json: eg.newestGetMessagesResult(\n foundOldest: true, messages: [message]).toJson());\n await store.handleEvent(eg.updateMessageEventMoveFrom(\n- newStreamId: newStream.streamId, newTopic: newTopic,\n+ newStreamId: newStream.streamId, newTopicStr: newTopic,\n propagateMode: PropagateMode.changeAll,\n origMessages: [message]));\n \n@@ -823,7 +823,7 @@ void main() {\n ..method.equals('POST')\n ..url.path.equals('/api/v1/messages/flags/narrow')\n ..bodyFields['narrow'].equals(\n- jsonEncode(TopicNarrow(newStream.streamId, newTopic).apiEncode()));\n+ jsonEncode(eg.topicNarrow(newStream.streamId, newTopic).apiEncode()));\n });\n \n testWidgets('shows error when fails', (tester) async {\ndiff --git a/test/widgets/autocomplete_test.dart b/test/widgets/autocomplete_test.dart\nindex 24ae2dba83..a3a4b3c5f7 100644\n--- a/test/widgets/autocomplete_test.dart\n+++ b/test/widgets/autocomplete_test.dart\n@@ -17,6 +17,7 @@ import 'package:zulip/widgets/message_list.dart';\n \n import '../api/fake_api.dart';\n import '../example_data.dart' as eg;\n+import '../flutter_checks.dart';\n import '../model/binding.dart';\n import '../model/test_store.dart';\n import '../test_images.dart';\n@@ -273,7 +274,7 @@ void main() {\n \n group('TopicAutocomplete', () {\n void checkTopicShown(GetStreamTopicsEntry topic, PerAccountStore store, {required bool expected}) {\n- check(find.text(topic.name).evaluate().length).equals(expected ? 1 : 0);\n+ check(find.text(topic.name.displayName).evaluate().length).equals(expected ? 1 : 0);\n }\n \n testWidgets('options appear, disappear, and change correctly', (WidgetTester tester) async {\n@@ -298,7 +299,7 @@ void main() {\n await tester.tap(find.text('Topic three'));\n await tester.pumpAndSettle();\n check(tester.widget(topicInputFinder).controller!.text)\n- .equals(topic3.name);\n+ .equals(topic3.name.displayName);\n checkTopicShown(topic1, store, expected: false);\n checkTopicShown(topic2, store, expected: false);\n checkTopicShown(topic3, store, expected: true); // shown in `_TopicInput` once\n@@ -309,5 +310,36 @@ void main() {\n await tester.pumpAndSettle();\n checkTopicShown(topic2, store, expected: true);\n });\n+\n+ testWidgets('text selection is reset on choosing an option', (tester) async {\n+ // TODO test also that composing region gets reset.\n+ // (Just adding it to the updateEditingValue call below doesn't seem\n+ // to suffice to set it up; the controller value after the pump still\n+ // has empty composing region, so there's nothing to check after tap.)\n+\n+ final topic = eg.getStreamTopicsEntry(name: 'some topic');\n+ final topicInputFinder = await setupToTopicInput(tester, topics: [topic]);\n+ final controller = tester.widget(topicInputFinder).controller!;\n+\n+ await tester.enterText(topicInputFinder, 'so');\n+ await tester.enterText(topicInputFinder, 'some');\n+ tester.testTextInput.updateEditingValue(const TextEditingValue(\n+ text: 'some',\n+ selection: TextSelection(baseOffset: 1, extentOffset: 3)));\n+ await tester.pump();\n+ check(controller.value)\n+ ..text.equals('some')\n+ ..selection.equals(\n+ const TextSelection(baseOffset: 1, extentOffset: 3));\n+\n+ await tester.tap(find.text('some topic'));\n+ await tester.pump();\n+ check(controller.value)\n+ ..text.equals('some topic')\n+ ..selection.equals(\n+ const TextSelection.collapsed(offset: 'some topic'.length));\n+\n+ await tester.pump(Duration.zero);\n+ });\n });\n }\ndiff --git a/test/widgets/compose_box_test.dart b/test/widgets/compose_box_test.dart\nindex 077134e7d1..cde7133d74 100644\n--- a/test/widgets/compose_box_test.dart\n+++ b/test/widgets/compose_box_test.dart\n@@ -230,14 +230,14 @@ void main() {\n testWidgets('_FixedDestinationComposeBox', (tester) async {\n final channel = eg.stream();\n await prepareComposeBox(tester,\n- narrow: TopicNarrow(channel.streamId, 'topic'), streams: [channel]);\n+ narrow: eg.topicNarrow(channel.streamId, 'topic'), streams: [channel]);\n checkComposeBoxTextFields(tester, expectTopicTextField: false);\n });\n });\n \n group('ComposeBox typing notices', () {\n final channel = eg.stream();\n- final narrow = TopicNarrow(channel.streamId, 'some topic');\n+ final narrow = eg.topicNarrow(channel.streamId, 'some topic');\n \n void checkTypingRequest(TypingOp op, SendableNarrow narrow) =>\n checkSetTypingStatusRequests(connection.takeRequests(), [(op, narrow)]);\n@@ -272,9 +272,9 @@ void main() {\n \n testWidgets('smoke ChannelNarrow', (tester) async {\n final narrow = ChannelNarrow(channel.streamId);\n- final destinationNarrow = TopicNarrow(narrow.streamId, 'test topic');\n+ final destinationNarrow = eg.topicNarrow(narrow.streamId, 'test topic');\n await prepareComposeBox(tester, narrow: narrow, streams: [channel]);\n- await enterTopic(tester, narrow: narrow, topic: destinationNarrow.topic);\n+ await enterTopic(tester, narrow: narrow, topic: 'test topic');\n \n await checkStartTyping(tester, destinationNarrow);\n \n@@ -339,9 +339,9 @@ void main() {\n \n testWidgets('for content input, unfocusing sends a \"typing stopped\" notice', (tester) async {\n final narrow = ChannelNarrow(channel.streamId);\n- final destinationNarrow = TopicNarrow(narrow.streamId, 'test topic');\n+ final destinationNarrow = eg.topicNarrow(narrow.streamId, 'test topic');\n await prepareComposeBox(tester, narrow: narrow, streams: [channel]);\n- await enterTopic(tester, narrow: narrow, topic: destinationNarrow.topic);\n+ await enterTopic(tester, narrow: narrow, topic: 'test topic');\n \n await checkStartTyping(tester, destinationNarrow);\n \n@@ -402,7 +402,7 @@ void main() {\n addTearDown(TypingNotifier.debugReset);\n \n final zulipLocalizations = GlobalLocalizations.zulipLocalizations;\n- await prepareComposeBox(tester, narrow: const TopicNarrow(123, 'some topic'),\n+ await prepareComposeBox(tester, narrow: eg.topicNarrow(123, 'some topic'),\n streams: [eg.stream(streamId: 123)]);\n \n await tester.enterText(contentInputFinder, 'hello world');\n@@ -708,7 +708,7 @@ void main() {\n \n final narrowTestCases = [\n ('channel', const ChannelNarrow(1)),\n- ('topic', const TopicNarrow(1, 'topic')),\n+ ('topic', eg.topicNarrow(1, 'topic')),\n ];\n \n for (final (String narrowType, Narrow narrow) in narrowTestCases) {\n@@ -802,7 +802,7 @@ void main() {\n group('ComposeBox content input scaling', () {\n const verticalPadding = 8;\n final stream = eg.stream();\n- final narrow = TopicNarrow(stream.streamId, 'foo');\n+ final narrow = eg.topicNarrow(stream.streamId, 'foo');\n \n Future checkContentInputMaxHeight(WidgetTester tester, {\n required double maxHeight,\ndiff --git a/test/widgets/message_list_test.dart b/test/widgets/message_list_test.dart\nindex b1f443c8b5..c220dc0e0c 100644\n--- a/test/widgets/message_list_test.dart\n+++ b/test/widgets/message_list_test.dart\n@@ -138,7 +138,7 @@ void main() {\n final navObserver = TestNavigatorObserver()\n ..onPushed = (route, prevRoute) => pushedRoutes.add(route);\n final channel = eg.stream();\n- await setupMessageListPage(tester, narrow: TopicNarrow(channel.streamId, 'hi'),\n+ await setupMessageListPage(tester, narrow: eg.topicNarrow(channel.streamId, 'hi'),\n navObservers: [navObserver],\n streams: [channel], messageCount: 1);\n \n@@ -157,7 +157,7 @@ void main() {\n final channel = eg.stream();\n const topic = 'topic';\n await setupMessageListPage(tester,\n- narrow: TopicNarrow(channel.streamId, topic),\n+ narrow: eg.topicNarrow(channel.streamId, topic),\n streams: [channel], subscriptions: [eg.subscription(channel)],\n messageCount: 1);\n await store.handleEvent(eg.userTopicEvent(\n@@ -661,7 +661,7 @@ void main() {\n const topic = 'foo';\n final channel = eg.stream();\n final otherChannel = eg.stream();\n- final narrow = TopicNarrow(channel.streamId, topic);\n+ final narrow = eg.topicNarrow(channel.streamId, topic);\n \n void prepareGetMessageResponse(List messages) {\n connection.prepare(json: eg.newestGetMessagesResult(\n@@ -671,7 +671,7 @@ void main() {\n void handleMessageMoveEvent(List messages, String newTopic, {int? newChannelId}) {\n store.handleEvent(eg.updateMessageEventMoveFrom(\n origMessages: messages,\n- newTopic: newTopic,\n+ newTopicStr: newTopic,\n newStreamId: newChannelId,\n propagateMode: PropagateMode.changeAll));\n }\n@@ -749,7 +749,8 @@ void main() {\n group('recipient headers', () {\n group('StreamMessageRecipientHeader', () {\n final stream = eg.stream(name: 'stream name');\n- final message = eg.streamMessage(stream: stream, topic: 'topic name');\n+ const topic = 'topic name';\n+ final message = eg.streamMessage(stream: stream, topic: topic);\n \n FinderResult findInMessageList(String text) {\n // Stream name shows up in [AppBar] so need to avoid matching that\n@@ -808,7 +809,7 @@ void main() {\n narrow: const CombinedFeedNarrow(),\n messages: [message], subscriptions: [eg.subscription(stream)]);\n await store.handleEvent(eg.userTopicEvent(\n- stream.streamId, message.topic, UserTopicVisibilityPolicy.followed));\n+ stream.streamId, topic, UserTopicVisibilityPolicy.followed));\n await tester.pump();\n check(find.descendant(\n of: find.byType(MessageList),\n@@ -820,7 +821,7 @@ void main() {\n narrow: TopicNarrow.ofMessage(message),\n messages: [message], subscriptions: [eg.subscription(stream, isMuted: true)]);\n await store.handleEvent(eg.userTopicEvent(\n- stream.streamId, message.topic, UserTopicVisibilityPolicy.unmuted));\n+ stream.streamId, topic, UserTopicVisibilityPolicy.unmuted));\n await tester.pump();\n check(find.descendant(\n of: find.byType(MessageList),\n@@ -1134,7 +1135,7 @@ void main() {\n checkMarkersCount(edited: 1, moved: 0);\n \n await store.handleEvent(eg.updateMessageEventMoveFrom(\n- origMessages: [message, message2], newTopic: 'new'));\n+ origMessages: [message, message2], newTopicStr: 'new'));\n await tester.pump();\n checkMarkersCount(edited: 1, moved: 1);\n \ndiff --git a/test/widgets/subscription_list_test.dart b/test/widgets/subscription_list_test.dart\nindex 9439bac865..a58124a533 100644\n--- a/test/widgets/subscription_list_test.dart\n+++ b/test/widgets/subscription_list_test.dart\n@@ -155,7 +155,7 @@ void main() {\n testWidgets('unread badge shows with unreads', (tester) async {\n final stream = eg.stream();\n final unreadMsgs = eg.unreadMsgs(channels: [\n- UnreadChannelSnapshot(streamId: stream.streamId, topic: 'a', unreadMessageIds: [1, 2]),\n+ eg.unreadChannelMsgs(streamId: stream.streamId, topic: 'a', unreadMessageIds: [1, 2]),\n ]);\n await setupStreamListPage(tester, subscriptions: [\n eg.subscription(stream),\n@@ -167,14 +167,14 @@ void main() {\n testWidgets('unread badge counts unmuted only', (tester) async {\n final stream = eg.stream();\n final unreadMsgs = eg.unreadMsgs(channels: [\n- UnreadChannelSnapshot(streamId: stream.streamId, topic: 'a', unreadMessageIds: [1, 2]),\n- UnreadChannelSnapshot(streamId: stream.streamId, topic: 'b', unreadMessageIds: [3]),\n+ eg.unreadChannelMsgs(streamId: stream.streamId, topic: 'a', unreadMessageIds: [1, 2]),\n+ eg.unreadChannelMsgs(streamId: stream.streamId, topic: 'b', unreadMessageIds: [3]),\n ]);\n await setupStreamListPage(tester,\n subscriptions: [eg.subscription(stream, isMuted: true)],\n userTopics: [UserTopicItem(\n streamId: stream.streamId,\n- topicName: 'b',\n+ topicName: eg.t('b'),\n lastUpdated: 1234567890,\n visibilityPolicy: UserTopicVisibilityPolicy.unmuted,\n )],\n@@ -198,7 +198,7 @@ void main() {\n testWidgets('muted unread badge shows when unreads are visible in channel but not inbox', (tester) async {\n final stream = eg.stream();\n final unreadMsgs = eg.unreadMsgs(channels: [\n- UnreadChannelSnapshot(streamId: stream.streamId, topic: 'b', unreadMessageIds: [3]),\n+ eg.unreadChannelMsgs(streamId: stream.streamId, topic: 'b', unreadMessageIds: [3]),\n ]);\n await setupStreamListPage(tester,\n subscriptions: [eg.subscription(stream, isMuted: true)],\n@@ -211,7 +211,7 @@ void main() {\n testWidgets('muted unread badge does not show when unreads are visible in both channel & inbox', (tester) async {\n final stream = eg.stream();\n final unreadMsgs = eg.unreadMsgs(channels: [\n- UnreadChannelSnapshot(streamId: stream.streamId, topic: 'b', unreadMessageIds: [3]),\n+ eg.unreadChannelMsgs(streamId: stream.streamId, topic: 'b', unreadMessageIds: [3]),\n ]);\n await setupStreamListPage(tester,\n subscriptions: [eg.subscription(stream, isMuted: false)],\n@@ -224,7 +224,7 @@ void main() {\n testWidgets('muted unread badge does not show when unreads are not visible in channel nor inbox', (tester) async {\n final stream = eg.stream();\n final unreadMsgs = eg.unreadMsgs(channels: [\n- UnreadChannelSnapshot(streamId: stream.streamId, topic: 'b', unreadMessageIds: [3]),\n+ eg.unreadChannelMsgs(streamId: stream.streamId, topic: 'b', unreadMessageIds: [3]),\n ]);\n await setupStreamListPage(tester,\n subscriptions: [eg.subscription(stream, isMuted: true)],\n@@ -237,7 +237,7 @@ void main() {\n testWidgets('color propagates to icon and badge', (tester) async {\n final stream = eg.stream();\n final unreadMsgs = eg.unreadMsgs(channels: [\n- UnreadChannelSnapshot(streamId: stream.streamId, topic: 'a', unreadMessageIds: [1, 2]),\n+ eg.unreadChannelMsgs(streamId: stream.streamId, topic: 'a', unreadMessageIds: [1, 2]),\n ]);\n final subscription = eg.subscription(stream, color: Colors.red.argbInt);\n final swatch = ChannelColorSwatch.light(subscription.color);\n@@ -275,8 +275,8 @@ void main() {\n eg.userTopicItem(stream2, 'b', UserTopicVisibilityPolicy.unmuted),\n ],\n unreadMsgs: eg.unreadMsgs(channels: [\n- UnreadChannelSnapshot(streamId: stream1.streamId, topic: 'a', unreadMessageIds: [1, 2]),\n- UnreadChannelSnapshot(streamId: stream2.streamId, topic: 'b', unreadMessageIds: [3]),\n+ eg.unreadChannelMsgs(streamId: stream1.streamId, topic: 'a', unreadMessageIds: [1, 2]),\n+ eg.unreadChannelMsgs(streamId: stream2.streamId, topic: 'b', unreadMessageIds: [3]),\n ]),\n );\n \n@@ -310,10 +310,10 @@ void main() {\n eg.userTopicItem(mutedStreamWithNoUnmutedUnreads, 'd', UserTopicVisibilityPolicy.muted),\n ],\n unreadMsgs: eg.unreadMsgs(channels: [\n- UnreadChannelSnapshot(streamId: unmutedStreamWithUnmutedUnreads.streamId, topic: 'a', unreadMessageIds: [1]),\n- UnreadChannelSnapshot(streamId: unmutedStreamWithNoUnmutedUnreads.streamId, topic: 'b', unreadMessageIds: [2]),\n- UnreadChannelSnapshot(streamId: mutedStreamWithUnmutedUnreads.streamId, topic: 'c', unreadMessageIds: [3]),\n- UnreadChannelSnapshot(streamId: mutedStreamWithNoUnmutedUnreads.streamId, topic: 'd', unreadMessageIds: [4]),\n+ eg.unreadChannelMsgs(streamId: unmutedStreamWithUnmutedUnreads.streamId, topic: 'a', unreadMessageIds: [1]),\n+ eg.unreadChannelMsgs(streamId: unmutedStreamWithNoUnmutedUnreads.streamId, topic: 'b', unreadMessageIds: [2]),\n+ eg.unreadChannelMsgs(streamId: mutedStreamWithUnmutedUnreads.streamId, topic: 'c', unreadMessageIds: [3]),\n+ eg.unreadChannelMsgs(streamId: mutedStreamWithNoUnmutedUnreads.streamId, topic: 'd', unreadMessageIds: [4]),\n ]),\n );\n \n", "n2p_tests": "{\"/home/zulip-flutter/test/api/model/events_test.dart: user_settings: all known settings have event handling\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: MessageEditState topic resolved in edit history Topic was resolved but it also moved in the history -> moved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: Message match_subject -> matchTopic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message orig_subject -> origTopic, subject -> newTopic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: typing status event private -> direct\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: typing status event direct type sort recipient ids\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: MessageEditState edit history exists Both topic and content changed in a single edit -> edited\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: User is_system_bot\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/notifications_test.dart: MessageFcmMessage obsolete or novel fields have no effect\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: MessageEditState edit history exists Moved message has last edit timestamp but no actual edits -> moved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: DmMessage displayRecipient\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/notifications_test.dart: MessageFcmMessage parse failures on malformed 'message' 3\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: Subscription converts color to int\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: subscription/remove: deserialize stream_ids correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/notifications_test.dart: MessageFcmMessage parse failures on malformed 'message' 6\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/notifications_test.dart: FcmMessage parse fails on missing or bad event type\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: MessageEditState topic resolved in edit history Topic was moved but it also was resolved in the history -> moved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: MessageEditState edit history exists 'prev_topic' present without the 'topic' field -> moved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: MessageEditState Edit history is absent Message with no evidence of an edit history -> none\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/notifications_test.dart: MessageFcmMessage parse failures on malformed 'message' 4\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/notifications_test.dart: MessageFcmMessage ignored fields missing have no effect\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: MessageEditState edit history exists Topic name change only -> moved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: MessageEditState edit history exists Channel change only -> moved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: MessageEditState topic resolved in edit history Topic was only resolved -> none\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: delete_message: require streamId and topic for stream messages\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: MessageEditState edit history exists Both topic and content changed -> edited\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/notifications_test.dart: MessageFcmMessage parse failures on malformed 'message' 5\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/initial_snapshot_test.dart: UnreadDmSnapshot: require sorted unreadMessageIds\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: realm_user/update delivery_email absent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: MessageEditState Edit history is absent Message without edit history has last edit timestamp -> edited\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/notifications_test.dart: MessageFcmMessage optional fields missing cause no error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/initial_snapshot_test.dart: UnreadMessagesSnapshot from json recognizes channels as streams\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/initial_snapshot_test.dart: UnreadChannelSnapshot: require sorted unreadMessageIds\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: MessageEditState topic resolved in edit history Unresolving topic with a weird prefix -> moved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: subscription/update: convert color correctly\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: typing status event stream type missing streamId/topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: Message require displayRecipient on parse\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: User profile_data\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/notifications_test.dart: MessageFcmMessage fields get parsed right in happy path\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: MessageEditState edit history exists Content change only -> edited\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: User delivery_email\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: MessageEditState topic resolved in edit history Topic was resolved but the content changed in the history -> edited\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: Message no crash on unrecognized flag\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: MessageEditState edit history exists 'prev_subject' present from a pre-5.0 server -> moved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/initial_snapshot_test.dart: UnreadHuddleSnapshot: require sorted unreadMessageIds\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message_flags/remove private -> direct\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message stream_id -> origStreamId\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/notifications_test.dart: MessageFcmMessage toJson round-trips\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: CustomProfileFieldChoiceDataItem\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: typing status event private type missing recipient\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/notifications_test.dart: MessageFcmMessage parse failures on malformed 'message' 1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: realm_user/update delivery_email a string\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: message: move flags into message object\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: realm_user/update delivery_email null\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/notifications_test.dart: MessageFcmMessage uses deprecated fields when newer fields are missing\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: delete_message: private -> direct\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: DmMessage allRecipientIds\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message_flags/remove require messageDetails in mark-as-unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/model_test.dart: Message subject -> topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/notifications_test.dart: MessageFcmMessage parse failures on malformed 'message' 2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: typing status event direct message typing events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1239", "org": "zulip", "repo": "zulip-flutter", "number": 1239, "state": "closed", "title": "compose: Enforce max topic/content length by code points, following API", "body": "Fixes #1238.\r\n\r\nDone by computing `String.runes` (the number of Unicode code points) unless we know that the result can't exceed the threshold number of code points. In particular, we don't compute it unless `String.length` (the number of UTF-16 code units) exceeds the threshold number of code points.", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"70343d4c3baa709d87c3ba381923a50cfccb1106\"}", "resolved_issues": "[{\"number\": 1238, \"title\": \"compose: Enforce max topic/content length by Unicode code points, not UTF-16 code units\", \"body\": \"We have this comment where we decide if the content input is too long:\\r\\n\\r\\n```dart\\r\\n // normalized.length is the number of UTF-16 code units, while the server\\r\\n // API expresses the max in Unicode code points. So this comparison will\\r\\n // be conservative and may cut the user off shorter than necessary.\\r\\n if (textNormalized.length > kMaxMessageLengthCodePoints)\\r\\n```\\r\\n\\r\\nThis issue is to stop cutting the user off shorter than necessary, while not regressing on performance in the common case where the length isn't approaching the limit.\\r\\n\\r\\nThis applies equally to topic lengths, where the server limit is also expressed in Unicode code points. For example, on CZO where the topic limit is 60 code points, we're not accepting '\\ud83d\\udc68\\u200d\\ud83d\\udc69\\u200d\\ud83d\\udc66\\ud83d\\udc68\\u200d\\ud83d\\udc69\\u200d\\ud83d\\udc66\\ud83d\\udc68\\u200d\\ud83d\\udc69\\u200d\\ud83d\\udc66\\ud83d\\udc68\\u200d\\ud83d\\udc69\\u200d\\ud83d\\udc66\\ud83d\\udc68\\u200d\\ud83d\\udc69\\u200d\\ud83d\\udc66\\ud83d\\udc68\\u200d\\ud83d\\udc69\\u200d\\ud83d\\udc66\\ud83d\\udc68\\u200d\\ud83d\\udc69\\u200d\\ud83d\\udc66\\ud83d\\udc68\\u200d\\ud83d\\udc69\\u200d\\ud83d\\udc66\\ud83d\\udc68\\u200d\\ud83d\\udc69\\u200d\\ud83d\\udc66\\ud83d\\udc68\\u200d\\ud83d\\udc69\\u200d\\ud83d\\udc66\\ud83d\\udc68\\u200d\\ud83d\\udc69\\u200d\\ud83d\\udc66\\ud83d\\udc68\\u200d\\ud83d\\udc69\\u200d\\ud83d\\udc66' (60 code points), but we should accept it because the server does.\"}]", "lang": "dart", "problem_statement": "compose: Enforce max topic/content length by Unicode code points, not UTF-16 code units\nWe have this comment where we decide if the content input is too long:\r\n\r\n```dart\r\n // normalized.length is the number of UTF-16 code units, while the server\r\n // API expresses the max in Unicode code points. So this comparison will\r\n // be conservative and may cut the user off shorter than necessary.\r\n if (textNormalized.length > kMaxMessageLengthCodePoints)\r\n```\r\n\r\nThis issue is to stop cutting the user off shorter than necessary, while not regressing on performance in the common case where the length isn't approaching the limit.\r\n\r\nThis applies equally to topic lengths, where the server limit is also expressed in Unicode code points. For example, on CZO where the topic limit is 60 code points, we're not accepting '\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66' (60 code points), but we should accept it because the server does.\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/1239", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1238\"]", "test_command": "flutter test test/widgets/app_test.dart test/widgets/compose_box_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/api/route/messages.dart b/lib/api/route/messages.dart\nindex 3374741c51..be6728c790 100644\n--- a/lib/api/route/messages.dart\n+++ b/lib/api/route/messages.dart\n@@ -156,7 +156,7 @@ class GetMessagesResult {\n }\n \n // https://zulip.com/api/send-message#parameter-topic\n-const int kMaxTopicLength = 60;\n+const int kMaxTopicLengthCodePoints = 60;\n \n // https://zulip.com/api/send-message#parameter-content\n const int kMaxMessageLengthCodePoints = 10000;\ndiff --git a/lib/widgets/compose_box.dart b/lib/widgets/compose_box.dart\nindex 83d923b6b8..d279c404ad 100644\n--- a/lib/widgets/compose_box.dart\n+++ b/lib/widgets/compose_box.dart\n@@ -28,10 +28,31 @@ const double _composeButtonSize = 44;\n ///\n /// Subclasses must ensure that [_update] is called in all exposed constructors.\n abstract class ComposeController extends TextEditingController {\n+ int get maxLengthUnicodeCodePoints;\n+\n String get textNormalized => _textNormalized;\n late String _textNormalized;\n String _computeTextNormalized();\n \n+ /// Length of [textNormalized] in Unicode code points\n+ /// if it might exceed [maxLengthUnicodeCodePoints], else null.\n+ ///\n+ /// Use this instead of [String.length]\n+ /// to enforce a max length expressed in code points.\n+ /// [String.length] is conservative and may cut the user off too short.\n+ ///\n+ /// Counting code points ([String.runes])\n+ /// is more expensive than getting the number of UTF-16 code units\n+ /// ([String.length]), so we avoid it when the result definitely won't exceed\n+ /// [maxLengthUnicodeCodePoints].\n+ late int? _lengthUnicodeCodePointsIfLong;\n+ @visibleForTesting\n+ int? get debugLengthUnicodeCodePointsIfLong => _lengthUnicodeCodePointsIfLong;\n+ int? _computeLengthUnicodeCodePointsIfLong() =>\n+ _textNormalized.length > maxLengthUnicodeCodePoints\n+ ? _textNormalized.runes.length\n+ : null;\n+\n List get validationErrors => _validationErrors;\n late List _validationErrors;\n List _computeValidationErrors();\n@@ -40,6 +61,8 @@ abstract class ComposeController extends TextEditingController {\n \n void _update() {\n _textNormalized = _computeTextNormalized();\n+ // uses _textNormalized, so comes after _computeTextNormalized()\n+ _lengthUnicodeCodePointsIfLong = _computeLengthUnicodeCodePointsIfLong();\n _validationErrors = _computeValidationErrors();\n hasValidationErrors.value = _validationErrors.isNotEmpty;\n }\n@@ -74,6 +97,9 @@ class ComposeTopicController extends ComposeController {\n // https://zulip.com/help/require-topics\n final mandatory = true;\n \n+ // TODO(#307) use `max_topic_length` instead of hardcoded limit\n+ @override final maxLengthUnicodeCodePoints = kMaxTopicLengthCodePoints;\n+\n @override\n String _computeTextNormalized() {\n String trimmed = text.trim();\n@@ -85,7 +111,11 @@ class ComposeTopicController extends ComposeController {\n return [\n if (mandatory && textNormalized == kNoTopicTopic)\n TopicValidationError.mandatoryButEmpty,\n- if (textNormalized.length > kMaxTopicLength)\n+\n+ if (\n+ _lengthUnicodeCodePointsIfLong != null\n+ && _lengthUnicodeCodePointsIfLong! > maxLengthUnicodeCodePoints\n+ )\n TopicValidationError.tooLong,\n ];\n }\n@@ -120,6 +150,9 @@ class ComposeContentController extends ComposeController\n _update();\n }\n \n+ // TODO(#1237) use `max_message_length` instead of hardcoded limit\n+ @override final maxLengthUnicodeCodePoints = kMaxMessageLengthCodePoints;\n+\n int _nextQuoteAndReplyTag = 0;\n int _nextUploadTag = 0;\n \n@@ -261,10 +294,10 @@ class ComposeContentController extends ComposeController\n if (textNormalized.isEmpty)\n ContentValidationError.empty,\n \n- // normalized.length is the number of UTF-16 code units, while the server\n- // API expresses the max in Unicode code points. So this comparison will\n- // be conservative and may cut the user off shorter than necessary.\n- if (textNormalized.length > kMaxMessageLengthCodePoints)\n+ if (\n+ _lengthUnicodeCodePointsIfLong != null\n+ && _lengthUnicodeCodePointsIfLong! > maxLengthUnicodeCodePoints\n+ )\n ContentValidationError.tooLong,\n \n if (_quoteAndReplies.isNotEmpty)\n", "test_patch": "diff --git a/test/widgets/app_test.dart b/test/widgets/app_test.dart\nindex 8c992533ee..af386bfdf1 100644\n--- a/test/widgets/app_test.dart\n+++ b/test/widgets/app_test.dart\n@@ -280,14 +280,14 @@ void main() {\n check(ZulipApp.ready).value.isFalse();\n await tester.pump();\n check(findSnackBarByText(message).evaluate()).isEmpty();\n- check(find.byType(AlertDialog).evaluate()).isEmpty();\n+ checkNoErrorDialog(tester);\n \n check(ZulipApp.ready).value.isTrue();\n // After app startup, reportErrorToUserBriefly displays a SnackBar.\n reportErrorToUserBriefly(message, details: details);\n await tester.pumpAndSettle();\n check(findSnackBarByText(message).evaluate()).single;\n- check(find.byType(AlertDialog).evaluate()).isEmpty();\n+ checkNoErrorDialog(tester);\n \n // Open the error details dialog.\n await tester.tap(find.text('Details'));\ndiff --git a/test/widgets/compose_box_test.dart b/test/widgets/compose_box_test.dart\nindex cde7133d74..96bc6cb837 100644\n--- a/test/widgets/compose_box_test.dart\n+++ b/test/widgets/compose_box_test.dart\n@@ -41,9 +41,6 @@ void main() {\n late FakeApiConnection connection;\n late ComposeBoxController? controller;\n \n- final contentInputFinder = find.byWidgetPredicate(\n- (widget) => widget is TextField && widget.controller is ComposeContentController);\n-\n Future prepareComposeBox(WidgetTester tester, {\n required Narrow narrow,\n User? selfUser,\n@@ -80,6 +77,7 @@ void main() {\n controller = tester.state(find.byType(ComposeBox)).controller;\n }\n \n+ /// Set the topic input's text to [topic], using [WidgetTester.enterText].\n Future enterTopic(WidgetTester tester, {\n required ChannelNarrow narrow,\n required String topic,\n@@ -95,6 +93,23 @@ void main() {\n ..url.path.equals('/api/v1/users/me/${narrow.streamId}/topics');\n }\n \n+ /// A [Finder] for the content input.\n+ ///\n+ /// To enter some text, use [enterContent].\n+ final contentInputFinder = find.byWidgetPredicate(\n+ (widget) => widget is TextField && widget.controller is ComposeContentController);\n+\n+ /// Set the content input's text to [content], using [WidgetTester.enterText].\n+ Future enterContent(WidgetTester tester, String content) async {\n+ await tester.enterText(contentInputFinder, content);\n+ }\n+\n+ Future tapSendButton(WidgetTester tester) async {\n+ connection.prepare(json: SendMessageResult(id: 123).toJson());\n+ await tester.tap(find.byIcon(ZulipIcons.send));\n+ await tester.pump(Duration.zero);\n+ }\n+\n group('ComposeContentController', () {\n group('insertPadded', () {\n // Like `parseMarkedText` in test/model/autocomplete_test.dart,\n@@ -197,6 +212,102 @@ void main() {\n });\n });\n \n+ group('length validation', () {\n+ final channel = eg.stream();\n+\n+ /// String where there are [n] Unicode code points,\n+ /// >[n] UTF-16 code units, and <[n] \"characters\" a.k.a. grapheme clusters.\n+ String makeStringWithCodePoints(int n) {\n+ assert(n >= 5);\n+ const graphemeCluster = '\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66';\n+ assert(graphemeCluster.runes.length == 5);\n+ assert(graphemeCluster.length == 8);\n+ assert(graphemeCluster.characters.length == 1);\n+\n+ final result =\n+ graphemeCluster * (n ~/ 5)\n+ + 'a' * (n % 5);\n+ assert(result.runes.length == n);\n+\n+ return result;\n+ }\n+\n+ group('content', () {\n+ Future prepareWithContent(WidgetTester tester, String content) async {\n+ TypingNotifier.debugEnable = false;\n+ addTearDown(TypingNotifier.debugReset);\n+\n+ final narrow = ChannelNarrow(channel.streamId);\n+ await prepareComposeBox(tester, narrow: narrow, streams: [channel]);\n+ await enterTopic(tester, narrow: narrow, topic: 'some topic');\n+ await enterContent(tester, content);\n+ }\n+\n+ Future checkErrorResponse(WidgetTester tester) async {\n+ await tester.tap(find.byWidget(checkErrorDialog(tester,\n+ expectedTitle: 'Message not sent',\n+ expectedMessage: 'Message length shouldn\\'t be greater than 10000 characters.')));\n+ }\n+\n+ testWidgets('too-long content is rejected', (tester) async {\n+ await prepareWithContent(tester,\n+ makeStringWithCodePoints(kMaxMessageLengthCodePoints + 1));\n+ await tapSendButton(tester);\n+ await checkErrorResponse(tester);\n+ });\n+\n+ testWidgets('max-length content not rejected', (tester) async {\n+ await prepareWithContent(tester,\n+ makeStringWithCodePoints(kMaxMessageLengthCodePoints));\n+ await tapSendButton(tester);\n+ checkNoErrorDialog(tester);\n+ });\n+\n+ testWidgets('code points not counted unnecessarily', (tester) async {\n+ await prepareWithContent(tester, 'a' * kMaxMessageLengthCodePoints);\n+ check(controller!.content.debugLengthUnicodeCodePointsIfLong).isNull();\n+ });\n+ });\n+\n+ group('topic', () {\n+ Future prepareWithTopic(WidgetTester tester, String topic) async {\n+ TypingNotifier.debugEnable = false;\n+ addTearDown(TypingNotifier.debugReset);\n+\n+ final narrow = ChannelNarrow(channel.streamId);\n+ await prepareComposeBox(tester, narrow: narrow, streams: [channel]);\n+ await enterTopic(tester, narrow: narrow, topic: topic);\n+ await enterContent(tester, 'some content');\n+ }\n+\n+ Future checkErrorResponse(WidgetTester tester) async {\n+ await tester.tap(find.byWidget(checkErrorDialog(tester,\n+ expectedTitle: 'Message not sent',\n+ expectedMessage: 'Topic length shouldn\\'t be greater than 60 characters.')));\n+ }\n+\n+ testWidgets('too-long topic is rejected', (tester) async {\n+ await prepareWithTopic(tester,\n+ makeStringWithCodePoints(kMaxTopicLengthCodePoints + 1));\n+ await tapSendButton(tester);\n+ await checkErrorResponse(tester);\n+ });\n+\n+ testWidgets('max-length topic not rejected', (tester) async {\n+ await prepareWithTopic(tester,\n+ makeStringWithCodePoints(kMaxTopicLengthCodePoints));\n+ await tapSendButton(tester);\n+ checkNoErrorDialog(tester);\n+ });\n+\n+ testWidgets('code points not counted unnecessarily', (tester) async {\n+ await prepareWithTopic(tester, 'a' * kMaxTopicLengthCodePoints);\n+ check((controller as StreamComposeBoxController)\n+ .topic.debugLengthUnicodeCodePointsIfLong).isNull();\n+ });\n+ });\n+ });\n+\n group('ComposeBox textCapitalization', () {\n void checkComposeBoxTextFields(WidgetTester tester, {\n required bool expectTopicTextField,\n@@ -244,7 +355,7 @@ void main() {\n \n Future checkStartTyping(WidgetTester tester, SendableNarrow narrow) async {\n connection.prepare(json: {});\n- await tester.enterText(contentInputFinder, 'hello world');\n+ await enterContent(tester, 'hello world');\n checkTypingRequest(TypingOp.start, narrow);\n }\n \n@@ -289,7 +400,7 @@ void main() {\n await checkStartTyping(tester, narrow);\n \n connection.prepare(json: {});\n- await tester.enterText(contentInputFinder, '');\n+ await enterContent(tester, '');\n checkTypingRequest(TypingOp.stop, narrow);\n });\n \n@@ -405,7 +516,7 @@ void main() {\n await prepareComposeBox(tester, narrow: eg.topicNarrow(123, 'some topic'),\n streams: [eg.stream(streamId: 123)]);\n \n- await tester.enterText(contentInputFinder, 'hello world');\n+ await enterContent(tester, 'hello world');\n \n prepareResponse(456);\n await tester.tap(find.byTooltip(zulipLocalizations.composeBoxSendTooltip));\n@@ -427,8 +538,7 @@ void main() {\n await setupAndTapSend(tester, prepareResponse: (int messageId) {\n connection.prepare(json: SendMessageResult(id: messageId).toJson());\n });\n- final errorDialogs = tester.widgetList(find.byType(AlertDialog));\n- check(errorDialogs).isEmpty();\n+ checkNoErrorDialog(tester);\n });\n \n testWidgets('ZulipApiException', (tester) async {\n@@ -497,8 +607,7 @@ void main() {\n check(call.allowMultiple).equals(true);\n check(call.type).equals(FileType.media);\n \n- final errorDialogs = tester.widgetList(find.byType(AlertDialog));\n- check(errorDialogs).isEmpty();\n+ checkNoErrorDialog(tester);\n \n check(controller!.content.text)\n .equals('see image: [Uploading image.jpg\u2026]()\\n\\n');\n@@ -557,8 +666,7 @@ void main() {\n check(call.source).equals(ImageSource.camera);\n check(call.requestFullMetadata).equals(false);\n \n- final errorDialogs = tester.widgetList(find.byType(AlertDialog));\n- check(errorDialogs).isEmpty();\n+ checkNoErrorDialog(tester);\n \n check(controller!.content.text)\n .equals('see image: [Uploading image.jpg\u2026]()\\n\\n');\n@@ -816,7 +924,7 @@ void main() {\n double? height;\n for (numLines = 2; numLines <= 1000; numLines++) {\n final content = List.generate(numLines, (_) => 'foo').join('\\n');\n- await tester.enterText(contentInputFinder, content);\n+ await enterContent(tester, content);\n await tester.pump();\n final newHeight = tester.getRect(contentInputFinder).height;\n if (newHeight == height) {\ndiff --git a/test/widgets/dialog_checks.dart b/test/widgets/dialog_checks.dart\nindex 504042d07e..af0c6e2963 100644\n--- a/test/widgets/dialog_checks.dart\n+++ b/test/widgets/dialog_checks.dart\n@@ -1,4 +1,6 @@\n+import 'package:checks/checks.dart';\n import 'package:flutter/material.dart';\n+import 'package:flutter_checks/flutter_checks.dart';\n import 'package:flutter_test/flutter_test.dart';\n import 'package:zulip/widgets/dialog.dart';\n \n@@ -26,6 +28,11 @@ Widget checkErrorDialog(WidgetTester tester, {\n matching: find.widgetWithText(TextButton, 'OK')));\n }\n \n+// TODO(#996) update this to check for per-platform flavors of alert dialog\n+void checkNoErrorDialog(WidgetTester tester) {\n+ check(find.byType(AlertDialog)).findsNothing();\n+}\n+\n /// In a widget test, check that [showSuggestedActionDialog] was called\n /// with the right text.\n ///\n", "n2p_tests": "{\"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation content code points not counted unnecessarily\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices smoke DmNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation topic code points not counted unnecessarily\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices clearing text sends a \\\"typing stopped\\\" notice\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users group DMs compose box replaced with a banner\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy user gains privilege -> banner is replaced with the compose box\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: uploads attach from media library success\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users 1:1 DMs active user becomes deactivated -> compose box is replaced with a banner\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices smoke TopicNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy error banner is shown in channel narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox content input scaling lower text scale factor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices for content input, unfocusing sends a \\\"typing stopped\\\" notice\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users 1:1 DMs deactivated user becomes active -> banner is replaced with the compose box\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: message-send request response success\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox content input scaling normal text scale factor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox content input scaling higher text scale factor exceeding threshold\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation topic max-length topic not rejected\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices unfocusing app sends a \\\"typing stopped\\\" notice\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy error banner is shown in topic narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy compose box is shown in topic narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices hitting send button sends a \\\"typing stopped\\\" notice\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices smoke ChannelNarrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation content too-long content is rejected\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy channel policy becomes stricter -> compose box is replaced with the banner\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices selection change sends a \\\"typing started\\\" notice\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users group DMs all deactivated users become active -> banner is replaced with the compose box\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation topic too-long topic is rejected\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation content max-length content not rejected\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox textCapitalization _FixedDestinationComposeBox\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox textCapitalization _StreamComposeBox\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: message-send request response ZulipApiException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users 1:1 DMs compose box replaced with a banner\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users group DMs at least one user becomes deactivated -> compose box is replaced with a banner\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: uploads attach from camera success\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy compose box is shown in channel narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy user loses privilege -> compose box is replaced with the banner\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox content input scaling higher text scale factor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices navigating away sends a \\\"typing stopped\\\" notice\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy channel policy becomes less strict -> banner is replaced with the compose box\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{\"/home/zulip-flutter/test/widgets/app_test.dart: scaffoldMessenger reportErrorToUserBriefly(null) does not dismiss dialog\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_test.dart: scaffoldMessenger scaffoldMessenger becomes non-null after startup\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_test.dart: scaffoldMessenger reportErrorToUserBriefly(null) does not dismiss unrelated SnackBar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_test.dart: ZulipApp initial navigation when no accounts, go to choose account\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_test.dart: scaffoldMessenger reportErrorToUserBriefly with details\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1112", "org": "zulip", "repo": "zulip-flutter", "number": 1112, "state": "closed", "title": "Rank emoji results in autocomplete", "body": "Fixes #1068.\r\n\r\nAs is, this PR applies to the results of autocomplete in the compose box (when you type a colon `:`). In combination with #1103 adding an emoji picker, it applies to the results in the emoji picker too, because that PR reuses the same autocomplete machinery.\r\n\r\nThis mimics the ranking in the web client (from [shared/src/typeahead.ts](https://github.com/zulip/zulip/blob/83a121c7e4f365d8253db251b072d0a034b87d4d/web/shared/src/typeahead.ts)) with a handful of small discrepancies. Almost all are (minor) bugs in web:\r\n```dart\r\n // Behavior differences we might copy, TODO:\r\n // * Web ranks each name of a Unicode emoji separately.\r\n // * Web recognizes a word-aligned match starting after [ /-] as well as [_].\r\n //\r\n // Behavior differences that web should probably fix, TODO(web):\r\n // * Among popular emoji with non-exact matches,\r\n // web doesn't prioritize prefix over word-aligned; we do.\r\n // (This affects just one case: for query \"o\",\r\n // we put :octopus: before :working_on_it:.)\r\n // * Web only counts an emoji as \"popular\" for ranking if the query\r\n // is a prefix of a single word in the name; so \"thumbs_\" or \"working_on_i\"\r\n // lose the ranking boost for :thumbs_up: and :working_on_it: respectively.\r\n // * Web starts with only case-sensitive exact matches (\"perfect matches\"),\r\n // and puts case-insensitive exact matches just ahead of prefix matches;\r\n // it also distinguishes prefix matches by case-sensitive vs. not.\r\n // We use case-insensitive matches throughout;\r\n // case seems unhelpful for emoji search.\r\n // * Web suppresses Unicode emoji names shadowed by a realm emoji\r\n // only if the latter is also a match for the query. That mostly works,\r\n // because emoji with the same name will mostly both match or both not;\r\n // but it breaks if the Unicode emoji was a literal match.\r\n```\r\n\r\n(There may also be differences in the base ordering within custom emoji or within Unicode emoji, seen when they match a given query equally well; I haven't yet studied those to pin them down.)\r\n\r\nThe details of this implementation work a bit differently from those in web. I think this one is easier to follow, and it's certainly more efficient. Rather than iterate through the list of candidates again and again to evaluate various criteria, partitioning into sub-lists and sub-sub-lists, for each query we\r\n* give each result a single ranking score once, based on all the criteria;\r\n* then sort by rank, using a stable sort.\r\n\r\nSimilarly, rather than check for different kinds of matches [once](https://github.com/zulip/zulip/blob/83a121c7e4f365d8253db251b072d0a034b87d4d/web/shared/src/typeahead.ts#L97-L119) to decide if the emoji matches the query at all, and [separately later](https://github.com/zulip/zulip/blob/83a121c7e4f365d8253db251b072d0a034b87d4d/web/shared/src/typeahead.ts#L225-L280) to help decide how to rank it among matching results, we check for matches just once and return an EmojiMatchQuality enum rather than just a boolean, which records the information we need for ranking too.\r\n\r\nI think the duplication of logic within the web implementation, in each of those areas, is the root cause of the bugs listed above \u2014 they're discrepancies between one part of web's logic and another, as tends to naturally arise once the same logic is repeated in multiple places in different ways.\r\n\r\n# Selected commit messages\r\n\r\nalgorithms: Add bucketSort, for stable, linear-time sorting\r\n\r\nSpecifically the sort takes linear time so long as there aren't\r\nmore than linearly-many buckets. For our immediate use case of\r\nranking emoji-autocomplete results, we'll in fact stick to a\r\nconstant number of buckets.\r\n\r\n---\r\n\r\nemoji [nfc]: Add ranking framework for emoji autocomplete results\r\n\r\n---\r\n\r\nemoji test [nfc]: Make the EmojiMatchQuality values explicit\r\n\r\nThis actually has a pretty nice effect on the readability of these\r\ntests, even at this stage where the enum isn't doing anything!\r\n\r\nSeparate from the parent commit just because this one is a\r\nbigger, and almost entirely mechanical and boring, diff.\r\n\r\n---\r\n\r\nemoji: Rank by quality of match (exact, prefix, other)\r\n\r\nFixes part of #1068.\r\n\r\n---\r\n\r\nemoji: Add list of the \"popular\" emoji\r\n\r\n---\r\n\r\nemoji: Rank \"popular\" > custom > other emoji\r\n\r\nFixes part of #1068.\r\n\r\n---\r\n\r\nemoji: Recognize word-aligned matches in ranking\r\n\r\nFixes #1068.\r\n\r\n---\r\n\r\nemoji: Order \"popular\" emoji canonically amongst themselves\r\n\r\nAs a bonus, this provides the popular emoji as candidates\r\neven when we haven't yet fetched the server's emoji data.\r\n\r\n\r\n\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"be4196efbe16a9af330510a9709a7038e039a21e\"}", "resolved_issues": "[{\"number\": 1068, \"title\": \"Rank emoji autocomplete results\", \"body\": \"For the initial implementation of #670, there won't be a useful ordering to the results. This means a user might have to type a longer, more specific query to find their desired emoji than they might with good ranking.\\r\\n\\r\\nThis issue is for ranking the results. The ranking should match what the web app does:\\r\\nhttps://github.com/zulip/zulip/blob/65f05794e/web/shared/src/typeahead.ts#L322-L382\\r\\n(We might make exceptions and depart from that ordering if there are areas where we see an alternative that's substantially better in either quality of results or clarity of code, without being particularly worse on the other axis.)\\r\\n\\r\\nBroadly, that ranking looks like:\\r\\n* \\\"Popular emoji\\\", before realm emoji, before (other) Unicode emoji, where \\\"popular emoji\\\" means a hard-coded list of six emoji like :+1:.\\r\\n* Names that exactly match the query, before names that have it as a prefix, before other matches.\\r\\n\\r\\nFor details, see the web implementation.\\r\\n\\r\\n\\r\\n### Related issues\\r\\n* Prerequisite:\\r\\n #670 \\r\\n* Similar features for other types of autocomplete:\\r\\n #228\\r\\n #618 \\r\\n #881 \\r\\n\"}]", "lang": "dart", "problem_statement": "Rank emoji autocomplete results\nFor the initial implementation of #670, there won't be a useful ordering to the results. This means a user might have to type a longer, more specific query to find their desired emoji than they might with good ranking.\r\n\r\nThis issue is for ranking the results. The ranking should match what the web app does:\r\nhttps://github.com/zulip/zulip/blob/65f05794e/web/shared/src/typeahead.ts#L322-L382\r\n(We might make exceptions and depart from that ordering if there are areas where we see an alternative that's substantially better in either quality of results or clarity of code, without being particularly worse on the other axis.)\r\n\r\nBroadly, that ranking looks like:\r\n* \"Popular emoji\", before realm emoji, before (other) Unicode emoji, where \"popular emoji\" means a hard-coded list of six emoji like :+1:.\r\n* Names that exactly match the query, before names that have it as a prefix, before other matches.\r\n\r\nFor details, see the web implementation.\r\n\r\n\r\n### Related issues\r\n* Prerequisite:\r\n #670 \r\n* Similar features for other types of autocomplete:\r\n #228\r\n #618 \r\n #881 \r\n\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/1112", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/1068\"]", "test_command": "flutter test test/model/algorithms_test.dart test/model/emoji_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/algorithms.dart b/lib/model/algorithms.dart\nindex 7c03a88d80..93bcb188ee 100644\n--- a/lib/model/algorithms.dart\n+++ b/lib/model/algorithms.dart\n@@ -116,3 +116,67 @@ QueueList setUnion(Iterable xs, Iterable ys) {\n }\n return result;\n }\n+\n+/// Sort the items by bucket, stably,\n+/// and if the buckets are few then in linear time.\n+///\n+/// The returned list will have the same elements as [xs], ordered by bucket,\n+/// and elements in each bucket will appear in the same order as in [xs].\n+/// In other words, the list is the result of a stable sort of [xs] by bucket.\n+/// (By contrast, Dart's [List.sort] is not guaranteed to be stable.)\n+///\n+/// For each element of [xs], the bucket identified by [bucketOf]\n+/// must be in the range `0 <= bucket < numBuckets`.\n+/// Repeated calls to [bucketOf] on the same element must return the same value.\n+///\n+/// If [bucketOf] returns different answers when called twice for some element,\n+/// this function's behavior is undefined:\n+/// it may throw, or may return an arbitrary list.\n+///\n+/// The cost of this function is linear in `xs.length` plus [numBuckets].\n+/// In particular if [numBuckets] is a constant\n+/// (or more generally is at most a constant multiple of `xs.length`),\n+/// then this function sorts the items in linear time, O(n).\n+/// On the other hand if there are many more buckets than elements,\n+/// consider using a different sorting algorithm.\n+List bucketSort(Iterable xs, int Function(T) bucketOf, {\n+ required int numBuckets,\n+}) {\n+ if (xs.isEmpty) return [];\n+ if (numBuckets <= 0) throw StateError(\"bucketSort: non-positive numBuckets\");\n+\n+ final counts = List.generate(numBuckets, (_) => 0);\n+ for (final x in xs) {\n+ final key = bucketOf(x);\n+ _checkBucket(key, numBuckets);\n+ counts[key]++;\n+ }\n+ // Now counts[k] is the number of values with key k.\n+\n+ var partialSum = 0;\n+ for (var k = 0; k < numBuckets; k++) {\n+ final count = counts[k];\n+ counts[k] = partialSum;\n+ partialSum += count;\n+ }\n+ assert(partialSum == xs.length);\n+ // Now counts[k] is the index where the first value with key k should go.\n+\n+ final result = List.generate(xs.length, (_) => xs.first);\n+ for (final x in xs) {\n+ // Each counts[k] is the index where the next value with key k should go.\n+ final key = bucketOf(x);\n+ _checkBucket(key, numBuckets);\n+ final index = counts[key]++;\n+ if (index >= result.length) {\n+ throw StateError(\"bucketSort: bucketOf gave varying answers on same value\");\n+ }\n+ result[index] = x;\n+ }\n+ return result;\n+}\n+\n+void _checkBucket(int key, int numBuckets) {\n+ if (key < 0) throw StateError(\"bucketSort: negative bucket\");\n+ if (key >= numBuckets) throw StateError(\"bucketSort: bucket out of range\");\n+}\ndiff --git a/lib/model/autocomplete.dart b/lib/model/autocomplete.dart\nindex a6285a6ab3..5b66a6d52a 100644\n--- a/lib/model/autocomplete.dart\n+++ b/lib/model/autocomplete.dart\n@@ -758,10 +758,15 @@ sealed class ComposeAutocompleteResult extends AutocompleteResult {}\n \n /// An emoji chosen in an autocomplete interaction, via [EmojiAutocompleteView].\n class EmojiAutocompleteResult extends ComposeAutocompleteResult {\n- EmojiAutocompleteResult(this.candidate);\n+ EmojiAutocompleteResult(this.candidate, this.rank);\n \n final EmojiCandidate candidate;\n \n+ /// A measure of the result's quality in the context of the query.\n+ ///\n+ /// Used internally by [EmojiAutocompleteView] for ranking the results.\n+ final int rank;\n+\n @override\n String toString() {\n return 'EmojiAutocompleteResult(${candidate.description()})';\ndiff --git a/lib/model/emoji.dart b/lib/model/emoji.dart\nindex 07591abd34..324d259351 100644\n--- a/lib/model/emoji.dart\n+++ b/lib/model/emoji.dart\n@@ -5,6 +5,7 @@ import '../api/model/events.dart';\n import '../api/model/initial_snapshot.dart';\n import '../api/model/model.dart';\n import '../api/route/realm.dart';\n+import 'algorithms.dart';\n import 'autocomplete.dart';\n import 'narrow.dart';\n import 'store.dart';\n@@ -108,6 +109,19 @@ mixin EmojiStore {\n required String emojiName,\n });\n \n+ /// Zulip's list of \"popular\" emoji, to be given precedence in\n+ /// offering to users.\n+ ///\n+ /// See description in the web code:\n+ /// https://github.com/zulip/zulip/blob/83a121c7e/web/shared/src/typeahead.ts#L3-L21\n+ // Someday this list may start varying rather than being hard-coded,\n+ // and then this will become a non-static member on EmojiStore.\n+ // For now, though, the fact it's constant is convenient when writing\n+ // tests of the logic that uses this data; so we guarantee it in the API.\n+ static Iterable get popularEmojiCandidates {\n+ return EmojiStoreImpl._popularCandidates;\n+ }\n+\n Iterable allEmojiCandidates();\n \n // TODO cut debugServerEmojiData once we can query for lists of emoji;\n@@ -206,7 +220,40 @@ class EmojiStoreImpl with EmojiStore {\n /// retrieving the data.\n Map>? _serverEmojiData;\n \n- List? _allEmojiCandidates;\n+ static final _popularCandidates = _generatePopularCandidates();\n+\n+ static List _generatePopularCandidates() {\n+ EmojiCandidate candidate(String emojiCode, String emojiUnicode,\n+ List names) {\n+ final emojiName = names.removeAt(0);\n+ assert(emojiUnicode == tryParseEmojiCodeToUnicode(emojiCode));\n+ return EmojiCandidate(emojiType: ReactionType.unicodeEmoji,\n+ emojiCode: emojiCode, emojiName: emojiName, aliases: names,\n+ emojiDisplay: UnicodeEmojiDisplay(\n+ emojiName: emojiName, emojiUnicode: emojiUnicode));\n+ }\n+ return [\n+ // This list should match web:\n+ // https://github.com/zulip/zulip/blob/83a121c7e/web/shared/src/typeahead.ts#L22-L29\n+ candidate('1f44d', '\ud83d\udc4d', ['+1', 'thumbs_up', 'like']),\n+ candidate('1f389', '\ud83c\udf89', ['tada']),\n+ candidate('1f642', '\ud83d\ude42', ['smile']),\n+ candidate( '2764', '\u2764', ['heart', 'love', 'love_you']),\n+ candidate('1f6e0', '\ud83d\udee0', ['working_on_it', 'hammer_and_wrench', 'tools']),\n+ candidate('1f419', '\ud83d\udc19', ['octopus']),\n+ ];\n+ }\n+\n+ static final _popularEmojiCodes = (() {\n+ assert(_popularCandidates.every((c) =>\n+ c.emojiType == ReactionType.unicodeEmoji));\n+ return Set.of(_popularCandidates.map((c) => c.emojiCode));\n+ })();\n+\n+ static bool _isPopularEmoji(EmojiCandidate candidate) {\n+ return candidate.emojiType == ReactionType.unicodeEmoji\n+ && _popularEmojiCodes.contains(candidate.emojiCode);\n+ }\n \n EmojiCandidate _emojiCandidateFor({\n required ReactionType emojiType,\n@@ -222,6 +269,9 @@ class EmojiStoreImpl with EmojiStore {\n }\n \n List _generateAllCandidates() {\n+ // See also [EmojiAutocompleteQuery._rankResult];\n+ // that ranking takes precedence over the order of this list.\n+ //\n // Compare `emoji_picker.rebuild_catalog` in Zulip web;\n // `composebox_typeahead.update_emoji_data` which receives its output;\n // and `emoji.update_emojis` which builds part of its input.\n@@ -245,7 +295,7 @@ class EmojiStoreImpl with EmojiStore {\n // but then ranks them first, after only the six \"popular\" emoji,\n // once there's a non-empty query.\n // * Web gives the six \"popular\" emoji a set order amongst themselves,\n- // like we do after #1112; but in web, this order appears only in the\n+ // like we do here; but in web, this order appears only in the\n // emoji picker on an empty query, and is otherwise lost even when the\n // emoji are taken out of their home categories and shown instead\n // together at the front.\n@@ -257,12 +307,18 @@ class EmojiStoreImpl with EmojiStore {\n \n final results = [];\n \n+ // Include the \"popular\" emoji, in their canonical order\n+ // relative to each other.\n+ results.addAll(_popularCandidates);\n+\n final namesOverridden = {\n for (final emoji in activeRealmEmoji) emoji.name,\n 'zulip',\n };\n // TODO(log) if _serverEmojiData missing\n for (final entry in (_serverEmojiData ?? {}).entries) {\n+ if (_popularEmojiCodes.contains(entry.key)) continue;\n+\n final allNames = entry.value;\n final String emojiName;\n final List? aliases;\n@@ -302,6 +358,8 @@ class EmojiStoreImpl with EmojiStore {\n return results;\n }\n \n+ List? _allEmojiCandidates;\n+\n @override\n Iterable allEmojiCandidates() {\n return _allEmojiCandidates ??= _generateAllCandidates();\n@@ -319,6 +377,42 @@ class EmojiStoreImpl with EmojiStore {\n }\n }\n \n+/// The quality of an emoji's match to an autocomplete query.\n+enum EmojiMatchQuality {\n+ /// The query matches the whole emoji name (or the literal emoji itself).\n+ exact,\n+\n+ /// The query matches a prefix of the emoji name, but not the whole name.\n+ prefix,\n+\n+ /// The query matches starting at the start of a word in the emoji name,\n+ /// but not the start of the whole name.\n+ ///\n+ /// For example a name \"ab_cd_ef\" would match queries \"c\" or \"cd_e\"\n+ /// at this level, but not a query \"b_cd_ef\".\n+ wordAligned,\n+\n+ /// The query matches somewhere in the emoji name,\n+ /// but not at the start of any word.\n+ other;\n+\n+ /// The best possible quality of match.\n+ static const best = exact;\n+\n+ /// The better of the two given qualities of match,\n+ /// where null represents no match at all.\n+ static EmojiMatchQuality? bestOf(EmojiMatchQuality? a, EmojiMatchQuality? b) {\n+ if (b == null) return a;\n+ if (a == null) return b;\n+ return compare(a, b) <= 0 ? a : b;\n+ }\n+\n+ /// Comparator that puts better matches first.\n+ static int compare(EmojiMatchQuality a, EmojiMatchQuality b) {\n+ return Enum.compareByIndex(a, b);\n+ }\n+}\n+\n class EmojiAutocompleteView extends AutocompleteView {\n EmojiAutocompleteView._({required super.store, required super.query});\n \n@@ -333,26 +427,39 @@ class EmojiAutocompleteView extends AutocompleteView?> computeResults() async {\n- // TODO(#1068): rank emoji results (popular, realm, other; exact match, prefix, other)\n- final results = [];\n+ final unsorted = [];\n if (await filterCandidates(filter: _testCandidate,\n- candidates: store.allEmojiCandidates(), results: results)) {\n+ candidates: store.allEmojiCandidates(), results: unsorted)) {\n return null;\n }\n- return results;\n+ return bucketSort(unsorted,\n+ (r) => r.rank, numBuckets: EmojiAutocompleteQuery._numResultRanks);\n }\n \n- EmojiAutocompleteResult? _testCandidate(EmojiAutocompleteQuery query, EmojiCandidate candidate) {\n- return query.matches(candidate) ? EmojiAutocompleteResult(candidate) : null;\n+ static EmojiAutocompleteResult? _testCandidate(EmojiAutocompleteQuery query, EmojiCandidate candidate) {\n+ return query.testCandidate(candidate);\n }\n }\n \n class EmojiAutocompleteQuery extends ComposeAutocompleteQuery {\n- EmojiAutocompleteQuery(super.raw)\n- : _adjusted = _adjustQuery(raw);\n+ factory EmojiAutocompleteQuery(String raw)\n+ => EmojiAutocompleteQuery._(raw, _adjustQuery(raw));\n+\n+ EmojiAutocompleteQuery._(super.raw, String adjusted)\n+ : _adjusted = adjusted,\n+ _sepAdjusted = _separator + adjusted;\n \n+ /// The query string as adjusted for comparing to emoji names,\n+ /// via [_adjustQuery].\n final String _adjusted;\n \n+ /// The concatenation of [_separator] with [_adjusted].\n+ ///\n+ /// Useful for finding word-aligned matches in an emoji name.\n+ final String _sepAdjusted;\n+\n+ static const _separator = '_';\n+\n static String _adjustQuery(String raw) {\n return raw.toLowerCase().replaceAll(' ', '_'); // TODO(#1067) remove diacritics too\n }\n@@ -362,34 +469,105 @@ class EmojiAutocompleteQuery extends ComposeAutocompleteQuery {\n return EmojiAutocompleteView.init(store: store, query: this);\n }\n \n+ @visibleForTesting\n+ EmojiAutocompleteResult? testCandidate(EmojiCandidate candidate) {\n+ final matchQuality = match(candidate);\n+ if (matchQuality == null) return null;\n+ return EmojiAutocompleteResult(candidate,\n+ _rankResult(matchQuality, candidate));\n+ }\n+\n // Compare get_emoji_matcher in Zulip web:shared/src/typeahead.ts .\n- bool matches(EmojiCandidate candidate) {\n+ @visibleForTesting\n+ EmojiMatchQuality? match(EmojiCandidate candidate) {\n+ if (_adjusted == '') return EmojiMatchQuality.prefix;\n+\n if (candidate.emojiDisplay case UnicodeEmojiDisplay(:var emojiUnicode)) {\n- if (_adjusted == emojiUnicode) return true;\n+ if (_adjusted == emojiUnicode) {\n+ return EmojiMatchQuality.exact;\n+ }\n+ }\n+\n+ EmojiMatchQuality? result = _matchName(candidate.emojiName);\n+ for (final alias in candidate.aliases) {\n+ if (result == EmojiMatchQuality.best) return result;\n+ result = EmojiMatchQuality.bestOf(result, _matchName(alias));\n }\n- return _nameMatches(candidate.emojiName)\n- || candidate.aliases.any((alias) => _nameMatches(alias));\n+ return result;\n }\n \n- // Compare query_matches_string_in_order in Zulip web:shared/src/typeahead.ts .\n- bool _nameMatches(String emojiName) {\n- // TODO(#1067) this assumes emojiName is already lower-case (and no diacritics)\n- const String separator = '_';\n+ EmojiMatchQuality? _matchName(String emojiName) {\n+ // Compare query_matches_string_in_order in Zulip web:shared/src/typeahead.ts\n+ // for a Boolean version of this logic (match vs. no match),\n+ // and triage_raw in the same file web:shared/src/typeahead.ts\n+ // for the finer distinctions.\n+ // See also commentary in [_rankResult].\n \n- if (!_adjusted.contains(separator)) {\n+ // TODO(#1067) this assumes emojiName is already lower-case (and no diacritics)\n+ if (emojiName == _adjusted) return EmojiMatchQuality.exact;\n+ if (emojiName.startsWith(_adjusted)) return EmojiMatchQuality.prefix;\n+ if (emojiName.contains(_sepAdjusted)) return EmojiMatchQuality.wordAligned;\n+ if (!_adjusted.contains(_separator)) {\n // If the query is a single token (doesn't contain a separator),\n- // the match can be anywhere in the string.\n- return emojiName.contains(_adjusted);\n+ // allow a match anywhere in the string, too.\n+ if (emojiName.contains(_adjusted)) return EmojiMatchQuality.other;\n+ } else {\n+ // Otherwise, require at least a word-aligned match.\n }\n+ return null;\n+ }\n \n- // If there is a separator in the query, then we\n- // require the match to start at the start of a token.\n- // (E.g. for 'ab_cd_ef', query could be 'ab_c' or 'cd_ef',\n- // but not 'b_cd_ef'.)\n- return emojiName.startsWith(_adjusted)\n- || emojiName.contains(separator + _adjusted);\n+ /// A measure of the result's quality in the context of the query,\n+ /// ranked from 0 (best) to one less than [_numResultRanks].\n+ static int _rankResult(EmojiMatchQuality matchQuality, EmojiCandidate candidate) {\n+ // See also [EmojiStoreImpl._generateAllCandidates];\n+ // emoji which this function ranks equally\n+ // will appear in the order they were put in by that method.\n+ //\n+ // Compare sort_emojis in Zulip web:\n+ // https://github.com/zulip/zulip/blob/83a121c7e/web/shared/src/typeahead.ts#L322-L382\n+ //\n+ // Behavior differences we might copy, TODO:\n+ // * Web ranks each name of a Unicode emoji separately.\n+ // * Web recognizes a word-aligned match starting after [ /-] as well as [_].\n+ //\n+ // Behavior differences that web should probably fix, TODO(web):\n+ // * Among popular emoji with non-exact matches,\n+ // web doesn't prioritize prefix over word-aligned; we do.\n+ // (This affects just one case: for query \"o\",\n+ // we put :octopus: before :working_on_it:.)\n+ // * Web only counts an emoji as \"popular\" for ranking if the query\n+ // is a prefix of a single word in the name; so \"thumbs_\" or \"working_on_i\"\n+ // lose the ranking boost for :thumbs_up: and :working_on_it: respectively.\n+ // * Web starts with only case-sensitive exact matches (\"perfect matches\"),\n+ // and puts case-insensitive exact matches just ahead of prefix matches;\n+ // it also distinguishes prefix matches by case-sensitive vs. not.\n+ // We use case-insensitive matches throughout;\n+ // case seems unhelpful for emoji search.\n+ // * Web suppresses Unicode emoji names shadowed by a realm emoji\n+ // only if the latter is also a match for the query. That mostly works,\n+ // because emoji with the same name will mostly both match or both not;\n+ // but it breaks if the Unicode emoji was a literal match.\n+\n+ final isPopular = EmojiStoreImpl._isPopularEmoji(candidate);\n+ final isCustomEmoji = switch (candidate.emojiType) {\n+ // The web implementation calls this condition `is_realm_emoji`,\n+ // but its actual semantics is it's true for the Zulip extra emoji too.\n+ // See `zulip_emoji` in web:src/emoji.ts .\n+ ReactionType.realmEmoji || ReactionType.zulipExtraEmoji => true,\n+ ReactionType.unicodeEmoji => false,\n+ };\n+ return switch (matchQuality) {\n+ EmojiMatchQuality.exact => 0,\n+ EmojiMatchQuality.prefix => isPopular ? 1 : isCustomEmoji ? 3 : 5,\n+ EmojiMatchQuality.wordAligned => isPopular ? 2 : isCustomEmoji ? 4 : 6,\n+ EmojiMatchQuality.other => isCustomEmoji ? 7 : 8,\n+ };\n }\n \n+ /// The number of possible values returned by [_rankResult].\n+ static const _numResultRanks = 9;\n+\n @override\n String toString() {\n return '${objectRuntimeType(this, 'EmojiAutocompleteQuery')}($raw)';\n", "test_patch": "diff --git a/test/model/algorithms_test.dart b/test/model/algorithms_test.dart\nindex b6def6393e..4dc3772105 100644\n--- a/test/model/algorithms_test.dart\n+++ b/test/model/algorithms_test.dart\n@@ -1,5 +1,7 @@\n+import 'dart:math';\n \n import 'package:checks/checks.dart';\n+import 'package:collection/collection.dart';\n import 'package:test/scaffolding.dart';\n import 'package:zulip/model/algorithms.dart';\n \n@@ -55,4 +57,95 @@ void main() {\n });\n }\n });\n+\n+ group('bucketSort', () {\n+ /// Same spec as [bucketSort], except slow: N * B time instead of N + B.\n+ List simpleBucketSort(Iterable xs, int Function(T) bucketOf, {\n+ required int numBuckets,\n+ }) {\n+ return Iterable.generate(numBuckets,\n+ (k) => xs.where((s) => bucketOf(s) == k)).flattenedToList;\n+ }\n+\n+ void checkBucketSort(Iterable xs, {\n+ required int Function(T) bucketOf, required int numBuckets,\n+ }) {\n+ check(bucketSort(xs, bucketOf, numBuckets: numBuckets)).deepEquals(\n+ simpleBucketSort(xs, bucketOf, numBuckets: numBuckets));\n+ }\n+\n+ int stringBucket(String s) => s.codeUnits.last - '0'.codeUnits.single;\n+\n+ test('explicit result, interleaved: 4 elements, 2 buckets', () {\n+ check(bucketSort(['a1', 'd0', 'c1', 'b0'], stringBucket, numBuckets: 2))\n+ .deepEquals(['d0', 'b0', 'a1', 'c1']);\n+ });\n+\n+ List<_SortablePair> generatePairs(Iterable keys) {\n+ var token = 0;\n+ return keys.map((k) => _SortablePair(k, \"${token++}\")).toList();\n+ }\n+\n+ void checkSortPairs(int numBuckets, Iterable keys) {\n+ checkBucketSort(numBuckets: numBuckets, bucketOf: (p) => p.key,\n+ generatePairs(keys));\n+ }\n+\n+ test('empty list, zero buckets', () {\n+ checkSortPairs(0, []);\n+ });\n+\n+ test('empty, some buckets', () {\n+ checkSortPairs(3, []);\n+ });\n+\n+ test('interleaved: 4 elements, 2 buckets', () {\n+ checkSortPairs(2, [1, 0, 1, 0]);\n+ });\n+\n+ test('some buckets empty: 10 elements in 3 of 10 buckets', () {\n+ checkSortPairs(10, [9, 9, 9, 5, 5, 5, 1, 1, 1, 1]);\n+ });\n+\n+ test('one big bucket', () {\n+ checkSortPairs(1, Iterable.generate(100, (_) => 0));\n+ });\n+\n+ const seed = 4321;\n+\n+ Iterable randomKeys({required int numBuckets, required int length}) {\n+ final rand = Random(seed);\n+ return Iterable.generate(length, (_) => rand.nextInt(numBuckets));\n+ }\n+\n+ test('long random list, 1000 in 2 buckets', () {\n+ checkSortPairs(2, randomKeys(numBuckets: 2, length: 1000));\n+ });\n+\n+ test('long random list, 1000 in 1000 buckets', () {\n+ checkSortPairs(1000, randomKeys(numBuckets: 1000, length: 1000));\n+ });\n+\n+ test('sparse random list, 100 in 1000 buckets', () {\n+ checkSortPairs(1000, randomKeys(numBuckets: 1000, length: 100));\n+ });\n+ });\n+}\n+\n+class _SortablePair {\n+ _SortablePair(this.key, this.tag);\n+\n+ final int key;\n+ final String tag;\n+\n+ @override\n+ bool operator ==(Object other) {\n+ return other is _SortablePair && key == other.key && tag == other.tag;\n+ }\n+\n+ @override\n+ int get hashCode => Object.hash(key, tag);\n+\n+ @override\n+ String toString() => \"$tag:$key\";\n }\ndiff --git a/test/model/emoji_test.dart b/test/model/emoji_test.dart\nindex 953d986774..a55f2dc36b 100644\n--- a/test/model/emoji_test.dart\n+++ b/test/model/emoji_test.dart\n@@ -78,6 +78,8 @@ void main() {\n });\n });\n \n+ final popularCandidates = EmojiStore.popularEmojiCandidates;\n+\n Condition isUnicodeCandidate(String? emojiCode, List? names) {\n return (it_) {\n final it = it_.isA();\n@@ -108,6 +110,9 @@ void main() {\n ..aliases.isEmpty();\n }\n \n+ List> arePopularCandidates = popularCandidates.map(\n+ (c) => isUnicodeCandidate(c.emojiCode, null)).toList();\n+\n group('allEmojiCandidates', () {\n // TODO test emojiDisplay of candidates matches emojiDisplayFor\n \n@@ -123,12 +128,47 @@ void main() {\n return store;\n }\n \n+ test('popular emoji appear even when no server emoji data', () {\n+ final store = prepare(unicodeEmoji: null);\n+ check(store.allEmojiCandidates()).deepEquals([\n+ ...arePopularCandidates,\n+ isZulipCandidate(),\n+ ]);\n+ });\n+\n+ test('popular emoji appear in their canonical order', () {\n+ // In the server's emoji data, have the popular emoji in a permuted order,\n+ // and interspersed with other emoji.\n+ final store = prepare(unicodeEmoji: {\n+ '1f603': ['smiley'],\n+ for (final candidate in popularCandidates.skip(3))\n+ candidate.emojiCode: [candidate.emojiName, ...candidate.aliases],\n+ '1f34a': ['orange', 'tangerine', 'mandarin'],\n+ for (final candidate in popularCandidates.take(3))\n+ candidate.emojiCode: [candidate.emojiName, ...candidate.aliases],\n+ '1f516': ['bookmark'],\n+ });\n+ // In the allEmojiCandidates result, the popular emoji come first\n+ // and are in their canonical order, even though the other Unicode emoji\n+ // are in the same order they were given in.\n+ check(store.allEmojiCandidates()).deepEquals([\n+ for (final candidate in popularCandidates)\n+ isUnicodeCandidate(candidate.emojiCode,\n+ [candidate.emojiName, ...candidate.aliases]),\n+ isUnicodeCandidate('1f603', ['smiley']),\n+ isUnicodeCandidate('1f34a', ['orange', 'tangerine', 'mandarin']),\n+ isUnicodeCandidate('1f516', ['bookmark']),\n+ isZulipCandidate(),\n+ ]);\n+ });\n+\n test('realm emoji included only when active', () {\n final store = prepare(realmEmoji: {\n '1': eg.realmEmojiItem(emojiCode: '1', emojiName: 'abc', deactivated: true),\n '2': eg.realmEmojiItem(emojiCode: '2', emojiName: 'abcd'),\n });\n check(store.allEmojiCandidates()).deepEquals([\n+ ...arePopularCandidates,\n isRealmCandidate(emojiCode: '2', emojiName: 'abcd'),\n isZulipCandidate(),\n ]);\n@@ -143,6 +183,7 @@ void main() {\n '5': eg.realmEmojiItem(emojiCode: '5', emojiName: 'test', deactivated: true),\n });\n check(store.allEmojiCandidates()).deepEquals([\n+ ...arePopularCandidates,\n isRealmCandidate(emojiCode: '4', emojiName: 'try'),\n isZulipCandidate(),\n ]);\n@@ -152,11 +193,12 @@ void main() {\n final store = prepare(realmEmoji: {\n '1': eg.realmEmojiItem(emojiCode: '1', emojiName: 'smiley'),\n }, unicodeEmoji: {\n- '1f642': ['smile'],\n+ '1f516': ['bookmark'],\n '1f603': ['smiley'],\n });\n check(store.allEmojiCandidates()).deepEquals([\n- isUnicodeCandidate('1f642', ['smile']),\n+ ...arePopularCandidates,\n+ isUnicodeCandidate('1f516', ['bookmark']),\n isRealmCandidate(emojiCode: '1', emojiName: 'smiley'),\n isZulipCandidate(),\n ]);\n@@ -169,6 +211,7 @@ void main() {\n '1f41c': ['ant'],\n });\n check(store.allEmojiCandidates()).deepEquals([\n+ ...arePopularCandidates,\n isUnicodeCandidate('1f41c', ['ant']),\n isZulipCandidate(),\n ]);\n@@ -181,6 +224,7 @@ void main() {\n '1f34a': ['orange', 'tangerine', 'mandarin'],\n });\n check(store.allEmojiCandidates()).deepEquals([\n+ ...arePopularCandidates,\n isUnicodeCandidate('1f34a', ['orange', 'mandarin']),\n isRealmCandidate(emojiCode: '1', emojiName: 'tangerine'),\n isZulipCandidate(),\n@@ -194,6 +238,7 @@ void main() {\n '1f34a': ['orange', 'tangerine', 'mandarin'],\n });\n check(store.allEmojiCandidates()).deepEquals([\n+ ...arePopularCandidates,\n isUnicodeCandidate('1f34a', ['tangerine', 'mandarin']),\n isRealmCandidate(emojiCode: '1', emojiName: 'orange'),\n isZulipCandidate(),\n@@ -203,14 +248,16 @@ void main() {\n test('updates on setServerEmojiData', () {\n final store = prepare();\n check(store.allEmojiCandidates()).deepEquals([\n+ ...arePopularCandidates,\n isZulipCandidate(),\n ]);\n \n store.setServerEmojiData(ServerEmojiData(codeToNames: {\n- '1f642': ['smile'],\n+ '1f516': ['bookmark'],\n }));\n check(store.allEmojiCandidates()).deepEquals([\n- isUnicodeCandidate('1f642', ['smile']),\n+ ...arePopularCandidates,\n+ isUnicodeCandidate('1f516', ['bookmark']),\n isZulipCandidate(),\n ]);\n });\n@@ -218,6 +265,7 @@ void main() {\n test('updates on RealmEmojiUpdateEvent', () {\n final store = prepare();\n check(store.allEmojiCandidates()).deepEquals([\n+ ...arePopularCandidates,\n isZulipCandidate(),\n ]);\n \n@@ -225,6 +273,7 @@ void main() {\n '1': eg.realmEmojiItem(emojiCode: '1', emojiName: 'happy'),\n }));\n check(store.allEmojiCandidates()).deepEquals([\n+ ...arePopularCandidates,\n isRealmCandidate(emojiCode: '1', emojiName: 'happy'),\n isZulipCandidate(),\n ]);\n@@ -234,7 +283,7 @@ void main() {\n final store = prepare(realmEmoji: {\n '1': eg.realmEmojiItem(emojiCode: '1', emojiName: 'happy'),\n }, unicodeEmoji: {\n- '1f642': ['smile'],\n+ '1f516': ['bookmark'],\n });\n final candidates = store.allEmojiCandidates();\n check(store.allEmojiCandidates()).identicalTo(candidates);\n@@ -257,6 +306,9 @@ void main() {\n isZulipCandidate());\n }\n \n+ List> arePopularResults = popularCandidates.map(\n+ (c) => isUnicodeResult(emojiCode: c.emojiCode)).toList();\n+\n PerAccountStore prepare({\n Map realmEmoji = const {},\n Map>? unicodeEmoji,\n@@ -274,7 +326,7 @@ void main() {\n \n test('results can include all three emoji types', () async {\n final store = prepare(\n- realmEmoji: {'1': 'happy'}, unicodeEmoji: {'1f642': ['smile']});\n+ realmEmoji: {'1': 'happy'}, unicodeEmoji: {'1f516': ['bookmark']});\n final view = EmojiAutocompleteView.init(store: store,\n query: EmojiAutocompleteQuery(''));\n bool done = false;\n@@ -282,9 +334,10 @@ void main() {\n await Future(() {});\n check(done).isTrue();\n check(view.results).deepEquals([\n- isUnicodeResult(names: ['smile']),\n+ ...arePopularResults,\n isRealmResult(emojiName: 'happy'),\n isZulipResult(),\n+ isUnicodeResult(names: ['bookmark']),\n ]);\n });\n \n@@ -292,7 +345,7 @@ void main() {\n final store = prepare(\n realmEmoji: {'1': 'happy'}, unicodeEmoji: {'1f642': ['smile']});\n final view = EmojiAutocompleteView.init(store: store,\n- query: EmojiAutocompleteQuery('h'));\n+ query: EmojiAutocompleteQuery('hap'));\n bool done = false;\n view.addListener(() { done = true; });\n await Future(() {});\n@@ -301,15 +354,92 @@ void main() {\n isRealmResult(emojiName: 'happy'));\n \n done = false;\n- view.query = EmojiAutocompleteQuery('s');\n+ view.query = EmojiAutocompleteQuery('sm');\n await Future(() {});\n check(done).isTrue();\n check(view.results).single.which(\n isUnicodeResult(names: ['smile']));\n });\n+\n+ Future> resultsOf(\n+ String query, {\n+ Map realmEmoji = const {},\n+ Map>? unicodeEmoji,\n+ }) async {\n+ final store = prepare(realmEmoji: realmEmoji, unicodeEmoji: unicodeEmoji);\n+ final view = EmojiAutocompleteView.init(store: store,\n+ query: EmojiAutocompleteQuery(query));\n+ bool done = false;\n+ view.addListener(() { done = true; });\n+ await Future(() {});\n+ check(done).isTrue();\n+ return view.results;\n+ }\n+\n+ test('results preserve order of popular emoji within each rank', () async {\n+ // In other words, the sorting by rank is a stable sort.\n+\n+ // Full results list matches allEmojiCandidates.\n+ check(prepare().allEmojiCandidates())\n+ .deepEquals([...arePopularCandidates, isZulipCandidate()]);\n+ check(await resultsOf(''))\n+ .deepEquals([...arePopularResults, isZulipResult()]);\n+\n+ // Same list written out explicitly, for comparison with the cases below.\n+ check(await resultsOf('')).deepEquals([\n+ isUnicodeResult(names: ['+1', 'thumbs_up', 'like']),\n+ isUnicodeResult(names: ['tada']),\n+ isUnicodeResult(names: ['smile']),\n+ isUnicodeResult(names: ['heart', 'love', 'love_you']),\n+ isUnicodeResult(names: ['working_on_it', 'hammer_and_wrench', 'tools']),\n+ isUnicodeResult(names: ['octopus']),\n+ isZulipResult(),\n+ ]);\n+\n+ check(await resultsOf('t')).deepEquals([\n+ // prefix\n+ isUnicodeResult(names: ['+1', 'thumbs_up', 'like']),\n+ isUnicodeResult(names: ['tada']),\n+ isUnicodeResult(names: ['working_on_it', 'hammer_and_wrench', 'tools']),\n+ // other\n+ isUnicodeResult(names: ['heart', 'love', 'love_you']),\n+ isUnicodeResult(names: ['octopus']),\n+ ]);\n+\n+ check(await resultsOf('h')).deepEquals([\n+ // prefix\n+ isUnicodeResult(names: ['heart', 'love', 'love_you']),\n+ isUnicodeResult(names: ['working_on_it', 'hammer_and_wrench', 'tools']),\n+ // other\n+ isUnicodeResult(names: ['+1', 'thumbs_up', 'like']),\n+ ]);\n+ });\n+\n+ test('results end-to-end', () async {\n+ // (See more detailed rank tests below, on EmojiAutocompleteQuery.)\n+\n+ final unicodeEmoji = {\n+ '1f4d3': ['notebook'], '1f516': ['bookmark'], '1f4d6': ['book']};\n+\n+ // Empty query -> base ordering.\n+ check(await resultsOf('', unicodeEmoji: unicodeEmoji)).deepEquals([\n+ ...arePopularResults,\n+ isZulipResult(),\n+ isUnicodeResult(names: ['notebook']),\n+ isUnicodeResult(names: ['bookmark']),\n+ isUnicodeResult(names: ['book']),\n+ ]);\n+\n+ // With query, exact match precedes prefix match precedes other.\n+ check(await resultsOf('book', unicodeEmoji: unicodeEmoji)).deepEquals([\n+ isUnicodeResult(names: ['book']),\n+ isUnicodeResult(names: ['bookmark']),\n+ isUnicodeResult(names: ['notebook']),\n+ ]);\n+ });\n });\n \n- group('EmojiAutocompleteQuery.matches', () {\n+ group('EmojiAutocompleteQuery', () {\n EmojiCandidate unicode(List names, {String? emojiCode}) {\n emojiCode ??= '10ffff';\n return EmojiCandidate(emojiType: ReactionType.unicodeEmoji,\n@@ -320,137 +450,235 @@ void main() {\n emojiUnicode: tryParseEmojiCodeToUnicode(emojiCode)!));\n }\n \n- bool matchesName(String query, String emojiName) {\n- return EmojiAutocompleteQuery(query).matches(unicode([emojiName]));\n+ EmojiMatchQuality? matchOf(String query, EmojiCandidate candidate) {\n+ return EmojiAutocompleteQuery(query).match(candidate);\n }\n \n- test('one-word query matches anywhere in name', () {\n- check(matchesName('', 'smile')).isTrue();\n- check(matchesName('s', 'smile')).isTrue();\n- check(matchesName('sm', 'smile')).isTrue();\n- check(matchesName('smile', 'smile')).isTrue();\n- check(matchesName('m', 'smile')).isTrue();\n- check(matchesName('mile', 'smile')).isTrue();\n- check(matchesName('e', 'smile')).isTrue();\n+ EmojiMatchQuality? matchOfNames(String query, List names) {\n+ return matchOf(query, unicode(names));\n+ }\n \n- check(matchesName('smiley', 'smile')).isFalse();\n- check(matchesName('a', 'smile')).isFalse();\n+ EmojiMatchQuality? matchOfName(String query, String emojiName) {\n+ return matchOfNames(query, [emojiName]);\n+ }\n \n- check(matchesName('o', 'open_book')).isTrue();\n- check(matchesName('open', 'open_book')).isTrue();\n- check(matchesName('pe', 'open_book')).isTrue();\n- check(matchesName('boo', 'open_book')).isTrue();\n- check(matchesName('ok', 'open_book')).isTrue();\n+ test('one-word query matches anywhere in name', () {\n+ check(matchOfName('', 'smile')).prefix;\n+ check(matchOfName('s', 'smile')).prefix;\n+ check(matchOfName('sm', 'smile')).prefix;\n+ check(matchOfName('smile', 'smile')).exact;\n+ check(matchOfName('m', 'smile')).other;\n+ check(matchOfName('mile', 'smile')).other;\n+ check(matchOfName('e', 'smile')).other;\n+\n+ check(matchOfName('smiley', 'smile')).none;\n+ check(matchOfName('a', 'smile')).none;\n+\n+ check(matchOfName('o', 'open_book')).prefix;\n+ check(matchOfName('open', 'open_book')).prefix;\n+ check(matchOfName('pe', 'open_book')).other;\n+ check(matchOfName('boo', 'open_book')).wordAligned;\n+ check(matchOfName('ok', 'open_book')).other;\n });\n \n test('multi-word query matches from start of a word', () {\n- check(matchesName('open_', 'open_book')).isTrue();\n- check(matchesName('open_b', 'open_book')).isTrue();\n- check(matchesName('open_book', 'open_book')).isTrue();\n+ check(matchOfName('open_', 'open_book')).prefix;\n+ check(matchOfName('open_b', 'open_book')).prefix;\n+ check(matchOfName('open_book', 'open_book')).exact;\n \n- check(matchesName('pen_', 'open_book')).isFalse();\n- check(matchesName('n_b', 'open_book')).isFalse();\n+ check(matchOfName('pen_', 'open_book')).none;\n+ check(matchOfName('n_b', 'open_book')).none;\n \n- check(matchesName('blue_dia', 'large_blue_diamond')).isTrue();\n+ check(matchOfName('blue_dia', 'large_blue_diamond')).wordAligned;\n });\n \n test('spaces in query behave as underscores', () {\n- check(matchesName('open ', 'open_book')).isTrue();\n- check(matchesName('open b', 'open_book')).isTrue();\n- check(matchesName('open book', 'open_book')).isTrue();\n+ check(matchOfName('open ', 'open_book')).prefix;\n+ check(matchOfName('open b', 'open_book')).prefix;\n+ check(matchOfName('open book', 'open_book')).exact;\n \n- check(matchesName('pen ', 'open_book')).isFalse();\n- check(matchesName('n b', 'open_book')).isFalse();\n+ check(matchOfName('pen ', 'open_book')).none;\n+ check(matchOfName('n b', 'open_book')).none;\n \n- check(matchesName('blue dia', 'large_blue_diamond')).isTrue();\n+ check(matchOfName('blue dia', 'large_blue_diamond')).wordAligned;\n });\n \n test('query is lower-cased', () {\n- check(matchesName('Smi', 'smile')).isTrue();\n+ check(matchOfName('Smi', 'smile')).prefix;\n });\n \n test('query matches aliases same way as primary name', () {\n- bool matchesNames(String query, List names) {\n- return EmojiAutocompleteQuery(query).matches(unicode(names));\n- }\n+ check(matchOfNames('a', ['a', 'b'])).exact;\n+ check(matchOfNames('b', ['a', 'b'])).exact;\n+ check(matchOfNames('c', ['a', 'b'])).none;\n+\n+ check(matchOfNames('pe', ['x', 'open_book'])).other;\n+ check(matchOfNames('ok', ['x', 'open_book'])).other;\n \n- check(matchesNames('a', ['a', 'b'])).isTrue();\n- check(matchesNames('b', ['a', 'b'])).isTrue();\n- check(matchesNames('c', ['a', 'b'])).isFalse();\n+ check(matchOfNames('open_', ['x', 'open_book'])).prefix;\n+ check(matchOfNames('open b', ['x', 'open_book'])).prefix;\n+ check(matchOfNames('pen_', ['x', 'open_book'])).none;\n \n- check(matchesNames('pe', ['x', 'open_book'])).isTrue();\n- check(matchesNames('ok', ['x', 'open_book'])).isTrue();\n+ check(matchOfNames('blue_dia', ['x', 'large_blue_diamond'])).wordAligned;\n \n- check(matchesNames('open_', ['x', 'open_book'])).isTrue();\n- check(matchesNames('open b', ['x', 'open_book'])).isTrue();\n- check(matchesNames('pen_', ['x', 'open_book'])).isFalse();\n+ check(matchOfNames('Smi', ['x', 'smile'])).prefix;\n+ });\n \n- check(matchesNames('Smi', ['x', 'smile'])).isTrue();\n+ test('best match among name and aliases prevails', () {\n+ check(matchOfNames('a', ['ab', 'a', 'b_a', 'ba', 'x'])).exact;\n+ check(matchOfNames('a', ['ba', 'ab', 'b_a', 'x'])).prefix;\n+ check(matchOfNames('a', ['ba', 'ab', 'b_a'])).prefix;\n+ check(matchOfNames('a', ['ba', 'b_a', 'x'])).wordAligned;\n+ check(matchOfNames('a', ['b_a', 'ba'])).wordAligned;\n+ check(matchOfNames('a', ['ba', 'x'])).other;\n+ check(matchOfNames('a', ['x', 'y', 'z'])).none;\n });\n \n test('query matches literal Unicode value', () {\n- bool matchesLiteral(String query, String emojiCode, {required String aka}) {\n+ EmojiMatchQuality? matchOfLiteral(String query, String emojiCode, {\n+ required String aka}) {\n assert(aka == query);\n- return EmojiAutocompleteQuery(query)\n- .matches(unicode(['asdf'], emojiCode: emojiCode));\n+ return matchOf(query, unicode(['asdf'], emojiCode: emojiCode));\n }\n \n // Matching the code, in hex, doesn't count.\n- check(matchesLiteral('1f642', aka: '1f642', '1f642')).isFalse();\n+ check(matchOfLiteral('1f642', aka: '1f642', '1f642')).none;\n \n // Matching the Unicode value the code describes does count\u2026\n- check(matchesLiteral('\ud83d\ude42', aka: '\\u{1f642}', '1f642')).isTrue();\n+ check(matchOfLiteral('\ud83d\ude42', aka: '\\u{1f642}', '1f642')).exact;\n // \u2026 and failing to match it doesn't make a match.\n- check(matchesLiteral('\ud83d\ude41', aka: '\\u{1f641}', '1f642')).isFalse();\n+ check(matchOfLiteral('\ud83d\ude41', aka: '\\u{1f641}', '1f642')).none;\n \n // Multi-code-point emoji work fine.\n- check(matchesLiteral('\ud83c\udff3\u200d\ud83c\udf08', aka: '\\u{1f3f3}\\u{200d}\\u{1f308}',\n- '1f3f3-200d-1f308')).isTrue();\n+ check(matchOfLiteral('\ud83c\udff3\u200d\ud83c\udf08', aka: '\\u{1f3f3}\\u{200d}\\u{1f308}',\n+ '1f3f3-200d-1f308')).exact;\n // Only exact matches count; no partial matches.\n- check(matchesLiteral('\ud83c\udff3', aka: '\\u{1f3f3}',\n- '1f3f3-200d-1f308')).isFalse();\n- check(matchesLiteral('\u200d\ud83c\udf08', aka: '\\u{200d}\\u{1f308}',\n- '1f3f3-200d-1f308')).isFalse();\n- check(matchesLiteral('\ud83c\udff3\u200d\ud83c\udf08', aka: '\\u{1f3f3}\\u{200d}\\u{1f308}',\n- '1f3f3')).isFalse();\n+ check(matchOfLiteral('\ud83c\udff3', aka: '\\u{1f3f3}',\n+ '1f3f3-200d-1f308')).none;\n+ check(matchOfLiteral('\u200d\ud83c\udf08', aka: '\\u{200d}\\u{1f308}',\n+ '1f3f3-200d-1f308')).none;\n+ check(matchOfLiteral('\ud83c\udff3\u200d\ud83c\udf08', aka: '\\u{1f3f3}\\u{200d}\\u{1f308}',\n+ '1f3f3')).none;\n });\n \n- test('can match realm emoji', () {\n- EmojiCandidate realmCandidate(String emojiName) {\n- return EmojiCandidate(\n- emojiType: ReactionType.realmEmoji,\n- emojiCode: '1', emojiName: emojiName, aliases: null,\n- emojiDisplay: ImageEmojiDisplay(\n- emojiName: emojiName,\n- resolvedUrl: eg.realmUrl.resolve('/emoji/1.png'),\n- resolvedStillUrl: eg.realmUrl.resolve('/emoji/1-still.png')));\n- }\n+ EmojiCandidate realmCandidate(String emojiName) {\n+ return EmojiCandidate(\n+ emojiType: ReactionType.realmEmoji,\n+ emojiCode: '1', emojiName: emojiName, aliases: null,\n+ emojiDisplay: ImageEmojiDisplay(\n+ emojiName: emojiName,\n+ resolvedUrl: eg.realmUrl.resolve('/emoji/1.png'),\n+ resolvedStillUrl: eg.realmUrl.resolve('/emoji/1-still.png')));\n+ }\n \n- check(EmojiAutocompleteQuery('eqeq')\n- .matches(realmCandidate('eqeq'))).isTrue();\n- check(EmojiAutocompleteQuery('open_')\n- .matches(realmCandidate('open_book'))).isTrue();\n- check(EmojiAutocompleteQuery('n_b')\n- .matches(realmCandidate('open_book'))).isFalse();\n- check(EmojiAutocompleteQuery('blue dia')\n- .matches(realmCandidate('large_blue_diamond'))).isTrue();\n- check(EmojiAutocompleteQuery('Smi')\n- .matches(realmCandidate('smile'))).isTrue();\n+ test('can match realm emoji', () {\n+ check(matchOf('eqeq', realmCandidate('eqeq'))).exact;\n+ check(matchOf('open_', realmCandidate('open_book'))).prefix;\n+ check(matchOf('n_b', realmCandidate('open_book'))).none;\n+ check(matchOf('blue dia', realmCandidate('large_blue_diamond'))).wordAligned;\n+ check(matchOf('Smi', realmCandidate('smile'))).prefix;\n });\n \n- test('can match Zulip extra emoji', () {\n+ EmojiCandidate zulipCandidate() {\n final store = eg.store();\n- final zulipCandidate = EmojiCandidate(\n+ return EmojiCandidate(\n emojiType: ReactionType.zulipExtraEmoji,\n emojiCode: 'zulip', emojiName: 'zulip', aliases: null,\n emojiDisplay: store.emojiDisplayFor(\n emojiType: ReactionType.zulipExtraEmoji,\n emojiCode: 'zulip', emojiName: 'zulip'));\n+ }\n \n- check(EmojiAutocompleteQuery('z').matches(zulipCandidate)).isTrue();\n- check(EmojiAutocompleteQuery('Zulip').matches(zulipCandidate)).isTrue();\n- check(EmojiAutocompleteQuery('p').matches(zulipCandidate)).isTrue();\n- check(EmojiAutocompleteQuery('x').matches(zulipCandidate)).isFalse();\n+ test('can match Zulip extra emoji', () {\n+ check(matchOf('z', zulipCandidate())).prefix;\n+ check(matchOf('Zulip', zulipCandidate())).exact;\n+ check(matchOf('p', zulipCandidate())).other;\n+ check(matchOf('x', zulipCandidate())).none;\n+ });\n+\n+ int? rankOf(String query, EmojiCandidate candidate) {\n+ return EmojiAutocompleteQuery(query).testCandidate(candidate)?.rank;\n+ }\n+\n+ void checkPrecedes(String query, EmojiCandidate a, EmojiCandidate b) {\n+ check(rankOf(query, a)!).isLessThan(rankOf(query, b)!);\n+ }\n+\n+ void checkSameRank(String query, EmojiCandidate a, EmojiCandidate b) {\n+ check(rankOf(query, a)!).equals(rankOf(query, b)!);\n+ }\n+\n+ final octopus = unicode(['octopus'], emojiCode: '1f419');\n+ final workingOnIt = unicode(['working_on_it'], emojiCode: '1f6e0');\n+ final love = unicode(['love'], emojiCode: '2764'); // aka :heart:\n+\n+ test('ranks match quality exact/prefix/word-aligned/other', () {\n+ checkPrecedes('o', unicode(['o']), unicode(['onion']));\n+ checkPrecedes('o', unicode(['onion']), unicode(['squared_ok']));\n+ checkPrecedes('o', unicode(['squared_ok']), unicode(['book']));\n+ });\n+\n+ test('ranks popular before realm before other Unicode', () {\n+ checkPrecedes('o', octopus, realmCandidate('open_book'));\n+ checkPrecedes('o', realmCandidate('open_book'), unicode(['ok']));\n+ });\n+\n+ test('ranks Zulip extra emoji same as realm emoji', () {\n+ checkSameRank('z', zulipCandidate(), realmCandidate('zounds'));\n+ });\n+\n+ test('ranks exact-vs-not more significant than popular/custom/other', () {\n+ // Generic Unicode exact beats popular prefix\u2026\n+ checkPrecedes('o', unicode(['o']), octopus);\n+ // \u2026 which really does count as popular, beating realm prefix.\n+ checkPrecedes('o', octopus, realmCandidate('open_book'));\n+ });\n+\n+ test('ranks popular-vs-not more significant than prefix/word-aligned', () {\n+ // Popular word-aligned beats realm prefix.\n+ checkPrecedes('o', workingOnIt, realmCandidate('open_book'));\n+ });\n+\n+ test('ranks popular as if generic when non-word-aligned', () {\n+ // Generic word-aligned beats popular other.\n+ checkPrecedes('o', unicode(['squared_ok']), love);\n+ // Popular other ranks below even custom other\u2026\n+ checkPrecedes('o', realmCandidate('yo'), love);\n+ // \u2026 and same as generic Unicode other.\n+ checkSameRank('o', love, unicode(['book']));\n+\n+ // And that emoji really does count as popular,\n+ // beating custom emoji when both have a prefix match.\n+ checkPrecedes('l', love, realmCandidate('logs'));\n+ });\n+\n+ test('ranks custom/other more significant than prefix/word-aligned', () {\n+ // Custom word-aligned beats generic prefix.\n+ checkPrecedes('o', realmCandidate('laughing_blue_octopus'),\n+ unicode(['ok']));\n+ });\n+\n+ test('ranks word-aligned/other more significant than custom/other', () {\n+ // Generic Unicode word-aligned beats realm other.\n+ checkPrecedes('o', unicode(['squared_ok']), realmCandidate('yo'));\n+ });\n+\n+ test('full list of ranks', () {\n+ check([\n+ rankOf('o', unicode(['o'])), // exact (generic)\n+ rankOf('o', octopus), // prefix popular\n+ rankOf('o', workingOnIt), // word-aligned popular\n+ rankOf('o', realmCandidate('open_book')), // prefix realm\n+ rankOf('z', zulipCandidate()), // == prefix :zulip:\n+ rankOf('y', realmCandidate('thank_you')), // word-aligned realm\n+ // (word-aligned :zulip: is impossible because the name is one word)\n+ rankOf('o', unicode(['ok'])), // prefix generic\n+ rankOf('o', unicode(['squared_ok'])), // word-aligned generic\n+ rankOf('o', realmCandidate('yo')), // other realm\n+ rankOf('p', zulipCandidate()), // == other :zulip:\n+ rankOf('o', unicode(['book'])), // other generic\n+ rankOf('o', love), // == other popular\n+ ]).deepEquals([0, 1, 2, 3, 3, 4, 5, 6, 7, 7, 8, 8]);\n });\n });\n }\n@@ -476,6 +704,14 @@ extension EmojiCandidateChecks on Subject {\n Subject get emojiDisplay => has((x) => x.emojiDisplay, 'emojiDisplay');\n }\n \n+extension EmojiMatchQualityChecks on Subject {\n+ void get exact => equals(EmojiMatchQuality.exact);\n+ void get prefix => equals(EmojiMatchQuality.prefix);\n+ void get wordAligned => equals(EmojiMatchQuality.wordAligned);\n+ void get other => equals(EmojiMatchQuality.other);\n+ void get none => isNull();\n+}\n+\n extension EmojiAutocompleteResultChecks on Subject {\n Subject get candidate => has((x) => x.candidate, 'candidate');\n }\n", "n2p_tests": "{\"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion comparison is numeric, not lexicographic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion nonempty, empty\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: binarySearchByKey 3 elements\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates Unicode emoji with overridden aliases survives with remaining names\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion reversed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates Unicode emoji with overridden primary name survives with remaining names\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: bucketSort some buckets empty: 10 elements in 3 of 10 buckets\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery query matches literal Unicode value\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery query is lower-cased\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion empty, nonempty\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates realm emoji overrides Unicode emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery ranks word-aligned/other more significant than custom/other\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: bucketSort empty, some buckets\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: bucketSort long random list, 1000 in 1000 buckets\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery ranks match quality exact/prefix/word-aligned/other\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates popular emoji appear in their canonical order\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery spaces in query behave as underscores\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: bucketSort empty list, zero buckets\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: binarySearchByKey empty\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery query matches aliases same way as primary name\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: bucketSort sparse random list, 100 in 1000 buckets\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion some dupes\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: emojiDisplayFor Unicode emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates memoizes result\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion all dupes\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery ranks custom/other more significant than prefix/word-aligned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates deactivated realm emoji cause no override of Unicode emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: emojiDisplayFor invalid Unicode emoji -> no crash\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: bucketSort interleaved: 4 elements, 2 buckets\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates updates on RealmEmojiUpdateEvent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery ranks popular as if generic when non-word-aligned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: binarySearchByKey 2 elements\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteView results end-to-end\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery ranks popular before realm before other Unicode\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery full list of ranks\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates realm emoji included only when active\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: bucketSort long random list, 1000 in 2 buckets\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery can match Zulip extra emoji\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery ranks popular-vs-not more significant than prefix/word-aligned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: emojiDisplayFor :zulip:\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion empty\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteView results can include all three emoji types\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery can match realm emoji\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: bucketSort one big bucket\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: bucketSort explicit result, interleaved: 4 elements, 2 buckets\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery ranks exact-vs-not more significant than popular/custom/other\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion in order\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates realm emoji tolerate name collisions\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery ranks Zulip extra emoji same as realm emoji\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates updates on setServerEmojiData\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: allEmojiCandidates popular emoji appear even when no server emoji data\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery one-word query matches anywhere in name\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery multi-word query matches from start of a word\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteView results preserve order of popular emoji within each rank\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: emojiDisplayFor realm emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteQuery best match among name and aliases prevails\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion interleaved\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/emoji_test.dart: EmojiAutocompleteView results update after query change\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1106", "org": "zulip", "repo": "zulip-flutter", "number": 1106, "state": "closed", "title": "Make topic headers case-insensitive", "body": "Topics in Zulip are case-insensitive. This change makes the message list's topic headers match that behavior, so messages whose topics differ only in case (like \"missing string\" and \"Missing string\") share a single header. This brings the behavior in line with Zulip web.\r\n\r\n### What is the change?\r\n\r\nThe change modifies the topic comparison logic in `haveSameRecipient()` to use case-insensitive comparison when determining whether to show a new recipient header.\r\n\r\n### Screenshots\r\n\r\n| Before | After |\r\n|---------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------|\r\n| | |\r\n\r\n\r\n\r\n\r\nFixes #739", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"6070a7f1950e15846e081a7f0abb686b8974164b\"}", "resolved_issues": "[{\"number\": 739, \"title\": \"Extra recipient header when topic changes case\", \"body\": \"If you visit the thread `#translation > Missing string` on chat.zulip.org, around this message (the first one in today's thread):\\r\\nhttps://chat.zulip.org/#narrow/stream/58-translation/topic/Missing.20string/near/1828362\\r\\n\\r\\nyou'll find it gets its own recipient header, even in a topic narrow, even though there are previous messages. Specifically there's a recipient header \\\"missing string\\\" for the older messages (which are from 2021), and another one \\\"Missing string\\\" for that message and the ones after it.\\r\\n\\r\\nIn general Zulip topics are case-insensitive. Specifically, if you look at that conversation in Zulip web, there's just one recipient header; it reflects the older messages, so \\\"missing string\\\". So we should do the same.\\r\\n\\r\\nRelated issues:\\r\\n* #980 \\r\\n* #1205\"}]", "lang": "dart", "problem_statement": "Extra recipient header when topic changes case\nIf you visit the thread `#translation > Missing string` on chat.zulip.org, around this message (the first one in today's thread):\r\nhttps://chat.zulip.org/#narrow/stream/58-translation/topic/Missing.20string/near/1828362\r\n\r\nyou'll find it gets its own recipient header, even in a topic narrow, even though there are previous messages. Specifically there's a recipient header \"missing string\" for the older messages (which are from 2021), and another one \"Missing string\" for that message and the ones after it.\r\n\r\nIn general Zulip topics are case-insensitive. Specifically, if you look at that conversation in Zulip web, there's just one recipient header; it reflects the older messages, so \"missing string\". So we should do the same.\r\n\r\nRelated issues:\r\n* #980 \r\n* #1205\n", "hints": "We had a second report of the issue today, with a screenshot:\r\nhttps://chat.zulip.org/#narrow/stream/48-mobile/topic/Case.20sensitivity.20in.20topics/near/1954248\r\n", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1106", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/739\"]", "test_command": "flutter test test/model/message_list_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/message_list.dart b/lib/model/message_list.dart\nindex 440d12f2b8..ecfb16c2b9 100644\n--- a/lib/model/message_list.dart\n+++ b/lib/model/message_list.dart\n@@ -352,7 +352,7 @@ mixin _MessageSequence {\n bool haveSameRecipient(Message prevMessage, Message message) {\n if (prevMessage is StreamMessage && message is StreamMessage) {\n if (prevMessage.streamId != message.streamId) return false;\n- if (prevMessage.topic != message.topic) return false;\n+ if (prevMessage.topic.toLowerCase() != message.topic.toLowerCase()) return false;\n } else if (prevMessage is DmMessage && message is DmMessage) {\n if (!_equalIdSequences(prevMessage.allRecipientIds, message.allRecipientIds)) {\n return false;\n", "test_patch": "diff --git a/test/model/message_list_test.dart b/test/model/message_list_test.dart\nindex e7b6cd7834..e92b2489b3 100644\n--- a/test/model/message_list_test.dart\n+++ b/test/model/message_list_test.dart\n@@ -1803,6 +1803,26 @@ void main() {\n }\n }\n });\n+\n+ group('topics compared case-insensitively', () {\n+ void doTest(String description, String topicA, String topicB, bool expected) {\n+ test(description, () {\n+ final stream = eg.stream();\n+ final messageA = eg.streamMessage(stream: stream, topic: topicA);\n+ final messageB = eg.streamMessage(stream: stream, topic: topicB);\n+ check(haveSameRecipient(messageA, messageB)).equals(expected);\n+ });\n+ }\n+\n+ doTest('same case, all lower', 'abc', 'abc', true);\n+ doTest('same case, all upper', 'ABC', 'ABC', true);\n+ doTest('same case, mixed', 'AbC', 'AbC', true);\n+ doTest('same non-cased chars', '\u55ce', '\u55ce', true);\n+ doTest('different case', 'aBc', 'ABC', true);\n+ doTest('different case, same diacritics', 'Ab\u00c7', 'aB\u00e7', true);\n+ doTest('same letters, different diacritics', 'ma', 'm\u01ce', false);\n+ doTest('having different CJK characters', '\u55ce', '\u99ac', false);\n+ });\n });\n \n test('messagesSameDay', () {\n", "n2p_tests": "{}", "f2p_tests": "{\"haveSameRecipient topics compared case-insensitively different case, same diacritics\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"haveSameRecipient topics compared case-insensitively different case\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"messagesMoved in topic narrow moved into narrow: should refetch messages (old channel, old topic) -> (channel, topic)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved fetch races fetchOlder #1, _reset, move fetch finishes, fetchOlder #2, fetchOlder #1 finishes, fetchOlder #2 finishes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved fetch races fetchOlder, _reset, move fetch finishes, fetchOlder returns\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"DeleteMessageEvent not all in narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"MessageEvent, before fetch\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"UserTopicEvent unmute a topic -> refetch from scratch\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in channel narrow channel -> new channel: remove moved messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved fetch races fetchOlder, _reset, fetchOlder returns, move fetch finishes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in channel narrow unrelated channel -> unrelated channel: unaffected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"haveSameRecipient DMs match just if same recipients\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fetchOlder\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fetchOlder, recent senders track all the messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in channel narrow old channel -> channel: refetch\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in combined feed narrow internal move between topics\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"regression tests for #455 UpdateMessageFlagsEvent is applied even when message not in any msglists\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fetchOlder nop during backoff\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"DeleteMessageEvent non-consecutive message deletion\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fetchInitial, no messages found\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in topic narrow irrelevant moves (channel, old topic) -> (channel, unrelated topic)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"UserTopicEvent no affected messages -> no notification\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"haveSameRecipient stream messages vs DMs, no match\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"notifyListenersIfMessagePresent message absent (older than window)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fetchOlder nop when already fetching\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"haveSameRecipient topics compared case-insensitively same case, all lower\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in channel narrow channel -> channel: internal move\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in topic narrow moved from narrow: should remove moved messages (channel, topic) -> (new channel, new topic)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fetchInitial, recent senders track all the messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"notifyListenersIfAnyMessagePresent all messages present\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fetchOlder nop when already haveOldest true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"reassemble\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"haveSameRecipient topics compared case-insensitively same case, all upper\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"regression tests for #455 UpdateMessageEvent (edit) is applied even when message not in any msglists\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in topic narrow follow to the new narrow when propagateMode = changeLater\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"regression tests for #455 ReactionEvent is applied even when message not in any msglists\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in topic narrow irrelevant moves (old channel, topic) - > (unrelated channel, topic)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"recipient headers are maintained consistently\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"DeleteMessageEvent in narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messageContentChanged message present\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"handle content parsing into subclasses of ZulipMessageContent ZulipContent\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in channel narrow do not follow when propagateMode = changeOne\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in channel narrow unrelated channel -> new channel: unaffected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fetchInitial, short history\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fetchInitial\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved fetch races fetchOlder backoff A starts, _reset, move fetch finishes, fetchOlder backoff B starts, fetchOlder backoff A ends\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved fetch races fetchInitial, _reset, move fetch finishes, initial fetch finishes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"stream/topic muting in StarredMessagesNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"stream/topic muting in ChannelNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in topic narrow do not follow to the new narrow when propagateMode = changeOne\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"notifyListenersIfAnyMessagePresent no messages present\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"UserTopicEvent in DmNarrow, do nothing (smoke test)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"UserTopicEvent in ChannelNarrow, use stream visibility\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in channel narrow do not follow when propagateMode = changeLater\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in topic narrow follow to the new narrow when propagateMode = changeAll\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in topic narrow moved from narrow: should remove moved messages (channel, topic) -> (channel, new topic)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"showSender is maintained correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in channel narrow do not follow when propagateMode = changeAll\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"notifyListenersIfAnyMessagePresent some messages present\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fetchOlder handles servers not understanding includeAnchor\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in combined feed narrow internal move between channels\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"stream/topic muting in CombinedFeedNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"UserTopicEvent mute a visible topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"haveSameRecipient topics compared case-insensitively same case, mixed\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"stream/topic muting in MentionsNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in topic narrow moved from narrow: should remove moved messages (channel, topic) -> (new channel, topic)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved fetch races fetchInitial, _reset, initial fetch finishes, move fetch finishes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"UserTopicEvent in TopicNarrow, stay visible\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"stream/topic muting in TopicNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"regression tests for #455 reaction events handled once, even when message is in two message lists\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in topic narrow handle move event before initial fetch\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"DeleteMessageEvent complete message deletion\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"haveSameRecipient topics compared case-insensitively same letters, different diacritics\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in topic narrow moved into narrow: should refetch messages (old channel, topic) -> (channel, topic)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"haveSameRecipient topics compared case-insensitively same non-cased chars\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"haveSameRecipient stream messages match just if same stream/topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"UserTopicEvent unmute a topic before initial fetch completes -> do nothing\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"notifyListenersIfMessagePresent message absent (newer than window)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"handle content parsing into subclasses of ZulipMessageContent PollContent\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"MessageEvent, not in narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messageContentChanged message absent\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"haveSameRecipient topics compared case-insensitively having different CJK characters\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"notifyListenersIfMessagePresent message present\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"UserTopicEvent in CombinedFeedNarrow, use combined-feed visibility\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesMoved in topic narrow moved into narrow: should refetch messages (channel, old topic) -> (channel, topic)\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"messagesSameDay\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"MessageEvent\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"notifyListenersIfMessagePresent message absent\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"DeleteMessageEvent not in narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-1017", "org": "zulip", "repo": "zulip-flutter", "number": 1017, "state": "closed", "title": "dialog: Use Cupertino-flavored alert dialogs on iOS", "body": "This pull request closes #996.
          \r\n\r\nIn `dialog.dart`:
          \r\nSwitched `alertDialog(` to `alertDialog.adaptive(`, as per #996.
          \r\nDefined new private widget `_adaptiveAction` which displays a `CupertinoDialogAction` for IOS and a `TextButton` otherwise. `_adaptiveAction(` is used in place of `TextButton(` when stating dialog actions.

          \r\n\r\nThe new result for IOS:\r\n\"Screenshot\r\n
          \r\n\r\n`dialog-checks.dart` has been updated to check the text content of the respective dialog types depending on the platform\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"98b94bd2a0685606272882e089441000f8680952\"}", "resolved_issues": "[{\"number\": 996, \"title\": \"dialog: Use Cupertino-flavored alert dialogs on iOS\", \"body\": \"We should experiment with the [`AlertDialog.adaptive`](https://api.flutter.dev/flutter/material/AlertDialog/AlertDialog.adaptive.html) constructor, instead of [`AlertDialog`](https://api.flutter.dev/flutter/material/AlertDialog/AlertDialog.html), which forces a Material-style dialog on iOS:\\r\\n\\r\\n| Current | Should be more like |\\r\\n| --- | --- |\\r\\n| \\\"image\\\" | \\\"image\\\" |\\r\\n\\r\\nThe \\\"after\\\" screenshot was made by simply changing `AlertDialog(` to `AlertDialog.adaptive(`. A complete fix will be a little more complicated than that, though. See the code sample on the [`AlertDialog.adaptive` doc](https://api.flutter.dev/flutter/material/AlertDialog/AlertDialog.adaptive.html), which shows a platform switch for the dialog's action buttons, to style those appropriately (including the buttons' on-press appearance):\\r\\n\\r\\n```dart\\r\\n Widget adaptiveAction(\\r\\n {required BuildContext context,\\r\\n required VoidCallback onPressed,\\r\\n required Widget child}) {\\r\\n final ThemeData theme = Theme.of(context);\\r\\n switch (theme.platform) {\\r\\n case TargetPlatform.android:\\r\\n case TargetPlatform.fuchsia:\\r\\n case TargetPlatform.linux:\\r\\n case TargetPlatform.windows:\\r\\n return TextButton(onPressed: onPressed, child: child);\\r\\n case TargetPlatform.iOS:\\r\\n case TargetPlatform.macOS:\\r\\n return CupertinoDialogAction(onPressed: onPressed, child: child);\\r\\n }\\r\\n }\\r\\n```\\r\\n\\r\\nRelatedly, I think the `TextAlign.end` in our `_dialogActionText` helper should not be applied on iOS because on iOS the button text is meant to be center-aligned.\\r\\n\\r\\nI also notice that our \\\"Source Sans 3\\\" font isn't being applied in the Cupertino-style dialog in the screenshot. ~~I think we want it to be, so we should debug and fix this.~~ Probably should leave this be, actually; it's supposed to mimic the native iOS alert, which uses a system font, not an app's chosen font.\"}]", "lang": "dart", "problem_statement": "dialog: Use Cupertino-flavored alert dialogs on iOS\nWe should experiment with the [`AlertDialog.adaptive`](https://api.flutter.dev/flutter/material/AlertDialog/AlertDialog.adaptive.html) constructor, instead of [`AlertDialog`](https://api.flutter.dev/flutter/material/AlertDialog/AlertDialog.html), which forces a Material-style dialog on iOS:\r\n\r\n| Current | Should be more like |\r\n| --- | --- |\r\n| \"image\" | \"image\" |\r\n\r\nThe \"after\" screenshot was made by simply changing `AlertDialog(` to `AlertDialog.adaptive(`. A complete fix will be a little more complicated than that, though. See the code sample on the [`AlertDialog.adaptive` doc](https://api.flutter.dev/flutter/material/AlertDialog/AlertDialog.adaptive.html), which shows a platform switch for the dialog's action buttons, to style those appropriately (including the buttons' on-press appearance):\r\n\r\n```dart\r\n Widget adaptiveAction(\r\n {required BuildContext context,\r\n required VoidCallback onPressed,\r\n required Widget child}) {\r\n final ThemeData theme = Theme.of(context);\r\n switch (theme.platform) {\r\n case TargetPlatform.android:\r\n case TargetPlatform.fuchsia:\r\n case TargetPlatform.linux:\r\n case TargetPlatform.windows:\r\n return TextButton(onPressed: onPressed, child: child);\r\n case TargetPlatform.iOS:\r\n case TargetPlatform.macOS:\r\n return CupertinoDialogAction(onPressed: onPressed, child: child);\r\n }\r\n }\r\n```\r\n\r\nRelatedly, I think the `TextAlign.end` in our `_dialogActionText` helper should not be applied on iOS because on iOS the button text is meant to be center-aligned.\r\n\r\nI also notice that our \"Source Sans 3\" font isn't being applied in the Cupertino-style dialog in the screenshot. ~~I think we want it to be, so we should debug and fix this.~~ Probably should leave this be, actually; it's supposed to mimic the native iOS alert, which uses a system font, not an app's chosen font.\n", "hints": "Hi I'm keen to get involved with this project and this issue looks like a good place to start, can I have a go at it?\n@u7088495 Please take a look at the Zulip project's guide to getting involved with the code:\r\nhttps://zulip.readthedocs.io/en/latest/contributing/contributing.html#your-first-codebase-contribution\r\nhttps://zulip.readthedocs.io/en/latest/contributing/contributing.html#picking-an-issue-to-work-on\r\n\nAs demonstrated, in `dialog.dart` I'd replace `AlertDialog(` with `AlertDialog.adaptive(`. I'd also implement the widget `adaptiveAction` to return a `CupertinoDialogAction(` for OS platforms and the regular textButton otherwise. As for the font, I am unsure how to fix that rather than by setting the textStyle property on the `Text` widgets directly - I tried defining cupertino theme data but with no luck.\nSounds good!\r\n\r\n> As for the font, I am unsure how to fix that rather than by setting the textStyle property on the `Text` widgets directly - I tried defining cupertino theme data but with no luck.\r\n\r\nI think it may be fine, actually, to accept the default styling, instead of overriding it with our custom styles with \"Source Sans 3\".\r\n\r\nIf we were using a native iOS API to show these alerts, we'd get whatever system-defined styles Apple chooses\u2014like what's illustrated in [this interface guidelines doc from Apple](https://developer.apple.com/design/human-interface-guidelines/alerts)\u2014and Flutter's defaults understandably mimic those.\nAlso, on the text alignment, with the `CupertinoDialogAction`, the label doesn't wrap and so setting `TextAlign.end` has no effect.\r\n\"Screenshot\r\n\r\nBut I could still update this if its worth being explicit?\n@u7088495 I think the most effective venue for getting that question answered would be in chat, in #mobile-dev-help. That will also help keep this issue thread focused.", "pull_url": "https://github.com/zulip/zulip-flutter/pull/1017", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/996\"]", "test_command": "flutter test test/widgets/action_sheet_test.dart test/widgets/app_test.dart test/widgets/compose_box_test.dart test/widgets/dialog_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/widgets/dialog.dart b/lib/widgets/dialog.dart\nindex e635071cc9..61a6462592 100644\n--- a/lib/widgets/dialog.dart\n+++ b/lib/widgets/dialog.dart\n@@ -1,3 +1,5 @@\n+import 'package:flutter/cupertino.dart';\n+import 'package:flutter/foundation.dart';\n import 'package:flutter/material.dart';\n \n import '../generated/l10n/zulip_localizations.dart';\n@@ -7,18 +9,29 @@ import 'app.dart';\n import 'content.dart';\n import 'store.dart';\n \n-Widget _dialogActionText(String text) {\n- return Text(\n- text,\n-\n- // As suggested by\n- // https://api.flutter.dev/flutter/material/AlertDialog/actions.html :\n- // > It is recommended to set the Text.textAlign to TextAlign.end\n- // > for the Text within the TextButton, so that buttons whose\n- // > labels wrap to an extra line align with the overall\n- // > OverflowBar's alignment within the dialog.\n- textAlign: TextAlign.end,\n- );\n+/// A platform-appropriate action for [AlertDialog.adaptive]'s [actions] param.\n+Widget _adaptiveAction({required VoidCallback onPressed, required String text}) {\n+ switch (defaultTargetPlatform) {\n+ case TargetPlatform.android:\n+ case TargetPlatform.fuchsia:\n+ case TargetPlatform.linux:\n+ case TargetPlatform.windows:\n+ return TextButton(\n+ onPressed: onPressed,\n+ child: Text(\n+ text,\n+ // As suggested by\n+ // https://api.flutter.dev/flutter/material/AlertDialog/actions.html :\n+ // > It is recommended to set the Text.textAlign to TextAlign.end\n+ // > for the Text within the TextButton, so that buttons whose\n+ // > labels wrap to an extra line align with the overall\n+ // > OverflowBar's alignment within the dialog.\n+ textAlign: TextAlign.end));\n+\n+ case TargetPlatform.iOS:\n+ case TargetPlatform.macOS:\n+ return CupertinoDialogAction(onPressed: onPressed, child: Text(text));\n+ }\n }\n \n /// Tracks the status of a dialog, in being still open or already closed.\n@@ -71,17 +84,17 @@ DialogStatus showErrorDialog({\n final zulipLocalizations = ZulipLocalizations.of(context);\n final future = showDialog(\n context: context,\n- builder: (BuildContext context) => AlertDialog(\n+ builder: (BuildContext context) => AlertDialog.adaptive(\n title: Text(title),\n content: message != null ? SingleChildScrollView(child: Text(message)) : null,\n actions: [\n if (learnMoreButtonUrl != null)\n- TextButton(\n+ _adaptiveAction(\n onPressed: () => PlatformActions.launchUrl(context, learnMoreButtonUrl),\n- child: _dialogActionText(zulipLocalizations.errorDialogLearnMore)),\n- TextButton(\n+ text: zulipLocalizations.errorDialogLearnMore),\n+ _adaptiveAction(\n onPressed: () => Navigator.pop(context),\n- child: _dialogActionText(zulipLocalizations.errorDialogContinue)),\n+ text: zulipLocalizations.errorDialogContinue),\n ]));\n return DialogStatus(future);\n }\n@@ -103,16 +116,16 @@ DialogStatus showSuggestedActionDialog({\n final zulipLocalizations = ZulipLocalizations.of(context);\n final future = showDialog(\n context: context,\n- builder: (BuildContext context) => AlertDialog(\n+ builder: (BuildContext context) => AlertDialog.adaptive(\n title: Text(title),\n content: SingleChildScrollView(child: Text(message)),\n actions: [\n- TextButton(\n+ _adaptiveAction(\n onPressed: () => Navigator.pop(context, null),\n- child: _dialogActionText(zulipLocalizations.dialogCancel)),\n- TextButton(\n+ text: zulipLocalizations.dialogCancel),\n+ _adaptiveAction(\n onPressed: () => Navigator.pop(context, true),\n- child: _dialogActionText(actionButtonText ?? zulipLocalizations.dialogContinue)),\n+ text: actionButtonText ?? zulipLocalizations.dialogContinue),\n ]));\n return DialogStatus(future);\n }\n@@ -164,7 +177,7 @@ class UpgradeWelcomeDialog extends StatelessWidget {\n @override\n Widget build(BuildContext context) {\n final zulipLocalizations = ZulipLocalizations.of(context);\n- return AlertDialog(\n+ return AlertDialog.adaptive(\n title: Text(zulipLocalizations.upgradeWelcomeDialogTitle),\n content: SingleChildScrollView(\n child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [\n@@ -177,8 +190,9 @@ class UpgradeWelcomeDialog extends StatelessWidget {\n zulipLocalizations.upgradeWelcomeDialogLinkText)),\n ])),\n actions: [\n- TextButton(onPressed: () => Navigator.pop(context),\n- child: Text(zulipLocalizations.upgradeWelcomeDialogDismiss)),\n+ _adaptiveAction(\n+ onPressed: () => Navigator.pop(context),\n+ text: zulipLocalizations.upgradeWelcomeDialogDismiss)\n ]);\n }\n }\n", "test_patch": "diff --git a/test/widgets/action_sheet_test.dart b/test/widgets/action_sheet_test.dart\nindex d65ac20507..f673ebc0d8 100644\n--- a/test/widgets/action_sheet_test.dart\n+++ b/test/widgets/action_sheet_test.dart\n@@ -335,7 +335,7 @@ void main() {\n await tester.tap(findButtonForLabel('Mark channel as read'));\n await tester.pumpAndSettle();\n checkRequest(someChannel.streamId);\n- checkNoErrorDialog(tester);\n+ checkNoDialog(tester);\n });\n \n testWidgets('request fails', (tester) async {\n@@ -776,7 +776,7 @@ void main() {\n await tester.tap(findButtonForLabel('Mark as resolved'));\n await tester.pumpAndSettle();\n \n- checkNoErrorDialog(tester);\n+ checkNoDialog(tester);\n checkRequest(message.id, '\u2714 zulip');\n });\n \n@@ -791,7 +791,7 @@ void main() {\n await tester.tap(findButtonForLabel('Mark as resolved'));\n await tester.pumpAndSettle();\n \n- checkNoErrorDialog(tester);\n+ checkNoDialog(tester);\n checkRequest(message.id, '\u2714 zulip');\n });\n \n@@ -805,7 +805,7 @@ void main() {\n await tester.tap(findButtonForLabel('Mark as unresolved'));\n await tester.pumpAndSettle();\n \n- checkNoErrorDialog(tester);\n+ checkNoDialog(tester);\n checkRequest(message.id, 'zulip');\n });\n \n@@ -819,7 +819,7 @@ void main() {\n await tester.tap(findButtonForLabel('Mark as unresolved'));\n await tester.pumpAndSettle();\n \n- checkNoErrorDialog(tester);\n+ checkNoDialog(tester);\n checkRequest(message.id, 'zulip');\n });\n \ndiff --git a/test/widgets/app_test.dart b/test/widgets/app_test.dart\nindex 53c959321e..eca2f95cab 100644\n--- a/test/widgets/app_test.dart\n+++ b/test/widgets/app_test.dart\n@@ -401,14 +401,14 @@ void main() {\n check(ZulipApp.ready).value.isFalse();\n await tester.pump();\n check(findSnackBarByText(message).evaluate()).isEmpty();\n- checkNoErrorDialog(tester);\n+ checkNoDialog(tester);\n \n check(ZulipApp.ready).value.isTrue();\n // After app startup, reportErrorToUserBriefly displays a SnackBar.\n reportErrorToUserBriefly(message, details: details);\n await tester.pumpAndSettle();\n check(findSnackBarByText(message).evaluate()).single;\n- checkNoErrorDialog(tester);\n+ checkNoDialog(tester);\n \n // Open the error details dialog.\n await tester.tap(find.text('Details'));\n@@ -493,7 +493,7 @@ void main() {\n reportErrorToUserModally(title, message: message);\n check(ZulipApp.ready).value.isFalse();\n await tester.pump();\n- checkNoErrorDialog(tester);\n+ checkNoDialog(tester);\n \n check(ZulipApp.ready).value.isTrue();\n // After app startup, reportErrorToUserModally displays an [AlertDialog].\ndiff --git a/test/widgets/compose_box_test.dart b/test/widgets/compose_box_test.dart\nindex d79acce925..e6b3cf6760 100644\n--- a/test/widgets/compose_box_test.dart\n+++ b/test/widgets/compose_box_test.dart\n@@ -395,7 +395,7 @@ void main() {\n await prepareWithContent(tester,\n makeStringWithCodePoints(kMaxMessageLengthCodePoints));\n await tapSendButton(tester);\n- checkNoErrorDialog(tester);\n+ checkNoDialog(tester);\n });\n \n testWidgets('code points not counted unnecessarily', (tester) async {\n@@ -434,7 +434,7 @@ void main() {\n await prepareWithTopic(tester,\n makeStringWithCodePoints(kMaxTopicLengthCodePoints));\n await tapSendButton(tester);\n- checkNoErrorDialog(tester);\n+ checkNoDialog(tester);\n });\n \n testWidgets('code points not counted unnecessarily', (tester) async {\n@@ -938,7 +938,7 @@ void main() {\n await setupAndTapSend(tester, prepareResponse: (int messageId) {\n connection.prepare(json: SendMessageResult(id: messageId).toJson());\n });\n- checkNoErrorDialog(tester);\n+ checkNoDialog(tester);\n });\n \n testWidgets('ZulipApiException', (tester) async {\n@@ -1078,7 +1078,7 @@ void main() {\n check(call.allowMultiple).equals(true);\n check(call.type).equals(FileType.media);\n \n- checkNoErrorDialog(tester);\n+ checkNoDialog(tester);\n \n check(controller!.content.text)\n .equals('see image: [Uploading image.jpg\u2026]()\\n\\n');\n@@ -1137,7 +1137,7 @@ void main() {\n check(call.source).equals(ImageSource.camera);\n check(call.requestFullMetadata).equals(false);\n \n- checkNoErrorDialog(tester);\n+ checkNoDialog(tester);\n \n check(controller!.content.text)\n .equals('see image: [Uploading image.jpg\u2026]()\\n\\n');\n@@ -1864,7 +1864,7 @@ void main() {\n UploadFileResult(url: '/path/file.jpg').toJson());\n await tester.tap(find.byIcon(ZulipIcons.attach_file), warnIfMissed: false);\n await tester.pump(Duration.zero);\n- checkNoErrorDialog(tester);\n+ checkNoDialog(tester);\n check(testBinding.takePickFilesCalls()).length.equals(1);\n connection.takeRequests(); // upload request\n \ndiff --git a/test/widgets/dialog_checks.dart b/test/widgets/dialog_checks.dart\nindex 86acec96ce..20ff0effd2 100644\n--- a/test/widgets/dialog_checks.dart\n+++ b/test/widgets/dialog_checks.dart\n@@ -1,10 +1,12 @@\n import 'package:checks/checks.dart';\n+import 'package:flutter/cupertino.dart';\n+import 'package:flutter/foundation.dart';\n import 'package:flutter/material.dart';\n import 'package:flutter_checks/flutter_checks.dart';\n import 'package:flutter_test/flutter_test.dart';\n import 'package:zulip/widgets/dialog.dart';\n \n-/// In a widget test, check that showErrorDialog was called with the right text.\n+/// In a widget test, check that [showErrorDialog] was called with the right text.\n ///\n /// Checks for an error dialog matching an expected title\n /// and, optionally, matching an expected message. Fails if none is found.\n@@ -15,24 +17,41 @@ Widget checkErrorDialog(WidgetTester tester, {\n required String expectedTitle,\n String? expectedMessage,\n }) {\n- final dialog = tester.widget(find.byType(AlertDialog));\n- tester.widget(find.descendant(matchRoot: true,\n- of: find.byWidget(dialog.title!), matching: find.text(expectedTitle)));\n- if (expectedMessage != null) {\n- tester.widget(find.descendant(matchRoot: true,\n- of: find.byWidget(dialog.content!), matching: find.text(expectedMessage)));\n- }\n-\n- // TODO check \"Learn more\" button?\n+ switch (defaultTargetPlatform) {\n+ case TargetPlatform.android:\n+ case TargetPlatform.fuchsia:\n+ case TargetPlatform.linux:\n+ case TargetPlatform.windows:\n+ final dialog = tester.widget(find.bySubtype());\n+ tester.widget(find.descendant(matchRoot: true,\n+ of: find.byWidget(dialog.title!), matching: find.text(expectedTitle)));\n+ if (expectedMessage != null) {\n+ tester.widget(find.descendant(matchRoot: true,\n+ of: find.byWidget(dialog.content!), matching: find.text(expectedMessage)));\n+ }\n+ return tester.widget(find.descendant(of: find.byWidget(dialog),\n+ matching: find.widgetWithText(TextButton, 'OK')));\n \n- return tester.widget(\n- find.descendant(of: find.byWidget(dialog),\n- matching: find.widgetWithText(TextButton, 'OK')));\n+ case TargetPlatform.iOS:\n+ case TargetPlatform.macOS:\n+ final dialog = tester.widget(find.byType(CupertinoAlertDialog));\n+ tester.widget(find.descendant(matchRoot: true,\n+ of: find.byWidget(dialog.title!), matching: find.text(expectedTitle)));\n+ if (expectedMessage != null) {\n+ tester.widget(find.descendant(matchRoot: true,\n+ of: find.byWidget(dialog.content!), matching: find.text(expectedMessage)));\n+ }\n+ return tester.widget(find.descendant(of: find.byWidget(dialog),\n+ matching: find.widgetWithText(CupertinoDialogAction, 'OK')));\n+ }\n }\n \n-// TODO(#996) update this to check for per-platform flavors of alert dialog\n-void checkNoErrorDialog(WidgetTester tester) {\n- check(find.byType(AlertDialog)).findsNothing();\n+/// Checks that there is no dialog.\n+/// Fails if one is found.\n+void checkNoDialog(WidgetTester tester) {\n+ check(find.byType(Dialog)).findsNothing();\n+ check(find.bySubtype()).findsNothing();\n+ check(find.byType(CupertinoAlertDialog)).findsNothing();\n }\n \n /// In a widget test, check that [showSuggestedActionDialog] was called\n@@ -49,19 +68,35 @@ void checkNoErrorDialog(WidgetTester tester) {\n required String expectedMessage,\n String? expectedActionButtonText,\n }) {\n- final dialog = tester.widget(find.byType(AlertDialog));\n- tester.widget(find.descendant(matchRoot: true,\n- of: find.byWidget(dialog.title!), matching: find.text(expectedTitle)));\n- tester.widget(find.descendant(matchRoot: true,\n- of: find.byWidget(dialog.content!), matching: find.text(expectedMessage)));\n+ switch (defaultTargetPlatform) {\n+ case TargetPlatform.android:\n+ case TargetPlatform.fuchsia:\n+ case TargetPlatform.linux:\n+ case TargetPlatform.windows:\n+ final dialog = tester.widget(find.bySubtype());\n+ tester.widget(find.descendant(matchRoot: true,\n+ of: find.byWidget(dialog.title!), matching: find.text(expectedTitle)));\n+ tester.widget(find.descendant(matchRoot: true,\n+ of: find.byWidget(dialog.content!), matching: find.text(expectedMessage)));\n \n- final actionButton = tester.widget(\n- find.descendant(of: find.byWidget(dialog),\n- matching: find.widgetWithText(TextButton, expectedActionButtonText ?? 'Continue')));\n+ final actionButton = tester.widget(find.descendant(of: find.byWidget(dialog),\n+ matching: find.widgetWithText(TextButton, expectedActionButtonText ?? 'Continue')));\n+ final cancelButton = tester.widget(find.descendant(of: find.byWidget(dialog),\n+ matching: find.widgetWithText(TextButton, 'Cancel')));\n+ return (actionButton, cancelButton);\n \n- final cancelButton = tester.widget(\n- find.descendant(of: find.byWidget(dialog),\n- matching: find.widgetWithText(TextButton, 'Cancel')));\n+ case TargetPlatform.iOS:\n+ case TargetPlatform.macOS:\n+ final dialog = tester.widget(find.byType(CupertinoAlertDialog));\n+ tester.widget(find.descendant(matchRoot: true,\n+ of: find.byWidget(dialog.title!), matching: find.text(expectedTitle)));\n+ tester.widget(find.descendant(matchRoot: true,\n+ of: find.byWidget(dialog.content!), matching: find.text(expectedMessage)));\n \n- return (actionButton, cancelButton);\n+ final actionButton = tester.widget(find.descendant(of: find.byWidget(dialog),\n+ matching: find.widgetWithText(CupertinoDialogAction, expectedActionButtonText ?? 'Continue')));\n+ final cancelButton = tester.widget(find.descendant(of: find.byWidget(dialog),\n+ matching: find.widgetWithText(CupertinoDialogAction, 'Cancel')));\n+ return (actionButton, cancelButton);\n+ }\n }\ndiff --git a/test/widgets/dialog_test.dart b/test/widgets/dialog_test.dart\nindex 1980f619f3..855affbb3f 100644\n--- a/test/widgets/dialog_test.dart\n+++ b/test/widgets/dialog_test.dart\n@@ -1,30 +1,69 @@\n import 'package:checks/checks.dart';\n-import 'package:flutter/widgets.dart';\n+import 'package:flutter/foundation.dart';\n+import 'package:flutter/material.dart';\n import 'package:flutter_test/flutter_test.dart';\n import 'package:url_launcher/url_launcher.dart';\n import 'package:zulip/widgets/dialog.dart';\n \n import '../model/binding.dart';\n+import 'dialog_checks.dart';\n import 'test_app.dart';\n \n void main() {\n TestZulipBinding.ensureInitialized();\n \n+ late BuildContext context;\n+\n+ const title = \"Dialog Title\";\n+ const message = \"Dialog message.\";\n+\n+ Future prepare(WidgetTester tester) async {\n+ addTearDown(testBinding.reset);\n+\n+ await tester.pumpWidget(const TestZulipApp(\n+ child: Scaffold(body: Placeholder())));\n+ await tester.pump();\n+ context = tester.element(find.byType(Placeholder));\n+ }\n+\n group('showErrorDialog', () {\n- testWidgets('tap \"Learn more\" button', (tester) async {\n- addTearDown(testBinding.reset);\n- await tester.pumpWidget(TestZulipApp());\n+ testWidgets('show error dialog', (tester) async {\n+ await prepare(tester);\n+\n+ showErrorDialog(context: context, title: title, message: message);\n await tester.pump();\n- final element = tester.element(find.byType(Placeholder));\n+ checkErrorDialog(tester, expectedTitle: title, expectedMessage: message);\n+ }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n \n- showErrorDialog(context: element, title: 'hello',\n- learnMoreButtonUrl: Uri.parse('https://foo.example'));\n+ testWidgets('user closes error dialog', (tester) async {\n+ await prepare(tester);\n+\n+ showErrorDialog(context: context, title: title, message: message);\n+ await tester.pump();\n+\n+ final button = checkErrorDialog(tester, expectedTitle: title);\n+ await tester.tap(find.byWidget(button));\n+ await tester.pump();\n+ checkNoDialog(tester);\n+ }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n+\n+ testWidgets('tap \"Learn more\" button', (tester) async {\n+ await prepare(tester);\n+\n+ final learnMoreButtonUrl = Uri.parse('https://foo.example');\n+ showErrorDialog(context: context, title: title, learnMoreButtonUrl: learnMoreButtonUrl);\n await tester.pump();\n+ checkErrorDialog(tester, expectedTitle: title);\n+\n await tester.tap(find.text('Learn more'));\n- check(testBinding.takeLaunchUrlCalls()).single.equals((\n- url: Uri.parse('https://foo.example'),\n- mode: LaunchMode.inAppBrowserView));\n- });\n+ final expectedMode = switch (defaultTargetPlatform) {\n+ TargetPlatform.android => LaunchMode.inAppBrowserView,\n+ TargetPlatform.iOS => LaunchMode.externalApplication,\n+ _ => throw StateError('attempted to test with $defaultTargetPlatform'),\n+ };\n+ check(testBinding.takeLaunchUrlCalls()).single\n+ .equals((url: learnMoreButtonUrl, mode: expectedMode));\n+ }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n });\n \n group('showSuggestedActionDialog', () {\n@@ -41,7 +80,7 @@ void main() {\n await tester.pump();\n await tester.tap(find.text('Sure'));\n await check(dialog.result).completes((it) => it.equals(true));\n- });\n+ }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n \n testWidgets('tap cancel', (tester) async {\n addTearDown(testBinding.reset);\n@@ -56,7 +95,7 @@ void main() {\n await tester.pump();\n await tester.tap(find.text('Cancel'));\n await check(dialog.result).completes((it) => it.equals(null));\n- });\n+ }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n \n testWidgets('tap outside dialog area', (tester) async {\n addTearDown(testBinding.reset);\n@@ -71,7 +110,7 @@ void main() {\n await tester.pump();\n await tester.tapAt(tester.getTopLeft(find.byType(TestZulipApp)));\n await check(dialog.result).completes((it) => it.equals(null));\n- });\n+ }, variant: const TargetPlatformVariant({TargetPlatform.android, TargetPlatform.iOS}));\n });\n \n // TODO(#1594): test UpgradeWelcomeDialog\n", "n2p_tests": "{\"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet showChannelActionSheet show from app bar in topic narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet UnrevealMutedMessageButton visible if message is from muted sender and revealed\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: TopicNarrow(219, topic), from action sheet\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons smile removing success; useLegacy: true\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to DmNarrow with self\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message interrupting new-message compose by tapping failed edit to restore: ChannelNarrow(219)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet StarButton star success\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message tap Cancel when editing from a restored failed edit: ChannelNarrow(219)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message interrupting new-message compose: ChannelNarrow(219)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, mandatory topics with non-empty but vacuous topics \\\"(no topic)\\\"\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet MarkAsUnread onPressed on topic move, acts on new topic\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton handle empty topic\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart removing success; useLegacy: false\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_test.dart: ChooseAccountPage choosing an account clears the navigator stack\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox textCapitalization _FixedDestinationComposeBox\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: DmNarrow(allRecipientIds: [1077, 1176]), from restoring a failed edit\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet CopyMessageTextButton success\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 removing success; useLegacy: true\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message interrupting new-message compose: DmNarrow(allRecipientIds: [1077, 1176])\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy channel policy becomes stricter -> compose box is replaced with the banner\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users group DMs at least one user becomes deactivated -> compose box is replaced with a banner\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: uploads use verbatim URL string from server, not re-encoded\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message tap Cancel during fetch-raw-content request: TopicNarrow(219, topic)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message tap Cancel after fetch-raw-content request: DmNarrow(allRecipientIds: [1077, 1176])\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: ChannelNarrow(219), from restoring a failed edit\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, content input has focus\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet StarButton star request has an error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: DmNarrow(allRecipientIds: [1077, 1176]), from action sheet\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message fetch-raw-content fails: TopicNarrow(219, topic)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message tap Cancel after fetch-raw-content request: ChannelNarrow(219)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet CopyMessageTextButton request has an error\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton request has an error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: TopicNarrow(219, topic), from restoring a failed edit\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada removing success; useLegacy: true\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message interrupting new-message compose: TopicNarrow(219, topic)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory legacy: with empty topic, topic input has focus\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus removing success; useLegacy: false\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it adding success; useLegacy: true\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy compose box is shown in channel narrow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users 1:1 DMs deactivated user becomes active -> banner is replaced with the compose box\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons octopus adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: edit message smoke: ChannelNarrow(219), from action sheet\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton unresolve: request fails\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices unfocusing app sends a \\\"typing stopped\\\" notice\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, topic input has focus, then loses it\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart removing success; useLegacy: true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons absent if ServerEmojiData not loaded\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{\"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation content code points not counted unnecessarily\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices clearing text sends a \\\"typing stopped\\\" notice\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 600, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet header muted sender also shown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy user gains privilege -> banner is replaced with the compose box\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 10, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet MarkChannelAsReadButton happy path from inbox\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users 1:1 DMs active user becomes deactivated -> compose box is replaced with a banner\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: true, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: auto focus ChannelNarrow, non-empty fetch\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, content input has focus, then loses it\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with non-empty topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: sending to empty topic if topics are mandatory, reject \\\"(no topic)\\\"\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: message-send request response success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: sending to empty topic if topics are mandatory, reject `realmEmptyTopicDisplayName`\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons slight_smile removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent interrupting new-message compose: proceed through confirmation dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in DMs with deactivated users group DMs all deactivated users become active -> banner is replaced with the compose box\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, content input has focus, then topic input gains focus\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation topic too-long topic is rejected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to TopicNarrow with non-empty topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ShareButton request succeeds; sharing fails\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when msglist empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_test.dart: ChooseAccountPage log out user confirms logging out\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: true, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent interrupting message edit: cancel confirmation dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox textCapitalization _StreamComposeBox\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet showChannelActionSheet show from inbox\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, mandatory topics legacy: with empty topic\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBoxState new-event-queue transition content input not cleared when store changes\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices navigating away sends a \\\"typing stopped\\\" notice\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton unresolve: weird prefix\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to group DmNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent restore content in DM narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton unmute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet CopyChannelLinkButton copies channel link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton unresolve: happy path\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton unfollow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/dialog_test.dart: showErrorDialog show error dialog (variant: TargetPlatform.android)\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox content input scaling normal text scale factor\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox content input scaling higher text scale factor exceeding threshold\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: auto focus DmNarrow, non-empty fetch\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices hitting send button sends a \\\"typing stopped\\\" notice\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices smoke ChannelNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation content too-long content is rejected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: sending to empty topic empty topic -> \\\"\\\"\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, mandatory topics with non-empty but vacuous topics realm_empty_topic_display_name\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet header poll is rendered\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton mute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: false, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton request fails with an error dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_test.dart: ChooseAccountPage accounts list is scrollable when more than a screenful\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it removing success; useLegacy: false\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, topic input has focus\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: uploads attach from camera success\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads and MessageStore\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet MarkTopicAsReadButton visible if topic has unread messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy channel policy becomes less strict -> banner is replaced with the compose box\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from app bar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet QuoteAndReplyButton in topic narrow smoke\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet CopyTopicLinkButton copies topic link to clipboard\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: 0, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: uploads attach from media library success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices smoke TopicNarrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent interrupting new-message compose: cancel confirmation dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons working_on_it request has an error; useLegacy: true\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ShareButton request has an error\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.muted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, mandatory topics with non-empty topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: sending to empty topic legacy: empty topic -> \\\"(no topic)\\\"\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet header message sender and content shown\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons tada request has an error; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton follow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: Instance of 'CombinedFeedNarrow', realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton unmuteInMutedChannel\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: false, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to TopicNarrow with empty topic\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: message-send request response ZulipApiException\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent restore content in topic narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: (not subscribed), UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet showTopicActionSheet show from app bar: resolve/unresolve not offered when topic is empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: unmute is unsupported when FL < 170 isChannelMuted: true, UserTopicVisibilityPolicy.none\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation topic code points not counted unnecessarily\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: sending to empty topic if topics are mandatory, reject empty topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent restore content and topic in channel narrow\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory legacy: with empty topic, content input has focus\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: restoreMessageNotSent interrupting message edit: proceed through confirmation dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet MarkAsUnread onPressed smoke test\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: channel action sheet MarkChannelAsReadButton request fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton tap button smoke\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: false, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox content input scaling lower text scale factor\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices for content input, unfocusing sends a \\\"typing stopped\\\" notice\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation topic max-length topic not rejected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: false, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet ResolveUnresolveButton resolve: happy path from inbox; message in Unreads but not MessageStore\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/app_test.dart: ZulipApp initial navigation when no accounts, go to choose account\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox typing notices selection change sends a \\\"typing started\\\" notice\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet MessageActionSheetCancelButton pressing the button dismisses the action sheet\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: length validation content max-length content not rejected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton check expected buttons isChannelMuted: true, UserTopicVisibilityPolicy.followed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet UserTopicUpdateButton legacy: follow is unsupported when FL < 219 isChannelMuted: false, UserTopicVisibilityPolicy.unmuted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with empty topic, topic input has focus, then content input gains focus\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: ComposeBox hintText to ChannelNarrow, topics not mandatory with non-empty but vacuous topic, topic input has focus\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 adding success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons heart request has an error; useLegacy: false\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: topic action sheet CopyTopicLinkButton FL < 271 -> link doesn't contain \\\"with\\\" operator\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/compose_box_test.dart: error banner in channel/topic narrow according to channel post policy user loses privilege -> compose box is replaced with the banner\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet ReactionButtons +1 removing success; useLegacy: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: ChannelNarrow(1), realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/action_sheet_test.dart: message action sheet EditButton present/absent appropriately from self: true, narrow: null, realm allows: true, edit limit: null, compose box is in editing mode: false, edit-message error status: null, has poll: true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-833", "org": "zulip", "repo": "zulip-flutter", "number": 833, "state": "closed", "title": " lightbox: Display thumbnail with original image sizing ", "body": "https://github.com/user-attachments/assets/0a007765-0879-4124-9f1b-2cf597518dac\r\n\r\n(Initial image opens are older messages missing `data-original-dimensions` attribute)\r\n\r\n\r\nFixes #830 ", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"c17dd0efd19291e0fa84cac87bbd0c6462835a6c\"}", "resolved_issues": "[{\"number\": 830, \"title\": \"Show thumbnail at main image's size in lightbox\", \"body\": \"With #820 (implementing #799), when you open an image in the lightbox we immediately show the thumbnail (which we'll typically already have loaded, from when you saw the preview in the message list) while we're loading the full image.\\r\\n\\r\\nOne wrinkle is that for some images this means that the thumbnail appears smaller than the full image will, so there's a pop where it expands when the fetch finishes. This is still better than not showing the image at all (at least in cases where the fetch is more than perhaps a few hundred milliseconds), which is why we do it.\\r\\n\\r\\nBut with an extra feature that's now being added in the server, we can do better: the image HTML will encode the original image's dimensions, so we can use those to make sure we show the thumbnail at the same size we'll eventually show the full image. Let's use that.\\r\\n\\r\\n* `#api design` thread: https://chat.zulip.org/#narrow/stream/378-api-design/topic/thumbnailing.20dimensions/near/1898379\\r\\n* Server PR: https://github.com/zulip/zulip/pull/31041\\r\\n\\r\\n\"}]", "lang": "dart", "problem_statement": "Show thumbnail at main image's size in lightbox\nWith #820 (implementing #799), when you open an image in the lightbox we immediately show the thumbnail (which we'll typically already have loaded, from when you saw the preview in the message list) while we're loading the full image.\r\n\r\nOne wrinkle is that for some images this means that the thumbnail appears smaller than the full image will, so there's a pop where it expands when the fetch finishes. This is still better than not showing the image at all (at least in cases where the fetch is more than perhaps a few hundred milliseconds), which is why we do it.\r\n\r\nBut with an extra feature that's now being added in the server, we can do better: the image HTML will encode the original image's dimensions, so we can use those to make sure we show the thumbnail at the same size we'll eventually show the full image. Let's use that.\r\n\r\n* `#api design` thread: https://chat.zulip.org/#narrow/stream/378-api-design/topic/thumbnailing.20dimensions/near/1898379\r\n* Server PR: https://github.com/zulip/zulip/pull/31041\r\n\r\n\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/833", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/830\"]", "test_command": "flutter test test/model/content_test.dart test/widgets/lightbox_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/content.dart b/lib/model/content.dart\nindex cf2ebd28b5..e9ee7875ef 100644\n--- a/lib/model/content.dart\n+++ b/lib/model/content.dart\n@@ -356,6 +356,8 @@ class ImageNode extends BlockContentNode {\n required this.srcUrl,\n required this.thumbnailUrl,\n required this.loading,\n+ required this.originalWidth,\n+ required this.originalHeight,\n });\n \n /// The canonical source URL of the image.\n@@ -379,16 +381,25 @@ class ImageNode extends BlockContentNode {\n /// Typically it will be `true` while Server is generating thumbnails.\n final bool loading;\n \n+ /// The width of the canonical image.\n+ final double? originalWidth;\n+\n+ /// The height of the canonical image.\n+ final double? originalHeight;\n+\n @override\n bool operator ==(Object other) {\n return other is ImageNode\n && other.srcUrl == srcUrl\n && other.thumbnailUrl == thumbnailUrl\n- && other.loading == loading;\n+ && other.loading == loading\n+ && other.originalWidth == originalWidth\n+ && other.originalHeight == originalHeight;\n }\n \n @override\n- int get hashCode => Object.hash('ImageNode', srcUrl, thumbnailUrl, loading);\n+ int get hashCode => Object.hash('ImageNode',\n+ srcUrl, thumbnailUrl, loading, originalWidth, originalHeight);\n \n @override\n void debugFillProperties(DiagnosticPropertiesBuilder properties) {\n@@ -396,6 +407,8 @@ class ImageNode extends BlockContentNode {\n properties.add(StringProperty('srcUrl', srcUrl));\n properties.add(StringProperty('thumbnailUrl', thumbnailUrl));\n properties.add(FlagProperty('loading', value: loading, ifTrue: \"is loading\"));\n+ properties.add(DoubleProperty('originalWidth', originalWidth));\n+ properties.add(DoubleProperty('originalHeight', originalHeight));\n }\n }\n \n@@ -1037,6 +1050,8 @@ class _ZulipContentParser {\n return CodeBlockNode(spans, debugHtmlNode: debugHtmlNode);\n }\n \n+ static final _imageDimensionsRegExp = RegExp(r'^(\\d+)x(\\d+)$');\n+\n BlockContentNode parseImageNode(dom.Element divElement) {\n assert(_debugParserContext == _ParserContext.block);\n final elements = () {\n@@ -1071,6 +1086,8 @@ class _ZulipContentParser {\n srcUrl: href,\n thumbnailUrl: null,\n loading: true,\n+ originalWidth: null,\n+ originalHeight: null,\n debugHtmlNode: debugHtmlNode);\n }\n final src = imgElement.attributes['src'];\n@@ -1093,10 +1110,32 @@ class _ZulipContentParser {\n } else {\n return UnimplementedBlockContentNode(htmlNode: divElement);\n }\n+\n+ double? originalWidth, originalHeight;\n+ final originalDimensions = imgElement.attributes['data-original-dimensions'];\n+ if (originalDimensions != null) {\n+ // Server encodes this string as \"{width}x{height}\" (eg. \"300x400\")\n+ final match = _imageDimensionsRegExp.firstMatch(originalDimensions);\n+ if (match != null) {\n+ final width = int.tryParse(match.group(1)!, radix: 10);\n+ final height = int.tryParse(match.group(2)!, radix: 10);\n+ if (width != null && height != null) {\n+ originalWidth = width.toDouble();\n+ originalHeight = height.toDouble();\n+ }\n+ }\n+\n+ if (originalWidth == null || originalHeight == null) {\n+ return UnimplementedBlockContentNode(htmlNode: divElement);\n+ }\n+ }\n+\n return ImageNode(\n srcUrl: srcUrl,\n thumbnailUrl: thumbnailUrl,\n loading: false,\n+ originalWidth: originalWidth,\n+ originalHeight: originalHeight,\n debugHtmlNode: debugHtmlNode);\n }\n \ndiff --git a/lib/widgets/content.dart b/lib/widgets/content.dart\nindex 795e1389e2..7b567b74fb 100644\n--- a/lib/widgets/content.dart\n+++ b/lib/widgets/content.dart\n@@ -572,12 +572,13 @@ class MessageImage extends StatelessWidget {\n \n return MessageMediaContainer(\n onTap: resolvedSrcUrl == null ? null : () { // TODO(log)\n- Navigator.of(context).push(getLightboxRoute(\n+ Navigator.of(context).push(getImageLightboxRoute(\n context: context,\n message: message,\n src: resolvedSrcUrl,\n thumbnailUrl: resolvedThumbnailUrl,\n- mediaType: MediaType.image));\n+ originalWidth: node.originalWidth,\n+ originalHeight: node.originalHeight));\n },\n child: node.loading\n ? const CupertinoActivityIndicator()\n@@ -603,12 +604,10 @@ class MessageInlineVideo extends StatelessWidget {\n \n return MessageMediaContainer(\n onTap: resolvedSrc == null ? null : () { // TODO(log)\n- Navigator.of(context).push(getLightboxRoute(\n+ Navigator.of(context).push(getVideoLightboxRoute(\n context: context,\n message: message,\n- src: resolvedSrc,\n- thumbnailUrl: null,\n- mediaType: MediaType.video));\n+ src: resolvedSrc));\n },\n child: Container(\n color: Colors.black, // Web has the same color in light and dark mode.\ndiff --git a/lib/widgets/lightbox.dart b/lib/widgets/lightbox.dart\nindex 33ed3f68de..dffe16dfbb 100644\n--- a/lib/widgets/lightbox.dart\n+++ b/lib/widgets/lightbox.dart\n@@ -217,12 +217,16 @@ class _ImageLightboxPage extends StatefulWidget {\n required this.message,\n required this.src,\n required this.thumbnailUrl,\n+ required this.originalWidth,\n+ required this.originalHeight,\n });\n \n final Animation routeEntranceAnimation;\n final Message message;\n final Uri src;\n final Uri? thumbnailUrl;\n+ final double? originalWidth;\n+ final double? originalHeight;\n \n @override\n State<_ImageLightboxPage> createState() => _ImageLightboxPageState();\n@@ -259,8 +263,14 @@ class _ImageLightboxPageState extends State<_ImageLightboxPage> {\n if (frame != null) return child;\n \n // Display the thumbnail image while original image is downloading.\n- return RealmContentNetworkImage(widget.thumbnailUrl!,\n- filterQuality: FilterQuality.medium);\n+ return FittedBox(\n+ fit: BoxFit.scaleDown,\n+ child: SizedBox(\n+ width: widget.originalWidth,\n+ height: widget.originalHeight,\n+ child: RealmContentNetworkImage(widget.thumbnailUrl!,\n+ filterQuality: FilterQuality.medium,\n+ fit: BoxFit.contain)));\n }\n \n Widget _loadingBuilder(BuildContext context, Widget child, ImageChunkEvent? loadingProgress) {\n@@ -301,11 +311,7 @@ class _ImageLightboxPageState extends State<_ImageLightboxPage> {\n child: RealmContentNetworkImage(widget.src,\n filterQuality: FilterQuality.medium,\n frameBuilder: _frameBuilder,\n- loadingBuilder: _loadingBuilder),\n- ),\n- ),\n- ),\n- ));\n+ loadingBuilder: _loadingBuilder))))));\n }\n }\n \n@@ -536,18 +542,10 @@ class _VideoLightboxPageState extends State with PerAccountSt\n }\n }\n \n-enum MediaType {\n- video,\n- image\n-}\n-\n-Route getLightboxRoute({\n- int? accountId,\n- BuildContext? context,\n- required Message message,\n- required Uri src,\n- required Uri? thumbnailUrl,\n- required MediaType mediaType,\n+Route _getLightboxRoute({\n+ required int? accountId,\n+ required BuildContext? context,\n+ required RoutePageBuilder pageBuilder,\n }) {\n return AccountPageRouteBuilder(\n accountId: accountId,\n@@ -559,17 +557,7 @@ Route getLightboxRoute({\n Animation secondaryAnimation,\n ) {\n // TODO(#40): Drag down to close?\n- return switch (mediaType) {\n- MediaType.image => _ImageLightboxPage(\n- routeEntranceAnimation: animation,\n- message: message,\n- src: src,\n- thumbnailUrl: thumbnailUrl),\n- MediaType.video => VideoLightboxPage(\n- routeEntranceAnimation: animation,\n- message: message,\n- src: src),\n- };\n+ return pageBuilder(context, animation, secondaryAnimation);\n },\n transitionsBuilder: (\n BuildContext context,\n@@ -583,3 +571,43 @@ Route getLightboxRoute({\n },\n );\n }\n+\n+Route getImageLightboxRoute({\n+ int? accountId,\n+ BuildContext? context,\n+ required Message message,\n+ required Uri src,\n+ required Uri? thumbnailUrl,\n+ required double? originalWidth,\n+ required double? originalHeight,\n+}) {\n+ return _getLightboxRoute(\n+ accountId: accountId,\n+ context: context,\n+ pageBuilder: (context, animation, secondaryAnimation) {\n+ return _ImageLightboxPage(\n+ routeEntranceAnimation: animation,\n+ message: message,\n+ src: src,\n+ thumbnailUrl: thumbnailUrl,\n+ originalWidth: originalWidth,\n+ originalHeight: originalHeight);\n+ });\n+}\n+\n+Route getVideoLightboxRoute({\n+ int? accountId,\n+ BuildContext? context,\n+ required Message message,\n+ required Uri src,\n+}) {\n+ return _getLightboxRoute(\n+ accountId: accountId,\n+ context: context,\n+ pageBuilder: (context, animation, secondaryAnimation) {\n+ return VideoLightboxPage(\n+ routeEntranceAnimation: animation,\n+ message: message,\n+ src: src);\n+ });\n+}\n", "test_patch": "diff --git a/test/model/content_test.dart b/test/model/content_test.dart\nindex 60a5698c99..0846273795 100644\n--- a/test/model/content_test.dart\n+++ b/test/model/content_test.dart\n@@ -263,7 +263,8 @@ class ContentExample {\n ]),\n ImageNodeList([\n ImageNode(srcUrl: 'https://chat.zulip.org/user_avatars/2/realm/icon.png?version=3',\n- thumbnailUrl: null, loading: false),\n+ thumbnailUrl: null, loading: false,\n+ originalWidth: null, originalHeight: null),\n ]),\n ],\n content: [ParagraphNode(links: null, nodes: [TextNode('hello world')])],\n@@ -421,6 +422,22 @@ class ContentExample {\n \n static const imageSingle = ContentExample(\n 'single image',\n+ // https://chat.zulip.org/#narrow/stream/7-test-here/topic/Thumbnails/near/1900103\n+ \"[image.jpg](/user_uploads/2/ce/nvoNL2LaZOciwGZ-FYagddtK/image.jpg)\",\n+ '
          '\n+ ''\n+ '
          ', [\n+ ImageNodeList([\n+ ImageNode(srcUrl: '/user_uploads/2/ce/nvoNL2LaZOciwGZ-FYagddtK/image.jpg',\n+ thumbnailUrl: '/user_uploads/thumbnail/2/ce/nvoNL2LaZOciwGZ-FYagddtK/image.jpg/840x560.webp',\n+ loading: false,\n+ originalWidth: 6000,\n+ originalHeight: 4000),\n+ ]),\n+ ]);\n+\n+ static const imageSingleNoDimensions = ContentExample(\n+ 'single image no dimensions',\n // https://chat.zulip.org/#narrow/stream/7-test-here/topic/Thumbnails/near/1893590\n \"[image.jpg](/user_uploads/2/c3/wb9FXk8Ej6qIc28aWKcqUogD/image.jpg)\",\n '
          '\n@@ -429,7 +446,9 @@ class ContentExample {\n ImageNodeList([\n ImageNode(srcUrl: '/user_uploads/2/c3/wb9FXk8Ej6qIc28aWKcqUogD/image.jpg',\n thumbnailUrl: '/user_uploads/thumbnail/2/c3/wb9FXk8Ej6qIc28aWKcqUogD/image.jpg/840x560.webp',\n- loading: false),\n+ loading: false,\n+ originalWidth: null,\n+ originalHeight: null),\n ]),\n ]);\n \n@@ -441,7 +460,8 @@ class ContentExample {\n '
          ', [\n ImageNodeList([\n ImageNode(srcUrl: 'https://chat.zulip.org/user_avatars/2/realm/icon.png?version=3',\n- thumbnailUrl: null, loading: false),\n+ thumbnailUrl: null, loading: false,\n+ originalWidth: null, originalHeight: null),\n ]),\n ]);\n \n@@ -454,7 +474,8 @@ class ContentExample {\n '', [\n ImageNodeList([\n ImageNode(srcUrl: '/user_uploads/2/c3/wb9FXk8Ej6qIc28aWKcqUogD/image.jpg',\n- thumbnailUrl: null, loading: true),\n+ thumbnailUrl: null, loading: true,\n+ originalWidth: null, originalHeight: null),\n ]),\n ]);\n \n@@ -467,7 +488,8 @@ class ContentExample {\n '', [\n ImageNodeList([\n ImageNode(srcUrl: '/external_content/de28eb3abf4b7786de4545023dc42d434a2ea0c2/68747470733a2f2f75706c6f61642e77696b696d656469612e6f72672f77696b6970656469612f636f6d6d6f6e732f372f37382f566572726567656e64655f626c6f656d5f76616e5f65656e5f48656c656e69756d5f253237456c5f446f7261646f2532372e5f32322d30372d323032332e5f253238642e6a2e622532392e6a7067',\n- thumbnailUrl: null, loading: false),\n+ thumbnailUrl: null, loading: false,\n+ originalWidth: null, originalHeight: null),\n ]),\n ]);\n \n@@ -478,7 +500,9 @@ class ContentExample {\n ''\n '', [\n ImageNodeList([\n- ImageNode(srcUrl: '::not a URL::', thumbnailUrl: null, loading: false),\n+ ImageNode(srcUrl: '::not a URL::',\n+ thumbnailUrl: null, loading: false,\n+ originalWidth: null, originalHeight: null),\n ]),\n ]);\n \n@@ -504,10 +528,14 @@ class ContentExample {\n ImageNodeList([\n ImageNode(srcUrl: '/user_uploads/2/9b/WkDt2Qsy79iwf3sM9EMp9fYL/image.jpg',\n thumbnailUrl: '/user_uploads/thumbnail/2/9b/WkDt2Qsy79iwf3sM9EMp9fYL/image.jpg/840x560.webp',\n- loading: false),\n+ loading: false,\n+ originalWidth: null,\n+ originalHeight: null),\n ImageNode(srcUrl: '/user_uploads/2/70/pVeI52TwFUEoFE2qT_u9AMCO/image2.jpg',\n thumbnailUrl: '/user_uploads/thumbnail/2/70/pVeI52TwFUEoFE2qT_u9AMCO/image2.jpg/840x560.webp',\n- loading: false),\n+ loading: false,\n+ originalWidth: null,\n+ originalHeight: null),\n ]),\n ]);\n \n@@ -531,9 +559,11 @@ class ContentExample {\n ]),\n ImageNodeList([\n ImageNode(srcUrl: 'https://uploads.zulipusercontent.net/f535ba07f95b99a83aa48e44fd62bbb6c6cf6615/68747470733a2f2f636861742e7a756c69702e6f72672f757365725f617661746172732f322f7265616c6d2f69636f6e2e706e673f76657273696f6e3d33',\n- thumbnailUrl: null, loading: false),\n+ thumbnailUrl: null, loading: false,\n+ originalWidth: null, originalHeight: null),\n ImageNode(srcUrl: 'https://uploads.zulipusercontent.net/8f63bc2632a0e41be3f457d86c077e61b4a03e7e/68747470733a2f2f636861742e7a756c69702e6f72672f757365725f617661746172732f322f7265616c6d2f69636f6e2e706e673f76657273696f6e3d34',\n- thumbnailUrl: null, loading: false),\n+ thumbnailUrl: null, loading: false,\n+ originalWidth: null, originalHeight: null),\n ]),\n ]);\n \n@@ -558,9 +588,11 @@ class ContentExample {\n ]),\n ImageNodeList([\n ImageNode(srcUrl: 'https://chat.zulip.org/user_avatars/2/realm/icon.png',\n- thumbnailUrl: null, loading: false),\n+ thumbnailUrl: null, loading: false,\n+ originalWidth: null, originalHeight: null),\n ImageNode(srcUrl: 'https://chat.zulip.org/user_avatars/2/realm/icon.png?version=2',\n- thumbnailUrl: null, loading: false),\n+ thumbnailUrl: null, loading: false,\n+ originalWidth: null, originalHeight: null),\n ]),\n ParagraphNode(links: null, nodes: [\n TextNode('more content'),\n@@ -596,9 +628,11 @@ class ContentExample {\n ]),\n ImageNodeList([\n ImageNode(srcUrl: 'https://uploads.zulipusercontent.net/34b2695ca83af76204b0b25a8f2019ee35ec38fa/68747470733a2f2f656e2e77696b6970656469612e6f72672f7374617469632f696d616765732f69636f6e732f77696b6970656469612e706e67',\n- thumbnailUrl: null, loading: false),\n+ thumbnailUrl: null, loading: false,\n+ originalWidth: null, originalHeight: null),\n ImageNode(srcUrl: 'https://uploads.zulipusercontent.net/d200fb112aaccbff9df767373a201fa59601f362/68747470733a2f2f656e2e77696b6970656469612e6f72672f7374617469632f696d616765732f69636f6e732f77696b6970656469612e706e673f763d31',\n- thumbnailUrl: null, loading: false),\n+ thumbnailUrl: null, loading: false,\n+ originalWidth: null, originalHeight: null),\n ]),\n ParagraphNode(links: null, nodes: [\n TextNode('Test'),\n@@ -611,9 +645,11 @@ class ContentExample {\n ]),\n ImageNodeList([\n ImageNode(srcUrl: 'https://uploads.zulipusercontent.net/c4db87e81348dac94eacaa966b46d968b34029cc/68747470733a2f2f656e2e77696b6970656469612e6f72672f7374617469632f696d616765732f69636f6e732f77696b6970656469612e706e673f763d32',\n- thumbnailUrl: null, loading: false),\n+ thumbnailUrl: null, loading: false,\n+ originalWidth: null, originalHeight: null),\n ImageNode(srcUrl: 'https://uploads.zulipusercontent.net/51b70540cf6a5b3c8a0b919c893b8abddd447e88/68747470733a2f2f656e2e77696b6970656469612e6f72672f7374617469632f696d616765732f69636f6e732f77696b6970656469612e706e673f763d33',\n- thumbnailUrl: null, loading: false),\n+ thumbnailUrl: null, loading: false,\n+ originalWidth: null, originalHeight: null),\n ]),\n ]);\n \n@@ -628,7 +664,8 @@ class ContentExample {\n ListNode(ListStyle.unordered, [[\n ImageNodeList([\n ImageNode(srcUrl: 'https://chat.zulip.org/user_avatars/2/realm/icon.png',\n- thumbnailUrl: null, loading: false),\n+ thumbnailUrl: null, loading: false,\n+ originalWidth: null, originalHeight: null),\n ]),\n ]]),\n ]);\n@@ -654,9 +691,11 @@ class ContentExample {\n ]),\n ImageNodeList([\n ImageNode(srcUrl: 'https://chat.zulip.org/user_avatars/2/realm/icon.png',\n- thumbnailUrl: null, loading: false),\n+ thumbnailUrl: null, loading: false,\n+ originalWidth: null, originalHeight: null),\n ImageNode(srcUrl: 'https://chat.zulip.org/user_avatars/2/realm/icon.png?version=2',\n- thumbnailUrl: null, loading: false),\n+ thumbnailUrl: null, loading: false,\n+ originalWidth: null, originalHeight: null),\n ]),\n ]]),\n ]);\n@@ -680,7 +719,8 @@ class ContentExample {\n ]),\n const ImageNodeList([\n ImageNode(srcUrl: 'https://chat.zulip.org/user_avatars/2/realm/icon.png',\n- thumbnailUrl: null, loading: false),\n+ thumbnailUrl: null, loading: false,\n+ originalWidth: null, originalHeight: null),\n ]),\n blockUnimplemented('more text'),\n ]]),\n@@ -1117,6 +1157,7 @@ void main() {\n testParseExample(ContentExample.mathBlockInQuote);\n \n testParseExample(ContentExample.imageSingle);\n+ testParseExample(ContentExample.imageSingleNoDimensions);\n testParseExample(ContentExample.imageSingleNoThumbnail);\n testParseExample(ContentExample.imageSingleLoadingPlaceholder);\n testParseExample(ContentExample.imageSingleExternal);\ndiff --git a/test/widgets/lightbox_test.dart b/test/widgets/lightbox_test.dart\nindex 23bb15b6b9..419690f788 100644\n--- a/test/widgets/lightbox_test.dart\n+++ b/test/widgets/lightbox_test.dart\n@@ -211,12 +211,13 @@ void main() {\n await tester.pumpWidget(const ZulipApp());\n await tester.pump();\n final navigator = await ZulipApp.navigator;\n- navigator.push(getLightboxRoute(\n+ navigator.push(getImageLightboxRoute(\n accountId: eg.selfAccount.id,\n message: message ?? eg.streamMessage(),\n src: src,\n thumbnailUrl: thumbnailUrl,\n- mediaType: MediaType.image,\n+ originalHeight: null,\n+ originalWidth: null,\n ));\n await tester.pump(); // per-account store\n await tester.pump(const Duration(milliseconds: 301)); // nav transition\n", "n2p_tests": "{\"/home/zulip-flutter/test/model/content_test.dart: parse image as immediate child in implicit paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse impossible content after image cluster in implicit paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse deleted/strike-through\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image with invalid URL\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: LinkNode parse link\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video non-preview for attempted vimeo embed with realm link previews disabled\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse headings plain h6\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: LinkNode parse #-mention of topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse nested del, strong, em, link\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse multiple images\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for user uploaded video\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse spoiler a header that has an image in it\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse nested link, del, strong, em, code\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse strong/bold\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse plain group @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse lists
            \": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: all content examples are tested\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse plain user @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse quotation\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse spoiler with rich header and content\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse nested del, strong, em, code\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse content after image cluster\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent group @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse lists implicit paragraph with internal
            \": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block with syntax highlighting\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for vimeo embed with realm link previews enabled, (hypothetical) class name reorder\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse emphasis/italic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse Zulip extra emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse lists explicit paragraphs\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image no dimensions\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block in quote\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse nested lists, quotes, headings, code blocks\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block, with syntax highlighting and highlighted lines\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: global times parse global time\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse headings amidst paragraphs\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse headings containing inline markup\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse blank text nodes after code blocks\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: global times handles DateTime.parse failure\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block, multiline, with syntax highlighting\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: global times handles unexpected timezone\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image external\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for youtube embed with thumbnail, (hypothetical) class name reorder\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse two plain-text paragraphs\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse math block\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse custom emoji with invalid URL\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse Unicode emoji, encoded in span element, class order reversed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: global times handles missing attribute\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse inline math\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: track links inside block-inline containers link in list item\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse multiple images no thumbnails\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse headings h1, h2, h3, h4, h5\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: track links inside block-inline containers multiple links in paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse Unicode emoji, encoded in span element, multiple codepoints\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse image cluster in implicit paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for vimeo embed with realm link previews enabled\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse multiple clusters of images\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: track links inside block-inline containers link in heading\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse inline code\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent user @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse
            in block context\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent user @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse lists
              \": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse spoiler with plain custom header\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for youtube embed with thumbnail\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image loading placeholder\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse custom emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse spoiler with default header\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: LinkNode parse #-mention of stream\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse parse thematic break (
              )\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse Unicode emoji, encoded in span element\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse Unicode emoji, not encoded in span element\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse @-mentions parse silent group @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block without syntax highlighting\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse single image no thumbnail\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse a plain-text paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse code block, with an unknown span type\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse video preview for user uploaded video, (hypothetical) class name reorder\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/content_test.dart: parse
              inside a paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-706", "org": "zulip", "repo": "zulip-flutter", "number": 706, "state": "closed", "title": "content: Make **bold** bolder even in spoiler headers and h1/h2/etc.", "body": "This fixes #705 by making boldness context-dependent, much like we did for some font sizes in #544.\r\n\r\nThat user-facing change is nice but fairly subtle. I'm also hoping this will be helpful by adding content tests for boldness in the first place; we didn't have any before. And I've set a pattern in the `UserMention` tests that should help reduce confusion when we write boldness tests for #647. (Confusion mainly related to the fact that `UserMention` is in a `WidgetSpan`.)\r\n\r\nThe need for more helpers in lib/widgets/text.dart is another reminder that it'll be great to have https://github.com/flutter/flutter/issues/148026 fixed upstream. But (as with the existing helpers there) I'm hoping this handles things in a way that makes it straightforward to migrate once that's done.\r\n\r\nFixes: #705\r\n\r\n| Before | After |\r\n| --- | --- |\r\n| ![75927CB2-41BB-415B-9530-CE418DBB9368](https://github.com/zulip/zulip-flutter/assets/22248748/c21677b2-4b15-4513-8b70-16354ffe48ff) | ![445F7D01-3E38-4A19-B5CD-7746474655D5](https://github.com/zulip/zulip-flutter/assets/22248748/c4c49bcd-e103-47dd-9b94-af7ecc10b5ab) |", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"5463a971da3ed04a2a324d101c4ff0bd644bf66c\"}", "resolved_issues": "[{\"number\": 705, \"title\": \"content: Bold spans aren't bolder than surrounding text in spoiler headers or h1/h2/etc.\", \"body\": \"Bold spans should be bolder than surrounding text, even when that surrounding text is bold because it's in a spoiler header or an h1/h2/etc. (or column headings in tables, with #360).\\r\\n\\r\\n| Current | Better |\\r\\n| --- | --- |\\r\\n| ![75927CB2-41BB-415B-9530-CE418DBB9368](https://github.com/zulip/zulip-flutter/assets/22248748/c21677b2-4b15-4513-8b70-16354ffe48ff) | ![445F7D01-3E38-4A19-B5CD-7746474655D5](https://github.com/zulip/zulip-flutter/assets/22248748/c4c49bcd-e103-47dd-9b94-af7ecc10b5ab) |\\r\\n\\r\\nIn fact, in the spoiler header, the bold text is _less_ bold. That's because, following web, we hard-code bold spans to weight 600 but spoiler headers to weight 700.\\r\\n\\r\\n\"}]", "lang": "dart", "problem_statement": "content: Bold spans aren't bolder than surrounding text in spoiler headers or h1/h2/etc.\nBold spans should be bolder than surrounding text, even when that surrounding text is bold because it's in a spoiler header or an h1/h2/etc. (or column headings in tables, with #360).\r\n\r\n| Current | Better |\r\n| --- | --- |\r\n| ![75927CB2-41BB-415B-9530-CE418DBB9368](https://github.com/zulip/zulip-flutter/assets/22248748/c21677b2-4b15-4513-8b70-16354ffe48ff) | ![445F7D01-3E38-4A19-B5CD-7746474655D5](https://github.com/zulip/zulip-flutter/assets/22248748/c4c49bcd-e103-47dd-9b94-af7ecc10b5ab) |\r\n\r\nIn fact, in the spoiler header, the bold text is _less_ bold. That's because, following web, we hard-code bold spans to weight 600 but spoiler headers to weight 700.\r\n\r\n\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/706", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/705\"]", "test_command": "flutter test test/widgets/content_test.dart test/widgets/text_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/widgets/content.dart b/lib/widgets/content.dart\nindex 9e7008aca1..2e81a13ce6 100644\n--- a/lib/widgets/content.dart\n+++ b/lib/widgets/content.dart\n@@ -252,6 +252,11 @@ class Heading extends StatelessWidget {\n fontSize: kBaseFontSize * emHeight,\n height: 1.4,\n )\n+ // Could set boldness relative to ambient text style, which itself\n+ // might be bolder than normal (e.g. in spoiler headers).\n+ // But this didn't seem like a clear improvement and would make inline\n+ // **bold** spans less distinct; discussion:\n+ // https://github.com/zulip/zulip-flutter/pull/706#issuecomment-2141326257\n .merge(weightVariableTextStyle(context, wght: 600)),\n node: node));\n }\n@@ -723,6 +728,12 @@ class InlineContent extends StatelessWidget {\n required this.nodes,\n }) {\n assert(style.fontSize != null);\n+ assert(\n+ style.debugLabel!.contains('weightVariableTextStyle')\n+ // ([ContentTheme.textStylePlainParagraph] applies [weightVariableTextStyle])\n+ || style.debugLabel!.contains('ContentTheme.textStylePlainParagraph')\n+ || style.debugLabel!.contains('bolderWghtTextStyle')\n+ );\n _builder = _InlineContentBuilder(this);\n }\n \n@@ -733,6 +744,7 @@ class InlineContent extends StatelessWidget {\n ///\n /// Must set [TextStyle.fontSize]. Some descendant spans will consume it,\n /// e.g., to make their content slightly smaller than surrounding text.\n+ /// Similarly must set a font weight using [weightVariableTextStyle].\n final TextStyle style;\n \n final List nodes;\n@@ -832,7 +844,7 @@ class _InlineContentBuilder {\n }\n \n InlineSpan _buildStrong(StrongNode node) => _buildNodes(node.nodes,\n- style: weightVariableTextStyle(_context!, wght: 600));\n+ style: bolderWghtTextStyle(widget.style, by: 200));\n \n InlineSpan _buildDeleted(DeletedNode node) => _buildNodes(node.nodes,\n style: const TextStyle(decoration: TextDecoration.lineThrough));\ndiff --git a/lib/widgets/text.dart b/lib/widgets/text.dart\nindex 73093a4294..3f4389e592 100644\n--- a/lib/widgets/text.dart\n+++ b/lib/widgets/text.dart\n@@ -1,4 +1,5 @@\n import 'dart:io';\n+import 'package:collection/collection.dart';\n import 'package:flutter/foundation.dart';\n import 'package:flutter/material.dart';\n \n@@ -209,7 +210,7 @@ TextStyle weightVariableTextStyle(BuildContext context, {\n double? wght,\n double? wghtIfPlatformRequestsBold,\n }) {\n- double value = wght ?? FontWeight.normal.value.toDouble();\n+ double value = wght ?? wghtFromFontWeight(FontWeight.normal);\n if (MediaQuery.boldTextOf(context)) {\n // The framework has a condition on [MediaQueryData.boldText]\n // in the [Text] widget, but that only affects `fontWeight`.\n@@ -254,9 +255,51 @@ const kWghtMin = 1.0;\n const kWghtMax = 1000.0;\n \n /// A [FontVariation] \"wght\" value that's 300 above a given, clamped to [kWghtMax].\n-double bolderWght(double baseWght) {\n+///\n+/// The input value must be between [kWghtMin] and [kWghtMax].\n+///\n+/// Pass [by] to use a value other than 300.\n+double bolderWght(double baseWght, {double by = 300}) {\n assert(kWghtMin <= baseWght && baseWght <= kWghtMax);\n- return clampDouble(baseWght + 300, kWghtMin, kWghtMax);\n+ return clampDouble(baseWght + by, kWghtMin, kWghtMax);\n+}\n+\n+/// A [TextStyle] whose [FontVariation] \"wght\" and [TextStyle.fontWeight]\n+/// have been raised using [bolderWght].\n+///\n+/// [style] must have already been processed with [weightVariableTextStyle],\n+/// and [by] must be positive.\n+///\n+/// The increase done here will commute with any increase that was done by\n+/// [weightVariableTextStyle] to respond to the device bold-text setting,\n+/// because both adjustments are done with [bolderWght] with positive `by`.\n+///\n+/// [by] defaults to 300.\n+TextStyle bolderWghtTextStyle(TextStyle style, {double by = 300}) {\n+ assert(\n+ style.debugLabel!.contains('weightVariableTextStyle')\n+ // ([ContentTheme.textStylePlainParagraph] applies [weightVariableTextStyle])\n+ || style.debugLabel!.contains('ContentTheme.textStylePlainParagraph')\n+ || style.debugLabel!.contains('bolderWghtTextStyle')\n+ );\n+ assert(by > 0);\n+ assert(style.fontVariations!.where((v) => v.axis == 'wght').length == 1);\n+\n+ final newWght = bolderWght(wghtFromTextStyle(style)!, by: by);\n+\n+ TextStyle result = style.copyWith(\n+ fontVariations: style.fontVariations!.map((v) => v.axis == 'wght'\n+ ? FontVariation('wght', newWght)\n+ : v).toList(),\n+ fontWeight: clampVariableFontWeight(newWght),\n+ );\n+\n+ assert(() {\n+ result = result.copyWith(debugLabel: 'bolderWghtTextStyle(by: $by)');\n+ return true;\n+ }());\n+\n+ return result;\n }\n \n /// Find the nearest [FontWeight] constant for a variable-font \"wght\"-axis value.\n@@ -286,6 +329,23 @@ FontWeight clampVariableFontWeight(double wght) {\n }\n }\n \n+/// A \"wght\" value extracted from a [TextStyle].\n+///\n+/// Returns the value in [TextStyle.fontVariations] if present.\n+/// If that's absent but a [TextStyle.fontWeight] is present,\n+/// returns [wghtFromFontWeight] for that value.\n+///\n+/// The returned value already reflects any response to the system bold-text\n+/// setting, so if the [TextStyle] was built using [weightVariableTextStyle],\n+/// this value might be larger than the `wght` that was passed to that function.\n+double? wghtFromTextStyle(TextStyle style) {\n+ double? result = style.fontVariations?.firstWhereOrNull((v) => v.axis == 'wght')?.value;\n+ if (result == null && style.fontWeight != null) {\n+ result = wghtFromFontWeight(style.fontWeight!);\n+ }\n+ return result;\n+}\n+\n /// A good guess at a font's \"wght\" value to match a given [FontWeight].\n ///\n /// Returns [FontWeight.value] as a double.\n", "test_patch": "diff --git a/test/flutter_checks.dart b/test/flutter_checks.dart\nindex 8c03d410ed..0a3fbcba91 100644\n--- a/test/flutter_checks.dart\n+++ b/test/flutter_checks.dart\n@@ -77,6 +77,10 @@ extension TextStyleChecks on Subject {\n // TODO others\n }\n \n+extension FontVariationChecks on Subject {\n+ Subject get axis => has((x) => x.axis, 'axis');\n+ Subject get value => has((x) => x.value, 'value');\n+}\n \n extension TextThemeChecks on Subject {\n Subject get displayLarge => has((t) => t.displayLarge, 'displayLarge');\ndiff --git a/test/widgets/content_test.dart b/test/widgets/content_test.dart\nindex 110a85ae1a..26116f8214 100644\n--- a/test/widgets/content_test.dart\n+++ b/test/widgets/content_test.dart\n@@ -14,6 +14,7 @@ import 'package:zulip/widgets/icons.dart';\n import 'package:zulip/widgets/message_list.dart';\n import 'package:zulip/widgets/page.dart';\n import 'package:zulip/widgets/store.dart';\n+import 'package:zulip/widgets/text.dart';\n import 'package:zulip/widgets/theme.dart';\n \n import '../example_data.dart' as eg;\n@@ -154,6 +155,41 @@ void main() {\n });\n }\n \n+ /// Test the font weight found by [styleFinder] in the rendering of [content].\n+ ///\n+ /// The weight will be expected to be [expectedWght] when the system\n+ /// bold-text setting is not set, and to vary appropriately when it is set.\n+ ///\n+ /// [styleFinder] must return the [TextStyle] containing the \"wght\"\n+ /// (in [TextStyle.fontVariations]) and the [TextStyle.fontWeight]\n+ /// to be checked.\n+ Future testFontWeight(String description, {\n+ required Widget content,\n+ required double expectedWght,\n+ required TextStyle Function(WidgetTester tester) styleFinder,\n+ }) async {\n+ for (final platformRequestsBold in [false, true]) {\n+ testWidgets(\n+ description + (platformRequestsBold ? ' (platform requests bold)' : ''),\n+ (tester) async {\n+ tester.platformDispatcher.accessibilityFeaturesTestValue =\n+ FakeAccessibilityFeatures(boldText: platformRequestsBold);\n+ await prepareContent(tester, content);\n+ final style = styleFinder(tester);\n+ double effectiveExpectedWght = expectedWght;\n+ if (platformRequestsBold) {\n+ // bolderWght because that's what [weightVariableTextStyle] uses\n+ effectiveExpectedWght = bolderWght(expectedWght);\n+ }\n+ check(style)\n+ ..fontVariations.isNotNull()\n+ .any((it) => it..axis.equals('wght')..value.equals(effectiveExpectedWght))\n+ ..fontWeight.equals(clampVariableFontWeight(effectiveExpectedWght));\n+ tester.platformDispatcher.clearAccessibilityFeaturesTestValue();\n+ });\n+ }\n+ }\n+\n group('ThematicBreak', () {\n testWidgets('smoke ThematicBreak', (tester) async {\n await prepareContent(tester, plainContent(ContentExample.thematicBreak.html));\n@@ -469,7 +505,69 @@ void main() {\n check((ratioInHeader - ratioInParagraph).abs()).isLessThan(0.001);\n }\n \n- testContentSmoke(ContentExample.strong);\n+ group('strong (bold)', () {\n+ testContentSmoke(ContentExample.strong);\n+\n+ TextStyle findWordBold(WidgetTester tester) {\n+ final root = tester.renderObject(find.textContaining('bold')).text;\n+ return mergedStyleOfSubstring(root, 'bold')!;\n+ }\n+\n+ testFontWeight('in plain paragraph',\n+ expectedWght: 600,\n+ // **bold**\n+ content: plainContent('

              bold

              '),\n+ styleFinder: findWordBold,\n+ );\n+\n+ for (final level in HeadingLevel.values) {\n+ final name = level.name;\n+ assert(RegExp(r'^h[1-6]$').hasMatch(name));\n+ testFontWeight('in $name',\n+ expectedWght: 800,\n+ // # **bold**, ## **bold**, ### **bold**, etc.\n+ content: plainContent('<$name>bold'),\n+ styleFinder: findWordBold,\n+ );\n+ }\n+\n+ testFontWeight('in different kind of span in h1',\n+ expectedWght: 800,\n+ // # ~~**bold**~~\n+ content: plainContent('

              bold

              '),\n+ styleFinder: findWordBold,\n+ );\n+\n+ testFontWeight('in spoiler header',\n+ expectedWght: 900,\n+ // ```spoiler regular **bold**\n+ // content\n+ // ```\n+ content: plainContent(\n+ '
              \\n'\n+ '

              regular bold

              \\n'\n+ '
              \\n'\n+ '

              content

              \\n'\n+ '
              '\n+ ),\n+ styleFinder: findWordBold,\n+ );\n+\n+ testFontWeight('in different kind of span in spoiler header',\n+ expectedWght: 900,\n+ // ```spoiler *italic **bold***\n+ // content\n+ // ```\n+ content: plainContent(\n+ '
              \\n'\n+ '

              italic bold

              \\n'\n+ '
              \\n'\n+ '

              content

              \\n'\n+ '
              '\n+ ),\n+ styleFinder: findWordBold,\n+ );\n+ });\n \n testContentSmoke(ContentExample.emphasis);\n \n@@ -489,25 +587,63 @@ void main() {\n testContentSmoke(ContentExample.groupMentionPlain);\n testContentSmoke(ContentExample.groupMentionSilent);\n \n+ UserMention? findUserMentionInSpan(InlineSpan rootSpan) {\n+ UserMention? result;\n+ rootSpan.visitChildren((span) {\n+ if (span case (WidgetSpan(child: UserMention() && var widget))) {\n+ result = widget;\n+ return false;\n+ }\n+ return true;\n+ });\n+ return result;\n+ }\n+\n+ TextStyle textStyleFromWidget(WidgetTester tester, UserMention widget, String mentionText) {\n+ final fullNameSpan = tester.renderObject(\n+ find.descendant(\n+ of: find.byWidget(widget), matching: find.text(mentionText))\n+ ).text;\n+ return mergedStyleOfSubstring(fullNameSpan, mentionText)!;\n+ }\n+\n testWidgets('maintains font-size ratio with surrounding text', (tester) async {\n await checkFontSizeRatio(tester,\n targetHtml: '@Chris Bobbe',\n targetFontSizeFinder: (rootSpan) {\n- late final double result;\n- rootSpan.visitChildren((span) {\n- if (span case WidgetSpan(child: UserMention() && var widget)) {\n- final fullNameSpan = tester.renderObject(\n- find.descendant(\n- of: find.byWidget(widget), matching: find.text('@Chris Bobbe'))\n- ).text;\n- result = mergedStyleOfSubstring(fullNameSpan, '@Chris Bobbe')!.fontSize!;\n- return false;\n- }\n- return true;\n- });\n- return result;\n+ final widget = findUserMentionInSpan(rootSpan);\n+ final style = textStyleFromWidget(tester, widget!, '@Chris Bobbe');\n+ return style.fontSize!;\n });\n });\n+\n+ testFontWeight('silent or non-self mention in plain paragraph',\n+ expectedWght: 400,\n+ // @_**Greg Price**\n+ content: plainContent(\n+ '

              Greg Price

              '),\n+ styleFinder: (tester) {\n+ return textStyleFromWidget(tester,\n+ tester.widget(find.byType(UserMention)), 'Greg Price');\n+ });\n+\n+ // TODO(#647):\n+ // testFontWeight('non-silent self-user mention in plain paragraph',\n+ // expectedWght: 600, // [etc.]\n+\n+ testFontWeight('silent or non-self mention in bold context',\n+ expectedWght: 600,\n+ // # @_**Chris Bobbe**\n+ content: plainContent(\n+ '

              Chris Bobbe

              '),\n+ styleFinder: (tester) {\n+ return textStyleFromWidget(tester,\n+ tester.widget(find.byType(UserMention)), 'Chris Bobbe');\n+ });\n+\n+ // TODO(#647):\n+ // testFontWeight('non-silent self-user mention in bold context',\n+ // expectedWght: 800, // [etc.]\n });\n \n Future tapText(WidgetTester tester, Finder textFinder) async {\ndiff --git a/test/widgets/text_test.dart b/test/widgets/text_test.dart\nindex 1a956345d6..824bc574eb 100644\n--- a/test/widgets/text_test.dart\n+++ b/test/widgets/text_test.dart\n@@ -1,4 +1,5 @@\n import 'package:checks/checks.dart';\n+import 'package:collection/collection.dart';\n import 'package:flutter/material.dart';\n import 'package:flutter_test/flutter_test.dart';\n import 'package:zulip/widgets/text.dart';\n@@ -151,10 +152,98 @@ void main() {\n });\n \n test('bolderWght', () {\n+ check(() => bolderWght(kWghtMin - 1)).throws();\n+ check(() => bolderWght(kWghtMax + 1)).throws();\n+\n check(bolderWght(1)).equals(301);\n check(bolderWght(400)).equals(700);\n check(bolderWght(600)).equals(900);\n check(bolderWght(900)).equals(1000);\n+\n+ check(bolderWght(1, by: -200)).equals(1);\n+ check(bolderWght(201, by: -200)).equals(1);\n+ check(bolderWght(1000, by: -200)).equals(800);\n+\n+ check(bolderWght(1, by: 200)).equals(201);\n+ check(bolderWght(400, by: 200)).equals(600);\n+ check(bolderWght(600, by: 200)).equals(800);\n+ check(bolderWght(900, by: 200)).equals(1000);\n+ });\n+\n+ group('bolderWghtTextStyle', () {\n+ Future testBolderWghtTextStyle(\n+ String description, {\n+ required TextStyle Function(BuildContext context) makeStyle,\n+ bool platformRequestsBold = false,\n+ required double expectedWght,\n+ required FontWeight expectedFontWeight,\n+ }) async {\n+ testWidgets(description, (WidgetTester tester) async {\n+ tester.platformDispatcher.accessibilityFeaturesTestValue =\n+ FakeAccessibilityFeatures(boldText: platformRequestsBold);\n+\n+ await tester.pumpWidget(\n+ MaterialApp(\n+ home: Builder(builder: (context) =>\n+ Text('', style: makeStyle(context)))));\n+\n+ final TextStyle? style = tester.widget(find.byType(Text)).style;\n+\n+ check(style).isNotNull().fontWeight.isNotNull().equals(expectedFontWeight);\n+\n+ final fontVariations = style!.fontVariations;\n+ check(fontVariations).isNotNull();\n+ final wghtVariation = fontVariations!.singleWhereOrNull((v) => v.axis == 'wght');\n+ check(wghtVariation).isNotNull().value.equals(expectedWght);\n+\n+ tester.platformDispatcher.clearAccessibilityFeaturesTestValue();\n+ });\n+ }\n+\n+ testBolderWghtTextStyle('default + default',\n+ makeStyle: (context) => bolderWghtTextStyle(weightVariableTextStyle(context)),\n+ expectedWght: 700,\n+ expectedFontWeight: FontWeight.w700);\n+\n+ testBolderWghtTextStyle('default + default (platform requests bold)',\n+ platformRequestsBold: true,\n+ makeStyle: (context) => bolderWghtTextStyle(weightVariableTextStyle(context)),\n+ expectedWght: 1000,\n+ expectedFontWeight: FontWeight.w900);\n+\n+ testBolderWghtTextStyle('320 + 200',\n+ makeStyle: (context) => bolderWghtTextStyle(\n+ weightVariableTextStyle(context, wght: 320),\n+ by: 200,\n+ ),\n+ expectedWght: 520,\n+ expectedFontWeight: FontWeight.w500);\n+\n+ testBolderWghtTextStyle('320 + 200 (platform requests bold)',\n+ platformRequestsBold: true,\n+ makeStyle: (context) => bolderWghtTextStyle(\n+ weightVariableTextStyle(context, wght: 320),\n+ by: 200,\n+ ),\n+ expectedWght: 820,\n+ expectedFontWeight: FontWeight.w800);\n+\n+ testBolderWghtTextStyle('320 + 200 (platform requests bold; custom response to setting)',\n+ platformRequestsBold: true,\n+ makeStyle: (context) => bolderWghtTextStyle(\n+ weightVariableTextStyle(context, wght: 320, wghtIfPlatformRequestsBold: 410),\n+ by: 200,\n+ ),\n+ expectedWght: 610,\n+ expectedFontWeight: FontWeight.w600);\n+\n+ testBolderWghtTextStyle('900 + 200',\n+ makeStyle: (context) => bolderWghtTextStyle(\n+ weightVariableTextStyle(context, wght: 900),\n+ by: 200,\n+ ),\n+ expectedWght: 1000,\n+ expectedFontWeight: FontWeight.w900);\n });\n \n test('clampVariableFontWeight: FontWeight has the assumed list of values', () {\n@@ -209,6 +298,38 @@ void main() {\n check(clampVariableFontWeight(1000)) .equals(FontWeight.w900);\n });\n \n+ test('wghtFromTextStyle', () {\n+ doCheck(TextStyle style, double? expected) {\n+ check(wghtFromTextStyle(style)).equals(expected);\n+ }\n+\n+ doCheck(const TextStyle(), null);\n+ doCheck(const TextStyle(fontVariations: []), null);\n+ doCheck(const TextStyle(fontVariations: [FontVariation.slant(45)]), null);\n+\n+ doCheck(const TextStyle(fontVariations: [FontVariation('wght', 100)]), 100);\n+ doCheck(const TextStyle(\n+ fontVariations: [FontVariation('wght', 160)],\n+ fontWeight: FontWeight.w200,\n+ ), 160);\n+ doCheck(const TextStyle(\n+ fontVariations: [FontVariation('wght', 100), FontVariation('wght', 200)]\n+ ), 100);\n+ doCheck(const TextStyle(\n+ fontVariations: [FontVariation('wght', 100), FontVariation('wght', 100)],\n+ fontWeight: FontWeight.w900,\n+ ), 100);\n+\n+ doCheck(const TextStyle(\n+ fontVariations: [],\n+ fontWeight: FontWeight.w900,\n+ ), 900);\n+ doCheck(const TextStyle(\n+ fontVariations: [FontVariation.slant(45)],\n+ fontWeight: FontWeight.w900,\n+ ), 900);\n+ });\n+\n group('proportionalLetterSpacing', () {\n Future testLetterSpacing(\n String description, {\n", "n2p_tests": "{\"/home/zulip-flutter/test/widgets/text_test.dart: proportionalLetterSpacing ambient text scale factor 3.1176, override with no scaling\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: weightVariableTextStyle specific `wght`, default `wghtIfPlatformRequestsBold`; platform does not request bold\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: _convertTextTheme: TextTheme has the assumed fields\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: weightVariableTextStyle default `wght`, specific `wghtIfPlatformRequestsBold`; platform does not request bold\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: zulipTypography platform requests bold\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: weightVariableTextStyle default `wght`, specific `wghtIfPlatformRequestsBold`; platform requests bold\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: zulipTypography Typography has the assumed fields\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: proportionalLetterSpacing smoke 2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: bolderWghtTextStyle default + default\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: proportionalLetterSpacing ambient text scale factor 1.0, override with no scaling\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: zulipTypography letter spacing\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: weightVariableTextStyle specific values; platform requests bold\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: weightVariableTextStyle default values; platform requests bold\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: bolderWghtTextStyle default + default (platform requests bold)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: wghtFromTextStyle\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: proportionalLetterSpacing ambient text scale factor 1.0, override with clamping\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: bolderWghtTextStyle 900 + 200\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: bolderWghtTextStyle 320 + 200 (platform requests bold)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: weightVariableTextStyle default values; platform does not request bold\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: bolderWghtTextStyle 320 + 200\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: proportionalLetterSpacing ambient text scale factor 1.3529, override with clamping\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: zulipTypography platform does not request bold\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: proportionalLetterSpacing ambient text scale factor 3.1176, no override\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: proportionalLetterSpacing ambient text scale factor 1.0, no override\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: proportionalLetterSpacing ambient text scale factor 0.8235, override with no scaling\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: proportionalLetterSpacing ambient text scale factor 0.8235, no override\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: clampVariableFontWeight\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: weightVariableTextStyle specific `wght`, default `wghtIfPlatformRequestsBold`; platform requests bold\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: proportionalLetterSpacing smoke 1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: proportionalLetterSpacing ambient text scale factor 3.1176, override with clamping\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: proportionalLetterSpacing ambient text scale factor 1.3529, override with no scaling\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: bolderWght\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: proportionalLetterSpacing ambient text scale factor 0.8235, override with clamping\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: weightVariableTextStyle specific values; platform does not request bold\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: proportionalLetterSpacing ambient text scale factor 1.3529, no override\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: clampVariableFontWeight: FontWeight has the assumed list of values\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/widgets/text_test.dart: bolderWghtTextStyle 320 + 200 (platform requests bold; custom response to setting)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-589", "org": "zulip", "repo": "zulip-flutter", "number": 589, "state": "closed", "title": "content: Handle strikethrough, the element", "body": "This handles the `` element. This means \"strikethrough\" formatting; it's what you get with Markdown syntax like `~~this~~`, enclosing a span in`~~`.\r\n\r\nHandling these means:\r\n- Parsing into `DeletedNode`\r\n- Styling nodes that are of type `DeletedNode` with a line-through\r\n\r\nFixes #357\r\n\r\nFinal Result: \r\n![Simulator Screenshot - iPhone 15 Pro Max - 2024-03-25 at 06 28 41](https://github.com/zulip/zulip-flutter/assets/63330019/ff1ca7b6-4900-483f-82f2-4193ad477f74)\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"e6c531a76301c13e0a784dc71ce07ab5d08ee3fb\"}", "resolved_issues": "[{\"number\": 357, \"title\": \"Handle strikethrough, the element\", \"body\": \"We should handle the `` element. This means \\\"strikethrough\\\" formatting; it's what you get with Markdown syntax like `~~this~~`, enclosing a span in `~~`.\\r\\n\\r\\nHandling these means parsing them in `lib/model/content.dart`, and then styling them appropriately in `lib/widgets/content.dart`. For appropriate styling, see the Zulip web app's `web/styles/rendered_markdown.css`.\\r\\n\"}]", "lang": "dart", "problem_statement": "Handle strikethrough, the element\nWe should handle the `` element. This means \"strikethrough\" formatting; it's what you get with Markdown syntax like `~~this~~`, enclosing a span in `~~`.\r\n\r\nHandling these means parsing them in `lib/model/content.dart`, and then styling them appropriately in `lib/widgets/content.dart`. For appropriate styling, see the Zulip web app's `web/styles/rendered_markdown.css`.\r\n\n", "hints": NaN, "pull_url": "https://github.com/zulip/zulip-flutter/pull/589", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/357\"]", "test_command": "flutter test test/model/content_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/content.dart b/lib/model/content.dart\nindex 05067c1d58..9156d0f51d 100644\n--- a/lib/model/content.dart\n+++ b/lib/model/content.dart\n@@ -450,6 +450,10 @@ class StrongNode extends InlineContainerNode {\n const StrongNode({super.debugHtmlNode, required super.nodes});\n }\n \n+class DeletedNode extends InlineContainerNode {\n+ const DeletedNode({super.debugHtmlNode, required super.nodes});\n+}\n+\n class EmphasisNode extends InlineContainerNode {\n const EmphasisNode({super.debugHtmlNode, required super.nodes});\n }\n@@ -717,6 +721,9 @@ class _ZulipContentParser {\n if (localName == 'strong' && className.isEmpty) {\n return StrongNode(nodes: nodes(), debugHtmlNode: debugHtmlNode);\n }\n+ if (localName == 'del' && className.isEmpty) {\n+ return DeletedNode(nodes: nodes(), debugHtmlNode: debugHtmlNode);\n+ }\n if (localName == 'em' && className.isEmpty) {\n return EmphasisNode(nodes: nodes(), debugHtmlNode: debugHtmlNode);\n }\ndiff --git a/lib/widgets/content.dart b/lib/widgets/content.dart\nindex c023d6d7be..36ca7a6f9c 100644\n--- a/lib/widgets/content.dart\n+++ b/lib/widgets/content.dart\n@@ -622,6 +622,8 @@ class _InlineContentBuilder {\n return const TextSpan(text: \"\");\n } else if (node is StrongNode) {\n return _buildStrong(node);\n+ } else if (node is DeletedNode) {\n+ return _buildDeleted(node);\n } else if (node is EmphasisNode) {\n return _buildEmphasis(node);\n } else if (node is LinkNode) {\n@@ -653,6 +655,9 @@ class _InlineContentBuilder {\n InlineSpan _buildStrong(StrongNode node) => _buildNodes(node.nodes,\n style: weightVariableTextStyle(_context, wght: 600, wghtIfPlatformRequestsBold: 900));\n \n+ InlineSpan _buildDeleted(DeletedNode node) => _buildNodes(node.nodes,\n+ style: const TextStyle(decoration: TextDecoration.lineThrough));\n+\n InlineSpan _buildEmphasis(EmphasisNode node) => _buildNodes(node.nodes,\n style: const TextStyle(fontStyle: FontStyle.italic));\n \n", "test_patch": "diff --git a/test/model/content_test.dart b/test/model/content_test.dart\nindex a89277daf0..dbf213cebc 100644\n--- a/test/model/content_test.dart\n+++ b/test/model/content_test.dart\n@@ -580,6 +580,11 @@ void main() {\n '

              bold

              ',\n const StrongNode(nodes: [TextNode('bold')]));\n \n+ testParseInline('parse deleted/strike-through',\n+ // \"~~strike through~~\"\n+ '

              strike through

              ',\n+ const DeletedNode(nodes: [TextNode('strike through')]));\n+\n testParseInline('parse emphasis/italic',\n // \"*italic*\"\n '

              italic

              ',\n@@ -590,11 +595,12 @@ void main() {\n '

              inline code

              ',\n const InlineCodeNode(nodes: [TextNode('inline code')]));\n \n- testParseInline('parse nested strong, em, code',\n- // \"***`word`***\"\n- '

              word

              ',\n- const StrongNode(nodes: [EmphasisNode(nodes: [InlineCodeNode(nodes: [\n- TextNode('word')])])]));\n+ testParseInline('parse nested del, strong, em, code',\n+ // \"~~***`word`***~~\"\n+ '

              word

              ',\n+ const DeletedNode(\n+ nodes: [StrongNode(nodes: [EmphasisNode(nodes: [InlineCodeNode(nodes: [\n+ TextNode('word')])])])]));\n \n group('LinkNode', () {\n testParseInline('parse link',\n@@ -618,19 +624,21 @@ void main() {\n nodes: [TextNode('#mobile-team > zulip-flutter')]));\n });\n \n- testParseInline('parse nested link, strong, em, code',\n- // \"[***`word`***](https://example/)\"\n- '

              word'\n- '

              ',\n+ testParseInline('parse nested link, del, strong, em, code',\n+ // \"[~~***`word`***~~](https://example/)\"\n+ '

              word'\n+ '

              ',\n const LinkNode(url: 'https://example/',\n- nodes: [StrongNode(nodes: [EmphasisNode(nodes: [InlineCodeNode(nodes: [\n- TextNode('word')])])])]));\n+ nodes: [DeletedNode(nodes: [\n+ StrongNode(nodes: [EmphasisNode(nodes: [InlineCodeNode(nodes: [\n+ TextNode('word')])])])])]));\n \n- testParseInline('parse nested strong, em, link',\n- // \"***[t](/u)***\"\n- '

              t

              ',\n- const StrongNode(nodes: [EmphasisNode(nodes: [LinkNode(url: '/u',\n- nodes: [TextNode('t')])])]));\n+ testParseInline('parse nested del, strong, em, link',\n+ // \"~~***[t](/u)***~~\"\n+ '

              t

              ',\n+ const DeletedNode(\n+ nodes: [StrongNode(nodes: [EmphasisNode(nodes: [LinkNode(url: '/u',\n+ nodes: [TextNode('t')])])])]));\n \n group('parse @-mentions', () {\n testParseInline('plain user @-mention',\n@@ -727,14 +735,15 @@ void main() {\n HeadingNode(level: HeadingLevel.h6, links: null, nodes: [TextNode('six')])]);\n \n testParse('containing inline markup',\n- // \"###### one [***`two`***](https://example/)\"\n- '
              one two'\n- '
              ', const [\n+ // \"###### one [**~~*`two`*~~**](https://example/)\"\n+ '
              one two'\n+ '
              ', const [\n HeadingNode(level: HeadingLevel.h6, links: null, nodes: [\n TextNode('one '),\n LinkNode(url: 'https://example/',\n- nodes: [StrongNode(nodes: [EmphasisNode(nodes: [\n- InlineCodeNode(nodes: [TextNode('two')])])])]),\n+ nodes: [StrongNode(\n+ nodes: [DeletedNode( nodes: [EmphasisNode(nodes: [\n+ InlineCodeNode(nodes: [TextNode('two')])])])])]),\n ])]);\n \n testParse('amidst paragraphs',\n", "n2p_tests": "{\"parse Unicode emoji, encoded in span element, class order reversed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse lists
                \": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse inline math\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse single image\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse two plain-text paragraphs\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse a plain-text paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse nested del, strong, em, code\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"LinkNode parse #-mention of stream\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse code block, with syntax highlighting and highlighted lines\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse code block, multiline, with syntax highlighting\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse lists implicit paragraph with internal
                \": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse @-mentions plain user @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse headings h1, h2, h3, h4, h5\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse spoiler with plain custom header\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse headings amidst paragraphs\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse math block\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse custom emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse lists
                  \": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse strong/bold\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse custom emoji with invalid URL\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"global times smoke\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"all content examples are tested\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse quotation\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse Zulip extra emoji\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse spoiler with rich header and content\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse @-mentions silent group @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse @-mentions plain group @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"track links inside block-inline containers multiple links in paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse nested link, del, strong, em, code\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse image as immediate child in implicit paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse multiple images\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"global times handles missing attribute\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse nested lists, quotes, headings, code blocks\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse content after image cluster\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse Unicode emoji, not encoded in span element\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse single image with invalid URL\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse impossible content after image cluster in implicit paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse
                  in block context\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse inline code\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"LinkNode parse link\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"track links inside block-inline containers link in list item\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"track links inside block-inline containers link in heading\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse multiple clusters of images\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse nested del, strong, em, link\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse deleted/strike-through\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse code block without syntax highlighting\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse @-mentions silent user @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"global times handles unexpected timezone\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse image cluster in implicit paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse Unicode emoji, encoded in span element\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse @-mentions silent group @-mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse @-mentions silent user @-mention, class order reversed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"LinkNode parse #-mention of topic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse headings containing inline markup\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse
                  inside a paragraph\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse math block in quote\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse emphasis/italic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse spoiler with default header\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse spoiler a header that has an image in it\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse Unicode emoji, encoded in span element, multiple codepoints\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse lists explicit paragraphs\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse code block, with an unknown span type\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"global times handles DateTime.parse failure\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse code block with syntax highlighting\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"parse headings plain h6\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-534", "org": "zulip", "repo": "zulip-flutter", "number": 534, "state": "closed", "title": "Fix avatar blurriness in profile screen", "body": "## Description\r\nUpdated the avatar URL used in the profile screen to request a higher-resolution image to reduce blurriness.\r\nFixes #301 \r\n\r\n## Outcome\r\n| Before | After |\r\n:-------------------------:|:-------------------------:\r\n![image](https://github.com/zulip/zulip-flutter/assets/67259068/b5e84b15-bb8c-421a-bbf4-7a7f97c1057d) | ![image](https://github.com/zulip/zulip-flutter/assets/67259068/38ee3f22-0c3f-4b09-827d-d9debf521e82)\r\n![image](https://github.com/zulip/zulip-flutter/assets/67259068/eef42b86-f413-43e3-876e-a7d60c83deb4) | ![image](https://github.com/zulip/zulip-flutter/assets/67259068/c258e9a0-70aa-4e93-adc1-385a18873561)\r\n", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"c99a31192b00fcd2cfd95bffdb6c9c0f36cfe677\"}", "resolved_issues": "[{\"number\": 301, \"title\": \"Request avatars of the appropriate size\", \"body\": \"With #195 fixed with PR #287, we now have a user-profile screen! \\ud83c\\udf89\\r\\n\\r\\nI noticed that on many profiles on CZO, the avatar is more blurry than on the corresponding screen in `zulip-mobile`:\\r\\n\\r\\n| zulip-flutter | zulip-mobile |\\r\\n| --- | --- | \\r\\n| ![image](https://github.com/zulip/zulip-flutter/assets/22248748/66896560-9b27-4f0d-813d-2164e7aaafca) | ![image](https://github.com/zulip/zulip-flutter/assets/22248748/644603ff-c376-45b4-b50e-dc0f0d1839bc) |\\r\\n\\r\\nThis is because we don't yet have special logic for requesting a larger image when we need one. This issue is for adding such logic.\\r\\n\\r\\nIn `zulip-mobile`, we made an `AvatarURL` class with a `get` method that gives you a URL for an image of the specified size in physical pixels (or at least the best possible approximation). `AvatarURL` has [three subclasses](https://github.com/zulip/zulip-mobile/blob/09754f0a5d7408fd490a631339eced3cf77a28e0/src/utils/avatar.js) that each implement `get` very differently.\\r\\n\\r\\nOn CZO in `#api documentation`, I've [summarized](https://chat.zulip.org/#narrow/stream/412-api-documentation/topic/avatar_url.3A.20Request.20specific.20size/near/1636546) zulip-mobile's logic for determining a URL for any given size in physical pixels. I'm hoping the API doc can start specifying that logic, and we can use the new documentation for zulip-flutter's implementation.\\r\\n\\r\\nTo convert a logical-pixel value to a physical-pixel value, we'll want to multiply by the device pixel ratio. As in zulip-mobile:\\r\\n```js\\r\\navatarUrl.get(PixelRatio.getPixelSizeForLayoutSize(size))\\r\\n```\\r\\n\\r\\n\\r\\nI think a solution will likely have lots of interactions with #254 and #255, so the best approach might be to consider these three issues together.\\r\\n\\r\\nRelated: #254\\r\\nRelated: #255\"}]", "lang": "dart", "problem_statement": "Request avatars of the appropriate size\nWith #195 fixed with PR #287, we now have a user-profile screen! \ud83c\udf89\r\n\r\nI noticed that on many profiles on CZO, the avatar is more blurry than on the corresponding screen in `zulip-mobile`:\r\n\r\n| zulip-flutter | zulip-mobile |\r\n| --- | --- | \r\n| ![image](https://github.com/zulip/zulip-flutter/assets/22248748/66896560-9b27-4f0d-813d-2164e7aaafca) | ![image](https://github.com/zulip/zulip-flutter/assets/22248748/644603ff-c376-45b4-b50e-dc0f0d1839bc) |\r\n\r\nThis is because we don't yet have special logic for requesting a larger image when we need one. This issue is for adding such logic.\r\n\r\nIn `zulip-mobile`, we made an `AvatarURL` class with a `get` method that gives you a URL for an image of the specified size in physical pixels (or at least the best possible approximation). `AvatarURL` has [three subclasses](https://github.com/zulip/zulip-mobile/blob/09754f0a5d7408fd490a631339eced3cf77a28e0/src/utils/avatar.js) that each implement `get` very differently.\r\n\r\nOn CZO in `#api documentation`, I've [summarized](https://chat.zulip.org/#narrow/stream/412-api-documentation/topic/avatar_url.3A.20Request.20specific.20size/near/1636546) zulip-mobile's logic for determining a URL for any given size in physical pixels. I'm hoping the API doc can start specifying that logic, and we can use the new documentation for zulip-flutter's implementation.\r\n\r\nTo convert a logical-pixel value to a physical-pixel value, we'll want to multiply by the device pixel ratio. As in zulip-mobile:\r\n```js\r\navatarUrl.get(PixelRatio.getPixelSizeForLayoutSize(size))\r\n```\r\n\r\n\r\nI think a solution will likely have lots of interactions with #254 and #255, so the best approach might be to consider these three issues together.\r\n\r\nRelated: #254\r\nRelated: #255\n", "hints": "An observant user noticed the blurriness and reported it in chat today: https://chat.zulip.org/#narrow/stream/48-mobile/topic/flutter.3A.20blurry.20profile.20picture/near/1735359\n@gnprice I'm currently working on this feature. Finished with most of the task using gravatar's. I would like to know which formatter you are using because as I save my code most of the file gets re-formatted causing several changes in the git history. It would be really helpful if you linked the contributing guidelines as well. \n@saisumith770 Cool \u2014 assigned you the issue, and I'll look at your PR in the next few days.\r\n\r\nWe don't use an auto-formatter, so you'll want to just tell your editor not to do that. Let's discuss in `#mobile-team` on chat.zulip.org ([thread](https://chat.zulip.org/#narrow/stream/243-mobile-team/topic/turning.20off.20reformat-on-save/near/1745058)).\r\n\r\nFor contributing guidelines, this repo's README file has information on running tests and making changes. We also follow the same basic style of clean commit history as the Zulip project in general, which is described here:\r\nhttps://zulip.readthedocs.io/en/latest/contributing/commit-discipline.html\r\n", "pull_url": "https://github.com/zulip/zulip-flutter/pull/534", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/301\"]", "test_command": "flutter test test/model/avatar_url_test.dart test/widgets/content_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/model/avatar_url.dart b/lib/model/avatar_url.dart\nnew file mode 100644\nindex 0000000000..8177a4e8c0\n--- /dev/null\n+++ b/lib/model/avatar_url.dart\n@@ -0,0 +1,50 @@\n+/// The size threshold above which is \"medium\" size for an avatar.\n+///\n+/// This is DEFAULT_AVATAR_SIZE in zerver/lib/upload.py.\n+const defaultUploadSizePx = 100;\n+\n+abstract class AvatarUrl {\n+ factory AvatarUrl.fromUserData({required Uri resolvedUrl}) {\n+ // TODO(#255): handle computing gravatars\n+ // TODO(#254): handle computing fallback avatar\n+ if (resolvedUrl.toString().startsWith(GravatarUrl.origin)) {\n+ return GravatarUrl(resolvedUrl: resolvedUrl);\n+ } else {\n+ return UploadedAvatarUrl(resolvedUrl: resolvedUrl);\n+ }\n+ }\n+\n+ Uri get(int sizePhysicalPx);\n+}\n+\n+class GravatarUrl implements AvatarUrl {\n+ GravatarUrl({required Uri resolvedUrl}) : standardUrl = resolvedUrl;\n+\n+ static String origin = 'https://secure.gravatar.com';\n+\n+ Uri standardUrl;\n+\n+ @override\n+ Uri get(int sizePhysicalPx) {\n+ return standardUrl.replace(queryParameters: {\n+ ...standardUrl.queryParameters,\n+ 's': sizePhysicalPx.toString(),\n+ });\n+ }\n+}\n+\n+class UploadedAvatarUrl implements AvatarUrl {\n+ UploadedAvatarUrl({required Uri resolvedUrl}) : standardUrl = resolvedUrl;\n+\n+ Uri standardUrl;\n+\n+ @override\n+ Uri get(int sizePhysicalPx) {\n+ if (sizePhysicalPx > defaultUploadSizePx) {\n+ return standardUrl.replace(\n+ path: standardUrl.path.replaceFirst(RegExp(r'(?:\\.png)?$'), \"-medium.png\"));\n+ }\n+\n+ return standardUrl;\n+ }\n+}\ndiff --git a/lib/widgets/content.dart b/lib/widgets/content.dart\nindex c5e2682ad2..24794464b4 100644\n--- a/lib/widgets/content.dart\n+++ b/lib/widgets/content.dart\n@@ -7,6 +7,7 @@ import 'package:flutter_gen/gen_l10n/zulip_localizations.dart';\n \n import '../api/core.dart';\n import '../api/model/model.dart';\n+import '../model/avatar_url.dart';\n import '../model/binding.dart';\n import '../model/content.dart';\n import '../model/internal_link.dart';\n@@ -1027,7 +1028,7 @@ class Avatar extends StatelessWidget {\n return AvatarShape(\n size: size,\n borderRadius: borderRadius,\n- child: AvatarImage(userId: userId));\n+ child: AvatarImage(userId: userId, size: size));\n }\n }\n \n@@ -1040,9 +1041,11 @@ class AvatarImage extends StatelessWidget {\n const AvatarImage({\n super.key,\n required this.userId,\n+ required this.size,\n });\n \n final int userId;\n+ final double size;\n \n @override\n Widget build(BuildContext context) {\n@@ -1057,9 +1060,19 @@ class AvatarImage extends StatelessWidget {\n null => null, // TODO(#255): handle computing gravatars\n var avatarUrl => store.tryResolveUrl(avatarUrl),\n };\n- return (resolvedUrl == null)\n- ? const SizedBox.shrink()\n- : RealmContentNetworkImage(resolvedUrl, filterQuality: FilterQuality.medium, fit: BoxFit.cover);\n+\n+ if (resolvedUrl == null) {\n+ return const SizedBox.shrink();\n+ }\n+\n+ final avatarUrl = AvatarUrl.fromUserData(resolvedUrl: resolvedUrl);\n+ final physicalSize = (MediaQuery.devicePixelRatioOf(context) * size).ceil();\n+\n+ return RealmContentNetworkImage(\n+ avatarUrl.get(physicalSize),\n+ filterQuality: FilterQuality.medium,\n+ fit: BoxFit.cover,\n+ );\n }\n }\n \ndiff --git a/lib/widgets/recent_dm_conversations.dart b/lib/widgets/recent_dm_conversations.dart\nindex aafdc8c42f..27bf2a7560 100644\n--- a/lib/widgets/recent_dm_conversations.dart\n+++ b/lib/widgets/recent_dm_conversations.dart\n@@ -84,6 +84,8 @@ class RecentDmConversationsItem extends StatelessWidget {\n final DmNarrow narrow;\n final int unreadCount;\n \n+ static const double _avatarSize = 32;\n+\n @override\n Widget build(BuildContext context) {\n final store = PerAccountStoreWidget.of(context);\n@@ -94,14 +96,14 @@ class RecentDmConversationsItem extends StatelessWidget {\n switch (narrow.otherRecipientIds) { // TODO dedupe with DM items in [InboxPage]\n case []:\n title = selfUser.fullName;\n- avatar = AvatarImage(userId: selfUser.userId);\n+ avatar = AvatarImage(userId: selfUser.userId, size: _avatarSize);\n case [var otherUserId]:\n // TODO(#296) actually don't show this row if the user is muted?\n // (should we offer a \"spam folder\" style summary screen of recent\n // 1:1 DM conversations from muted users?)\n final otherUser = store.users[otherUserId];\n title = otherUser?.fullName ?? '(unknown user)';\n- avatar = AvatarImage(userId: otherUserId);\n+ avatar = AvatarImage(userId: otherUserId, size: _avatarSize);\n default:\n // TODO(i18n): List formatting, like you can do in JavaScript:\n // new Intl.ListFormat('ja').format(['Chris', 'Greg', 'Alya'])\n@@ -122,7 +124,7 @@ class RecentDmConversationsItem extends StatelessWidget {\n child: ConstrainedBox(constraints: const BoxConstraints(minHeight: 48),\n child: Row(crossAxisAlignment: CrossAxisAlignment.center, children: [\n Padding(padding: const EdgeInsetsDirectional.fromSTEB(12, 8, 0, 8),\n- child: AvatarShape(size: 32, borderRadius: 3, child: avatar)),\n+ child: AvatarShape(size: _avatarSize, borderRadius: 3, child: avatar)),\n const SizedBox(width: 8),\n Expanded(child: Padding(\n padding: const EdgeInsets.symmetric(vertical: 4),\n", "test_patch": "diff --git a/test/model/avatar_url_test.dart b/test/model/avatar_url_test.dart\nnew file mode 100644\nindex 0000000000..f12d3a60f9\n--- /dev/null\n+++ b/test/model/avatar_url_test.dart\n@@ -0,0 +1,34 @@\n+import 'package:checks/checks.dart';\n+import 'package:test/scaffolding.dart';\n+import 'package:zulip/model/avatar_url.dart';\n+\n+void main() {\n+ const defaultSize = 30;\n+ const largeSize = 120;\n+\n+ group('GravatarUrl', () {\n+ test('gravatar url', () {\n+ final url = '${GravatarUrl.origin}/avatar/1234';\n+ final avatarUrl = AvatarUrl.fromUserData(resolvedUrl: Uri.parse(url));\n+\n+ check(avatarUrl.get(defaultSize).toString()).equals('$url?s=30');\n+ });\n+ });\n+\n+ group('UploadedAvatarUrl', () {\n+ test('png image', () {\n+ const url = 'https://zulip.example/image.png';\n+ final avatarUrl = AvatarUrl.fromUserData(resolvedUrl: Uri.parse(url));\n+\n+ check(avatarUrl.get(defaultSize).toString()).equals(url);\n+ });\n+\n+ test('png image, larger size', () {\n+ const url = 'https://zulip.example/image.png';\n+ final avatarUrl = AvatarUrl.fromUserData(resolvedUrl: Uri.parse(url));\n+ final expectedUrl = url.replaceAll('.png', '-medium.png');\n+\n+ check(avatarUrl.get(largeSize).toString()).equals(expectedUrl);\n+ });\n+ });\n+}\ndiff --git a/test/widgets/content_test.dart b/test/widgets/content_test.dart\nindex c485f585a7..5976171eec 100644\n--- a/test/widgets/content_test.dart\n+++ b/test/widgets/content_test.dart\n@@ -538,7 +538,7 @@ void main() {\n group('AvatarImage', () {\n late PerAccountStore store;\n \n- Future actualUrl(WidgetTester tester, String avatarUrl) async {\n+ Future actualUrl(WidgetTester tester, String avatarUrl, [double? size]) async {\n addTearDown(testBinding.reset);\n await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());\n store = await testBinding.globalStore.perAccount(eg.selfAccount.id);\n@@ -548,7 +548,7 @@ void main() {\n prepareBoringImageHttpClient();\n await tester.pumpWidget(GlobalStoreWidget(\n child: PerAccountStoreWidget(accountId: eg.selfAccount.id,\n- child: AvatarImage(userId: user.userId))));\n+ child: AvatarImage(userId: user.userId, size: size ?? 30))));\n await tester.pump();\n await tester.pump();\n tester.widget(find.byType(AvatarImage));\n@@ -571,6 +571,26 @@ void main() {\n debugNetworkImageHttpClientProvider = null;\n });\n \n+ testWidgets('absolute URL, larger size', (tester) async {\n+ tester.view.devicePixelRatio = 2.5;\n+ addTearDown(tester.view.resetDevicePixelRatio);\n+\n+ const avatarUrl = 'https://example/avatar.png';\n+ check(await actualUrl(tester, avatarUrl, 50)).isNotNull()\n+ .asString.equals(avatarUrl.replaceAll('.png', '-medium.png'));\n+ debugNetworkImageHttpClientProvider = null;\n+ });\n+\n+ testWidgets('relative URL, larger size', (tester) async {\n+ tester.view.devicePixelRatio = 2.5;\n+ addTearDown(tester.view.resetDevicePixelRatio);\n+\n+ const avatarUrl = '/avatar.png';\n+ check(await actualUrl(tester, avatarUrl, 50))\n+ .equals(store.tryResolveUrl('/avatar-medium.png')!);\n+ debugNetworkImageHttpClientProvider = null;\n+ });\n+\n testWidgets('smoke with invalid URL', (tester) async {\n const avatarUrl = '::not a URL::';\n check(await actualUrl(tester, avatarUrl)).isNull();\n", "n2p_tests": "{\"/home/zulip-flutter/test/model/avatar_url_test.dart: UploadedAvatarUrl png image, larger size\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/avatar_url_test.dart: UploadedAvatarUrl png image\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/avatar_url_test.dart: GravatarUrl gravatar url\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "zulip__zulip-flutter-304", "org": "zulip", "repo": "zulip-flutter", "number": 304, "state": "closed", "title": "model: Add Unreads model, for tracking unread-message counts", "body": "Fixes #253.\r\n\r\nContains my current revision of #299.\r\n\r\nThis is still in progress, but thought I'd check in with what I have so far, and see if it's going in the right direction. \ud83d\ude42", "base": "{\"label\": \"zulip:main\", \"ref\": \"main\", \"sha\": \"f4060fd2f05aced8d844a294aa34e96a1ef23a88\"}", "resolved_issues": "[{\"number\": 253, \"title\": \"Track unread counts\", \"body\": \"We want to show how many unread messages the user has in each stream and conversation, how many unread @-mentions they have, and how many unreads they have total, each in various places in the UI.\\r\\n\\r\\nThe data to power this begins with the `unread_msgs` data structure in the initial data \\u2014 search for \\\"unread_msgs:\\\" in https://zulip.com/api/register-queue . It then needs to be updated on a variety of events: new message, messages marked read or unread, messages moved or edited (affecting @-mention status), message deleted, and some others.\\r\\n\\r\\nIn zulip-mobile, this is tracked as `state.unread`. See [src/unread/unreadModel.js](https://github.com/zulip/zulip-mobile/blob/c979530d6804db33310ed7d14a4ac62017432944/src/unread/unreadModel.js) and [src/unread/unreadSelectors.js](https://github.com/zulip/zulip-mobile/blob/c979530d6804db33310ed7d14a4ac62017432944/src/unread/unreadSelectors.js). The handling there of counts for DMs and @-mentions (and the overall total) is legacy and isn't to be imitated, but the handling for streams and stream conversations \\u2014 typically the bulk of the data \\u2014 was overhauled more recently and much of that should translate well.\\r\\n\\r\\nThen this data should appear in the UI:\\r\\n* in the list of recent DM conversations #119\\r\\n* in the inbox view #117 \\r\\n* in the stream list #187\\r\\n* on a button to navigate to the @-mentions narrow #250\\r\\n* probably in the between-organization navigation\\r\\n* perhaps other places\\r\\n\\r\\nFor any of those pieces of UI that we've already implemented when we take up this issue, we can add the data to those parts of the UI as part of this issue. For the rest, we can include this data when we first implement those parts of the UI.\\r\\n\"}]", "lang": "dart", "problem_statement": "Track unread counts\nWe want to show how many unread messages the user has in each stream and conversation, how many unread @-mentions they have, and how many unreads they have total, each in various places in the UI.\r\n\r\nThe data to power this begins with the `unread_msgs` data structure in the initial data \u2014 search for \"unread_msgs:\" in https://zulip.com/api/register-queue . It then needs to be updated on a variety of events: new message, messages marked read or unread, messages moved or edited (affecting @-mention status), message deleted, and some others.\r\n\r\nIn zulip-mobile, this is tracked as `state.unread`. See [src/unread/unreadModel.js](https://github.com/zulip/zulip-mobile/blob/c979530d6804db33310ed7d14a4ac62017432944/src/unread/unreadModel.js) and [src/unread/unreadSelectors.js](https://github.com/zulip/zulip-mobile/blob/c979530d6804db33310ed7d14a4ac62017432944/src/unread/unreadSelectors.js). The handling there of counts for DMs and @-mentions (and the overall total) is legacy and isn't to be imitated, but the handling for streams and stream conversations \u2014 typically the bulk of the data \u2014 was overhauled more recently and much of that should translate well.\r\n\r\nThen this data should appear in the UI:\r\n* in the list of recent DM conversations #119\r\n* in the inbox view #117 \r\n* in the stream list #187\r\n* on a button to navigate to the @-mentions narrow #250\r\n* probably in the between-organization navigation\r\n* perhaps other places\r\n\r\nFor any of those pieces of UI that we've already implemented when we take up this issue, we can add the data to those parts of the UI as part of this issue. For the rest, we can include this data when we first implement those parts of the UI.\r\n\n", "hints": "Tentatively milestoning this as \"alpha\" because it's important for daily use to know if there are unreads at a glance; feel free to change.\n> Then this data should appear in the UI:\r\n> \r\n> * in the list of recent DM conversations [ui: Add list of recent DM conversations\u00a0#119](https://github.com/zulip/zulip-flutter/issues/119)\r\n\r\nI've forked this part off as a followup issue:\r\n* #328 \r\n\r\nSo we can close this issue when we complete the model, and use that one to track the remaining task of adding it to the UI there.\r\n", "pull_url": "https://github.com/zulip/zulip-flutter/pull/304", "issue_urls": "[\"https://github.com/zulip/zulip-flutter/issues/253\"]", "test_command": "flutter test test/api/model/events_test.dart test/api/model/initial_snapshot_test.dart test/model/algorithms_test.dart test/model/unreads_test.dart --reporter expanded 2>&1", "fix_patch": "diff --git a/lib/api/model/events.dart b/lib/api/model/events.dart\nindex 86ba97f27f..241aa70a41 100644\n--- a/lib/api/model/events.dart\n+++ b/lib/api/model/events.dart\n@@ -438,8 +438,15 @@ class DeleteMessageEvent extends Event {\n this.topic,\n });\n \n- factory DeleteMessageEvent.fromJson(Map json) =>\n- _$DeleteMessageEventFromJson(json);\n+ factory DeleteMessageEvent.fromJson(Map json) {\n+ final result = _$DeleteMessageEventFromJson(json);\n+ // Crunchy-shell validation\n+ if (result.messageType == MessageType.stream) {\n+ result.streamId as int;\n+ result.topic as String;\n+ }\n+ return result;\n+ }\n \n @override\n Map toJson() => _$DeleteMessageEventToJson(this);\ndiff --git a/lib/api/model/initial_snapshot.dart b/lib/api/model/initial_snapshot.dart\nindex 30e49c0cee..8d7f983453 100644\n--- a/lib/api/model/initial_snapshot.dart\n+++ b/lib/api/model/initial_snapshot.dart\n@@ -1,6 +1,7 @@\n import 'package:flutter/foundation.dart';\n import 'package:json_annotation/json_annotation.dart';\n \n+import '../../model/algorithms.dart';\n import 'model.dart';\n \n part 'initial_snapshot.g.dart';\n@@ -227,10 +228,13 @@ class UnreadMessagesSnapshot {\n \n final List streams;\n final List huddles;\n+\n+ // Unlike other lists of message IDs here, [mentions] is *not* sorted.\n final List mentions;\n+\n final bool oldUnreadsMissing;\n \n- UnreadMessagesSnapshot({\n+ const UnreadMessagesSnapshot({\n required this.count,\n required this.dms,\n required this.streams,\n@@ -260,7 +264,7 @@ class UnreadDmSnapshot {\n UnreadDmSnapshot({\n required this.otherUserId,\n required this.unreadMessageIds,\n- });\n+ }) : assert(isSortedWithoutDuplicates(unreadMessageIds));\n \n factory UnreadDmSnapshot.fromJson(Map json) =>\n _$UnreadDmSnapshotFromJson(json);\n@@ -279,7 +283,7 @@ class UnreadStreamSnapshot {\n required this.topic,\n required this.streamId,\n required this.unreadMessageIds,\n- });\n+ }) : assert(isSortedWithoutDuplicates(unreadMessageIds));\n \n factory UnreadStreamSnapshot.fromJson(Map json) =>\n _$UnreadStreamSnapshotFromJson(json);\n@@ -296,7 +300,7 @@ class UnreadHuddleSnapshot {\n UnreadHuddleSnapshot({\n required this.userIdsString,\n required this.unreadMessageIds,\n- });\n+ }) : assert(isSortedWithoutDuplicates(unreadMessageIds));\n \n factory UnreadHuddleSnapshot.fromJson(Map json) =>\n _$UnreadHuddleSnapshotFromJson(json);\ndiff --git a/lib/model/algorithms.dart b/lib/model/algorithms.dart\nindex 37ef1cc986..7c03a88d80 100644\n--- a/lib/model/algorithms.dart\n+++ b/lib/model/algorithms.dart\n@@ -1,4 +1,6 @@\n \n+import 'package:collection/collection.dart';\n+\n /// Returns the index in [sortedList] of an element matching the given [key],\n /// if there is one.\n ///\n@@ -41,3 +43,76 @@ int binarySearchByKey(\n }\n return -1;\n }\n+\n+bool isSortedWithoutDuplicates(List items) {\n+ final length = items.length;\n+ if (length == 0) {\n+ return true;\n+ }\n+ int lastItem = items[0];\n+ for (int i = 1; i < length; i++) {\n+ final item = items[i];\n+ if (item <= lastItem) {\n+ return false;\n+ }\n+ lastItem = item;\n+ }\n+ return true;\n+}\n+\n+/// The union of sets, represented as sorted lists.\n+///\n+/// The inputs must be sorted (by `<`) and without duplicates (by `==`).\n+///\n+/// The output will contain all the elements found in either input, again\n+/// sorted and without duplicates.\n+// When implementing this, it was convenient to have it return a [QueueList].\n+// We can make it more general if needed:\n+// https://chat.zulip.org/#narrow/stream/243-mobile-team/topic/flutter.3A.20unreads.20model/near/1647754\n+QueueList setUnion(Iterable xs, Iterable ys) {\n+ // This will overshoot by the number of elements that occur in both lists.\n+ // That may make this optimization less effective, but it will not cause\n+ // incorrectness.\n+ final capacity = xs is List && ys is List // [List]s should have efficient `.length`\n+ ? xs.length + ys.length\n+ : null;\n+ final result = QueueList(capacity);\n+\n+ final iterX = xs.iterator;\n+ final iterY = ys.iterator;\n+ late bool xHasElement;\n+ void moveX() => xHasElement = iterX.moveNext();\n+ late bool yHasElement;\n+ void moveY() => yHasElement = iterY.moveNext();\n+\n+ moveX();\n+ moveY();\n+ while (true) {\n+ if (!xHasElement || !yHasElement) {\n+ break;\n+ }\n+\n+ int x = iterX.current;\n+ int y = iterY.current;\n+ if (x < y) {\n+ result.add(x);\n+ moveX();\n+ } else if (x != y) {\n+ result.add(y);\n+ moveY();\n+ } else { // x == y\n+ result.add(x);\n+ moveX();\n+ moveY();\n+ }\n+ }\n+ while (xHasElement) {\n+ result.add(iterX.current);\n+ moveX();\n+ }\n+ while (yHasElement) {\n+ result.add(iterY.current);\n+ moveY();\n+ }\n+ return result;\n+}\ndiff --git a/lib/model/narrow.dart b/lib/model/narrow.dart\nindex fb29a5f151..014fa3c216 100644\n--- a/lib/model/narrow.dart\n+++ b/lib/model/narrow.dart\n@@ -1,8 +1,10 @@\n \n+import '../api/model/events.dart';\n import '../api/model/initial_snapshot.dart';\n import '../api/model/model.dart';\n import '../api/model/narrow.dart';\n import '../api/route/messages.dart';\n+import 'algorithms.dart';\n \n /// A Zulip narrow.\n sealed class Narrow {\n@@ -119,22 +121,6 @@ class TopicNarrow extends Narrow implements SendableNarrow {\n int get hashCode => Object.hash('TopicNarrow', streamId, topic);\n }\n \n-bool _isSortedWithoutDuplicates(List items) {\n- final length = items.length;\n- if (length == 0) {\n- return true;\n- }\n- int lastItem = items[0];\n- for (int i = 1; i < length; i++) {\n- final item = items[i];\n- if (item <= lastItem) {\n- return false;\n- }\n- lastItem = item;\n- }\n- return true;\n-}\n-\n /// The narrow for a direct-message conversation.\n // Zulip has many ways of representing a DM conversation; for example code\n // handling many of them, see zulip-mobile:src/utils/recipient.js .\n@@ -142,39 +128,56 @@ bool _isSortedWithoutDuplicates(List items) {\n // as we turn out to need them.\n class DmNarrow extends Narrow implements SendableNarrow {\n DmNarrow({required this.allRecipientIds, required int selfUserId})\n- : assert(_isSortedWithoutDuplicates(allRecipientIds)),\n+ : assert(isSortedWithoutDuplicates(allRecipientIds)),\n assert(allRecipientIds.contains(selfUserId)),\n _selfUserId = selfUserId;\n \n- factory DmNarrow.ofMessage(DmMessage message, {required int selfUserId}) {\n+ factory DmNarrow.withUser(int userId, {required int selfUserId}) {\n return DmNarrow(\n- allRecipientIds: List.unmodifiable(message.allRecipientIds),\n+ allRecipientIds: {userId, selfUserId}.toList()..sort(),\n selfUserId: selfUserId,\n );\n }\n \n- /// A [DmNarrow] from an item in [InitialSnapshot.recentPrivateConversations].\n- factory DmNarrow.ofRecentDmConversation(RecentDmConversation conversation, {required int selfUserId}) {\n+ factory DmNarrow.withUsers(List userIds, {required int selfUserId}) {\n return DmNarrow(\n- allRecipientIds: [...conversation.userIds, selfUserId]..sort(),\n+ allRecipientIds: {...userIds, selfUserId}.toList()..sort(),\n selfUserId: selfUserId,\n );\n }\n \n- factory DmNarrow.withUser(int userId, {required int selfUserId}) {\n+ factory DmNarrow.ofMessage(DmMessage message, {required int selfUserId}) {\n return DmNarrow(\n- allRecipientIds: {userId, selfUserId}.toList()..sort(),\n+ allRecipientIds: List.unmodifiable(message.allRecipientIds),\n selfUserId: selfUserId,\n );\n }\n \n- factory DmNarrow.withUsers(List userIds, {required int selfUserId}) {\n+ /// A [DmNarrow] from an item in [InitialSnapshot.recentPrivateConversations].\n+ factory DmNarrow.ofRecentDmConversation(RecentDmConversation conversation, {required int selfUserId}) {\n return DmNarrow(\n- allRecipientIds: {...userIds, selfUserId}.toList()..sort(),\n+ allRecipientIds: [...conversation.userIds, selfUserId]..sort(),\n selfUserId: selfUserId,\n );\n }\n \n+ /// A [DmNarrow] from an [UnreadHuddleSnapshot].\n+ factory DmNarrow.ofUnreadHuddleSnapshot(UnreadHuddleSnapshot snapshot, {required int selfUserId}) {\n+ final userIds = snapshot.userIdsString.split(',').map((id) => int.parse(id));\n+ return DmNarrow(selfUserId: selfUserId,\n+ // (already sorted; see API doc)\n+ allRecipientIds: userIds.toList(growable: false));\n+ }\n+\n+ factory DmNarrow.ofUpdateMessageFlagsMessageDetail(\n+ UpdateMessageFlagsMessageDetail detail, {\n+ required int selfUserId,\n+ }) {\n+ assert(detail.type == MessageType.private);\n+ return DmNarrow(selfUserId: selfUserId,\n+ allRecipientIds: [...detail.userIds!, selfUserId]..sort());\n+ }\n+\n /// The user IDs of everyone in the conversation, sorted.\n ///\n /// Each message in the conversation is sent by one of these users\ndiff --git a/lib/model/store.dart b/lib/model/store.dart\nindex 0e45555615..28898fc8fd 100644\n--- a/lib/model/store.dart\n+++ b/lib/model/store.dart\n@@ -17,6 +17,7 @@ import 'autocomplete.dart';\n import 'database.dart';\n import 'message_list.dart';\n import 'recent_dm_conversations.dart';\n+import 'unreads.dart';\n \n export 'package:drift/drift.dart' show Value;\n export 'database.dart' show Account, AccountsCompanion;\n@@ -154,6 +155,7 @@ class PerAccountStore extends ChangeNotifier {\n realmDefaultExternalAccounts = initialSnapshot.realmDefaultExternalAccounts,\n customProfileFields = _sortCustomProfileFields(initialSnapshot.customProfileFields),\n userSettings = initialSnapshot.userSettings,\n+ unreads = Unreads(initial: initialSnapshot.unreadMsgs, selfUserId: account.userId),\n users = Map.fromEntries(\n initialSnapshot.realmUsers\n .followedBy(initialSnapshot.realmNonActiveUsers)\n@@ -181,6 +183,7 @@ class PerAccountStore extends ChangeNotifier {\n \n // Data attached to the self-account on the realm.\n final UserSettings? userSettings; // TODO(server-5)\n+ final Unreads unreads;\n \n // Users and data about them.\n final Map users;\n@@ -306,19 +309,23 @@ class PerAccountStore extends ChangeNotifier {\n for (final view in _messageListViews) {\n view.maybeAddMessage(event.message);\n }\n+ unreads.handleMessageEvent(event);\n } else if (event is UpdateMessageEvent) {\n assert(debugLog(\"server event: update_message ${event.messageId}\"));\n for (final view in _messageListViews) {\n view.maybeUpdateMessage(event);\n }\n+ unreads.handleUpdateMessageEvent(event);\n } else if (event is DeleteMessageEvent) {\n assert(debugLog(\"server event: delete_message ${event.messageIds}\"));\n- // TODO handle\n+ // TODO handle in message lists\n+ unreads.handleDeleteMessageEvent(event);\n } else if (event is UpdateMessageFlagsEvent) {\n assert(debugLog(\"server event: update_message_flags/${event.op} ${event.flag.toJson()}\"));\n for (final view in _messageListViews) {\n view.maybeUpdateMessageFlags(event);\n }\n+ unreads.handleUpdateMessageFlagsEvent(event);\n } else if (event is ReactionEvent) {\n assert(debugLog(\"server event: reaction/${event.op}\"));\n for (final view in _messageListViews) {\ndiff --git a/lib/model/unreads.dart b/lib/model/unreads.dart\nnew file mode 100644\nindex 0000000000..5d4cd1471b\n--- /dev/null\n+++ b/lib/model/unreads.dart\n@@ -0,0 +1,399 @@\n+import 'dart:core';\n+\n+import 'package:collection/collection.dart';\n+import 'package:flutter/foundation.dart';\n+\n+import '../api/model/initial_snapshot.dart';\n+import '../api/model/model.dart';\n+import '../api/model/events.dart';\n+import '../log.dart';\n+import 'algorithms.dart';\n+import 'narrow.dart';\n+\n+/// The view-model for unread messages.\n+///\n+/// Implemented to track actual unread state as faithfully as possible\n+/// given incomplete information in [UnreadMessagesSnapshot].\n+/// Callers should do their own filtering based on other state, like muting,\n+/// as desired.\n+///\n+/// In each component of this model ([streams], [dms], [mentions]),\n+/// if a message is not represented, its status is either read\n+/// or unknown to the component. In all components,\n+/// a message's status will be unknown if, at /register time,\n+/// it was very old by the server's reckoning. See [oldUnreadsMissing].\n+/// It may also be unknown for other reasons that differ by component; see each.\n+///\n+/// Messages in unsubscribed streams, and messages sent by muted users,\n+/// are generally deemed read by the server and shouldn't be expected to appear.\n+/// They may still appear temporarily when the server hasn't finished processing\n+/// the message's transition to the muted or unsubscribed-stream state;\n+/// the mark-as-read is done asynchronously and comes with a mark-as-read event:\n+/// https://chat.zulip.org/#narrow/stream/412-api-documentation/topic/unreads.3A.20messages.20from.20muted.20users.3F/near/1660912\n+/// For that reason, consumers of this model may wish to filter out messages in\n+/// unsubscribed streams and messages sent by muted users.\n+// TODO handle moved messages\n+// TODO When [oldUnreadsMissing], if you load a message list with very old unreads,\n+// sync to those unreads, because the user has shown an interest in them.\n+// TODO When loading a message list with stream messages, check all the stream\n+// messages and refresh [mentions] (see [mentions] dartdoc).\n+class Unreads extends ChangeNotifier {\n+ factory Unreads({required UnreadMessagesSnapshot initial, required selfUserId}) {\n+ final streams = >>{};\n+ final dms = >{};\n+ final mentions = Set.of(initial.mentions);\n+\n+ for (final unreadStreamSnapshot in initial.streams) {\n+ final streamId = unreadStreamSnapshot.streamId;\n+ final topic = unreadStreamSnapshot.topic;\n+ (streams[streamId] ??= {})[topic] = QueueList.from(unreadStreamSnapshot.unreadMessageIds);\n+ }\n+\n+ for (final unreadDmSnapshot in initial.dms) {\n+ final otherUserId = unreadDmSnapshot.otherUserId;\n+ final narrow = DmNarrow.withUser(otherUserId, selfUserId: selfUserId);\n+ dms[narrow] = QueueList.from(unreadDmSnapshot.unreadMessageIds);\n+ }\n+\n+ for (final unreadHuddleSnapshot in initial.huddles) {\n+ final narrow = DmNarrow.ofUnreadHuddleSnapshot(unreadHuddleSnapshot, selfUserId: selfUserId);\n+ dms[narrow] = QueueList.from(unreadHuddleSnapshot.unreadMessageIds);\n+ }\n+\n+ return Unreads._(\n+ streams: streams,\n+ dms: dms,\n+ mentions: mentions,\n+ oldUnreadsMissing: initial.oldUnreadsMissing,\n+ selfUserId: selfUserId,\n+ );\n+ }\n+\n+ Unreads._({\n+ required this.streams,\n+ required this.dms,\n+ required this.mentions,\n+ required this.oldUnreadsMissing,\n+ required this.selfUserId,\n+ });\n+\n+ // TODO excluded for now; would need to handle nuances around muting etc.\n+ // int count;\n+\n+ /// Unread stream messages, as: stream ID \u2192 topic \u2192 message ID.\n+ final Map>> streams;\n+\n+ /// Unread DM messages, as: DM narrow \u2192 message ID.\n+ final Map> dms;\n+\n+ /// Unread messages with the self-user @-mentioned, directly or by wildcard.\n+ ///\n+ /// At initialization, if a message is:\n+ /// 1) muted because of the user's stream- and topic-level choices [1], and\n+ /// 2) wildcard mentioned but not directly mentioned\n+ /// then it will be absent, and its unread state will be unknown to [mentions]\n+ /// because the message is absent in [UnreadMessagesSnapshot]:\n+ /// https://chat.zulip.org/#narrow/stream/378-api-design/topic/register.3A.20maintaining.20.60unread_msgs.2Ementions.60.20correctly/near/1649584\n+ /// If its state is actually unread, [mentions] recovers that knowledge when:\n+ /// a) the message is edited at all ([UpdateMessageEvent]),\n+ /// assuming it still has a direct or wildcard mention after the edit, or\n+ /// b) the message gains a direct @-mention ([UpdateMessageFlagsEvent]), or\n+ /// c) TODO unimplemented: the user loads the message in the message list\n+ /// But otherwise, assume its unread state remains unknown to [mentions].\n+ ///\n+ /// [1] This item applies verbatim at Server 8.0+. For older servers, the\n+ /// item would say \"in a muted stream\" because the \"unmute topic\"\n+ /// feature was not considered:\n+ /// https://chat.zulip.org/#narrow/stream/412-api-documentation/topic/register.3A.20.60unread_msgs.2Ementions.60/near/1645622\n+ // If a message's unread state is unknown, it's likely the user doesn't\n+ // care about it anyway -- it's really old, or it's in a muted conversation.\n+ // Still, good to recover the knowledge when possible. In the rare case\n+ // that a user shows they are interested, like by unmuting or loading messages\n+ // in the message list, it's important to display as much known state as we can.\n+ //\n+ // TODO(server-8) Remove [1].\n+ final Set mentions;\n+\n+ /// Whether the model is missing data on old unread messages.\n+ ///\n+ /// Initialized to the value of [UnreadMessagesSnapshot.oldUnreadsMissing].\n+ /// Is set to false when the user clears out all unreads at once.\n+ bool oldUnreadsMissing;\n+\n+ final int selfUserId;\n+\n+ void handleMessageEvent(MessageEvent event) {\n+ final message = event.message;\n+ if (message.flags.contains(MessageFlag.read)) {\n+ return;\n+ }\n+\n+ switch (message) {\n+ case StreamMessage():\n+ _addLastInStreamTopic(message.id, message.streamId, message.subject);\n+ case DmMessage():\n+ final narrow = DmNarrow.ofMessage(message, selfUserId: selfUserId);\n+ _addLastInDm(message.id, narrow);\n+ }\n+ if (\n+ message.flags.contains(MessageFlag.mentioned)\n+ || message.flags.contains(MessageFlag.wildcardMentioned)\n+ ) {\n+ mentions.add(message.id);\n+ }\n+ notifyListeners();\n+ }\n+\n+ void handleUpdateMessageEvent(UpdateMessageEvent event) {\n+ final messageId = event.messageId;\n+\n+ // This event might signal mentions being added or removed in the\n+ // [messageId] message when its content is edited; so, handle that.\n+ // (As of writing, we don't expect such changes to be signaled by\n+ // an [UpdateMessageFlagsEvent].)\n+ final bool isMentioned = event.flags.any(\n+ (f) => f == MessageFlag.mentioned || f == MessageFlag.wildcardMentioned,\n+ );\n+\n+ // We assume this event can't signal a change in a message's 'read' flag.\n+ // TODO can it actually though, when it's about messages being moved into an\n+ // unsubscribed stream?\n+ // https://chat.zulip.org/#narrow/stream/378-api-design/topic/mark-as-read.20events.20with.20message.20moves.3F/near/1639957\n+ final bool isRead = event.flags.contains(MessageFlag.read);\n+ assert(() {\n+ if (!oldUnreadsMissing && !event.messageIds.every((messageId) {\n+ final isUnreadLocally = _slowIsPresentInDms(messageId) || _slowIsPresentInStreams(messageId);\n+ return isUnreadLocally == !isRead;\n+ })) {\n+ // If this happens, then either:\n+ // - the server and client have been out of sync about a message's\n+ // unread state since before this event, or\n+ // - this event was unexpectedly used to announce a change in a\n+ // message's 'read' flag.\n+ debugLog('Unreads warning: got surprising UpdateMessageEvent');\n+ }\n+ return true;\n+ }());\n+\n+ bool madeAnyUpdate = false;\n+\n+ switch ((isRead, isMentioned)) {\n+ case (true, _ ):\n+ // A mention (even if new with this event) makes no difference\n+ // for a message that's already read.\n+ break;\n+ case (false, false):\n+ madeAnyUpdate |= mentions.remove(messageId);\n+ case (false, true ):\n+ madeAnyUpdate |= mentions.add(messageId);\n+ }\n+\n+ // (Moved messages will be handled here;\n+ // the TODO for that is just above the class declaration.)\n+\n+ if (madeAnyUpdate) {\n+ notifyListeners();\n+ }\n+ }\n+\n+ void handleDeleteMessageEvent(DeleteMessageEvent event) {\n+ mentions.removeAll(event.messageIds);\n+ final messageIdsSet = Set.of(event.messageIds);\n+ switch (event.messageType) {\n+ case MessageType.stream:\n+ final streamId = event.streamId!;\n+ final topic = event.topic!;\n+ _removeAllInStreamTopic(messageIdsSet, streamId, topic);\n+ case MessageType.private:\n+ _slowRemoveAllInDms(messageIdsSet);\n+ }\n+\n+ // TODO skip notifyListeners if unchanged?\n+ notifyListeners();\n+ }\n+\n+ void handleUpdateMessageFlagsEvent(UpdateMessageFlagsEvent event) {\n+ switch (event.flag) {\n+ case MessageFlag.starred:\n+ case MessageFlag.collapsed:\n+ case MessageFlag.hasAlertWord:\n+ case MessageFlag.historical:\n+ case MessageFlag.unknown:\n+ // These are irrelevant.\n+ return;\n+\n+ case MessageFlag.mentioned:\n+ case MessageFlag.wildcardMentioned:\n+ // Empirically, we don't seem to get these events when a message is edited\n+ // to add/remove an @-mention, even though @-mention state is represented\n+ // as flags. Instead, we just get the [UpdateMessageEvent], and that\n+ // contains the new set of flags, which we'll use to update [mentions].\n+ // (See our handling of [UpdateMessageEvent].)\n+ //\n+ // Handle the event anyway, using the meaning on the tin.\n+ // It might be used in a valid case we haven't thought of yet.\n+\n+ // TODO skip notifyListeners if unchanged?\n+ switch (event) {\n+ case UpdateMessageFlagsAddEvent():\n+ mentions.addAll(\n+ event.messages.where(\n+ (messageId) => _slowIsPresentInStreams(messageId) || _slowIsPresentInDms(messageId),\n+ ),\n+ );\n+\n+ case UpdateMessageFlagsRemoveEvent():\n+ mentions.removeAll(event.messages);\n+ }\n+\n+ case MessageFlag.read:\n+ switch (event) {\n+ case UpdateMessageFlagsAddEvent():\n+ if (event.all) {\n+ streams.clear();\n+ dms.clear();\n+ mentions.clear();\n+ oldUnreadsMissing = false;\n+ } else {\n+ final messageIdsSet = Set.of(event.messages);\n+ mentions.removeAll(messageIdsSet);\n+ _slowRemoveAllInStreams(messageIdsSet);\n+ _slowRemoveAllInDms(messageIdsSet);\n+ }\n+ case UpdateMessageFlagsRemoveEvent():\n+ final newlyUnreadInStreams = >>{};\n+ final newlyUnreadInDms = >{};\n+ for (final messageId in event.messages) {\n+ final detail = event.messageDetails![messageId];\n+ if (detail == null) { // TODO(log) if on Zulip 6.0+\n+ // Happens as a bug in some cases before fixed in Zulip 6.0:\n+ // https://chat.zulip.org/#narrow/stream/378-api-design/topic/unreads.20in.20unsubscribed.20streams/near/1458467\n+ // TODO(server-6) remove Zulip 6.0 comment\n+ continue;\n+ }\n+ if (detail.mentioned == true) {\n+ mentions.add(messageId);\n+ }\n+ switch (detail.type) {\n+ case MessageType.stream:\n+ final topics = (newlyUnreadInStreams[detail.streamId!] ??= {});\n+ final messageIds = (topics[detail.topic!] ??= QueueList());\n+ messageIds.add(messageId);\n+ case MessageType.private:\n+ final narrow = DmNarrow.ofUpdateMessageFlagsMessageDetail(selfUserId: selfUserId,\n+ detail);\n+ (newlyUnreadInDms[narrow] ??= QueueList())\n+ .add(messageId);\n+ }\n+ }\n+ newlyUnreadInStreams.forEach((incomingStreamId, incomingTopics) {\n+ incomingTopics.forEach((incomingTopic, incomingMessageIds) {\n+ _addAllInStreamTopic(incomingMessageIds..sort(), incomingStreamId, incomingTopic);\n+ });\n+ });\n+ newlyUnreadInDms.forEach((incomingDmNarrow, incomingMessageIds) {\n+ _addAllInDm(incomingMessageIds..sort(), incomingDmNarrow);\n+ });\n+ }\n+ }\n+ notifyListeners();\n+ }\n+\n+ // TODO use efficient lookups\n+ bool _slowIsPresentInStreams(int messageId) {\n+ return streams.values.any(\n+ (topics) => topics.values.any(\n+ (messageIds) => messageIds.contains(messageId),\n+ ),\n+ );\n+ }\n+\n+ void _addLastInStreamTopic(int messageId, int streamId, String topic) {\n+ ((streams[streamId] ??= {})[topic] ??= QueueList()).addLast(messageId);\n+ }\n+\n+ // [messageIds] must be sorted ascending and without duplicates.\n+ void _addAllInStreamTopic(QueueList messageIds, int streamId, String topic) {\n+ final topics = streams[streamId] ??= {};\n+ topics.update(topic,\n+ ifAbsent: () => messageIds,\n+ // setUnion dedupes existing and incoming unread IDs,\n+ // so we tolerate zulip/zulip#22164, fixed in 6.0\n+ // TODO(server-6) remove 6.0 comment\n+ (existing) => setUnion(existing, messageIds),\n+ );\n+ }\n+\n+ // TODO use efficient model lookups\n+ void _slowRemoveAllInStreams(Set idsToRemove) {\n+ final newlyEmptyStreams = [];\n+ streams.forEach((streamId, topics) {\n+ final newlyEmptyTopics = [];\n+ topics.forEach((topic, messageIds) {\n+ messageIds.removeWhere((id) => idsToRemove.contains(id));\n+ if (messageIds.isEmpty) {\n+ newlyEmptyTopics.add(topic);\n+ }\n+ });\n+ for (final topic in newlyEmptyTopics) {\n+ topics.remove(topic);\n+ }\n+ if (topics.isEmpty) {\n+ newlyEmptyStreams.add(streamId);\n+ }\n+ });\n+ for (final streamId in newlyEmptyStreams) {\n+ streams.remove(streamId);\n+ }\n+ }\n+\n+ void _removeAllInStreamTopic(Set incomingMessageIds, int streamId, String topic) {\n+ final topics = streams[streamId];\n+ if (topics == null) return;\n+ final messageIds = topics[topic];\n+ if (messageIds == null) return;\n+\n+ // ([QueueList] doesn't have a `removeAll`)\n+ messageIds.removeWhere((id) => incomingMessageIds.contains(id));\n+ if (messageIds.isEmpty) {\n+ topics.remove(topic);\n+ if (topics.isEmpty) {\n+ streams.remove(streamId);\n+ }\n+ }\n+ }\n+\n+ // TODO use efficient model lookups\n+ bool _slowIsPresentInDms(int messageId) {\n+ return dms.values.any((ids) => ids.contains(messageId));\n+ }\n+\n+ void _addLastInDm(int messageId, DmNarrow narrow) {\n+ (dms[narrow] ??= QueueList()).addLast(messageId);\n+ }\n+\n+ // [messageIds] must be sorted ascending and without duplicates.\n+ void _addAllInDm(QueueList messageIds, DmNarrow dmNarrow) {\n+ dms.update(dmNarrow,\n+ ifAbsent: () => messageIds,\n+ // setUnion dedupes existing and incoming unread IDs,\n+ // so we tolerate zulip/zulip#22164, fixed in 6.0\n+ // TODO(server-6) remove 6.0 comment\n+ (existing) => setUnion(existing, messageIds),\n+ );\n+ }\n+\n+ // TODO use efficient model lookups\n+ void _slowRemoveAllInDms(Set idsToRemove) {\n+ final newlyEmptyDms = [];\n+ dms.forEach((dmNarrow, messageIds) {\n+ messageIds.removeWhere((id) => idsToRemove.contains(id));\n+ if (messageIds.isEmpty) {\n+ newlyEmptyDms.add(dmNarrow);\n+ }\n+ });\n+ for (final dmNarrow in newlyEmptyDms) {\n+ dms.remove(dmNarrow);\n+ }\n+ }\n+}\n", "test_patch": "diff --git a/test/api/model/events_test.dart b/test/api/model/events_test.dart\nindex eb05fb95b2..2fe7153065 100644\n--- a/test/api/model/events_test.dart\n+++ b/test/api/model/events_test.dart\n@@ -43,6 +43,38 @@ void main() {\n check(mkEvent([MessageFlag.read])).message.flags.deepEquals([MessageFlag.read]);\n });\n \n+ test('delete_message: require streamId and topic for stream messages', () {\n+ check(() => DeleteMessageEvent.fromJson({\n+ 'id': 1,\n+ 'type': 'delete_message',\n+ 'message_ids': [1, 2, 3],\n+ 'message_type': 'private',\n+ })).returnsNormally();\n+\n+ final baseJsonStream = {\n+ 'id': 1,\n+ 'type': 'delete_message',\n+ 'message_ids': [1, 2, 3],\n+ 'message_type': 'stream',\n+ };\n+\n+ check(() => DeleteMessageEvent.fromJson({\n+ ...baseJsonStream\n+ })).throws();\n+\n+ check(() => DeleteMessageEvent.fromJson({\n+ ...baseJsonStream, 'stream_id': 1, 'topic': 'some topic',\n+ })).returnsNormally();\n+\n+ check(() => DeleteMessageEvent.fromJson({\n+ ...baseJsonStream, 'stream_id': 1,\n+ })).throws();\n+\n+ check(() => DeleteMessageEvent.fromJson({\n+ ...baseJsonStream, 'topic': 'some topic',\n+ })).throws();\n+ });\n+\n test('update_message_flags/remove: require messageDetails in mark-as-unread', () {\n final baseJson = {\n 'id': 1,\ndiff --git a/test/api/model/initial_snapshot_test.dart b/test/api/model/initial_snapshot_test.dart\nnew file mode 100644\nindex 0000000000..d89dfaec43\n--- /dev/null\n+++ b/test/api/model/initial_snapshot_test.dart\n@@ -0,0 +1,43 @@\n+import 'package:checks/checks.dart';\n+import 'package:test/scaffolding.dart';\n+import 'package:zulip/api/model/initial_snapshot.dart';\n+\n+void main() {\n+ test('UnreadDmSnapshot: require sorted unreadMessageIds', () {\n+ check(() => UnreadDmSnapshot.fromJson({\n+ 'other_user_id': 1,\n+ 'unread_message_ids': [1, 2, 3],\n+ })).returnsNormally();\n+\n+ check(() => UnreadDmSnapshot.fromJson({\n+ 'other_user_id': 1,\n+ 'unread_message_ids': [11, 2, 3],\n+ })).throws();\n+ });\n+\n+ test('UnreadStreamSnapshot: require sorted unreadMessageIds', () {\n+ check(() => UnreadStreamSnapshot.fromJson({\n+ 'topic': 'a',\n+ 'stream_id': 1,\n+ 'unread_message_ids': [1, 2, 3],\n+ })).returnsNormally();\n+\n+ check(() => UnreadStreamSnapshot.fromJson({\n+ 'topic': 'a',\n+ 'stream_id': 1,\n+ 'unread_message_ids': [11, 2, 3],\n+ })).throws();\n+ });\n+\n+ test('UnreadHuddleSnapshot: require sorted unreadMessageIds', () {\n+ check(() => UnreadHuddleSnapshot.fromJson({\n+ 'user_ids_string': '1,2',\n+ 'unread_message_ids': [1, 2, 3],\n+ })).returnsNormally();\n+\n+ check(() => UnreadHuddleSnapshot.fromJson({\n+ 'user_ids_string': '1,2',\n+ 'unread_message_ids': [11, 2, 3],\n+ })).throws();\n+ });\n+}\ndiff --git a/test/model/algorithms_test.dart b/test/model/algorithms_test.dart\nindex ad6d4b3ed2..b6def6393e 100644\n--- a/test/model/algorithms_test.dart\n+++ b/test/model/algorithms_test.dart\n@@ -36,4 +36,23 @@ void main() {\n check(search(7)).equals(-1);\n });\n });\n+\n+ group('setUnion', () {\n+ for (final (String desc, Iterable xs, Iterable ys) in [\n+ ('empty', [], []),\n+ ('nonempty, empty', [1, 2], []),\n+ ('empty, nonempty', [], [1, 2]),\n+ ('in order', [1, 2], [3, 4]),\n+ ('reversed', [3, 4], [1, 2]),\n+ ('interleaved', [1, 3], [2, 4]),\n+ ('all dupes', [1, 2], [1, 2]),\n+ ('some dupes', [1, 2], [2, 3]),\n+ ('comparison is numeric, not lexicographic', [11], [2]),\n+ ]) {\n+ test(desc, () {\n+ final expected = Set.of(xs.followedBy(ys)).toList()..sort();\n+ check(setUnion(xs, ys)).deepEquals(expected);\n+ });\n+ }\n+ });\n }\ndiff --git a/test/model/unreads_checks.dart b/test/model/unreads_checks.dart\nnew file mode 100644\nindex 0000000000..836e497b2b\n--- /dev/null\n+++ b/test/model/unreads_checks.dart\n@@ -0,0 +1,11 @@\n+import 'package:checks/checks.dart';\n+import 'package:collection/collection.dart';\n+import 'package:zulip/model/narrow.dart';\n+import 'package:zulip/model/unreads.dart';\n+\n+extension UnreadsChecks on Subject {\n+ Subject>>> get streams => has((u) => u.streams, 'streams');\n+ Subject>> get dms => has((u) => u.dms, 'dms');\n+ Subject> get mentions => has((u) => u.mentions, 'mentions');\n+ Subject get oldUnreadsMissing => has((u) => u.oldUnreadsMissing, 'oldUnreadsMissing');\n+}\ndiff --git a/test/model/unreads_test.dart b/test/model/unreads_test.dart\nnew file mode 100644\nindex 0000000000..3d60170b3f\n--- /dev/null\n+++ b/test/model/unreads_test.dart\n@@ -0,0 +1,908 @@\n+import 'package:checks/checks.dart';\n+import 'package:collection/collection.dart';\n+import 'package:test/scaffolding.dart';\n+import 'package:zulip/api/model/events.dart';\n+import 'package:zulip/api/model/initial_snapshot.dart';\n+import 'package:zulip/api/model/model.dart';\n+import 'package:zulip/model/narrow.dart';\n+import 'package:zulip/model/unreads.dart';\n+\n+import '../example_data.dart' as eg;\n+import 'unreads_checks.dart';\n+\n+void main() {\n+ // These variables are the common state operated on by each test.\n+ // Each test case calls [prepare] to initialize them.\n+ late Unreads model;\n+ late int notifiedCount;\n+\n+ void checkNotified({required int count}) {\n+ check(notifiedCount).equals(count);\n+ notifiedCount = 0;\n+ }\n+ void checkNotNotified() => checkNotified(count: 0);\n+ void checkNotifiedOnce() => checkNotified(count: 1);\n+\n+ /// Initialize [model] and the rest of the test state.\n+ void prepare({\n+ UnreadMessagesSnapshot initial = const UnreadMessagesSnapshot(\n+ count: 0,\n+ streams: [],\n+ dms: [],\n+ huddles: [],\n+ mentions: [],\n+ oldUnreadsMissing: false,\n+ ),\n+ }) {\n+ notifiedCount = 0;\n+ model = Unreads(initial: initial, selfUserId: eg.selfUser.userId)\n+ ..addListener(() {\n+ notifiedCount++;\n+ });\n+ checkNotNotified();\n+ }\n+\n+ void fillWithMessages(Iterable messages) {\n+ for (final message in messages) {\n+ model.handleMessageEvent(MessageEvent(id: 0, message: message));\n+ }\n+ notifiedCount = 0;\n+ }\n+\n+ void checkMatchesMessages(Iterable messages) {\n+ assert(Set.of(messages.map((m) => m.id)).length == messages.length,\n+ 'checkMatchesMessages: duplicate messages in test input');\n+\n+ final Map>> expectedStreams = {};\n+ final Map> expectedDms = {};\n+ final Set expectedMentions = {};\n+ for (final message in messages) {\n+ if (message.flags.contains(MessageFlag.read)) {\n+ continue;\n+ }\n+ switch (message) {\n+ case StreamMessage():\n+ final perTopic = expectedStreams[message.streamId] ??= {};\n+ final messageIds = perTopic[message.subject] ??= QueueList();\n+ messageIds.add(message.id);\n+ case DmMessage():\n+ final narrow = DmNarrow.ofMessage(message, selfUserId: eg.selfUser.userId);\n+ final messageIds = expectedDms[narrow] ??= QueueList();\n+ messageIds.add(message.id);\n+ }\n+ if (\n+ message.flags.contains(MessageFlag.mentioned)\n+ || message.flags.contains(MessageFlag.wildcardMentioned)\n+ ) {\n+ expectedMentions.add(message.id);\n+ }\n+ }\n+ for (final perTopic in expectedStreams.values) {\n+ for (final messageIds in perTopic.values) {\n+ messageIds.sort();\n+ }\n+ }\n+ for (final messageIds in expectedDms.values) {\n+ messageIds.sort();\n+ }\n+\n+ check(model)\n+ ..streams.deepEquals(expectedStreams)\n+ ..dms.deepEquals(expectedDms)\n+ ..mentions.unorderedEquals(expectedMentions);\n+ }\n+\n+ group('constructor', () {\n+ test('empty', () {\n+ prepare();\n+ checkMatchesMessages([]);\n+ });\n+\n+ test('not empty', () {\n+ final stream1 = eg.stream(streamId: 1);\n+ final stream2 = eg.stream(streamId: 2);\n+\n+ final user1 = eg.user(userId: 1);\n+ final user2 = eg.user(userId: 2);\n+ final user3 = eg.user(userId: 3);\n+\n+ prepare(initial: UnreadMessagesSnapshot(\n+ count: 0,\n+ streams: [\n+ UnreadStreamSnapshot(streamId: stream1.streamId, topic: 'a', unreadMessageIds: [1, 2]),\n+ UnreadStreamSnapshot(streamId: stream1.streamId, topic: 'b', unreadMessageIds: [3, 4]),\n+ UnreadStreamSnapshot(streamId: stream2.streamId, topic: 'b', unreadMessageIds: [5, 6]),\n+ UnreadStreamSnapshot(streamId: stream2.streamId, topic: 'c', unreadMessageIds: [7, 8]),\n+ ],\n+ dms: [\n+ UnreadDmSnapshot(otherUserId: 1, unreadMessageIds: [9, 10]),\n+ UnreadDmSnapshot(otherUserId: 2, unreadMessageIds: [11, 12]),\n+ ],\n+ huddles: [\n+ UnreadHuddleSnapshot(userIdsString: '1,2,${eg.selfUser.userId}', unreadMessageIds: [13, 14]),\n+ UnreadHuddleSnapshot(userIdsString: '2,3,${eg.selfUser.userId}', unreadMessageIds: [15, 16]),\n+ ],\n+ mentions: [6, 12, 16],\n+ oldUnreadsMissing: false,\n+ ));\n+ checkMatchesMessages([\n+ eg.streamMessage(id: 1, stream: stream1, topic: 'a', flags: []),\n+ eg.streamMessage(id: 2, stream: stream1, topic: 'a', flags: []),\n+ eg.streamMessage(id: 3, stream: stream1, topic: 'b', flags: []),\n+ eg.streamMessage(id: 4, stream: stream1, topic: 'b', flags: []),\n+ eg.streamMessage(id: 5, stream: stream2, topic: 'b', flags: []),\n+ eg.streamMessage(id: 6, stream: stream2, topic: 'b', flags: [MessageFlag.mentioned]),\n+ eg.streamMessage(id: 7, stream: stream2, topic: 'c', flags: []),\n+ eg.streamMessage(id: 8, stream: stream2, topic: 'c', flags: []),\n+ eg.dmMessage(id: 9, from: user1, to: [eg.selfUser], flags: []),\n+ eg.dmMessage(id: 10, from: user1, to: [eg.selfUser], flags: []),\n+ eg.dmMessage(id: 11, from: user2, to: [eg.selfUser], flags: []),\n+ eg.dmMessage(id: 12, from: user2, to: [eg.selfUser], flags: [MessageFlag.mentioned]),\n+ eg.dmMessage(id: 13, from: user1, to: [user2, eg.selfUser], flags: []),\n+ eg.dmMessage(id: 14, from: user1, to: [user2, eg.selfUser], flags: []),\n+ eg.dmMessage(id: 15, from: user2, to: [user3, eg.selfUser], flags: []),\n+ eg.dmMessage(id: 16, from: user2, to: [user3, eg.selfUser], flags: [MessageFlag.wildcardMentioned]),\n+ ]);\n+ });\n+ });\n+\n+ group('handleMessageEvent', () {\n+ for (final (isUnread, isStream, isDirectMentioned, isWildcardMentioned) in [\n+ (true, true, true, true ),\n+ (true, true, true, false),\n+ (true, true, false, true ),\n+ (true, true, false, false),\n+ (true, false, true, true ),\n+ (true, false, true, false),\n+ (true, false, false, true ),\n+ (true, false, false, false),\n+ (false, true, true, true ),\n+ (false, true, true, false),\n+ (false, true, false, true ),\n+ (false, true, false, false),\n+ (false, false, true, true ),\n+ (false, false, true, false),\n+ (false, false, false, true ),\n+ (false, false, false, false),\n+ ]) {\n+ final description = [\n+ isUnread ? 'unread' : 'read',\n+ isStream ? 'stream' : 'dm',\n+ isDirectMentioned ? 'direct mentioned' : 'not direct mentioned',\n+ isWildcardMentioned ? 'wildcard mentioned' : 'not wildcard mentioned',\n+ ].join(' / ');\n+ test(description, () {\n+ prepare();\n+ final flags = [\n+ if (!isUnread) MessageFlag.read,\n+ if (isDirectMentioned) MessageFlag.mentioned,\n+ if (isWildcardMentioned) MessageFlag.wildcardMentioned,\n+ ];\n+ final message = isStream\n+ ? eg.streamMessage(flags: flags)\n+ : eg.dmMessage(from: eg.otherUser, to: [eg.selfUser], flags: flags);\n+ model.handleMessageEvent(MessageEvent(id: 0, message: message));\n+ if (isUnread) {\n+ checkNotifiedOnce();\n+ }\n+ checkMatchesMessages([message]);\n+ });\n+ }\n+\n+ group('stream messages', () {\n+ group('new unread follows existing unread', () {\n+ final stream1 = eg.stream(streamId: 1);\n+ final stream2 = eg.stream(streamId: 2);\n+ for (final (oldStream, newStream, oldTopic, newTopic) in [\n+ (stream1, stream1, 'a', 'a'),\n+ (stream1, stream1, 'a', 'b'),\n+ (stream1, stream2, 'a', 'a'),\n+ (stream1, stream2, 'a', 'b'),\n+ ]) {\n+ final description = [\n+ oldStream.streamId == newStream.streamId ? 'same stream' : 'different stream',\n+ oldTopic == newTopic ? 'same topic' : 'different topic',\n+ ].join(' / ');\n+ test(description, () {\n+ final oldMessage = eg.streamMessage(id: 1, stream: oldStream, topic: oldTopic, flags: []);\n+ final newMessage = eg.streamMessage(id: 2, stream: newStream, topic: newTopic, flags: []);\n+\n+ prepare();\n+ fillWithMessages([oldMessage]);\n+ model.handleMessageEvent(MessageEvent(id: 0, message: newMessage));\n+ checkNotifiedOnce();\n+ checkMatchesMessages([oldMessage, newMessage]);\n+ });\n+ }\n+ });\n+ });\n+\n+ group('DM messages', () {\n+ final variousDms = [\n+ ('self 1:1', eg.selfUser, []),\n+ ('1:1', eg.otherUser, [eg.selfUser]),\n+ ('1:1', eg.thirdUser, [eg.selfUser]),\n+ ('group', eg.otherUser, [eg.selfUser, eg.thirdUser]),\n+ ('group', eg.otherUser, [eg.selfUser, eg.user(userId: 456)]),\n+ ];\n+\n+ group('DM narrow subtypes', () {\n+ for (final (desc, from, to) in variousDms) {\n+ test(desc, () {\n+ final message = eg.dmMessage(from: from, to: to, flags: []);\n+\n+ prepare();\n+ model.handleMessageEvent(MessageEvent(id: 0, message: message));\n+ checkNotifiedOnce();\n+ checkMatchesMessages([message]);\n+ });\n+ }\n+ });\n+\n+ group('new unread follows existing unread', () {\n+ for (final (oldDesc, oldFrom, oldTo) in variousDms) {\n+ final oldMessage = eg.dmMessage(id: 1, from: oldFrom, to: oldTo, flags: []);\n+ final oldNarrow = DmNarrow.ofMessage(oldMessage, selfUserId: eg.selfUser.userId);\n+ for (final (newDesc, newFrom, newTo) in variousDms) {\n+ final newMessage = eg.dmMessage(id: 2, from: newFrom, to: newTo, flags: []);\n+ final newNarrow = DmNarrow.ofMessage(newMessage, selfUserId: eg.selfUser.userId);\n+\n+ test('existing in $oldDesc narrow; new in ${oldNarrow == newNarrow ? 'same narrow' : 'different narrow ($newDesc)'}', () {\n+ prepare();\n+ fillWithMessages([oldMessage]);\n+ model.handleMessageEvent(MessageEvent(id: 0, message: newMessage));\n+ checkNotifiedOnce();\n+ checkMatchesMessages([oldMessage, newMessage]);\n+ });\n+ }\n+ }\n+ });\n+ });\n+ });\n+\n+ group('handleUpdateMessageEvent', () {\n+ group('mentions', () {\n+ for (final isKnownToModel in [true, false]) {\n+ for (final isRead in [false, true]) {\n+ final baseFlags = [if (isRead) MessageFlag.read];\n+ for (final (messageDesc, message) in [\n+ ('stream', eg.streamMessage(flags: baseFlags)),\n+ ('1:1 dm', eg.dmMessage(from: eg.otherUser, to: [eg.selfUser], flags: baseFlags)),\n+ ]) {\n+ test('${isRead ? 'read' : 'unread'} $messageDesc message${isKnownToModel ? '' : ' (but read state unknown to model)'}', () {\n+ prepare();\n+ fillWithMessages([\n+ if (isKnownToModel) message,\n+ ]);\n+\n+ for (final List newFlags in [\n+ [...baseFlags, MessageFlag.mentioned],\n+ [...baseFlags, MessageFlag.mentioned, MessageFlag.wildcardMentioned],\n+ [...baseFlags, MessageFlag.wildcardMentioned],\n+ [...baseFlags, ],\n+ [...baseFlags, MessageFlag.wildcardMentioned],\n+ ]) {\n+ assert(newFlags.contains(MessageFlag.read) == isRead);\n+ if (!isKnownToModel) {\n+ check(because: \"no crash if message is in model's blindspots\",\n+ () => model.handleUpdateMessageEvent(\n+ UpdateMessageEvent(id: 0, messageId: message.id, messageIds: [], flags: newFlags),\n+ )).returnsNormally();\n+ // Rarely, this event will be about an unread that's unknown\n+ // to the model, or at least one of the model's components;\n+ // see e.g. [oldUnreadsMissing]. When that happens, I think\n+ // we won't usually have necessary data (in the event or model)\n+ // to make the unread appear in [streams] or [dms]\n+ // if it wasn't there before. However, for stream messages,\n+ // we may have that needed data if this event happens to\n+ // signal that the message was moved.\n+ //\n+ // If the message in this event is unread and mentioned,\n+ // I *think* the model will cause it to correctly appear in\n+ // [mentions], as of 2023-10.\n+ //\n+ // TODO in any case, confirm behavior and run appropriate\n+ // model checks here.\n+ notifiedCount = 0;\n+ continue;\n+ }\n+ model.handleUpdateMessageEvent(\n+ UpdateMessageEvent(id: 0, messageId: message.id, messageIds: [], flags: newFlags),\n+ );\n+\n+ if (\n+ isRead\n+ || (\n+ // TODO make less verbose\n+ (message.flags.contains(MessageFlag.mentioned) || message.flags.contains(MessageFlag.wildcardMentioned))\n+ == (newFlags.contains(MessageFlag.mentioned) || newFlags.contains(MessageFlag.wildcardMentioned))\n+ )\n+ ) {\n+ checkNotNotified();\n+ } else {\n+ checkNotifiedOnce();\n+ }\n+ // It would be more realistic to set [message]'s content too,\n+ // but the implementation doesn't depend on that.\n+ message.flags = newFlags;\n+ checkMatchesMessages(isKnownToModel ? [message] : []);\n+ }\n+ });\n+ }\n+ }\n+ }\n+ });\n+ });\n+\n+\n+ group('handleDeleteMessageEvent', () {\n+ final stream1 = eg.stream(streamId: 1);\n+ final stream2 = eg.stream(streamId: 2);\n+\n+ final message1 = eg.dmMessage(id: 1, from: eg.selfUser, to: [], flags: []);\n+ final message2 = eg.dmMessage(id: 2, from: eg.otherUser, to: [eg.selfUser], flags: []);\n+ final message3 = eg.dmMessage(id: 3, from: eg.thirdUser, to: [eg.selfUser], flags: []);\n+ final message4 = eg.dmMessage(id: 4, from: eg.otherUser, to: [eg.selfUser, eg.thirdUser], flags: []);\n+ final message5 = eg.dmMessage(id: 5, from: eg.otherUser, to: [eg.selfUser, eg.user(userId: 456)], flags: []);\n+\n+ final message6 = eg.dmMessage(id: 6, from: eg.selfUser, to: [], flags: [MessageFlag.mentioned]);\n+ final message7 = eg.dmMessage(id: 7, from: eg.otherUser, to: [eg.selfUser], flags: [MessageFlag.mentioned]);\n+ final message8 = eg.dmMessage(id: 8, from: eg.thirdUser, to: [eg.selfUser], flags: [MessageFlag.mentioned]);\n+ final message9 = eg.dmMessage(id: 9, from: eg.otherUser, to: [eg.selfUser, eg.thirdUser], flags: [MessageFlag.mentioned]);\n+ final message10 = eg.dmMessage(id: 10, from: eg.otherUser, to: [eg.selfUser, eg.user(userId: 456)], flags: [MessageFlag.mentioned]);\n+\n+ final message11 = eg.streamMessage(id: 11, stream: stream1, topic: 'a', flags: []);\n+ final message12 = eg.streamMessage(id: 12, stream: stream1, topic: 'a', flags: [MessageFlag.mentioned]);\n+ final message13 = eg.streamMessage(id: 13, stream: stream2, topic: 'b', flags: []);\n+ final message14 = eg.streamMessage(id: 14, stream: stream2, topic: 'b', flags: [MessageFlag.mentioned]);\n+\n+ final messages = [\n+ message1, message2, message3, message4, message5,\n+ message6, message7, message8, message9, message10,\n+ message11, message12, message13, message14,\n+ ];\n+\n+ test('single deletes of unreads', () {\n+ prepare();\n+ fillWithMessages(messages);\n+\n+ final expectedRemainingMessages = Set.of(messages);\n+ for (final message in messages) {\n+ final event = switch (message) {\n+ StreamMessage() => DeleteMessageEvent(\n+ id: 0,\n+ messageType: MessageType.stream,\n+ messageIds: [message.id],\n+ streamId: message.streamId,\n+ topic: message.subject,\n+ ),\n+ DmMessage() => DeleteMessageEvent(id: 0, messageType: MessageType.private, messageIds: [message.id]),\n+ };\n+ model.handleDeleteMessageEvent(event);\n+ checkNotifiedOnce();\n+ checkMatchesMessages(expectedRemainingMessages..remove(message));\n+ }\n+ });\n+\n+ test('bulk deletes of unreads', () {\n+ prepare();\n+ fillWithMessages(messages);\n+\n+ final expectedRemainingMessages = Set.of(messages);\n+\n+ model.handleDeleteMessageEvent(DeleteMessageEvent(\n+ id: 0,\n+ messageIds: [11, 12],\n+ messageType: MessageType.stream,\n+ streamId: stream1.streamId,\n+ topic: 'a',\n+ ));\n+ checkNotifiedOnce();\n+ checkMatchesMessages(expectedRemainingMessages..removeAll([message11, message12]));\n+ model.handleDeleteMessageEvent(DeleteMessageEvent(\n+ id: 0,\n+ messageIds: [13, 14],\n+ messageType: MessageType.stream,\n+ streamId: stream2.streamId,\n+ topic: 'b',\n+ ));\n+ checkNotifiedOnce();\n+ checkMatchesMessages(expectedRemainingMessages..removeAll([message13, message14]));\n+ model.handleDeleteMessageEvent(DeleteMessageEvent(\n+ id: 0,\n+ messageIds: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],\n+ messageType: MessageType.private,\n+ ));\n+ checkNotifiedOnce();\n+ checkMatchesMessages([]);\n+ });\n+\n+ test('delete read (or unknown) stream message', () {\n+ final message = eg.streamMessage(flags: [MessageFlag.read]);\n+\n+ prepare();\n+ // Equivalently, could do: fillWithMessages([message]);\n+ model.handleDeleteMessageEvent(DeleteMessageEvent(\n+ id: 0,\n+ messageIds: [message.id],\n+ messageType: MessageType.stream,\n+ streamId: message.streamId,\n+ topic: message.subject,\n+ ));\n+ // TODO improve implementation; then:\n+ // checkNotNotified();\n+ // For now, at least check callers aren't notified *more* than once:\n+ checkNotifiedOnce();\n+ checkMatchesMessages([message]);\n+ });\n+\n+ test('delete read (or unknown) DM message', () {\n+ final message = eg.dmMessage(from: eg.otherUser, to: [eg.selfUser], flags: [MessageFlag.read]);\n+\n+ prepare();\n+ // Equivalently, could do: fillWithMessages([message]);\n+ model.handleDeleteMessageEvent(DeleteMessageEvent(\n+ id: 0,\n+ messageIds: [message.id],\n+ messageType: MessageType.private,\n+ ));\n+ // TODO improve implementation; then:\n+ // checkNotNotified();\n+ // For now, at least check callers aren't notified *more* than once:\n+ checkNotifiedOnce();\n+ checkMatchesMessages([message]);\n+ });\n+ });\n+\n+ group('handleUpdateMessageFlagsEvent', () {\n+ final irrelevantFlags = MessageFlag.values.where((flag) =>\n+ switch (flag) {\n+ MessageFlag.starred => true,\n+ MessageFlag.collapsed => true,\n+ MessageFlag.hasAlertWord => true,\n+ MessageFlag.historical => true,\n+ MessageFlag.unknown => true,\n+ MessageFlag.mentioned => false,\n+ MessageFlag.wildcardMentioned => false,\n+ MessageFlag.read => false,\n+ });\n+\n+ for (final (isRead, isMentioned) in [\n+ (true, true ),\n+ (true, false),\n+ (false, true ),\n+ (false, false),\n+ ]) {\n+ // When isRead is true, the message won't appear in the model.\n+ // That case is indistinguishable from an unread that's unknown to\n+ // the model, so we get coverage for that case too.\n+ test('remove irrelevant flags; ${isRead ? 'read' : 'unread'} / ${isMentioned ? 'mentioned' : 'not mentioned'}', () {\n+ final message = eg.streamMessage(flags: [\n+ ...irrelevantFlags,\n+ if (isRead) MessageFlag.read,\n+ if (isMentioned) MessageFlag.mentioned,\n+ ]);\n+ prepare();\n+ fillWithMessages([message]);\n+ for (final flag in irrelevantFlags) {\n+ model.handleUpdateMessageFlagsEvent(UpdateMessageFlagsRemoveEvent(\n+ id: 0,\n+ flag: flag,\n+ messages: [message.id],\n+ messageDetails: null,\n+ ));\n+ checkNotNotified();\n+ message.flags.remove(flag);\n+ checkMatchesMessages([message]);\n+ }\n+ });\n+ }\n+\n+ for (final (isRead, isMentioned) in [\n+ (true, true ),\n+ (true, false),\n+ (false, true ),\n+ (false, false),\n+ ]) {\n+ // When isRead is true, the message won't appear in the model.\n+ // That case is indistinguishable from an unread that's unknown to\n+ // the model, so we get coverage for that case too.\n+ test('add irrelevant flags; ${isRead ? 'read' : 'unread'} / ${isMentioned ? 'mentioned' : 'not mentioned'}', () {\n+ final message = eg.streamMessage(flags: [\n+ if (isRead) MessageFlag.read,\n+ if (isMentioned) MessageFlag.mentioned,\n+ ]);\n+ prepare();\n+ fillWithMessages([message]);\n+ for (final flag in irrelevantFlags) {\n+ model.handleUpdateMessageFlagsEvent(UpdateMessageFlagsAddEvent(\n+ id: 0,\n+ flag: flag,\n+ messages: [message.id],\n+ all: false,\n+ ));\n+ checkNotNotified();\n+ message.flags.add(flag);\n+ checkMatchesMessages([message]);\n+ }\n+ });\n+ }\n+\n+ for (final mentionFlag in [MessageFlag.mentioned, MessageFlag.wildcardMentioned]) {\n+ // For a read message in this test, the message won't appear in the model.\n+ // That case is indistinguishable from an unread that's unknown to\n+ // the model, so we get coverage for that case too.\n+ test('add flag: ${mentionFlag.name}', () {\n+ final messages = [\n+ eg.streamMessage(id: 1, flags: []),\n+ eg.streamMessage(id: 2, flags: [MessageFlag.read]),\n+ eg.dmMessage(id: 3, from: eg.otherUser, to: [eg.selfUser], flags: []),\n+ eg.dmMessage(id: 4, from: eg.otherUser, to: [eg.selfUser], flags: [MessageFlag.read]),\n+ ];\n+\n+ prepare();\n+ fillWithMessages(messages);\n+ for (final message in messages) {\n+ model.handleUpdateMessageFlagsEvent(UpdateMessageFlagsAddEvent(\n+ id: 0,\n+ flag: mentionFlag,\n+ messages: [message.id],\n+ all: false,\n+ ));\n+ if (!message.flags.contains(MessageFlag.read)) {\n+ checkNotifiedOnce();\n+ } else {\n+ // TODO improve implementation; then:\n+ // checkNotNotified();\n+ // For now, at least check callers aren't notified *more* than once:\n+ checkNotifiedOnce();\n+ }\n+ message.flags.add(mentionFlag);\n+ checkMatchesMessages(messages);\n+ }\n+ });\n+\n+ // TODO test adding wildcard mention when direct mention is already present\n+ // and vice versa (implementation should skip notifyListeners;\n+ // test should checkNotNotified)\n+\n+ // For a read message in this test, the message won't appear in the model.\n+ // That case is indistinguishable from an unread that's unknown to\n+ // the model, so we get coverage for that case too.\n+ test('remove flag: ${mentionFlag.name}', () {\n+ final messages = [\n+ eg.streamMessage(id: 1, flags: [mentionFlag]),\n+ eg.streamMessage(id: 2, flags: [mentionFlag, MessageFlag.read]),\n+ eg.dmMessage(id: 3, from: eg.otherUser, to: [eg.selfUser], flags: [mentionFlag]),\n+ eg.dmMessage(id: 4, from: eg.otherUser, to: [eg.selfUser], flags: [mentionFlag, MessageFlag.read]),\n+ ];\n+\n+ prepare();\n+ fillWithMessages(messages);\n+ for (final message in messages) {\n+ model.handleUpdateMessageFlagsEvent(UpdateMessageFlagsRemoveEvent(\n+ id: 0,\n+ flag: mentionFlag,\n+ messages: [message.id],\n+ messageDetails: null,\n+ ));\n+ if (!message.flags.contains(MessageFlag.read)) {\n+ checkNotifiedOnce();\n+ } else {\n+ // TODO improve implementation; then:\n+ // checkNotNotified();\n+ // For now, at least check callers aren't notified *more* than once:\n+ checkNotifiedOnce();\n+ }\n+ message.flags.remove(mentionFlag);\n+ checkMatchesMessages(messages);\n+ }\n+ });\n+ }\n+\n+ // TODO test removing just direct or wildcard mention when both are present\n+ // (implementation should skip notifyListeners;\n+ // test should checkNotNotified)\n+\n+ test('mark all as read', () {\n+ final message1 = eg.streamMessage(id: 1, flags: []);\n+ final message2 = eg.streamMessage(id: 2, flags: [MessageFlag.mentioned]);\n+ final message3 = eg.dmMessage(id: 3, from: eg.otherUser, to: [eg.selfUser], flags: []);\n+ final message4 = eg.dmMessage(id: 4, from: eg.otherUser, to: [eg.selfUser], flags: [MessageFlag.wildcardMentioned]);\n+ final messages = [message1, message2, message3, message4];\n+\n+ prepare();\n+ fillWithMessages([message1, message2, message3, message4]);\n+\n+ // Might as well test with oldUnreadsMissing: true.\n+ //\n+ // We didn't fill the model with 50k unreads, so this is questionably\n+ // realistic\u2026 but the 50k cap isn't actually API-guaranteed, and this is\n+ // plausibly realistic for a hypothetical server that decides based on\n+ // message age rather than the 50k cap.\n+ model.oldUnreadsMissing = true;\n+\n+ model.handleUpdateMessageFlagsEvent(UpdateMessageFlagsAddEvent(\n+ id: 0,\n+ flag: MessageFlag.read,\n+ messages: [],\n+ all: true,\n+ ));\n+ checkNotifiedOnce();\n+ for (final message in messages) {\n+ message.flags.add(MessageFlag.read);\n+ }\n+ checkMatchesMessages(messages);\n+ check(model).oldUnreadsMissing.isFalse();\n+ });\n+\n+ group('mark some as read', () {\n+ test('usual cases', () {\n+ final stream1 = eg.stream(streamId: 1);\n+ final stream2 = eg.stream(streamId: 2);\n+\n+ final message1 = eg.dmMessage(id: 1, from: eg.selfUser, to: [], flags: []);\n+ final message2 = eg.dmMessage(id: 2, from: eg.otherUser, to: [eg.selfUser], flags: []);\n+ final message3 = eg.dmMessage(id: 3, from: eg.thirdUser, to: [eg.selfUser], flags: []);\n+ final message4 = eg.dmMessage(id: 4, from: eg.otherUser, to: [eg.selfUser, eg.thirdUser], flags: []);\n+ final message5 = eg.dmMessage(id: 5, from: eg.otherUser, to: [eg.selfUser, eg.user(userId: 456)], flags: []);\n+\n+ final message6 = eg.dmMessage(id: 6, from: eg.selfUser, to: [], flags: [MessageFlag.mentioned]);\n+ final message7 = eg.dmMessage(id: 7, from: eg.otherUser, to: [eg.selfUser], flags: [MessageFlag.mentioned]);\n+ final message8 = eg.dmMessage(id: 8, from: eg.thirdUser, to: [eg.selfUser], flags: [MessageFlag.mentioned]);\n+ final message9 = eg.dmMessage(id: 9, from: eg.otherUser, to: [eg.selfUser, eg.thirdUser], flags: [MessageFlag.mentioned]);\n+ final message10 = eg.dmMessage(id: 10, from: eg.otherUser, to: [eg.selfUser, eg.user(userId: 456)], flags: [MessageFlag.mentioned]);\n+\n+ final message11 = eg.streamMessage(id: 11, stream: stream1, topic: 'a', flags: []);\n+ final message12 = eg.streamMessage(id: 12, stream: stream1, topic: 'a', flags: [MessageFlag.mentioned]);\n+ final message13 = eg.streamMessage(id: 13, stream: stream2, topic: 'b', flags: []);\n+ final message14 = eg.streamMessage(id: 14, stream: stream2, topic: 'b', flags: [MessageFlag.mentioned]);\n+\n+ final messages = [\n+ message1, message2, message3, message4, message5,\n+ message6, message7, message8, message9, message10,\n+ message11, message12, message13, message14,\n+ ];\n+\n+ prepare();\n+ fillWithMessages(messages);\n+\n+ model.handleUpdateMessageFlagsEvent(UpdateMessageFlagsAddEvent(\n+ id: 0,\n+ flag: MessageFlag.read,\n+ messages: [message1.id],\n+ all: false,\n+ ));\n+ checkNotifiedOnce();\n+ message1.flags.add(MessageFlag.read);\n+ checkMatchesMessages(messages);\n+\n+ model.handleUpdateMessageFlagsEvent(UpdateMessageFlagsAddEvent(\n+ id: 0,\n+ flag: MessageFlag.read,\n+ messages: [message14.id],\n+ all: false,\n+ ));\n+ checkNotifiedOnce();\n+ message14.flags.add(MessageFlag.read);\n+ checkMatchesMessages(messages);\n+\n+ model.handleUpdateMessageFlagsEvent(UpdateMessageFlagsAddEvent(\n+ id: 0,\n+ flag: MessageFlag.read,\n+ messages: [message5.id, message6.id],\n+ all: false,\n+ ));\n+ checkNotifiedOnce();\n+ message5.flags.add(MessageFlag.read);\n+ message6.flags.add(MessageFlag.read);\n+ checkMatchesMessages(messages);\n+\n+ model.handleUpdateMessageFlagsEvent(UpdateMessageFlagsAddEvent(\n+ id: 0,\n+ flag: MessageFlag.read,\n+ messages: [\n+ message2.id, message3.id, message3.id, message4.id,\n+ message7.id, message8.id, message9.id, message10.id,\n+ message11.id, message12.id, message13.id,\n+ ],\n+ all: false,\n+ ));\n+ checkNotifiedOnce();\n+ message2.flags.add(MessageFlag.read);\n+ message3.flags.add(MessageFlag.read);\n+ message4.flags.add(MessageFlag.read);\n+ message7.flags.add(MessageFlag.read);\n+ message8.flags.add(MessageFlag.read);\n+ message9.flags.add(MessageFlag.read);\n+ message10.flags.add(MessageFlag.read);\n+ message11.flags.add(MessageFlag.read);\n+ message12.flags.add(MessageFlag.read);\n+ message13.flags.add(MessageFlag.read);\n+ checkMatchesMessages(messages);\n+ });\n+\n+ test('on unreads that are unknown to the model', () {\n+ final stream = eg.stream();\n+ final message1 = eg.streamMessage(id: 1, flags: [], stream: stream, topic: 'a');\n+ final message2 = eg.dmMessage(id: 2, flags: [], from: eg.otherUser, to: [eg.selfUser]);\n+ final message3 = eg.streamMessage(id: 3, flags: [], stream: stream, topic: 'a');\n+ final message4 = eg.dmMessage(id: 4, flags: [], from: eg.otherUser, to: [eg.selfUser]);\n+\n+ prepare();\n+ fillWithMessages([message3, message4]);\n+\n+ check(() => model.handleUpdateMessageFlagsEvent(UpdateMessageFlagsAddEvent(\n+ id: 0,\n+ flag: MessageFlag.read,\n+ messages: [message1.id, message2.id, message3.id, message4.id],\n+ all: false,\n+ ))).returnsNormally();\n+ checkNotifiedOnce();\n+ message3.flags.add(MessageFlag.read);\n+ message4.flags.add(MessageFlag.read);\n+ checkMatchesMessages([message3, message4]);\n+ });\n+ });\n+\n+ group('mark as unread', () {\n+ mkEvent(messages) => eg.updateMessageFlagsRemoveEvent(MessageFlag.read, messages);\n+\n+ test('usual cases', () {\n+ final stream1 = eg.stream(streamId: 1);\n+ final stream2 = eg.stream(streamId: 2);\n+\n+ final message1 = eg.dmMessage(id: 1, from: eg.selfUser, to: [], flags: [MessageFlag.read]);\n+ final message2 = eg.dmMessage(id: 2, from: eg.otherUser, to: [eg.selfUser], flags: [MessageFlag.read]);\n+ final message3 = eg.dmMessage(id: 3, from: eg.thirdUser, to: [eg.selfUser], flags: [MessageFlag.read]);\n+ final message4 = eg.dmMessage(id: 4, from: eg.otherUser, to: [eg.selfUser, eg.thirdUser], flags: [MessageFlag.read]);\n+ final message5 = eg.dmMessage(id: 5, from: eg.otherUser, to: [eg.selfUser, eg.user(userId: 456)], flags: [MessageFlag.read]);\n+\n+ final message6 = eg.dmMessage(id: 6, from: eg.selfUser, to: [], flags: [MessageFlag.mentioned, MessageFlag.read]);\n+ final message7 = eg.dmMessage(id: 7, from: eg.otherUser, to: [eg.selfUser], flags: [MessageFlag.mentioned, MessageFlag.read]);\n+ final message8 = eg.dmMessage(id: 8, from: eg.thirdUser, to: [eg.selfUser], flags: [MessageFlag.mentioned, MessageFlag.read]);\n+ final message9 = eg.dmMessage(id: 9, from: eg.otherUser, to: [eg.selfUser, eg.thirdUser], flags: [MessageFlag.mentioned, MessageFlag.read]);\n+ final message10 = eg.dmMessage(id: 10, from: eg.otherUser, to: [eg.selfUser, eg.user(userId: 456)], flags: [MessageFlag.mentioned, MessageFlag.read]);\n+\n+ final message11 = eg.streamMessage(id: 11, stream: stream1, topic: 'a', flags: [MessageFlag.read]);\n+ final message12 = eg.streamMessage(id: 12, stream: stream1, topic: 'a', flags: [MessageFlag.mentioned, MessageFlag.read]);\n+ final message13 = eg.streamMessage(id: 13, stream: stream2, topic: 'b', flags: [MessageFlag.read]);\n+ final message14 = eg.streamMessage(id: 14, stream: stream2, topic: 'b', flags: [MessageFlag.mentioned, MessageFlag.read]);\n+\n+ final messages = [\n+ message1, message2, message3, message4, message5,\n+ message6, message7, message8, message9, message10,\n+ message11, message12, message13, message14,\n+ ];\n+\n+ prepare();\n+ fillWithMessages(messages);\n+\n+ model.handleUpdateMessageFlagsEvent(mkEvent([message1]));\n+ checkNotifiedOnce();\n+ message1.flags.remove(MessageFlag.read);\n+ checkMatchesMessages(messages);\n+\n+ model.handleUpdateMessageFlagsEvent(mkEvent([message14]));\n+ checkNotifiedOnce();\n+ message14.flags.remove(MessageFlag.read);\n+ checkMatchesMessages(messages);\n+\n+ model.handleUpdateMessageFlagsEvent(mkEvent([message5, message6]));\n+ checkNotifiedOnce();\n+ message5.flags.remove(MessageFlag.read);\n+ message6.flags.remove(MessageFlag.read);\n+ checkMatchesMessages(messages);\n+\n+ model.handleUpdateMessageFlagsEvent(mkEvent([\n+ message2, message3, message4,\n+ message7, message8, message9, message10,\n+ message11, message12, message13,\n+ ]));\n+ checkNotifiedOnce();\n+ message2.flags.remove(MessageFlag.read);\n+ message3.flags.remove(MessageFlag.read);\n+ message4.flags.remove(MessageFlag.read);\n+ message7.flags.remove(MessageFlag.read);\n+ message8.flags.remove(MessageFlag.read);\n+ message9.flags.remove(MessageFlag.read);\n+ message10.flags.remove(MessageFlag.read);\n+ message11.flags.remove(MessageFlag.read);\n+ message12.flags.remove(MessageFlag.read);\n+ message13.flags.remove(MessageFlag.read);\n+ checkMatchesMessages(messages);\n+ });\n+\n+ test('tolerates unsorted event.messages: stream messages', () {\n+ final stream = eg.stream();\n+ final message1 = eg.streamMessage(id: 1, flags: [MessageFlag.read], stream: stream, topic: 'a');\n+ final message2 = eg.streamMessage(id: 2, flags: [MessageFlag.read], stream: stream, topic: 'a');\n+\n+ prepare();\n+ fillWithMessages([message1, message2]);\n+\n+ model.handleUpdateMessageFlagsEvent(mkEvent([message2, message1]));\n+ checkNotifiedOnce();\n+\n+ message1.flags.remove(MessageFlag.read);\n+ message2.flags.remove(MessageFlag.read);\n+ checkMatchesMessages([message1, message2]);\n+ });\n+\n+ test('tolerates unsorted event.messages: DM messages', () {\n+ final message1 = eg.dmMessage(id: 1, flags: [MessageFlag.read], from: eg.otherUser, to: [eg.selfUser]);\n+ final message2 = eg.dmMessage(id: 2, flags: [MessageFlag.read], from: eg.otherUser, to: [eg.selfUser]);\n+\n+ prepare();\n+ fillWithMessages([message1, message2]);\n+\n+ model.handleUpdateMessageFlagsEvent(mkEvent([message2, message1]));\n+ checkNotifiedOnce();\n+\n+ message1.flags.remove(MessageFlag.read);\n+ message2.flags.remove(MessageFlag.read);\n+ checkMatchesMessages([message1, message2]);\n+ });\n+\n+ // TODO(server-6) remove mention of zulip/zulip#22164, fixed in 6.0\n+ test('tolerates event pointing to DM/stream messages that are already unread (zulip/zulip#22164)', () {\n+ final message1 = eg.streamMessage(id: 1, flags: []);\n+ final message2 = eg.dmMessage(id: 2, from: eg.otherUser, to: [eg.selfUser], flags: []);\n+\n+ prepare();\n+ fillWithMessages([message1, message2]);\n+\n+ model.handleUpdateMessageFlagsEvent(mkEvent([message1, message2]));\n+ checkNotifiedOnce();\n+\n+ message1.flags.remove(MessageFlag.read);\n+ message2.flags.remove(MessageFlag.read);\n+ checkMatchesMessages([message1, message2]);\n+ });\n+\n+ test('tolerates \"message details\" missing', () {\n+ final stream = eg.stream();\n+ const topic = 'a';\n+ final message1 = eg.streamMessage(id: 1, flags: [MessageFlag.read], stream: stream, topic: topic);\n+ final message2 = eg.streamMessage(id: 2, flags: [MessageFlag.read], stream: stream, topic: topic);\n+ final message3 = eg.dmMessage(id: 3, flags: [MessageFlag.read], from: eg.otherUser, to: [eg.selfUser]);\n+ final message4 = eg.dmMessage(id: 4, flags: [MessageFlag.read], from: eg.otherUser, to: [eg.selfUser]);\n+\n+ prepare();\n+ fillWithMessages([message1, message2, message3, message4]);\n+\n+ check(() {\n+ model.handleUpdateMessageFlagsEvent(UpdateMessageFlagsRemoveEvent(\n+ id: 0,\n+ flag: MessageFlag.read,\n+ messages: [message1.id, message2.id, message3.id, message4.id],\n+ messageDetails: {\n+ message1.id: UpdateMessageFlagsMessageDetail(\n+ type: MessageType.stream,\n+ mentioned: false,\n+ streamId: stream.streamId,\n+ topic: topic,\n+ userIds: null,\n+ ),\n+ // message 2 and 3 have their details missing\n+ message4.id: UpdateMessageFlagsMessageDetail(\n+ type: MessageType.private,\n+ mentioned: false,\n+ streamId: null,\n+ topic: null,\n+ userIds: DmNarrow.ofMessage(message4, selfUserId: eg.selfUser.userId)\n+ .otherRecipientIds,\n+ ),\n+ }));\n+ }).returnsNormally();\n+\n+ checkNotifiedOnce();\n+\n+ message1.flags.remove(MessageFlag.read);\n+ // messages 2 and 3 not marked unread, but at least we didn't crash\n+ message4.flags.remove(MessageFlag.read);\n+ checkMatchesMessages([message1, message2, message3, message4]);\n+ });\n+ });\n+ });\n+}\n", "n2p_tests": "{\"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion nonempty, empty\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent unread / stream / not direct mentioned / not wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent add irrelevant flags; read / not mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent stream messages new unread follows existing unread same stream / same topic\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent remove irrelevant flags; read / not mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent add irrelevant flags; unread / not mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent read / stream / not direct mentioned / wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in group narrow; new in different narrow (self 1:1)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent mark as unread tolerates event pointing to DM/stream messages that are already unread (zulip/zulip#22164)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent mark some as read on unreads that are unknown to the model\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in 1:1 narrow; new in different narrow (group)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in group narrow; new in same narrow\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in self 1:1 narrow; new in different narrow (1:1)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages DM narrow subtypes self 1:1\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion in order\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in 1:1 narrow; new in different narrow (1:1)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in self 1:1 narrow; new in different narrow (group)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent unread / dm / not direct mentioned / not wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in 1:1 narrow; new in different narrow (self 1:1)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent stream messages new unread follows existing unread same stream / different topic\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent add irrelevant flags; unread / mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion interleaved\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent remove flag: wildcardMentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent mentions unread 1:1 dm message (but read state unknown to model)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent read / stream / direct mentioned / not wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent unread / dm / not direct mentioned / wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent read / dm / direct mentioned / not wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent unread / stream / direct mentioned / not wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent unread / dm / direct mentioned / wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent unread / dm / direct mentioned / not wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: binarySearchByKey empty\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent read / stream / not direct mentioned / not wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion some dupes\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent mentions unread stream message (but read state unknown to model)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent read / dm / direct mentioned / wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion all dupes\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleDeleteMessageEvent single deletes of unreads\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent remove irrelevant flags; read / mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent mark all as read\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in group narrow; new in different narrow (group)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: constructor not empty\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent remove irrelevant flags; unread / not mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in self 1:1 narrow; new in same narrow\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleDeleteMessageEvent delete read (or unknown) stream message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent mark as unread tolerates unsorted event.messages: DM messages\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in 1:1 narrow; new in same narrow\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent unread / stream / direct mentioned / wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent mentions read 1:1 dm message (but read state unknown to model)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent add irrelevant flags; read / mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent read / dm / not direct mentioned / wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages new unread follows existing unread existing in group narrow; new in different narrow (1:1)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent remove irrelevant flags; unread / mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion reversed\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: constructor empty\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion empty, nonempty\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent mentions unread 1:1 dm message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent remove flag: mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages DM narrow subtypes 1:1\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent stream messages new unread follows existing unread different stream / same topic\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent mark as unread tolerates \\\"message details\\\" missing\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent mentions unread stream message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent mark some as read usual cases\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent read / dm / not direct mentioned / not wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion empty\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent add flag: mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: setUnion comparison is numeric, not lexicographic\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: binarySearchByKey 3 elements\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent stream messages new unread follows existing unread different stream / different topic\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent DM messages DM narrow subtypes group\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent unread / stream / not direct mentioned / wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/algorithms_test.dart: binarySearchByKey 2 elements\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent mentions read stream message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent add flag: wildcardMentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleDeleteMessageEvent bulk deletes of unreads\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleMessageEvent read / stream / direct mentioned / wildcard mentioned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent mentions read 1:1 dm message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent mark as unread usual cases\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageFlagsEvent mark as unread tolerates unsorted event.messages: stream messages\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleUpdateMessageEvent mentions read stream message (but read state unknown to model)\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/model/unreads_test.dart: handleDeleteMessageEvent delete read (or unknown) DM message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"/home/zulip-flutter/test/api/model/initial_snapshot_test.dart: UnreadDmSnapshot: require sorted unreadMessageIds\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/initial_snapshot_test.dart: UnreadHuddleSnapshot: require sorted unreadMessageIds\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/initial_snapshot_test.dart: UnreadStreamSnapshot: require sorted unreadMessageIds\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: delete_message: require streamId and topic for stream messages\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"/home/zulip-flutter/test/api/model/events_test.dart: message: move flags into message object\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: user_settings: all known settings have event handling\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"/home/zulip-flutter/test/api/model/events_test.dart: update_message_flags/remove: require messageDetails in mark-as-unread\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "AntennaPod__AntennaPod-7954", "org": "AntennaPod", "repo": "AntennaPod", "number": 7954, "state": "closed", "title": "Tags above subscriptions screen", "body": "### Description\r\n\r\nTags above subscriptions screen, remembers the last selected one\r\nCloses #5318\r\n\r\n\"Screenshot_20250830-145355\"\r\n\r\n### Checklist\r\n\r\n- [x] I have read the contribution guidelines: https://github.com/AntennaPod/AntennaPod/blob/develop/CONTRIBUTING.md#submit-a-pull-request\r\n- [x] I have performed a self-review of my code\r\n- [x] I have run the automated code checks using `./gradlew checkstyle spotbugsPlayDebug spotbugsDebug :app:lintPlayDebug`\r\n- [x] My code follows the style guidelines of the AntennaPod project: https://github.com/AntennaPod/AntennaPod/wiki/Code-style\r\n- [x] I have mentioned the corresponding issue and the relevant keyword (e.g., \"Closes: #xy\") in the description (see https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)\r\n- [x] If it is a core feature, I have added automated tests\r\n", "base": "{\"label\": \"AntennaPod:develop\", \"ref\": \"develop\", \"sha\": \"944e0690ba5a070ad02834a3c3d90946bf3ee738\"}", "resolved_issues": "[{\"number\": 5318, \"title\": \"Display podcast tags at the top of the Subscriptions screen\", \"body\": \"# Checklist\\r\\n\\r\\n- [x ] I have used the search function to see if someone else has already submitted the same feature request.\\r\\n- [x ] I will only create one feature request per issue.\\r\\n- [x ] I will describe the problem with as much detail as possible.\\r\\n\\r\\n# System info\\r\\n\\r\\n**App version**: 2.2.1\\r\\n**Source**: F-Droid\\r\\n\\r\\n# Feature description\\r\\n\\r\\nCurrently I have around 40 subscriptions of podcasts with a vast range of topics: Local audiobooks, history, linux, politics, travel, languages etc. \\r\\nTherefore, it's hard to find straight forward the right podcast. Unfortunately the sorting and the filter feature are hardly helpful here.\\r\\n\\r\\n\\r\\n\\r\\n**Suggested solution**:\\r\\nCategories, as I have already mentioned a few above, which the user could create and to which the user could add podcasts.\\r\\n\\r\\n\\r\\n**Screenshots / Drawings / Technical details**:\\r\\n\\r\\nThere could be two sort of tiles now: Category tiles on top and podcast tiles below, which have not yet been categorized.\\r\\n\\r\\n![MockUp_small](https://user-images.githubusercontent.com/43318127/127771255-f46ef271-7f66-4282-b88f-9790109107d7.png) ![MockUp2_small](https://user-images.githubusercontent.com/43318127/127776861-a9aee853-86d1-466a-97d2-679da568ff24.png)\\r\\n\\r\\n\\r\\n\\r\\n\\r\\nThe user could add a new category with some custom name and icon via the context menu of the three dots on the top right.\\r\\nPodcasts could be assigned a category or more categories by\\r\\n* drag and drop\\r\\n* long press on a podcast, add to category: A cateogry chooser would open\\r\\n* In the opened categories folder, there could be a button \\\"add podcast\\\" or \\\"add existing podcast\\\"\\r\\n\\r\\nIf the user clicks on the category, it opens and presents all containing podcasts. \\r\\n\\r\\n\\r\\n\\r\\n\\r\\n\\r\\n\\r\\n\\r\\n\\r\\n\"}]", "lang": "java", "problem_statement": "Display podcast tags at the top of the Subscriptions screen\n# Checklist\r\n\r\n- [x ] I have used the search function to see if someone else has already submitted the same feature request.\r\n- [x ] I will only create one feature request per issue.\r\n- [x ] I will describe the problem with as much detail as possible.\r\n\r\n# System info\r\n\r\n**App version**: 2.2.1\r\n**Source**: F-Droid\r\n\r\n# Feature description\r\n\r\nCurrently I have around 40 subscriptions of podcasts with a vast range of topics: Local audiobooks, history, linux, politics, travel, languages etc. \r\nTherefore, it's hard to find straight forward the right podcast. Unfortunately the sorting and the filter feature are hardly helpful here.\r\n\r\n\r\n\r\n**Suggested solution**:\r\nCategories, as I have already mentioned a few above, which the user could create and to which the user could add podcasts.\r\n\r\n\r\n**Screenshots / Drawings / Technical details**:\r\n\r\nThere could be two sort of tiles now: Category tiles on top and podcast tiles below, which have not yet been categorized.\r\n\r\n![MockUp_small](https://user-images.githubusercontent.com/43318127/127771255-f46ef271-7f66-4282-b88f-9790109107d7.png) ![MockUp2_small](https://user-images.githubusercontent.com/43318127/127776861-a9aee853-86d1-466a-97d2-679da568ff24.png)\r\n\r\n\r\n\r\n\r\nThe user could add a new category with some custom name and icon via the context menu of the three dots on the top right.\r\nPodcasts could be assigned a category or more categories by\r\n* drag and drop\r\n* long press on a podcast, add to category: A cateogry chooser would open\r\n* In the opened categories folder, there could be a button \"add podcast\" or \"add existing podcast\"\r\n\r\nIf the user clicks on the category, it opens and presents all containing podcasts. \r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\n", "hints": "Oh, as I just checked the changelog, could it be that this feature has been implemented in 2.3.0 as of\r\n> Support for tagging (grouping) subscriptions\r\n\r\nbut I haven't seen it yet as F-Droid hasn't rolled out the latest version yet?\n> but I haven't seen it yet as F-Droid hasn't rolled out the latest version yet?\n\nYup, see #5305.\n\n> could it be that this feature has been implemented in 2.3.0 as of\n\nIndeed tags are now implemented, but I like your suggestion to display them on top, above uncategorised podcasts.\nGreat you like it! I just have added a second mock-up with a search box added. I think this could be very useful too! :)\n> but I like your suggestion to display them on top, above uncategorised podcasts.\r\n\r\nFor the subscriptions screen, we had this mock-up some time ago: https://github.com/AntennaPod/AntennaPod/issues/1711#issuecomment-727600455. In the side drawer, I would still keep them at the bottom, though.\r\n\r\n\n> For the subscriptions screen, we had this mock-up some time ago: #1711 (comment).\r\n\r\nAh, that's right! :)\r\n\r\n> In the side drawer, I would still keep them at the bottom, though.\r\n\r\nI still think it's nice to be able to disable the general list and display only the folders. But I guess that's for another issue.\n> Oh, as I just checked the changelog, could it be that this feature has been implemented in 2.3.0 as of\r\n> \r\n> > Support for tagging (grouping) subscriptions\r\n\r\nI am now on 2.3.0 via F-Droid and I wanted to check out the current implementation to see what could be improved or what kind of suggestion I could make -- in case there's any space for improvement, but I absolutely don't find a way to create tags. I feel like I clicked and long pressed every button and tile and looked through all options.\r\n\r\nSo, if I am not completely blind, I already have one suggestion: This feature needs to be more discoverable. :)\nYou can find it on the settings screen of each podcast\n> You can find it on the settings screen of each podcast\r\n\r\nThanks, I found it. I looked more for the keyword \"tags\" or \"categories\" but it's called \"folders\". I see that these folders are now added as further tiles at the end of the list of podcasts. Making some distinction between \"folders\" other than just having a different icon would indeed improve the visual clearance.\r\n\r\n In my mockups I had added the \"folders\" on top as I thought one usually have quiet less \"folders\" than \"podcasts\" and as such, would not need to scroll so much to go to the \"folders\" or in the other way around would only need to scroll very few to go to all podcasts.\r\n\r\n\n> looked more for the keyword \"tags\" or \"categories\" but it's called \"folders\"\n\nYeah, we should correct that.\n\n\nWhat do you think of my mock-up that ByteHamster shared before?\n> What do you think of my mock-up that ByteHamster shared before?\r\n\r\nI like it overall, though I am not a great friend of horizontal scrolling. In the the mock up it looks like you need to do that as the tags are only within one line and fade out.\r\nThe touch area like it's drawn there is already small in height, it requires more action and may interfere with gestures and thus and thus could be uncomfortable.\r\n\r\nHow about the following: \r\n* show a toggle button `tags ^` which, when clicked on, reveals all available tags + a toggle tag `Show all`\r\n* when clicked on again, the list of all tags vanish except for those, which are selected. So, you know what you are looking at.\r\n* the list of tags displayed don't fade out but wrap around into the next line(s)\r\n\r\nIt would be rather similar to what you have now. \r\n\r\n\r\n\r\n\n> though I am not a great friend of horizontal scrolling\n\n\nYeah, I was thinking the same this morning, but wanted to hear your thoughts. I like your suggestion! Sounds like more implementation work, though.\n@ericschdt I tried to put your suggestion in a set of mock-ups:\r\nhttps://design.penpot.app/#/view/e357a320-7535-11eb-8a88-eb0147e048f5/7accff30-fa1e-11eb-a745-7b5f72f6725e?index=2\r\nYou can click on \"Interactions\" > \"Show interactions\" to see where you can click. It will show more or less the behaviour. You can also navigate with keyboard arrows. The first two screens cover the scenario where there's only a few tags.\r\n\r\nI didn't implement it properly in the mock-ups, but I think tags should be sorted alphabetically (in the groups of inactive and selected tags).\r\n\r\nNote also that I made the interactive mock-ups so that when clicking a tag, it collapses the list. But maybe that's not a good idea (e.g. if you want to select a couple of tags, you'd have to toggle the full list every time). Instead, the list should only collapse when scrolling, and when clicking the 'collapse' icon.\r\n\r\nCurious to hear what you think.\n@ByteHamster @keunes. I'm almost done with a prototype. I will submit it soon.\nThinking about this more, I am no longer really a fan of having an expanding list. My original idea why I suggested a tag bar was the following:\r\n\r\n> https://github.com/AntennaPod/AntennaPod/issues/1711#issuecomment-727240650\r\n> How about displaying the tags directly above the subscriptions list? Clicking could then filter (with a nice animation) in place. That makes it faster to switch and (at least in my opinion) easier to discover.\r\n\r\nThe tag bar is supposed to be a quick way to switch between tags. If the tag bar is not quick and needs something like 4 taps to change to another tag (expand, de-select one, select the other, collapse), we can just make it a dialog and have more screen space for the actual subscriptions. @keunes @Matth7878 - you were involved in the discussion in the old issue (#1711). Opinions about this?\n@ByteHamster I don't know, I liked the mockup with the thin tag bar but it's true you don't see many chips.\nSoooo pleased this functionality now exists.\n\nIt's true that a horizontal scrolling list would be frustrating. Because you wouldn't be able to review all/many folders in one look.\n\nBut having some mechanism at the top is very important. The bottom is the wrong place vs the function. Hiding the means of organisation at the bottom feels backwards, literally and metaphorically.\n\nCould the left hand side hamburger also please have the folders at the top too?\n\nIt might make sense for the foldered subs that are hidden from the main list to also be hidden in the left hand menu. But if not, folders at the top is the same necessary logic as for the top of the Sub list itself.\nI'd like to add my vote here to have some way of choosing a tag at the top of the subscriptions list. The tag feature is now so hidden/hard to get to, that I never use it, and don't really understand how others are supposed to use it either. \r\n\r\nThe only people interested in this feature, I would think, are people with a lot of subscriptions \u2013 meaning that anyone interested in using it would have to scroll so far down to get to it, that it's really uncomfortable to use.\r\n\r\nI hope you'll look more into how to make it available from the top of the subscriptions list. In the meantime I'd think that the easiest way would to just keep everything as it already is, but sorting the tags at the top of the list instead of the bottom.\r\n\r\nThanks!\n@ByteHamster Am I still working on this?\nIf you want to start working on it again, feel free to re-open your PR :)\n@ByteHamster Ah,I finally have the time to get back to you. I already have it implemented in my own fork. If I have time, I will try to see if I can port it over. In the meantime, i suggest you and others really hammer in what exactly you want the feature to look and act. That way I can modify my port.\nThis issue has been mentioned on **AntennaPod Forum**. There might be relevant details there:\n\nhttps://forum.antennapod.org/t/tag-icons/3347/3\n\nI know I'm not the only one waiting for this. You said you already had it implemented in a fork back in january, @peakvalleytech, have you had any progress in moving it over to upstream since then? \r\n\r\nAs I said before, there's no need to change anything except for just moving the sorting of the tags from the bottom to the top.\r\n\r\nThanks!\nJust changing the sort order breaks other user's workflow (favorite subscriptions in main list, everything else moved to folders and hidden from main list). Refer to the mock-up above to see how a solution might look.\nI'm sorry, I don't understand this. First, I don't see any way to hide subs that are in tags/folders from the main list? I've looked. Second, I don't understand how moving them from the bottom to the top would break anything for anyone, except if you have a really good muscle memory. Sure, a new implementation might be preferable, but since it's been two years I at least think that just sorting them on top would be good enough until a better way can be developed.\r\n\r\nJust my 2 cents. Asked about an update because someone I recommended AP to asked if there's a good way to reach favorites when you have hundreds of subs :) \nWhen adding a tag there is a checkbox that allow to hide subscription from main list.\r\nIt's not perfect but it is possible to select all subscriptions, apply a default tag and check don't show in main list.\r\nThis way you would see only chips in main list.\n> I know I'm not the only one waiting for this. You said you already had it implemented in a fork back in january, @peakvalleytech, have you had any progress in moving it over to upstream since then?\r\n\r\n\r\nYes, that is true. I already have a fully implemented solution in my fork (https://github.com/ApexPod/ApexPod). It's been a while, so I don't remember the implementation entirely. I would have to look at the code again. But I can send you a demo of how it works, if you want.\r\n\r\nThere has been no progress in moving it upstream due to some politics. The maintainers, if i recalled, wanted it to be done by the book, which involved numerous meetings for designs and brainstorming. I told them I didn't have the time, as I am only a volunteer. \r\n\nUsers benefitting from/interested in this request, in Google Play reviews:\n[1](https://play.google.com/console/developers/8008695526664634386/app/4974638472012894302/user-feedback/review-details?reviewId=2eec8c4d-04f8-48d1-839b-1f336e9594ea&corpus=PUBLIC_REVIEWS)\n> Would be great add tags/ folders to group podcasts\n\nAnd on social media:\n[1](https://mastodon.social/@bjoern/113753033433042601)\n> first impression: I like the bottom navigation a lot! \ud83d\ude80 \n>\n> Only drawback so far, but maybe I miss something. On the sidebar I could filter my podcasts by tags which I use a lot to organize my podcasts. With the bottom navigation tags seems to be completely useless, at least I couldn't find a way to access them. It would be great if tags could be added to the bottom navigation to have easy access to some kind of filtered view of my podcast subscriptions.\n\n[2](https://so.denk-nach-mcfly.de/objects/e65a5b3c-358e-42db-9f7f-ca2eea212359)\n> Bottom Menu doesn't feel so \u201emodern\u201c to me, more \u201eretro\u201c (which isn't bad at all!)\n>\n> In the drawer I have ALL the views listed, PLUS all subscribed podcasts in Folders/Tags in dynamic order and with counts. That's very powerful for me!\n> \n> In the bottom button menu bar, I can only place 5 \"Most Favorite\" quick switch views, one of these 5 is currently taken by the overflow \u201eMore\u201c entry which feels clumsy.\nThis issue has been mentioned on **AntennaPod Forum**. There might be relevant details there:\n\nhttps://forum.antennapod.org/t/organization-of-podcasts/6340/3\n\nThis issue has been mentioned on **AntennaPod Forum**. There might be relevant details there:\n\nhttps://forum.antennapod.org/t/option-to-move-tags-at-the-top/7019/2\n", "pull_url": "https://github.com/AntennaPod/AntennaPod/pull/7954", "issue_urls": "[\"https://github.com/AntennaPod/AntennaPod/issues/5318\"]", "test_command": "./gradlew :net:download:service:testFreeDebugUnitTest --tests \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest\"", "fix_patch": "diff --git a/app/src/main/java/de/danoeh/antennapod/activity/SelectSubscriptionActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/SelectSubscriptionActivity.java\nindex 2b11080565b..749799b236b 100644\n--- a/app/src/main/java/de/danoeh/antennapod/activity/SelectSubscriptionActivity.java\n+++ b/app/src/main/java/de/danoeh/antennapod/activity/SelectSubscriptionActivity.java\n@@ -27,10 +27,8 @@\n import de.danoeh.antennapod.ui.appstartintent.MainActivityStarter;\n import de.danoeh.antennapod.ui.common.ThemeSwitcher;\n import de.danoeh.antennapod.storage.database.DBReader;\n-import de.danoeh.antennapod.storage.database.NavDrawerData;\n import de.danoeh.antennapod.databinding.SubscriptionSelectionActivityBinding;\n import de.danoeh.antennapod.model.feed.Feed;\n-import de.danoeh.antennapod.storage.preferences.UserPreferences;\n import io.reactivex.rxjava3.core.Observable;\n import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;\n import io.reactivex.rxjava3.disposables.Disposable;\n@@ -74,20 +72,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {\n \n }\n \n- public List getFeedItems(List items, List result) {\n- for (NavDrawerData.DrawerItem item : items) {\n- if (item.type == NavDrawerData.DrawerItem.Type.TAG) {\n- getFeedItems(((NavDrawerData.TagDrawerItem) item).getChildren(), result);\n- } else {\n- Feed feed = ((NavDrawerData.FeedDrawerItem) item).feed;\n- if (!result.contains(feed)) {\n- result.add(feed);\n- }\n- }\n- }\n- return result;\n- }\n-\n private void addShortcut(Feed feed, Bitmap bitmap) {\n Intent intent = new Intent(this, MainActivity.class);\n intent.setAction(Intent.ACTION_MAIN);\n@@ -140,12 +124,7 @@ private void loadSubscriptions() {\n if (disposable != null) {\n disposable.dispose();\n }\n- disposable = Observable.fromCallable(\n- () -> {\n- NavDrawerData data = DBReader.getNavDrawerData(UserPreferences.getSubscriptionsFilter(),\n- UserPreferences.getFeedOrder(), UserPreferences.getFeedCounterSetting());\n- return getFeedItems(data.items, new ArrayList<>());\n- })\n+ disposable = Observable.fromCallable(DBReader::getFeedList)\n .subscribeOn(Schedulers.io())\n .observeOn(AndroidSchedulers.mainThread())\n .subscribe(\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/DrawerItem.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/DrawerItem.java\nnew file mode 100644\nindex 00000000000..dbf2f6d44c3\n--- /dev/null\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/DrawerItem.java\n@@ -0,0 +1,58 @@\n+package de.danoeh.antennapod.ui.screen.drawer;\n+\n+import androidx.annotation.NonNull;\n+import de.danoeh.antennapod.model.feed.Feed;\n+import de.danoeh.antennapod.storage.database.NavDrawerData;\n+\n+public class DrawerItem {\n+ private final Feed feed;\n+ private final NavDrawerData.TagItem tag;\n+ private int counter;\n+ private final int layer;\n+\n+ public DrawerItem(@NonNull Feed feed, int counter, int layer) {\n+ this.tag = null;\n+ this.feed = feed;\n+ this.counter = counter;\n+ this.layer = layer;\n+ }\n+\n+ public DrawerItem(@NonNull NavDrawerData.TagItem tag) {\n+ this.feed = null;\n+ this.tag = tag;\n+ this.counter = 0;\n+ this.layer = 0;\n+ }\n+\n+ public boolean isFeed() {\n+ return feed != null;\n+ }\n+\n+ public Feed asFeed() {\n+ return feed;\n+ }\n+\n+ public NavDrawerData.TagItem asTag() {\n+ return tag;\n+ }\n+\n+ public void setCounter(int counter) {\n+ this.counter = counter;\n+ }\n+\n+ public int getCounter() {\n+ return counter;\n+ }\n+\n+ public int getLayer() {\n+ return layer;\n+ }\n+\n+ public String getTitle() {\n+ return isFeed() ? feed.getTitle() : tag.getTitle();\n+ }\n+\n+ public long getId() {\n+ return isFeed() ? feed.getId() : tag.getId();\n+ }\n+}\n\\ No newline at end of file\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavDrawerFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavDrawerFragment.java\nindex 74089b9b8a7..083acebac7a 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavDrawerFragment.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavDrawerFragment.java\n@@ -46,6 +46,7 @@\n import java.util.ArrayList;\n import java.util.HashSet;\n import java.util.List;\n+import java.util.Map;\n import java.util.Set;\n \n import de.danoeh.antennapod.R;\n@@ -80,8 +81,8 @@ public class NavDrawerFragment extends Fragment implements SharedPreferences.OnS\n \n private NavDrawerData navDrawerData;\n private int reclaimableSpace = 0;\n- private List flatItemList;\n- private NavDrawerData.DrawerItem contextPressedItem = null;\n+ private List flatItemList;\n+ private DrawerItem contextPressedItem = null;\n private NavListAdapter navAdapter;\n private Disposable disposable;\n private ProgressBar progressBar;\n@@ -162,11 +163,12 @@ public void onDestroyView() {\n public void onCreateContextMenu(@NonNull ContextMenu menu, @NonNull View v, ContextMenu.ContextMenuInfo menuInfo) {\n super.onCreateContextMenu(menu, v, menuInfo);\n MenuInflater inflater = getActivity().getMenuInflater();\n- menu.setHeaderTitle(contextPressedItem.getTitle());\n- if (contextPressedItem.type == NavDrawerData.DrawerItem.Type.FEED) {\n+ if (contextPressedItem.isFeed()) {\n+ menu.setHeaderTitle(contextPressedItem.asFeed().getTitle());\n inflater.inflate(R.menu.nav_feed_context, menu);\n // episodes are not loaded, so we cannot check if the podcast has new or unplayed ones!\n } else {\n+ menu.setHeaderTitle(contextPressedItem.asTag().getTitle());\n inflater.inflate(R.menu.nav_folder_context, menu);\n }\n MenuItemUtils.setOnClickListeners(menu, this::onContextItemSelected);\n@@ -174,15 +176,15 @@ public void onCreateContextMenu(@NonNull ContextMenu menu, @NonNull View v, Cont\n \n @Override\n public boolean onContextItemSelected(@NonNull MenuItem item) {\n- NavDrawerData.DrawerItem pressedItem = contextPressedItem;\n+ DrawerItem pressedItem = contextPressedItem;\n contextPressedItem = null;\n if (pressedItem == null) {\n return false;\n }\n- if (pressedItem.type == NavDrawerData.DrawerItem.Type.FEED) {\n- return onFeedContextMenuClicked(((NavDrawerData.FeedDrawerItem) pressedItem).feed, item);\n+ if (pressedItem.isFeed()) {\n+ return onFeedContextMenuClicked(pressedItem.asFeed(), item);\n } else {\n- return onTagContextMenuClicked(pressedItem, item);\n+ return onTagContextMenuClicked(pressedItem.asTag(), item);\n }\n }\n \n@@ -204,7 +206,7 @@ private boolean onFeedContextMenuClicked(Feed feed, MenuItem item) {\n return super.onContextItemSelected(item);\n }\n \n- private boolean onTagContextMenuClicked(NavDrawerData.DrawerItem drawerItem, MenuItem item) {\n+ private boolean onTagContextMenuClicked(NavDrawerData.TagItem drawerItem, MenuItem item) {\n final int itemId = item.getItemId();\n if (itemId == R.id.rename_folder_item) {\n new RenameFeedDialog(getActivity(), drawerItem).show();\n@@ -216,10 +218,8 @@ private boolean onTagContextMenuClicked(NavDrawerData.DrawerItem drawerItem, Men\n \n @Override\n public void onConfirmButtonPressed(DialogInterface dialog) {\n- List feeds = ((NavDrawerData.TagDrawerItem) drawerItem).getChildren();\n-\n- for (NavDrawerData.DrawerItem feed : feeds) {\n- FeedPreferences preferences = ((NavDrawerData.FeedDrawerItem) feed).feed.getPreferences();\n+ for (Feed feed : drawerItem.getFeeds()) {\n+ FeedPreferences preferences = feed.getPreferences();\n preferences.getTags().remove(drawerItem.getTitle());\n DBWriter.setFeedPreferences(preferences);\n }\n@@ -272,7 +272,7 @@ public int getCount() {\n }\n \n @Override\n- public NavDrawerData.DrawerItem getItem(int position) {\n+ public DrawerItem getItem(int position) {\n if (flatItemList != null && 0 <= position && position < flatItemList.size()) {\n return flatItemList.get(position);\n } else {\n@@ -288,11 +288,11 @@ public boolean isSelected(int position) {\n } else if (StringUtils.isNumeric(lastNavFragment)) { // last fragment was not a list, but a feed\n long feedId = Long.parseLong(lastNavFragment);\n if (navDrawerData != null) {\n- NavDrawerData.DrawerItem itemToCheck = flatItemList.get(\n+ DrawerItem itemToCheck = flatItemList.get(\n position - navAdapter.getSubscriptionOffset());\n- if (itemToCheck.type == NavDrawerData.DrawerItem.Type.FEED) {\n+ if (itemToCheck.isFeed()) {\n // When the same feed is displayed multiple times, it should be highlighted multiple times.\n- return ((NavDrawerData.FeedDrawerItem) itemToCheck).feed.getId() == feedId;\n+ return itemToCheck.asFeed().getId() == feedId;\n }\n }\n }\n@@ -341,15 +341,15 @@ public void onItemClick(int position) {\n ((MainActivity) getActivity()).getBottomSheet().setState(BottomSheetBehavior.STATE_COLLAPSED);\n } else {\n int pos = position - navAdapter.getSubscriptionOffset();\n- NavDrawerData.DrawerItem clickedItem = flatItemList.get(pos);\n+ DrawerItem clickedItem = flatItemList.get(pos);\n \n- if (clickedItem.type == NavDrawerData.DrawerItem.Type.FEED) {\n- long feedId = ((NavDrawerData.FeedDrawerItem) clickedItem).feed.getId();\n+ if (clickedItem.isFeed()) {\n+ long feedId = clickedItem.asFeed().getId();\n ((MainActivity) getActivity()).loadFeedFragmentById(feedId, null);\n ((MainActivity) getActivity()).getBottomSheet()\n .setState(BottomSheetBehavior.STATE_COLLAPSED);\n } else {\n- NavDrawerData.TagDrawerItem folder = ((NavDrawerData.TagDrawerItem) clickedItem);\n+ NavDrawerData.TagItem folder = clickedItem.asTag();\n if (openFolders.contains(folder.getTitle())) {\n openFolders.remove(folder.getTitle());\n } else {\n@@ -361,7 +361,8 @@ public void onItemClick(int position) {\n .putStringSet(PREF_OPEN_FOLDERS, openFolders)\n .apply();\n \n- disposable = Observable.fromCallable(() -> makeFlatDrawerData(navDrawerData.items, 0))\n+ disposable = Observable.fromCallable(() -> makeFlatDrawerData(navDrawerData.feeds,\n+ navDrawerData.tags, navDrawerData.feedCounters))\n .subscribeOn(Schedulers.computation())\n .observeOn(AndroidSchedulers.mainThread())\n .subscribe(\n@@ -409,7 +410,7 @@ private void loadData() {\n NavDrawerData data = DBReader.getNavDrawerData(UserPreferences.getSubscriptionsFilter(),\n UserPreferences.getFeedOrder(), UserPreferences.getFeedCounterSetting());\n reclaimableSpace = EpisodeCleanupAlgorithmFactory.build().getReclaimableItems();\n- return new Pair<>(data, makeFlatDrawerData(data.items, 0));\n+ return new Pair<>(data, makeFlatDrawerData(data.feeds, data.tags, data.feedCounters));\n })\n .subscribeOn(Schedulers.io())\n .observeOn(AndroidSchedulers.mainThread())\n@@ -425,23 +426,38 @@ private void loadData() {\n });\n }\n \n- private List makeFlatDrawerData(List items, int layer) {\n- List flatItems = new ArrayList<>();\n- for (NavDrawerData.DrawerItem item : items) {\n- item.setLayer(layer);\n- flatItems.add(item);\n- if (item.type == NavDrawerData.DrawerItem.Type.TAG) {\n- NavDrawerData.TagDrawerItem folder = ((NavDrawerData.TagDrawerItem) item);\n- folder.setOpen(openFolders.contains(folder.getTitle()));\n- if (folder.isOpen()) {\n- flatItems.addAll(makeFlatDrawerData(\n- ((NavDrawerData.TagDrawerItem) item).getChildren(), layer + 1));\n+ private List makeFlatDrawerData(List feeds, List tags,\n+ @Nullable java.util.Map feedCounters) {\n+ List flatItems = new ArrayList<>();\n+ for (Feed feed : feeds) {\n+ flatItems.add(new DrawerItem(feed, feedCounter(feed, feedCounters), 0));\n+ }\n+ for (NavDrawerData.TagItem tag : tags) {\n+ if (FeedPreferences.TAG_ROOT.equals(tag.getTitle())) {\n+ continue;\n+ }\n+ DrawerItem tagItem = new DrawerItem(tag);\n+ flatItems.add(tagItem);\n+ int counter = 0;\n+ tag.setOpen(openFolders.contains(tag.getTitle()));\n+ for (Feed feed : tag.getFeeds()) {\n+ counter += feedCounter(feed, feedCounters);\n+ if (tag.isOpen()) {\n+ flatItems.add(new DrawerItem(feed, feedCounter(feed, feedCounters), 1));\n }\n }\n+ tagItem.setCounter(counter);\n }\n return flatItems;\n }\n \n+ private int feedCounter(Feed feed, Map feedCounters) {\n+ if (navDrawerData == null || feedCounters == null) {\n+ return 0;\n+ }\n+ return feedCounters.containsKey(feed.getId()) ? feedCounters.get(feed.getId()) : 0;\n+ }\n+\n public static void saveLastNavFragment(Context context, String tag) {\n Log.d(TAG, \"saveLastNavFragment(tag: \" + tag + \")\");\n SharedPreferences prefs = context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavListAdapter.java\nindex 763b0ca1f25..47783f88d7a 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavListAdapter.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavListAdapter.java\n@@ -107,7 +107,7 @@ public int getItemCount() {\n public long getItemId(int position) {\n int viewType = getItemViewType(position);\n if (viewType == VIEW_TYPE_SUBSCRIPTION) {\n- return itemAccess.getItem(position - getSubscriptionOffset()).id;\n+ return itemAccess.getItem(position - getSubscriptionOffset()).getId();\n } else if (viewType == VIEW_TYPE_NAV) {\n return -Math.abs((long) fragmentTags.get(position).hashCode()) - 1; // Folder IDs are >0\n } else {\n@@ -154,12 +154,12 @@ public void onBindViewHolder(@NonNull Holder holder, int position) {\n bindSectionDivider((DividerHolder) holder);\n } else {\n int itemPos = position - getSubscriptionOffset();\n- NavDrawerData.DrawerItem item = itemAccess.getItem(itemPos);\n+ DrawerItem item = itemAccess.getItem(itemPos);\n bindListItem(item, (FeedHolder) holder);\n- if (item.type == NavDrawerData.DrawerItem.Type.FEED) {\n- bindFeedView((NavDrawerData.FeedDrawerItem) item, (FeedHolder) holder);\n+ if (item.isFeed()) {\n+ bindFeedView(item.asFeed(), (FeedHolder) holder);\n } else {\n- bindTagView((NavDrawerData.TagDrawerItem) item, (FeedHolder) holder);\n+ bindTagView(item.asTag(), (FeedHolder) holder);\n }\n holder.itemView.setOnCreateContextMenuListener(itemAccess);\n }\n@@ -231,7 +231,7 @@ private void bindSectionDivider(DividerHolder holder) {\n }\n }\n \n- private void bindListItem(NavDrawerData.DrawerItem item, FeedHolder holder) {\n+ private void bindListItem(DrawerItem item, FeedHolder holder) {\n if (item.getCounter() > 0) {\n holder.count.setVisibility(View.VISIBLE);\n holder.count.setText(NumberFormat.getInstance().format(item.getCounter()));\n@@ -243,8 +243,7 @@ private void bindListItem(NavDrawerData.DrawerItem item, FeedHolder holder) {\n holder.itemView.setPadding(item.getLayer() * padding, 0, 0, 0);\n }\n \n- private void bindFeedView(NavDrawerData.FeedDrawerItem drawerItem, FeedHolder holder) {\n- Feed feed = drawerItem.feed;\n+ private void bindFeedView(Feed feed, FeedHolder holder) {\n Activity context = activity.get();\n if (context == null) {\n return;\n@@ -264,7 +263,7 @@ private void bindFeedView(NavDrawerData.FeedDrawerItem drawerItem, FeedHolder ho\n holder.failure.setVisibility(feed.hasLastUpdateFailed() ? View.VISIBLE : View.GONE);\n }\n \n- private void bindTagView(NavDrawerData.TagDrawerItem tag, FeedHolder holder) {\n+ private void bindTagView(NavDrawerData.TagItem tag, FeedHolder holder) {\n Activity context = activity.get();\n if (context == null) {\n return;\n@@ -323,7 +322,7 @@ public FeedHolder(@NonNull View itemView) {\n public interface ItemAccess extends View.OnCreateContextMenuListener {\n int getCount();\n \n- NavDrawerData.DrawerItem getItem(int position);\n+ DrawerItem getItem(int position);\n \n boolean isSelected(int position);\n \ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/RenameFeedDialog.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/RenameFeedDialog.java\nindex 4ce9632f348..4339b63aaae 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/RenameFeedDialog.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/RenameFeedDialog.java\n@@ -3,8 +3,6 @@\n import android.app.Activity;\n \n import java.lang.ref.WeakReference;\n-import java.util.ArrayList;\n-import java.util.List;\n \n import android.view.LayoutInflater;\n import androidx.appcompat.app.AlertDialog;\n@@ -20,16 +18,16 @@ public class RenameFeedDialog {\n \n private final WeakReference activityRef;\n private Feed feed = null;\n- private NavDrawerData.DrawerItem drawerItem = null;\n+ private NavDrawerData.TagItem tag = null;\n \n public RenameFeedDialog(Activity activity, Feed feed) {\n this.activityRef = new WeakReference<>(activity);\n this.feed = feed;\n }\n \n- public RenameFeedDialog(Activity activity, NavDrawerData.DrawerItem drawerItem) {\n+ public RenameFeedDialog(Activity activity, NavDrawerData.TagItem drawerItem) {\n this.activityRef = new WeakReference<>(activity);\n- this.drawerItem = drawerItem;\n+ this.tag = drawerItem;\n }\n \n public void show() {\n@@ -39,7 +37,7 @@ public void show() {\n }\n \n final EditTextDialogBinding binding = EditTextDialogBinding.inflate(LayoutInflater.from(activity));\n- String title = feed != null ? feed.getTitle() : drawerItem.getTitle();\n+ String title = feed != null ? feed.getTitle() : tag.getTitle();\n \n binding.textInput.setText(title);\n AlertDialog dialog = new MaterialAlertDialogBuilder(activity)\n@@ -64,17 +62,11 @@ public void show() {\n }\n \n private void renameTag(String title) {\n- if (NavDrawerData.DrawerItem.Type.TAG == drawerItem.type) {\n- List feedPreferences = new ArrayList<>();\n- for (NavDrawerData.DrawerItem item : ((NavDrawerData.TagDrawerItem) drawerItem).getChildren()) {\n- feedPreferences.add(((NavDrawerData.FeedDrawerItem) item).feed.getPreferences());\n- }\n-\n- for (FeedPreferences preferences : feedPreferences) {\n- preferences.getTags().remove(drawerItem.getTitle());\n- preferences.getTags().add(title);\n- DBWriter.setFeedPreferences(preferences);\n- }\n+ for (Feed feed : tag.getFeeds()) {\n+ FeedPreferences preferences = feed.getPreferences();\n+ preferences.getTags().remove(tag.getTitle());\n+ preferences.getTags().add(title);\n+ DBWriter.setFeedPreferences(preferences);\n }\n }\n \ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/TagSettingsDialog.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/TagSettingsDialog.java\nindex 5e5d59527c7..3c89da0d1f5 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/TagSettingsDialog.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/TagSettingsDialog.java\n@@ -7,33 +7,30 @@\n import android.view.MotionEvent;\n import android.view.View;\n import android.widget.ArrayAdapter;\n-\n import androidx.annotation.NonNull;\n import androidx.annotation.Nullable;\n import androidx.fragment.app.DialogFragment;\n import androidx.recyclerview.widget.GridLayoutManager;\n-\n import com.google.android.material.dialog.MaterialAlertDialogBuilder;\n-\n-import java.util.ArrayList;\n-import java.util.HashSet;\n-import java.util.List;\n-import java.util.Set;\n-\n import de.danoeh.antennapod.R;\n-import de.danoeh.antennapod.ui.SimpleChipAdapter;\n-import de.danoeh.antennapod.storage.database.DBReader;\n-import de.danoeh.antennapod.storage.database.DBWriter;\n-import de.danoeh.antennapod.storage.database.NavDrawerData;\n import de.danoeh.antennapod.databinding.EditTagsDialogBinding;\n import de.danoeh.antennapod.model.feed.FeedCounter;\n import de.danoeh.antennapod.model.feed.FeedOrder;\n import de.danoeh.antennapod.model.feed.FeedPreferences;\n+import de.danoeh.antennapod.storage.database.DBReader;\n+import de.danoeh.antennapod.storage.database.DBWriter;\n+import de.danoeh.antennapod.storage.database.NavDrawerData;\n+import de.danoeh.antennapod.ui.SimpleChipAdapter;\n import de.danoeh.antennapod.ui.view.ItemOffsetDecoration;\n-import io.reactivex.rxjava3.core.Observable;\n import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;\n+import io.reactivex.rxjava3.core.Observable;\n import io.reactivex.rxjava3.schedulers.Schedulers;\n \n+import java.util.ArrayList;\n+import java.util.HashSet;\n+import java.util.List;\n+import java.util.Set;\n+\n public class TagSettingsDialog extends DialogFragment {\n public static final String TAG = \"TagSettingsDialog\";\n private static final String ARG_FEED_PREFERENCES = \"feed_preferences\";\n@@ -113,10 +110,9 @@ private void loadTags() {\n Observable.fromCallable(\n () -> {\n NavDrawerData data = DBReader.getNavDrawerData(null, FeedOrder.ALPHABETICAL, FeedCounter.SHOW_NONE);\n- List items = data.items;\n- List folders = new ArrayList();\n- for (NavDrawerData.DrawerItem item : items) {\n- if (item.type == NavDrawerData.DrawerItem.Type.TAG) {\n+ List folders = new ArrayList<>();\n+ for (NavDrawerData.TagItem item : data.tags) {\n+ if (!FeedPreferences.TAG_ROOT.equals(item.getTitle())) {\n folders.add(item.getTitle());\n }\n }\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionFragment.java\nindex 1f00251d02e..307436babf6 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionFragment.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionFragment.java\n@@ -11,7 +11,6 @@\n import android.view.View;\n import android.view.ViewGroup;\n import android.widget.ProgressBar;\n-\n import androidx.annotation.NonNull;\n import androidx.core.util.Pair;\n import androidx.fragment.app.Fragment;\n@@ -19,43 +18,40 @@\n import androidx.recyclerview.widget.LinearLayoutManager;\n import androidx.recyclerview.widget.RecyclerView;\n import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;\n-\n import com.google.android.material.appbar.MaterialToolbar;\n import com.google.android.material.floatingactionbutton.FloatingActionButton;\n-\n-import de.danoeh.antennapod.model.feed.FeedPreferences;\n-import de.danoeh.antennapod.storage.database.DBWriter;\n-import de.danoeh.antennapod.ui.common.ConfirmationDialog;\n-import de.danoeh.antennapod.ui.screen.AddFeedFragment;\n-import de.danoeh.antennapod.ui.screen.SearchFragment;\n-import de.danoeh.antennapod.net.download.serviceinterface.FeedUpdateManager;\n-import de.danoeh.antennapod.ui.view.FloatingSelectMenu;\n-import org.greenrobot.eventbus.EventBus;\n-import org.greenrobot.eventbus.Subscribe;\n-import org.greenrobot.eventbus.ThreadMode;\n-\n-import java.util.ArrayList;\n-import java.util.List;\n-import java.util.Locale;\n-\n import de.danoeh.antennapod.R;\n import de.danoeh.antennapod.activity.MainActivity;\n-import de.danoeh.antennapod.ui.MenuItemUtils;\n-import de.danoeh.antennapod.storage.database.DBReader;\n-import de.danoeh.antennapod.storage.database.NavDrawerData;\n-import de.danoeh.antennapod.ui.screen.feed.RenameFeedDialog;\n import de.danoeh.antennapod.event.FeedListUpdateEvent;\n import de.danoeh.antennapod.event.FeedUpdateRunningEvent;\n import de.danoeh.antennapod.event.UnreadItemsUpdateEvent;\n import de.danoeh.antennapod.model.feed.Feed;\n+import de.danoeh.antennapod.model.feed.FeedPreferences;\n+import de.danoeh.antennapod.net.download.serviceinterface.FeedUpdateManager;\n+import de.danoeh.antennapod.storage.database.DBReader;\n+import de.danoeh.antennapod.storage.database.DBWriter;\n+import de.danoeh.antennapod.storage.database.NavDrawerData;\n import de.danoeh.antennapod.storage.preferences.UserPreferences;\n+import de.danoeh.antennapod.ui.MenuItemUtils;\n+import de.danoeh.antennapod.ui.common.ConfirmationDialog;\n+import de.danoeh.antennapod.ui.screen.AddFeedFragment;\n+import de.danoeh.antennapod.ui.screen.SearchFragment;\n+import de.danoeh.antennapod.ui.screen.feed.RenameFeedDialog;\n import de.danoeh.antennapod.ui.statistics.StatisticsFragment;\n import de.danoeh.antennapod.ui.view.EmptyViewHandler;\n+import de.danoeh.antennapod.ui.view.FloatingSelectMenu;\n+import de.danoeh.antennapod.ui.view.ItemOffsetDecoration;\n import de.danoeh.antennapod.ui.view.LiftOnScrollListener;\n-import io.reactivex.rxjava3.core.Observable;\n import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;\n+import io.reactivex.rxjava3.core.Observable;\n import io.reactivex.rxjava3.disposables.Disposable;\n import io.reactivex.rxjava3.schedulers.Schedulers;\n+import org.greenrobot.eventbus.EventBus;\n+import org.greenrobot.eventbus.Subscribe;\n+import org.greenrobot.eventbus.ThreadMode;\n+\n+import java.util.List;\n+import java.util.Locale;\n \n /**\n * Fragment for displaying feed subscriptions\n@@ -66,6 +62,7 @@ public class SubscriptionFragment extends Fragment\n public static final String TAG = \"SubscriptionFragment\";\n private static final String PREFS = \"SubscriptionFragment\";\n private static final String PREF_NUM_COLUMNS = \"columns\";\n+ private static final String PREF_LAST_TAG = \"last_tag\";\n private static final String KEY_UP_ARROW = \"up_arrow\";\n private static final String ARGUMENT_FOLDER = \"folder\";\n \n@@ -79,12 +76,13 @@ public class SubscriptionFragment extends Fragment\n \n private RecyclerView subscriptionRecycler;\n private SubscriptionsRecyclerAdapter subscriptionAdapter;\n+ private RecyclerView tagsRecycler;\n+ private SubscriptionTagAdapter tagAdapter;\n private EmptyViewHandler emptyView;\n private View feedsFilteredMsg;\n private MaterialToolbar toolbar;\n private SwipeRefreshLayout swipeRefreshLayout;\n private ProgressBar progressBar;\n- private String displayedFolder = null;\n private boolean displayUpArrow;\n \n private Disposable disposable;\n@@ -94,7 +92,7 @@ public class SubscriptionFragment extends Fragment\n private FloatingActionButton subscriptionAddButton;\n private FloatingSelectMenu floatingSelectMenu;\n private RecyclerView.ItemDecoration itemDecoration;\n- private List listItems;\n+ private List feeds;\n \n public static SubscriptionFragment newInstance(String folderTitle) {\n SubscriptionFragment fragment = new SubscriptionFragment();\n@@ -134,13 +132,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,\n }\n refreshToolbarState();\n \n- if (getArguments() != null) {\n- displayedFolder = getArguments().getString(ARGUMENT_FOLDER, null);\n- if (displayedFolder != null) {\n- toolbar.setTitle(displayedFolder);\n- }\n- }\n-\n subscriptionRecycler = root.findViewById(R.id.subscriptions_grid);\n registerForContextMenu(subscriptionRecycler);\n subscriptionRecycler.addOnScrollListener(new LiftOnScrollListener(root.findViewById(R.id.appbar)));\n@@ -186,6 +177,28 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMen\n return true;\n });\n \n+ tagsRecycler = root.findViewById(R.id.tags_recycler);\n+ tagsRecycler.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));\n+ tagsRecycler.addItemDecoration(new ItemOffsetDecoration(getContext(), 4, 0));\n+ registerForContextMenu(tagsRecycler);\n+ tagAdapter = new SubscriptionTagAdapter(getActivity()) {\n+ @Override\n+ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {\n+ super.onCreateContextMenu(menu, v, menuInfo);\n+ MenuItemUtils.setOnClickListeners(menu, SubscriptionFragment.this::onTagContextItemSelected);\n+ }\n+\n+ @Override\n+ protected void onTagClick(NavDrawerData.TagItem tag) {\n+ tagAdapter.setSelectedTag(tag.getTitle());\n+ loadSubscriptionsAndTags();\n+ }\n+ };\n+ tagAdapter.setSelectedTag(prefs.getString(PREF_LAST_TAG, FeedPreferences.TAG_ROOT));\n+ tagsRecycler.setAdapter(tagAdapter);\n+ if (getArguments() != null) {\n+ tagAdapter.setSelectedTag(getArguments().getString(ARGUMENT_FOLDER, null));\n+ }\n return root;\n }\n \n@@ -282,13 +295,14 @@ private void setupEmptyView() {\n public void onStart() {\n super.onStart();\n EventBus.getDefault().register(this);\n- loadSubscriptions();\n+ loadSubscriptionsAndTags();\n }\n \n @Override\n public void onPause() {\n super.onPause();\n scrollPosition = getScrollPosition();\n+ prefs.edit().putString(PREF_LAST_TAG, tagAdapter.getSelectedTag()).apply();\n }\n \n @Override\n@@ -303,44 +317,45 @@ public void onStop() {\n }\n }\n \n- private void loadSubscriptions() {\n+ private void loadSubscriptionsAndTags() {\n if (disposable != null) {\n disposable.dispose();\n }\n emptyView.hide();\n disposable = Observable.fromCallable(\n- () -> {\n- NavDrawerData data = DBReader.getNavDrawerData(UserPreferences.getSubscriptionsFilter(),\n- UserPreferences.getFeedOrder(), UserPreferences.getFeedCounterSetting());\n- List items = data.items;\n- for (NavDrawerData.DrawerItem item : items) {\n- if (item.type == NavDrawerData.DrawerItem.Type.TAG\n- && item.getTitle().equals(displayedFolder)) {\n- return ((NavDrawerData.TagDrawerItem) item).getChildren();\n- }\n- }\n- return items;\n- })\n+ () -> DBReader.getNavDrawerData(UserPreferences.getSubscriptionsFilter(),\n+ UserPreferences.getFeedOrder(), UserPreferences.getFeedCounterSetting()))\n .subscribeOn(Schedulers.io())\n .observeOn(AndroidSchedulers.mainThread())\n .subscribe(\n result -> {\n- final boolean firstLoaded = listItems == null || listItems.isEmpty();\n- if (listItems != null && listItems.size() > result.size()) {\n+ List openedFolderFeeds = result.feeds;\n+ for (NavDrawerData.TagItem tag : result.tags) {\n+ if (tag.getTitle().equals(tagAdapter.getSelectedTag())) {\n+ openedFolderFeeds = tag.getFeeds();\n+ break;\n+ }\n+ }\n+\n+ final boolean firstLoaded = feeds == null || feeds.isEmpty();\n+ if (feeds != null && feeds.size() > openedFolderFeeds.size()) {\n // We have fewer items. This can result in items being selected that are no longer visible.\n subscriptionAdapter.endSelectMode();\n }\n- listItems = result;\n+ feeds = openedFolderFeeds;\n progressBar.setVisibility(View.GONE);\n- subscriptionAdapter.setItems(result);\n+ subscriptionAdapter.setItems(feeds, result.feedCounters);\n if (firstLoaded) {\n restoreScrollPosition(scrollPosition);\n }\n emptyView.updateVisibility();\n+ if (tagAdapter != null) {\n+ tagAdapter.setTags(result.tags);\n+ tagsRecycler.setVisibility(result.tags.size() > 1 ? View.VISIBLE : View.GONE);\n+ }\n }, error -> {\n Log.e(TAG, Log.getStackTraceString(error));\n });\n-\n updateFilterVisibility();\n }\n \n@@ -358,75 +373,71 @@ private int getDefaultNumOfColumns() {\n return getResources().getInteger(R.integer.subscriptions_default_num_of_columns);\n }\n \n- @Override\n- public boolean onContextItemSelected(MenuItem item) {\n- NavDrawerData.DrawerItem drawerItem = subscriptionAdapter.getSelectedItem();\n- if (drawerItem == null) {\n+ private boolean onTagContextItemSelected(MenuItem item) {\n+ NavDrawerData.TagItem selectedTag = tagAdapter.getLongPressedItem();\n+ if (selectedTag == null) {\n return false;\n }\n int itemId = item.getItemId();\n- if (drawerItem.type == NavDrawerData.DrawerItem.Type.TAG) {\n- if (itemId == R.id.rename_folder_item) {\n- new RenameFeedDialog(getActivity(), drawerItem).show();\n- return true;\n- } else if (itemId == R.id.delete_folder_item) {\n- ConfirmationDialog dialog = new ConfirmationDialog(\n- getContext(), R.string.delete_tag_label,\n- getString(R.string.delete_tag_confirmation, drawerItem.getTitle())) {\n-\n- @Override\n- public void onConfirmButtonPressed(DialogInterface dialog) {\n- List feeds = ((NavDrawerData.TagDrawerItem) drawerItem).getChildren();\n-\n- for (NavDrawerData.DrawerItem feed : feeds) {\n- FeedPreferences preferences = ((NavDrawerData.FeedDrawerItem) feed).feed.getPreferences();\n- preferences.getTags().remove(drawerItem.getTitle());\n- DBWriter.setFeedPreferences(preferences);\n- }\n+ if (itemId == R.id.rename_folder_item) {\n+ new RenameFeedDialog(getActivity(), selectedTag).show();\n+ return true;\n+ } else if (itemId == R.id.delete_folder_item) {\n+ ConfirmationDialog dialog = new ConfirmationDialog(getContext(), R.string.delete_tag_label,\n+ getString(R.string.delete_tag_confirmation, selectedTag.getTitle())) {\n+\n+ @Override\n+ public void onConfirmButtonPressed(DialogInterface dialog) {\n+ tagAdapter.setSelectedTag(FeedPreferences.TAG_ROOT);\n+ for (Feed feed : selectedTag.getFeeds()) {\n+ FeedPreferences preferences = feed.getPreferences();\n+ preferences.getTags().remove(selectedTag.getTitle());\n+ DBWriter.setFeedPreferences(preferences);\n }\n- };\n- dialog.createNewDialog().show();\n+ }\n+ };\n+ dialog.createNewDialog().show();\n \n- return true;\n- }\n+ return true;\n }\n+ return false;\n+ }\n \n- Feed feed = ((NavDrawerData.FeedDrawerItem) drawerItem).feed;\n- if (itemId == R.id.multi_select) {\n+ @Override\n+ public boolean onContextItemSelected(@NonNull MenuItem item) {\n+ Feed selectedFeed = subscriptionAdapter.getSelectedItem();\n+ if (selectedFeed == null) {\n+ return false;\n+ }\n+ if (item.getItemId() == R.id.multi_select) {\n return subscriptionAdapter.onContextItemSelected(item);\n }\n- return FeedMenuHandler.onMenuItemClicked(this, item.getItemId(), feed, this::loadSubscriptions);\n+ return FeedMenuHandler.onMenuItemClicked(this, item.getItemId(), selectedFeed, this::loadSubscriptionsAndTags);\n }\n \n @Subscribe(threadMode = ThreadMode.MAIN)\n public void onFeedListChanged(FeedListUpdateEvent event) {\n- loadSubscriptions();\n+ loadSubscriptionsAndTags();\n }\n \n @Subscribe(threadMode = ThreadMode.MAIN)\n public void onUnreadItemsChanged(UnreadItemsUpdateEvent event) {\n- loadSubscriptions();\n+ loadSubscriptionsAndTags();\n }\n \n @Override\n public void onEndSelectMode() {\n floatingSelectMenu.setVisibility(View.GONE);\n subscriptionAddButton.setVisibility(View.VISIBLE);\n- subscriptionAdapter.setItems(listItems);\n+ tagsRecycler.setVisibility(tagAdapter.getItemCount() > 1 ? View.VISIBLE : View.GONE);\n updateFilterVisibility();\n }\n \n @Override\n public void onStartSelectMode() {\n- List feedsOnly = new ArrayList<>();\n- for (NavDrawerData.DrawerItem item : listItems) {\n- if (item.type == NavDrawerData.DrawerItem.Type.FEED) {\n- feedsOnly.add(item);\n- }\n- }\n- subscriptionAdapter.setItems(feedsOnly);\n floatingSelectMenu.setVisibility(View.VISIBLE);\n subscriptionAddButton.setVisibility(View.GONE);\n+ tagsRecycler.setVisibility(tagAdapter.getItemCount() > 1 ? View.INVISIBLE : View.GONE);\n updateFilterVisibility();\n }\n \ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionTagAdapter.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionTagAdapter.java\nnew file mode 100644\nindex 00000000000..11328323630\n--- /dev/null\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionTagAdapter.java\n@@ -0,0 +1,116 @@\n+package de.danoeh.antennapod.ui.screen.subscriptions;\n+\n+import android.app.Activity;\n+import android.os.Build;\n+import android.view.ContextMenu;\n+import android.view.InputDevice;\n+import android.view.LayoutInflater;\n+import android.view.MenuInflater;\n+import android.view.MotionEvent;\n+import android.view.View;\n+import android.view.ViewGroup;\n+import androidx.annotation.NonNull;\n+import androidx.recyclerview.widget.RecyclerView;\n+import com.google.android.material.chip.Chip;\n+import de.danoeh.antennapod.R;\n+import de.danoeh.antennapod.model.feed.FeedPreferences;\n+import de.danoeh.antennapod.storage.database.NavDrawerData;\n+\n+import java.lang.ref.WeakReference;\n+import java.util.ArrayList;\n+import java.util.List;\n+\n+public class SubscriptionTagAdapter extends RecyclerView.Adapter\n+ implements View.OnCreateContextMenuListener {\n+ private final WeakReference activityRef;\n+ private List tags = new ArrayList<>();\n+ private String selectedTag = null;\n+ private NavDrawerData.TagItem longPressedItem = null;\n+\n+ public SubscriptionTagAdapter(Activity activity) {\n+ this.activityRef = new WeakReference<>(activity);\n+ }\n+\n+ public void setTags(List tags) {\n+ this.tags = tags;\n+ notifyDataSetChanged();\n+ }\n+\n+ public void setSelectedTag(String tag) {\n+ this.selectedTag = tag;\n+ notifyDataSetChanged();\n+ }\n+\n+ public String getSelectedTag() {\n+ return selectedTag;\n+ }\n+\n+ @NonNull\n+ @Override\n+ public TagViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {\n+ View view = LayoutInflater.from(parent.getContext())\n+ .inflate(R.layout.item_tag_chip, parent, false);\n+ return new TagViewHolder(view);\n+ }\n+\n+ @Override\n+ public void onBindViewHolder(@NonNull TagViewHolder holder, int position) {\n+ NavDrawerData.TagItem tag = tags.get(position);\n+ if (FeedPreferences.TAG_ROOT.equals(tag.getTitle())) {\n+ holder.chip.setText(R.string.tag_all);\n+ } else {\n+ String title = tag.getTitle();\n+ if (title.length() > 20) {\n+ title = title.substring(0, 19) + \"\u2026\";\n+ }\n+ holder.chip.setText(title);\n+ }\n+ holder.chip.setChecked(tag.getTitle().equals(selectedTag));\n+ holder.chip.setOnClickListener(v -> onTagClick(tag));\n+ holder.chip.setOnTouchListener((v, e) -> {\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {\n+ if (e.isFromSource(InputDevice.SOURCE_MOUSE)\n+ && e.getButtonState() == MotionEvent.BUTTON_SECONDARY) {\n+ longPressedItem = tag;\n+ }\n+ }\n+ return false;\n+ });\n+ holder.chip.setOnLongClickListener(v -> {\n+ longPressedItem = tag;\n+ return false;\n+ });\n+ holder.chip.setOnCreateContextMenuListener(this);\n+ }\n+\n+ @Override\n+ public int getItemCount() {\n+ return tags != null ? tags.size() : 0;\n+ }\n+\n+ @Override\n+ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {\n+ if (longPressedItem == null || FeedPreferences.TAG_ROOT.equals(longPressedItem.getTitle())) {\n+ return;\n+ }\n+ MenuInflater inflater = activityRef.get().getMenuInflater();\n+ inflater.inflate(R.menu.nav_folder_context, menu);\n+ menu.setHeaderTitle(longPressedItem.getTitle());\n+ }\n+\n+ protected void onTagClick(NavDrawerData.TagItem tag) {\n+ }\n+\n+ public NavDrawerData.TagItem getLongPressedItem() {\n+ return longPressedItem;\n+ }\n+\n+ public static class TagViewHolder extends RecyclerView.ViewHolder {\n+ public final Chip chip;\n+\n+ public TagViewHolder(@NonNull View itemView) {\n+ super(itemView);\n+ chip = itemView.findViewById(R.id.tag_chip);\n+ }\n+ }\n+}\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionViewHolder.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionViewHolder.java\nindex 79b58f8d7b9..d85f9bb6478 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionViewHolder.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionViewHolder.java\n@@ -13,7 +13,6 @@\n import androidx.recyclerview.widget.RecyclerView;\n import de.danoeh.antennapod.R;\n import de.danoeh.antennapod.model.feed.Feed;\n-import de.danoeh.antennapod.storage.database.NavDrawerData;\n import de.danoeh.antennapod.storage.preferences.UserPreferences;\n import de.danoeh.antennapod.ui.CoverLoader;\n import de.danoeh.antennapod.ui.common.ThemeUtils;\n@@ -45,35 +44,28 @@ public SubscriptionViewHolder(@NonNull View itemView, Activity mainActivity) {\n this.mainActivityRef = new WeakReference<>(mainActivity);\n }\n \n- public void bind(NavDrawerData.DrawerItem drawerItem, int columnCount) {\n+ public void bind(Feed feed, int columnCount, int counter) {\n if (selectView != null) {\n Drawable drawable = AppCompatResources.getDrawable(selectView.getContext(),\n R.drawable.ic_checkbox_background);\n selectView.setBackground(drawable); // Setting this in XML crashes API <= 21\n }\n- title.setText(drawerItem.getTitle());\n- fallbackTitle.setText(drawerItem.getTitle());\n- coverImage.setContentDescription(drawerItem.getTitle());\n- if (drawerItem.getCounter() > 0) {\n- count.setText(NumberFormat.getInstance().format(drawerItem.getCounter()));\n+ title.setText(feed.getTitle());\n+ fallbackTitle.setText(feed.getTitle());\n+ coverImage.setContentDescription(feed.getTitle());\n+ if (counter > 0) {\n+ count.setText(NumberFormat.getInstance().format(counter));\n count.setVisibility(View.VISIBLE);\n } else {\n count.setVisibility(View.GONE);\n }\n \n CoverLoader coverLoader = new CoverLoader();\n- boolean textAndImageCombined;\n- if (drawerItem.type == NavDrawerData.DrawerItem.Type.FEED) {\n- Feed feed = ((NavDrawerData.FeedDrawerItem) drawerItem).feed;\n- textAndImageCombined = feed.isLocalFeed() && feed.getImageUrl() != null\n- && feed.getImageUrl().startsWith(Feed.PREFIX_GENERATIVE_COVER);\n- coverLoader.withUri(feed.getImageUrl());\n- errorIcon.setVisibility(feed.hasLastUpdateFailed() ? View.VISIBLE : View.GONE);\n- } else {\n- textAndImageCombined = true;\n- coverLoader.withResource(R.drawable.ic_tag);\n- errorIcon.setVisibility(View.GONE);\n- }\n+ boolean textAndImageCombined = feed.isLocalFeed() && feed.getImageUrl() != null\n+ && feed.getImageUrl().startsWith(Feed.PREFIX_GENERATIVE_COVER);\n+ coverLoader.withUri(feed.getImageUrl());\n+ errorIcon.setVisibility(feed.hasLastUpdateFailed() ? View.VISIBLE : View.GONE);\n+\n if (UserPreferences.shouldShowSubscriptionTitle() || columnCount == 1) {\n // No need for fallback title when already showing title\n fallbackTitle.setVisibility(View.GONE);\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionsRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionsRecyclerAdapter.java\nindex 1a243a250fd..0a35a015a13 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionsRecyclerAdapter.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionsRecyclerAdapter.java\n@@ -18,7 +18,6 @@\n import de.danoeh.antennapod.R;\n import de.danoeh.antennapod.activity.MainActivity;\n import de.danoeh.antennapod.model.feed.Feed;\n-import de.danoeh.antennapod.storage.database.NavDrawerData;\n import de.danoeh.antennapod.storage.preferences.UserPreferences;\n import de.danoeh.antennapod.ui.SelectableAdapter;\n import de.danoeh.antennapod.ui.common.ThemeUtils;\n@@ -27,6 +26,7 @@\n import java.lang.ref.WeakReference;\n import java.util.ArrayList;\n import java.util.List;\n+import java.util.Map;\n \n /**\n * Adapter for subscriptions\n@@ -34,8 +34,9 @@\n public class SubscriptionsRecyclerAdapter extends SelectableAdapter\n implements View.OnCreateContextMenuListener {\n private final WeakReference mainActivityRef;\n- private List listItems;\n- private NavDrawerData.DrawerItem selectedItem = null;\n+ private List listItems;\n+ private Map feedCounters;\n+ private Feed selectedItem = null;\n int longPressedPosition = 0; // used to init actionMode\n private int columnCount = 3;\n \n@@ -43,6 +44,7 @@ public SubscriptionsRecyclerAdapter(MainActivity mainActivity) {\n super(mainActivity);\n this.mainActivityRef = new WeakReference<>(mainActivity);\n this.listItems = new ArrayList<>();\n+ this.feedCounters = Map.of();\n setHasStableIds(true);\n }\n \n@@ -54,7 +56,7 @@ public Object getItem(int position) {\n return listItems.get(position);\n }\n \n- public NavDrawerData.DrawerItem getSelectedItem() {\n+ public Feed getSelectedItem() {\n return selectedItem;\n }\n \n@@ -75,16 +77,13 @@ public SubscriptionViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int\n \n @Override\n public void onBindViewHolder(@NonNull SubscriptionViewHolder holder, int position) {\n- NavDrawerData.DrawerItem drawerItem = listItems.get(position);\n- boolean isFeed = drawerItem.type == NavDrawerData.DrawerItem.Type.FEED;\n- holder.bind(drawerItem, columnCount);\n+ Feed feed = listItems.get(position);\n+ holder.bind(feed, columnCount, feedCounters.containsKey(feed.getId()) ? feedCounters.get(feed.getId()) : 0);\n holder.itemView.setOnCreateContextMenuListener(this);\n if (inActionMode()) {\n if (holder.selectView != null) {\n- if (isFeed) {\n- holder.selectCheckbox.setVisibility(View.VISIBLE);\n- }\n- holder.selectView.setVisibility(isFeed ? View.VISIBLE : View.GONE);\n+ holder.selectCheckbox.setVisibility(View.VISIBLE);\n+ holder.selectView.setVisibility(View.VISIBLE);\n holder.selectCheckbox.setChecked((isSelected(position)));\n holder.selectCheckbox.setOnCheckedChangeListener((buttonView, isChecked)\n -> setSelected(holder.getBindingAdapterPosition(), isChecked));\n@@ -106,10 +105,8 @@ public void onBindViewHolder(@NonNull SubscriptionViewHolder holder, int positio\n \n holder.itemView.setOnLongClickListener(v -> {\n if (!inActionMode()) {\n- if (isFeed) {\n- longPressedPosition = holder.getBindingAdapterPosition();\n- }\n- selectedItem = drawerItem;\n+ longPressedPosition = holder.getBindingAdapterPosition();\n+ selectedItem = feed;\n }\n return false;\n });\n@@ -119,27 +116,19 @@ public void onBindViewHolder(@NonNull SubscriptionViewHolder holder, int positio\n if (e.isFromSource(InputDevice.SOURCE_MOUSE)\n && e.getButtonState() == MotionEvent.BUTTON_SECONDARY) {\n if (!inActionMode()) {\n- if (isFeed) {\n- longPressedPosition = holder.getBindingAdapterPosition();\n- }\n- selectedItem = drawerItem;\n+ longPressedPosition = holder.getBindingAdapterPosition();\n+ selectedItem = feed;\n }\n }\n }\n return false;\n });\n holder.itemView.setOnClickListener(v -> {\n- if (isFeed) {\n- if (inActionMode()) {\n- setSelected(holder.getBindingAdapterPosition(), !isSelected(holder.getBindingAdapterPosition()));\n- notifyItemChanged(holder.getBindingAdapterPosition());\n- } else {\n- Fragment fragment = FeedItemlistFragment\n- .newInstance(((NavDrawerData.FeedDrawerItem) drawerItem).feed.getId());\n- mainActivityRef.get().loadChildFragment(fragment);\n- }\n- } else if (!inActionMode()) {\n- Fragment fragment = SubscriptionFragment.newInstance(drawerItem.getTitle());\n+ if (inActionMode()) {\n+ setSelected(holder.getBindingAdapterPosition(), !isSelected(holder.getBindingAdapterPosition()));\n+ notifyItemChanged(holder.getBindingAdapterPosition());\n+ } else {\n+ Fragment fragment = FeedItemlistFragment.newInstance(feed.getId());\n mainActivityRef.get().loadChildFragment(fragment);\n }\n });\n@@ -156,7 +145,7 @@ public long getItemId(int position) {\n if (position >= listItems.size()) {\n return RecyclerView.NO_ID; // Dummy views\n }\n- return listItems.get(position).id;\n+ return listItems.get(position).getId();\n }\n \n @Override\n@@ -165,12 +154,8 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMen\n return;\n }\n MenuInflater inflater = mainActivityRef.get().getMenuInflater();\n- if (selectedItem.type == NavDrawerData.DrawerItem.Type.FEED) {\n- inflater.inflate(R.menu.nav_feed_context, menu);\n- menu.findItem(R.id.multi_select).setVisible(true);\n- } else {\n- inflater.inflate(R.menu.nav_folder_context, menu);\n- }\n+ inflater.inflate(R.menu.nav_feed_context, menu);\n+ menu.findItem(R.id.multi_select).setVisible(true);\n menu.setHeaderTitle(selectedItem.getTitle());\n }\n \n@@ -186,29 +171,18 @@ public List getSelectedItems() {\n List items = new ArrayList<>();\n for (int i = 0; i < getItemCount(); i++) {\n if (isSelected(i)) {\n- NavDrawerData.DrawerItem drawerItem = listItems.get(i);\n- if (drawerItem.type == NavDrawerData.DrawerItem.Type.FEED) {\n- Feed feed = ((NavDrawerData.FeedDrawerItem) drawerItem).feed;\n- items.add(feed);\n- }\n+ items.add(listItems.get(i));\n }\n }\n return items;\n }\n \n- public void setItems(List listItems) {\n+ public void setItems(List listItems, Map feedCounters) {\n this.listItems = listItems;\n+ this.feedCounters = feedCounters;\n notifyDataSetChanged();\n }\n \n- @Override\n- public void setSelected(int pos, boolean selected) {\n- NavDrawerData.DrawerItem drawerItem = listItems.get(pos);\n- if (drawerItem.type == NavDrawerData.DrawerItem.Type.FEED) {\n- super.setSelected(pos, selected);\n- }\n- }\n-\n @Override\n public int getItemViewType(int position) {\n if (columnCount == 1) {\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/view/ItemOffsetDecoration.java b/app/src/main/java/de/danoeh/antennapod/ui/view/ItemOffsetDecoration.java\nindex 4c3adcbc1b5..2bfc0ba7f60 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/view/ItemOffsetDecoration.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/view/ItemOffsetDecoration.java\n@@ -6,19 +6,24 @@\n import androidx.annotation.NonNull;\n import androidx.recyclerview.widget.RecyclerView;\n \n-/**\n- * Source: https://stackoverflow.com/a/30794046\n- */\n public class ItemOffsetDecoration extends RecyclerView.ItemDecoration {\n- private final int itemOffset;\n+ private final int itemOffsetHorizontal;\n+ private final int itemOffsetVertical;\n \n public ItemOffsetDecoration(@NonNull Context context, int itemOffsetDp) {\n- itemOffset = (int) (itemOffsetDp * context.getResources().getDisplayMetrics().density);\n+ itemOffsetHorizontal = (int) (itemOffsetDp * context.getResources().getDisplayMetrics().density);\n+ itemOffsetVertical = (int) (itemOffsetDp * context.getResources().getDisplayMetrics().density);\n+ }\n+\n+ public ItemOffsetDecoration(@NonNull Context context, int itemOffsetHorizontalDp, int itemOffsetVerticalDp) {\n+ itemOffsetHorizontal = (int) (itemOffsetHorizontalDp * context.getResources().getDisplayMetrics().density);\n+ itemOffsetVertical = (int) (itemOffsetVerticalDp * context.getResources().getDisplayMetrics().density);\n }\n \n @Override\n- public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {\n+ public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent,\n+ @NonNull RecyclerView.State state) {\n super.getItemOffsets(outRect, view, parent, state);\n- outRect.set(itemOffset, itemOffset, itemOffset, itemOffset);\n+ outRect.set(itemOffsetHorizontal, itemOffsetVertical, itemOffsetHorizontal, itemOffsetVertical);\n }\n }\ndiff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml\nindex 16c69bd0cbe..c18eb0b88ba 100644\n--- a/app/src/main/res/layout/fragment_subscriptions.xml\n+++ b/app/src/main/res/layout/fragment_subscriptions.xml\n@@ -20,15 +20,32 @@\n app:navigationContentDescription=\"@string/toolbar_back_button_content_description\"\n app:navigationIcon=\"?homeAsUpIndicator\" />\n \n- \n+ android:orientation=\"vertical\">\n+\n+ \n+\n+ \n+\n+ \n \n \n \ndiff --git a/app/src/main/res/layout/item_tag_chip.xml b/app/src/main/res/layout/item_tag_chip.xml\nnew file mode 100644\nindex 00000000000..5a88e67c11b\n--- /dev/null\n+++ b/app/src/main/res/layout/item_tag_chip.xml\n@@ -0,0 +1,9 @@\n+\n+\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBReader.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBReader.java\nindex 08f9dd5a348..9e1524fc2f1 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBReader.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBReader.java\n@@ -21,7 +21,6 @@\n import de.danoeh.antennapod.model.feed.FeedItemFilter;\n import de.danoeh.antennapod.model.feed.FeedMedia;\n import de.danoeh.antennapod.model.feed.FeedOrder;\n-import de.danoeh.antennapod.model.feed.FeedPreferences;\n import de.danoeh.antennapod.model.feed.SortOrder;\n import de.danoeh.antennapod.model.feed.SubscriptionsFilter;\n import de.danoeh.antennapod.model.download.DownloadResult;\n@@ -737,32 +736,21 @@ public static NavDrawerData getNavDrawerData(@Nullable SubscriptionsFilter subsc\n final int numNewItems = getTotalEpisodeCount(new FeedItemFilter(FeedItemFilter.NEW));\n final int numDownloadedItems = getTotalEpisodeCount(new FeedItemFilter(FeedItemFilter.DOWNLOADED));\n \n- List items = new ArrayList<>();\n- Map folders = new HashMap<>();\n+ Map tags = new HashMap<>();\n for (Feed feed : feeds) {\n for (String tag : feed.getPreferences().getTags()) {\n- int counter = feedCounters.containsKey(feed.getId()) ? feedCounters.get(feed.getId()) : 0;\n- NavDrawerData.FeedDrawerItem drawerItem = new NavDrawerData.FeedDrawerItem(feed, feed.getId(), counter);\n- if (FeedPreferences.TAG_ROOT.equals(tag)) {\n- items.add(drawerItem);\n- continue;\n- }\n- NavDrawerData.TagDrawerItem folder;\n- if (folders.containsKey(tag)) {\n- folder = folders.get(tag);\n- } else {\n- folder = new NavDrawerData.TagDrawerItem(tag);\n- folders.put(tag, folder);\n+ if (!tags.containsKey(tag)) {\n+ tags.put(tag, new NavDrawerData.TagItem(tag));\n }\n- drawerItem.id |= folder.id;\n- folder.getChildren().add(drawerItem);\n+ int counter = feedCounters.containsKey(feed.getId()) ? feedCounters.get(feed.getId()) : 0;\n+ tags.get(tag).addFeed(feed, counter);\n }\n }\n- List foldersSorted = new ArrayList<>(folders.values());\n- Collections.sort(foldersSorted, (o1, o2) -> o1.getTitle().compareToIgnoreCase(o2.getTitle()));\n- items.addAll(foldersSorted);\n+ List tagsSorted = new ArrayList<>(tags.values());\n+ Collections.sort(tagsSorted, (o1, o2) -> o1.getTitle().compareToIgnoreCase(o2.getTitle()));\n \n- NavDrawerData result = new NavDrawerData(items, queueSize, numNewItems, numDownloadedItems, feedCounters);\n+ NavDrawerData result = new NavDrawerData(feeds, tagsSorted,\n+ queueSize, numNewItems, numDownloadedItems, feedCounters);\n adapter.close();\n return result;\n }\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/NavDrawerData.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/NavDrawerData.java\nindex 5be8247526b..601ae7e87ca 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/NavDrawerData.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/NavDrawerData.java\n@@ -7,60 +7,38 @@\n import java.util.Map;\n \n public class NavDrawerData {\n- public final List items;\n+ public final List feeds;\n+ public final List tags;\n public final int queueSize;\n public final int numNewItems;\n public final int numDownloadedItems;\n public final Map feedCounters;\n \n- public NavDrawerData(List feeds,\n+ public NavDrawerData(List feeds,\n+ List tags,\n int queueSize,\n int numNewItems,\n int numDownloadedItems,\n Map feedIndicatorValues) {\n- this.items = feeds;\n+ this.feeds = feeds;\n+ this.tags = tags;\n this.queueSize = queueSize;\n this.numNewItems = numNewItems;\n this.numDownloadedItems = numDownloadedItems;\n this.feedCounters = feedIndicatorValues;\n }\n \n- public abstract static class DrawerItem {\n- public enum Type {\n- TAG, FEED\n- }\n-\n- public final Type type;\n- private int layer;\n- public long id;\n-\n- public DrawerItem(Type type, long id) {\n- this.type = type;\n- this.id = id;\n- }\n-\n- public int getLayer() {\n- return layer;\n- }\n-\n- public void setLayer(int layer) {\n- this.layer = layer;\n- }\n-\n- public abstract String getTitle();\n-\n- public abstract int getCounter();\n- }\n-\n- public static class TagDrawerItem extends DrawerItem {\n- private final List children = new ArrayList<>();\n+ public static class TagItem {\n private final String name;\n- private boolean isOpen;\n+ private List feeds = new ArrayList<>();\n+ private int counter = 0;\n+ private boolean isOpen = false;\n+ private long id;\n \n- public TagDrawerItem(String name) {\n- // Keep IDs >0 but make room for many feeds\n- super(DrawerItem.Type.TAG, Math.abs((long) name.hashCode()) << 20);\n+ public TagItem(String name) {\n this.name = name;\n+ // Keep IDs >0 but make room for many feeds\n+ this.id = (Math.abs((long) name.hashCode()) << 20);\n }\n \n public String getTitle() {\n@@ -75,35 +53,21 @@ public void setOpen(final boolean open) {\n isOpen = open;\n }\n \n- public List getChildren() {\n- return children;\n+ public List getFeeds() {\n+ return feeds;\n }\n \n public int getCounter() {\n- int sum = 0;\n- for (DrawerItem item : children) {\n- sum += item.getCounter();\n- }\n- return sum;\n- }\n- }\n-\n- public static class FeedDrawerItem extends DrawerItem {\n- public final Feed feed;\n- public final int counter;\n-\n- public FeedDrawerItem(Feed feed, long id, int counter) {\n- super(DrawerItem.Type.FEED, id);\n- this.feed = feed;\n- this.counter = counter;\n+ return counter;\n }\n \n- public String getTitle() {\n- return feed.getTitle();\n+ public void addFeed(Feed feed, int feedCounter) {\n+ counter += feedCounter;\n+ feeds.add(feed);\n }\n \n- public int getCounter() {\n- return counter;\n+ public long getId() {\n+ return id;\n }\n }\n }\ndiff --git a/ui/i18n/src/main/res/values/strings.xml b/ui/i18n/src/main/res/values/strings.xml\nindex 5eb3088e422..00a13e4cd3f 100644\n--- a/ui/i18n/src/main/res/values/strings.xml\n+++ b/ui/i18n/src/main/res/values/strings.xml\n@@ -760,7 +760,8 @@\n Change your username and password for this podcast and its episodes\n Tags\n Change the tags of this podcast to help organize your subscriptions\n- Show this podcast in main list\n+ Show this podcast in \\\"all\\\" tag\n+ All\n Only common tags from all selected subscriptions are shown. Other tags stay unaffected.\n Automatically download episodes from the inbox\n Episode filter\n", "test_patch": "diff --git a/net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbReaderTest.java b/net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbReaderTest.java\nindex 8f54609b013..16dce9143ba 100644\n--- a/net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbReaderTest.java\n+++ b/net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbReaderTest.java\n@@ -343,7 +343,7 @@ public void testGetNavDrawerDataQueueEmptyNoUnreadItems() {\n DbTestUtils.saveFeedlist(numFeeds, numItems, true);\n NavDrawerData navDrawerData = DBReader.getNavDrawerData(\n UserPreferences.getSubscriptionsFilter(), FeedOrder.COUNTER, FeedCounter.SHOW_NEW);\n- assertEquals(numFeeds, navDrawerData.items.size());\n+ assertEquals(numFeeds, navDrawerData.feeds.size());\n assertEquals(0, navDrawerData.numNewItems);\n assertEquals(0, navDrawerData.queueSize);\n }\n@@ -373,7 +373,7 @@ public void testGetNavDrawerDataQueueNotEmptyWithUnreadItems() {\n \n NavDrawerData navDrawerData = DBReader.getNavDrawerData(\n UserPreferences.getSubscriptionsFilter(), FeedOrder.COUNTER, FeedCounter.SHOW_NEW);\n- assertEquals(numFeeds, navDrawerData.items.size());\n+ assertEquals(numFeeds, navDrawerData.feeds.size());\n assertEquals(numNew, navDrawerData.numNewItems);\n assertEquals(numQueue, navDrawerData.queueSize);\n }\n", "n2p_tests": "{\"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testLoadFeedDataOfFeedItemlist\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[7]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetFeedItemlistCheckChaptersTrue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[2]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[1]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[3]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetQueue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetItemByEpisodeUrl\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testLoadChaptersOfFeedItemNoChapters\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[8]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetItemByGuid\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testLoadChaptersOfFeedItemWithChapters\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[0]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetNewItemIds\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetItemWithChapters\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[4]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetFeedItemList\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetQueueIdList\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetNavDrawerDataQueueNotEmptyWithUnreadItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetFeedItemlistCheckChaptersFalse\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetFeedList\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[5]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[6]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetPlaybackHistoryLength\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetDownloadedItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testFeedListDownloadUrls\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetFeedListSortOrder\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetNavDrawerDataQueueEmptyNoUnreadItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "AntennaPod__AntennaPod-7815", "org": "AntennaPod", "repo": "AntennaPod", "number": 7815, "state": "closed", "title": "Feature add incompletely played episodes to playback history", "body": "### Description\r\n\r\nResolves #7702\r\n\r\nThis PR adds partially played episodes to the Playlist History by repurposing the database column `KEY_PLAYBACK_COMPLETION_DATE` as `KEY_LAST_PLAYED_TIME_HISTORY`, as discussed here: https://github.com/AntennaPod/AntennaPod/issues/7702#issue-2933349528\r\n\r\n|Before|After|\r\n|---|---|\r\n| ||\r\n\r\n# Questions\r\n\r\nAssuming the solution in this PR is correct, there are still some variables and functions that reference the old constant name KEY_PLAYBACK_COMPLETION_DATE. Should we rename them as well for consistency?\r\n\r\nhttps://github.com/dominikfill/AntennaPod/blob/64112ccefd673cd06a76d6920ba39e4f4c0f4774/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java#L559-L569\r\n\r\nhttps://github.com/dominikfill/AntennaPod/blob/64112ccefd673cd06a76d6920ba39e4f4c0f4774/model/src/main/java/de/danoeh/antennapod/model/feed/FeedMedia.java#L263-L271\r\n\r\nhttps://github.com/dominikfill/AntennaPod/blob/64112ccefd673cd06a76d6920ba39e4f4c0f4774/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemFilterQuery.java#L25\r\n\r\nhttps://github.com/dominikfill/AntennaPod/blob/64112ccefd673cd06a76d6920ba39e4f4c0f4774/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedMediaCursor.java#L31\r\n\r\n\r\n## Checklist\r\n- [x] I have read the contribution guidelines: https://github.com/AntennaPod/AntennaPod/blob/develop/CONTRIBUTING.md#submit-a-pull-request\r\n- [x] I have performed a self-review of my code\r\n- [x] I have run the automated code checks using `./gradlew checkstyle spotbugsPlayDebug spotbugsDebug :app:lintPlayDebug`\r\n- [x] My code follows the style guidelines of the AntennaPod project: https://github.com/AntennaPod/AntennaPod/wiki/Code-style\r\n- [x] I have mentioned the corresponding issue and the relevant keyword (e.g., \"Closes: #xy\") in the description (see https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)\r\n- [ ] If it is a core feature, I have added automated tests\r\n", "base": "{\"label\": \"AntennaPod:develop\", \"ref\": \"develop\", \"sha\": \"49e6da67271dead9d0a574c9ecbd70c35da18d36\"}", "resolved_issues": "[{\"number\": 7702, \"title\": \"Add episodes to playback history even when not completing them\", \"body\": \"### Checklist\\n\\n- [x] I have used the search function for [**OPEN**](https://github.com/AntennaPod/AntennaPod/issues) issues to see if someone else has already submitted the same feature request.\\n- [x] I have **also** used the search function for [**CLOSED**](https://github.com/AntennaPod/AntennaPod/issues?q=is%3Aissue+is%3Aclosed) issues to see if the feature was already implemented and is just waiting to be released, or if the feature was rejected.\\n- [x] I will describe the problem with as much detail as possible.\\n- [x] This request contains only one single feature, **not** a list of multiple (related) features.\\n\\n### App version\\n\\n3.7.0\\n\\n### Feature or improvement you want\\n\\nSometimes I play an episode but do not complete it. I expect it to be displayed on the history screen nonetheless.\\n\\n### Why should this be added?\\n\\n_No response_\\n\\n### Screenshots / Drawings / Technical details\\n\\nCurrently we have a column `completed_date`. Re-purpose that column into storing `last_played_date_history`. Note that there is also `last_played_date` which is for statistics. These should stay separate fields. Because columns cannot be renamed, just rename the references to it in Java (PodDbAdaper, FeedItem, etc). Fill that column with the last played date, just like the other column.\"}]", "lang": "java", "problem_statement": "Add episodes to playback history even when not completing them\n### Checklist\n\n- [x] I have used the search function for [**OPEN**](https://github.com/AntennaPod/AntennaPod/issues) issues to see if someone else has already submitted the same feature request.\n- [x] I have **also** used the search function for [**CLOSED**](https://github.com/AntennaPod/AntennaPod/issues?q=is%3Aissue+is%3Aclosed) issues to see if the feature was already implemented and is just waiting to be released, or if the feature was rejected.\n- [x] I will describe the problem with as much detail as possible.\n- [x] This request contains only one single feature, **not** a list of multiple (related) features.\n\n### App version\n\n3.7.0\n\n### Feature or improvement you want\n\nSometimes I play an episode but do not complete it. I expect it to be displayed on the history screen nonetheless.\n\n### Why should this be added?\n\n_No response_\n\n### Screenshots / Drawings / Technical details\n\nCurrently we have a column `completed_date`. Re-purpose that column into storing `last_played_date_history`. Note that there is also `last_played_date` which is for statistics. These should stay separate fields. Because columns cannot be renamed, just rename the references to it in Java (PodDbAdaper, FeedItem, etc). Fill that column with the last played date, just like the other column.\n", "hints": "Hi, I would be interested to work on this. Just for clarification:\nyour idea is to repurpose `completion_date` to store the same value as `last_played_time`? \n\nAs of sqlite v. 3.28 its possible to rename columns, from what i could find:\nhttps://stackoverflow.com/questions/805363/how-do-i-rename-a-column-in-an-sqlite-database-table\n \n> Just for clarification: your idea is to repurpose completion_date to store the same value as last_played_time?\n\nExactly :) They wouldn't always be the same value, in case one of them is cleared (clear statistics vs clear playback history), but generally yes\n\n> As of sqlite v. 3.28 its possible to rename columns\n\nAh, interesting. I didn't know that. However, we support Android versions that don't have sqlite 3.28 yet, so I would just rename the references in Java but keep the old sqlite column names internally\nThanks for clearing that up :)", "pull_url": "https://github.com/AntennaPod/AntennaPod/pull/7815", "issue_urls": "[\"https://github.com/AntennaPod/AntennaPod/issues/7702\"]", "test_command": "./gradlew :net:download:service:testFreeDebugUnitTest --tests \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbCleanupTests\" --tests \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest\" --tests \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest\"", "fix_patch": "diff --git a/app/src/main/java/de/danoeh/antennapod/ui/swipeactions/RemoveFromHistorySwipeAction.java b/app/src/main/java/de/danoeh/antennapod/ui/swipeactions/RemoveFromHistorySwipeAction.java\nindex 4e89be62308..3d99a4cba84 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/swipeactions/RemoveFromHistorySwipeAction.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/swipeactions/RemoveFromHistorySwipeAction.java\n@@ -38,10 +38,10 @@ public String getTitle(Context context) {\n \n @Override\n public void performAction(FeedItem item, Fragment fragment, FeedItemFilter filter) {\n- Date playbackCompletionDate = item.getMedia().getPlaybackCompletionDate();\n+ Date lastPlayedTimeHistory = item.getMedia().getLastPlayedTimeHistory();\n DBWriter.deleteFromPlaybackHistory(item);\n EventBus.getDefault().post(new MessageEvent(fragment.getString(R.string.removed_history_label),\n- context -> DBWriter.addItemToPlaybackHistory(item.getMedia(), playbackCompletionDate),\n+ context -> DBWriter.addItemToPlaybackHistory(item.getMedia(), lastPlayedTimeHistory),\n fragment.getString(R.string.undo)));\n }\n \ndiff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItemFilter.java b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItemFilter.java\nindex 1faeda01220..08755fb18bc 100644\n--- a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItemFilter.java\n+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItemFilter.java\n@@ -117,7 +117,7 @@ public boolean matches(FeedItem item) {\n } else if (showNotFavorite && item.isTagged(FeedItem.TAG_FAVORITE)) {\n return false;\n } else if (showInHistory && item.getMedia() != null\n- && item.getMedia().getPlaybackCompletionDate().getTime() == 0) {\n+ && item.getMedia().getLastPlayedTimeHistory().getTime() == 0) {\n return false;\n } else if (!includeNotSubscribed && item.getFeed() != null\n && item.getFeed().getState() != Feed.STATE_SUBSCRIBED) {\ndiff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedMedia.java b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedMedia.java\nindex 88d6a77141c..91e41ce229f 100644\n--- a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedMedia.java\n+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedMedia.java\n@@ -38,12 +38,12 @@ public class FeedMedia implements Playable {\n private long downloadDate;\n private int duration;\n private int position; // Current position in file\n- private long lastPlayedTime; // Last time this media was played (in ms)\n+ private long lastPlayedTimeStatistics; // Last time this media was played (in ms)\n private int playedDuration; // How many ms of this file have been played\n private long size; // File size in Byte\n private String mimeType;\n @Nullable private volatile FeedItem item;\n- private Date playbackCompletionDate;\n+ private Date lastPlayedTimeHistory;\n private int startPosition = -1;\n private int playedDurationWhenStarted;\n \n@@ -66,8 +66,8 @@ public FeedMedia(FeedItem i, String downloadUrl, long size,\n \n public FeedMedia(long id, FeedItem item, int duration, int position,\n long size, String mimeType, String localFileUrl, String downloadUrl,\n- long downloadDate, Date playbackCompletionDate, int playedDuration,\n- long lastPlayedTime) {\n+ long downloadDate, Date lastPlayedTimeHistory, int playedDuration,\n+ long lastPlayedTimeStatistics) {\n this.localFileUrl = localFileUrl;\n this.downloadUrl = downloadUrl;\n this.downloadDate = downloadDate;\n@@ -80,17 +80,17 @@ public FeedMedia(long id, FeedItem item, int duration, int position,\n this.playedDurationWhenStarted = playedDuration;\n this.size = size;\n this.mimeType = mimeType;\n- this.playbackCompletionDate = playbackCompletionDate == null\n- ? null : (Date) playbackCompletionDate.clone();\n- this.lastPlayedTime = lastPlayedTime;\n+ this.lastPlayedTimeHistory = lastPlayedTimeHistory == null\n+ ? null : (Date) lastPlayedTimeHistory.clone();\n+ this.lastPlayedTimeStatistics = lastPlayedTimeStatistics;\n }\n \n public FeedMedia(long id, FeedItem item, int duration, int position,\n long size, String mimeType, String localFileUrl, String downloadUrl,\n- long downloadDate, Date playbackCompletionDate, int playedDuration,\n- Boolean hasEmbeddedPicture, long lastPlayedTime) {\n+ long downloadDate, Date lastPlayedTimeHistory, int playedDuration,\n+ Boolean hasEmbeddedPicture, long lastPlayedTimeStatistics) {\n this(id, item, duration, position, size, mimeType, localFileUrl, downloadUrl, downloadDate,\n- playbackCompletionDate, playedDuration, lastPlayedTime);\n+ lastPlayedTimeHistory, playedDuration, lastPlayedTimeStatistics);\n this.hasEmbeddedPicture = hasEmbeddedPicture;\n }\n \n@@ -178,8 +178,8 @@ public void setDuration(int duration) {\n }\n \n @Override\n- public void setLastPlayedTime(long lastPlayedTime) {\n- this.lastPlayedTime = lastPlayedTime;\n+ public void setLastPlayedTimeStatistics(long lastPlayedTimeStatistics) {\n+ this.lastPlayedTimeStatistics = lastPlayedTimeStatistics;\n }\n \n public int getPlayedDuration() {\n@@ -199,8 +199,8 @@ public int getPosition() {\n }\n \n @Override\n- public long getLastPlayedTime() {\n- return lastPlayedTime;\n+ public long getLastPlayedTimeStatistics() {\n+ return lastPlayedTimeStatistics;\n }\n \n public void setPosition(int position) {\n@@ -260,14 +260,14 @@ public void setItem(FeedItem item) {\n }\n }\n \n- public Date getPlaybackCompletionDate() {\n- return playbackCompletionDate == null\n- ? null : (Date) playbackCompletionDate.clone();\n+ public Date getLastPlayedTimeHistory() {\n+ return lastPlayedTimeHistory == null\n+ ? null : (Date) lastPlayedTimeHistory.clone();\n }\n \n- public void setPlaybackCompletionDate(Date playbackCompletionDate) {\n- this.playbackCompletionDate = playbackCompletionDate == null\n- ? null : (Date) playbackCompletionDate.clone();\n+ public void setLastPlayedTimeHistory(Date lastPlayedTimeHistory) {\n+ this.lastPlayedTimeHistory = lastPlayedTimeHistory == null\n+ ? null : (Date) lastPlayedTimeHistory.clone();\n }\n \n public boolean isInProgress() {\n@@ -298,9 +298,9 @@ public void writeToParcel(Parcel dest, int flags) {\n dest.writeString(localFileUrl);\n dest.writeString(downloadUrl);\n dest.writeLong(downloadDate);\n- dest.writeLong((playbackCompletionDate != null) ? playbackCompletionDate.getTime() : 0);\n+ dest.writeLong((lastPlayedTimeHistory != null) ? lastPlayedTimeHistory.getTime() : 0);\n dest.writeInt(playedDuration);\n- dest.writeLong(lastPlayedTime);\n+ dest.writeLong(lastPlayedTimeStatistics);\n }\n \n @Override\ndiff --git a/model/src/main/java/de/danoeh/antennapod/model/playback/Playable.java b/model/src/main/java/de/danoeh/antennapod/model/playback/Playable.java\nindex 8bf1c4e2065..c3fda817044 100644\n--- a/model/src/main/java/de/danoeh/antennapod/model/playback/Playable.java\n+++ b/model/src/main/java/de/danoeh/antennapod/model/playback/Playable.java\n@@ -61,7 +61,7 @@ public interface Playable extends Parcelable, Serializable {\n * Returns last time (in ms) when this playable was played or 0\n * if last played time is unknown.\n */\n- long getLastPlayedTime();\n+ long getLastPlayedTimeStatistics();\n \n /**\n * Returns the description of the item, if available.\n@@ -100,7 +100,7 @@ public interface Playable extends Parcelable, Serializable {\n /**\n * @param lastPlayedTimestamp timestamp in ms\n */\n- void setLastPlayedTime(long lastPlayedTimestamp);\n+ void setLastPlayedTimeStatistics(long lastPlayedTimestamp);\n \n /**\n * This method should be called every time playback starts on this object.\ndiff --git a/model/src/main/java/de/danoeh/antennapod/model/playback/RemoteMedia.java b/model/src/main/java/de/danoeh/antennapod/model/playback/RemoteMedia.java\nindex c979488a6a7..4e98add2c79 100644\n--- a/model/src/main/java/de/danoeh/antennapod/model/playback/RemoteMedia.java\n+++ b/model/src/main/java/de/danoeh/antennapod/model/playback/RemoteMedia.java\n@@ -40,7 +40,7 @@ public class RemoteMedia implements Playable {\n private List chapters;\n private int duration;\n private int position;\n- private long lastPlayedTime;\n+ private long lastPlayedTimeStatistics;\n \n public RemoteMedia(String downloadUrl, String itemId, String feedUrl, String feedTitle,\n String episodeTitle, String episodeLink, String feedAuthor,\n@@ -159,8 +159,8 @@ public int getPosition() {\n }\n \n @Override\n- public long getLastPlayedTime() {\n- return lastPlayedTime;\n+ public long getLastPlayedTimeStatistics() {\n+ return lastPlayedTimeStatistics;\n }\n \n @Override\n@@ -194,8 +194,8 @@ public void setDuration(int newDuration) {\n }\n \n @Override\n- public void setLastPlayedTime(long lastPlayedTimestamp) {\n- lastPlayedTime = lastPlayedTimestamp;\n+ public void setLastPlayedTimeStatistics(long lastPlayedTimestamp) {\n+ lastPlayedTimeStatistics = lastPlayedTimestamp;\n }\n \n @Override\n@@ -255,7 +255,7 @@ public void writeToParcel(Parcel dest, int flags) {\n dest.writeString(notes);\n dest.writeInt(duration);\n dest.writeInt(position);\n- dest.writeLong(lastPlayedTime);\n+ dest.writeLong(lastPlayedTimeStatistics);\n }\n \n public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {\n@@ -266,7 +266,7 @@ public RemoteMedia createFromParcel(Parcel in) {\n in.readString(), in.readString(), new Date(in.readLong()), in.readString());\n result.setDuration(in.readInt());\n result.setPosition(in.readInt());\n- result.setLastPlayedTime(in.readLong());\n+ result.setLastPlayedTimeStatistics(in.readLong());\n return result;\n }\n \ndiff --git a/net/download/service-interface/src/main/java/de/danoeh/antennapod/net/download/serviceinterface/AutoDownloadManager.java b/net/download/service-interface/src/main/java/de/danoeh/antennapod/net/download/serviceinterface/AutoDownloadManager.java\nindex 2eb1d1b56ea..82cfc522db0 100644\n--- a/net/download/service-interface/src/main/java/de/danoeh/antennapod/net/download/serviceinterface/AutoDownloadManager.java\n+++ b/net/download/service-interface/src/main/java/de/danoeh/antennapod/net/download/serviceinterface/AutoDownloadManager.java\n@@ -29,7 +29,7 @@ public static void setInstance(AutoDownloadManager instance) {\n \n /**\n * Removed downloaded episodes outside of the queue if the episode cache is full. Episodes with a smaller\n- * 'playbackCompletionDate'-value will be deleted first.\n+ * 'lastPlayedTimeHistory'-value will be deleted first.\n *

                  \n * This method should NOT be executed on the GUI thread.\n *\ndiff --git a/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/autodownload/APCleanupAlgorithm.java b/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/autodownload/APCleanupAlgorithm.java\nindex c8db7e7fd11..011f0169544 100644\n--- a/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/autodownload/APCleanupAlgorithm.java\n+++ b/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/autodownload/APCleanupAlgorithm.java\n@@ -47,8 +47,8 @@ public int performCleanup(Context context, int numberOfEpisodesToDelete) {\n List delete;\n \n Collections.sort(candidates, (lhs, rhs) -> {\n- Date l = lhs.getMedia().getPlaybackCompletionDate();\n- Date r = rhs.getMedia().getPlaybackCompletionDate();\n+ Date l = lhs.getMedia().getLastPlayedTimeHistory();\n+ Date r = rhs.getMedia().getLastPlayedTimeHistory();\n \n if (l == null) {\n l = new Date();\n@@ -105,8 +105,8 @@ private List getCandidates() {\n // make sure this candidate was played at least the proper amount of days prior\n // to now\n if (media != null\n- && media.getPlaybackCompletionDate() != null\n- && media.getPlaybackCompletionDate().before(mostRecentDateForDeletion)) {\n+ && media.getLastPlayedTimeHistory() != null\n+ && media.getLastPlayedTimeHistory().before(mostRecentDateForDeletion)) {\n candidates.add(item);\n }\n }\ndiff --git a/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/autodownload/AutoDownloadManagerImpl.java b/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/autodownload/AutoDownloadManagerImpl.java\nindex 2b0eb4d6293..dfcfaae9a80 100644\n--- a/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/autodownload/AutoDownloadManagerImpl.java\n+++ b/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/autodownload/AutoDownloadManagerImpl.java\n@@ -43,7 +43,7 @@ public Future autodownloadUndownloadedItems(final Context context) {\n \n /**\n * Removed downloaded episodes outside of the queue if the episode cache is full. Episodes with a smaller\n- * 'playbackCompletionDate'-value will be deleted first.\n+ * 'lastPlayedTimeHistory'-value will be deleted first.\n *

                  \n * This method should NOT be executed on the GUI thread.\n *\ndiff --git a/playback/base/src/main/java/de/danoeh/antennapod/playback/base/RewindAfterPauseUtils.java b/playback/base/src/main/java/de/danoeh/antennapod/playback/base/RewindAfterPauseUtils.java\nindex 3ea8e59c560..f8af620d7f1 100644\n--- a/playback/base/src/main/java/de/danoeh/antennapod/playback/base/RewindAfterPauseUtils.java\n+++ b/playback/base/src/main/java/de/danoeh/antennapod/playback/base/RewindAfterPauseUtils.java\n@@ -19,12 +19,12 @@ public abstract class RewindAfterPauseUtils {\n \n /**\n * @param currentPosition current position in a media file in ms\n- * @param lastPlayedTime timestamp when was media paused\n+ * @param lastPlayedTimeStatistics timestamp when was media paused\n * @return new rewinded position for playback in milliseconds\n */\n- public static int calculatePositionWithRewind(int currentPosition, long lastPlayedTime) {\n- if (currentPosition > 0 && lastPlayedTime > 0) {\n- long elapsedTime = System.currentTimeMillis() - lastPlayedTime;\n+ public static int calculatePositionWithRewind(int currentPosition, long lastPlayedTimeStatistics) {\n+ if (currentPosition > 0 && lastPlayedTimeStatistics > 0) {\n+ long elapsedTime = System.currentTimeMillis() - lastPlayedTimeStatistics;\n long rewindTime = 0;\n \n if (elapsedTime > ELAPSED_TIME_FOR_LONG_REWIND) {\ndiff --git a/playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/CastPsmp.java b/playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/CastPsmp.java\nindex 07a3639d962..44abdabab28 100644\n--- a/playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/CastPsmp.java\n+++ b/playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/CastPsmp.java\n@@ -334,7 +334,7 @@ private void playMediaObject(@NonNull final Playable playable, final boolean for\n public void resume() {\n int newPosition = RewindAfterPauseUtils.calculatePositionWithRewind(\n media.getPosition(),\n- media.getLastPlayedTime());\n+ media.getLastPlayedTimeStatistics());\n seekTo(newPosition);\n remoteMediaClient.play();\n }\n@@ -353,7 +353,7 @@ public void prepare() {\n if (position > 0) {\n position = RewindAfterPauseUtils.calculatePositionWithRewind(\n position,\n- media.getLastPlayedTime());\n+ media.getLastPlayedTimeStatistics());\n }\n remoteMediaClient.load(new MediaLoadRequestData.Builder()\n .setMediaInfo(remoteMedia)\ndiff --git a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/LocalPSMP.java b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/LocalPSMP.java\nindex 37cacd262f7..543e5908bee 100644\n--- a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/LocalPSMP.java\n+++ b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/LocalPSMP.java\n@@ -233,7 +233,7 @@ public void resume() {\n \n if (playerStatus == PlayerStatus.PREPARED && media.getPosition() > 0) {\n int newPosition = RewindAfterPauseUtils.calculatePositionWithRewind(\n- media.getPosition(), media.getLastPlayedTime());\n+ media.getPosition(), media.getLastPlayedTimeStatistics());\n seekTo(newPosition);\n }\n mediaPlayer.start();\ndiff --git a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/PlayableUtils.java b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/PlayableUtils.java\nindex beef456f95a..7e71db953ed 100644\n--- a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/PlayableUtils.java\n+++ b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/PlayableUtils.java\n@@ -1,5 +1,7 @@\n package de.danoeh.antennapod.playback.service.internal;\n \n+import java.util.Date;\n+\n import de.danoeh.antennapod.storage.database.DBWriter;\n import de.danoeh.antennapod.model.feed.FeedItem;\n import de.danoeh.antennapod.model.feed.FeedMedia;\n@@ -17,10 +19,11 @@ public abstract class PlayableUtils {\n */\n public static void saveCurrentPosition(Playable playable, int newPosition, long timestamp) {\n playable.setPosition(newPosition);\n- playable.setLastPlayedTime(timestamp);\n+ playable.setLastPlayedTimeStatistics(timestamp);\n \n if (playable instanceof FeedMedia) {\n FeedMedia media = (FeedMedia) playable;\n+ media.setLastPlayedTimeHistory(new Date(timestamp));\n FeedItem item = media.getItem();\n if (item != null && item.isNew()) {\n DBWriter.markItemPlayed(FeedItem.UNPLAYED, item.getId());\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBUpgrader.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBUpgrader.java\nindex 9daa1c137ca..b0b7009daa6 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBUpgrader.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBUpgrader.java\n@@ -45,7 +45,7 @@ static void upgrade(final SQLiteDatabase db, final int oldVersion, final int new\n }\n if (oldVersion <= 7) {\n db.execSQL(\"ALTER TABLE \" + PodDBAdapter.TABLE_NAME_FEED_MEDIA\n- + \" ADD COLUMN \" + PodDBAdapter.KEY_PLAYBACK_COMPLETION_DATE\n+ + \" ADD COLUMN \" + PodDBAdapter.KEY_LAST_PLAYED_TIME_HISTORY\n + \" INTEGER\");\n }\n if (oldVersion <= 8) {\n@@ -210,7 +210,7 @@ static void upgrade(final SQLiteDatabase db, final int oldVersion, final int new\n }\n if (oldVersion < 1040002) {\n db.execSQL(\"ALTER TABLE \" + PodDBAdapter.TABLE_NAME_FEED_MEDIA\n- + \" ADD COLUMN \" + PodDBAdapter.KEY_LAST_PLAYED_TIME + \" INTEGER DEFAULT 0\");\n+ + \" ADD COLUMN \" + PodDBAdapter.KEY_LAST_PLAYED_TIME_STATISTICS + \" INTEGER DEFAULT 0\");\n }\n if (oldVersion < 1040013) {\n db.execSQL(PodDBAdapter.CREATE_INDEX_FEEDITEMS_PUBDATE);\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBWriter.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBWriter.java\nindex 93b961f9ae6..62e2d9504e9 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBWriter.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBWriter.java\n@@ -296,16 +296,16 @@ public static Future addItemToPlaybackHistory(FeedMedia media) {\n * current date regardless of the current value.\n *\n * @param media FeedMedia that should be added to the playback history.\n- * @param date PlaybackCompletionDate for media\n+ * @param date LastPlayedTimeHistory for media\n */\n public static Future addItemToPlaybackHistory(final FeedMedia media, Date date) {\n return runOnDbThread(() -> {\n Log.d(TAG, \"Adding item to playback history\");\n- media.setPlaybackCompletionDate(date);\n+ media.setLastPlayedTimeHistory(date);\n \n PodDBAdapter adapter = PodDBAdapter.getInstance();\n adapter.open();\n- adapter.setFeedMediaPlaybackCompletionDate(media);\n+ adapter.setFeedMediaLastPlayedTimeHistory(media);\n adapter.close();\n EventBus.getDefault().post(PlaybackHistoryEvent.listUpdated());\n \ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/FeedItemPermutors.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/FeedItemPermutors.java\nindex a9c59e2bb52..7955ebbbbc4 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/FeedItemPermutors.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/FeedItemPermutors.java\n@@ -79,8 +79,8 @@ public static Permutor getPermutor(@NonNull SortOrder sortOrder) {\n comparator = (f1, f2) -> Long.compare(size(f2), size(f1));\n break;\n case COMPLETION_DATE_NEW_OLD:\n- comparator = (f1, f2) -> f2.getMedia().getPlaybackCompletionDate()\n- .compareTo(f1.getMedia().getPlaybackCompletionDate());\n+ comparator = (f1, f2) -> f2.getMedia().getLastPlayedTimeHistory()\n+ .compareTo(f1.getMedia().getLastPlayedTimeHistory());\n break;\n default:\n throw new IllegalArgumentException(\"Permutor not implemented\");\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java\nindex e4b612b38bf..edc6934b462 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java\n@@ -95,7 +95,6 @@ public class PodDBAdapter {\n public static final String KEY_FEED_IDENTIFIER = \"feed_identifier\";\n public static final String KEY_REASON_DETAILED = \"reason_detailed\";\n public static final String KEY_DOWNLOADSTATUS_TITLE = \"title\";\n- public static final String KEY_PLAYBACK_COMPLETION_DATE = \"playback_completion_date\";\n public static final String KEY_AUTO_DOWNLOAD_ENABLED = \"auto_download\"; // Both tables use the same key\n public static final String KEY_KEEP_UPDATED = \"keep_updated\";\n public static final String KEY_AUTO_DELETE_ACTION = \"auto_delete_action\";\n@@ -109,7 +108,8 @@ public class PodDBAdapter {\n public static final String KEY_SORT_ORDER = \"sort_order\";\n public static final String KEY_LAST_UPDATE_FAILED = \"last_update_failed\";\n public static final String KEY_HAS_EMBEDDED_PICTURE = \"has_embedded_picture\";\n- public static final String KEY_LAST_PLAYED_TIME = \"last_played_time\";\n+ public static final String KEY_LAST_PLAYED_TIME_HISTORY = \"playback_completion_date\";\n+ public static final String KEY_LAST_PLAYED_TIME_STATISTICS = \"last_played_time\";\n public static final String KEY_INCLUDE_FILTER = \"include_filter\";\n public static final String KEY_EXCLUDE_FILTER = \"exclude_filter\";\n public static final String KEY_MINIMAL_DURATION_FILTER = \"minimal_duration_filter\";\n@@ -197,11 +197,11 @@ public class PodDBAdapter {\n + \" INTEGER,\" + KEY_FILE_URL + \" TEXT,\" + KEY_DOWNLOAD_URL\n + \" TEXT,\" + KEY_DOWNLOAD_DATE + \" INTEGER,\" + KEY_POSITION\n + \" INTEGER,\" + KEY_SIZE + \" INTEGER,\" + KEY_MIME_TYPE + \" TEXT,\"\n- + KEY_PLAYBACK_COMPLETION_DATE + \" INTEGER,\"\n+ + KEY_LAST_PLAYED_TIME_HISTORY + \" INTEGER,\"\n + KEY_FEEDITEM + \" INTEGER,\"\n + KEY_PLAYED_DURATION + \" INTEGER,\"\n + KEY_HAS_EMBEDDED_PICTURE + \" INTEGER,\"\n- + KEY_LAST_PLAYED_TIME + \" INTEGER\" + \")\";\n+ + KEY_LAST_PLAYED_TIME_STATISTICS + \" INTEGER\" + \")\";\n \n private static final String CREATE_TABLE_DOWNLOAD_LOG = \"CREATE TABLE \"\n + TABLE_NAME_DOWNLOAD_LOG + \" (\" + TABLE_PRIMARY_KEY + KEY_FEEDFILE\n@@ -292,11 +292,11 @@ public class PodDBAdapter {\n + TABLE_NAME_FEED_MEDIA + \".\" + KEY_POSITION + \", \"\n + TABLE_NAME_FEED_MEDIA + \".\" + KEY_SIZE + \", \"\n + TABLE_NAME_FEED_MEDIA + \".\" + KEY_MIME_TYPE + \", \"\n- + TABLE_NAME_FEED_MEDIA + \".\" + KEY_PLAYBACK_COMPLETION_DATE + \", \"\n+ + TABLE_NAME_FEED_MEDIA + \".\" + KEY_LAST_PLAYED_TIME_HISTORY + \", \"\n + TABLE_NAME_FEED_MEDIA + \".\" + KEY_FEEDITEM + \", \"\n + TABLE_NAME_FEED_MEDIA + \".\" + KEY_PLAYED_DURATION + \", \"\n + TABLE_NAME_FEED_MEDIA + \".\" + KEY_HAS_EMBEDDED_PICTURE + \", \"\n- + TABLE_NAME_FEED_MEDIA + \".\" + KEY_LAST_PLAYED_TIME;\n+ + TABLE_NAME_FEED_MEDIA + \".\" + KEY_LAST_PLAYED_TIME_STATISTICS;\n \n private static final String KEYS_FEED =\n TABLE_NAME_FEEDS + \".\" + KEY_ID + \" AS \" + SELECT_KEY_FEED_ID + \", \"\n@@ -523,12 +523,12 @@ public long setMedia(FeedMedia media) {\n values.put(KEY_DOWNLOAD_DATE, media.getDownloadDate());\n values.put(KEY_FILE_URL, media.getLocalFileUrl());\n values.put(KEY_HAS_EMBEDDED_PICTURE, media.hasEmbeddedPicture());\n- values.put(KEY_LAST_PLAYED_TIME, media.getLastPlayedTime());\n+ values.put(KEY_LAST_PLAYED_TIME_STATISTICS, media.getLastPlayedTimeStatistics());\n \n- if (media.getPlaybackCompletionDate() != null) {\n- values.put(KEY_PLAYBACK_COMPLETION_DATE, media.getPlaybackCompletionDate().getTime());\n+ if (media.getLastPlayedTimeHistory() != null) {\n+ values.put(KEY_LAST_PLAYED_TIME_HISTORY, media.getLastPlayedTimeHistory().getTime());\n } else {\n- values.put(KEY_PLAYBACK_COMPLETION_DATE, 0);\n+ values.put(KEY_LAST_PLAYED_TIME_HISTORY, 0);\n }\n if (media.getItem() != null) {\n values.put(KEY_FEEDITEM, media.getItem().getId());\n@@ -548,7 +548,8 @@ public void setFeedMediaPlaybackInformation(FeedMedia media) {\n values.put(KEY_POSITION, media.getPosition());\n values.put(KEY_DURATION, media.getDuration());\n values.put(KEY_PLAYED_DURATION, media.getPlayedDuration());\n- values.put(KEY_LAST_PLAYED_TIME, media.getLastPlayedTime());\n+ values.put(KEY_LAST_PLAYED_TIME_STATISTICS, media.getLastPlayedTimeStatistics());\n+ values.put(KEY_LAST_PLAYED_TIME_HISTORY, media.getLastPlayedTimeHistory().getTime());\n db.update(TABLE_NAME_FEED_MEDIA, values, KEY_ID + \"=?\",\n new String[]{String.valueOf(media.getId())});\n } else {\n@@ -556,15 +557,15 @@ public void setFeedMediaPlaybackInformation(FeedMedia media) {\n }\n }\n \n- public void setFeedMediaPlaybackCompletionDate(FeedMedia media) {\n+ public void setFeedMediaLastPlayedTimeHistory(FeedMedia media) {\n if (media.getId() != 0) {\n ContentValues values = new ContentValues();\n- values.put(KEY_PLAYBACK_COMPLETION_DATE, media.getPlaybackCompletionDate().getTime());\n+ values.put(KEY_LAST_PLAYED_TIME_HISTORY, media.getLastPlayedTimeHistory().getTime());\n values.put(KEY_PLAYED_DURATION, media.getPlayedDuration());\n db.update(TABLE_NAME_FEED_MEDIA, values, KEY_ID + \"=?\",\n new String[]{String.valueOf(media.getId())});\n } else {\n- Log.e(TAG, \"setFeedMediaPlaybackCompletionDate: ID of media was 0\");\n+ Log.e(TAG, \"setFeedMediaLastPlayedTimeHistory: ID of media was 0\");\n }\n }\n \n@@ -954,7 +955,7 @@ public void removeFeed(Feed feed) {\n \n public void clearPlaybackHistory() {\n ContentValues values = new ContentValues();\n- values.put(KEY_PLAYBACK_COMPLETION_DATE, 0);\n+ values.put(KEY_LAST_PLAYED_TIME_HISTORY, 0);\n db.update(TABLE_NAME_FEED_MEDIA, values, null, null);\n }\n \n@@ -1061,7 +1062,7 @@ public Cursor getNextInQueue(final FeedItem item) {\n \n public final Cursor getPausedQueueCursor(int limit) {\n final String hasPositionOrRecentlyPlayed = TABLE_NAME_FEED_MEDIA + \".\" + KEY_POSITION + \" >= 1000\"\n- + \" OR \" + TABLE_NAME_FEED_MEDIA + \".\" + KEY_LAST_PLAYED_TIME\n+ + \" OR \" + TABLE_NAME_FEED_MEDIA + \".\" + KEY_LAST_PLAYED_TIME_STATISTICS\n + \" >= \" + (System.currentTimeMillis() - 30000);\n final String query = \"SELECT \" + KEYS_FEED_ITEM_WITHOUT_DESCRIPTION + \", \" + KEYS_FEED_MEDIA\n + \" FROM \" + TABLE_NAME_QUEUE\n@@ -1069,7 +1070,7 @@ public final Cursor getPausedQueueCursor(int limit) {\n + \" ON \" + SELECT_KEY_ITEM_ID + \" = \" + TABLE_NAME_QUEUE + \".\" + KEY_FEEDITEM\n + JOIN_FEED_ITEM_AND_MEDIA\n + \" ORDER BY (CASE WHEN \" + hasPositionOrRecentlyPlayed + \" THEN \"\n- + TABLE_NAME_FEED_MEDIA + \".\" + KEY_LAST_PLAYED_TIME + \" ELSE 0 END) DESC , \"\n+ + TABLE_NAME_FEED_MEDIA + \".\" + KEY_LAST_PLAYED_TIME_STATISTICS + \" ELSE 0 END) DESC , \"\n + TABLE_NAME_QUEUE + \".\" + KEY_ID\n + \" LIMIT \" + limit;\n return db.rawQuery(query, null);\n@@ -1124,13 +1125,14 @@ public final Cursor getFeedEpisodeCountCursor(long feedId, FeedItemFilter filter\n }\n \n public Cursor getRandomEpisodesCursor(int limit, int seed) {\n+ long oneHourAgo = System.currentTimeMillis() - 1000L * 3600L;\n final String allItems = SELECT_FEED_ITEMS_AND_MEDIA\n + \" WHERE (\" + KEY_READ + \" = \" + FeedItem.NEW + \" OR \" + KEY_READ + \" = \" + FeedItem.UNPLAYED + \") \"\n // Only from the last two years. Older episodes often contain broken covers and stuff like that\n + \" AND \" + KEY_PUBDATE + \" > \" + (System.currentTimeMillis() - 1000L * 3600L * 24L * 356L * 2)\n // Hide episodes that have been played but not completed\n- + \" AND (\" + KEY_LAST_PLAYED_TIME + \" == 0\"\n- + \" OR \" + KEY_LAST_PLAYED_TIME + \" > \" + (System.currentTimeMillis() - 1000L * 3600L) + \")\"\n+ + \" AND (\" + KEY_LAST_PLAYED_TIME_STATISTICS + \" == 0\"\n+ + \" OR \" + KEY_LAST_PLAYED_TIME_STATISTICS + \" > \" + oneHourAgo + \")\"\n + \" AND \" + SELECT_WHERE_FEED_IS_SUBSCRIBED;\n final String query = \"SELECT MAX(\" + randomEpisodeNumber(seed) + \"), * FROM (\" + allItems + \")\"\n + \" GROUP BY \" + KEY_FEED\n@@ -1184,7 +1186,7 @@ public final Cursor getFeedItemCursorByUrl(List urls) {\n }\n final String query = SELECT_FEED_ITEMS_AND_MEDIA\n + \" WHERE \" + KEY_DOWNLOAD_URL + \" IN (\" + urlsString + \")\"\n- + \" ORDER BY \" + KEY_PLAYBACK_COMPLETION_DATE + \" DESC\";\n+ + \" ORDER BY \" + KEY_LAST_PLAYED_TIME_HISTORY + \" DESC\";\n return db.rawQuery(query, null);\n }\n \n@@ -1206,10 +1208,10 @@ public final Cursor getFeedItemCursor(final String guid, final String episodeUrl\n \n public final Cursor getMonthlyStatisticsCursor() {\n final String query = \"SELECT SUM(\" + KEY_PLAYED_DURATION + \") AS total_duration\"\n- + \", strftime('%m', datetime(\" + KEY_LAST_PLAYED_TIME + \"/1000, 'unixepoch')) AS month\"\n- + \", strftime('%Y', datetime(\" + KEY_LAST_PLAYED_TIME + \"/1000, 'unixepoch')) AS year\"\n+ + \", strftime('%m', datetime(\" + KEY_LAST_PLAYED_TIME_STATISTICS + \"/1000, 'unixepoch')) AS month\"\n+ + \", strftime('%Y', datetime(\" + KEY_LAST_PLAYED_TIME_STATISTICS + \"/1000, 'unixepoch')) AS year\"\n + \" FROM \" + TABLE_NAME_FEED_MEDIA\n- + \" WHERE \" + KEY_LAST_PLAYED_TIME + \" > 0 AND \" + KEY_PLAYED_DURATION + \" > 0\"\n+ + \" WHERE \" + KEY_LAST_PLAYED_TIME_STATISTICS + \" > 0 AND \" + KEY_PLAYED_DURATION + \" > 0\"\n + \" GROUP BY year, month\"\n + \" ORDER BY year, month\";\n return db.rawQuery(query, null);\n@@ -1217,16 +1219,16 @@ public final Cursor getMonthlyStatisticsCursor() {\n \n public final Cursor getFeedStatisticsCursor(boolean includeMarkedAsPlayed, long timeFilterFrom,\n long timeFilterTo, long sixMonthsAgo) {\n- final String lastPlayedTime = TABLE_NAME_FEED_MEDIA + \".\" + KEY_LAST_PLAYED_TIME;\n- String wasStarted = TABLE_NAME_FEED_MEDIA + \".\" + KEY_PLAYBACK_COMPLETION_DATE + \" > 0\"\n+ final String lastPlayedTimeStatistics = TABLE_NAME_FEED_MEDIA + \".\" + KEY_LAST_PLAYED_TIME_STATISTICS;\n+ String wasStarted = TABLE_NAME_FEED_MEDIA + \".\" + KEY_LAST_PLAYED_TIME_HISTORY + \" > 0\"\n + \" AND \" + TABLE_NAME_FEED_MEDIA + \".\" + KEY_PLAYED_DURATION + \" > 0\";\n if (includeMarkedAsPlayed) {\n wasStarted = \"(\" + wasStarted + \") OR \"\n + TABLE_NAME_FEED_ITEMS + \".\" + KEY_READ + \"=\" + FeedItem.PLAYED + \" OR \"\n + TABLE_NAME_FEED_MEDIA + \".\" + KEY_POSITION + \"> 0\";\n }\n- final String timeFilter = lastPlayedTime + \">=\" + timeFilterFrom\n- + \" AND \" + lastPlayedTime + \"<\" + timeFilterTo;\n+ final String timeFilter = lastPlayedTimeStatistics + \">=\" + timeFilterFrom\n+ + \" AND \" + lastPlayedTimeStatistics + \"<\" + timeFilterTo;\n String playedTime = TABLE_NAME_FEED_MEDIA + \".\" + KEY_PLAYED_DURATION;\n if (includeMarkedAsPlayed) {\n playedTime = \"(CASE WHEN \" + playedTime + \" != 0\"\n@@ -1238,8 +1240,9 @@ public final Cursor getFeedStatisticsCursor(boolean includeMarkedAsPlayed, long\n \n final String query = \"SELECT \" + KEYS_FEED + \", \"\n + \"COUNT(*) AS num_episodes, \"\n- + \"MIN(CASE WHEN \" + lastPlayedTime + \" > 0\"\n- + \" THEN \" + lastPlayedTime + \" ELSE \" + Long.MAX_VALUE + \" END) AS oldest_date, \"\n+ + \"MIN(CASE WHEN \" + lastPlayedTimeStatistics + \" > 0\"\n+ + \" THEN \" + lastPlayedTimeStatistics\n+ + \" ELSE \" + Long.MAX_VALUE + \" END) AS oldest_date, \"\n + \"SUM(CASE WHEN (\" + wasStarted + \") THEN 1 ELSE 0 END) AS episodes_started, \"\n + \"IFNULL(SUM(CASE WHEN (\" + timeFilter + \")\"\n + \" THEN (\" + playedTime + \") ELSE 0 END), 0) AS played_time, \"\n@@ -1263,10 +1266,10 @@ public final Cursor getFeedStatisticsCursor(boolean includeMarkedAsPlayed, long\n public final Cursor getTimeBetweenReleaseAndPlayback(long timeFilterFrom, long timeFilterTo) {\n final String from = \" FROM \" + TABLE_NAME_FEED_ITEMS\n + JOIN_FEED_ITEM_AND_MEDIA\n- + \" WHERE \" + TABLE_NAME_FEED_MEDIA + \".\" + KEY_LAST_PLAYED_TIME + \">=\" + timeFilterFrom\n+ + \" WHERE \" + TABLE_NAME_FEED_MEDIA + \".\" + KEY_LAST_PLAYED_TIME_STATISTICS + \">=\" + timeFilterFrom\n + \" AND \" + TABLE_NAME_FEED_ITEMS + \".\" + KEY_PUBDATE + \">=\" + timeFilterFrom\n- + \" AND \" + TABLE_NAME_FEED_MEDIA + \".\" + KEY_LAST_PLAYED_TIME + \"<\" + timeFilterTo;\n- final String query = \"SELECT \" + TABLE_NAME_FEED_MEDIA + \".\" + KEY_LAST_PLAYED_TIME\n+ + \" AND \" + TABLE_NAME_FEED_MEDIA + \".\" + KEY_LAST_PLAYED_TIME_STATISTICS + \"<\" + timeFilterTo;\n+ final String query = \"SELECT \" + TABLE_NAME_FEED_MEDIA + \".\" + KEY_LAST_PLAYED_TIME_STATISTICS\n + \" - \" + TABLE_NAME_FEED_ITEMS + \".\" + KEY_PUBDATE + \" AS diff\"\n + from\n + \" ORDER BY diff ASC\"\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemFilterQuery.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemFilterQuery.java\nindex 481107cfac2..f5f0a95c358 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemFilterQuery.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemFilterQuery.java\n@@ -22,7 +22,7 @@ public static String generateFrom(FeedItemFilter filter) {\n // The keys used within this method, but explicitly combined with their table\n String keyRead = PodDBAdapter.TABLE_NAME_FEED_ITEMS + \".\" + PodDBAdapter.KEY_READ;\n String keyPosition = PodDBAdapter.TABLE_NAME_FEED_MEDIA + \".\" + PodDBAdapter.KEY_POSITION;\n- String keyCompletionDate = PodDBAdapter.TABLE_NAME_FEED_MEDIA + \".\" + PodDBAdapter.KEY_PLAYBACK_COMPLETION_DATE;\n+ String keyCompletionDate = PodDBAdapter.TABLE_NAME_FEED_MEDIA + \".\" + PodDBAdapter.KEY_LAST_PLAYED_TIME_HISTORY;\n String keyDownloaded = PodDBAdapter.TABLE_NAME_FEED_MEDIA + \".\" + PodDBAdapter.KEY_DOWNLOAD_DATE;\n String keyMediaId = PodDBAdapter.TABLE_NAME_FEED_MEDIA + \".\" + PodDBAdapter.KEY_ID;\n String keyItemId = PodDBAdapter.TABLE_NAME_FEED_ITEMS + \".\" + PodDBAdapter.KEY_ID;\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemSortQuery.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemSortQuery.java\nindex 236e9cbcf90..96a3a509fe3 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemSortQuery.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemSortQuery.java\n@@ -23,7 +23,7 @@ public static String generateFrom(SortOrder sortOrder) {\n return PodDBAdapter.TABLE_NAME_FEED_MEDIA + \".\" + PodDBAdapter.KEY_SIZE + \" \" + \"DESC\";\n case COMPLETION_DATE_NEW_OLD:\n return PodDBAdapter.TABLE_NAME_FEED_MEDIA + \".\"\n- + PodDBAdapter.KEY_PLAYBACK_COMPLETION_DATE + \" \" + \"DESC\";\n+ + PodDBAdapter.KEY_LAST_PLAYED_TIME_HISTORY + \" \" + \"DESC\";\n case DATE_OLD_NEW:\n return PodDBAdapter.TABLE_NAME_FEED_ITEMS + \".\" + PodDBAdapter.KEY_PUBDATE + \" \" + \"ASC\";\n case EPISODE_FILENAME_A_Z:\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedMediaCursor.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedMediaCursor.java\nindex 51b25584fbb..ecd2c9c856f 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedMediaCursor.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedMediaCursor.java\n@@ -13,7 +13,7 @@\n */\n public class FeedMediaCursor extends CursorWrapper {\n private final int indexId;\n- private final int indexPlaybackCompletionDate;\n+ private final int indexLastPlayedTimeHistory;\n private final int indexDuration;\n private final int indexPosition;\n private final int indexSize;\n@@ -22,13 +22,13 @@ public class FeedMediaCursor extends CursorWrapper {\n private final int indexDownloadUrl;\n private final int indexDownloadDate;\n private final int indexPlayedDuration;\n- private final int indexLastPlayedTime;\n+ private final int indexLastPlayedTimeStatistics;\n private final int indexHasEmbeddedPicture;\n \n public FeedMediaCursor(Cursor cursor) {\n super(cursor);\n indexId = cursor.getColumnIndexOrThrow(PodDBAdapter.SELECT_KEY_MEDIA_ID);\n- indexPlaybackCompletionDate = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_PLAYBACK_COMPLETION_DATE);\n+ indexLastPlayedTimeHistory = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_LAST_PLAYED_TIME_HISTORY);\n indexDuration = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_DURATION);\n indexPosition = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_POSITION);\n indexSize = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_SIZE);\n@@ -37,7 +37,7 @@ public FeedMediaCursor(Cursor cursor) {\n indexDownloadUrl = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_DOWNLOAD_URL);\n indexDownloadDate = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_DOWNLOAD_DATE);\n indexPlayedDuration = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_PLAYED_DURATION);\n- indexLastPlayedTime = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_LAST_PLAYED_TIME);\n+ indexLastPlayedTimeStatistics = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_LAST_PLAYED_TIME_STATISTICS);\n indexHasEmbeddedPicture = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_HAS_EMBEDDED_PICTURE);\n }\n \n@@ -46,8 +46,8 @@ public FeedMediaCursor(Cursor cursor) {\n */\n @NonNull\n public FeedMedia getFeedMedia() {\n- long playbackCompletionTime = getLong(indexPlaybackCompletionDate);\n- Date playbackCompletionDate = playbackCompletionTime > 0 ? new Date(playbackCompletionTime) : null;\n+ long lastPlayedTimeHistoryTime = getLong(indexLastPlayedTimeHistory);\n+ Date lastPlayedTimeHistory = lastPlayedTimeHistoryTime > 0 ? new Date(lastPlayedTimeHistoryTime) : null;\n \n Boolean hasEmbeddedPicture;\n switch (getInt(indexHasEmbeddedPicture)) {\n@@ -72,10 +72,10 @@ public FeedMedia getFeedMedia() {\n getString(indexFileUrl),\n getString(indexDownloadUrl),\n getLong(indexDownloadDate),\n- playbackCompletionDate,\n+ lastPlayedTimeHistory,\n getInt(indexPlayedDuration),\n hasEmbeddedPicture,\n- getLong(indexLastPlayedTime)\n+ getLong(indexLastPlayedTimeStatistics)\n );\n }\n }\n", "test_patch": "diff --git a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java\nindex 4b93dcee9b9..8eef573d07a 100644\n--- a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java\n+++ b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java\n@@ -183,7 +183,7 @@ public void addLocalFeedData(boolean downloadEpisodes) throws Exception {\n \n queue.add(feed.getItems().get(0));\n if (feed.getItems().get(1).hasMedia()) {\n- feed.getItems().get(1).getMedia().setPlaybackCompletionDate(new Date());\n+ feed.getItems().get(1).getMedia().setLastPlayedTimeHistory(new Date());\n }\n }\n localFeedDataAdded = true;\ndiff --git a/net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbCleanupTests.java b/net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbCleanupTests.java\nindex c9a707327a0..737b4b93677 100644\n--- a/net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbCleanupTests.java\n+++ b/net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbCleanupTests.java\n@@ -130,9 +130,9 @@ void populateItems(final int numItems, Feed feed, List items,\n boolean addToFavorites) throws IOException {\n for (int i = 0; i < numItems; i++) {\n Date itemDate = new Date(numItems - i);\n- Date playbackCompletionDate = null;\n+ Date lastPlayedTimeHistory = null;\n if (itemState == FeedItem.PLAYED) {\n- playbackCompletionDate = itemDate;\n+ lastPlayedTimeHistory = itemDate;\n }\n FeedItem item = new FeedItem(0, \"title\", \"id\" + i, \"link\", itemDate, itemState, feed);\n \n@@ -140,7 +140,7 @@ void populateItems(final int numItems, Feed feed, List items,\n assertTrue(f.createNewFile());\n files.add(f);\n item.setMedia(new FeedMedia(0, item, 1, 0, 1L, \"m\",\n- f.getAbsolutePath(), \"url\", System.currentTimeMillis(), playbackCompletionDate, 0, 0));\n+ f.getAbsolutePath(), \"url\", System.currentTimeMillis(), lastPlayedTimeHistory, 0, 0));\n items.add(item);\n }\n \ndiff --git a/net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbReaderTest.java b/net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbReaderTest.java\nindex a3dc9bd6fae..8f54609b013 100644\n--- a/net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbReaderTest.java\n+++ b/net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbReaderTest.java\n@@ -324,9 +324,9 @@ public void testGetPlaybackHistoryLength() {\n adapter.open();\n for (int i = 0; i < playedItems; ++i) {\n FeedMedia m = feed.getItems().get(i).getMedia();\n- m.setPlaybackCompletionDate(new Date(i + 1));\n+ m.setLastPlayedTimeHistory(new Date(i + 1));\n \n- adapter.setFeedMediaPlaybackCompletionDate(m);\n+ adapter.setFeedMediaLastPlayedTimeHistory(m);\n }\n adapter.close();\n \n@@ -506,8 +506,8 @@ public void testGetPlaybackHistory() {\n adapter.open();\n for (int i = 0; i < playedItems; i++) {\n FeedMedia m = feed.getItems().get(i).getMedia();\n- m.setPlaybackCompletionDate(new Date(i + 1));\n- adapter.setFeedMediaPlaybackCompletionDate(m);\n+ m.setLastPlayedTimeHistory(new Date(i + 1));\n+ adapter.setFeedMediaLastPlayedTimeHistory(m);\n ids[ids.length - 1 - i] = m.getItem().getId();\n }\n adapter.close();\n@@ -520,7 +520,7 @@ public void testGetPlaybackHistory() {\n numReturnedItems, saved.size());\n for (int i = 0; i < numReturnedItems; i++) {\n FeedItem item = saved.get(i);\n- assertNotNull(item.getMedia().getPlaybackCompletionDate());\n+ assertNotNull(item.getMedia().getLastPlayedTimeHistory());\n assertEquals(String.format(\"Wrong sort order with offset %d and limit %d: \",\n paramOffset, paramLimit),\n item.getId(), ids[paramOffset + i]);\ndiff --git a/net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbWriterTest.java b/net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbWriterTest.java\nindex 4fc41a73b4c..d61e2076661 100644\n--- a/net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbWriterTest.java\n+++ b/net/download/service/src/test/java/de/danoeh/antennapod/net/download/service/episode/autodownload/DbWriterTest.java\n@@ -94,7 +94,8 @@ public void tearDown() {\n @Test\n public void testSetFeedMediaPlaybackInformation() throws Exception {\n final int position = 50;\n- final long lastPlayedTime = 1000;\n+ final long lastPlayedTimeStatistics = 1000;\n+ final Date lastPlayedTimeHistory = new Date();\n final int playedDuration = 60;\n final int duration = 100;\n \n@@ -110,8 +111,9 @@ public void testSetFeedMediaPlaybackInformation() throws Exception {\n DBWriter.setFeedItem(item).get(TIMEOUT, TimeUnit.SECONDS);\n \n media.setPosition(position);\n- media.setLastPlayedTime(lastPlayedTime);\n+ media.setLastPlayedTimeStatistics(lastPlayedTimeStatistics);\n media.setPlayedDuration(playedDuration);\n+ media.setLastPlayedTimeHistory(lastPlayedTimeHistory);\n \n DBWriter.setFeedMediaPlaybackInformation(item.getMedia()).get(TIMEOUT, TimeUnit.SECONDS);\n \n@@ -119,7 +121,8 @@ public void testSetFeedMediaPlaybackInformation() throws Exception {\n FeedMedia mediaFromDb = itemFromDb.getMedia();\n \n assertEquals(position, mediaFromDb.getPosition());\n- assertEquals(lastPlayedTime, mediaFromDb.getLastPlayedTime());\n+ assertEquals(lastPlayedTimeStatistics, mediaFromDb.getLastPlayedTimeStatistics());\n+ assertEquals(lastPlayedTimeHistory, mediaFromDb.getLastPlayedTimeHistory());\n assertEquals(playedDuration, mediaFromDb.getPlayedDuration());\n assertEquals(duration, mediaFromDb.getDuration());\n }\n@@ -467,12 +470,12 @@ public void testDeleteFeedItems() throws Exception {\n adapter.close();\n }\n \n- private FeedMedia playbackHistorySetup(Date playbackCompletionDate) {\n+ private FeedMedia playbackHistorySetup(Date lastPlayedTimeHistory) {\n Feed feed = new Feed(\"url\", null, \"title\");\n feed.setItems(new ArrayList<>());\n FeedItem item = new FeedItem(0, \"title\", \"id\", \"link\", new Date(), FeedItem.PLAYED, feed);\n FeedMedia media = new FeedMedia(0, item, 10, 0, 1, \"mime\", null,\n- \"url\", 0, playbackCompletionDate, 0, 0);\n+ \"url\", 0, lastPlayedTimeHistory, 0, 0);\n feed.getItems().add(item);\n item.setMedia(media);\n PodDBAdapter adapter = PodDBAdapter.getInstance();\n@@ -493,7 +496,7 @@ public void testAddItemToPlaybackHistoryNotPlayedYet() throws Exception {\n adapter.close();\n \n assertNotNull(media);\n- assertNotNull(media.getPlaybackCompletionDate());\n+ assertNotNull(media.getLastPlayedTimeHistory());\n }\n \n @Test\n@@ -508,8 +511,8 @@ public void testAddItemToPlaybackHistoryAlreadyPlayed() throws Exception {\n adapter.close();\n \n assertNotNull(media);\n- assertNotNull(media.getPlaybackCompletionDate());\n- assertNotEquals(media.getPlaybackCompletionDate().getTime(), oldDate);\n+ assertNotNull(media.getLastPlayedTimeHistory());\n+ assertNotEquals(media.getLastPlayedTimeHistory().getTime(), oldDate);\n }\n \n @SuppressWarnings(\"SameParameterValue\")\n", "n2p_tests": "{\"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testClearQueue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testLoadFeedDataOfFeedItemlist\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testSetFeedMediaPlaybackInformation\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbCleanupTests.testPerformAutoCleanupShouldDelete\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetFeedItemlistCheckChaptersTrue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[2]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[3]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetQueue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetItemByGuid\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testDeleteFeedWithQueueItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testLoadChaptersOfFeedItemWithChapters\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[0]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetNewItemIds\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetItemWithChapters\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[4]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbCleanupTests.testPerformAutoCleanupShouldNotDeleteBecauseFavorite\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetQueueIdList\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetFeedList\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testRemoveQueueItemMultipleItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testFeedListDownloadUrls\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetFeedListSortOrder\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testAddQueueItemSingleItemAlreadyInQueue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbCleanupTests.testPerformAutoCleanupShouldNotDeleteBecauseInQueue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbCleanupTests.testPerformAutoCleanupHandleUnplayed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testDeleteFeed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testRemoveAllNewFlags\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testDeleteFeedNoDownloadedFiles\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testDeleteFeedNoFeedMedia\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[7]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testAddQueueItemMultipleItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbCleanupTests.testPerformAutoCleanupShouldNotDeleteBecauseInQueue_withFeedsWithNoMedia\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[1]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testDeleteFeedItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testDeleteFeedNoItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetItemByEpisodeUrl\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testAddQueueItemSingleItem\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testLoadChaptersOfFeedItemNoChapters\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[8]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testAddItemToPlaybackHistoryNotPlayedYet\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testMoveQueueItem\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetFeedItemList\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetNavDrawerDataQueueNotEmptyWithUnreadItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetFeedItemlistCheckChaptersFalse\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[5]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$PlaybackHistoryTest.testGetPlaybackHistory[6]\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testAddItemToPlaybackHistoryAlreadyPlayed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetPlaybackHistoryLength\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testDeleteFeedMediaOfItemFileExists\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testDeleteFeedMediaOfItemRemoveFromQueue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetDownloadedItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbWriterTest.testRemoveQueueItem\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.net.download.service.episode.autodownload.DbReaderTest$SingleTests.testGetNavDrawerDataQueueEmptyNoUnreadItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "AntennaPod__AntennaPod-7581", "org": "AntennaPod", "repo": "AntennaPod", "number": 7581, "state": "closed", "title": "Highlight plain-text links in episode description", "body": "### Description\r\n\r\ncloses #7578\r\n\r\n### Checklist\r\n\r\n- [x] I have read the contribution guidelines: https://github.com/AntennaPod/AntennaPod/blob/develop/CONTRIBUTING.md#submit-a-pull-request\r\n- [x] I have performed a self-review of my code\r\n- [x] I have run the automated code checks using `./gradlew checkstyle spotbugsPlayDebug spotbugsDebug :app:lintPlayDebug`\r\n- [x] My code follows the style guidelines of the AntennaPod project: https://github.com/AntennaPod/AntennaPod/wiki/Code-style\r\n- [x] I have mentioned the corresponding issue and the relevant keyword (e.g., \"Closes: #xy\") in the description (see https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)\r\n- [x] If it is a core feature, I have added automated tests\r\n", "base": "{\"label\": \"AntennaPod:develop\", \"ref\": \"develop\", \"sha\": \"60f5faf394e9859e2505923a81cac6e86d21930f\"}", "resolved_issues": "[{\"number\": 7578, \"title\": \"Highlight plain-text links in episode description\", \"body\": \"### Checklist\\n\\n- [X] I have used the search function for [**OPEN**](https://github.com/AntennaPod/AntennaPod/issues) issues to see if someone else has already submitted the same feature request.\\n- [X] I have **also** used the search function for [**CLOSED**](https://github.com/AntennaPod/AntennaPod/issues?q=is%3Aissue+is%3Aclosed) issues to see if the feature was already implemented and is just waiting to be released, or if the feature was rejected.\\n- [X] I will describe the problem with as much detail as possible.\\n- [X] This request contains only one single feature, **not** a list of multiple (related) features.\\n\\n### App version\\n\\n3.6.0\\n\\n### Feature or improvement you want\\n\\nSometimes podcast authors add links not as proper html `` tags but just as plain text `https://domain.com/`\\r\\n\\r\\nIt's an easy fix to treat such links as normal clickable links (see screenshots)\\n\\n### Why should this be added?\\n\\nThis improves UX, users don't have to copy-paste links\\n\\n### Screenshots / Drawings / Technical details\\n\\nI have unit tests that seems to cover all the cases, tried it on my device for a couple of weeks, so far no issues\\r\\n\\r\\nBefore:\\r\\n\\r\\n![before](https://github.com/user-attachments/assets/ae5431d9-ccb0-4975-9e8b-53528a4c7fc9)\\r\\n\\r\\n\\r\\n\\r\\nAfter:\\r\\n\\r\\n![after](https://github.com/user-attachments/assets/8aae3162-1df6-4abd-9f5c-9ef98017d83c)\\r\\n\\r\\n\\r\\n\"}]", "lang": "java", "problem_statement": "Highlight plain-text links in episode description\n### Checklist\n\n- [X] I have used the search function for [**OPEN**](https://github.com/AntennaPod/AntennaPod/issues) issues to see if someone else has already submitted the same feature request.\n- [X] I have **also** used the search function for [**CLOSED**](https://github.com/AntennaPod/AntennaPod/issues?q=is%3Aissue+is%3Aclosed) issues to see if the feature was already implemented and is just waiting to be released, or if the feature was rejected.\n- [X] I will describe the problem with as much detail as possible.\n- [X] This request contains only one single feature, **not** a list of multiple (related) features.\n\n### App version\n\n3.6.0\n\n### Feature or improvement you want\n\nSometimes podcast authors add links not as proper html `` tags but just as plain text `https://domain.com/`\r\n\r\nIt's an easy fix to treat such links as normal clickable links (see screenshots)\n\n### Why should this be added?\n\nThis improves UX, users don't have to copy-paste links\n\n### Screenshots / Drawings / Technical details\n\nI have unit tests that seems to cover all the cases, tried it on my device for a couple of weeks, so far no issues\r\n\r\nBefore:\r\n\r\n![before](https://github.com/user-attachments/assets/ae5431d9-ccb0-4975-9e8b-53528a4c7fc9)\r\n\r\n\r\n\r\nAfter:\r\n\r\n![after](https://github.com/user-attachments/assets/8aae3162-1df6-4abd-9f5c-9ef98017d83c)\r\n\r\n\r\n\n", "hints": "Could you open a PR please, so we can have a look at your solution?", "pull_url": "https://github.com/AntennaPod/AntennaPod/pull/7581", "issue_urls": "[\"https://github.com/AntennaPod/AntennaPod/issues/7578\"]", "test_command": "./gradlew :app:testFreeDebugUnitTest --tests \"de.danoeh.antennapod.ui.cleaner.PlainTextLinksConverterTest\"", "fix_patch": "diff --git a/app/src/main/java/de/danoeh/antennapod/ui/cleaner/PlainTextLinksConverter.java b/app/src/main/java/de/danoeh/antennapod/ui/cleaner/PlainTextLinksConverter.java\nnew file mode 100644\nindex 00000000000..8f7d59e2d9d\n--- /dev/null\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/cleaner/PlainTextLinksConverter.java\n@@ -0,0 +1,145 @@\n+package de.danoeh.antennapod.ui.cleaner;\n+\n+import androidx.annotation.NonNull;\n+\n+import org.jsoup.Jsoup;\n+import org.jsoup.nodes.Document;\n+import org.jsoup.nodes.Element;\n+import org.jsoup.nodes.Node;\n+import org.jsoup.nodes.TextNode;\n+import org.jsoup.select.NodeTraversor;\n+import org.jsoup.select.NodeVisitor;\n+\n+import java.util.ArrayList;\n+import java.util.List;\n+import java.util.regex.Matcher;\n+import java.util.regex.Pattern;\n+\n+public class PlainTextLinksConverter {\n+ private static final Pattern HTTP_LINK_REGEX = Pattern.compile(\n+ \"(?:https?://(?:www\\\\.)?|www\\\\.)\" // http(s)://[www.] OR www.\n+ + \"[-a-zA-Z0-9@:%._+~#=]{1,256}\" // Domain name\n+ + \"\\\\.[a-zA-Z]{2,6}\\\\b\" // Top-level domain\n+ + \"[-a-zA-Z0-9@:%_+.*~#?!&$/=()\\\\[\\\\],;]*\", // Path, query params\n+ Pattern.CASE_INSENSITIVE\n+ );\n+ protected static final List NOT_ALLOWED_END_CHARS = List.of(\n+ \".\", \",\", \";\", \":\", \"?\", \"!\", \")\", \"(\", \"[\", \"]\", \"-\", \"_\", \"~\", \"#\", \"@\", \"$\", \"*\", \"+\");\n+\n+ private static final String STARTS_WITH_HTTP = \"(?i)https?://.*\";\n+ private static final String ANCHOR_TAG = \"a\";\n+ private static final String ANCHOR_ADDRESS = \"href\";\n+\n+ /**\n+ * Provided text can be an HTML document or plain text.\n+ * It may contain a mixture of plain-text links and HTML links.\n+ * Only plain-text links will be converted to HTML {@code } tags.\n+ */\n+ public static String convertLinksToHtml(String text) {\n+ if (text == null || text.isEmpty()) {\n+ return text;\n+ }\n+ try {\n+ Document doc = Jsoup.parse(text);\n+ convertLinksToHtml(doc);\n+ return doc.body().html();\n+ } catch (Exception e) {\n+ return text;\n+ }\n+ }\n+\n+ public static void convertLinksToHtml(Document doc) {\n+ if (doc == null) {\n+ return;\n+ }\n+ NodeTraversor.traverse(new LinkConvertingVisitor(), doc.body());\n+ }\n+\n+ /**\n+ * Ensures that URLs are only converted if they are not already part of an existing anchor tag.\n+ * Document structure remains untouched, logic affects only {@link TextNode} - leaf element with no tags in it.\n+ * One {@link TextNode} is replaced with multiple {@link Element}s:\n+ *

                • {@link TextNode} with text before the link
                  • \n+ *
                • {@link Element} with the link tag
                  • \n+ *
                • {@link TextNode} with text after the link
                  • \n+ */\n+ private static class LinkConvertingVisitor implements NodeVisitor {\n+ @Override\n+ public void head(@NonNull Node node, int depth) {\n+ if (!(node instanceof TextNode textNode)) {\n+ return;\n+ } else if (isInsideAnchor(textNode)) {\n+ return;\n+ }\n+ String originalText = textNode.getWholeText();\n+ Matcher matcher = HTTP_LINK_REGEX.matcher(originalText);\n+\n+ if (!matcher.find()) {\n+ return;\n+ }\n+ List newNodes = new ArrayList<>();\n+ int lastEnd = 0;\n+ matcher.reset();\n+\n+ while (matcher.find()) {\n+ String url = matcher.group();\n+ if (endsWithPunctuation(url)) {\n+ continue;\n+ }\n+ if (matcher.start() > lastEnd) {\n+ newNodes.add(new TextNode(originalText.substring(lastEnd, matcher.start())));\n+ }\n+ newNodes.add(link(url));\n+ lastEnd = matcher.end();\n+ }\n+\n+ if (lastEnd < originalText.length()) {\n+ newNodes.add(new TextNode(originalText.substring(lastEnd)));\n+ }\n+\n+ if (!newNodes.isEmpty()) {\n+ Node parent = textNode.parent();\n+ if (parent instanceof Element parentElement) {\n+ int index = textNode.siblingIndex();\n+ textNode.remove();\n+ parentElement.insertChildren(index, newNodes);\n+ }\n+ }\n+ }\n+\n+ private static Element link(String detectedUrl) {\n+ var url = detectedUrl;\n+ if (!detectedUrl.matches(STARTS_WITH_HTTP)) {\n+ url = \"https://\" + url;\n+ }\n+ return new Element(ANCHOR_TAG).attr(ANCHOR_ADDRESS, url).text(detectedUrl);\n+ }\n+\n+ @Override\n+ public void tail(@NonNull Node node, int depth) {\n+ //not needed\n+ }\n+ }\n+\n+ private static boolean isInsideAnchor(Node node) {\n+ Node current = node;\n+ while (current != null) {\n+ if (current instanceof Element currentElement) {\n+ if (ANCHOR_TAG.equalsIgnoreCase(currentElement.tagName())) {\n+ return true;\n+ }\n+ }\n+ current = current.parent();\n+ }\n+ return false;\n+ }\n+\n+ private static boolean endsWithPunctuation(String url) {\n+ for (String endChar : NOT_ALLOWED_END_CHARS) {\n+ if (url.endsWith(endChar)) {\n+ return true;\n+ }\n+ }\n+ return false;\n+ }\n+}\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/cleaner/ShownotesCleaner.java b/app/src/main/java/de/danoeh/antennapod/ui/cleaner/ShownotesCleaner.java\nindex 8c6dc5f9a01..54f251ef682 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/cleaner/ShownotesCleaner.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/cleaner/ShownotesCleaner.java\n@@ -76,6 +76,7 @@ private String colorToHtml(Context context, int colorAttr) {\n \n /**\n * Applies an app-specific CSS stylesheet and adds timecode links (optional).\n+ * Also converts plain-text links to HTML links.\n *

                  \n * This method does NOT change the original shownotes string of the shownotesProvider object and it should\n * also not be changed by the caller.\n@@ -99,6 +100,7 @@ public String processShownotes() {\n Document document = Jsoup.parse(shownotes);\n cleanCss(document);\n document.head().appendElement(\"style\").attr(\"type\", \"text/css\").text(webviewStyle);\n+ PlainTextLinksConverter.convertLinksToHtml(document);\n addTimecodes(document);\n document.body().attr(\"dir\", \"auto\");\n return document.toString();\n", "test_patch": "diff --git a/app/src/test/java/de/danoeh/antennapod/ui/cleaner/PlainTextLinksConverterTest.java b/app/src/test/java/de/danoeh/antennapod/ui/cleaner/PlainTextLinksConverterTest.java\nnew file mode 100644\nindex 00000000000..36e55d02e3b\n--- /dev/null\n+++ b/app/src/test/java/de/danoeh/antennapod/ui/cleaner/PlainTextLinksConverterTest.java\n@@ -0,0 +1,154 @@\n+package de.danoeh.antennapod.ui.cleaner;\n+\n+\n+import static org.junit.Assert.assertEquals;\n+import static org.junit.Assert.assertNull;\n+import static de.danoeh.antennapod.ui.cleaner.PlainTextLinksConverter.NOT_ALLOWED_END_CHARS;\n+import org.junit.Test;\n+import java.util.List;\n+\n+public class PlainTextLinksConverterTest {\n+\n+ @Test\n+ public void testConvertPlainTextLinksToHtml() {\n+ final String link1 = \"https://url.to/link\";\n+ final String textWithLink = \"text \" + link1;\n+ assertEquals(\"text \" + makeLinkHtml(link1), PlainTextLinksConverter.convertLinksToHtml(textWithLink));\n+\n+ final String link2 = \"https://t.me/link\";\n+ final String textWithLink2 = \"text \" + link2;\n+ assertEquals(\"text \" + makeLinkHtml(link2), PlainTextLinksConverter.convertLinksToHtml(textWithLink2));\n+\n+ final String text = \"artist here: www.example.com\";\n+ final String expected = \"artist here: www.example.com\";\n+ assertEquals(expected, PlainTextLinksConverter.convertLinksToHtml(text));\n+\n+ final String textWithTwoLinks = \"text \" + link1 + \" and \" + link2;\n+ final String expectedTwoLinks = \"text \" + makeLinkHtml(link1) + \" and \" + makeLinkHtml(link2);\n+ assertEquals(expectedTwoLinks, PlainTextLinksConverter.convertLinksToHtml(textWithTwoLinks));\n+\n+ final String textWithMixturePlainTextAndHtml = \"text \" + link1 + \" and \" + makeLinkHtml(link2);\n+ final String expectedMixture = \"text \" + makeLinkHtml(link1) + \" and \" + makeLinkHtml(link2);\n+ assertEquals(expectedMixture, PlainTextLinksConverter.convertLinksToHtml(textWithMixturePlainTextAndHtml));\n+\n+ final String textWithSpecialChars = \"text'\" + link1 + \" and=\" + link2;\n+ final String expectedWithSpecialChars = \"text'\" + makeLinkHtml(link1) + \" and=\" + makeLinkHtml(link2);\n+ assertEquals(expectedWithSpecialChars, PlainTextLinksConverter.convertLinksToHtml(textWithSpecialChars));\n+\n+ final String linkWithParams = \"http://t.me/link#mark?param1=1¶m2=true;param3=true\";\n+ final String textWithParams = \"text \" + linkWithParams + \" after-text\";\n+ final String expectedWithParams = \"text \" + makeLinkHtml(linkWithParams) + \" after-text\";\n+ assertEquals(expectedWithParams, PlainTextLinksConverter.convertLinksToHtml(textWithParams));\n+\n+ final String linkWithComma = \"https://example.org/%D0%%86_(%D1%%BC,_2020\";\n+ final String textWithComma = \"text \" + linkWithComma;\n+ assertEquals(\"text \" + makeLinkHtml(linkWithComma), PlainTextLinksConverter.convertLinksToHtml(textWithComma));\n+\n+ final String linkWithDot = \"https://www.ietf.org/rfc/rfc3986.txt\";\n+ final String textWithDot = \"text \" + linkWithDot;\n+ assertEquals(\"text \" + makeLinkHtml(linkWithDot), PlainTextLinksConverter.convertLinksToHtml(textWithDot));\n+\n+ final String linkWithTilda = \"https://www.example.org/valid/-~.,$/url/\";\n+ final String textWithTilda = \"text \" + linkWithTilda;\n+ assertEquals(\"text \" + makeLinkHtml(linkWithTilda), PlainTextLinksConverter.convertLinksToHtml(textWithTilda));\n+\n+ final String linkWithExclamation = \"http://www.example.com/index.php?id=123&v=wall#!/index.php?id=234\";\n+ final String textWithExclamation = \"text \" + linkWithExclamation;\n+ assertEquals(\"text \" + makeLinkHtml(linkWithExclamation),\n+ PlainTextLinksConverter.convertLinksToHtml(textWithExclamation));\n+\n+ final String linkWithBrackets = \"http://www.example.com/index.php?bar[]=1&bar[]=2\";\n+ final String textWithBrackets = \"text \" + linkWithBrackets;\n+ assertEquals(\"text \" + makeLinkHtml(linkWithBrackets),\n+ PlainTextLinksConverter.convertLinksToHtml(textWithBrackets));\n+\n+ final String linkWithAsterisk = \"https://archive.org/web/*/http://www.example.com/\";\n+ final String textWithAsterisk = \"text \" + linkWithAsterisk;\n+ assertEquals(\"text \" + makeLinkHtml(linkWithAsterisk),\n+ PlainTextLinksConverter.convertLinksToHtml(textWithAsterisk));\n+ }\n+\n+ @Test\n+ public void testBrokenLinksAreNotCreated() {\n+ final String linkWithBrackets = \"Sign up now (http://example.com/abc)\";\n+ assertEquals(linkWithBrackets, PlainTextLinksConverter.convertLinksToHtml(linkWithBrackets));\n+\n+ final String linkWithBrackets2 = \"Sign up now (http://example.com/abc)! please\";\n+ assertEquals(linkWithBrackets2, PlainTextLinksConverter.convertLinksToHtml(linkWithBrackets2));\n+\n+ final String linkWithDot = \"To read on, visit https://example.com.\";\n+ assertEquals(linkWithDot, PlainTextLinksConverter.convertLinksToHtml(linkWithDot));\n+\n+ //we choose to ignore links like this, even though they are valid\n+ final String validLinkIgnored = \"Visit https://example.com/wiki_(url+rules)\";\n+ assertEquals(validLinkIgnored, PlainTextLinksConverter.convertLinksToHtml(validLinkIgnored));\n+\n+ final String link = \"https://example.com/abc\";\n+ NOT_ALLOWED_END_CHARS.forEach(end ->\n+ assertEquals(link + end, PlainTextLinksConverter.convertLinksToHtml(link + end))\n+ );\n+\n+ final String firstLinkIgnored = \"(\" + link + \") and \" + link;\n+ assertEquals(\"(https://example.com/abc) and \" + makeLinkHtml(link),\n+ PlainTextLinksConverter.convertLinksToHtml(firstLinkIgnored));\n+\n+ final String secondLinkIgnored = \"text \" + link + \" and (\" + link + \")\";\n+ assertEquals(\"text \" + makeLinkHtml(link) + \" and (https://example.com/abc)\",\n+ PlainTextLinksConverter.convertLinksToHtml(secondLinkIgnored));\n+\n+ final String middleLinkIgnored = \"text \" + link + \" and (\" + link + \") and \" + link;\n+ assertEquals(\"text \" + makeLinkHtml(link) + \" and (https://example.com/abc) and \" + makeLinkHtml(link),\n+ PlainTextLinksConverter.convertLinksToHtml(middleLinkIgnored));\n+ }\n+\n+ @Test\n+ public void testExistingLinksArePreserved() {\n+ var links = List.of(\n+ \"Click http://url.to/link, this link\",\n+ \"domain.org\",\n+ \"you can find it on our new website http://xy.org\",\n+ \"you can find it on our new website http://xy.org\",\n+ \"

                  \\\"https://url.to/i.jpg\\\"

                  \",\n+ \"text \\n\",\n+ \"AI interview - 01:57:01\",\n+ \"sign up for our premium feed here! https://example.com/join\",\n+ \"you can do so here:https://example.com/button\",\n+ \"LINKS:Example\",\n+ \"Example\",\n+ \"

                  A picture of the photo in question

                  \",\n+ \"https://example.com/shop/book/\",\n+ \"https://example.me/yH6x/gx5ywe7g\",\n+ \"\"\n+ );\n+ links.forEach(link -> assertEquals(link, PlainTextLinksConverter.convertLinksToHtml(link)));\n+ }\n+\n+ @Test\n+ public void testConvertToHtmlWhenNoLinksAreDetected() {\n+ assertNull(PlainTextLinksConverter.convertLinksToHtml((String) null));\n+ assertEquals(\"\", PlainTextLinksConverter.convertLinksToHtml(\"\"));\n+\n+ final String text = \"plain text\";\n+ assertEquals(text, PlainTextLinksConverter.convertLinksToHtml(text));\n+\n+ final String specialCharacters = \"text with ' special \\\" characters !@#$%^&*()<>?123\";\n+ var expected = specialCharacters.replace(\"&\", \"&\");\n+ expected = expected.replace(\"<\", \"<\");\n+ expected = expected.replace(\">\", \">\");\n+ assertEquals(expected, PlainTextLinksConverter.convertLinksToHtml(specialCharacters));\n+\n+ final String textWithDots = \"\\\"Text With...Dots Works\\\"\";\n+ assertEquals(textWithDots, PlainTextLinksConverter.convertLinksToHtml(textWithDots));\n+ }\n+\n+ /**\n+ * Adds {@code ..} around provided string\n+ */\n+ private static String makeLinkHtml(String plain) {\n+ if (plain == null || plain.isEmpty()) {\n+ return \"\";\n+ }\n+ String encodedPlain = plain.replace(\"&\", \"&\");\n+ return \"\" + encodedPlain + \"\";\n+ }\n+}\n\\ No newline at end of file\n", "n2p_tests": "{\"de.danoeh.antennapod.ui.cleaner.PlainTextLinksConverterTest.testConvertToHtmlWhenNoLinksAreDetected\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.ui.cleaner.PlainTextLinksConverterTest.testBrokenLinksAreNotCreated\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.ui.cleaner.PlainTextLinksConverterTest.testConvertPlainTextLinksToHtml\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.ui.cleaner.PlainTextLinksConverterTest.testExistingLinksArePreserved\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "AntennaPod__AntennaPod-7537", "org": "AntennaPod", "repo": "AntennaPod", "number": 7537, "state": "closed", "title": "Vtt support for transcripts", "body": "### Description\r\n\r\nThis PR adds VTT support for transcripts (in addition to existing SRT and JSON).\r\n\r\nCloses #7431 \r\n\r\n### Checklist\r\n\r\n- [x] I have read the contribution guidelines: https://github.com/AntennaPod/AntennaPod/blob/develop/CONTRIBUTING.md#submit-a-pull-request\r\n- [x] I have performed a self-review of my code\r\n- [x] I have run the automated code checks using `./gradlew checkstyle spotbugsPlayDebug spotbugsDebug :app:lintPlayDebug`\r\n- [x] My code follows the style guidelines of the AntennaPod project: https://github.com/AntennaPod/AntennaPod/wiki/Code-style\r\n- [x] I have mentioned the corresponding issue and the relevant keyword (e.g., \"Closes: #xy\") in the description (see https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)\r\n- [x] If it is a core feature, I have added automated tests\r\n", "base": "{\"label\": \"AntennaPod:develop\", \"ref\": \"develop\", \"sha\": \"310ce203cea26cf14dc8514ab72d028e545640ab\"}", "resolved_issues": "[{\"number\": 7431, \"title\": \"Support WebVTT transcript format\", \"body\": \"### Checklist\\n\\n- [X] I have used the search function for [**OPEN**](https://github.com/AntennaPod/AntennaPod/issues) issues to see if someone else has already submitted the same feature request.\\n- [X] I have **also** used the search function for [**CLOSED**](https://github.com/AntennaPod/AntennaPod/issues?q=is%3Aissue+is%3Aclosed) issues to see if the feature was already implemented and is just waiting to be released, or if the feature was rejected.\\n- [X] I will describe the problem with as much detail as possible.\\n- [X] This request contains only one single feature, **not** a list of multiple (related) features.\\n\\n### App version\\n\\n3.5.0\\n\\n### Where did you get the app from\\n\\nGoogle Play\\n\\n### Feature or improvement you want\\n\\nWe currently support SRT, JSON transcript. We should add support for WebVTT as well. Detailed reasons why certain podcast hosts are only supporting WebVTT here https://github.com/jamescridland/podnews/issues/2\\n\\n### Why should this be added?\\n\\nWider support of transcript\\n\\n### Screenshots / Drawings / Technical details\\n\\n```\\r\\ncurl https://podnews.net/rss > ~/Downloads/podnews.rss\\r\\n```\\r\\n\\r\\n```\\r\\n\\r\\n```\\r\\n\\r\\n```\\r\\ncurl https://podnews.net/audio/podnews240926.mp3.vtt | less\\r\\n\\r\\nWEBVTT\\r\\n\\r\\n00:00:00.000 --> 00:00:05.900\\r\\nPaid New York Times podcasts go to Apple and Spotify - from the Pacific Island of Niue,\\r\\n\\r\\n00:00:05.900 --> 00:00:13.100\\r\\nthe latest from Podnews.net with Podpage: making SEO-optimized podcast websites.\\r\\n\\r\\n00:00:13.100 --> 00:00:16.900\\r\\nFrom the New York Times, I'm Sabrina Tavernise, and this is The Daily.\\r\\n\\r\\n00:00:16.900 --> 00:00:21.640\\r\\nThe New York Times is to make its premium paid podcasts available for New York Times subscribers\\r\\n\\r\\n```\"}]", "lang": "java", "problem_statement": "Support WebVTT transcript format\n### Checklist\n\n- [X] I have used the search function for [**OPEN**](https://github.com/AntennaPod/AntennaPod/issues) issues to see if someone else has already submitted the same feature request.\n- [X] I have **also** used the search function for [**CLOSED**](https://github.com/AntennaPod/AntennaPod/issues?q=is%3Aissue+is%3Aclosed) issues to see if the feature was already implemented and is just waiting to be released, or if the feature was rejected.\n- [X] I will describe the problem with as much detail as possible.\n- [X] This request contains only one single feature, **not** a list of multiple (related) features.\n\n### App version\n\n3.5.0\n\n### Where did you get the app from\n\nGoogle Play\n\n### Feature or improvement you want\n\nWe currently support SRT, JSON transcript. We should add support for WebVTT as well. Detailed reasons why certain podcast hosts are only supporting WebVTT here https://github.com/jamescridland/podnews/issues/2\n\n### Why should this be added?\n\nWider support of transcript\n\n### Screenshots / Drawings / Technical details\n\n```\r\ncurl https://podnews.net/rss > ~/Downloads/podnews.rss\r\n```\r\n\r\n```\r\n\r\n```\r\n\r\n```\r\ncurl https://podnews.net/audio/podnews240926.mp3.vtt | less\r\n\r\nWEBVTT\r\n\r\n00:00:00.000 --> 00:00:05.900\r\nPaid New York Times podcasts go to Apple and Spotify - from the Pacific Island of Niue,\r\n\r\n00:00:05.900 --> 00:00:13.100\r\nthe latest from Podnews.net with Podpage: making SEO-optimized podcast websites.\r\n\r\n00:00:13.100 --> 00:00:16.900\r\nFrom the New York Times, I'm Sabrina Tavernise, and this is The Daily.\r\n\r\n00:00:16.900 --> 00:00:21.640\r\nThe New York Times is to make its premium paid podcasts available for New York Times subscribers\r\n\r\n```\n", "hints": ":)\r\n\r\nThis is a good VTT to show, in that it has the speaker identification in it.\nHello,\r\nThanks a lot for the work already done on transcripts!\r\n\r\nI\u2019d very much like to see VTT support happening, and to that end I volunteer to try and add the feature.\r\n\r\nBut I see that @tonytamsf you already assigned yourself to that feature. Are you already working on this, or should I start an implementation on my end?\n@Shaac go ahead and start working on it. I will assign to you\nGreat!\r\n\r\nSo I started working on it and here is my progress so far [(you can look at the current work here)](https://github.com/AntennaPod/AntennaPod/compare/develop...Shaac:AntennaPod:vtt?expand=1).\r\n\r\nI added a third supported transcript format and used the following preference if several are present: JSON > VTT > SRT. Previously it was JSON > SRT, I inserted VTT in the middle, that is what made the most sense to me, but I guess it could be anything.\r\n\r\nFor the parser, I mostly copy-pasted the SRT one, since VTT is very similar. The issue with VTT is that there a many tags, that can add italics, bold, or other metadata. There a basically 3 options of what we can do with those tags. For instance, if the text is `Hello you`, we can either:\r\n\r\n- do nothing (and the text shown on screen will be ugly: \u201c`Hello you`\u201d)\r\n- properly ignore them (\u201cHello you\u201d)\r\n- show them in the final text (\u201c**Hello** _you_\u201d)\r\n\r\nOf course the third is the best, but it is the most work. I don\u2019t know if there are many podcast that use them. Maybe for now the first option will be enough. What do you think?\r\n\r\nThe only tag that is often used is the one identifying the speaker. I parsed it, but only if it is at the beginning of the text (if not it would be complex for us, because we would not have the timestamp for the change of speaker). I did not handle the fact that the tag could be closed (``), because I\u2019m not sure people use it.\nOne big issue I encountered though, and it seems to be more of architecture problem on the existing codebase, is that my feature only works for new episodes. If the podcast is already loaded with a version of AntennaPod on the branch `develop`, using my branch without uninstalling the app with not work for those episodes already present in the local DB.\r\n\r\nI did not manage to understand how the feed DB works just yet, but somehow, if a new `podcastIndexTranscriptType` is set, it will be overridden with the previous value (`null`) before it has time to write the new value into the database. The result is that if an episode has no transcript initially (or not supported transcript), AntennaPod will never be able to change that state in the future!\nMy vote for formatting is to store all the tags as is and strip it when we display (when you return the string/text)\n\nMaybe add a function to return the raw text for future use \n\n\n> So I started working on it and here is my progress so far\r\n\r\nNice! Could you please open a PR? That makes it easier to discuss the code by commenting on it.\r\n\r\n> For the parser, I mostly copy-pasted the SRT one\r\n\r\nAny chance for re-using parts of the code instead of copy-pasting? That ensures that in case we find a bug in one of them in the future, we cannot forget to apply the fix to the other one as well.\r\n\r\n> My vote for formatting is to store all the tags as is\r\n\r\nShowing the formatting should be quite easy: `textView.setText(Html.fromHtml(xy))`. What could be difficult is to make sure that the re-formatting step we do while displaying does not make the html invalid. Because of that, I think it might be easier to strip it already while parsing. Then one does not have to modify the re-formatting for now. I think we already have a function somewhere that strips the html of a feed's description.\r\n\r\n> my feature only works for new episodes\r\n\r\nDid you try force-refreshing? Swipe to refresh on the podcast screen performs a force-refresh even if the rss feed did not change (in contrast to refreshing on any other screen).\r\n\r\n> if a new podcastIndexTranscriptType is set, it will be overridden with the previous value\r\n\r\nHmm. If that's really the case, we should fix this :) But first please make sure to try force-refresh :)\nAll right, I wished I had time to work on this sooner, but I finally managed to find some. :smile: \r\n\r\n> Nice! Could you please open a PR? That makes it easier to discuss the code by commenting on it.\r\n\r\nDone\r\n\r\n> Any chance for re-using parts of the code instead of copy-pasting? That ensures that in case we find a bug in one of them in the future, we cannot forget to apply the fix to the other one as well.\r\n\r\nMy first reaction when reading this comment was \u201csure, of course, code duplication is awful; code should always be factorized\u201d. But then looking closely at the code I\u2019m not so sure. We\u2019re taking about parsing 2 different specs. Sure there are very close, but I\u2019ve seen in some other projects how factorizing parts of 2 slightly different, but still two independents things, can do more harm than wrong. Because then the code on both parts is complex, with lots of functions, and it becomes very hard to update one part without harming the other.\r\n\r\nThey are definitely some functions that should be factorize, like `parseTimecode`, which is the same for both. But apart from that, I\u2019m not so sure. Maybe it will be easier to make a decision when the feature is completed.\r\n\r\n> I think it might be easier to strip it already while parsing. Then one does not have to modify the re-formatting for now. I think we already have a function somewhere that strips the html of a feed's description.\r\n\r\nI found the `HtmlToPlainText` class in the codebase. But it\u2019s VTT spec here, it\u2019s not really HTML. I guess it should work because the tags look the same. I should probably write a test VTT file with all the features and either make a fake podcast with it or add some integration tests with it.\r\n\r\n> Did you try force-refreshing? Swipe to refresh on the podcast screen performs a force-refresh even if the rss feed did not change (in contrast to refreshing on any other screen).\r\n\r\nI think I tried it all. Going on the podcast view (with the list of episodes). Swiping down, or clicking on the 3 dots and hitting \u201crefresh\u201d. It will trigger a reprocessing of the data, but it fails with the following:\r\n- `FeedItem::setTranscriptUrl` is called, with the correct type (`text/vtt`) and URL\r\n- then for some reason `PodDBAdapter::updateOrInsertFeedItem` is called, but the type here is `null`\r\n- And then the `FeedItem` constructor used by DBReader will get called, with `transcriptType = null`\r\n\r\nI\u2019ve added some logs in my branch. It\u2019s easy to reproduce: without my branch, subscribe to podnews daily, launch an episode, there will be now transcript working (because it\u2019s VTT). Then checkout my branch, refresh and it still won\u2019t work. But clearing app data and starting over will.", "pull_url": "https://github.com/AntennaPod/AntennaPod/pull/7537", "issue_urls": "[\"https://github.com/AntennaPod/AntennaPod/issues/7431\"]", "test_command": "./gradlew :parser:transcript:testDebugUnitTest --tests \"de.danoeh.antennapod.parser.transcript.VttTranscriptParserTest\"", "fix_patch": "diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/TranscriptAdapter.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/TranscriptAdapter.java\nindex ffb3b7bdae5..7ce8b0964e3 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/TranscriptAdapter.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/TranscriptAdapter.java\n@@ -78,6 +78,8 @@ public void onBindViewHolder(@NonNull TranscriptViewholder holder, int position)\n if (speakers.isEmpty() && (position % 5 == 0)) {\n holder.viewTimecode.setVisibility(View.VISIBLE);\n holder.viewTimecode.setText(timecode);\n+ } else {\n+ holder.viewTimecode.setVisibility(View.GONE);\n }\n holder.viewContent.setText(seg.getWords());\n }\ndiff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItem.java b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItem.java\nindex 603c6666774..f10871992a7 100644\n--- a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItem.java\n+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItem.java\n@@ -45,7 +45,6 @@ public class FeedItem implements Serializable {\n private String socialInteractUrl;\n private String podcastIndexTranscriptUrl;\n private String podcastIndexTranscriptType;\n- private String podcastIndexTranscriptText;\n private Transcript transcript;\n \n private int state;\n@@ -456,29 +455,15 @@ public String getTranscriptType() {\n return podcastIndexTranscriptType;\n }\n \n- public void updateTranscriptPreferredFormat(String type, String url) {\n- if (StringUtils.isEmpty(type) || StringUtils.isEmpty(url)) {\n+ public void updateTranscriptPreferredFormat(String typeStr, String url) {\n+ if (StringUtils.isEmpty(typeStr) || StringUtils.isEmpty(url)) {\n return;\n }\n-\n- String canonicalSrr = \"application/srr\";\n- String jsonType = \"application/json\";\n-\n- switch (type) {\n- case \"application/json\":\n- podcastIndexTranscriptUrl = url;\n- podcastIndexTranscriptType = type;\n- break;\n- case \"application/srr\":\n- case \"application/srt\":\n- case \"application/x-subrip\":\n- if (podcastIndexTranscriptUrl == null || !podcastIndexTranscriptType.equals(jsonType)) {\n- podcastIndexTranscriptUrl = url;\n- podcastIndexTranscriptType = canonicalSrr;\n- }\n- break;\n- default:\n- break;\n+ TranscriptType type = TranscriptType.fromMime(typeStr);\n+ TranscriptType previousType = TranscriptType.fromMime(podcastIndexTranscriptType);\n+ if (type.priority > previousType.priority) {\n+ podcastIndexTranscriptUrl = url;\n+ podcastIndexTranscriptType = type.canonicalMime;\n }\n }\n \n@@ -490,14 +475,6 @@ public void setTranscript(Transcript t) {\n transcript = t;\n }\n \n- public String getPodcastIndexTranscriptText() {\n- return podcastIndexTranscriptText;\n- }\n-\n- public String setPodcastIndexTranscriptText(String str) {\n- return podcastIndexTranscriptText = str;\n- }\n-\n public boolean hasTranscript() {\n return (podcastIndexTranscriptUrl != null);\n }\ndiff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/TranscriptSegment.java b/model/src/main/java/de/danoeh/antennapod/model/feed/TranscriptSegment.java\nindex 0101bb8ed51..6f3401c3bd4 100644\n--- a/model/src/main/java/de/danoeh/antennapod/model/feed/TranscriptSegment.java\n+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/TranscriptSegment.java\n@@ -2,8 +2,8 @@\n \n public class TranscriptSegment {\n private final long startTime;\n- private final long endTime;\n- private final String words;\n+ private long endTime;\n+ private String words;\n private final String speaker;\n \n public TranscriptSegment(long start, long end, String w, String s) {\n@@ -13,6 +13,11 @@ public TranscriptSegment(long start, long end, String w, String s) {\n speaker = s;\n }\n \n+ public void append(long newEndTime, String wordsToAppend) {\n+ endTime = newEndTime;\n+ words += \" \" + wordsToAppend;\n+ }\n+\n public long getStartTime() {\n return startTime;\n }\ndiff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/TranscriptType.java b/model/src/main/java/de/danoeh/antennapod/model/feed/TranscriptType.java\nnew file mode 100644\nindex 00000000000..4a9d1315326\n--- /dev/null\n+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/TranscriptType.java\n@@ -0,0 +1,28 @@\n+package de.danoeh.antennapod.model.feed;\n+\n+public enum TranscriptType {\n+ JSON(4, \"application/json\"),\n+ VTT(3, \"text/vtt\"),\n+ SRT(2, \"application/srt\"),\n+ NONE(0, \"\");\n+\n+ public final int priority;\n+ public final String canonicalMime;\n+\n+ TranscriptType(int priority, String canonicalMime) {\n+ this.priority = priority;\n+ this.canonicalMime = canonicalMime;\n+ }\n+\n+ public static TranscriptType fromMime(String type) {\n+ if (type == null) {\n+ return NONE;\n+ }\n+ return switch (type) {\n+ case \"application/json\" -> JSON;\n+ case \"text/vtt\" -> VTT;\n+ case \"application/srt\", \"application/srr\", \"application/x-subrip\" -> SRT;\n+ default -> NONE;\n+ };\n+ }\n+}\ndiff --git a/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/MediaDownloadedHandler.java b/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/MediaDownloadedHandler.java\nindex 4958ba529b7..293f3065219 100644\n--- a/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/MediaDownloadedHandler.java\n+++ b/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/MediaDownloadedHandler.java\n@@ -70,7 +70,6 @@ public void run() {\n if (item != null && item.getTranscriptUrl() != null) {\n String transcript = TranscriptUtils.loadTranscriptFromUrl(item.getTranscriptUrl(), true);\n if (!StringUtils.isEmpty(transcript)) {\n- item.setPodcastIndexTranscriptText(transcript);\n TranscriptUtils.storeTranscript(media, transcript);\n }\n }\ndiff --git a/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/feed/FeedUpdateWorker.java b/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/feed/FeedUpdateWorker.java\nindex cd6954ac822..1b7ffffec34 100644\n--- a/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/feed/FeedUpdateWorker.java\n+++ b/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/feed/FeedUpdateWorker.java\n@@ -167,6 +167,7 @@ private void refreshFeeds(List toUpdate, boolean force) {\n newEpisodesNotification.showIfNeeded(getApplicationContext(), savedFeed);\n }\n } catch (Exception e) {\n+ e.printStackTrace();\n DBWriter.setFeedLastUpdateFailed(feed.getId(), true);\n DownloadResult status = new DownloadResult(feed.getTitle(),\n feed.getId(), Feed.FEEDFILETYPE_FEED, false,\ndiff --git a/parser/transcript/src/main/java/de/danoeh/antennapod/parser/transcript/TranscriptParser.java b/parser/transcript/src/main/java/de/danoeh/antennapod/parser/transcript/TranscriptParser.java\nindex 4049b2c8f85..e428a3ce105 100644\n--- a/parser/transcript/src/main/java/de/danoeh/antennapod/parser/transcript/TranscriptParser.java\n+++ b/parser/transcript/src/main/java/de/danoeh/antennapod/parser/transcript/TranscriptParser.java\n@@ -1,5 +1,6 @@\n package de.danoeh.antennapod.parser.transcript;\n \n+import de.danoeh.antennapod.model.feed.TranscriptType;\n import org.apache.commons.lang3.StringUtils;\n \n import de.danoeh.antennapod.model.feed.Transcript;\n@@ -8,18 +9,16 @@ public class TranscriptParser {\n static final long MIN_SPAN = 5000L; // Merge short segments together to form a span of 5 seconds\n static final long MAX_SPAN = 8000L; // Don't go beyond 10 seconds when merging\n \n- public static Transcript parse(String str, String type) {\n+ public static Transcript parse(String str, String typeStr) {\n if (str == null || StringUtils.isBlank(str)) {\n return null;\n }\n-\n- if (\"application/json\".equals(type)) {\n- return JsonTranscriptParser.parse(str);\n- }\n-\n- if (\"application/srt\".equals(type) || \"application/srr\".equals(type) || \"application/x-subrip\".equals(type)) {\n- return SrtTranscriptParser.parse(str);\n- }\n- return null;\n+ TranscriptType type = TranscriptType.fromMime(typeStr);\n+ return switch (type) {\n+ case JSON -> JsonTranscriptParser.parse(str);\n+ case VTT -> VttTranscriptParser.parse(str);\n+ case SRT -> SrtTranscriptParser.parse(str);\n+ default -> null;\n+ };\n }\n }\ndiff --git a/parser/transcript/src/main/java/de/danoeh/antennapod/parser/transcript/VttTranscriptParser.java b/parser/transcript/src/main/java/de/danoeh/antennapod/parser/transcript/VttTranscriptParser.java\nnew file mode 100644\nindex 00000000000..33d7071a506\n--- /dev/null\n+++ b/parser/transcript/src/main/java/de/danoeh/antennapod/parser/transcript/VttTranscriptParser.java\n@@ -0,0 +1,144 @@\n+package de.danoeh.antennapod.parser.transcript;\n+\n+import androidx.annotation.NonNull;\n+import androidx.annotation.Nullable;\n+\n+import org.apache.commons.lang3.StringUtils;\n+import org.jsoup.Jsoup;\n+\n+import java.util.Arrays;\n+import java.util.HashSet;\n+import java.util.Iterator;\n+import java.util.List;\n+import java.util.Set;\n+import java.util.regex.Matcher;\n+import java.util.regex.Pattern;\n+\n+import de.danoeh.antennapod.model.feed.Transcript;\n+import de.danoeh.antennapod.model.feed.TranscriptSegment;\n+\n+public class VttTranscriptParser {\n+ private static final Pattern TIMESTAMP_PATTERN =\n+ Pattern.compile(\"^(?:([0-9]{2}):)?([0-9]{2}):([0-9]{2})\\\\.([0-9]{3})$\");\n+\n+ private static final Pattern VOICE_SPAN =\n+ Pattern.compile(\".]+)*[ \\\\t]([^\\\\n\\\\r&>]+)>\");\n+\n+ private record Timings(long start, long end) {}\n+\n+ public static Transcript parse(String str) {\n+ // This is basically a very light WebVTT parser.\n+ // It uses WebVTT properties to be both exact and very light.\n+ // We will only be parsing the WebVTT cue blocks.\n+\n+ if (StringUtils.isBlank(str)) {\n+ return null;\n+ }\n+\n+ // WebVTT line terminator can be \\r\\n, \\n or \\n, let's use only one\n+ str = str.replaceAll(\"\\r\\n?\", \"\\n\");\n+ List lines = Arrays.asList(str.split(\"\\n\"));\n+\n+ Transcript transcript = new Transcript();\n+ Iterator iterator = lines.iterator();\n+ Set speakers = new HashSet<>();\n+ String speaker = \"\";\n+ TranscriptSegment segment = null;\n+\n+ // Iterate through cue blocks\n+ while (iterator.hasNext()) {\n+ String line = iterator.next();\n+\n+ if (!line.contains(\"-->\")) {\n+ continue;\n+ }\n+\n+ Timings timings = parseCueTimings(line);\n+ if (timings == null) {\n+ return null; // Input is broken\n+ }\n+\n+ String payload = parseCuePayload(iterator);\n+\n+ Matcher matcher = VOICE_SPAN.matcher(payload);\n+ if (matcher.find()) {\n+ speaker = matcher.group(1);\n+ speakers.add(speaker);\n+ }\n+\n+ payload = Jsoup.parse(payload).text(); // remove all HTML tags\n+\n+ // should we merge this segment with the previous one?\n+ if (segment != null && segment.getSpeaker().equals(speaker)\n+ && timings.end - segment.getStartTime() < TranscriptParser.MAX_SPAN) {\n+ segment.append(timings.end, payload);\n+ } else {\n+ if (segment != null) {\n+ transcript.addSegment(segment);\n+ }\n+ segment = new TranscriptSegment(timings.start, timings.end, payload, speaker);\n+ }\n+\n+ // do we have a candidate segment long enough to add it without trying to add more\n+ if (segment.getEndTime() - segment.getStartTime() >= TranscriptParser.MIN_SPAN) {\n+ transcript.addSegment(segment);\n+ segment = null;\n+ }\n+ }\n+\n+ if (segment != null) {\n+ transcript.addSegment(segment);\n+ }\n+\n+ if (transcript.getSegmentCount() == 0) {\n+ return null;\n+ }\n+ transcript.setSpeakers(speakers);\n+ return transcript;\n+ }\n+\n+ private static long parseIntOrNull(@Nullable String s) {\n+ return StringUtils.isEmpty(s) ? 0 : Integer.parseInt(s);\n+ }\n+\n+ private static long parseTimestamp(@NonNull String timestamp) {\n+ Matcher matcher = TIMESTAMP_PATTERN.matcher(timestamp);\n+ if (!matcher.matches()) {\n+ return -1;\n+ }\n+ long hours = parseIntOrNull(matcher.group(1));\n+ long minutes = parseIntOrNull(matcher.group(2));\n+ long seconds = parseIntOrNull(matcher.group(3));\n+ long milliseconds = parseIntOrNull(matcher.group(4));\n+ return (hours * 60 * 60 * 1000) + (minutes * 60 * 1000) + (seconds * 1000) + milliseconds;\n+ }\n+\n+ @Nullable\n+ private static Timings parseCueTimings(@NonNull String line) {\n+ String[] timestamps = line.split(\"-->\");\n+ if (timestamps.length < 2) {\n+ return null;\n+ }\n+ long start = parseTimestamp(timestamps[0].trim());\n+ long end = parseTimestamp(timestamps[1].trim().split(\"[ \\\\t]\")[0]);\n+ if (start == -1 || end == -1) {\n+ return null;\n+ }\n+ return new Timings(start, end);\n+ }\n+\n+ @NonNull\n+ private static String parseCuePayload(@NonNull Iterator iterator) {\n+ StringBuilder body = new StringBuilder();\n+ while (iterator.hasNext()) {\n+ String line = iterator.next();\n+ if (line.isEmpty()) {\n+ break;\n+ }\n+ body.append(line.strip());\n+ body.append(\" \");\n+ }\n+ return body.toString().strip();\n+ }\n+\n+}\n", "test_patch": "diff --git a/parser/transcript/src/test/java/de/danoeh/antennapod/parser/transcript/VttTranscriptParserTest.java b/parser/transcript/src/test/java/de/danoeh/antennapod/parser/transcript/VttTranscriptParserTest.java\nnew file mode 100644\nindex 00000000000..ed9a506e330\n--- /dev/null\n+++ b/parser/transcript/src/test/java/de/danoeh/antennapod/parser/transcript/VttTranscriptParserTest.java\n@@ -0,0 +1,172 @@\n+package de.danoeh.antennapod.parser.transcript;\n+\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.robolectric.RobolectricTestRunner;\n+import static org.junit.Assert.assertEquals;\n+import static org.junit.Assert.assertNull;\n+import de.danoeh.antennapod.model.feed.Transcript;\n+\n+@RunWith(RobolectricTestRunner.class)\n+public class VttTranscriptParserTest {\n+\n+ private static String vttStrSimple = \"\"\"\n+ WEBVTT\n+\n+ 00:00.000 --> 00:02.000\n+ Intro without speaker\n+\n+ 00:00:02.000 --> 00:03.000\n+ Still no speaker\n+\n+ 00:03.389 --> 00:00:09.000\n+ This is the first speaker.\n+\n+ 00:09.150 --> 00:12.123\n+ Let's assume it's still the first speaker.\n+\n+ 00:13.000 --> 00:15.000\n+ And this is the second.\n+\n+ 00:15.000 --> 00:16.000\n+ Still talking.\n+\n+ 00:16.000 --> 00:18.000\n+ Still same line.\n+\n+ 00:18.000 --> 00:19.000\n+ New line.\n+\n+ 00:22.000 --> 00:26.500\n+ Too long to collapse with previous.\n+\n+ 00:36.000 --> 00:38.000\n+ And again.\n+ Je suis speaker 1.\n+\n+ 01:00:00.000 --> 01:00:01.000\n+ Still talking after one hour.\"\"\";\n+\n+ // This is the same content as above, but with lots more WEBVTT features\n+ private static String vttStrComplex = \"\"\"\n+ WEBVTT\n+\n+ NOTE This is a note\n+\n+ 00:00.000 --> 00:02.000\n+ Intro without speaker\n+\n+ 00:00:02.000 --> 00:03.000\n+ Still no speaker\n+\n+ NOTE Here is an other note\n+\n+ First block with a speaker\n+ 00:03.389 --> 00:00:09.000\n+ This is the first speaker.\n+\n+ 00:09.150 --> 00:12.123\n+ Let's assume it's still the first speaker.\n+\n+ 00:13.000 --> 00:15.000\\tposition:90% align:right size:35%\n+ And this is the second.\n+\n+ 00:15.000 --> 00:16.000 position:10%,line-left align:left size:35%\n+ Still talking.\n+\n+ 00:16.000 --> 00:18.000\n+ Still same line.\n+\n+ 00:18.000 --> 00:19.000\n+ New line.\n+\n+ 00:22.000 --> 00:26.500\n+ Too long to collapse with previous.\n+\n+ 00:36.000 --> 00:38.000\n+ And again.\n+ Je suis speaker 1.\n+\n+ After one hour\n+ 01:00:00.000 --> 01:00:01.000\n+ Still talking after one hour.\"\"\";\n+\n+ private void checkResults(Transcript result) {\n+ assertEquals(\"Intro without speaker Still no speaker\", result.getSegmentAtTime(0L).getWords());\n+ assertEquals(\"\", result.getSegmentAtTime(0L).getSpeaker());\n+ assertEquals(3000L, result.getSegmentAtTime(0L).getEndTime());\n+\n+ assertEquals(\"This is the first speaker.\", result.getSegmentAtTime(3389L).getWords());\n+ assertEquals(\"Speaker 1\", result.getSegmentAtTime(3389L).getSpeaker());\n+ assertEquals(9000L, result.getSegmentAtTime(3389L).getEndTime());\n+\n+ assertEquals(\"Let's assume it's still the first speaker.\", result.getSegmentAtTime(9150L).getWords());\n+ assertEquals(\"Speaker 1\", result.getSegmentAtTime(9150L).getSpeaker());\n+ assertEquals(12123L, result.getSegmentAtTime(9150L).getEndTime());\n+\n+ assertEquals(\"And this is the second. Still talking. Still same line.\",\n+ result.getSegmentAtTime(13000L).getWords());\n+ assertEquals(\"Speaker 2\", result.getSegmentAtTime(13000L).getSpeaker());\n+ assertEquals(18000L, result.getSegmentAtTime(13000L).getEndTime());\n+\n+ assertEquals(\"New line.\", result.getSegmentAtTime(18000L).getWords());\n+ assertEquals(\"Speaker 2\", result.getSegmentAtTime(18000L).getSpeaker());\n+ assertEquals(19000L, result.getSegmentAtTime(18000L).getEndTime());\n+\n+ assertEquals(\"Too long to collapse with previous.\", result.getSegmentAtTime(22000L).getWords());\n+ assertEquals(\"Speaker 2\", result.getSegmentAtTime(22000L).getSpeaker());\n+ assertEquals(26500L, result.getSegmentAtTime(22000L).getEndTime());\n+\n+ assertEquals(\"And again. Je suis speaker 1.\", result.getSegmentAtTime(36000L).getWords());\n+ assertEquals(\"Speaker 1\", result.getSegmentAtTime(36000L).getSpeaker());\n+ assertEquals(38000L, result.getSegmentAtTime(36000L).getEndTime());\n+\n+ assertEquals(\"Still talking after one hour.\", result.getSegmentAtTime(10000000L).getWords());\n+ assertEquals(\"Speaker 1\", result.getSegmentAtTime(3600000L).getSpeaker());\n+ assertEquals(3601000L, result.getSegmentAtTime(3600000L).getEndTime());\n+ }\n+\n+ @Test\n+ public void testParseVttSimple() {\n+ Transcript result = VttTranscriptParser.parse(vttStrSimple);\n+ checkResults(result);\n+ }\n+\n+ @Test\n+ public void testParseVttComplex() {\n+ Transcript result = VttTranscriptParser.parse(vttStrComplex);\n+ checkResults(result);\n+ }\n+\n+ @Test\n+ public void testParse() {\n+ String type = \"text/vtt\";\n+ Transcript result;\n+\n+ result = TranscriptParser.parse(vttStrSimple, type);\n+ // There isn't a segment at 800L, so go backwards and get the segment at 0L\n+ assertEquals(\"Intro without speaker Still no speaker\", result.getSegmentAtTime(800L).getWords());\n+\n+ result = TranscriptParser.parse(null, type);\n+ assertNull(result);\n+\n+ // blank string\n+ result = TranscriptParser.parse(\"\", type);\n+ assertNull(result);\n+\n+ // All empty lines\n+ result = TranscriptParser.parse(\"\\r\\n\\r\\n\\r\\n\\r\\n\", type);\n+ assertNull(result);\n+\n+ // Just plain text\n+ result = TranscriptParser.parse(\" Just text\", type);\n+ assertNull(result);\n+\n+ // passing the wrong type\n+ result = TranscriptParser.parse(vttStrSimple, \"application/srr\");\n+ assertNull(result);\n+ result = TranscriptParser.parse(vttStrSimple, \"unknown\");\n+ assertNull(result);\n+ }\n+}\n+\n", "n2p_tests": "{\"de.danoeh.antennapod.parser.transcript.VttTranscriptParserTest.testParseVttSimple\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.parser.transcript.VttTranscriptParserTest.testParse\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.parser.transcript.VttTranscriptParserTest.testParseVttComplex\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "AntennaPod__AntennaPod-7098", "org": "AntennaPod", "repo": "AntennaPod", "number": 7098, "state": "closed", "title": "Add episodes without subscribing", "body": "### Description\r\n\r\nAdding episodes to the queue without subscribing is a long running feature request. Doing this does not really make sense on a distributed podcast app. However, to make these people happy, subscribe to the feed internally anyway and just tell them that it is not subscribed.\r\n\r\nCloses #4710\r\n\r\n \r\n\r\nToDo:\r\n- [x] Do the \"non-subscribed\" feeds end up in opml/html exports?\r\n- [x] Unsubscribe automatically after a while when no episode is queued or downloaded\r\n- [x] Do the feeds end up on the sync server?\r\n- [x] sync after subscribing\r\n- [x] move subscribe code to dbwriter\r\n- [x] searching on the podcast screen of a non subscribed one should work\r\n- [x] use button \"preview\", not \" view episodes\"\r\n- [x] show episodes list preview in online feed popup, not in normal app page. Then we can keep the buttons as they are and only display subscribe \r\n- [x] I think the current implementation might lead new users into never discovering the per podcast settings because there is no reason for them to ever subscribe. The app works just fine wirhout it. (Until at some point the playback states disappear, at which point they will blame AntennaPod) Show the settings button even for non subscribed podcasts but then refuse to open the settings (\"Subscribe to change settings\"). Maybe that is more of a nudge than simply not displaying the settings button \r\n- [x] With a very fast network connection, the non subscribed podcasts open almost immediately. That might make users think that the additional popup (old onlinefeedview) is just the way navigation works in AntennaPod. If a podcast is already in the database but not subscribe, delay loading the page such that they see that everything goes faster once subscribed. Something like 3 seconds could work (minus the time it takes to actually load)\r\n\r\nEarlier ideas, maybe not for now\r\n- [x] Maybe display some text like \"the playback state of non-subscribed podcasts is removed after a while. Press \"subscribe\" to fully add the podcast to AntennaPod\".\r\n\r\n### Checklist\r\n\r\n- [x] I have read the contribution guidelines: https://github.com/AntennaPod/AntennaPod/blob/develop/CONTRIBUTING.md#submit-a-pull-request\r\n- [x] I have performed a self-review of my code\r\n- [x] I have run the automated code checks using `./gradlew checkstyle spotbugsPlayDebug spotbugsDebug :app:lintPlayDebug`\r\n- [x] My code follows the style guidelines of the AntennaPod project: https://github.com/AntennaPod/AntennaPod/wiki/Code-style\r\n- [x] I have mentioned the corresponding issue and the relevant keyword (e.g., \"Closes: #xy\") in the description (see https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)\r\n- [x] If it is a core feature, I have added automated tests\r\n", "base": "{\"label\": \"AntennaPod:develop\", \"ref\": \"develop\", \"sha\": \"cb1a03cd8d55efca8a815d9c55b6a9a6448c0267\"}", "resolved_issues": "[{\"number\": 4710, \"title\": \"Add/play single episode without subscribing to podcast\", \"body\": \"# Checklist\\r\\n\\r\\n\\r\\n- [x] I have used the search function to see if someone else has already submitted the same feature request.\\r\\n- [x] I will only create one feature request per issue.\\r\\n- [x] I will describe the problem with as much detail as possible.\\r\\n\\r\\n# System info\\r\\n\\r\\n**App version**: 2.0.3\\r\\n\\r\\n**App source**: F-Droid\\r\\n\\r\\n# Feature description\\r\\n\\r\\n**Problem you may be having, or feature you want**:\\r\\n\\r\\nAfter recommending AntennaPod to a friend, the friend is really happy with the application and use it to listen to regular podcast shows, some of them in auto-download, some of them cherry picking the episodes according to the description and title. \\r\\n\\r\\nI recommend a particular episode of a podcast I enjoy, which she doesn't follow, she says \\\"great, I'll listen to it, but not right now, I'll add it to AntennaPod\\\", but then she had the following reaction \\\"Hey, why can't I add a single episode without having to subscribe to the whole podcast ?\\\". And I thought this would be a nice feature in AntennaPod : not having to subscribe to a podcast which you won't follow or have to unsubscribe to later, and benefit from the \\\"Queue\\\" feature that enables one to \\\"Listen later\\\" to a single episode. \\r\\n\\r\\n\\r\\n**Suggested solution**:\\r\\n\\r\\nIn the podcast \\\"Subscribe\\\" menu, when the user clicks on an episode there is a \\\"Preview\\\" link which is useful to listen to it straight away, there could be an other link / button with \\\"Download to listen later (without subscribing)\\\". \\r\\n\\r\\n**Screenshots / Drawings / Technical details**:\\r\\n\\r\\n\\r\\n![Screenshot_20201123-094806](https://user-images.githubusercontent.com/108437/99943362-773d6a00-2d71-11eb-8b53-e739c724e6e6.png)\\r\\n\\r\\n\"}]", "lang": "java", "problem_statement": "Add/play single episode without subscribing to podcast\n# Checklist\r\n\r\n\r\n- [x] I have used the search function to see if someone else has already submitted the same feature request.\r\n- [x] I will only create one feature request per issue.\r\n- [x] I will describe the problem with as much detail as possible.\r\n\r\n# System info\r\n\r\n**App version**: 2.0.3\r\n\r\n**App source**: F-Droid\r\n\r\n# Feature description\r\n\r\n**Problem you may be having, or feature you want**:\r\n\r\nAfter recommending AntennaPod to a friend, the friend is really happy with the application and use it to listen to regular podcast shows, some of them in auto-download, some of them cherry picking the episodes according to the description and title. \r\n\r\nI recommend a particular episode of a podcast I enjoy, which she doesn't follow, she says \"great, I'll listen to it, but not right now, I'll add it to AntennaPod\", but then she had the following reaction \"Hey, why can't I add a single episode without having to subscribe to the whole podcast ?\". And I thought this would be a nice feature in AntennaPod : not having to subscribe to a podcast which you won't follow or have to unsubscribe to later, and benefit from the \"Queue\" feature that enables one to \"Listen later\" to a single episode. \r\n\r\n\r\n**Suggested solution**:\r\n\r\nIn the podcast \"Subscribe\" menu, when the user clicks on an episode there is a \"Preview\" link which is useful to listen to it straight away, there could be an other link / button with \"Download to listen later (without subscribing)\". \r\n\r\n**Screenshots / Drawings / Technical details**:\r\n\r\n\r\n![Screenshot_20201123-094806](https://user-images.githubusercontent.com/108437/99943362-773d6a00-2d71-11eb-8b53-e739c724e6e6.png)\r\n\r\n\n", "hints": "I suggest we don't work on this. Without subscribing to a podcast, it's difficult to manage that 'dangling' episode in the app without the data structures behind the 'parent', which is the podcast. \r\n\r\nFor example: for the episode that you download, we have to deal with the 'Open Podcast' menu because it has no where to go.\r\n\r\nI suggest you 'share the episode' with your friend so they can use their email as a bookmarking feature\nNow that support for virtual podcast from local folder is going to become possible maybe it could be used to allow this : \r\n- create a preview folder if it doesn't already exist and add it as a virtual podcast\r\n- download the episode and put it in the preview local folder\r\n\r\nLocal folder for this would really be handy and I think could remove a lot of problem which were making this hard to do?\nWhile that would work, it's not really good UX. Users could then not press the \"open podcast\" button to hear more from the same publishers. Also, deleting the downloaded file would also delete the listening status. In general, to store listening status, we always need the feed as well. I don't think we should add this as a half-working feature. (the reason why we can not really store state of individual episodes without a subscription is that AntennaPod is decentralized without a server that knows all episodes of all podcasts. You can read more about that on the forum: https://forum.antennapod.org/t/newbie-questions/84/2)\r\n\r\nThe easiest option is (as @tonytamsf wrote) to share the link to the episode file. In AntennaPod 2.1, you can add the downloads folder as a \"virtual\" podcast to have it directly in AntennaPod.\r\n\r\n---\r\n\r\nWhy don't you just subscribe to the podcast and unsubscribe again when no longer interested? The number of clicks to delete a whole subscription is not much higher than the number of clicks to delete a download.\nYou can also just preview an episode without subscribing to it.\r\nI vote that we close this issue @keunes ?\nTo be honest I find the use-case very relevant: it would be great if you could share a particular episode with a friend who could listen to it at a later point. Indeed temporarily subscribing is a workaround, but it doesn't feel great as a user (you have to remember to delete the feed afterwards, a cognitive burden).\n\nI realise it's currently technically hardly possible to cater for this use-case elegantly, but I would opt to keep this feature request open.\nAnother idea to manage this : \r\n- wait for group folders to be implemented\r\n- have a \"no subscription\" folder\r\n- let user download episode without subscribing (instead of previewing) and add it to the queue\r\n- behind the scenes subscribe to podcast, put it in \"no subscription\" folder\r\n- make \"no subscription\" folder and podcasts in it invisible to user\r\n- remove invisible subscriptions if there is no longer any related episodes in queue or in favorites\r\n- like for normal subscriptions user can go to podcast screen from episode or player. When viewing podcast screen a subscribe button should be added so user can permanently subscribe. (Doing so, move subscription outside of \"no subscription\" folder)\r\n\r\nPros : \r\n- user can access to podcast normally from player or from episodes (but he won't be able to see it in subscriptions in lateral menu or in subscriptions screen)\r\n- all information from podcast is available and accessible to AntennaPod like any other podcast\r\n- It becomes easy for user to permanently subscribe\r\n- apart from invisible group folder everything is the same\r\n\r\nCons : \r\nI fear that it could be complicated to manage an invisible folder group \u2639\ufe0f\n@keunes thanks for this user centric approach. There is no rush for this feature. \n> behind the scenes subscribe to podcast, put it in \"no subscription\" folder\r\n\r\nYeah, I think that is the only good option we have. Would mean a lot of work, though (hide in episodes list, etc). Also, what happens if someone goes to the podcast page and downloads another episode of that podcast without subscribing? Do we delete the subscription only when no episode is marked as favorite? This feature sounds like it could lead to pretty big discussions about the behavior and quite a lot of confused users\nYes removing podcast should only happen when there is no more downloaded episode or episode in favorites.\r\nReally all would be like any other podcasts for the user except he wouldn't be able to see it in subscriptions screen or in subscriptions list. As all others interaction will be exactly the same I don't think it will cause any confusion.\n> what happens if someone goes to the podcast page and downloads another episode of that podcast without subscribing?\r\n\r\nEither nothing special (episode gets added, nothing else changes), or - probably better - a dialog is shown saying that they're currently not subscribed and adding more episodes is not possible, offering to 'subscribe' (i.e. remove the 'not subscribed' tag).\nThis issue has been mentioned on **AntennaPod Forum**. There might be relevant details there:\n\nhttps://forum.antennapod.org/t/is-there-a-way-to-download-podcasts-from-within-antennapod-without-subscribing/456/2\n\nThis issue has been mentioned on **AntennaPod Forum**. There might be relevant details there:\n\nhttps://forum.antennapod.org/t/ability-to-download-queue-episodes-from-non-subscribed-podcast/691/2\n\nThis issue has been mentioned on **AntennaPod Forum**. There might be relevant details there:\n\nhttps://forum.antennapod.org/t/downloading-just-one-episode-of-a-podcast/153/7\n\nPlay store review in favour of this:\r\n\r\n[1](https://play.google.com/apps/publish?account=8008695526664634386#ReviewDetailsPlace:p=de.danoeh.antennapod&reviewid=gp:AOqpTOGmhirt-hw7-qwI6tNJ-UCLP3d0MMM8W7-bFNLP9wkA0PU6WGseoG-KnDQkuGGn7FZBKFarZr8PF0kaQvY)\r\n\r\n> Browsing through podcasts that you have not yet subscribed to is very cumbersome. You would first have to subscribe to a podcast in order to watch the episodes normally and listen to them normally without this strange \"rehearsal\". Pictures / logos of the podcasts are only displayed if you have subscribed. So not to be used for me. 2 stars because it is open source..\r\n\r\n[2](https://play.google.com/apps/publish?account=8008695526664634386#ReviewDetailsPlace:p=de.danoeh.antennapod&reviewid=gp:AOqpTOEcI_r2mtnsYsffAapPd9oNJx5s0vh4wdcoJszMUOhk1uYNjAYvfIPG2W1-NZwy_8iexwvaropY2JTEt4s)\r\n\r\n> If I search for a podcast I see a list of the episodes but it won't let me sample one it seems like I have to subscribe first that doesn't work for me.\r\n\r\n[3](https://play.google.com/apps/publish?account=8008695526664634386#ReviewDetailsPlace:p=de.danoeh.antennapod&reviewid=5fdaaa83-a0ec-492f-9e1a-e0a40183bec2)\r\n\r\n> Would be nice to have backups via Google account and single episode download without subbing, but otherwise really nice..\r\n\r\n[4](https://play.google.com/apps/publish?account=8008695526664634386#ReviewDetailsPlace:p=de.danoeh.antennapod&reviewid=fc78c156-b31b-4b81-bacb-ad276556336b)\r\n\r\n> Could be perfect but missing a crucial feature; download episode(s) without having to subscribe to the whole podcast first...So annoying, why??.\r\n\r\n[5](https://play.google.com/console/u/0/developers/8008695526664634386/app/4974638472012894302/user-feedback/review-details?reviewId=e5c79032-84ea-468d-b282-229a15264c0b&corpus=PUBLIC_REVIEWS)\r\n\r\n> Good podcast app. Only issue is that it's unclear how to listen to podcasts that I'm not subscribed to.\r\n\r\n[6](https://play.google.com/console/u/0/developers/8008695526664634386/app/4974638472012894302/user-feedback/review-details?reviewId=17fdf663-5922-451d-b74a-e019431e7082&corpus=PUBLIC_REVIEWS)\r\n> I switched over to find a replacement for Google podcasts. tried several apps this one seems the most intuitive for Google Podcast users. I wish the queue was a little more prominent and I am still confused about how to download single episodes when not subscribed to a podcast. glad to have a new podcast player.\nI really think that the only thing needed is triggering an invisible subscription for the user when he is adding an episode.\r\n\r\nPodcast wouldn't show in subscriptions list but could be accessed through added episodes.\r\nUnsubscribing should be automatic when there is no more episode in queue or starred / in favorites.\r\n\r\n-> this way there would be minimum difference for AntennaPod and for user it would be as if subscribing for only an episode is not necessary\r\n\n**Requested in #5643: ability to open a specific episode when it is shared (especially between AntennaPod users). Possible solutions are discussed there. Ideally support for this is implemented together with this issue.**\nThis issue has been mentioned on **AntennaPod Forum**. There might be relevant details there:\n\nhttps://forum.antennapod.org/t/add-episode-from-podcasts-without-subscribing/1271/4\n\nI recently started using this app and came across this issue, but I found a decent work-around. It is possible to subscribe to a podcast, download a single episode, and turn auto-refreshing off in the settings. I think that's good enough and similar to what other podcast applications do, what do you think of adding a shortcut for doing this?\nYeah, I think that's what the solution for this issue will look like. Internally, subscribe to it normally but disable auto-refreshing and put it in a folder called \"not subscribed\".\nThis issue has been mentioned on **AntennaPod Forum**. There might be relevant details there:\n\nhttps://forum.antennapod.org/t/user-must-be-able-to-listen-to-the-podcast-without-subscribing/1853/2\n", "pull_url": "https://github.com/AntennaPod/AntennaPod/pull/7098", "issue_urls": "[\"https://github.com/AntennaPod/AntennaPod/issues/4710\"]", "test_command": "./gradlew :storage:database:testFreeDebugUnitTest --tests \"de.danoeh.antennapod.storage.database.NonSubscribedFeedsCleanerTest\"", "fix_patch": "diff --git a/app/src/main/java/de/danoeh/antennapod/actionbutton/ItemActionButton.java b/app/src/main/java/de/danoeh/antennapod/actionbutton/ItemActionButton.java\nindex 84b24616705..54714be3d17 100644\n--- a/app/src/main/java/de/danoeh/antennapod/actionbutton/ItemActionButton.java\n+++ b/app/src/main/java/de/danoeh/antennapod/actionbutton/ItemActionButton.java\n@@ -7,6 +7,7 @@\n import androidx.annotation.StringRes;\n import android.view.View;\n \n+import de.danoeh.antennapod.model.feed.Feed;\n import de.danoeh.antennapod.playback.service.PlaybackStatus;\n import de.danoeh.antennapod.model.feed.FeedItem;\n import de.danoeh.antennapod.model.feed.FeedMedia;\n@@ -48,6 +49,8 @@ public static ItemActionButton forItem(@NonNull FeedItem item) {\n return new PlayActionButton(item);\n } else if (isDownloadingMedia) {\n return new CancelDownloadActionButton(item);\n+ } else if (item.getFeed().getState() != Feed.STATE_SUBSCRIBED) {\n+ return new StreamActionButton(item);\n } else if (UserPreferences.isStreamOverDownload()) {\n return new StreamActionButton(item);\n } else {\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodeItemListAdapter.java b/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodeItemListAdapter.java\nindex 5082f25ffd3..db79912611f 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodeItemListAdapter.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodeItemListAdapter.java\n@@ -12,6 +12,7 @@\n \n import androidx.annotation.NonNull;\n import androidx.annotation.Nullable;\n+import androidx.fragment.app.FragmentActivity;\n import androidx.recyclerview.widget.RecyclerView;\n \n import de.danoeh.antennapod.ui.SelectableAdapter;\n@@ -32,13 +33,13 @@\n public class EpisodeItemListAdapter extends SelectableAdapter\n implements View.OnCreateContextMenuListener {\n \n- private final WeakReference mainActivityRef;\n+ private final WeakReference mainActivityRef;\n private List episodes = new ArrayList<>();\n private FeedItem longPressedItem;\n int longPressedPosition = 0; // used to init actionMode\n private int dummyViews = 0;\n \n- public EpisodeItemListAdapter(MainActivity mainActivity) {\n+ public EpisodeItemListAdapter(FragmentActivity mainActivity) {\n super(mainActivity);\n this.mainActivityRef = new WeakReference<>(mainActivity);\n setHasStableIds(true);\n@@ -86,9 +87,18 @@ public final void onBindViewHolder(EpisodeItemViewHolder holder, int pos) {\n holder.bind(item);\n \n holder.itemView.setOnClickListener(v -> {\n- MainActivity activity = mainActivityRef.get();\n- if (activity != null && !inActionMode()) {\n- activity.loadChildFragment(ItemPagerFragment.newInstance(episodes, item));\n+ if (!inActionMode()) {\n+ if (mainActivityRef.get() instanceof MainActivity) {\n+ ((MainActivity) mainActivityRef.get())\n+ .loadChildFragment(ItemPagerFragment.newInstance(episodes, item));\n+ } else {\n+ ItemPagerFragment fragment = ItemPagerFragment.newInstance(episodes, item);\n+ mainActivityRef.get().getSupportFragmentManager()\n+ .beginTransaction()\n+ .replace(R.id.fragmentContainer, fragment, \"Items\")\n+ .addToBackStack(\"Items\")\n+ .commitAllowingStateLoss();\n+ }\n } else {\n toggleSelection(holder.getBindingAdapterPosition());\n }\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodeItemViewHolder.java b/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodeItemViewHolder.java\nindex dd1a10450ce..c5868a945fd 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodeItemViewHolder.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodeItemViewHolder.java\n@@ -1,5 +1,6 @@\n package de.danoeh.antennapod.ui.episodeslist;\n \n+import android.app.Activity;\n import android.os.Build;\n import android.text.Layout;\n import android.text.format.Formatter;\n@@ -17,7 +18,6 @@\n import com.google.android.material.elevation.SurfaceColors;\n \n import de.danoeh.antennapod.R;\n-import de.danoeh.antennapod.activity.MainActivity;\n import de.danoeh.antennapod.ui.CoverLoader;\n import de.danoeh.antennapod.actionbutton.ItemActionButton;\n import de.danoeh.antennapod.playback.service.PlaybackStatus;\n@@ -62,10 +62,10 @@ public class EpisodeItemViewHolder extends RecyclerView.ViewHolder {\n private final View leftPadding;\n public final CardView coverHolder;\n \n- private final MainActivity activity;\n+ private final Activity activity;\n private FeedItem item;\n \n- public EpisodeItemViewHolder(MainActivity activity, ViewGroup parent) {\n+ public EpisodeItemViewHolder(Activity activity, ViewGroup parent) {\n super(LayoutInflater.from(activity).inflate(R.layout.feeditemlist_item, parent, false));\n this.activity = activity;\n container = itemView.findViewById(R.id.container);\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodeMultiSelectActionHandler.java b/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodeMultiSelectActionHandler.java\nindex 76ed47de537..a655982cbb3 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodeMultiSelectActionHandler.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodeMultiSelectActionHandler.java\n@@ -1,29 +1,28 @@\n package de.danoeh.antennapod.ui.episodeslist;\n \n+import android.app.Activity;\n import android.util.Log;\n \n import androidx.annotation.PluralsRes;\n \n-import com.google.android.material.snackbar.Snackbar;\n-\n import java.util.List;\n \n import de.danoeh.antennapod.R;\n-import de.danoeh.antennapod.activity.MainActivity;\n+import de.danoeh.antennapod.event.MessageEvent;\n import de.danoeh.antennapod.net.download.serviceinterface.DownloadServiceInterface;\n import de.danoeh.antennapod.storage.database.DBWriter;\n import de.danoeh.antennapod.storage.database.LongList;\n import de.danoeh.antennapod.model.feed.FeedItem;\n import de.danoeh.antennapod.ui.view.LocalDeleteModal;\n+import org.greenrobot.eventbus.EventBus;\n \n public class EpisodeMultiSelectActionHandler {\n private static final String TAG = \"EpisodeSelectHandler\";\n- private final MainActivity activity;\n+ private final Activity activity;\n private final int actionId;\n private int totalNumItems = 0;\n- private Snackbar snackbar = null;\n \n- public EpisodeMultiSelectActionHandler(MainActivity activity, int actionId) {\n+ public EpisodeMultiSelectActionHandler(Activity activity, int actionId) {\n this.activity = activity;\n this.actionId = actionId;\n }\n@@ -116,12 +115,7 @@ private void showMessage(@PluralsRes int msgId, int numItems) {\n totalNumItems += numItems;\n activity.runOnUiThread(() -> {\n String text = activity.getResources().getQuantityString(msgId, totalNumItems, totalNumItems);\n- if (snackbar != null) {\n- snackbar.setText(text);\n- snackbar.show(); // Resets the timeout\n- } else {\n- snackbar = activity.showSnackbarAbovePlayer(text, Snackbar.LENGTH_LONG);\n- }\n+ EventBus.getDefault().post(new MessageEvent(text));\n });\n }\n \ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/FeedItemMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/FeedItemMenuHandler.java\nindex e1974940c18..720e0ccbcda 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/FeedItemMenuHandler.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/FeedItemMenuHandler.java\n@@ -16,6 +16,7 @@\n \n import de.danoeh.antennapod.R;\n import de.danoeh.antennapod.activity.MainActivity;\n+import de.danoeh.antennapod.model.feed.Feed;\n import de.danoeh.antennapod.net.sync.serviceinterface.SynchronizationQueueSink;\n import de.danoeh.antennapod.storage.preferences.PlaybackPreferences;\n import de.danoeh.antennapod.playback.service.PlaybackServiceInterface;\n@@ -84,6 +85,10 @@ public static boolean onPrepareMenu(Menu menu, FeedItem selectedItem) {\n setItemVisibility(menu, R.id.add_to_favorites_item, !isFavorite);\n setItemVisibility(menu, R.id.remove_from_favorites_item, isFavorite);\n setItemVisibility(menu, R.id.remove_item, fileDownloaded || isLocalFile);\n+\n+ if (selectedItem.getFeed().getState() != Feed.STATE_SUBSCRIBED) {\n+ setItemVisibility(menu, R.id.mark_read_item, false);\n+ }\n return true;\n }\n \n@@ -158,7 +163,8 @@ public static boolean onMenuItemClicked(@NonNull Fragment fragment, int menuItem\n } else if (menuItemId == R.id.mark_read_item) {\n selectedItem.setPlayed(true);\n DBWriter.markItemPlayed(selectedItem, FeedItem.PLAYED, true);\n- if (!selectedItem.getFeed().isLocalFeed() && SynchronizationSettings.isProviderConnected()) {\n+ if (!selectedItem.getFeed().isLocalFeed() && selectedItem.getFeed().getState() == Feed.STATE_SUBSCRIBED\n+ && SynchronizationSettings.isProviderConnected()) {\n FeedMedia media = selectedItem.getMedia();\n // not all items have media, Gpodder only cares about those that do\n if (media != null) {\n@@ -174,7 +180,8 @@ public static boolean onMenuItemClicked(@NonNull Fragment fragment, int menuItem\n } else if (menuItemId == R.id.mark_unread_item) {\n selectedItem.setPlayed(false);\n DBWriter.markItemPlayed(selectedItem, FeedItem.UNPLAYED, false);\n- if (!selectedItem.getFeed().isLocalFeed() && selectedItem.getMedia() != null) {\n+ if (!selectedItem.getFeed().isLocalFeed() && selectedItem.getMedia() != null\n+ && selectedItem.getFeed().getState() == Feed.STATE_SUBSCRIBED) {\n EpisodeAction actionNew = new EpisodeAction.Builder(selectedItem, EpisodeAction.NEW)\n .currentTimestamp()\n .build();\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/AllEpisodesFragment.java\nindex eb49c94d93a..6e48ade3978 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/AllEpisodesFragment.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/AllEpisodesFragment.java\n@@ -66,7 +66,12 @@ protected int loadTotalItemCount() {\n \n @Override\n protected FeedItemFilter getFilter() {\n- return new FeedItemFilter(UserPreferences.getPrefFilterAllEpisodes());\n+ FeedItemFilter filter = new FeedItemFilter(UserPreferences.getPrefFilterAllEpisodes());\n+ if (filter.showIsFavorite) {\n+ return new FeedItemFilter(filter, FeedItemFilter.INCLUDE_NOT_SUBSCRIBED);\n+ } else {\n+ return filter;\n+ }\n }\n \n @Override\n@@ -91,6 +96,7 @@ public boolean onMenuItemClick(MenuItem item) {\n ArrayList filter = new ArrayList<>(getFilter().getValuesList());\n if (filter.contains(FeedItemFilter.IS_FAVORITE)) {\n filter.remove(FeedItemFilter.IS_FAVORITE);\n+ filter.remove(FeedItemFilter.INCLUDE_NOT_SUBSCRIBED);\n } else {\n filter.add(FeedItemFilter.IS_FAVORITE);\n }\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/PlaybackHistoryFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/PlaybackHistoryFragment.java\nindex a02f86bd21a..abdf043b1ec 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/PlaybackHistoryFragment.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/PlaybackHistoryFragment.java\n@@ -23,7 +23,8 @@\n \n public class PlaybackHistoryFragment extends EpisodesListFragment {\n public static final String TAG = \"PlaybackHistoryFragment\";\n- private static final FeedItemFilter FILTER_HISTORY = new FeedItemFilter(FeedItemFilter.IS_IN_HISTORY);\n+ private static final FeedItemFilter FILTER_HISTORY = new FeedItemFilter(\n+ FeedItemFilter.IS_IN_HISTORY, FeedItemFilter.INCLUDE_NOT_SUBSCRIBED);\n \n @NonNull\n @Override\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/download/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/download/CompletedDownloadsFragment.java\nindex 001c2b4658a..0d82b713307 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/download/CompletedDownloadsFragment.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/download/CompletedDownloadsFragment.java\n@@ -285,7 +285,7 @@ private void loadItems() {\n disposable = Observable.fromCallable(() -> {\n SortOrder sortOrder = UserPreferences.getDownloadsSortedOrder();\n List downloadedItems = DBReader.getEpisodes(0, Integer.MAX_VALUE,\n- new FeedItemFilter(FeedItemFilter.DOWNLOADED), sortOrder);\n+ new FeedItemFilter(FeedItemFilter.DOWNLOADED, FeedItemFilter.INCLUDE_NOT_SUBSCRIBED), sortOrder);\n \n List mediaUrls = new ArrayList<>();\n if (runningDownloads == null) {\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/episode/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/episode/ItemFragment.java\nindex e31004a57f7..a5ee78a58ca 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/episode/ItemFragment.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/episode/ItemFragment.java\n@@ -38,6 +38,7 @@\n import de.danoeh.antennapod.actionbutton.StreamActionButton;\n import de.danoeh.antennapod.actionbutton.VisitWebsiteActionButton;\n import de.danoeh.antennapod.event.EpisodeDownloadEvent;\n+import de.danoeh.antennapod.model.feed.Feed;\n import de.danoeh.antennapod.playback.service.PlaybackStatus;\n import de.danoeh.antennapod.event.FeedItemEvent;\n import de.danoeh.antennapod.event.PlayerStatusEvent;\n@@ -49,6 +50,7 @@\n import de.danoeh.antennapod.net.download.serviceinterface.DownloadServiceInterface;\n import de.danoeh.antennapod.storage.preferences.UserPreferences;\n import de.danoeh.antennapod.storage.database.DBReader;\n+import de.danoeh.antennapod.ui.appstartintent.OnlineFeedviewActivityStarter;\n import de.danoeh.antennapod.ui.common.Converter;\n import de.danoeh.antennapod.ui.common.DateFormatter;\n import de.danoeh.antennapod.ui.common.CircularProgressBar;\n@@ -114,6 +116,7 @@ public static ItemFragment newInstance(long feeditem) {\n private ItemActionButton actionButton1;\n private ItemActionButton actionButton2;\n private View noMediaLabel;\n+ private View nonSubscribedWarningLabel;\n \n private Disposable disposable;\n private PlaybackController controller;\n@@ -164,6 +167,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,\n butAction1Text = layout.findViewById(R.id.butAction1Text);\n butAction2Text = layout.findViewById(R.id.butAction2Text);\n noMediaLabel = layout.findViewById(R.id.noMediaLabel);\n+ nonSubscribedWarningLabel = layout.findViewById(R.id.nonSubscribedWarningLabel);\n \n butAction1.setOnClickListener(v -> {\n if (actionButton1 instanceof StreamActionButton && !UserPreferences.isStreamOverDownload()\n@@ -287,6 +291,11 @@ private void updateAppearance() {\n txtvPublished.setContentDescription(DateFormatter.formatForAccessibility(item.getPubDate()));\n }\n \n+ if (item.getFeed().getState() != Feed.STATE_SUBSCRIBED) {\n+ nonSubscribedWarningLabel.setVisibility(View.VISIBLE);\n+ nonSubscribedWarningLabel.setOnClickListener(v -> openPodcast());\n+ }\n+\n float radius = 8 * getResources().getDisplayMetrics().density;\n RequestOptions options = new RequestOptions()\n .error(ImagePlaceholder.getDrawable(getContext(), radius))\n@@ -366,8 +375,13 @@ private void openPodcast() {\n if (item == null) {\n return;\n }\n- Fragment fragment = FeedItemlistFragment.newInstance(item.getFeedId());\n- ((MainActivity) getActivity()).loadChildFragment(fragment);\n+ if (item.getFeed().getState() == Feed.STATE_SUBSCRIBED) {\n+ Fragment fragment = FeedItemlistFragment.newInstance(item.getFeedId());\n+ ((MainActivity) getActivity()).loadChildFragment(fragment);\n+ } else {\n+ startActivity(new OnlineFeedviewActivityStarter(getContext(), item.getFeed().getDownloadUrl())\n+ .getIntent());\n+ }\n }\n \n @Subscribe(threadMode = ThreadMode.MAIN)\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/episode/ItemPagerFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/episode/ItemPagerFragment.java\nindex e7f34561752..951e5affb59 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/episode/ItemPagerFragment.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/episode/ItemPagerFragment.java\n@@ -1,5 +1,6 @@\n package de.danoeh.antennapod.ui.screen.episode;\n \n+import android.content.Intent;\n import android.os.Bundle;\n import android.view.LayoutInflater;\n import android.view.MenuItem;\n@@ -13,7 +14,8 @@\n import androidx.viewpager2.adapter.FragmentStateAdapter;\n import androidx.viewpager2.widget.ViewPager2;\n \n-import de.danoeh.antennapod.ui.screen.feed.FeedItemlistFragment;\n+import de.danoeh.antennapod.model.feed.Feed;\n+import de.danoeh.antennapod.ui.appstartintent.OnlineFeedviewActivityStarter;\n import org.greenrobot.eventbus.EventBus;\n import org.greenrobot.eventbus.Subscribe;\n import org.greenrobot.eventbus.ThreadMode;\n@@ -173,8 +175,12 @@ private void openPodcast() {\n if (item == null) {\n return;\n }\n- Fragment fragment = FeedItemlistFragment.newInstance(item.getFeedId());\n- ((MainActivity) getActivity()).loadChildFragment(fragment);\n+ if (item.getFeed().getState() == Feed.STATE_SUBSCRIBED) {\n+ Intent intent = MainActivity.getIntentToOpenFeed(getContext(), item.getFeedId());\n+ startActivity(intent);\n+ } else {\n+ startActivity(new OnlineFeedviewActivityStarter(getContext(), item.getFeed().getDownloadUrl()).getIntent());\n+ }\n }\n \n private class ItemPagerAdapter extends FragmentStateAdapter {\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedInfoFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedInfoFragment.java\nindex aabb0852e26..f73b69d7529 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedInfoFragment.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedInfoFragment.java\n@@ -122,7 +122,6 @@ protected void doTint(Context themedContext) {\n viewBinding.header.butFilter.setVisibility(View.INVISIBLE);\n // https://github.com/bumptech/glide/issues/529\n viewBinding.imgvBackground.setColorFilter(new LightingColorFilter(0xff828282, 0x000000));\n-\n viewBinding.urlLabel.setOnClickListener(copyUrlToClipboard);\n \n long feedId = getArguments().getLong(EXTRA_FEED_ID);\n@@ -237,6 +236,25 @@ private void showFeed() {\n viewBinding.supportUrl.setText(str.toString());\n }\n \n+ if (feed.getState() == Feed.STATE_SUBSCRIBED) {\n+ long feedId = getArguments().getLong(EXTRA_FEED_ID);\n+ getParentFragmentManager().beginTransaction().replace(R.id.statisticsFragmentContainer,\n+ FeedStatisticsFragment.newInstance(feedId, false), \"feed_statistics_fragment\")\n+ .commitAllowingStateLoss();\n+\n+ viewBinding.statisticsButton.setOnClickListener(view -> {\n+ StatisticsFragment fragment = new StatisticsFragment();\n+ ((MainActivity) getActivity()).loadChildFragment(fragment, TransitionEffect.SLIDE);\n+ });\n+ } else {\n+ viewBinding.statisticsButton.setVisibility(View.GONE);\n+ viewBinding.statisticsFragmentContainer.setVisibility(View.GONE);\n+ viewBinding.statisticsHeadingLabel.setVisibility(View.GONE);\n+ viewBinding.supportHeadingLabel.setVisibility(View.GONE);\n+ viewBinding.supportUrl.setVisibility(View.GONE);\n+ viewBinding.descriptionHeadingLabel.setVisibility(View.GONE);\n+ }\n+\n refreshToolbarState();\n }\n \n@@ -249,13 +267,14 @@ public void onDestroy() {\n }\n \n private void refreshToolbarState() {\n+ boolean isSubscribed = feed != null && feed.getState() == Feed.STATE_SUBSCRIBED;\n viewBinding.toolbar.getMenu().findItem(R.id.reconnect_local_folder).setVisible(\n- feed != null && feed.isLocalFeed());\n- viewBinding.toolbar.getMenu().findItem(R.id.share_item).setVisible(feed != null && !feed.isLocalFeed());\n- viewBinding.toolbar.getMenu().findItem(R.id.visit_website_item).setVisible(feed != null\n+ isSubscribed && feed.isLocalFeed());\n+ viewBinding.toolbar.getMenu().findItem(R.id.share_item).setVisible(isSubscribed && !feed.isLocalFeed());\n+ viewBinding.toolbar.getMenu().findItem(R.id.visit_website_item).setVisible(isSubscribed\n && feed.getLink() != null\n && IntentUtils.isCallable(getContext(), new Intent(Intent.ACTION_VIEW, Uri.parse(feed.getLink()))));\n- viewBinding.toolbar.getMenu().findItem(R.id.edit_feed_url_item).setVisible(feed != null && !feed.isLocalFeed());\n+ viewBinding.toolbar.getMenu().findItem(R.id.edit_feed_url_item).setVisible(isSubscribed && !feed.isLocalFeed());\n }\n \n @Override\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java\nindex 9bc45a235f4..2167887d51c 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java\n@@ -12,52 +12,23 @@\n import android.view.View;\n import android.view.ViewGroup;\n import android.widget.AdapterView;\n-import android.widget.Toast;\n-\n import androidx.annotation.NonNull;\n import androidx.annotation.Nullable;\n import androidx.appcompat.content.res.AppCompatResources;\n import androidx.core.util.Pair;\n import androidx.fragment.app.Fragment;\n+import androidx.fragment.app.FragmentActivity;\n import androidx.recyclerview.widget.RecyclerView;\n-\n import com.bumptech.glide.Glide;\n import com.bumptech.glide.request.RequestOptions;\n import com.google.android.material.appbar.MaterialToolbar;\n import com.google.android.material.snackbar.Snackbar;\n-\n-import de.danoeh.antennapod.ui.CoverLoader;\n-import de.danoeh.antennapod.ui.screen.episode.ItemPagerFragment;\n-import de.danoeh.antennapod.ui.screen.SearchFragment;\n-import de.danoeh.antennapod.ui.TransitionEffect;\n-import de.danoeh.antennapod.net.download.serviceinterface.FeedUpdateManager;\n-import de.danoeh.antennapod.ui.screen.download.DownloadLogFragment;\n-import de.danoeh.antennapod.ui.screen.feed.preferences.FeedSettingsFragment;\n-import org.apache.commons.lang3.StringUtils;\n-import org.apache.commons.lang3.Validate;\n-import org.greenrobot.eventbus.EventBus;\n-import org.greenrobot.eventbus.Subscribe;\n-import org.greenrobot.eventbus.ThreadMode;\n-\n-import java.util.Collections;\n-import java.util.List;\n-import java.util.concurrent.ExecutionException;\n-\n import de.danoeh.antennapod.R;\n import de.danoeh.antennapod.activity.MainActivity;\n-import de.danoeh.antennapod.ui.episodeslist.EpisodeItemListAdapter;\n-import de.danoeh.antennapod.event.FeedEvent;\n-import de.danoeh.antennapod.ui.MenuItemUtils;\n-import de.danoeh.antennapod.storage.database.DBReader;\n-import de.danoeh.antennapod.storage.database.DBWriter;\n-import de.danoeh.antennapod.ui.common.IntentUtils;\n-import de.danoeh.antennapod.ui.share.ShareUtils;\n-import de.danoeh.antennapod.ui.episodeslist.MoreContentListFooterUtil;\n import de.danoeh.antennapod.databinding.FeedItemListFragmentBinding;\n-import de.danoeh.antennapod.ui.screen.download.DownloadLogDetailsDialog;\n-import de.danoeh.antennapod.ui.FeedItemFilterDialog;\n import de.danoeh.antennapod.event.EpisodeDownloadEvent;\n import de.danoeh.antennapod.event.FavoritesEvent;\n+import de.danoeh.antennapod.event.FeedEvent;\n import de.danoeh.antennapod.event.FeedItemEvent;\n import de.danoeh.antennapod.event.FeedListUpdateEvent;\n import de.danoeh.antennapod.event.FeedUpdateRunningEvent;\n@@ -65,21 +36,48 @@\n import de.danoeh.antennapod.event.QueueEvent;\n import de.danoeh.antennapod.event.UnreadItemsUpdateEvent;\n import de.danoeh.antennapod.event.playback.PlaybackPositionEvent;\n-import de.danoeh.antennapod.ui.episodeslist.EpisodeMultiSelectActionHandler;\n-import de.danoeh.antennapod.ui.swipeactions.SwipeActions;\n-import de.danoeh.antennapod.ui.episodeslist.FeedItemMenuHandler;\n import de.danoeh.antennapod.model.download.DownloadResult;\n import de.danoeh.antennapod.model.feed.Feed;\n import de.danoeh.antennapod.model.feed.FeedItem;\n import de.danoeh.antennapod.model.feed.FeedItemFilter;\n+import de.danoeh.antennapod.net.download.serviceinterface.FeedUpdateManager;\n+import de.danoeh.antennapod.storage.database.DBReader;\n+import de.danoeh.antennapod.storage.database.DBWriter;\n import de.danoeh.antennapod.storage.preferences.UserPreferences;\n-import de.danoeh.antennapod.ui.glide.FastBlurTransformation;\n+import de.danoeh.antennapod.ui.CoverLoader;\n+import de.danoeh.antennapod.ui.FeedItemFilterDialog;\n+import de.danoeh.antennapod.ui.MenuItemUtils;\n+import de.danoeh.antennapod.ui.TransitionEffect;\n+import de.danoeh.antennapod.ui.appstartintent.MainActivityStarter;\n+import de.danoeh.antennapod.ui.cleaner.HtmlToPlainText;\n+import de.danoeh.antennapod.ui.common.IntentUtils;\n+import de.danoeh.antennapod.ui.episodeslist.EpisodeItemListAdapter;\n import de.danoeh.antennapod.ui.episodeslist.EpisodeItemViewHolder;\n+import de.danoeh.antennapod.ui.episodeslist.EpisodeMultiSelectActionHandler;\n+import de.danoeh.antennapod.ui.episodeslist.FeedItemMenuHandler;\n+import de.danoeh.antennapod.ui.episodeslist.MoreContentListFooterUtil;\n+import de.danoeh.antennapod.ui.glide.FastBlurTransformation;\n+import de.danoeh.antennapod.ui.screen.SearchFragment;\n+import de.danoeh.antennapod.ui.screen.download.DownloadLogDetailsDialog;\n+import de.danoeh.antennapod.ui.screen.download.DownloadLogFragment;\n+import de.danoeh.antennapod.ui.screen.episode.ItemPagerFragment;\n+import de.danoeh.antennapod.ui.screen.feed.preferences.FeedSettingsFragment;\n+import de.danoeh.antennapod.ui.share.ShareUtils;\n+import de.danoeh.antennapod.ui.swipeactions.SwipeActions;\n import io.reactivex.Maybe;\n import io.reactivex.Observable;\n import io.reactivex.android.schedulers.AndroidSchedulers;\n import io.reactivex.disposables.Disposable;\n import io.reactivex.schedulers.Schedulers;\n+import org.apache.commons.lang3.StringUtils;\n+import org.apache.commons.lang3.Validate;\n+import org.greenrobot.eventbus.EventBus;\n+import org.greenrobot.eventbus.Subscribe;\n+import org.greenrobot.eventbus.ThreadMode;\n+\n+import java.util.Collections;\n+import java.util.List;\n+import java.util.concurrent.ExecutionException;\n \n /**\n * Displays a list of FeedItems.\n@@ -100,7 +98,6 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem\n private boolean displayUpArrow;\n private long feedID;\n private Feed feed;\n- private boolean headerCreated = false;\n private Disposable disposable;\n private FeedItemListFragmentBinding viewBinding;\n \n@@ -145,12 +142,18 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c\n if (savedInstanceState != null) {\n displayUpArrow = savedInstanceState.getBoolean(KEY_UP_ARROW);\n }\n- ((MainActivity) getActivity()).setupToolbarToggle(viewBinding.toolbar, displayUpArrow);\n+ if (getActivity() instanceof MainActivity) {\n+ ((MainActivity) getActivity()).setupToolbarToggle(viewBinding.toolbar, displayUpArrow);\n+ viewBinding.recyclerView.setRecycledViewPool(((MainActivity) getActivity()).getRecycledViewPool());\n+ } else {\n+ viewBinding.toolbar.setNavigationIcon(R.drawable.ic_close);\n+ viewBinding.toolbar.setNavigationOnClickListener(view -> getActivity().finish());\n+ }\n updateToolbar();\n setupLoadMoreScrollListener();\n+ setupHeaderView();\n \n- viewBinding.recyclerView.setRecycledViewPool(((MainActivity) getActivity()).getRecycledViewPool());\n- adapter = new FeedItemListAdapter((MainActivity) getActivity());\n+ adapter = new FeedItemListAdapter(getActivity());\n adapter.setOnSelectModeListener(this);\n viewBinding.recyclerView.setAdapter(adapter);\n swipeActions = new SwipeActions(this, TAG).attachTo(viewBinding.recyclerView);\n@@ -198,7 +201,7 @@ public void onScrolled(@NonNull RecyclerView view, int deltaX, int deltaY) {\n Snackbar.LENGTH_SHORT);\n return false;\n }\n- new EpisodeMultiSelectActionHandler(((MainActivity) getActivity()), menuItem.getItemId())\n+ new EpisodeMultiSelectActionHandler(getActivity(), menuItem.getItemId())\n .handleAction(adapter.getSelectedItems());\n adapter.endSelectMode();\n return true;\n@@ -249,6 +252,13 @@ private void updateToolbar() {\n if (feed.isLocalFeed()) {\n viewBinding.toolbar.getMenu().findItem(R.id.share_item).setVisible(false);\n }\n+ if (feed.getState() == Feed.STATE_NOT_SUBSCRIBED) {\n+ viewBinding.toolbar.getMenu().findItem(R.id.sort_items).setVisible(false);\n+ viewBinding.toolbar.getMenu().findItem(R.id.refresh_item).setVisible(false);\n+ viewBinding.toolbar.getMenu().findItem(R.id.rename_item).setVisible(false);\n+ viewBinding.toolbar.getMenu().findItem(R.id.remove_feed).setVisible(false);\n+ viewBinding.toolbar.getMenu().findItem(R.id.action_search).setVisible(false);\n+ }\n }\n \n @Override\n@@ -263,8 +273,7 @@ public void onConfigurationChanged(@NonNull Configuration newConfig) {\n @Override\n public boolean onMenuItemClick(MenuItem item) {\n if (feed == null) {\n- ((MainActivity) getActivity()).showSnackbarAbovePlayer(\n- R.string.please_wait_for_data, Toast.LENGTH_LONG);\n+ EventBus.getDefault().post(getString(R.string.please_wait_for_data));\n return true;\n }\n if (item.getItemId() == R.id.visit_website_item) {\n@@ -443,7 +452,6 @@ public void onEventMainThread(FeedUpdateRunningEvent event) {\n }\n \n private void refreshHeaderView() {\n- setupHeaderView();\n if (viewBinding == null || feed == null) {\n Log.e(TAG, \"Unable to refresh header view\");\n return;\n@@ -454,7 +462,7 @@ private void refreshHeaderView() {\n } else {\n viewBinding.header.txtvFailure.setVisibility(View.GONE);\n }\n- if (!feed.getPreferences().getKeepUpdated()) {\n+ if (!feed.getPreferences().getKeepUpdated() && feed.getState() == Feed.STATE_SUBSCRIBED) {\n viewBinding.header.txtvUpdatesDisabled.setText(R.string.updates_disabled_label);\n viewBinding.header.txtvUpdatesDisabled.setVisibility(View.VISIBLE);\n } else {\n@@ -462,7 +470,11 @@ private void refreshHeaderView() {\n }\n viewBinding.header.txtvTitle.setText(feed.getTitle());\n viewBinding.header.txtvAuthor.setText(feed.getAuthor());\n- if (feed.getItemFilter() != null) {\n+ viewBinding.header.descriptionContainer.setVisibility(View.GONE);\n+ if (feed.getState() != Feed.STATE_SUBSCRIBED) {\n+ viewBinding.header.descriptionContainer.setVisibility(View.VISIBLE);\n+ viewBinding.header.headerDescriptionLabel.setText(HtmlToPlainText.getPlainText(feed.getDescription()));\n+ } else if (feed.getItemFilter() != null) {\n FeedItemFilter filter = feed.getItemFilter();\n if (filter.getValues().length > 0) {\n viewBinding.header.txtvInformation.setText(R.string.filtered_label);\n@@ -475,17 +487,30 @@ private void refreshHeaderView() {\n } else {\n viewBinding.header.txtvInformation.setVisibility(View.GONE);\n }\n- }\n+ boolean isSubscribed = feed.getState() == Feed.STATE_SUBSCRIBED;\n+ viewBinding.header.butShowInfo.setVisibility(isSubscribed ? View.VISIBLE : View.GONE);\n+ viewBinding.header.butFilter.setVisibility(isSubscribed ? View.VISIBLE : View.GONE);\n+ viewBinding.header.butShowSettings.setVisibility(isSubscribed ? View.VISIBLE : View.GONE);\n+ viewBinding.header.butSubscribe.setVisibility(isSubscribed ? View.GONE : View.VISIBLE);\n \n- private void setupHeaderView() {\n- if (feed == null || headerCreated) {\n- return;\n+ if (!isSubscribed && feed.getLastRefreshAttempt() < System.currentTimeMillis() - 1000L * 3600 * 24) {\n+ FeedUpdateManager.getInstance().runOnce(getContext(), feed, true);\n }\n+ }\n \n+ private void setupHeaderView() {\n // https://github.com/bumptech/glide/issues/529\n viewBinding.imgvBackground.setColorFilter(new LightingColorFilter(0xff666666, 0x000000));\n viewBinding.header.butShowInfo.setOnClickListener(v -> showFeedInfo());\n viewBinding.header.imgvCover.setOnClickListener(v -> showFeedInfo());\n+ viewBinding.header.headerDescriptionLabel.setOnClickListener(v -> showFeedInfo());\n+ viewBinding.header.butSubscribe.setOnClickListener(view -> {\n+ DBWriter.setFeedState(getContext(), feed, Feed.STATE_SUBSCRIBED);\n+ MainActivityStarter mainActivityStarter = new MainActivityStarter(getContext());\n+ mainActivityStarter.withOpenFeed(feed.getId());\n+ getActivity().finish();\n+ startActivity(mainActivityStarter.getIntent());\n+ });\n viewBinding.header.butShowSettings.setOnClickListener(v -> {\n if (feed != null) {\n FeedSettingsFragment fragment = FeedSettingsFragment.newInstance(feed);\n@@ -495,7 +520,6 @@ private void setupHeaderView() {\n viewBinding.header.butFilter.setOnClickListener(v ->\n FeedItemFilterDialog.newInstance(feed).show(getChildFragmentManager(), null));\n viewBinding.header.txtvFailure.setOnClickListener(v -> showErrorDetails());\n- headerCreated = true;\n }\n \n private void showErrorDetails() {\n@@ -516,9 +540,18 @@ private void showErrorDetails() {\n }\n \n private void showFeedInfo() {\n- if (feed != null) {\n- FeedInfoFragment fragment = FeedInfoFragment.newInstance(feed);\n+ if (feed == null) {\n+ return;\n+ }\n+ FeedInfoFragment fragment = FeedInfoFragment.newInstance(feed);\n+ if (getActivity() instanceof MainActivity) {\n ((MainActivity) getActivity()).loadChildFragment(fragment, TransitionEffect.SLIDE);\n+ } else {\n+ getActivity().getSupportFragmentManager()\n+ .beginTransaction()\n+ .replace(R.id.fragmentContainer, fragment, \"Info\")\n+ .addToBackStack(\"Info\")\n+ .commitAllowingStateLoss();\n }\n }\n \n@@ -625,7 +658,7 @@ public void onKeyUp(KeyEvent event) {\n }\n \n private class FeedItemListAdapter extends EpisodeItemListAdapter {\n- public FeedItemListAdapter(MainActivity mainActivity) {\n+ public FeedItemListAdapter(FragmentActivity mainActivity) {\n super(mainActivity);\n }\n \n@@ -648,7 +681,7 @@ protected void afterBindViewHolder(EpisodeItemViewHolder holder, int pos) {\n @Override\n public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {\n super.onCreateContextMenu(menu, v, menuInfo);\n- if (!inActionMode()) {\n+ if (!inActionMode() && feed.getState() == Feed.STATE_SUBSCRIBED) {\n menu.findItem(R.id.multi_select).setVisible(true);\n }\n MenuItemUtils.setOnClickListeners(menu, FeedItemlistFragment.this::onContextItemSelected);\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/DownloadsSection.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/DownloadsSection.java\nindex cc3288e2f27..06de7803a10 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/DownloadsSection.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/DownloadsSection.java\n@@ -39,6 +39,8 @@\n public class DownloadsSection extends HomeSection {\n public static final String TAG = \"DownloadsSection\";\n private static final int NUM_EPISODES = 2;\n+ private static final FeedItemFilter FILTER_DOWNLOADED = new FeedItemFilter(\n+ FeedItemFilter.DOWNLOADED, FeedItemFilter.INCLUDE_NOT_SUBSCRIBED);\n private EpisodeItemListAdapter adapter;\n private List items;\n private Disposable disposable;\n@@ -52,7 +54,7 @@ public View onCreateView(@NonNull LayoutInflater inflater,\n viewBinding.recyclerView.setOverScrollMode(RecyclerView.OVER_SCROLL_NEVER);\n viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));\n viewBinding.recyclerView.setRecycledViewPool(((MainActivity) requireActivity()).getRecycledViewPool());\n- adapter = new EpisodeItemListAdapter((MainActivity) requireActivity()) {\n+ adapter = new EpisodeItemListAdapter(requireActivity()) {\n @Override\n public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {\n super.onCreateContextMenu(menu, v, menuInfo);\n@@ -124,8 +126,7 @@ private void loadItems() {\n disposable.dispose();\n }\n SortOrder sortOrder = UserPreferences.getDownloadsSortedOrder();\n- disposable = Observable.fromCallable(() -> DBReader.getEpisodes(0, NUM_EPISODES,\n- new FeedItemFilter(FeedItemFilter.DOWNLOADED), sortOrder))\n+ disposable = Observable.fromCallable(() -> DBReader.getEpisodes(0, NUM_EPISODES, FILTER_DOWNLOADED, sortOrder))\n .subscribeOn(Schedulers.io())\n .observeOn(AndroidSchedulers.mainThread())\n .subscribe(downloads -> {\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/FeedItemlistDescriptionAdapter.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/FeedItemlistDescriptionAdapter.java\ndeleted file mode 100644\nindex f46d786cfe3..00000000000\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/FeedItemlistDescriptionAdapter.java\n+++ /dev/null\n@@ -1,112 +0,0 @@\n-package de.danoeh.antennapod.ui.screen.onlinefeedview;\n-\n-import android.content.Context;\n-import android.view.LayoutInflater;\n-import android.view.View;\n-import android.view.ViewGroup;\n-import android.widget.ArrayAdapter;\n-import android.widget.Button;\n-import android.widget.TextView;\n-\n-import androidx.annotation.NonNull;\n-import androidx.annotation.Nullable;\n-\n-import de.danoeh.antennapod.R;\n-import de.danoeh.antennapod.model.playback.MediaType;\n-import de.danoeh.antennapod.net.common.NetworkUtils;\n-import de.danoeh.antennapod.model.playback.RemoteMedia;\n-import de.danoeh.antennapod.model.feed.FeedItem;\n-import de.danoeh.antennapod.playback.service.PlaybackService;\n-import de.danoeh.antennapod.playback.service.PlaybackServiceStarter;\n-import de.danoeh.antennapod.ui.common.DateFormatter;\n-import de.danoeh.antennapod.model.playback.Playable;\n-import de.danoeh.antennapod.ui.cleaner.HtmlToPlainText;\n-import de.danoeh.antennapod.ui.StreamingConfirmationDialog;\n-\n-import java.util.List;\n-\n-/**\n- * List adapter for showing a list of FeedItems with their title and description.\n- */\n-public class FeedItemlistDescriptionAdapter extends ArrayAdapter {\n- private static final int MAX_LINES_COLLAPSED = 2;\n-\n- public FeedItemlistDescriptionAdapter(Context context, int resource, List objects) {\n- super(context, resource, objects);\n- }\n-\n- @NonNull\n- @Override\n- public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {\n- Holder holder;\n-\n- FeedItem item = getItem(position);\n-\n- // Inflate layout\n- if (convertView == null) {\n- holder = new Holder();\n- LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);\n- convertView = inflater.inflate(R.layout.itemdescription_listitem, parent, false);\n- holder.title = convertView.findViewById(R.id.txtvTitle);\n- holder.pubDate = convertView.findViewById(R.id.txtvPubDate);\n- holder.description = convertView.findViewById(R.id.txtvDescription);\n- holder.preview = convertView.findViewById(R.id.butPreview);\n-\n- convertView.setTag(holder);\n- } else {\n- holder = (Holder) convertView.getTag();\n- }\n-\n- holder.title.setText(item.getTitle());\n- holder.pubDate.setText(DateFormatter.formatAbbrev(getContext(), item.getPubDate()));\n- if (item.getDescription() != null) {\n- String description = HtmlToPlainText.getPlainText(item.getDescription())\n- .replaceAll(\"\\n\", \" \")\n- .replaceAll(\"\\\\s+\", \" \")\n- .trim();\n- holder.description.setText(description);\n- holder.description.setMaxLines(MAX_LINES_COLLAPSED);\n- }\n- holder.description.setTag(Boolean.FALSE); // not expanded\n- holder.preview.setVisibility(View.GONE);\n- holder.preview.setOnClickListener(v -> {\n- if (item.getMedia() == null) {\n- return;\n- }\n- Playable playable = new RemoteMedia(item);\n- if (!NetworkUtils.isStreamingAllowed()) {\n- new StreamingConfirmationDialog(getContext(), playable).show();\n- return;\n- }\n-\n- new PlaybackServiceStarter(getContext(), playable)\n- .callEvenIfRunning(true)\n- .start();\n-\n- if (playable.getMediaType() == MediaType.VIDEO) {\n- getContext().startActivity(PlaybackService.getPlayerActivityIntent(getContext(), playable));\n- }\n- });\n- convertView.setOnClickListener(v -> {\n- if (holder.description.getTag() == Boolean.TRUE) {\n- holder.description.setMaxLines(MAX_LINES_COLLAPSED);\n- holder.preview.setVisibility(View.GONE);\n- holder.description.setTag(Boolean.FALSE);\n- } else {\n- holder.description.setMaxLines(30);\n- holder.description.setTag(Boolean.TRUE);\n-\n- holder.preview.setVisibility(item.getMedia() != null ? View.VISIBLE : View.GONE);\n- holder.preview.setText(R.string.preview_episode);\n- }\n- });\n- return convertView;\n- }\n-\n- static class Holder {\n- TextView title;\n- TextView pubDate;\n- TextView description;\n- Button preview;\n- }\n-}\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java\nindex 7b8558c3d0c..be601027c0e 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java\n@@ -4,8 +4,6 @@\n import android.content.Context;\n import android.content.DialogInterface;\n import android.content.Intent;\n-import android.content.SharedPreferences;\n-import android.graphics.LightingColorFilter;\n import android.os.Bundle;\n import android.text.Spannable;\n import android.text.SpannableString;\n@@ -13,68 +11,45 @@\n import android.text.style.ForegroundColorSpan;\n import android.util.Log;\n import android.view.View;\n-import android.view.ViewGroup;\n-import android.widget.AdapterView;\n import android.widget.ArrayAdapter;\n import android.widget.Toast;\n import androidx.annotation.NonNull;\n import androidx.annotation.Nullable;\n import androidx.annotation.UiThread;\n-import com.google.android.material.dialog.MaterialAlertDialogBuilder;\n import androidx.appcompat.app.AppCompatActivity;\n-import com.bumptech.glide.Glide;\n-import com.bumptech.glide.request.RequestOptions;\n-import com.google.android.material.snackbar.Snackbar;\n-\n+import com.google.android.material.dialog.MaterialAlertDialogBuilder;\n import de.danoeh.antennapod.R;\n-import de.danoeh.antennapod.net.download.service.feed.remote.Downloader;\n-import de.danoeh.antennapod.net.download.service.feed.remote.HttpDownloader;\n-import de.danoeh.antennapod.ui.appstartintent.MainActivityStarter;\n-import de.danoeh.antennapod.ui.common.ThemeSwitcher;\n-import de.danoeh.antennapod.net.download.serviceinterface.DownloadRequestCreator;\n-import de.danoeh.antennapod.net.discovery.FeedUrlNotFoundException;\n-import de.danoeh.antennapod.storage.database.FeedDatabaseWriter;\n-import de.danoeh.antennapod.playback.service.PlaybackServiceInterface;\n-import de.danoeh.antennapod.ui.screen.download.DownloadErrorLabel;\n import de.danoeh.antennapod.databinding.EditTextDialogBinding;\n-import de.danoeh.antennapod.databinding.OnlinefeedviewHeaderBinding;\n-import de.danoeh.antennapod.event.EpisodeDownloadEvent;\n-import de.danoeh.antennapod.event.FeedListUpdateEvent;\n-import de.danoeh.antennapod.event.PlayerStatusEvent;\n-import de.danoeh.antennapod.storage.preferences.PlaybackPreferences;\n-import de.danoeh.antennapod.net.download.serviceinterface.DownloadServiceInterface;\n-import de.danoeh.antennapod.storage.preferences.UserPreferences;\n+import de.danoeh.antennapod.databinding.OnlinefeedviewActivityBinding;\n+import de.danoeh.antennapod.model.download.DownloadError;\n import de.danoeh.antennapod.model.download.DownloadRequest;\n import de.danoeh.antennapod.model.download.DownloadResult;\n-import de.danoeh.antennapod.storage.database.DBReader;\n-import de.danoeh.antennapod.storage.database.DBWriter;\n+import de.danoeh.antennapod.model.feed.Feed;\n+import de.danoeh.antennapod.net.common.UrlChecker;\n import de.danoeh.antennapod.net.discovery.CombinedSearcher;\n+import de.danoeh.antennapod.net.discovery.FeedUrlNotFoundException;\n import de.danoeh.antennapod.net.discovery.PodcastSearchResult;\n import de.danoeh.antennapod.net.discovery.PodcastSearcherRegistry;\n+import de.danoeh.antennapod.net.download.service.feed.remote.Downloader;\n+import de.danoeh.antennapod.net.download.service.feed.remote.HttpDownloader;\n+import de.danoeh.antennapod.net.download.serviceinterface.DownloadRequestCreator;\n import de.danoeh.antennapod.parser.feed.FeedHandler;\n import de.danoeh.antennapod.parser.feed.FeedHandlerResult;\n-import de.danoeh.antennapod.model.download.DownloadError;\n-import de.danoeh.antennapod.ui.common.IntentUtils;\n-import de.danoeh.antennapod.net.common.UrlChecker;\n-import de.danoeh.antennapod.ui.cleaner.HtmlToPlainText;\n-import de.danoeh.antennapod.databinding.OnlinefeedviewActivityBinding;\n-import de.danoeh.antennapod.model.feed.Feed;\n-import de.danoeh.antennapod.model.feed.FeedPreferences;\n-import de.danoeh.antennapod.model.playback.RemoteMedia;\n import de.danoeh.antennapod.parser.feed.UnsupportedFeedtypeException;\n+import de.danoeh.antennapod.storage.database.DBReader;\n+import de.danoeh.antennapod.storage.database.DBWriter;\n+import de.danoeh.antennapod.storage.database.FeedDatabaseWriter;\n+import de.danoeh.antennapod.ui.appstartintent.MainActivityStarter;\n+import de.danoeh.antennapod.ui.common.ThemeSwitcher;\n import de.danoeh.antennapod.ui.common.ThemeUtils;\n-import de.danoeh.antennapod.ui.glide.FastBlurTransformation;\n import de.danoeh.antennapod.ui.preferences.screen.synchronization.AuthenticationDialog;\n+import de.danoeh.antennapod.ui.screen.download.DownloadErrorLabel;\n+import de.danoeh.antennapod.ui.screen.feed.FeedItemlistFragment;\n import io.reactivex.Maybe;\n import io.reactivex.Observable;\n import io.reactivex.android.schedulers.AndroidSchedulers;\n import io.reactivex.disposables.Disposable;\n-import io.reactivex.observers.DisposableMaybeObserver;\n import io.reactivex.schedulers.Schedulers;\n-import org.apache.commons.lang3.StringUtils;\n-import org.greenrobot.eventbus.EventBus;\n-import org.greenrobot.eventbus.Subscribe;\n-import org.greenrobot.eventbus.ThreadMode;\n \n import java.io.File;\n import java.io.IOException;\n@@ -95,30 +70,16 @@\n * and the activity will finish as soon as the error dialog is closed.\n */\n public class OnlineFeedViewActivity extends AppCompatActivity {\n-\n- private static final int RESULT_ERROR = 2;\n private static final String TAG = \"OnlineFeedViewActivity\";\n- private static final String PREFS = \"OnlineFeedViewActivityPreferences\";\n- private static final String PREF_LAST_AUTO_DOWNLOAD = \"lastAutoDownload\";\n- private static final int DESCRIPTION_MAX_LINES_COLLAPSED = 4;\n-\n- private volatile List feeds;\n private String selectedDownloadUrl;\n private Downloader downloader;\n private String username = null;\n private String password = null;\n-\n private boolean isPaused;\n- private boolean didPressSubscribe = false;\n private boolean isFeedFoundBySearch = false;\n-\n private Dialog dialog;\n-\n private Disposable download;\n private Disposable parser;\n- private Disposable updater;\n-\n- private OnlinefeedviewHeaderBinding headerBinding;\n private OnlinefeedviewActivityBinding viewBinding;\n \n @Override\n@@ -128,12 +89,9 @@ protected void onCreate(Bundle savedInstanceState) {\n \n viewBinding = OnlinefeedviewActivityBinding.inflate(getLayoutInflater());\n setContentView(viewBinding.getRoot());\n-\n viewBinding.transparentBackground.setOnClickListener(v -> finish());\n- viewBinding.closeButton.setOnClickListener(view -> finish());\n viewBinding.card.setOnClickListener(null);\n viewBinding.card.setCardBackgroundColor(ThemeUtils.getColorFromAttr(this, R.attr.colorSurface));\n- headerBinding = OnlinefeedviewHeaderBinding.inflate(getLayoutInflater());\n \n String feedUrl = null;\n if (getIntent().hasExtra(ARG_FEEDURL)) {\n@@ -149,7 +107,6 @@ protected void onCreate(Bundle savedInstanceState) {\n showNoPodcastFoundError();\n } else {\n Log.d(TAG, \"Activity was started with url \" + feedUrl);\n- setLoadingLayout();\n // Remove subscribeonandroid.com from feed URL in order to subscribe to the actual feed URL\n if (feedUrl.contains(\"subscribeonandroid.com\")) {\n feedUrl = feedUrl.replaceFirst(\"((www.)?(subscribeonandroid.com/))\", \"\");\n@@ -167,33 +124,20 @@ private void showNoPodcastFoundError() {\n .setNeutralButton(android.R.string.ok, (dialog, which) -> finish())\n .setTitle(R.string.error_label)\n .setMessage(R.string.null_value_podcast_error)\n- .setOnDismissListener(dialog1 -> {\n- setResult(RESULT_ERROR);\n- finish();\n- })\n+ .setOnDismissListener(dialog1 -> finish())\n .show());\n }\n \n- /**\n- * Displays a progress indicator.\n- */\n- private void setLoadingLayout() {\n- viewBinding.progressBar.setVisibility(View.VISIBLE);\n- viewBinding.feedDisplayContainer.setVisibility(View.GONE);\n- }\n-\n @Override\n protected void onStart() {\n super.onStart();\n isPaused = false;\n- EventBus.getDefault().register(this);\n }\n \n @Override\n protected void onStop() {\n super.onStop();\n isPaused = true;\n- EventBus.getDefault().unregister(this);\n if (downloader != null && !downloader.isFinished()) {\n downloader.cancel();\n }\n@@ -205,9 +149,6 @@ protected void onStop() {\n @Override\n public void onDestroy() {\n super.onDestroy();\n- if(updater != null) {\n- updater.dispose();\n- }\n if(download != null) {\n download.dispose();\n }\n@@ -239,7 +180,7 @@ private void lookupUrlAndDownload(String url) {\n download = PodcastSearcherRegistry.lookupUrl(url)\n .subscribeOn(Schedulers.io())\n .observeOn(Schedulers.io())\n- .subscribe(this::startFeedDownload,\n+ .subscribe(this::downloadIfNotAlreadySubscribed,\n error -> {\n if (error instanceof FeedUrlNotFoundException) {\n tryToRetrieveFeedUrlBySearch((FeedUrlNotFoundException) error);\n@@ -256,7 +197,7 @@ private void tryToRetrieveFeedUrlBySearch(FeedUrlNotFoundException error) {\n if (url != null) {\n Log.d(TAG, \"Successfully retrieve feed url\");\n isFeedFoundBySearch = true;\n- startFeedDownload(url);\n+ downloadIfNotAlreadySubscribed(url);\n } else {\n showNoPodcastFoundError();\n Log.d(TAG, \"Failed to retrieve feed url\");\n@@ -277,6 +218,28 @@ private String searchFeedUrlByTrackName(String trackName, String artistName) {\n return null;\n }\n \n+ private Feed downloadIfNotAlreadySubscribed(String url) {\n+ download = Maybe.fromCallable(() -> {\n+ List feeds = DBReader.getFeedList();\n+ for (Feed f : feeds) {\n+ if (f.getDownloadUrl().equals(url)) {\n+ return f;\n+ }\n+ }\n+ return null;\n+ })\n+ .subscribeOn(Schedulers.io())\n+ .observeOn(AndroidSchedulers.mainThread())\n+ .subscribe(subscribedFeed -> {\n+ if (subscribedFeed.getState() == Feed.STATE_SUBSCRIBED) {\n+ openFeed(subscribedFeed.getId());\n+ } else {\n+ showFeedFragment(subscribedFeed.getId());\n+ }\n+ }, error -> Log.e(TAG, Log.getStackTraceString(error)), () -> startFeedDownload(url));\n+ return null;\n+ }\n+\n private void startFeedDownload(String url) {\n Log.d(TAG, \"Starting feed download\");\n selectedDownloadUrl = UrlChecker.prepareUrl(url);\n@@ -286,7 +249,6 @@ private void startFeedDownload(String url) {\n .build();\n \n download = Observable.fromCallable(() -> {\n- feeds = DBReader.getFeedList();\n downloader = new HttpDownloader(request);\n downloader.call();\n return downloader.getResult();\n@@ -315,46 +277,25 @@ private void checkDownloadResult(@NonNull DownloadResult status, String destinat\n }\n }\n \n- @Subscribe\n- public void onFeedListChanged(FeedListUpdateEvent event) {\n- updater = Observable.fromCallable(DBReader::getFeedList)\n- .subscribeOn(Schedulers.io())\n- .observeOn(AndroidSchedulers.mainThread())\n- .subscribe(\n- feeds -> {\n- OnlineFeedViewActivity.this.feeds = feeds;\n- handleUpdatedFeedStatus();\n- }, error -> Log.e(TAG, Log.getStackTraceString(error))\n- );\n- }\n-\n- @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)\n- public void onEventMainThread(EpisodeDownloadEvent event) {\n- handleUpdatedFeedStatus();\n- }\n-\n private void parseFeed(String destination) {\n Log.d(TAG, \"Parsing feed\");\n- parser = Maybe.fromCallable(() -> doParseFeed(destination))\n- .subscribeOn(Schedulers.computation())\n- .observeOn(AndroidSchedulers.mainThread())\n- .subscribeWith(new DisposableMaybeObserver() {\n- @Override\n- public void onSuccess(@NonNull FeedHandlerResult result) {\n- showFeedInformation(result.feed, result.alternateFeedUrls);\n- }\n-\n- @Override\n- public void onComplete() {\n- // Ignore null result: We showed the discovery dialog.\n- }\n-\n- @Override\n- public void onError(@NonNull Throwable error) {\n- showErrorDialog(error.getMessage(), \"\");\n- Log.d(TAG, \"Feed parser exception: \" + Log.getStackTraceString(error));\n- }\n- });\n+ parser = Observable.fromCallable(() -> {\n+ FeedHandlerResult handlerResult = doParseFeed(destination);\n+ Feed feed = handlerResult.feed;\n+ feed.setState(Feed.STATE_NOT_SUBSCRIBED);\n+ feed.setLastRefreshAttempt(System.currentTimeMillis());\n+ FeedDatabaseWriter.updateFeed(this, feed, false);\n+ Feed feedFromDb = DBReader.getFeed(feed.getId(), false, 0, Integer.MAX_VALUE);\n+ feedFromDb.getPreferences().setKeepUpdated(false);\n+ DBWriter.setFeedPreferences(feedFromDb.getPreferences());\n+ return feed.getId();\n+ })\n+ .subscribeOn(Schedulers.computation())\n+ .observeOn(AndroidSchedulers.mainThread())\n+ .subscribe(this::showFeedFragment, error -> {\n+ error.printStackTrace();\n+ showErrorDialog(error.getMessage(), \"\");\n+ });\n }\n \n /**\n@@ -392,123 +333,23 @@ private FeedHandlerResult doParseFeed(String destination) throws Exception {\n }\n }\n \n- /**\n- * Called when feed parsed successfully.\n- * This method is executed on the GUI thread.\n- */\n- private void showFeedInformation(final Feed feed, Map alternateFeedUrls) {\n- viewBinding.progressBar.setVisibility(View.GONE);\n- viewBinding.feedDisplayContainer.setVisibility(View.VISIBLE);\n+ private void showFeedFragment(long id) {\n if (isFeedFoundBySearch) {\n- int resId = R.string.no_feed_url_podcast_found_by_search;\n- Snackbar.make(findViewById(android.R.id.content), resId, Snackbar.LENGTH_LONG).show();\n- }\n-\n- viewBinding.backgroundImage.setColorFilter(new LightingColorFilter(0xff828282, 0x000000));\n-\n- viewBinding.listView.addHeaderView(headerBinding.getRoot());\n- viewBinding.listView.setSelector(android.R.color.transparent);\n- viewBinding.listView.setAdapter(new FeedItemlistDescriptionAdapter(this, 0, feed.getItems()));\n-\n- if (StringUtils.isNotBlank(feed.getImageUrl())) {\n- Glide.with(this)\n- .load(feed.getImageUrl())\n- .apply(new RequestOptions()\n- .placeholder(R.color.light_gray)\n- .error(R.color.light_gray)\n- .fitCenter()\n- .dontAnimate())\n- .into(viewBinding.coverImage);\n- Glide.with(this)\n- .load(feed.getImageUrl())\n- .apply(new RequestOptions()\n- .placeholder(R.color.image_readability_tint)\n- .error(R.color.image_readability_tint)\n- .transform(new FastBlurTransformation())\n- .dontAnimate())\n- .into(viewBinding.backgroundImage);\n- }\n-\n- viewBinding.titleLabel.setText(feed.getTitle());\n- viewBinding.authorLabel.setText(feed.getAuthor());\n- headerBinding.txtvDescription.setText(HtmlToPlainText.getPlainText(feed.getDescription()));\n-\n- viewBinding.subscribeButton.setOnClickListener(v -> {\n- if (feedInFeedlist()) {\n- openFeed();\n- } else {\n- FeedDatabaseWriter.updateFeed(this, feed, false);\n- didPressSubscribe = true;\n- handleUpdatedFeedStatus();\n- }\n- });\n-\n- viewBinding.stopPreviewButton.setOnClickListener(v -> {\n- PlaybackPreferences.writeNoMediaPlaying();\n- IntentUtils.sendLocalBroadcast(this, PlaybackServiceInterface.ACTION_SHUTDOWN_PLAYBACK_SERVICE);\n- });\n-\n- if (UserPreferences.isEnableAutodownload()) {\n- SharedPreferences preferences = getSharedPreferences(PREFS, MODE_PRIVATE);\n- viewBinding.autoDownloadCheckBox.setChecked(preferences.getBoolean(PREF_LAST_AUTO_DOWNLOAD, true));\n+ Toast.makeText(this, R.string.no_feed_url_podcast_found_by_search, Toast.LENGTH_LONG).show();\n }\n \n- headerBinding.txtvDescription.setMaxLines(DESCRIPTION_MAX_LINES_COLLAPSED);\n- headerBinding.txtvDescription.setOnClickListener(v -> {\n- if (headerBinding.txtvDescription.getMaxLines() > DESCRIPTION_MAX_LINES_COLLAPSED) {\n- headerBinding.txtvDescription.setMaxLines(DESCRIPTION_MAX_LINES_COLLAPSED);\n- } else {\n- headerBinding.txtvDescription.setMaxLines(2000);\n- }\n- });\n-\n- if (alternateFeedUrls.isEmpty()) {\n- viewBinding.alternateUrlsSpinner.setVisibility(View.GONE);\n- } else {\n- viewBinding.alternateUrlsSpinner.setVisibility(View.VISIBLE);\n-\n- final List alternateUrlsList = new ArrayList<>();\n- final List alternateUrlsTitleList = new ArrayList<>();\n-\n- alternateUrlsList.add(feed.getDownloadUrl());\n- alternateUrlsTitleList.add(feed.getTitle());\n-\n-\n- alternateUrlsList.addAll(alternateFeedUrls.keySet());\n- for (String url : alternateFeedUrls.keySet()) {\n- alternateUrlsTitleList.add(alternateFeedUrls.get(url));\n- }\n-\n- ArrayAdapter adapter = new ArrayAdapter(this,\n- R.layout.alternate_urls_item, alternateUrlsTitleList) {\n- @Override\n- public View getDropDownView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {\n- // reusing the old view causes a visual bug on Android <= 10\n- return super.getDropDownView(position, null, parent);\n- }\n- };\n-\n- adapter.setDropDownViewResource(R.layout.alternate_urls_dropdown_item);\n- viewBinding.alternateUrlsSpinner.setAdapter(adapter);\n- viewBinding.alternateUrlsSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {\n- @Override\n- public void onItemSelected(AdapterView parent, View view, int position, long id) {\n- selectedDownloadUrl = alternateUrlsList.get(position);\n- }\n-\n- @Override\n- public void onNothingSelected(AdapterView parent) {\n-\n- }\n- });\n- }\n- handleUpdatedFeedStatus();\n+ viewBinding.progressBar.setVisibility(View.GONE);\n+ FeedItemlistFragment fragment = FeedItemlistFragment.newInstance(id);\n+ getSupportFragmentManager()\n+ .beginTransaction()\n+ .replace(R.id.fragmentContainer, fragment, FeedItemlistFragment.TAG)\n+ .commitAllowingStateLoss();\n }\n \n- private void openFeed() {\n+ private void openFeed(long feedId) {\n // feed.getId() is always 0, we have to retrieve the id from the feed list from the database\n MainActivityStarter mainActivityStarter = new MainActivityStarter(this);\n- mainActivityStarter.withOpenFeed(getFeedId());\n+ mainActivityStarter.withOpenFeed(feedId);\n if (getIntent().getBooleanExtra(ARG_STARTED_FROM_SEARCH, false)) {\n mainActivityStarter.withAddToBackStack();\n }\n@@ -516,60 +357,6 @@ private void openFeed() {\n startActivity(mainActivityStarter.getIntent());\n }\n \n- private void handleUpdatedFeedStatus() {\n- if (DownloadServiceInterface.get().isDownloadingEpisode(selectedDownloadUrl)) {\n- viewBinding.subscribeButton.setEnabled(false);\n- viewBinding.subscribeButton.setText(R.string.subscribing_label);\n- } else if (feedInFeedlist()) {\n- viewBinding.subscribeButton.setEnabled(true);\n- viewBinding.subscribeButton.setText(R.string.open_podcast);\n- if (didPressSubscribe) {\n- didPressSubscribe = false;\n-\n- Feed feed1 = DBReader.getFeed(getFeedId(), false, 0, 0);\n- FeedPreferences feedPreferences = feed1.getPreferences();\n- if (UserPreferences.isEnableAutodownload()) {\n- boolean autoDownload = viewBinding.autoDownloadCheckBox.isChecked();\n- feedPreferences.setAutoDownload(autoDownload);\n-\n- SharedPreferences preferences = getSharedPreferences(PREFS, MODE_PRIVATE);\n- SharedPreferences.Editor editor = preferences.edit();\n- editor.putBoolean(PREF_LAST_AUTO_DOWNLOAD, autoDownload);\n- editor.apply();\n- }\n- if (username != null) {\n- feedPreferences.setUsername(username);\n- feedPreferences.setPassword(password);\n- }\n- DBWriter.setFeedPreferences(feedPreferences);\n-\n- openFeed();\n- }\n- } else {\n- viewBinding.subscribeButton.setEnabled(true);\n- viewBinding.subscribeButton.setText(R.string.subscribe_label);\n- if (UserPreferences.isEnableAutodownload()) {\n- viewBinding.autoDownloadCheckBox.setVisibility(View.VISIBLE);\n- }\n- }\n- }\n-\n- private boolean feedInFeedlist() {\n- return getFeedId() != 0;\n- }\n-\n- private long getFeedId() {\n- if (feeds == null) {\n- return 0;\n- }\n- for (Feed f : feeds) {\n- if (f.getDownloadUrl().equals(selectedDownloadUrl)) {\n- return f.getId();\n- }\n- }\n- return 0;\n- }\n-\n @UiThread\n private void showErrorDialog(String errorMsg, String details) {\n if (!isFinishing() && !isPaused) {\n@@ -589,7 +376,6 @@ private void showErrorDialog(String errorMsg, String details) {\n builder.setNeutralButton(R.string.edit_url_menu, (dialog, which) -> editUrl());\n }\n builder.setOnCancelListener(dialog -> {\n- setResult(RESULT_ERROR);\n finish();\n });\n if (dialog != null && dialog.isShowing()) {\n@@ -608,24 +394,15 @@ private void editUrl() {\n }\n builder.setView(dialogBinding.getRoot());\n builder.setPositiveButton(R.string.confirm_label, (dialog, which) -> {\n- setLoadingLayout();\n lookupUrlAndDownload(dialogBinding.urlEditText.getText().toString());\n });\n builder.setNegativeButton(R.string.cancel_label, (dialog1, which) -> dialog1.cancel());\n builder.setOnCancelListener(dialog1 -> {\n- setResult(RESULT_ERROR);\n finish();\n });\n builder.show();\n }\n \n- @Subscribe(threadMode = ThreadMode.MAIN)\n- public void playbackStateChanged(PlayerStatusEvent event) {\n- boolean isPlayingPreview =\n- PlaybackPreferences.getCurrentlyPlayingMediaType() == RemoteMedia.PLAYABLE_TYPE_REMOTE_MEDIA;\n- viewBinding.stopPreviewButton.setVisibility(isPlayingPreview ? View.VISIBLE : View.GONE);\n- }\n-\n /**\n *\n * @return true if a FeedDiscoveryDialog is shown, false otherwise (e.g., due to no feed found).\n@@ -657,7 +434,7 @@ private boolean showFeedDiscoveryDialog(File feedFile, String baseUrl) {\n if (urls.size() == 1) {\n // Skip dialog and display the item directly\n resetIntent(urls.get(0));\n- startFeedDownload(urls.get(0));\n+ downloadIfNotAlreadySubscribed(urls.get(0));\n return true;\n }\n \n@@ -667,7 +444,7 @@ private boolean showFeedDiscoveryDialog(File feedFile, String baseUrl) {\n String selectedUrl = urls.get(which);\n dialog.dismiss();\n resetIntent(selectedUrl);\n- startFeedDownload(selectedUrl);\n+ downloadIfNotAlreadySubscribed(selectedUrl);\n };\n \n MaterialAlertDialogBuilder ab = new MaterialAlertDialogBuilder(OnlineFeedViewActivity.this)\n@@ -704,7 +481,7 @@ protected void onCancelled() {\n protected void onConfirmed(String username, String password) {\n OnlineFeedViewActivity.this.username = username;\n OnlineFeedViewActivity.this.password = password;\n- startFeedDownload(feedUrl);\n+ downloadIfNotAlreadySubscribed(feedUrl);\n }\n }\n \ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/AudioPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/AudioPlayerFragment.java\nindex e66ed6d3eae..7aa9da50367 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/AudioPlayerFragment.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/AudioPlayerFragment.java\n@@ -25,8 +25,10 @@\n import com.google.android.material.bottomsheet.BottomSheetBehavior;\n import com.google.android.material.elevation.SurfaceColors;\n \n+import de.danoeh.antennapod.model.feed.Feed;\n import de.danoeh.antennapod.playback.service.PlaybackController;\n import de.danoeh.antennapod.ui.appstartintent.MediaButtonStarter;\n+import de.danoeh.antennapod.ui.appstartintent.OnlineFeedviewActivityStarter;\n import de.danoeh.antennapod.ui.chapters.ChapterUtils;\n import de.danoeh.antennapod.ui.episodes.PlaybackSpeedUtils;\n import de.danoeh.antennapod.ui.episodes.TimeSpeedConverter;\n@@ -497,14 +499,25 @@ public boolean onMenuItemClick(MenuItem item) {\n return true;\n } else if (itemId == R.id.open_feed_item) {\n if (feedItem != null) {\n- Intent intent = MainActivity.getIntentToOpenFeed(getContext(), feedItem.getFeedId());\n- startActivity(intent);\n+ openFeed(feedItem.getFeed());\n }\n return true;\n }\n return false;\n }\n \n+ private void openFeed(Feed feed) {\n+ if (feed == null) {\n+ return;\n+ }\n+ if (feed.getState() == Feed.STATE_SUBSCRIBED) {\n+ Intent intent = MainActivity.getIntentToOpenFeed(getContext(), feed.getId());\n+ startActivity(intent);\n+ } else {\n+ startActivity(new OnlineFeedviewActivityStarter(getContext(), feed.getDownloadUrl()).getIntent());\n+ }\n+ }\n+\n public void fadePlayerToToolbar(float slideOffset) {\n float playerFadeProgress = Math.max(0.0f, Math.min(0.2f, slideOffset - 0.2f)) / 0.2f;\n View player = getView().findViewById(R.id.playerFragment);\ndiff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/CoverFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/CoverFragment.java\nindex 073d5b0be36..d4931380ed3 100644\n--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/CoverFragment.java\n+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/CoverFragment.java\n@@ -32,6 +32,8 @@\n import com.google.android.material.snackbar.Snackbar;\n import de.danoeh.antennapod.R;\n import de.danoeh.antennapod.activity.MainActivity;\n+import de.danoeh.antennapod.model.feed.Feed;\n+import de.danoeh.antennapod.ui.appstartintent.OnlineFeedviewActivityStarter;\n import de.danoeh.antennapod.ui.chapters.ChapterUtils;\n import de.danoeh.antennapod.ui.screen.chapter.ChaptersFragment;\n import de.danoeh.antennapod.playback.service.PlaybackController;\n@@ -122,9 +124,7 @@ private void displayMediaInfo(@NonNull Playable media) {\n + \"\\u00A0\"\n + StringUtils.replace(StringUtils.stripToEmpty(pubDateStr), \" \", \"\\u00A0\"));\n if (media instanceof FeedMedia) {\n- Intent openFeed = MainActivity.getIntentToOpenFeed(requireContext(),\n- ((FeedMedia) media).getItem().getFeedId());\n- viewBinding.txtvPodcastTitle.setOnClickListener(v -> startActivity(openFeed));\n+ viewBinding.txtvPodcastTitle.setOnClickListener(v -> openFeed(((FeedMedia) media).getItem().getFeed()));\n } else {\n viewBinding.txtvPodcastTitle.setOnClickListener(null);\n }\n@@ -164,6 +164,18 @@ public void onAnimationEnd(Animator animation) {\n updateChapterControlVisibility();\n }\n \n+ private void openFeed(Feed feed) {\n+ if (feed == null) {\n+ return;\n+ }\n+ if (feed.getState() == Feed.STATE_SUBSCRIBED) {\n+ Intent intent = MainActivity.getIntentToOpenFeed(getContext(), feed.getId());\n+ startActivity(intent);\n+ } else {\n+ startActivity(new OnlineFeedviewActivityStarter(getContext(), feed.getDownloadUrl()).getIntent());\n+ }\n+ }\n+\n private void updateChapterControlVisibility() {\n boolean chapterControlVisible = false;\n if (media.getChapters() != null) {\ndiff --git a/app/src/main/res/layout/alternate_urls_dropdown_item.xml b/app/src/main/res/layout/alternate_urls_dropdown_item.xml\ndeleted file mode 100644\nindex 3c4dcc7fc63..00000000000\n--- a/app/src/main/res/layout/alternate_urls_dropdown_item.xml\n+++ /dev/null\n@@ -1,8 +0,0 @@\n-\n-\ndiff --git a/app/src/main/res/layout/alternate_urls_item.xml b/app/src/main/res/layout/alternate_urls_item.xml\ndeleted file mode 100644\nindex 54e05b49d03..00000000000\n--- a/app/src/main/res/layout/alternate_urls_item.xml\n+++ /dev/null\n@@ -1,9 +0,0 @@\n-\n-\ndiff --git a/app/src/main/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml\nindex 1a6d8ce9312..ba121a8f345 100644\n--- a/app/src/main/res/layout/feedinfo.xml\n+++ b/app/src/main/res/layout/feedinfo.xml\n@@ -66,13 +66,13 @@\n android:layout_width=\"match_parent\"\n android:layout_height=\"wrap_content\"\n android:orientation=\"vertical\"\n+ android:paddingTop=\"16dp\"\n android:paddingHorizontal=\"@dimen/additional_horizontal_spacing\">\n \n \n \n@@ -97,7 +98,6 @@\n android:id=\"@+id/supportHeadingLabel\"\n android:layout_width=\"match_parent\"\n android:layout_height=\"wrap_content\"\n- android:layout_marginTop=\"16dp\"\n android:layout_marginBottom=\"4dp\"\n android:text=\"@string/support_funding_label\"\n android:textColor=\"?android:attr/textColorPrimary\"\n@@ -120,7 +120,6 @@\n android:layout_width=\"wrap_content\"\n android:layout_height=\"wrap_content\"\n android:textSize=\"18sp\"\n- android:layout_marginTop=\"16dp\"\n android:layout_marginBottom=\"4dp\"\n android:text=\"@string/description_label\"\n android:textColor=\"?android:attr/textColorPrimary\"\n@@ -130,7 +129,6 @@\n android:id=\"@+id/descriptionLabel\"\n android:layout_width=\"match_parent\"\n android:layout_height=\"wrap_content\"\n- android:text=\"@string/design_time_lorem_ipsum\"\n android:textIsSelectable=\"true\"\n tools:background=\"@android:color/holo_green_dark\" />\n \ndiff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml\nindex 37db9067c39..df95b8c1579 100644\n--- a/app/src/main/res/layout/feeditem_fragment.xml\n+++ b/app/src/main/res/layout/feeditem_fragment.xml\n@@ -174,6 +174,20 @@\n \n \n \n+ \n+\n \n \n+ \n+\n \n \n+ \n+\n+ \n+\n+ \n+\n+ \n+\n+ \n+\n+ \n+\n \ndiff --git a/app/src/main/res/layout/itemdescription_listitem.xml b/app/src/main/res/layout/itemdescription_listitem.xml\ndeleted file mode 100644\nindex c3f8c24b8dc..00000000000\n--- a/app/src/main/res/layout/itemdescription_listitem.xml\n+++ /dev/null\n@@ -1,51 +0,0 @@\n-\n-\n-\n- \n-\n- \n-\n- \n-\n- \n-\n-\ndiff --git a/app/src/main/res/layout/onlinefeedview_activity.xml b/app/src/main/res/layout/onlinefeedview_activity.xml\nindex 88b87da1aff..a121c9e0eda 100644\n--- a/app/src/main/res/layout/onlinefeedview_activity.xml\n+++ b/app/src/main/res/layout/onlinefeedview_activity.xml\n@@ -2,7 +2,6 @@\n \n@@ -11,169 +10,22 @@\n android:id=\"@+id/card\"\n android:layout_width=\"match_parent\"\n android:layout_height=\"match_parent\"\n- android:layout_margin=\"24dp\"\n+ android:layout_marginHorizontal=\"16dp\"\n+ android:layout_marginVertical=\"56dp\"\n android:elevation=\"16dp\"\n app:cardCornerRadius=\"8dp\">\n \n- \n-\n- \n-\n- \n-\n- \n-\n- \n-\n- \n-\n- \n-\n- \n-\n- \n-\n- \n-\n- \n-\n- \n-\n- \n-\n- \n-\n- \n-\n- \n-\n- \n-\n- \n-\n- \n+ android:layout_height=\"match_parent\" />\n+\n+ \n \n \n \ndiff --git a/app/src/main/res/layout/onlinefeedview_header.xml b/app/src/main/res/layout/onlinefeedview_header.xml\ndeleted file mode 100644\nindex 6d740c772bc..00000000000\n--- a/app/src/main/res/layout/onlinefeedview_header.xml\n+++ /dev/null\n@@ -1,36 +0,0 @@\n-\n-\n-\n- \n-\n- \n-\n- \n-\n-\ndiff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/Feed.java b/model/src/main/java/de/danoeh/antennapod/model/feed/Feed.java\nindex 15d256c244e..634d3440d72 100644\n--- a/model/src/main/java/de/danoeh/antennapod/model/feed/Feed.java\n+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/Feed.java\n@@ -15,6 +15,8 @@\n public class Feed {\n \n public static final int FEEDFILETYPE_FEED = 0;\n+ public static final int STATE_SUBSCRIBED = 0;\n+ public static final int STATE_NOT_SUBSCRIBED = 1;\n public static final String TYPE_RSS2 = \"rss\";\n public static final String TYPE_ATOM1 = \"atom\";\n public static final String PREFIX_LOCAL_FOLDER = \"antennapod_local:\";\n@@ -101,6 +103,7 @@ public class Feed {\n */\n @Nullable\n private SortOrder sortOrder;\n+ private int state;\n \n /**\n * This constructor is used for restoring a feed from the database.\n@@ -109,7 +112,7 @@ public Feed(long id, String lastModified, String title, String customTitle, Stri\n String description, String paymentLinks, String author, String language,\n String type, String feedIdentifier, String imageUrl, String fileUrl,\n String downloadUrl, long lastRefreshAttempt, boolean paged, String nextPageLink,\n- String filter, @Nullable SortOrder sortOrder, boolean lastUpdateFailed) {\n+ String filter, @Nullable SortOrder sortOrder, boolean lastUpdateFailed, int state) {\n this.localFileUrl = fileUrl;\n this.downloadUrl = downloadUrl;\n this.lastRefreshAttempt = lastRefreshAttempt;\n@@ -135,6 +138,7 @@ public Feed(long id, String lastModified, String title, String customTitle, Stri\n }\n setSortOrder(sortOrder);\n this.lastUpdateFailed = lastUpdateFailed;\n+ this.state = state;\n }\n \n /**\n@@ -144,7 +148,7 @@ public Feed(long id, String lastModified, String title, String link, String desc\n String author, String language, String type, String feedIdentifier, String imageUrl, String fileUrl,\n String downloadUrl, long lastRefreshAttempt) {\n this(id, lastModified, title, null, link, description, paymentLink, author, language, type, feedIdentifier,\n- imageUrl, fileUrl, downloadUrl, lastRefreshAttempt, false, null, null, null, false);\n+ imageUrl, fileUrl, downloadUrl, lastRefreshAttempt, false, null, null, null, false, STATE_SUBSCRIBED);\n }\n \n /**\n@@ -468,4 +472,12 @@ public void setLastUpdateFailed(boolean lastUpdateFailed) {\n public boolean isLocalFeed() {\n return downloadUrl.startsWith(PREFIX_LOCAL_FOLDER);\n }\n+\n+ public int getState() {\n+ return state;\n+ }\n+\n+ public void setState(int state) {\n+ this.state = state;\n+ }\n }\ndiff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItemFilter.java b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItemFilter.java\nindex 95a7a611025..1faeda01220 100644\n--- a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItemFilter.java\n+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItemFilter.java\n@@ -24,6 +24,7 @@ public class FeedItemFilter implements Serializable {\n public final boolean showIsFavorite;\n public final boolean showNotFavorite;\n public final boolean showInHistory;\n+ public final boolean includeNotSubscribed;\n \n public static final String PLAYED = \"played\";\n public static final String UNPLAYED = \"unplayed\";\n@@ -39,6 +40,7 @@ public class FeedItemFilter implements Serializable {\n public static final String DOWNLOADED = \"downloaded\";\n public static final String NOT_DOWNLOADED = \"not_downloaded\";\n public static final String IS_IN_HISTORY = \"is_in_history\";\n+ public static final String INCLUDE_NOT_SUBSCRIBED = \"include_not_subscribed\";\n \n public static FeedItemFilter unfiltered() {\n return new FeedItemFilter(\"\");\n@@ -48,6 +50,10 @@ public FeedItemFilter(String properties) {\n this(TextUtils.split(properties, \",\"));\n }\n \n+ public FeedItemFilter(FeedItemFilter filter, String... additionalProperties) {\n+ this(TextUtils.join(\",\", filter.getValues()) + \",\" + TextUtils.join(\",\", additionalProperties));\n+ }\n+\n public FeedItemFilter(String... properties) {\n this.properties = properties;\n \n@@ -66,6 +72,7 @@ public FeedItemFilter(String... properties) {\n showNotFavorite = hasProperty(NOT_FAVORITE);\n showNew = hasProperty(NEW);\n showInHistory = hasProperty(IS_IN_HISTORY);\n+ includeNotSubscribed = hasProperty(INCLUDE_NOT_SUBSCRIBED);\n }\n \n private boolean hasProperty(String property) {\n@@ -112,6 +119,9 @@ public boolean matches(FeedItem item) {\n } else if (showInHistory && item.getMedia() != null\n && item.getMedia().getPlaybackCompletionDate().getTime() == 0) {\n return false;\n+ } else if (!includeNotSubscribed && item.getFeed() != null\n+ && item.getFeed().getState() != Feed.STATE_SUBSCRIBED) {\n+ return false;\n }\n return true;\n }\ndiff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/SubscriptionsFilter.java b/model/src/main/java/de/danoeh/antennapod/model/feed/SubscriptionsFilter.java\nindex 434d474a795..2d584adef85 100644\n--- a/model/src/main/java/de/danoeh/antennapod/model/feed/SubscriptionsFilter.java\n+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/SubscriptionsFilter.java\n@@ -12,6 +12,7 @@ public class SubscriptionsFilter {\n private final String[] properties;\n \n private boolean showIfCounterGreaterZero = false;\n+ private boolean hideNonSubscribedFeeds = true;\n \n private boolean showAutoDownloadEnabled = false;\n private boolean showAutoDownloadDisabled = false;\n@@ -67,10 +68,6 @@ public boolean isEnabled() {\n * Run a list of feed items through the filter.\n */\n public List filter(List items, Map feedCounters) {\n- if (properties.length == 0) {\n- return items;\n- }\n-\n List result = new ArrayList<>();\n \n for (Feed item : items) {\n@@ -95,6 +92,10 @@ public List filter(List items, Map feedCounters) {\n continue;\n }\n \n+ if (hideNonSubscribedFeeds && item.getState() != Feed.STATE_SUBSCRIBED) {\n+ continue;\n+ }\n+\n // If the item reaches here, it meets all criteria (except counter > 0)\n result.add(item);\n }\ndiff --git a/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/ItunesTopListLoader.java b/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/ItunesTopListLoader.java\nindex 128aad5939c..c837a14efc8 100644\n--- a/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/ItunesTopListLoader.java\n+++ b/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/ItunesTopListLoader.java\n@@ -58,7 +58,8 @@ private static List removeSubscribed(\n List suggestedPodcasts, List subscribedFeeds, int limit) {\n Set subscribedPodcastsSet = new HashSet<>();\n for (Feed subscribedFeed : subscribedFeeds) {\n- if (subscribedFeed.getTitle() != null && subscribedFeed.getAuthor() != null) {\n+ if (subscribedFeed.getTitle() != null && subscribedFeed.getAuthor() != null\n+ && subscribedFeed.getState() == Feed.STATE_SUBSCRIBED) {\n subscribedPodcastsSet.add(subscribedFeed.getTitle().trim() + \" - \" + subscribedFeed.getAuthor().trim());\n }\n }\ndiff --git a/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/MediaDownloadedHandler.java b/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/MediaDownloadedHandler.java\nindex 96c1549e2a3..cf9ec17e19f 100644\n--- a/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/MediaDownloadedHandler.java\n+++ b/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/episode/MediaDownloadedHandler.java\n@@ -7,6 +7,7 @@\n import androidx.annotation.NonNull;\n \n import de.danoeh.antennapod.model.MediaMetadataRetrieverCompat;\n+import de.danoeh.antennapod.model.feed.Feed;\n import de.danoeh.antennapod.net.sync.serviceinterface.SynchronizationQueueSink;\n import de.danoeh.antennapod.ui.chapters.ChapterUtils;\n import org.greenrobot.eventbus.EventBus;\n@@ -104,7 +105,7 @@ public void run() {\n FeedMedia.FEEDFILETYPE_FEEDMEDIA, false, DownloadError.ERROR_DB_ACCESS_ERROR, e.getMessage());\n }\n \n- if (item != null) {\n+ if (item != null && item.getFeed().getState() == Feed.STATE_SUBSCRIBED) {\n EpisodeAction action = new EpisodeAction.Builder(item, EpisodeAction.DOWNLOAD)\n .currentTimestamp()\n .build();\ndiff --git a/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/feed/FeedUpdateWorker.java b/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/feed/FeedUpdateWorker.java\nindex 9e363b58524..b5174dfcb8d 100644\n--- a/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/feed/FeedUpdateWorker.java\n+++ b/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/feed/FeedUpdateWorker.java\n@@ -35,6 +35,7 @@\n \n import de.danoeh.antennapod.net.download.serviceinterface.DownloadRequestBuilder;\n import de.danoeh.antennapod.parser.feed.FeedHandlerResult;\n+import de.danoeh.antennapod.storage.database.NonSubscribedFeedsCleaner;\n import de.danoeh.antennapod.ui.notifications.NotificationUtils;\n import java.util.ArrayList;\n import java.util.Collections;\n@@ -69,7 +70,7 @@ public Result doWork() {\n Iterator itr = toUpdate.iterator();\n while (itr.hasNext()) {\n Feed feed = itr.next();\n- if (!feed.getPreferences().getKeepUpdated()) {\n+ if (!feed.getPreferences().getKeepUpdated() || feed.getState() != Feed.STATE_SUBSCRIBED) {\n itr.remove();\n continue;\n }\n@@ -99,8 +100,9 @@ public Result doWork() {\n }\n refreshFeeds(toUpdate, force);\n \n- notificationManager.cancel(R.id.notification_updating_feeds);\n+ NonSubscribedFeedsCleaner.deleteOldNonSubscribedFeeds(getApplicationContext());\n AutoDownloadManager.getInstance().autodownloadUndownloadedItems(getApplicationContext());\n+ notificationManager.cancel(R.id.notification_updating_feeds);\n return Result.success();\n }\n \ndiff --git a/net/sync/service-interface/src/main/java/de/danoeh/antennapod/net/sync/serviceinterface/SynchronizationQueueSink.java b/net/sync/service-interface/src/main/java/de/danoeh/antennapod/net/sync/serviceinterface/SynchronizationQueueSink.java\nindex ad235130a2e..e617dfc7816 100644\n--- a/net/sync/service-interface/src/main/java/de/danoeh/antennapod/net/sync/serviceinterface/SynchronizationQueueSink.java\n+++ b/net/sync/service-interface/src/main/java/de/danoeh/antennapod/net/sync/serviceinterface/SynchronizationQueueSink.java\n@@ -2,6 +2,7 @@\n \n import android.content.Context;\n \n+import de.danoeh.antennapod.model.feed.Feed;\n import de.danoeh.antennapod.storage.preferences.SynchronizationSettings;\n import de.danoeh.antennapod.model.feed.FeedMedia;\n \n@@ -62,7 +63,8 @@ public static void enqueueEpisodePlayedIfSynchronizationIsActive(Context context\n if (!SynchronizationSettings.isProviderConnected()) {\n return;\n }\n- if (media.getItem() == null || media.getItem().getFeed().isLocalFeed()) {\n+ if (media.getItem() == null || media.getItem().getFeed().isLocalFeed()\n+ || media.getItem().getFeed().getState() != Feed.STATE_SUBSCRIBED) {\n return;\n }\n if (media.getStartPosition() < 0 || (!completed && media.getStartPosition() >= media.getPosition())) {\ndiff --git a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackService.java b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackService.java\nindex 5fa89dd43d3..7d20124cf38 100644\n--- a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackService.java\n+++ b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackService.java\n@@ -436,7 +436,9 @@ private List loadChildrenSynchronous(@NonNull Stri\n DBReader.getTotalEpisodeCount(new FeedItemFilter(FeedItemFilter.UNPLAYED))));\n List feeds = DBReader.getFeedList();\n for (Feed feed : feeds) {\n- mediaItems.add(createBrowsableMediaItemForFeed(feed));\n+ if (feed.getState() == Feed.STATE_SUBSCRIBED) {\n+ mediaItems.add(createBrowsableMediaItemForFeed(feed));\n+ }\n }\n return mediaItems;\n }\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBReader.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBReader.java\nindex 4329903796d..272df504886 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBReader.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBReader.java\n@@ -356,7 +356,9 @@ public static Feed getFeed(final long feedId, boolean filtered, int offset, int\n try (FeedCursor cursor = new FeedCursor(adapter.getFeedCursor(feedId))) {\n if (cursor.moveToNext()) {\n feed = cursor.getFeed();\n- FeedItemFilter filter = filtered ? feed.getItemFilter() : FeedItemFilter.unfiltered();\n+ FeedItemFilter filter = (filtered && feed.getItemFilter() != null)\n+ ? feed.getItemFilter() : FeedItemFilter.unfiltered();\n+ filter = new FeedItemFilter(filter, FeedItemFilter.INCLUDE_NOT_SUBSCRIBED);\n List items = getFeedItemList(feed, filter, feed.getSortOrder(), offset, limit);\n for (FeedItem item : items) {\n item.setFeed(feed);\n@@ -668,9 +670,10 @@ public static NavDrawerData getNavDrawerData(@Nullable SubscriptionsFilter subsc\n final Map feedCounters = adapter.getFeedCounters(feedCounter);\n List feeds = getFeedList();\n \n- if (subscriptionsFilter != null) {\n- feeds = subscriptionsFilter.filter(feeds, feedCounters);\n+ if (subscriptionsFilter == null) {\n+ subscriptionsFilter = new SubscriptionsFilter(\"\");\n }\n+ feeds = subscriptionsFilter.filter(feeds, feedCounters);\n \n Comparator comparator;\n switch (feedOrder) {\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBUpgrader.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBUpgrader.java\nindex 19a02972de8..be09a5132e8 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBUpgrader.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBUpgrader.java\n@@ -6,6 +6,7 @@\n import android.media.MediaMetadataRetriever;\n import android.util.Log;\n \n+import de.danoeh.antennapod.model.feed.Feed;\n import de.danoeh.antennapod.model.feed.FeedItem;\n \n import static de.danoeh.antennapod.model.feed.FeedPreferences.SPEED_USE_GLOBAL;\n@@ -338,6 +339,10 @@ static void upgrade(final SQLiteDatabase db, final int oldVersion, final int new\n db.execSQL(\"ALTER TABLE \" + PodDBAdapter.TABLE_NAME_FEEDS\n + \" ADD COLUMN \" + PodDBAdapter.KEY_FEED_SKIP_SILENCE + \" INTEGER\");\n }\n+ if (oldVersion < 3050000) {\n+ db.execSQL(\"ALTER TABLE \" + PodDBAdapter.TABLE_NAME_FEEDS\n+ + \" ADD COLUMN \" + PodDBAdapter.KEY_STATE + \" INTEGER DEFAULT \" + Feed.STATE_SUBSCRIBED);\n+ }\n }\n \n }\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBWriter.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBWriter.java\nindex 5f684b3985d..11e1ad75109 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBWriter.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBWriter.java\n@@ -14,6 +14,7 @@\n import com.google.common.util.concurrent.Futures;\n import de.danoeh.antennapod.event.DownloadLogEvent;\n \n+import de.danoeh.antennapod.model.feed.FeedItemFilter;\n import de.danoeh.antennapod.net.download.serviceinterface.AutoDownloadManager;\n import de.danoeh.antennapod.net.download.serviceinterface.DownloadServiceInterface;\n import de.danoeh.antennapod.net.download.serviceinterface.FeedUpdateManager;\n@@ -141,12 +142,13 @@ private static boolean deleteFeedMediaSynchronous(@NonNull Context context, @Non\n // Do full update of this feed to get rid of the item\n FeedUpdateManager.getInstance().runOnce(context, media.getItem().getFeed());\n } else {\n- // Gpodder: queue delete action for synchronization\n- FeedItem item = media.getItem();\n- EpisodeAction action = new EpisodeAction.Builder(item, EpisodeAction.DELETE)\n- .currentTimestamp()\n- .build();\n- SynchronizationQueueSink.enqueueEpisodeActionIfSynchronizationIsActive(context, action);\n+ if (media.getItem().getFeed().getState() == Feed.STATE_SUBSCRIBED) {\n+ FeedItem item = media.getItem();\n+ EpisodeAction action = new EpisodeAction.Builder(item, EpisodeAction.DELETE)\n+ .currentTimestamp()\n+ .build();\n+ SynchronizationQueueSink.enqueueEpisodeActionIfSynchronizationIsActive(context, action);\n+ }\n \n EventBus.getDefault().post(FeedItemEvent.updated(media.getItem()));\n }\n@@ -174,7 +176,7 @@ public static Future deleteFeed(final Context context, final long feedId) {\n adapter.removeFeed(feed);\n adapter.close();\n \n- if (!feed.isLocalFeed()) {\n+ if (!feed.isLocalFeed() && feed.getState() == Feed.STATE_SUBSCRIBED) {\n SynchronizationQueueSink.enqueueFeedRemovedIfSynchronizationIsActive(context, feed.getDownloadUrl());\n }\n EventBus.getDefault().post(new FeedListUpdateEvent(feed));\n@@ -786,7 +788,7 @@ static Future addNewFeed(final Context context, final Feed... feeds) {\n adapter.close();\n \n for (Feed feed : feeds) {\n- if (!feed.isLocalFeed()) {\n+ if (!feed.isLocalFeed() && feed.getState() == Feed.STATE_SUBSCRIBED) {\n SynchronizationQueueSink.enqueueFeedAddedIfSynchronizationIsActive(context, feed.getDownloadUrl());\n }\n }\n@@ -928,6 +930,32 @@ public static Future setFeedCustomTitle(Feed feed) {\n });\n }\n \n+ public static Future setFeedState(Context context, Feed feed, int newState) {\n+ int oldState = feed.getState();\n+ return runOnDbThread(() -> {\n+ PodDBAdapter adapter = PodDBAdapter.getInstance();\n+ adapter.open();\n+ adapter.setFeedState(feed.getId(), newState);\n+ feed.setState(newState);\n+ if (oldState == Feed.STATE_NOT_SUBSCRIBED && newState == Feed.STATE_SUBSCRIBED) {\n+ feed.getPreferences().setKeepUpdated(true);\n+ DBWriter.setFeedPreferences(feed.getPreferences());\n+ FeedUpdateManager.getInstance().runOnceOrAsk(context, feed);\n+ SynchronizationQueueSink.enqueueFeedAddedIfSynchronizationIsActive(context, feed.getDownloadUrl());\n+ DBReader.getFeedItemList(feed, FeedItemFilter.unfiltered(),\n+ SortOrder.DATE_NEW_OLD, 0, Integer.MAX_VALUE);\n+ for (FeedItem item : feed.getItems()) {\n+ if (item.isPlayed()) {\n+ SynchronizationQueueSink.enqueueEpisodePlayedIfSynchronizationIsActive(\n+ context, item.getMedia(), true);\n+ }\n+ }\n+ }\n+ adapter.close();\n+ EventBus.getDefault().post(new FeedListUpdateEvent(feed));\n+ });\n+ }\n+\n /**\n * Sort the FeedItems in the queue with the given the named sort order.\n *\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/FeedDatabaseWriter.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/FeedDatabaseWriter.java\nindex 7269fcd55f1..a62e18809ba 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/FeedDatabaseWriter.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/FeedDatabaseWriter.java\n@@ -157,7 +157,8 @@ public static synchronized Feed updateFeed(Context context, Feed newFeed, boolea\n + \"\\n\\nNow the feed contains:\\n\" + duplicateEpisodeDetails(item)));\n oldItem.setItemIdentifier(item.getItemIdentifier());\n \n- if (oldItem.isPlayed() && oldItem.getMedia() != null) {\n+ if (oldItem.isPlayed() && oldItem.getMedia() != null\n+ && savedFeed.getState() == Feed.STATE_SUBSCRIBED) {\n EpisodeAction action = new EpisodeAction.Builder(oldItem, EpisodeAction.PLAY)\n .currentTimestamp()\n .started(oldItem.getMedia().getDuration() / 1000)\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/NonSubscribedFeedsCleaner.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/NonSubscribedFeedsCleaner.java\nnew file mode 100644\nindex 00000000000..47a5a5aeef6\n--- /dev/null\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/NonSubscribedFeedsCleaner.java\n@@ -0,0 +1,46 @@\n+package de.danoeh.antennapod.storage.database;\n+\n+import android.content.Context;\n+import android.util.Log;\n+import de.danoeh.antennapod.model.feed.Feed;\n+import de.danoeh.antennapod.model.feed.FeedItem;\n+import de.danoeh.antennapod.model.feed.FeedItemFilter;\n+import de.danoeh.antennapod.model.feed.SortOrder;\n+\n+import java.util.List;\n+\n+public class NonSubscribedFeedsCleaner {\n+ private static final String TAG = \"NonSubscrFeedsCleaner\";\n+ private static final long TIME_TO_KEEP = 1000L * 3600 * 24 * 30; // 30 days\n+\n+ public static void deleteOldNonSubscribedFeeds(Context context) {\n+ List feeds = DBReader.getFeedList();\n+ for (Feed feed : feeds) {\n+ if (feed.getState() != Feed.STATE_NOT_SUBSCRIBED) {\n+ continue;\n+ }\n+ DBReader.getFeedItemList(feed, FeedItemFilter.unfiltered(), SortOrder.DATE_NEW_OLD, 0, Integer.MAX_VALUE);\n+ if (shouldDelete(feed)) {\n+ Log.d(TAG, \"Deleting unsubscribed feed \" + feed.getTitle());\n+ DBWriter.deleteFeed(context, feed.getId());\n+ }\n+ feed.setItems(null); // Let it be garbage collected\n+ }\n+ }\n+\n+ public static boolean shouldDelete(Feed feed) {\n+ if (feed.getState() != Feed.STATE_NOT_SUBSCRIBED) {\n+ return false;\n+ } else if (feed.getItems() == null) {\n+ return false;\n+ }\n+ for (FeedItem item : feed.getItems()) {\n+ if (item.isTagged(FeedItem.TAG_FAVORITE)\n+ || item.isTagged(FeedItem.TAG_QUEUE)\n+ || item.isDownloaded()) {\n+ return false;\n+ }\n+ }\n+ return feed.getLastRefreshAttempt() < System.currentTimeMillis() - TIME_TO_KEEP;\n+ }\n+}\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java\nindex 2cbf275090e..aec136457d1 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java\n@@ -52,7 +52,7 @@ public class PodDBAdapter {\n \n private static final String TAG = \"PodDBAdapter\";\n public static final String DATABASE_NAME = \"Antennapod.db\";\n- public static final int VERSION = 3040000;\n+ public static final int VERSION = 3050000;\n \n /**\n * Maximum number of arguments for IN-operator.\n@@ -121,6 +121,7 @@ public class PodDBAdapter {\n public static final String KEY_EPISODE_NOTIFICATION = \"episode_notification\";\n public static final String KEY_NEW_EPISODES_ACTION = \"new_episodes_action\";\n public static final String KEY_PODCASTINDEX_CHAPTER_URL = \"podcastindex_chapter_url\";\n+ public static final String KEY_STATE = \"state\";\n \n // Table names\n public static final String TABLE_NAME_FEEDS = \"Feeds\";\n@@ -171,6 +172,7 @@ public class PodDBAdapter {\n + KEY_FEED_SKIP_INTRO + \" INTEGER DEFAULT 0,\"\n + KEY_FEED_SKIP_ENDING + \" INTEGER DEFAULT 0,\"\n + KEY_EPISODE_NOTIFICATION + \" INTEGER DEFAULT 0,\"\n+ + KEY_STATE + \" INTEGER DEFAULT \" + Feed.STATE_SUBSCRIBED + \",\"\n + KEY_NEW_EPISODES_ACTION + \" INTEGER DEFAULT 0)\";\n \n private static final String CREATE_TABLE_FEED_ITEMS = \"CREATE TABLE \"\n@@ -323,6 +325,7 @@ public class PodDBAdapter {\n + TABLE_NAME_FEEDS + \".\" + KEY_FEED_SKIP_INTRO + \", \"\n + TABLE_NAME_FEEDS + \".\" + KEY_FEED_SKIP_ENDING + \", \"\n + TABLE_NAME_FEEDS + \".\" + KEY_EPISODE_NOTIFICATION + \", \"\n+ + TABLE_NAME_FEEDS + \".\" + KEY_STATE + \", \"\n + TABLE_NAME_FEEDS + \".\" + KEY_NEW_EPISODES_ACTION;\n \n private static final String JOIN_FEED_ITEM_AND_MEDIA = \" LEFT JOIN \" + TABLE_NAME_FEED_MEDIA\n@@ -337,6 +340,9 @@ public class PodDBAdapter {\n \"SELECT \" + KEYS_FEED_ITEM_WITHOUT_DESCRIPTION + \", \" + KEYS_FEED_MEDIA\n + \" FROM \" + TABLE_NAME_FEED_ITEMS\n + JOIN_FEED_ITEM_AND_MEDIA;\n+ public static final String SELECT_WHERE_FEED_IS_SUBSCRIBED = TABLE_NAME_FEED_ITEMS + \".\" + KEY_FEED\n+ + \" IN (SELECT \" + KEY_ID + \" FROM \" + TABLE_NAME_FEEDS\n+ + \" WHERE \" + KEY_STATE + \"=\" + Feed.STATE_SUBSCRIBED + \")\";\n \n private static Context context;\n private static PodDBAdapter instance;\n@@ -431,6 +437,7 @@ private long setFeed(Feed feed) {\n values.put(KEY_LASTUPDATE, feed.getLastModified());\n values.put(KEY_TYPE, feed.getType());\n values.put(KEY_FEED_IDENTIFIER, feed.getFeedIdentifier());\n+ values.put(KEY_STATE, feed.getState());\n \n values.put(KEY_IS_PAGED, feed.isPaged());\n values.put(KEY_NEXT_PAGE_LINK, feed.getNextPageLink());\n@@ -768,6 +775,12 @@ public void setFeedCustomTitle(long feedId, String customTitle) {\n db.update(TABLE_NAME_FEEDS, values, KEY_ID + \"=?\", new String[]{String.valueOf(feedId)});\n }\n \n+ public void setFeedState(long feedId, int state) {\n+ ContentValues values = new ContentValues();\n+ values.put(KEY_STATE, state);\n+ db.update(TABLE_NAME_FEEDS, values, KEY_ID + \"=?\", new String[]{String.valueOf(feedId)});\n+ }\n+\n /**\n * Inserts or updates a download status.\n */\n@@ -1101,6 +1114,7 @@ public Cursor getRandomEpisodesCursor(int limit, int seed) {\n // Hide episodes that have been played but not completed\n + \" AND (\" + KEY_LAST_PLAYED_TIME + \" == 0\"\n + \" OR \" + KEY_LAST_PLAYED_TIME + \" > \" + (System.currentTimeMillis() - 1000L * 3600L) + \")\"\n+ + \" AND \" + SELECT_WHERE_FEED_IS_SUBSCRIBED\n + \" ORDER BY \" + randomEpisodeNumber(seed);\n final String query = \"SELECT * FROM (\" + allItemsRandomOrder + \")\"\n + \" GROUP BY \" + KEY_FEED\n@@ -1221,6 +1235,7 @@ public final Cursor getFeedStatisticsCursor(boolean includeMarkedAsPlayed, long\n + JOIN_FEED_ITEM_AND_MEDIA\n + \" INNER JOIN \" + TABLE_NAME_FEEDS\n + \" ON \" + TABLE_NAME_FEED_ITEMS + \".\" + KEY_FEED + \"=\" + TABLE_NAME_FEEDS + \".\" + KEY_ID\n+ + \" WHERE \" + TABLE_NAME_FEEDS + \".\" + KEY_STATE + \"=\" + Feed.STATE_SUBSCRIBED\n + \" GROUP BY \" + TABLE_NAME_FEEDS + \".\" + KEY_ID;\n return db.rawQuery(query, null);\n }\n@@ -1372,7 +1387,7 @@ public Cursor searchItems(long feedID, String searchQuery) {\n }\n \n String queryStart = SELECT_FEED_ITEMS_AND_MEDIA_WITH_DESCRIPTION\n- + \" WHERE \" + queryFeedId + \" AND (\";\n+ + \" WHERE \" + queryFeedId + \" AND \" + SELECT_WHERE_FEED_IS_SUBSCRIBED + \" AND (\";\n StringBuilder sb = new StringBuilder(queryStart);\n \n for (int i = 0; i < queryWords.length; i++) {\n@@ -1401,12 +1416,13 @@ public Cursor searchItems(long feedID, String searchQuery) {\n public Cursor searchFeeds(String searchQuery) {\n String[] queryWords = prepareSearchQuery(searchQuery);\n \n- String queryStart = \"SELECT \" + KEYS_FEED + \" FROM \" + TABLE_NAME_FEEDS + \" WHERE \";\n+ String queryStart = \"SELECT \" + KEYS_FEED + \" FROM \" + TABLE_NAME_FEEDS\n+ + \" WHERE \" + KEY_STATE + \" = \" + Feed.STATE_SUBSCRIBED;\n StringBuilder sb = new StringBuilder(queryStart);\n \n for (int i = 0; i < queryWords.length; i++) {\n sb\n- .append(\"(\")\n+ .append(\" AND (\")\n .append(KEY_TITLE).append(\" LIKE '%\").append(queryWords[i])\n .append(\"%' OR \")\n .append(KEY_CUSTOM_TITLE).append(\" LIKE '%\").append(queryWords[i])\n@@ -1415,13 +1431,9 @@ public Cursor searchFeeds(String searchQuery) {\n .append(\"%' OR \")\n .append(KEY_DESCRIPTION).append(\" LIKE '%\").append(queryWords[i])\n .append(\"%') \");\n-\n- if (i != queryWords.length - 1) {\n- sb.append(\"AND \");\n- }\n }\n \n- sb.append(\"ORDER BY \" + KEY_TITLE + \" ASC LIMIT 300\");\n+ sb.append(\" ORDER BY \" + KEY_TITLE + \" ASC LIMIT 300\");\n \n return db.rawQuery(sb.toString(), null);\n }\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedCursor.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedCursor.java\nindex 2707275caab..3aba6910635 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedCursor.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedCursor.java\n@@ -34,6 +34,7 @@ public class FeedCursor extends CursorWrapper {\n private final int indexSortOrder;\n private final int indexLastUpdateFailed;\n private final int indexImageUrl;\n+ private final int indexState;\n \n public FeedCursor(Cursor cursor) {\n super(new FeedPreferencesCursor(cursor));\n@@ -58,6 +59,7 @@ public FeedCursor(Cursor cursor) {\n indexSortOrder = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_SORT_ORDER);\n indexLastUpdateFailed = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_LAST_UPDATE_FAILED);\n indexImageUrl = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_IMAGE_URL);\n+ indexState = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_STATE);\n }\n \n /**\n@@ -85,7 +87,8 @@ public Feed getFeed() {\n getString(indexNextPageLink),\n getString(indexHide),\n SortOrder.fromCodeString(getString(indexSortOrder)),\n- getInt(indexLastUpdateFailed) > 0);\n+ getInt(indexLastUpdateFailed) > 0,\n+ getInt(indexState));\n feed.setPreferences(preferencesCursor.getFeedPreferences());\n return feed;\n }\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemFilterQuery.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemFilterQuery.java\nindex a4794d324db..481107cfac2 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemFilterQuery.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemFilterQuery.java\n@@ -66,6 +66,9 @@ public static String generateFrom(FeedItemFilter filter) {\n if (filter.showInHistory) {\n statements.add(keyCompletionDate + \" > 0 \");\n }\n+ if (!filter.includeNotSubscribed) {\n+ statements.add(PodDBAdapter.SELECT_WHERE_FEED_IS_SUBSCRIBED);\n+ }\n \n if (statements.isEmpty()) {\n return \"\";\ndiff --git a/storage/importexport/src/main/java/de/danoeh/antennapod/storage/importexport/HtmlWriter.java b/storage/importexport/src/main/java/de/danoeh/antennapod/storage/importexport/HtmlWriter.java\nindex 0b162fab0f6..d259db43b10 100644\n--- a/storage/importexport/src/main/java/de/danoeh/antennapod/storage/importexport/HtmlWriter.java\n+++ b/storage/importexport/src/main/java/de/danoeh/antennapod/storage/importexport/HtmlWriter.java\n@@ -28,6 +28,9 @@ public static void writeDocument(List feeds, Writer writer, Context contex\n \n writer.append(templateParts[0]);\n for (Feed feed : feeds) {\n+ if (feed.getState() != Feed.STATE_SUBSCRIBED) {\n+ continue;\n+ }\n writer.append(\"

                • \");\ndiff --git a/storage/importexport/src/main/java/de/danoeh/antennapod/storage/importexport/OpmlWriter.java b/storage/importexport/src/main/java/de/danoeh/antennapod/storage/importexport/OpmlWriter.java\nindex 9701476f952..d06932a5e4b 100644\n--- a/storage/importexport/src/main/java/de/danoeh/antennapod/storage/importexport/OpmlWriter.java\n+++ b/storage/importexport/src/main/java/de/danoeh/antennapod/storage/importexport/OpmlWriter.java\n@@ -48,6 +48,9 @@ public static void writeDocument(List feeds, Writer writer)\n \n xs.startTag(null, OpmlSymbols.BODY);\n for (Feed feed : feeds) {\n+ if (feed.getState() != Feed.STATE_SUBSCRIBED) {\n+ continue;\n+ }\n xs.startTag(null, OpmlSymbols.OUTLINE);\n xs.attribute(null, OpmlSymbols.TEXT, feed.getTitle());\n xs.attribute(null, OpmlSymbols.TITLE, feed.getTitle());\ndiff --git a/ui/common/src/main/res/drawable/bg_message_info.xml b/ui/common/src/main/res/drawable/bg_message_info.xml\nnew file mode 100644\nindex 00000000000..6543066cfdf\n--- /dev/null\n+++ b/ui/common/src/main/res/drawable/bg_message_info.xml\n@@ -0,0 +1,17 @@\n+\n+\n+ \n+\n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\n\\ No newline at end of file\ndiff --git a/ui/common/src/main/res/drawable/bg_rounded_corners.xml b/ui/common/src/main/res/drawable/bg_rounded_corners.xml\ndeleted file mode 100644\nindex 11b7710c403..00000000000\n--- a/ui/common/src/main/res/drawable/bg_rounded_corners.xml\n+++ /dev/null\n@@ -1,6 +0,0 @@\n-\n-\n- \n-\ndiff --git a/ui/common/src/main/res/drawable/ic_close.xml b/ui/common/src/main/res/drawable/ic_close.xml\nnew file mode 100644\nindex 00000000000..ccba7f4a04f\n--- /dev/null\n+++ b/ui/common/src/main/res/drawable/ic_close.xml\n@@ -0,0 +1,11 @@\n+\n+ \n+\ndiff --git a/ui/common/src/main/res/values/colors.xml b/ui/common/src/main/res/values/colors.xml\nindex ad835faf470..55ba650e781 100644\n--- a/ui/common/src/main/res/values/colors.xml\n+++ b/ui/common/src/main/res/values/colors.xml\n@@ -8,7 +8,6 @@\n #afafaf\n #000000\n #80000000\n- #50000000\n #55333333\n \n \ndiff --git a/ui/common/src/main/res/values/dimens.xml b/ui/common/src/main/res/values/dimens.xml\nindex 5cfcd68b62c..82c2b145176 100644\n--- a/ui/common/src/main/res/values/dimens.xml\n+++ b/ui/common/src/main/res/values/dimens.xml\n@@ -7,8 +7,6 @@\n 22sp\n 56dp\n 56dp\n- 92dp\n- 132dp\n 40dp\n 48dp\n 16dp\ndiff --git a/ui/i18n/src/main/res/values/strings.xml b/ui/i18n/src/main/res/values/strings.xml\nindex a840a1abfe7..f5ac3c30646 100644\n--- a/ui/i18n/src/main/res/values/strings.xml\n+++ b/ui/i18n/src/main/res/values/strings.xml\n@@ -681,9 +681,8 @@\n \n \n Subscribe\n- Subscribing…\n- Preview\n- Stop preview\n+ Episodes preview\n+ Playback state and history of non-subscribed podcasts are deleted after a while. Subscribe to keep them.\n \n \n Back\n", "test_patch": "diff --git a/storage/database/src/test/java/de/danoeh/antennapod/storage/database/NonSubscribedFeedsCleanerTest.java b/storage/database/src/test/java/de/danoeh/antennapod/storage/database/NonSubscribedFeedsCleanerTest.java\nnew file mode 100644\nindex 00000000000..76bbfddc1a0\n--- /dev/null\n+++ b/storage/database/src/test/java/de/danoeh/antennapod/storage/database/NonSubscribedFeedsCleanerTest.java\n@@ -0,0 +1,104 @@\n+package de.danoeh.antennapod.storage.database;\n+\n+import de.danoeh.antennapod.model.feed.Feed;\n+import de.danoeh.antennapod.model.feed.FeedItem;\n+import de.danoeh.antennapod.model.feed.FeedMedia;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.robolectric.RobolectricTestRunner;\n+\n+import java.util.ArrayList;\n+import java.util.Date;\n+import java.util.concurrent.TimeUnit;\n+\n+import static org.junit.Assert.assertFalse;\n+import static org.junit.Assert.assertTrue;\n+\n+@RunWith(RobolectricTestRunner.class)\n+public class NonSubscribedFeedsCleanerTest {\n+\n+ @Test\n+ public void testSubscribed() {\n+ Feed feed = createFeed();\n+ feed.setLastRefreshAttempt(System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(200, TimeUnit.DAYS));\n+ assertFalse(NonSubscribedFeedsCleaner.shouldDelete(feed));\n+\n+ feed.setState(Feed.STATE_NOT_SUBSCRIBED);\n+ assertTrue(NonSubscribedFeedsCleaner.shouldDelete(feed));\n+ }\n+\n+ @Test\n+ public void testOldDate() {\n+ Feed feed = createFeed();\n+ feed.setState(Feed.STATE_NOT_SUBSCRIBED);\n+ feed.setLastRefreshAttempt(System.currentTimeMillis());\n+ assertFalse(NonSubscribedFeedsCleaner.shouldDelete(feed));\n+\n+ feed.setLastRefreshAttempt(System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(10, TimeUnit.DAYS));\n+ assertFalse(NonSubscribedFeedsCleaner.shouldDelete(feed));\n+\n+ feed.setLastRefreshAttempt(System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(200, TimeUnit.DAYS));\n+ assertTrue(NonSubscribedFeedsCleaner.shouldDelete(feed));\n+\n+ feed.setLastRefreshAttempt(System.currentTimeMillis() + TimeUnit.MILLISECONDS.convert(200, TimeUnit.DAYS));\n+ assertFalse(NonSubscribedFeedsCleaner.shouldDelete(feed));\n+ }\n+\n+ @Test\n+ public void testQueuedItem() {\n+ Feed feed = createFeed();\n+ feed.setState(Feed.STATE_NOT_SUBSCRIBED);\n+ feed.setLastRefreshAttempt(System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(200, TimeUnit.DAYS));\n+ feed.getItems().add(createItem(feed));\n+ assertTrue(NonSubscribedFeedsCleaner.shouldDelete(feed));\n+\n+ FeedItem queuedItem = createItem(feed);\n+ queuedItem.addTag(FeedItem.TAG_QUEUE);\n+ feed.getItems().add(queuedItem);\n+ assertFalse(NonSubscribedFeedsCleaner.shouldDelete(feed));\n+ }\n+\n+ @Test\n+ public void testFavoriteItem() {\n+ Feed feed = createFeed();\n+ feed.setState(Feed.STATE_NOT_SUBSCRIBED);\n+ feed.setLastRefreshAttempt(System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(200, TimeUnit.DAYS));\n+ feed.getItems().add(createItem(feed));\n+ assertTrue(NonSubscribedFeedsCleaner.shouldDelete(feed));\n+\n+ FeedItem queuedItem = createItem(feed);\n+ queuedItem.addTag(FeedItem.TAG_FAVORITE);\n+ feed.getItems().add(queuedItem);\n+ assertFalse(NonSubscribedFeedsCleaner.shouldDelete(feed));\n+ }\n+\n+ @Test\n+ public void testDownloadedItem() {\n+ Feed feed = createFeed();\n+ feed.setState(Feed.STATE_NOT_SUBSCRIBED);\n+ feed.setLastRefreshAttempt(System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(200, TimeUnit.DAYS));\n+ feed.getItems().add(createItem(feed));\n+ assertTrue(NonSubscribedFeedsCleaner.shouldDelete(feed));\n+\n+ FeedItem queuedItem = createItem(feed);\n+ queuedItem.getMedia().setDownloaded(true, System.currentTimeMillis());\n+ feed.getItems().add(queuedItem);\n+ assertFalse(NonSubscribedFeedsCleaner.shouldDelete(feed));\n+ }\n+\n+ private Feed createFeed() {\n+ Feed feed = new Feed(0, null, \"title\", \"http://example.com\", \"This is the description\",\n+ \"http://example.com/payment\", \"Daniel\", \"en\", null, \"http://example.com/feed\",\n+ \"http://example.com/image\", null, \"http://example.com/feed\", System.currentTimeMillis());\n+ feed.setItems(new ArrayList<>());\n+ return feed;\n+ }\n+\n+ private FeedItem createItem(Feed feed) {\n+ FeedItem item = new FeedItem(0, \"Item\", \"ItemId\", \"url\", new Date(), FeedItem.PLAYED, feed);\n+ FeedMedia media = new FeedMedia(item, \"http://download.url.net/\", 1234567, \"audio/mpeg\");\n+ media.setId(item.getId());\n+ item.setMedia(media);\n+ return item;\n+ }\n+}\n", "n2p_tests": "{\"de.danoeh.antennapod.storage.database.NonSubscribedFeedsCleanerTest.testQueuedItem\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.storage.database.NonSubscribedFeedsCleanerTest.testSubscribed\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.storage.database.NonSubscribedFeedsCleanerTest.testDownloadedItem\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.storage.database.NonSubscribedFeedsCleanerTest.testFavoriteItem\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.storage.database.NonSubscribedFeedsCleanerTest.testOldDate\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "AntennaPod__AntennaPod-6808", "org": "AntennaPod", "repo": "AntennaPod", "number": 6808, "state": "closed", "title": "Check if volume boost effect is supported on the device", "body": "This is an attempt to fix #6802. I have no idea if it works (I cannot reproduce the issue on my device).", "base": "{\"label\": \"AntennaPod:master\", \"ref\": \"master\", \"sha\": \"58081fe5bf7d9ad28f089cf10b2c17bfcfc8bbc7\"}", "resolved_issues": "[{\"number\": 6802, \"title\": \"Media wont play in Version 3.2.0 (3020095)\", \"body\": \"### Checklist\\r\\n\\r\\n- [X] I have used the search function for [**OPEN**](https://github.com/AntennaPod/AntennaPod/issues) issues to see if someone else has already submitted the same bug report.\\r\\n- [X] I have **also** used the search function for [**CLOSED**](https://github.com/AntennaPod/AntennaPod/issues?q=is%3Aissue+is%3Aclosed) issues to see if the problem is already solved and just waiting to be released.\\r\\n- [X] I will describe the problem with as much detail as possible.\\r\\n- [X] If the bug only to occurs with a certain podcast, I will include the URL of that podcast.\\r\\n\\r\\n### App version\\r\\n\\r\\n3.2.0\\r\\n\\r\\n### Where did you get the app from\\r\\n\\r\\nF-Droid\\r\\n\\r\\n### Android version\\r\\n\\r\\n13 PixelExperience_topaz-13.0-20230714-1432-UNOFFICIAL\\r\\n\\r\\n### Device model\\r\\n\\r\\nRemi Note 12 4G\\r\\n\\r\\n### First occurred\\r\\n\\r\\nabout a week ago\\r\\n\\r\\n### Steps to reproduce\\r\\n\\r\\ninstall version 3.2.0\\r\\n\\r\\n### Expected behaviour\\r\\n\\r\\nmedia should play\\r\\n\\r\\n### Current behaviour\\r\\n\\r\\nmedia does not play neither downloaded nor stream, the player doesn't come up when clicking play. it works perfectly in 3.1.2 and below.\\r\\n\\r\\n### Logs\\r\\n\\r\\nI already downgraded back to 3.1.2 so I can't export the logs but I have this from logfox:\\r\\n\\n```\\r\\n1702289036.344 10231 8418 8418 D ExternalPlayerFragment: Loading media info\\r\\n1702289036.348 10231 8418 8418 D QueueFragment: loadItems()\\r\\n1702289036.348 10231 8418 12216 D DBReader: getQueue() called\\r\\n1702289036.348 10231 8418 12216 D DBReader: getQueue()\\r\\n1702289036.350 10231 8418 12216 D DBReader: getFavoriteIDList() called\\r\\n1702289036.351 10231 8418 12216 D DBReader: getQueueIDList() called\\r\\n1702289036.352 10231 8418 12216 D DBReader: Extracting Feedlist\\r\\n1702289036.352 10231 8418 8418 D MainActivity: handleNavIntent()\\r\\n1702289036.352 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\\r\\n1702289036.353 10231 8418 12383 D DBReader: getNavDrawerData() called with:\\r\\n1702289036.363 10231 8418 9893 E OpenGLRenderer: Unable to match the desired swap behavior.\\r\\n1702289036.410 10231 8418 12383 D DBReader: getRecentlyPublishedEpisodes() called with: offset=0, limit=2147483647\\r\\n1702289036.549 10231 8418 12383 D DBReader: getFavoriteIDList() called\\r\\n1702289036.550 10231 8418 12383 D DBReader: getQueueIDList() called\\r\\n1702289036.551 10231 8418 12383 D DBReader: Extracting Feedlist\\r\\n1702289036.559 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\\r\\n1702289036.560 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\\r\\n1702289036.560 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\\r\\n1702289036.560 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\\r\\n1702289036.561 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\\r\\n1702289036.561 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\\r\\n1702289036.561 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\\r\\n1702289036.562 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\\r\\n1702289037.765 10231 8418 8418 D PlaybackService: Service created.\\r\\n1702289037.774 10231 8418 8418 D PlaybackController: Trying to connect to service\\r\\n1702289037.776 10231 8418 8418 D PlaybackController: Result for service binding: true\\r\\n1702289037.778 10231 8418 8418 D PlaybackController: Trying to connect to service\\r\\n1702289037.779 10231 8418 8418 D PlaybackController: Result for service binding: true\\r\\n1702289037.779 10231 8418 8418 D ExternalPlayerFragment: Loading media info\\r\\n1702289037.779 10231 8418 8418 D PlaybackService: OnStartCommand called\\r\\n1702289037.780 10231 8418 8418 D PlaybackSrvState: startForeground\\r\\n1702289037.783 10231 8418 8418 D PlaybackService: Received onBind event\\r\\n1702289037.783 10231 8418 12383 D DBReader: getFeedItem() called with: itemId = [1570]\\r\\n1702289037.783 10231 8418 12383 D DBReader: Loading feeditem with id 1570\\r\\n1702289037.783 10231 8418 12383 D DBReader: getFavoriteIDList() called\\r\\n1702289037.784 10231 8418 12383 D DBReader: getQueueIDList() called\\r\\n1702289037.784 10231 8418 12383 D DBReader: Extracting Feedlist\\r\\n1702289037.785 10231 8418 8418 D PlaybackController: Trying to connect to service\\r\\n1702289037.786 10231 8418 8418 D PlaybackController: Result for service binding: true\\r\\n1702289037.786 10231 8418 8418 D PlaybackController: Trying to connect to service\\r\\n1702289037.787 10231 8418 8418 D PlaybackController: Result for service binding: true\\r\\n1702289037.787 10231 8418 8418 D PlaybackController: Querying service info\\r\\n1702289037.787 10231 8418 8418 D PlaybackController: status: STOPPED\\r\\n1702289037.787 10231 8418 8418 D PlaybackController: Connection to Service established\\r\\n1702289037.787 10231 8418 8418 D PlaybackController: Querying service info\\r\\n1702289037.787 10231 8418 8418 D PlaybackController: status: STOPPED\\r\\n1702289037.787 10231 8418 8418 D ExternalPlayerFragment: Loading media info\\r\\n1702289037.787 10231 8418 8418 D PlaybackController: Connection to Service established\\r\\n1702289037.795 10231 8418 8418 D LclPlaybackSvcMPlayer: playMediaObject(...)\\r\\n1702289037.808 10231 8418 8418 I ExoPlayerImpl: Init 4a66ac [ExoPlayerLib/2.14.2] [tapas, 23021RAAEG, Xiaomi, 33]\\r\\n1702289037.813 10231 8418 8418 E AudioEffect: set(): AudioFlinger could not create effect fe3199be-aed0-413f-87bb-11260eb63cf1 / ec7178ec-e5e1-4432-a3f4-4657e6795210, status: -2\\r\\n1702289037.813 10231 8418 8418 E AudioEffects-JNI: AudioEffect initCheck failed -3\\r\\n1702289037.813 10231 8418 8418 E AudioEffect-JAVA: Error code -3 when initializing AudioEffect.\\r\\n1702289037.813 10231 8418 8418 W System.err: java.lang.RuntimeException: Cannot initialize effect engine for type: fe3199be-aed0-413f-87bb-11260eb63cf1 Error: -3\\r\\n1702289037.813 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:543)\\r\\n1702289037.813 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:501)\\r\\n1702289037.813 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:475)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat android.media.audiofx.LoudnessEnhancer.(LoudnessEnhancer.java:80)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.initLoudnessEnhancer(ExoPlayerWrapper.java:357)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.createPlayer(ExoPlayerWrapper.java:146)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.(ExoPlayerWrapper.java:76)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.createMediaPlayer(LocalPSMP.java:587)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:158)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:113)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.startPlaying(PlaybackService.java:741)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.lambda$onStartCommand$6(PlaybackService.java:526)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.$r8$lambda$mOCf9qqsskaQGmxsaI_m2ZmJO2w(PlaybackService.java:0)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService$$ExternalSyntheticLambda6.accept(R8$$SyntheticClass:0)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat io.reactivex.internal.observers.LambdaObserver.onNext(LambdaObserver.java:63)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.drainNormal(ObservableObserveOn.java:201)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.run(ObservableObserveOn.java:255)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat io.reactivex.android.schedulers.HandlerScheduler$ScheduledRunnable.run(HandlerScheduler.java:124)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat android.os.Handler.handleCallback(Handler.java:942)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat android.os.Handler.dispatchMessage(Handler.java:99)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat android.os.Looper.loopOnce(Looper.java:201)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat android.os.Looper.loop(Looper.java:288)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat android.app.ActivityThread.main(ActivityThread.java:7959)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat java.lang.reflect.Method.invoke(Native Method)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat com.android.internal.os.ZygoteInit.main(ZygoteInit.java:942)\\r\\n1702289037.814 10231 8418 8418 D PlaybackService: Playable was not found. Stopping service.\\r\\n1702289037.814 10231 8418 8418 W System.err: java.lang.RuntimeException: Cannot initialize effect engine for type: fe3199be-aed0-413f-87bb-11260eb63cf1 Error: -3\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:543)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:501)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:475)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat android.media.audiofx.LoudnessEnhancer.(LoudnessEnhancer.java:80)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.initLoudnessEnhancer(ExoPlayerWrapper.java:357)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.createPlayer(ExoPlayerWrapper.java:146)\\r\\n1702289037.814 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.(ExoPlayerWrapper.java:76)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.createMediaPlayer(LocalPSMP.java:587)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:158)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:113)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.startPlaying(PlaybackService.java:741)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.lambda$onStartCommand$6(PlaybackService.java:526)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.$r8$lambda$mOCf9qqsskaQGmxsaI_m2ZmJO2w(PlaybackService.java:0)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService$$ExternalSyntheticLambda6.accept(R8$$SyntheticClass:0)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat io.reactivex.internal.observers.LambdaObserver.onNext(LambdaObserver.java:63)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.drainNormal(ObservableObserveOn.java:201)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.run(ObservableObserveOn.java:255)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat io.reactivex.android.schedulers.HandlerScheduler$ScheduledRunnable.run(HandlerScheduler.java:124)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat android.os.Handler.handleCallback(Handler.java:942)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat android.os.Handler.dispatchMessage(Handler.java:99)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat android.os.Looper.loopOnce(Looper.java:201)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat android.os.Looper.loop(Looper.java:288)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat android.app.ActivityThread.main(ActivityThread.java:7959)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat java.lang.reflect.Method.invoke(Native Method)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)\\r\\n1702289037.815 10231 8418 8418 W System.err: \\tat com.android.internal.os.ZygoteInit.main(ZygoteInit.java:942)\\r\\n1702289037.815 10231 8418 8418 D PlaybackSrvState: stopService\\r\\n1702289037.815 10231 8418 8418 D PlaybackSrvState: stopForeground\\r\\n1702289037.821 10231 8418 8418 D PlaybackController: Disconnected from Service\\r\\n1702289037.821 10231 8418 8418 D PlaybackController: Disconnected from Service\\r\\n1702289037.821 10231 8418 8418 D PlaybackService: Received onUnbind event\\r\\n1702289037.821 10231 8418 8418 D PlaybackService: Service is about to be destroyed\\r\\n1702289037.821 10231 8418 8418 D PlaybackSrvState: stopForeground\\r\\n1702289039.176 10231 8418 8418 D PlaybackService: Service created.\\r\\n1702289039.188 10231 8418 8418 D PlaybackController: Trying to connect to service\\r\\n1702289039.189 10231 8418 8418 D PlaybackController: Result for service binding: true\\r\\n1702289039.189 10231 8418 8418 D PlaybackController: Trying to connect to service\\r\\n1702289039.190 10231 8418 8418 D PlaybackController: Result for service binding: true\\r\\n1702289039.190 10231 8418 8418 D PlaybackService: OnStartCommand called\\r\\n1702289039.191 10231 8418 8418 D PlaybackSrvState: startForeground\\r\\n1702289039.194 10231 8418 8418 D PlaybackService: Received onBind event\\r\\n1702289039.200 10231 8418 8418 D PlaybackController: Trying to connect to service\\r\\n1702289039.201 10231 8418 8418 D PlaybackController: Result for service binding: true\\r\\n1702289039.201 10231 8418 8418 D PlaybackController: Trying to connect to service\\r\\n1702289039.202 10231 8418 8418 D PlaybackController: Result for service binding: true\\r\\n1702289039.202 10231 8418 8418 D PlaybackController: Querying service info\\r\\n1702289039.202 10231 8418 8418 D PlaybackController: status: STOPPED\\r\\n1702289039.202 10231 8418 8418 D PlaybackController: Connection to Service established\\r\\n1702289039.202 10231 8418 8418 D PlaybackController: Querying service info\\r\\n1702289039.202 10231 8418 8418 D PlaybackController: status: STOPPED\\r\\n1702289039.202 10231 8418 8418 D ExternalPlayerFragment: Loading media info\\r\\n1702289039.202 10231 8418 12230 D DBReader: getFeedItem() called with: itemId = [1570]\\r\\n1702289039.202 10231 8418 8418 D PlaybackController: Connection to Service established\\r\\n1702289039.202 10231 8418 12230 D DBReader: Loading feeditem with id 1570\\r\\n1702289039.203 10231 8418 12230 D DBReader: getFavoriteIDList() called\\r\\n1702289039.204 10231 8418 12230 D DBReader: getQueueIDList() called\\r\\n1702289039.204 10231 8418 12230 D DBReader: Extracting Feedlist\\r\\n1702289039.215 10231 8418 8418 D LclPlaybackSvcMPlayer: playMediaObject(...)\\r\\n1702289039.219 10231 8418 8418 I ExoPlayerImpl: Init c5ceaba [ExoPlayerLib/2.14.2] [tapas, 23021RAAEG, Xiaomi, 33]\\r\\n1702289039.223 10231 8418 8418 E AudioEffect: set(): AudioFlinger could not create effect fe3199be-aed0-413f-87bb-11260eb63cf1 / ec7178ec-e5e1-4432-a3f4-4657e6795210, status: -2\\r\\n1702289039.224 10231 8418 8418 E AudioEffects-JNI: AudioEffect initCheck failed -3\\r\\n1702289039.224 10231 8418 8418 E AudioEffect-JAVA: Error code -3 when initializing AudioEffect.\\r\\n1702289039.224 10231 8418 8418 W System.err: java.lang.RuntimeException: Cannot initialize effect engine for type: fe3199be-aed0-413f-87bb-11260eb63cf1 Error: -3\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:543)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:501)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:475)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat android.media.audiofx.LoudnessEnhancer.(LoudnessEnhancer.java:80)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.initLoudnessEnhancer(ExoPlayerWrapper.java:357)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.createPlayer(ExoPlayerWrapper.java:146)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.(ExoPlayerWrapper.java:76)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.createMediaPlayer(LocalPSMP.java:587)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:158)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:113)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.startPlaying(PlaybackService.java:741)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.lambda$onStartCommand$6(PlaybackService.java:526)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.$r8$lambda$mOCf9qqsskaQGmxsaI_m2ZmJO2w(PlaybackService.java:0)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService$$ExternalSyntheticLambda6.accept(R8$$SyntheticClass:0)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat io.reactivex.internal.observers.LambdaObserver.onNext(LambdaObserver.java:63)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.drainNormal(ObservableObserveOn.java:201)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.run(ObservableObserveOn.java:255)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat io.reactivex.android.schedulers.HandlerScheduler$ScheduledRunnable.run(HandlerScheduler.java:124)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat android.os.Handler.handleCallback(Handler.java:942)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat android.os.Handler.dispatchMessage(Handler.java:99)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat android.os.Looper.loopOnce(Looper.java:201)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat android.os.Looper.loop(Looper.java:288)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat android.app.ActivityThread.main(ActivityThread.java:7959)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat java.lang.reflect.Method.invoke(Native Method)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)\\r\\n1702289039.224 10231 8418 8418 W System.err: \\tat com.android.internal.os.ZygoteInit.main(ZygoteInit.java:942)\\r\\n1702289039.224 10231 8418 8418 D PlaybackService: Playable was not found. Stopping service.\\r\\n1702289039.225 10231 8418 8418 W System.err: java.lang.RuntimeException: Cannot initialize effect engine for type: fe3199be-aed0-413f-87bb-11260eb63cf1 Error: -3\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:543)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:501)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:475)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat android.media.audiofx.LoudnessEnhancer.(LoudnessEnhancer.java:80)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.initLoudnessEnhancer(ExoPlayerWrapper.java:357)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.createPlayer(ExoPlayerWrapper.java:146)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.(ExoPlayerWrapper.java:76)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.createMediaPlayer(LocalPSMP.java:587)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:158)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:113)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.startPlaying(PlaybackService.java:741)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.lambda$onStartCommand$6(PlaybackService.java:526)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.$r8$lambda$mOCf9qqsskaQGmxsaI_m2ZmJO2w(PlaybackService.java:0)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService$$ExternalSyntheticLambda6.accept(R8$$SyntheticClass:0)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat io.reactivex.internal.observers.LambdaObserver.onNext(LambdaObserver.java:63)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.drainNormal(ObservableObserveOn.java:201)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.run(ObservableObserveOn.java:255)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat io.reactivex.android.schedulers.HandlerScheduler$ScheduledRunnable.run(HandlerScheduler.java:124)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat android.os.Handler.handleCallback(Handler.java:942)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat android.os.Handler.dispatchMessage(Handler.java:99)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat android.os.Looper.loopOnce(Looper.java:201)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat android.os.Looper.loop(Looper.java:288)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat android.app.ActivityThread.main(ActivityThread.java:7959)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat java.lang.reflect.Method.invoke(Native Method)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)\\r\\n1702289039.225 10231 8418 8418 W System.err: \\tat com.android.internal.os.ZygoteInit.main(ZygoteInit.java:942)\\r\\n1702289039.225 10231 8418 8418 D PlaybackSrvState: stopService\\r\\n1702289039.225 10231 8418 8418 D PlaybackSrvState: stopForeground\\r\\n1702289039.227 10231 8418 8418 D PlaybackController: Disconnected from Service\\r\\n1702289039.227 10231 8418 8418 D PlaybackController: Disconnected from Service\\r\\n1702289039.227 10231 8418 8418 D PlaybackService: Received onUnbind event\\r\\n1702289039.228 10231 8418 8418 D PlaybackService: Service is about to be destroyed\\r\\n1702289039.228 10231 8418 8418 D PlaybackSrvState: stopForeground\\r\\n1702289040.348 10231 8418 8418 D PlaybackService: Service created.\\r\\n1702289040.362 10231 8418 8418 D PlaybackController: Trying to connect to service\\r\\n1702289040.363 10231 8418 8418 D PlaybackController: Result for service binding: true\\r\\n1702289040.363 10231 8418 8418 D PlaybackController: Trying to connect to service\\r\\n1702289040.364 10231 8418 8418 D PlaybackController: Result for service binding: true\\r\\n1702289040.365 10231 8418 8418 D PlaybackService: OnStartCommand called\\r\\n1702289040.365 10231 8418 8418 D PlaybackSrvState: startForeground\\r\\n1702289040.368 10231 8418 12216 D DBReader: getFeedItem() called with: itemId = [1570]\\r\\n1702289040.368 10231 8418 12216 D DBReader: Loading feeditem with id 1570\\r\\n1702289040.369 10231 8418 8418 D PlaybackService: Received onBind event\\r\\n1702289040.370 10231 8418 12216 D DBReader: getFavoriteIDList() called\\r\\n1702289040.371 10231 8418 12216 D DBReader: getQueueIDList() called\\r\\n1702289040.371 10231 8418 12216 D DBReader: Extracting Feedlist\\r\\n1702289040.376 10231 8418 8418 D PlaybackController: Trying to connect to service\\r\\n1702289040.378 10231 8418 8418 D PlaybackController: Result for service binding: true\\r\\n1702289040.378 10231 8418 8418 D PlaybackController: Querying service info\\r\\n1702289040.378 10231 8418 8418 D PlaybackController: status: STOPPED\\r\\n1702289040.378 10231 8418 8418 D PlaybackController: Connection to Service established\\r\\n1702289040.378 10231 8418 8418 D PlaybackController: Trying to connect to service\\r\\n1702289040.379 10231 8418 8418 D PlaybackController: Result for service binding: true\\r\\n1702289040.379 10231 8418 8418 D PlaybackController: Querying service info\\r\\n1702289040.380 10231 8418 8418 D PlaybackController: status: STOPPED\\r\\n1702289040.380 10231 8418 8418 D ExternalPlayerFragment: Loading media info\\r\\n1702289040.380 10231 8418 8418 D PlaybackController: Connection to Service established\\r\\n1702289040.380 10231 8418 8418 D LclPlaybackSvcMPlayer: playMediaObject(...)\\r\\n1702289040.390 10231 8418 8418 I ExoPlayerImpl: Init c03e75b [ExoPlayerLib/2.14.2] [tapas, 23021RAAEG, Xiaomi, 33]\\r\\n1702289040.394 10231 8418 8418 E AudioEffect: set(): AudioFlinger could not create effect fe3199be-aed0-413f-87bb-11260eb63cf1 / ec7178ec-e5e1-4432-a3f4-4657e6795210, status: -2\\r\\n1702289040.394 10231 8418 8418 E AudioEffects-JNI: AudioEffect initCheck failed -3\\r\\n1702289040.394 10231 8418 8418 E AudioEffect-JAVA: Error code -3 when initializing AudioEffect.\\r\\n1702289040.394 10231 8418 8418 W System.err: java.lang.RuntimeException: Cannot initialize effect engine for type: fe3199be-aed0-413f-87bb-11260eb63cf1 Error: -3\\r\\n1702289040.394 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:543)\\r\\n1702289040.394 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:501)\\r\\n1702289040.394 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:475)\\r\\n1702289040.394 10231 8418 8418 W System.err: \\tat android.media.audiofx.LoudnessEnhancer.(LoudnessEnhancer.java:80)\\r\\n1702289040.394 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.initLoudnessEnhancer(ExoPlayerWrapper.java:357)\\r\\n1702289040.394 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.createPlayer(ExoPlayerWrapper.java:146)\\r\\n1702289040.394 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.(ExoPlayerWrapper.java:76)\\r\\n1702289040.394 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.createMediaPlayer(LocalPSMP.java:587)\\r\\n1702289040.394 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:158)\\r\\n1702289040.394 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:113)\\r\\n1702289040.394 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.startPlaying(PlaybackService.java:741)\\r\\n1702289040.394 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.lambda$onStartCommand$6(PlaybackService.java:526)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.$r8$lambda$mOCf9qqsskaQGmxsaI_m2ZmJO2w(PlaybackService.java:0)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService$$ExternalSyntheticLambda6.accept(R8$$SyntheticClass:0)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat io.reactivex.internal.observers.LambdaObserver.onNext(LambdaObserver.java:63)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.drainNormal(ObservableObserveOn.java:201)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.run(ObservableObserveOn.java:255)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat io.reactivex.android.schedulers.HandlerScheduler$ScheduledRunnable.run(HandlerScheduler.java:124)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat android.os.Handler.handleCallback(Handler.java:942)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat android.os.Handler.dispatchMessage(Handler.java:99)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat android.os.Looper.loopOnce(Looper.java:201)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat android.os.Looper.loop(Looper.java:288)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat android.app.ActivityThread.main(ActivityThread.java:7959)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat java.lang.reflect.Method.invoke(Native Method)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat com.android.internal.os.ZygoteInit.main(ZygoteInit.java:942)\\r\\n1702289040.395 10231 8418 8418 D PlaybackService: Playable was not found. Stopping service.\\r\\n1702289040.395 10231 8418 8418 W System.err: java.lang.RuntimeException: Cannot initialize effect engine for type: fe3199be-aed0-413f-87bb-11260eb63cf1 Error: -3\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:543)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:501)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat android.media.audiofx.AudioEffect.(AudioEffect.java:475)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat android.media.audiofx.LoudnessEnhancer.(LoudnessEnhancer.java:80)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.initLoudnessEnhancer(ExoPlayerWrapper.java:357)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.createPlayer(ExoPlayerWrapper.java:146)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.(ExoPlayerWrapper.java:76)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.createMediaPlayer(LocalPSMP.java:587)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:158)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:113)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.startPlaying(PlaybackService.java:741)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.lambda$onStartCommand$6(PlaybackService.java:526)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService.$r8$lambda$mOCf9qqsskaQGmxsaI_m2ZmJO2w(PlaybackService.java:0)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat de.danoeh.antennapod.core.service.playback.PlaybackService$$ExternalSyntheticLambda6.accept(R8$$SyntheticClass:0)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat io.reactivex.internal.observers.LambdaObserver.onNext(LambdaObserver.java:63)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.drainNormal(ObservableObserveOn.java:201)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.run(ObservableObserveOn.java:255)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat io.reactivex.android.schedulers.HandlerScheduler$ScheduledRunnable.run(HandlerScheduler.java:124)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat android.os.Handler.handleCallback(Handler.java:942)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat android.os.Handler.dispatchMessage(Handler.java:99)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat android.os.Looper.loopOnce(Looper.java:201)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat android.os.Looper.loop(Looper.java:288)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat android.app.ActivityThread.main(ActivityThread.java:7959)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat java.lang.reflect.Method.invoke(Native Method)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)\\r\\n1702289040.395 10231 8418 8418 W System.err: \\tat com.android.internal.os.ZygoteInit.main(ZygoteInit.java:942)\\r\\n1702289040.395 10231 8418 8418 D PlaybackSrvState: stopService\\r\\n1702289040.395 10231 8418 8418 D PlaybackSrvState: stopForeground\\r\\n1702289040.398 10231 8418 8418 D PlaybackController: Disconnected from Service\\r\\n1702289040.398 10231 8418 8418 D PlaybackController: Disconnected from Service\\r\\n1702289040.398 10231 8418 8418 D PlaybackService: Received onUnbind event\\r\\n1702289040.398 10231 8418 8418 D PlaybackService: Service is about to be destroyed\\r\\n1702289040.398 10231 8418 8418 D PlaybackSrvState: stopForeground\\r\\n1702289041.529 10231 8418 8418 D PlaybackController: Releasing PlaybackController\\r\\n1702289041.533 10231 8418 8418 D PlaybackController: Releasing PlaybackController\\n```\"}]", "lang": "java", "problem_statement": "Media wont play in Version 3.2.0 (3020095)\n### Checklist\r\n\r\n- [X] I have used the search function for [**OPEN**](https://github.com/AntennaPod/AntennaPod/issues) issues to see if someone else has already submitted the same bug report.\r\n- [X] I have **also** used the search function for [**CLOSED**](https://github.com/AntennaPod/AntennaPod/issues?q=is%3Aissue+is%3Aclosed) issues to see if the problem is already solved and just waiting to be released.\r\n- [X] I will describe the problem with as much detail as possible.\r\n- [X] If the bug only to occurs with a certain podcast, I will include the URL of that podcast.\r\n\r\n### App version\r\n\r\n3.2.0\r\n\r\n### Where did you get the app from\r\n\r\nF-Droid\r\n\r\n### Android version\r\n\r\n13 PixelExperience_topaz-13.0-20230714-1432-UNOFFICIAL\r\n\r\n### Device model\r\n\r\nRemi Note 12 4G\r\n\r\n### First occurred\r\n\r\nabout a week ago\r\n\r\n### Steps to reproduce\r\n\r\ninstall version 3.2.0\r\n\r\n### Expected behaviour\r\n\r\nmedia should play\r\n\r\n### Current behaviour\r\n\r\nmedia does not play neither downloaded nor stream, the player doesn't come up when clicking play. it works perfectly in 3.1.2 and below.\r\n\r\n### Logs\r\n\r\nI already downgraded back to 3.1.2 so I can't export the logs but I have this from logfox:\r\n\n```\r\n1702289036.344 10231 8418 8418 D ExternalPlayerFragment: Loading media info\r\n1702289036.348 10231 8418 8418 D QueueFragment: loadItems()\r\n1702289036.348 10231 8418 12216 D DBReader: getQueue() called\r\n1702289036.348 10231 8418 12216 D DBReader: getQueue()\r\n1702289036.350 10231 8418 12216 D DBReader: getFavoriteIDList() called\r\n1702289036.351 10231 8418 12216 D DBReader: getQueueIDList() called\r\n1702289036.352 10231 8418 12216 D DBReader: Extracting Feedlist\r\n1702289036.352 10231 8418 8418 D MainActivity: handleNavIntent()\r\n1702289036.352 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\r\n1702289036.353 10231 8418 12383 D DBReader: getNavDrawerData() called with:\r\n1702289036.363 10231 8418 9893 E OpenGLRenderer: Unable to match the desired swap behavior.\r\n1702289036.410 10231 8418 12383 D DBReader: getRecentlyPublishedEpisodes() called with: offset=0, limit=2147483647\r\n1702289036.549 10231 8418 12383 D DBReader: getFavoriteIDList() called\r\n1702289036.550 10231 8418 12383 D DBReader: getQueueIDList() called\r\n1702289036.551 10231 8418 12383 D DBReader: Extracting Feedlist\r\n1702289036.559 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\r\n1702289036.560 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\r\n1702289036.560 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\r\n1702289036.560 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\r\n1702289036.561 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\r\n1702289036.561 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\r\n1702289036.561 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\r\n1702289036.562 10231 8418 8418 D NavDrawerFragment: getLastNavFragment() -> QueueFragment\r\n1702289037.765 10231 8418 8418 D PlaybackService: Service created.\r\n1702289037.774 10231 8418 8418 D PlaybackController: Trying to connect to service\r\n1702289037.776 10231 8418 8418 D PlaybackController: Result for service binding: true\r\n1702289037.778 10231 8418 8418 D PlaybackController: Trying to connect to service\r\n1702289037.779 10231 8418 8418 D PlaybackController: Result for service binding: true\r\n1702289037.779 10231 8418 8418 D ExternalPlayerFragment: Loading media info\r\n1702289037.779 10231 8418 8418 D PlaybackService: OnStartCommand called\r\n1702289037.780 10231 8418 8418 D PlaybackSrvState: startForeground\r\n1702289037.783 10231 8418 8418 D PlaybackService: Received onBind event\r\n1702289037.783 10231 8418 12383 D DBReader: getFeedItem() called with: itemId = [1570]\r\n1702289037.783 10231 8418 12383 D DBReader: Loading feeditem with id 1570\r\n1702289037.783 10231 8418 12383 D DBReader: getFavoriteIDList() called\r\n1702289037.784 10231 8418 12383 D DBReader: getQueueIDList() called\r\n1702289037.784 10231 8418 12383 D DBReader: Extracting Feedlist\r\n1702289037.785 10231 8418 8418 D PlaybackController: Trying to connect to service\r\n1702289037.786 10231 8418 8418 D PlaybackController: Result for service binding: true\r\n1702289037.786 10231 8418 8418 D PlaybackController: Trying to connect to service\r\n1702289037.787 10231 8418 8418 D PlaybackController: Result for service binding: true\r\n1702289037.787 10231 8418 8418 D PlaybackController: Querying service info\r\n1702289037.787 10231 8418 8418 D PlaybackController: status: STOPPED\r\n1702289037.787 10231 8418 8418 D PlaybackController: Connection to Service established\r\n1702289037.787 10231 8418 8418 D PlaybackController: Querying service info\r\n1702289037.787 10231 8418 8418 D PlaybackController: status: STOPPED\r\n1702289037.787 10231 8418 8418 D ExternalPlayerFragment: Loading media info\r\n1702289037.787 10231 8418 8418 D PlaybackController: Connection to Service established\r\n1702289037.795 10231 8418 8418 D LclPlaybackSvcMPlayer: playMediaObject(...)\r\n1702289037.808 10231 8418 8418 I ExoPlayerImpl: Init 4a66ac [ExoPlayerLib/2.14.2] [tapas, 23021RAAEG, Xiaomi, 33]\r\n1702289037.813 10231 8418 8418 E AudioEffect: set(): AudioFlinger could not create effect fe3199be-aed0-413f-87bb-11260eb63cf1 / ec7178ec-e5e1-4432-a3f4-4657e6795210, status: -2\r\n1702289037.813 10231 8418 8418 E AudioEffects-JNI: AudioEffect initCheck failed -3\r\n1702289037.813 10231 8418 8418 E AudioEffect-JAVA: Error code -3 when initializing AudioEffect.\r\n1702289037.813 10231 8418 8418 W System.err: java.lang.RuntimeException: Cannot initialize effect engine for type: fe3199be-aed0-413f-87bb-11260eb63cf1 Error: -3\r\n1702289037.813 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:543)\r\n1702289037.813 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:501)\r\n1702289037.813 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:475)\r\n1702289037.814 10231 8418 8418 W System.err: \tat android.media.audiofx.LoudnessEnhancer.(LoudnessEnhancer.java:80)\r\n1702289037.814 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.initLoudnessEnhancer(ExoPlayerWrapper.java:357)\r\n1702289037.814 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.createPlayer(ExoPlayerWrapper.java:146)\r\n1702289037.814 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.(ExoPlayerWrapper.java:76)\r\n1702289037.814 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.createMediaPlayer(LocalPSMP.java:587)\r\n1702289037.814 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:158)\r\n1702289037.814 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:113)\r\n1702289037.814 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.startPlaying(PlaybackService.java:741)\r\n1702289037.814 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.lambda$onStartCommand$6(PlaybackService.java:526)\r\n1702289037.814 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.$r8$lambda$mOCf9qqsskaQGmxsaI_m2ZmJO2w(PlaybackService.java:0)\r\n1702289037.814 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService$$ExternalSyntheticLambda6.accept(R8$$SyntheticClass:0)\r\n1702289037.814 10231 8418 8418 W System.err: \tat io.reactivex.internal.observers.LambdaObserver.onNext(LambdaObserver.java:63)\r\n1702289037.814 10231 8418 8418 W System.err: \tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.drainNormal(ObservableObserveOn.java:201)\r\n1702289037.814 10231 8418 8418 W System.err: \tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.run(ObservableObserveOn.java:255)\r\n1702289037.814 10231 8418 8418 W System.err: \tat io.reactivex.android.schedulers.HandlerScheduler$ScheduledRunnable.run(HandlerScheduler.java:124)\r\n1702289037.814 10231 8418 8418 W System.err: \tat android.os.Handler.handleCallback(Handler.java:942)\r\n1702289037.814 10231 8418 8418 W System.err: \tat android.os.Handler.dispatchMessage(Handler.java:99)\r\n1702289037.814 10231 8418 8418 W System.err: \tat android.os.Looper.loopOnce(Looper.java:201)\r\n1702289037.814 10231 8418 8418 W System.err: \tat android.os.Looper.loop(Looper.java:288)\r\n1702289037.814 10231 8418 8418 W System.err: \tat android.app.ActivityThread.main(ActivityThread.java:7959)\r\n1702289037.814 10231 8418 8418 W System.err: \tat java.lang.reflect.Method.invoke(Native Method)\r\n1702289037.814 10231 8418 8418 W System.err: \tat com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)\r\n1702289037.814 10231 8418 8418 W System.err: \tat com.android.internal.os.ZygoteInit.main(ZygoteInit.java:942)\r\n1702289037.814 10231 8418 8418 D PlaybackService: Playable was not found. Stopping service.\r\n1702289037.814 10231 8418 8418 W System.err: java.lang.RuntimeException: Cannot initialize effect engine for type: fe3199be-aed0-413f-87bb-11260eb63cf1 Error: -3\r\n1702289037.814 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:543)\r\n1702289037.814 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:501)\r\n1702289037.814 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:475)\r\n1702289037.814 10231 8418 8418 W System.err: \tat android.media.audiofx.LoudnessEnhancer.(LoudnessEnhancer.java:80)\r\n1702289037.814 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.initLoudnessEnhancer(ExoPlayerWrapper.java:357)\r\n1702289037.814 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.createPlayer(ExoPlayerWrapper.java:146)\r\n1702289037.814 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.(ExoPlayerWrapper.java:76)\r\n1702289037.815 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.createMediaPlayer(LocalPSMP.java:587)\r\n1702289037.815 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:158)\r\n1702289037.815 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:113)\r\n1702289037.815 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.startPlaying(PlaybackService.java:741)\r\n1702289037.815 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.lambda$onStartCommand$6(PlaybackService.java:526)\r\n1702289037.815 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.$r8$lambda$mOCf9qqsskaQGmxsaI_m2ZmJO2w(PlaybackService.java:0)\r\n1702289037.815 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService$$ExternalSyntheticLambda6.accept(R8$$SyntheticClass:0)\r\n1702289037.815 10231 8418 8418 W System.err: \tat io.reactivex.internal.observers.LambdaObserver.onNext(LambdaObserver.java:63)\r\n1702289037.815 10231 8418 8418 W System.err: \tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.drainNormal(ObservableObserveOn.java:201)\r\n1702289037.815 10231 8418 8418 W System.err: \tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.run(ObservableObserveOn.java:255)\r\n1702289037.815 10231 8418 8418 W System.err: \tat io.reactivex.android.schedulers.HandlerScheduler$ScheduledRunnable.run(HandlerScheduler.java:124)\r\n1702289037.815 10231 8418 8418 W System.err: \tat android.os.Handler.handleCallback(Handler.java:942)\r\n1702289037.815 10231 8418 8418 W System.err: \tat android.os.Handler.dispatchMessage(Handler.java:99)\r\n1702289037.815 10231 8418 8418 W System.err: \tat android.os.Looper.loopOnce(Looper.java:201)\r\n1702289037.815 10231 8418 8418 W System.err: \tat android.os.Looper.loop(Looper.java:288)\r\n1702289037.815 10231 8418 8418 W System.err: \tat android.app.ActivityThread.main(ActivityThread.java:7959)\r\n1702289037.815 10231 8418 8418 W System.err: \tat java.lang.reflect.Method.invoke(Native Method)\r\n1702289037.815 10231 8418 8418 W System.err: \tat com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)\r\n1702289037.815 10231 8418 8418 W System.err: \tat com.android.internal.os.ZygoteInit.main(ZygoteInit.java:942)\r\n1702289037.815 10231 8418 8418 D PlaybackSrvState: stopService\r\n1702289037.815 10231 8418 8418 D PlaybackSrvState: stopForeground\r\n1702289037.821 10231 8418 8418 D PlaybackController: Disconnected from Service\r\n1702289037.821 10231 8418 8418 D PlaybackController: Disconnected from Service\r\n1702289037.821 10231 8418 8418 D PlaybackService: Received onUnbind event\r\n1702289037.821 10231 8418 8418 D PlaybackService: Service is about to be destroyed\r\n1702289037.821 10231 8418 8418 D PlaybackSrvState: stopForeground\r\n1702289039.176 10231 8418 8418 D PlaybackService: Service created.\r\n1702289039.188 10231 8418 8418 D PlaybackController: Trying to connect to service\r\n1702289039.189 10231 8418 8418 D PlaybackController: Result for service binding: true\r\n1702289039.189 10231 8418 8418 D PlaybackController: Trying to connect to service\r\n1702289039.190 10231 8418 8418 D PlaybackController: Result for service binding: true\r\n1702289039.190 10231 8418 8418 D PlaybackService: OnStartCommand called\r\n1702289039.191 10231 8418 8418 D PlaybackSrvState: startForeground\r\n1702289039.194 10231 8418 8418 D PlaybackService: Received onBind event\r\n1702289039.200 10231 8418 8418 D PlaybackController: Trying to connect to service\r\n1702289039.201 10231 8418 8418 D PlaybackController: Result for service binding: true\r\n1702289039.201 10231 8418 8418 D PlaybackController: Trying to connect to service\r\n1702289039.202 10231 8418 8418 D PlaybackController: Result for service binding: true\r\n1702289039.202 10231 8418 8418 D PlaybackController: Querying service info\r\n1702289039.202 10231 8418 8418 D PlaybackController: status: STOPPED\r\n1702289039.202 10231 8418 8418 D PlaybackController: Connection to Service established\r\n1702289039.202 10231 8418 8418 D PlaybackController: Querying service info\r\n1702289039.202 10231 8418 8418 D PlaybackController: status: STOPPED\r\n1702289039.202 10231 8418 8418 D ExternalPlayerFragment: Loading media info\r\n1702289039.202 10231 8418 12230 D DBReader: getFeedItem() called with: itemId = [1570]\r\n1702289039.202 10231 8418 8418 D PlaybackController: Connection to Service established\r\n1702289039.202 10231 8418 12230 D DBReader: Loading feeditem with id 1570\r\n1702289039.203 10231 8418 12230 D DBReader: getFavoriteIDList() called\r\n1702289039.204 10231 8418 12230 D DBReader: getQueueIDList() called\r\n1702289039.204 10231 8418 12230 D DBReader: Extracting Feedlist\r\n1702289039.215 10231 8418 8418 D LclPlaybackSvcMPlayer: playMediaObject(...)\r\n1702289039.219 10231 8418 8418 I ExoPlayerImpl: Init c5ceaba [ExoPlayerLib/2.14.2] [tapas, 23021RAAEG, Xiaomi, 33]\r\n1702289039.223 10231 8418 8418 E AudioEffect: set(): AudioFlinger could not create effect fe3199be-aed0-413f-87bb-11260eb63cf1 / ec7178ec-e5e1-4432-a3f4-4657e6795210, status: -2\r\n1702289039.224 10231 8418 8418 E AudioEffects-JNI: AudioEffect initCheck failed -3\r\n1702289039.224 10231 8418 8418 E AudioEffect-JAVA: Error code -3 when initializing AudioEffect.\r\n1702289039.224 10231 8418 8418 W System.err: java.lang.RuntimeException: Cannot initialize effect engine for type: fe3199be-aed0-413f-87bb-11260eb63cf1 Error: -3\r\n1702289039.224 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:543)\r\n1702289039.224 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:501)\r\n1702289039.224 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:475)\r\n1702289039.224 10231 8418 8418 W System.err: \tat android.media.audiofx.LoudnessEnhancer.(LoudnessEnhancer.java:80)\r\n1702289039.224 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.initLoudnessEnhancer(ExoPlayerWrapper.java:357)\r\n1702289039.224 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.createPlayer(ExoPlayerWrapper.java:146)\r\n1702289039.224 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.(ExoPlayerWrapper.java:76)\r\n1702289039.224 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.createMediaPlayer(LocalPSMP.java:587)\r\n1702289039.224 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:158)\r\n1702289039.224 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:113)\r\n1702289039.224 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.startPlaying(PlaybackService.java:741)\r\n1702289039.224 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.lambda$onStartCommand$6(PlaybackService.java:526)\r\n1702289039.224 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.$r8$lambda$mOCf9qqsskaQGmxsaI_m2ZmJO2w(PlaybackService.java:0)\r\n1702289039.224 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService$$ExternalSyntheticLambda6.accept(R8$$SyntheticClass:0)\r\n1702289039.224 10231 8418 8418 W System.err: \tat io.reactivex.internal.observers.LambdaObserver.onNext(LambdaObserver.java:63)\r\n1702289039.224 10231 8418 8418 W System.err: \tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.drainNormal(ObservableObserveOn.java:201)\r\n1702289039.224 10231 8418 8418 W System.err: \tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.run(ObservableObserveOn.java:255)\r\n1702289039.224 10231 8418 8418 W System.err: \tat io.reactivex.android.schedulers.HandlerScheduler$ScheduledRunnable.run(HandlerScheduler.java:124)\r\n1702289039.224 10231 8418 8418 W System.err: \tat android.os.Handler.handleCallback(Handler.java:942)\r\n1702289039.224 10231 8418 8418 W System.err: \tat android.os.Handler.dispatchMessage(Handler.java:99)\r\n1702289039.224 10231 8418 8418 W System.err: \tat android.os.Looper.loopOnce(Looper.java:201)\r\n1702289039.224 10231 8418 8418 W System.err: \tat android.os.Looper.loop(Looper.java:288)\r\n1702289039.224 10231 8418 8418 W System.err: \tat android.app.ActivityThread.main(ActivityThread.java:7959)\r\n1702289039.224 10231 8418 8418 W System.err: \tat java.lang.reflect.Method.invoke(Native Method)\r\n1702289039.224 10231 8418 8418 W System.err: \tat com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)\r\n1702289039.224 10231 8418 8418 W System.err: \tat com.android.internal.os.ZygoteInit.main(ZygoteInit.java:942)\r\n1702289039.224 10231 8418 8418 D PlaybackService: Playable was not found. Stopping service.\r\n1702289039.225 10231 8418 8418 W System.err: java.lang.RuntimeException: Cannot initialize effect engine for type: fe3199be-aed0-413f-87bb-11260eb63cf1 Error: -3\r\n1702289039.225 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:543)\r\n1702289039.225 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:501)\r\n1702289039.225 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:475)\r\n1702289039.225 10231 8418 8418 W System.err: \tat android.media.audiofx.LoudnessEnhancer.(LoudnessEnhancer.java:80)\r\n1702289039.225 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.initLoudnessEnhancer(ExoPlayerWrapper.java:357)\r\n1702289039.225 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.createPlayer(ExoPlayerWrapper.java:146)\r\n1702289039.225 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.(ExoPlayerWrapper.java:76)\r\n1702289039.225 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.createMediaPlayer(LocalPSMP.java:587)\r\n1702289039.225 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:158)\r\n1702289039.225 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:113)\r\n1702289039.225 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.startPlaying(PlaybackService.java:741)\r\n1702289039.225 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.lambda$onStartCommand$6(PlaybackService.java:526)\r\n1702289039.225 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.$r8$lambda$mOCf9qqsskaQGmxsaI_m2ZmJO2w(PlaybackService.java:0)\r\n1702289039.225 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService$$ExternalSyntheticLambda6.accept(R8$$SyntheticClass:0)\r\n1702289039.225 10231 8418 8418 W System.err: \tat io.reactivex.internal.observers.LambdaObserver.onNext(LambdaObserver.java:63)\r\n1702289039.225 10231 8418 8418 W System.err: \tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.drainNormal(ObservableObserveOn.java:201)\r\n1702289039.225 10231 8418 8418 W System.err: \tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.run(ObservableObserveOn.java:255)\r\n1702289039.225 10231 8418 8418 W System.err: \tat io.reactivex.android.schedulers.HandlerScheduler$ScheduledRunnable.run(HandlerScheduler.java:124)\r\n1702289039.225 10231 8418 8418 W System.err: \tat android.os.Handler.handleCallback(Handler.java:942)\r\n1702289039.225 10231 8418 8418 W System.err: \tat android.os.Handler.dispatchMessage(Handler.java:99)\r\n1702289039.225 10231 8418 8418 W System.err: \tat android.os.Looper.loopOnce(Looper.java:201)\r\n1702289039.225 10231 8418 8418 W System.err: \tat android.os.Looper.loop(Looper.java:288)\r\n1702289039.225 10231 8418 8418 W System.err: \tat android.app.ActivityThread.main(ActivityThread.java:7959)\r\n1702289039.225 10231 8418 8418 W System.err: \tat java.lang.reflect.Method.invoke(Native Method)\r\n1702289039.225 10231 8418 8418 W System.err: \tat com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)\r\n1702289039.225 10231 8418 8418 W System.err: \tat com.android.internal.os.ZygoteInit.main(ZygoteInit.java:942)\r\n1702289039.225 10231 8418 8418 D PlaybackSrvState: stopService\r\n1702289039.225 10231 8418 8418 D PlaybackSrvState: stopForeground\r\n1702289039.227 10231 8418 8418 D PlaybackController: Disconnected from Service\r\n1702289039.227 10231 8418 8418 D PlaybackController: Disconnected from Service\r\n1702289039.227 10231 8418 8418 D PlaybackService: Received onUnbind event\r\n1702289039.228 10231 8418 8418 D PlaybackService: Service is about to be destroyed\r\n1702289039.228 10231 8418 8418 D PlaybackSrvState: stopForeground\r\n1702289040.348 10231 8418 8418 D PlaybackService: Service created.\r\n1702289040.362 10231 8418 8418 D PlaybackController: Trying to connect to service\r\n1702289040.363 10231 8418 8418 D PlaybackController: Result for service binding: true\r\n1702289040.363 10231 8418 8418 D PlaybackController: Trying to connect to service\r\n1702289040.364 10231 8418 8418 D PlaybackController: Result for service binding: true\r\n1702289040.365 10231 8418 8418 D PlaybackService: OnStartCommand called\r\n1702289040.365 10231 8418 8418 D PlaybackSrvState: startForeground\r\n1702289040.368 10231 8418 12216 D DBReader: getFeedItem() called with: itemId = [1570]\r\n1702289040.368 10231 8418 12216 D DBReader: Loading feeditem with id 1570\r\n1702289040.369 10231 8418 8418 D PlaybackService: Received onBind event\r\n1702289040.370 10231 8418 12216 D DBReader: getFavoriteIDList() called\r\n1702289040.371 10231 8418 12216 D DBReader: getQueueIDList() called\r\n1702289040.371 10231 8418 12216 D DBReader: Extracting Feedlist\r\n1702289040.376 10231 8418 8418 D PlaybackController: Trying to connect to service\r\n1702289040.378 10231 8418 8418 D PlaybackController: Result for service binding: true\r\n1702289040.378 10231 8418 8418 D PlaybackController: Querying service info\r\n1702289040.378 10231 8418 8418 D PlaybackController: status: STOPPED\r\n1702289040.378 10231 8418 8418 D PlaybackController: Connection to Service established\r\n1702289040.378 10231 8418 8418 D PlaybackController: Trying to connect to service\r\n1702289040.379 10231 8418 8418 D PlaybackController: Result for service binding: true\r\n1702289040.379 10231 8418 8418 D PlaybackController: Querying service info\r\n1702289040.380 10231 8418 8418 D PlaybackController: status: STOPPED\r\n1702289040.380 10231 8418 8418 D ExternalPlayerFragment: Loading media info\r\n1702289040.380 10231 8418 8418 D PlaybackController: Connection to Service established\r\n1702289040.380 10231 8418 8418 D LclPlaybackSvcMPlayer: playMediaObject(...)\r\n1702289040.390 10231 8418 8418 I ExoPlayerImpl: Init c03e75b [ExoPlayerLib/2.14.2] [tapas, 23021RAAEG, Xiaomi, 33]\r\n1702289040.394 10231 8418 8418 E AudioEffect: set(): AudioFlinger could not create effect fe3199be-aed0-413f-87bb-11260eb63cf1 / ec7178ec-e5e1-4432-a3f4-4657e6795210, status: -2\r\n1702289040.394 10231 8418 8418 E AudioEffects-JNI: AudioEffect initCheck failed -3\r\n1702289040.394 10231 8418 8418 E AudioEffect-JAVA: Error code -3 when initializing AudioEffect.\r\n1702289040.394 10231 8418 8418 W System.err: java.lang.RuntimeException: Cannot initialize effect engine for type: fe3199be-aed0-413f-87bb-11260eb63cf1 Error: -3\r\n1702289040.394 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:543)\r\n1702289040.394 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:501)\r\n1702289040.394 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:475)\r\n1702289040.394 10231 8418 8418 W System.err: \tat android.media.audiofx.LoudnessEnhancer.(LoudnessEnhancer.java:80)\r\n1702289040.394 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.initLoudnessEnhancer(ExoPlayerWrapper.java:357)\r\n1702289040.394 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.createPlayer(ExoPlayerWrapper.java:146)\r\n1702289040.394 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.(ExoPlayerWrapper.java:76)\r\n1702289040.394 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.createMediaPlayer(LocalPSMP.java:587)\r\n1702289040.394 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:158)\r\n1702289040.394 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:113)\r\n1702289040.394 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.startPlaying(PlaybackService.java:741)\r\n1702289040.394 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.lambda$onStartCommand$6(PlaybackService.java:526)\r\n1702289040.395 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.$r8$lambda$mOCf9qqsskaQGmxsaI_m2ZmJO2w(PlaybackService.java:0)\r\n1702289040.395 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService$$ExternalSyntheticLambda6.accept(R8$$SyntheticClass:0)\r\n1702289040.395 10231 8418 8418 W System.err: \tat io.reactivex.internal.observers.LambdaObserver.onNext(LambdaObserver.java:63)\r\n1702289040.395 10231 8418 8418 W System.err: \tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.drainNormal(ObservableObserveOn.java:201)\r\n1702289040.395 10231 8418 8418 W System.err: \tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.run(ObservableObserveOn.java:255)\r\n1702289040.395 10231 8418 8418 W System.err: \tat io.reactivex.android.schedulers.HandlerScheduler$ScheduledRunnable.run(HandlerScheduler.java:124)\r\n1702289040.395 10231 8418 8418 W System.err: \tat android.os.Handler.handleCallback(Handler.java:942)\r\n1702289040.395 10231 8418 8418 W System.err: \tat android.os.Handler.dispatchMessage(Handler.java:99)\r\n1702289040.395 10231 8418 8418 W System.err: \tat android.os.Looper.loopOnce(Looper.java:201)\r\n1702289040.395 10231 8418 8418 W System.err: \tat android.os.Looper.loop(Looper.java:288)\r\n1702289040.395 10231 8418 8418 W System.err: \tat android.app.ActivityThread.main(ActivityThread.java:7959)\r\n1702289040.395 10231 8418 8418 W System.err: \tat java.lang.reflect.Method.invoke(Native Method)\r\n1702289040.395 10231 8418 8418 W System.err: \tat com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)\r\n1702289040.395 10231 8418 8418 W System.err: \tat com.android.internal.os.ZygoteInit.main(ZygoteInit.java:942)\r\n1702289040.395 10231 8418 8418 D PlaybackService: Playable was not found. Stopping service.\r\n1702289040.395 10231 8418 8418 W System.err: java.lang.RuntimeException: Cannot initialize effect engine for type: fe3199be-aed0-413f-87bb-11260eb63cf1 Error: -3\r\n1702289040.395 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:543)\r\n1702289040.395 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:501)\r\n1702289040.395 10231 8418 8418 W System.err: \tat android.media.audiofx.AudioEffect.(AudioEffect.java:475)\r\n1702289040.395 10231 8418 8418 W System.err: \tat android.media.audiofx.LoudnessEnhancer.(LoudnessEnhancer.java:80)\r\n1702289040.395 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.initLoudnessEnhancer(ExoPlayerWrapper.java:357)\r\n1702289040.395 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.createPlayer(ExoPlayerWrapper.java:146)\r\n1702289040.395 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.ExoPlayerWrapper.(ExoPlayerWrapper.java:76)\r\n1702289040.395 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.createMediaPlayer(LocalPSMP.java:587)\r\n1702289040.395 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:158)\r\n1702289040.395 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.LocalPSMP.playMediaObject(LocalPSMP.java:113)\r\n1702289040.395 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.startPlaying(PlaybackService.java:741)\r\n1702289040.395 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.lambda$onStartCommand$6(PlaybackService.java:526)\r\n1702289040.395 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService.$r8$lambda$mOCf9qqsskaQGmxsaI_m2ZmJO2w(PlaybackService.java:0)\r\n1702289040.395 10231 8418 8418 W System.err: \tat de.danoeh.antennapod.core.service.playback.PlaybackService$$ExternalSyntheticLambda6.accept(R8$$SyntheticClass:0)\r\n1702289040.395 10231 8418 8418 W System.err: \tat io.reactivex.internal.observers.LambdaObserver.onNext(LambdaObserver.java:63)\r\n1702289040.395 10231 8418 8418 W System.err: \tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.drainNormal(ObservableObserveOn.java:201)\r\n1702289040.395 10231 8418 8418 W System.err: \tat io.reactivex.internal.operators.observable.ObservableObserveOn$ObserveOnObserver.run(ObservableObserveOn.java:255)\r\n1702289040.395 10231 8418 8418 W System.err: \tat io.reactivex.android.schedulers.HandlerScheduler$ScheduledRunnable.run(HandlerScheduler.java:124)\r\n1702289040.395 10231 8418 8418 W System.err: \tat android.os.Handler.handleCallback(Handler.java:942)\r\n1702289040.395 10231 8418 8418 W System.err: \tat android.os.Handler.dispatchMessage(Handler.java:99)\r\n1702289040.395 10231 8418 8418 W System.err: \tat android.os.Looper.loopOnce(Looper.java:201)\r\n1702289040.395 10231 8418 8418 W System.err: \tat android.os.Looper.loop(Looper.java:288)\r\n1702289040.395 10231 8418 8418 W System.err: \tat android.app.ActivityThread.main(ActivityThread.java:7959)\r\n1702289040.395 10231 8418 8418 W System.err: \tat java.lang.reflect.Method.invoke(Native Method)\r\n1702289040.395 10231 8418 8418 W System.err: \tat com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)\r\n1702289040.395 10231 8418 8418 W System.err: \tat com.android.internal.os.ZygoteInit.main(ZygoteInit.java:942)\r\n1702289040.395 10231 8418 8418 D PlaybackSrvState: stopService\r\n1702289040.395 10231 8418 8418 D PlaybackSrvState: stopForeground\r\n1702289040.398 10231 8418 8418 D PlaybackController: Disconnected from Service\r\n1702289040.398 10231 8418 8418 D PlaybackController: Disconnected from Service\r\n1702289040.398 10231 8418 8418 D PlaybackService: Received onUnbind event\r\n1702289040.398 10231 8418 8418 D PlaybackService: Service is about to be destroyed\r\n1702289040.398 10231 8418 8418 D PlaybackSrvState: stopForeground\r\n1702289041.529 10231 8418 8418 D PlaybackController: Releasing PlaybackController\r\n1702289041.533 10231 8418 8418 D PlaybackController: Releasing PlaybackController\n```\n", "hints": "Ping @matejdro\nMy guess is that this device does not support the audio boost effect?\r\n\r\nFrom what I can read , we can query the effects via `android.media.audiofx.AudioEffect.queryEffects` and if there is not UUID of `android.media.audiofx.AudioEffect#EFFECT_TYPE_LOUDNESS_ENHANCER` in there, disable it in ExoPlayerWrapper and hide setting from settings (or disable it with a note saying \"Not supported on your device\"?).\r\n\r\nIt might also be worth try catching the whole thing just in case and log the exceptions somewhere.\r\n\r\nI can try doing a PR for this, but I'm not sure if I can do it within couple of days.", "pull_url": "https://github.com/AntennaPod/AntennaPod/pull/6808", "issue_urls": "[\"https://github.com/AntennaPod/AntennaPod/issues/6802\"]", "test_command": "./gradlew :core:testFreeDebugUnitTest --tests \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest\"", "fix_patch": "diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/VolumeAdaptationPreference.java b/app/src/main/java/de/danoeh/antennapod/preferences/VolumeAdaptationPreference.java\nnew file mode 100644\nindex 00000000000..584b7d90ec5\n--- /dev/null\n+++ b/app/src/main/java/de/danoeh/antennapod/preferences/VolumeAdaptationPreference.java\n@@ -0,0 +1,27 @@\n+package de.danoeh.antennapod.preferences;\n+\n+import android.content.Context;\n+import android.util.AttributeSet;\n+\n+import java.util.Arrays;\n+\n+import de.danoeh.antennapod.model.feed.VolumeAdaptionSetting;\n+\n+public class VolumeAdaptationPreference extends MaterialListPreference {\n+ public VolumeAdaptationPreference(Context context) {\n+ super(context);\n+ }\n+\n+ public VolumeAdaptationPreference(Context context, AttributeSet attrs) {\n+ super(context, attrs);\n+ }\n+\n+ @Override\n+ public CharSequence[] getEntries() {\n+ if (VolumeAdaptionSetting.isBoostSupported()) {\n+ return super.getEntries();\n+ } else {\n+ return Arrays.copyOfRange(super.getEntries(), 0, 3);\n+ }\n+ }\n+}\ndiff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml\nindex fb9e2e42544..b322217ad89 100644\n--- a/app/src/main/res/xml/feed_settings.xml\n+++ b/app/src/main/res/xml/feed_settings.xml\n@@ -48,7 +48,7 @@\n android:summary=\"@string/global_default\"\n android:title=\"@string/auto_delete_label\" />\n \n- 1) {\n exoPlayer.setVolume(1f);\n- loudnessEnhancer.setEnabled(true);\n- loudnessEnhancer.setTargetGain((int) (1000 * (v - 1)));\n+ if (loudnessEnhancer != null) {\n+ loudnessEnhancer.setEnabled(true);\n+ loudnessEnhancer.setTargetGain((int) (1000 * (v - 1)));\n+ }\n } else {\n exoPlayer.setVolume(v);\n- loudnessEnhancer.setEnabled(false);\n+ if (loudnessEnhancer != null) {\n+ loudnessEnhancer.setEnabled(false);\n+ }\n }\n }\n \n@@ -354,6 +361,10 @@ void setOnBufferingUpdateListener(Consumer bufferingUpdateListener) {\n }\n \n private void initLoudnessEnhancer(int audioStreamId) {\n+ if (!VolumeAdaptionSetting.isBoostSupported()) {\n+ return;\n+ }\n+\n LoudnessEnhancer newEnhancer = new LoudnessEnhancer(audioStreamId);\n LoudnessEnhancer oldEnhancer = this.loudnessEnhancer;\n if (oldEnhancer != null) {\ndiff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/VolumeAdaptionSetting.java b/model/src/main/java/de/danoeh/antennapod/model/feed/VolumeAdaptionSetting.java\nindex e71c5ad3634..a9b1089f2b0 100644\n--- a/model/src/main/java/de/danoeh/antennapod/model/feed/VolumeAdaptionSetting.java\n+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/VolumeAdaptionSetting.java\n@@ -1,5 +1,10 @@\n package de.danoeh.antennapod.model.feed;\n \n+import android.media.audiofx.AudioEffect;\n+\n+import androidx.annotation.Nullable;\n+import androidx.annotation.VisibleForTesting;\n+\n public enum VolumeAdaptionSetting {\n OFF(0, 1.0f),\n LIGHT_REDUCTION(1, 0.5f),\n@@ -32,4 +37,29 @@ public int toInteger() {\n public float getAdaptionFactor() {\n return adaptionFactor;\n }\n+\n+ @Nullable\n+ private static Boolean boostSupported = null;\n+\n+ public static boolean isBoostSupported() {\n+ if (boostSupported != null) {\n+ return boostSupported;\n+ }\n+ final AudioEffect.Descriptor[] audioEffects = AudioEffect.queryEffects();\n+ if (audioEffects != null) {\n+ for (AudioEffect.Descriptor effect : audioEffects) {\n+ if (effect.type.equals(AudioEffect.EFFECT_TYPE_LOUDNESS_ENHANCER)) {\n+ boostSupported = true;\n+ return boostSupported;\n+ }\n+ }\n+ }\n+ boostSupported = false;\n+ return boostSupported;\n+ }\n+\n+ @VisibleForTesting\n+ public static void setBoostSupported(@Nullable Boolean boostSupported) {\n+ VolumeAdaptionSetting.boostSupported = boostSupported;\n+ }\n }\n", "test_patch": "diff --git a/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeAdaptionSettingTest.java b/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeAdaptionSettingTest.java\nindex 30767bdc884..966351a5e45 100644\n--- a/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeAdaptionSettingTest.java\n+++ b/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeAdaptionSettingTest.java\n@@ -1,6 +1,9 @@\n package de.danoeh.antennapod.core.feed;\n \n import de.danoeh.antennapod.model.feed.VolumeAdaptionSetting;\n+\n+import org.junit.After;\n+import org.junit.Before;\n import org.junit.Test;\n \n import static org.hamcrest.Matchers.equalTo;\n@@ -11,6 +14,16 @@\n \n public class VolumeAdaptionSettingTest {\n \n+ @Before\n+ public void setUp() throws Exception {\n+ VolumeAdaptionSetting.setBoostSupported(false);\n+ }\n+\n+ @After\n+ public void tearDown() throws Exception {\n+ VolumeAdaptionSetting.setBoostSupported(null);\n+ }\n+\n @Test\n public void mapOffToInteger() {\n VolumeAdaptionSetting setting = VolumeAdaptionSetting.OFF;\n", "n2p_tests": "{\"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.mapLightBoostToInteger\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.mapOffToInteger\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.mapHeavyBoostToInteger\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.mapMediumBoostToInteger\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.mapHeavyReductionToInteger\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.lightReductionYieldsHigherValueThanHeavyReduction\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.mediumBoostYieldsHigherValueThanLightBoost\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.mapLightReductionToInteger\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.cannotMapValuesOutOfRange\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.mapIntegerToVolumeAdaptionSetting\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.lightBoostYieldsHigherValueThanLightReduction\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.noAdaptionIfTurnedOff\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.cannotMapNegativeValues\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.heavyBoostYieldsHigherValueThanMediumBoost\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "AntennaPod__AntennaPod-6739", "org": "AntennaPod", "repo": "AntennaPod", "number": 6739, "state": "closed", "title": "Parse podcast:transcript url and store in SQLite", "body": "Fix #4935 \r\n\r\n@keunes , @ByteHamster mentioned that for the big feature for transcript, we will use the `transcript` branch and target many small PR's\r\n\r\nThis PR parses the `` tag from a feed and store the URL of most preferred format (JSON and then SRT)\r\n\r\nIt's ready for review\r\n\r\nValidation using the `Podnews Daily` podcast and `No Agenda`\r\n```\r\nsqlite> .schema\r\n\r\nCREATE TABLE FeedItems (id INTEGER PRIMARY KEY AUTOINCREMENT ,title TEXT,pubDate INTEGER,read INTEGER,link TEXT,description TEXT,payment_link TEXT,media INTEGER,feed INTEGER,has_simple_chapters INTEGER,item_identifier TEXT,image_url TEXT,auto_download INTEGER,podcastindex_chapter_url TEXT,podcastindex_transcript_type TEXT,podcastindex_transcript_url TEXT);\r\n\r\nsqlite> select podcastindex_transcript_type, podcastindex_transcript_url from FeedItems;\r\napplication/json|https://podnews.net/audio/podnews231102.mp3.json\r\napplication/json|https://podnews.net/audio/podnews231101.mp3.json\r\napplication/json|https://podnews.net/audio/podnews231031.mp3.json\r\n...\r\napplication/srt|https://mp3s.nashownotes.com/NA-1604-Captions.srt\r\napplication/srt|https://mp3s.nashownotes.com/NA-1603-Captions.srt\r\napplication/srt|https://mp3s.nashownotes.com/NA-1602-Captions.srt\r\n```", "base": "{\"label\": \"AntennaPod:transcript\", \"ref\": \"transcript\", \"sha\": \"2c3fb5610a98d80db25b85fdf0607bfc2b6216fc\"}", "resolved_issues": "[{\"number\": 4935, \"title\": \"Support for podcast:transcript tag\", \"body\": \"# Checklist\\r\\n\\r\\n\\r\\n- [x] I have used the search function to see if someone else has already submitted the same feature request.\\r\\n- [x] I will only create one feature request per issue.\\r\\n- [x] I will describe the problem with as much detail as possible\\r\\n\\r\\n# Feature description\\r\\nSome podcasts include text transcript using `podcast:transcipt`\\r\\n\\r\\n**Suggested solution**:\\r\\nDisplay transcript and sync it with the audio.\\r\\n\\r\\nMeeting notes from Nov 2nd, 2023 https://github.com/AntennaPod/AntennaPod/issues/4935#issuecomment-1791614891\\r\\n\"}]", "lang": "java", "problem_statement": "Support for podcast:transcript tag\n# Checklist\r\n\r\n\r\n- [x] I have used the search function to see if someone else has already submitted the same feature request.\r\n- [x] I will only create one feature request per issue.\r\n- [x] I will describe the problem with as much detail as possible\r\n\r\n# Feature description\r\nSome podcasts include text transcript using `podcast:transcipt`\r\n\r\n**Suggested solution**:\r\nDisplay transcript and sync it with the audio.\r\n\r\nMeeting notes from Nov 2nd, 2023 https://github.com/AntennaPod/AntennaPod/issues/4935#issuecomment-1791614891\r\n\n", "hints": "@keunes or @ByteHamster please assign to me, since I have the podcastindex namespace parsing done in #4933, I could tackle `podcast:transcript`\nI have a a few suggestions for transcript related features I think would be great to include in AntennaPod (originally mentioned in https://github.com/AntennaPod/AntennaPod/issues/5002):\r\n\r\n1. Optionally including timestamps when copying from the trancsript. This would be helpful when using a noteapp to write down interesting segments from the podcast as it makes it easier to go back to the podcast an relisten to the particular segment.\r\n2. Having the transcript autoscroll as the episode is playing, so when switching to the transcript tab, the text is in the same position as the audio. This would facilitate notetaking while listening.\r\n3. Searching the transcript. I am referring to searching within a single transcript , which would make it easier to find interesting segments (which in turn could be navigated to if combined with the below item).\r\n4. Using the transcript for seeking in the audio (clicking sentences to jump to that position).\r\n\r\nThere are currently at least two podcast apps on iOS that provide some of these features, but none on Android as far as I know. Those apps are https://podcast9.com/ and https://www.airr.io/. They are labeling themselves as more educational / productive alternatives to regular podcast apps and their main value proposition is the ability to interact with and remember what you listen to as well as easily share your favorite bits with others.\r\n\r\nA future item to consider which might be out of scope currently is to automatically create transcripts for episodes that don't provide it, e.g. using the live transcribe feature on phones where it is available.\nNice ideas \ud83d\udc4d My guess would be that # 4 wouldn't be too difficult. But for the others I guess we (the app) would need to receive the timestamps with the transcript I think - as I reckon it's not feasible for AP to automatically match the text with the audio. Do you know if transcripts typically have such timestamps?\nThanks @keunes ! I am not very experienced with podcast data and metadata, but I looked around a bit and it seems like at least some transcripts provide this. The [example used on the podcastindex API docs](https://podcastindex-org.github.io/docs-api/#get-/episodes/byid) page includes this segment:\r\n\r\n```json\r\ntranscriptUrl: \"https://mp3s.nashownotes.com/NA-1322-Captions.srt\"\r\n```\r\n\r\nThat srt file includes timestamps which look like this:\r\n\r\n```srt\r\n1\r\n00:00:00,000 --> 00:00:05,340\r\nPull my mask over my nose. Adam\r\nCurry John C Dvorak, Thursday,\r\n\r\n2\r\n00:00:05,340 --> 00:00:09,030\r\nFebruary 18 2021. This is your\r\naward winning media\r\n\r\n3\r\n00:00:09,030 --> 00:00:13,380\r\nassassination Episode 13. This\r\nis no agenda.\r\n\r\n...\r\n```\r\n\r\nI am not sure how common it is, but at least it exists.\r\n\r\nA complimentary approach that is less robust but does not rely on external data could be to match the relative position of sentences in the transcript with the relative time of the audio file (when no timestamps are available). Even if this was only able to generate precision to the minute, I think it would be helpful for most items I mentioned above. For some, like the scrolling text, it would probably perform quite well since so much of the transcript would be shown on the screen that the matched position does not have to be exact. It would probably benefit from calculating the relative audio position without silences (I noted that there is already an option in AP to skip these when listening).\r\n\nI like to add an idea mentioned in the issue above: **hide empty tabs** - that could be empty transcripts and especially nonexistent chapters, if only one tab remains the tablayout itself should probably be hidden.\r\n\r\nI think thats a sensible solution, to not crowd the AudioPlayer with empty tabs and require to user to swipe a thousand times to get to the desired tab, makes the UX clearer :)\n@tonytamsf Any idea how to implement the data store? Downloading all transcripts of all episodes could result in a huge amount of text to be stored. We already have the problem that the database is pretty big. I think it would be better to only store the URLs and then load the transcript when actually viewing the transcript page in AntennaPod. We could enable caching with okhttp to reduce the number of web requests. \n> @tonytamsf Any idea how to implement the data store? Downloading all transcripts of all episodes could result in a huge amount of text to be stored. We already have the problem that the database is pretty big. I think it would be better to only store the URLs and then load the transcript when actually viewing the transcript page in AntennaPod. We could enable caching with okhttp to reduce the number of web requests.\r\n\r\nI like your idea, there is no need to store transcription. Depending on the user, they may not want to be downloading transcript using mobile data, so we might have to get user consent to use mobile to download transcript.\nWhy not storing transcript on file text on device? Same way episodes are stored. They would be removed along with episodes and it would allow to make them available like episodes are.\r\n\r\nEdit :\r\nAnd it won't clutter database except maybe to put a flag to know there is transcript downloaded. I am not sure it's even needed as all logics would be parallel to what is done for downloaded episodes.\nSounds like a good idea. When streaming, users need a data connection anyways. When downloading, we can download the transcripts, too. :+1:\n> Why not storing transcript on file text on device?\n\nI'm just wondering: this wouldn't hinder 'processing' the info (esp. timestamps, for # 4 in OP).\n\n> When downloading, we can download the transcripts, too\n\nJust to throw an idea out: couldn't this be done, but then in the db? As in, download & store in db when episode is downloaded; remove from dB when file is deleted? (Don't know if this would have any actual benefit, see above).\nI don't think storing and using text files would cause any problem : it is what video player does with srt files for subtitles.\nStoring it in the database but only for downloaded episodes should work :) Then we don't need to store the file path, we can just store the transcript directly.\nDon't know if you saw how Podverse implemented transcript with search. For reference there is a video of what they did : https://twitter.com/Podverse/status/1413642917760184325?s=19\r\n\r\nIMHO about their screen : \r\n- I would prefer timecode on left side and with a smaller font and using grey as text color. So time code would be there but won't distract your eyes when reading transcription\r\n- I wouldn't separate block like they did. It's like there is an empty line beetween each segment which is annoying when reading\nThanks for sharing that @Matth7878!\r\n\r\n> I would prefer timecode on left side and with a smaller font and using grey as text color\r\n\r\nFully agree\r\n\r\n> I wouldn't separate block like they did\r\n\r\nI understand your point, but we can't really merge sentences that are separated into two blocks I think:\r\n* we don't know where we can stitch parts together, and where a hard enter should be kept (in the interface). If there's no whitespace, it might still be complicated to read:\r\n![Schermafdruk van 2021-07-11 10-45-14](https://user-images.githubusercontent.com/11229646/125188759-38432280-e235-11eb-89f0-e0ce24a2ffff.png)\r\n* if we do stitch together the sentences, there might be a situation where one line on the screen covers three lines in the transcript file. Then we can only display the first timestamp, which can be problematic in some cases (e.g. when there is a line with `[silence]` that takes a minute - you wouldn't be able to jump to the bit after the silence).\r\n\nLet me take a stab at getting the podcast:transcript tag to download and stored. Then we can work on the UI on the next step\n> Let me take a stab at getting the podcast:transcript tag to download and stored. Then we can work on the UI on the next step\r\n\r\nSorry I have been taking a break from AntennaPod. I'm un-assigning myself until I get back\n\r\n> Sorry I have been taking a break from AntennaPod. I'm un-assigning myself until I get back\r\n\r\nI'm back with my beloved AP app. I'll start working on downloading the transcript\nAny thoughts about the support of all 4 content types in the `` tag?\r\n\r\nSpec: https://github.com/Podcastindex-org/podcast-namespace/blob/main/transcripts/transcripts.md\r\n\r\n* HTML - this format has no or limited timecode - I recommend that we ignore this\r\n* JSON - Much more flexible - we should fully support this, I'm searching for sample podcast that use this format (not seeing it yet)\r\n* SRT - great for video or audio, max number of lines 2, max chars 32 - I recommend we support this fully\r\n* WebVTT - for HTML on the web, I recommend we don't support this\r\n\r\nExample: https://podnews.net/rss\r\n\r\n```\r\n\r\n\r\n\r\n\r\n```\r\n\r\nIt looks like Podnews also provides `text/pain` which is not in the Podcast 2.0 spec\r\n\r\n@jamescridland I am a loyal listener of Podnews, is there a reason you don't have JSON version of `podcast:transcript`? \r\n\r\nExample: Podcasting 2.0 https://feeds.podcastindex.org/pc20.xml\r\n\r\nIt uses the SRT format \r\n``\n@ByteHamster - do you have objections if I pull in this code to parse SRT files? https://github.com/gusthavosouza/SRTParser.\r\n\r\nI'm contacting the author about the missing license file his source code.\r\n\r\nIf you prefer I write my parser, I could do that. It's not that hard. Before I embark, I wanted to hear your opinion.\n> HTML - this format has no or limited timecode - I recommend that we ignore this\n\nAgreed.\n\nSupporting JSON & SRT is quite nice already.\n@tonytamsf I can't generate JSON transcripts - whisper.cpp is what I use, and it doesn't make them.\r\n\r\nI agree that supporting all four is redundant, and would agree with your suggestion to cease support for VTT. VTT seems to have been chosen because of support from libraries; but it seems to me that we are offering too many formats here for sensible support. It's not complicated to make an SRT using the same tools as that might make a VTT.\r\n\r\n(Edited) I was under the impression that support for HTML was as a simple link to a full web page with a transcript. This doesn't appear to be the case, and I believe that we should also remove this. So, we end up with (in preference order):\r\n\r\n1. JSON files for word-by-word closed-captioning, editing, etc.\r\n2. SRT files for closed-captioning (max 32 char length)\r\n\r\n(I shall also go and remove the TXT format from the Podnews feed; but will keep the VTT file there).\n> Any thoughts about the support of all 4 content types in the `` tag?\r\n> \r\n> Spec: https://github.com/Podcastindex-org/podcast-namespace/blob/main/transcripts/transcripts.md\r\n> \r\n> * HTML - this format has no or limited timecode - I recommend that we ignore this\r\n> * JSON - Much more flexible - we should fully support this, I'm searching for sample podcast that use this format (not seeing it yet)\r\n> * SRT - great for video or audio, max number of lines 2, max chars 32 - I recommend we support this fully\r\n> * WebVTT - for HTML on the web, I recommend we don't support this\r\n> \r\n> Example: https://podnews.net/rss\r\n> \r\n> ```\r\n> \r\n> \r\n> \r\n> \r\n> ```\r\n> \r\n> It looks like Podnews also provides `text/pain` which is not in the Podcast 2.0 spec\r\n> \r\n> @jamescridland I am a loyal listener of Podnews, is there a reason you don't have JSON version of `podcast:transcript`?\r\n> \r\n> Example: Podcasting 2.0 https://feeds.podcastindex.org/pc20.xml\r\n> \r\n> It uses the SRT format ``\r\n\r\n@tonytamsf, @jamescridland, `text/plain` is mentioned [here](https://github.com/Podcastindex-org/podcast-namespace/blob/main/docs/1.0.md#transcript) but not [here](https://github.com/Podcastindex-org/podcast-namespace/blob/main/transcripts/transcripts.md).\nI don't get this removing supported formats business. VTT is the only format supported natively by browsers, and like SRT+ in many ways but a proper w3c standard. If some of the first apps to take a stab at implementing don't support all formats, that's on them (and will improve with time) - no need to penalize everyone else by removing valuable stuff from the spec. We should encourage the server side to push as much signal out to the world as they can.\n> I don't get this removing supported formats business. VTT is the only format supported natively by browsers\r\n\r\nNote that this issue is about support for the transcript tag in AntennaPod. First I thought that HTML was pointless, but I see now that it has a (different) use case - outside of the scope of this issue.\r\n\r\nMaybe let's create a separate issue in the PC namespace repo about this wider (PC namespace) topic.\nAh, sorry - followed a clickbaity link from [podnews](https://podnews.net/update/size-matters), and thought this was referring to the spec itself!\r\n\r\n> [Should we drop support for VTT and even HTML file support](https://github.com/AntennaPod/AntennaPod/issues/4935#issuecomment-1465273529?utm_source=podnews.net&utm_medium=web&utm_campaign=podnews.net:2023-03-13) for the podcast:transcript tag?\r\n\n> do you have objections if I pull in this code to parse SRT files? https://github.com/gusthavosouza/SRTParser.\r\n\r\nIf the license allows that, it should be okay. Probably needs some changes, though, because we only want English comments and maybe don't need all the features.\n> because we only want English comments\r\n\r\nDo we? With 'comments' do you refer to the actual transcripts (subtitles)? If a user has their device in French and there are transcripts/subtitles available in French, why not use that instead.\r\n\r\nSide note on implementation: I would be in favour of storing the transcript 'on drive' for downloaded episodes. As we've discussed for chapters, it's probably too big for in the database, and retrieving it only on playtime causes issues like #6062.\nThis issue has been mentioned on **AntennaPod Forum**. There might be relevant details there:\n\nhttps://forum.antennapod.org/t/podcast-subtitles/3365/4\n\n@keunes - I'm done with the data parsing for JSON and working on the SRT format now for ``. After I'm done with the data storage, I would like some mockups on how transcription would work in the AP app.\r\n\r\n1. How does transcription display while an episode is being played? Does it by default hover as an overlay and users can click on the words to jump into a full timecode view?\r\n2. In the timecode full transcription view, I assume the user can scroll back and forward to view the transcription and tap on a timecode to jump into the audio? Would each word highlight to follow along the audio?\r\n3. The user can copy and paste any portion transcript?\r\n4. Without the overlay of the words, can users jump to view the transcript before listening, how would that work?\r\n5. Propose Phase 2 : Can users search the transcripts in one episode, across all episodes and subscriptions?\nYeey. That's great news @tonytamsf!\n\nLet me try to reply to some of your questions:\n\n> How does transcription display while an episode is being played? Does it by default hover as an overlay and users can click on the words to jump into a full timecode view?\n\nBy default this 'live subtitling' should be enabled/visible in the full player, for discoverability (there are not yet many feeds with this tag, so we want to show it when it's available). It should be possible via a setting in the UI section to disable this. (I expect that someone at some point will ask to make this a setting at podcast level, e.g. to only turn it on for their language learning, but let's see.)\n\nWe'll need a mock-up for this. We can probably take inspiration from some of the other apps who have enabled this already. To make it work nicely, we might have to make some design/UI changes.\n\n> In the timecode full transcription view, I assume the user can scroll back and forward to view the transcription and tap on a timecode to jump into the audio?\n\nYes. We'll need a mock-up for this.\n\n> Would each word highlight to follow along the audio?\n\nDepends. It's not always possible at word-level. E.g. SRT/VTT does not \u2013 here I think we should highlight each fragment.\n\nIn any case, I think the highlighting should be quite subtle (and I'm wondering if it's acceptable if e.g. highlight colour is not visible to visually impaired/does not comply with accessibility standards). We'll need a mock-up for this.\n\nhttps://github.com/Podcastindex-org/podcast-namespace/blob/main/transcripts/transcripts.md\n\n(~~Which transcript file types do you support at thi point?~~ I see it's SRT and JSON.)\n\n> The user can copy and paste any portion transcript?\n\nYes.\n\n> Without the overlay of the words, can users jump to view the transcript before listening, how would that work?\n\nYes, this should be possible. I made a proposal a long time ago here, following user feedback on a beta version: https://forum.antennapod.org/t/user-feedback-swipe-navigation-from-player-screen-2-3-beta/1119\n\nIt's probably a lot of work to implement, bit I still stand behind the UX concept.\n\n(As a back-up, there should probably be an entry in the overflow menu.)\n\n> Propose Phase 2 : Can users search the transcripts in one episode, across all episodes and subscriptions?\n\nThat would be cool indeed. Certainly *within* the current episode (e.g. to find the section where they talk about X). Global search is an entirely separate thing.\n> I made a proposal a long time ago here... It's probably a lot of work to implement, bit I still stand behind the UX concept. (As a back-up, there should probably be an entry in the overflow menu.)\r\n\r\nThat's outside the scope of this PR (and would need some discussion). For now, I would do the overflow button. There is enough to discuss about the subtitles dialog/page itself\nI have a working PR that can parse, scroll through the transcript while following the audio. Feel free to download a test version and give some feedback. \r\n I use `Podnews Daily` to do my test https://github.com/AntennaPod/AntennaPod/pull/6710\r\n\r\nUnfortunately, after sampling podcasts that I am subscribed to, the state of the transcript format is still not super well supported. Here is a sample of of 104 feeds\r\n\r\n# Podcasts sampling\r\n- Roblox Tech Talk - `text/plain` https://share.transistor.fm/s/39ce510f/transcript.txt\r\n - parsable with timecoees\r\n- Dev Interrupted - `text/html` https://feeds.buzzsprout.com/1422892/10190284/transcript\r\n - not parsable\r\n- The Method - json & 'text/html' https://feeds.buzzsprout.com/1859927/9638130/transcript\r\n - html not parsable\r\n - json is fine https://feeds.buzzsprout.com/1859927/9638130/transcript.json\r\n - (only 2 episode)\r\n- Radical Candor - `application/x-subrip` https://freepodcasttranscription.com/transcription/5e6070b67882e784d6b5baf4b19976bb717f1115.srt\r\n - parsable\r\n- Indie Bites - `text/plain` https://share.transistor.fm/s/6cdce2f8/transcript.txt (no timecodes)\r\n - not parsable\r\n- The Golden Hour - `text/html` https://www.podcastone.com/episode/Someones-Getting-Tased--The-Golden-Hour-51-w/-Brendan-Schaub-Erik-Griffin--Chris-DElia?view=transcript\r\n - not parsable\nHi, really exciting times for AntennaPod and Podcsting in general. I've been doing some research about the use of transcript in the Podcasting 2.0 namespace.\r\n- I've found that even these mime types being equivalent `text/srt` `application/srt` `application/x-subrip` most player don't support all 3, so in in a \"test\" feed I declare all for the same file. \r\n- SRT is the most used format, then JSON, VTT and TXT (but these are usually full transcripts, not subtitle with parsable timecodes)\r\n\r\nIn case is useful, I have a feed with different options of redirect/hosting with different formats and mime-types if you want to test different edge cases, as discussed here : https://github.com/podverse/podverse-web/issues/1168#issuecomment-1695231077\r\nProbably the redirect / hosting part is no problem here as that part was for testing CORS in different web players. (Gitlab Pages works best with web players than Archive if something is interested)\r\n\r\n```\r\nEpisode 16\r\nOp3+ archive.org + vtt only\r\n\r\nEpisode 15\r\nOp3+ gitlab + vtt only\r\n\r\nEpisode 09\r\nOp3 + gitlab + vtt\r\nOp3 + archive + srt\r\n\r\nEpisode 08 (without OP3)\r\nGitlab + vtt\r\nArchive + srt\r\n\r\nEpisode Episode 00\r\nOp3 + gitlab + vtt/srt\r\n\r\nAll others\r\nOP3 + archive + vtt/srt\r\n```\r\nA problem that I've found with some player, in case you want to take it into account, is that if there is first a transcript tag with a file that doesn't work, some player won't try the next tag that would work.\r\n\r\nFeed:\r\nhttps://kdeexpress.gitlab.io/feed\r\n\r\n**TL;NR**\r\n\r\nI would prioritize SRT parsing, then JSON and if there is no much trouble VTT given the similarities with SRT. \r\nFor `text/html` and `text/plain` I would either show a new screen with all the text just assuming that is the full transcript to read or just offer a link to be open in the web browser.\nI'd jump in here and say two things:\r\n\r\nThe accurate stat is [contained here](https://stats.podcastindex.org/hourly_counts.json) - which at the time of writing is: \r\n\r\n> \"feedsWithTranscripts\": 38,255\r\n> \"episodesWithTranscripts\": 1,379,606\r\n\r\nThere's obviously a chicken and egg scenario with support. If AntennaPod supports transcripts, it would be a significant benefit to podcasting as a whole, but also to the uptake of this feature. But you'll get considerable promotion when this is launched. (I will, as one guarantee, give you a headline story in Podnews.)\r\n\r\nSecondly; might I suggest you ideally support these in this format:\r\n\r\n1. JSON - this is accurate to the word level, and allows [this kind of highlighted transcript](https://www.steno.fm/show/9b024349-ccf0-5f69-a609-6b82873eab3c/episode/aHR0cHM6Ly9wb2RuZXdzLm5ldC91cGRhdGUvZ2Vuei1mYXN0ZXN0LWdyb3dpbmc=), where the individual word being said is highlighted on screen. That also allows you to lay out closed-captions in a very bespoke way - allowing you to properly wordwrap them. It also allows more features in future like clipping, where you could highlight a word or sentence, and have the app specifically clip that accurately.\r\n\r\n2. SRT - these are accurate to about 32 characters, and therefore the timing isn't as perfect as it could be. [It works like this](https://www.steno.fm/show/917393e3-1b1e-5cef-ace4-edaa54e1f810/episode/YTQ2OWE5ZmQtMzVlOC00MDNhLWIzMDUtZGEyNmU3MDE1ZjBh). \r\n\r\nI'd, frankly, not support TXT or HTML unless you really want to - my suspicion is that these are relatively poorly supported anyway. But it doesn't seem like a heavy lift to simply open these in a webview. (I'm also very unclear if anyone is using VTT.)\r\n\r\nI hope that helps a bit!\n> If AntennaPod supports transcripts\r\n\r\nThanks for chipping in @jamescridland - one of our contributors is already working on this functionality. Hope we can coordinate re your coverage when it gets released. :-)\r\n\r\n> JSON \u2026 That also allows you to lay out closed-captions in a very bespoke way - allowing you to properly wordwrap them\r\n\r\nSee, that's what I was thinking. But I'm also wondering: how. Let's say it is at word level, how do you wrap that into the traditional two lines neatly? Starting from the first word (with its time stamp) and fill up the two lines until the screen is full, and take the end-time of the last word as the end-time for these two lines? Do you 'hard break' when there's a comma, or a period? What about speaker changes?\r\n\r\nI feel that SRT - given that it's the provider's responsibility to make it work with the character limit - often will provide a more logical view (even if less accurate).\r\n\r\nEither way - I'm very happy that both SRT & JSON already can be fetched and parsed \ud83d\ude00\nThank you @jamescridland for the details, it is helpful.\n\nWhat would be helpful for me when I am implementing the transcript feature is to look at other Android apps that are supporting the transcript tag. Do you recommend an app that has implemented this feature well and taken advantage of the JSON word level time code? \n[Podverse](https://github.com/podverse) could be a reference. [The web displays](https://podverse.fm/es/episode/hazS_hcJz) 1 word per line :-1: , but the mobile (-rn repo) app shows the full sentence :+1: . So I assume it's using a word level JSON.\r\nIn the Android app each line on sentences is a placeholder for the audio timestamps, not exactly a word by word. [Steno.fm](https://www.steno.fm/show/396d9ae0-da7e-5557-b894-b606231fa3ea/episode/QnV6enNwcm91dC0xMzgwNjg5Nw==) is 1 by 1, but I don't think it's open source :-1: \r\n\r\n![imagen](https://github.com/AntennaPod/AntennaPod/assets/2069735/ae51a17b-13b0-4928-934c-9c49b2156130)\r\n![imagen](https://github.com/AntennaPod/AntennaPod/assets/2069735/2d31a517-72df-4b48-9da9-00c957dc6f04)\r\n\n> What would be helpful for me when I am implementing the transcript feature is to look at other Android apps that are supporting the transcript tag.\n\n@tonytamsf Sorry for the silence on my end. I've been doing a comparative analysis of all the We/Android apps that support the transcript tag and will at some point this weekend share a couple of nice examples.\nHello,\r\n\r\nI've thought and designed a bit more over the weekend. Please find below some recordings of (web) apps that I particularly liked, and a link to some mock-ups I made.\r\n\r\nInspiration\r\n---\r\nI tested all Android & web-[apps listed on the Podcast Index website](https://podcastindex.org/apps?appTypes=podcast+player&elements=Transcript) that support the Transcript tag and are accessible without log-in. I always checked episode [1601 - \"Unkool & The Gang\"](https://podcastindex.org/podcast/41504?episode=15754728488) of No agenda. It has [this SRT captions file](https://mp3s.nashownotes.com/NA-1601-Captions.srt). Here is [the podcast's RSS feed](https://feeds.noagendaassets.com/noagenda.xml).\r\n\r\n### Podfriend **\r\nCool because: has nicely designed subtitles, with different colours, and speaker images.\r\n\r\nhttps://github.com/AntennaPod/AntennaPod/assets/11229646/aa6d70d0-77d6-42dd-9d5a-ec7557145dd6\r\n\r\n### Steno **\r\ncool because: grouping of source content into blocks per speaker, highlighting background of actively playing blocks as well as selected block (when paused or searching)\r\n[Try for yourself](https://www.steno.fm/show/856cd618-7f34-57ea-9b84-3600f1f65e7f/episode/aHR0cDovLzE2MDEubm9hZ2VuZGFub3Rlcy5jb20=) - my recording is too big for GitHub.\r\n\r\n### Podfans *\r\ncool because: has up/down arrows in search bar, nice design of timestamps (thin + lighter colour - should try that in my mock-ups too, althgouh they only seem to use mm:ss, not hh)\r\n![Screenshot from 2023-10-29 23-16-03 podfans](https://github.com/AntennaPod/AntennaPod/assets/11229646/e94b019e-d7ba-4824-8c67-de9c5a9459a0)\r\n\r\n### Fountain *\r\ncool because: has a little (i) icon with info about the transcript timings - noting they \"might not be accurate if the podcaster has dynamic ads.\" --> not in mock-ups yet\r\n![Screenshot from 2023-10-29 23-09-47 Fountain](https://github.com/AntennaPod/AntennaPod/assets/11229646/007f0bdd-4fe6-40af-8100-a4cac7b4c1af)\r\n\r\n### Anytime Player *\r\ncool because: has 'follow transcript' toggle, the way scrolling position follows active block\r\n![Screenshot from 2023-10-29 23-13-14 anytime player](https://github.com/AntennaPod/AntennaPod/assets/11229646/350b356a-f936-4b2f-8a55-20c0aae2038d)\r\n\r\n### Podcast Addict\r\ncool because: has option in the player settings to (de)activate subtitles\r\n\r\nMock-up & general considerations\r\n---\r\n\r\nPlease find here the mock-ups I have so far: https://design.penpot.app/#/view/e357a320-7535-11eb-8a88-eb0147e048f5?page-id=eae2ba44-fe23-80be-8003-5736fde8c987§ion=interactions&index=0&share-id=b509ea44-7222-80be-8003-5db588cbed16\r\n\r\nSome notes:\r\n* Several apps leverage speaker indication (either name + colon in SRT, or as metadata in JSON). It would be really neat if we can do that too. \r\n * Steno 'collates' blocks - [Nathan explained how](https://mastodon.social/@keunes/111305523569815424).\r\n * Podfriend & Anytime Player somehow connect speaker info from the subtitles with info from the `person` tags within the item (episode)\r\n```\r\nAdam Curry\r\nJohn C Dvorak\r\n```\r\n* I think we'll have to first identify if we have or can extract speakers, and adjust the design of the player & transcript screens for it. Yet maybe speaker indication (especially on the player screen) might be out of scope for now.\r\n* I kept the playback controls visible on purpose - I think it's handy to be able to pause and rewind when viewing the transcript.\r\n\r\n_The first set of screens you'll see are in case there are speakers extracted/known, which can be displayed on the player screen. Followed by some screens where this is not the case. There's also some other details. Maybe it's best if we have a call @tonytamsf & @ByteHamster to see what's feasible for now._\n@keunes Thanks for the great research and screen casts of other players. I can try to join the next community call about this topic if finding time is difficult \nWe'll be meeting to discuss the mock-ups Thursday 2 November at 21:00 CET, over at https://meet.antennapod.org/transcripts. Anyone interested in this UX review is welcome to join.\nAs discussed and agreed during the meeting:\r\n* implement as full-screen dialog (https://m3.material.io/components/dialogs/overview)\r\n* what to do with landscape player view? For now, easy implementation on the right-hand side.\r\n* store transcript SRT/JSON in filesystem\r\n* if there's word-level JSON without speaker:\r\n * collate text blocks\r\n * Sentence-based (using periods & question marks)\r\n * If long pause, start new block\r\n * If long single block without period, then break it up after x (30?) seconds\r\n * combine highlighting in blocks of min. 1 second (e.g. 2 words) to avoid words being skipped due to 1-second refresh rate.\r\n\r\nDesign change to do:\r\n* tap on CC in player, open transcript dialog\r\n* setting to show/hide closed caption (TBC if in player settings or only in global>UI settings)\r\n\r\nIn separate PRs:\r\n* playback controls in transcript view\r\n* option to reach transcript from ep. detail page; show 'can't jump to postion' warning\r\n* Search in transcript\r\n* Speaker tag (parse & store; display in ep. details; display speaker photo in player screen)", "pull_url": "https://github.com/AntennaPod/AntennaPod/pull/6739", "issue_urls": "[\"https://github.com/AntennaPod/AntennaPod/issues/4935\"]", "test_command": "./gradlew :parser:feed:testDebugUnitTest --tests \"de.danoeh.antennapod.parser.feed.element.namespace.RssParserTest\"", "fix_patch": "diff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItem.java b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItem.java\nindex a8570ea4e6f..a6142048073 100644\n--- a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItem.java\n+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItem.java\n@@ -1,8 +1,10 @@\n package de.danoeh.antennapod.model.feed;\n \n+import android.util.Log;\n import androidx.annotation.NonNull;\n import androidx.annotation.Nullable;\n \n+import org.apache.commons.lang3.StringUtils;\n import org.apache.commons.lang3.builder.ToStringBuilder;\n import org.apache.commons.lang3.builder.ToStringStyle;\n \n@@ -20,6 +22,8 @@\n */\n public class FeedItem extends FeedComponent implements Serializable {\n \n+ public static String TAG = \"FeedItem\";\n+\n /** tag that indicates this item is in the queue */\n public static final String TAG_QUEUE = \"Queue\";\n /** tag that indicates this item is in favorites */\n@@ -42,6 +46,8 @@ public class FeedItem extends FeedComponent implements Serializable {\n private transient Feed feed;\n private long feedId;\n private String podcastIndexChapterUrl;\n+ private String podcastIndexTranscriptUrl;\n+ private String podcastIndexTranscriptType;\n \n private int state;\n public static final int NEW = -1;\n@@ -82,7 +88,8 @@ public FeedItem() {\n * */\n public FeedItem(long id, String title, String link, Date pubDate, String paymentLink, long feedId,\n boolean hasChapters, String imageUrl, int state,\n- String itemIdentifier, long autoDownload, String podcastIndexChapterUrl) {\n+ String itemIdentifier, long autoDownload, String podcastIndexChapterUrl,\n+ String transcriptType, String transcriptUrl) {\n this.id = id;\n this.title = title;\n this.link = link;\n@@ -95,6 +102,10 @@ public FeedItem(long id, String title, String link, Date pubDate, String payment\n this.itemIdentifier = itemIdentifier;\n this.autoDownload = autoDownload;\n this.podcastIndexChapterUrl = podcastIndexChapterUrl;\n+ if (transcriptUrl != null) {\n+ this.podcastIndexTranscriptUrl = transcriptUrl;\n+ this.podcastIndexTranscriptType = transcriptType;\n+ }\n }\n \n /**\n@@ -162,6 +173,9 @@ public void updateFromOther(FeedItem other) {\n if (other.podcastIndexChapterUrl != null) {\n podcastIndexChapterUrl = other.podcastIndexChapterUrl;\n }\n+ if (other.getPodcastIndexTranscriptUrl() != null) {\n+ podcastIndexTranscriptUrl = other.podcastIndexTranscriptUrl;\n+ }\n }\n \n /**\n@@ -440,6 +454,45 @@ public void setPodcastIndexChapterUrl(String url) {\n podcastIndexChapterUrl = url;\n }\n \n+ public void setPodcastIndexTranscriptUrl(String type, String url) {\n+ updateTranscriptPreferredFormat(type, url);\n+ }\n+\n+ public String getPodcastIndexTranscriptUrl() {\n+ return podcastIndexTranscriptUrl;\n+ }\n+\n+ public String getPodcastIndexTranscriptType() {\n+ return podcastIndexTranscriptType;\n+ }\n+\n+ public void updateTranscriptPreferredFormat(String type, String url) {\n+ if (StringUtils.isEmpty(type) || StringUtils.isEmpty(url)) {\n+ return;\n+ }\n+\n+ String canonicalSrr = \"application/srr\";\n+ String jsonType = \"application/json\";\n+\n+ switch (type) {\n+ case \"application/json\":\n+ podcastIndexTranscriptUrl = url;\n+ podcastIndexTranscriptType = type;\n+ break;\n+ case \"application/srr\":\n+ case \"application/srt\":\n+ case \"application/x-subrip\":\n+ if (podcastIndexTranscriptUrl == null || !podcastIndexTranscriptType.equals(jsonType)) {\n+ podcastIndexTranscriptUrl = url;\n+ podcastIndexTranscriptType = canonicalSrr;\n+ }\n+ break;\n+ default:\n+ Log.d(TAG, \"Invalid format for transcript \" + type);\n+ break;\n+ }\n+ }\n+\n @NonNull\n @Override\n public String toString() {\ndiff --git a/parser/feed/src/main/java/de/danoeh/antennapod/parser/feed/namespace/PodcastIndex.java b/parser/feed/src/main/java/de/danoeh/antennapod/parser/feed/namespace/PodcastIndex.java\nindex 1f543a5ae53..dd11fb4e7b4 100644\n--- a/parser/feed/src/main/java/de/danoeh/antennapod/parser/feed/namespace/PodcastIndex.java\n+++ b/parser/feed/src/main/java/de/danoeh/antennapod/parser/feed/namespace/PodcastIndex.java\n@@ -14,6 +14,8 @@ public class PodcastIndex extends Namespace {\n private static final String URL = \"url\";\n private static final String FUNDING = \"funding\";\n private static final String CHAPTERS = \"chapters\";\n+ private static final String TRANSCRIPT = \"transcript\";\n+ private static final String TYPE = \"type\";\n \n @Override\n public SyndElement handleElementStart(String localName, HandlerState state,\n@@ -28,6 +30,12 @@ public SyndElement handleElementStart(String localName, HandlerState state,\n if (!TextUtils.isEmpty(href)) {\n state.getCurrentItem().setPodcastIndexChapterUrl(href);\n }\n+ } else if (TRANSCRIPT.equals(localName)) {\n+ String href = attributes.getValue(URL);\n+ String type = attributes.getValue(TYPE);\n+ if (!TextUtils.isEmpty(href) && !TextUtils.isEmpty(type)) {\n+ state.getCurrentItem().setPodcastIndexTranscriptUrl(type, href);\n+ }\n }\n return new SyndElement(localName, this);\n }\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBUpgrader.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBUpgrader.java\nindex e4a1f5a3dd8..bde74948f5d 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBUpgrader.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/DBUpgrader.java\n@@ -334,6 +334,12 @@ static void upgrade(final SQLiteDatabase db, final int oldVersion, final int new\n db.execSQL(\"ALTER TABLE \" + PodDBAdapter.TABLE_NAME_FEEDS\n + \" ADD COLUMN \" + PodDBAdapter.KEY_NEW_EPISODES_ACTION + \" INTEGER DEFAULT 0\");\n }\n+ if (oldVersion < 3030000) {\n+ db.execSQL(\"ALTER TABLE \" + PodDBAdapter.TABLE_NAME_FEED_ITEMS\n+ + \" ADD COLUMN \" + PodDBAdapter.KEY_PODCASTINDEX_TRANSCRIPT_URL + \" TEXT\");\n+ db.execSQL(\"ALTER TABLE \" + PodDBAdapter.TABLE_NAME_FEED_ITEMS\n+ + \" ADD COLUMN \" + PodDBAdapter.KEY_PODCASTINDEX_TRANSCRIPT_TYPE + \" TEXT\");\n+ }\n }\n \n }\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java\nindex 21f12e2230c..3140fdd0ea5 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java\n@@ -52,7 +52,7 @@ public class PodDBAdapter {\n \n private static final String TAG = \"PodDBAdapter\";\n public static final String DATABASE_NAME = \"Antennapod.db\";\n- public static final int VERSION = 3010000;\n+ public static final int VERSION = 3030000;\n \n /**\n * Maximum number of arguments for IN-operator.\n@@ -120,6 +120,8 @@ public class PodDBAdapter {\n public static final String KEY_EPISODE_NOTIFICATION = \"episode_notification\";\n public static final String KEY_NEW_EPISODES_ACTION = \"new_episodes_action\";\n public static final String KEY_PODCASTINDEX_CHAPTER_URL = \"podcastindex_chapter_url\";\n+ public static final String KEY_PODCASTINDEX_TRANSCRIPT_URL = \"podcastindex_transcript_url\";\n+ public static final String KEY_PODCASTINDEX_TRANSCRIPT_TYPE = \"podcastindex_transcript_type\";\n \n // Table names\n public static final String TABLE_NAME_FEEDS = \"Feeds\";\n@@ -172,7 +174,9 @@ public class PodDBAdapter {\n + KEY_HAS_CHAPTERS + \" INTEGER,\" + KEY_ITEM_IDENTIFIER + \" TEXT,\"\n + KEY_IMAGE_URL + \" TEXT,\"\n + KEY_AUTO_DOWNLOAD_ATTEMPTS + \" INTEGER,\"\n- + KEY_PODCASTINDEX_CHAPTER_URL + \" TEXT)\";\n+ + KEY_PODCASTINDEX_CHAPTER_URL + \" TEXT,\"\n+ + KEY_PODCASTINDEX_TRANSCRIPT_TYPE + \" TEXT,\"\n+ + KEY_PODCASTINDEX_TRANSCRIPT_URL + \" TEXT\" + \")\";\n \n private static final String CREATE_TABLE_FEED_MEDIA = \"CREATE TABLE \"\n + TABLE_NAME_FEED_MEDIA + \" (\" + TABLE_PRIMARY_KEY + KEY_DURATION\n@@ -260,7 +264,9 @@ public class PodDBAdapter {\n + TABLE_NAME_FEED_ITEMS + \".\" + KEY_ITEM_IDENTIFIER + \", \"\n + TABLE_NAME_FEED_ITEMS + \".\" + KEY_IMAGE_URL + \", \"\n + TABLE_NAME_FEED_ITEMS + \".\" + KEY_AUTO_DOWNLOAD_ATTEMPTS + \", \"\n- + TABLE_NAME_FEED_ITEMS + \".\" + KEY_PODCASTINDEX_CHAPTER_URL;\n+ + TABLE_NAME_FEED_ITEMS + \".\" + KEY_PODCASTINDEX_CHAPTER_URL + \", \"\n+ + TABLE_NAME_FEED_ITEMS + \".\" + KEY_PODCASTINDEX_TRANSCRIPT_TYPE + \", \"\n+ + TABLE_NAME_FEED_ITEMS + \".\" + KEY_PODCASTINDEX_TRANSCRIPT_URL;\n \n private static final String KEYS_FEED_MEDIA =\n TABLE_NAME_FEED_MEDIA + \".\" + KEY_ID + \" AS \" + SELECT_KEY_MEDIA_ID + \", \"\n@@ -656,6 +662,14 @@ private long updateOrInsertFeedItem(FeedItem item, boolean saveFeed) {\n values.put(KEY_IMAGE_URL, item.getImageUrl());\n values.put(KEY_PODCASTINDEX_CHAPTER_URL, item.getPodcastIndexChapterUrl());\n \n+ // We only store one transcript url, we prefer JSON if it exists\n+ String type = item.getPodcastIndexTranscriptType();\n+ String url = item.getPodcastIndexTranscriptUrl();\n+ if (url != null) {\n+ values.put(KEY_PODCASTINDEX_TRANSCRIPT_TYPE, type);\n+ values.put(KEY_PODCASTINDEX_TRANSCRIPT_URL, url);\n+ }\n+\n if (item.getId() == 0) {\n item.setId(db.insert(TABLE_NAME_FEED_ITEMS, null, values));\n } else {\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemCursorMapper.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemCursorMapper.java\nindex fcf51e31ec3..c4e271eb23e 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemCursorMapper.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemCursorMapper.java\n@@ -28,6 +28,9 @@ public static FeedItem convert(@NonNull Cursor cursor) {\n int indexAutoDownload = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_AUTO_DOWNLOAD_ATTEMPTS);\n int indexImageUrl = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_IMAGE_URL);\n int indexPodcastIndexChapterUrl = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_PODCASTINDEX_CHAPTER_URL);\n+ int indexPodcastIndexTranscriptUrl = cursor.getColumnIndexOrThrow(PodDBAdapter.KEY_PODCASTINDEX_TRANSCRIPT_URL);\n+ int indexPodcastIndexTranscriptType = cursor.getColumnIndexOrThrow(\n+ PodDBAdapter.KEY_PODCASTINDEX_TRANSCRIPT_TYPE);\n \n long id = cursor.getInt(indexId);\n String title = cursor.getString(indexTitle);\n@@ -41,8 +44,11 @@ public static FeedItem convert(@NonNull Cursor cursor) {\n long autoDownload = cursor.getLong(indexAutoDownload);\n String imageUrl = cursor.getString(indexImageUrl);\n String podcastIndexChapterUrl = cursor.getString(indexPodcastIndexChapterUrl);\n+ String podcastIndexTranscriptUrl = cursor.getString(indexPodcastIndexTranscriptUrl);\n+ String podcastIndexTranscriptType = cursor.getString(indexPodcastIndexTranscriptType);\n \n return new FeedItem(id, title, link, pubDate, paymentLink, feedId,\n- hasChapters, imageUrl, state, itemIdentifier, autoDownload, podcastIndexChapterUrl);\n+ hasChapters, imageUrl, state, itemIdentifier, autoDownload, podcastIndexChapterUrl,\n+ podcastIndexTranscriptType, podcastIndexTranscriptUrl);\n }\n }\n", "test_patch": "diff --git a/parser/feed/src/test/java/de/danoeh/antennapod/parser/feed/element/namespace/RssParserTest.java b/parser/feed/src/test/java/de/danoeh/antennapod/parser/feed/element/namespace/RssParserTest.java\nindex 88ac5c73146..4ce8911e921 100644\n--- a/parser/feed/src/test/java/de/danoeh/antennapod/parser/feed/element/namespace/RssParserTest.java\n+++ b/parser/feed/src/test/java/de/danoeh/antennapod/parser/feed/element/namespace/RssParserTest.java\n@@ -97,6 +97,14 @@ public void testMultipleFundingTags() throws Exception {\n assertEquals(\"https://example.com/funding3\", feed.getPaymentLinks().get(2).url);\n }\n \n+ @Test\n+ public void testPodcastIndexTranscript() throws Exception {\n+ File feedFile = FeedParserTestHelper.getFeedFile(\"feed-rss-testPodcastIndexTranscript.xml\");\n+ Feed feed = FeedParserTestHelper.runFeedParser(feedFile);\n+ assertEquals(\"https://podnews.net/audio/podnews231011.mp3.json\", feed.getItems().get(0).getPodcastIndexTranscriptUrl());\n+ assertEquals(\"application/json\", feed.getItems().get(0).getPodcastIndexTranscriptType());\n+ }\n+\n @Test\n public void testUnsupportedElements() throws Exception {\n File feedFile = FeedParserTestHelper.getFeedFile(\"feed-rss-testUnsupportedElements.xml\");\ndiff --git a/parser/feed/src/test/resources/feed-rss-testPodcastIndexTranscript.xml b/parser/feed/src/test/resources/feed-rss-testPodcastIndexTranscript.xml\nnew file mode 100644\nindex 00000000000..f972ee2076e\n--- /dev/null\n+++ b/parser/feed/src/test/resources/feed-rss-testPodcastIndexTranscript.xml\n@@ -0,0 +1,13 @@\n+\n+\n+ \n+ title\n+ \n+ Podcasts in YouTube make it to the UK\n+ https://podnews.net/update/youtube-podcasts-uk\n+ Tue, 10 Oct 2023 08:46:31 +0000\n+ \n+ \n+ \n+ \n+\n", "n2p_tests": "{\"de.danoeh.antennapod.parser.feed.element.namespace.RssParserTest.testUnsupportedElements\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.parser.feed.element.namespace.RssParserTest.testRss2Basic\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.parser.feed.element.namespace.RssParserTest.testImageWithWhitespace\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.parser.feed.element.namespace.RssParserTest.testMediaContentMime\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.parser.feed.element.namespace.RssParserTest.testMultipleFundingTags\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.parser.feed.element.namespace.RssParserTest.testPodcastIndexTranscript\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "AntennaPod__AntennaPod-6659", "org": "AntennaPod", "repo": "AntennaPod", "number": 6659, "state": "closed", "title": "Add sort downloads by size feature", "body": "I want to try to resolve #6642 .\r\nPlease make a review. I hope it helps.", "base": "{\"label\": \"AntennaPod:develop\", \"ref\": \"develop\", \"sha\": \"574ec1434c885429e0d9b4061dff765eb7284701\"}", "resolved_issues": "[{\"number\": 6642, \"title\": \"Sort downloads by size\", \"body\": \"### Checklist\\n\\n- [X] I have used the search function for [open](https://github.com/AntennaPod/AntennaPod/issues) **and** [closed](https://github.com/AntennaPod/AntennaPod/issues?q=is%3Aissue+is%3Aclosed) issues to see if someone else has already submitted the same feature request.\\n- [X] I will describe the problem with as much detail as possible.\\n- [X] This request contains only one single feature, **not** a list of multiple (related) features.\\n\\n### App version\\n\\n3.1.0\\n\\n### Where did you get the app from\\n\\nGoogle Play\\n\\n### Problem you may be having, or feature you want\\n\\nThe Downloads pane supports sorting by date, duration and title, but it would be nice to be able to sort by size of the file, to see large episodes that are taking up space.\\n\\n### Suggested solution\\n\\nAdd a new sort\\n\\n### Screenshots / Drawings / Technical details\\n\\n_No response_\"}]", "lang": "java", "problem_statement": "Sort downloads by size\n### Checklist\n\n- [X] I have used the search function for [open](https://github.com/AntennaPod/AntennaPod/issues) **and** [closed](https://github.com/AntennaPod/AntennaPod/issues?q=is%3Aissue+is%3Aclosed) issues to see if someone else has already submitted the same feature request.\n- [X] I will describe the problem with as much detail as possible.\n- [X] This request contains only one single feature, **not** a list of multiple (related) features.\n\n### App version\n\n3.1.0\n\n### Where did you get the app from\n\nGoogle Play\n\n### Problem you may be having, or feature you want\n\nThe Downloads pane supports sorting by date, duration and title, but it would be nice to be able to sort by size of the file, to see large episodes that are taking up space.\n\n### Suggested solution\n\nAdd a new sort\n\n### Screenshots / Drawings / Technical details\n\n_No response_\n", "hints": "Hey @Julian . I would like to work on this issue!! Is this still open?\nYes, it is still open :)\nGreat!! I would like to work on it then.", "pull_url": "https://github.com/AntennaPod/AntennaPod/pull/6659", "issue_urls": "[\"https://github.com/AntennaPod/AntennaPod/issues/6642\"]", "test_command": "./gradlew :core:testFreeDebugUnitTest --tests \"de.danoeh.antennapod.core.util.FeedItemPermutorsTest\"", "fix_patch": "diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java\nindex ba328adba71..730a3918988 100644\n--- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java\n+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java\n@@ -159,6 +159,7 @@ private void inflateSortMenu(MaterialToolbar toolbar) {\n menu.findItem(R.id.sort_random).setVisible(false);\n menu.findItem(R.id.sort_smart_shuffle).setVisible(false);\n menu.findItem(R.id.keep_sorted).setVisible(false);\n+ menu.findItem(R.id.sort_size).setVisible(true);\n }\n \n @Override\ndiff --git a/app/src/main/java/de/danoeh/antennapod/fragment/MenuItemToSortOrderConverter.java b/app/src/main/java/de/danoeh/antennapod/fragment/MenuItemToSortOrderConverter.java\nindex 51911b12281..d4150fbdb5f 100644\n--- a/app/src/main/java/de/danoeh/antennapod/fragment/MenuItemToSortOrderConverter.java\n+++ b/app/src/main/java/de/danoeh/antennapod/fragment/MenuItemToSortOrderConverter.java\n@@ -32,6 +32,10 @@ public static SortOrder convert(MenuItem item) {\n return SortOrder.SMART_SHUFFLE_OLD_NEW;\n } else if (itemId == R.id.sort_smart_shuffle_desc) {\n return SortOrder.SMART_SHUFFLE_NEW_OLD;\n+ } else if (itemId == R.id.sort_size_small_large) {\n+ return SortOrder.SIZE_SMALL_LARGE;\n+ } else if (itemId == R.id.sort_size_large_small) {\n+ return SortOrder.SIZE_LARGE_SMALL;\n }\n \n return null;\ndiff --git a/app/src/main/res/menu/sort_menu.xml b/app/src/main/res/menu/sort_menu.xml\nindex f0a22042b07..96ad4b9f6d7 100644\n--- a/app/src/main/res/menu/sort_menu.xml\n+++ b/app/src/main/res/menu/sort_menu.xml\n@@ -75,6 +75,22 @@\n android:title=\"@string/sort_new_old\"/>\n \n \n+\n+ \n+\n+

                  \n+ \n+ \n+ \n+ \n+\n getPermutor(@NonNull SortOrder sortOrder) {\n case SMART_SHUFFLE_NEW_OLD:\n permutor = (queue) -> smartShuffle(queue, false);\n break;\n+ case SIZE_SMALL_LARGE:\n+ comparator = (f1, f2) -> Long.compare(size(f1), size(f2));\n+ break;\n+ case SIZE_LARGE_SMALL:\n+ comparator = (f1, f2) -> Long.compare(size(f2), size(f1));\n+ break;\n }\n \n if (comparator != null) {\n@@ -97,6 +103,10 @@ private static int duration(@Nullable FeedItem item) {\n return (item != null && item.getMedia() != null) ? item.getMedia().getDuration() : 0;\n }\n \n+ private static long size(@Nullable FeedItem item) {\n+ return (item != null && item.getMedia() != null) ? item.getMedia().getSize() : 0;\n+ }\n+\n @NonNull\n private static String itemLink(@Nullable FeedItem item) {\n return (item != null && item.getLink() != null)\ndiff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/SortOrder.java b/model/src/main/java/de/danoeh/antennapod/model/feed/SortOrder.java\nindex 1f9687b2ee6..08504b44545 100644\n--- a/model/src/main/java/de/danoeh/antennapod/model/feed/SortOrder.java\n+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/SortOrder.java\n@@ -20,6 +20,8 @@ public enum SortOrder {\n DURATION_LONG_SHORT(6, INTRA_FEED),\n EPISODE_FILENAME_A_Z(7, INTRA_FEED),\n EPISODE_FILENAME_Z_A(8, INTRA_FEED),\n+ SIZE_SMALL_LARGE(9, INTRA_FEED),\n+ SIZE_LARGE_SMALL(10, INTRA_FEED),\n FEED_TITLE_A_Z(101, INTER_FEED),\n FEED_TITLE_Z_A(102, INTER_FEED),\n RANDOM(103, INTER_FEED),\ndiff --git a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemSortQuery.java b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemSortQuery.java\nindex aae5154d3e9..d4404a08208 100644\n--- a/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemSortQuery.java\n+++ b/storage/database/src/main/java/de/danoeh/antennapod/storage/database/mapper/FeedItemSortQuery.java\n@@ -25,6 +25,12 @@ public static String generateFrom(SortOrder sortOrder) {\n case DURATION_LONG_SHORT:\n sortQuery = PodDBAdapter.TABLE_NAME_FEED_MEDIA + \".\" + PodDBAdapter.KEY_DURATION + \" \" + \"DESC\";\n break;\n+ case SIZE_SMALL_LARGE:\n+ sortQuery = PodDBAdapter.TABLE_NAME_FEED_MEDIA + \".\" + PodDBAdapter.KEY_SIZE + \" \" + \"ASC\";\n+ break;\n+ case SIZE_LARGE_SMALL:\n+ sortQuery = PodDBAdapter.TABLE_NAME_FEED_MEDIA + \".\" + PodDBAdapter.KEY_SIZE + \" \" + \"DESC\";\n+ break;\n default:\n sortQuery = \"\";\n break;\ndiff --git a/ui/i18n/src/main/res/values/strings.xml b/ui/i18n/src/main/res/values/strings.xml\nindex 0697a2f5374..73423f4b5cb 100644\n--- a/ui/i18n/src/main/res/values/strings.xml\n+++ b/ui/i18n/src/main/res/values/strings.xml\n@@ -343,6 +343,7 @@\n Podcast title\n Random\n Smart shuffle\n+ Size\n Please confirm that you want to clear the queue of ALL of the episodes in it\n Time left:\\u0020\n \n@@ -771,6 +772,8 @@\n Old \\u2192 New\n Short \\u2192 Long\n Long \\u2192 Short\n+ Small \\u2192 Large\n+ Large \\u2192 Small\n \n \n Include playback position\n", "test_patch": "diff --git a/core/src/test/java/de/danoeh/antennapod/core/util/FeedItemPermutorsTest.java b/core/src/test/java/de/danoeh/antennapod/core/util/FeedItemPermutorsTest.java\nindex 9c48f8df7eb..be4012cb6cc 100644\n--- a/core/src/test/java/de/danoeh/antennapod/core/util/FeedItemPermutorsTest.java\n+++ b/core/src/test/java/de/danoeh/antennapod/core/util/FeedItemPermutorsTest.java\n@@ -112,6 +112,26 @@ public void testPermutorForRule_DURATION_DESC() {\n assertTrue(checkIdOrder(itemList, 3, 2, 1)); // after sorting\n }\n \n+ @Test\n+ public void testPermutorForRule_size_asc() {\n+ Permutor permutor = FeedItemPermutors.getPermutor(SortOrder.SIZE_SMALL_LARGE);\n+\n+ List itemList = getTestList();\n+ assertTrue(checkIdOrder(itemList, 1, 3, 2)); // before sorting\n+ permutor.reorder(itemList);\n+ assertTrue(checkIdOrder(itemList, 1, 2, 3)); // after sorting\n+ }\n+\n+ @Test\n+ public void testPermutorForRule_size_desc() {\n+ Permutor permutor = FeedItemPermutors.getPermutor(SortOrder.SIZE_LARGE_SMALL);\n+\n+ List itemList = getTestList();\n+ assertTrue(checkIdOrder(itemList, 1, 3, 2)); // before sorting\n+ permutor.reorder(itemList);\n+ assertTrue(checkIdOrder(itemList, 3, 2, 1)); // after sorting\n+ }\n+\n @Test\n public void testPermutorForRule_DURATION_DESC_NullMedia() {\n Permutor permutor = FeedItemPermutors.getPermutor(SortOrder.DURATION_LONG_SHORT);\n@@ -166,21 +186,21 @@ private List getTestList() {\n calendar.set(2019, 0, 1); // January 1st\n Feed feed1 = new Feed(null, null, \"Feed title 1\");\n FeedItem feedItem1 = new FeedItem(1, \"Title 1\", null, null, calendar.getTime(), 0, feed1);\n- FeedMedia feedMedia1 = new FeedMedia(0, feedItem1, 1000, 0, 0, null, null, null, true, null, 0, 0);\n+ FeedMedia feedMedia1 = new FeedMedia(0, feedItem1, 1000, 0, 100, null, null, null, true, null, 0, 0);\n feedItem1.setMedia(feedMedia1);\n itemList.add(feedItem1);\n \n calendar.set(2019, 2, 1); // March 1st\n Feed feed2 = new Feed(null, null, \"Feed title 3\");\n FeedItem feedItem2 = new FeedItem(3, \"Title 3\", null, null, calendar.getTime(), 0, feed2);\n- FeedMedia feedMedia2 = new FeedMedia(0, feedItem2, 3000, 0, 0, null, null, null, true, null, 0, 0);\n+ FeedMedia feedMedia2 = new FeedMedia(0, feedItem2, 3000, 0, 300, null, null, null, true, null, 0, 0);\n feedItem2.setMedia(feedMedia2);\n itemList.add(feedItem2);\n \n calendar.set(2019, 1, 1); // February 1st\n Feed feed3 = new Feed(null, null, \"Feed title 2\");\n FeedItem feedItem3 = new FeedItem(2, \"Title 2\", null, null, calendar.getTime(), 0, feed3);\n- FeedMedia feedMedia3 = new FeedMedia(0, feedItem3, 2000, 0, 0, null, null, null, true, null, 0, 0);\n+ FeedMedia feedMedia3 = new FeedMedia(0, feedItem3, 2000, 0, 200, null, null, null, true, null, 0, 0);\n feedItem3.setMedia(feedMedia3);\n itemList.add(feedItem3);\n \n", "n2p_tests": "{\"de.danoeh.antennapod.core.util.FeedItemPermutorsTest.testPermutorForRule_EPISODE_TITLE_ASC\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.util.FeedItemPermutorsTest.testPermutorForRule_FEED_TITLE_DESC_NullTitle\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.util.FeedItemPermutorsTest.testPermutorForRule_DATE_DESC\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.util.FeedItemPermutorsTest.testPermutorForRule_DURATION_DESC_NullMedia\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.util.FeedItemPermutorsTest.testPermutorForRule_FEED_TITLE_DESC\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.util.FeedItemPermutorsTest.testPermutorForRule_size_desc\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.util.FeedItemPermutorsTest.testPermutorForRule_DURATION_DESC\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.util.FeedItemPermutorsTest.testPermutorForRule_DATE_ASC\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.util.FeedItemPermutorsTest.testPermutorForRule_DURATION_ASC\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.util.FeedItemPermutorsTest.testPermutorForRule_EPISODE_TITLE_DESC\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.util.FeedItemPermutorsTest.testPermutorForRule_DATE_ASC_NulPubDatel\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.util.FeedItemPermutorsTest.testPermutorForRule_FEED_TITLE_ASC\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.util.FeedItemPermutorsTest.testEnsureNonNullPermutors\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.util.FeedItemPermutorsTest.testPermutorForRule_size_asc\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.util.FeedItemPermutorsTest.testPermutorForRule_EPISODE_TITLE_ASC_NullTitle\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "AntennaPod__AntennaPod-6573", "org": "AntennaPod", "repo": "AntennaPod", "number": 6573, "state": "closed", "title": "Add volume boost", "body": "This PR changes \"Volume reduction\" setting into \"Volume adaptation\" setting, adding three extra options for volume boost in addition to existing light and heavy reduction options-\r\n\r\nThis fixes #5286", "base": "{\"label\": \"AntennaPod:develop\", \"ref\": \"develop\", \"sha\": \"5ae766b1a1557e2a54627e6b3c83c54c6578995d\"}", "resolved_issues": "[{\"number\": 5286, \"title\": \"Option to allow boosting audio volume over 100%\", \"body\": \"# Checklist\\r\\n\\r\\n- [x ] I have used the search function to see if someone else has already submitted the same feature request.\\r\\n- [ x] I will only create one feature request per issue.\\r\\n- [x ] I will describe the problem with as much detail as possible.\\r\\n\\r\\n# System info\\r\\n\\r\\n**App version**: 2.2.1 (latest)\\r\\n\\r\\n**App source**: Google Play\\r\\n\\r\\n# Feature description\\r\\n\\r\\n**Problem you may be having, or feature you want**:\\r\\nSome of the episodes I have are using a lower audio volume, and even if I'm at 100% of the volume I cannot hear correctly.\\r\\n\\r\\n**Suggested solution**:\\r\\nMaybe we could implement an option that allow to boost audio volume over 100% ?\\r\\nFor safety reasons, it could be an option that is disabled by default and is available to be enabled in the advanced settings tab.\\r\\n\"}]", "lang": "java", "problem_statement": "Option to allow boosting audio volume over 100%\n# Checklist\r\n\r\n- [x ] I have used the search function to see if someone else has already submitted the same feature request.\r\n- [ x] I will only create one feature request per issue.\r\n- [x ] I will describe the problem with as much detail as possible.\r\n\r\n# System info\r\n\r\n**App version**: 2.2.1 (latest)\r\n\r\n**App source**: Google Play\r\n\r\n# Feature description\r\n\r\n**Problem you may be having, or feature you want**:\r\nSome of the episodes I have are using a lower audio volume, and even if I'm at 100% of the volume I cannot hear correctly.\r\n\r\n**Suggested solution**:\r\nMaybe we could implement an option that allow to boost audio volume over 100% ?\r\nFor safety reasons, it could be an option that is disabled by default and is available to be enabled in the advanced settings tab.\r\n\n", "hints": "Hi and thank you for writing this issue!\n\nIt looks like you did not follow our issue template. In case you accidentally deleted the template, you can find the version for bug reports [here](https://raw.githubusercontent.com/AntennaPod/AntennaPod/develop/.github/ISSUE_TEMPLATE/bug_report.md) and the version for feature requests [here](https://raw.githubusercontent.com/AntennaPod/AntennaPod/develop/.github/ISSUE_TEMPLATE/feature_request.md). Please copy the matching template and then edit your post to follow the template. Please also make sure to use the [search function](https://github.com/AntennaPod/AntennaPod/issues?q=is%3Aissue) to look for open **and** closed issues about the same topic.\n\nIn order to properly deal with the issue, we need the information requested in the template. Please note that dealing with duplicate issues and asking users to follow the issue template takes away a lot of time from the developers. That time can then not be spent to actually implement features.\nRelated: #2187\nInterested in seeing this feature happen.\nThis is the reason for me leaving this app that actually I like a lot.\r\n\r\nWhen driving a car, the traffic instructions are sometimes so much louder than a badly recorded hardly audible podcast that it blows my ears. For health reasons, I have to switch now. (I am not exaggerating - it is literally painful.)\r\n\r\nThanks for the great work so far!", "pull_url": "https://github.com/AntennaPod/AntennaPod/pull/6573", "issue_urls": "[\"https://github.com/AntennaPod/AntennaPod/issues/5286\"]", "test_command": "./gradlew :core:testFreeDebugUnitTest --tests \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest\"", "fix_patch": "diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java\nindex ae9e003d504..0e4c883cfe1 100644\n--- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java\n+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java\n@@ -156,7 +156,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {\n setupAutoDownloadPreference();\n setupKeepUpdatedPreference();\n setupAutoDeletePreference();\n- setupVolumeReductionPreferences();\n+ setupVolumeAdaptationPreferences();\n setupNewEpisodesAction();\n setupAuthentificationPreference();\n setupEpisodeFilterPreference();\n@@ -166,7 +166,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {\n setupTags();\n \n updateAutoDeleteSummary();\n- updateVolumeReductionValue();\n+ updateVolumeAdaptationValue();\n updateAutoDownloadEnabled();\n updateNewEpisodesAction();\n \n@@ -317,9 +317,9 @@ private void updateAutoDeleteSummary() {\n }\n }\n \n- private void setupVolumeReductionPreferences() {\n- ListPreference volumeReductionPreference = findPreference(\"volumeReduction\");\n- volumeReductionPreference.setOnPreferenceChangeListener((preference, newValue) -> {\n+ private void setupVolumeAdaptationPreferences() {\n+ ListPreference volumeAdaptationPreference = findPreference(\"volumeReduction\");\n+ volumeAdaptationPreference.setOnPreferenceChangeListener((preference, newValue) -> {\n switch ((String) newValue) {\n case \"off\":\n feedPreferences.setVolumeAdaptionSetting(VolumeAdaptionSetting.OFF);\n@@ -330,28 +330,46 @@ private void setupVolumeReductionPreferences() {\n case \"heavy\":\n feedPreferences.setVolumeAdaptionSetting(VolumeAdaptionSetting.HEAVY_REDUCTION);\n break;\n+ case \"light_boost\":\n+ feedPreferences.setVolumeAdaptionSetting(VolumeAdaptionSetting.LIGHT_BOOST);\n+ break;\n+ case \"medium_boost\":\n+ feedPreferences.setVolumeAdaptionSetting(VolumeAdaptionSetting.MEDIUM_BOOST);\n+ break;\n+ case \"heavy_boost\":\n+ feedPreferences.setVolumeAdaptionSetting(VolumeAdaptionSetting.HEAVY_BOOST);\n+ break;\n default:\n }\n DBWriter.setFeedPreferences(feedPreferences);\n- updateVolumeReductionValue();\n+ updateVolumeAdaptationValue();\n EventBus.getDefault().post(\n new VolumeAdaptionChangedEvent(feedPreferences.getVolumeAdaptionSetting(), feed.getId()));\n return false;\n });\n }\n \n- private void updateVolumeReductionValue() {\n- ListPreference volumeReductionPreference = findPreference(\"volumeReduction\");\n+ private void updateVolumeAdaptationValue() {\n+ ListPreference volumeAdaptationPreference = findPreference(\"volumeReduction\");\n \n switch (feedPreferences.getVolumeAdaptionSetting()) {\n case OFF:\n- volumeReductionPreference.setValue(\"off\");\n+ volumeAdaptationPreference.setValue(\"off\");\n break;\n case LIGHT_REDUCTION:\n- volumeReductionPreference.setValue(\"light\");\n+ volumeAdaptationPreference.setValue(\"light\");\n break;\n case HEAVY_REDUCTION:\n- volumeReductionPreference.setValue(\"heavy\");\n+ volumeAdaptationPreference.setValue(\"heavy\");\n+ break;\n+ case LIGHT_BOOST:\n+ volumeAdaptationPreference.setValue(\"light_boost\");\n+ break;\n+ case MEDIUM_BOOST:\n+ volumeAdaptationPreference.setValue(\"medium_boost\");\n+ break;\n+ case HEAVY_BOOST:\n+ volumeAdaptationPreference.setValue(\"heavy_boost\");\n break;\n }\n }\ndiff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml\nindex 619ab62966e..fb9e2e42544 100644\n--- a/app/src/main/res/xml/feed_settings.xml\n+++ b/app/src/main/res/xml/feed_settings.xml\n@@ -50,12 +50,12 @@\n \n \n+ android:summary=\"@string/feed_volume_adaptation_summary\"\n+ android:title=\"@string/feed_volume_adapdation\" />\n \n 1) {\n+ exoPlayer.setVolume(1f);\n+ loudnessEnhancer.setEnabled(true);\n+ loudnessEnhancer.setTargetGain((int) (1000 * (v - 1)));\n+ } else {\n+ exoPlayer.setVolume(v);\n+ loudnessEnhancer.setEnabled(false);\n+ }\n }\n \n public void start() {\n@@ -335,4 +352,16 @@ int getVideoHeight() {\n void setOnBufferingUpdateListener(Consumer bufferingUpdateListener) {\n this.bufferingUpdateListener = bufferingUpdateListener;\n }\n+\n+ private void initLoudnessEnhancer(int audioStreamId) {\n+ LoudnessEnhancer newEnhancer = new LoudnessEnhancer(audioStreamId);\n+ LoudnessEnhancer oldEnhancer = this.loudnessEnhancer;\n+ if (oldEnhancer != null) {\n+ newEnhancer.setEnabled(oldEnhancer.getEnabled());\n+ newEnhancer.setTargetGain((int) oldEnhancer.getTargetGain());\n+ oldEnhancer.release();\n+ }\n+\n+ this.loudnessEnhancer = newEnhancer;\n+ }\n }\ndiff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml\nindex 7749c6f3c81..50afe630b7a 100644\n--- a/core/src/main/res/values/arrays.xml\n+++ b/core/src/main/res/values/arrays.xml\n@@ -13,16 +13,22 @@\n never\n \n \n- \n- @string/feed_volume_reduction_off\n- @string/feed_volume_reduction_light\n+ \n @string/feed_volume_reduction_heavy\n+ @string/feed_volume_reduction_light\n+ @string/feed_volume_reduction_off\n+ @string/feed_volume_boost_light\n+ @string/feed_volume_boost_medium\n+ @string/feed_volume_boost_heavy\n \n \n- \n- off\n- light\n+ \n heavy\n+ light\n+ off\n+ light_boost\n+ medium_boost\n+ heavy_boost\n \n \n \ndiff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/VolumeAdaptionSetting.java b/model/src/main/java/de/danoeh/antennapod/model/feed/VolumeAdaptionSetting.java\nindex 67e30e5c817..e71c5ad3634 100644\n--- a/model/src/main/java/de/danoeh/antennapod/model/feed/VolumeAdaptionSetting.java\n+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/VolumeAdaptionSetting.java\n@@ -3,7 +3,10 @@\n public enum VolumeAdaptionSetting {\n OFF(0, 1.0f),\n LIGHT_REDUCTION(1, 0.5f),\n- HEAVY_REDUCTION(2, 0.2f);\n+ HEAVY_REDUCTION(2, 0.2f),\n+ LIGHT_BOOST(3, 1.5f),\n+ MEDIUM_BOOST(4, 2f),\n+ HEAVY_BOOST(5, 2.5f);\n \n private final int value;\n private float adaptionFactor;\ndiff --git a/ui/i18n/src/main/res/values/strings.xml b/ui/i18n/src/main/res/values/strings.xml\nindex 6bdb836dd2b..baed14c5538 100644\n--- a/ui/i18n/src/main/res/values/strings.xml\n+++ b/ui/i18n/src/main/res/values/strings.xml\n@@ -124,11 +124,14 @@\n Retry\n Include in auto downloads\n Auto delete episode\n- Volume reduction\n- Turn down volume for episodes of this podcast: %1$s\n- Off\n- Light\n- Heavy\n+ Volume adaptation\n+ Turn volume for episodes of this podcast up or down: %1$s\n+ No adaption\n+ Light reduction\n+ Heavy reduction\n+ Light boost\n+ Medium boost\n+ Heavy boost\n Always\n Never\n Add to inbox\n", "test_patch": "diff --git a/app/src/androidTest/java/de/test/antennapod/ui/FeedSettingsTest.java b/app/src/androidTest/java/de/test/antennapod/ui/FeedSettingsTest.java\nindex 861c62f1bff..187c9e16dac 100644\n--- a/app/src/androidTest/java/de/test/antennapod/ui/FeedSettingsTest.java\n+++ b/app/src/androidTest/java/de/test/antennapod/ui/FeedSettingsTest.java\n@@ -73,7 +73,7 @@ public void testClickFeedSettings() {\n clickPreference(R.string.auto_delete_label);\n onView(withText(R.string.cancel_label)).perform(click());\n \n- clickPreference(R.string.feed_volume_reduction);\n+ clickPreference(R.string.feed_volume_adapdation);\n onView(withText(R.string.cancel_label)).perform(click());\n }\n }\ndiff --git a/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeAdaptionSettingTest.java b/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeAdaptionSettingTest.java\nindex 4241707bc5d..30767bdc884 100644\n--- a/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeAdaptionSettingTest.java\n+++ b/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeAdaptionSettingTest.java\n@@ -31,11 +31,35 @@ public void mapHeavyReductionToInteger() {\n assertThat(setting.toInteger(), is(equalTo(2)));\n }\n \n+ @Test\n+ public void mapLightBoostToInteger() {\n+ VolumeAdaptionSetting setting = VolumeAdaptionSetting.LIGHT_BOOST;\n+\n+ assertThat(setting.toInteger(), is(equalTo(3)));\n+ }\n+\n+ @Test\n+ public void mapMediumBoostToInteger() {\n+ VolumeAdaptionSetting setting = VolumeAdaptionSetting.MEDIUM_BOOST;\n+\n+ assertThat(setting.toInteger(), is(equalTo(4)));\n+ }\n+\n+ @Test\n+ public void mapHeavyBoostToInteger() {\n+ VolumeAdaptionSetting setting = VolumeAdaptionSetting.HEAVY_BOOST;\n+\n+ assertThat(setting.toInteger(), is(equalTo(5)));\n+ }\n+\n @Test\n public void mapIntegerToVolumeAdaptionSetting() {\n assertThat(VolumeAdaptionSetting.fromInteger(0), is(equalTo(VolumeAdaptionSetting.OFF)));\n assertThat(VolumeAdaptionSetting.fromInteger(1), is(equalTo(VolumeAdaptionSetting.LIGHT_REDUCTION)));\n assertThat(VolumeAdaptionSetting.fromInteger(2), is(equalTo(VolumeAdaptionSetting.HEAVY_REDUCTION)));\n+ assertThat(VolumeAdaptionSetting.fromInteger(3), is(equalTo(VolumeAdaptionSetting.LIGHT_BOOST)));\n+ assertThat(VolumeAdaptionSetting.fromInteger(4), is(equalTo(VolumeAdaptionSetting.MEDIUM_BOOST)));\n+ assertThat(VolumeAdaptionSetting.fromInteger(5), is(equalTo(VolumeAdaptionSetting.HEAVY_BOOST)));\n }\n \n @Test(expected = IllegalArgumentException.class)\n@@ -45,7 +69,7 @@ public void cannotMapNegativeValues() {\n \n @Test(expected = IllegalArgumentException.class)\n public void cannotMapValuesOutOfRange() {\n- VolumeAdaptionSetting.fromInteger(3);\n+ VolumeAdaptionSetting.fromInteger(6);\n }\n \n @Test\n@@ -62,4 +86,31 @@ public void lightReductionYieldsHigherValueThanHeavyReduction() {\n \n assertTrue(\"Light reduction must have higher factor than heavy reduction\", lightReductionFactor > heavyReductionFactor);\n }\n-}\n\\ No newline at end of file\n+\n+ @Test\n+ public void lightBoostYieldsHigherValueThanLightReduction() {\n+ float lightReductionFactor = VolumeAdaptionSetting.LIGHT_REDUCTION.getAdaptionFactor();\n+\n+ float lightBoostFactor = VolumeAdaptionSetting.LIGHT_BOOST.getAdaptionFactor();\n+\n+ assertTrue(\"Light boost must have higher factor than light reduction\", lightBoostFactor > lightReductionFactor);\n+ }\n+\n+ @Test\n+ public void mediumBoostYieldsHigherValueThanLightBoost() {\n+ float lightBoostFactor = VolumeAdaptionSetting.LIGHT_BOOST.getAdaptionFactor();\n+\n+ float mediumBoostFactor = VolumeAdaptionSetting.MEDIUM_BOOST.getAdaptionFactor();\n+\n+ assertTrue(\"Medium boost must have higher factor than light boost\", mediumBoostFactor > lightBoostFactor);\n+ }\n+\n+ @Test\n+ public void heavyBoostYieldsHigherValueThanMediumBoost() {\n+ float mediumBoostFactor = VolumeAdaptionSetting.MEDIUM_BOOST.getAdaptionFactor();\n+\n+ float heavyBoostFactor = VolumeAdaptionSetting.HEAVY_BOOST.getAdaptionFactor();\n+\n+ assertTrue(\"Heavy boost must have higher factor than medium boost\", heavyBoostFactor > mediumBoostFactor);\n+ }\n+}\n", "n2p_tests": "{\"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.mapLightBoostToInteger\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.mapOffToInteger\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.mapHeavyBoostToInteger\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.mapMediumBoostToInteger\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.mapHeavyReductionToInteger\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.lightReductionYieldsHigherValueThanHeavyReduction\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.mediumBoostYieldsHigherValueThanLightBoost\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.mapLightReductionToInteger\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.cannotMapValuesOutOfRange\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.mapIntegerToVolumeAdaptionSetting\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.lightBoostYieldsHigherValueThanLightReduction\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.noAdaptionIfTurnedOff\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.cannotMapNegativeValues\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"de.danoeh.antennapod.core.feed.VolumeAdaptionSettingTest.heavyBoostYieldsHigherValueThanMediumBoost\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "commons-app__apps-android-commons-6529", "org": "commons-app", "repo": "apps-android-commons", "number": 6529, "state": "closed", "title": "Test/2819 add campaigns api tests", "body": "**Description (required)**\r\n\r\nFixes #2819\r\n\r\nWhat changes did you make and why?\r\n\r\nThis PR implements the requested unit tests for the `OkHttpJsonApiClient:getCampaigns` method to ensure the API layer is working correctly.\r\n\r\nThe changes include:\r\n1. **Model Fixes:** Updated `CampaignConfig` and `CampaignResponseDTO` by changing their fields from immutable (`val`) to mutable (`var`). This is essential to allow the Gson library to correctly deserialize the JSON data into these Kotlin data classes during the test run and at application runtime.\r\n2. **Test Resources:** Added two new JSON files (`campaigns_response_with_data.json` and `campaigns_response_empty.json`) to the test resources directory to provide mock responses for the API calls.\r\n3. **Unit Tests:** Implemented the two required test cases in `OkHttpJsonApiClientTests.kt` to cover both scenarios: a successful response with campaign data and a successful response with an empty campaign list.\r\n\r\n**Tests performed (required)**\r\n\r\nTested `ProdDebug` on `Redmi note 13 pro 5g` with API level `35`.", "base": "{\"label\": \"commons-app:main\", \"ref\": \"main\", \"sha\": \"3a55583460d3294efc7ae2000616d1cb4ec6ad68\"}", "resolved_issues": "[{\"number\": 2819, \"title\": \"Add unit test for fetching campaigns\", \"body\": \"**Summary:** \\r\\n\\r\\nNow that we have #2793 in place we can easily test campaigns. At least we should have unit tests to verify the API layer (using mock web server). Specifically we need to test `OkHttpJsonApiClient:getCampaigns` for 2 scenarios. \\r\\n\\r\\n- when the API returns at least 1 campaign(active or otherwise)\\r\\n- when the API returns no campaigns. \"}]", "lang": "kotlin", "problem_statement": "Add unit test for fetching campaigns\n**Summary:** \r\n\r\nNow that we have #2793 in place we can easily test campaigns. At least we should have unit tests to verify the API layer (using mock web server). Specifically we need to test `OkHttpJsonApiClient:getCampaigns` for 2 scenarios. \r\n\r\n- when the API returns at least 1 campaign(active or otherwise)\r\n- when the API returns no campaigns. \n", "hints": "Can i work on this @maskaravivek \nSure take this up. @JobGetabu \nHi @maskaravivek! I would like to work on this issue if no one else is looking into it.\n@SaumiaSinghal Yes, sure. Assigned to you. \nHi @maskaravivek! Thanks for assigning the issue. I'm running into an error on running the tests that I wrote, I have pointed out the error on my draft PR [here](https://github.com/commons-app/apps-android-commons/pull/3862/files#r448880632). Can you please check once whenever you have time? Thanks. \n@neslihanturan Could I work on this one as part of Hacktoberfest?\nHi, if no one else is looking into this issue I'd like to try to resolve it.", "pull_url": "https://github.com/commons-app/apps-android-commons/pull/6529", "issue_urls": "[\"https://github.com/commons-app/apps-android-commons/issues/2819\"]", "test_command": "./gradlew :app:testBetaDebugUnitTest --tests \"fr.free.nrw.commons.OkHttpJsonApiClientTests\"", "fix_patch": "diff --git a/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignConfig.kt b/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignConfig.kt\nindex 6bf0bc0ed6..9f94e85927 100644\n--- a/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignConfig.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignConfig.kt\n@@ -7,8 +7,8 @@ import com.google.gson.annotations.SerializedName\n */\n class CampaignConfig {\n @SerializedName(\"showOnlyLiveCampaigns\")\n- private val showOnlyLiveCampaigns = false\n+ var showOnlyLiveCampaigns = false\n \n @SerializedName(\"sortBy\")\n- private val sortBy: String? = null\n-}\n+ var sortBy: String? = null\n+}\n\\ No newline at end of file\ndiff --git a/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignResponseDTO.kt b/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignResponseDTO.kt\nindex 767732eb78..1656109e74 100644\n--- a/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignResponseDTO.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignResponseDTO.kt\n@@ -8,8 +8,8 @@ import fr.free.nrw.commons.campaigns.models.Campaign\n */\n class CampaignResponseDTO {\n @SerializedName(\"config\")\n- val campaignConfig: CampaignConfig? = null\n+ var campaignConfig: CampaignConfig? = null\n \n @SerializedName(\"campaigns\")\n- val campaigns: List? = null\n-}\n+ var campaigns: List? = null\n+}\n\\ No newline at end of file\n", "test_patch": "diff --git a/app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt\nindex 9e78915603..1a9d1500b5 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt\n@@ -3,6 +3,10 @@ package fr.free.nrw.commons\n import com.google.gson.Gson\n import com.nhaarman.mockitokotlin2.any\n import com.nhaarman.mockitokotlin2.verify\n+import com.nhaarman.mockitokotlin2.times\n+import fr.free.nrw.commons.campaigns.CampaignResponseDTO\n+import fr.free.nrw.commons.campaigns.CampaignConfig\n+import fr.free.nrw.commons.campaigns.models.Campaign\n import fr.free.nrw.commons.explore.depictions.DepictsClient\n import fr.free.nrw.commons.location.LatLng\n import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient\n@@ -10,13 +14,22 @@ import fr.free.nrw.commons.nearby.model.NearbyQueryParams\n import okhttp3.Call\n import okhttp3.HttpUrl\n import okhttp3.OkHttpClient\n+import okhttp3.Request\n import okhttp3.Response\n+import okhttp3.ResponseBody\n+import okhttp3.mockwebserver.MockResponse\n+import org.junit.Assert.assertEquals\n+import org.junit.Assert.assertFalse\n+import org.junit.Assert.assertNotNull\n+import org.junit.Assert.assertTrue\n import org.junit.Before\n import org.junit.Test\n import org.mockito.Mock\n import org.mockito.Mockito\n-import org.mockito.Mockito.times\n+import org.mockito.Mockito.eq\n import org.mockito.MockitoAnnotations\n+import java.io.BufferedReader\n+import java.io.InputStreamReader\n import java.lang.Exception\n \n class OkHttpJsonApiClientTests {\n@@ -45,34 +58,43 @@ class OkHttpJsonApiClientTests {\n @Mock\n lateinit var response: Response\n \n+ @Mock\n+ lateinit var responseBody: ResponseBody\n+\n+ private lateinit var mockWebServer: TestWebServer\n+\n @Before\n fun setUp() {\n MockitoAnnotations.openMocks(this)\n- okHttpJsonApiClient =\n- OkHttpJsonApiClient(\n- okhttpClient,\n- depictsClient,\n- wikiMediaToolforgeUrl,\n- sparqlQueryUrl,\n- campaignsUrl,\n- gson,\n- )\n+ mockWebServer = TestWebServer()\n+ mockWebServer.setUp()\n+ okHttpJsonApiClient = OkHttpJsonApiClient(\n+ okhttpClient,\n+ depictsClient,\n+ wikiMediaToolforgeUrl,\n+ sparqlQueryUrl,\n+ mockWebServer.getUrl(), //use the mock server for the campaignsUrl\n+ gson\n+ )\n Mockito.`when`(okhttpClient.newCall(any())).thenReturn(call)\n Mockito.`when`(call.execute()).thenReturn(response)\n+ Mockito.`when`(response.isSuccessful).thenReturn(false)\n+ Mockito.`when`(response.message).thenReturn(\"test\")\n+ Mockito.`when`(response.body).thenReturn(responseBody)\n+ Mockito.`when`(responseBody.string()).thenReturn(\"{\\\"error\\\": \\\"test\\\"}\")\n }\n \n @Test\n fun testGetNearbyPlacesCustomQuery() {\n- Mockito.`when`(response.message).thenReturn(\"test\")\n try {\n okHttpJsonApiClient.getNearbyPlaces(latLng, \"test\", 10.0, \"test\")\n } catch (e: Exception) {\n- assert(e.message.equals(\"test\"))\n+ assertEquals(\"test\", e.message)\n }\n try {\n okHttpJsonApiClient.getNearbyPlaces(NearbyQueryParams.Rectangular(latLng, latLng), \"test\", true, \"test\")\n } catch (e: Exception) {\n- assert(e.message.equals(\"test\"))\n+ assertEquals(\"test\", e.message)\n }\n verify(okhttpClient, times(2)).newCall(any())\n verify(call, times(2)).execute()\n@@ -80,11 +102,10 @@ class OkHttpJsonApiClientTests {\n \n @Test\n fun testGetNearbyPlaces() {\n- Mockito.`when`(response.message).thenReturn(\"test\")\n try {\n okHttpJsonApiClient.getNearbyPlaces(latLng, \"test\", 10.0, null)\n } catch (e: Exception) {\n- assert(e.message.equals(\"test\"))\n+ assertEquals(\"test\", e.message)\n }\n try {\n okHttpJsonApiClient.getNearbyPlaces(\n@@ -93,9 +114,8 @@ class OkHttpJsonApiClientTests {\n true,\n null\n )\n-\n } catch (e: Exception) {\n- assert(e.message.equals(\"test\"))\n+ assertEquals(\"test\", e.message)\n }\n try {\n okHttpJsonApiClient.getNearbyPlaces(\n@@ -105,7 +125,7 @@ class OkHttpJsonApiClientTests {\n null\n )\n } catch (e: Exception) {\n- assert(e.message.equals(\"test\"))\n+ assertEquals(\"test\", e.message)\n }\n verify(okhttpClient, times(3)).newCall(any())\n verify(call, times(3)).execute()\n@@ -113,18 +133,121 @@ class OkHttpJsonApiClientTests {\n \n @Test\n fun testGetNearbyItemCount() {\n- Mockito.`when`(response.message).thenReturn(\"test\")\n try {\n okHttpJsonApiClient.getNearbyItemCount(NearbyQueryParams.Radial(latLng, 10f))\n } catch (e: Exception) {\n- assert(e.message.equals(\"test\"))\n+ assertEquals(\"test\", e.message)\n }\n try {\n okHttpJsonApiClient.getNearbyItemCount(NearbyQueryParams.Rectangular(latLng, latLng))\n } catch (e: Exception) {\n- assert(e.message.equals(\"test\"))\n+ assertEquals(\"test\", e.message)\n }\n verify(okhttpClient, times(2)).newCall(any())\n verify(call, times(2)).execute()\n }\n-}\n+\n+ @Test\n+ fun testGetCampaignsWithData() {\n+ //loads the json response from resources\n+ val jsonResponse = loadJsonFromResource(\"campaigns_response_with_data.json\")\n+\n+ //mocks the succesfull response chain\n+ Mockito.`when`(response.isSuccessful).thenReturn(true)\n+ Mockito.`when`(response.message).thenReturn(\"OK\")\n+ Mockito.`when`(response.body).thenReturn(responseBody)\n+ Mockito.`when`(responseBody.string()).thenReturn(jsonResponse)\n+\n+ val campaignResponse = CampaignResponseDTO().apply {\n+ campaignConfig = CampaignConfig().apply {\n+ showOnlyLiveCampaigns = false\n+ sortBy = \"startDate\"\n+ }\n+ campaigns = listOf(\n+ Campaign().apply {\n+ title = \"Wiki Loves Monuments\"\n+ isWLMCampaign = true\n+ },\n+ Campaign().apply {\n+ title = \"Wiki Loves Nature\"\n+ isWLMCampaign = false\n+ }\n+ )\n+ }\n+\n+ //any() for the string argument and eq() for the class argument.\n+ Mockito.`when`(\n+ gson.fromJson(\n+ any(),\n+ eq(CampaignResponseDTO::class.java)\n+ )\n+ ).thenReturn(campaignResponse)\n+\n+ //call the getCampaigns\n+ val result: CampaignResponseDTO? = okHttpJsonApiClient.getCampaigns().blockingGet()\n+\n+ //verify the results\n+ assertNotNull(result)\n+ assertNotNull(result?.campaigns)\n+ assertEquals(2, result?.campaigns!!.size)\n+ assertEquals(\"Wiki Loves Monuments\", result.campaigns!![0].title)\n+ assertTrue(result.campaigns!![0].isWLMCampaign)\n+ assertEquals(\"Wiki Loves Nature\", result.campaigns!![1].title)\n+ assertEquals(false, result.campaigns!![1].isWLMCampaign)\n+ assertNotNull(result.campaignConfig)\n+ assertFalse(result.campaignConfig!!.showOnlyLiveCampaigns)\n+ assertEquals(\"startDate\", result.campaignConfig!!.sortBy)\n+ }\n+\n+ @Test\n+ fun testGetCampaignsEmpty() {\n+ //loads the empty json response\n+ val jsonResponse = loadJsonFromResource(\"campaigns_response_empty.json\")\n+\n+ //mocks the successful response chain\n+ Mockito.`when`(response.isSuccessful).thenReturn(true)\n+ Mockito.`when`(response.message).thenReturn(\"OK\")\n+ Mockito.`when`(response.body).thenReturn(responseBody)\n+ Mockito.`when`(responseBody.string()).thenReturn(jsonResponse)\n+\n+ val campaignResponse = CampaignResponseDTO().apply {\n+ campaignConfig = CampaignConfig().apply {\n+ showOnlyLiveCampaigns = false\n+ sortBy = \"startDate\"\n+ }\n+ campaigns = emptyList()\n+ }\n+\n+ //use any() for the string argument and eq() for the class argument.\n+ Mockito.`when`(\n+ gson.fromJson(\n+ any(),\n+ eq(CampaignResponseDTO::class.java)\n+ )\n+ ).thenReturn(campaignResponse)\n+\n+ //calls getCampaigns\n+ val result: CampaignResponseDTO? = okHttpJsonApiClient.getCampaigns().blockingGet()\n+\n+ //verify the results\n+ assertNotNull(result)\n+ assertNotNull(result?.campaigns)\n+ assertTrue(result?.campaigns!!.isEmpty())\n+ assertNotNull(result.campaignConfig)\n+ assertFalse(result.campaignConfig!!.showOnlyLiveCampaigns)\n+ assertEquals(\"startDate\", result.campaignConfig!!.sortBy)\n+ }\n+\n+ fun loadJsonFromResource(fileName: String): String {\n+ val resourcePath = \"raw/$fileName\"\n+ //uses the classloader to find the resource in the test environment\n+ val inputStream = javaClass.classLoader?.getResourceAsStream(resourcePath)\n+\n+ if (inputStream != null) {\n+ //reads the entire stream content\n+ return BufferedReader(InputStreamReader(inputStream)).use { it.readText() }\n+ }\n+ //throws an exception with the correct expected path\n+ throw IllegalArgumentException(\"Resource $fileName not found. Please ensure the file is located in app/src/test/resources/raw/\")\n+ }\n+}\n\\ No newline at end of file\ndiff --git a/app/src/test/resources/raw/campaigns_response_empty.json b/app/src/test/resources/raw/campaigns_response_empty.json\nnew file mode 100644\nindex 0000000000..61903e24c3\n--- /dev/null\n+++ b/app/src/test/resources/raw/campaigns_response_empty.json\n@@ -0,0 +1,7 @@\n+{\n+ \"config\": {\n+ \"showOnlyLiveCampaigns\": false,\n+ \"sortBy\": \"startDate\"\n+ },\n+ \"campaigns\": []\n+}\n\\ No newline at end of file\ndiff --git a/app/src/test/resources/raw/campaigns_response_with_data.json b/app/src/test/resources/raw/campaigns_response_with_data.json\nnew file mode 100644\nindex 0000000000..dab818e2ae\n--- /dev/null\n+++ b/app/src/test/resources/raw/campaigns_response_with_data.json\n@@ -0,0 +1,24 @@\n+{\n+ \"config\": {\n+ \"showOnlyLiveCampaigns\": false,\n+ \"sortBy\": \"startDate\"\n+ },\n+ \"campaigns\": [\n+ {\n+ \"title\": \"Wiki Loves Monuments\",\n+ \"description\": \"A campaign to photograph monuments\",\n+ \"startDate\": \"2025-09-01\",\n+ \"endDate\": \"2025-09-30\",\n+ \"link\": \"https://commons.wikimedia.org/wiki/Campaign:Wiki_Loves_Monuments\",\n+ \"isWLMCampaign\": true\n+ },\n+ {\n+ \"title\": \"Wiki Loves Nature\",\n+ \"description\": \"A campaign to photograph nature\",\n+ \"startDate\": \"2025-06-01\",\n+ \"endDate\": \"2025-06-30\",\n+ \"link\": \"https://commons.wikimedia.org/wiki/Campaign:Wiki_Loves_Nature\",\n+ \"isWLMCampaign\": false\n+ }\n+ ]\n+}\n\\ No newline at end of file\n", "n2p_tests": "{\"fr.free.nrw.commons.OkHttpJsonApiClientTests.testGetCampaignsWithData\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.OkHttpJsonApiClientTests.testGetNearbyPlaces\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.OkHttpJsonApiClientTests.testGetNearbyItemCount\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.OkHttpJsonApiClientTests.testGetCampaignsEmpty\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.OkHttpJsonApiClientTests.testGetNearbyPlacesCustomQuery\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "commons-app__apps-android-commons-6167", "org": "commons-app", "repo": "apps-android-commons", "number": 6167, "state": "closed", "title": "Enhance filtering criteria for category search", "body": "Fixes #4901\r\n\r\nWhat changes did you make and why?\r\n\r\nThis PR is an extension of #4902 PR. refer to [comment](https://github.com/commons-app/apps-android-commons/issues/4901#issuecomment-2592110652). Conflicting changes were made while this PR was open making changes introduced outdated. Also, some of the checks were redundant so that's why started fresh with this PR.\r\n\r\nNow, spam filtering function filter these strings ->\r\n\r\n- that contains `needing` or `taken on`\r\n- that contains dates in format `dd mm yyyy or yy` and `mm/yyyy or yy` (in any order possible) with separators `/` `.` `-` in between.\r\n- that contains years that doesn't come in 20XX range.\r\n\r\n- [X] Wrote tests.\r\n\r\n**Example input and output (true if filtered) ->** \r\n```\r\n\r\nMedia_needing_categories_as_of_16_June_2017 -> true\r\nPhoto_taken on_23_March_2009 -> true\r\nPhoto_taken_12/10/2023 -> true\r\nEvent_on_25-12-19 -> true\r\nImage_in_22/04/17 -> true\r\nVideo_in_2023-05 -> true\r\nPic_taken_20-12 -> true\r\nArticle_in_2024 -> false\r\nPhoto_in_1998 -> true\r\nNo_date_category -> false\r\n17/04/2021 -> true\r\nCaptured_in_1980 -> true\r\nFile_uploaded_in_18-05 -> true\r\nShot_2019/10/15 -> true\r\nJust_some_random_text -> false\r\nUpdated_in_21/07 -> true\r\n\r\n```\r\n \r\n\r\n", "base": "{\"label\": \"commons-app:main\", \"ref\": \"main\", \"sha\": \"36f844a709dc40944644723917c0b1622380edf6\"}", "resolved_issues": "[{\"number\": 4901, \"title\": \"[Bug]: Category \\\"Amavenita (ship, 2014)\\\" not found\", \"body\": \"### Summary\\n\\nI serached for a category that exists, but it doesn't show up.\\n\\n### Steps to reproduce\\n\\n1. When uploading an image, search for category: Amavenita\\r\\n\\n\\n### Expected behaviour\\n\\n[Category:Amavenita (ship, 2014)](https://commons.wikimedia.org/wiki/Category:Amavenita_(ship,_2014)) should be suggested.\\n\\n### Actual behaviour\\n\\n\\\"No Categories found\\\"\\n\\n### Device name\\n\\nSamsung Galaxy S10\\n\\n### Android version\\n\\nAndroid 12\\n\\n### Commons app version\\n\\n3.1.1~1c9267ca0\\n\\n### Device logs\\n\\n_No response_\\n\\n### Screen-shots\\n\\n![Screenshot_20220318-180530_Commons](https://user-images.githubusercontent.com/5566159/159050916-23c318f1-f0bb-4c53-b8b9-01a1b24a1e4f.jpg)\\r\\n\\n\\n### Would you like to work on the issue?\\n\\n_No response_\"}]", "lang": "kotlin", "problem_statement": "[Bug]: Category \"Amavenita (ship, 2014)\" not found\n### Summary\n\nI serached for a category that exists, but it doesn't show up.\n\n### Steps to reproduce\n\n1. When uploading an image, search for category: Amavenita\r\n\n\n### Expected behaviour\n\n[Category:Amavenita (ship, 2014)](https://commons.wikimedia.org/wiki/Category:Amavenita_(ship,_2014)) should be suggested.\n\n### Actual behaviour\n\n\"No Categories found\"\n\n### Device name\n\nSamsung Galaxy S10\n\n### Android version\n\nAndroid 12\n\n### Commons app version\n\n3.1.1~1c9267ca0\n\n### Device logs\n\n_No response_\n\n### Screen-shots\n\n![Screenshot_20220318-180530_Commons](https://user-images.githubusercontent.com/5566159/159050916-23c318f1-f0bb-4c53-b8b9-01a1b24a1e4f.jpg)\r\n\n\n### Would you like to work on the issue?\n\n_No response_\n", "hints": "@Ainali isn't this the expected behaviour? Because, Amavenita (ship, 2014) is a non-hidden category and I think we are only supposed to show the hidden category in search bar. But I could be wrong. \nOh, I didn't realize. Then this is a duplicate with #4192 (and a use case for why it is needed, this is how all ships are categorized and the way for a human to identify them). \n> \"we are only supposed to show the hidden category in search bar\"\r\n\r\n@devarsh-mavani-19 I would consider that a bug. If a category is not hidden, then the upload wizard's category search step is **supposed to** show it.\nBy the way, when I search for \"rabbits\", the first result is https://commons.wikimedia.org/wiki/Category:Rabbits which is not a hidden category:\r\n\r\n![adb](https://user-images.githubusercontent.com/99590/159115296-dff3836c-346d-4088-b66f-00e2c4f8d59e.png)\r\n\n> By the way, when I search for \"rabbits\", the first result is https://commons.wikimedia.org/wiki/Category:Rabbits which is not a hidden category:\r\n> \r\n> ![adb](https://user-images.githubusercontent.com/99590/159115296-dff3836c-346d-4088-b66f-00e2c4f8d59e.png)\r\n\r\nYes that is how it should work if it is non-hidden, then it should be displayed. However, in case of Ainali it was not displayed because category name contained a year which was older than previous year (Amavenita (ship, **2014**)). so according to this issue #750 it should be filtered out.\r\n\r\nso just to summarize currently 2 conditions must met 1. it should be non-hidden and 2nd either should not have any year in name or the year should be current or previous year.\n> However, in case of Ainali it was not displayed because category name contained a year which was older than previous year (Amavenita (ship, **2014**)). so according to this issue #750 it should be filtered out.\r\n\r\nThen I would still consider that issue to have been too poorly defined, because the app shouldn't filter out things where the year is part of the identifier of that thing, in this case, the ship that got the name in 2014. (Also, the app should probably not filter out by only older than current year, since it's common to upload files a day or two after they are taken which means that if I upload an image on January 1, I expect to see the category for the year before. Safer would be to filter categories where the year is less than current year minus 2.)\nI'm presuming the issue #750 was understood properly but the fix for it was a bit loose than it should've been. The [relevant code snippet](https://github.com/commons-app/apps-android-commons/blob/15fa93e8d004bd0f55515e6d33c7228b23d63026/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt):\r\n\r\n```kotlin\r\nreturn item.matches(\".*(19|20)\\\\d{2}.*\".toRegex())\r\n && !item.contains(yearInString)\r\n && !item.contains(prevYearInString)\r\n || item.matches(\"(.*)needing(.*)\".toRegex())\r\n || item.matches(\"(.*)taken on(.*)\".toRegex())\r\n || item.matches(\".*0s.*\".toRegex())\r\n && !item.matches(\".*(200|201)0s.*\".toRegex())\r\n```\r\n\r\nThat essentially returns true (which means the category is filtered out) when the name:\r\n\r\n1. Contains \"19xx\" OR \"20xx\" AND\r\n2. Does not contain current year AND\r\n3. Does not contain previous year OR\r\n4. Contains \"needing\" OR\r\n5. Contains \"take on\" OR\r\n6. Contains 0s AND\r\n7. Does not contain \"2000s\" OR \"2010s\"\r\n\r\nIf we were to convert the implicit precedence to explicit ones the condition looks like this:\r\n\r\n(((1) AND (2) AND (3)) OR (4) OR (5) OR ((6) AND (7)))\r\n\r\nGiven [short-circuiting evaluation](https://en.wikipedia.org/wiki/Short-circuit_evaluation), the condition should've returned `true` for \"Amavenita (ship, 2014)\" thus the category getting filtered out.\r\n\r\nWe could fix this by fixing the loose condition. I'll open a PR.\nThanks a lot @devarsh-mavani-19 for finding this out!\r\nI had forgotten about this feature.\r\nDo we all agree on this?\r\n- `Photographs taken on 2015-11-08` -> Hide\r\n- `Amavenita (ship, 2014)` -> Do not hide\n> Do we all agree on this?\r\n\r\nagree\nWhat is the status of this?\n@Discostu36 This bug still happens, I just tried on the latest Git code. Do you want to work on it? :-)\nSadly, I lack the skills. I have started learning Kotlin development, but I'm only at the very first baby steps (and don't have much time).\nFor those interested in picking this up, MR #4902 already has the changes to fix this. Only the tests need fixing IIRC. So, it could be used as a base.\r\n\r\nI intend to get around to completing it. Do feel free to beat me to it, though \ud83d\ude09 \nI want to try \u270b\nApart from filtering strings `needing` & `taken on` we have these filters \r\n\r\n- years that ends with XXX0s & are above 2000s are allowed i.e 2000, 2010, 2020.\r\n- Otherwise we only allow `current` or `previous year`.\r\n\r\nNow, this issue needs the second condition to be removed i.e any year should be allowed. But then it also doesn't make sense to have filter for decades (in the first point) right? \r\n\r\n### Solution: \r\n\r\nWe can remove both of the filters and allow any year between 19XX & 20XX (inclusive) \r\n\r\nOR\r\n\r\nJust have one filter to allow any year above >2000s instead of only `current` or `previous` year or in `decades` terms.\r\n\r\nWDYT? @nicolas-raoul \r\n\r\nAlso, api only works correctly under `prod` because the query (Amavenita) mentioned in the issue was returning empty result in `beta` , shouldn't be an issue right?\r\n\r\n\n@parneet-guraya If I understand correctly Sivaraam's comment above, only the unit tests need fixing. :-)\r\n\r\nFurther modifications might be worth a different issue.\r\n\r\nThanks!\n> So, I'm starting to do you think if we could just take forward a combination of your changes (https://github.com/commons-app/apps-android-commons/pull/5761) and the one proposed in https://github.com/commons-app/apps-android-commons/pull/4902 in the next release and see how it goes \ud83e\udd14\r\n\r\nAs per [comment](https://github.com/commons-app/apps-android-commons/issues/5749#issuecomment-2227279839), solution for this #4902 overlaps with the PR that was later merged #5761. I had to solve the conflict but solution made the other filters redundant that's why the comment (my comment above). \r\n\r\n>Now, this issue needs the second condition to be removed i.e any year should be allowed. But then it also doesn't make sense to have filter for decades (in the first point) right?\nI get what you're trying to say @parneet-guraya. The fix done via #5761 does conflict with the PR #4902 significantly. I think the change does need a bit of tweak as a consequence. I've merged recent main and tweaked the fix accordingly. Hope this helps you show a way out of the conflict.", "pull_url": "https://github.com/commons-app/apps-android-commons/pull/6167", "issue_urls": "[\"https://github.com/commons-app/apps-android-commons/issues/4901\"]", "test_command": "./gradlew :app:testBetaDebugUnitTest --tests \"fr.free.nrw.commons.category.CategoriesModelTest\"", "fix_patch": "diff --git a/app/.attach_pid781771 b/app/.attach_pid781771\nnew file mode 100644\nindex 0000000000..e69de29bb2\ndiff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt\nindex fd90be95fd..47147944c6 100644\n--- a/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt\n@@ -36,37 +36,35 @@ class CategoriesModel\n * @return\n */\n fun isSpammyCategory(item: String): Boolean {\n- // Check for current and previous year to exclude these categories from removal\n- val now = Calendar.getInstance()\n- val curYear = now[Calendar.YEAR]\n- val curYearInString = curYear.toString()\n- val prevYear = curYear - 1\n- val prevYearInString = prevYear.toString()\n- Timber.d(\"Previous year: %s\", prevYearInString)\n-\n- val mentionsDecade = item.matches(\".*0s.*\".toRegex())\n- val recentDecade = item.matches(\".*20[0-2]0s.*\".toRegex())\n- val spammyCategory =\n- item.matches(\"(.*)needing(.*)\".toRegex()) ||\n- item.matches(\"(.*)taken on(.*)\".toRegex())\n \n // always skip irrelevant categories such as Media_needing_categories_as_of_16_June_2017(Issue #750)\n+ val spammyCategory = item.matches(\"(.*)needing(.*)\".toRegex())\n+ || item.matches(\"(.*)taken on(.*)\".toRegex())\n+\n+ // checks for\n+ // dd/mm/yyyy or yy\n+ // yyyy or yy/mm/dd\n+ // yyyy or yy/mm\n+ // mm/yyyy or yy\n+ // for `yy` it is assumed that 20XX is implicit.\n+ // with separators [., /, -]\n+ val isIrrelevantCategory =\n+ item.contains(\"\"\"\\d{1,2}[-/.]\\d{1,2}[-/.]\\d{2,4}|\\d{2,4}[-/.]\\d{1,2}[-/.]\\d{1,2}|\\d{2,4}[-/.]\\d{1,2}|\\d{1,2}[-/.]\\d{2,4}\"\"\".toRegex())\n+\n+\n if (spammyCategory) {\n return true\n }\n \n- if (mentionsDecade) {\n- // Check if the year in the form of XX(X)0s is recent/relevant, i.e. in the 2000s or 2010s/2020s as stated in Issue #1029\n- // Example: \"2020s\" is OK, but \"1920s\" is not (and should be skipped)\n- return !recentDecade\n- } else {\n- // If it is not an year in decade form (e.g. 19xxs/20xxs), then check if item contains a 4-digit year\n- // anywhere within the string (.* is wildcard) (Issue #47)\n- // And that item does not equal the current year or previous year\n- return item.matches(\".*(19|20)\\\\d{2}.*\".toRegex()) &&\n- !item.contains(curYearInString) &&\n- !item.contains(prevYearInString)\n+ if(isIrrelevantCategory){\n+ return true\n }\n+\n+ val hasYear = item.matches(\"(.*\\\\d{4}.*)\".toRegex())\n+ val validYearsRange = item.matches(\".*(20[0-9]{2}).*\".toRegex())\n+\n+ // finally if there's 4 digits year exists in XXXX it should only be in 20XX range.\n+ return hasYear && !validYearsRange\n }\n \n /**\n", "test_patch": "diff --git a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt\nindex 8c336470a6..21fdba2f57 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt\n@@ -11,6 +11,7 @@ import fr.free.nrw.commons.upload.GpsCategoryModel\n import io.reactivex.Single\n import io.reactivex.subjects.BehaviorSubject\n import media\n+import org.junit.Assert\n import org.junit.Before\n import org.junit.Test\n import org.mockito.ArgumentMatchers\n@@ -331,4 +332,42 @@ class CategoriesModelTest {\n media(),\n )\n }\n+\n+ @Test\n+ fun `test valid input with XXXX in it between the expected range 20XX`() {\n+ val input = categoriesModel.isSpammyCategory(\"Amavenita (ship, 2014)\")\n+ Assert.assertFalse(input)\n+ }\n+\n+ @Test\n+ fun `test valid input with XXXXs in it between the expected range 20XXs`() {\n+ val input = categoriesModel.isSpammyCategory(\"Amavenita (ship, 2014s)\")\n+ Assert.assertFalse(input)\n+ }\n+\n+ @Test\n+ fun `test invalid category when have needing in the input`() {\n+ val input = categoriesModel.isSpammyCategory(\"Media needing categories as of 30 March 2017\")\n+ Assert.assertTrue(input)\n+ }\n+\n+ @Test\n+ fun `test invalid category when have taken on in the input`() {\n+ val input = categoriesModel.isSpammyCategory(\"Photographs taken on 2015-12-08\")\n+ Assert.assertTrue(input)\n+ }\n+\n+ @Test\n+ fun `test invalid category when have yy mm or yy mm dd in the input`() {\n+ // filtering based on [., /, -] separators between the dates.\n+ val input = categoriesModel.isSpammyCategory(\"Image class 09.14\")\n+ Assert.assertTrue(input)\n+ }\n+\n+ @Test\n+ fun `test invalid category when have years not in 20XX range`() {\n+ val input = categoriesModel.isSpammyCategory(\"Japan in the 1400s\")\n+ Assert.assertTrue(input)\n+ }\n+\n }\n", "n2p_tests": "{\"fr.free.nrw.commons.category.CategoriesModelTest.Test buildCategories when it returns non empty list\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is not null and item is selected and media does not contains category\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.test valid input with XXXX in it between the expected range 20XX\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test buildCategories when it returns empty list\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is not null and item is not selected and media does not contains category\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.test valid input with XXXXs in it between the expected range 20XXs\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.test invalid category when have needing in the input\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.testGetSelectedExistingCategories\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.test invalid category when have yy mm or yy mm dd in the input\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.searchAllFoundCaseTest\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"fr.free.nrw.commons.category.CategoriesModelTest.test invalid category when have taken on in the input\": {\"run\": \"NONE\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is null and item is not selected\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is not null and item is selected and media contains category\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is null and item is selected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.testSetSelectedExistingCategories\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.testGetCategoriesByName\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.searchAll with empty search terms creates results from gps, title search & recents\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.test invalid category when have years not in 20XX range\": {\"run\": \"NONE\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is not null and item is not selected and media contains category\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "commons-app__apps-android-commons-6130", "org": "commons-app", "repo": "apps-android-commons", "number": 6130, "state": "closed", "title": "If depicted Wikidata item has no associated Commons category property, then suggest categories from its P18", "body": "**Description (required)**\r\n\r\nResolves #5936\r\n\r\n**Tests performed (required)**\r\n\r\nTested ProdDebug on Samsung S20FE with API level 33.\r\n\r\n**Screenshots (for UI changes only)**\r\nIn the screenrecord below, the item [Warnitz (Uckermark) railway station](https://www.wikidata.org/wiki/Q7969836) has no commons category, so its [P18](https://commons.wikimedia.org/wiki/File:Bahnhof_warnitz.jpg)'s categories are listed. On the other hand, the item [human](https://www.wikidata.org/wiki/Q5) has a commons category, which is listed on the categories screen.\r\n\r\n\r\nhttps://github.com/user-attachments/assets/a59f7fd2-1814-48f4-a3c9-0dbf4347b762\r\n\r\n\r\n\r\n", "base": "{\"label\": \"commons-app:main\", \"ref\": \"main\", \"sha\": \"62136b5b09695e50c9dd5f86dfbb7e49d7282243\"}", "resolved_issues": "[{\"number\": 5936, \"title\": \"If depicted Wikidata item has no associated Commons category property, then suggest categories from its P18\", \"body\": \"### What is the user problem or growth opportunity you want to see solved?\\n\\nRecently, the objects that already have an image are also displayed for searched images. \\r\\n\\r\\nI would find it helpful if all categories of an image already available via Wikidata were offered for selection.\\n\\n### How do you know that this problem exists today? Why is this important?\\n\\nIn my opinion, this would simplify the assignment and help to ensure that the most suitable categories are selected when uploading.\\n\\n### Who will benefit from it?\\n\\nall users\\n\\n### Anything else you would like to add?\\n\\n_No response_\"}]", "lang": "kotlin", "problem_statement": "If depicted Wikidata item has no associated Commons category property, then suggest categories from its P18\n### What is the user problem or growth opportunity you want to see solved?\n\nRecently, the objects that already have an image are also displayed for searched images. \r\n\r\nI would find it helpful if all categories of an image already available via Wikidata were offered for selection.\n\n### How do you know that this problem exists today? Why is this important?\n\nIn my opinion, this would simplify the assignment and help to ensure that the most suitable categories are selected when uploading.\n\n### Who will benefit from it?\n\nall users\n\n### Anything else you would like to add?\n\n_No response_\n", "hints": "I am not sure to understand. Would you mind editing to add a real-world example, citing the real-world objects/categories? Thanks!\n@nicolas-raoul \r\n\r\nThere is already a picture (\u201cPicture A\u201d) for a Wikidata object (Q7969836).\r\nI would like to upload another (\u201cPicture B\u201d) picture related to the same Wikidata object (Q7969836) to Commons.\r\nWhen uploading (\u201cPicture B\u201d), I want the Commons app to offer all the categories (first) in which \u201cPicture A\u201d is.\r\n\r\nExmaple:\r\n* \u201cPicture A\u201d: https://commons.wikimedia.org/wiki/File:Bahnhof_warnitz.jpg\r\n* \u201cPicture B\u201d: https://commons.wikimedia.org/wiki/File:20241117_xl_0956-Haltepunkt_Warnitz_(Uckermark).jpg\r\n** https://commons.wikimedia.org/w/index.php?title=File:20241117_xl_0956-Haltepunkt_Warnitz_(Uckermark).jpg&action=history\r\n\r\n(Is that easier to understand?)\nGood idea, thanks!\nEspecially useful when a Wikidata item does not have a dedicated Commons category.\nI'd like to try", "pull_url": "https://github.com/commons-app/apps-android-commons/pull/6130", "issue_urls": "[\"https://github.com/commons-app/apps-android-commons/issues/5936\"]", "test_command": "./gradlew :app:testBetaDebugUnitTest --tests \"fr.free.nrw.commons.category.CategoriesModelTest\" --tests \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest\"", "fix_patch": "diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt\nindex 7e6fee2fca..fd90be95fd 100644\n--- a/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt\n@@ -127,30 +127,64 @@ class CategoriesModel\n /**\n * Fetches details of every category associated with selected depictions, converts them into\n * CategoryItem and returns them in a list.\n+ * If a selected depiction has no categories, the categories in which its P18 belongs are\n+ * returned in the list.\n *\n * @param selectedDepictions selected DepictItems\n * @return List of CategoryItem associated with selected depictions\n */\n- private fun categoriesFromDepiction(selectedDepictions: List): Observable>? =\n- Observable\n- .fromIterable(\n- selectedDepictions.map { it.commonsCategories }.flatten(),\n- ).map { categoryItem ->\n- categoryClient\n- .getCategoriesByName(\n- categoryItem.name,\n- categoryItem.name,\n- SEARCH_CATS_LIMIT,\n- ).map {\n- CategoryItem(\n- it[0].name,\n- it[0].description,\n- it[0].thumbnail,\n- it[0].isSelected,\n- )\n- }.blockingGet()\n- }.toList()\n- .toObservable()\n+ private fun categoriesFromDepiction(selectedDepictions: List): Observable>? {\n+ val observables = selectedDepictions.map { depictedItem ->\n+ if (depictedItem.commonsCategories.isEmpty()) {\n+ if (depictedItem.primaryImage == null) {\n+ return@map Observable.just(emptyList())\n+ }\n+ Observable.just(\n+ depictedItem.primaryImage\n+ ).map { image ->\n+ categoryClient\n+ .getCategoriesOfImage(\n+ image,\n+ SEARCH_CATS_LIMIT,\n+ ).map {\n+ it.map { category ->\n+ CategoryItem(\n+ category.name,\n+ category.description,\n+ category.thumbnail,\n+ category.isSelected,\n+ )\n+ }\n+ }.blockingGet()\n+ }.flatMapIterable { it }.toList()\n+ .toObservable()\n+ } else {\n+ Observable\n+ .fromIterable(\n+ depictedItem.commonsCategories,\n+ ).map { categoryItem ->\n+ categoryClient\n+ .getCategoriesByName(\n+ categoryItem.name,\n+ categoryItem.name,\n+ SEARCH_CATS_LIMIT,\n+ ).map {\n+ CategoryItem(\n+ it[0].name,\n+ it[0].description,\n+ it[0].thumbnail,\n+ it[0].isSelected,\n+ )\n+ }.blockingGet()\n+ }.toList()\n+ .toObservable()\n+ }\n+ }\n+ return Observable.concat(observables)\n+ .scan(mutableListOf()) { accumulator, currentList ->\n+ accumulator.apply { addAll(currentList) }\n+ }\n+ }\n \n /**\n * Fetches details of every category by their name, converts them into\ndiff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt\nindex 5571e0ea77..b031f12f13 100644\n--- a/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt\n@@ -78,6 +78,24 @@ class CategoryClient\n ),\n )\n \n+ /**\n+ * Fetches categories belonging to an image (P18 of some wikidata entity).\n+ *\n+ * @param image P18 of some wikidata entity\n+ * @param itemLimit How many categories to return\n+ * @return Single Observable emitting the list of categories\n+ */\n+ fun getCategoriesOfImage(\n+ image: String,\n+ itemLimit: Int,\n+ ): Single> =\n+ responseMapper(\n+ categoryInterface.getCategoriesByTitles(\n+ \"File:${image}\",\n+ itemLimit,\n+ ),\n+ )\n+\n /**\n * The method takes categoryName as input and returns a List of Subcategories\n * It uses the generator query API to get the subcategories in a category, 500 at a time.\ndiff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryInterface.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoryInterface.kt\nindex aa5ac8c3ad..3888ef889e 100644\n--- a/app/src/main/java/fr/free/nrw/commons/category/CategoryInterface.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryInterface.kt\n@@ -61,6 +61,21 @@ interface CategoryInterface {\n @Query(\"gacoffset\") offset: Int,\n ): Single\n \n+ /**\n+ * Fetches non-hidden categories by titles.\n+ *\n+ * @param titles titles to fetch categories for (e.g. File:)\n+ * @param itemLimit How many categories to return\n+ * @return MwQueryResponse\n+ */\n+ @GET(\n+ \"w/api.php?action=query&format=json&formatversion=2&generator=categories&prop=categoryinfo|description|pageimages&piprop=thumbnail&pithumbsize=70&gclshow=!hidden\",\n+ )\n+ fun getCategoriesByTitles(\n+ @Query(\"titles\") titles: String?,\n+ @Query(\"gcllimit\") itemLimit: Int,\n+ ): Single\n+\n @GET(\"w/api.php?action=query&format=json&formatversion=2&generator=categorymembers&gcmtype=subcat&prop=info&gcmlimit=50\")\n fun getSubCategoryList(\n @Query(\"gcmtitle\") categoryName: String,\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt b/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt\nindex 0e4ed482d2..4ae366535f 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt\n@@ -68,6 +68,9 @@ data class DepictedItem constructor(\n entity.id(),\n )\n \n+ val primaryImage: String?\n+ get() = imageUrl?.split('-')?.lastOrNull()\n+\n override fun equals(other: Any?) =\n when {\n this === other -> true\n", "test_patch": "diff --git a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt\nindex cc5340fbb7..8c336470a6 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt\n@@ -1,7 +1,9 @@\n package fr.free.nrw.commons.category\n \n import categoryItem\n+import com.nhaarman.mockitokotlin2.any\n import com.nhaarman.mockitokotlin2.mock\n+import com.nhaarman.mockitokotlin2.times\n import com.nhaarman.mockitokotlin2.verify\n import com.nhaarman.mockitokotlin2.whenever\n import depictedItem\n@@ -90,14 +92,18 @@ class CategoriesModelTest {\n val depictedItem =\n depictedItem(\n commonsCategories =\n- listOf(\n- CategoryItem(\n- \"depictionCategory\",\n- \"\",\n- \"\",\n- false,\n- ),\n+ listOf(\n+ CategoryItem(\n+ \"depictionCategory\",\n+ \"\",\n+ \"\",\n+ false,\n ),\n+ ),\n+ )\n+ val depictedItemWithoutCategories =\n+ depictedItem(\n+ imageUrl = \"testUrl\"\n )\n \n whenever(gpsCategoryModel.categoriesFromLocation)\n@@ -159,6 +165,23 @@ class CategoriesModelTest {\n ),\n ),\n )\n+ whenever(\n+ categoryClient.getCategoriesOfImage(\n+ \"testUrl\",\n+ 25,\n+ ),\n+ ).thenReturn(\n+ Single.just(\n+ listOf(\n+ CategoryItem(\n+ \"categoriesOfP18\",\n+ \"\",\n+ \"\",\n+ false,\n+ ),\n+ ),\n+ ),\n+ )\n val imageTitleList = listOf(\"Test\")\n CategoriesModel(categoryClient, categoryDao, gpsCategoryModel)\n .searchAll(\"\", imageTitleList, listOf(depictedItem))\n@@ -171,8 +194,21 @@ class CategoriesModelTest {\n categoryItem(\"recentCategories\"),\n ),\n )\n+ CategoriesModel(categoryClient, categoryDao, gpsCategoryModel)\n+ .searchAll(\"\", imageTitleList, listOf(depictedItemWithoutCategories))\n+ .test()\n+ .assertValue(\n+ listOf(\n+ categoryItem(\"categoriesOfP18\"),\n+ categoryItem(\"gpsCategory\"),\n+ categoryItem(\"titleSearch\"),\n+ categoryItem(\"recentCategories\"),\n+ ),\n+ )\n imageTitleList.forEach {\n- verify(categoryClient).searchCategories(it, CategoriesModel.SEARCH_CATS_LIMIT)\n+ verify(categoryClient, times(2)).searchCategories(it, CategoriesModel.SEARCH_CATS_LIMIT)\n+ verify(categoryClient).getCategoriesByName(any(), any(), any(), any())\n+ verify(categoryClient).getCategoriesOfImage(any(), any())\n }\n }\n \ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryClientTest.kt\nindex 5c95215a87..5edf55f6ed 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryClientTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryClientTest.kt\n@@ -132,6 +132,45 @@ class CategoryClientTest {\n )\n }\n \n+ @Test\n+ fun getCategoriesByTitlesFound() {\n+ val mockResponse = withMockResponse(\"Category:Test\")\n+ whenever(\n+ categoryInterface.getCategoriesByTitles(\n+ anyString(),\n+ anyInt(),\n+ ),\n+ ).thenReturn(Single.just(mockResponse))\n+ categoryClient\n+ .getCategoriesOfImage(\"tes\", 10)\n+ .test()\n+ .assertValues(\n+ listOf(\n+ CategoryItem(\n+ \"Test\",\n+ \"\",\n+ \"\",\n+ false,\n+ ),\n+ ),\n+ )\n+ categoryClient\n+ .getCategoriesOfImage(\n+ \"tes\",\n+ 10,\n+ ).test()\n+ .assertValues(\n+ listOf(\n+ CategoryItem(\n+ \"Test\",\n+ \"\",\n+ \"\",\n+ false,\n+ ),\n+ ),\n+ )\n+ }\n+\n @Test\n fun getCategoriesByNameNull() {\n val mockResponse = withNullPages()\n@@ -160,6 +199,29 @@ class CategoryClientTest {\n .assertValues(emptyList())\n }\n \n+ @Test\n+ fun getCategoriesByTitlesNull() {\n+ val mockResponse = withNullPages()\n+ whenever(\n+ categoryInterface.getCategoriesByTitles(\n+ anyString(),\n+ anyInt(),\n+ ),\n+ ).thenReturn(Single.just(mockResponse))\n+ categoryClient\n+ .getCategoriesOfImage(\n+ \"tes\",\n+ 10,\n+ ).test()\n+ .assertValues(emptyList())\n+ categoryClient\n+ .getCategoriesOfImage(\n+ \"tes\",\n+ 10,\n+ ).test()\n+ .assertValues(emptyList())\n+ }\n+\n @Test\n fun getParentCategoryListFound() {\n val mockResponse = withMockResponse(\"Category:Test\")\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/structure/depictions/DepictedItemTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/structure/depictions/DepictedItemTest.kt\nindex e0d339eee8..faec520519 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/structure/depictions/DepictedItemTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/structure/depictions/DepictedItemTest.kt\n@@ -181,4 +181,20 @@ class DepictedItemTest {\n fun `hashCode returns different values for objects with different name`() {\n Assert.assertNotEquals(depictedItem(name = \"a\").hashCode(), depictedItem(name = \"b\").hashCode())\n }\n+\n+ @Test\n+ fun `primaryImage is derived correctly from imageUrl`() {\n+ Assert.assertEquals(\n+ DepictedItem(\n+ entity(\n+ statements = mapOf(\n+ WikidataProperties.IMAGE.propertyName to listOf(\n+ statement(snak(dataValue = valueString(\"prefix: example_image name\"))),\n+ ),\n+ ),\n+ ),\n+ ).primaryImage,\n+ \"_example_image_name\",\n+ )\n+ }\n }\n", "n2p_tests": "{\"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.id is entityId\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.hashCode returns same values for objects with same name\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test buildCategories when it returns non empty list\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is not null and item is selected and media does not contains category\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.commonsCategory maps ValueString to strings\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.primaryImage is derived correctly from imageUrl\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test buildCategories when it returns empty list\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is not null and item is not selected and media does not contains category\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.isSelected is false at creation\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.if names are not equal is not Equal\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.commonsCategory is empty with no values\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.image is empty with no image statement\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.name and descriptions get empty if nothing present\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.instancesOf is empty with no values\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is null and item is selected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.hashCode returns different values for objects with different name\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.place constructor uses place name and longDescription\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.testSetSelectedExistingCategories\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.testGetCategoriesByName\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.instancesOf maps EntityIds to ids\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.testGetSelectedExistingCategories\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.searchAll with empty search terms creates results from gps, title search & recents\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.image is not empty with dataValue of ValueString type\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is null and item is not selected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.different type is not Equal\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.same object is Equal\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.searchAllFoundCaseTest\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.if names are equal is Equal\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.image is empty with dataValue not of ValueString type\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.image is empty with null statements\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.name and descriptions get first language label if user language not present\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is not null and item is selected and media contains category\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is not null and item is not selected and media contains category\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.name and description get user language label\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "commons-app__apps-android-commons-6070", "org": "commons-app", "repo": "apps-android-commons", "number": 6070, "state": "closed", "title": "Nearby: No longer keeps loading until timeout when map is zoomed out", "body": "**Description (required)**\r\n\r\nFixes #6044\r\n\r\nPut briefly, the map now only searches in up to 300km radius centered on the screen's center.\r\n\r\nThe change wasnn't that simple, as loading the list of items even for a 50km radius can result in timeout for some locations, so I implemented an algorithm based on binary search to figure out the appropriate radius to list items inside, by first making some COUNT queries. Also, the centermost pins now appear on top.\r\n\r\n**Tests performed (required)**\r\n\r\nTested BetaDebug on Medium Phone AVD and a Physical Device with API levels 34 and 33 respectively.\r\n\r\n**Screenshots (for UI changes only)**\r\n\r\nhttps://github.com/user-attachments/assets/e589876f-2853-4677-81d9-556eb358d4b0", "base": "{\"label\": \"commons-app:main\", \"ref\": \"main\", \"sha\": \"c963cd9ea49b1fa9dd2baf20e11d1b46e75abc62\"}", "resolved_issues": "[{\"number\": 6044, \"title\": \"Nearby: Flawed initial loading of pins.\", \"body\": \"Currently, in nearby, when a user scrolls (which also includes resizing) to a new position in the map), a query is made for items in the rectangular geographical area. Although the query is lightweight (made for only P625), it goes on endlessly until timeout for large enough areas.\\r\\n\\r\\nWhen a user zooms out enough, the initial query is made for a large area, so the query takes a long time only to end up in a timeout. When the user then zooms in, a second query should be initiated (discarding the first), but it never happens as per the current logic, which ideally shouldn't happen.\\r\\nThis part is easy to fix (by ignoring currently running query after a shorter timeout).\\r\\n\\r\\nBut ideally, the expensive query should never be made in the first place. Reason:\\r\\nSay, the area is small enough for the query to return (but still large enough for it to return much greater than 1000 items).\\r\\nThen the resulting items are sorted in-app (by their distance from the map centre), and only the nearest 1000 items are actually utilized.\\r\\n\\r\\nA workaround would be to first query for the items count. If it's much greater than 1000, then query on a smaller square bound centered on the user (in the same manner as a _binary search_). Do it till the number of items in the queried area is under $`1000 \\\\times \\\\frac{4}{\\\\pi}`$.\\r\\n\\r\\nHere's an example:\\r\\n- [The initial query in its current form](https://query.wikidata.org/sparql?query=SELECT%0A%20%20%3Fitem%0A%20%20%28SAMPLE%28%3Flocation%29%20as%20%3Flocation%29%0AWHERE%20%7B%0A%20%20%23%20Around%20given%20location%0A%20%20SERVICE%20wikibase%3Abox%20%7B%0A%20%20%20%20%3Fitem%20wdt%3AP625%20%3Flocation.%0A%20%20%20%20%20bd%3AserviceParam%20wikibase%3AcornerWest%20%22Point%282.3321%2048.8376%29%22%5E%5Egeo%3AwktLiteral.%0A%20%20%20%20%20bd%3AserviceParam%20wikibase%3AcornerEast%20%22Point%282.3545%2048.8625%29%22%5E%5Egeo%3AwktLiteral.%0A%20%20%7D%0A%0A%7D%0AGROUP%20BY%20%3Fitem%0A&format=json)\\r\\n- [The proposed initial query (which returns only the count)](https://query.wikidata.org/sparql?query=SELECT%20(COUNT(DISTINCT%20%3fitem)%20AS%20%3fcount)%0d%0aWHERE%20%7b%0d%0a%20%20SERVICE%20wikibase%3abox%20%7b%0d%0a%20%20%20%20%3fitem%20wdt%3aP625%20%3flocation.%0d%0a%20%20%20%20bd%3aserviceParam%20wikibase%3acornerWest%20%22Point(2.3321%2048.8376)%22%5e%5egeo%3awktLiteral.%0d%0a%20%20%20%20bd%3aserviceParam%20wikibase%3acornerEast%20%22Point(2.3545%2048.8625)%22%5e%5egeo%3awktLiteral.%0d%0a%20%20%7d%0d%0a%7d%0d%0a&format=json)\\r\\n\\r\\nAlso, if the area is absurdly big, then even the count-binary-search queries (proposed above) can be dropped and a simple overlay saying \\\"zoom in to display pins\\\" can be shown (maybe similar to how chromium based browsers show \\\"No Internet Connection\\\").\"}]", "lang": "kotlin", "problem_statement": "Nearby: Flawed initial loading of pins.\nCurrently, in nearby, when a user scrolls (which also includes resizing) to a new position in the map), a query is made for items in the rectangular geographical area. Although the query is lightweight (made for only P625), it goes on endlessly until timeout for large enough areas.\r\n\r\nWhen a user zooms out enough, the initial query is made for a large area, so the query takes a long time only to end up in a timeout. When the user then zooms in, a second query should be initiated (discarding the first), but it never happens as per the current logic, which ideally shouldn't happen.\r\nThis part is easy to fix (by ignoring currently running query after a shorter timeout).\r\n\r\nBut ideally, the expensive query should never be made in the first place. Reason:\r\nSay, the area is small enough for the query to return (but still large enough for it to return much greater than 1000 items).\r\nThen the resulting items are sorted in-app (by their distance from the map centre), and only the nearest 1000 items are actually utilized.\r\n\r\nA workaround would be to first query for the items count. If it's much greater than 1000, then query on a smaller square bound centered on the user (in the same manner as a _binary search_). Do it till the number of items in the queried area is under $`1000 \\times \\frac{4}{\\pi}`$.\r\n\r\nHere's an example:\r\n- [The initial query in its current form](https://query.wikidata.org/sparql?query=SELECT%0A%20%20%3Fitem%0A%20%20%28SAMPLE%28%3Flocation%29%20as%20%3Flocation%29%0AWHERE%20%7B%0A%20%20%23%20Around%20given%20location%0A%20%20SERVICE%20wikibase%3Abox%20%7B%0A%20%20%20%20%3Fitem%20wdt%3AP625%20%3Flocation.%0A%20%20%20%20%20bd%3AserviceParam%20wikibase%3AcornerWest%20%22Point%282.3321%2048.8376%29%22%5E%5Egeo%3AwktLiteral.%0A%20%20%20%20%20bd%3AserviceParam%20wikibase%3AcornerEast%20%22Point%282.3545%2048.8625%29%22%5E%5Egeo%3AwktLiteral.%0A%20%20%7D%0A%0A%7D%0AGROUP%20BY%20%3Fitem%0A&format=json)\r\n- [The proposed initial query (which returns only the count)](https://query.wikidata.org/sparql?query=SELECT%20(COUNT(DISTINCT%20%3fitem)%20AS%20%3fcount)%0d%0aWHERE%20%7b%0d%0a%20%20SERVICE%20wikibase%3abox%20%7b%0d%0a%20%20%20%20%3fitem%20wdt%3aP625%20%3flocation.%0d%0a%20%20%20%20bd%3aserviceParam%20wikibase%3acornerWest%20%22Point(2.3321%2048.8376)%22%5e%5egeo%3awktLiteral.%0d%0a%20%20%20%20bd%3aserviceParam%20wikibase%3acornerEast%20%22Point(2.3545%2048.8625)%22%5e%5egeo%3awktLiteral.%0d%0a%20%20%7d%0d%0a%7d%0d%0a&format=json)\r\n\r\nAlso, if the area is absurdly big, then even the count-binary-search queries (proposed above) can be dropped and a simple overlay saying \"zoom in to display pins\" can be shown (maybe similar to how chromium based browsers show \"No Internet Connection\").\n", "hints": "Great ideas! I totally agree with all of this.\r\nDo you want to be assigned? (please mention it when creating issues)\n> Do you want to be assigned? (please mention it when creating issues)\r\n\r\nYes, I'll be glad to implement this. I'll make sure to mention if I\u2019d like to be assigned in future issues.", "pull_url": "https://github.com/commons-app/apps-android-commons/pull/6070", "issue_urls": "[\"https://github.com/commons-app/apps-android-commons/issues/6044\"]", "test_command": "./gradlew :app:testBetaDebugUnitTest --tests \"fr.free.nrw.commons.OkHttpJsonApiClientTests\"", "fix_patch": "diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.kt b/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.kt\nindex 415d316711..291c834bdc 100644\n--- a/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.kt\n@@ -2,6 +2,7 @@ package fr.free.nrw.commons.mwapi\n \n import android.text.TextUtils\n import com.google.gson.Gson\n+import com.google.gson.JsonParser\n import fr.free.nrw.commons.BuildConfig\n import fr.free.nrw.commons.campaigns.CampaignResponseDTO\n import fr.free.nrw.commons.explore.depictions.DepictsClient\n@@ -10,6 +11,7 @@ import fr.free.nrw.commons.fileusages.GlobalFileUsagesResponse\n import fr.free.nrw.commons.location.LatLng\n import fr.free.nrw.commons.nearby.Place\n import fr.free.nrw.commons.nearby.model.ItemsClass\n+import fr.free.nrw.commons.nearby.model.NearbyQueryParams\n import fr.free.nrw.commons.nearby.model.NearbyResponse\n import fr.free.nrw.commons.nearby.model.PlaceBindings\n import fr.free.nrw.commons.profile.achievements.FeaturedImages\n@@ -330,36 +332,130 @@ class OkHttpJsonApiClient @Inject constructor(\n throw Exception(response.message)\n }\n \n+ /**\n+ * Returns the count of items in the specified area by querying Wikidata.\n+ *\n+ * @param queryParams: a `NearbyQueryParam` specifying the geographical area.\n+ * @return The count of items in the specified area.\n+ */\n+ @Throws(Exception::class)\n+ fun getNearbyItemCount(\n+ queryParams: NearbyQueryParams\n+ ): Int {\n+ val wikidataQuery: String = when (queryParams) {\n+ is NearbyQueryParams.Rectangular -> {\n+ val westCornerLat = queryParams.screenTopRight.latitude\n+ val westCornerLong = queryParams.screenTopRight.longitude\n+ val eastCornerLat = queryParams.screenBottomLeft.latitude\n+ val eastCornerLong = queryParams.screenBottomLeft.longitude\n+ FileUtils.readFromResource(\"/queries/rectangle_query_for_item_count.rq\")\n+ .replace(\"\\${LAT_WEST}\", String.format(Locale.ROOT, \"%.4f\", westCornerLat))\n+ .replace(\"\\${LONG_WEST}\", String.format(Locale.ROOT, \"%.4f\", westCornerLong))\n+ .replace(\"\\${LAT_EAST}\", String.format(Locale.ROOT, \"%.4f\", eastCornerLat))\n+ .replace(\"\\${LONG_EAST}\", String.format(Locale.ROOT, \"%.4f\", eastCornerLong))\n+ }\n+\n+ is NearbyQueryParams.Radial -> {\n+ FileUtils.readFromResource(\"/queries/radius_query_for_item_count.rq\")\n+ .replace(\n+ \"\\${LAT}\",\n+ String.format(Locale.ROOT, \"%.4f\", queryParams.center.latitude)\n+ )\n+ .replace(\n+ \"\\${LONG}\",\n+ String.format(Locale.ROOT, \"%.4f\", queryParams.center.longitude)\n+ )\n+ .replace(\"\\${RAD}\", String.format(Locale.ROOT, \"%.2f\", queryParams.radiusInKm))\n+ }\n+ }\n+\n+ val urlBuilder: HttpUrl.Builder = sparqlQueryUrl.toHttpUrlOrNull()!!\n+ .newBuilder()\n+ .addQueryParameter(\"query\", wikidataQuery)\n+ .addQueryParameter(\"format\", \"json\")\n+\n+ val request: Request = Request.Builder()\n+ .url(urlBuilder.build())\n+ .build()\n+\n+ val response = okHttpClient.newCall(request).execute()\n+ if (response.body != null && response.isSuccessful) {\n+ val json = response.body!!.string()\n+ return JsonParser.parseString(json).getAsJsonObject().getAsJsonObject(\"results\")\n+ .getAsJsonArray(\"bindings\").get(0).getAsJsonObject().getAsJsonObject(\"itemCount\")\n+ .get(\"value\").asInt\n+ }\n+ throw Exception(response.message)\n+ }\n+\n @Throws(Exception::class)\n fun getNearbyPlaces(\n- screenTopRight: LatLng,\n- screenBottomLeft: LatLng, language: String,\n+ queryParams: NearbyQueryParams, language: String,\n shouldQueryForMonuments: Boolean, customQuery: String?\n ): List? {\n Timber.d(\"CUSTOM_SPARQL: %s\", (customQuery != null).toString())\n \n+ val locale = Locale.ROOT;\n val wikidataQuery: String = if (customQuery != null) {\n- customQuery\n- } else if (!shouldQueryForMonuments) {\n- FileUtils.readFromResource(\"/queries/rectangle_query_for_nearby.rq\")\n- } else {\n- FileUtils.readFromResource(\"/queries/rectangle_query_for_nearby_monuments.rq\")\n- }\n+ when (queryParams) {\n+ is NearbyQueryParams.Rectangular -> {\n+ val westCornerLat = queryParams.screenTopRight.latitude\n+ val westCornerLong = queryParams.screenTopRight.longitude\n+ val eastCornerLat = queryParams.screenBottomLeft.latitude\n+ val eastCornerLong = queryParams.screenBottomLeft.longitude\n+ customQuery\n+ .replace(\"\\${LAT_WEST}\", String.format(locale, \"%.4f\", westCornerLat))\n+ .replace(\"\\${LONG_WEST}\", String.format(locale, \"%.4f\", westCornerLong))\n+ .replace(\"\\${LAT_EAST}\", String.format(locale, \"%.4f\", eastCornerLat))\n+ .replace(\"\\${LONG_EAST}\", String.format(locale, \"%.4f\", eastCornerLong))\n+ .replace(\"\\${LANG}\", language)\n+ }\n+ is NearbyQueryParams.Radial -> {\n+ Timber.e(\n+ \"%s%s\",\n+ \"okHttpJsonApiClient.getNearbyPlaces invoked with custom query\",\n+ \"and radial coordinates. This is currently not supported.\"\n+ )\n+ \"\"\n+ }\n+ }\n+ } else when (queryParams) {\n+ is NearbyQueryParams.Radial -> {\n+ val placeHolderQuery: String = if (!shouldQueryForMonuments) {\n+ FileUtils.readFromResource(\"/queries/radius_query_for_nearby.rq\")\n+ } else {\n+ FileUtils.readFromResource(\"/queries/radius_query_for_nearby_monuments.rq\")\n+ }\n+ placeHolderQuery.replace(\n+ \"\\${LAT}\", String.format(locale, \"%.4f\", queryParams.center.latitude)\n+ ).replace(\n+ \"\\${LONG}\", String.format(locale, \"%.4f\", queryParams.center.longitude)\n+ )\n+ .replace(\"\\${RAD}\", String.format(locale, \"%.2f\", queryParams.radiusInKm))\n+ }\n \n- val westCornerLat = screenTopRight.latitude\n- val westCornerLong = screenTopRight.longitude\n- val eastCornerLat = screenBottomLeft.latitude\n- val eastCornerLong = screenBottomLeft.longitude\n+ is NearbyQueryParams.Rectangular -> {\n+ val placeHolderQuery: String = if (!shouldQueryForMonuments) {\n+ FileUtils.readFromResource(\"/queries/rectangle_query_for_nearby.rq\")\n+ } else {\n+ FileUtils.readFromResource(\"/queries/rectangle_query_for_nearby_monuments.rq\")\n+ }\n+ val westCornerLat = queryParams.screenTopRight.latitude\n+ val westCornerLong = queryParams.screenTopRight.longitude\n+ val eastCornerLat = queryParams.screenBottomLeft.latitude\n+ val eastCornerLong = queryParams.screenBottomLeft.longitude\n+ placeHolderQuery\n+ .replace(\"\\${LAT_WEST}\", String.format(locale, \"%.4f\", westCornerLat))\n+ .replace(\"\\${LONG_WEST}\", String.format(locale, \"%.4f\", westCornerLong))\n+ .replace(\"\\${LAT_EAST}\", String.format(locale, \"%.4f\", eastCornerLat))\n+ .replace(\"\\${LONG_EAST}\", String.format(locale, \"%.4f\", eastCornerLong))\n+ .replace(\"\\${LANG}\", language)\n+ }\n+ }\n \n- val query = wikidataQuery\n- .replace(\"\\${LAT_WEST}\", String.format(Locale.ROOT, \"%.4f\", westCornerLat))\n- .replace(\"\\${LONG_WEST}\", String.format(Locale.ROOT, \"%.4f\", westCornerLong))\n- .replace(\"\\${LAT_EAST}\", String.format(Locale.ROOT, \"%.4f\", eastCornerLat))\n- .replace(\"\\${LONG_EAST}\", String.format(Locale.ROOT, \"%.4f\", eastCornerLong))\n- .replace(\"\\${LANG}\", language)\n val urlBuilder: HttpUrl.Builder = sparqlQueryUrl.toHttpUrlOrNull()!!\n .newBuilder()\n- .addQueryParameter(\"query\", query)\n+ .addQueryParameter(\"query\", wikidataQuery)\n .addQueryParameter(\"format\", \"json\")\n \n val request: Request = Request.Builder()\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java\nindex cc2442db60..4038135195 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java\n@@ -196,8 +196,9 @@ public NearbyPlacesInfo loadAttractionsFromLocation(final LatLng currentLatLng,\n return null;\n }\n \n- List places = nearbyPlaces.getFromWikidataQuery(screenTopRight, screenBottomLeft,\n- Locale.getDefault().getLanguage(), shouldQueryForMonuments, customQuery);\n+ List places = nearbyPlaces.getFromWikidataQuery(currentLatLng, screenTopRight,\n+ screenBottomLeft, Locale.getDefault().getLanguage(), shouldQueryForMonuments,\n+ customQuery);\n \n if (null != places && places.size() > 0) {\n LatLng[] boundaryCoordinates = {\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java\nindex 46f0a2a9eb..caae8ee45f 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java\n@@ -1,6 +1,8 @@\n package fr.free.nrw.commons.nearby;\n \n+import android.location.Location;\n import androidx.annotation.Nullable;\n+import fr.free.nrw.commons.nearby.model.NearbyQueryParams;\n import java.io.IOException;\n import java.util.Collections;\n import java.util.List;\n@@ -101,6 +103,7 @@ public List getFromWikidataQuery(final LatLng cur, final String lang,\n * Retrieves a list of places from a Wikidata query based on screen coordinates and optional\n * parameters.\n *\n+ * @param centerPoint The center of the map, used for radius queries if required.\n * @param screenTopRight The top right corner of the screen (latitude, longitude).\n * @param screenBottomLeft The bottom left corner of the screen (latitude, longitude).\n * @param lang The language for the query.\n@@ -111,13 +114,70 @@ public List getFromWikidataQuery(final LatLng cur, final String lang,\n * @throws Exception If an error occurs during the retrieval process.\n */\n public List getFromWikidataQuery(\n+ final fr.free.nrw.commons.location.LatLng centerPoint,\n final fr.free.nrw.commons.location.LatLng screenTopRight,\n final fr.free.nrw.commons.location.LatLng screenBottomLeft, final String lang,\n final boolean shouldQueryForMonuments,\n @Nullable final String customQuery) throws Exception {\n- return okHttpJsonApiClient\n- .getNearbyPlaces(screenTopRight, screenBottomLeft, lang, shouldQueryForMonuments,\n- customQuery);\n+ if (customQuery != null) {\n+ return okHttpJsonApiClient\n+ .getNearbyPlaces(\n+ new NearbyQueryParams.Rectangular(screenTopRight, screenBottomLeft), lang,\n+ shouldQueryForMonuments,\n+ customQuery);\n+ }\n+\n+ final int lowerLimit = 1000, upperLimit = 1500;\n+\n+ final float[] results = new float[1];\n+ Location.distanceBetween(centerPoint.getLatitude(), screenTopRight.getLongitude(),\n+ centerPoint.getLatitude(), screenBottomLeft.getLongitude(), results);\n+ final float longGap = results[0] / 1000f;\n+ Location.distanceBetween(screenTopRight.getLatitude(), centerPoint.getLongitude(),\n+ screenBottomLeft.getLatitude(), centerPoint.getLongitude(), results);\n+ final float latGap = results[0] / 1000f;\n+\n+ if (Math.max(longGap, latGap) < 100f) {\n+ final int itemCount = okHttpJsonApiClient.getNearbyItemCount(\n+ new NearbyQueryParams.Rectangular(screenTopRight, screenBottomLeft));\n+ if (itemCount < upperLimit) {\n+ return okHttpJsonApiClient.getNearbyPlaces(\n+ new NearbyQueryParams.Rectangular(screenTopRight, screenBottomLeft), lang,\n+ shouldQueryForMonuments, null);\n+ }\n+ }\n+\n+ // minRadius, targetRadius and maxRadius are radii in decameters\n+ // unlike other radii here, which are in kilometers, to avoid looping over\n+ // floating point values\n+ int minRadius = 0, maxRadius = Math.round(Math.min(300f, Math.min(longGap, latGap))) * 100;\n+ int targetRadius = maxRadius / 2;\n+ while (minRadius < maxRadius) {\n+ targetRadius = minRadius + (maxRadius - minRadius + 1) / 2;\n+ final int itemCount = okHttpJsonApiClient.getNearbyItemCount(\n+ new NearbyQueryParams.Radial(centerPoint, targetRadius / 100f));\n+ if (itemCount >= lowerLimit && itemCount < upperLimit) {\n+ break;\n+ }\n+ if (targetRadius > maxRadius / 2 && itemCount < lowerLimit / 5) { // fast forward\n+ minRadius = targetRadius;\n+ targetRadius = minRadius + (maxRadius - minRadius + 1) / 2;\n+ minRadius = targetRadius;\n+ if (itemCount < lowerLimit / 10 && minRadius < maxRadius) { // fast forward again\n+ targetRadius = minRadius + (maxRadius - minRadius + 1) / 2;\n+ minRadius = targetRadius;\n+ }\n+ continue;\n+ }\n+ if (itemCount < upperLimit) {\n+ minRadius = targetRadius;\n+ } else {\n+ maxRadius = targetRadius - 1;\n+ }\n+ }\n+ return okHttpJsonApiClient.getNearbyPlaces(\n+ new NearbyQueryParams.Radial(centerPoint, targetRadius / 100f), lang, shouldQueryForMonuments,\n+ null);\n }\n \n /**\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java\nindex ab3d9a049e..a865a07893 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java\n@@ -1101,19 +1101,19 @@ public void populatePlaces(final LatLng currentLatLng) {\n eastCornerLong, 0);\n if (currentLatLng.equals(\n getLastMapFocus())) { // Means we are checking around current location\n- populatePlacesForCurrentLocation(getLastMapFocus(), screenTopRightLatLng,\n+ populatePlacesForCurrentLocation(getMapFocus(), screenTopRightLatLng,\n screenBottomLeftLatLng, currentLatLng, null);\n } else {\n- populatePlacesForAnotherLocation(getLastMapFocus(), screenTopRightLatLng,\n+ populatePlacesForAnotherLocation(getMapFocus(), screenTopRightLatLng,\n screenBottomLeftLatLng, currentLatLng, null);\n }\n } else {\n if (currentLatLng.equals(\n getLastMapFocus())) { // Means we are checking around current location\n- populatePlacesForCurrentLocation(getLastMapFocus(), screenTopRightLatLng,\n+ populatePlacesForCurrentLocation(getMapFocus(), screenTopRightLatLng,\n screenBottomLeftLatLng, currentLatLng, null);\n } else {\n- populatePlacesForAnotherLocation(getLastMapFocus(), screenTopRightLatLng,\n+ populatePlacesForAnotherLocation(getMapFocus(), screenTopRightLatLng,\n screenBottomLeftLatLng, currentLatLng, null);\n }\n }\n@@ -1887,9 +1887,12 @@ public Marker convertToMarker(Place place, boolean isBookMarked) {\n @Override\n public void replaceMarkerOverlays(final List markerPlaceGroups) {\n ArrayList newMarkers = new ArrayList<>(markerPlaceGroups.size());\n- for (MarkerPlaceGroup markerPlaceGroup : markerPlaceGroups) {\n+ // iterate in reverse so that the nearest pins get rendered on top\n+ for (int i = markerPlaceGroups.size() - 1; i >= 0; i--) {\n newMarkers.add(\n- convertToMarker(markerPlaceGroup.getPlace(), markerPlaceGroup.getIsBookmarked()));\n+ convertToMarker(markerPlaceGroups.get(i).getPlace(),\n+ markerPlaceGroups.get(i).getIsBookmarked())\n+ );\n }\n clearAllMarkers();\n binding.map.getOverlays().addAll(newMarkers);\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/model/NearbyQueryParams.kt b/app/src/main/java/fr/free/nrw/commons/nearby/model/NearbyQueryParams.kt\nnew file mode 100644\nindex 0000000000..eb1d7cc70f\n--- /dev/null\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/model/NearbyQueryParams.kt\n@@ -0,0 +1,10 @@\n+package fr.free.nrw.commons.nearby.model\n+\n+import fr.free.nrw.commons.location.LatLng\n+\n+sealed class NearbyQueryParams {\n+ class Rectangular(val screenTopRight: LatLng, val screenBottomLeft: LatLng) :\n+ NearbyQueryParams()\n+\n+ class Radial(val center: LatLng, val radiusInKm: Float) : NearbyQueryParams()\n+}\n\\ No newline at end of file\ndiff --git a/app/src/main/resources/queries/radius_query_for_item_count.rq b/app/src/main/resources/queries/radius_query_for_item_count.rq\nnew file mode 100644\nindex 0000000000..427b727953\n--- /dev/null\n+++ b/app/src/main/resources/queries/radius_query_for_item_count.rq\n@@ -0,0 +1,9 @@\n+SELECT (COUNT(?item) AS ?itemCount)\n+WHERE {\n+ # Around given location.\n+ SERVICE wikibase:around {\n+ ?item wdt:P625 ?location.\n+ bd:serviceParam wikibase:center \"Point(${LONG} ${LAT})\"^^geo:wktLiteral.\n+ bd:serviceParam wikibase:radius \"${RAD}\" . # Radius in kilometers.\n+ }\n+}\n\\ No newline at end of file\ndiff --git a/app/src/main/resources/queries/radius_query_for_nearby.rq b/app/src/main/resources/queries/radius_query_for_nearby.rq\nnew file mode 100644\nindex 0000000000..86c4ff602d\n--- /dev/null\n+++ b/app/src/main/resources/queries/radius_query_for_nearby.rq\n@@ -0,0 +1,12 @@\n+SELECT\n+ ?item\n+ (SAMPLE(?location) as ?location)\n+WHERE {\n+ # Around given location.\n+ SERVICE wikibase:around {\n+ ?item wdt:P625 ?location.\n+ bd:serviceParam wikibase:center \"Point(${LONG} ${LAT})\"^^geo:wktLiteral.\n+ bd:serviceParam wikibase:radius \"${RAD}\" . # Radius in kilometers.\n+ }\n+}\n+GROUP BY ?item\n\\ No newline at end of file\ndiff --git a/app/src/main/resources/queries/radius_query_for_nearby_monuments.rq b/app/src/main/resources/queries/radius_query_for_nearby_monuments.rq\nnew file mode 100644\nindex 0000000000..84b3095af2\n--- /dev/null\n+++ b/app/src/main/resources/queries/radius_query_for_nearby_monuments.rq\n@@ -0,0 +1,25 @@\n+SELECT\n+ ?item\n+ (SAMPLE(?location) as ?location)\n+ (SAMPLE(?monument) AS ?monument)\n+WHERE {\n+ # Around given location.\n+ SERVICE wikibase:around {\n+ ?item wdt:P625 ?location.\n+ bd:serviceParam wikibase:center \"Point(${LONG} ${LAT})\"^^geo:wktLiteral.\n+ bd:serviceParam wikibase:radius \"${RAD}\" . # Radius in kilometers.\n+ }\n+\n+ # Wiki Loves Monuments\n+ OPTIONAL {?item p:P1435 ?monument}\n+ OPTIONAL {?item p:P2186 ?monument}\n+ OPTIONAL {?item p:P1459 ?monument}\n+ OPTIONAL {?item p:P1460 ?monument}\n+ OPTIONAL {?item p:P1216 ?monument}\n+ OPTIONAL {?item p:P709 ?monument}\n+ OPTIONAL {?item p:P718 ?monument}\n+ OPTIONAL {?item p:P5694 ?monument}\n+ OPTIONAL {?item p:P3426 ?monument}\n+\n+}\n+GROUP BY ?item\n\\ No newline at end of file\ndiff --git a/app/src/main/resources/queries/rectangle_query_for_item_count.rq b/app/src/main/resources/queries/rectangle_query_for_item_count.rq\nnew file mode 100644\nindex 0000000000..93b9385e79\n--- /dev/null\n+++ b/app/src/main/resources/queries/rectangle_query_for_item_count.rq\n@@ -0,0 +1,8 @@\n+SELECT (COUNT(?item) AS ?itemCount)\n+WHERE {\n+ SERVICE wikibase:box {\n+ ?item wdt:P625 ?location.\n+ bd:serviceParam wikibase:cornerWest \"Point(${LONG_WEST} ${LAT_WEST})\"^^geo:wktLiteral.\n+ bd:serviceParam wikibase:cornerEast \"Point(${LONG_EAST} ${LAT_EAST})\"^^geo:wktLiteral.\n+ }\n+}\n\\ No newline at end of file\ndiff --git a/app/src/main/resources/queries/rectangle_query_for_nearby.rq b/app/src/main/resources/queries/rectangle_query_for_nearby.rq\nindex 336b22db77..f8c70c74ad 100644\n--- a/app/src/main/resources/queries/rectangle_query_for_nearby.rq\n+++ b/app/src/main/resources/queries/rectangle_query_for_nearby.rq\n@@ -8,6 +8,5 @@ WHERE {\n bd:serviceParam wikibase:cornerWest \"Point(${LONG_WEST} ${LAT_WEST})\"^^geo:wktLiteral.\n bd:serviceParam wikibase:cornerEast \"Point(${LONG_EAST} ${LAT_EAST})\"^^geo:wktLiteral.\n }\n-\n }\n GROUP BY ?item\n\\ No newline at end of file\n", "test_patch": "diff --git a/app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt\nindex 3431efd6b8..9e78915603 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt\n@@ -6,6 +6,7 @@ import com.nhaarman.mockitokotlin2.verify\n import fr.free.nrw.commons.explore.depictions.DepictsClient\n import fr.free.nrw.commons.location.LatLng\n import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient\n+import fr.free.nrw.commons.nearby.model.NearbyQueryParams\n import okhttp3.Call\n import okhttp3.HttpUrl\n import okhttp3.OkHttpClient\n@@ -14,6 +15,7 @@ import org.junit.Before\n import org.junit.Test\n import org.mockito.Mock\n import org.mockito.Mockito\n+import org.mockito.Mockito.times\n import org.mockito.MockitoAnnotations\n import java.lang.Exception\n \n@@ -64,12 +66,16 @@ class OkHttpJsonApiClientTests {\n Mockito.`when`(response.message).thenReturn(\"test\")\n try {\n okHttpJsonApiClient.getNearbyPlaces(latLng, \"test\", 10.0, \"test\")\n- okHttpJsonApiClient.getNearbyPlaces(latLng, latLng, \"test\", true, \"test\")\n } catch (e: Exception) {\n assert(e.message.equals(\"test\"))\n }\n- verify(okhttpClient).newCall(any())\n- verify(call).execute()\n+ try {\n+ okHttpJsonApiClient.getNearbyPlaces(NearbyQueryParams.Rectangular(latLng, latLng), \"test\", true, \"test\")\n+ } catch (e: Exception) {\n+ assert(e.message.equals(\"test\"))\n+ }\n+ verify(okhttpClient, times(2)).newCall(any())\n+ verify(call, times(2)).execute()\n }\n \n @Test\n@@ -77,11 +83,48 @@ class OkHttpJsonApiClientTests {\n Mockito.`when`(response.message).thenReturn(\"test\")\n try {\n okHttpJsonApiClient.getNearbyPlaces(latLng, \"test\", 10.0, null)\n- okHttpJsonApiClient.getNearbyPlaces(latLng, latLng, \"test\", true, null)\n } catch (e: Exception) {\n assert(e.message.equals(\"test\"))\n }\n- verify(okhttpClient).newCall(any())\n- verify(call).execute()\n+ try {\n+ okHttpJsonApiClient.getNearbyPlaces(\n+ NearbyQueryParams.Rectangular(latLng, latLng),\n+ \"test\",\n+ true,\n+ null\n+ )\n+\n+ } catch (e: Exception) {\n+ assert(e.message.equals(\"test\"))\n+ }\n+ try {\n+ okHttpJsonApiClient.getNearbyPlaces(\n+ NearbyQueryParams.Radial(latLng, 10f),\n+ \"test\",\n+ true,\n+ null\n+ )\n+ } catch (e: Exception) {\n+ assert(e.message.equals(\"test\"))\n+ }\n+ verify(okhttpClient, times(3)).newCall(any())\n+ verify(call, times(3)).execute()\n+ }\n+\n+ @Test\n+ fun testGetNearbyItemCount() {\n+ Mockito.`when`(response.message).thenReturn(\"test\")\n+ try {\n+ okHttpJsonApiClient.getNearbyItemCount(NearbyQueryParams.Radial(latLng, 10f))\n+ } catch (e: Exception) {\n+ assert(e.message.equals(\"test\"))\n+ }\n+ try {\n+ okHttpJsonApiClient.getNearbyItemCount(NearbyQueryParams.Rectangular(latLng, latLng))\n+ } catch (e: Exception) {\n+ assert(e.message.equals(\"test\"))\n+ }\n+ verify(okhttpClient, times(2)).newCall(any())\n+ verify(call, times(2)).execute()\n }\n }\n", "n2p_tests": "{\"fr.free.nrw.commons.OkHttpJsonApiClientTests.testGetNearbyPlacesCustomQuery\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.OkHttpJsonApiClientTests.testGetNearbyPlaces\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.OkHttpJsonApiClientTests.testGetNearbyItemCount\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "commons-app__apps-android-commons-6041", "org": "commons-app", "repo": "apps-android-commons", "number": 6041, "state": "closed", "title": "Add pull down to refresh in Contributions screen ", "body": "Fixes #5131\r\n\r\nWhat changes did you make and why?\r\n\r\nAdd pull down to refresh in the contributions screen to fetch the latest data.\r\n\r\n**Screenshots (for UI changes only)**\r\n\r\n\r\nhttps://github.com/user-attachments/assets/a49cfc77-294a-45e0-a877-01c51a81cc7a\r\n\r\n", "base": "{\"label\": \"commons-app:main\", \"ref\": \"main\", \"sha\": \"5500b039762b63d18b794bb0bc68d2a84a495166\"}", "resolved_issues": "[{\"number\": 5131, \"title\": \"Add pull down sync\", \"body\": \"Install the app on two different cell phones. Take some pictures and upload them on one cell phone, then do the same on the different cell phone.\\n\\nNow back on the first cell phone pull down on the screen (refresh action), expecting to be able to see the pictures that one took on the other cell phone.\\n\\nNot only does the screen not pull down to refresh, the other pictures don't suddenly arrive either.\"}]", "lang": "kotlin", "problem_statement": "Add pull down sync\nInstall the app on two different cell phones. Take some pictures and upload them on one cell phone, then do the same on the different cell phone.\n\nNow back on the first cell phone pull down on the screen (refresh action), expecting to be able to see the pictures that one took on the other cell phone.\n\nNot only does the screen not pull down to refresh, the other pictures don't suddenly arrive either.\n", "hints": "(Workaround: log out and then log in again. Your latest contributions from outside the app will then appear. )\n@nicolas-raoul Can you please assign this issue to me?\r\n\r\nI believe we can use SwipeRefreshLayout (Released by Android) to implement it.\n@nicolas-raoul I am able to implement the swipe-to-refresh functionality but I'm currently facing an issue.\r\n\r\nI was trying to call the initRecyclerView method on refreshing to fetch the contributions list and notify to update with the new list of contributions. Line - https://github.com/commons-app/apps-android-commons/blob/9d0614e73466f6c3a524acce2540f17d72778dff/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java#L179\r\n\r\nThe method internally calls - https://github.com/commons-app/apps-android-commons/blob/9d0614e73466f6c3a524acce2540f17d72778dff/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.java#L74\r\n\r\nThe output of repository.fetchContributions() from the second device however does not give the updated contributions as the observed contribution list size was still the same. \r\n\r\n\n@kartikaykaushik14 I see this is still assigned to you, do you plan to work on it? :-)\nLet me do this. While I'm at it, I will write it in Jetpack compose :)", "pull_url": "https://github.com/commons-app/apps-android-commons/pull/6041", "issue_urls": "[\"https://github.com/commons-app/apps-android-commons/issues/5131\"]", "test_command": "./gradlew :app:testBetaDebugUnitTest --tests \"fr.free.nrw.commons.contributions.ContributionBoundaryCallbackTest\"", "fix_patch": "diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt\nindex 3f7bffe91b..b5075a21e0 100644\n--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt\n@@ -2,7 +2,6 @@ package fr.free.nrw.commons.contributions\n \n import androidx.paging.PagedList.BoundaryCallback\n import fr.free.nrw.commons.auth.SessionManager\n-import fr.free.nrw.commons.di.CommonsApplicationModule\n import fr.free.nrw.commons.di.CommonsApplicationModule.Companion.IO_THREAD\n import fr.free.nrw.commons.media.MediaClient\n import io.reactivex.Scheduler\n@@ -31,10 +30,7 @@ class ContributionBoundaryCallback\n * network\n */\n override fun onZeroItemsLoaded() {\n- if (sessionManager.userName != null) {\n- mediaClient.resetUserNameContinuation(sessionManager.userName!!)\n- }\n- fetchContributions()\n+ refreshList()\n }\n \n /**\n@@ -51,10 +47,26 @@ class ContributionBoundaryCallback\n fetchContributions()\n }\n \n+ /**\n+ * Fetch list from network and save it to local DB.\n+ *\n+ * @param onRefreshFinish callback to invoke when operations finishes\n+ * with either error or success.\n+ */\n+ fun refreshList(onRefreshFinish: () -> Unit = {}){\n+ if (sessionManager.userName != null) {\n+ mediaClient.resetUserNameContinuation(sessionManager.userName!!)\n+ }\n+ fetchContributions(onRefreshFinish)\n+ }\n+\n /**\n * Fetches contributions using the MediaWiki API\n+ *\n+ * @param onRefreshFinish callback to invoke when operations finishes\n+ * with either error or success.\n */\n- private fun fetchContributions() {\n+ private fun fetchContributions(onRefreshFinish: () -> Unit = {}) {\n if (sessionManager.userName != null) {\n userName\n ?.let { userName ->\n@@ -65,12 +77,15 @@ class ContributionBoundaryCallback\n Contribution(media = media, state = Contribution.STATE_COMPLETED)\n }\n }.subscribeOn(ioThreadScheduler)\n- .subscribe(::saveContributionsToDB) { error: Throwable ->\n+ .subscribe({ list ->\n+ saveContributionsToDB(list, onRefreshFinish)\n+ },{ error ->\n+ onRefreshFinish()\n Timber.e(\n \"Failed to fetch contributions: %s\",\n error.message,\n )\n- }\n+ })\n }?.let {\n compositeDisposable.add(\n it,\n@@ -83,13 +98,16 @@ class ContributionBoundaryCallback\n \n /**\n * Saves the contributions the the local DB\n+ *\n+ * @param onRefreshFinish callback to invoke when successfully saved to DB.\n */\n- private fun saveContributionsToDB(contributions: List) {\n+ private fun saveContributionsToDB(contributions: List, onRefreshFinish: () -> Unit) {\n compositeDisposable.add(\n repository\n .save(contributions)\n .subscribeOn(ioThreadScheduler)\n .subscribe { longs: List? ->\n+ onRefreshFinish()\n repository[\"last_fetch_timestamp\"] = System.currentTimeMillis()\n },\n )\ndiff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.java\nindex 58bd2783dd..0d0a194362 100644\n--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.java\n+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.java\n@@ -1,5 +1,6 @@\n package fr.free.nrw.commons.contributions;\n \n+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;\n import fr.free.nrw.commons.BasePresenter;\n \n /**\n@@ -17,5 +18,8 @@ public interface View {\n }\n \n public interface UserActionListener extends BasePresenter {\n+\n+ void refreshList(SwipeRefreshLayout swipeRefreshLayout);\n+\n }\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java\nindex 509d1eb95b..df65a91cc7 100644\n--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java\n+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java\n@@ -191,6 +191,15 @@ public View onCreateView(\n \n initAdapter();\n \n+ // pull down to refresh only enabled for self user.\n+ if(Objects.equals(sessionManager.getUserName(), userName)){\n+ binding.swipeRefreshLayout.setOnRefreshListener(() -> {\n+ contributionsListPresenter.refreshList(binding.swipeRefreshLayout);\n+ });\n+ } else {\n+ binding.swipeRefreshLayout.setEnabled(false);\n+ }\n+\n return binding.getRoot();\n }\n \ndiff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.java\nindex 735ff63d43..100c8be031 100644\n--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.java\n+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.java\n@@ -8,14 +8,15 @@\n import androidx.paging.DataSource.Factory;\n import androidx.paging.LivePagedListBuilder;\n import androidx.paging.PagedList;\n+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;\n import fr.free.nrw.commons.contributions.ContributionsListContract.UserActionListener;\n-import fr.free.nrw.commons.di.CommonsApplicationModule;\n import io.reactivex.Scheduler;\n import io.reactivex.disposables.CompositeDisposable;\n-import java.util.Arrays;\n import java.util.Collections;\n import javax.inject.Inject;\n import javax.inject.Named;\n+import kotlin.Unit;\n+import kotlin.jvm.functions.Function0;\n \n /**\n * The presenter class for Contributions\n@@ -95,4 +96,17 @@ public void onDetachView() {\n contributionBoundaryCallback.dispose();\n }\n \n+ /**\n+ * It is used to refresh list.\n+ *\n+ * @param swipeRefreshLayout used to stop refresh animation when\n+ * refresh finishes.\n+ */\n+ @Override\n+ public void refreshList(final SwipeRefreshLayout swipeRefreshLayout) {\n+ contributionBoundaryCallback.refreshList(() -> {\n+ swipeRefreshLayout.setRefreshing(false);\n+ return Unit.INSTANCE;\n+ });\n+ }\n }\ndiff --git a/app/src/main/res/layout/fragment_contributions_list.xml b/app/src/main/res/layout/fragment_contributions_list.xml\nindex b490c35ff5..41121c92aa 100644\n--- a/app/src/main/res/layout/fragment_contributions_list.xml\n+++ b/app/src/main/res/layout/fragment_contributions_list.xml\n@@ -1,125 +1,129 @@\n \n-\n+\n+ \n+ android:orientation=\"vertical\">\n+\n \n \n+ android:id=\"@+id/noContributionsYet\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_centerInParent=\"true\"\n+ android:layout_marginEnd=\"@dimen/tiny_gap\"\n+ android:layout_marginRight=\"@dimen/tiny_gap\"\n+ android:gravity=\"center\"\n+ android:text=\"@string/no_uploads\"\n+ android:visibility=\"gone\" />\n \n \n+ android:visibility=\"gone\" />\n \n \n \n- \n-\n- \n+ \n+\n+ \n \n \n \n+\n+ \n+\n+ \n+\n+ \n+\n+ \n-\n- \n-\n- \n-\n- \n-\n- \n+ android:contentDescription=\"@string/add_new_contribution\"\n+ android:gravity=\"center_vertical\"\n+ android:visibility=\"visible\"\n+ app:backgroundTint=\"@color/status_bar_blue\"\n+ app:elevation=\"@dimen/tiny_margin\"\n+ app:srcCompat=\"@drawable/ic_add_white_24dp\"\n+ app:useCompatPadding=\"true\" />\n \n \n \n-\n+ \n \n+\n", "test_patch": "diff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionBoundaryCallbackTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionBoundaryCallbackTest.kt\nindex 19b36521df..11b5fe9a23 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionBoundaryCallbackTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionBoundaryCallbackTest.kt\n@@ -19,6 +19,7 @@ import org.mockito.Mockito.mock\n import org.mockito.Mockito.verifyNoInteractions\n import org.mockito.MockitoAnnotations\n import java.lang.reflect.Method\n+import kotlin.reflect.jvm.internal.impl.builtins.functions.FunctionTypeKind\n \n /**\n * The unit test class for ContributionBoundaryCallbackTest\n@@ -99,9 +100,10 @@ class ContributionBoundaryCallbackTest {\n val method: Method =\n ContributionBoundaryCallback::class.java.getDeclaredMethod(\n \"fetchContributions\",\n+ Function0::class.java\n )\n method.isAccessible = true\n- method.invoke(contributionBoundaryCallback)\n+ method.invoke(contributionBoundaryCallback, {})\n verify(repository).save(anyList())\n verify(mediaClient).getMediaListForUser(anyString())\n }\n@@ -113,9 +115,10 @@ class ContributionBoundaryCallbackTest {\n val method: Method =\n ContributionBoundaryCallback::class.java.getDeclaredMethod(\n \"fetchContributions\",\n+ Function0::class.java\n )\n method.isAccessible = true\n- method.invoke(contributionBoundaryCallback)\n+ method.invoke(contributionBoundaryCallback, {})\n verifyNoInteractions(repository)\n verify(mediaClient).getMediaListForUser(anyString())\n }\n", "n2p_tests": "{\"fr.free.nrw.commons.contributions.ContributionBoundaryCallbackTest.testFetchContributionsFailed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionBoundaryCallbackTest.testOnZeroItemsLoaded\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"fr.free.nrw.commons.contributions.ContributionBoundaryCallbackTest.testFetchContributions\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionBoundaryCallbackTest.testOnFrontItemLoaded\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"fr.free.nrw.commons.contributions.ContributionBoundaryCallbackTest.testOnLastItemLoaded\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "commons-app__apps-android-commons-5947", "org": "commons-app", "repo": "apps-android-commons", "number": 5947, "state": "closed", "title": "Fix unit tests", "body": "**Description (required)**\r\n\r\nFixes #5945 #5921 \r\n\r\nWhat changes did you make and why?\r\n1. Move **`createLocale()`** method to companion object in `SettingsFragment`. In Java, that method was previously defined as **static**, making it easier to access from `SettingsFragmentUnitTest`. Also, added the `Mockk` dependency to solve unresolved reference errors.\r\n\r\n2. Tests like `LoginActivityUnitTests` and `SessionManagerUnitTests` were failing because the `Mock` library was unable to mock **sealed class`LoginResult`**. So, I mock that class using the `mockk()` method from the **Mockk** library.\r\n**Tests performed (required)**.\r\n\r\n3. Fixed some other tests by making minor changes.\r\n\r\nTested prodDebug on Samsung A14 with API level 34.\r\n\r\n**Screenshots (for UI changes only)**\r\nNone\r\n", "base": "{\"label\": \"commons-app:main\", \"ref\": \"main\", \"sha\": \"fe347c21fdede145e6a945750aa43a6de7ec24eb\"}", "resolved_issues": "[{\"number\": 5945, \"title\": \"`Unresolved reference: mockk` when running unit tests\", \"body\": \"```\\r\\n> Task :app:compileBetaDebugUnitTestKotlin FAILED\\r\\ne: app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt:7:11 Unresolved reference: mockk\\r\\ne: app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt:8:11 Unresolved reference: mockk\\r\\ne: app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt:42:9 Unresolved reference: mockkObject\\r\\ne: app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt:43:9 Unresolved reference: every\\r\\ne: app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt:23:11 Unresolved reference: mockk\\r\\ne: app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt:24:11 Unresolved reference: mockk\\r\\ne: app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt:91:9 Unresolved reference: mockkObject\\r\\ne: app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt:92:9 Unresolved reference: every\\r\\ne: app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt:22:54 Cannot import 'createLocale', functions and properties can be imported only from packages or objects\\r\\ne: app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt:286:30 Unresolved reference: createLocale\\r\\ne: app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt:295:30 Unresolved reference: createLocale\\r\\ne: app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt:304:30 Unresolved reference: createLocale\\r\\n```\"}]", "lang": "kotlin", "problem_statement": "`Unresolved reference: mockk` when running unit tests\n```\r\n> Task :app:compileBetaDebugUnitTestKotlin FAILED\r\ne: app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt:7:11 Unresolved reference: mockk\r\ne: app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt:8:11 Unresolved reference: mockk\r\ne: app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt:42:9 Unresolved reference: mockkObject\r\ne: app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt:43:9 Unresolved reference: every\r\ne: app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt:23:11 Unresolved reference: mockk\r\ne: app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt:24:11 Unresolved reference: mockk\r\ne: app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt:91:9 Unresolved reference: mockkObject\r\ne: app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt:92:9 Unresolved reference: every\r\ne: app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt:22:54 Cannot import 'createLocale', functions and properties can be imported only from packages or objects\r\ne: app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt:286:30 Unresolved reference: createLocale\r\ne: app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt:295:30 Unresolved reference: createLocale\r\ne: app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt:304:30 Unresolved reference: createLocale\r\n```\n", "hints": "Adding this dependency `testImplementation(\"io. mockk:mockk:1.13.5\")` fixed the problem but got another import issue from SettingsFragment. This is causing a build failure. I am looking into it.\nWell, I fixed it. Please assign me so that I can create a PR :)", "pull_url": "https://github.com/commons-app/apps-android-commons/pull/5947", "issue_urls": "[\"https://github.com/commons-app/apps-android-commons/issues/5945\"]", "test_command": "./gradlew :app:testBetaDebugUnitTest --tests \"fr.free.nrw.commons.upload.UploadMediaPresenterTest\" --tests \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest\" --tests \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest\" --tests \"fr.free.nrw.commons.auth.LoginActivityUnitTests\" --tests \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest\" --tests \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests\" --tests \"fr.free.nrw.commons.auth.SessionManagerUnitTests\"", "fix_patch": "diff --git a/app/build.gradle b/app/build.gradle\nindex 9e6c56c83f..468255d38c 100644\n--- a/app/build.gradle\n+++ b/app/build.gradle\n@@ -98,6 +98,7 @@ dependencies {\n testImplementation 'org.mockito:mockito-core:5.6.0'\n testImplementation \"org.powermock:powermock-module-junit4:2.0.9\"\n testImplementation \"org.powermock:powermock-api-mockito2:2.0.9\"\n+ testImplementation(\"io.mockk:mockk:1.13.5\")\n \n // Unit testing\n testImplementation 'junit:junit:4.13.2'\ndiff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt\nindex 992c4ed1cf..5571e0ea77 100644\n--- a/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt\n@@ -124,7 +124,9 @@ class CategoryClient\n }.map {\n it\n .filter { page ->\n- !page.categoryInfo().isHidden\n+ // Null check is not redundant because some values could be null\n+ // for mocks when running unit tests\n+ page.categoryInfo()?.isHidden != true\n }.map {\n CategoryItem(\n it.title().replace(CATEGORY_PREFIX, \"\"),\ndiff --git a/app/src/main/java/fr/free/nrw/commons/recentlanguages/RecentLanguagesDao.kt b/app/src/main/java/fr/free/nrw/commons/recentlanguages/RecentLanguagesDao.kt\nindex e97c4f8165..a4a06185bf 100644\n--- a/app/src/main/java/fr/free/nrw/commons/recentlanguages/RecentLanguagesDao.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/recentlanguages/RecentLanguagesDao.kt\n@@ -6,7 +6,6 @@ import android.content.ContentValues\n import android.database.Cursor\n import android.database.sqlite.SQLiteDatabase\n import android.os.RemoteException\n-import java.util.ArrayList\n import javax.inject.Inject\n import javax.inject.Named\n import javax.inject.Provider\n@@ -163,9 +162,9 @@ class RecentLanguagesDao @Inject constructor(\n COLUMN_CODE\n )\n \n- private const val DROP_TABLE_STATEMENT = \"DROP TABLE IF EXISTS $TABLE_NAME\"\n+ const val DROP_TABLE_STATEMENT = \"DROP TABLE IF EXISTS $TABLE_NAME\"\n \n- private const val CREATE_TABLE_STATEMENT = \"CREATE TABLE $TABLE_NAME (\" +\n+ const val CREATE_TABLE_STATEMENT = \"CREATE TABLE $TABLE_NAME (\" +\n \"$COLUMN_NAME STRING,\" +\n \"$COLUMN_CODE STRING PRIMARY KEY\" +\n \");\"\ndiff --git a/app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.kt b/app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.kt\nindex 0500f4946a..3779532547 100644\n--- a/app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.kt\n@@ -19,10 +19,10 @@ import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n import io.reactivex.Flowable\n import io.reactivex.Observable\n import io.reactivex.Single\n+import timber.log.Timber\n import java.util.Locale\n import javax.inject.Inject\n import javax.inject.Singleton\n-import timber.log.Timber\n \n /**\n * The repository class for UploadActivity\n@@ -46,7 +46,7 @@ class UploadRepository @Inject constructor(\n *\n * @return\n */\n- fun buildContributions(): Observable {\n+ fun buildContributions(): Observable? {\n return uploadModel.buildContributions()\n }\n \n@@ -150,7 +150,7 @@ class UploadRepository @Inject constructor(\n *\n * @return\n */\n- fun getSelectedLicense(): String {\n+ fun getSelectedLicense(): String? {\n return uploadModel.selectedLicense\n }\n \n@@ -173,11 +173,11 @@ class UploadRepository @Inject constructor(\n * @return\n */\n fun preProcessImage(\n- uploadableFile: UploadableFile,\n+ uploadableFile: UploadableFile?,\n place: Place?,\n- similarImageInterface: SimilarImageInterface,\n+ similarImageInterface: SimilarImageInterface?,\n inAppPictureLocation: LatLng?\n- ): Observable {\n+ ): Observable? {\n return uploadModel.preProcessImage(\n uploadableFile,\n place,\n@@ -193,7 +193,7 @@ class UploadRepository @Inject constructor(\n * @param location Location of the image\n * @return Quality of UploadItem\n */\n- fun getImageQuality(uploadItem: UploadItem, location: LatLng?): Single {\n+ fun getImageQuality(uploadItem: UploadItem, location: LatLng?): Single? {\n return uploadModel.getImageQuality(uploadItem, location)\n }\n \n@@ -213,7 +213,7 @@ class UploadRepository @Inject constructor(\n * @param uploadItem UploadItem whose caption is to be checked\n * @return Quality of caption of the UploadItem\n */\n- fun getCaptionQuality(uploadItem: UploadItem): Single {\n+ fun getCaptionQuality(uploadItem: UploadItem): Single? {\n return uploadModel.getCaptionQuality(uploadItem)\n }\n \ndiff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.kt b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.kt\nindex 53f6b28fe2..b55ac60099 100644\n--- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.kt\n@@ -471,18 +471,20 @@ class SettingsFragment : PreferenceFragmentCompat() {\n editor.apply()\n }\n \n- /**\n- * Create Locale based on different types of language codes\n- * @param languageCode\n- * @return Locale and throws error for invalid language codes\n- */\n- fun createLocale(languageCode: String): Locale {\n- val parts = languageCode.split(\"-\")\n- return when (parts.size) {\n- 1 -> Locale(parts[0])\n- 2 -> Locale(parts[0], parts[1])\n- 3 -> Locale(parts[0], parts[1], parts[2])\n- else -> throw IllegalArgumentException(\"Invalid language code: $languageCode\")\n+ companion object {\n+ /**\n+ * Create Locale based on different types of language codes\n+ * @param languageCode\n+ * @return Locale and throws error for invalid language codes\n+ */\n+ fun createLocale(languageCode: String): Locale {\n+ val parts = languageCode.split(\"-\")\n+ return when (parts.size) {\n+ 1 -> Locale(parts[0])\n+ 2 -> Locale(parts[0], parts[1])\n+ 3 -> Locale(parts[0], parts[1], parts[2])\n+ else -> throw IllegalArgumentException(\"Invalid language code: $languageCode\")\n+ }\n }\n }\n \ndiff --git a/app/src/main/java/fr/free/nrw/commons/utils/ImageUtilsWrapper.kt b/app/src/main/java/fr/free/nrw/commons/utils/ImageUtilsWrapper.kt\nindex 2e0efc6901..8393dc6524 100644\n--- a/app/src/main/java/fr/free/nrw/commons/utils/ImageUtilsWrapper.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/utils/ImageUtilsWrapper.kt\n@@ -16,7 +16,7 @@ class ImageUtilsWrapper @Inject constructor() {\n \n fun checkImageGeolocationIsDifferent(\n geolocationOfFileString: String,\n- latLng: LatLng\n+ latLng: LatLng?\n ): Single {\n return Single.fromCallable {\n ImageUtils.checkImageGeolocationIsDifferent(geolocationOfFileString, latLng)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/utils/MediaDataExtractorUtil.kt b/app/src/main/java/fr/free/nrw/commons/utils/MediaDataExtractorUtil.kt\nindex 9e46525da5..93cdabbfc0 100644\n--- a/app/src/main/java/fr/free/nrw/commons/utils/MediaDataExtractorUtil.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/utils/MediaDataExtractorUtil.kt\n@@ -1,9 +1,5 @@\n package fr.free.nrw.commons.utils\n \n-import org.apache.commons.lang3.StringUtils\n-\n-import java.util.ArrayList\n-\n object MediaDataExtractorUtil {\n \n /**\n@@ -13,8 +9,8 @@ object MediaDataExtractorUtil {\n * @return\n */\n @JvmStatic\n- fun extractCategoriesFromList(source: String): List {\n- if (source.isBlank()) {\n+ fun extractCategoriesFromList(source: String?): List {\n+ if (source.isNullOrBlank()) {\n return emptyList()\n }\n val cats = source.split(\"|\")\n", "test_patch": "diff --git a/app/src/test/kotlin/fr/free/nrw/commons/auth/LoginActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/auth/LoginActivityUnitTests.kt\nindex b50c820a0d..162f505848 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/auth/LoginActivityUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/auth/LoginActivityUnitTests.kt\n@@ -16,6 +16,7 @@ import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.auth.login.LoginResult\n import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.kvstore.JsonKvStore\n+import io.mockk.mockk\n import org.junit.Assert\n import org.junit.Before\n import org.junit.Test\n@@ -66,11 +67,11 @@ class LoginActivityUnitTests {\n @Mock\n private lateinit var account: Account\n \n- @Mock\n private lateinit var loginResult: LoginResult\n \n @Before\n fun setUp() {\n+ loginResult = mockk()\n MockitoAnnotations.openMocks(this)\n OkHttpConnectionFactory.CLIENT = createTestClient()\n activity = Robolectric.buildActivity(LoginActivity::class.java).create().get()\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/auth/SessionManagerUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/auth/SessionManagerUnitTests.kt\nindex 7b7c260e86..4e5c78f3e5 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/auth/SessionManagerUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/auth/SessionManagerUnitTests.kt\n@@ -7,13 +7,14 @@ import androidx.test.core.app.ApplicationProvider\n import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.auth.login.LoginResult\n import fr.free.nrw.commons.kvstore.JsonKvStore\n+import io.mockk.every\n+import io.mockk.mockk\n import org.junit.Assert\n import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n import org.mockito.Mock\n import org.mockito.MockitoAnnotations\n-import org.powermock.api.mockito.PowerMockito.`when`\n import org.robolectric.RobolectricTestRunner\n import org.robolectric.Shadows.shadowOf\n import org.robolectric.annotation.Config\n@@ -33,7 +34,6 @@ class SessionManagerUnitTests {\n @Mock\n private lateinit var defaultKvStore: JsonKvStore\n \n- @Mock\n private lateinit var loginResult: LoginResult\n \n @Mock\n@@ -41,6 +41,7 @@ class SessionManagerUnitTests {\n \n @Before\n fun setUp() {\n+ loginResult = mockk()\n MockitoAnnotations.openMocks(this)\n accountManager = AccountManager.get(ApplicationProvider.getApplicationContext())\n shadowOf(accountManager).addAccount(account)\n@@ -68,8 +69,8 @@ class SessionManagerUnitTests {\n @Test\n @Throws(Exception::class)\n fun testUpdateAccount() {\n- `when`(loginResult.userName).thenReturn(\"username\")\n- `when`(loginResult.password).thenReturn(\"password\")\n+ every { loginResult.userName } returns \"username\"\n+ every { loginResult.password } returns \"password\"\n val method: Method =\n SessionManager::class.java.getDeclaredMethod(\n \"updateAccount\",\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesDaoUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesDaoUnitTest.kt\nindex 087640a44c..e0f4587f46 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesDaoUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesDaoUnitTest.kt\n@@ -85,7 +85,7 @@ class RecentLanguagesDaoUnitTest {\n whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull()))\n .thenReturn(createCursor(14))\n \n- val result = testObject.recentLanguages\n+ val result = testObject.getRecentLanguages()\n \n Assert.assertEquals(14, (result.size))\n }\n@@ -95,20 +95,20 @@ class RecentLanguagesDaoUnitTest {\n whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenThrow(\n RemoteException(\"\"),\n )\n- testObject.recentLanguages\n+ testObject.getRecentLanguages()\n }\n \n @Test\n fun getGetRecentLanguagesReturnsEmptyList_emptyCursor() {\n whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull()))\n .thenReturn(createCursor(0))\n- Assert.assertTrue(testObject.recentLanguages.isEmpty())\n+ Assert.assertTrue(testObject.getRecentLanguages().isEmpty())\n }\n \n @Test\n fun getGetRecentLanguagesReturnsEmptyList_nullCursor() {\n whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenReturn(null)\n- Assert.assertTrue(testObject.recentLanguages.isEmpty())\n+ Assert.assertTrue(testObject.getRecentLanguages().isEmpty())\n }\n \n @Test\n@@ -117,7 +117,7 @@ class RecentLanguagesDaoUnitTest {\n whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenReturn(mockCursor)\n whenever(mockCursor.moveToFirst()).thenReturn(false)\n \n- testObject.recentLanguages\n+ testObject.getRecentLanguages()\n \n verify(mockCursor).close()\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt\nindex 6c9ee9d039..5a6d27e1bb 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt\n@@ -19,7 +19,7 @@ import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.recentlanguages.Language\n import fr.free.nrw.commons.recentlanguages.RecentLanguagesAdapter\n import fr.free.nrw.commons.recentlanguages.RecentLanguagesDao\n-import fr.free.nrw.commons.settings.SettingsFragment.createLocale\n+import fr.free.nrw.commons.settings.SettingsFragment.Companion.createLocale\n import org.junit.Assert\n import org.junit.Assert.assertEquals\n import org.junit.Before\n@@ -156,14 +156,14 @@ class SettingsFragmentUnitTests {\n )\n method.isAccessible = true\n method.invoke(fragment, \"appUiDefaultLanguagePref\")\n- verify(recentLanguagesDao, times(1)).recentLanguages\n+ verify(recentLanguagesDao, times(1)).getRecentLanguages()\n }\n \n @Test\n @Throws(Exception::class)\n fun `Test prepareAppLanguages when recently used languages is not empty`() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- whenever(recentLanguagesDao.recentLanguages)\n+ whenever(recentLanguagesDao.getRecentLanguages())\n .thenReturn(\n mutableListOf(\n Language(\"English\", \"en\"),\n@@ -181,7 +181,7 @@ class SettingsFragmentUnitTests {\n )\n method.isAccessible = true\n method.invoke(fragment, \"appUiDefaultLanguagePref\")\n- verify(recentLanguagesDao, times(2)).recentLanguages\n+ verify(recentLanguagesDao, times(2)).getRecentLanguages()\n }\n \n @Test\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt\nindex bf27280aae..47c4d0ae56 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt\n@@ -131,7 +131,7 @@ class UploadMediaPresenterTest {\n */\n @Test\n fun getImageQualityTest() {\n- whenever(repository.uploads).thenReturn(listOf(uploadItem))\n+ whenever(repository.getUploads()).thenReturn(listOf(uploadItem))\n whenever(repository.getImageQuality(uploadItem, location))\n .thenReturn(testSingleImageResult)\n whenever(uploadItem.imageQuality).thenReturn(0)\n@@ -149,7 +149,7 @@ class UploadMediaPresenterTest {\n */\n @Test\n fun `get ImageQuality Test while coordinates equals to null`() {\n- whenever(repository.uploads).thenReturn(listOf(uploadItem))\n+ whenever(repository.getUploads()).thenReturn(listOf(uploadItem))\n whenever(repository.getImageQuality(uploadItem, location))\n .thenReturn(testSingleImageResult)\n whenever(uploadItem.imageQuality).thenReturn(0)\n@@ -225,7 +225,7 @@ class UploadMediaPresenterTest {\n */\n @Test\n fun fetchImageAndTitleTest() {\n- whenever(repository.uploads).thenReturn(listOf(uploadItem))\n+ whenever(repository.getUploads()).thenReturn(listOf(uploadItem))\n whenever(repository.getUploadItem(ArgumentMatchers.anyInt()))\n .thenReturn(uploadItem)\n whenever(uploadItem.uploadMediaDetails).thenReturn(listOf())\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadRepositoryUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadRepositoryUnitTest.kt\nindex 233b0de32c..ac01d237fe 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadRepositoryUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadRepositoryUnitTest.kt\n@@ -15,6 +15,7 @@ import fr.free.nrw.commons.repository.UploadRepository\n import fr.free.nrw.commons.upload.structure.depictions.DepictModel\n import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n import io.reactivex.Completable\n+import io.reactivex.Observable\n import io.reactivex.Single\n import org.junit.Before\n import org.junit.Test\n@@ -196,7 +197,7 @@ class UploadRepositoryUnitTest {\n fun testGetCaptionQuality() {\n assertEquals(\n repository.getCaptionQuality(uploadItem),\n- uploadModel.getCaptionQuality(uploadItem),\n+ uploadModel.getCaptionQuality(uploadItem)\n )\n }\n \n@@ -386,7 +387,8 @@ class UploadRepositoryUnitTest {\n fun testGetCategories() {\n assertEquals(\n repository.getCategories(listOf(\"Test\")),\n- categoriesModel.getCategoriesByName(mutableListOf(\"Test\")),\n+ categoriesModel.getCategoriesByName(mutableListOf(\"Test\"))\n+ ?: Observable.empty>()\n )\n }\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/structure/depictions/DepictedItemTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/structure/depictions/DepictedItemTest.kt\nindex 892d501fd2..e0d339eee8 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/structure/depictions/DepictedItemTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/structure/depictions/DepictedItemTest.kt\n@@ -1,10 +1,10 @@\n package fr.free.nrw.commons.upload.structure.depictions\n \n-import com.nhaarman.mockitokotlin2.mock\n import depictedItem\n import entity\n import entityId\n import fr.free.nrw.commons.wikidata.WikidataProperties\n+import io.mockk.mockk\n import org.junit.Assert\n import org.junit.Test\n import place\n@@ -53,7 +53,7 @@ class DepictedItemTest {\n entity(\n statements =\n mapOf(\n- WikidataProperties.IMAGE.propertyName to listOf(statement(snak(dataValue = mock()))),\n+ WikidataProperties.IMAGE.propertyName to listOf(statement(snak(dataValue = mockk()))),\n ),\n ),\n ).imageUrl,\n", "n2p_tests": "{\"fr.free.nrw.commons.auth.SessionManagerUnitTests.testLogout\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.testAddNewLanguage\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.id is entityId\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.cursorsAreClosedAfterFindLanguageQuery\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.SessionManagerUnitTests.testDoesAccountExist\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testGetCaptionQuality\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.cursorsAreClosedAfterGetRecentLanguages\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v18_to_v19\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.checkActivityNotNull\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests.testOnRecentLanguageClicked\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testGetUploads\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaPresenterTest.fetchImageAndTitleTest\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v5_to_v6\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnOptionsItemSelectedCaseDefault\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v7_to_v8\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests.Test prepareAppLanguages when recently used languages is empty\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.SessionManagerUnitTests.checkNotNull\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v11_to_v12\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaPresenterTest.showSimilarImageFragmentTest\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnDestroy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testHideProgress\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v1_to_v2\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnPrivacyPolicyClicked\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.place constructor uses place name and longDescription\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v20_to_v20\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testPreProcessImage\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.instancesOf maps EntityIds to ids\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.testDeleteLanguage\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.different type is not Equal\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testSearchAll\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testSetContentView\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests.testGetCurrentLanguageCode\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.SessionManagerUnitTests.testGetPreference\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testShowPasswordResetPrompt\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testSignUp\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.name and descriptions get first language label if user language not present\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testPrepareMedia\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.name and description get user language label\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.SessionManagerUnitTests.testForceLogin\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testSkipLogin\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testOnDepictItemClicked\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testContainsYear\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaPresenterTest.getImageQualityTest\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaPresenterTest.emptyFileNameTest\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.findNotExistingLanguageReturnsNull_emptyCursor\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testGetSelectedExistingCategories\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testGetCount\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testCleanup\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.isSelected is false at creation\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v9_to_v10\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.SessionManagerUnitTests.testCreateAccount\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.image is empty with no image statement\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v4_to_v5\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testSetSelectedExistingCategories\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.test joinIDs when depictIDs is null\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v10_to_v11\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnEditorActionCaseDefault\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testCheckNearbyPlacesWithException\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testSetSelectedLicense\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.SessionManagerUnitTests.testGetPassword\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests.Test setUpRecentLanguagesSection when list is not empty\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testAskUserForTwoFactorAuth\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaPresenterTest.get ImageQuality Test while coordinates equals to null\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.same object is Equal\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.findLanguageTranslatesExceptions\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.if names are equal is Equal\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.SessionManagerUnitTests.testSetUserLoggedIn\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testSetSelectedExistingDepictions\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.image is empty with dataValue not of ValueString type\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests.testHideRecentLanguagesSection\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests.testSaveLanguageValueCase_appUiDefaultLanguagePref\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testGetSelectedLicense\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.deleteTable\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testBuildContributions\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testGetCategories\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testGetUploadItemCaseNull\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testGetPlaceDepictions\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaPresenterTest.addSingleCaption\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.getGetRecentLanguagesTranslatesExceptions\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v12_to_v13\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testShowSuccessAndDismissDialog\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.hashCode returns same values for objects with same name\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testGetSelectedCategories\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.SessionManagerUnitTests.testRemoveAccountCaseNull\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnDestroyWithException\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v6_to_v7\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testJoinIDs\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v14_to_v15\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests.Test setUpRecentLanguagesSection when list is empty\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaPresenterTest.receiveImageTest\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.commonsCategory maps ValueString to strings\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests.testCreateLocaleWithLanguageCode\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testSearchAllEntities\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnResume\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v15_to_v16\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.if names are not equal is not Equal\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.SessionManagerUnitTests.testGetUserName\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.commonsCategory is empty with no values\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testSetSelectedCategories\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaPresenterTest.correctFileNameTest\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testGetSelectedExistingDepictions\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.name and descriptions get empty if nothing present\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.instancesOf is empty with no values\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testStartMainActivity\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testGetMenuInflater\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.getGetRecentLanguagesReturnsEmptyList_nullCursor\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.findNotExistingLanguageReturnsNull_nullCursor\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnStart\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaPresenterTest.addMultipleCaptions\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testDeletePicture\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests.testSaveLanguageValueCase_descriptionDefaultLanguagePref\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.SessionManagerUnitTests.testForceLoginCaseNull\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testIsWMLSupportedForThisPlace\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.image is empty with null statements\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests.testCheckPermissionsAndSendLogs\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.getGetRecentLanguagesReturnsEmptyList_emptyCursor\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testForgotPassword\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.findExistingLanguage\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.testGetRecentLanguages\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.createFromCursor\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testGetUploadItemCaseNonNull\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testGetImageQuality\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnPostResume\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v8_to_v9\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v16_to_v17\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testOnCategoryClicked\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v19_to_v20\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnLoginSuccessCaseDefault\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testCheckNearbyPlacesWithoutExceptionCaseNull\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnStop\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testPerformLogin\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnLoginSuccess\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaPresenterTest.setCorrectCountryCodeForReceivedImage\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.SessionManagerUnitTests.testUpdateAccount\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests.testCreateLocaleWithLanguageCountryAndVariantCode\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testShowMessageAndCancelDialogRes\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaPresenterTest.duplicateFileNameTest\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests.testRequestExternalStoragePermissions\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.hashCode returns different values for objects with different name\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testGetDepictions\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests.Test prepareAppLanguages when recently used languages is not empty\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests.testCreateLocaleWithLanguageAndCountryCode\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v2_to_v3\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v3_to_v4\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.image is not empty with dataValue of ValueString type\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testSaveContribution\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testCheckNearbyPlacesWithoutExceptionCaseNonNull\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.SessionManagerUnitTests.testIsUserLoggedIn\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testGetSelectedDepictions\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests.checkFragmentNotNull\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testShowMessageAndCancelDialog\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.migrateTableVersionFrom_v13_to_v14\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest.createTable\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnPostCreate\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testUseSimilarPictureCoordinates\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest.testGetLicenses\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "commons-app__apps-android-commons-5875", "org": "commons-app", "repo": "apps-android-commons", "number": 5875, "state": "closed", "title": "Use new result API", "body": "Fixes #5849\r\n\r\nWhat changes did you make and why?\r\n\r\n- Migrate Activities that are launched with expectancy of getting result back, to new result api.\r\n\r\n#### For ease of review, these are the functionalities that are affected and have been tested. \r\n\r\n- File picking -> Camera, Gallery, Custom; from every place one or more of these options can be used have been refactored.\r\n- getting result back from `ImageFragment` launched from `CustomSelectorActivity` \r\n- getting result of voice input.\r\n- result from image editing from `EditActivity`\r\n\r\n**Tests performed (required)**\r\n`betaDebug` & `prodDebug` tested on Oneplust 9RT 5G , Android 14\r\n\r\n\r\n", "base": "{\"label\": \"commons-app:main\", \"ref\": \"main\", \"sha\": \"f1205c19be7dccefc2b65f4d4c95bfb36c06c23c\"}", "resolved_issues": "[{\"number\": 5849, \"title\": \"[Tech Debt] Remove usage of deprecated `startActivityForResult` & `onActivityResult` APIs in favour of decoupled result APIs\", \"body\": \"Remove usage of deprecated `startActivityForResult` & `onActivityResult` APIs in favour of decoupled result APIs. \\r\\n\\r\\n> While the underlying [startActivityForResult()](https://developer.android.com/reference/android/app/Activity#startActivityForResult(android.content.Intent,%20int)) and [onActivityResult()](https://developer.android.com/reference/android/app/Activity#onActivityResult(int,%20int,%20android.content.Intent)) APIs are available on the Activity class on all API levels, Google strongly recommends using the Activity Result APIs introduced in AndroidX [Activity](https://developer.android.com/jetpack/androidx/releases/activity) and [Fragment](https://developer.android.com/jetpack/androidx/releases/fragment) classes.\\r\\n\\r\\nFor more on what benefits it offers refer here https://developer.android.com/training/basics/intents/result#custom\\r\\n\\r\\nP.S: We already have newer code using this API. Only some place that needs refactor.\"}]", "lang": "kotlin", "problem_statement": "[Tech Debt] Remove usage of deprecated `startActivityForResult` & `onActivityResult` APIs in favour of decoupled result APIs\nRemove usage of deprecated `startActivityForResult` & `onActivityResult` APIs in favour of decoupled result APIs. \r\n\r\n> While the underlying [startActivityForResult()](https://developer.android.com/reference/android/app/Activity#startActivityForResult(android.content.Intent,%20int)) and [onActivityResult()](https://developer.android.com/reference/android/app/Activity#onActivityResult(int,%20int,%20android.content.Intent)) APIs are available on the Activity class on all API levels, Google strongly recommends using the Activity Result APIs introduced in AndroidX [Activity](https://developer.android.com/jetpack/androidx/releases/activity) and [Fragment](https://developer.android.com/jetpack/androidx/releases/fragment) classes.\r\n\r\nFor more on what benefits it offers refer here https://developer.android.com/training/basics/intents/result#custom\r\n\r\nP.S: We already have newer code using this API. Only some place that needs refactor.\n", "hints": NaN, "pull_url": "https://github.com/commons-app/apps-android-commons/pull/5875", "issue_urls": "[\"https://github.com/commons-app/apps-android-commons/issues/5849\"]", "test_command": "./gradlew :app:testBetaDebugUnitTest --tests \"fr.free.nrw.commons.upload.UploadActivityUnitTests\" --tests \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests\" --tests \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest\" --tests \"fr.free.nrw.commons.contributions.MainActivityUnitTests\" --tests \"fr.free.nrw.commons.filepicker.FilePickerTest\" --tests \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest\" --tests \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivityTest\"", "fix_patch": "diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java\nindex c3dde9caa7..3aceb957ab 100644\n--- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java\n+++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java\n@@ -107,7 +107,6 @@ public class CommonsApplication extends MultiDexApplication {\n /**\n * Constants begin\n */\n- public static final int OPEN_APPLICATION_DETAIL_SETTINGS = 1001;\n \n public static final String DEFAULT_EDIT_SUMMARY = \"Uploaded using [[COM:MOA|Commons Mobile App]]\";\n \ndiff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.java b/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.java\nindex 65d0e45a8a..f5ce556c41 100644\n--- a/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.java\n+++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.java\n@@ -9,6 +9,7 @@\n import androidx.activity.result.ActivityResultCallback;\n import androidx.activity.result.ActivityResultLauncher;\n import androidx.activity.result.contract.ActivityResultContracts;\n+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;\n import androidx.annotation.NonNull;\n import androidx.annotation.Nullable;\n import androidx.recyclerview.widget.LinearLayoutManager;\n@@ -33,6 +34,23 @@ public class BookmarkLocationsFragment extends DaggerFragment {\n @Inject BookmarkLocationsDao bookmarkLocationDao;\n @Inject CommonPlaceClickActions commonPlaceClickActions;\n private PlaceAdapter adapter;\n+\n+ private final ActivityResultLauncher cameraPickLauncherForResult =\n+ registerForActivityResult(new StartActivityForResult(),\n+ result -> {\n+ contributionController.handleActivityResultWithCallback(requireActivity(), callbacks -> {\n+ contributionController.onPictureReturnedFromCamera(result, requireActivity(), callbacks);\n+ });\n+ });\n+\n+ private final ActivityResultLauncher galleryPickLauncherForResult =\n+ registerForActivityResult(new StartActivityForResult(),\n+ result -> {\n+ contributionController.handleActivityResultWithCallback(requireActivity(), callbacks -> {\n+ contributionController.onPictureReturnedFromGallery(result, requireActivity(), callbacks);\n+ });\n+ });\n+\n private ActivityResultLauncher inAppCameraLocationPermissionLauncher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback>() {\n @Override\n public void onActivityResult(Map result) {\n@@ -45,7 +63,7 @@ public void onActivityResult(Map result) {\n contributionController.locationPermissionCallback.onLocationPermissionGranted();\n } else {\n if (shouldShowRequestPermissionRationale(permission.ACCESS_FINE_LOCATION)) {\n- contributionController.handleShowRationaleFlowCameraLocation(getActivity(), inAppCameraLocationPermissionLauncher);\n+ contributionController.handleShowRationaleFlowCameraLocation(getActivity(), inAppCameraLocationPermissionLauncher, cameraPickLauncherForResult);\n } else {\n contributionController.locationPermissionCallback.onLocationPermissionDenied(getActivity().getString(R.string.in_app_camera_location_permission_denied));\n }\n@@ -83,7 +101,9 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {\n return Unit.INSTANCE;\n },\n commonPlaceClickActions,\n- inAppCameraLocationPermissionLauncher\n+ inAppCameraLocationPermissionLauncher,\n+ galleryPickLauncherForResult,\n+ cameraPickLauncherForResult\n );\n binding.listView.setAdapter(adapter);\n }\n@@ -109,11 +129,6 @@ private void initList() {\n }\n }\n \n- @Override\n- public void onActivityResult(int requestCode, int resultCode, Intent data) {\n- contributionController.handleActivityResult(getActivity(), requestCode, resultCode, data);\n- }\n-\n @Override\n public void onDestroy() {\n super.onDestroy();\ndiff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java\nindex 1251d10273..fcfd329740 100644\n--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java\n+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java\n@@ -7,6 +7,7 @@\n import android.content.Context;\n import android.content.Intent;\n import android.widget.Toast;\n+import androidx.activity.result.ActivityResult;\n import androidx.activity.result.ActivityResultLauncher;\n import androidx.annotation.NonNull;\n import androidx.lifecycle.LiveData;\n@@ -64,10 +65,11 @@ public ContributionController(@Named(\"default_preferences\") JsonKvStore defaultK\n * Check for permissions and initiate camera click\n */\n public void initiateCameraPick(Activity activity,\n- ActivityResultLauncher inAppCameraLocationPermissionLauncher) {\n+ ActivityResultLauncher inAppCameraLocationPermissionLauncher,\n+ ActivityResultLauncher resultLauncher) {\n boolean useExtStorage = defaultKvStore.getBoolean(\"useExternalStorage\", true);\n if (!useExtStorage) {\n- initiateCameraUpload(activity);\n+ initiateCameraUpload(activity, resultLauncher);\n return;\n }\n \n@@ -75,12 +77,12 @@ public void initiateCameraPick(Activity activity,\n () -> {\n if (defaultKvStore.getBoolean(\"inAppCameraFirstRun\")) {\n defaultKvStore.putBoolean(\"inAppCameraFirstRun\", false);\n- askUserToAllowLocationAccess(activity, inAppCameraLocationPermissionLauncher);\n+ askUserToAllowLocationAccess(activity, inAppCameraLocationPermissionLauncher, resultLauncher);\n } else if (defaultKvStore.getBoolean(\"inAppCameraLocationPref\")) {\n createDialogsAndHandleLocationPermissions(activity,\n- inAppCameraLocationPermissionLauncher);\n+ inAppCameraLocationPermissionLauncher, resultLauncher);\n } else {\n- initiateCameraUpload(activity);\n+ initiateCameraUpload(activity, resultLauncher);\n }\n },\n R.string.storage_permission_title,\n@@ -94,7 +96,8 @@ public void initiateCameraPick(Activity activity,\n * @param activity\n */\n private void createDialogsAndHandleLocationPermissions(Activity activity,\n- ActivityResultLauncher inAppCameraLocationPermissionLauncher) {\n+ ActivityResultLauncher inAppCameraLocationPermissionLauncher,\n+ ActivityResultLauncher resultLauncher) {\n locationPermissionCallback = new LocationPermissionCallback() {\n @Override\n public void onLocationPermissionDenied(String toastMessage) {\n@@ -103,16 +106,16 @@ public void onLocationPermissionDenied(String toastMessage) {\n toastMessage,\n Toast.LENGTH_LONG\n ).show();\n- initiateCameraUpload(activity);\n+ initiateCameraUpload(activity, resultLauncher);\n }\n \n @Override\n public void onLocationPermissionGranted() {\n if (!locationPermissionsHelper.isLocationAccessToAppsTurnedOn()) {\n showLocationOffDialog(activity, R.string.in_app_camera_needs_location,\n- R.string.in_app_camera_location_unavailable);\n+ R.string.in_app_camera_location_unavailable, resultLauncher);\n } else {\n- initiateCameraUpload(activity);\n+ initiateCameraUpload(activity, resultLauncher);\n }\n }\n };\n@@ -135,9 +138,10 @@ public void onLocationPermissionGranted() {\n * @param activity Activity reference\n * @param dialogTextResource Resource id of text to be shown in dialog\n * @param toastTextResource Resource id of text to be shown in toast\n+ * @param resultLauncher\n */\n private void showLocationOffDialog(Activity activity, int dialogTextResource,\n- int toastTextResource) {\n+ int toastTextResource, ActivityResultLauncher resultLauncher) {\n DialogUtil\n .showAlertDialog(activity,\n activity.getString(R.string.ask_to_turn_location_on),\n@@ -148,20 +152,21 @@ private void showLocationOffDialog(Activity activity, int dialogTextResource,\n () -> {\n Toast.makeText(activity, activity.getString(toastTextResource),\n Toast.LENGTH_LONG).show();\n- initiateCameraUpload(activity);\n+ initiateCameraUpload(activity, resultLauncher);\n }\n );\n }\n \n public void handleShowRationaleFlowCameraLocation(Activity activity,\n- ActivityResultLauncher inAppCameraLocationPermissionLauncher) {\n+ ActivityResultLauncher inAppCameraLocationPermissionLauncher,\n+ ActivityResultLauncher resultLauncher) {\n DialogUtil.showAlertDialog(activity, activity.getString(R.string.location_permission_title),\n activity.getString(R.string.in_app_camera_location_permission_rationale),\n activity.getString(android.R.string.ok),\n activity.getString(android.R.string.cancel),\n () -> {\n createDialogsAndHandleLocationPermissions(activity,\n- inAppCameraLocationPermissionLauncher);\n+ inAppCameraLocationPermissionLauncher, resultLauncher);\n },\n () -> locationPermissionCallback.onLocationPermissionDenied(\n activity.getString(R.string.in_app_camera_location_permission_denied)),\n@@ -181,7 +186,8 @@ public void handleShowRationaleFlowCameraLocation(Activity activity,\n * @param activity\n */\n private void askUserToAllowLocationAccess(Activity activity,\n- ActivityResultLauncher inAppCameraLocationPermissionLauncher) {\n+ ActivityResultLauncher inAppCameraLocationPermissionLauncher,\n+ ActivityResultLauncher resultLauncher) {\n DialogUtil.showAlertDialog(activity,\n activity.getString(R.string.in_app_camera_location_permission_title),\n activity.getString(R.string.in_app_camera_location_access_explanation),\n@@ -190,12 +196,12 @@ private void askUserToAllowLocationAccess(Activity activity,\n () -> {\n defaultKvStore.putBoolean(\"inAppCameraLocationPref\", true);\n createDialogsAndHandleLocationPermissions(activity,\n- inAppCameraLocationPermissionLauncher);\n+ inAppCameraLocationPermissionLauncher, resultLauncher);\n },\n () -> {\n ViewUtil.showLongToast(activity, R.string.in_app_camera_location_permission_denied);\n defaultKvStore.putBoolean(\"inAppCameraLocationPref\", false);\n- initiateCameraUpload(activity);\n+ initiateCameraUpload(activity, resultLauncher);\n },\n null,\n true);\n@@ -204,18 +210,18 @@ private void askUserToAllowLocationAccess(Activity activity,\n /**\n * Initiate gallery picker\n */\n- public void initiateGalleryPick(final Activity activity, final boolean allowMultipleUploads) {\n- initiateGalleryUpload(activity, allowMultipleUploads);\n+ public void initiateGalleryPick(final Activity activity, ActivityResultLauncher resultLauncher, final boolean allowMultipleUploads) {\n+ initiateGalleryUpload(activity, resultLauncher, allowMultipleUploads);\n }\n \n /**\n * Initiate gallery picker with permission\n */\n- public void initiateCustomGalleryPickWithPermission(final Activity activity) {\n+ public void initiateCustomGalleryPickWithPermission(final Activity activity, ActivityResultLauncher resultLauncher) {\n setPickerConfiguration(activity, true);\n \n PermissionUtils.checkPermissionsAndPerformAction(activity,\n- () -> FilePicker.openCustomSelector(activity, 0),\n+ () -> FilePicker.openCustomSelector(activity, resultLauncher, 0),\n R.string.storage_permission_title,\n R.string.write_storage_permission_rationale,\n PermissionUtils.PERMISSIONS_STORAGE);\n@@ -225,12 +231,10 @@ public void initiateCustomGalleryPickWithPermission(final Activity activity) {\n /**\n * Open chooser for gallery uploads\n */\n- private void initiateGalleryUpload(final Activity activity,\n+ private void initiateGalleryUpload(final Activity activity, ActivityResultLauncher resultLauncher,\n final boolean allowMultipleUploads) {\n setPickerConfiguration(activity, allowMultipleUploads);\n- boolean openDocumentIntentPreferred = defaultKvStore.getBoolean(\n- \"openDocumentPhotoPickerPref\", true);\n- FilePicker.openGallery(activity, 0, openDocumentIntentPreferred);\n+ FilePicker.openGallery(activity, resultLauncher, 0, isDocumentPhotoPickerPreferred());\n }\n \n /**\n@@ -247,22 +251,43 @@ private void setPickerConfiguration(Activity activity,\n /**\n * Initiate camera upload by opening camera\n */\n- private void initiateCameraUpload(Activity activity) {\n+ private void initiateCameraUpload(Activity activity, ActivityResultLauncher resultLauncher) {\n setPickerConfiguration(activity, false);\n if (defaultKvStore.getBoolean(\"inAppCameraLocationPref\", false)) {\n locationBeforeImageCapture = locationManager.getLastLocation();\n }\n isInAppCameraUpload = true;\n- FilePicker.openCameraForImage(activity, 0);\n+ FilePicker.openCameraForImage(activity, resultLauncher, 0);\n+ }\n+\n+ private boolean isDocumentPhotoPickerPreferred(){\n+ return defaultKvStore.getBoolean(\n+ \"openDocumentPhotoPickerPref\", true);\n+ }\n+\n+ public void onPictureReturnedFromGallery(ActivityResult result, Activity activity, FilePicker.Callbacks callbacks){\n+\n+ if(isDocumentPhotoPickerPreferred()){\n+ FilePicker.onPictureReturnedFromDocuments(result, activity, callbacks);\n+ } else {\n+ FilePicker.onPictureReturnedFromGallery(result, activity, callbacks);\n+ }\n+ }\n+\n+ public void onPictureReturnedFromCustomSelector(ActivityResult result, Activity activity, @NonNull FilePicker.Callbacks callbacks) {\n+ FilePicker.onPictureReturnedFromCustomSelector(result, activity, callbacks);\n+ }\n+\n+ public void onPictureReturnedFromCamera(ActivityResult result, Activity activity, @NonNull FilePicker.Callbacks callbacks) {\n+ FilePicker.onPictureReturnedFromCamera(result, activity, callbacks);\n }\n \n /**\n * Attaches callback for file picker.\n */\n- public void handleActivityResult(Activity activity, int requestCode, int resultCode,\n- Intent data) {\n- FilePicker.handleActivityResult(requestCode, resultCode, data, activity,\n- new DefaultCallback() {\n+ public void handleActivityResultWithCallback(Activity activity, FilePicker.HandleActivityResult handleActivityResult) {\n+\n+ handleActivityResult.onHandleActivityResult(new DefaultCallback() {\n \n @Override\n public void onCanceled(final ImageSource source, final int type) {\ndiff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java\nindex 53c91534e4..509d1eb95b 100644\n--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java\n+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java\n@@ -6,6 +6,7 @@\n \n import android.Manifest.permission;\n import android.content.Context;\n+import android.content.Intent;\n import android.content.res.Configuration;\n import android.net.Uri;\n import android.os.Bundle;\n@@ -20,6 +21,7 @@\n import androidx.activity.result.ActivityResultCallback;\n import androidx.activity.result.ActivityResultLauncher;\n import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions;\n+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;\n import androidx.annotation.NonNull;\n import androidx.annotation.Nullable;\n import androidx.annotation.VisibleForTesting;\n@@ -96,6 +98,30 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl\n private int contributionsSize;\n private String userName;\n \n+ private final ActivityResultLauncher galleryPickLauncherForResult =\n+ registerForActivityResult(new StartActivityForResult(),\n+ result -> {\n+ controller.handleActivityResultWithCallback(requireActivity(), callbacks -> {\n+ controller.onPictureReturnedFromGallery(result, requireActivity(), callbacks);\n+ });\n+ });\n+\n+ private final ActivityResultLauncher customSelectorLauncherForResult =\n+ registerForActivityResult(new StartActivityForResult(),\n+ result -> {\n+ controller.handleActivityResultWithCallback(requireActivity(), callbacks -> {\n+ controller.onPictureReturnedFromCustomSelector(result, requireActivity(), callbacks);\n+ });\n+ });\n+\n+ private final ActivityResultLauncher cameraPickLauncherForResult =\n+ registerForActivityResult(new StartActivityForResult(),\n+ result -> {\n+ controller.handleActivityResultWithCallback(requireActivity(), callbacks -> {\n+ controller.onPictureReturnedFromCamera(result, requireActivity(), callbacks);\n+ });\n+ });\n+\n private ActivityResultLauncher inAppCameraLocationPermissionLauncher = registerForActivityResult(\n new RequestMultiplePermissions(),\n new ActivityResultCallback>() {\n@@ -111,7 +137,7 @@ public void onActivityResult(Map result) {\n } else {\n if (shouldShowRequestPermissionRationale(permission.ACCESS_FINE_LOCATION)) {\n controller.handleShowRationaleFlowCameraLocation(getActivity(),\n- inAppCameraLocationPermissionLauncher);\n+ inAppCameraLocationPermissionLauncher, cameraPickLauncherForResult);\n } else {\n controller.locationPermissionCallback.onLocationPermissionDenied(\n getActivity().getString(\n@@ -322,7 +348,7 @@ private void initializeAnimations() {\n private void setListeners() {\n binding.fabPlus.setOnClickListener(view -> animateFAB(isFabOpen));\n binding.fabCamera.setOnClickListener(view -> {\n- controller.initiateCameraPick(getActivity(), inAppCameraLocationPermissionLauncher);\n+ controller.initiateCameraPick(getActivity(), inAppCameraLocationPermissionLauncher, cameraPickLauncherForResult);\n animateFAB(isFabOpen);\n });\n binding.fabCamera.setOnLongClickListener(view -> {\n@@ -330,7 +356,7 @@ private void setListeners() {\n return true;\n });\n binding.fabGallery.setOnClickListener(view -> {\n- controller.initiateGalleryPick(getActivity(), true);\n+ controller.initiateGalleryPick(getActivity(), galleryPickLauncherForResult, true);\n animateFAB(isFabOpen);\n });\n binding.fabGallery.setOnLongClickListener(view -> {\n@@ -343,7 +369,7 @@ private void setListeners() {\n * Launch Custom Selector.\n */\n protected void launchCustomSelector() {\n- controller.initiateCustomGalleryPickWithPermission(getActivity());\n+ controller.initiateCustomGalleryPickWithPermission(getActivity(), customSelectorLauncherForResult);\n animateFAB(isFabOpen);\n }\n \ndiff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java\nindex 54d3e96818..a9e9ee5c62 100644\n--- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java\n+++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java\n@@ -438,13 +438,6 @@ public void onReady() {\n });\n }\n \n- @Override\n- protected void onActivityResult(int requestCode, int resultCode, Intent data) {\n- Timber.d(data != null ? data.toString() : \"onActivityResult data is null\");\n- super.onActivityResult(requestCode, resultCode, data);\n- controller.handleActivityResult(this, requestCode, resultCode, data);\n- }\n-\n @Override\n protected void onResume() {\n super.onResume();\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt\nindex 3bba6f05cc..959db52f3b 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt\n@@ -13,6 +13,8 @@ import android.view.Window\n import android.widget.Button\n import android.widget.ImageButton\n import android.widget.TextView\n+import androidx.activity.result.ActivityResult\n+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult\n import androidx.compose.foundation.BorderStroke\n import androidx.compose.foundation.layout.Row\n import androidx.compose.foundation.layout.fillMaxWidth\n@@ -146,6 +148,10 @@ class CustomSelectorActivity :\n \n private var showPartialAccessIndicator by mutableStateOf(false)\n \n+ private val startForResult = registerForActivityResult(StartActivityForResult()){ result ->\n+ onFullScreenDataReceived(result)\n+ }\n+\n /**\n * onCreate Activity, sets theme, initialises the view model, setup view.\n */\n@@ -224,17 +230,10 @@ class CustomSelectorActivity :\n /**\n * When data will be send from full screen mode, it will be passed to fragment\n */\n- override fun onActivityResult(\n- requestCode: Int,\n- resultCode: Int,\n- data: Intent?,\n- ) {\n- super.onActivityResult(requestCode, resultCode, data)\n- if (requestCode == Constants.RequestCodes.RECEIVE_DATA_FROM_FULL_SCREEN_MODE &&\n- resultCode == Activity.RESULT_OK\n- ) {\n+ private fun onFullScreenDataReceived(result: ActivityResult){\n+ if (result.resultCode == Activity.RESULT_OK) {\n val selectedImages: ArrayList =\n- data!!\n+ result.data!!\n .getParcelableArrayListExtra(CustomSelectorConstants.NEW_SELECTED_IMAGES)!!\n viewModel?.selectedImages?.value = selectedImages\n }\n@@ -509,7 +508,7 @@ class CustomSelectorActivity :\n selectedImages,\n )\n intent.putExtra(CustomSelectorConstants.BUCKET_ID, bucketId)\n- startActivityForResult(intent, Constants.RequestCodes.RECEIVE_DATA_FROM_FULL_SCREEN_MODE)\n+ startForResult.launch(intent)\n }\n \n /**\ndiff --git a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt\nindex 0dbdf71ae0..cfd7f36b9a 100644\n--- a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt\n@@ -6,6 +6,8 @@ import android.os.Bundle\n import android.os.Parcelable\n import android.speech.RecognizerIntent\n import android.view.View\n+import androidx.activity.result.ActivityResult\n+import androidx.activity.result.contract.ActivityResultContracts\n import androidx.recyclerview.widget.LinearLayoutManager\n import androidx.recyclerview.widget.RecyclerView\n import fr.free.nrw.commons.CommonsApplication\n@@ -70,10 +72,14 @@ class DescriptionEditActivity :\n \n private lateinit var binding: ActivityDescriptionEditBinding\n \n- private val requestCodeForVoiceInput = 1213\n-\n private var descriptionAndCaptions: ArrayList? = null\n \n+ private val voiceInputResultLauncher = registerForActivityResult(\n+ ActivityResultContracts.StartActivityForResult()\n+ ) { result: ActivityResult ->\n+ onVoiceInput(result)\n+ }\n+\n @Inject lateinit var descriptionEditHelper: DescriptionEditHelper\n \n @Inject lateinit var sessionManager: SessionManager\n@@ -115,6 +121,7 @@ class DescriptionEditActivity :\n savedLanguageValue,\n descriptionAndCaptions,\n recentLanguagesDao,\n+ voiceInputResultLauncher\n )\n uploadMediaDetailAdapter.setCallback { titleStringID: Int, messageStringId: Int ->\n showInfoAlert(\n@@ -149,6 +156,15 @@ class DescriptionEditActivity :\n \n override fun onPrimaryCaptionTextChange(isNotEmpty: Boolean) {}\n \n+ private fun onVoiceInput(result: ActivityResult) {\n+ if (result.resultCode == RESULT_OK && result.data != null) {\n+ val resultData = result.data!!.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)\n+ uploadMediaDetailAdapter.handleSpeechResult(resultData!![0])\n+ } else {\n+ Timber.e(\"Error %s\", result.resultCode)\n+ }\n+ }\n+\n /**\n * Adds new language item to RecyclerView\n */\n@@ -292,22 +308,6 @@ class DescriptionEditActivity :\n progressDialog!!.show()\n }\n \n- override fun onActivityResult(\n- requestCode: Int,\n- resultCode: Int,\n- data: Intent?,\n- ) {\n- super.onActivityResult(requestCode, resultCode, data)\n- if (requestCode == requestCodeForVoiceInput) {\n- if (resultCode == RESULT_OK && data != null) {\n- val result = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)\n- uploadMediaDetailAdapter.handleSpeechResult(result!![0])\n- } else {\n- Timber.e(\"Error %s\", resultCode)\n- }\n- }\n- }\n-\n override fun onSaveInstanceState(outState: Bundle) {\n super.onSaveInstanceState(outState)\n \ndiff --git a/app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java b/app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java\nindex f907f0a014..4a58232522 100644\n--- a/app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java\n+++ b/app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java\n@@ -4,20 +4,11 @@ public interface Constants {\n String DEFAULT_FOLDER_NAME = \"CommonsContributions\";\n \n /**\n- * Provides the request codes utilised by the FilePicker\n+ * Provides the request codes for permission handling\n */\n interface RequestCodes {\n int LOCATION = 1;\n int STORAGE = 2;\n- int FILE_PICKER_IMAGE_IDENTIFICATOR = 0b1101101100; //876\n- int SOURCE_CHOOSER = 1 << 15;\n-\n- int PICK_PICTURE_FROM_CUSTOM_SELECTOR = FILE_PICKER_IMAGE_IDENTIFICATOR + (1 << 10);\n- int PICK_PICTURE_FROM_DOCUMENTS = FILE_PICKER_IMAGE_IDENTIFICATOR + (1 << 11);\n- int PICK_PICTURE_FROM_GALLERY = FILE_PICKER_IMAGE_IDENTIFICATOR + (1 << 12);\n- int TAKE_PICTURE = FILE_PICKER_IMAGE_IDENTIFICATOR + (1 << 13);\n-\n- int RECEIVE_DATA_FROM_FULL_SCREEN_MODE = 1 << 9;\n }\n \n /**\ndiff --git a/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java b/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java\nindex daa29276a8..b64db24c5f 100644\n--- a/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java\n+++ b/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java\n@@ -12,6 +12,8 @@\n import android.net.Uri;\n import android.provider.MediaStore;\n import android.text.TextUtils;\n+import androidx.activity.result.ActivityResult;\n+import androidx.activity.result.ActivityResultLauncher;\n import androidx.annotation.NonNull;\n import androidx.annotation.Nullable;\n import androidx.preference.PreferenceManager;\n@@ -107,31 +109,25 @@ private static int restoreType(@NonNull Context context) {\n *\n * @param type Custom type of your choice, which will be returned with the images\n */\n- public static void openGallery(Activity activity, int type, boolean openDocumentIntentPreferred) {\n+ public static void openGallery(Activity activity, ActivityResultLauncher resultLauncher, int type, boolean openDocumentIntentPreferred) {\n Intent intent = createGalleryIntent(activity, type, openDocumentIntentPreferred);\n- int requestCode = RequestCodes.PICK_PICTURE_FROM_GALLERY;\n-\n- if(openDocumentIntentPreferred){\n- requestCode = RequestCodes.PICK_PICTURE_FROM_DOCUMENTS;\n- }\n-\n- activity.startActivityForResult(intent, requestCode);\n+ resultLauncher.launch(intent);\n }\n \n /**\n * Opens Custom Selector\n */\n- public static void openCustomSelector(Activity activity, int type) {\n+ public static void openCustomSelector(Activity activity, ActivityResultLauncher resultLauncher, int type) {\n Intent intent = createCustomSelectorIntent(activity, type);\n- activity.startActivityForResult(intent, RequestCodes.PICK_PICTURE_FROM_CUSTOM_SELECTOR);\n+ resultLauncher.launch(intent);\n }\n \n /**\n * Opens the camera app to pick image clicked by user \n */\n- public static void openCameraForImage(Activity activity, int type) {\n+ public static void openCameraForImage(Activity activity, ActivityResultLauncher resultLauncher, int type) {\n Intent intent = createCameraForImageIntent(activity, type);\n- activity.startActivityForResult(intent, RequestCodes.TAKE_PICTURE);\n+ resultLauncher.launch(intent);\n }\n \n @Nullable\n@@ -154,43 +150,6 @@ private static UploadableFile takenCameraVideo(Context context) throws URISyntax\n }\n }\n \n- /**\n- * Any activity can use this method to attach their callback to the file picker\n- */\n- public static void handleActivityResult(int requestCode, int resultCode, Intent data, Activity activity, @NonNull FilePicker.Callbacks callbacks) {\n- boolean isHandledPickedFile = (requestCode & RequestCodes.FILE_PICKER_IMAGE_IDENTIFICATOR) > 0;\n- if (isHandledPickedFile) {\n- requestCode &= ~RequestCodes.SOURCE_CHOOSER;\n- if (requestCode == RequestCodes.PICK_PICTURE_FROM_GALLERY ||\n- requestCode == RequestCodes.TAKE_PICTURE ||\n- requestCode == RequestCodes.PICK_PICTURE_FROM_DOCUMENTS ||\n- requestCode == RequestCodes.PICK_PICTURE_FROM_CUSTOM_SELECTOR) {\n- if (resultCode == Activity.RESULT_OK) {\n- if (requestCode == RequestCodes.PICK_PICTURE_FROM_DOCUMENTS && !isPhoto(data)) {\n- onPictureReturnedFromDocuments(data, activity, callbacks);\n- } else if (requestCode == RequestCodes.PICK_PICTURE_FROM_GALLERY && !isPhoto(data)) {\n- onPictureReturnedFromGallery(data, activity, callbacks);\n- } else if (requestCode == RequestCodes.PICK_PICTURE_FROM_CUSTOM_SELECTOR) {\n- onPictureReturnedFromCustomSelector(data, activity, callbacks);\n- } else if (requestCode == RequestCodes.TAKE_PICTURE) {\n- onPictureReturnedFromCamera(activity, callbacks);\n- }\n- } else {\n- if (requestCode == RequestCodes.PICK_PICTURE_FROM_DOCUMENTS) {\n- callbacks.onCanceled(FilePicker.ImageSource.DOCUMENTS, restoreType(activity));\n- } else if (requestCode == RequestCodes.PICK_PICTURE_FROM_GALLERY) {\n- callbacks.onCanceled(FilePicker.ImageSource.GALLERY, restoreType(activity));\n- } else if (requestCode == RequestCodes.PICK_PICTURE_FROM_CUSTOM_SELECTOR){\n- callbacks.onCanceled(ImageSource.CUSTOM_SELECTOR, restoreType(activity));\n- }\n- else {\n- callbacks.onCanceled(FilePicker.ImageSource.CAMERA_IMAGE, restoreType(activity));\n- }\n- }\n- }\n- }\n- }\n-\n public static List handleExternalImagesPicked(Intent data, Activity activity) {\n try {\n return getFilesFromGalleryPictures(data, activity);\n@@ -243,18 +202,22 @@ private static Intent plainGalleryPickerIntent(boolean openDocumentIntentPreferr\n return intent;\n }\n \n- private static void onPictureReturnedFromDocuments(Intent data, Activity activity, @NonNull FilePicker.Callbacks callbacks) {\n- try {\n- Uri photoPath = data.getData();\n- UploadableFile photoFile = PickedFiles.pickedExistingPicture(activity, photoPath);\n- callbacks.onImagesPicked(singleFileList(photoFile), FilePicker.ImageSource.DOCUMENTS, restoreType(activity));\n+ public static void onPictureReturnedFromDocuments(ActivityResult result, Activity activity, @NonNull FilePicker.Callbacks callbacks) {\n+ if(result.getResultCode() == Activity.RESULT_OK && !isPhoto(result.getData())){\n+ try {\n+ Uri photoPath = result.getData().getData();\n+ UploadableFile photoFile = PickedFiles.pickedExistingPicture(activity, photoPath);\n+ callbacks.onImagesPicked(singleFileList(photoFile), FilePicker.ImageSource.DOCUMENTS, restoreType(activity));\n \n- if (configuration(activity).shouldCopyPickedImagesToPublicGalleryAppFolder()) {\n- PickedFiles.copyFilesInSeparateThread(activity, singleFileList(photoFile));\n+ if (configuration(activity).shouldCopyPickedImagesToPublicGalleryAppFolder()) {\n+ PickedFiles.copyFilesInSeparateThread(activity, singleFileList(photoFile));\n+ }\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ callbacks.onImagePickerError(e, FilePicker.ImageSource.DOCUMENTS, restoreType(activity));\n }\n- } catch (Exception e) {\n- e.printStackTrace();\n- callbacks.onImagePickerError(e, FilePicker.ImageSource.DOCUMENTS, restoreType(activity));\n+ } else {\n+ callbacks.onCanceled(FilePicker.ImageSource.DOCUMENTS, restoreType(activity));\n }\n }\n \n@@ -262,14 +225,18 @@ private static void onPictureReturnedFromDocuments(Intent data, Activity activit\n * onPictureReturnedFromCustomSelector.\n * Retrieve and forward the images to upload wizard through callback.\n */\n- private static void onPictureReturnedFromCustomSelector(Intent data, Activity activity, @NonNull FilePicker.Callbacks callbacks) {\n- try {\n- List files = getFilesFromCustomSelector(data, activity);\n- callbacks.onImagesPicked(files, ImageSource.CUSTOM_SELECTOR, restoreType(activity));\n- } catch (Exception e) {\n- e.printStackTrace();\n- callbacks.onImagePickerError(e, ImageSource.CUSTOM_SELECTOR, restoreType(activity));\n- }\n+ public static void onPictureReturnedFromCustomSelector(ActivityResult result, Activity activity, @NonNull FilePicker.Callbacks callbacks) {\n+ if(result.getResultCode() == Activity.RESULT_OK){\n+ try {\n+ List files = getFilesFromCustomSelector(result.getData(), activity);\n+ callbacks.onImagesPicked(files, ImageSource.CUSTOM_SELECTOR, restoreType(activity));\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ callbacks.onImagePickerError(e, ImageSource.CUSTOM_SELECTOR, restoreType(activity));\n+ }\n+ } else {\n+ callbacks.onCanceled(ImageSource.CUSTOM_SELECTOR, restoreType(activity));\n+ }\n }\n \n /**\n@@ -292,13 +259,17 @@ private static List getFilesFromCustomSelector(Intent data, Acti\n return files;\n }\n \n- private static void onPictureReturnedFromGallery(Intent data, Activity activity, @NonNull FilePicker.Callbacks callbacks) {\n- try {\n- List files = getFilesFromGalleryPictures(data, activity);\n- callbacks.onImagesPicked(files, FilePicker.ImageSource.GALLERY, restoreType(activity));\n- } catch (Exception e) {\n- e.printStackTrace();\n- callbacks.onImagePickerError(e, FilePicker.ImageSource.GALLERY, restoreType(activity));\n+ public static void onPictureReturnedFromGallery(ActivityResult result, Activity activity, @NonNull FilePicker.Callbacks callbacks) {\n+ if(result.getResultCode() == Activity.RESULT_OK && !isPhoto(result.getData())){\n+ try {\n+ List files = getFilesFromGalleryPictures(result.getData(), activity);\n+ callbacks.onImagesPicked(files, FilePicker.ImageSource.GALLERY, restoreType(activity));\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ callbacks.onImagePickerError(e, FilePicker.ImageSource.GALLERY, restoreType(activity));\n+ }\n+ } else{\n+ callbacks.onCanceled(FilePicker.ImageSource.GALLERY, restoreType(activity));\n }\n }\n \n@@ -324,69 +295,40 @@ private static List getFilesFromGalleryPictures(Intent data, Act\n return files;\n }\n \n- private static void onPictureReturnedFromCamera(Activity activity, @NonNull FilePicker.Callbacks callbacks) {\n- try {\n- String lastImageUri = PreferenceManager.getDefaultSharedPreferences(activity).getString(KEY_PHOTO_URI, null);\n- if (!TextUtils.isEmpty(lastImageUri)) {\n- revokeWritePermission(activity, Uri.parse(lastImageUri));\n- }\n+ public static void onPictureReturnedFromCamera(ActivityResult activityResult, Activity activity, @NonNull FilePicker.Callbacks callbacks) {\n+ if(activityResult.getResultCode() == Activity.RESULT_OK){\n+ try {\n+ String lastImageUri = PreferenceManager.getDefaultSharedPreferences(activity).getString(KEY_PHOTO_URI, null);\n+ if (!TextUtils.isEmpty(lastImageUri)) {\n+ revokeWritePermission(activity, Uri.parse(lastImageUri));\n+ }\n \n- UploadableFile photoFile = FilePicker.takenCameraPicture(activity);\n- List files = new ArrayList<>();\n- files.add(photoFile);\n+ UploadableFile photoFile = FilePicker.takenCameraPicture(activity);\n+ List files = new ArrayList<>();\n+ files.add(photoFile);\n \n- if (photoFile == null) {\n- Exception e = new IllegalStateException(\"Unable to get the picture returned from camera\");\n- callbacks.onImagePickerError(e, FilePicker.ImageSource.CAMERA_IMAGE, restoreType(activity));\n- } else {\n- if (configuration(activity).shouldCopyTakenPhotosToPublicGalleryAppFolder()) {\n- PickedFiles.copyFilesInSeparateThread(activity, singleFileList(photoFile));\n- }\n+ if (photoFile == null) {\n+ Exception e = new IllegalStateException(\"Unable to get the picture returned from camera\");\n+ callbacks.onImagePickerError(e, FilePicker.ImageSource.CAMERA_IMAGE, restoreType(activity));\n+ } else {\n+ if (configuration(activity).shouldCopyTakenPhotosToPublicGalleryAppFolder()) {\n+ PickedFiles.copyFilesInSeparateThread(activity, singleFileList(photoFile));\n+ }\n \n- callbacks.onImagesPicked(files, FilePicker.ImageSource.CAMERA_IMAGE, restoreType(activity));\n- }\n+ callbacks.onImagesPicked(files, FilePicker.ImageSource.CAMERA_IMAGE, restoreType(activity));\n+ }\n \n- PreferenceManager.getDefaultSharedPreferences(activity)\n+ PreferenceManager.getDefaultSharedPreferences(activity)\n .edit()\n .remove(KEY_LAST_CAMERA_PHOTO)\n .remove(KEY_PHOTO_URI)\n .apply();\n- } catch (Exception e) {\n- e.printStackTrace();\n- callbacks.onImagePickerError(e, FilePicker.ImageSource.CAMERA_IMAGE, restoreType(activity));\n- }\n- }\n-\n- private static void onVideoReturnedFromCamera(Activity activity, @NonNull FilePicker.Callbacks callbacks) {\n- try {\n- String lastVideoUri = PreferenceManager.getDefaultSharedPreferences(activity).getString(KEY_VIDEO_URI, null);\n- if (!TextUtils.isEmpty(lastVideoUri)) {\n- revokeWritePermission(activity, Uri.parse(lastVideoUri));\n- }\n-\n- UploadableFile photoFile = FilePicker.takenCameraVideo(activity);\n- List files = new ArrayList<>();\n- files.add(photoFile);\n-\n- if (photoFile == null) {\n- Exception e = new IllegalStateException(\"Unable to get the video returned from camera\");\n- callbacks.onImagePickerError(e, FilePicker.ImageSource.CAMERA_VIDEO, restoreType(activity));\n- } else {\n- if (configuration(activity).shouldCopyTakenPhotosToPublicGalleryAppFolder()) {\n- PickedFiles.copyFilesInSeparateThread(activity, singleFileList(photoFile));\n- }\n-\n- callbacks.onImagesPicked(files, FilePicker.ImageSource.CAMERA_VIDEO, restoreType(activity));\n+ } catch (Exception e) {\n+ e.printStackTrace();\n+ callbacks.onImagePickerError(e, FilePicker.ImageSource.CAMERA_IMAGE, restoreType(activity));\n }\n-\n- PreferenceManager.getDefaultSharedPreferences(activity)\n- .edit()\n- .remove(KEY_LAST_CAMERA_VIDEO)\n- .remove(KEY_VIDEO_URI)\n- .apply();\n- } catch (Exception e) {\n- e.printStackTrace();\n- callbacks.onImagePickerError(e, FilePicker.ImageSource.CAMERA_VIDEO, restoreType(activity));\n+ } else {\n+ callbacks.onCanceled(FilePicker.ImageSource.CAMERA_IMAGE, restoreType(activity));\n }\n }\n \n@@ -406,4 +348,8 @@ public interface Callbacks {\n \n void onCanceled(FilePicker.ImageSource source, int type);\n }\n+\n+ public interface HandleActivityResult{\n+ void onHandleActivityResult(FilePicker.Callbacks callbacks);\n+ }\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java\nindex 7336c1b407..dd0829a1b5 100644\n--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java\n+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java\n@@ -1,13 +1,10 @@\n package fr.free.nrw.commons.media;\n \n-import static android.app.Activity.RESULT_CANCELED;\n-import static android.app.Activity.RESULT_OK;\n import static android.view.View.GONE;\n import static android.view.View.VISIBLE;\n import static fr.free.nrw.commons.category.CategoryClientKt.CATEGORY_NEEDING_CATEGORIES;\n import static fr.free.nrw.commons.category.CategoryClientKt.CATEGORY_UNCATEGORISED;\n import static fr.free.nrw.commons.description.EditDescriptionConstants.LIST_OF_DESCRIPTION_AND_CAPTION;\n-import static fr.free.nrw.commons.description.EditDescriptionConstants.UPDATED_WIKITEXT;\n import static fr.free.nrw.commons.description.EditDescriptionConstants.WIKITEXT;\n import static fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment.LAST_LOCATION;\n import static fr.free.nrw.commons.utils.LangCodeUtils.getLocalizedResources;\n@@ -112,8 +109,6 @@\n public class MediaDetailFragment extends CommonsDaggerSupportFragment implements\n CategoryEditHelper.Callback {\n \n- private static final int REQUEST_CODE = 1001;\n- private static final int REQUEST_CODE_EDIT_DESCRIPTION = 1002;\n private static final String IMAGE_BACKGROUND_COLOR = \"image_background_color\";\n static final int DEFAULT_IMAGE_BACKGROUND_COLOR = 0;\n \n@@ -1065,81 +1060,6 @@ private LinkedHashMap getCaptionsList() {\n return captionList;\n }\n \n- /**\n- * Get the result from another activity and act accordingly.\n- * @param requestCode\n- * @param resultCode\n- * @param data\n- */\n- @Override\n- public void onActivityResult(final int requestCode, final int resultCode,\n- @Nullable final Intent data) {\n- super.onActivityResult(requestCode, resultCode, data);\n-\n- if (requestCode == REQUEST_CODE_EDIT_DESCRIPTION && resultCode == RESULT_OK) {\n- final String updatedWikiText = data.getStringExtra(UPDATED_WIKITEXT);\n-\n- try {\n- compositeDisposable.add(descriptionEditHelper.addDescription(getContext(), media,\n- updatedWikiText)\n- .subscribeOn(Schedulers.io())\n- .observeOn(AndroidSchedulers.mainThread())\n- .subscribe(s -> {\n- Timber.d(\"Descriptions are added.\");\n- }));\n- } catch (Exception e) {\n- if (e.getLocalizedMessage().equals(CsrfTokenClient.ANONYMOUS_TOKEN_MESSAGE)) {\n- final String username = sessionManager.getUserName();\n- final CommonsApplication.BaseLogoutListener logoutListener = new CommonsApplication.BaseLogoutListener(\n- getActivity(),\n- requireActivity().getString(R.string.invalid_login_message),\n- username\n- );\n-\n- CommonsApplication.getInstance().clearApplicationData(\n- requireActivity(), logoutListener);\n- }\n- }\n-\n- final ArrayList uploadMediaDetails\n- = data.getParcelableArrayListExtra(LIST_OF_DESCRIPTION_AND_CAPTION);\n-\n- LinkedHashMap updatedCaptions = new LinkedHashMap<>();\n- for (UploadMediaDetail mediaDetail:\n- uploadMediaDetails) {\n- try {\n- compositeDisposable.add(descriptionEditHelper.addCaption(getContext(), media,\n- mediaDetail.getLanguageCode(), mediaDetail.getCaptionText())\n- .subscribeOn(Schedulers.io())\n- .observeOn(AndroidSchedulers.mainThread())\n- .subscribe(s -> {\n- updateCaptions(mediaDetail, updatedCaptions);\n- Timber.d(\"Caption is added.\");\n- }));\n-\n- } catch (Exception e) {\n- if (e.getLocalizedMessage().equals(CsrfTokenClient.ANONYMOUS_TOKEN_MESSAGE)) {\n- final String username = sessionManager.getUserName();\n- final CommonsApplication.BaseLogoutListener logoutListener = new CommonsApplication.BaseLogoutListener(\n- getActivity(),\n- requireActivity().getString(R.string.invalid_login_message),\n- username\n- );\n-\n- CommonsApplication.getInstance().clearApplicationData(\n- requireActivity(), logoutListener);\n- }\n- }\n- }\n- binding.progressBarEdit.setVisibility(GONE);\n- binding.descriptionEdit.setVisibility(VISIBLE);\n-\n- } else if (requestCode == REQUEST_CODE_EDIT_DESCRIPTION && resultCode == RESULT_CANCELED) {\n- binding.progressBarEdit.setVisibility(GONE);\n- binding.descriptionEdit.setVisibility(VISIBLE);\n- }\n- }\n-\n /**\n * Adds caption to the map and updates captions\n * @param mediaDetail UploadMediaDetail\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceAdapterDelegate.kt b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceAdapterDelegate.kt\nindex 5152ac0f79..a4ea3cd5b2 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceAdapterDelegate.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceAdapterDelegate.kt\n@@ -1,5 +1,6 @@\n package fr.free.nrw.commons.nearby\n \n+import android.content.Intent\n import android.view.View\n import android.view.View.GONE\n import android.view.View.INVISIBLE\n@@ -17,9 +18,9 @@ import fr.free.nrw.commons.databinding.ItemPlaceBinding\n fun placeAdapterDelegate(\n bookmarkLocationDao: BookmarkLocationsDao,\n onItemClick: ((Place) -> Unit)? = null,\n- onCameraClicked: (Place, ActivityResultLauncher>) -> Unit,\n+ onCameraClicked: (Place, ActivityResultLauncher>, ActivityResultLauncher) -> Unit,\n onCameraLongPressed: () -> Boolean,\n- onGalleryClicked: (Place) -> Unit,\n+ onGalleryClicked: (Place, ActivityResultLauncher) -> Unit,\n onGalleryLongPressed: () -> Boolean,\n onBookmarkClicked: (Place, Boolean) -> Unit,\n onBookmarkLongPressed: () -> Boolean,\n@@ -28,6 +29,8 @@ fun placeAdapterDelegate(\n onDirectionsClicked: (Place) -> Unit,\n onDirectionsLongPressed: () -> Boolean,\n inAppCameraLocationPermissionLauncher: ActivityResultLauncher>,\n+ cameraPickLauncherForResult: ActivityResultLauncher,\n+ galleryPickLauncherForResult: ActivityResultLauncher\n ) = adapterDelegateViewBinding({ layoutInflater, parent ->\n ItemPlaceBinding.inflate(layoutInflater, parent, false)\n }) {\n@@ -44,10 +47,10 @@ fun placeAdapterDelegate(\n onItemClick?.invoke(item)\n }\n }\n- nearbyButtonLayout.cameraButton.setOnClickListener { onCameraClicked(item, inAppCameraLocationPermissionLauncher) }\n+ nearbyButtonLayout.cameraButton.setOnClickListener { onCameraClicked(item, inAppCameraLocationPermissionLauncher, cameraPickLauncherForResult) }\n nearbyButtonLayout.cameraButton.setOnLongClickListener { onCameraLongPressed() }\n \n- nearbyButtonLayout.galleryButton.setOnClickListener { onGalleryClicked(item) }\n+ nearbyButtonLayout.galleryButton.setOnClickListener { onGalleryClicked(item, galleryPickLauncherForResult) }\n nearbyButtonLayout.galleryButton.setOnLongClickListener { onGalleryLongPressed() }\n bookmarkButtonImage.setOnClickListener {\n val isBookmarked = bookmarkLocationDao.updateBookmarkLocation(item)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt\nindex f3eecf1160..a4d6b14b7d 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt\n@@ -28,14 +28,14 @@ class CommonPlaceClickActions\n private val activity: Activity,\n private val contributionController: ContributionController,\n ) {\n- fun onCameraClicked(): (Place, ActivityResultLauncher>) -> Unit =\n- { place, launcher ->\n+ fun onCameraClicked(): (Place, ActivityResultLauncher>, ActivityResultLauncher) -> Unit =\n+ { place, launcher, resultLauncher ->\n if (applicationKvStore.getBoolean(\"login_skipped\", false)) {\n showLoginDialog()\n } else {\n Timber.d(\"Camera button tapped. Image title: ${place.getName()}Image desc: ${place.longDescription}\")\n storeSharedPrefs(place)\n- contributionController.initiateCameraPick(activity, launcher)\n+ contributionController.initiateCameraPick(activity, launcher, resultLauncher)\n }\n }\n \n@@ -72,14 +72,14 @@ class CommonPlaceClickActions\n true\n }\n \n- fun onGalleryClicked(): (Place) -> Unit =\n- {\n+ fun onGalleryClicked(): (Place, ActivityResultLauncher) -> Unit =\n+ {place, galleryPickLauncherForResult ->\n if (applicationKvStore.getBoolean(\"login_skipped\", false)) {\n showLoginDialog()\n } else {\n- Timber.d(\"Gallery button tapped. Image title: ${it.getName()}Image desc: ${it.getLongDescription()}\")\n- storeSharedPrefs(it)\n- contributionController.initiateGalleryPick(activity, false)\n+ Timber.d(\"Gallery button tapped. Image title: ${place.getName()}Image desc: ${place.getLongDescription()}\")\n+ storeSharedPrefs(place)\n+ contributionController.initiateGalleryPick(activity, galleryPickLauncherForResult, false)\n }\n }\n \ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java\nindex f578afc259..7a7d5cdcba 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java\n@@ -49,6 +49,7 @@\n import androidx.activity.result.ActivityResultLauncher;\n import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions;\n import androidx.activity.result.contract.ActivityResultContracts.RequestPermission;\n+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;\n import androidx.annotation.DrawableRes;\n import androidx.annotation.NonNull;\n import androidx.annotation.Nullable;\n@@ -225,6 +226,31 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment\n private GridLayoutManager gridLayoutManager;\n private List dataList;\n private BottomSheetAdapter bottomSheetAdapter;\n+\n+ private final ActivityResultLauncher galleryPickLauncherForResult =\n+ registerForActivityResult(new StartActivityForResult(),\n+ result -> {\n+ controller.handleActivityResultWithCallback(requireActivity(), callbacks -> {\n+ controller.onPictureReturnedFromGallery(result, requireActivity(), callbacks);\n+ });\n+ });\n+\n+ private final ActivityResultLauncher customSelectorLauncherForResult =\n+ registerForActivityResult(new StartActivityForResult(),\n+ result -> {\n+ controller.handleActivityResultWithCallback(requireActivity(), callbacks -> {\n+ controller.onPictureReturnedFromCustomSelector(result, requireActivity(), callbacks);\n+ });\n+ });\n+\n+ private final ActivityResultLauncher cameraPickLauncherForResult =\n+ registerForActivityResult(new StartActivityForResult(),\n+ result -> {\n+ controller.handleActivityResultWithCallback(requireActivity(), callbacks -> {\n+ controller.onPictureReturnedFromCamera(result, requireActivity(), callbacks);\n+ });\n+ });\n+\n private ActivityResultLauncher inAppCameraLocationPermissionLauncher = registerForActivityResult(\n new RequestMultiplePermissions(),\n new ActivityResultCallback>() {\n@@ -240,7 +266,7 @@ public void onActivityResult(Map result) {\n } else {\n if (shouldShowRequestPermissionRationale(permission.ACCESS_FINE_LOCATION)) {\n controller.handleShowRationaleFlowCameraLocation(getActivity(),\n- inAppCameraLocationPermissionLauncher);\n+ inAppCameraLocationPermissionLauncher, cameraPickLauncherForResult);\n } else {\n controller.locationPermissionCallback.onLocationPermissionDenied(\n getActivity().getString(\n@@ -570,7 +596,9 @@ private void initRvNearbyList() {\n return Unit.INSTANCE;\n },\n commonPlaceClickActions,\n- inAppCameraLocationPermissionLauncher\n+ inAppCameraLocationPermissionLauncher,\n+ galleryPickLauncherForResult,\n+ cameraPickLauncherForResult\n );\n binding.bottomSheetNearby.rvNearbyList.setAdapter(adapter);\n }\n@@ -2201,7 +2229,7 @@ private void passInfoToSheet(final Place place) {\n if (binding.fabCamera.isShown()) {\n Timber.d(\"Camera button tapped. Place: %s\", selectedPlace.toString());\n storeSharedPrefs(selectedPlace);\n- controller.initiateCameraPick(getActivity(), inAppCameraLocationPermissionLauncher);\n+ controller.initiateCameraPick(getActivity(), inAppCameraLocationPermissionLauncher, cameraPickLauncherForResult);\n }\n });\n \n@@ -2210,6 +2238,7 @@ private void passInfoToSheet(final Place place) {\n Timber.d(\"Gallery button tapped. Place: %s\", selectedPlace.toString());\n storeSharedPrefs(selectedPlace);\n controller.initiateGalleryPick(getActivity(),\n+ galleryPickLauncherForResult,\n false);\n }\n });\n@@ -2218,7 +2247,7 @@ private void passInfoToSheet(final Place place) {\n if (binding.fabCustomGallery.isShown()) {\n Timber.d(\"Gallery button tapped. Place: %s\", selectedPlace.toString());\n storeSharedPrefs(selectedPlace);\n- controller.initiateCustomGalleryPickWithPermission(getActivity());\n+ controller.initiateCustomGalleryPickWithPermission(getActivity(), customSelectorLauncherForResult);\n }\n });\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/PlaceAdapter.kt b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/PlaceAdapter.kt\nindex 689aa7efca..e5cc926671 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/PlaceAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/PlaceAdapter.kt\n@@ -1,5 +1,6 @@\n package fr.free.nrw.commons.nearby.fragments\n \n+import android.content.Intent\n import androidx.activity.result.ActivityResultLauncher\n import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao\n import fr.free.nrw.commons.nearby.Place\n@@ -12,6 +13,8 @@ class PlaceAdapter(\n onBookmarkClicked: (Place, Boolean) -> Unit,\n commonPlaceClickActions: CommonPlaceClickActions,\n inAppCameraLocationPermissionLauncher: ActivityResultLauncher>,\n+ galleryPickLauncherForResult: ActivityResultLauncher,\n+ cameraPickLauncherForResult: ActivityResultLauncher\n ) : BaseDelegateAdapter(\n placeAdapterDelegate(\n bookmarkLocationsDao,\n@@ -27,6 +30,8 @@ class PlaceAdapter(\n commonPlaceClickActions.onDirectionsClicked(),\n commonPlaceClickActions.onDirectionsLongPressed(),\n inAppCameraLocationPermissionLauncher,\n+ cameraPickLauncherForResult,\n+ galleryPickLauncherForResult\n ),\n areItemsTheSame = { oldItem, newItem -> oldItem.wikiDataEntityId == newItem.wikiDataEntityId },\n )\ndiff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java\nindex 94e799aa29..5e631425b4 100644\n--- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java\n+++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java\n@@ -21,6 +21,7 @@\n import androidx.activity.result.ActivityResultCallback;\n import androidx.activity.result.ActivityResultLauncher;\n import androidx.activity.result.contract.ActivityResultContracts;\n+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;\n import androidx.preference.ListPreference;\n import androidx.preference.MultiSelectListPreference;\n import androidx.preference.Preference;\n@@ -85,6 +86,15 @@ public class SettingsFragment extends PreferenceFragmentCompat {\n private View separator;\n private ListView languageHistoryListView;\n private static final String GET_CONTENT_PICKER_HELP_URL = \"https://commons-app.github.io/docs.html#get-content\";\n+\n+ private final ActivityResultLauncher cameraPickLauncherForResult =\n+ registerForActivityResult(new StartActivityForResult(),\n+ result -> {\n+ contributionController.handleActivityResultWithCallback(requireActivity(), callbacks -> {\n+ contributionController.onPictureReturnedFromCamera(result, requireActivity(), callbacks);\n+ });\n+ });\n+\n private ActivityResultLauncher inAppCameraLocationPermissionLauncher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback>() {\n @Override\n public void onActivityResult(Map result) {\n@@ -93,7 +103,7 @@ public void onActivityResult(Map result) {\n areAllGranted = areAllGranted && b;\n }\n if (!areAllGranted && shouldShowRequestPermissionRationale(permission.ACCESS_FINE_LOCATION)) {\n- contributionController.handleShowRationaleFlowCameraLocation(getActivity(), inAppCameraLocationPermissionLauncher);\n+ contributionController.handleShowRationaleFlowCameraLocation(getActivity(), inAppCameraLocationPermissionLauncher, cameraPickLauncherForResult);\n }\n }\n });\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java\nindex 23b1873401..35906c3fb5 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java\n@@ -441,14 +441,6 @@ public void onRequestPermissionsResult(final int requestCode,\n super.onRequestPermissionsResult(requestCode, permissions, grantResults);\n }\n \n- @Override\n- protected void onActivityResult(int requestCode, int resultCode, Intent data) {\n- super.onActivityResult(requestCode, resultCode, data);\n- if (requestCode == CommonsApplication.OPEN_APPLICATION_DETAIL_SETTINGS) {\n- //TODO: Confirm if handling manual permission enabled is required\n- }\n- }\n-\n /**\n * Sets the flag indicating whether the upload is of a specific place.\n *\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java\nindex ecddab43d8..6fc8b3266d 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java\n@@ -20,6 +20,7 @@\n import android.widget.LinearLayout;\n import android.widget.ListView;\n import android.widget.TextView;\n+import androidx.activity.result.ActivityResultLauncher;\n import androidx.annotation.NonNull;\n import androidx.annotation.Nullable;\n import androidx.constraintlayout.widget.ConstraintLayout;\n@@ -57,27 +58,29 @@ public class UploadMediaDetailAdapter extends\n private int currentPosition;\n private Fragment fragment;\n private Activity activity;\n+ private final ActivityResultLauncher voiceInputResultLauncher;\n private SelectedVoiceIcon selectedVoiceIcon;\n- private static final int REQUEST_CODE_FOR_VOICE_INPUT = 1213;\n \n private RowItemDescriptionBinding binding;\n \n public UploadMediaDetailAdapter(Fragment fragment, String savedLanguageValue,\n- RecentLanguagesDao recentLanguagesDao) {\n+ RecentLanguagesDao recentLanguagesDao, ActivityResultLauncher voiceInputResultLauncher) {\n uploadMediaDetails = new ArrayList<>();\n selectedLanguages = new HashMap<>();\n this.savedLanguageValue = savedLanguageValue;\n this.recentLanguagesDao = recentLanguagesDao;\n this.fragment = fragment;\n+ this.voiceInputResultLauncher = voiceInputResultLauncher;\n }\n \n public UploadMediaDetailAdapter(Activity activity, final String savedLanguageValue,\n- List uploadMediaDetails, RecentLanguagesDao recentLanguagesDao) {\n+ List uploadMediaDetails, RecentLanguagesDao recentLanguagesDao, ActivityResultLauncher voiceInputResultLauncher) {\n this.uploadMediaDetails = uploadMediaDetails;\n selectedLanguages = new HashMap<>();\n this.savedLanguageValue = savedLanguageValue;\n this.recentLanguagesDao = recentLanguagesDao;\n this.activity = activity;\n+ this.voiceInputResultLauncher = voiceInputResultLauncher;\n }\n \n public void setCallback(Callback callback) {\n@@ -150,11 +153,7 @@ private void startSpeechInput(String locale) {\n );\n \n try {\n- if (activity == null) {\n- fragment.startActivityForResult(intent, REQUEST_CODE_FOR_VOICE_INPUT);\n- } else {\n- activity.startActivityForResult(intent, REQUEST_CODE_FOR_VOICE_INPUT);\n- }\n+ voiceInputResultLauncher.launch(intent);\n } catch (Exception e) {\n Timber.e(e.getMessage());\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java\nindex 105df1837a..2c4c2ecd3d 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java\n@@ -18,6 +18,9 @@\n import android.widget.CheckBox;\n import android.widget.ImageView;\n import android.widget.Toast;\n+import androidx.activity.result.ActivityResult;\n+import androidx.activity.result.ActivityResultLauncher;\n+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;\n import androidx.annotation.NonNull;\n import androidx.annotation.Nullable;\n import androidx.exifinterface.media.ExifInterface;\n@@ -58,9 +61,24 @@\n public class UploadMediaDetailFragment extends UploadBaseFragment implements\n UploadMediaDetailsContract.View, UploadMediaDetailAdapter.EventListener {\n \n- private static final int REQUEST_CODE = 1211;\n- private static final int REQUEST_CODE_FOR_EDIT_ACTIVITY = 1212;\n- private static final int REQUEST_CODE_FOR_VOICE_INPUT = 1213;\n+ private UploadMediaDetailAdapter uploadMediaDetailAdapter;\n+\n+ private final ActivityResultLauncher startForResult = registerForActivityResult(\n+ new StartActivityForResult(), result -> {\n+ onCameraPosition(result);\n+ });\n+\n+ private final ActivityResultLauncher startForEditActivityResult = registerForActivityResult(\n+ new StartActivityForResult(), result -> {\n+ onEditActivityResult(result);\n+ }\n+ );\n+\n+ private final ActivityResultLauncher voiceInputResultLauncher = registerForActivityResult(\n+ new StartActivityForResult(), result -> {\n+ onVoiceInput(result);\n+ }\n+ );\n \n public static Activity activity ;\n \n@@ -84,8 +102,6 @@ public class UploadMediaDetailFragment extends UploadBaseFragment implements\n private boolean hasUserRemovedLocation;\n \n \n- private UploadMediaDetailAdapter uploadMediaDetailAdapter;\n-\n @Inject\n UploadMediaDetailsContract.UserActionListener presenter;\n \n@@ -279,7 +295,7 @@ private void initPresenter() {\n */\n private void initRecyclerView() {\n uploadMediaDetailAdapter = new UploadMediaDetailAdapter(this,\n- defaultKvStore.getString(Prefs.DESCRIPTION_LANGUAGE, \"\"), recentLanguagesDao);\n+ defaultKvStore.getString(Prefs.DESCRIPTION_LANGUAGE, \"\"), recentLanguagesDao, voiceInputResultLauncher);\n uploadMediaDetailAdapter.setCallback(this::showInfoAlert);\n uploadMediaDetailAdapter.setEventListener(this);\n binding.rvDescriptions.setLayoutManager(new LinearLayoutManager(getContext()));\n@@ -593,14 +609,14 @@ public void showExternalMap(final UploadItem uploadItem) {\n * This method is called to start the image editing activity for a specific UploadItem.\n * It sets the UploadItem as the currently editable item, creates an intent to launch the\n * EditActivity, and passes the image file path as an extra in the intent. The activity\n- * is started with a request code, allowing the result to be handled in onActivityResult.\n+ * is started using resultLauncher that handles the result in respective callback.\n */\n @Override\n public void showEditActivity(UploadItem uploadItem) {\n editableUploadItem = uploadItem;\n Intent intent = new Intent(getContext(), EditActivity.class);\n intent.putExtra(\"image\", uploadableFile.getFilePath().toString());\n- startActivityForResult(intent, REQUEST_CODE_FOR_EDIT_ACTIVITY);\n+ startForEditActivityResult.launch(intent);\n }\n \n /**\n@@ -615,6 +631,8 @@ private void goToLocationPickerActivity(final UploadItem uploadItem) {\n double defaultLongitude = -122.431297;\n double defaultZoom = 16.0;\n \n+ final Intent locationPickerIntent;\n+\n /* Retrieve image location from EXIF if present or\n check if user has provided location while using the in-app camera.\n Use location of last UploadItem if none of them is available */\n@@ -624,10 +642,11 @@ private void goToLocationPickerActivity(final UploadItem uploadItem) {\n .getDecLatitude();\n defaultLongitude = uploadItem.getGpsCoords().getDecLongitude();\n defaultZoom = uploadItem.getGpsCoords().getZoomLevel();\n- startActivityForResult(new LocationPicker.IntentBuilder()\n+\n+ locationPickerIntent = new LocationPicker.IntentBuilder()\n .defaultLocation(new CameraPosition(defaultLatitude,defaultLongitude,defaultZoom))\n .activityKey(\"UploadActivity\")\n- .build(getActivity()), REQUEST_CODE);\n+ .build(getActivity());\n } else {\n if (defaultKvStore.getString(LAST_LOCATION) != null) {\n final String[] locationLatLng\n@@ -638,27 +657,20 @@ private void goToLocationPickerActivity(final UploadItem uploadItem) {\n if (defaultKvStore.getString(LAST_ZOOM) != null) {\n defaultZoom = Double.parseDouble(defaultKvStore.getString(LAST_ZOOM));\n }\n- startActivityForResult(new LocationPicker.IntentBuilder()\n+\n+ locationPickerIntent = new LocationPicker.IntentBuilder()\n .defaultLocation(new CameraPosition(defaultLatitude,defaultLongitude,defaultZoom))\n .activityKey(\"NoLocationUploadActivity\")\n- .build(getActivity()), REQUEST_CODE);\n+ .build(getActivity());\n }\n+ startForResult.launch(locationPickerIntent);\n }\n \n- /**\n- * Get the coordinates and update the existing coordinates.\n- * @param requestCode code of request\n- * @param resultCode code of result\n- * @param data intent\n- */\n- @Override\n- public void onActivityResult(final int requestCode, final int resultCode,\n- @Nullable final Intent data) {\n- super.onActivityResult(requestCode, resultCode, data);\n- if (requestCode == REQUEST_CODE && resultCode == RESULT_OK) {\n+ private void onCameraPosition(ActivityResult result){\n+ if (result.getResultCode() == RESULT_OK) {\n \n- assert data != null;\n- final CameraPosition cameraPosition = LocationPicker.getCameraPosition(data);\n+ assert result.getData() != null;\n+ final CameraPosition cameraPosition = LocationPicker.getCameraPosition(result.getData());\n \n if (cameraPosition != null) {\n \n@@ -678,8 +690,21 @@ public void onActivityResult(final int requestCode, final int resultCode,\n removeLocation();\n }\n }\n- if (requestCode == REQUEST_CODE_FOR_EDIT_ACTIVITY && resultCode == RESULT_OK) {\n- String result = data.getStringExtra(\"editedImageFilePath\");\n+ }\n+\n+ private void onVoiceInput(ActivityResult result) {\n+ if (result.getResultCode() == RESULT_OK && result.getData() != null) {\n+ ArrayList resultData = result.getData().getStringArrayListExtra(\n+ RecognizerIntent.EXTRA_RESULTS);\n+ uploadMediaDetailAdapter.handleSpeechResult(resultData.get(0));\n+ }else {\n+ Timber.e(\"Error %s\", result.getResultCode());\n+ }\n+ }\n+\n+ private void onEditActivityResult(ActivityResult result){\n+ if (result.getResultCode() == RESULT_OK) {\n+ String path = result.getData().getStringExtra(\"editedImageFilePath\");\n \n if (Objects.equals(result, \"Error\")) {\n Timber.e(\"Error in rotating image\");\n@@ -687,24 +712,15 @@ public void onActivityResult(final int requestCode, final int resultCode,\n }\n try {\n if (binding != null){\n- binding.backgroundImage.setImageURI(Uri.fromFile(new File(result)));\n+ binding.backgroundImage.setImageURI(Uri.fromFile(new File(path)));\n }\n- editableUploadItem.setContentUri(Uri.fromFile(new File(result)));\n+ editableUploadItem.setContentUri(Uri.fromFile(new File(path)));\n callback.changeThumbnail(indexOfFragment,\n- result);\n+ path);\n } catch (Exception e) {\n Timber.e(e);\n }\n }\n- else if (requestCode == REQUEST_CODE_FOR_VOICE_INPUT) {\n- if (resultCode == RESULT_OK && data != null) {\n- ArrayList result = data.getStringArrayListExtra(\n- RecognizerIntent.EXTRA_RESULTS);\n- uploadMediaDetailAdapter.handleSpeechResult(result.get(0));\n- }else {\n- Timber.e(\"Error %s\", resultCode);\n- }\n- }\n }\n \n /**\ndiff --git a/app/src/main/java/fr/free/nrw/commons/utils/PermissionUtils.java b/app/src/main/java/fr/free/nrw/commons/utils/PermissionUtils.java\nindex 9082c1f0fc..828ef2338b 100644\n--- a/app/src/main/java/fr/free/nrw/commons/utils/PermissionUtils.java\n+++ b/app/src/main/java/fr/free/nrw/commons/utils/PermissionUtils.java\n@@ -54,8 +54,7 @@ private static void askUserToManuallyEnablePermissionFromSettings(final Activity\n final Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);\n final Uri uri = Uri.fromParts(\"package\", activity.getPackageName(), null);\n intent.setData(uri);\n- activity.startActivityForResult(intent,\n- CommonsApplication.OPEN_APPLICATION_DETAIL_SETTINGS);\n+ activity.startActivity(intent);\n }\n \n /**\n", "test_patch": "diff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/MainActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/MainActivityUnitTests.kt\nindex a2eb41615a..780322603a 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/MainActivityUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/MainActivityUnitTests.kt\n@@ -340,20 +340,6 @@ class MainActivityUnitTests {\n method.invoke(activity, null, true)\n }\n \n- @Test\n- @Throws(Exception::class)\n- fun testOnActivityResult() {\n- val method: Method =\n- MainActivity::class.java.getDeclaredMethod(\n- \"onActivityResult\",\n- Int::class.java,\n- Int::class.java,\n- Intent::class.java,\n- )\n- method.isAccessible = true\n- method.invoke(activity, 0, 0, null)\n- }\n-\n @Test\n @Throws(Exception::class)\n fun testOnResume() {\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivityTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivityTest.kt\nindex 0274fed7d3..b1d66ee4d3 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivityTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivityTest.kt\n@@ -1,8 +1,10 @@\n package fr.free.nrw.commons.customselector.ui.selector\n \n+import android.app.Activity\n import android.content.Intent\n import android.net.Uri\n import android.os.Bundle\n+import androidx.activity.result.ActivityResult\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.contributions.ContributionDao\n@@ -98,20 +100,20 @@ class CustomSelectorActivityTest {\n }\n \n /**\n- * Test onActivityResult function.\n+ * Test callback when result received.\n */\n @Test\n @Throws(Exception::class)\n- fun testOnActivityResult() {\n+ fun testResultLauncher() {\n+ val intent = Mockito.mock(Intent::class.java)\n+ val activityResult = ActivityResult(Activity.RESULT_OK, intent)\n val func =\n activity.javaClass.getDeclaredMethod(\n- \"onActivityResult\",\n- Int::class.java,\n- Int::class.java,\n- Intent::class.java,\n+ \"onFullScreenDataReceived\",\n+ ActivityResult::class.java,\n )\n func.isAccessible = true\n- func.invoke(activity, 512, -1, Mockito.mock(Intent::class.java))\n+ func.invoke(activity, activityResult)\n }\n \n /**\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt\nindex 365af27f03..b7ef7878fd 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt\n@@ -6,18 +6,19 @@ import android.content.Context\n import android.content.Intent\n import android.content.SharedPreferences\n import android.net.Uri\n+import android.provider.MediaStore\n+import androidx.activity.result.ActivityResultLauncher\n import androidx.preference.PreferenceManager\n import androidx.test.core.app.ApplicationProvider\n+import com.nhaarman.mockitokotlin2.KArgumentCaptor\n+import com.nhaarman.mockitokotlin2.argumentCaptor\n import com.nhaarman.mockitokotlin2.verify\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.filepicker.Constants.RequestCodes\n+import fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivity\n import org.junit.Assert.assertEquals\n import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n-import org.mockito.ArgumentCaptor\n-import org.mockito.ArgumentMatchers\n-import org.mockito.Captor\n import org.mockito.Mock\n import org.mockito.Mockito.mock\n import org.mockito.Mockito.`when`\n@@ -48,8 +49,10 @@ class FilePickerTest {\n @Mock\n var unit: Unit? = null\n \n- @Captor\n- var requestCodeCaptor: ArgumentCaptor? = null\n+ @Mock\n+ private lateinit var mockResultLauncher: ActivityResultLauncher\n+\n+ private val intentCaptor: KArgumentCaptor = argumentCaptor()\n \n private lateinit var context: Context\n \n@@ -65,15 +68,17 @@ class FilePickerTest {\n `when`(sharedPref.edit()).thenReturn(sharedPreferencesEditor)\n `when`(sharedPref.edit().putInt(\"type\", 0)).thenReturn(sharedPreferencesEditor)\n val openDocumentPreferred = nextBoolean()\n- FilePicker.openGallery(activity, 0, openDocumentPreferred)\n- verify(activity).startActivityForResult(\n- ArgumentMatchers.any(),\n- requestCodeCaptor?.capture()?.toInt()!!,\n- )\n- if(openDocumentPreferred){\n- assertEquals(requestCodeCaptor?.value, RequestCodes.PICK_PICTURE_FROM_DOCUMENTS)\n- }else{\n- assertEquals(requestCodeCaptor?.value, RequestCodes.PICK_PICTURE_FROM_GALLERY)\n+\n+ FilePicker.openGallery(activity, mockResultLauncher, 0, openDocumentPreferred)\n+\n+ verify(mockResultLauncher).launch(intentCaptor.capture())\n+\n+ val capturedIntent = intentCaptor.firstValue\n+\n+ if (openDocumentPreferred) {\n+ assertEquals(Intent.ACTION_OPEN_DOCUMENT, capturedIntent.action)\n+ } else {\n+ assertEquals(Intent.ACTION_GET_CONTENT, capturedIntent.action)\n }\n }\n \n@@ -84,12 +89,13 @@ class FilePickerTest {\n `when`(sharedPref.edit().putInt(\"type\", 0)).thenReturn(sharedPreferencesEditor)\n val mockApplication = mock(Application::class.java)\n `when`(activity.applicationContext).thenReturn(mockApplication)\n- FilePicker.openCameraForImage(activity, 0)\n- verify(activity).startActivityForResult(\n- ArgumentMatchers.any(),\n- requestCodeCaptor?.capture()?.toInt()!!,\n- )\n- assertEquals(requestCodeCaptor?.value, RequestCodes.TAKE_PICTURE)\n+ FilePicker.openCameraForImage(activity, mockResultLauncher, 0)\n+\n+ verify(mockResultLauncher).launch(intentCaptor.capture())\n+\n+ val capturedIntent = intentCaptor.firstValue\n+ \n+ assertEquals(MediaStore.ACTION_IMAGE_CAPTURE, capturedIntent.action)\n }\n \n @Test\n@@ -183,46 +189,20 @@ class FilePickerTest {\n method.invoke(mockFilePicker, mockIntent)\n }\n \n- @Test\n- fun testHandleActivityResultCaseOne() {\n- val mockIntent = mock(Intent::class.java)\n- FilePicker.handleActivityResult(\n- RequestCodes.FILE_PICKER_IMAGE_IDENTIFICATOR,\n- Activity.RESULT_OK,\n- mockIntent,\n- activity,\n- object : DefaultCallback() {\n- override fun onCanceled(\n- source: FilePicker.ImageSource,\n- type: Int,\n- ) {\n- super.onCanceled(source, type)\n- }\n-\n- override fun onImagePickerError(\n- e: Exception,\n- source: FilePicker.ImageSource,\n- type: Int,\n- ) {\n- }\n-\n- override fun onImagesPicked(\n- imagesFiles: List,\n- source: FilePicker.ImageSource,\n- type: Int,\n- ) {\n- }\n- },\n- )\n- }\n-\n @Test\n fun testOpenCustomSelectorRequestCode() {\n `when`(PreferenceManager.getDefaultSharedPreferences(activity)).thenReturn(sharedPref)\n `when`(sharedPref.edit()).thenReturn(sharedPreferencesEditor)\n `when`(sharedPref.edit().putInt(\"type\", 0)).thenReturn(sharedPreferencesEditor)\n- FilePicker.openCustomSelector(activity, 0)\n- verify(activity).startActivityForResult(ArgumentMatchers.any(), requestCodeCaptor?.capture()?.toInt()!!)\n- assertEquals(requestCodeCaptor?.value, RequestCodes.PICK_PICTURE_FROM_CUSTOM_SELECTOR)\n+ FilePicker.openCustomSelector(activity, mockResultLauncher, 0)\n+\n+ verify(mockResultLauncher).launch(intentCaptor.capture())\n+\n+ val capturedIntent = intentCaptor.firstValue\n+\n+ assertEquals(\n+ CustomSelectorActivity.Companion::class.java.declaringClass.name,\n+ capturedIntent.component?.className\n+ )\n }\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt\nindex 7f9e3d5763..ea1d3402d3 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt\n@@ -19,6 +19,7 @@ import android.widget.ProgressBar\n import android.widget.ScrollView\n import android.widget.Spinner\n import android.widget.TextView\n+import androidx.activity.result.ActivityResult\n import androidx.fragment.app.FragmentManager\n import androidx.fragment.app.FragmentTransaction\n import androidx.test.core.app.ApplicationProvider\n@@ -76,7 +77,6 @@ import java.util.Locale\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class MediaDetailFragmentUnitTests {\n- private val requestCode = 1001\n private val lastLocation = \"last_location_while_uploading\"\n private lateinit var fragment: MediaDetailFragment\n private lateinit var fragmentManager: FragmentManager\n@@ -231,24 +231,6 @@ class MediaDetailFragmentUnitTests {\n fragment.onCreateView(layoutInflater, null, savedInstanceState)\n }\n \n- @Test\n- @Throws(Exception::class)\n- fun testOnActivityResultLocationPickerActivity() {\n- fragment.onActivityResult(requestCode, Activity.RESULT_CANCELED, intent)\n- }\n-\n- @Test\n- @Throws(Exception::class)\n- fun `test OnActivity Result Cancelled LocationPickerActivity`() {\n- fragment.onActivityResult(requestCode, Activity.RESULT_CANCELED, intent)\n- }\n-\n- @Test\n- @Throws(Exception::class)\n- fun `test OnActivity Result Cancelled DescriptionEditActivity`() {\n- fragment.onActivityResult(requestCode, Activity.RESULT_OK, intent)\n- }\n-\n @Test\n @Throws(Exception::class)\n fun testOnSaveInstanceState() {\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadActivityUnitTests.kt\nindex d15fe06e5f..938e595af6 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadActivityUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadActivityUnitTests.kt\n@@ -167,20 +167,6 @@ class UploadActivityUnitTests {\n activity.makeUploadRequest()\n }\n \n- @Test\n- @Throws(Exception::class)\n- fun testOnActivityResult() {\n- val method: Method =\n- UploadActivity::class.java.getDeclaredMethod(\n- \"onActivityResult\",\n- Int::class.java,\n- Int::class.java,\n- Intent::class.java,\n- )\n- method.isAccessible = true\n- method.invoke(activity, CommonsApplication.OPEN_APPLICATION_DETAIL_SETTINGS, 0, Intent())\n- }\n-\n @Test\n @Throws(Exception::class)\n fun testReceiveSharedItems() {\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaDetailAdapterUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaDetailAdapterUnitTest.kt\nindex db5b20f7e6..794b6e64ee 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaDetailAdapterUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaDetailAdapterUnitTest.kt\n@@ -2,11 +2,13 @@ package fr.free.nrw.commons.upload\n \n import android.app.Dialog\n import android.content.Context\n+import android.content.Intent\n import android.view.View\n import android.widget.AdapterView\n import android.widget.GridLayout\n import android.widget.ListView\n import android.widget.TextView\n+import androidx.activity.result.ActivityResultLauncher\n import androidx.test.core.app.ApplicationProvider\n import com.nhaarman.mockitokotlin2.any\n import com.nhaarman.mockitokotlin2.times\n@@ -67,13 +69,16 @@ class UploadMediaDetailAdapterUnitTest {\n @Mock\n private lateinit var adapterView: AdapterView\n \n+ @Mock\n+ private lateinit var mockResultLauncher: ActivityResultLauncher\n+\n @Before\n fun setUp() {\n MockitoAnnotations.openMocks(this)\n uploadMediaDetails = mutableListOf(uploadMediaDetail, uploadMediaDetail)\n activity = Robolectric.buildActivity(UploadActivity::class.java).get()\n fragment = mock(UploadMediaDetailFragment::class.java)\n- adapter = UploadMediaDetailAdapter(fragment, \"\", recentLanguagesDao)\n+ adapter = UploadMediaDetailAdapter(fragment, \"\", recentLanguagesDao, mockResultLauncher)\n context = ApplicationProvider.getApplicationContext()\n Whitebox.setInternalState(adapter, \"uploadMediaDetails\", uploadMediaDetails)\n Whitebox.setInternalState(adapter, \"eventListener\", eventListener)\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt\nindex ed76b4519f..169bcd5c01 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt\n@@ -11,6 +11,7 @@ import android.view.View\n import android.widget.ImageView\n import android.widget.LinearLayout\n import android.widget.TextView\n+import androidx.activity.result.ActivityResult\n import androidx.appcompat.widget.AppCompatButton\n import androidx.appcompat.widget.AppCompatImageButton\n import androidx.fragment.app.FragmentManager\n@@ -348,7 +349,7 @@ class UploadMediaDetailFragmentUnitTest {\n \n @Test\n @Throws(Exception::class)\n- fun testOnActivityResultOnMapIconClicked() {\n+ fun testOnCameraPositionCallbackOnMapIconClicked() {\n shadowOf(Looper.getMainLooper()).idle()\n Mockito.mock(LocationPicker::class.java)\n val intent = Mockito.mock(Intent::class.java)\n@@ -363,13 +364,18 @@ class UploadMediaDetailFragmentUnitTest {\n `when`(latLng.latitude).thenReturn(0.0)\n `when`(latLng.longitude).thenReturn(0.0)\n `when`(uploadItem.gpsCoords).thenReturn(imageCoordinates)\n- fragment.onActivityResult(1211, Activity.RESULT_OK, intent)\n+ val activityResult = ActivityResult(Activity.RESULT_OK, intent)\n+\n+ val handleResultMethod = UploadMediaDetailFragment::class.java.getDeclaredMethod(\"onCameraPosition\", ActivityResult::class.java)\n+ handleResultMethod.isAccessible = true\n+\n+ handleResultMethod.invoke(fragment, activityResult)\n Mockito.verify(presenter, Mockito.times(0)).getImageQuality(0, location, activity)\n }\n \n @Test\n @Throws(Exception::class)\n- fun testOnActivityResultAddLocationDialog() {\n+ fun testOnCameraPositionCallbackAddLocationDialog() {\n shadowOf(Looper.getMainLooper()).idle()\n Mockito.mock(LocationPicker::class.java)\n val intent = Mockito.mock(Intent::class.java)\n@@ -387,7 +393,13 @@ class UploadMediaDetailFragmentUnitTest {\n `when`(latLng.latitude).thenReturn(0.0)\n `when`(latLng.longitude).thenReturn(0.0)\n `when`(uploadItem.gpsCoords).thenReturn(imageCoordinates)\n- fragment.onActivityResult(1211, Activity.RESULT_OK, intent)\n+\n+ val activityResult = ActivityResult(Activity.RESULT_OK,intent)\n+\n+ val handleResultMethod = UploadMediaDetailFragment::class.java.getDeclaredMethod(\"onCameraPosition\", ActivityResult::class.java)\n+ handleResultMethod.isAccessible = true\n+\n+ handleResultMethod.invoke(fragment, activityResult)\n Mockito.verify(presenter, Mockito.times(1)).displayLocDialog(0, null, false)\n }\n \n", "n2p_tests": "{\"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testRememberedZoomLevelOnNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest.testRemoveDescription\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testDescriptionEditClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testLaunchZoomActivity\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testOnSaveInstanceState\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testSetImageToBeUploaded\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testShowHideTopCard\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testGetIndexInViewFlipper\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testInit\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnCategoryEditButtonClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivityTest.testOnSelectedImagesChanged\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testPrettyDiscussion\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testSetNumOfUploads\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testStartYourself\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testLoadFragmentCaseNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testOnRestoreInstanceStateCaseContributions\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testOnImageProcessed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testOnViewCreated\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivityTest.testChangeTitle\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testOnRestoreInstanceStateCaseExplore\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testGetDescriptions\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testPrettyUploadedDateCaseNonNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testOnRestoreInstanceStateCaseBookmark\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testShowTabs\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest.testGetItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testUpdateCategoryDisplayCaseNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testOnNextButtonClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testGetIsMultipleFilesSelected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testOnDestroyView\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testLoadFragmentCaseBookmarkFragment\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnNextButtonClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testOnOptionsItemSelectedCaseDefault\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testSetUpPager\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testDisplayAddLocationDialog\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testGetDescriptionsWithLongSpaces\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnDepictEditButtonClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivityTest.testOnDone\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivityTest.testResultLauncher\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.checkActivityNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testGetTotalNumberOfSteps\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivityTest.testOnDestroy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest.testOnBindViewHolderPosition1\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnUpdateCoordinatesClickedCurrentLocationNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testInitCaseGetIndexInViewFlipperNonZero\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnCreateView\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnUpdateCoordinatesClickedNotNullValue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testGetDescriptionsWithSpaces\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testReceiveSharedItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testUpdateCategoryDisplayCaseNonNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testOnPreviousButtonClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnConfigurationChangedCaseFalse\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnDiscussionLoaded\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testSetupImageView\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.checkFragmentNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testShowProgressCaseFalse\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testTakenCameraPicture\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testOnBecameVisible\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testShowSimilarImageFragment\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest.testHideRecentLanguagesSection\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnDeleteButtonClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testShowDuplicatePicturePopupCaseDefault\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnSaveInstanceState\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivityTest.testOnClickNotForUpload\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testPrettyCaptionCaseEmpty\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testCreateCameraPictureFile\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testOnButtonCopyTitleDescToSubsequentMedia\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testIsPhoto\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testShowConnectionErrorPopupForCaptionCheck\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testOnOptionsItemSelected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testSetCallback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnDestroyView\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testGetDescriptionsWithComma\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testShowMessageCaseOne\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testOnCameraPositionCallbackAddLocationDialog\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testRememberedZoomLevelOnNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testIsWLMUpload\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testSetUpLoggedOutPager\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnDestroy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivityTest.testOnBackPressed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnPreviousButtonClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testHandleNullMedia\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest.testRemoveLeadingAndTrailingInstanceTab\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testGetCaptions\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest.testOnBindViewHolderPosition0\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testReceiveInternalSharedItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivityTest.testSetOnDataListener\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testOnCameraPositionCallbackOnMapIconClicked\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testShowProgressCaseTrue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testIsLoggedIn\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testPrettyCoordinatesCaseNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testOnBackStackChanged\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnNextButtonClickedCaseFalse\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnConfigurationChangedCaseTrue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivityTest.testActivityNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivityTest.testUploadLimit\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testGotoCategoryEditor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testOnCreateView\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testExtractCaptionDescription\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivityTest.testOnFolderClick\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testOnNearbyPlaceFound\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.checkFragmentNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testDisplayMediaDetails\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testPrettyLicenseCaseNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testLoadFragmentCaseContributionsFragmentCaseTrue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testOnRestoreInstanceStateCaseNearby\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnBackPressed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testCenterMapToPlace\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnDeleteClickedNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testGetDescriptionList\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest.testAddDescription\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testShowProgress\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivityTest.testShowWelcomeDialog\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testOpenGalleryRequestCode\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testShowDuplicatePicturePopupCaseFalse\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testOpenCameraForImageCode\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest.testGetItemCount\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnMediaRefreshed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testOnSetUpPagerNearBy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest.Test setUpRecentLanguagesSection when list is not empty\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testOnLlContainerTitleClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testOnPostCreate\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testMakeUploadRequest\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testGetDescription\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivityTest.testOnLongPress\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testLoadFragmentCaseContributionsFragment\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testShowExternalMap\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testShowCaptionAndDescriptionCaseVisible\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testPrettyUploadedDateCaseNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testResetDirectPrefs\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testForMedia\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivityTest.testDisplayUploadLimitWarning\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testPrettyCoordinates\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testLoadFragmentCaseExploreFragment\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testOnSetUpPagerOtherThanNearBy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testLoadFragmentCaseBookmarkFragmentCaseTrue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testRevokeWritePermission\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest.testRemoveLeadingAndTrailingWhitespace\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testLoadFragmentCaseNearbyParentFragmentCaseTrue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testOnIbMapClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testTakenCameraPictureCaseTrue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testPrettyCaption\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testPrettyLicenseCaseNonNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testLoadFragmentCaseNearbyParentFragment\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testExtractDescription\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnUpdateCoordinatesClickedCurrentLocationNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testOnCreate\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnImageBackgroundChangedWithDifferentColor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnUploadMediaDeleted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testOnResume\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testShowInfoAlert\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnStop\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testOnImageValidationSuccess\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testPrettyCaptionCaseNonEmpty\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testCreateCameraForImageIntent\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testOnSupportNavigateUp\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnResume\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnResume\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest.Test setUpRecentLanguagesSection when list is empty\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testSetSelectedItemId\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testShowMessageCaseTwo\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testShowMessage\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testOnDestroy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testOnImageBackgroundChangedWithSameColor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest.testCaptionJapaneseCharacters\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testLoadFragmentCaseExploreFragmentCaseTrue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testHideTabs\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testRestoreType\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testUpdateMediaDetails\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testOpenCustomSelectorRequestCode\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testGetDescriptionsWithNestedBrackets\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testUpdateTopCardTitle\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest.checkAdapterNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testOnSupportNavigateUpCaseDefault\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testReceiveExternalSharedItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testSetUpCaptionAndDescriptionLayout\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest.testOnPrimaryCaptionTextChange\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest.testOnRecentLanguageClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.testOnBackPressedCaseDefault\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testGetUploadableFiles\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest.testSetItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testGetCaptionsCaseEmpty\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest.testRemoveLeadingAndTrailingCarriageReturn\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testShowCaptionAndDescription\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests.testGetDescriptionsWithInvalidLanguageCode\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.MainActivityUnitTests.checkActivityNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "commons-app__apps-android-commons-5851", "org": "commons-app", "repo": "apps-android-commons", "number": 5851, "state": "closed", "title": "Refactor `FilePicker.java` intent result handling", "body": "Fixes #5850\r\n\r\nWhat changes did you make and why?\r\n\r\n- Removed `CAPTURE_VIDEO` request code and it's checks, while from what I can understand we do not handle video mime type. Though if I missed something and I'm wrong please let me know, happy to make changes.\r\n\r\n- Removed Video's picker test cases.\r\n\r\n- Only Gallery picker's callback was handling changes for both Document picker and Gallery picker. So, passed appropriate flag to make sure respective callbacks get invoked\r\n\r\nEDIT: \r\n\r\n- Removed below code \r\n```\r\n else if (isPhoto(data)) {\r\n onPictureReturnedFromCamera(activity, callbacks);\r\n } else {\r\n onPictureReturnedFromDocuments(data, activity, callbacks);\r\n }\r\n```\r\n\r\nisPhoto(data) method checks if the returned data is null or not. Now, it for `Document` and `Gallery` picker results we rely on returned results so we are making sure it's not null. But, later after all the specific checks we had the above code. \r\n\r\nTo understand the problem, let's say we got the result of `Document` picker which also checks for `!isPhoto()` to make sure result is not null. But let's say it is then the above mentioned check would invoke the callback for handling camera result but didn't we returned the result for document picker (however very unlikely to get null from document picker we either get cancelled or result ok, which we already take care of before making these checks). \r\n\r\nMy understanding is this the check was added under the assumption that we store the image in the persistent storage when using camera's result. So it just made simple check if the result is null then it must be camera's result otherwise document's result. But from above we understand that it would wrong to use camera's image (will return the last stored image which is wrong) when user has chosen Document/Gallery one (less likely but still we shouldn't have this check)\r\n\r\n**Tests performed (required)**\r\n- Ran test for `FilePicker.java` file. \r\n\r\n- manually tested. below is this demo. \r\n\r\n[Screencast from 2024-10-15 02-07-13.webm](https://github.com/user-attachments/assets/a4e16423-83ce-4876-82c3-885aa26c4ec1)\r\n\r\n\r\nTested {build variant, e.g. ProdDebug} on {name of device or emulator} with API level {API level}.\r\nBuild variant: betaDebug\r\nAPI level: 34 (Emulator) & 34 Oneplus 9RT 5G\r\n\r\n", "base": "{\"label\": \"commons-app:main\", \"ref\": \"main\", \"sha\": \"95e0a0d143725ebb3079222c3fbb8dca3cff129a\"}", "resolved_issues": "[{\"number\": 5850, \"title\": \"Remove unnecessary request code checks while handling file picker results\", \"body\": \"While working on #5849, I saw, there are some problems with handling request codes in `FilePicker.java` \\r\\n\\r\\nI chose not to include these changes in the refactor (refer #5849) because these are distinct changes which should be addressed separately and it'd easier to understand from git history.\\r\\n\\r\\nProblems were ->\\r\\n\\r\\n- Capture Video flag was still being checked even though we never use it in any intent to launch anything.\\r\\n\\r\\n- Even when using `Document PIcker` (default) , the `Intent` created for launching it, is passed with `Gallery Picker/Photo Picker` `requestCode` which means for both of the methods result will be handled by only Gallery picker's callback. Though I'm not sure if this lead to any bug but still we should be using respective callbacks.\\r\\n\\r\\n\\r\\n\"}]", "lang": "kotlin", "problem_statement": "Remove unnecessary request code checks while handling file picker results\nWhile working on #5849, I saw, there are some problems with handling request codes in `FilePicker.java` \r\n\r\nI chose not to include these changes in the refactor (refer #5849) because these are distinct changes which should be addressed separately and it'd easier to understand from git history.\r\n\r\nProblems were ->\r\n\r\n- Capture Video flag was still being checked even though we never use it in any intent to launch anything.\r\n\r\n- Even when using `Document PIcker` (default) , the `Intent` created for launching it, is passed with `Gallery Picker/Photo Picker` `requestCode` which means for both of the methods result will be handled by only Gallery picker's callback. Though I'm not sure if this lead to any bug but still we should be using respective callbacks.\r\n\r\n\r\n\n", "hints": NaN, "pull_url": "https://github.com/commons-app/apps-android-commons/pull/5851", "issue_urls": "[\"https://github.com/commons-app/apps-android-commons/issues/5850\"]", "test_command": "./gradlew :app:testBetaDebugUnitTest --tests \"fr.free.nrw.commons.filepicker.FilePickerTest\"", "fix_patch": "diff --git a/app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java b/app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java\nindex 3c9299c1aa..f907f0a014 100644\n--- a/app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java\n+++ b/app/src/main/java/fr/free/nrw/commons/filepicker/Constants.java\n@@ -16,7 +16,6 @@ interface RequestCodes {\n int PICK_PICTURE_FROM_DOCUMENTS = FILE_PICKER_IMAGE_IDENTIFICATOR + (1 << 11);\n int PICK_PICTURE_FROM_GALLERY = FILE_PICKER_IMAGE_IDENTIFICATOR + (1 << 12);\n int TAKE_PICTURE = FILE_PICKER_IMAGE_IDENTIFICATOR + (1 << 13);\n- int CAPTURE_VIDEO = FILE_PICKER_IMAGE_IDENTIFICATOR + (1 << 14);\n \n int RECEIVE_DATA_FROM_FULL_SCREEN_MODE = 1 << 9;\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java b/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java\nindex 08453a95d3..daa29276a8 100644\n--- a/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java\n+++ b/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java\n@@ -109,7 +109,13 @@ private static int restoreType(@NonNull Context context) {\n */\n public static void openGallery(Activity activity, int type, boolean openDocumentIntentPreferred) {\n Intent intent = createGalleryIntent(activity, type, openDocumentIntentPreferred);\n- activity.startActivityForResult(intent, RequestCodes.PICK_PICTURE_FROM_GALLERY);\n+ int requestCode = RequestCodes.PICK_PICTURE_FROM_GALLERY;\n+\n+ if(openDocumentIntentPreferred){\n+ requestCode = RequestCodes.PICK_PICTURE_FROM_DOCUMENTS;\n+ }\n+\n+ activity.startActivityForResult(intent, requestCode);\n }\n \n /**\n@@ -157,7 +163,6 @@ public static void handleActivityResult(int requestCode, int resultCode, Intent\n requestCode &= ~RequestCodes.SOURCE_CHOOSER;\n if (requestCode == RequestCodes.PICK_PICTURE_FROM_GALLERY ||\n requestCode == RequestCodes.TAKE_PICTURE ||\n- requestCode == RequestCodes.CAPTURE_VIDEO ||\n requestCode == RequestCodes.PICK_PICTURE_FROM_DOCUMENTS ||\n requestCode == RequestCodes.PICK_PICTURE_FROM_CUSTOM_SELECTOR) {\n if (resultCode == Activity.RESULT_OK) {\n@@ -169,19 +174,16 @@ public static void handleActivityResult(int requestCode, int resultCode, Intent\n onPictureReturnedFromCustomSelector(data, activity, callbacks);\n } else if (requestCode == RequestCodes.TAKE_PICTURE) {\n onPictureReturnedFromCamera(activity, callbacks);\n- } else if (requestCode == RequestCodes.CAPTURE_VIDEO) {\n- onVideoReturnedFromCamera(activity, callbacks);\n- } else if (isPhoto(data)) {\n- onPictureReturnedFromCamera(activity, callbacks);\n- } else {\n- onPictureReturnedFromDocuments(data, activity, callbacks);\n }\n } else {\n if (requestCode == RequestCodes.PICK_PICTURE_FROM_DOCUMENTS) {\n callbacks.onCanceled(FilePicker.ImageSource.DOCUMENTS, restoreType(activity));\n } else if (requestCode == RequestCodes.PICK_PICTURE_FROM_GALLERY) {\n callbacks.onCanceled(FilePicker.ImageSource.GALLERY, restoreType(activity));\n- } else {\n+ } else if (requestCode == RequestCodes.PICK_PICTURE_FROM_CUSTOM_SELECTOR){\n+ callbacks.onCanceled(ImageSource.CUSTOM_SELECTOR, restoreType(activity));\n+ }\n+ else {\n callbacks.onCanceled(FilePicker.ImageSource.CAMERA_IMAGE, restoreType(activity));\n }\n }\n", "test_patch": "diff --git a/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt\nindex 171e04b4e0..365af27f03 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt\n@@ -64,12 +64,17 @@ class FilePickerTest {\n `when`(PreferenceManager.getDefaultSharedPreferences(activity)).thenReturn(sharedPref)\n `when`(sharedPref.edit()).thenReturn(sharedPreferencesEditor)\n `when`(sharedPref.edit().putInt(\"type\", 0)).thenReturn(sharedPreferencesEditor)\n- FilePicker.openGallery(activity, 0, nextBoolean())\n+ val openDocumentPreferred = nextBoolean()\n+ FilePicker.openGallery(activity, 0, openDocumentPreferred)\n verify(activity).startActivityForResult(\n ArgumentMatchers.any(),\n requestCodeCaptor?.capture()?.toInt()!!,\n )\n- assertEquals(requestCodeCaptor?.value, RequestCodes.PICK_PICTURE_FROM_GALLERY)\n+ if(openDocumentPreferred){\n+ assertEquals(requestCodeCaptor?.value, RequestCodes.PICK_PICTURE_FROM_DOCUMENTS)\n+ }else{\n+ assertEquals(requestCodeCaptor?.value, RequestCodes.PICK_PICTURE_FROM_GALLERY)\n+ }\n }\n \n @Test\n@@ -165,32 +170,6 @@ class FilePickerTest {\n method.invoke(mockFilePicker, activity)\n }\n \n- @Test\n- fun testTakenCameraVideo() {\n- val mockFilePicker = mock(FilePicker::class.java)\n- val method: Method =\n- FilePicker::class.java.getDeclaredMethod(\n- \"takenCameraVideo\",\n- Context::class.java,\n- )\n- method.isAccessible = true\n- method.invoke(mockFilePicker, context)\n- }\n-\n- @Test\n- fun testTakenCameraVideoCaseTrue() {\n- val mockFilePicker = mock(FilePicker::class.java)\n- `when`(PreferenceManager.getDefaultSharedPreferences(activity)).thenReturn(sharedPref)\n- `when`(sharedPref.getString(\"last_video\", null)).thenReturn(\"\")\n- val method: Method =\n- FilePicker::class.java.getDeclaredMethod(\n- \"takenCameraVideo\",\n- Context::class.java,\n- )\n- method.isAccessible = true\n- method.invoke(mockFilePicker, activity)\n- }\n-\n @Test\n fun testIsPhoto() {\n val mockFilePicker = mock(FilePicker::class.java)\n", "n2p_tests": "{\"fr.free.nrw.commons.filepicker.FilePickerTest.testHandleActivityResultCaseOne\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testRestoreType\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testOpenGalleryRequestCode\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testTakenCameraPicture\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testOpenCustomSelectorRequestCode\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testOpenCameraForImageCode\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testTakenCameraPictureCaseTrue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testRevokeWritePermission\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.filepicker.FilePickerTest.testCreateCameraPictureFile\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"fr.free.nrw.commons.filepicker.FilePickerTest.testCreateCameraForImageIntent\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"fr.free.nrw.commons.filepicker.FilePickerTest.testIsPhoto\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "commons-app__apps-android-commons-5833", "org": "commons-app", "repo": "apps-android-commons", "number": 5833, "state": "closed", "title": "Issue-5662-kotlinstyle", "body": "Fixes #5662\r\n\r\n- Bulk automated formatting updates on the code base using ktLint --format\r\n- Multiple manual changes to meet ktLint standard rules including:\r\n- removal of wildcard imports (standard:no-wildcard-imports)\r\n- successive KDOC comments (standard:no-consecutive-comments)\r\n- unexpected indentation (standard:indent)\r\n- excessive line lengths (standard:max-line-length)\r\n- class naming (standard:class-naming)\r\n- try catch spacing (standard:try-catch-finally-spacing)\r\n- removal of underscores, capitalisation in fun names (standard:function-naming)\r\n- filename not matching class name (standard:filename)\r\n- backing property used with private property (standard:backing-property-naming)\r\n- lexicopgraphical import ordering (standard:import-ordering)\r\n\r\n**Tests performed (required)**\r\nTested 'app' profile on Virtual Device (Pixel_7_Pro) with API_35\r\n\r\nRan 'All Tests', failures reported, the same failures reported when executed on the unmodified codebase. Unsure if this is a configuration issue like user account or pre-existing issue with the unit tests.\r\n\r\n- AboutActivityTest 9/9\r\n- LoginActivityTest 3/3\r\n- MainActivityTest 0/5\r\n- ProfileActivityTest 0/1\r\n- ReviewActivityTest 0/1\r\n\r\n**Screenshots (for UI changes only)**\r\n- None\r\n", "base": "{\"label\": \"commons-app:main\", \"ref\": \"main\", \"sha\": \"950539c55c26881bcc2f148e5ffe3f2b0be2c45e\"}", "resolved_issues": "[{\"number\": 5662, \"title\": \"Fix 119 minor Kotlin styling error\", \"body\": \"```\\r\\njava/fr/free/nrw/commons/AboutActivityTest.kt:130:26 Missing newline after \\\"(\\\"\\r\\njava/fr/free/nrw/commons/AboutActivityTest.kt:130:45 Argument should be on a separate line (unless all arguments can fit a single line)\\r\\njava/fr/free/nrw/commons/AboutActivityTest.kt:130:45 Missing newline after \\\"(\\\"\\r\\njava/fr/free/nrw/commons/AboutActivityTest.kt:131:55 Missing newline before \\\")\\\"\\r\\njava/fr/free/nrw/commons/AboutActivityTest.kt:131:56 Missing newline before \\\")\\\"\\r\\njava/fr/free/nrw/commons/AboutActivityTest.kt:131:56 Missing newline before \\\")\\\"\\r\\njava/fr/free/nrw/commons/AboutActivityTest.kt:134:1 Needless blank line(s)\\r\\njava/fr/free/nrw/commons/LoginActivityTest.kt:1:1 File must end with a newline (\\\\n)\\r\\njava/fr/free/nrw/commons/LoginActivityTest.kt:21:1 Wildcard import (cannot be auto-corrected)\\r\\njava/fr/free/nrw/commons/MainActivityTest.kt:1:1 File must end with a newline (\\\\n)\\r\\njava/fr/free/nrw/commons/MainActivityTest.kt:24:1 Wildcard import (cannot be auto-corrected)\\r\\njava/fr/free/nrw/commons/MainActivityTest.kt:82:55 Argument should be on a separate line (unless all arguments can fit a single line)\\r\\njava/fr/free/nrw/commons/MainActivityTest.kt:229:1 Unexpected blank line(s) before \\\"}\\\"\\r\\njava/fr/free/nrw/commons/ProfileActivityTest.kt:7:1 Unused import\\r\\njava/fr/free/nrw/commons/ProfileActivityTest.kt:64:27 Missing spacing after \\\",\\\"\\r\\njava/fr/free/nrw/commons/ProfileActivityTest.kt:64:32 Missing spacing after \\\",\\\"\\r\\njava/fr/free/nrw/commons/ProfileActivityTest.kt:64:36 Missing spacing after \\\",\\\"\\r\\njava/fr/free/nrw/commons/ProfileActivityTest.kt:64:41 Missing spacing after \\\",\\\"\\r\\njava/fr/free/nrw/commons/ProfileActivityTest.kt:68:1 Unexpected blank line(s) before \\\"}\\\"\\r\\njava/fr/free/nrw/commons/ReviewActivityTest.kt:1:1 File must end with a newline (\\\\n)\\r\\njava/fr/free/nrw/commons/ReviewActivityTest.kt:20:1 Unexpected blank line(s) before \\\"}\\\"\\r\\njava/fr/free/nrw/commons/SearchActivityTest.kt:1:1 File must end with a newline (\\\\n)\\r\\njava/fr/free/nrw/commons/SettingsActivityLoggedInTest.kt:1:1 File must end with a newline (\\\\n)\\r\\njava/fr/free/nrw/commons/SettingsActivityLoggedInTest.kt:64:1 Unexpected blank line(s) before \\\"}\\\"\\r\\njava/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt:1:1 File must end with a newline (\\\\n)\\r\\njava/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt:26:40 Missing spacing before \\\"{\\\"\\r\\njava/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt:28:43 Argument should be on a separate line (unless all arguments can fit a single line)\\r\\njava/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt:28:64 Argument should be on a separate line (unless all arguments can fit a single line)\\r\\njava/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt:28:87 Missing newline before \\\")\\\"\\r\\njava/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt:28:88 Missing newline before \\\")\\\"\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:1:1 File must end with a newline (\\\\n)\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:13:1 Wildcard import (cannot be auto-corrected)\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:16:1 Needless blank line(s)\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:23:17 Missing space after //\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:32:17 Missing space after //\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:35:63 Argument should be on a separate line (unless all arguments can fit a single line)\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:43:68 Argument should be on a separate line (unless all arguments can fit a single line)\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:60:17 Missing space after //\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:79:1 Unexpected blank line(s) before \\\"}\\\"\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:99:64 Argument should be on a separate line (unless all arguments can fit a single line)\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:111:68 Argument should be on a separate line (unless all arguments can fit a single line)\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:127:43 Parameter should be on a separate line (unless all parameters can fit a single line)\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:129:1 First line in a method block should not be empty\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:139:1 Unexpected indentation (28) (should be 24)\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:139:29 Line must not begin with \\\"&&\\\"\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:157:20 Missing { ... }\\r\\njava/fr/free/nrw/commons/UITestHelper.kt:164:20 Missing { ... }\\r\\njava/fr/free/nrw/commons/UploadCancelledTest.kt:7:1 Wildcard import (cannot be auto-corrected)\\r\\njava/fr/free/nrw/commons/UploadCancelledTest.kt:51:1 Unexpected blank line(s) before \\\"}\\\"\\r\\njava/fr/free/nrw/commons/UploadCancelledTest.kt:51:1 First line in a method block should not be empty\\r\\njava/fr/free/nrw/commons/UploadCancelledTest.kt:67:1 Unexpected blank line(s) before \\\"}\\\"\\r\\njava/fr/free/nrw/commons/UploadCancelledTest.kt:67:1 First line in a method block should not be empty\\r\\njava/fr/free/nrw/commons/UploadCancelledTest.kt:73:1 First line in a method block should not be empty\\r\\njava/fr/free/nrw/commons/UploadCancelledTest.kt:107:44 Unnecessary trailing comma before \\\")\\\"\\r\\njava/fr/free/nrw/commons/UploadCancelledTest.kt:122:58 Unnecessary trailing comma before \\\")\\\"\\r\\njava/fr/free/nrw/commons/UploadCancelledTest.kt:178:45 Unnecessary trailing comma before \\\")\\\"\\r\\njava/fr/free/nrw/commons/UploadTest.kt:1:1 File must end with a newline (\\\\n)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:22:1 Wildcard import (cannot be auto-corrected)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:32:1 Wildcard import (cannot be auto-corrected)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:45:52 Argument should be on a separate line (unless all arguments can fit a single line)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:45:52 Missing newline after \\\"(\\\"\\r\\njava/fr/free/nrw/commons/UploadTest.kt:46:1 Unexpected indentation (12) (should be 8)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:46:52 Missing newline before \\\")\\\"\\r\\njava/fr/free/nrw/commons/UploadTest.kt:46:53 Missing newline before \\\")\\\"\\r\\njava/fr/free/nrw/commons/UploadTest.kt:64:1 Unexpected blank line(s) before \\\"}\\\"\\r\\njava/fr/free/nrw/commons/UploadTest.kt:64:1 First line in a method block should not be empty\\r\\njava/fr/free/nrw/commons/UploadTest.kt:97:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:100:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:102:1 Needless blank line(s)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:104:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:112:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:118:1 Unexpected indentation (20) (should be 16)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:123:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:130:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:135:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:142:1 Unexpected indentation (20) (should be 16)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:143:1 Unexpected indentation (20) (should be 16)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:170:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:173:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:181:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:187:1 Unexpected indentation (20) (should be 16)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:192:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:199:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:204:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:230:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:233:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:234:1 Unexpected indentation (24) (should be 16)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:234:86 Argument should be on a separate line (unless all arguments can fit a single line)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:234:86 Missing newline after \\\"(\\\"\\r\\njava/fr/free/nrw/commons/UploadTest.kt:235:1 Unexpected indentation (32) (should be 20)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:235:123 Missing newline before \\\")\\\"\\r\\njava/fr/free/nrw/commons/UploadTest.kt:235:124 Missing newline before \\\")\\\"\\r\\njava/fr/free/nrw/commons/UploadTest.kt:235:124 Missing newline before \\\")\\\"\\r\\njava/fr/free/nrw/commons/UploadTest.kt:235:125 Missing newline before \\\")\\\"\\r\\njava/fr/free/nrw/commons/UploadTest.kt:238:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:241:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:242:1 Unexpected indentation (24) (should be 16)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:242:86 Argument should be on a separate line (unless all arguments can fit a single line)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:242:86 Missing newline after \\\"(\\\"\\r\\njava/fr/free/nrw/commons/UploadTest.kt:243:1 Unexpected indentation (32) (should be 20)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:243:118 Missing newline before \\\")\\\"\\r\\njava/fr/free/nrw/commons/UploadTest.kt:243:119 Missing newline before \\\")\\\"\\r\\njava/fr/free/nrw/commons/UploadTest.kt:243:119 Missing newline before \\\")\\\"\\r\\njava/fr/free/nrw/commons/UploadTest.kt:243:120 Missing newline before \\\")\\\"\\r\\njava/fr/free/nrw/commons/UploadTest.kt:246:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:254:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:260:1 Unexpected indentation (20) (should be 16)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:265:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:272:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:277:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:309:1 Unexpected blank line(s) before \\\"}\\\"\\r\\njava/fr/free/nrw/commons/UploadTest.kt:331:1 Unexpected indentation (20) (should be 16)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:332:1 Unexpected indentation (20) (should be 16)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:340:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/UploadTest.kt:344:1 Unexpected indentation (16) (should be 12)\\r\\njava/fr/free/nrw/commons/util/MyViewAction.kt:1:1 File must end with a newline (\\\\n)\\r\\njava/fr/free/nrw/commons/util/MyViewAction.kt:62:1 Unexpected blank line(s) before \\\"}\\\"\\r\\njava/fr/free/nrw/commons/WelcomeActivityTest.kt:1:1 File must end with a newline (\\\\n)\\r\\njava/fr/free/nrw/commons/WelcomeActivityTest.kt:6:1 Unused import\\r\\n```\"}]", "lang": "kotlin", "problem_statement": "Fix 119 minor Kotlin styling error\n```\r\njava/fr/free/nrw/commons/AboutActivityTest.kt:130:26 Missing newline after \"(\"\r\njava/fr/free/nrw/commons/AboutActivityTest.kt:130:45 Argument should be on a separate line (unless all arguments can fit a single line)\r\njava/fr/free/nrw/commons/AboutActivityTest.kt:130:45 Missing newline after \"(\"\r\njava/fr/free/nrw/commons/AboutActivityTest.kt:131:55 Missing newline before \")\"\r\njava/fr/free/nrw/commons/AboutActivityTest.kt:131:56 Missing newline before \")\"\r\njava/fr/free/nrw/commons/AboutActivityTest.kt:131:56 Missing newline before \")\"\r\njava/fr/free/nrw/commons/AboutActivityTest.kt:134:1 Needless blank line(s)\r\njava/fr/free/nrw/commons/LoginActivityTest.kt:1:1 File must end with a newline (\\n)\r\njava/fr/free/nrw/commons/LoginActivityTest.kt:21:1 Wildcard import (cannot be auto-corrected)\r\njava/fr/free/nrw/commons/MainActivityTest.kt:1:1 File must end with a newline (\\n)\r\njava/fr/free/nrw/commons/MainActivityTest.kt:24:1 Wildcard import (cannot be auto-corrected)\r\njava/fr/free/nrw/commons/MainActivityTest.kt:82:55 Argument should be on a separate line (unless all arguments can fit a single line)\r\njava/fr/free/nrw/commons/MainActivityTest.kt:229:1 Unexpected blank line(s) before \"}\"\r\njava/fr/free/nrw/commons/ProfileActivityTest.kt:7:1 Unused import\r\njava/fr/free/nrw/commons/ProfileActivityTest.kt:64:27 Missing spacing after \",\"\r\njava/fr/free/nrw/commons/ProfileActivityTest.kt:64:32 Missing spacing after \",\"\r\njava/fr/free/nrw/commons/ProfileActivityTest.kt:64:36 Missing spacing after \",\"\r\njava/fr/free/nrw/commons/ProfileActivityTest.kt:64:41 Missing spacing after \",\"\r\njava/fr/free/nrw/commons/ProfileActivityTest.kt:68:1 Unexpected blank line(s) before \"}\"\r\njava/fr/free/nrw/commons/ReviewActivityTest.kt:1:1 File must end with a newline (\\n)\r\njava/fr/free/nrw/commons/ReviewActivityTest.kt:20:1 Unexpected blank line(s) before \"}\"\r\njava/fr/free/nrw/commons/SearchActivityTest.kt:1:1 File must end with a newline (\\n)\r\njava/fr/free/nrw/commons/SettingsActivityLoggedInTest.kt:1:1 File must end with a newline (\\n)\r\njava/fr/free/nrw/commons/SettingsActivityLoggedInTest.kt:64:1 Unexpected blank line(s) before \"}\"\r\njava/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt:1:1 File must end with a newline (\\n)\r\njava/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt:26:40 Missing spacing before \"{\"\r\njava/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt:28:43 Argument should be on a separate line (unless all arguments can fit a single line)\r\njava/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt:28:64 Argument should be on a separate line (unless all arguments can fit a single line)\r\njava/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt:28:87 Missing newline before \")\"\r\njava/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt:28:88 Missing newline before \")\"\r\njava/fr/free/nrw/commons/UITestHelper.kt:1:1 File must end with a newline (\\n)\r\njava/fr/free/nrw/commons/UITestHelper.kt:13:1 Wildcard import (cannot be auto-corrected)\r\njava/fr/free/nrw/commons/UITestHelper.kt:16:1 Needless blank line(s)\r\njava/fr/free/nrw/commons/UITestHelper.kt:23:17 Missing space after //\r\njava/fr/free/nrw/commons/UITestHelper.kt:32:17 Missing space after //\r\njava/fr/free/nrw/commons/UITestHelper.kt:35:63 Argument should be on a separate line (unless all arguments can fit a single line)\r\njava/fr/free/nrw/commons/UITestHelper.kt:43:68 Argument should be on a separate line (unless all arguments can fit a single line)\r\njava/fr/free/nrw/commons/UITestHelper.kt:60:17 Missing space after //\r\njava/fr/free/nrw/commons/UITestHelper.kt:79:1 Unexpected blank line(s) before \"}\"\r\njava/fr/free/nrw/commons/UITestHelper.kt:99:64 Argument should be on a separate line (unless all arguments can fit a single line)\r\njava/fr/free/nrw/commons/UITestHelper.kt:111:68 Argument should be on a separate line (unless all arguments can fit a single line)\r\njava/fr/free/nrw/commons/UITestHelper.kt:127:43 Parameter should be on a separate line (unless all parameters can fit a single line)\r\njava/fr/free/nrw/commons/UITestHelper.kt:129:1 First line in a method block should not be empty\r\njava/fr/free/nrw/commons/UITestHelper.kt:139:1 Unexpected indentation (28) (should be 24)\r\njava/fr/free/nrw/commons/UITestHelper.kt:139:29 Line must not begin with \"&&\"\r\njava/fr/free/nrw/commons/UITestHelper.kt:157:20 Missing { ... }\r\njava/fr/free/nrw/commons/UITestHelper.kt:164:20 Missing { ... }\r\njava/fr/free/nrw/commons/UploadCancelledTest.kt:7:1 Wildcard import (cannot be auto-corrected)\r\njava/fr/free/nrw/commons/UploadCancelledTest.kt:51:1 Unexpected blank line(s) before \"}\"\r\njava/fr/free/nrw/commons/UploadCancelledTest.kt:51:1 First line in a method block should not be empty\r\njava/fr/free/nrw/commons/UploadCancelledTest.kt:67:1 Unexpected blank line(s) before \"}\"\r\njava/fr/free/nrw/commons/UploadCancelledTest.kt:67:1 First line in a method block should not be empty\r\njava/fr/free/nrw/commons/UploadCancelledTest.kt:73:1 First line in a method block should not be empty\r\njava/fr/free/nrw/commons/UploadCancelledTest.kt:107:44 Unnecessary trailing comma before \")\"\r\njava/fr/free/nrw/commons/UploadCancelledTest.kt:122:58 Unnecessary trailing comma before \")\"\r\njava/fr/free/nrw/commons/UploadCancelledTest.kt:178:45 Unnecessary trailing comma before \")\"\r\njava/fr/free/nrw/commons/UploadTest.kt:1:1 File must end with a newline (\\n)\r\njava/fr/free/nrw/commons/UploadTest.kt:22:1 Wildcard import (cannot be auto-corrected)\r\njava/fr/free/nrw/commons/UploadTest.kt:32:1 Wildcard import (cannot be auto-corrected)\r\njava/fr/free/nrw/commons/UploadTest.kt:45:52 Argument should be on a separate line (unless all arguments can fit a single line)\r\njava/fr/free/nrw/commons/UploadTest.kt:45:52 Missing newline after \"(\"\r\njava/fr/free/nrw/commons/UploadTest.kt:46:1 Unexpected indentation (12) (should be 8)\r\njava/fr/free/nrw/commons/UploadTest.kt:46:52 Missing newline before \")\"\r\njava/fr/free/nrw/commons/UploadTest.kt:46:53 Missing newline before \")\"\r\njava/fr/free/nrw/commons/UploadTest.kt:64:1 Unexpected blank line(s) before \"}\"\r\njava/fr/free/nrw/commons/UploadTest.kt:64:1 First line in a method block should not be empty\r\njava/fr/free/nrw/commons/UploadTest.kt:97:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:100:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:102:1 Needless blank line(s)\r\njava/fr/free/nrw/commons/UploadTest.kt:104:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:112:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:118:1 Unexpected indentation (20) (should be 16)\r\njava/fr/free/nrw/commons/UploadTest.kt:123:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:130:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:135:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:142:1 Unexpected indentation (20) (should be 16)\r\njava/fr/free/nrw/commons/UploadTest.kt:143:1 Unexpected indentation (20) (should be 16)\r\njava/fr/free/nrw/commons/UploadTest.kt:170:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:173:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:181:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:187:1 Unexpected indentation (20) (should be 16)\r\njava/fr/free/nrw/commons/UploadTest.kt:192:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:199:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:204:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:230:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:233:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:234:1 Unexpected indentation (24) (should be 16)\r\njava/fr/free/nrw/commons/UploadTest.kt:234:86 Argument should be on a separate line (unless all arguments can fit a single line)\r\njava/fr/free/nrw/commons/UploadTest.kt:234:86 Missing newline after \"(\"\r\njava/fr/free/nrw/commons/UploadTest.kt:235:1 Unexpected indentation (32) (should be 20)\r\njava/fr/free/nrw/commons/UploadTest.kt:235:123 Missing newline before \")\"\r\njava/fr/free/nrw/commons/UploadTest.kt:235:124 Missing newline before \")\"\r\njava/fr/free/nrw/commons/UploadTest.kt:235:124 Missing newline before \")\"\r\njava/fr/free/nrw/commons/UploadTest.kt:235:125 Missing newline before \")\"\r\njava/fr/free/nrw/commons/UploadTest.kt:238:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:241:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:242:1 Unexpected indentation (24) (should be 16)\r\njava/fr/free/nrw/commons/UploadTest.kt:242:86 Argument should be on a separate line (unless all arguments can fit a single line)\r\njava/fr/free/nrw/commons/UploadTest.kt:242:86 Missing newline after \"(\"\r\njava/fr/free/nrw/commons/UploadTest.kt:243:1 Unexpected indentation (32) (should be 20)\r\njava/fr/free/nrw/commons/UploadTest.kt:243:118 Missing newline before \")\"\r\njava/fr/free/nrw/commons/UploadTest.kt:243:119 Missing newline before \")\"\r\njava/fr/free/nrw/commons/UploadTest.kt:243:119 Missing newline before \")\"\r\njava/fr/free/nrw/commons/UploadTest.kt:243:120 Missing newline before \")\"\r\njava/fr/free/nrw/commons/UploadTest.kt:246:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:254:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:260:1 Unexpected indentation (20) (should be 16)\r\njava/fr/free/nrw/commons/UploadTest.kt:265:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:272:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:277:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:309:1 Unexpected blank line(s) before \"}\"\r\njava/fr/free/nrw/commons/UploadTest.kt:331:1 Unexpected indentation (20) (should be 16)\r\njava/fr/free/nrw/commons/UploadTest.kt:332:1 Unexpected indentation (20) (should be 16)\r\njava/fr/free/nrw/commons/UploadTest.kt:340:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/UploadTest.kt:344:1 Unexpected indentation (16) (should be 12)\r\njava/fr/free/nrw/commons/util/MyViewAction.kt:1:1 File must end with a newline (\\n)\r\njava/fr/free/nrw/commons/util/MyViewAction.kt:62:1 Unexpected blank line(s) before \"}\"\r\njava/fr/free/nrw/commons/WelcomeActivityTest.kt:1:1 File must end with a newline (\\n)\r\njava/fr/free/nrw/commons/WelcomeActivityTest.kt:6:1 Unused import\r\n```\n", "hints": "@nicolas-raoul Can we fix all this in one pr? I would like to take it up.\n@neeldoshii I unassign for now, but if you are you still working on this, please let us know. If no answer, someone else may be assigned to it. Thanks a lot. :-)\n@nicolas-raoul are you looking to just fix the formatting in the files listed in this issue or the whole project? I ran ktlint across *.kt files and there seems to be many files not listed in the original issue list which are failing the standard rule set. Some can be fixed automatically others need to be manually corrected.\r\n\r\nSummary error count (descending) by rule:\r\n standard:trailing-comma-on-call-site: 1064\r\n standard:function-signature: 809\r\n standard:argument-list-wrapping: 768\r\n standard:indent: 616\r\n standard:multiline-expression-wrapping: 604\r\n standard:wrapping: 434\r\n standard:chain-method-continuation: 351\r\n standard:class-signature: 270\r\n standard:no-empty-first-line-in-class-body: 213\r\n standard:trailing-comma-on-declaration-site: 209\r\n standard:function-expression-body: 185\r\n standard:final-newline: 171\r\n standard:no-unused-imports: 166\r\n standard:no-blank-line-before-rbrace: 148\r\n standard:no-consecutive-blank-lines: 139\r\n standard:parameter-list-wrapping: 137\r\n standard:curly-spacing: 116\r\n standard:no-wildcard-imports: 114\r\n standard:colon-spacing: 112\r\n standard:comma-spacing: 104\r\n standard:no-semi: 97\r\n standard:annotation: 94\r\n standard:import-ordering: 73\r\n standard:blank-line-before-declaration: 60\r\n standard:function-start-of-body-spacing: 55\r\n standard:op-spacing: 53\r\n standard:comment-spacing: 51\r\n standard:parameter-list-spacing: 49\r\n standard:multiline-if-else: 46\r\n standard:keyword-spacing: 42\r\n standard:no-empty-first-line-in-method-block: 41\r\n standard:spacing-between-declarations-with-annotations: 39\r\n standard:enum-wrapping: 37\r\n standard:no-multi-spaces: 34\r\n standard:no-blank-line-in-list: 33\r\n standard:function-return-type-spacing: 28\r\n standard:if-else-wrapping: 28\r\n standard:max-line-length: 26\r\n standard:property-naming: 25\r\n standard:statement-wrapping: 23\r\n standard:condition-wrapping: 21\r\n standard:paren-spacing: 21\r\n standard:no-consecutive-comments: 18\r\n standard:no-trailing-spaces: 18\r\n standard:chain-wrapping: 16\r\n standard:function-literal: 16\r\n standard:spacing-between-declarations-with-comments: 11\r\n standard:if-else-bracing: 9\r\n standard:try-catch-finally-spacing: 8\r\n standard:binary-expression-wrapping: 7\r\n standard:backing-property-naming: 5\r\n standard:class-naming: 5\r\n standard:block-comment-initial-star-alignment: 4\r\n standard:modifier-list-spacing: 4\r\n standard:filename: 3\r\n standard:no-empty-class-body: 3\r\n standard:kdoc-wrapping: 1\r\n standard:property-wrapping: 1\r\n standard:type-parameter-list-spacing: 1\r\n standard:unnecessary-parentheses-before-trailing-lambda: 1\n@tristan81 The whole project! :-) Ideally all lint problems must be fixed. Thanks a lot for the updated list! Feel free to send small pull requests, rather than all at once, if fixing all takes more than a week or so.\n@nicolas-raoul okay will do", "pull_url": "https://github.com/commons-app/apps-android-commons/pull/5833", "issue_urls": "[\"https://github.com/commons-app/apps-android-commons/issues/5662\"]", "test_command": "./gradlew :app:testBetaDebugUnitTest --tests \"fr.free.nrw.commons.quiz.QuizControllerTest\" --tests \"fr.free.nrw.commons.utils.FileUtilsTest\" --tests \"fr.free.nrw.commons.auth.login.UserExtendedInfoClientTest\" --tests \"fr.free.nrw.commons.contributions.ContributionsPresenterTest\" --tests \"fr.free.nrw.commons.description.DescriptionEditActivityUnitTest\" --tests \"fr.free.nrw.commons.explore.search.SearchActivityUnitTests\" --tests \"fr.free.nrw.commons.upload.UploadMediaDetailInputFilterTest\" --tests \"fr.free.nrw.commons.upload.depicts.DepictsFragmentUnitTests\" --tests \"fr.free.nrw.commons.quiz.QuizActivityUnitTest\" --tests \"fr.free.nrw.commons.notification.NotificationActivityUnitTests\" --tests \"fr.free.nrw.commons.locationpicker.LocationPickerViewModelUnitTests\" --tests \"fr.free.nrw.commons.upload.UploadPresenterTest\" --tests \"fr.free.nrw.commons.media.MediaDetailFragmentUnitTests\" --tests \"fr.free.nrw.commons.contributions.ContributionsRepositoryTest\" --tests \"fr.free.nrw.commons.media.CustomOkHttpNetworkFetcherUnitTest\" --tests \"fr.free.nrw.commons.campaigns.CampaignViewUnitTests\" --tests \"fr.free.nrw.commons.contributions.ContributionViewHolderUnitTests\" --tests \"fr.free.nrw.commons.customselector.helper.ImageHelperTest\" --tests \"fr.free.nrw.commons.auth.SessionManagerUnitTests\" --tests \"fr.free.nrw.commons.explore.PagingDataSourceTest\" --tests \"fr.free.nrw.commons.review.ReviewDaoTest\" --tests \"fr.free.nrw.commons.quiz.QuizCheckerUnitTest\" --tests \"fr.free.nrw.commons.nearby.NearbyPlacesTest\" --tests \"fr.free.nrw.commons.WelcomeActivityUnitTest\" --tests \"fr.free.nrw.commons.nearby.CheckBoxTriStatesTest\" --tests \"fr.free.nrw.commons.widget.HeightLimitedRecyclerViewUnitTests\" --tests \"fr.free.nrw.commons.campaigns.CampaignsPresenterTest\" --tests \"fr.free.nrw.commons.nearby.NearbyParentFragmentUnitTest\" --tests \"fr.free.nrw.commons.auth.WikiAccountAuthenticatorServiceUnitTest\" --tests \"fr.free.nrw.commons.profile.achievements.AchievementsFragmentUnitTests\" --tests \"fr.free.nrw.commons.actions.ThanksClientTest\" --tests \"fr.free.nrw.commons.widget.PicOfDayAppWidgetUnitTests\" --tests \"fr.free.nrw.commons.explore.ExploreListRootFragmentUnitTest\" --tests \"fr.free.nrw.commons.NearbyControllerTest\" --tests \"fr.free.nrw.commons.upload.CategoriesPresenterTest\" --tests \"fr.free.nrw.commons.upload.UploadActivityUnitTests\" --tests \"fr.free.nrw.commons.bookmarks.BookmarkListRootFragmentUnitTest\" --tests \"fr.free.nrw.commons.MediaTest\" --tests \"fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesControllerTest\" --tests \"fr.free.nrw.commons.explore.depictions.WikidataItemDetailsActivityUnitTests\" --tests \"fr.free.nrw.commons.upload.FileMetadataUtilsTest\" --tests \"fr.free.nrw.commons.media.ZoomableActivityUnitTests\" --tests \"fr.free.nrw.commons.upload.MediaLicensePresenterTest\" --tests \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest\" --tests \"fr.free.nrw.commons.explore.PageableBaseDataSourceTest\" --tests \"fr.free.nrw.commons.media.MediaClientTest\" --tests \"fr.free.nrw.commons.contributions.ContributionsFragmentUnitTests\" --tests \"fr.free.nrw.commons.review.ReviewControllerTest\" --tests \"fr.free.nrw.commons.feedback.FeedbackDialogTests\" --tests \"fr.free.nrw.commons.utils.ImageUtilsTest\" --tests \"fr.free.nrw.commons.leaderboard.LeaderboardFragmentUnitTests\" --tests \"fr.free.nrw.commons.bookmarks.BookmarksPagerAdapterTests\" --tests \"fr.free.nrw.commons.utils.LocationUtilsTest\" --tests \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest\" --tests \"fr.free.nrw.commons.customselector.ui.adapter.ImageAdapterTest\" --tests \"fr.free.nrw.commons.category.GridViewAdapterUnitTest\" --tests \"fr.free.nrw.commons.explore.categories.sub.PageableSubCategoriesDataSourceTest\" --tests \"fr.free.nrw.commons.auth.csrf.CsrfTokenClientTest\" --tests \"fr.free.nrw.commons.media.zoomControllers.MultiPointerGestureDetectorUnitTest\" --tests \"fr.free.nrw.commons.wikidata.WikidataClientTest\" --tests \"fr.free.nrw.commons.customselector.ui.selector.ImageFileLoaderTest\" --tests \"fr.free.nrw.commons.customselector.ui.selector.ImageLoaderTest\" --tests \"fr.free.nrw.commons.contributions.MainActivityUnitTests\" --tests \"fr.free.nrw.commons.navtab.MoreBottomSheetLoggedOutFragmentUnitTests\" --tests \"fr.free.nrw.commons.actions.PageEditClientTest\" --tests \"fr.free.nrw.commons.bookmarks.locations.BookmarkLocationFragmentUnitTests\" --tests \"fr.free.nrw.commons.bookmarks.locations.BookMarkLocationDaoTest\" --tests \"fr.free.nrw.commons.upload.DepictsPresenterTest\" --tests \"fr.free.nrw.commons.bookmarks.locations.BookmarkLocationControllerTest\" --tests \"fr.free.nrw.commons.feedback.FeedbackUnitTests\" --tests \"fr.free.nrw.commons.explore.categories.parent.PageableParentCategoriesDataSourceTest\" --tests \"fr.free.nrw.commons.OkHttpJsonApiClientTests\" --tests \"fr.free.nrw.commons.auth.AccountUtilUnitTest\" --tests \"fr.free.nrw.commons.feedback.FeedbackContentCreatorUnitTests\" --tests \"fr.free.nrw.commons.utils.LengthUtilsTest\" --tests \"fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragmentUnitTest\" --tests \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesFragmentUnitTest\" --tests \"fr.free.nrw.commons.navtab.MoreBottomSheetFragmentUnitTests\" --tests \"fr.free.nrw.commons.notification.NotificationHelperUnitTests\" --tests \"fr.free.nrw.commons.notification.NotificationWorkerFragmentUnitTests\" --tests \"fr.free.nrw.commons.quiz.QuizQuestionTest\" --tests \"fr.free.nrw.commons.upload.ImageProcessingServiceTest\" --tests \"fr.free.nrw.commons.settings.SettingsFragmentUnitTests\" --tests \"fr.free.nrw.commons.explore.depictions.PageableDepictionsDataSourceTest\" --tests \"fr.free.nrw.commons.notification.NotificationClientTest\" --tests \"fr.free.nrw.commons.AboutActivityUnitTests\" --tests \"fr.free.nrw.commons.review.ReviewActivityTest\" --tests \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsControllerTest\" --tests \"fr.free.nrw.commons.review.ReviewImageFragmentTest\" --tests \"fr.free.nrw.commons.bookmarks.LoggedOutBookmarksPagerAdapterTests\" --tests \"fr.free.nrw.commons.auth.WikiAccountAuthenticatorUnitTest\" --tests \"fr.free.nrw.commons.upload.UploadMediaPresenterTest\" --tests \"fr.free.nrw.commons.contributions.ContributionsListFragmentUnitTests\" --tests \"fr.free.nrw.commons.explore.depictions.parent.PageableParentDepictionsDataSourceTest\" --tests \"fr.free.nrw.commons.media.zoomControllers.TransformGestureDetectorUnitTest\" --tests \"fr.free.nrw.commons.mwapi.UserClientTest\" --tests \"fr.free.nrw.commons.bookmarks.pictures.BookmarkPictureDaoTest\" --tests \"fr.free.nrw.commons.customselector.ui.selector.FolderFragmentTest\" --tests \"fr.free.nrw.commons.customselector.helper.OnSwipeTouchListenerTest\" --tests \"fr.free.nrw.commons.nearby.NearbyControllerTest\" --tests \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsFragmentUnitTest\" --tests \"fr.free.nrw.commons.nearby.LabelTest\" --tests \"fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesFragmentUnitTests\" --tests \"fr.free.nrw.commons.profile.achievements.LevelControllerTest\" --tests \"fr.free.nrw.commons.upload.LanguagesAdapterTest\" --tests \"fr.free.nrw.commons.upload.UploadClientTest\" --tests \"fr.free.nrw.commons.explore.media.MediaConverterTest\" --tests \"fr.free.nrw.commons.description.DescriptionEditHelperUnitTest\" --tests \"fr.free.nrw.commons.upload.UploadRepositoryUnitTest\" --tests \"fr.free.nrw.commons.explore.depictions.DepictsClientTest\" --tests \"fr.free.nrw.commons.upload.categories.UploadCategoriesFragmentUnitTests\" --tests \"fr.free.nrw.commons.explore.PagingDataSourceFactoryTest\" --tests \"fr.free.nrw.commons.quiz.RadioGroupHelperUnitTest\" --tests \"fr.free.nrw.commons.nearby.AdvanceQueryFragmentUnitTests\" --tests \"fr.free.nrw.commons.notification.NotificationControllerTest\" --tests \"fr.free.nrw.commons.recentlanguages.RecentLanguagesAdapterUnitTest\" --tests \"fr.free.nrw.commons.explore.ExploreFragmentUnitTest\" --tests \"fr.free.nrw.commons.delete.DeleteHelperTest\" --tests \"fr.free.nrw.commons.upload.UploadMediaDetailAdapterUnitTest\" --tests \"fr.free.nrw.commons.customselector.ui.adapter.FolderAdapterTest\" --tests \"fr.free.nrw.commons.upload.UploadModelUnitTest\" --tests \"fr.free.nrw.commons.recentlanguages.RecentLanguagesDaoUnitTest\" --tests \"fr.free.nrw.commons.utils.StringSortingUtilsTest\" --tests \"fr.free.nrw.commons.review.ReviewHelperTest\" --tests \"fr.free.nrw.commons.upload.GpsCategoryModelTest\" --tests \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorViewModelTest\" --tests \"fr.free.nrw.commons.explore.media.PageableMediaDataSourceTest\" --tests \"fr.free.nrw.commons.location.LatLngTest\" --tests \"fr.free.nrw.commons.explore.depictions.media.PageableDepictedMediaDataSourceTest\" --tests \"fr.free.nrw.commons.media.MediaDetailPagerFragmentUnitTests\" --tests \"fr.free.nrw.commons.quiz.QuizResultActivityUnitTest\" --tests \"fr.free.nrw.commons.locationpicker.LocationPickerActivityUnitTests\" --tests \"fr.free.nrw.commons.wikidata.WikidataEditServiceTest\" --tests \"fr.free.nrw.commons.category.CategoriesModelTest\" --tests \"fr.free.nrw.commons.auth.SignupActivityTest\" --tests \"fr.free.nrw.commons.recentlanguages.RecentLanguagesContentProviderUnitTest\" --tests \"fr.free.nrw.commons.contributions.ContributionBoundaryCallbackTest\" --tests \"fr.free.nrw.commons.login.LoginActivityUnitTests\" --tests \"fr.free.nrw.commons.profile.ProfileActivityTest\" --tests \"fr.free.nrw.commons.delete.ReasonBuilderTest\" --tests \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest\" --tests \"fr.free.nrw.commons.wikidata.WikiBaseClientUnitTest\" --tests \"fr.free.nrw.commons.filepicker.FilePickerTest\" --tests \"fr.free.nrw.commons.upload.depicts.DepictEditHelperUnitTest\" --tests \"fr.free.nrw.commons.explore.depictions.child.PageableChildDepictionsDataSourceTest\" --tests \"fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivityTest\" --tests \"fr.free.nrw.commons.nearby.NearbyFilterSearchRecyclerViewAdapterUnitTests\" --tests \"fr.free.nrw.commons.auth.LoginActivityUnitTests\" --tests \"fr.free.nrw.commons.leaderboard.LeaderboardListAdapterUnitTests\" --tests \"fr.free.nrw.commons.LatLngTests\" --tests \"fr.free.nrw.commons.nearby.NearbyParentFragmentPresenterTest\" --tests \"fr.free.nrw.commons.settings.SettingsActivityUnitTests\" --tests \"fr.free.nrw.commons.customselector.ui.selector.ImageFragmentTest\" --tests \"fr.free.nrw.commons.coordinates.CoordinateEditHelperUnitTest\" --tests \"fr.free.nrw.commons.MediaDataExtractorTest\"", "fix_patch": "diff --git a/app/src/main/java/fr/free/nrw/commons/BaseMarker.kt b/app/src/main/java/fr/free/nrw/commons/BaseMarker.kt\nindex 277faea841..1daadb5a16 100644\n--- a/app/src/main/java/fr/free/nrw/commons/BaseMarker.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/BaseMarker.kt\n@@ -39,26 +39,25 @@ class BaseMarker {\n constructor() {\n }\n \n- fun fromResource(context: Context, drawableResId: Int) {\n+ fun fromResource(\n+ context: Context,\n+ drawableResId: Int,\n+ ) {\n val drawable: Drawable = context.resources.getDrawable(drawableResId)\n- icon = if (drawable is BitmapDrawable) {\n- (drawable as BitmapDrawable).bitmap\n- } else {\n- val bitmap = Bitmap.createBitmap(\n- drawable.intrinsicWidth,\n- drawable.intrinsicHeight, Bitmap.Config.ARGB_8888\n- )\n- val canvas = Canvas(bitmap)\n- drawable.setBounds(0, 0, canvas.width, canvas.height)\n- drawable.draw(canvas)\n- bitmap\n- }\n+ icon =\n+ if (drawable is BitmapDrawable) {\n+ (drawable as BitmapDrawable).bitmap\n+ } else {\n+ val bitmap =\n+ Bitmap.createBitmap(\n+ drawable.intrinsicWidth,\n+ drawable.intrinsicHeight,\n+ Bitmap.Config.ARGB_8888,\n+ )\n+ val canvas = Canvas(bitmap)\n+ drawable.setBounds(0, 0, canvas.width, canvas.height)\n+ drawable.draw(canvas)\n+ bitmap\n+ }\n }\n }\n-\n-\n-\n-\n-\n-\n-\ndiff --git a/app/src/main/java/fr/free/nrw/commons/BetaConstants.kt b/app/src/main/java/fr/free/nrw/commons/BetaConstants.kt\nindex 018d787f9c..c0c0b9a61b 100644\n--- a/app/src/main/java/fr/free/nrw/commons/BetaConstants.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/BetaConstants.kt\n@@ -10,9 +10,10 @@ object BetaConstants {\n * production server where beta server does not work\n */\n const val COMMONS_URL = \"https://commons.wikimedia.org/\"\n+\n /**\n * Commons production's depicts property which is used in beta for some specific GET calls on\n * production server where beta server does not work\n */\n const val DEPICTS_PROPERTY = \"P180\"\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/CameraPosition.kt b/app/src/main/java/fr/free/nrw/commons/CameraPosition.kt\nindex 31136e61b3..e3a644c6a9 100644\n--- a/app/src/main/java/fr/free/nrw/commons/CameraPosition.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/CameraPosition.kt\n@@ -3,31 +3,31 @@ package fr.free.nrw.commons\n import android.os.Parcel\n import android.os.Parcelable\n \n-class CameraPosition(val latitude: Double, val longitude: Double, val zoom: Double) : Parcelable {\n-\n+class CameraPosition(\n+ val latitude: Double,\n+ val longitude: Double,\n+ val zoom: Double,\n+) : Parcelable {\n constructor(parcel: Parcel) : this(\n parcel.readDouble(),\n parcel.readDouble(),\n- parcel.readDouble()\n+ parcel.readDouble(),\n )\n \n- override fun writeToParcel(parcel: Parcel, flags: Int) {\n+ override fun writeToParcel(\n+ parcel: Parcel,\n+ flags: Int,\n+ ) {\n parcel.writeDouble(latitude)\n parcel.writeDouble(longitude)\n parcel.writeDouble(zoom)\n }\n \n- override fun describeContents(): Int {\n- return 0\n- }\n+ override fun describeContents(): Int = 0\n \n companion object CREATOR : Parcelable.Creator {\n- override fun createFromParcel(parcel: Parcel): CameraPosition {\n- return CameraPosition(parcel)\n- }\n+ override fun createFromParcel(parcel: Parcel): CameraPosition = CameraPosition(parcel)\n \n- override fun newArray(size: Int): Array {\n- return arrayOfNulls(size)\n- }\n+ override fun newArray(size: Int): Array = arrayOfNulls(size)\n }\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/Media.kt b/app/src/main/java/fr/free/nrw/commons/Media.kt\nindex 65e66e2793..93efac7b23 100644\n--- a/app/src/main/java/fr/free/nrw/commons/Media.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/Media.kt\n@@ -2,9 +2,11 @@ package fr.free.nrw.commons\n \n import android.os.Parcelable\n import fr.free.nrw.commons.location.LatLng\n-import kotlinx.parcelize.Parcelize\n import fr.free.nrw.commons.wikidata.model.page.PageTitle\n-import java.util.*\n+import kotlinx.parcelize.Parcelize\n+import java.util.Date\n+import java.util.Locale\n+import java.util.UUID\n \n @Parcelize\n class Media constructor(\n@@ -14,7 +16,6 @@ class Media constructor(\n */\n var pageId: String = UUID.randomUUID().toString(),\n var thumbUrl: String? = null,\n-\n /**\n * Gets image URL\n * @return Image URL\n@@ -26,16 +27,11 @@ class Media constructor(\n */\n var filename: String? = null,\n /**\n- * Gets the file description.\n+ * Gets or sets the file description.\n * @return file description as a string\n- */\n- // monolingual description on input...\n- /**\n- * Sets the file description.\n * @param fallbackDescription the new description of the file\n */\n var fallbackDescription: String? = null,\n-\n /**\n * Gets the upload date of the file.\n * Can be null.\n@@ -43,28 +39,19 @@ class Media constructor(\n */\n var dateUploaded: Date? = null,\n /**\n- * Gets the license name of the file.\n+ * Gets or sets the license name of the file.\n * @return license as a String\n- */\n- /**\n- * Sets the license name of the file.\n- *\n * @param license license name as a String\n */\n var license: String? = null,\n var licenseUrl: String? = null,\n /**\n- * Gets the name of the creator of the file.\n+ * Gets or sets the name of the creator of the file.\n * @return author name as a String\n- */\n- /**\n- * Sets the author name of the file.\n * @param author creator name as a string\n */\n var author: String? = null,\n-\n- var user:String?=null,\n-\n+ var user: String? = null,\n /**\n * Gets the categories the file falls under.\n * @return file categories as an ArrayList of Strings\n@@ -83,23 +70,23 @@ class Media constructor(\n * Stores the mapping of category title to hidden attribute\n * Example: \"Mountains\" => false, \"CC-BY-SA-2.0\" => true\n */\n- var categoriesHiddenStatus: Map = emptyMap()\n+ var categoriesHiddenStatus: Map = emptyMap(),\n ) : Parcelable {\n-\n constructor(\n captions: Map,\n categories: List?,\n filename: String?,\n fallbackDescription: String?,\n- author: String?, user:String?\n+ author: String?,\n+ user: String?,\n ) : this(\n filename = filename,\n fallbackDescription = fallbackDescription,\n dateUploaded = Date(),\n author = author,\n- user=user,\n+ user = user,\n categories = categories,\n- captions = captions\n+ captions = captions,\n )\n \n /**\n@@ -108,10 +95,11 @@ class Media constructor(\n */\n val displayTitle: String\n get() =\n- if (filename != null)\n+ if (filename != null) {\n pageTitle.displayTextWithoutNamespace.replaceFirst(\"[.][^.]+$\".toRegex(), \"\")\n- else\n+ } else {\n \"\"\n+ }\n \n /**\n * Gets file page title\n@@ -127,9 +115,10 @@ class Media constructor(\n get() = String.format(\"[[%s|thumb|%s]]\", filename, mostRelevantCaption)\n \n val mostRelevantCaption: String\n- get() = captions[Locale.getDefault().language]\n- ?: captions.values.firstOrNull()\n- ?: displayTitle\n+ get() =\n+ captions[Locale.getDefault().language]\n+ ?: captions.values.firstOrNull()\n+ ?: displayTitle\n \n /**\n * Gets the categories the file falls under.\n@@ -138,6 +127,8 @@ class Media constructor(\n var addedCategories: List? = null\n // TODO added categories should be removed. It is added for a short fix. On category update,\n // categories should be re-fetched instead\n- get() = field // getter\n- set(value) { field = value } // setter\n+ get() = field // getter\n+ set(value) {\n+ field = value\n+ } // setter\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.kt b/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.kt\nindex b18c343e00..2ff54959db 100644\n--- a/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.kt\n@@ -1,9 +1,9 @@\n package fr.free.nrw.commons\n \n import androidx.core.text.HtmlCompat\n-import fr.free.nrw.commons.media.PAGE_ID_PREFIX\n import fr.free.nrw.commons.media.IdAndCaptions\n import fr.free.nrw.commons.media.MediaClient\n+import fr.free.nrw.commons.media.PAGE_ID_PREFIX\n import io.reactivex.Single\n import timber.log.Timber\n import javax.inject.Inject\n@@ -17,42 +17,46 @@ import javax.inject.Singleton\n * to the media and may change due to editing.\n */\n @Singleton\n-class MediaDataExtractor @Inject constructor(private val mediaClient: MediaClient) {\n-\n- fun fetchDepictionIdsAndLabels(media: Media) =\n- mediaClient.getEntities(media.depictionIds)\n- .map {\n- it.entities()\n- .mapValues { entry -> entry.value.labels().mapValues { it.value.value() } }\n- }\n- .map { it.map { (key, value) -> IdAndCaptions(key, value) } }\n- .onErrorReturn { emptyList() }\n-\n- fun checkDeletionRequestExists(media: Media) =\n- mediaClient.checkPageExistsUsingTitle(\"Commons:Deletion_requests/\" + media.filename)\n-\n- fun fetchDiscussion(media: Media) =\n- mediaClient.getPageHtml(media.filename!!.replace(\"File\", \"File talk\"))\n- .map { HtmlCompat.fromHtml(it, HtmlCompat.FROM_HTML_MODE_LEGACY).toString() }\n- .onErrorReturn {\n- Timber.d(\"Error occurred while fetching discussion\")\n- \"\"\n- }\n-\n- fun refresh(media: Media): Single {\n- return Single.ambArray(\n- mediaClient.getMediaById(PAGE_ID_PREFIX + media.pageId)\n- .onErrorResumeNext { Single.never() },\n- mediaClient.getMediaSuppressingErrors(media.filename)\n- .onErrorResumeNext { Single.never() }\n- )\n-\n+class MediaDataExtractor\n+ @Inject\n+ constructor(\n+ private val mediaClient: MediaClient,\n+ ) {\n+ fun fetchDepictionIdsAndLabels(media: Media) =\n+ mediaClient\n+ .getEntities(media.depictionIds)\n+ .map {\n+ it\n+ .entities()\n+ .mapValues { entry -> entry.value.labels().mapValues { it.value.value() } }\n+ }.map { it.map { (key, value) -> IdAndCaptions(key, value) } }\n+ .onErrorReturn { emptyList() }\n+\n+ fun checkDeletionRequestExists(media: Media) = mediaClient.checkPageExistsUsingTitle(\"Commons:Deletion_requests/\" + media.filename)\n+\n+ fun fetchDiscussion(media: Media) =\n+ mediaClient\n+ .getPageHtml(media.filename!!.replace(\"File\", \"File talk\"))\n+ .map { HtmlCompat.fromHtml(it, HtmlCompat.FROM_HTML_MODE_LEGACY).toString() }\n+ .onErrorReturn {\n+ Timber.d(\"Error occurred while fetching discussion\")\n+ \"\"\n+ }\n+\n+ fun refresh(media: Media): Single =\n+ Single.ambArray(\n+ mediaClient\n+ .getMediaById(PAGE_ID_PREFIX + media.pageId)\n+ .onErrorResumeNext { Single.never() },\n+ mediaClient\n+ .getMediaSuppressingErrors(media.filename)\n+ .onErrorResumeNext { Single.never() },\n+ )\n+\n+ fun getHtmlOfPage(title: String) = mediaClient.getPageHtml(title)\n+\n+ /**\n+ * Fetches wikitext from mediaClient\n+ */\n+ fun getCurrentWikiText(title: String) = mediaClient.getCurrentWikiText(title)\n }\n-\n- fun getHtmlOfPage(title: String) = mediaClient.getPageHtml(title);\n-\n- /**\n- * Fetches wikitext from mediaClient\n- */\n- fun getCurrentWikiText(title: String) = mediaClient.getCurrentWikiText(title);\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/Urls.kt b/app/src/main/java/fr/free/nrw/commons/Urls.kt\nindex d2f6f4caab..3eb7ee243d 100644\n--- a/app/src/main/java/fr/free/nrw/commons/Urls.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/Urls.kt\n@@ -10,7 +10,9 @@ internal object Urls {\n const val FAQ_URL = \"https://github.com/commons-app/commons-app-documentation/blob/master/android/Frequently-Asked-Questions.md\"\n const val PLAY_STORE_PREFIX = \"market://details?id=\"\n const val PLAY_STORE_URL_PREFIX = \"https://play.google.com/store/apps/details?id=\"\n- const val TRANSLATE_WIKI_URL = \"https://translatewiki.net/w/i.php?title=Special:Translate&group=commons-android-strings&filter=%21translated&action=translate&language=\"\n+ const val TRANSLATE_WIKI_URL =\n+ \"https://translatewiki.net/w/i.php?title=Special:Translate\" +\n+ \"&group=commons-android-strings&filter=%21translated&action=translate&language=\"\n const val FACEBOOK_WEB_URL = \"https://www.facebook.com/1921335171459985\"\n const val FACEBOOK_APP_URL = \"fb://page/1921335171459985\"\n const val FACEBOOK_PACKAGE_NAME = \"com.facebook.katana\"\ndiff --git a/app/src/main/java/fr/free/nrw/commons/actions/PageEditClient.kt b/app/src/main/java/fr/free/nrw/commons/actions/PageEditClient.kt\nindex 93e833c15d..a3d6de2577 100644\n--- a/app/src/main/java/fr/free/nrw/commons/actions/PageEditClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/actions/PageEditClient.kt\n@@ -1,10 +1,9 @@\n package fr.free.nrw.commons.actions\n \n+import fr.free.nrw.commons.auth.csrf.CsrfTokenClient\n import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException\n import io.reactivex.Observable\n import io.reactivex.Single\n-import fr.free.nrw.commons.auth.csrf.CsrfTokenClient\n-import timber.log.Timber\n \n /**\n * This class acts as a Client to facilitate wiki page editing\n@@ -15,9 +14,8 @@ import timber.log.Timber\n */\n class PageEditClient(\n private val csrfTokenClient: CsrfTokenClient,\n- private val pageEditInterface: PageEditInterface\n+ private val pageEditInterface: PageEditInterface,\n ) {\n-\n /**\n * Replace the content of a wiki page\n * @param pageTitle Title of the page to edit\n@@ -25,12 +23,17 @@ class PageEditClient(\n * @param summary Edit summary\n * @return whether the edit was successful\n */\n- fun edit(pageTitle: String, text: String, summary: String): Observable {\n- return try {\n- pageEditInterface.postEdit(pageTitle, summary, text, csrfTokenClient.getTokenBlocking())\n+ fun edit(\n+ pageTitle: String,\n+ text: String,\n+ summary: String,\n+ ): Observable =\n+ try {\n+ pageEditInterface\n+ .postEdit(pageTitle, summary, text, csrfTokenClient.getTokenBlocking())\n .map { editResponse ->\n- editResponse.edit()!!.editSucceeded()\n- }\n+ editResponse.edit()!!.editSucceeded()\n+ }\n } catch (throwable: Throwable) {\n if (throwable is InvalidLoginTokenException) {\n throw throwable\n@@ -38,7 +41,6 @@ class PageEditClient(\n Observable.just(false)\n }\n }\n- }\n \n /**\n * Creates a new page with the given title, text, and summary.\n@@ -49,20 +51,25 @@ class PageEditClient(\n * @return An observable that emits true if the page creation succeeded, false otherwise.\n * @throws InvalidLoginTokenException If an invalid login token is encountered during the process.\n */\n- fun postCreate(pageTitle: String, text: String, summary: String): Observable {\n- return try {\n- pageEditInterface.postCreate(\n- pageTitle,\n- summary,\n- text,\n- \"text/x-wiki\",\n- \"wikitext\",\n- true,\n- true,\n- csrfTokenClient.getTokenBlocking()\n- ).map { editResponse ->\n- editResponse.edit()!!.editSucceeded()\n- }\n+ fun postCreate(\n+ pageTitle: String,\n+ text: String,\n+ summary: String,\n+ ): Observable =\n+ try {\n+ pageEditInterface\n+ .postCreate(\n+ pageTitle,\n+ summary,\n+ text,\n+ \"text/x-wiki\",\n+ \"wikitext\",\n+ true,\n+ true,\n+ csrfTokenClient.getTokenBlocking(),\n+ ).map { editResponse ->\n+ editResponse.edit()!!.editSucceeded()\n+ }\n } catch (throwable: Throwable) {\n if (throwable is InvalidLoginTokenException) {\n throw throwable\n@@ -70,7 +77,6 @@ class PageEditClient(\n Observable.just(false)\n }\n }\n- }\n \n /**\n * Append text to the end of a wiki page\n@@ -79,9 +85,14 @@ class PageEditClient(\n * @param summary Edit summary\n * @return whether the edit was successful\n */\n- fun appendEdit(pageTitle: String, appendText: String, summary: String): Observable {\n- return try {\n- pageEditInterface.postAppendEdit(pageTitle, summary, appendText, csrfTokenClient.getTokenBlocking())\n+ fun appendEdit(\n+ pageTitle: String,\n+ appendText: String,\n+ summary: String,\n+ ): Observable =\n+ try {\n+ pageEditInterface\n+ .postAppendEdit(pageTitle, summary, appendText, csrfTokenClient.getTokenBlocking())\n .map { editResponse -> editResponse.edit()!!.editSucceeded() }\n } catch (throwable: Throwable) {\n if (throwable is InvalidLoginTokenException) {\n@@ -90,7 +101,6 @@ class PageEditClient(\n Observable.just(false)\n }\n }\n- }\n \n /**\n * Prepend text to the beginning of a wiki page\n@@ -99,9 +109,14 @@ class PageEditClient(\n * @param summary Edit summary\n * @return whether the edit was successful\n */\n- fun prependEdit(pageTitle: String, prependText: String, summary: String): Observable {\n- return try {\n- pageEditInterface.postPrependEdit(pageTitle, summary, prependText, csrfTokenClient.getTokenBlocking())\n+ fun prependEdit(\n+ pageTitle: String,\n+ prependText: String,\n+ summary: String,\n+ ): Observable =\n+ try {\n+ pageEditInterface\n+ .postPrependEdit(pageTitle, summary, prependText, csrfTokenClient.getTokenBlocking())\n .map { editResponse -> editResponse.edit()?.editSucceeded() ?: false }\n } catch (throwable: Throwable) {\n if (throwable is InvalidLoginTokenException) {\n@@ -110,8 +125,6 @@ class PageEditClient(\n Observable.just(false)\n }\n }\n- }\n-\n \n /**\n * Appends a new section to the wiki page\n@@ -121,9 +134,15 @@ class PageEditClient(\n * @param summary Edit summary\n * @return whether the edit was successful\n */\n- fun createNewSection(pageTitle: String, sectionTitle: String, sectionText: String, summary: String): Observable {\n- return try {\n- pageEditInterface.postNewSection(pageTitle, summary, sectionTitle, sectionText, csrfTokenClient.getTokenBlocking())\n+ fun createNewSection(\n+ pageTitle: String,\n+ sectionTitle: String,\n+ sectionText: String,\n+ summary: String,\n+ ): Observable =\n+ try {\n+ pageEditInterface\n+ .postNewSection(pageTitle, summary, sectionTitle, sectionText, csrfTokenClient.getTokenBlocking())\n .map { editResponse -> editResponse.edit()!!.editSucceeded() }\n } catch (throwable: Throwable) {\n if (throwable is InvalidLoginTokenException) {\n@@ -132,8 +151,6 @@ class PageEditClient(\n Observable.just(false)\n }\n }\n- }\n-\n \n /**\n * Set new labels to Wikibase server of commons\n@@ -143,12 +160,21 @@ class PageEditClient(\n * @param value label\n * @return 1 when the edit was successful\n */\n- fun setCaptions(summary: String, title: String,\n- language: String, value: String) : Observable{\n- return try {\n- pageEditInterface.postCaptions(summary, title, language,\n- value, csrfTokenClient.getTokenBlocking()\n- ).map { it.success }\n+ fun setCaptions(\n+ summary: String,\n+ title: String,\n+ language: String,\n+ value: String,\n+ ): Observable =\n+ try {\n+ pageEditInterface\n+ .postCaptions(\n+ summary,\n+ title,\n+ language,\n+ value,\n+ csrfTokenClient.getTokenBlocking(),\n+ ).map { it.success }\n } catch (throwable: Throwable) {\n if (throwable is InvalidLoginTokenException) {\n throw throwable\n@@ -156,16 +182,20 @@ class PageEditClient(\n Observable.just(0)\n }\n }\n- }\n \n /**\n * Get whole WikiText of required file\n * @param title : Name of the file\n * @return Observable\n */\n- fun getCurrentWikiText(title: String): Single {\n- return pageEditInterface.getWikiText(title).map {\n- it.query()?.pages()?.get(0)?.revisions()?.get(0)?.content()\n+ fun getCurrentWikiText(title: String): Single =\n+ pageEditInterface.getWikiText(title).map {\n+ it\n+ .query()\n+ ?.pages()\n+ ?.get(0)\n+ ?.revisions()\n+ ?.get(0)\n+ ?.content()\n }\n- }\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/actions/PageEditInterface.kt b/app/src/main/java/fr/free/nrw/commons/actions/PageEditInterface.kt\nindex 1aa0bbfce3..db43bb6200 100644\n--- a/app/src/main/java/fr/free/nrw/commons/actions/PageEditInterface.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/actions/PageEditInterface.kt\n@@ -3,10 +3,15 @@ package fr.free.nrw.commons.actions\n import fr.free.nrw.commons.wikidata.WikidataConstants.MW_API_PREFIX\n import fr.free.nrw.commons.wikidata.model.Entities\n import fr.free.nrw.commons.wikidata.model.edit.Edit\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n import io.reactivex.Observable\n import io.reactivex.Single\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n-import retrofit2.http.*\n+import retrofit2.http.Field\n+import retrofit2.http.FormUrlEncoded\n+import retrofit2.http.GET\n+import retrofit2.http.Headers\n+import retrofit2.http.POST\n+import retrofit2.http.Query\n \n /**\n * This interface facilitates wiki commons page editing services to the Networking module\n@@ -33,7 +38,7 @@ interface PageEditInterface {\n @Field(\"summary\") summary: String,\n @Field(\"text\") text: String,\n // NOTE: This csrf shold always be sent as the last field of form data\n- @Field(\"token\") token: String\n+ @Field(\"token\") token: String,\n ): Observable\n \n /**\n@@ -60,7 +65,7 @@ interface PageEditInterface {\n @Field(\"minor\") minor: Boolean,\n @Field(\"recreate\") recreate: Boolean,\n // NOTE: This csrf shold always be sent as the last field of form data\n- @Field(\"token\") token: String\n+ @Field(\"token\") token: String,\n ): Observable\n \n /**\n@@ -79,7 +84,7 @@ interface PageEditInterface {\n @Field(\"title\") title: String,\n @Field(\"summary\") summary: String,\n @Field(\"appendtext\") appendText: String,\n- @Field(\"token\") token: String\n+ @Field(\"token\") token: String,\n ): Observable\n \n /**\n@@ -98,7 +103,7 @@ interface PageEditInterface {\n @Field(\"title\") title: String,\n @Field(\"summary\") summary: String,\n @Field(\"prependtext\") prependText: String,\n- @Field(\"token\") token: String\n+ @Field(\"token\") token: String,\n ): Observable\n \n @FormUrlEncoded\n@@ -109,7 +114,7 @@ interface PageEditInterface {\n @Field(\"summary\") summary: String,\n @Field(\"sectiontitle\") sectionTitle: String,\n @Field(\"text\") sectionText: String,\n- @Field(\"token\") token: String\n+ @Field(\"token\") token: String,\n ): Observable\n \n @FormUrlEncoded\n@@ -120,7 +125,7 @@ interface PageEditInterface {\n @Field(\"title\") title: String,\n @Field(\"language\") language: String,\n @Field(\"value\") value: String,\n- @Field(\"token\") token: String\n+ @Field(\"token\") token: String,\n ): Observable\n \n /**\n@@ -130,6 +135,6 @@ interface PageEditInterface {\n */\n @GET(MW_API_PREFIX + \"action=query&prop=revisions&rvprop=content|timestamp&rvlimit=1&converttitles=\")\n fun getWikiText(\n- @Query(\"titles\") title: String\n+ @Query(\"titles\") title: String,\n ): Single\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/actions/ThanksClient.kt b/app/src/main/java/fr/free/nrw/commons/actions/ThanksClient.kt\nindex 06ad63d256..de716db99e 100644\n--- a/app/src/main/java/fr/free/nrw/commons/actions/ThanksClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/actions/ThanksClient.kt\n@@ -1,11 +1,10 @@\n package fr.free.nrw.commons.actions\n \n import fr.free.nrw.commons.CommonsApplication\n-import fr.free.nrw.commons.di.NetworkingModule.NAMED_COMMONS_CSRF\n-import io.reactivex.Observable\n import fr.free.nrw.commons.auth.csrf.CsrfTokenClient\n import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException\n-import fr.free.nrw.commons.auth.login.LoginFailedException\n+import fr.free.nrw.commons.di.NetworkingModule.NAMED_COMMONS_CSRF\n+import io.reactivex.Observable\n import javax.inject.Inject\n import javax.inject.Named\n import javax.inject.Singleton\n@@ -15,34 +14,33 @@ import javax.inject.Singleton\n * Thanks are used by a user to show gratitude to another user for their contributions\n */\n @Singleton\n-class ThanksClient @Inject constructor(\n- @param:Named(NAMED_COMMONS_CSRF) private val csrfTokenClient: CsrfTokenClient,\n- private val service: ThanksInterface\n-) {\n- /**\n- * Thanks a user for a particular revision\n- * @param revisionId The revision ID the user would like to thank someone for\n- * @return if thanks was successfully sent to intended recipient\n- */\n- fun thank(revisionId: Long): Observable {\n- return try {\n- service.thank(\n- revisionId.toString(), // Rev\n- null, // Log\n- csrfTokenClient.getTokenBlocking(), // Token\n- CommonsApplication.getInstance().userAgent // Source\n- ).map {\n- mwThankPostResponse -> mwThankPostResponse.result?.success == 1\n+class ThanksClient\n+ @Inject\n+ constructor(\n+ @param:Named(NAMED_COMMONS_CSRF) private val csrfTokenClient: CsrfTokenClient,\n+ private val service: ThanksInterface,\n+ ) {\n+ /**\n+ * Thanks a user for a particular revision\n+ * @param revisionId The revision ID the user would like to thank someone for\n+ * @return if thanks was successfully sent to intended recipient\n+ */\n+ fun thank(revisionId: Long): Observable =\n+ try {\n+ service\n+ .thank(\n+ revisionId.toString(), // Rev\n+ null, // Log\n+ csrfTokenClient.getTokenBlocking(), // Token\n+ CommonsApplication.getInstance().userAgent, // Source\n+ ).map { mwThankPostResponse ->\n+ mwThankPostResponse.result?.success == 1\n+ }\n+ } catch (throwable: Throwable) {\n+ if (throwable is InvalidLoginTokenException) {\n+ Observable.error(throwable)\n+ } else {\n+ Observable.just(false)\n+ }\n }\n- }\n- catch (throwable: Throwable) {\n- if (throwable is InvalidLoginTokenException) {\n- Observable.error(throwable)\n- }\n- else {\n- Observable.just(false)\n- }\n- }\n }\n-\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/actions/ThanksInterface.kt b/app/src/main/java/fr/free/nrw/commons/actions/ThanksInterface.kt\nindex bc7d224af5..62934d0f2f 100644\n--- a/app/src/main/java/fr/free/nrw/commons/actions/ThanksInterface.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/actions/ThanksInterface.kt\n@@ -19,6 +19,6 @@ interface ThanksInterface {\n @Field(\"rev\") rev: String?,\n @Field(\"log\") log: String?,\n @Field(\"token\") token: String,\n- @Field(\"source\") source: String?\n+ @Field(\"source\") source: String?,\n ): Observable\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/auth/csrf/CsrfTokenClient.kt b/app/src/main/java/fr/free/nrw/commons/auth/csrf/CsrfTokenClient.kt\nindex 88cc6b9530..f35e5f0035 100644\n--- a/app/src/main/java/fr/free/nrw/commons/auth/csrf/CsrfTokenClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/auth/csrf/CsrfTokenClient.kt\n@@ -2,11 +2,11 @@ package fr.free.nrw.commons.auth.csrf\n \n import androidx.annotation.VisibleForTesting\n import fr.free.nrw.commons.auth.SessionManager\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n-import fr.free.nrw.commons.auth.login.LoginClient\n import fr.free.nrw.commons.auth.login.LoginCallback\n+import fr.free.nrw.commons.auth.login.LoginClient\n import fr.free.nrw.commons.auth.login.LoginFailedException\n import fr.free.nrw.commons.auth.login.LoginResult\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n import retrofit2.Call\n import retrofit2.Response\n import timber.log.Timber\n@@ -17,12 +17,11 @@ class CsrfTokenClient(\n private val sessionManager: SessionManager,\n private val csrfTokenInterface: CsrfTokenInterface,\n private val loginClient: LoginClient,\n- private val logoutClient: LogoutClient\n+ private val logoutClient: LogoutClient,\n ) {\n private var retries = 0\n private var csrfTokenCall: Call? = null\n \n-\n @Throws(Throwable::class)\n fun getTokenBlocking(): String {\n var token = \"\"\n@@ -37,11 +36,20 @@ class CsrfTokenClient(\n }\n \n // Get CSRFToken response off the main thread.\n- val response = newSingleThreadExecutor().submit(Callable {\n- csrfTokenInterface.getCsrfTokenCall().execute()\n- }).get()\n-\n- if (response.body()?.query()?.csrfToken().isNullOrEmpty()) {\n+ val response =\n+ newSingleThreadExecutor()\n+ .submit(\n+ Callable {\n+ csrfTokenInterface.getCsrfTokenCall().execute()\n+ },\n+ ).get()\n+\n+ if (response\n+ .body()\n+ ?.query()\n+ ?.csrfToken()\n+ .isNullOrEmpty()\n+ ) {\n continue\n }\n \n@@ -51,9 +59,8 @@ class CsrfTokenClient(\n }\n break\n } catch (e: LoginFailedException) {\n- throw InvalidLoginTokenException(ANONYMOUS_TOKEN_MESSAGE)\n- }\n- catch (t: Throwable) {\n+ throw InvalidLoginTokenException(ANONYMOUS_TOKEN_MESSAGE)\n+ } catch (t: Throwable) {\n Timber.w(t)\n }\n }\n@@ -65,45 +72,65 @@ class CsrfTokenClient(\n }\n \n @VisibleForTesting\n- fun request(service: CsrfTokenInterface, cb: Callback): Call =\n- requestToken(service, object : Callback {\n- override fun success(token: String?) {\n- if (sessionManager.isUserLoggedIn && token == ANON_TOKEN) {\n- retryWithLogin(cb) {\n- InvalidLoginTokenException(ANONYMOUS_TOKEN_MESSAGE)\n+ fun request(\n+ service: CsrfTokenInterface,\n+ cb: Callback,\n+ ): Call =\n+ requestToken(\n+ service,\n+ object : Callback {\n+ override fun success(token: String?) {\n+ if (sessionManager.isUserLoggedIn && token == ANON_TOKEN) {\n+ retryWithLogin(cb) {\n+ InvalidLoginTokenException(ANONYMOUS_TOKEN_MESSAGE)\n+ }\n+ } else {\n+ cb.success(token)\n }\n- } else {\n- cb.success(token)\n }\n- }\n \n- override fun failure(caught: Throwable?) = retryWithLogin(cb) { caught }\n+ override fun failure(caught: Throwable?) = retryWithLogin(cb) { caught }\n \n- override fun twoFactorPrompt() = cb.twoFactorPrompt()\n- })\n+ override fun twoFactorPrompt() = cb.twoFactorPrompt()\n+ },\n+ )\n \n @VisibleForTesting\n- fun requestToken(service: CsrfTokenInterface, cb: Callback): Call {\n+ fun requestToken(\n+ service: CsrfTokenInterface,\n+ cb: Callback,\n+ ): Call {\n val call = service.getCsrfTokenCall()\n- call.enqueue(object : retrofit2.Callback {\n- override fun onResponse(call: Call, response: Response) {\n- if (call.isCanceled) {\n- return\n+ call.enqueue(\n+ object : retrofit2.Callback {\n+ override fun onResponse(\n+ call: Call,\n+ response: Response,\n+ ) {\n+ if (call.isCanceled) {\n+ return\n+ }\n+ cb.success(response.body()!!.query()!!.csrfToken())\n }\n- cb.success(response.body()!!.query()!!.csrfToken())\n- }\n \n- override fun onFailure(call: Call, t: Throwable) {\n- if (call.isCanceled) {\n- return\n+ override fun onFailure(\n+ call: Call,\n+ t: Throwable,\n+ ) {\n+ if (call.isCanceled) {\n+ return\n+ }\n+ cb.failure(t)\n }\n- cb.failure(t)\n- }\n- })\n+ },\n+ )\n return call\n }\n \n- private fun retryWithLogin(callback: Callback, caught: () -> Throwable?) {\n+ private fun retryWithLogin(\n+ callback: Callback,\n+ caught: () -> Throwable?,\n+ ) {\n val userName = sessionManager.userName\n val password = sessionManager.password\n if (retries < MAX_RETRIES && !userName.isNullOrEmpty() && !password.isNullOrEmpty()) {\n@@ -123,26 +150,31 @@ class CsrfTokenClient(\n username: String,\n password: String,\n callback: Callback,\n- retryCallback: () -> Unit\n- ) = loginClient.request(username, password, object : LoginCallback {\n- override fun success(loginResult: LoginResult) {\n- if (loginResult.pass) {\n- sessionManager.updateAccount(loginResult)\n- retryCallback()\n- } else {\n- callback.failure(LoginFailedException(loginResult.message))\n+ retryCallback: () -> Unit,\n+ ) = loginClient.request(\n+ username,\n+ password,\n+ object : LoginCallback {\n+ override fun success(loginResult: LoginResult) {\n+ if (loginResult.pass) {\n+ sessionManager.updateAccount(loginResult)\n+ retryCallback()\n+ } else {\n+ callback.failure(LoginFailedException(loginResult.message))\n+ }\n }\n- }\n \n- override fun twoFactorPrompt(caught: Throwable, token: String?) =\n- callback.twoFactorPrompt()\n+ override fun twoFactorPrompt(\n+ caught: Throwable,\n+ token: String?,\n+ ) = callback.twoFactorPrompt()\n \n- // Should not happen here, but call the callback just in case.\n- override fun passwordResetPrompt(token: String?) =\n- callback.failure(LoginFailedException(\"Logged in with temporary password.\"))\n+ // Should not happen here, but call the callback just in case.\n+ override fun passwordResetPrompt(token: String?) = callback.failure(LoginFailedException(\"Logged in with temporary password.\"))\n \n- override fun error(caught: Throwable) = callback.failure(caught)\n- })\n+ override fun error(caught: Throwable) = callback.failure(caught)\n+ },\n+ )\n \n private fun cancel() {\n loginClient.cancel()\n@@ -154,7 +186,9 @@ class CsrfTokenClient(\n \n interface Callback {\n fun success(token: String?)\n+\n fun failure(caught: Throwable?)\n+\n fun twoFactorPrompt()\n }\n \n@@ -166,5 +200,7 @@ class CsrfTokenClient(\n const val ANONYMOUS_TOKEN_MESSAGE = \"App believes we're logged in, but got anonymous token.\"\n }\n }\n-class InvalidLoginTokenException(message: String) : Exception(message)\n \n+class InvalidLoginTokenException(\n+ message: String,\n+) : Exception(message)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/auth/csrf/LogoutClient.kt b/app/src/main/java/fr/free/nrw/commons/auth/csrf/LogoutClient.kt\nindex eb462beaf4..84481c918d 100644\n--- a/app/src/main/java/fr/free/nrw/commons/auth/csrf/LogoutClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/auth/csrf/LogoutClient.kt\n@@ -3,6 +3,10 @@ package fr.free.nrw.commons.auth.csrf\n import fr.free.nrw.commons.wikidata.cookies.CommonsCookieStorage\n import javax.inject.Inject\n \n-class LogoutClient @Inject constructor(private val store: CommonsCookieStorage) {\n- fun logout() = store.clear()\n-}\n\\ No newline at end of file\n+class LogoutClient\n+ @Inject\n+ constructor(\n+ private val store: CommonsCookieStorage,\n+ ) {\n+ fun logout() = store.clear()\n+ }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginCallback.kt b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginCallback.kt\nindex cfaf90b58d..8092f73ae7 100644\n--- a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginCallback.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginCallback.kt\n@@ -2,7 +2,13 @@ package fr.free.nrw.commons.auth.login\n \n interface LoginCallback {\n fun success(loginResult: LoginResult)\n- fun twoFactorPrompt(caught: Throwable, token: String?)\n+\n+ fun twoFactorPrompt(\n+ caught: Throwable,\n+ token: String?,\n+ )\n+\n fun passwordResetPrompt(token: String?)\n+\n fun error(caught: Throwable)\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginClient.kt b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginClient.kt\nindex 44bb684488..48ca37cf0e 100644\n--- a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginClient.kt\n@@ -4,9 +4,9 @@ import android.text.TextUtils\n import fr.free.nrw.commons.auth.login.LoginResult.OAuthResult\n import fr.free.nrw.commons.auth.login.LoginResult.ResetPasswordResult\n import fr.free.nrw.commons.wikidata.WikidataConstants.WIKIPEDIA_URL\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n import io.reactivex.android.schedulers.AndroidSchedulers\n import io.reactivex.schedulers.Schedulers\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n import retrofit2.Call\n import retrofit2.Callback\n import retrofit2.Response\n@@ -16,7 +16,9 @@ import java.io.IOException\n /**\n * Responsible for making login related requests to the server.\n */\n-class LoginClient(private val loginInterface: LoginInterface) {\n+class LoginClient(\n+ private val loginInterface: LoginInterface,\n+) {\n private var tokenCall: Call? = null\n private var loginCall: Call? = null\n \n@@ -30,80 +32,116 @@ class LoginClient(private val loginInterface: LoginInterface) {\n \n private fun getLoginToken() = loginInterface.getLoginToken()\n \n- fun request(userName: String, password: String, cb: LoginCallback) {\n+ fun request(\n+ userName: String,\n+ password: String,\n+ cb: LoginCallback,\n+ ) {\n cancel()\n \n tokenCall = getLoginToken()\n- tokenCall!!.enqueue(object : Callback {\n- override fun onResponse(call: Call, response: Response) {\n- login(\n- userName, password, null, null, response.body()!!.query()!!.loginToken(),\n- userLanguage, cb\n- )\n- }\n+ tokenCall!!.enqueue(\n+ object : Callback {\n+ override fun onResponse(\n+ call: Call,\n+ response: Response,\n+ ) {\n+ login(\n+ userName,\n+ password,\n+ null,\n+ null,\n+ response.body()!!.query()!!.loginToken(),\n+ userLanguage,\n+ cb,\n+ )\n+ }\n \n- override fun onFailure(call: Call, caught: Throwable) {\n- if (call.isCanceled) {\n- return\n+ override fun onFailure(\n+ call: Call,\n+ caught: Throwable,\n+ ) {\n+ if (call.isCanceled) {\n+ return\n+ }\n+ cb.error(caught)\n }\n- cb.error(caught)\n- }\n- })\n+ },\n+ )\n }\n \n fun login(\n- userName: String, password: String, retypedPassword: String?, twoFactorCode: String?,\n- loginToken: String?, userLanguage: String, cb: LoginCallback\n+ userName: String,\n+ password: String,\n+ retypedPassword: String?,\n+ twoFactorCode: String?,\n+ loginToken: String?,\n+ userLanguage: String,\n+ cb: LoginCallback,\n ) {\n this.userLanguage = userLanguage\n \n- loginCall = if (twoFactorCode.isNullOrEmpty() && retypedPassword.isNullOrEmpty()) {\n- loginInterface.postLogIn(userName, password, loginToken, userLanguage, WIKIPEDIA_URL)\n- } else {\n- loginInterface.postLogIn(\n- userName, password, retypedPassword, twoFactorCode, loginToken, userLanguage, true\n- )\n- }\n+ loginCall =\n+ if (twoFactorCode.isNullOrEmpty() && retypedPassword.isNullOrEmpty()) {\n+ loginInterface.postLogIn(userName, password, loginToken, userLanguage, WIKIPEDIA_URL)\n+ } else {\n+ loginInterface.postLogIn(\n+ userName,\n+ password,\n+ retypedPassword,\n+ twoFactorCode,\n+ loginToken,\n+ userLanguage,\n+ true,\n+ )\n+ }\n+\n+ loginCall!!.enqueue(\n+ object : Callback {\n+ override fun onResponse(\n+ call: Call,\n+ response: Response,\n+ ) {\n+ val loginResult = response.body()?.toLoginResult(password)\n+ if (loginResult != null) {\n+ if (loginResult.pass && !loginResult.userName.isNullOrEmpty()) {\n+ // The server could do some transformations on user names, e.g. on some\n+ // wikis is uppercases the first letter.\n+ getExtendedInfo(loginResult.userName, loginResult, cb)\n+ } else if (\"UI\" == loginResult.status) {\n+ when (loginResult) {\n+ is OAuthResult ->\n+ cb.twoFactorPrompt(\n+ LoginFailedException(loginResult.message),\n+ loginToken,\n+ )\n \n- loginCall!!.enqueue(object : Callback {\n- override fun onResponse(\n- call: Call,\n- response: Response\n- ) {\n- val loginResult = response.body()?.toLoginResult(password)\n- if (loginResult != null) {\n- if (loginResult.pass && !loginResult.userName.isNullOrEmpty()) {\n- // The server could do some transformations on user names, e.g. on some\n- // wikis is uppercases the first letter.\n- getExtendedInfo(loginResult.userName, loginResult, cb)\n- } else if (\"UI\" == loginResult.status) {\n- when (loginResult) {\n- is OAuthResult -> cb.twoFactorPrompt(\n- LoginFailedException(loginResult.message),\n- loginToken\n- )\n-\n- is ResetPasswordResult -> cb.passwordResetPrompt(loginToken)\n-\n- is LoginResult.Result -> cb.error(\n- LoginFailedException(loginResult.message)\n- )\n+ is ResetPasswordResult -> cb.passwordResetPrompt(loginToken)\n+\n+ is LoginResult.Result ->\n+ cb.error(\n+ LoginFailedException(loginResult.message),\n+ )\n+ }\n+ } else {\n+ cb.error(LoginFailedException(loginResult.message))\n }\n } else {\n- cb.error(LoginFailedException(loginResult.message))\n+ cb.error(IOException(\"Login failed. Unexpected response.\"))\n }\n- } else {\n- cb.error(IOException(\"Login failed. Unexpected response.\"))\n }\n- }\n \n- override fun onFailure(call: Call, t: Throwable) {\n- if (call.isCanceled) {\n- return\n+ override fun onFailure(\n+ call: Call,\n+ t: Throwable,\n+ ) {\n+ if (call.isCanceled) {\n+ return\n+ }\n+ cb.error(t)\n }\n- cb.error(t)\n- }\n- })\n+ },\n+ )\n }\n \n fun doLogin(\n@@ -111,43 +149,65 @@ class LoginClient(private val loginInterface: LoginInterface) {\n password: String,\n twoFactorCode: String,\n userLanguage: String,\n- loginCallback: LoginCallback\n+ loginCallback: LoginCallback,\n ) {\n- getLoginToken().enqueue(object :Callback{\n- override fun onResponse(\n- call: Call,\n- response: Response\n- ) = if (response.isSuccessful){\n- val loginToken = response.body()?.query()?.loginToken()\n- loginToken?.let {\n- login(username, password, null, twoFactorCode, it, userLanguage, loginCallback)\n- } ?: run {\n+ getLoginToken().enqueue(\n+ object : Callback {\n+ override fun onResponse(\n+ call: Call,\n+ response: Response,\n+ ) = if (response.isSuccessful) {\n+ val loginToken = response.body()?.query()?.loginToken()\n+ loginToken?.let {\n+ login(username, password, null, twoFactorCode, it, userLanguage, loginCallback)\n+ } ?: run {\n+ loginCallback.error(IOException(\"Failed to retrieve login token\"))\n+ }\n+ } else {\n loginCallback.error(IOException(\"Failed to retrieve login token\"))\n }\n- } else {\n- loginCallback.error(IOException(\"Failed to retrieve login token\"))\n- }\n \n- override fun onFailure(call: Call, t: Throwable) {\n- loginCallback.error(t)\n- }\n- })\n+ override fun onFailure(\n+ call: Call,\n+ t: Throwable,\n+ ) {\n+ loginCallback.error(t)\n+ }\n+ },\n+ )\n }\n+\n @Throws(Throwable::class)\n- fun loginBlocking(userName: String, password: String, twoFactorCode: String?) {\n+ fun loginBlocking(\n+ userName: String,\n+ password: String,\n+ twoFactorCode: String?,\n+ ) {\n val tokenResponse = getLoginToken().execute()\n- if (tokenResponse.body()?.query()?.loginToken().isNullOrEmpty()) {\n+ if (tokenResponse\n+ .body()\n+ ?.query()\n+ ?.loginToken()\n+ .isNullOrEmpty()\n+ ) {\n throw IOException(\"Unexpected response when getting login token.\")\n }\n \n val loginToken = tokenResponse.body()?.query()?.loginToken()\n- val tempLoginCall = if (twoFactorCode.isNullOrEmpty()) {\n- loginInterface.postLogIn(userName, password, loginToken, userLanguage, WIKIPEDIA_URL)\n- } else {\n- loginInterface.postLogIn(\n- userName, password, null, twoFactorCode, loginToken, userLanguage, true\n- )\n- }\n+ val tempLoginCall =\n+ if (twoFactorCode.isNullOrEmpty()) {\n+ loginInterface.postLogIn(userName, password, loginToken, userLanguage, WIKIPEDIA_URL)\n+ } else {\n+ loginInterface.postLogIn(\n+ userName,\n+ password,\n+ null,\n+ twoFactorCode,\n+ loginToken,\n+ userLanguage,\n+ true,\n+ )\n+ }\n \n val response = tempLoginCall.execute()\n val loginResponse = response.body() ?: throw IOException(\"Unexpected response when logging in.\")\n@@ -166,18 +226,23 @@ class LoginClient(private val loginInterface: LoginInterface) {\n }\n }\n \n- private fun getExtendedInfo(userName: String, loginResult: LoginResult, cb: LoginCallback) =\n- loginInterface.getUserInfo(userName)\n- .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())\n- .subscribe({ response: MwQueryResponse? ->\n- loginResult.userId = response?.query()?.userInfo()?.id() ?: 0\n- loginResult.groups =\n- response?.query()?.getUserResponse(userName)?.groups ?: emptySet()\n- cb.success(loginResult)\n- }, { caught: Throwable ->\n- Timber.e(caught, \"Login succeeded but getting group information failed. \")\n- cb.error(caught)\n- })\n+ private fun getExtendedInfo(\n+ userName: String,\n+ loginResult: LoginResult,\n+ cb: LoginCallback,\n+ ) = loginInterface\n+ .getUserInfo(userName)\n+ .subscribeOn(Schedulers.io())\n+ .observeOn(AndroidSchedulers.mainThread())\n+ .subscribe({ response: MwQueryResponse? ->\n+ loginResult.userId = response?.query()?.userInfo()?.id() ?: 0\n+ loginResult.groups =\n+ response?.query()?.getUserResponse(userName)?.groups ?: emptySet()\n+ cb.success(loginResult)\n+ }, { caught: Throwable ->\n+ Timber.e(caught, \"Login succeeded but getting group information failed. \")\n+ cb.error(caught)\n+ })\n \n fun cancel() {\n tokenCall?.let {\ndiff --git a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginFailedException.kt b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginFailedException.kt\nindex 2f60b2071c..fb5ad14c69 100644\n--- a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginFailedException.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginFailedException.kt\n@@ -1,3 +1,5 @@\n package fr.free.nrw.commons.auth.login\n \n-class LoginFailedException(message: String?) : Throwable(message)\n+class LoginFailedException(\n+ message: String?,\n+) : Throwable(message)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginInterface.kt b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginInterface.kt\nindex 0502cf8c7f..07e1cd45cc 100644\n--- a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginInterface.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginInterface.kt\n@@ -1,8 +1,8 @@\n package fr.free.nrw.commons.auth.login\n \n import fr.free.nrw.commons.wikidata.WikidataConstants.MW_API_PREFIX\n-import io.reactivex.Observable\n import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n+import io.reactivex.Observable\n import retrofit2.Call\n import retrofit2.http.Field\n import retrofit2.http.FormUrlEncoded\n@@ -24,7 +24,7 @@ interface LoginInterface {\n @Field(\"password\") pass: String?,\n @Field(\"logintoken\") token: String?,\n @Field(\"uselang\") userLanguage: String?,\n- @Field(\"loginreturnurl\") url: String?\n+ @Field(\"loginreturnurl\") url: String?,\n ): Call\n \n @Headers(\"Cache-Control: no-cache\")\n@@ -37,9 +37,11 @@ interface LoginInterface {\n @Field(\"OATHToken\") twoFactorCode: String?,\n @Field(\"logintoken\") token: String?,\n @Field(\"uselang\") userLanguage: String?,\n- @Field(\"logincontinue\") loginContinue: Boolean\n+ @Field(\"logincontinue\") loginContinue: Boolean,\n ): Call\n \n @GET(MW_API_PREFIX + \"action=query&meta=userinfo&list=users&usprop=groups|cancreate\")\n- fun getUserInfo(@Query(\"ususers\") userName: String): Observable\n-}\n\\ No newline at end of file\n+ fun getUserInfo(\n+ @Query(\"ususers\") userName: String,\n+ ): Observable\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginResponse.kt b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginResponse.kt\nindex 7e3a80c9ee..a96778e380 100644\n--- a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginResponse.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginResponse.kt\n@@ -13,9 +13,7 @@ class LoginResponse {\n @SerializedName(\"clientlogin\")\n private val clientLogin: ClientLogin? = null\n \n- fun toLoginResult(password: String): LoginResult? {\n- return clientLogin?.toLoginResult(password)\n- }\n+ fun toLoginResult(password: String): LoginResult? = clientLogin?.toLoginResult(password)\n }\n \n internal class ClientLogin {\n@@ -39,7 +37,7 @@ internal class ClientLogin {\n }\n }\n } else if (\"PASS\" != status && \"FAIL\" != status) {\n- //TODO: String resource -- Looks like needed for others in this class too\n+ // TODO: String resource -- Looks like needed for others in this class too\n userMessage = \"An unknown error occurred.\"\n }\n return Result(status ?: \"\", userName, password, userMessage)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginResult.kt b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginResult.kt\nindex 69e4a7f895..6a7594ec02 100644\n--- a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginResult.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginResult.kt\n@@ -4,7 +4,7 @@ sealed class LoginResult(\n val status: String,\n val userName: String?,\n val password: String?,\n- val message: String?\n+ val message: String?,\n ) {\n var userId = 0\n var groups = emptySet()\n@@ -14,20 +14,20 @@ sealed class LoginResult(\n status: String,\n userName: String?,\n password: String?,\n- message: String?\n- ): LoginResult(status, userName, password, message)\n+ message: String?,\n+ ) : LoginResult(status, userName, password, message)\n \n class OAuthResult(\n status: String,\n userName: String?,\n password: String?,\n- message: String?\n+ message: String?,\n ) : LoginResult(status, userName, password, message)\n \n class ResetPasswordResult(\n status: String,\n userName: String?,\n password: String?,\n- message: String?\n+ message: String?,\n ) : LoginResult(status, userName, password, message)\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsAdapter.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsAdapter.kt\nindex 64bdf5315e..4233d95087 100644\n--- a/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsAdapter.kt\n@@ -15,25 +15,34 @@ import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n /**\n * Helps to inflate Wikidata Items into Items tab\n */\n-class BookmarkItemsAdapter (val list: List, val context: Context) :\n- RecyclerView.Adapter() {\n-\n- class BookmarkItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {\n-\n+class BookmarkItemsAdapter(\n+ val list: List,\n+ val context: Context,\n+) : RecyclerView.Adapter() {\n+ class BookmarkItemViewHolder(\n+ itemView: View,\n+ ) : RecyclerView.ViewHolder(itemView) {\n var depictsLabel: TextView = itemView.findViewById(R.id.depicts_label)\n var description: TextView = itemView.findViewById(R.id.description)\n var depictsImage: SimpleDraweeView = itemView.findViewById(R.id.depicts_image)\n- var layout : ConstraintLayout = itemView.findViewById(R.id.layout_item)\n+ var layout: ConstraintLayout = itemView.findViewById(R.id.layout_item)\n }\n \n- override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BookmarkItemViewHolder {\n- val v: View = LayoutInflater.from(context)\n- .inflate(R.layout.item_depictions, parent, false)\n+ override fun onCreateViewHolder(\n+ parent: ViewGroup,\n+ viewType: Int,\n+ ): BookmarkItemViewHolder {\n+ val v: View =\n+ LayoutInflater\n+ .from(context)\n+ .inflate(R.layout.item_depictions, parent, false)\n return BookmarkItemViewHolder(v)\n }\n \n- override fun onBindViewHolder(holder: BookmarkItemViewHolder, position: Int) {\n-\n+ override fun onBindViewHolder(\n+ holder: BookmarkItemViewHolder,\n+ position: Int,\n+ ) {\n val depictedItem = list[position]\n holder.depictsLabel.text = depictedItem.name\n holder.description.text = depictedItem.description\n@@ -48,7 +57,5 @@ class BookmarkItemsAdapter (val list: List, val context: Context)\n }\n }\n \n- override fun getItemCount(): Int {\n- return list.size\n- }\n-}\n\\ No newline at end of file\n+ override fun getItemCount(): Int = list.size\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/models/Bookmark.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/models/Bookmark.kt\nindex 541baeb690..a33638e723 100644\n--- a/app/src/main/java/fr/free/nrw/commons/bookmarks/models/Bookmark.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/models/Bookmark.kt\n@@ -2,25 +2,25 @@ package fr.free.nrw.commons.bookmarks.models\n \n import android.net.Uri\n \n-class Bookmark(mediaName: String?, mediaCreator: String?,\n- /**\n- * Modifies the content URI - marking this bookmark as already saved in the database\n- * @param contentUri the content URI\n- */\n- var contentUri: Uri?) {\n+class Bookmark(\n+ mediaName: String?,\n+ mediaCreator: String?,\n /**\n- * Gets the content URI for this bookmark\n+ * Gets or Sets the content URI - marking this bookmark as already saved in the database\n * @return content URI\n+ * @param contentUri the content URI\n */\n+ var contentUri: Uri?,\n+) {\n /**\n * Gets the media name\n * @return the media name\n */\n val mediaName: String = mediaName ?: \"\"\n+\n /**\n * Gets media creator\n * @return creator name\n */\n val mediaCreator: String = mediaCreator ?: \"\"\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignConfig.kt b/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignConfig.kt\nindex dd82e181d3..6bf0bc0ed6 100644\n--- a/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignConfig.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignConfig.kt\n@@ -8,6 +8,7 @@ import com.google.gson.annotations.SerializedName\n class CampaignConfig {\n @SerializedName(\"showOnlyLiveCampaigns\")\n private val showOnlyLiveCampaigns = false\n+\n @SerializedName(\"sortBy\")\n private val sortBy: String? = null\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignResponseDTO.kt b/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignResponseDTO.kt\nindex cb37850556..767732eb78 100644\n--- a/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignResponseDTO.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/campaigns/CampaignResponseDTO.kt\n@@ -9,7 +9,7 @@ import fr.free.nrw.commons.campaigns.models.Campaign\n class CampaignResponseDTO {\n @SerializedName(\"config\")\n val campaignConfig: CampaignConfig? = null\n+\n @SerializedName(\"campaigns\")\n val campaigns: List? = null\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/campaigns/models/Campaign.kt b/app/src/main/java/fr/free/nrw/commons/campaigns/models/Campaign.kt\nindex 006415a136..cd68797e0d 100644\n--- a/app/src/main/java/fr/free/nrw/commons/campaigns/models/Campaign.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/campaigns/models/Campaign.kt\n@@ -3,9 +3,11 @@ package fr.free.nrw.commons.campaigns.models\n /**\n * A data class to hold a campaign\n */\n-data class Campaign(var title: String? = null,\n- var description: String? = null,\n- var startDate: String? = null,\n- var endDate: String? = null,\n- var link: String? = null,\n- var isWLMCampaign: Boolean = false)\n\\ No newline at end of file\n+data class Campaign(\n+ var title: String? = null,\n+ var description: String? = null,\n+ var startDate: String? = null,\n+ var endDate: String? = null,\n+ var link: String? = null,\n+ var isWLMCampaign: Boolean = false,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt\nindex c69789c21c..1cb50b8f3b 100644\n--- a/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt\n@@ -8,275 +8,287 @@ import fr.free.nrw.commons.utils.StringSortingUtils\n import io.reactivex.Observable\n import io.reactivex.functions.Function4\n import timber.log.Timber\n-import java.util.*\n+import java.util.Calendar\n+import java.util.Date\n import javax.inject.Inject\n \n /**\n * The model class for categories in upload\n */\n-class CategoriesModel @Inject constructor(\n- private val categoryClient: CategoryClient,\n- private val categoryDao: CategoryDao,\n- private val gpsCategoryModel: GpsCategoryModel\n-) {\n- private val selectedCategories: MutableList = mutableListOf()\n+class CategoriesModel\n+ @Inject\n+ constructor(\n+ private val categoryClient: CategoryClient,\n+ private val categoryDao: CategoryDao,\n+ private val gpsCategoryModel: GpsCategoryModel,\n+ ) {\n+ private val selectedCategories: MutableList = mutableListOf()\n \n- /**\n- * Existing categories which are selected\n- */\n- private var selectedExistingCategories: MutableList = mutableListOf()\n+ /**\n+ * Existing categories which are selected\n+ */\n+ private var selectedExistingCategories: MutableList = mutableListOf()\n \n- /**\n- * Returns true if an item is considered to be a spammy category which should be ignored\n- *\n- * @param item a category item that needs to be validated to know if it is spammy or not\n- * @return\n- */\n- fun isSpammyCategory(item: String): Boolean {\n- //Check for current and previous year to exclude these categories from removal\n- val now = Calendar.getInstance()\n- val curYear = now[Calendar.YEAR]\n- val curYearInString = curYear.toString()\n- val prevYear = curYear - 1\n- val prevYearInString = prevYear.toString()\n- Timber.d(\"Previous year: %s\", prevYearInString)\n+ /**\n+ * Returns true if an item is considered to be a spammy category which should be ignored\n+ *\n+ * @param item a category item that needs to be validated to know if it is spammy or not\n+ * @return\n+ */\n+ fun isSpammyCategory(item: String): Boolean {\n+ // Check for current and previous year to exclude these categories from removal\n+ val now = Calendar.getInstance()\n+ val curYear = now[Calendar.YEAR]\n+ val curYearInString = curYear.toString()\n+ val prevYear = curYear - 1\n+ val prevYearInString = prevYear.toString()\n+ Timber.d(\"Previous year: %s\", prevYearInString)\n \n- val mentionsDecade = item.matches(\".*0s.*\".toRegex())\n- val recentDecade = item.matches(\".*20[0-2]0s.*\".toRegex())\n- val spammyCategory = item.matches(\"(.*)needing(.*)\".toRegex())\n- || item.matches(\"(.*)taken on(.*)\".toRegex())\n+ val mentionsDecade = item.matches(\".*0s.*\".toRegex())\n+ val recentDecade = item.matches(\".*20[0-2]0s.*\".toRegex())\n+ val spammyCategory =\n+ item.matches(\"(.*)needing(.*)\".toRegex()) ||\n+ item.matches(\"(.*)taken on(.*)\".toRegex())\n \n- // always skip irrelevant categories such as Media_needing_categories_as_of_16_June_2017(Issue #750)\n- if (spammyCategory) {\n- return true\n- }\n+ // always skip irrelevant categories such as Media_needing_categories_as_of_16_June_2017(Issue #750)\n+ if (spammyCategory) {\n+ return true\n+ }\n \n- if (mentionsDecade) {\n- // Check if the year in the form of XX(X)0s is recent/relevant, i.e. in the 2000s or 2010s/2020s as stated in Issue #1029\n- // Example: \"2020s\" is OK, but \"1920s\" is not (and should be skipped)\n- return !recentDecade\n- } else {\n- // If it is not an year in decade form (e.g. 19xxs/20xxs), then check if item contains a 4-digit year\n- // anywhere within the string (.* is wildcard) (Issue #47)\n- // And that item does not equal the current year or previous year\n- return item.matches(\".*(19|20)\\\\d{2}.*\".toRegex())\n- && !item.contains(curYearInString)\n- && !item.contains(prevYearInString)\n+ if (mentionsDecade) {\n+ // Check if the year in the form of XX(X)0s is recent/relevant, i.e. in the 2000s or 2010s/2020s as stated in Issue #1029\n+ // Example: \"2020s\" is OK, but \"1920s\" is not (and should be skipped)\n+ return !recentDecade\n+ } else {\n+ // If it is not an year in decade form (e.g. 19xxs/20xxs), then check if item contains a 4-digit year\n+ // anywhere within the string (.* is wildcard) (Issue #47)\n+ // And that item does not equal the current year or previous year\n+ return item.matches(\".*(19|20)\\\\d{2}.*\".toRegex()) &&\n+ !item.contains(curYearInString) &&\n+ !item.contains(prevYearInString)\n+ }\n }\n- }\n \n- /**\n- * Updates category count in category dao\n- * @param item\n- */\n- fun updateCategoryCount(item: CategoryItem) {\n- var category = categoryDao.find(item.name)\n+ /**\n+ * Updates category count in category dao\n+ * @param item\n+ */\n+ fun updateCategoryCount(item: CategoryItem) {\n+ var category = categoryDao.find(item.name)\n \n- // Newly used category...\n- if (category == null) {\n- category = Category(null, item.name, item.description, item.thumbnail, Date(), 0)\n+ // Newly used category...\n+ if (category == null) {\n+ category = Category(null, item.name, item.description, item.thumbnail, Date(), 0)\n+ }\n+ category.incTimesUsed()\n+ categoryDao.save(category)\n }\n- category.incTimesUsed()\n- categoryDao.save(category)\n- }\n-\n- /**\n- * Regional category search\n- * @param term\n- * @param imageTitleList\n- * @return\n- */\n- fun searchAll(\n- term: String,\n- imageTitleList: List,\n- selectedDepictions: List\n- ): Observable> {\n- return suggestionsOrSearch(term, imageTitleList, selectedDepictions)\n- .map { it.map { CategoryItem(it.name, it.description, it.thumbnail, false) } }\n- }\n-\n- private fun suggestionsOrSearch(\n- term: String,\n- imageTitleList: List,\n- selectedDepictions: List\n- ): Observable> {\n- return if (TextUtils.isEmpty(term))\n- Observable.combineLatest(\n- categoriesFromDepiction(selectedDepictions),\n- gpsCategoryModel.categoriesFromLocation,\n- titleCategories(imageTitleList),\n- Observable.just(categoryDao.recentCategories(SEARCH_CATS_LIMIT)),\n- Function4(::combine)\n- )\n- else\n- categoryClient.searchCategoriesForPrefix(term, SEARCH_CATS_LIMIT)\n- .map { it.sortedWith(StringSortingUtils.sortBySimilarity(term)) }\n- .toObservable()\n- }\n-\n- /**\n- * Fetches details of every category associated with selected depictions, converts them into\n- * CategoryItem and returns them in a list.\n- *\n- * @param selectedDepictions selected DepictItems\n- * @return List of CategoryItem associated with selected depictions\n- */\n- private fun categoriesFromDepiction(selectedDepictions: List):\n- Observable>? {\n- return Observable.fromIterable(\n- selectedDepictions.map { it.commonsCategories }.flatten())\n- .map { categoryItem ->\n- categoryClient.getCategoriesByName(categoryItem.name,\n- categoryItem.name, SEARCH_CATS_LIMIT).map {\n-\n- CategoryItem(it[0].name, it[0].description,\n- it[0].thumbnail, it[0].isSelected)\n \n- }.blockingGet()\n- }.toList().toObservable()\n- }\n+ /**\n+ * Regional category search\n+ * @param term\n+ * @param imageTitleList\n+ * @return\n+ */\n+ fun searchAll(\n+ term: String,\n+ imageTitleList: List,\n+ selectedDepictions: List,\n+ ): Observable> =\n+ suggestionsOrSearch(term, imageTitleList, selectedDepictions)\n+ .map { it.map { CategoryItem(it.name, it.description, it.thumbnail, false) } }\n \n- /**\n- * Fetches details of every category by their name, converts them into\n- * CategoryItem and returns them in a list.\n- *\n- * @param categoryNames selected Categories\n- * @return List of CategoryItem\n- */\n- fun getCategoriesByName(categoryNames: List):\n- Observable>? {\n- return Observable.fromIterable(categoryNames)\n- .map { categoryName ->\n- buildCategories(categoryName)\n- }\n- .filter { categoryItem ->\n- categoryItem.name != \"Hidden\"\n- }\n- .toList().toObservable()\n- }\n-\n- /**\n- * Fetches the categories and converts them into CategoryItem\n- */\n- fun buildCategories(categoryName: String): CategoryItem {\n- return categoryClient.getCategoriesByName(categoryName,\n- categoryName, SEARCH_CATS_LIMIT).map {\n- if(it.isNotEmpty()) {\n- CategoryItem(\n- it[0].name, it[0].description,\n- it[0].thumbnail, it[0].isSelected\n+ private fun suggestionsOrSearch(\n+ term: String,\n+ imageTitleList: List,\n+ selectedDepictions: List,\n+ ): Observable> =\n+ if (TextUtils.isEmpty(term)) {\n+ Observable.combineLatest(\n+ categoriesFromDepiction(selectedDepictions),\n+ gpsCategoryModel.categoriesFromLocation,\n+ titleCategories(imageTitleList),\n+ Observable.just(categoryDao.recentCategories(SEARCH_CATS_LIMIT)),\n+ Function4(::combine),\n )\n } else {\n- CategoryItem(\n- \"Hidden\", \"Hidden\",\n- \"hidden\", false\n- )\n+ categoryClient\n+ .searchCategoriesForPrefix(term, SEARCH_CATS_LIMIT)\n+ .map { it.sortedWith(StringSortingUtils.sortBySimilarity(term)) }\n+ .toObservable()\n }\n- }.blockingGet()\n- }\n-\n- private fun combine(\n- depictionCategories: List,\n- locationCategories: List,\n- titles: List,\n- recents: List\n- ) = depictionCategories + locationCategories + titles + recents\n \n+ /**\n+ * Fetches details of every category associated with selected depictions, converts them into\n+ * CategoryItem and returns them in a list.\n+ *\n+ * @param selectedDepictions selected DepictItems\n+ * @return List of CategoryItem associated with selected depictions\n+ */\n+ private fun categoriesFromDepiction(selectedDepictions: List): Observable>? =\n+ Observable\n+ .fromIterable(\n+ selectedDepictions.map { it.commonsCategories }.flatten(),\n+ ).map { categoryItem ->\n+ categoryClient\n+ .getCategoriesByName(\n+ categoryItem.name,\n+ categoryItem.name,\n+ SEARCH_CATS_LIMIT,\n+ ).map {\n+ CategoryItem(\n+ it[0].name,\n+ it[0].description,\n+ it[0].thumbnail,\n+ it[0].isSelected,\n+ )\n+ }.blockingGet()\n+ }.toList()\n+ .toObservable()\n \n- /**\n- * Returns title based categories\n- * @param titleList\n- * @return\n- */\n- private fun titleCategories(titleList: List) =\n- if (titleList.isNotEmpty())\n- Observable.combineLatest(titleList.map { getTitleCategories(it) }) { searchResults ->\n- searchResults.map { it as List }.flatten()\n- }\n- else\n- Observable.just(emptyList())\n+ /**\n+ * Fetches details of every category by their name, converts them into\n+ * CategoryItem and returns them in a list.\n+ *\n+ * @param categoryNames selected Categories\n+ * @return List of CategoryItem\n+ */\n+ fun getCategoriesByName(categoryNames: List): Observable>? =\n+ Observable\n+ .fromIterable(categoryNames)\n+ .map { categoryName ->\n+ buildCategories(categoryName)\n+ }.filter { categoryItem ->\n+ categoryItem.name != \"Hidden\"\n+ }.toList()\n+ .toObservable()\n \n- /**\n- * Return category for single title\n- * @param title\n- * @return\n- */\n- private fun getTitleCategories(title: String): Observable> {\n- return categoryClient.searchCategories(title, SEARCH_CATS_LIMIT).toObservable()\n- }\n+ /**\n+ * Fetches the categories and converts them into CategoryItem\n+ */\n+ fun buildCategories(categoryName: String): CategoryItem =\n+ categoryClient\n+ .getCategoriesByName(\n+ categoryName,\n+ categoryName,\n+ SEARCH_CATS_LIMIT,\n+ ).map {\n+ if (it.isNotEmpty()) {\n+ CategoryItem(\n+ it[0].name,\n+ it[0].description,\n+ it[0].thumbnail,\n+ it[0].isSelected,\n+ )\n+ } else {\n+ CategoryItem(\n+ \"Hidden\",\n+ \"Hidden\",\n+ \"hidden\",\n+ false,\n+ )\n+ }\n+ }.blockingGet()\n \n+ private fun combine(\n+ depictionCategories: List,\n+ locationCategories: List,\n+ titles: List,\n+ recents: List,\n+ ) = depictionCategories + locationCategories + titles + recents\n \n- /**\n- * Handles category item selection\n- * @param item\n- */\n- fun onCategoryItemClicked(item: CategoryItem, media: Media?) {\n- if (media == null) {\n- if (item.isSelected) {\n- selectedCategories.add(item)\n- updateCategoryCount(item)\n+ /**\n+ * Returns title based categories\n+ * @param titleList\n+ * @return\n+ */\n+ private fun titleCategories(titleList: List) =\n+ if (titleList.isNotEmpty()) {\n+ Observable.combineLatest(titleList.map { getTitleCategories(it) }) { searchResults ->\n+ searchResults.map { it as List }.flatten()\n+ }\n } else {\n- selectedCategories.remove(item)\n+ Observable.just(emptyList())\n }\n- } else {\n- if (item.isSelected) {\n- if (media.categories?.contains(item.name) == true) {\n- selectedExistingCategories.add(item.name)\n- } else {\n+\n+ /**\n+ * Return category for single title\n+ * @param title\n+ * @return\n+ */\n+ private fun getTitleCategories(title: String): Observable> =\n+ categoryClient.searchCategories(title, SEARCH_CATS_LIMIT).toObservable()\n+\n+ /**\n+ * Handles category item selection\n+ * @param item\n+ */\n+ fun onCategoryItemClicked(\n+ item: CategoryItem,\n+ media: Media?,\n+ ) {\n+ if (media == null) {\n+ if (item.isSelected) {\n selectedCategories.add(item)\n updateCategoryCount(item)\n+ } else {\n+ selectedCategories.remove(item)\n }\n } else {\n- if (media.categories?.contains(item.name) == true) {\n- selectedExistingCategories.remove(item.name)\n- if (!media.categories?.contains(item.name)!!) {\n- val categoriesList: MutableList = ArrayList()\n- categoriesList.add(item.name)\n- categoriesList.addAll(media.categories!!)\n- media.categories = categoriesList\n+ if (item.isSelected) {\n+ if (media.categories?.contains(item.name) == true) {\n+ selectedExistingCategories.add(item.name)\n+ } else {\n+ selectedCategories.add(item)\n+ updateCategoryCount(item)\n }\n } else {\n- selectedCategories.remove(item)\n+ if (media.categories?.contains(item.name) == true) {\n+ selectedExistingCategories.remove(item.name)\n+ if (!media.categories?.contains(item.name)!!) {\n+ val categoriesList: MutableList = ArrayList()\n+ categoriesList.add(item.name)\n+ categoriesList.addAll(media.categories!!)\n+ media.categories = categoriesList\n+ }\n+ } else {\n+ selectedCategories.remove(item)\n+ }\n }\n }\n }\n- }\n \n- /**\n- * Get Selected Categories\n- * @return\n- */\n- fun getSelectedCategories(): List {\n- return selectedCategories\n- }\n+ /**\n+ * Get Selected Categories\n+ * @return\n+ */\n+ fun getSelectedCategories(): List = selectedCategories\n \n- /**\n- * Cleanup the existing in memory cache's\n- */\n- fun cleanUp() {\n- selectedCategories.clear()\n- selectedExistingCategories.clear()\n- }\n+ /**\n+ * Cleanup the existing in memory cache's\n+ */\n+ fun cleanUp() {\n+ selectedCategories.clear()\n+ selectedExistingCategories.clear()\n+ }\n \n- companion object {\n- const val SEARCH_CATS_LIMIT = 25\n- }\n+ companion object {\n+ const val SEARCH_CATS_LIMIT = 25\n+ }\n \n- /**\n- * Provides selected existing categories\n- *\n- * @return selected existing categories\n- */\n- fun getSelectedExistingCategories(): List {\n- return selectedExistingCategories\n- }\n+ /**\n+ * Provides selected existing categories\n+ *\n+ * @return selected existing categories\n+ */\n+ fun getSelectedExistingCategories(): List = selectedExistingCategories\n \n- /**\n- * Initialize existing categories\n- *\n- * @param selectedExistingCategories existing categories\n- */\n- fun setSelectedExistingCategories(selectedExistingCategories: MutableList) {\n- this.selectedExistingCategories = selectedExistingCategories\n+ /**\n+ * Initialize existing categories\n+ *\n+ * @param selectedExistingCategories existing categories\n+ */\n+ fun setSelectedExistingCategories(selectedExistingCategories: MutableList) {\n+ this.selectedExistingCategories = selectedExistingCategories\n+ }\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt\nindex 49796b03a7..64463d8263 100644\n--- a/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryClient.kt\n@@ -1,7 +1,7 @@\n package fr.free.nrw.commons.category\n \n-import io.reactivex.Single\n import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n+import io.reactivex.Single\n import javax.inject.Inject\n import javax.inject.Singleton\n \n@@ -15,109 +15,123 @@ const val CATEGORY_NEEDING_CATEGORIES = \"needing categories\"\n * Category Client to handle custom calls to Commons MediaWiki APIs\n */\n @Singleton\n-class CategoryClient @Inject constructor(private val categoryInterface: CategoryInterface) :\n- ContinuationClient() {\n+class CategoryClient\n+ @Inject\n+ constructor(\n+ private val categoryInterface: CategoryInterface,\n+ ) : ContinuationClient() {\n+ /**\n+ * Searches for categories containing the specified string.\n+ *\n+ * @param filter The string to be searched\n+ * @param itemLimit How many results are returned\n+ * @param offset Starts returning items from the nth result. If offset is 9, the response starts with the 9th item of the search result\n+ * @return\n+ */\n+ @JvmOverloads\n+ fun searchCategories(\n+ filter: String?,\n+ itemLimit: Int,\n+ offset: Int = 0,\n+ ): Single> = responseMapper(categoryInterface.searchCategories(filter, itemLimit, offset))\n \n- /**\n- * Searches for categories containing the specified string.\n- *\n- * @param filter The string to be searched\n- * @param itemLimit How many results are returned\n- * @param offset Starts returning items from the nth result. If offset is 9, the response starts with the 9th item of the search result\n- * @return\n- */\n- @JvmOverloads\n- fun searchCategories(filter: String?, itemLimit: Int, offset: Int = 0):\n- Single> {\n- return responseMapper(categoryInterface.searchCategories(filter, itemLimit, offset))\n- }\n+ /**\n+ * Searches for categories starting with the specified string.\n+ *\n+ * @param prefix The prefix to be searched\n+ * @param itemLimit How many results are returned\n+ * @param offset Starts returning items from the nth result. If offset is 9, the response starts with the 9th item of the search result\n+ * @return\n+ */\n+ @JvmOverloads\n+ fun searchCategoriesForPrefix(\n+ prefix: String?,\n+ itemLimit: Int,\n+ offset: Int = 0,\n+ ): Single> =\n+ responseMapper(\n+ categoryInterface.searchCategoriesForPrefix(prefix, itemLimit, offset),\n+ )\n \n- /**\n- * Searches for categories starting with the specified string.\n- *\n- * @param prefix The prefix to be searched\n- * @param itemLimit How many results are returned\n- * @param offset Starts returning items from the nth result. If offset is 9, the response starts with the 9th item of the search result\n- * @return\n- */\n- @JvmOverloads\n- fun searchCategoriesForPrefix(prefix: String?, itemLimit: Int, offset: Int = 0):\n- Single> {\n- return responseMapper(\n- categoryInterface.searchCategoriesForPrefix(prefix, itemLimit, offset)\n- )\n- }\n+ /**\n+ * Fetches categories starting and ending with a specified name.\n+ *\n+ * @param startingCategoryName Name of the category to start\n+ * @param endingCategoryName Name of the category to end\n+ * @param itemLimit How many categories to return\n+ * @param offset offset\n+ * @return MwQueryResponse\n+ */\n+ @JvmOverloads\n+ fun getCategoriesByName(\n+ startingCategoryName: String?,\n+ endingCategoryName: String?,\n+ itemLimit: Int,\n+ offset: Int = 0,\n+ ): Single> =\n+ responseMapper(\n+ categoryInterface.getCategoriesByName(\n+ startingCategoryName,\n+ endingCategoryName,\n+ itemLimit,\n+ offset,\n+ ),\n+ )\n \n- /**\n- * Fetches categories starting and ending with a specified name.\n- *\n- * @param startingCategoryName Name of the category to start\n- * @param endingCategoryName Name of the category to end\n- * @param itemLimit How many categories to return\n- * @param offset offset\n- * @return MwQueryResponse\n- */\n- @JvmOverloads\n- fun getCategoriesByName(startingCategoryName: String?, endingCategoryName: String?,\n- itemLimit: Int, offset: Int = 0): Single> {\n- return responseMapper(\n- categoryInterface.getCategoriesByName(startingCategoryName, endingCategoryName,\n- itemLimit, offset)\n- )\n- }\n+ /**\n+ * The method takes categoryName as input and returns a List of Subcategories\n+ * It uses the generator query API to get the subcategories in a category, 500 at a time.\n+ *\n+ * @param categoryName Category name as defined on commons\n+ * @return Observable emitting the categories returned. If our search yielded \"Category:Test\", \"Test\" is emitted.\n+ */\n+ fun getSubCategoryList(categoryName: String): Single> =\n+ continuationRequest(SUB_CATEGORY_CONTINUATION_PREFIX, categoryName) {\n+ categoryInterface.getSubCategoryList(\n+ categoryName,\n+ it,\n+ )\n+ }\n \n- /**\n- * The method takes categoryName as input and returns a List of Subcategories\n- * It uses the generator query API to get the subcategories in a category, 500 at a time.\n- *\n- * @param categoryName Category name as defined on commons\n- * @return Observable emitting the categories returned. If our search yielded \"Category:Test\", \"Test\" is emitted.\n- */\n- fun getSubCategoryList(categoryName: String): Single> {\n- return continuationRequest(SUB_CATEGORY_CONTINUATION_PREFIX, categoryName) {\n- categoryInterface.getSubCategoryList(\n- categoryName, it\n- )\n- }\n- }\n+ /**\n+ * The method takes categoryName as input and returns a List of parent categories\n+ * It uses the generator query API to get the parent categories of a category, 500 at a time.\n+ *\n+ * @param categoryName Category name as defined on commons\n+ * @return\n+ */\n+ fun getParentCategoryList(categoryName: String): Single> =\n+ continuationRequest(PARENT_CATEGORY_CONTINUATION_PREFIX, categoryName) {\n+ categoryInterface.getParentCategoryList(categoryName, it)\n+ }\n \n- /**\n- * The method takes categoryName as input and returns a List of parent categories\n- * It uses the generator query API to get the parent categories of a category, 500 at a time.\n- *\n- * @param categoryName Category name as defined on commons\n- * @return\n- */\n- fun getParentCategoryList(categoryName: String): Single> {\n- return continuationRequest(PARENT_CATEGORY_CONTINUATION_PREFIX, categoryName) {\n- categoryInterface.getParentCategoryList(categoryName, it)\n+ fun resetSubCategoryContinuation(category: String) {\n+ resetContinuation(SUB_CATEGORY_CONTINUATION_PREFIX, category)\n }\n- }\n-\n- fun resetSubCategoryContinuation(category: String) {\n- resetContinuation(SUB_CATEGORY_CONTINUATION_PREFIX, category)\n- }\n \n- fun resetParentCategoryContinuation(category: String) {\n- resetContinuation(PARENT_CATEGORY_CONTINUATION_PREFIX, category)\n- }\n+ fun resetParentCategoryContinuation(category: String) {\n+ resetContinuation(PARENT_CATEGORY_CONTINUATION_PREFIX, category)\n+ }\n \n- override fun responseMapper(\n- networkResult: Single,\n- key: String?\n- ): Single> {\n- return networkResult\n- .map {\n- handleContinuationResponse(it.continuation(), key)\n- it.query()?.pages() ?: emptyList()\n- }\n- .map {\n- it.filter {\n- page -> page.categoryInfo() == null || !page.categoryInfo().isHidden\n+ override fun responseMapper(\n+ networkResult: Single,\n+ key: String?,\n+ ): Single> =\n+ networkResult\n+ .map {\n+ handleContinuationResponse(it.continuation(), key)\n+ it.query()?.pages() ?: emptyList()\n }.map {\n- CategoryItem(it.title().replace(CATEGORY_PREFIX, \"\"),\n- it.description().toString(), it.thumbUrl().toString(), false)\n+ it\n+ .filter { page ->\n+ page.categoryInfo() == null || !page.categoryInfo().isHidden\n+ }.map {\n+ CategoryItem(\n+ it.title().replace(CATEGORY_PREFIX, \"\"),\n+ it.description().toString(),\n+ it.thumbUrl().toString(),\n+ false,\n+ )\n+ }\n }\n- }\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryInterface.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoryInterface.kt\nindex c3c8ae4c7d..aa5ac8c3ad 100644\n--- a/app/src/main/java/fr/free/nrw/commons/category/CategoryInterface.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryInterface.kt\n@@ -17,11 +17,13 @@ interface CategoryInterface {\n * @param itemLimit How many results are returned\n * @return\n */\n- @GET(\"w/api.php?action=query&format=json&formatversion=2&generator=search&prop=description|pageimages&piprop=thumbnail&pithumbsize=70&gsrnamespace=14\")\n+ @GET(\n+ \"w/api.php?action=query&format=json&formatversion=2&generator=search&prop=description|pageimages&piprop=thumbnail&pithumbsize=70&gsrnamespace=14\",\n+ )\n fun searchCategories(\n @Query(\"gsrsearch\") filter: String?,\n @Query(\"gsrlimit\") itemLimit: Int,\n- @Query(\"gsroffset\") offset: Int\n+ @Query(\"gsroffset\") offset: Int,\n ): Single\n \n /**\n@@ -31,11 +33,13 @@ interface CategoryInterface {\n * @param itemLimit How many results are returned\n * @return\n */\n- @GET(\"w/api.php?action=query&format=json&formatversion=2&generator=allcategories&prop=categoryinfo|description|pageimages&piprop=thumbnail&pithumbsize=70\")\n+ @GET(\n+ \"w/api.php?action=query&format=json&formatversion=2&generator=allcategories&prop=categoryinfo|description|pageimages&piprop=thumbnail&pithumbsize=70\",\n+ )\n fun searchCategoriesForPrefix(\n @Query(\"gacprefix\") prefix: String?,\n @Query(\"gaclimit\") itemLimit: Int,\n- @Query(\"gacoffset\") offset: Int\n+ @Query(\"gacoffset\") offset: Int,\n ): Single\n \n /**\n@@ -47,23 +51,25 @@ interface CategoryInterface {\n * @param offset offset\n * @return MwQueryResponse\n */\n- @GET(\"w/api.php?action=query&format=json&formatversion=2&generator=allcategories&prop=categoryinfo|description|pageimages&piprop=thumbnail&pithumbsize=70\")\n+ @GET(\n+ \"w/api.php?action=query&format=json&formatversion=2&generator=allcategories&prop=categoryinfo|description|pageimages&piprop=thumbnail&pithumbsize=70\",\n+ )\n fun getCategoriesByName(\n @Query(\"gacfrom\") startingCategory: String?,\n @Query(\"gacto\") endingCategory: String?,\n @Query(\"gaclimit\") itemLimit: Int,\n- @Query(\"gacoffset\") offset: Int\n+ @Query(\"gacoffset\") offset: Int,\n ): Single\n \n @GET(\"w/api.php?action=query&format=json&formatversion=2&generator=categorymembers&gcmtype=subcat&prop=info&gcmlimit=50\")\n fun getSubCategoryList(\n @Query(\"gcmtitle\") categoryName: String,\n- @QueryMap(encoded = true) continuation: Map\n+ @QueryMap(encoded = true) continuation: Map,\n ): Single\n \n @GET(\"w/api.php?action=query&format=json&formatversion=2&generator=categories&prop=info&gcllimit=50\")\n fun getParentCategoryList(\n @Query(\"titles\") categoryName: String?,\n- @QueryMap(encoded = true) continuation: Map\n+ @QueryMap(encoded = true) continuation: Map,\n ): Single\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryItem.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoryItem.kt\nindex 027c9b8044..d0ee8d53cd 100644\n--- a/app/src/main/java/fr/free/nrw/commons/category/CategoryItem.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryItem.kt\n@@ -4,12 +4,13 @@ import android.os.Parcelable\n import kotlinx.parcelize.Parcelize\n \n @Parcelize\n-data class CategoryItem(val name: String, val description: String?,\n- val thumbnail: String?, var isSelected: Boolean) : Parcelable {\n-\n- override fun toString(): String {\n- return \"CategoryItem: '$name'\"\n- }\n+data class CategoryItem(\n+ val name: String,\n+ val description: String?,\n+ val thumbnail: String?,\n+ var isSelected: Boolean,\n+) : Parcelable {\n+ override fun toString(): String = \"CategoryItem: '$name'\"\n \n override fun equals(other: Any?): Boolean {\n if (this === other) return true\n@@ -22,7 +23,5 @@ data class CategoryItem(val name: String, val description: String?,\n return true\n }\n \n- override fun hashCode(): Int {\n- return name.hashCode()\n- }\n+ override fun hashCode(): Int = name.hashCode()\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/category/ContinuationClient.kt b/app/src/main/java/fr/free/nrw/commons/category/ContinuationClient.kt\nindex a85eee79d0..0322cd7b6f 100644\n--- a/app/src/main/java/fr/free/nrw/commons/category/ContinuationClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/category/ContinuationClient.kt\n@@ -2,16 +2,16 @@ package fr.free.nrw.commons.category\n \n import io.reactivex.Single\n \n-\n abstract class ContinuationClient {\n private val continuationStore: MutableMap?> = mutableMapOf()\n private val continuationExists: MutableMap = mutableMapOf()\n \n private fun hasMorePagesFor(key: String) = continuationExists[key] ?: true\n+\n fun continuationRequest(\n prefix: String,\n name: String,\n- requestFunction: (Map) -> Single\n+ requestFunction: (Map) -> Single,\n ): Single> {\n val key = \"$prefix$name\"\n return if (hasMorePagesFor(key)) {\n@@ -21,9 +21,15 @@ abstract class ContinuationClient {\n }\n }\n \n- abstract fun responseMapper(networkResult: Single, key: String?=null): Single>\n+ abstract fun responseMapper(\n+ networkResult: Single,\n+ key: String? = null,\n+ ): Single>\n \n- fun handleContinuationResponse(continuation:Map?, key:String?){\n+ fun handleContinuationResponse(\n+ continuation: Map?,\n+ key: String?,\n+ ) {\n if (key != null) {\n continuationExists[key] =\n continuation?.let { continuation ->\n@@ -33,7 +39,10 @@ abstract class ContinuationClient {\n }\n }\n \n- protected fun resetContinuation(prefix: String, category: String) {\n+ protected fun resetContinuation(\n+ prefix: String,\n+ category: String,\n+ ) {\n continuationExists.remove(\"$prefix$category\")\n continuationStore.remove(\"$prefix$category\")\n }\n@@ -44,9 +53,11 @@ abstract class ContinuationClient {\n * @param prefix\n * @param userName the username\n */\n- protected fun resetUserContinuation(prefix: String, userName: String) {\n+ protected fun resetUserContinuation(\n+ prefix: String,\n+ userName: String,\n+ ) {\n continuationExists.remove(\"$prefix$userName\")\n continuationStore.remove(\"$prefix$userName\")\n }\n-\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ChunkInfo.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ChunkInfo.kt\nindex 0ef4066a2d..b611574b0e 100644\n--- a/app/src/main/java/fr/free/nrw/commons/contributions/ChunkInfo.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ChunkInfo.kt\n@@ -7,32 +7,29 @@ import fr.free.nrw.commons.upload.UploadResult\n data class ChunkInfo(\n val uploadResult: UploadResult?,\n val indexOfNextChunkToUpload: Int,\n- val totalChunks: Int\n+ val totalChunks: Int,\n ) : Parcelable {\n constructor(parcel: Parcel) : this(\n parcel.readParcelable(UploadResult::class.java.classLoader),\n parcel.readInt(),\n- parcel.readInt()\n+ parcel.readInt(),\n ) {\n }\n \n- override fun writeToParcel(parcel: Parcel, flags: Int) {\n+ override fun writeToParcel(\n+ parcel: Parcel,\n+ flags: Int,\n+ ) {\n parcel.writeParcelable(uploadResult, flags)\n parcel.writeInt(indexOfNextChunkToUpload)\n parcel.writeInt(totalChunks)\n }\n \n- override fun describeContents(): Int {\n- return 0\n- }\n+ override fun describeContents(): Int = 0\n \n companion object CREATOR : Parcelable.Creator {\n- override fun createFromParcel(parcel: Parcel): ChunkInfo {\n- return ChunkInfo(parcel)\n- }\n+ override fun createFromParcel(parcel: Parcel): ChunkInfo = ChunkInfo(parcel)\n \n- override fun newArray(size: Int): Array {\n- return arrayOfNulls(size)\n- }\n+ override fun newArray(size: Int): Array = arrayOfNulls(size)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt\nindex 81721e9b27..0a757619f0 100644\n--- a/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt\n@@ -5,7 +5,6 @@ import android.os.Parcelable\n import androidx.room.Embedded\n import androidx.room.Entity\n import androidx.room.PrimaryKey\n-import fr.free.nrw.commons.CommonsApplication\n import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.auth.SessionManager\n import fr.free.nrw.commons.upload.UploadItem\n@@ -31,8 +30,7 @@ data class Contribution constructor(\n var errorInfo: String? = null,\n /**\n * @return array list of entityids for the depictions\n- */\n- /**\n+ *\n * Each depiction loaded in depictions activity is associated with a wikidata entity id, this Id\n * is in turn used to upload depictions to wikibase\n */\n@@ -44,26 +42,23 @@ data class Contribution constructor(\n var dateCreatedString: String? = null,\n var dateModified: Date? = null,\n var dateUploadStarted: Date? = null,\n- var hasInvalidLocation : Int = 0,\n+ var hasInvalidLocation: Int = 0,\n var contentUri: Uri? = null,\n- var countryCode : String? = null,\n- var imageSHA1 : String? = null,\n+ var countryCode: String? = null,\n+ var imageSHA1: String? = null,\n /**\n * Number of times a contribution has been retried after a failure\n */\n- var retries: Int = 0\n+ var retries: Int = 0,\n ) : Parcelable {\n-\n- fun completeWith(media: Media): Contribution {\n- return copy(pageId = media.pageId, media = media, state = STATE_COMPLETED)\n- }\n+ fun completeWith(media: Media): Contribution = copy(pageId = media.pageId, media = media, state = STATE_COMPLETED)\n \n constructor(\n item: UploadItem,\n sessionManager: SessionManager,\n depictedItems: List,\n categories: List,\n- imageSHA1: String\n+ imageSHA1: String,\n ) : this(\n Media(\n formatCaptions(item.uploadMediaDetails),\n@@ -71,7 +66,7 @@ data class Contribution constructor(\n item.fileName,\n formatDescriptions(item.uploadMediaDetails),\n sessionManager.userName,\n- sessionManager.userName\n+ sessionManager.userName,\n ),\n localUri = item.mediaUri,\n decimalCoords = item.gpsCoords.decimalCoords,\n@@ -80,7 +75,7 @@ data class Contribution constructor(\n wikidataPlace = from(item.place),\n contentUri = item.contentUri,\n dateCreatedString = item.fileCreatedDateString,\n- imageSHA1 = imageSHA1\n+ imageSHA1 = imageSHA1,\n )\n \n /**\n@@ -91,9 +86,7 @@ data class Contribution constructor(\n this.hasInvalidLocation = if (hasInvalidLocation) 1 else 0\n }\n \n- fun hasInvalidLocation(): Boolean {\n- return hasInvalidLocation == 1\n- }\n+ fun hasInvalidLocation(): Boolean = hasInvalidLocation == 1\n \n companion object {\n const val STATE_COMPLETED = -1\n@@ -107,7 +100,8 @@ data class Contribution constructor(\n * @param uploadMediaDetails list of media Details\n */\n fun formatCaptions(uploadMediaDetails: List) =\n- uploadMediaDetails.associate { it.languageCode!! to it.captionText }\n+ uploadMediaDetails\n+ .associate { it.languageCode!! to it.captionText }\n .filter { it.value.isNotBlank() }\n \n /**\n@@ -117,19 +111,15 @@ data class Contribution constructor(\n * @return a string with the pattern of {{en|1=descriptionText}}\n */\n fun formatDescriptions(descriptions: List) =\n- descriptions.filter { it.descriptionText.isNotEmpty() }\n+ descriptions\n+ .filter { it.descriptionText.isNotEmpty() }\n .joinToString(separator = \"\") { \"{{${it.languageCode}|1=${it.descriptionText}}}\" }\n }\n \n- val fileKey : String? get() = chunkInfo?.uploadResult?.filekey\n+ val fileKey: String? get() = chunkInfo?.uploadResult?.filekey\n val localUriPath: File? get() = localUri?.path?.let { File(it) }\n \n- fun isCompleted(): Boolean {\n- return chunkInfo != null && chunkInfo!!.totalChunks == chunkInfo!!.indexOfNextChunkToUpload\n- }\n-\n- fun dateUploadStartedInMillis(): Long {\n- return dateUploadStarted!!.time\n- }\n+ fun isCompleted(): Boolean = chunkInfo != null && chunkInfo!!.totalChunks == chunkInfo!!.indexOfNextChunkToUpload\n \n+ fun dateUploadStartedInMillis(): Long = dateUploadStarted!!.time\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt\nindex b75332b73a..286abb97aa 100644\n--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt\n@@ -14,88 +14,90 @@ import javax.inject.Named\n * Class that extends PagedList.BoundaryCallback for contributions list It defines the action that\n * is triggered for various boundary conditions in the list\n */\n-class ContributionBoundaryCallback @Inject constructor(\n- private val repository: ContributionsRepository,\n- private val sessionManager: SessionManager,\n- private val mediaClient: MediaClient,\n- @param:Named(CommonsApplicationModule.IO_THREAD) private val ioThreadScheduler: Scheduler\n-) : BoundaryCallback() {\n- private val compositeDisposable: CompositeDisposable = CompositeDisposable()\n- var userName: String? = null\n+class ContributionBoundaryCallback\n+ @Inject\n+ constructor(\n+ private val repository: ContributionsRepository,\n+ private val sessionManager: SessionManager,\n+ private val mediaClient: MediaClient,\n+ @param:Named(CommonsApplicationModule.IO_THREAD) private val ioThreadScheduler: Scheduler,\n+ ) : BoundaryCallback() {\n+ private val compositeDisposable: CompositeDisposable = CompositeDisposable()\n+ var userName: String? = null\n \n-\n- /**\n- * It is triggered when the list has no items User's Contributions are then fetched from the\n- * network\n- */\n- override fun onZeroItemsLoaded() {\n- if (sessionManager.userName != null) {\n- mediaClient.resetUserNameContinuation(sessionManager.userName!!)\n+ /**\n+ * It is triggered when the list has no items User's Contributions are then fetched from the\n+ * network\n+ */\n+ override fun onZeroItemsLoaded() {\n+ if (sessionManager.userName != null) {\n+ mediaClient.resetUserNameContinuation(sessionManager.userName!!)\n+ }\n+ fetchContributions()\n }\n- fetchContributions()\n- }\n-\n- /**\n- * It is triggered when the user scrolls to the top of the list\n- * */\n- override fun onItemAtFrontLoaded(itemAtFront: Contribution) {\n \n- }\n+ /**\n+ * It is triggered when the user scrolls to the top of the list\n+ * */\n+ override fun onItemAtFrontLoaded(itemAtFront: Contribution) {\n+ }\n \n- /**\n- * It is triggered when the user scrolls to the end of the list. User's Contributions are then\n- * fetched from the network\n- */\n- override fun onItemAtEndLoaded(itemAtEnd: Contribution) {\n- fetchContributions()\n- }\n+ /**\n+ * It is triggered when the user scrolls to the end of the list. User's Contributions are then\n+ * fetched from the network\n+ */\n+ override fun onItemAtEndLoaded(itemAtEnd: Contribution) {\n+ fetchContributions()\n+ }\n \n- /**\n- * Fetches contributions using the MediaWiki API\n- */\n- private fun fetchContributions() {\n- if (sessionManager.userName != null) {\n- userName?.let { userName ->\n- mediaClient.getMediaListForUser(userName)\n- .map { mediaList ->\n- mediaList.map { media ->\n- Contribution(media = media, state = Contribution.STATE_COMPLETED)\n- }\n- }\n- .subscribeOn(ioThreadScheduler)\n- .subscribe(::saveContributionsToDB) { error: Throwable ->\n- Timber.e(\n- \"Failed to fetch contributions: %s\",\n- error.message\n+ /**\n+ * Fetches contributions using the MediaWiki API\n+ */\n+ private fun fetchContributions() {\n+ if (sessionManager.userName != null) {\n+ userName\n+ ?.let { userName ->\n+ mediaClient\n+ .getMediaListForUser(userName)\n+ .map { mediaList ->\n+ mediaList.map { media ->\n+ Contribution(media = media, state = Contribution.STATE_COMPLETED)\n+ }\n+ }.subscribeOn(ioThreadScheduler)\n+ .subscribe(::saveContributionsToDB) { error: Throwable ->\n+ Timber.e(\n+ \"Failed to fetch contributions: %s\",\n+ error.message,\n+ )\n+ }\n+ }?.let {\n+ compositeDisposable.add(\n+ it,\n )\n }\n- }?.let {\n- compositeDisposable.add(\n- it\n- )\n+ } else {\n+ compositeDisposable.clear()\n }\n- }else {\n- compositeDisposable.clear()\n }\n- }\n \n- /**\n- * Saves the contributions the the local DB\n- */\n- private fun saveContributionsToDB(contributions: List) {\n- compositeDisposable.add(\n- repository.save(contributions)\n- .subscribeOn(ioThreadScheduler)\n- .subscribe { longs: List? ->\n- repository[\"last_fetch_timestamp\"] = System.currentTimeMillis()\n- }\n- )\n- }\n+ /**\n+ * Saves the contributions the the local DB\n+ */\n+ private fun saveContributionsToDB(contributions: List) {\n+ compositeDisposable.add(\n+ repository\n+ .save(contributions)\n+ .subscribeOn(ioThreadScheduler)\n+ .subscribe { longs: List? ->\n+ repository[\"last_fetch_timestamp\"] = System.currentTimeMillis()\n+ },\n+ )\n+ }\n \n- /**\n- * Clean up\n- */\n- fun dispose() {\n- compositeDisposable.dispose()\n+ /**\n+ * Clean up\n+ */\n+ fun dispose() {\n+ compositeDisposable.dispose()\n+ }\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRemoteDataSource.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRemoteDataSource.kt\nindex 777bb8a21e..346c83b344 100644\n--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRemoteDataSource.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRemoteDataSource.kt\n@@ -12,62 +12,61 @@ import javax.inject.Named\n /**\n * Data-Source which acts as mediator for contributions-data from the API\n */\n-class ContributionsRemoteDataSource @Inject constructor(\n- private val mediaClient: MediaClient,\n- @param:Named(CommonsApplicationModule.IO_THREAD) private val ioThreadScheduler: Scheduler\n-) : ItemKeyedDataSource() {\n- private val compositeDisposable: CompositeDisposable = CompositeDisposable()\n- var userName: String? = null\n+class ContributionsRemoteDataSource\n+ @Inject\n+ constructor(\n+ private val mediaClient: MediaClient,\n+ @param:Named(CommonsApplicationModule.IO_THREAD) private val ioThreadScheduler: Scheduler,\n+ ) : ItemKeyedDataSource() {\n+ private val compositeDisposable: CompositeDisposable = CompositeDisposable()\n+ var userName: String? = null\n \n- override fun loadInitial(\n- params: LoadInitialParams,\n- callback: LoadInitialCallback\n- ) {\n- fetchContributions(callback)\n- }\n-\n- override fun loadAfter(\n- params: LoadParams,\n- callback: LoadCallback\n- ) {\n- fetchContributions(callback)\n- }\n+ override fun loadInitial(\n+ params: LoadInitialParams,\n+ callback: LoadInitialCallback,\n+ ) {\n+ fetchContributions(callback)\n+ }\n \n- override fun loadBefore(\n- params: LoadParams,\n- callback: LoadCallback\n- ) {\n- }\n+ override fun loadAfter(\n+ params: LoadParams,\n+ callback: LoadCallback,\n+ ) {\n+ fetchContributions(callback)\n+ }\n \n- override fun getKey(item: Contribution): Int {\n- return item.pageId.hashCode()\n- }\n+ override fun loadBefore(\n+ params: LoadParams,\n+ callback: LoadCallback,\n+ ) {\n+ }\n \n+ override fun getKey(item: Contribution): Int = item.pageId.hashCode()\n \n- /**\n- * Fetches contributions using the MediaWiki API\n- */\n- private fun fetchContributions(callback: LoadCallback) {\n- compositeDisposable.add(\n- mediaClient.getMediaListForUser(userName!!)\n- .map { mediaList ->\n- mediaList.map {\n- Contribution(media = it, state = Contribution.STATE_COMPLETED)\n- }\n- }\n- .subscribeOn(ioThreadScheduler)\n- .subscribe({\n- callback.onResult(it)\n- }) { error: Throwable ->\n- Timber.e(\n- \"Failed to fetch contributions: %s\",\n- error.message\n- )\n- }\n- )\n- }\n+ /**\n+ * Fetches contributions using the MediaWiki API\n+ */\n+ private fun fetchContributions(callback: LoadCallback) {\n+ compositeDisposable.add(\n+ mediaClient\n+ .getMediaListForUser(userName!!)\n+ .map { mediaList ->\n+ mediaList.map {\n+ Contribution(media = it, state = Contribution.STATE_COMPLETED)\n+ }\n+ }.subscribeOn(ioThreadScheduler)\n+ .subscribe({\n+ callback.onResult(it)\n+ }) { error: Throwable ->\n+ Timber.e(\n+ \"Failed to fetch contributions: %s\",\n+ error.message,\n+ )\n+ },\n+ )\n+ }\n \n- fun dispose() {\n- compositeDisposable.dispose()\n+ fun dispose() {\n+ compositeDisposable.dispose()\n+ }\n }\n-}\n\\ No newline at end of file\ndiff --git a/app/src/main/java/fr/free/nrw/commons/contributions/WikipediaInstructionsDialogFragment.kt b/app/src/main/java/fr/free/nrw/commons/contributions/WikipediaInstructionsDialogFragment.kt\nindex e0f7e7c42e..77e52e1dbe 100644\n--- a/app/src/main/java/fr/free/nrw/commons/contributions/WikipediaInstructionsDialogFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/contributions/WikipediaInstructionsDialogFragment.kt\n@@ -13,26 +13,30 @@ import fr.free.nrw.commons.databinding.DialogAddToWikipediaInstructionsBinding\n * Dialog fragment for displaying instructions for editing wikipedia\n */\n class WikipediaInstructionsDialogFragment : DialogFragment() {\n-\n var callback: Callback? = null\n \n override fun onCreateView(\n inflater: LayoutInflater,\n container: ViewGroup?,\n- savedInstanceState: Bundle?\n- ) = DialogAddToWikipediaInstructionsBinding.inflate(inflater, container, false).apply {\n- val contribution: Contribution? = arguments!!.getParcelable(ARG_CONTRIBUTION)\n- tvWikicode.setText(contribution?.media?.wikiCode)\n- instructionsCancel.setOnClickListener { dismiss() }\n- instructionsConfirm.setOnClickListener {\n- callback?.onConfirmClicked(contribution, checkboxCopyWikicode.isChecked)\n- }\n- }.root\n-\n- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {\n+ savedInstanceState: Bundle?,\n+ ) = DialogAddToWikipediaInstructionsBinding\n+ .inflate(inflater, container, false)\n+ .apply {\n+ val contribution: Contribution? = arguments!!.getParcelable(ARG_CONTRIBUTION)\n+ tvWikicode.setText(contribution?.media?.wikiCode)\n+ instructionsCancel.setOnClickListener { dismiss() }\n+ instructionsConfirm.setOnClickListener {\n+ callback?.onConfirmClicked(contribution, checkboxCopyWikicode.isChecked)\n+ }\n+ }.root\n+\n+ override fun onViewCreated(\n+ view: View,\n+ savedInstanceState: Bundle?,\n+ ) {\n super.onViewCreated(view, savedInstanceState)\n dialog!!.window?.setSoftInputMode(\n- WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN\n+ WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN,\n )\n }\n \n@@ -40,15 +44,19 @@ class WikipediaInstructionsDialogFragment : DialogFragment() {\n * Callback for handling confirm button clicked\n */\n interface Callback {\n- fun onConfirmClicked(contribution: Contribution?, copyWikicode: Boolean)\n+ fun onConfirmClicked(\n+ contribution: Contribution?,\n+ copyWikicode: Boolean,\n+ )\n }\n \n companion object {\n const val ARG_CONTRIBUTION = \"contribution\"\n \n @JvmStatic\n- fun newInstance(contribution: Contribution) = WikipediaInstructionsDialogFragment().apply {\n- arguments = bundleOf(ARG_CONTRIBUTION to contribution)\n- }\n+ fun newInstance(contribution: Contribution) =\n+ WikipediaInstructionsDialogFragment().apply {\n+ arguments = bundleOf(ARG_CONTRIBUTION to contribution)\n+ }\n }\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/database/NotForUploadStatus.kt b/app/src/main/java/fr/free/nrw/commons/customselector/database/NotForUploadStatus.kt\nindex 31d48af97b..b3ef36318d 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/database/NotForUploadStatus.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/database/NotForUploadStatus.kt\n@@ -1,16 +1,16 @@\n package fr.free.nrw.commons.customselector.database\n \n-import androidx.room.*\n+import androidx.room.Entity\n+import androidx.room.PrimaryKey\n \n /**\n * Entity class for Not For Upload status.\n */\n @Entity(tableName = \"images_not_for_upload_table\")\n data class NotForUploadStatus(\n-\n /**\n * Original image sha1.\n */\n @PrimaryKey\n- val imageSHA1 : String\n+ val imageSHA1: String,\n )\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/database/NotForUploadDao.kt b/app/src/main/java/fr/free/nrw/commons/customselector/database/NotForUploadStatusDao.kt\nsimilarity index 70%\nrename from app/src/main/java/fr/free/nrw/commons/customselector/database/NotForUploadDao.kt\nrename to app/src/main/java/fr/free/nrw/commons/customselector/database/NotForUploadStatusDao.kt\nindex d6c9235cef..b75a6e1d4f 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/database/NotForUploadDao.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/database/NotForUploadStatusDao.kt\n@@ -1,18 +1,20 @@\n package fr.free.nrw.commons.customselector.database\n \n-import androidx.room.*\n-\n+import androidx.room.Dao\n+import androidx.room.Delete\n+import androidx.room.Insert\n+import androidx.room.OnConflictStrategy\n+import androidx.room.Query\n \n /**\n * Dao class for Not For Upload\n */\n @Dao\n abstract class NotForUploadStatusDao {\n-\n /**\n * Insert into Not For Upload status.\n */\n- @Insert( onConflict = OnConflictStrategy.REPLACE )\n+ @Insert(onConflict = OnConflictStrategy.REPLACE)\n abstract suspend fun insert(notForUploadStatus: NotForUploadStatus)\n \n /**\n@@ -25,33 +27,27 @@ abstract class NotForUploadStatusDao {\n * Query Not For Upload status with image sha1.\n */\n @Query(\"SELECT * FROM images_not_for_upload_table WHERE imageSHA1 = (:imageSHA1) \")\n- abstract suspend fun getFromImageSHA1(imageSHA1 : String) : NotForUploadStatus?\n+ abstract suspend fun getFromImageSHA1(imageSHA1: String): NotForUploadStatus?\n \n /**\n * Asynchronous image sha1 query.\n */\n- suspend fun getNotForUploadFromImageSHA1(imageSHA1: String):NotForUploadStatus? {\n- return getFromImageSHA1(imageSHA1)\n- }\n+ suspend fun getNotForUploadFromImageSHA1(imageSHA1: String): NotForUploadStatus? = getFromImageSHA1(imageSHA1)\n \n /**\n * Deletion Not For Upload status with image sha1.\n */\n @Query(\"DELETE FROM images_not_for_upload_table WHERE imageSHA1 = (:imageSHA1) \")\n- abstract suspend fun deleteWithImageSHA1(imageSHA1 : String)\n+ abstract suspend fun deleteWithImageSHA1(imageSHA1: String)\n \n /**\n * Asynchronous image sha1 deletion.\n */\n- suspend fun deleteNotForUploadWithImageSHA1(imageSHA1: String) {\n- return deleteWithImageSHA1(imageSHA1)\n- }\n+ suspend fun deleteNotForUploadWithImageSHA1(imageSHA1: String) = deleteWithImageSHA1(imageSHA1)\n \n /**\n * Check whether the imageSHA1 is present in database\n */\n @Query(\"SELECT COUNT() FROM images_not_for_upload_table WHERE imageSHA1 = (:imageSHA1) \")\n- abstract suspend fun find(imageSHA1 : String): Int\n+ abstract suspend fun find(imageSHA1: String): Int\n }\n-\n-\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/database/UploadedStatus.kt b/app/src/main/java/fr/free/nrw/commons/customselector/database/UploadedStatus.kt\nindex 93e4a82437..7f635ed954 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/database/UploadedStatus.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/database/UploadedStatus.kt\n@@ -3,37 +3,32 @@ package fr.free.nrw.commons.customselector.database\n import androidx.room.Entity\n import androidx.room.Index\n import androidx.room.PrimaryKey\n-import java.util.*\n+import java.util.Date\n \n /**\n * Entity class for Uploaded Status.\n */\n @Entity(tableName = \"uploaded_table\", indices = [Index(value = [\"modifiedImageSHA1\"], unique = true)])\n data class UploadedStatus(\n-\n /**\n * Original image sha1.\n */\n @PrimaryKey\n- val imageSHA1 : String,\n-\n+ val imageSHA1: String,\n /**\n * Modified image sha1 (after exif changes).\n */\n- val modifiedImageSHA1 : String,\n-\n+ val modifiedImageSHA1: String,\n /**\n * imageSHA1 query result from API.\n */\n- var imageResult : Boolean,\n-\n+ var imageResult: Boolean,\n /**\n * modifiedImageSHA1 query result from API.\n */\n- var modifiedImageResult : Boolean,\n-\n+ var modifiedImageResult: Boolean,\n /**\n * lastUpdated for data validation.\n */\n- var lastUpdated : Date? = null\n+ var lastUpdated: Date? = null,\n )\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/database/UploadedDao.kt b/app/src/main/java/fr/free/nrw/commons/customselector/database/UploadedStatusDao.kt\nsimilarity index 62%\nrename from app/src/main/java/fr/free/nrw/commons/customselector/database/UploadedDao.kt\nrename to app/src/main/java/fr/free/nrw/commons/customselector/database/UploadedStatusDao.kt\nindex 70454cc9e8..378af5b8db 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/database/UploadedDao.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/database/UploadedStatusDao.kt\n@@ -1,18 +1,22 @@\n package fr.free.nrw.commons.customselector.database\n \n-import androidx.room.*\n-import java.util.*\n+import androidx.room.Dao\n+import androidx.room.Delete\n+import androidx.room.Insert\n+import androidx.room.OnConflictStrategy\n+import androidx.room.Query\n+import androidx.room.Update\n+import java.util.Calendar\n \n /**\n * UploadedStatusDao for Custom Selector.\n */\n @Dao\n abstract class UploadedStatusDao {\n-\n /**\n * Insert into uploaded status.\n */\n- @Insert( onConflict = OnConflictStrategy.REPLACE )\n+ @Insert(onConflict = OnConflictStrategy.REPLACE)\n abstract suspend fun insert(uploadedStatus: UploadedStatus)\n \n /**\n@@ -31,13 +35,13 @@ abstract class UploadedStatusDao {\n * Query uploaded status with image sha1.\n */\n @Query(\"SELECT * FROM uploaded_table WHERE imageSHA1 = (:imageSHA1) \")\n- abstract suspend fun getFromImageSHA1(imageSHA1 : String) : UploadedStatus?\n+ abstract suspend fun getFromImageSHA1(imageSHA1: String): UploadedStatus?\n \n /**\n * Query uploaded status with modified image sha1.\n */\n @Query(\"SELECT * FROM uploaded_table WHERE modifiedImageSHA1 = (:modifiedImageSHA1) \")\n- abstract suspend fun getFromModifiedImageSHA1(modifiedImageSHA1 : String) : UploadedStatus?\n+ abstract suspend fun getFromModifiedImageSHA1(modifiedImageSHA1: String): UploadedStatus?\n \n /**\n * Asynchronous insert into uploaded status table.\n@@ -51,20 +55,24 @@ abstract class UploadedStatusDao {\n * Check whether the imageSHA1 is present in database\n */\n @Query(\"SELECT COUNT() FROM uploaded_table WHERE imageSHA1 = (:imageSHA1) AND imageResult = (:imageResult) \")\n- abstract suspend fun findByImageSHA1(imageSHA1 : String, imageResult: Boolean): Int\n+ abstract suspend fun findByImageSHA1(\n+ imageSHA1: String,\n+ imageResult: Boolean,\n+ ): Int\n \n /**\n * Check whether the modifiedImageSHA1 is present in database\n */\n- @Query(\"SELECT COUNT() FROM uploaded_table WHERE modifiedImageSHA1 = (:modifiedImageSHA1) AND modifiedImageResult = (:modifiedImageResult) \")\n- abstract suspend fun findByModifiedImageSHA1(modifiedImageSHA1 : String,\n- modifiedImageResult: Boolean): Int\n+ @Query(\n+ \"SELECT COUNT() FROM uploaded_table WHERE modifiedImageSHA1 = (:modifiedImageSHA1) AND modifiedImageResult = (:modifiedImageResult) \",\n+ )\n+ abstract suspend fun findByModifiedImageSHA1(\n+ modifiedImageSHA1: String,\n+ modifiedImageResult: Boolean,\n+ ): Int\n \n /**\n * Asynchronous image sha1 query.\n */\n- suspend fun getUploadedFromImageSHA1(imageSHA1: String):UploadedStatus? {\n- return getFromImageSHA1(imageSHA1)\n- }\n-\n-}\n\\ No newline at end of file\n+ suspend fun getUploadedFromImageSHA1(imageSHA1: String): UploadedStatus? = getFromImageSHA1(imageSHA1)\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/helper/CustomSelectorConstants.kt b/app/src/main/java/fr/free/nrw/commons/customselector/helper/CustomSelectorConstants.kt\nindex f28a1c6137..e03b4da3c9 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/helper/CustomSelectorConstants.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/helper/CustomSelectorConstants.kt\n@@ -4,12 +4,10 @@ package fr.free.nrw.commons.customselector.helper\n * Stores constants related to custom image selector\n */\n object CustomSelectorConstants {\n-\n const val BUCKET_ID = \"bucket_id\"\n const val TOTAL_SELECTED_IMAGES = \"total_selected_images\"\n const val PRESENT_POSITION = \"present_position\"\n const val NEW_SELECTED_IMAGES = \"new_selected_images\"\n const val SHOULD_REFRESH = \"should_refresh\"\n const val FULL_SCREEN_MODE_FIRST_LUNCH = \"full_screen_mode_first_launch\"\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/helper/ImageHelper.kt b/app/src/main/java/fr/free/nrw/commons/customselector/helper/ImageHelper.kt\nindex f59d8a844e..5df123ad2c 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/helper/ImageHelper.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/helper/ImageHelper.kt\n@@ -7,7 +7,6 @@ import fr.free.nrw.commons.customselector.model.Image\n * Image Helper object, includes all the static functions and variables required by custom selector.\n */\n object ImageHelper {\n-\n /**\n * Custom selector preference key\n */\n@@ -39,7 +38,10 @@ object ImageHelper {\n /**\n * Filters the images based on the given bucketId (folder)\n */\n- fun filterImages(images: ArrayList, bukketId: Long?): ArrayList {\n+ fun filterImages(\n+ images: ArrayList,\n+ bukketId: Long?,\n+ ): ArrayList {\n if (bukketId == null) return images\n \n val filteredImages = arrayListOf()\n@@ -54,30 +56,37 @@ object ImageHelper {\n /**\n * getIndex: Returns the index of image in given list.\n */\n- fun getIndex(list: ArrayList, image: Image): Int {\n- return list.indexOf(image)\n- }\n+ fun getIndex(\n+ list: ArrayList,\n+ image: Image,\n+ ): Int = list.indexOf(image)\n \n /**\n * getIndex: Returns the index of image in given list.\n */\n- fun getIndexFromId(list: ArrayList, imageId: Long): Int {\n- for(i in list){\n- if(i.id == imageId)\n+ fun getIndexFromId(\n+ list: ArrayList,\n+ imageId: Long,\n+ ): Int {\n+ for (i in list) {\n+ if (i.id == imageId) {\n return list.indexOf(i)\n+ }\n }\n- return 0;\n+ return 0\n }\n \n /**\n * Gets the list of indices from the master list.\n */\n- fun getIndexList(list: ArrayList, masterList: ArrayList): ArrayList {\n-\n- // Can be optimised as masterList is sorted by time.\n+ fun getIndexList(\n+ list: ArrayList,\n+ masterList: ArrayList,\n+ ): ArrayList {\n+ // Can be optimised as masterList is sorted by time.\n \n val indexes = arrayListOf()\n- for(image in list) {\n+ for (image in list) {\n val index = getIndex(masterList, image)\n if (index == -1) {\n continue\n@@ -86,4 +95,4 @@ object ImageHelper {\n }\n return indexes\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListener.kt b/app/src/main/java/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListener.kt\nindex 961d511583..05159c56b8 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListener.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListener.kt\n@@ -2,23 +2,29 @@ package fr.free.nrw.commons.customselector.helper\n \n import android.content.Context\n import android.util.DisplayMetrics\n-import android.view.*\n+import android.view.Display\n+import android.view.GestureDetector\n+import android.view.MotionEvent\n+import android.view.View\n+import android.view.WindowManager\n import kotlin.math.abs\n \n /**\n * Class for detecting swipe gestures\n */\n-open class OnSwipeTouchListener(context: Context?) : View.OnTouchListener {\n-\n+open class OnSwipeTouchListener(\n+ context: Context?,\n+) : View.OnTouchListener {\n private val gestureDetector: GestureDetector\n \n- private val SWIPE_THRESHOLD_HEIGHT = (getScreenResolution(context!!)).second / 3\n- private val SWIPE_THRESHOLD_WIDTH = (getScreenResolution(context!!)).first / 3\n- private val SWIPE_VELOCITY_THRESHOLD = 1000\n+ private val swipeThresholdHeight = (getScreenResolution(context!!)).second / 3\n+ private val swipeThresholdWidth = (getScreenResolution(context!!)).first / 3\n+ private val swipeVelocityThreshold = 1000\n \n- override fun onTouch(view: View?, motionEvent: MotionEvent): Boolean {\n- return gestureDetector.onTouchEvent(motionEvent)\n- }\n+ override fun onTouch(\n+ view: View?,\n+ motionEvent: MotionEvent,\n+ ): Boolean = gestureDetector.onTouchEvent(motionEvent)\n \n fun getScreenResolution(context: Context): Pair {\n val wm: WindowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager\n@@ -31,10 +37,7 @@ open class OnSwipeTouchListener(context: Context?) : View.OnTouchListener {\n }\n \n inner class GestureListener : GestureDetector.SimpleOnGestureListener() {\n-\n- override fun onDown(e: MotionEvent): Boolean {\n- return true\n- }\n+ override fun onDown(e: MotionEvent): Boolean = true\n \n /**\n * Detects the gestures\n@@ -43,14 +46,16 @@ open class OnSwipeTouchListener(context: Context?) : View.OnTouchListener {\n event1: MotionEvent?,\n event2: MotionEvent,\n velocityX: Float,\n- velocityY: Float\n+ velocityY: Float,\n ): Boolean {\n try {\n val diffY: Float = event2.y - (event1?.y ?: event2.y)\n val diffX: Float = event2.x - (event1?.x ?: event2.x)\n if (abs(diffX) > abs(diffY)) {\n- if (abs(diffX) > SWIPE_THRESHOLD_WIDTH && abs(velocityX) >\n- SWIPE_VELOCITY_THRESHOLD) {\n+ if (abs(diffX) > swipeThresholdWidth &&\n+ abs(velocityX) >\n+ swipeVelocityThreshold\n+ ) {\n if (diffX > 0) {\n onSwipeRight()\n } else {\n@@ -58,8 +63,10 @@ open class OnSwipeTouchListener(context: Context?) : View.OnTouchListener {\n }\n }\n } else {\n- if (abs(diffY) > SWIPE_THRESHOLD_HEIGHT && abs(velocityY) >\n- SWIPE_VELOCITY_THRESHOLD) {\n+ if (abs(diffY) > swipeThresholdHeight &&\n+ abs(velocityY) >\n+ swipeVelocityThreshold\n+ ) {\n if (diffY > 0) {\n onSwipeDown()\n } else {\n@@ -100,4 +107,4 @@ open class OnSwipeTouchListener(context: Context?) : View.OnTouchListener {\n init {\n gestureDetector = GestureDetector(context, GestureListener())\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/listeners/FolderClickListener.kt b/app/src/main/java/fr/free/nrw/commons/customselector/listeners/FolderClickListener.kt\nindex bc3bd518dc..be808c3f07 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/listeners/FolderClickListener.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/listeners/FolderClickListener.kt\n@@ -4,12 +4,15 @@ package fr.free.nrw.commons.customselector.listeners\n * Custom Selector Folder Click Listener\n */\n interface FolderClickListener {\n-\n /**\n * onFolderClick\n * @param folderId : folder id of the folder.\n * @param folderName : folder name of the folder.\n * @param lastItemId : last scroll position in the folder.\n */\n- fun onFolderClick(folderId: Long, folderName: String, lastItemId: Long)\n-}\n\\ No newline at end of file\n+ fun onFolderClick(\n+ folderId: Long,\n+ folderName: String,\n+ lastItemId: Long,\n+ )\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/listeners/ImageLoaderListener.kt b/app/src/main/java/fr/free/nrw/commons/customselector/listeners/ImageLoaderListener.kt\nindex 5ba43082d4..78ce46c6e4 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/listeners/ImageLoaderListener.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/listeners/ImageLoaderListener.kt\n@@ -7,7 +7,6 @@ import fr.free.nrw.commons.customselector.model.Image\n * responds to the device image query.\n */\n interface ImageLoaderListener {\n-\n /**\n * On image loaded\n * @param images : queried device images.\n@@ -19,4 +18,4 @@ interface ImageLoaderListener {\n * @param throwable : throwable exception on failure.\n */\n fun onFailed(throwable: Throwable)\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/listeners/ImageSelectListener.kt b/app/src/main/java/fr/free/nrw/commons/customselector/listeners/ImageSelectListener.kt\nindex d6349eb492..24565963b6 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/listeners/ImageSelectListener.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/listeners/ImageSelectListener.kt\n@@ -1,19 +1,20 @@\n package fr.free.nrw.commons.customselector.listeners\n \n-import android.net.Uri\n import fr.free.nrw.commons.customselector.model.Image\n \n /**\n * Custom selector Image select listener\n */\n interface ImageSelectListener {\n-\n /**\n * onSelectedImagesChanged\n * @param selectedImages : new selected images.\n * @param selectedNotForUploadImages : number of selected not for upload images\n */\n- fun onSelectedImagesChanged(selectedImages: ArrayList, selectedNotForUploadImages: Int)\n+ fun onSelectedImagesChanged(\n+ selectedImages: ArrayList,\n+ selectedNotForUploadImages: Int,\n+ )\n \n /**\n * onLongPress\n@@ -22,6 +23,6 @@ interface ImageSelectListener {\n fun onLongPress(\n position: Int,\n images: ArrayList,\n- selectedImages: ArrayList\n+ selectedImages: ArrayList,\n )\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/listeners/PassDataListener.kt b/app/src/main/java/fr/free/nrw/commons/customselector/listeners/PassDataListener.kt\nindex d2110d2085..da526be35e 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/listeners/PassDataListener.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/listeners/PassDataListener.kt\n@@ -6,5 +6,8 @@ import fr.free.nrw.commons.customselector.model.Image\n * Interface to pass data between fragment and activity\n */\n interface PassDataListener {\n- fun passSelectedImages(selectedImages: ArrayList, shouldRefresh: Boolean)\n-}\n\\ No newline at end of file\n+ fun passSelectedImages(\n+ selectedImages: ArrayList,\n+ shouldRefresh: Boolean,\n+ )\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/listeners/RefreshUIListener.kt b/app/src/main/java/fr/free/nrw/commons/customselector/listeners/RefreshUIListener.kt\nindex d271c1d0b3..a6b4f3dce0 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/listeners/RefreshUIListener.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/listeners/RefreshUIListener.kt\n@@ -8,4 +8,4 @@ interface RefreshUIListener {\n * Refreshes the data in adapter\n */\n fun refresh()\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/model/CallbackStatus.kt b/app/src/main/java/fr/free/nrw/commons/customselector/model/CallbackStatus.kt\nindex 5cdcfb9bf7..c47806f16e 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/model/CallbackStatus.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/model/CallbackStatus.kt\n@@ -6,17 +6,17 @@ package fr.free.nrw.commons.customselector.model\n */\n sealed class CallbackStatus {\n /**\n- IDLE : The callback is idle , doing nothing.\n+ IDLE : The callback is idle , doing nothing.\n */\n object IDLE : CallbackStatus()\n \n /**\n- FETCHING : Fetching images.\n+ FETCHING : Fetching images.\n */\n object FETCHING : CallbackStatus()\n \n /**\n- SUCCESS : Success fetching images.\n+ SUCCESS : Success fetching images.\n */\n object SUCCESS : CallbackStatus()\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/model/Folder.kt b/app/src/main/java/fr/free/nrw/commons/customselector/model/Folder.kt\nindex 6857589bdf..ec08f6f73a 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/model/Folder.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/model/Folder.kt\n@@ -5,27 +5,22 @@ package fr.free.nrw.commons.customselector.model\n */\n data class Folder(\n /**\n- bucketId : Unique directory id, eg 540528482\n+ bucketId : Unique directory id, eg 540528482\n */\n var bucketId: Long,\n-\n /**\n- name : bucket/folder name, eg Camera\n+ name : bucket/folder name, eg Camera\n */\n var name: String,\n-\n /**\n- images : folder images, list of all images under this folder.\n+ images : folder images, list of all images under this folder.\n */\n- var images: ArrayList = arrayListOf()\n-\n-\n+ var images: ArrayList = arrayListOf(),\n ) {\n /**\n * Indicates whether some other object is \"equal to\" this one.\n */\n override fun equals(other: Any?): Boolean {\n-\n if (javaClass != other?.javaClass) {\n return false\n }\n@@ -44,4 +39,4 @@ data class Folder(\n \n return true\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/model/Image.kt b/app/src/main/java/fr/free/nrw/commons/customselector/model/Image.kt\nindex 38e7b6b855..a2965fb5df 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/model/Image.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/model/Image.kt\n@@ -9,65 +9,60 @@ import android.os.Parcelable\n */\n data class Image(\n /**\n- id : Unique image id, primary key of image in device, eg 104950\n+ id : Unique image id, primary key of image in device, eg 104950\n */\n var id: Long,\n-\n /**\n- name : Name of the image with extension, eg CommonsLogo.jpeg\n+ name : Name of the image with extension, eg CommonsLogo.jpeg\n */\n var name: String,\n-\n /**\n- uri : Uri of the image, points to image location or name, eg content://media/external/images/camera/10495 (Android 10)\n+ uri : Uri of the image, points to image location or name, eg content://media/external/images/camera/10495 (Android 10)\n */\n var uri: Uri,\n-\n /**\n- path : System path of the image, eg storage/emulated/0/camera/CommonsLogo.jpeg\n+ path : System path of the image, eg storage/emulated/0/camera/CommonsLogo.jpeg\n */\n var path: String,\n-\n /**\n- bucketId : bucketId of folder, eg 540528482\n+ bucketId : bucketId of folder, eg 540528482\n */\n var bucketId: Long = 0,\n-\n /**\n- bucketName : name of folder, eg Camera\n+ bucketName : name of folder, eg Camera\n */\n var bucketName: String = \"\",\n-\n /**\n- sha1 : sha1 of original image.\n+ sha1 : sha1 of original image.\n */\n var sha1: String = \"\",\n-\n /**\n * date: Creation date of the image to show it inside the bubble during bubble scroll.\n */\n- var date: String = \"\"\n-\n+ var date: String = \"\",\n ) : Parcelable {\n-\n /**\n- default parcelable constructor.\n+ default parcelable constructor.\n */\n- constructor(parcel: Parcel):\n- this(parcel.readLong(),\n- parcel.readString()!!,\n- parcel.readParcelable(Uri::class.java.classLoader)!!,\n- parcel.readString()!!,\n- parcel.readLong(),\n- parcel.readString()!!,\n- parcel.readString()!!,\n- parcel.readString()!!\n- )\n+ constructor(parcel: Parcel) :\n+ this(\n+ parcel.readLong(),\n+ parcel.readString()!!,\n+ parcel.readParcelable(Uri::class.java.classLoader)!!,\n+ parcel.readString()!!,\n+ parcel.readLong(),\n+ parcel.readString()!!,\n+ parcel.readString()!!,\n+ parcel.readString()!!,\n+ )\n \n /**\n- Write to parcel method.\n+ Write to parcel method.\n */\n- override fun writeToParcel(parcel: Parcel, flags: Int) {\n+ override fun writeToParcel(\n+ parcel: Parcel,\n+ flags: Int,\n+ ) {\n parcel.writeLong(id)\n parcel.writeString(name)\n parcel.writeParcelable(uri, flags)\n@@ -81,41 +76,38 @@ data class Image(\n /**\n * Describe the kinds of special objects contained in this Parcelable\n */\n- override fun describeContents(): Int {\n- return 0\n- }\n+ override fun describeContents(): Int = 0\n \n /**\n * Indicates whether some other object is \"equal to\" this one.\n */\n override fun equals(other: Any?): Boolean {\n-\n- if(javaClass != other?.javaClass) {\n+ if (javaClass != other?.javaClass) {\n return false\n }\n \n other as Image\n \n- if(id != other.id) {\n- return false;\n+ if (id != other.id) {\n+ return false\n }\n- if(name != other.name) {\n- return false;\n+ if (name != other.name) {\n+ return false\n }\n- if(uri != other.uri) {\n- return false;\n+ if (uri != other.uri) {\n+ return false\n }\n- if(path != other.path) {\n- return false;\n+ if (path != other.path) {\n+ return false\n }\n- if(bucketId != other.bucketId) {\n- return false;\n+ if (bucketId != other.bucketId) {\n+ return false\n }\n- if(bucketName != other.bucketName) {\n- return false;\n+ if (bucketName != other.bucketName) {\n+ return false\n }\n- if(sha1 != other.sha1) {\n- return false;\n+ if (sha1 != other.sha1) {\n+ return false\n }\n \n return true\n@@ -125,12 +117,8 @@ data class Image(\n * Parcelable companion object\n */\n companion object CREATOR : Parcelable.Creator {\n- override fun createFromParcel(parcel: Parcel): Image {\n- return Image(parcel)\n- }\n+ override fun createFromParcel(parcel: Parcel): Image = Image(parcel)\n \n- override fun newArray(size: Int): Array {\n- return arrayOfNulls(size)\n- }\n+ override fun newArray(size: Int): Array = arrayOfNulls(size)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/model/Result.kt b/app/src/main/java/fr/free/nrw/commons/customselector/model/Result.kt\nindex 11ed8ef006..5cccccae6a 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/model/Result.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/model/Result.kt\n@@ -7,10 +7,9 @@ data class Result(\n /**\n * CallbackStatus : stores the result status\n */\n- val status:CallbackStatus,\n-\n+ val status: CallbackStatus,\n /**\n * Images : images retrieved\n */\n- val images: ArrayList) {\n-}\n\\ No newline at end of file\n+ val images: ArrayList,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/FolderAdapter.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/FolderAdapter.kt\nindex abebc89444..87f68a3e13 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/FolderAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/FolderAdapter.kt\n@@ -21,14 +21,11 @@ class FolderAdapter(\n * Application context.\n */\n context: Context,\n-\n /**\n * Folder Click listener for click events.\n */\n- private val itemClickListener: FolderClickListener\n-\n+ private val itemClickListener: FolderClickListener,\n ) : RecyclerViewAdapter(context) {\n-\n /**\n * List of folders.\n */\n@@ -37,7 +34,10 @@ class FolderAdapter(\n /**\n * Create view holder, returns View holder item.\n */\n- override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FolderViewHolder {\n+ override fun onCreateViewHolder(\n+ parent: ViewGroup,\n+ viewType: Int,\n+ ): FolderViewHolder {\n val itemView = inflater.inflate(R.layout.item_custom_selector_folder, parent, false)\n return FolderViewHolder(itemView)\n }\n@@ -45,28 +45,31 @@ class FolderAdapter(\n /**\n * Bind view holder, setup the item view, title, count and click listener\n */\n- override fun onBindViewHolder(holder: FolderViewHolder, position: Int) {\n+ override fun onBindViewHolder(\n+ holder: FolderViewHolder,\n+ position: Int,\n+ ) {\n val folder = folders[position]\n val toBeRemoved = ArrayList()\n \n- for(image in folder.images) {\n+ for (image in folder.images) {\n // Remove all the top images that do not exist anymore\n- if(context.contentResolver.getType(image.uri) == null){\n+ if (context.contentResolver.getType(image.uri) == null) {\n // File not found\n toBeRemoved.add(image)\n } else {\n break\n }\n }\n- holder.image.setImageDrawable (null)\n+ holder.image.setImageDrawable(null)\n folder.images.removeAll(toBeRemoved)\n val count = folder.images.size\n \n- if(count == 0 && folders.size > 0) {\n+ if (count == 0 && folders.size > 0) {\n // Folder is empty, remove folder from the adapter.\n- holder.itemView.post{\n+ holder.itemView.post {\n val updatePosition = folders.indexOf(folder)\n- if(updatePosition != -1) {\n+ if (updatePosition != -1) {\n folders.removeAt(updatePosition)\n notifyItemRemoved(updatePosition)\n notifyItemRangeChanged(updatePosition, folders.size)\n@@ -89,9 +92,10 @@ class FolderAdapter(\n fun init(newFolders: List) {\n val oldFolderList: MutableList = folders\n val newFolderList = newFolders.toMutableList()\n- val diffResult = DiffUtil.calculateDiff(\n- FoldersDiffCallback(oldFolderList, newFolderList)\n- )\n+ val diffResult =\n+ DiffUtil.calculateDiff(\n+ FoldersDiffCallback(oldFolderList, newFolderList),\n+ )\n folders = newFolderList\n diffResult.dispatchUpdatesTo(this)\n }\n@@ -99,15 +103,14 @@ class FolderAdapter(\n /**\n * returns item count.\n */\n- override fun getItemCount(): Int {\n- return folders.size\n- }\n+ override fun getItemCount(): Int = folders.size\n \n /**\n * Folder view holder.\n */\n- class FolderViewHolder(itemView:View) : RecyclerView.ViewHolder(itemView) {\n-\n+ class FolderViewHolder(\n+ itemView: View,\n+ ) : RecyclerView.ViewHolder(itemView) {\n /**\n * Folder thumbnail image view.\n */\n@@ -129,37 +132,33 @@ class FolderAdapter(\n */\n class FoldersDiffCallback(\n var oldFolders: MutableList,\n- var newFolders: MutableList\n+ var newFolders: MutableList,\n ) : DiffUtil.Callback() {\n /**\n * Returns the size of the old list.\n */\n- override fun getOldListSize(): Int {\n- return oldFolders.size\n- }\n+ override fun getOldListSize(): Int = oldFolders.size\n \n /**\n * Returns the size of the new list.\n */\n- override fun getNewListSize(): Int {\n- return newFolders.size\n- }\n+ override fun getNewListSize(): Int = newFolders.size\n \n /**\n * Called by the DiffUtil to decide whether two object represent the same Item.\n */\n- override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {\n- return oldFolders.get(oldItemPosition).bucketId == newFolders.get(newItemPosition).bucketId\n- }\n+ override fun areItemsTheSame(\n+ oldItemPosition: Int,\n+ newItemPosition: Int,\n+ ): Boolean = oldFolders.get(oldItemPosition).bucketId == newFolders.get(newItemPosition).bucketId\n \n /**\n * Called by the DiffUtil when it wants to check whether two items have the same data.\n * DiffUtil uses this information to detect if the contents of an item has changed.\n */\n- override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {\n- return oldFolders.get(oldItemPosition).equals(newFolders.get(newItemPosition))\n- }\n-\n+ override fun areContentsTheSame(\n+ oldItemPosition: Int,\n+ newItemPosition: Int,\n+ ): Boolean = oldFolders.get(oldItemPosition).equals(newFolders.get(newItemPosition))\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt\nindex 58f4c83850..74b937f970 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt\n@@ -5,7 +5,6 @@ import android.content.SharedPreferences\n import android.view.View\n import android.view.ViewGroup\n import android.widget.ImageView\n-import android.widget.TextView\n import android.widget.Toast\n import androidx.constraintlayout.widget.Group\n import androidx.recyclerview.widget.DiffUtil\n@@ -20,8 +19,13 @@ import fr.free.nrw.commons.customselector.helper.ImageHelper.SHOW_ALREADY_ACTION\n import fr.free.nrw.commons.customselector.listeners.ImageSelectListener\n import fr.free.nrw.commons.customselector.model.Image\n import fr.free.nrw.commons.customselector.ui.selector.ImageLoader\n-import kotlinx.coroutines.*\n-import java.util.*\n+import kotlinx.coroutines.CoroutineDispatcher\n+import kotlinx.coroutines.CoroutineScope\n+import kotlinx.coroutines.Dispatchers\n+import kotlinx.coroutines.MainScope\n+import kotlinx.coroutines.cancel\n+import kotlinx.coroutines.launch\n+import java.util.TreeMap\n import kotlin.collections.ArrayList\n \n /**\n@@ -32,20 +36,16 @@ class ImageAdapter(\n * Application Context.\n */\n context: Context,\n-\n /**\n * Image select listener for click events on image.\n */\n private var imageSelectListener: ImageSelectListener,\n-\n /**\n * ImageLoader queries images.\n */\n- private var imageLoader: ImageLoader\n-):\n-\n- RecyclerViewAdapter(context), FastScrollRecyclerView.SectionedAdapter {\n-\n+ private var imageLoader: ImageLoader,\n+) : RecyclerViewAdapter(context),\n+ FastScrollRecyclerView.SectionedAdapter {\n /**\n * ImageSelectedOrUpdated payload class.\n */\n@@ -106,14 +106,17 @@ class ImageAdapter(\n /**\n * Coroutine Dispatchers and Scope.\n */\n- private var defaultDispatcher : CoroutineDispatcher = Dispatchers.Default\n- private var ioDispatcher : CoroutineDispatcher = Dispatchers.IO\n- private val scope : CoroutineScope = MainScope()\n+ private var defaultDispatcher: CoroutineDispatcher = Dispatchers.Default\n+ private var ioDispatcher: CoroutineDispatcher = Dispatchers.IO\n+ private val scope: CoroutineScope = MainScope()\n \n /**\n * Create View holder.\n */\n- override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ImageViewHolder {\n+ override fun onCreateViewHolder(\n+ parent: ViewGroup,\n+ viewType: Int,\n+ ): ImageViewHolder {\n val itemView = inflater.inflate(R.layout.item_custom_selector_image, parent, false)\n return ImageViewHolder(itemView)\n }\n@@ -121,10 +124,15 @@ class ImageAdapter(\n /**\n * Bind View holder, load image, selected view, click listeners.\n */\n- override fun onBindViewHolder(holder: ImageViewHolder, position: Int) {\n- if(images.size == 0) { return }\n- var image=images[position]\n- holder.image.setImageDrawable (null)\n+ override fun onBindViewHolder(\n+ holder: ImageViewHolder,\n+ position: Int,\n+ ) {\n+ if (images.size == 0) {\n+ return\n+ }\n+ var image = images[position]\n+ holder.image.setImageDrawable(null)\n if (context.contentResolver.getType(image.uri) == null) {\n // Image does not exist anymore, update adapter.\n holder.itemView.post {\n@@ -140,18 +148,19 @@ class ImageAdapter(\n sharedPreferences.getBoolean(SHOW_ALREADY_ACTIONED_IMAGES_PREFERENCE_KEY, true)\n \n // Getting selected index when switch is on\n- val selectedIndex: Int = if (showAlreadyActionedImages) {\n- ImageHelper.getIndex(selectedImages, image)\n+ val selectedIndex: Int =\n+ if (showAlreadyActionedImages) {\n+ ImageHelper.getIndex(selectedImages, image)\n \n- // Getting selected index when switch is off\n- } else if (actionableImagesMap.size > position) {\n- ImageHelper\n- .getIndex(selectedImages, ArrayList(actionableImagesMap.values)[position])\n+ // Getting selected index when switch is off\n+ } else if (actionableImagesMap.size > position) {\n+ ImageHelper\n+ .getIndex(selectedImages, ArrayList(actionableImagesMap.values)[position])\n \n- // For any other case return -1\n- } else {\n- -1\n- }\n+ // For any other case return -1\n+ } else {\n+ -1\n+ }\n \n val isSelected = selectedIndex != -1\n if (isSelected) {\n@@ -160,7 +169,11 @@ class ImageAdapter(\n holder.itemUnselected()\n }\n imageLoader.queryAndSetView(\n- holder, image, ioDispatcher, defaultDispatcher ,uploadingContributionList\n+ holder,\n+ image,\n+ ioDispatcher,\n+ defaultDispatcher,\n+ uploadingContributionList,\n )\n scope.launch {\n val sharedPreferences: SharedPreferences =\n@@ -173,22 +186,28 @@ class ImageAdapter(\n if (!alreadyAddedPositions.contains(position)) {\n processThumbnailForActionedImage(holder, position, uploadingContributionList)\n \n- // If the position is already visited, that means the image is already present\n- // inside map, so it will fetch the image from the map and load in the holder\n+ // If the position is already visited, that means the image is already present\n+ // inside map, so it will fetch the image from the map and load in the holder\n } else {\n val actionableImages: List = ArrayList(actionableImagesMap.values)\n- if(actionableImages.size > position) {\n+ if (actionableImages.size > position) {\n image = actionableImages[position]\n- Glide.with(holder.image).load(image.uri)\n- .thumbnail(0.3f).into(holder.image)\n+ Glide\n+ .with(holder.image)\n+ .load(image.uri)\n+ .thumbnail(0.3f)\n+ .into(holder.image)\n }\n }\n \n- // If switch is turned off, it just fetches the image from all images without any\n- // further operations\n+ // If switch is turned off, it just fetches the image from all images without any\n+ // further operations\n } else {\n- Glide.with(holder.image).load(image.uri)\n- .thumbnail(0.3f).into(holder.image)\n+ Glide\n+ .with(holder.image)\n+ .load(image.uri)\n+ .thumbnail(0.3f)\n+ .into(holder.image)\n }\n }\n \n@@ -210,12 +229,16 @@ class ImageAdapter(\n suspend fun processThumbnailForActionedImage(\n holder: ImageViewHolder,\n position: Int,\n- uploadingContributionList: List\n+ uploadingContributionList: List,\n ) {\n- val next = imageLoader.nextActionableImage(\n- allImages, ioDispatcher, defaultDispatcher,\n- nextImagePosition, uploadingContributionList\n- )\n+ val next =\n+ imageLoader.nextActionableImage(\n+ allImages,\n+ ioDispatcher,\n+ defaultDispatcher,\n+ nextImagePosition,\n+ uploadingContributionList,\n+ )\n \n // If next actionable image is found, saves it, as the the search for\n // finding next actionable image will start from this position\n@@ -229,8 +252,11 @@ class ImageAdapter(\n actionableImagesMap[next] = allImages[next]\n alreadyAddedPositions.add(imagePositionAsPerIncreasingOrder)\n imagePositionAsPerIncreasingOrder++\n- Glide.with(holder.image).load(allImages[next].uri)\n- .thumbnail(0.3f).into(holder.image)\n+ Glide\n+ .with(holder.image)\n+ .load(allImages[next].uri)\n+ .thumbnail(0.3f)\n+ .into(holder.image)\n notifyItemInserted(position)\n notifyItemRangeChanged(position, itemCount + 1)\n }\n@@ -248,7 +274,7 @@ class ImageAdapter(\n */\n private fun onThumbnailClicked(\n position: Int,\n- holder: ImageViewHolder\n+ holder: ImageViewHolder,\n ) {\n val sharedPreferences: SharedPreferences =\n context.getSharedPreferences(CUSTOM_SELECTOR_PREFERENCE_KEY, 0)\n@@ -269,7 +295,10 @@ class ImageAdapter(\n /**\n * Handle click event on an image, update counter on images.\n */\n- private fun selectOrRemoveImage(holder: ImageViewHolder, position: Int){\n+ private fun selectOrRemoveImage(\n+ holder: ImageViewHolder,\n+ position: Int,\n+ ) {\n val sharedPreferences: SharedPreferences =\n context.getSharedPreferences(CUSTOM_SELECTOR_PREFERENCE_KEY, 0)\n val showAlreadyActionedImages =\n@@ -277,14 +306,15 @@ class ImageAdapter(\n \n // Getting clicked index from all images index when show_already_actioned_images\n // switch is on\n- val clickedIndex: Int = if(showAlreadyActionedImages) {\n- ImageHelper.getIndex(selectedImages, images[position])\n+ val clickedIndex: Int =\n+ if (showAlreadyActionedImages) {\n+ ImageHelper.getIndex(selectedImages, images[position])\n \n- // Getting clicked index from actionable images when show_already_actioned_images\n- // switch is off\n- } else {\n- ImageHelper.getIndex(selectedImages, ArrayList(actionableImagesMap.values)[position])\n- }\n+ // Getting clicked index from actionable images when show_already_actioned_images\n+ // switch is off\n+ } else {\n+ ImageHelper.getIndex(selectedImages, ArrayList(actionableImagesMap.values)[position])\n+ }\n \n if (clickedIndex != -1) {\n selectedImages.removeAt(clickedIndex)\n@@ -294,13 +324,14 @@ class ImageAdapter(\n notifyItemChanged(position, ImageUnselected())\n \n // Getting index from all images index when switch is on\n- val indexes = if (showAlreadyActionedImages) {\n- ImageHelper.getIndexList(selectedImages, images)\n+ val indexes =\n+ if (showAlreadyActionedImages) {\n+ ImageHelper.getIndexList(selectedImages, images)\n \n- // Getting index from actionable images when switch is off\n- } else {\n- ImageHelper.getIndexList(selectedImages, ArrayList(actionableImagesMap.values))\n- }\n+ // Getting index from actionable images when switch is off\n+ } else {\n+ ImageHelper.getIndexList(selectedImages, ArrayList(actionableImagesMap.values))\n+ }\n for (index in indexes) {\n notifyItemChanged(index, ImageSelectedOrUpdated())\n }\n@@ -313,15 +344,16 @@ class ImageAdapter(\n }\n \n // Getting index from all images index when switch is on\n- val indexes: ArrayList = if (showAlreadyActionedImages) {\n- selectedImages.add(images[position])\n- ImageHelper.getIndexList(selectedImages, images)\n+ val indexes: ArrayList =\n+ if (showAlreadyActionedImages) {\n+ selectedImages.add(images[position])\n+ ImageHelper.getIndexList(selectedImages, images)\n \n- // Getting index from actionable images when switch is off\n- } else {\n- selectedImages.add(ArrayList(actionableImagesMap.values)[position])\n- ImageHelper.getIndexList(selectedImages, ArrayList(actionableImagesMap.values))\n- }\n+ // Getting index from actionable images when switch is off\n+ } else {\n+ selectedImages.add(ArrayList(actionableImagesMap.values)[position])\n+ ImageHelper.getIndexList(selectedImages, ArrayList(actionableImagesMap.values))\n+ }\n \n for (index in indexes) {\n notifyItemChanged(index, ImageSelectedOrUpdated())\n@@ -334,10 +366,15 @@ class ImageAdapter(\n /**\n * Initialize the data set.\n */\n- fun init(newImages: List, fixedImages: List, emptyMap: TreeMap, uploadedImages: List = ArrayList()) {\n+ fun init(\n+ newImages: List,\n+ fixedImages: List,\n+ emptyMap: TreeMap,\n+ uploadedImages: List = ArrayList(),\n+ ) {\n allImages = fixedImages\n- val oldImageList:ArrayList = images\n- val newImageList:ArrayList = ArrayList(newImages)\n+ val oldImageList: ArrayList = images\n+ val newImageList: ArrayList = ArrayList(newImages)\n actionableImagesMap = emptyMap\n alreadyAddedPositions = ArrayList()\n uploadingContributionList = uploadedImages\n@@ -345,9 +382,10 @@ class ImageAdapter(\n reachedEndOfFolder = false\n selectedImages = ArrayList()\n imagePositionAsPerIncreasingOrder = 0\n- val diffResult = DiffUtil.calculateDiff(\n- ImagesDiffCallback(oldImageList, newImageList)\n- )\n+ val diffResult =\n+ DiffUtil.calculateDiff(\n+ ImagesDiffCallback(oldImageList, newImageList),\n+ )\n images = newImageList\n diffResult.dispatchUpdatesTo(this)\n }\n@@ -355,31 +393,35 @@ class ImageAdapter(\n /**\n * Set new selected images\n */\n- fun setSelectedImages(newSelectedImages: ArrayList){\n+ fun setSelectedImages(newSelectedImages: ArrayList) {\n selectedImages = ArrayList(newSelectedImages)\n imageSelectListener.onSelectedImagesChanged(selectedImages, 0)\n }\n+\n /**\n * Refresh the data in the adapter\n */\n- fun refresh(newImages: List, fixedImages: List, uploadingImages: List = ArrayList()) {\n+ fun refresh(\n+ newImages: List,\n+ fixedImages: List,\n+ uploadingImages: List = ArrayList(),\n+ ) {\n numberOfSelectedImagesMarkedAsNotForUpload = 0\n images.clear()\n selectedImages = arrayListOf()\n- init(newImages, fixedImages, TreeMap(),uploadingImages)\n+ init(newImages, fixedImages, TreeMap(), uploadingImages)\n notifyDataSetChanged()\n }\n \n /**\n * Clear selected images and empty the list.\n */\n- fun clearSelectedImages(){\n+ fun clearSelectedImages() {\n numberOfSelectedImagesMarkedAsNotForUpload = 0\n selectedImages.clear()\n selectedImages = arrayListOf()\n }\n \n-\n /**\n * Remove image from actionable images map.\n */\n@@ -389,7 +431,7 @@ class ImageAdapter(\n val showAlreadyActionedImages =\n sharedPreferences.getBoolean(SHOW_ALREADY_ACTIONED_IMAGES_PREFERENCE_KEY, true)\n \n- if(showAlreadyActionedImages) {\n+ if (showAlreadyActionedImages) {\n refresh(allImages, allImages, uploadingContributionList)\n } else {\n val iterator = actionableImagesMap.entries.iterator()\n@@ -402,16 +444,14 @@ class ImageAdapter(\n iterator.remove()\n alreadyAddedPositions.removeAt(alreadyAddedPositions.size - 1)\n notifyItemRemoved(index)\n- notifyItemRangeChanged(index, itemCount )\n+ notifyItemRangeChanged(index, itemCount)\n break\n }\n index++\n }\n }\n-\n }\n \n-\n /**\n * Returns the total number of items in the data set held by the adapter.\n *\n@@ -424,24 +464,22 @@ class ImageAdapter(\n sharedPreferences.getBoolean(SHOW_ALREADY_ACTIONED_IMAGES_PREFERENCE_KEY, true)\n \n // While switch is on initializes the holder with all images size\n- return if(showAlreadyActionedImages) {\n+ return if (showAlreadyActionedImages) {\n allImages.size\n \n- // While switch is off and searching for next actionable has ended, initializes the holder\n- // with size of all actionable images\n+ // While switch is off and searching for next actionable has ended, initializes the holder\n+ // with size of all actionable images\n } else if (actionableImagesMap.size == allImages.size || reachedEndOfFolder) {\n actionableImagesMap.size\n \n- // While switch is off, initializes the holder with and extra view holder so that finding\n- // and addition of the next actionable image in the adapter can be continued\n+ // While switch is off, initializes the holder with and extra view holder so that finding\n+ // and addition of the next actionable image in the adapter can be continued\n } else {\n actionableImagesMap.size + 1\n }\n }\n \n- fun getImageIdAt(position: Int): Long {\n- return images.get(position).id\n- }\n+ fun getImageIdAt(position: Int): Long = images.get(position).id\n \n /**\n * CleanUp function.\n@@ -453,7 +491,9 @@ class ImageAdapter(\n /**\n * Image view holder.\n */\n- class ImageViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {\n+ class ImageViewHolder(\n+ itemView: View,\n+ ) : RecyclerView.ViewHolder(itemView) {\n val image: ImageView = itemView.findViewById(R.id.image_thumbnail)\n private val uploadedGroup: Group = itemView.findViewById(R.id.uploaded_group)\n private val uploadingGroup: Group = itemView.findViewById(R.id.uploading_group)\n@@ -495,16 +535,12 @@ class ImageAdapter(\n notForUploadGroup.visibility = View.VISIBLE\n }\n \n- fun isItemUploaded():Boolean {\n- return uploadedGroup.visibility == View.VISIBLE\n- }\n+ fun isItemUploaded(): Boolean = uploadedGroup.visibility == View.VISIBLE\n \n /**\n * Item is not for upload\n */\n- fun isItemNotForUpload():Boolean {\n- return notForUploadGroup.visibility == View.VISIBLE\n- }\n+ fun isItemNotForUpload(): Boolean = notForUploadGroup.visibility == View.VISIBLE\n \n /**\n * Item is not uploading\n@@ -533,45 +569,38 @@ class ImageAdapter(\n */\n class ImagesDiffCallback(\n var oldImageList: ArrayList,\n- var newImageList: ArrayList\n- ) : DiffUtil.Callback(){\n-\n+ var newImageList: ArrayList,\n+ ) : DiffUtil.Callback() {\n /**\n * Returns the size of the old list.\n */\n- override fun getOldListSize(): Int {\n- return oldImageList.size\n- }\n+ override fun getOldListSize(): Int = oldImageList.size\n \n /**\n * Returns the size of the new list.\n */\n- override fun getNewListSize(): Int {\n- return newImageList.size\n- }\n+ override fun getNewListSize(): Int = newImageList.size\n \n /**\n * Called by the DiffUtil to decide whether two object represent the same Item.\n */\n- override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {\n- return newImageList[newItemPosition].id == oldImageList[oldItemPosition].id\n- }\n+ override fun areItemsTheSame(\n+ oldItemPosition: Int,\n+ newItemPosition: Int,\n+ ): Boolean = newImageList[newItemPosition].id == oldImageList[oldItemPosition].id\n \n /**\n * Called by the DiffUtil when it wants to check whether two items have the same data.\n * DiffUtil uses this information to detect if the contents of an item has changed.\n */\n- override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {\n- return oldImageList[oldItemPosition].equals(newImageList[newItemPosition])\n- }\n-\n+ override fun areContentsTheSame(\n+ oldItemPosition: Int,\n+ newItemPosition: Int,\n+ ): Boolean = oldImageList[oldItemPosition].equals(newImageList[newItemPosition])\n }\n \n /**\n * Returns the text for showing inside the bubble during bubble scroll.\n */\n- override fun getSectionName(position: Int): String {\n- return images[position].date\n- }\n-\n+ override fun getSectionName(position: Int): String = images[position].date\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/RecyclerViewAdapter.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/RecyclerViewAdapter.kt\nindex 75f9353028..3318d58906 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/RecyclerViewAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/RecyclerViewAdapter.kt\n@@ -7,6 +7,8 @@ import androidx.recyclerview.widget.RecyclerView\n /**\n * Generic Recycler view adapter.\n */\n-abstract class RecyclerViewAdapter(val context: Context): RecyclerView.Adapter() {\n+abstract class RecyclerViewAdapter(\n+ val context: Context,\n+) : RecyclerView.Adapter() {\n val inflater: LayoutInflater = LayoutInflater.from(context)\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt\nindex bcb7446d8e..d39b69f29c 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt\n@@ -8,23 +8,16 @@ import android.content.SharedPreferences\n import android.content.pm.PackageManager\n import android.os.Build\n import android.os.Bundle\n-import android.util.Log\n import android.view.View\n import android.view.Window\n import android.widget.Button\n import android.widget.ImageButton\n import android.widget.TextView\n import androidx.compose.foundation.BorderStroke\n-import androidx.compose.foundation.background\n-import androidx.compose.foundation.clickable\n-import androidx.compose.foundation.layout.Arrangement\n-import androidx.compose.foundation.layout.Box\n import androidx.compose.foundation.layout.Row\n import androidx.compose.foundation.layout.fillMaxWidth\n-import androidx.compose.foundation.layout.height\n import androidx.compose.foundation.layout.padding\n import androidx.compose.foundation.shape.RoundedCornerShape\n-import androidx.compose.material3.Button\n import androidx.compose.material3.ButtonDefaults\n import androidx.compose.material3.CardDefaults\n import androidx.compose.material3.MaterialTheme\n@@ -38,7 +31,6 @@ import androidx.compose.runtime.mutableStateOf\n import androidx.compose.runtime.setValue\n import androidx.compose.ui.Alignment\n import androidx.compose.ui.Modifier\n-import androidx.compose.ui.draw.clip\n import androidx.compose.ui.res.colorResource\n import androidx.compose.ui.tooling.preview.Preview\n import androidx.compose.ui.unit.dp\n@@ -57,23 +49,27 @@ import fr.free.nrw.commons.databinding.ActivityCustomSelectorBinding\n import fr.free.nrw.commons.databinding.CustomSelectorBottomLayoutBinding\n import fr.free.nrw.commons.databinding.CustomSelectorToolbarBinding\n import fr.free.nrw.commons.filepicker.Constants\n-import fr.free.nrw.commons.filepicker.FilePicker\n import fr.free.nrw.commons.media.ZoomableActivity\n import fr.free.nrw.commons.theme.BaseActivity\n import fr.free.nrw.commons.upload.FileUtilsWrapper\n import fr.free.nrw.commons.utils.CustomSelectorUtils\n-import fr.free.nrw.commons.utils.PermissionUtils\n-import kotlinx.coroutines.*\n+import kotlinx.coroutines.CoroutineDispatcher\n+import kotlinx.coroutines.CoroutineScope\n+import kotlinx.coroutines.Dispatchers\n+import kotlinx.coroutines.MainScope\n+import kotlinx.coroutines.launch\n+import kotlinx.coroutines.withContext\n import java.io.File\n import java.lang.Integer.max\n import javax.inject.Inject\n \n-\n /**\n * Custom Selector Activity.\n */\n-class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectListener {\n-\n+class CustomSelectorActivity :\n+ BaseActivity(),\n+ FolderClickListener,\n+ ImageSelectListener {\n /**\n * ViewBindings\n */\n@@ -147,7 +143,7 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n */\n var imageFragment: ImageFragment? = null\n \n- private var progressDialogText:String=\"\"\n+ private var progressDialogText: String = \"\"\n \n private var showPartialAccessIndicator by mutableStateOf(false)\n \n@@ -158,7 +154,8 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n super.onCreate(savedInstanceState)\n if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE &&\n ContextCompat.checkSelfPermission(\n- this, Manifest.permission.READ_MEDIA_IMAGES\n+ this,\n+ Manifest.permission.READ_MEDIA_IMAGES,\n ) == PackageManager.PERMISSION_DENIED\n ) {\n showPartialAccessIndicator = true\n@@ -168,25 +165,27 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n toolbarBinding = CustomSelectorToolbarBinding.bind(binding.root)\n bottomSheetBinding = CustomSelectorBottomLayoutBinding.bind(binding.root)\n binding.partialAccessIndicator.setContent {\n- PartialStorageAccessIndicator(\n+ partialStorageAccessIndicator(\n isVisible = showPartialAccessIndicator,\n onManage = {\n- if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {\n requestPermissions(arrayOf(Manifest.permission.READ_MEDIA_IMAGES), 1)\n }\n },\n- modifier = Modifier\n- .padding(vertical = 8.dp, horizontal = 4.dp)\n- .fillMaxWidth()\n+ modifier =\n+ Modifier\n+ .padding(vertical = 8.dp, horizontal = 4.dp)\n+ .fillMaxWidth(),\n )\n }\n val view = binding.root\n setContentView(view)\n \n prefs = applicationContext.getSharedPreferences(\"CustomSelector\", MODE_PRIVATE)\n- viewModel = ViewModelProvider(this, customSelectorViewModelFactory).get(\n- CustomSelectorViewModel::class.java\n- )\n+ viewModel =\n+ ViewModelProvider(this, customSelectorViewModelFactory).get(\n+ CustomSelectorViewModel::class.java,\n+ )\n \n setupViews()\n \n@@ -208,11 +207,11 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n override fun onRequestPermissionsResult(\n requestCode: Int,\n permissions: Array,\n- grantResults: IntArray\n+ grantResults: IntArray,\n ) {\n super.onRequestPermissionsResult(requestCode, permissions, grantResults)\n- if(requestCode == 1 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {\n- if(grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {\n+ if (requestCode == 1 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {\n+ if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {\n showPartialAccessIndicator = false\n }\n }\n@@ -226,7 +225,11 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n /**\n * When data will be send from full screen mode, it will be passed to fragment\n */\n- override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {\n+ override fun onActivityResult(\n+ requestCode: Int,\n+ resultCode: Int,\n+ data: Intent?,\n+ ) {\n super.onActivityResult(requestCode, resultCode, data)\n if (requestCode == Constants.RequestCodes.RECEIVE_DATA_FROM_FULL_SCREEN_MODE &&\n resultCode == Activity.RESULT_OK\n@@ -254,7 +257,8 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n * Set up view, default folder view.\n */\n private fun setupViews() {\n- supportFragmentManager.beginTransaction()\n+ supportFragmentManager\n+ .beginTransaction()\n .replace(R.id.fragment_container, FolderFragment.newInstance())\n .commit()\n setUpToolbar()\n@@ -322,12 +326,13 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n \n var allImagesAlreadyNotForUpload = true\n images.forEach { image ->\n- val imageSHA1 = CustomSelectorUtils.getImageSHA1(\n- image.uri,\n- ioDispatcher,\n- fileUtilsWrapper,\n- contentResolver\n- )\n+ val imageSHA1 =\n+ CustomSelectorUtils.getImageSHA1(\n+ image.uri,\n+ ioDispatcher,\n+ fileUtilsWrapper,\n+ contentResolver,\n+ )\n val exists = notForUploadStatusDao.find(imageSHA1)\n if (exists < 1) {\n allImagesAlreadyNotForUpload = false\n@@ -337,12 +342,13 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n if (!allImagesAlreadyNotForUpload) {\n // Insert or delete images as necessary, but the UI updates should be posted back to the main thread\n images.forEach { image ->\n- val imageSHA1 = CustomSelectorUtils.getImageSHA1(\n- image.uri,\n- ioDispatcher,\n- fileUtilsWrapper,\n- contentResolver\n- )\n+ val imageSHA1 =\n+ CustomSelectorUtils.getImageSHA1(\n+ image.uri,\n+ ioDispatcher,\n+ fileUtilsWrapper,\n+ contentResolver,\n+ )\n notForUploadStatusDao.insert(NotForUploadStatus(imageSHA1))\n }\n withContext(Dispatchers.Main) {\n@@ -353,12 +359,13 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n }\n } else {\n images.forEach { image ->\n- val imageSHA1 = CustomSelectorUtils.getImageSHA1(\n- image.uri,\n- ioDispatcher,\n- fileUtilsWrapper,\n- contentResolver\n- )\n+ val imageSHA1 =\n+ CustomSelectorUtils.getImageSHA1(\n+ image.uri,\n+ ioDispatcher,\n+ fileUtilsWrapper,\n+ contentResolver,\n+ )\n notForUploadStatusDao.deleteNotForUploadWithImageSHA1(imageSHA1)\n }\n \n@@ -386,13 +393,19 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n /**\n * Change the title of the toolbar.\n */\n- private fun changeTitle(title: String, selectedImageCount:Int) {\n- if (title.isNotEmpty()){\n+ private fun changeTitle(\n+ title: String,\n+ selectedImageCount: Int,\n+ ) {\n+ if (title.isNotEmpty()) {\n val titleText = findViewById(R.id.title)\n var titleWithAppendedImageCount = title\n if (selectedImageCount > 0) {\n- titleWithAppendedImageCount += \" (${resources.getQuantityString(R.plurals.custom_picker_images_selected_title_appendix, \n- selectedImageCount, selectedImageCount)})\"\n+ titleWithAppendedImageCount += \" (${resources.getQuantityString(\n+ R.plurals.custom_picker_images_selected_title_appendix,\n+ selectedImageCount,\n+ selectedImageCount,\n+ )})\"\n }\n if (titleText != null) {\n titleText.text = titleWithAppendedImageCount\n@@ -415,8 +428,13 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n /**\n * override on folder click, change the toolbar title on folder click.\n */\n- override fun onFolderClick(folderId: Long, folderName: String, lastItemId: Long) {\n- supportFragmentManager.beginTransaction()\n+ override fun onFolderClick(\n+ folderId: Long,\n+ folderName: String,\n+ lastItemId: Long,\n+ ) {\n+ supportFragmentManager\n+ .beginTransaction()\n .add(R.id.fragment_container, ImageFragment.newInstance(folderId, lastItemId))\n .addToBackStack(null)\n .commit()\n@@ -433,18 +451,21 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n */\n override fun onSelectedImagesChanged(\n selectedImages: ArrayList,\n- selectedNotForUploadImages: Int\n+ selectedNotForUploadImages: Int,\n ) {\n viewModel.selectedImages.value = selectedImages\n changeTitle(bucketName, selectedImages.size)\n \n uploadLimitExceeded = selectedImages.size > uploadLimit\n- uploadLimitExceededBy = max(selectedImages.size - uploadLimit,0)\n+ uploadLimitExceededBy = max(selectedImages.size - uploadLimit, 0)\n \n if (uploadLimitExceeded && selectedNotForUploadImages == 0) {\n toolbarBinding.imageLimitError.visibility = View.VISIBLE\n- bottomSheetBinding.upload.text = resources.getString(\n- R.string.custom_selector_button_limit_text, uploadLimit)\n+ bottomSheetBinding.upload.text =\n+ resources.getString(\n+ R.string.custom_selector_button_limit_text,\n+ uploadLimit,\n+ )\n } else {\n toolbarBinding.imageLimitError.visibility = View.INVISIBLE\n bottomSheetBinding.upload.text = resources.getString(R.string.upload)\n@@ -461,11 +482,11 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n bottomSheetBinding.notForUpload.text =\n when (selectedImages.size == selectedNotForUploadImages) {\n true -> {\n- progressDialogText=getString(R.string.unmarking_as_not_for_upload)\n+ progressDialogText = getString(R.string.unmarking_as_not_for_upload)\n getString(R.string.unmark_as_not_for_upload)\n }\n else -> {\n- progressDialogText=getString(R.string.marking_as_not_for_upload)\n+ progressDialogText = getString(R.string.marking_as_not_for_upload)\n getString(R.string.mark_as_not_for_upload)\n }\n }\n@@ -481,13 +502,13 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n override fun onLongPress(\n position: Int,\n images: ArrayList,\n- selectedImages: ArrayList\n+ selectedImages: ArrayList,\n ) {\n val intent = Intent(this, ZoomableActivity::class.java)\n intent.putExtra(CustomSelectorConstants.PRESENT_POSITION, position)\n intent.putParcelableArrayListExtra(\n CustomSelectorConstants.TOTAL_SELECTED_IMAGES,\n- selectedImages\n+ selectedImages,\n )\n intent.putExtra(CustomSelectorConstants.BUCKET_ID, bucketId)\n startActivityForResult(intent, Constants.RequestCodes.RECEIVE_DATA_FROM_FULL_SCREEN_MODE)\n@@ -498,22 +519,22 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n * Get the selected images. Remove any non existent file, forward the data to finish selector.\n */\n fun onDone() {\n- val selectedImages = viewModel.selectedImages.value\n- if (selectedImages.isNullOrEmpty()) {\n- finishPickImages(arrayListOf())\n- return\n- }\n- var i = 0\n- while (i < selectedImages.size) {\n- val path = selectedImages[i].path\n- val file = File(path)\n- if (!file.exists()) {\n- selectedImages.removeAt(i)\n- i--\n- }\n- i++\n+ val selectedImages = viewModel.selectedImages.value\n+ if (selectedImages.isNullOrEmpty()) {\n+ finishPickImages(arrayListOf())\n+ return\n+ }\n+ var i = 0\n+ while (i < selectedImages.size) {\n+ val path = selectedImages[i].path\n+ val file = File(path)\n+ if (!file.exists()) {\n+ selectedImages.removeAt(i)\n+ i--\n }\n- finishPickImages(selectedImages)\n+ i++\n+ }\n+ finishPickImages(selectedImages)\n }\n \n /**\n@@ -547,10 +568,13 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n val dialog = Dialog(this)\n dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)\n dialog.setContentView(R.layout.custom_selector_limit_dialog)\n- (dialog.findViewById(R.id.btn_dismiss_limit_warning) as Button).setOnClickListener()\n- { dialog.dismiss() }\n- (dialog.findViewById(R.id.upload_limit_warning) as TextView).text = resources.getString(\n- R.string.custom_selector_over_limit_warning, uploadLimit, uploadLimitExceededBy)\n+ (dialog.findViewById(R.id.btn_dismiss_limit_warning) as Button).setOnClickListener { dialog.dismiss() }\n+ (dialog.findViewById(R.id.upload_limit_warning) as TextView).text =\n+ resources.getString(\n+ R.string.custom_selector_over_limit_warning,\n+ uploadLimit,\n+ uploadLimitExceededBy,\n+ )\n dialog.show()\n }\n \n@@ -560,9 +584,17 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n */\n override fun onDestroy() {\n if (isImageFragmentOpen) {\n- prefs.edit().putLong(FOLDER_ID, bucketId).putString(FOLDER_NAME, bucketName).apply()\n+ prefs\n+ .edit()\n+ .putLong(FOLDER_ID, bucketId)\n+ .putString(FOLDER_NAME, bucketName)\n+ .apply()\n } else {\n- prefs.edit().remove(FOLDER_ID).remove(FOLDER_NAME).apply()\n+ prefs\n+ .edit()\n+ .remove(FOLDER_ID)\n+ .remove(FOLDER_NAME)\n+ .apply()\n }\n super.onDestroy()\n }\n@@ -573,38 +605,41 @@ class CustomSelectorActivity : BaseActivity(), FolderClickListener, ImageSelectL\n const val ITEM_ID: String = \"ItemId\"\n }\n }\n+\n @Composable\n-fun PartialStorageAccessIndicator(\n+fun partialStorageAccessIndicator(\n isVisible: Boolean,\n- onManage: ()-> Unit,\n- modifier: Modifier = Modifier\n+ onManage: () -> Unit,\n+ modifier: Modifier = Modifier,\n ) {\n- if(isVisible) {\n+ if (isVisible) {\n OutlinedCard(\n modifier = modifier,\n- colors = CardDefaults.cardColors(\n- containerColor = colorResource(R.color.primarySuperLightColor)\n- ),\n+ colors =\n+ CardDefaults.cardColors(\n+ containerColor = colorResource(R.color.primarySuperLightColor),\n+ ),\n border = BorderStroke(0.5.dp, color = colorResource(R.color.primaryColor)),\n- shape = RoundedCornerShape(8.dp)\n+ shape = RoundedCornerShape(8.dp),\n ) {\n Row(modifier = Modifier.padding(16.dp).fillMaxWidth()) {\n Text(\n text = \"You've given access to a select number of photos\",\n- modifier = Modifier.weight(1f)\n+ modifier = Modifier.weight(1f),\n )\n TextButton(\n onClick = onManage,\n modifier = Modifier.align(Alignment.Bottom),\n- colors = ButtonDefaults.buttonColors(\n- containerColor = colorResource(R.color.primaryColor)\n- ),\n- shape = RoundedCornerShape(8.dp)\n+ colors =\n+ ButtonDefaults.buttonColors(\n+ containerColor = colorResource(R.color.primaryColor),\n+ ),\n+ shape = RoundedCornerShape(8.dp),\n ) {\n Text(\n text = \"Manage\",\n style = MaterialTheme.typography.labelMedium,\n- color = colorResource(R.color.primaryTextColor)\n+ color = colorResource(R.color.primaryTextColor),\n )\n }\n }\n@@ -614,11 +649,15 @@ fun PartialStorageAccessIndicator(\n \n @Preview\n @Composable\n-fun PartialStorageAccessIndicatorPreview() {\n+fun partialStorageAccessIndicatorPreview() {\n Surface {\n- PartialStorageAccessIndicator(isVisible = true, onManage = {}, modifier = Modifier\n- .padding(vertical = 8.dp, horizontal = 4.dp)\n- .fillMaxWidth()\n+ partialStorageAccessIndicator(\n+ isVisible = true,\n+ onManage = {},\n+ modifier =\n+ Modifier\n+ .padding(vertical = 8.dp, horizontal = 4.dp)\n+ .fillMaxWidth(),\n )\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorViewModel.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorViewModel.kt\nindex 90f9963fbb..f3465063a7 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorViewModel.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorViewModel.kt\n@@ -14,8 +14,10 @@ import kotlinx.coroutines.cancel\n /**\n * Custom Selector view model.\n */\n-class CustomSelectorViewModel(var context: Context,var imageFileLoader: ImageFileLoader) : ViewModel() {\n-\n+class CustomSelectorViewModel(\n+ var context: Context,\n+ var imageFileLoader: ImageFileLoader,\n+) : ViewModel() {\n /**\n * Scope for coroutine task (image fetch).\n */\n@@ -37,15 +39,17 @@ class CustomSelectorViewModel(var context: Context,var imageFileLoader: ImageFil\n fun fetchImages() {\n result.postValue(Result(CallbackStatus.FETCHING, arrayListOf()))\n scope.cancel()\n- imageFileLoader.loadDeviceImages(object: ImageLoaderListener {\n- override fun onImageLoaded(images: ArrayList) {\n- result.postValue(Result(CallbackStatus.SUCCESS, images))\n- }\n-\n- override fun onFailed(throwable: Throwable) {\n- result.postValue(Result(CallbackStatus.SUCCESS, arrayListOf()))\n- }\n- })\n+ imageFileLoader.loadDeviceImages(\n+ object : ImageLoaderListener {\n+ override fun onImageLoaded(images: ArrayList) {\n+ result.postValue(Result(CallbackStatus.SUCCESS, images))\n+ }\n+\n+ override fun onFailed(throwable: Throwable) {\n+ result.postValue(Result(CallbackStatus.SUCCESS, arrayListOf()))\n+ }\n+ },\n+ )\n }\n \n /**\n@@ -55,4 +59,4 @@ class CustomSelectorViewModel(var context: Context,var imageFileLoader: ImageFil\n scope.cancel()\n super.onCleared()\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorViewModelFactory.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorViewModelFactory.kt\nindex 616c5e83fc..27679a5df9 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorViewModelFactory.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorViewModelFactory.kt\n@@ -8,10 +8,12 @@ import javax.inject.Inject\n /**\n * View Model Factory.\n */\n-class CustomSelectorViewModelFactory @Inject constructor(val context: Context,val imageFileLoader: ImageFileLoader) : ViewModelProvider.Factory {\n-\n- override fun create(modelClass: Class) : CustomSelectorViewModel {\n- return CustomSelectorViewModel(context,imageFileLoader) as CustomSelectorViewModel\n+class CustomSelectorViewModelFactory\n+ @Inject\n+ constructor(\n+ val context: Context,\n+ val imageFileLoader: ImageFileLoader,\n+ ) : ViewModelProvider.Factory {\n+ override fun create(modelClass: Class): CustomSelectorViewModel =\n+ CustomSelectorViewModel(context, imageFileLoader) as CustomSelectorViewModel\n }\n-\n-}\n\\ No newline at end of file\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt\nindex 95f427f49e..6ca2b06e40 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt\n@@ -9,10 +9,10 @@ import androidx.lifecycle.ViewModelProvider\n import androidx.recyclerview.widget.GridLayoutManager\n import androidx.recyclerview.widget.RecyclerView\n import fr.free.nrw.commons.customselector.helper.ImageHelper\n-import fr.free.nrw.commons.customselector.model.Result\n import fr.free.nrw.commons.customselector.listeners.FolderClickListener\n import fr.free.nrw.commons.customselector.model.CallbackStatus\n import fr.free.nrw.commons.customselector.model.Folder\n+import fr.free.nrw.commons.customselector.model.Result\n import fr.free.nrw.commons.customselector.ui.adapter.FolderAdapter\n import fr.free.nrw.commons.databinding.FragmentCustomSelectorBinding\n import fr.free.nrw.commons.di.CommonsDaggerSupportFragment\n@@ -24,12 +24,11 @@ import javax.inject.Inject\n * Custom selector folder fragment.\n */\n class FolderFragment : CommonsDaggerSupportFragment() {\n-\n /**\n * ViewBinding\n */\n private var _binding: FragmentCustomSelectorBinding? = null\n- private val binding get() = _binding\n+ val binding get() = _binding\n \n /**\n * View Model for images.\n@@ -53,6 +52,7 @@ class FolderFragment : CommonsDaggerSupportFragment() {\n \n var mediaClient: MediaClient? = null\n @Inject set\n+\n /**\n * Folder Adapter.\n */\n@@ -66,15 +66,13 @@ class FolderFragment : CommonsDaggerSupportFragment() {\n /**\n * Folder List.\n */\n- private lateinit var folders : ArrayList\n+ private lateinit var folders: ArrayList\n \n /**\n * Companion newInstance.\n */\n- companion object{\n- fun newInstance(): FolderFragment {\n- return FolderFragment()\n- }\n+ companion object {\n+ fun newInstance(): FolderFragment = FolderFragment()\n }\n \n /**\n@@ -83,21 +81,24 @@ class FolderFragment : CommonsDaggerSupportFragment() {\n override fun onCreate(savedInstanceState: Bundle?) {\n super.onCreate(savedInstanceState)\n \n- viewModel = ViewModelProvider(requireActivity(),customSelectorViewModelFactory!!).get(CustomSelectorViewModel::class.java)\n-\n+ viewModel = ViewModelProvider(requireActivity(), customSelectorViewModelFactory!!).get(CustomSelectorViewModel::class.java)\n }\n \n /**\n * OnCreateView.\n * Inflate Layout, init adapter, init gridLayoutManager, setUp recycler view, observe the view model for result.\n */\n- override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {\n+ override fun onCreateView(\n+ inflater: LayoutInflater,\n+ container: ViewGroup?,\n+ savedInstanceState: Bundle?,\n+ ): View? {\n _binding = FragmentCustomSelectorBinding.inflate(inflater, container, false)\n folderAdapter = FolderAdapter(requireActivity(), activity as FolderClickListener)\n gridLayoutManager = GridLayoutManager(context, columnCount())\n selectorRV = binding?.selectorRv\n loader = binding?.loader\n- with(binding?.selectorRv){\n+ with(binding?.selectorRv) {\n this?.layoutManager = gridLayoutManager\n this?.setHasFixedSize(true)\n this?.adapter = folderAdapter\n@@ -114,9 +115,9 @@ class FolderFragment : CommonsDaggerSupportFragment() {\n * Load adapter.\n */\n private fun handleResult(result: Result) {\n- if(result.status is CallbackStatus.SUCCESS){\n+ if (result.status is CallbackStatus.SUCCESS) {\n val images = result.images\n- if(images.isEmpty()){\n+ if (images.isEmpty()) {\n binding?.emptyText?.let {\n it.visibility = View.VISIBLE\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFileLoader.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFileLoader.kt\nindex bc4d179a2e..f079dee507 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFileLoader.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFileLoader.kt\n@@ -20,8 +20,9 @@ import kotlin.coroutines.CoroutineContext\n * Custom Selector Image File Loader.\n * Loads device images.\n */\n-class ImageFileLoader(val context: Context) : CoroutineScope{\n-\n+class ImageFileLoader(\n+ val context: Context,\n+) : CoroutineScope {\n /**\n * Coroutine context for fetching images.\n */\n@@ -30,14 +31,15 @@ class ImageFileLoader(val context: Context) : CoroutineScope{\n /**\n * Media paramerters required.\n */\n- private val projection = arrayOf(\n- MediaStore.Images.Media._ID,\n- MediaStore.Images.Media.DISPLAY_NAME,\n- MediaStore.Images.Media.DATA,\n- MediaStore.Images.Media.BUCKET_ID,\n- MediaStore.Images.Media.BUCKET_DISPLAY_NAME,\n- MediaStore.Images.Media.DATE_ADDED\n- )\n+ private val projection =\n+ arrayOf(\n+ MediaStore.Images.Media._ID,\n+ MediaStore.Images.Media.DISPLAY_NAME,\n+ MediaStore.Images.Media.DATA,\n+ MediaStore.Images.Media.BUCKET_ID,\n+ MediaStore.Images.Media.BUCKET_DISPLAY_NAME,\n+ MediaStore.Images.Media.DATE_ADDED,\n+ )\n \n /**\n * Load Device Images under coroutine.\n@@ -50,12 +52,18 @@ class ImageFileLoader(val context: Context) : CoroutineScope{\n }\n }\n \n-\n /**\n * Load Device images using cursor\n */\n- private fun getImages(listener:ImageLoaderListener) {\n- val cursor = context.contentResolver.query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, projection, null, null, MediaStore.Images.Media.DATE_ADDED + \" DESC\")\n+ private fun getImages(listener: ImageLoaderListener) {\n+ val cursor =\n+ context.contentResolver.query(\n+ MediaStore.Images.Media.EXTERNAL_CONTENT_URI,\n+ projection,\n+ null,\n+ null,\n+ MediaStore.Images.Media.DATE_ADDED + \" DESC\",\n+ )\n if (cursor == null) {\n listener.onFailed(NullPointerException())\n return\n@@ -85,10 +93,12 @@ class ImageFileLoader(val context: Context) : CoroutineScope{\n val file =\n if (path == null || path.isEmpty()) {\n null\n- } else try {\n- File(path)\n- } catch (ignored: Exception) {\n- null\n+ } else {\n+ try {\n+ File(path)\n+ } catch (ignored: Exception) {\n+ null\n+ }\n }\n \n if (file != null && file.exists() && name != null && path != null && bucketName != null) {\n@@ -106,30 +116,29 @@ class ImageFileLoader(val context: Context) : CoroutineScope{\n val dateFormat = DateFormat.getMediumDateFormat(context)\n val formattedDate = dateFormat.format(date)\n \n- val image = Image(\n- id,\n- name,\n- uri,\n- path,\n- bucketId,\n- bucketName,\n- date = (formattedDate)\n- )\n+ val image =\n+ Image(\n+ id,\n+ name,\n+ uri,\n+ path,\n+ bucketId,\n+ bucketName,\n+ date = (formattedDate),\n+ )\n images.add(image)\n }\n-\n } while (cursor.moveToNext())\n }\n cursor.close()\n listener.onImageLoaded(images)\n }\n \n-\n /**\n * Abort loading images.\n */\n- fun abortLoadImage(){\n- //todo Abort loading images.\n+ fun abortLoadImage() {\n+ // todo Abort loading images.\n }\n \n /*\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt\nindex c5e5de4f64..7e522f6815 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt\n@@ -37,17 +37,19 @@ import fr.free.nrw.commons.theme.BaseActivity\n import fr.free.nrw.commons.upload.FileProcessor\n import fr.free.nrw.commons.upload.FileUtilsWrapper\n import io.reactivex.schedulers.Schedulers\n-import java.util.*\n+import java.util.TreeMap\n import javax.inject.Inject\n import kotlin.collections.ArrayList\n \n /**\n * Custom Selector Image Fragment.\n */\n-class ImageFragment : CommonsDaggerSupportFragment(), RefreshUIListener, PassDataListener {\n-\n+class ImageFragment :\n+ CommonsDaggerSupportFragment(),\n+ RefreshUIListener,\n+ PassDataListener {\n private var _binding: FragmentCustomSelectorBinding? = null\n- private val binding get() = _binding\n+ val binding get() = _binding\n \n /**\n * Current bucketId.\n@@ -107,7 +109,6 @@ class ImageFragment : CommonsDaggerSupportFragment(), RefreshUIListener, PassDat\n private lateinit var progressDialog: AlertDialog\n private lateinit var progressDialogLayout: ProgressDialogBinding\n \n-\n /**\n * NotForUploadStatus Dao class for database operations\n */\n@@ -142,7 +143,6 @@ class ImageFragment : CommonsDaggerSupportFragment(), RefreshUIListener, PassDat\n lateinit var contributionDao: ContributionDao\n \n companion object {\n-\n /**\n * Switch state\n */\n@@ -157,7 +157,10 @@ class ImageFragment : CommonsDaggerSupportFragment(), RefreshUIListener, PassDat\n /**\n * newInstance from bucketId.\n */\n- fun newInstance(bucketId: Long, lastItemId: Long): ImageFragment {\n+ fun newInstance(\n+ bucketId: Long,\n+ lastItemId: Long,\n+ ): ImageFragment {\n val fragment = ImageFragment()\n val args = Bundle()\n args.putLong(BUCKET_ID, bucketId)\n@@ -175,9 +178,10 @@ class ImageFragment : CommonsDaggerSupportFragment(), RefreshUIListener, PassDat\n super.onCreate(savedInstanceState)\n bucketId = arguments?.getLong(BUCKET_ID)\n lastItemId = arguments?.getLong(LAST_ITEM_ID, 0)\n- viewModel = ViewModelProvider(requireActivity(), customSelectorViewModelFactory).get(\n- CustomSelectorViewModel::class.java\n- )\n+ viewModel =\n+ ViewModelProvider(requireActivity(), customSelectorViewModelFactory).get(\n+ CustomSelectorViewModel::class.java,\n+ )\n }\n \n /**\n@@ -188,7 +192,7 @@ class ImageFragment : CommonsDaggerSupportFragment(), RefreshUIListener, PassDat\n override fun onCreateView(\n inflater: LayoutInflater,\n container: ViewGroup?,\n- savedInstanceState: Bundle?\n+ savedInstanceState: Bundle?,\n ): View? {\n _binding = FragmentCustomSelectorBinding.inflate(inflater, container, false)\n imageAdapter =\n@@ -200,9 +204,12 @@ class ImageFragment : CommonsDaggerSupportFragment(), RefreshUIListener, PassDat\n this?.adapter = imageAdapter\n }\n \n- viewModel?.result?.observe(viewLifecycleOwner, Observer {\n- handleResult(it)\n- })\n+ viewModel?.result?.observe(\n+ viewLifecycleOwner,\n+ Observer {\n+ handleResult(it)\n+ },\n+ )\n \n switch = binding?.switchWidget\n switch?.visibility = View.VISIBLE\n@@ -323,20 +330,22 @@ class ImageFragment : CommonsDaggerSupportFragment(), RefreshUIListener, PassDat\n override fun onDestroy() {\n imageAdapter.cleanUp()\n \n- val position = (selectorRV?.layoutManager as GridLayoutManager)\n- .findFirstVisibleItemPosition()\n+ val position =\n+ (selectorRV?.layoutManager as GridLayoutManager)\n+ .findFirstVisibleItemPosition()\n \n // Check for empty RecyclerView.\n if (position != -1 && filteredImages.size > 0) {\n context?.let { context ->\n- context.getSharedPreferences(\n- \"CustomSelector\",\n- BaseActivity.MODE_PRIVATE\n- )?.let { prefs ->\n- prefs.edit()?.let { editor ->\n- editor.putLong(\"ItemId\", imageAdapter.getImageIdAt(position))?.apply()\n+ context\n+ .getSharedPreferences(\n+ \"CustomSelector\",\n+ BaseActivity.MODE_PRIVATE,\n+ )?.let { prefs ->\n+ prefs.edit()?.let { editor ->\n+ editor.putLong(\"ItemId\", imageAdapter.getImageIdAt(position))?.apply()\n+ }\n }\n- }\n }\n }\n super.onDestroy()\n@@ -354,7 +363,7 @@ class ImageFragment : CommonsDaggerSupportFragment(), RefreshUIListener, PassDat\n /**\n * Removes the image from the actionable image map\n */\n- fun removeImage(image : Image){\n+ fun removeImage(image: Image) {\n imageAdapter.removeImageFromActionableImageMap(image)\n }\n \n@@ -364,11 +373,15 @@ class ImageFragment : CommonsDaggerSupportFragment(), RefreshUIListener, PassDat\n fun clearSelectedImages() {\n imageAdapter.clearSelectedImages()\n }\n+\n /**\n * Passes selected images and other information from Activity to Fragment and connects it with\n * the adapter\n */\n- override fun passSelectedImages(selectedImages: ArrayList, shouldRefresh: Boolean) {\n+ override fun passSelectedImages(\n+ selectedImages: ArrayList,\n+ shouldRefresh: Boolean,\n+ ) {\n imageAdapter.setSelectedImages(selectedImages)\n \n val uploadingContributions = getUploadingContributions()\n@@ -398,11 +411,10 @@ class ImageFragment : CommonsDaggerSupportFragment(), RefreshUIListener, PassDat\n }\n }\n \n- private fun getUploadingContributions(): List {\n-\n- return contributionDao.getContribution(\n- listOf(Contribution.STATE_IN_PROGRESS, Contribution.STATE_FAILED, Contribution.STATE_QUEUED, Contribution.STATE_PAUSED)\n- )?.subscribeOn(Schedulers.io())?.blockingGet() ?: emptyList()\n- }\n-\n+ private fun getUploadingContributions(): List =\n+ contributionDao\n+ .getContribution(\n+ listOf(Contribution.STATE_IN_PROGRESS, Contribution.STATE_FAILED, Contribution.STATE_QUEUED, Contribution.STATE_PAUSED),\n+ )?.subscribeOn(Schedulers.io())\n+ ?.blockingGet() ?: emptyList()\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageLoader.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageLoader.kt\nindex 4e3ad09021..1fb5c59537 100644\n--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageLoader.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageLoader.kt\n@@ -15,368 +15,389 @@ import fr.free.nrw.commons.upload.FileProcessor\n import fr.free.nrw.commons.upload.FileUtilsWrapper\n import fr.free.nrw.commons.utils.CustomSelectorUtils\n import fr.free.nrw.commons.utils.CustomSelectorUtils.Companion.checkWhetherFileExistsOnCommonsUsingSHA1\n-import kotlinx.coroutines.*\n-import java.util.*\n+import kotlinx.coroutines.CoroutineDispatcher\n+import kotlinx.coroutines.CoroutineScope\n+import kotlinx.coroutines.MainScope\n+import kotlinx.coroutines.launch\n+import java.util.Calendar\n import java.util.concurrent.TimeUnit\n import javax.inject.Inject\n \n /**\n * Image Loader class, loads images, depending on API results.\n */\n-class ImageLoader @Inject constructor(\n-\n- /**\n- * MediaClient for SHA1 query.\n- */\n- var mediaClient: MediaClient,\n-\n- /**\n- * FileProcessor to pre-process the file.\n- */\n- var fileProcessor: FileProcessor,\n-\n- /**\n- * File Utils Wrapper for SHA1\n- */\n- var fileUtilsWrapper: FileUtilsWrapper,\n-\n- /**\n- * UploadedStatusDao for cache query.\n- */\n- var uploadedStatusDao: UploadedStatusDao,\n-\n- /**\n- * NotForUploadDao for database operations\n- */\n- var notForUploadStatusDao: NotForUploadStatusDao,\n-\n- /**\n- * Context for coroutine.\n- */\n- val context: Context\n-) {\n-\n- /**\n- * Maps to facilitate image query.\n- */\n- private var mapModifiedImageSHA1: HashMap = HashMap()\n- private var mapHolderImage : HashMap = HashMap()\n- private var mapResult: HashMap = HashMap()\n- private var mapImageSHA1: HashMap = HashMap()\n-\n- /**\n- * Coroutine Scope.\n- */\n- private val scope : CoroutineScope = MainScope()\n-\n- /**\n- * Query image and setUp the view.\n- */\n- fun queryAndSetView(\n- holder: ImageViewHolder,\n- image: Image,\n- ioDispatcher: CoroutineDispatcher,\n- defaultDispatcher: CoroutineDispatcher,\n- uploadedContributionsList : List\n+class ImageLoader\n+ @Inject\n+ constructor(\n+ /**\n+ * MediaClient for SHA1 query.\n+ */\n+ var mediaClient: MediaClient,\n+ /**\n+ * FileProcessor to pre-process the file.\n+ */\n+ var fileProcessor: FileProcessor,\n+ /**\n+ * File Utils Wrapper for SHA1\n+ */\n+ var fileUtilsWrapper: FileUtilsWrapper,\n+ /**\n+ * UploadedStatusDao for cache query.\n+ */\n+ var uploadedStatusDao: UploadedStatusDao,\n+ /**\n+ * NotForUploadDao for database operations\n+ */\n+ var notForUploadStatusDao: NotForUploadStatusDao,\n+ /**\n+ * Context for coroutine.\n+ */\n+ val context: Context,\n ) {\n-\n /**\n- * Recycler view uses same view holder, so we can identify the latest query image from holder.\n+ * Maps to facilitate image query.\n */\n- mapHolderImage[holder] = image\n- holder.itemNotUploaded()\n- holder.itemForUpload()\n- holder.itemNotUploading()\n-\n- scope.launch {\n- var result: Result = Result.NOTFOUND\n+ private var mapModifiedImageSHA1: HashMap = HashMap()\n+ private var mapHolderImage: HashMap = HashMap()\n+ private var mapResult: HashMap = HashMap()\n+ private var mapImageSHA1: HashMap = HashMap()\n \n- if (mapHolderImage[holder] != image) {\n- return@launch\n- }\n-\n- val imageSHA1: String = when (mapImageSHA1[image.uri] != null) {\n- true -> mapImageSHA1[image.uri]!!\n- else -> CustomSelectorUtils.getImageSHA1(\n- image.uri,\n- ioDispatcher,\n- fileUtilsWrapper,\n- context.contentResolver\n- )\n- }\n- mapImageSHA1[image.uri] = imageSHA1\n-\n- if (imageSHA1.isEmpty()) {\n- return@launch\n- }\n- val uploadedStatus = getFromUploaded(imageSHA1)\n+ /**\n+ * Coroutine Scope.\n+ */\n+ private val scope: CoroutineScope = MainScope()\n \n- val sha1 = uploadedStatus?.let {\n- result = getResultFromUploadedStatus(uploadedStatus)\n- uploadedStatus.modifiedImageSHA1\n- } ?: run {\n- if (mapHolderImage[holder] == image) {\n- getSHA1(image, defaultDispatcher)\n- } else {\n- \"\"\n+ /**\n+ * Query image and setUp the view.\n+ */\n+ fun queryAndSetView(\n+ holder: ImageViewHolder,\n+ image: Image,\n+ ioDispatcher: CoroutineDispatcher,\n+ defaultDispatcher: CoroutineDispatcher,\n+ uploadedContributionsList: List,\n+ ) {\n+ /**\n+ * Recycler view uses same view holder, so we can identify the latest query image from holder.\n+ */\n+ mapHolderImage[holder] = image\n+ holder.itemNotUploaded()\n+ holder.itemForUpload()\n+ holder.itemNotUploading()\n+\n+ scope.launch {\n+ var result: Result = Result.NOTFOUND\n+\n+ if (mapHolderImage[holder] != image) {\n+ return@launch\n }\n- }\n \n- if (mapHolderImage[holder] != image) {\n- return@launch\n- }\n+ val imageSHA1: String =\n+ when (mapImageSHA1[image.uri] != null) {\n+ true -> mapImageSHA1[image.uri]!!\n+ else ->\n+ CustomSelectorUtils.getImageSHA1(\n+ image.uri,\n+ ioDispatcher,\n+ fileUtilsWrapper,\n+ context.contentResolver,\n+ )\n+ }\n+ mapImageSHA1[image.uri] = imageSHA1\n \n- val existsInNotForUploadTable = notForUploadStatusDao.find(imageSHA1)\n-\n- if (result in arrayOf(Result.NOTFOUND, Result.INVALID) && sha1.isNotEmpty()) {\n- when {\n- mapResult[imageSHA1] == null -> {\n- // Query original image.\n- result = checkWhetherFileExistsOnCommonsUsingSHA1(\n- imageSHA1,\n- ioDispatcher,\n- mediaClient\n- )\n- when (result) {\n- is Result.TRUE -> {\n- mapResult[imageSHA1] = Result.TRUE\n- }\n- is Result.ERROR -> {\n- mapResult[imageSHA1] = Result.ERROR\n- }\n- is Result.FALSE -> {\n- mapResult[imageSHA1] = Result.FALSE\n- }\n- is Result.INVALID -> {\n- mapResult[imageSHA1] = Result.INVALID\n- }\n- is Result.NOTFOUND -> {\n- mapResult[imageSHA1] = Result.NOTFOUND\n- }\n+ if (imageSHA1.isEmpty()) {\n+ return@launch\n+ }\n+ val uploadedStatus = getFromUploaded(imageSHA1)\n+\n+ val sha1 =\n+ uploadedStatus?.let {\n+ result = getResultFromUploadedStatus(uploadedStatus)\n+ uploadedStatus.modifiedImageSHA1\n+ } ?: run {\n+ if (mapHolderImage[holder] == image) {\n+ getSHA1(image, defaultDispatcher)\n+ } else {\n+ \"\"\n }\n }\n- else -> {\n- result = mapResult[imageSHA1]!!\n- }\n+\n+ if (mapHolderImage[holder] != image) {\n+ return@launch\n }\n- if (result is Result.TRUE) {\n- // Original image found.\n- insertIntoUploaded(imageSHA1, sha1, result is Result.TRUE, false)\n- } else {\n+\n+ val existsInNotForUploadTable = notForUploadStatusDao.find(imageSHA1)\n+\n+ if (result in arrayOf(Result.NOTFOUND, Result.INVALID) && sha1.isNotEmpty()) {\n when {\n- mapResult[sha1] == null -> {\n- // Original image not found, query modified image.\n- result = checkWhetherFileExistsOnCommonsUsingSHA1(\n- sha1,\n- ioDispatcher,\n- mediaClient\n- )\n+ mapResult[imageSHA1] == null -> {\n+ // Query original image.\n+ result =\n+ checkWhetherFileExistsOnCommonsUsingSHA1(\n+ imageSHA1,\n+ ioDispatcher,\n+ mediaClient,\n+ )\n when (result) {\n is Result.TRUE -> {\n- mapResult[sha1] = Result.TRUE\n+ mapResult[imageSHA1] = Result.TRUE\n }\n is Result.ERROR -> {\n- mapResult[sha1] = Result.ERROR\n+ mapResult[imageSHA1] = Result.ERROR\n }\n is Result.FALSE -> {\n- mapResult[sha1] = Result.FALSE\n+ mapResult[imageSHA1] = Result.FALSE\n }\n is Result.INVALID -> {\n- mapResult[sha1] = Result.INVALID\n+ mapResult[imageSHA1] = Result.INVALID\n }\n is Result.NOTFOUND -> {\n- mapResult[sha1] = Result.NOTFOUND\n+ mapResult[imageSHA1] = Result.NOTFOUND\n }\n }\n }\n else -> {\n- result = mapResult[sha1]!!\n+ result = mapResult[imageSHA1]!!\n }\n }\n- if (result != Result.ERROR) {\n- insertIntoUploaded(imageSHA1, sha1, false, result is Result.TRUE)\n+ if (result is Result.TRUE) {\n+ // Original image found.\n+ insertIntoUploaded(imageSHA1, sha1, result is Result.TRUE, false)\n+ } else {\n+ when {\n+ mapResult[sha1] == null -> {\n+ // Original image not found, query modified image.\n+ result =\n+ checkWhetherFileExistsOnCommonsUsingSHA1(\n+ sha1,\n+ ioDispatcher,\n+ mediaClient,\n+ )\n+ when (result) {\n+ is Result.TRUE -> {\n+ mapResult[sha1] = Result.TRUE\n+ }\n+ is Result.ERROR -> {\n+ mapResult[sha1] = Result.ERROR\n+ }\n+ is Result.FALSE -> {\n+ mapResult[sha1] = Result.FALSE\n+ }\n+ is Result.INVALID -> {\n+ mapResult[sha1] = Result.INVALID\n+ }\n+ is Result.NOTFOUND -> {\n+ mapResult[sha1] = Result.NOTFOUND\n+ }\n+ }\n+ }\n+ else -> {\n+ result = mapResult[sha1]!!\n+ }\n+ }\n+ if (result != Result.ERROR) {\n+ insertIntoUploaded(imageSHA1, sha1, false, result is Result.TRUE)\n+ }\n }\n }\n- }\n \n- val sharedPreferences: SharedPreferences =\n- context\n- .getSharedPreferences(ImageHelper.CUSTOM_SELECTOR_PREFERENCE_KEY, 0)\n- val showAlreadyActionedImages =\n- sharedPreferences.getBoolean(\n- ImageHelper.SHOW_ALREADY_ACTIONED_IMAGES_PREFERENCE_KEY,\n- true\n- )\n-\n- if (mapHolderImage[holder] == image) {\n- if ((result is Result.TRUE) && showAlreadyActionedImages) {\n- holder.itemUploaded()\n- } else holder.itemNotUploaded()\n-\n- if ((existsInNotForUploadTable > 0) && showAlreadyActionedImages) {\n- holder.itemNotForUpload()\n- } else holder.itemForUpload()\n- }\n+ val sharedPreferences: SharedPreferences =\n+ context\n+ .getSharedPreferences(ImageHelper.CUSTOM_SELECTOR_PREFERENCE_KEY, 0)\n+ val showAlreadyActionedImages =\n+ sharedPreferences.getBoolean(\n+ ImageHelper.SHOW_ALREADY_ACTIONED_IMAGES_PREFERENCE_KEY,\n+ true,\n+ )\n \n- if (uploadedContributionsList.isNotEmpty()) {\n- for (contribution in uploadedContributionsList ) {\n- if (contribution.contentUri == image.uri && showAlreadyActionedImages) {\n- holder.itemUploading()\n- break\n+ if (mapHolderImage[holder] == image) {\n+ if ((result is Result.TRUE) && showAlreadyActionedImages) {\n+ holder.itemUploaded()\n } else {\n- holder.itemNotUploading()\n+ holder.itemNotUploaded()\n+ }\n+\n+ if ((existsInNotForUploadTable > 0) && showAlreadyActionedImages) {\n+ holder.itemNotForUpload()\n+ } else {\n+ holder.itemForUpload()\n+ }\n+ }\n+\n+ if (uploadedContributionsList.isNotEmpty()) {\n+ for (contribution in uploadedContributionsList) {\n+ if (contribution.contentUri == image.uri && showAlreadyActionedImages) {\n+ holder.itemUploading()\n+ break\n+ } else {\n+ holder.itemNotUploading()\n+ }\n }\n }\n }\n }\n- }\n \n- /**\n- * Finds out the next actionable image position\n- */\n- suspend fun nextActionableImage(\n- allImages: List, ioDispatcher: CoroutineDispatcher,\n- defaultDispatcher: CoroutineDispatcher,\n- nextImagePosition: Int,\n- currentlyUploadingImages: List\n- ): Int {\n- var next: Int\n- // Traversing from given position to the end\n- for (i in nextImagePosition until allImages.size){\n- val currentImage = allImages[i]\n-\n- if (currentlyUploadingImages.any { it.contentUri == currentImage.uri }) {\n- continue // Skip this image as it's currently being uploaded\n- }\n+ /**\n+ * Finds out the next actionable image position\n+ */\n+ suspend fun nextActionableImage(\n+ allImages: List,\n+ ioDispatcher: CoroutineDispatcher,\n+ defaultDispatcher: CoroutineDispatcher,\n+ nextImagePosition: Int,\n+ currentlyUploadingImages: List,\n+ ): Int {\n+ var next: Int\n+ // Traversing from given position to the end\n+ for (i in nextImagePosition until allImages.size) {\n+ val currentImage = allImages[i]\n+\n+ if (currentlyUploadingImages.any { it.contentUri == currentImage.uri }) {\n+ continue // Skip this image as it's currently being uploaded\n+ }\n \n- val imageSHA1: String = when (mapImageSHA1[currentImage.uri] != null) {\n- true -> mapImageSHA1[currentImage.uri]!!\n- else -> CustomSelectorUtils.getImageSHA1(\n- currentImage.uri,\n- ioDispatcher,\n- fileUtilsWrapper,\n- context.contentResolver\n- )\n- }\n- next = notForUploadStatusDao.find(imageSHA1)\n+ val imageSHA1: String =\n+ when (mapImageSHA1[currentImage.uri] != null) {\n+ true -> mapImageSHA1[currentImage.uri]!!\n+ else ->\n+ CustomSelectorUtils.getImageSHA1(\n+ currentImage.uri,\n+ ioDispatcher,\n+ fileUtilsWrapper,\n+ context.contentResolver,\n+ )\n+ }\n+ next = notForUploadStatusDao.find(imageSHA1)\n \n- // After checking the image in the not for upload table, if the image is present then\n- // skips the image and moves to next image for checking\n- if(next > 0){\n- continue\n+ // After checking the image in the not for upload table, if the image is present then\n+ // skips the image and moves to next image for checking\n+ if (next > 0) {\n+ continue\n \n- // Otherwise checks in already uploaded table\n- } else {\n- next = uploadedStatusDao.findByImageSHA1(imageSHA1, true)\n-\n- // If the image is not present in the already uploaded table, checks for its\n- // modified SHA1 in already uploaded table\n- if (next <= 0) {\n- val modifiedImageSha1 = getSHA1(currentImage, defaultDispatcher)\n- next = uploadedStatusDao.findByModifiedImageSHA1(\n- modifiedImageSha1,\n- true\n- )\n+ // Otherwise checks in already uploaded table\n+ } else {\n+ next = uploadedStatusDao.findByImageSHA1(imageSHA1, true)\n \n- // If the modified image SHA1 is not present in the already uploaded table,\n- // returns the position as next actionable image position\n+ // If the image is not present in the already uploaded table, checks for its\n+ // modified SHA1 in already uploaded table\n if (next <= 0) {\n- return i\n+ val modifiedImageSha1 = getSHA1(currentImage, defaultDispatcher)\n+ next =\n+ uploadedStatusDao.findByModifiedImageSHA1(\n+ modifiedImageSha1,\n+ true,\n+ )\n+\n+ // If the modified image SHA1 is not present in the already uploaded table,\n+ // returns the position as next actionable image position\n+ if (next <= 0) {\n+ return i\n \n- // If present in the db then skips iteration for the image and moves to the next\n- // for checking\n+ // If present in the db then skips iteration for the image and moves to the next\n+ // for checking\n+ } else {\n+ continue\n+ }\n+\n+ // If present in the db then skips iteration for the image and moves to the next\n+ // for checking\n } else {\n continue\n }\n-\n- // If present in the db then skips iteration for the image and moves to the next\n- // for checking\n- } else {\n- continue\n }\n }\n+ return -1\n }\n- return -1\n- }\n \n- /**\n- * Get SHA1, return SHA1 if available, otherwise generate and store the SHA1.\n- *\n- * @return sha1 of the image\n- */\n- suspend fun getSHA1(image: Image, defaultDispatcher: CoroutineDispatcher): String {\n- mapModifiedImageSHA1[image]?.let{\n- return it\n+ /**\n+ * Get SHA1, return SHA1 if available, otherwise generate and store the SHA1.\n+ *\n+ * @return sha1 of the image\n+ */\n+ suspend fun getSHA1(\n+ image: Image,\n+ defaultDispatcher: CoroutineDispatcher,\n+ ): String {\n+ mapModifiedImageSHA1[image]?.let {\n+ return it\n+ }\n+ val sha1 =\n+ CustomSelectorUtils\n+ .generateModifiedSHA1(\n+ image,\n+ defaultDispatcher,\n+ context,\n+ fileProcessor,\n+ fileUtilsWrapper,\n+ )\n+ mapModifiedImageSHA1[image] = sha1\n+ return sha1\n }\n- val sha1 = CustomSelectorUtils\n- .generateModifiedSHA1(image,\n- defaultDispatcher,\n- context,\n- fileProcessor,\n- fileUtilsWrapper\n- )\n- mapModifiedImageSHA1[image] = sha1;\n- return sha1;\n- }\n \n- /**\n- * Get the uploaded status entry from the database.\n- */\n- suspend fun getFromUploaded(imageSha1:String): UploadedStatus? {\n- return uploadedStatusDao.getUploadedFromImageSHA1(imageSha1)\n- }\n+ /**\n+ * Get the uploaded status entry from the database.\n+ */\n+ suspend fun getFromUploaded(imageSha1: String): UploadedStatus? = uploadedStatusDao.getUploadedFromImageSHA1(imageSha1)\n \n- /**\n- * Insert into uploaded status table.\n- */\n- suspend fun insertIntoUploaded(imageSha1:String, modifiedImageSha1:String, imageResult:Boolean, modifiedImageResult: Boolean){\n- uploadedStatusDao.insertUploaded(\n- UploadedStatus(\n- imageSha1,\n- modifiedImageSha1,\n- imageResult,\n- modifiedImageResult\n+ /**\n+ * Insert into uploaded status table.\n+ */\n+ suspend fun insertIntoUploaded(\n+ imageSha1: String,\n+ modifiedImageSha1: String,\n+ imageResult: Boolean,\n+ modifiedImageResult: Boolean,\n+ ) {\n+ uploadedStatusDao.insertUploaded(\n+ UploadedStatus(\n+ imageSha1,\n+ modifiedImageSha1,\n+ imageResult,\n+ modifiedImageResult,\n+ ),\n )\n- )\n- }\n+ }\n \n- /**\n- * Get result data from database.\n- */\n- fun getResultFromUploadedStatus(uploadedStatus: UploadedStatus): Result {\n- if (uploadedStatus.imageResult || uploadedStatus.modifiedImageResult) {\n- return Result.TRUE\n- } else {\n- uploadedStatus.lastUpdated?.let {\n- val duration = Calendar.getInstance().time.time - it.time\n- if (TimeUnit.MILLISECONDS.toDays(duration) < INVALIDATE_DAY_COUNT) {\n- return Result.FALSE\n+ /**\n+ * Get result data from database.\n+ */\n+ fun getResultFromUploadedStatus(uploadedStatus: UploadedStatus): Result {\n+ if (uploadedStatus.imageResult || uploadedStatus.modifiedImageResult) {\n+ return Result.TRUE\n+ } else {\n+ uploadedStatus.lastUpdated?.let {\n+ val duration = Calendar.getInstance().time.time - it.time\n+ if (TimeUnit.MILLISECONDS.toDays(duration) < INVALIDATE_DAY_COUNT) {\n+ return Result.FALSE\n+ }\n }\n }\n+ return Result.INVALID\n }\n- return Result.INVALID\n- }\n \n- /**\n- * Sealed Result class.\n- */\n- sealed class Result {\n- object TRUE : Result()\n- object FALSE : Result()\n- object INVALID : Result()\n- object NOTFOUND : Result()\n- object ERROR : Result()\n- }\n+ /**\n+ * Sealed Result class.\n+ */\n+ sealed class Result {\n+ object TRUE : Result()\n+\n+ object FALSE : Result()\n+\n+ object INVALID : Result()\n+\n+ object NOTFOUND : Result()\n+\n+ object ERROR : Result()\n+ }\n \n- /**\n- * Companion Object\n- */\n- companion object {\n /**\n- * Invalidate Day count.\n- * False Database Entries are invalid after INVALIDATE_DAY_COUNT and need to be re-queried.\n+ * Companion Object\n */\n- const val INVALIDATE_DAY_COUNT: Long = 7\n+ companion object {\n+ /**\n+ * Invalidate Day count.\n+ * False Database Entries are invalid after INVALIDATE_DAY_COUNT and need to be re-queried.\n+ */\n+ const val INVALIDATE_DAY_COUNT: Long = 7\n+ }\n }\n-\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt b/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt\nindex 594f087c83..71947fa1a6 100644\n--- a/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt\n@@ -5,7 +5,10 @@ import androidx.room.RoomDatabase\n import androidx.room.TypeConverters\n import fr.free.nrw.commons.contributions.Contribution\n import fr.free.nrw.commons.contributions.ContributionDao\n-import fr.free.nrw.commons.customselector.database.*\n+import fr.free.nrw.commons.customselector.database.NotForUploadStatus\n+import fr.free.nrw.commons.customselector.database.NotForUploadStatusDao\n+import fr.free.nrw.commons.customselector.database.UploadedStatus\n+import fr.free.nrw.commons.customselector.database.UploadedStatusDao\n import fr.free.nrw.commons.nearby.Place\n import fr.free.nrw.commons.nearby.PlaceDao\n import fr.free.nrw.commons.review.ReviewDao\n@@ -17,13 +20,22 @@ import fr.free.nrw.commons.upload.depicts.DepictsDao\n * The database for accessing the respective DAOs\n *\n */\n-@Database(entities = [Contribution::class, Depicts::class, UploadedStatus::class, NotForUploadStatus::class, ReviewEntity::class, Place::class], version = 18, exportSchema = false)\n+@Database(\n+ entities = [Contribution::class, Depicts::class, UploadedStatus::class, NotForUploadStatus::class, ReviewEntity::class, Place::class],\n+ version = 18,\n+ exportSchema = false,\n+)\n @TypeConverters(Converters::class)\n abstract class AppDatabase : RoomDatabase() {\n abstract fun contributionDao(): ContributionDao\n+\n abstract fun PlaceDao(): PlaceDao\n- abstract fun DepictsDao(): DepictsDao;\n- abstract fun UploadedStatusDao(): UploadedStatusDao;\n+\n+ abstract fun DepictsDao(): DepictsDao\n+\n+ abstract fun UploadedStatusDao(): UploadedStatusDao\n+\n abstract fun NotForUploadStatusDao(): NotForUploadStatusDao\n+\n abstract fun ReviewDao(): ReviewDao\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt\nindex 3ec9a9723a..0dbdf71ae0 100644\n--- a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt\n@@ -1,6 +1,5 @@\n package fr.free.nrw.commons.description\n \n-\n import android.app.ProgressDialog\n import android.content.Intent\n import android.os.Bundle\n@@ -29,11 +28,12 @@ import io.reactivex.schedulers.Schedulers\n import timber.log.Timber\n import javax.inject.Inject\n \n-\n /**\n * Activity for populating and editing existing description and caption\n */\n-class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventListener {\n+class DescriptionEditActivity :\n+ BaseActivity(),\n+ UploadMediaDetailAdapter.EventListener {\n /**\n * Adapter for showing UploadMediaDetail in the activity\n */\n@@ -70,7 +70,7 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi\n \n private lateinit var binding: ActivityDescriptionEditBinding\n \n- private val REQUEST_CODE_FOR_VOICE_INPUT = 1213\n+ private val requestCodeForVoiceInput = 1213\n \n private var descriptionAndCaptions: ArrayList? = null\n \n@@ -78,7 +78,6 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi\n \n @Inject lateinit var sessionManager: SessionManager\n \n-\n override fun onCreate(savedInstanceState: Bundle?) {\n super.onCreate(savedInstanceState)\n \n@@ -110,12 +109,17 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi\n * @param descriptionAndCaptions list of description and caption\n */\n private fun initRecyclerView(descriptionAndCaptions: ArrayList?) {\n- uploadMediaDetailAdapter = UploadMediaDetailAdapter(this,\n- savedLanguageValue, descriptionAndCaptions, recentLanguagesDao)\n+ uploadMediaDetailAdapter =\n+ UploadMediaDetailAdapter(\n+ this,\n+ savedLanguageValue,\n+ descriptionAndCaptions,\n+ recentLanguagesDao,\n+ )\n uploadMediaDetailAdapter.setCallback { titleStringID: Int, messageStringId: Int ->\n showInfoAlert(\n titleStringID,\n- messageStringId\n+ messageStringId,\n )\n }\n uploadMediaDetailAdapter.setEventListener(this)\n@@ -129,11 +133,17 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi\n * @param titleStringID Title ID\n * @param messageStringId Message ID\n */\n- private fun showInfoAlert(titleStringID: Int, messageStringId: Int) {\n+ private fun showInfoAlert(\n+ titleStringID: Int,\n+ messageStringId: Int,\n+ ) {\n showAlertDialog(\n- this, getString(titleStringID),\n- getString(messageStringId), getString(android.R.string.ok),\n- null, true\n+ this,\n+ getString(titleStringID),\n+ getString(messageStringId),\n+ getString(android.R.string.ok),\n+ null,\n+ true,\n )\n }\n \n@@ -144,13 +154,13 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi\n */\n override fun addLanguage() {\n val uploadMediaDetail = UploadMediaDetail()\n- uploadMediaDetail.isManuallyAdded = true //This was manually added by the user\n+ uploadMediaDetail.isManuallyAdded = true // This was manually added by the user\n uploadMediaDetailAdapter.addDescription(uploadMediaDetail)\n rvDescriptions!!.smoothScrollToPosition(uploadMediaDetailAdapter.itemCount - 1)\n }\n \n private fun onBackButtonClicked(view: View) {\n- onBackPressedDispatcher.onBackPressed()\n+ onBackPressedDispatcher.onBackPressed()\n }\n \n private fun onSubmitButtonClicked(view: View) {\n@@ -174,10 +184,11 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi\n val descriptionStart = wikiText!!.substring(0, descriptionIndex + 12)\n val descriptionToEnd = wikiText!!.substring(descriptionIndex + 12)\n val descriptionEndIndex = descriptionToEnd.indexOf(\"\\n\")\n- val descriptionEnd = wikiText!!.substring(\n- descriptionStart.length\n- + descriptionEndIndex\n- )\n+ val descriptionEnd =\n+ wikiText!!.substring(\n+ descriptionStart.length +\n+ descriptionEndIndex,\n+ )\n buffer.append(descriptionStart)\n for (i in uploadMediaDetails.indices) {\n val uploadDetails = uploadMediaDetails[i]\n@@ -203,65 +214,72 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi\n * @param updatedWikiText updated wiki text\n * @param uploadMediaDetails descriptions and captions\n */\n- private fun editDescription(media : Media, updatedWikiText : String, uploadMediaDetails : ArrayList){\n-\n+ private fun editDescription(\n+ media: Media,\n+ updatedWikiText: String,\n+ uploadMediaDetails: ArrayList,\n+ ) {\n try {\n- descriptionEditHelper?.addDescription(\n- applicationContext, media,\n- updatedWikiText\n- )\n- ?.subscribeOn(Schedulers.io())\n+ descriptionEditHelper\n+ ?.addDescription(\n+ applicationContext,\n+ media,\n+ updatedWikiText,\n+ )?.subscribeOn(Schedulers.io())\n ?.observeOn(AndroidSchedulers.mainThread())\n- ?.subscribe(Consumer { s: Boolean? -> Timber.d(\"Descriptions are added.\") })?.let {\n+ ?.subscribe(Consumer { s: Boolean? -> Timber.d(\"Descriptions are added.\") })\n+ ?.let {\n compositeDisposable.add(\n- it\n+ it,\n )\n }\n- } catch (e : InvalidLoginTokenException) {\n+ } catch (e: InvalidLoginTokenException) {\n val username: String? = sessionManager?.userName\n- val logoutListener = CommonsApplication.BaseLogoutListener(\n- this,\n- getString(R.string.invalid_login_message),\n- username\n- )\n+ val logoutListener =\n+ CommonsApplication.BaseLogoutListener(\n+ this,\n+ getString(R.string.invalid_login_message),\n+ username,\n+ )\n \n val commonsApplication = CommonsApplication.getInstance()\n- if (commonsApplication != null ){\n- commonsApplication.clearApplicationData(this,logoutListener)\n+ if (commonsApplication != null) {\n+ commonsApplication.clearApplicationData(this, logoutListener)\n }\n }\n \n-\n val updatedCaptions = LinkedHashMap()\n for (mediaDetail in uploadMediaDetails) {\n try {\n compositeDisposable.add(\n- descriptionEditHelper!!.addCaption(\n- applicationContext, media,\n- mediaDetail.languageCode, mediaDetail.captionText\n- )\n- .subscribeOn(Schedulers.io())\n+ descriptionEditHelper!!\n+ .addCaption(\n+ applicationContext,\n+ media,\n+ mediaDetail.languageCode,\n+ mediaDetail.captionText,\n+ ).subscribeOn(Schedulers.io())\n .observeOn(AndroidSchedulers.mainThread())\n .subscribe { s: Boolean? ->\n updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText\n media.captions = updatedCaptions\n Timber.d(\"Caption is added.\")\n- })\n- }\n- catch (e : InvalidLoginTokenException) {\n- val username = sessionManager.userName\n- val logoutListener = CommonsApplication.BaseLogoutListener(\n- this,\n- getString(R.string.invalid_login_message),\n- username\n+ },\n )\n+ } catch (e: InvalidLoginTokenException) {\n+ val username = sessionManager.userName\n+ val logoutListener =\n+ CommonsApplication.BaseLogoutListener(\n+ this,\n+ getString(R.string.invalid_login_message),\n+ username,\n+ )\n \n val commonsApplication = CommonsApplication.getInstance()\n- if (commonsApplication != null ){\n- commonsApplication.clearApplicationData(this,logoutListener)\n+ if (commonsApplication != null) {\n+ commonsApplication.clearApplicationData(this, logoutListener)\n }\n }\n-\n }\n }\n \n@@ -274,23 +292,29 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi\n progressDialog!!.show()\n }\n \n- override\n- fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {\n- super.onActivityResult(requestCode, resultCode, data);\n- if (requestCode == REQUEST_CODE_FOR_VOICE_INPUT) {\n+ override fun onActivityResult(\n+ requestCode: Int,\n+ resultCode: Int,\n+ data: Intent?,\n+ ) {\n+ super.onActivityResult(requestCode, resultCode, data)\n+ if (requestCode == requestCodeForVoiceInput) {\n if (resultCode == RESULT_OK && data != null) {\n- val result = data.getStringArrayListExtra( RecognizerIntent.EXTRA_RESULTS )\n- uploadMediaDetailAdapter.handleSpeechResult(result!![0]) }\n- else { Timber.e(\"Error %s\", resultCode) }\n+ val result = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)\n+ uploadMediaDetailAdapter.handleSpeechResult(result!![0])\n+ } else {\n+ Timber.e(\"Error %s\", resultCode)\n+ }\n }\n }\n+\n override fun onSaveInstanceState(outState: Bundle) {\n super.onSaveInstanceState(outState)\n \n outState.putParcelableArrayList(LIST_OF_DESCRIPTION_AND_CAPTION, uploadMediaDetailAdapter.items as ArrayList)\n outState.putString(WIKITEXT, wikiText)\n outState.putString(Prefs.DESCRIPTION_LANGUAGE, savedLanguageValue)\n- //save Media\n+ // save Media\n outState.putParcelable(\"media\", media)\n }\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/description/EditDescriptionConstants.kt b/app/src/main/java/fr/free/nrw/commons/description/EditDescriptionConstants.kt\nindex 7502a10edc..0c0b546714 100644\n--- a/app/src/main/java/fr/free/nrw/commons/description/EditDescriptionConstants.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/description/EditDescriptionConstants.kt\n@@ -6,5 +6,5 @@ package fr.free.nrw.commons.description\n object EditDescriptionConstants {\n const val LIST_OF_DESCRIPTION_AND_CAPTION = \"description.descriptionAndCaption\"\n const val WIKITEXT = \"description.wikiText\"\n- const val UPDATED_WIKITEXT = \"description.updatedWikiText\";\n-}\n\\ No newline at end of file\n+ const val UPDATED_WIKITEXT = \"description.updatedWikiText\"\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/di/ExploreMapFragmentModule.kt b/app/src/main/java/fr/free/nrw/commons/di/ExploreMapFragmentModule.kt\nindex fe037d3e2a..39e01371a5 100644\n--- a/app/src/main/java/fr/free/nrw/commons/di/ExploreMapFragmentModule.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/di/ExploreMapFragmentModule.kt\n@@ -6,8 +6,7 @@ import dagger.Provides\n import fr.free.nrw.commons.explore.map.ExploreMapFragment\n \n @Module\n-class ExploreMapFragmentModule{\n-\n+class ExploreMapFragmentModule {\n @Provides\n fun ExploreMapFragment.providesActivity(): Activity = activity!!\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/di/NearbyParentFragmentModule.kt b/app/src/main/java/fr/free/nrw/commons/di/NearbyParentFragmentModule.kt\nindex 51b29621db..c7c9840ef2 100644\n--- a/app/src/main/java/fr/free/nrw/commons/di/NearbyParentFragmentModule.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/di/NearbyParentFragmentModule.kt\n@@ -6,8 +6,7 @@ import dagger.Provides\n import fr.free.nrw.commons.nearby.fragments.NearbyParentFragment\n \n @Module\n-class NearbyParentFragmentModule{\n-\n+class NearbyParentFragmentModule {\n @Provides\n fun NearbyParentFragment.providesActivity(): Activity = activity!!\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/edit/EditActivity.kt b/app/src/main/java/fr/free/nrw/commons/edit/EditActivity.kt\nindex a04e0c3232..d585a99e91 100644\n--- a/app/src/main/java/fr/free/nrw/commons/edit/EditActivity.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/edit/EditActivity.kt\n@@ -44,31 +44,32 @@ class EditActivity : AppCompatActivity() {\n imageUri = intent.getStringExtra(\"image\") ?: \"\"\n vm = ViewModelProvider(this).get(EditViewModel::class.java)\n val sourceExif = imageUri.toUri().path?.let { ExifInterface(it) }\n- val exifTags = arrayOf(\n- ExifInterface.TAG_APERTURE,\n- ExifInterface.TAG_DATETIME,\n- ExifInterface.TAG_EXPOSURE_TIME,\n- ExifInterface.TAG_FLASH,\n- ExifInterface.TAG_FOCAL_LENGTH,\n- ExifInterface.TAG_GPS_ALTITUDE,\n- ExifInterface.TAG_GPS_ALTITUDE_REF,\n- ExifInterface.TAG_GPS_DATESTAMP,\n- ExifInterface.TAG_GPS_LATITUDE,\n- ExifInterface.TAG_GPS_LATITUDE_REF,\n- ExifInterface.TAG_GPS_LONGITUDE,\n- ExifInterface.TAG_GPS_LONGITUDE_REF,\n- ExifInterface.TAG_GPS_PROCESSING_METHOD,\n- ExifInterface.TAG_GPS_TIMESTAMP,\n- ExifInterface.TAG_IMAGE_LENGTH,\n- ExifInterface.TAG_IMAGE_WIDTH,\n- ExifInterface.TAG_ISO,\n- ExifInterface.TAG_MAKE,\n- ExifInterface.TAG_MODEL,\n- ExifInterface.TAG_ORIENTATION,\n- ExifInterface.TAG_WHITE_BALANCE,\n- ExifInterface.WHITEBALANCE_AUTO,\n- ExifInterface.WHITEBALANCE_MANUAL\n- )\n+ val exifTags =\n+ arrayOf(\n+ ExifInterface.TAG_APERTURE,\n+ ExifInterface.TAG_DATETIME,\n+ ExifInterface.TAG_EXPOSURE_TIME,\n+ ExifInterface.TAG_FLASH,\n+ ExifInterface.TAG_FOCAL_LENGTH,\n+ ExifInterface.TAG_GPS_ALTITUDE,\n+ ExifInterface.TAG_GPS_ALTITUDE_REF,\n+ ExifInterface.TAG_GPS_DATESTAMP,\n+ ExifInterface.TAG_GPS_LATITUDE,\n+ ExifInterface.TAG_GPS_LATITUDE_REF,\n+ ExifInterface.TAG_GPS_LONGITUDE,\n+ ExifInterface.TAG_GPS_LONGITUDE_REF,\n+ ExifInterface.TAG_GPS_PROCESSING_METHOD,\n+ ExifInterface.TAG_GPS_TIMESTAMP,\n+ ExifInterface.TAG_IMAGE_LENGTH,\n+ ExifInterface.TAG_IMAGE_WIDTH,\n+ ExifInterface.TAG_ISO,\n+ ExifInterface.TAG_MAKE,\n+ ExifInterface.TAG_MODEL,\n+ ExifInterface.TAG_ORIENTATION,\n+ ExifInterface.TAG_WHITE_BALANCE,\n+ ExifInterface.WHITEBALANCE_AUTO,\n+ ExifInterface.WHITEBALANCE_MANUAL,\n+ )\n for (tag in exifTags) {\n val attribute = sourceExif?.getAttribute(tag.toString())\n sourceExifAttributeList.add(Pair(tag.toString(), attribute))\n@@ -87,37 +88,38 @@ class EditActivity : AppCompatActivity() {\n private fun init() {\n binding.iv.adjustViewBounds = true\n binding.iv.scaleType = ImageView.ScaleType.MATRIX\n- binding.iv.post(Runnable {\n- val options = BitmapFactory.Options()\n- options.inJustDecodeBounds = true\n- BitmapFactory.decodeFile(imageUri, options)\n-\n- val bitmapWidth = options.outWidth\n- val bitmapHeight = options.outHeight\n-\n- // Check if the bitmap dimensions exceed a certain threshold\n- val maxBitmapSize = 2000 // Set your maximum size here\n- if (bitmapWidth > maxBitmapSize || bitmapHeight > maxBitmapSize) {\n- val scaleFactor = calculateScaleFactor(bitmapWidth, bitmapHeight, maxBitmapSize)\n- options.inSampleSize = scaleFactor\n- options.inJustDecodeBounds = false\n- val scaledBitmap = BitmapFactory.decodeFile(imageUri, options)\n- binding.iv.setImageBitmap(scaledBitmap)\n- // Update the ImageView with the scaled bitmap\n- val scale = binding.iv.measuredWidth.toFloat() / scaledBitmap.width.toFloat()\n- binding.iv.layoutParams.height = (scale * scaledBitmap.height).toInt()\n- binding.iv.imageMatrix = scaleMatrix(scale, scale)\n- } else {\n-\n- options.inJustDecodeBounds = false\n- val bitmap = BitmapFactory.decodeFile(imageUri, options)\n- binding.iv.setImageBitmap(bitmap)\n-\n- val scale = binding.iv.measuredWidth.toFloat() / bitmapWidth.toFloat()\n- binding.iv.layoutParams.height = (scale * bitmapHeight).toInt()\n- binding.iv.imageMatrix = scaleMatrix(scale, scale)\n- }\n- })\n+ binding.iv.post(\n+ Runnable {\n+ val options = BitmapFactory.Options()\n+ options.inJustDecodeBounds = true\n+ BitmapFactory.decodeFile(imageUri, options)\n+\n+ val bitmapWidth = options.outWidth\n+ val bitmapHeight = options.outHeight\n+\n+ // Check if the bitmap dimensions exceed a certain threshold\n+ val maxBitmapSize = 2000 // Set your maximum size here\n+ if (bitmapWidth > maxBitmapSize || bitmapHeight > maxBitmapSize) {\n+ val scaleFactor = calculateScaleFactor(bitmapWidth, bitmapHeight, maxBitmapSize)\n+ options.inSampleSize = scaleFactor\n+ options.inJustDecodeBounds = false\n+ val scaledBitmap = BitmapFactory.decodeFile(imageUri, options)\n+ binding.iv.setImageBitmap(scaledBitmap)\n+ // Update the ImageView with the scaled bitmap\n+ val scale = binding.iv.measuredWidth.toFloat() / scaledBitmap.width.toFloat()\n+ binding.iv.layoutParams.height = (scale * scaledBitmap.height).toInt()\n+ binding.iv.imageMatrix = scaleMatrix(scale, scale)\n+ } else {\n+ options.inJustDecodeBounds = false\n+ val bitmap = BitmapFactory.decodeFile(imageUri, options)\n+ binding.iv.setImageBitmap(bitmap)\n+\n+ val scale = binding.iv.measuredWidth.toFloat() / bitmapWidth.toFloat()\n+ binding.iv.layoutParams.height = (scale * bitmapHeight).toInt()\n+ binding.iv.imageMatrix = scaleMatrix(scale, scale)\n+ }\n+ },\n+ )\n binding.rotateBtn.setOnClickListener {\n animateImageHeight()\n }\n@@ -138,8 +140,16 @@ class EditActivity : AppCompatActivity() {\n * further rotation actions.\n */\n private fun animateImageHeight() {\n- val drawableWidth: Float = binding.iv.getDrawable().getIntrinsicWidth().toFloat()\n- val drawableHeight: Float = binding.iv.getDrawable().getIntrinsicHeight().toFloat()\n+ val drawableWidth: Float =\n+ binding.iv\n+ .getDrawable()\n+ .getIntrinsicWidth()\n+ .toFloat()\n+ val drawableHeight: Float =\n+ binding.iv\n+ .getDrawable()\n+ .getIntrinsicHeight()\n+ .toFloat()\n val viewWidth: Float = binding.iv.getMeasuredWidth().toFloat()\n val viewHeight: Float = binding.iv.getMeasuredHeight().toFloat()\n val rotation = imageRotation % 360\n@@ -152,7 +162,6 @@ class EditActivity : AppCompatActivity() {\n Timber.d(\"Rotation $rotation\")\n Timber.d(\"new Rotation $newRotation\")\n \n-\n if (rotation == 0 || rotation == 180) {\n imageScale = viewWidth / drawableWidth\n newImageScale = viewWidth / drawableHeight\n@@ -169,23 +178,24 @@ class EditActivity : AppCompatActivity() {\n \n animator.interpolator = AccelerateDecelerateInterpolator()\n \n- animator.addListener(object : AnimatorListener {\n- override fun onAnimationStart(animation: Animator) {\n- binding.rotateBtn.setEnabled(false)\n- }\n-\n- override fun onAnimationEnd(animation: Animator) {\n- imageRotation = newRotation % 360\n- binding.rotateBtn.setEnabled(true)\n- }\n+ animator.addListener(\n+ object : AnimatorListener {\n+ override fun onAnimationStart(animation: Animator) {\n+ binding.rotateBtn.setEnabled(false)\n+ }\n \n- override fun onAnimationCancel(animation: Animator) {\n- }\n+ override fun onAnimationEnd(animation: Animator) {\n+ imageRotation = newRotation % 360\n+ binding.rotateBtn.setEnabled(true)\n+ }\n \n- override fun onAnimationRepeat(animation: Animator) {\n- }\n+ override fun onAnimationCancel(animation: Animator) {\n+ }\n \n- })\n+ override fun onAnimationRepeat(animation: Animator) {\n+ }\n+ },\n+ )\n \n animator.addUpdateListener { animation ->\n val animVal = animation.animatedValue as Float\n@@ -195,20 +205,21 @@ class EditActivity : AppCompatActivity() {\n val animatedScale = complementaryAnimVal * imageScale + animVal * newImageScale\n val animatedRotation = complementaryAnimVal * rotation + animVal * newRotation\n binding.iv.getLayoutParams().height = animatedHeight\n- val matrix: Matrix = rotationMatrix(\n- animatedRotation,\n- drawableWidth / 2,\n- drawableHeight / 2\n- )\n+ val matrix: Matrix =\n+ rotationMatrix(\n+ animatedRotation,\n+ drawableWidth / 2,\n+ drawableHeight / 2,\n+ )\n matrix.postScale(\n animatedScale,\n animatedScale,\n drawableWidth / 2,\n- drawableHeight / 2\n+ drawableHeight / 2,\n )\n matrix.postTranslate(\n -(drawableWidth - binding.iv.getMeasuredWidth()) / 2,\n- -(drawableHeight - binding.iv.getMeasuredHeight()) / 2\n+ -(drawableHeight - binding.iv.getMeasuredHeight()) / 2,\n )\n binding.iv.setImageMatrix(matrix)\n binding.iv.requestLayout()\n@@ -228,11 +239,9 @@ class EditActivity : AppCompatActivity() {\n * as a result, and finishes the current activity.\n */\n fun getRotatedImage() {\n-\n val filePath = imageUri.toUri().path\n val file = filePath?.let { File(it) }\n \n-\n val rotatedImage = file?.let { vm.rotateImage(imageRotation, it) }\n if (rotatedImage == null) {\n Toast.makeText(this, \"Failed to rotate to image\", Toast.LENGTH_LONG).show()\n@@ -243,9 +252,9 @@ class EditActivity : AppCompatActivity() {\n copyExifData(editedImageExif)\n }\n val resultIntent = Intent()\n- resultIntent.putExtra(\"editedImageFilePath\", rotatedImage?.toUri()?.path ?: \"Error\");\n- setResult(RESULT_OK, resultIntent);\n- finish();\n+ resultIntent.putExtra(\"editedImageFilePath\", rotatedImage?.toUri()?.path ?: \"Error\")\n+ setResult(RESULT_OK, resultIntent)\n+ finish()\n }\n \n /**\n@@ -257,7 +266,6 @@ class EditActivity : AppCompatActivity() {\n * @param editedImageExif The ExifInterface object for the edited image.\n */\n private fun copyExifData(editedImageExif: ExifInterface?) {\n-\n for (attr in sourceExifAttributeList) {\n Log.d(\"Tag is ${attr.first}\", \"Value is ${attr.second}\")\n editedImageExif!!.setAttribute(attr.first, attr.second)\n@@ -282,7 +290,11 @@ class EditActivity : AppCompatActivity() {\n * The scale factor ensures that the scaled bitmap will fit within the maximum size\n * while maintaining aspect ratio.\n */\n- private fun calculateScaleFactor(originalWidth: Int, originalHeight: Int, maxSize: Int): Int {\n+ private fun calculateScaleFactor(\n+ originalWidth: Int,\n+ originalHeight: Int,\n+ maxSize: Int,\n+ ): Int {\n var scaleFactor = 1\n \n if (originalWidth > maxSize || originalHeight > maxSize) {\n@@ -295,7 +307,4 @@ class EditActivity : AppCompatActivity() {\n \n return scaleFactor\n }\n-\n-\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/edit/EditViewModel.kt b/app/src/main/java/fr/free/nrw/commons/edit/EditViewModel.kt\nindex 80db0f1ab1..9bf6f93145 100644\n--- a/app/src/main/java/fr/free/nrw/commons/edit/EditViewModel.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/edit/EditViewModel.kt\n@@ -9,8 +9,7 @@ import java.io.File\n * This ViewModel class is responsible for managing image editing operations, such as\n * rotating images. It utilizes a TransformImage implementation to perform image transformations.\n */\n-class EditViewModel() : ViewModel() {\n-\n+class EditViewModel : ViewModel() {\n // Ideally should be injected using DI\n private val transformImage: TransformImage = TransformImageImpl()\n \n@@ -21,7 +20,8 @@ class EditViewModel() : ViewModel() {\n * @param imageFile The File representing the image to be rotated.\n * @return The rotated image File, or null if the rotation operation fails.\n */\n- fun rotateImage(degree: Int, imageFile: File): File? {\n- return transformImage.rotateImage(imageFile, degree)\n- }\n-}\n\\ No newline at end of file\n+ fun rotateImage(\n+ degree: Int,\n+ imageFile: File,\n+ ): File? = transformImage.rotateImage(imageFile, degree)\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/edit/TransformImage.kt b/app/src/main/java/fr/free/nrw/commons/edit/TransformImage.kt\nindex 4c3607a8ed..586df0daf0 100644\n--- a/app/src/main/java/fr/free/nrw/commons/edit/TransformImage.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/edit/TransformImage.kt\n@@ -9,7 +9,6 @@ import java.io.File\n * implementations to provide specific functionality for tasks like rotating images.\n */\n interface TransformImage {\n-\n /**\n * Rotates the specified image file by the given degree.\n *\n@@ -17,5 +16,8 @@ interface TransformImage {\n * @param degree The degree by which to rotate the image.\n * @return The rotated image File, or null if the rotation operation fails.\n */\n- fun rotateImage(imageFile: File, degree : Int ):File?\n-}\n\\ No newline at end of file\n+ fun rotateImage(\n+ imageFile: File,\n+ degree: Int,\n+ ): File?\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/edit/TransformImageImpl.kt b/app/src/main/java/fr/free/nrw/commons/edit/TransformImageImpl.kt\nindex fb96ca0443..b596196915 100644\n--- a/app/src/main/java/fr/free/nrw/commons/edit/TransformImageImpl.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/edit/TransformImageImpl.kt\n@@ -15,8 +15,7 @@ import java.io.FileOutputStream\n * function for rotating images by a specified degree using the LLJTran library. Right now it reads\n * the input image file, performs the rotation, and saves the rotated image to a new file.\n */\n-class TransformImageImpl() : TransformImage {\n-\n+class TransformImageImpl : TransformImage {\n /**\n * Rotates the specified image file by the given degree.\n *\n@@ -24,46 +23,50 @@ class TransformImageImpl() : TransformImage {\n * @param degree The degree by which to rotate the image.\n * @return The rotated image File, or null if the rotation operation fails.\n */\n- override fun rotateImage(imageFile: File, degree : Int): File? {\n-\n+ override fun rotateImage(\n+ imageFile: File,\n+ degree: Int,\n+ ): File? {\n Timber.tag(\"Trying to rotate image\").d(\"Starting\")\n \n- val path = Environment.getExternalStoragePublicDirectory(\n- Environment.DIRECTORY_DOWNLOADS\n- )\n+ val path =\n+ Environment.getExternalStoragePublicDirectory(\n+ Environment.DIRECTORY_DOWNLOADS,\n+ )\n \n val imagePath = System.currentTimeMillis()\n val file: File = File(path, \"$imagePath.jpg\")\n \n val output = file\n \n- val rotated = try {\n- val lljTran = LLJTran(imageFile)\n- lljTran.read(\n- LLJTran.READ_ALL,\n- false,\n- ) // This could throw an LLJTranException. I am not catching it for now... Let's see.\n- lljTran.transform(\n- when(degree){\n- 90 -> LLJTran.ROT_90\n- 180 -> LLJTran.ROT_180\n- 270 -> LLJTran.ROT_270\n- else -> {\n- LLJTran.ROT_90\n- }\n- },\n- LLJTran.OPT_DEFAULTS or LLJTran.OPT_XFORM_ORIENTATION\n- )\n- BufferedOutputStream(FileOutputStream(output)).use { writer ->\n- lljTran.save(writer, LLJTran.OPT_WRITE_ALL )\n+ val rotated =\n+ try {\n+ val lljTran = LLJTran(imageFile)\n+ lljTran.read(\n+ LLJTran.READ_ALL,\n+ false,\n+ ) // This could throw an LLJTranException. I am not catching it for now... Let's see.\n+ lljTran.transform(\n+ when (degree) {\n+ 90 -> LLJTran.ROT_90\n+ 180 -> LLJTran.ROT_180\n+ 270 -> LLJTran.ROT_270\n+ else -> {\n+ LLJTran.ROT_90\n+ }\n+ },\n+ LLJTran.OPT_DEFAULTS or LLJTran.OPT_XFORM_ORIENTATION,\n+ )\n+ BufferedOutputStream(FileOutputStream(output)).use { writer ->\n+ lljTran.save(writer, LLJTran.OPT_WRITE_ALL)\n+ }\n+ lljTran.freeMemory()\n+ true\n+ } catch (e: LLJTranException) {\n+ Timber.tag(\"Error\").d(e)\n+ return null\n+ false\n }\n- lljTran.freeMemory()\n- true\n- } catch (e: LLJTranException) {\n- Timber.tag(\"Error\").d(e)\n- return null\n- false\n- }\n \n if (rotated) {\n Timber.tag(\"Done rotating image\").d(\"Done\")\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/SearchModule.kt b/app/src/main/java/fr/free/nrw/commons/explore/SearchModule.kt\nindex e0a9d41a01..4323613229 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/SearchModule.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/SearchModule.kt\n@@ -15,14 +15,11 @@ import fr.free.nrw.commons.explore.media.SearchMediaFragmentPresenterImpl\n @Module\n abstract class SearchModule {\n @Binds\n- abstract fun SearchDepictionsFragmentPresenterImpl.bindsSearchDepictionsFragmentPresenter()\n- : SearchDepictionsFragmentPresenter\n+ abstract fun SearchDepictionsFragmentPresenterImpl.bindsSearchDepictionsFragmentPresenter(): SearchDepictionsFragmentPresenter\n \n @Binds\n- abstract fun SearchCategoriesFragmentPresenterImpl.bindsSearchCategoriesFragmentPresenter()\n- : SearchCategoriesFragmentPresenter\n+ abstract fun SearchCategoriesFragmentPresenterImpl.bindsSearchCategoriesFragmentPresenter(): SearchCategoriesFragmentPresenter\n \n @Binds\n- abstract fun SearchMediaFragmentPresenterImpl.bindsSearchMediaFragmentPresenter()\n- : SearchMediaFragmentPresenter\n+ abstract fun SearchMediaFragmentPresenterImpl.bindsSearchMediaFragmentPresenter(): SearchMediaFragmentPresenter\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/CategoriesModule.kt b/app/src/main/java/fr/free/nrw/commons/explore/categories/CategoriesModule.kt\nindex 394b88ca6c..7d66f59de0 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/categories/CategoriesModule.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/CategoriesModule.kt\n@@ -9,19 +9,14 @@ import fr.free.nrw.commons.explore.categories.parent.ParentCategoriesPresenterIm\n import fr.free.nrw.commons.explore.categories.sub.SubCategoriesPresenter\n import fr.free.nrw.commons.explore.categories.sub.SubCategoriesPresenterImpl\n \n-\n @Module\n abstract class CategoriesModule {\n-\n @Binds\n- abstract fun CategoryMediaPresenterImpl.bindsCategoryMediaPresenter()\n- : CategoryMediaPresenter\n+ abstract fun CategoryMediaPresenterImpl.bindsCategoryMediaPresenter(): CategoryMediaPresenter\n \n @Binds\n- abstract fun SubCategoriesPresenterImpl.bindsSubCategoriesPresenter()\n- : SubCategoriesPresenter\n+ abstract fun SubCategoriesPresenterImpl.bindsSubCategoriesPresenter(): SubCategoriesPresenter\n \n @Binds\n- abstract fun ParentCategoriesPresenterImpl.bindsParentCategoriesPresenter()\n- : ParentCategoriesPresenter\n+ abstract fun ParentCategoriesPresenterImpl.bindsParentCategoriesPresenter(): ParentCategoriesPresenter\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/PageableCategoryFragment.kt b/app/src/main/java/fr/free/nrw/commons/explore/categories/PageableCategoryFragment.kt\nindex 54a97cb093..89d2bd817f 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/categories/PageableCategoryFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/PageableCategoryFragment.kt\n@@ -4,7 +4,6 @@ import fr.free.nrw.commons.R\n import fr.free.nrw.commons.category.CategoryDetailsActivity\n import fr.free.nrw.commons.explore.paging.BasePagingFragment\n \n-\n abstract class PageableCategoryFragment : BasePagingFragment() {\n override val errorTextId: Int = R.string.error_loading_categories\n override val pagedListAdapter by lazy {\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/PagedCategoriesAdapter.kt b/app/src/main/java/fr/free/nrw/commons/explore/categories/PagedCategoriesAdapter.kt\nindex 6710f8dc81..04edcc1e22 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/categories/PagedCategoriesAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/PagedCategoriesAdapter.kt\n@@ -8,31 +8,44 @@ import androidx.recyclerview.widget.RecyclerView\n import fr.free.nrw.commons.category.CATEGORY_PREFIX\n import fr.free.nrw.commons.databinding.ItemRecentSearchesBinding\n \n-class PagedSearchCategoriesAdapter(private val onCategoryClicked: (String) -> Unit) :\n- PagedListAdapter(PagedSearchCategoriesDiffUtilCallback) {\n-\n- override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = CategoryItemViewHolder(\n- ItemRecentSearchesBinding.inflate(LayoutInflater.from(parent.context), parent, false)\n+class PagedSearchCategoriesAdapter(\n+ private val onCategoryClicked: (String) -> Unit,\n+) : PagedListAdapter(PagedSearchCategoriesDiffUtilCallback) {\n+ override fun onCreateViewHolder(\n+ parent: ViewGroup,\n+ viewType: Int,\n+ ) = CategoryItemViewHolder(\n+ ItemRecentSearchesBinding.inflate(LayoutInflater.from(parent.context), parent, false),\n )\n \n- override fun onBindViewHolder(holder: CategoryItemViewHolder, position: Int) {\n+ override fun onBindViewHolder(\n+ holder: CategoryItemViewHolder,\n+ position: Int,\n+ ) {\n holder.bind(getItem(position)!!, onCategoryClicked)\n }\n }\n \n class CategoryItemViewHolder(\n- private val binding: ItemRecentSearchesBinding\n+ private val binding: ItemRecentSearchesBinding,\n ) : RecyclerView.ViewHolder(binding.root) {\n- fun bind(item: String, onCategoryClicked: (String) -> Unit) = with(binding) {\n+ fun bind(\n+ item: String,\n+ onCategoryClicked: (String) -> Unit,\n+ ) = with(binding) {\n root.setOnClickListener { onCategoryClicked(item) }\n textView1.text = item.substringAfter(CATEGORY_PREFIX)\n }\n }\n \n private object PagedSearchCategoriesDiffUtilCallback : DiffUtil.ItemCallback() {\n- override fun areItemsTheSame(oldItem: String, newItem: String) =\n- oldItem == newItem\n+ override fun areItemsTheSame(\n+ oldItem: String,\n+ newItem: String,\n+ ) = oldItem == newItem\n \n- override fun areContentsTheSame(oldItem: String, newItem: String) =\n- oldItem == newItem\n+ override fun areContentsTheSame(\n+ oldItem: String,\n+ newItem: String,\n+ ) = oldItem == newItem\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/media/CategoriesMediaFragment.kt b/app/src/main/java/fr/free/nrw/commons/explore/categories/media/CategoriesMediaFragment.kt\nindex c13445f2b7..6de1248b4a 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/categories/media/CategoriesMediaFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/media/CategoriesMediaFragment.kt\n@@ -6,16 +6,17 @@ import fr.free.nrw.commons.category.CATEGORY_PREFIX\n import fr.free.nrw.commons.explore.media.PageableMediaFragment\n import javax.inject.Inject\n \n-\n class CategoriesMediaFragment : PageableMediaFragment() {\n-\n @Inject\n lateinit var presenter: CategoryMediaPresenter\n \n override val injectedPresenter\n get() = presenter\n \n- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {\n+ override fun onViewCreated(\n+ view: View,\n+ savedInstanceState: Bundle?,\n+ ) {\n super.onViewCreated(view, savedInstanceState)\n onQueryUpdated(\"$CATEGORY_PREFIX${arguments!!.getString(\"categoryName\")!!}\")\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/media/CategoryMediaPresenterImpl.kt b/app/src/main/java/fr/free/nrw/commons/explore/categories/media/CategoryMediaPresenterImpl.kt\nindex 0ca581416a..07e5b0f568 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/categories/media/CategoryMediaPresenterImpl.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/media/CategoryMediaPresenterImpl.kt\n@@ -13,8 +13,10 @@ interface CategoryMediaPresenter : PagingContract.Presenter\n /**\n * Presenter for DepictedImagesFragment\n */\n-class CategoryMediaPresenterImpl @Inject constructor(\n- @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n- dataSourceFactory: PageableCategoriesMediaDataSource\n-) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n- CategoryMediaPresenter\n+class CategoryMediaPresenterImpl\n+ @Inject\n+ constructor(\n+ @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n+ dataSourceFactory: PageableCategoriesMediaDataSource,\n+ ) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n+ CategoryMediaPresenter\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/media/PageableCategoriesMediaDataSource.kt b/app/src/main/java/fr/free/nrw/commons/explore/categories/media/PageableCategoriesMediaDataSource.kt\nindex 7ba5209f86..49ed304853 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/categories/media/PageableCategoriesMediaDataSource.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/media/PageableCategoriesMediaDataSource.kt\n@@ -7,14 +7,16 @@ import fr.free.nrw.commons.explore.paging.PageableBaseDataSource\n import fr.free.nrw.commons.media.MediaClient\n import javax.inject.Inject\n \n-class PageableCategoriesMediaDataSource @Inject constructor(\n- liveDataConverter: LiveDataConverter,\n- private val mediaClient: MediaClient\n-) : PageableBaseDataSource(liveDataConverter) {\n- override val loadFunction: LoadFunction = { loadSize: Int, startPosition: Int ->\n- if(startPosition == 0){\n- mediaClient.resetCategoryContinuation(query)\n+class PageableCategoriesMediaDataSource\n+ @Inject\n+ constructor(\n+ liveDataConverter: LiveDataConverter,\n+ private val mediaClient: MediaClient,\n+ ) : PageableBaseDataSource(liveDataConverter) {\n+ override val loadFunction: LoadFunction = { loadSize: Int, startPosition: Int ->\n+ if (startPosition == 0) {\n+ mediaClient.resetCategoryContinuation(query)\n+ }\n+ mediaClient.getMediaListFromCategory(query).blockingGet()\n }\n- mediaClient.getMediaListFromCategory(query).blockingGet()\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/parent/PageableParentCategoriesDataSource.kt b/app/src/main/java/fr/free/nrw/commons/explore/categories/parent/PageableParentCategoriesDataSource.kt\nindex 16a7cdb088..b045be7d23 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/categories/parent/PageableParentCategoriesDataSource.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/parent/PageableParentCategoriesDataSource.kt\n@@ -5,15 +5,16 @@ import fr.free.nrw.commons.explore.paging.LiveDataConverter\n import fr.free.nrw.commons.explore.paging.PageableBaseDataSource\n import javax.inject.Inject\n \n-class PageableParentCategoriesDataSource @Inject constructor(\n- liveDataConverter: LiveDataConverter,\n- val categoryClient: CategoryClient\n-) : PageableBaseDataSource(liveDataConverter) {\n-\n- override val loadFunction = { loadSize: Int, startPosition: Int ->\n- if (startPosition == 0) {\n- categoryClient.resetParentCategoryContinuation(query)\n+class PageableParentCategoriesDataSource\n+ @Inject\n+ constructor(\n+ liveDataConverter: LiveDataConverter,\n+ val categoryClient: CategoryClient,\n+ ) : PageableBaseDataSource(liveDataConverter) {\n+ override val loadFunction = { loadSize: Int, startPosition: Int ->\n+ if (startPosition == 0) {\n+ categoryClient.resetParentCategoryContinuation(query)\n+ }\n+ categoryClient.getParentCategoryList(query).blockingGet().map { it.name }\n }\n- categoryClient.getParentCategoryList(query).blockingGet().map { it.name }\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/parent/ParentCategoriesFragment.kt b/app/src/main/java/fr/free/nrw/commons/explore/categories/parent/ParentCategoriesFragment.kt\nindex a43fdad1dc..6ceccf6075 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/categories/parent/ParentCategoriesFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/parent/ParentCategoriesFragment.kt\n@@ -7,9 +7,7 @@ import fr.free.nrw.commons.category.CATEGORY_PREFIX\n import fr.free.nrw.commons.explore.categories.PageableCategoryFragment\n import javax.inject.Inject\n \n-\n class ParentCategoriesFragment : PageableCategoryFragment() {\n-\n @Inject\n lateinit var presenter: ParentCategoriesPresenter\n \n@@ -18,9 +16,11 @@ class ParentCategoriesFragment : PageableCategoryFragment() {\n \n override fun getEmptyText(query: String) = getString(R.string.no_parentcategory_found)\n \n- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {\n+ override fun onViewCreated(\n+ view: View,\n+ savedInstanceState: Bundle?,\n+ ) {\n super.onViewCreated(view, savedInstanceState)\n onQueryUpdated(\"$CATEGORY_PREFIX${arguments!!.getString(\"categoryName\")!!}\")\n }\n }\n-\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/parent/ParentCategoriesPresenterImpl.kt b/app/src/main/java/fr/free/nrw/commons/explore/categories/parent/ParentCategoriesPresenterImpl.kt\nindex 90c11d10d4..06ba4e5eb1 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/categories/parent/ParentCategoriesPresenterImpl.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/parent/ParentCategoriesPresenterImpl.kt\n@@ -7,11 +7,12 @@ import io.reactivex.Scheduler\n import javax.inject.Inject\n import javax.inject.Named\n \n-\n interface ParentCategoriesPresenter : PagingContract.Presenter\n \n-class ParentCategoriesPresenterImpl @Inject constructor(\n- @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n- dataSourceFactory: PageableParentCategoriesDataSource\n-) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n- ParentCategoriesPresenter\n+class ParentCategoriesPresenterImpl\n+ @Inject\n+ constructor(\n+ @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n+ dataSourceFactory: PageableParentCategoriesDataSource,\n+ ) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n+ ParentCategoriesPresenter\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/search/PageableSearchCategoriesDataSource.kt b/app/src/main/java/fr/free/nrw/commons/explore/categories/search/PageableSearchCategoriesDataSource.kt\nindex 775462861b..11591bea72 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/categories/search/PageableSearchCategoriesDataSource.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/search/PageableSearchCategoriesDataSource.kt\n@@ -5,13 +5,16 @@ import fr.free.nrw.commons.explore.paging.LiveDataConverter\n import fr.free.nrw.commons.explore.paging.PageableBaseDataSource\n import javax.inject.Inject\n \n-class PageableSearchCategoriesDataSource @Inject constructor(\n- liveDataConverter: LiveDataConverter,\n- val categoryClient: CategoryClient\n-) : PageableBaseDataSource(liveDataConverter) {\n-\n- override val loadFunction = { loadSize: Int, startPosition: Int ->\n- categoryClient.searchCategories(query, loadSize, startPosition).blockingGet()\n- .map { it.name }\n+class PageableSearchCategoriesDataSource\n+ @Inject\n+ constructor(\n+ liveDataConverter: LiveDataConverter,\n+ val categoryClient: CategoryClient,\n+ ) : PageableBaseDataSource(liveDataConverter) {\n+ override val loadFunction = { loadSize: Int, startPosition: Int ->\n+ categoryClient\n+ .searchCategories(query, loadSize, startPosition)\n+ .blockingGet()\n+ .map { it.name }\n+ }\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/search/SearchCategoriesFragmentPresenterImpl.kt b/app/src/main/java/fr/free/nrw/commons/explore/categories/search/SearchCategoriesFragmentPresenterImpl.kt\nindex 998dee1e80..0624cea5be 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/categories/search/SearchCategoriesFragmentPresenterImpl.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/search/SearchCategoriesFragmentPresenterImpl.kt\n@@ -9,8 +9,10 @@ import javax.inject.Named\n \n interface SearchCategoriesFragmentPresenter : PagingContract.Presenter\n \n-class SearchCategoriesFragmentPresenterImpl @Inject constructor(\n- @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n- dataSourceFactory: PageableSearchCategoriesDataSource\n-) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n- SearchCategoriesFragmentPresenter\n+class SearchCategoriesFragmentPresenterImpl\n+ @Inject\n+ constructor(\n+ @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n+ dataSourceFactory: PageableSearchCategoriesDataSource,\n+ ) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n+ SearchCategoriesFragmentPresenter\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/sub/PageableSubCategoriesDataSource.kt b/app/src/main/java/fr/free/nrw/commons/explore/categories/sub/PageableSubCategoriesDataSource.kt\nindex 4c1df96693..6179b92551 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/categories/sub/PageableSubCategoriesDataSource.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/sub/PageableSubCategoriesDataSource.kt\n@@ -5,15 +5,16 @@ import fr.free.nrw.commons.explore.paging.LiveDataConverter\n import fr.free.nrw.commons.explore.paging.PageableBaseDataSource\n import javax.inject.Inject\n \n-class PageableSubCategoriesDataSource @Inject constructor(\n- liveDataConverter: LiveDataConverter,\n- val categoryClient: CategoryClient\n-) : PageableBaseDataSource(liveDataConverter) {\n-\n- override val loadFunction = { loadSize: Int, startPosition: Int ->\n- if (startPosition == 0) {\n- categoryClient.resetSubCategoryContinuation(query)\n+class PageableSubCategoriesDataSource\n+ @Inject\n+ constructor(\n+ liveDataConverter: LiveDataConverter,\n+ val categoryClient: CategoryClient,\n+ ) : PageableBaseDataSource(liveDataConverter) {\n+ override val loadFunction = { loadSize: Int, startPosition: Int ->\n+ if (startPosition == 0) {\n+ categoryClient.resetSubCategoryContinuation(query)\n+ }\n+ categoryClient.getSubCategoryList(query).blockingGet().map { it.name }\n }\n- categoryClient.getSubCategoryList(query).blockingGet().map { it.name }\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/sub/SubCategoriesFragment.kt b/app/src/main/java/fr/free/nrw/commons/explore/categories/sub/SubCategoriesFragment.kt\nindex 36ffca70e7..19fe52beb0 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/categories/sub/SubCategoriesFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/sub/SubCategoriesFragment.kt\n@@ -7,9 +7,7 @@ import fr.free.nrw.commons.category.CATEGORY_PREFIX\n import fr.free.nrw.commons.explore.categories.PageableCategoryFragment\n import javax.inject.Inject\n \n-\n class SubCategoriesFragment : PageableCategoryFragment() {\n-\n @Inject lateinit var presenter: SubCategoriesPresenter\n \n override val injectedPresenter\n@@ -17,7 +15,10 @@ class SubCategoriesFragment : PageableCategoryFragment() {\n \n override fun getEmptyText(query: String) = getString(R.string.no_subcategory_found)\n \n- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {\n+ override fun onViewCreated(\n+ view: View,\n+ savedInstanceState: Bundle?,\n+ ) {\n super.onViewCreated(view, savedInstanceState)\n onQueryUpdated(\"$CATEGORY_PREFIX${arguments!!.getString(\"categoryName\")!!}\")\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/categories/sub/SubCategoriesPresenterImpl.kt b/app/src/main/java/fr/free/nrw/commons/explore/categories/sub/SubCategoriesPresenterImpl.kt\nindex 5f41a36a44..df4aebcf26 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/categories/sub/SubCategoriesPresenterImpl.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/categories/sub/SubCategoriesPresenterImpl.kt\n@@ -9,8 +9,10 @@ import javax.inject.Named\n \n interface SubCategoriesPresenter : PagingContract.Presenter\n \n-class SubCategoriesPresenterImpl @Inject constructor(\n- @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n- dataSourceFactory: PageableSubCategoriesDataSource\n-) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n- SubCategoriesPresenter\n+class SubCategoriesPresenterImpl\n+ @Inject\n+ constructor(\n+ @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n+ dataSourceFactory: PageableSubCategoriesDataSource,\n+ ) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n+ SubCategoriesPresenter\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictionAdapter.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictionAdapter.kt\nindex 632881150b..56baacc659 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictionAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictionAdapter.kt\n@@ -9,22 +9,31 @@ import fr.free.nrw.commons.R\n import fr.free.nrw.commons.databinding.ItemDepictionsBinding\n import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n \n-class DepictionAdapter(private val onDepictionClicked: (DepictedItem) -> Unit) :\n- PagedListAdapter(DepictionDiffUtilCallback) {\n-\n- override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = DepictedItemViewHolder(\n- ItemDepictionsBinding.inflate(LayoutInflater.from(parent.context), parent, false)\n+class DepictionAdapter(\n+ private val onDepictionClicked: (DepictedItem) -> Unit,\n+) : PagedListAdapter(DepictionDiffUtilCallback) {\n+ override fun onCreateViewHolder(\n+ parent: ViewGroup,\n+ viewType: Int,\n+ ) = DepictedItemViewHolder(\n+ ItemDepictionsBinding.inflate(LayoutInflater.from(parent.context), parent, false),\n )\n \n- override fun onBindViewHolder(holder: DepictedItemViewHolder, position: Int) {\n+ override fun onBindViewHolder(\n+ holder: DepictedItemViewHolder,\n+ position: Int,\n+ ) {\n holder.bind(getItem(position)!!, onDepictionClicked)\n }\n }\n \n class DepictedItemViewHolder(\n- private val binding: ItemDepictionsBinding\n+ private val binding: ItemDepictionsBinding,\n ) : RecyclerView.ViewHolder(binding.root) {\n- fun bind(item: DepictedItem, onDepictionClicked: (DepictedItem) -> Unit) = with(binding) {\n+ fun bind(\n+ item: DepictedItem,\n+ onDepictionClicked: (DepictedItem) -> Unit,\n+ ) = with(binding) {\n root.setOnClickListener { onDepictionClicked(item) }\n depictsLabel.text = item.name\n description.text = item.description\n@@ -37,9 +46,13 @@ class DepictedItemViewHolder(\n }\n \n private object DepictionDiffUtilCallback : DiffUtil.ItemCallback() {\n- override fun areItemsTheSame(oldItem: DepictedItem, newItem: DepictedItem) =\n- oldItem.id == newItem.id\n+ override fun areItemsTheSame(\n+ oldItem: DepictedItem,\n+ newItem: DepictedItem,\n+ ) = oldItem.id == newItem.id\n \n- override fun areContentsTheSame(oldItem: DepictedItem, newItem: DepictedItem) =\n- oldItem == newItem\n+ override fun areContentsTheSame(\n+ oldItem: DepictedItem,\n+ newItem: DepictedItem,\n+ ) = oldItem == newItem\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictionModule.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictionModule.kt\nindex cb8ee6999c..d6d5954e1b 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictionModule.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictionModule.kt\n@@ -14,16 +14,12 @@ import fr.free.nrw.commons.explore.depictions.parent.ParentDepictionsPresenterIm\n */\n @Module\n abstract class DepictionModule {\n-\n @Binds\n- abstract fun ParentDepictionsPresenterImpl.bindsParentDepictionPresenter()\n- : ParentDepictionsPresenter\n+ abstract fun ParentDepictionsPresenterImpl.bindsParentDepictionPresenter(): ParentDepictionsPresenter\n \n @Binds\n- abstract fun ChildDepictionsPresenterImpl.bindsChildDepictionPresenter()\n- : ChildDepictionsPresenter\n+ abstract fun ChildDepictionsPresenterImpl.bindsChildDepictionPresenter(): ChildDepictionsPresenter\n \n @Binds\n- abstract fun DepictedImagesPresenterImpl.bindsDepictedImagesContractPresenter()\n- : DepictedImagesPresenter\n+ abstract fun DepictedImagesPresenterImpl.bindsDepictedImagesContractPresenter(): DepictedImagesPresenter\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictsClient.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictsClient.kt\nindex e01e12f55f..acf0f9351d 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictsClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictsClient.kt\n@@ -10,9 +10,9 @@ import fr.free.nrw.commons.wikidata.WikidataProperties\n import fr.free.nrw.commons.wikidata.model.DataValue\n import fr.free.nrw.commons.wikidata.model.DepictSearchItem\n import fr.free.nrw.commons.wikidata.model.Entities\n-import fr.free.nrw.commons.wikidata.model.Statement_partial\n+import fr.free.nrw.commons.wikidata.model.StatementPartial\n import io.reactivex.Single\n-import java.util.*\n+import java.util.Locale\n import javax.inject.Inject\n import javax.inject.Singleton\n \n@@ -20,89 +20,101 @@ import javax.inject.Singleton\n * Depicts Client to handle custom calls to Commons Wikibase APIs\n */\n @Singleton\n-class DepictsClient @Inject constructor(private val depictsInterface: DepictsInterface) {\n+class DepictsClient\n+ @Inject\n+ constructor(\n+ private val depictsInterface: DepictsInterface,\n+ ) {\n+ /**\n+ * Search for depictions using the search item\n+ * @return list of depicted items\n+ */\n+ fun searchForDepictions(\n+ query: String?,\n+ limit: Int,\n+ offset: Int,\n+ ): Single> {\n+ val language = Locale.getDefault().language\n+ return depictsInterface\n+ .searchForDepicts(query, \"$limit\", language, language, \"$offset\")\n+ .map { it.search.joinToString(\"|\", transform = DepictSearchItem::id) }\n+ .mapToDepictions()\n+ }\n \n- /**\n- * Search for depictions using the search item\n- * @return list of depicted items\n- */\n- fun searchForDepictions(query: String?, limit: Int, offset: Int): Single> {\n- val language = Locale.getDefault().language\n- return depictsInterface.searchForDepicts(query, \"$limit\", language, language, \"$offset\")\n- .map { it.search.joinToString(\"|\", transform = DepictSearchItem::id) }\n- .mapToDepictions()\n- }\n+ fun getEntities(ids: String): Single = depictsInterface.getEntities(ids)\n \n- fun getEntities(ids: String): Single {\n- return depictsInterface.getEntities(ids)\n- }\n+ fun toDepictions(sparqlResponse: Single): Single> =\n+ sparqlResponse\n+ .map {\n+ it.results.bindings.joinToString(\"|\", transform = Binding::id)\n+ }.mapToDepictions()\n \n- fun toDepictions(sparqlResponse: Single): Single> {\n- return sparqlResponse.map {\n- it.results.bindings.joinToString(\"|\", transform = Binding::id)\n- }.mapToDepictions()\n- }\n-\n- /**\n- * Fetches Entities from ids ex. \"Q1233|Q546\" and converts them into DepictedItem\n- */\n- @SuppressLint(\"CheckResult\")\n- private fun Single.mapToDepictions() =\n- flatMap(::getEntities)\n- .map { entities ->\n- entities.entities().values.map { entity ->\n- mapToDepictItem(entity)\n- }\n- }\n+ /**\n+ * Fetches Entities from ids ex. \"Q1233|Q546\" and converts them into DepictedItem\n+ */\n+ @SuppressLint(\"CheckResult\")\n+ private fun Single.mapToDepictions() =\n+ flatMap(::getEntities)\n+ .map { entities ->\n+ entities.entities().values.map { entity ->\n+ mapToDepictItem(entity)\n+ }\n+ }\n \n- /**\n- * Convert different entities into DepictedItem\n- */\n- private fun mapToDepictItem(entity: Entities.Entity): DepictedItem {\n- return if (entity.descriptions().byLanguageOrFirstOrEmpty() == \"\") {\n- val instanceOfIDs = entity[WikidataProperties.INSTANCE_OF]\n- .toIds()\n- if (instanceOfIDs.isNotEmpty()) {\n- val entities: Entities = getEntities(instanceOfIDs[0]).blockingGet()\n- val nameAsDescription = entities.entities().values.first().labels()\n- .byLanguageOrFirstOrEmpty()\n- DepictedItem(\n- entity,\n- entity.labels().byLanguageOrFirstOrEmpty(),\n- nameAsDescription\n- )\n+ /**\n+ * Convert different entities into DepictedItem\n+ */\n+ private fun mapToDepictItem(entity: Entities.Entity): DepictedItem =\n+ if (entity.descriptions().byLanguageOrFirstOrEmpty() == \"\") {\n+ val instanceOfIDs =\n+ entity[WikidataProperties.INSTANCE_OF]\n+ .toIds()\n+ if (instanceOfIDs.isNotEmpty()) {\n+ val entities: Entities = getEntities(instanceOfIDs[0]).blockingGet()\n+ val nameAsDescription =\n+ entities\n+ .entities()\n+ .values\n+ .first()\n+ .labels()\n+ .byLanguageOrFirstOrEmpty()\n+ DepictedItem(\n+ entity,\n+ entity.labels().byLanguageOrFirstOrEmpty(),\n+ nameAsDescription,\n+ )\n+ } else {\n+ DepictedItem(\n+ entity,\n+ entity.labels().byLanguageOrFirstOrEmpty(),\n+ \"\",\n+ )\n+ }\n } else {\n DepictedItem(\n entity,\n entity.labels().byLanguageOrFirstOrEmpty(),\n- \"\"\n+ entity.descriptions().byLanguageOrFirstOrEmpty(),\n )\n }\n- } else {\n- DepictedItem(\n- entity,\n- entity.labels().byLanguageOrFirstOrEmpty(),\n- entity.descriptions().byLanguageOrFirstOrEmpty()\n- )\n- }\n- }\n \n- /**\n- * Tries to get Entities.Label by default language from the map.\n- * If that returns null, Tries to retrieve first element from the map.\n- * If that still returns null, function returns \"\".\n- */\n- private fun Map.byLanguageOrFirstOrEmpty() =\n- let {\n- it[Locale.getDefault().language] ?: it.values.firstOrNull() }?.value() ?: \"\"\n+ /**\n+ * Tries to get Entities.Label by default language from the map.\n+ * If that returns null, Tries to retrieve first element from the map.\n+ * If that still returns null, function returns \"\".\n+ */\n+ private fun Map.byLanguageOrFirstOrEmpty() =\n+ let {\n+ it[Locale.getDefault().language] ?: it.values.firstOrNull()\n+ }?.value() ?: \"\"\n \n- /**\n- * returns list of id ex. \"Q2323\" from Statement_partial\n- */\n- private fun List?.toIds(): List {\n- return this?.map { it.mainSnak.dataValue }\n- ?.filterIsInstance()\n- ?.map { it.value.id }\n- ?: emptyList()\n+ /**\n+ * returns list of id ex. \"Q2323\" from Statement_partial\n+ */\n+ private fun List?.toIds(): List =\n+ this\n+ ?.map { it.mainSnak.dataValue }\n+ ?.filterIsInstance()\n+ ?.map { it.value.id }\n+ ?: emptyList()\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/PageableDepictionsFragment.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/PageableDepictionsFragment.kt\nindex 4c288d08ab..9c41628a23 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/PageableDepictionsFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/PageableDepictionsFragment.kt\n@@ -4,7 +4,6 @@ import fr.free.nrw.commons.R\n import fr.free.nrw.commons.explore.paging.BasePagingFragment\n import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n \n-\n abstract class PageableDepictionsFragment : BasePagingFragment() {\n override val errorTextId: Int = R.string.error_loading_depictions\n override val pagedListAdapter by lazy {\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/child/ChildDepictionsFragment.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/child/ChildDepictionsFragment.kt\nindex ae5cc755e4..5275362997 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/child/ChildDepictionsFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/child/ChildDepictionsFragment.kt\n@@ -6,18 +6,19 @@ import fr.free.nrw.commons.R\n import fr.free.nrw.commons.explore.depictions.PageableDepictionsFragment\n import javax.inject.Inject\n \n-\n-class ChildDepictionsFragment: PageableDepictionsFragment() {\n+class ChildDepictionsFragment : PageableDepictionsFragment() {\n @Inject\n lateinit var presenter: ChildDepictionsPresenter\n \n override val injectedPresenter\n- get() = presenter\n+ get() = presenter\n \n- override fun getEmptyText(query: String) =\n- getString(R.string.no_child_classes, arguments!!.getString(\"wikidataItemName\")!!)\n+ override fun getEmptyText(query: String) = getString(R.string.no_child_classes, arguments!!.getString(\"wikidataItemName\")!!)\n \n- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {\n+ override fun onViewCreated(\n+ view: View,\n+ savedInstanceState: Bundle?,\n+ ) {\n super.onViewCreated(view, savedInstanceState)\n onQueryUpdated(arguments!!.getString(\"entityId\")!!)\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/child/ChildDepictionsPresenterImpl.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/child/ChildDepictionsPresenterImpl.kt\nindex b8c1abe63e..2d88522be8 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/child/ChildDepictionsPresenterImpl.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/child/ChildDepictionsPresenterImpl.kt\n@@ -10,8 +10,10 @@ import javax.inject.Named\n \n interface ChildDepictionsPresenter : PagingContract.Presenter\n \n-class ChildDepictionsPresenterImpl @Inject constructor(\n- @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n- dataSourceFactory: PageableChildDepictionsDataSource\n-) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n- ChildDepictionsPresenter\n+class ChildDepictionsPresenterImpl\n+ @Inject\n+ constructor(\n+ @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n+ dataSourceFactory: PageableChildDepictionsDataSource,\n+ ) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n+ ChildDepictionsPresenter\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/child/PageableChildDepictionsDataSource.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/child/PageableChildDepictionsDataSource.kt\nindex c189a2e0a3..c801f08e72 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/child/PageableChildDepictionsDataSource.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/child/PageableChildDepictionsDataSource.kt\n@@ -6,12 +6,13 @@ import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient\n import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n import javax.inject.Inject\n \n-class PageableChildDepictionsDataSource @Inject constructor(\n- liveDataConverter: LiveDataConverter,\n- private val okHttpJsonApiClient: OkHttpJsonApiClient\n-) : PageableBaseDataSource(liveDataConverter) {\n- override val loadFunction = { limit: Int, startPosition: Int ->\n- okHttpJsonApiClient.getChildDepictions(query, startPosition, limit).blockingGet()\n+class PageableChildDepictionsDataSource\n+ @Inject\n+ constructor(\n+ liveDataConverter: LiveDataConverter,\n+ private val okHttpJsonApiClient: OkHttpJsonApiClient,\n+ ) : PageableBaseDataSource(liveDataConverter) {\n+ override val loadFunction = { limit: Int, startPosition: Int ->\n+ okHttpJsonApiClient.getChildDepictions(query, startPosition, limit).blockingGet()\n+ }\n }\n-}\n-\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/media/DepictedImagesFragment.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/media/DepictedImagesFragment.kt\nindex f31bba68d1..cc1b664b2a 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/media/DepictedImagesFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/media/DepictedImagesFragment.kt\n@@ -2,7 +2,6 @@ package fr.free.nrw.commons.explore.depictions.media\n \n import android.os.Bundle\n import android.view.View\n-import fr.free.nrw.commons.explore.depictions.WikidataItemDetailsActivity\n import fr.free.nrw.commons.explore.media.PageableMediaFragment\n import javax.inject.Inject\n \n@@ -13,7 +12,10 @@ class DepictedImagesFragment : PageableMediaFragment() {\n override val injectedPresenter\n get() = presenter\n \n- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {\n+ override fun onViewCreated(\n+ view: View,\n+ savedInstanceState: Bundle?,\n+ ) {\n super.onViewCreated(view, savedInstanceState)\n onQueryUpdated(arguments!!.getString(\"entityId\")!!)\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/media/DepictedImagesPresenterImpl.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/media/DepictedImagesPresenterImpl.kt\nindex 743b78e437..e227a48754 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/media/DepictedImagesPresenterImpl.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/media/DepictedImagesPresenterImpl.kt\n@@ -13,8 +13,10 @@ interface DepictedImagesPresenter : PagingContract.Presenter\n /**\n * Presenter for DepictedImagesFragment\n */\n-class DepictedImagesPresenterImpl @Inject constructor(\n- @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n- dataSourceFactory: PageableDepictedMediaDataSource\n-) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n- DepictedImagesPresenter\n+class DepictedImagesPresenterImpl\n+ @Inject\n+ constructor(\n+ @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n+ dataSourceFactory: PageableDepictedMediaDataSource,\n+ ) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n+ DepictedImagesPresenter\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/media/PageableDepictedMediaDataSource.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/media/PageableDepictedMediaDataSource.kt\nindex 9592d76057..0f1c5109b1 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/media/PageableDepictedMediaDataSource.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/media/PageableDepictedMediaDataSource.kt\n@@ -7,11 +7,13 @@ import fr.free.nrw.commons.explore.paging.PageableBaseDataSource\n import fr.free.nrw.commons.media.WikidataMediaClient\n import javax.inject.Inject\n \n-class PageableDepictedMediaDataSource @Inject constructor(\n- liveDataConverter: LiveDataConverter,\n- private val wikiMediaClient: WikidataMediaClient\n-) : PageableBaseDataSource(liveDataConverter) {\n- override val loadFunction: LoadFunction = { loadSize: Int, startPosition: Int ->\n- wikiMediaClient.fetchImagesForDepictedItem(query, loadSize, startPosition).blockingGet()\n+class PageableDepictedMediaDataSource\n+ @Inject\n+ constructor(\n+ liveDataConverter: LiveDataConverter,\n+ private val wikiMediaClient: WikidataMediaClient,\n+ ) : PageableBaseDataSource(liveDataConverter) {\n+ override val loadFunction: LoadFunction = { loadSize: Int, startPosition: Int ->\n+ wikiMediaClient.fetchImagesForDepictedItem(query, loadSize, startPosition).blockingGet()\n+ }\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/parent/PageableParentDepictionsDataSource.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/parent/PageableParentDepictionsDataSource.kt\nindex 8771adbfab..d59a845abd 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/parent/PageableParentDepictionsDataSource.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/parent/PageableParentDepictionsDataSource.kt\n@@ -6,12 +6,13 @@ import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient\n import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n import javax.inject.Inject\n \n-class PageableParentDepictionsDataSource @Inject constructor(\n- liveDataConverter: LiveDataConverter,\n- private val okHttpJsonApiClient: OkHttpJsonApiClient\n-) : PageableBaseDataSource(liveDataConverter) {\n- override val loadFunction = { limit: Int, startPosition: Int ->\n- okHttpJsonApiClient.getParentDepictions(query, startPosition, limit).blockingGet()\n+class PageableParentDepictionsDataSource\n+ @Inject\n+ constructor(\n+ liveDataConverter: LiveDataConverter,\n+ private val okHttpJsonApiClient: OkHttpJsonApiClient,\n+ ) : PageableBaseDataSource(liveDataConverter) {\n+ override val loadFunction = { limit: Int, startPosition: Int ->\n+ okHttpJsonApiClient.getParentDepictions(query, startPosition, limit).blockingGet()\n+ }\n }\n-}\n-\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/parent/ParentDepictionsFragment.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/parent/ParentDepictionsFragment.kt\nindex 779764409f..52a5aff5d8 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/parent/ParentDepictionsFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/parent/ParentDepictionsFragment.kt\n@@ -6,7 +6,6 @@ import fr.free.nrw.commons.R\n import fr.free.nrw.commons.explore.depictions.PageableDepictionsFragment\n import javax.inject.Inject\n \n-\n class ParentDepictionsFragment : PageableDepictionsFragment() {\n @Inject\n lateinit var presenter: ParentDepictionsPresenter\n@@ -14,10 +13,12 @@ class ParentDepictionsFragment : PageableDepictionsFragment() {\n override val injectedPresenter\n get() = presenter\n \n- override fun getEmptyText(query: String) =\n- getString(R.string.no_parent_classes, arguments!!.getString(\"wikidataItemName\")!!)\n+ override fun getEmptyText(query: String) = getString(R.string.no_parent_classes, arguments!!.getString(\"wikidataItemName\")!!)\n \n- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {\n+ override fun onViewCreated(\n+ view: View,\n+ savedInstanceState: Bundle?,\n+ ) {\n super.onViewCreated(view, savedInstanceState)\n onQueryUpdated(arguments!!.getString(\"entityId\")!!)\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/parent/ParentDepictionsPresenterImpl.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/parent/ParentDepictionsPresenterImpl.kt\nindex db9ee9192d..5bb066aa13 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/parent/ParentDepictionsPresenterImpl.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/parent/ParentDepictionsPresenterImpl.kt\n@@ -10,10 +10,10 @@ import javax.inject.Named\n \n interface ParentDepictionsPresenter : PagingContract.Presenter\n \n-class ParentDepictionsPresenterImpl @Inject constructor(\n- @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n- dataSourceFactory: PageableParentDepictionsDataSource\n-) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n- ParentDepictionsPresenter {\n-\n-}\n+class ParentDepictionsPresenterImpl\n+ @Inject\n+ constructor(\n+ @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n+ dataSourceFactory: PageableParentDepictionsDataSource,\n+ ) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n+ ParentDepictionsPresenter\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/search/PageableDepictionsDataSource.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/search/PageableDepictionsDataSource.kt\nindex 961d1afb2e..9297fc7c87 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/search/PageableDepictionsDataSource.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/search/PageableDepictionsDataSource.kt\n@@ -1,9 +1,9 @@\n package fr.free.nrw.commons.explore.depictions.search\n \n+import fr.free.nrw.commons.explore.depictions.DepictsClient\n import fr.free.nrw.commons.explore.paging.LiveDataConverter\n import fr.free.nrw.commons.explore.paging.LoadingState\n import fr.free.nrw.commons.explore.paging.PageableBaseDataSource\n-import fr.free.nrw.commons.explore.depictions.DepictsClient\n import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n import io.reactivex.processors.PublishProcessor\n import javax.inject.Inject\n@@ -11,13 +11,13 @@ import javax.inject.Inject\n typealias LoadFunction = (Int, Int) -> List\n typealias LoadingStates = PublishProcessor\n \n-class PageableDepictionsDataSource @Inject constructor(\n- liveDataConverter: LiveDataConverter,\n- val depictsClient: DepictsClient\n-) : PageableBaseDataSource(liveDataConverter) {\n-\n- override val loadFunction = { loadSize: Int, startPosition: Int ->\n- depictsClient.searchForDepictions(query, loadSize, startPosition).blockingGet()\n+class PageableDepictionsDataSource\n+ @Inject\n+ constructor(\n+ liveDataConverter: LiveDataConverter,\n+ val depictsClient: DepictsClient,\n+ ) : PageableBaseDataSource(liveDataConverter) {\n+ override val loadFunction = { loadSize: Int, startPosition: Int ->\n+ depictsClient.searchForDepictions(query, loadSize, startPosition).blockingGet()\n+ }\n }\n-}\n-\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/search/SearchDepictionsFragmentPresenterImpl.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/search/SearchDepictionsFragmentPresenterImpl.kt\nindex e85b08e223..5433ed3a72 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/search/SearchDepictionsFragmentPresenterImpl.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/search/SearchDepictionsFragmentPresenterImpl.kt\n@@ -9,11 +9,14 @@ import javax.inject.Inject\n import javax.inject.Named\n \n interface SearchDepictionsFragmentPresenter : PagingContract.Presenter\n+\n /**\n * The presenter class for SearchDepictionsFragment\n */\n-class SearchDepictionsFragmentPresenterImpl @Inject constructor(\n- @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n- dataSourceFactory: PageableDepictionsDataSource\n-) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n- SearchDepictionsFragmentPresenter\n+class SearchDepictionsFragmentPresenterImpl\n+ @Inject\n+ constructor(\n+ @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n+ dataSourceFactory: PageableDepictionsDataSource,\n+ ) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n+ SearchDepictionsFragmentPresenter\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/media/MediaConverter.kt b/app/src/main/java/fr/free/nrw/commons/explore/media/MediaConverter.kt\nindex 162cfa2f2b..70b46b1291 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/media/MediaConverter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/media/MediaConverter.kt\n@@ -8,95 +8,105 @@ import fr.free.nrw.commons.utils.MediaDataExtractorUtil\n import fr.free.nrw.commons.wikidata.WikidataProperties\n import fr.free.nrw.commons.wikidata.model.DataValue\n import fr.free.nrw.commons.wikidata.model.Entities\n-import org.apache.commons.lang3.StringUtils\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage\n import fr.free.nrw.commons.wikidata.model.gallery.ExtMetadata\n import fr.free.nrw.commons.wikidata.model.gallery.ImageInfo\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage\n+import org.apache.commons.lang3.StringUtils\n import java.text.ParseException\n-import java.util.*\n+import java.util.Date\n import javax.inject.Inject\n \n-class MediaConverter @Inject constructor() {\n- fun convert(page: MwQueryPage, entity: Entities.Entity, imageInfo: ImageInfo): Media {\n- val metadata = imageInfo.metadata\n- requireNotNull(metadata) { \"No metadata\" }\n- // Stores mapping of title attribute to hidden attribute of each category\n- val myMap = mutableMapOf()\n- page.categories()?.forEach { myMap[it.title()] = (it.hidden()) }\n+class MediaConverter\n+ @Inject\n+ constructor() {\n+ fun convert(\n+ page: MwQueryPage,\n+ entity: Entities.Entity,\n+ imageInfo: ImageInfo,\n+ ): Media {\n+ val metadata = imageInfo.metadata\n+ requireNotNull(metadata) { \"No metadata\" }\n+ // Stores mapping of title attribute to hidden attribute of each category\n+ val myMap = mutableMapOf()\n+ page.categories()?.forEach { myMap[it.title()] = (it.hidden()) }\n \n- return Media(\n- page.pageId().toString(),\n- imageInfo.thumbUrl.takeIf { it.isNotBlank() } ?: imageInfo.originalUrl,\n- imageInfo.originalUrl,\n- page.title(),\n- metadata.imageDescription(),\n- safeParseDate(metadata.dateTime()),\n- metadata.licenseShortName(),\n- metadata.prefixedLicenseUrl,\n- getAuthor(metadata),\n- imageInfo.user,\n- MediaDataExtractorUtil.extractCategoriesFromList(metadata.categories),\n- metadata.latLng,\n- entity.labels().mapValues { it.value.value() },\n- entity.descriptions().mapValues { it.value.value() },\n- entity.depictionIds(),\n- myMap\n- )\n- }\n-\n- /**\n- * Creating Media object from MWQueryPage.\n- * Earlier only basic details were set for the media object but going forward,\n- * a full media object(with categories, descriptions, coordinates etc) can be constructed using this method\n- *\n- * @param page response from the API\n- * @return Media object\n- */\n-\n- private fun safeParseDate(dateStr: String): Date? {\n- return try {\n- CommonsDateUtil.getMediaSimpleDateFormat().parse(dateStr)\n- } catch (e: ParseException) {\n- null\n+ return Media(\n+ page.pageId().toString(),\n+ imageInfo.thumbUrl.takeIf { it.isNotBlank() } ?: imageInfo.originalUrl,\n+ imageInfo.originalUrl,\n+ page.title(),\n+ metadata.imageDescription(),\n+ safeParseDate(metadata.dateTime()),\n+ metadata.licenseShortName(),\n+ metadata.prefixedLicenseUrl,\n+ getAuthor(metadata),\n+ imageInfo.user,\n+ MediaDataExtractorUtil.extractCategoriesFromList(metadata.categories),\n+ metadata.latLng,\n+ entity.labels().mapValues { it.value.value() },\n+ entity.descriptions().mapValues { it.value.value() },\n+ entity.depictionIds(),\n+ myMap,\n+ )\n }\n- }\n \n+ /**\n+ * Creating Media object from MWQueryPage.\n+ * Earlier only basic details were set for the media object but going forward,\n+ * a full media object(with categories, descriptions, coordinates etc) can be constructed using this method\n+ *\n+ * @param page response from the API\n+ * @return Media object\n+ */\n \n- /**\n- * This method extracts the Commons Username from the artist HTML information\n- * @param metadata\n- * @return\n- */\n- private fun getAuthor(metadata: ExtMetadata): String? {\n- return try {\n- val authorHtml = metadata.artist()\n- val anchorStartTagTerminalChars = \"\\\">\"\n- val anchorCloseTag = \"\"\n+ private fun safeParseDate(dateStr: String): Date? =\n+ try {\n+ CommonsDateUtil.getMediaSimpleDateFormat().parse(dateStr)\n+ } catch (e: ParseException) {\n+ null\n+ }\n \n- return authorHtml.substring(\n- authorHtml.indexOf(anchorStartTagTerminalChars) + anchorStartTagTerminalChars\n- .length, authorHtml.indexOf(anchorCloseTag)\n- )\n- } catch (ex: java.lang.Exception) {\n- \"\"\n+ /**\n+ * This method extracts the Commons Username from the artist HTML information\n+ * @param metadata\n+ * @return\n+ */\n+ private fun getAuthor(metadata: ExtMetadata): String? {\n+ return try {\n+ val authorHtml = metadata.artist()\n+ val anchorStartTagTerminalChars = \"\\\">\"\n+ val anchorCloseTag = \"\"\n+\n+ return authorHtml.substring(\n+ authorHtml.indexOf(anchorStartTagTerminalChars) +\n+ anchorStartTagTerminalChars\n+ .length,\n+ authorHtml.indexOf(anchorCloseTag),\n+ )\n+ } catch (ex: java.lang.Exception) {\n+ \"\"\n+ }\n }\n }\n-}\n \n private fun Entities.Entity.depictionIds() =\n this[WikidataProperties.DEPICTS]?.mapNotNull { (it.mainSnak.dataValue as? DataValue.EntityId)?.value?.id }\n ?: emptyList()\n \n private val ExtMetadata.prefixedLicenseUrl: String\n- get() = licenseUrl().let {\n- if (!it.startsWith(\"http://\") && !it.startsWith(\"https://\"))\n- \"https://$it\"\n- else\n- it\n- }\n+ get() =\n+ licenseUrl().let {\n+ if (!it.startsWith(\"http://\") && !it.startsWith(\"https://\")) {\n+ \"https://$it\"\n+ } else {\n+ it\n+ }\n+ }\n \n private val ExtMetadata.latLng: LatLng?\n- get() = if (!StringUtils.isBlank(gpsLatitude) && !StringUtils.isBlank(gpsLongitude))\n- LatLng(gpsLatitude.toDouble(), gpsLongitude.toDouble(), 0.0f)\n- else\n- null\n+ get() =\n+ if (!StringUtils.isBlank(gpsLatitude) && !StringUtils.isBlank(gpsLongitude)) {\n+ LatLng(gpsLatitude.toDouble(), gpsLongitude.toDouble(), 0.0f)\n+ } else {\n+ null\n+ }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/media/PageableMediaDataSource.kt b/app/src/main/java/fr/free/nrw/commons/explore/media/PageableMediaDataSource.kt\nindex 89bdf38795..074a2125f5 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/media/PageableMediaDataSource.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/media/PageableMediaDataSource.kt\n@@ -1,17 +1,19 @@\n package fr.free.nrw.commons.explore.media\n \n import fr.free.nrw.commons.Media\n+import fr.free.nrw.commons.explore.depictions.search.LoadFunction\n import fr.free.nrw.commons.explore.paging.LiveDataConverter\n import fr.free.nrw.commons.explore.paging.PageableBaseDataSource\n-import fr.free.nrw.commons.explore.depictions.search.LoadFunction\n import fr.free.nrw.commons.media.MediaClient\n import javax.inject.Inject\n \n-class PageableMediaDataSource @Inject constructor(\n- liveDataConverter: LiveDataConverter,\n- private val mediaClient: MediaClient\n-) : PageableBaseDataSource(liveDataConverter) {\n- override val loadFunction: LoadFunction = { loadSize: Int, startPosition: Int ->\n- mediaClient.getMediaListFromSearch(query, loadSize, startPosition).blockingGet()\n+class PageableMediaDataSource\n+ @Inject\n+ constructor(\n+ liveDataConverter: LiveDataConverter,\n+ private val mediaClient: MediaClient,\n+ ) : PageableBaseDataSource(liveDataConverter) {\n+ override val loadFunction: LoadFunction = { loadSize: Int, startPosition: Int ->\n+ mediaClient.getMediaListFromSearch(query, loadSize, startPosition).blockingGet()\n+ }\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/media/PageableMediaFragment.kt b/app/src/main/java/fr/free/nrw/commons/explore/media/PageableMediaFragment.kt\nindex 3ff43aeacb..987f4ca005 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/media/PageableMediaFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/media/PageableMediaFragment.kt\n@@ -9,8 +9,9 @@ import fr.free.nrw.commons.category.CategoryImagesCallback\n import fr.free.nrw.commons.explore.paging.BasePagingFragment\n import fr.free.nrw.commons.media.MediaDetailPagerFragment.MediaDetailProvider\n \n-abstract class PageableMediaFragment : BasePagingFragment(), MediaDetailProvider {\n-\n+abstract class PageableMediaFragment :\n+ BasePagingFragment(),\n+ MediaDetailProvider {\n override val pagedListAdapter by lazy {\n PagedMediaAdapter(categoryImagesCallback::onMediaClicked)\n }\n@@ -33,7 +34,10 @@ abstract class PageableMediaFragment : BasePagingFragment(), MediaDetailP\n private val simpleDataObserver =\n SimpleDataObserver { categoryImagesCallback.viewPagerNotifyDataSetChanged() }\n \n- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {\n+ override fun onViewCreated(\n+ view: View,\n+ savedInstanceState: Bundle?,\n+ ) {\n super.onViewCreated(view, savedInstanceState)\n pagedListAdapter.registerAdapterDataObserver(simpleDataObserver)\n }\n@@ -44,7 +48,9 @@ abstract class PageableMediaFragment : BasePagingFragment(), MediaDetailP\n }\n \n override fun getMediaAtPosition(position: Int): Media? =\n- pagedListAdapter.currentList?.get(position)?.takeIf { it.filename != null }\n+ pagedListAdapter.currentList\n+ ?.get(position)\n+ ?.takeIf { it.filename != null }\n .also {\n pagedListAdapter.currentList?.loadAround(position)\n binding.paginatedSearchResultsList.scrollToPosition(position)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/media/PagedMediaAdapter.kt b/app/src/main/java/fr/free/nrw/commons/explore/media/PagedMediaAdapter.kt\nindex c1e641b560..c987b76c29 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/media/PagedMediaAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/media/PagedMediaAdapter.kt\n@@ -10,28 +10,41 @@ import fr.free.nrw.commons.databinding.LayoutCategoryImagesBinding\n import fr.free.nrw.commons.explore.paging.BaseViewHolder\n import fr.free.nrw.commons.explore.paging.inflate\n \n-class PagedMediaAdapter(private val onImageClicked: (Int) -> Unit) :\n- PagedListAdapter(object : DiffUtil.ItemCallback() {\n- override fun areItemsTheSame(oldItem: Media, newItem: Media) =\n- oldItem.pageId == newItem.pageId\n-\n- override fun areContentsTheSame(oldItem: Media, newItem: Media) =\n- oldItem.pageId == newItem.pageId\n- }) {\n-\n- override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =\n- SearchImagesViewHolder(\n- parent.inflate(R.layout.layout_category_images),\n- onImageClicked\n- )\n-\n- override fun onBindViewHolder(holder: SearchImagesViewHolder, position: Int) {\n+class PagedMediaAdapter(\n+ private val onImageClicked: (Int) -> Unit,\n+) : PagedListAdapter(\n+ object : DiffUtil.ItemCallback() {\n+ override fun areItemsTheSame(\n+ oldItem: Media,\n+ newItem: Media,\n+ ) = oldItem.pageId == newItem.pageId\n+\n+ override fun areContentsTheSame(\n+ oldItem: Media,\n+ newItem: Media,\n+ ) = oldItem.pageId == newItem.pageId\n+ },\n+ ) {\n+ override fun onCreateViewHolder(\n+ parent: ViewGroup,\n+ viewType: Int,\n+ ) = SearchImagesViewHolder(\n+ parent.inflate(R.layout.layout_category_images),\n+ onImageClicked,\n+ )\n+\n+ override fun onBindViewHolder(\n+ holder: SearchImagesViewHolder,\n+ position: Int,\n+ ) {\n holder.bind(getItem(position)!! to position)\n }\n }\n \n-class SearchImagesViewHolder(containerView: View, val onImageClicked: (Int) -> Unit) :\n- BaseViewHolder>(containerView) {\n+class SearchImagesViewHolder(\n+ containerView: View,\n+ val onImageClicked: (Int) -> Unit,\n+) : BaseViewHolder>(containerView) {\n val binding = LayoutCategoryImagesBinding.bind(itemView)\n \n override fun bind(item: Pair) {\n@@ -47,5 +60,4 @@ class SearchImagesViewHolder(containerView: View, val onImageClicked: (Int) -> U\n binding.categoryImageAuthor.visibility = View.GONE\n }\n }\n-\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/media/SearchMediaFragment.kt b/app/src/main/java/fr/free/nrw/commons/explore/media/SearchMediaFragment.kt\nindex 28709d8350..de16bddf6c 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/media/SearchMediaFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/media/SearchMediaFragment.kt\n@@ -12,4 +12,3 @@ class SearchMediaFragment : PageableMediaFragment() {\n override val injectedPresenter\n get() = presenter\n }\n-\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/media/SearchMediaFragmentPresenterImpl.kt b/app/src/main/java/fr/free/nrw/commons/explore/media/SearchMediaFragmentPresenterImpl.kt\nindex ea2c3c4d0f..9279f46689 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/media/SearchMediaFragmentPresenterImpl.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/media/SearchMediaFragmentPresenterImpl.kt\n@@ -2,16 +2,18 @@ package fr.free.nrw.commons.explore.media\n \n import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.di.CommonsApplicationModule\n-import fr.free.nrw.commons.explore.paging.PagingContract\n import fr.free.nrw.commons.explore.paging.BasePagingPresenter\n+import fr.free.nrw.commons.explore.paging.PagingContract\n import io.reactivex.Scheduler\n import javax.inject.Inject\n import javax.inject.Named\n \n interface SearchMediaFragmentPresenter : PagingContract.Presenter\n \n-class SearchMediaFragmentPresenterImpl @Inject constructor(\n- @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n- dataSourceFactory: PageableMediaDataSource\n-) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n- SearchMediaFragmentPresenter\n+class SearchMediaFragmentPresenterImpl\n+ @Inject\n+ constructor(\n+ @Named(CommonsApplicationModule.MAIN_THREAD) mainThreadScheduler: Scheduler,\n+ dataSourceFactory: PageableMediaDataSource,\n+ ) : BasePagingPresenter(mainThreadScheduler, dataSourceFactory),\n+ SearchMediaFragmentPresenter\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/media/SimpleDataObserver.kt b/app/src/main/java/fr/free/nrw/commons/explore/media/SimpleDataObserver.kt\nindex 4bd9e0f2b0..e5a7b24ab9 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/media/SimpleDataObserver.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/media/SimpleDataObserver.kt\n@@ -2,18 +2,27 @@ package fr.free.nrw.commons.explore.media\n \n import androidx.recyclerview.widget.RecyclerView\n \n-class SimpleDataObserver(private val onAnyChange: () -> Unit) : RecyclerView.AdapterDataObserver() {\n+class SimpleDataObserver(\n+ private val onAnyChange: () -> Unit,\n+) : RecyclerView.AdapterDataObserver() {\n override fun onChanged() {\n super.onChanged()\n onAnyChange.invoke()\n }\n \n- override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {\n+ override fun onItemRangeRemoved(\n+ positionStart: Int,\n+ itemCount: Int,\n+ ) {\n super.onItemRangeRemoved(positionStart, itemCount)\n onAnyChange.invoke()\n }\n \n- override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {\n+ override fun onItemRangeMoved(\n+ fromPosition: Int,\n+ toPosition: Int,\n+ itemCount: Int,\n+ ) {\n super.onItemRangeMoved(fromPosition, toPosition, itemCount)\n onAnyChange.invoke()\n }\n@@ -23,17 +32,27 @@ class SimpleDataObserver(private val onAnyChange: () -> Unit) : RecyclerView.Ada\n onAnyChange.invoke()\n }\n \n- override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {\n+ override fun onItemRangeInserted(\n+ positionStart: Int,\n+ itemCount: Int,\n+ ) {\n super.onItemRangeInserted(positionStart, itemCount)\n onAnyChange.invoke()\n }\n \n- override fun onItemRangeChanged(positionStart: Int, itemCount: Int) {\n+ override fun onItemRangeChanged(\n+ positionStart: Int,\n+ itemCount: Int,\n+ ) {\n super.onItemRangeChanged(positionStart, itemCount)\n onAnyChange.invoke()\n }\n \n- override fun onItemRangeChanged(positionStart: Int, itemCount: Int, payload: Any?) {\n+ override fun onItemRangeChanged(\n+ positionStart: Int,\n+ itemCount: Int,\n+ payload: Any?,\n+ ) {\n super.onItemRangeChanged(positionStart, itemCount, payload)\n onAnyChange.invoke()\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/models/RecentSearch.kt b/app/src/main/java/fr/free/nrw/commons/explore/models/RecentSearch.kt\nindex 6c8c052304..2340865a68 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/models/RecentSearch.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/models/RecentSearch.kt\n@@ -1,29 +1,23 @@\n package fr.free.nrw.commons.explore.models\n \n import android.net.Uri\n-import java.util.*\n+import java.util.Date\n \n /**\n * Represents a recently searched query\n * Example - query = \"butterfly\"\n */\n-class RecentSearch\n-/**\n- * Constructor\n- * @param contentUri the content URI for this query\n- * @param query query name\n- * @param lastSearched last searched date\n- */(\n- /**\n- * Modifies the content URI - marking this query as already saved in the database\n- *\n- * @param contentUri the content URI\n- */\n- var contentUri: Uri?,\n- /**\n- * Gets query name\n- * @return query name\n- */\n- val query: String, var lastSearched: Date) {\n-\n-}\n\\ No newline at end of file\n+class RecentSearch(\n+ /**\n+ * Modifies the content URI - marking this query as already saved in the database\n+ *\n+ * @param contentUri the content URI\n+ */\n+ var contentUri: Uri?,\n+ /**\n+ * Gets query name\n+ * @return query name\n+ */\n+ val query: String,\n+ var lastSearched: Date,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingFragment.kt b/app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingFragment.kt\nindex d4e8f0e8f4..e3673f9deb 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingFragment.kt\n@@ -5,7 +5,8 @@ import android.content.res.Configuration\n import android.os.Bundle\n import android.view.LayoutInflater\n import android.view.View\n-import android.view.View.*\n+import android.view.View.GONE\n+import android.view.View.VISIBLE\n import android.view.ViewGroup\n import androidx.fragment.app.Fragment\n import androidx.lifecycle.LiveData\n@@ -18,10 +19,9 @@ import fr.free.nrw.commons.databinding.FragmentSearchPaginatedBinding\n import fr.free.nrw.commons.di.CommonsDaggerSupportFragment\n import fr.free.nrw.commons.utils.ViewUtil\n \n-\n-abstract class BasePagingFragment : CommonsDaggerSupportFragment(),\n+abstract class BasePagingFragment :\n+ CommonsDaggerSupportFragment(),\n PagingContract.View {\n-\n abstract val pagedListAdapter: PagedListAdapter\n abstract val injectedPresenter: PagingContract.Presenter\n abstract val errorTextId: Int\n@@ -29,18 +29,21 @@ abstract class BasePagingFragment : CommonsDaggerSupportFragment(),\n private val mergeAdapter by lazy { MergeAdapter(pagedListAdapter, loadingAdapter) }\n private var searchResults: LiveData>? = null\n \n- protected lateinit var binding : FragmentSearchPaginatedBinding\n+ protected lateinit var binding: FragmentSearchPaginatedBinding\n \n override fun onCreateView(\n inflater: LayoutInflater,\n container: ViewGroup?,\n- savedInstanceState: Bundle?\n+ savedInstanceState: Bundle?,\n ): View? {\n binding = FragmentSearchPaginatedBinding.inflate(inflater, container, false)\n return binding.root\n }\n \n- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {\n+ override fun onViewCreated(\n+ view: View,\n+ savedInstanceState: Bundle?,\n+ ) {\n super.onViewCreated(view, savedInstanceState)\n \n binding.paginatedSearchResultsList.apply {\n@@ -49,7 +52,7 @@ abstract class BasePagingFragment : CommonsDaggerSupportFragment(),\n }\n injectedPresenter.listFooterData.observe(\n viewLifecycleOwner,\n- Observer(loadingAdapter::submitList)\n+ Observer(loadingAdapter::submitList),\n )\n }\n \n@@ -66,9 +69,12 @@ abstract class BasePagingFragment : CommonsDaggerSupportFragment(),\n override fun observePagingResults(searchResults: LiveData>) {\n this.searchResults?.removeObservers(viewLifecycleOwner)\n this.searchResults = searchResults\n- searchResults.observe(viewLifecycleOwner, Observer {\n- pagedListAdapter.submitList(it)\n- })\n+ searchResults.observe(\n+ viewLifecycleOwner,\n+ Observer {\n+ pagedListAdapter.submitList(it)\n+ },\n+ )\n }\n \n override fun onAttach(context: Context) {\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingPresenter.kt b/app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingPresenter.kt\nindex 22194adb83..6c2f0882c7 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingPresenter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingPresenter.kt\n@@ -6,14 +6,12 @@ import io.reactivex.Scheduler\n import io.reactivex.disposables.CompositeDisposable\n import timber.log.Timber\n \n-\n abstract class BasePagingPresenter(\n val mainThreadScheduler: Scheduler,\n- val pageableBaseDataSource: PageableBaseDataSource\n+ val pageableBaseDataSource: PageableBaseDataSource,\n ) : PagingContract.Presenter {\n-\n- private val DUMMY: PagingContract.View = proxy()\n- private var view: PagingContract.View = DUMMY\n+ private val dummy: PagingContract.View = proxy()\n+ private var view: PagingContract.View = dummy\n \n private val compositeDisposable = CompositeDisposable()\n override val listFooterData = MutableLiveData>().apply { value = emptyList() }\n@@ -25,41 +23,41 @@ abstract class BasePagingPresenter(\n pageableBaseDataSource.loadingStates\n .observeOn(mainThreadScheduler)\n .subscribe(::onLoadingState, Timber::e),\n- pageableBaseDataSource.noItemsLoadedQueries.subscribe(view::showEmptyText)\n+ pageableBaseDataSource.noItemsLoadedEvent.subscribe(view::showEmptyText),\n )\n }\n \n- private fun onLoadingState(it: LoadingState) = when (it) {\n- LoadingState.Loading -> {\n- view.hideEmptyText()\n- listFooterData.postValue(listOf(FooterItem.LoadingItem))\n- }\n- LoadingState.Complete -> {\n- listFooterData.postValue(emptyList())\n- view.hideInitialLoadProgress()\n- }\n- LoadingState.InitialLoad -> {\n- view.hideEmptyText()\n- view.showInitialLoadInProgress()\n+ private fun onLoadingState(it: LoadingState) =\n+ when (it) {\n+ LoadingState.Loading -> {\n+ view.hideEmptyText()\n+ listFooterData.postValue(listOf(FooterItem.LoadingItem))\n+ }\n+ LoadingState.Complete -> {\n+ listFooterData.postValue(emptyList())\n+ view.hideInitialLoadProgress()\n+ }\n+ LoadingState.InitialLoad -> {\n+ view.hideEmptyText()\n+ view.showInitialLoadInProgress()\n+ }\n+ LoadingState.Error -> {\n+ view.showSnackbar()\n+ view.hideInitialLoadProgress()\n+ listFooterData.postValue(listOf(FooterItem.RefreshItem))\n+ }\n }\n- LoadingState.Error -> {\n- view.showSnackbar()\n- view.hideInitialLoadProgress()\n- listFooterData.postValue(listOf(FooterItem.RefreshItem))\n- }\n- }\n \n override fun retryFailedRequest() {\n pageableBaseDataSource.retryFailedRequest()\n }\n \n override fun onDetachView() {\n- view = DUMMY\n+ view = dummy\n compositeDisposable.clear()\n }\n \n override fun onQueryUpdated(query: String) {\n pageableBaseDataSource.onQueryUpdated(query)\n }\n-\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/paging/BaseViewHolder.kt b/app/src/main/java/fr/free/nrw/commons/explore/paging/BaseViewHolder.kt\nindex fda1408bf4..5a978c864f 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/paging/BaseViewHolder.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/paging/BaseViewHolder.kt\n@@ -4,7 +4,9 @@ import android.view.View\n import androidx.recyclerview.widget.RecyclerView\n import kotlinx.android.extensions.LayoutContainer\n \n-abstract class BaseViewHolder(override val containerView: View) :\n- RecyclerView.ViewHolder(containerView), LayoutContainer {\n+abstract class BaseViewHolder(\n+ override val containerView: View,\n+) : RecyclerView.ViewHolder(containerView),\n+ LayoutContainer {\n abstract fun bind(item: T)\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/paging/FooterAdapter.kt b/app/src/main/java/fr/free/nrw/commons/explore/paging/FooterAdapter.kt\nindex 7c64609672..fc5f529b28 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/paging/FooterAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/paging/FooterAdapter.kt\n@@ -11,40 +11,58 @@ import fr.free.nrw.commons.R\n import fr.free.nrw.commons.databinding.ListItemLoadMoreBinding\n import kotlinx.android.extensions.LayoutContainer\n \n-class FooterAdapter(private val onRefreshClicked: () -> Unit) :\n- ListAdapter(object :\n- DiffUtil.ItemCallback() {\n- override fun areItemsTheSame(oldItem: FooterItem, newItem: FooterItem) = oldItem == newItem\n+class FooterAdapter(\n+ private val onRefreshClicked: () -> Unit,\n+) : ListAdapter(\n+ object :\n+ DiffUtil.ItemCallback() {\n+ override fun areItemsTheSame(\n+ oldItem: FooterItem,\n+ newItem: FooterItem,\n+ ) = oldItem == newItem\n \n- override fun areContentsTheSame(oldItem: FooterItem, newItem: FooterItem) =\n- oldItem == newItem\n- }) {\n+ override fun areContentsTheSame(\n+ oldItem: FooterItem,\n+ newItem: FooterItem,\n+ ) = oldItem == newItem\n+ },\n+ ) {\n+ override fun getItemViewType(position: Int): Int = getItem(position).ordinal\n \n- override fun getItemViewType(position: Int): Int {\n- return getItem(position).ordinal\n- }\n-\n- override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =\n- when (FooterItem.values()[viewType]) {\n- FooterItem.LoadingItem -> LoadingViewHolder(\n- parent.inflate(R.layout.list_item_progress)\n+ override fun onCreateViewHolder(\n+ parent: ViewGroup,\n+ viewType: Int,\n+ ) = when (FooterItem.values()[viewType]) {\n+ FooterItem.LoadingItem ->\n+ LoadingViewHolder(\n+ parent.inflate(R.layout.list_item_progress),\n )\n- FooterItem.RefreshItem -> RefreshViewHolder(\n+ FooterItem.RefreshItem ->\n+ RefreshViewHolder(\n parent.inflate(R.layout.list_item_load_more),\n- onRefreshClicked\n+ onRefreshClicked,\n )\n- }\n+ }\n \n- override fun onBindViewHolder(holder: FooterViewHolder, position: Int) {}\n+ override fun onBindViewHolder(\n+ holder: FooterViewHolder,\n+ position: Int,\n+ ) {}\n }\n \n-open class FooterViewHolder(override val containerView: View) :\n- RecyclerView.ViewHolder(containerView),\n+open class FooterViewHolder(\n+ override val containerView: View,\n+) : RecyclerView.ViewHolder(containerView),\n LayoutContainer\n \n-class LoadingViewHolder(containerView: View) : FooterViewHolder(containerView)\n-class RefreshViewHolder(containerView: View, onRefreshClicked: () -> Unit) :\n- FooterViewHolder(containerView) {\n+class LoadingViewHolder(\n+ containerView: View,\n+) : FooterViewHolder(containerView)\n+\n+class RefreshViewHolder(\n+ containerView: View,\n+ onRefreshClicked: () -> Unit,\n+) : FooterViewHolder(containerView) {\n val binding = ListItemLoadMoreBinding.bind(itemView)\n \n init {\n@@ -54,5 +72,7 @@ class RefreshViewHolder(containerView: View, onRefreshClicked: () -> Unit) :\n \n enum class FooterItem { LoadingItem, RefreshItem }\n \n-fun ViewGroup.inflate(@LayoutRes layoutId: Int, attachToRoot: Boolean = false): View =\n- LayoutInflater.from(context).inflate(layoutId, this, attachToRoot)\n+fun ViewGroup.inflate(\n+ @LayoutRes layoutId: Int,\n+ attachToRoot: Boolean = false,\n+): View = LayoutInflater.from(context).inflate(layoutId, this, attachToRoot)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingContract.kt b/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingContract.kt\nindex d7169d4586..428fb36d6d 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingContract.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingContract.kt\n@@ -7,16 +7,23 @@ import fr.free.nrw.commons.BasePresenter\n interface PagingContract {\n interface View {\n fun showSnackbar()\n+\n fun observePagingResults(searchResults: LiveData>)\n+\n fun showInitialLoadInProgress()\n+\n fun hideInitialLoadProgress()\n+\n fun showEmptyText(query: String)\n+\n fun hideEmptyText()\n }\n \n interface Presenter : BasePresenter> {\n val listFooterData: LiveData>\n+\n fun onQueryUpdated(query: String)\n+\n fun retryFailedRequest()\n }\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSource.kt b/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSource.kt\nindex ed67a71b1b..84dda5c38f 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSource.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSource.kt\n@@ -8,38 +8,42 @@ import io.reactivex.schedulers.Schedulers\n import timber.log.Timber\n \n abstract class PagingDataSource(\n- private val loadingStates: PublishProcessor\n+ private val loadingStates: PublishProcessor,\n ) : PositionalDataSource() {\n-\n private var lastExecutedRequest: (() -> Boolean)? = null\n+\n private fun storeAndExecute(function: () -> Boolean) {\n function.also { lastExecutedRequest = it }.invoke()\n }\n \n- private fun performWithTryCatch(function: () -> Unit) = try {\n- function.invoke()\n- loadingStates.offer(LoadingState.Complete)\n- } catch (e: Exception) {\n- Timber.e(e)\n- loadingStates.offer(LoadingState.Error)\n- }\n+ private fun performWithTryCatch(function: () -> Unit) =\n+ try {\n+ function.invoke()\n+ loadingStates.offer(LoadingState.Complete)\n+ } catch (e: Exception) {\n+ Timber.e(e)\n+ loadingStates.offer(LoadingState.Error)\n+ }\n \n override fun loadInitial(\n params: LoadInitialParams,\n- callback: LoadInitialCallback\n+ callback: LoadInitialCallback,\n ) {\n storeAndExecute {\n loadingStates.offer(LoadingState.InitialLoad)\n performWithTryCatch {\n callback.onResult(\n getItems(params.requestedLoadSize, params.requestedStartPosition),\n- params.requestedStartPosition\n+ params.requestedStartPosition,\n )\n }\n }\n }\n \n- override fun loadRange(params: LoadRangeParams, callback: LoadRangeCallback) {\n+ override fun loadRange(\n+ params: LoadRangeParams,\n+ callback: LoadRangeCallback,\n+ ) {\n storeAndExecute {\n loadingStates.offer(LoadingState.Loading)\n performWithTryCatch {\n@@ -48,10 +52,14 @@ abstract class PagingDataSource(\n }\n }\n \n- protected abstract fun getItems(loadSize: Int, startPosition: Int): List\n+ protected abstract fun getItems(\n+ loadSize: Int,\n+ startPosition: Int,\n+ ): List\n \n fun retryFailedRequest() {\n- Completable.fromAction { lastExecutedRequest?.invoke() }\n+ Completable\n+ .fromAction { lastExecutedRequest?.invoke() }\n .subscribeOn(Schedulers.io())\n .subscribe()\n }\n@@ -59,9 +67,10 @@ abstract class PagingDataSource(\n \n fun dataSource(\n loadingStates: PublishProcessor,\n- loadFunction: LoadFunction\n+ loadFunction: LoadFunction,\n ) = object : PagingDataSource(loadingStates) {\n- override fun getItems(loadSize: Int, startPosition: Int): List {\n- return loadFunction(loadSize, startPosition)\n- }\n+ override fun getItems(\n+ loadSize: Int,\n+ startPosition: Int,\n+ ): List = loadFunction(loadSize, startPosition)\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSourceFactory.kt b/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSourceFactory.kt\nindex 6cce5bcf62..10529e29f0 100644\n--- a/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSourceFactory.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSourceFactory.kt\n@@ -14,13 +14,14 @@ import javax.inject.Inject\n private const val PAGE_SIZE = 50\n private const val INITIAL_LOAD_SIZE = 50\n \n-abstract class PageableBaseDataSource(private val liveDataConverter: LiveDataConverter) {\n-\n+abstract class PageableBaseDataSource(\n+ private val liveDataConverter: LiveDataConverter,\n+) {\n lateinit var query: String\n private val dataSourceFactoryFactory: () -> PagingDataSourceFactory = {\n dataSourceFactory(\n _loadingStates,\n- loadFunction\n+ loadFunction,\n )\n }\n private val _loadingStates = PublishProcessor.create()\n@@ -28,7 +29,7 @@ abstract class PageableBaseDataSource(private val liveDataConverter: LiveData\n private val _pagingResults = PublishProcessor.create>>()\n val pagingResults: Flowable>> = _pagingResults\n private val _noItemsLoadedEvent = PublishProcessor.create()\n- val noItemsLoadedQueries: Flowable = _noItemsLoadedEvent\n+ val noItemsLoadedEvent: Flowable = _noItemsLoadedEvent\n private var currentFactory: PagingDataSourceFactory? = null\n \n abstract val loadFunction: LoadFunction\n@@ -38,7 +39,7 @@ abstract class PageableBaseDataSource(private val liveDataConverter: LiveData\n _pagingResults.offer(\n liveDataConverter.convert(dataSourceFactoryFactory().also { currentFactory = it }) {\n _noItemsLoadedEvent.offer(query)\n- }\n+ },\n )\n }\n \n@@ -47,52 +48,58 @@ abstract class PageableBaseDataSource(private val liveDataConverter: LiveData\n }\n }\n \n-class LiveDataConverter @Inject constructor() {\n- fun convert(\n- dataSourceFactory: PagingDataSourceFactory,\n- zeroItemsLoadedFunction: () -> Unit\n- ): LiveData> {\n- return dataSourceFactory.toLiveData(\n- Config(\n- pageSize = PAGE_SIZE,\n- initialLoadSizeHint = INITIAL_LOAD_SIZE,\n- enablePlaceholders = false\n- ),\n- boundaryCallback = object : PagedList.BoundaryCallback() {\n- override fun onZeroItemsLoaded() {\n- zeroItemsLoadedFunction()\n- }\n- }\n- )\n+class LiveDataConverter\n+ @Inject\n+ constructor() {\n+ fun convert(\n+ dataSourceFactory: PagingDataSourceFactory,\n+ zeroItemsLoadedFunction: () -> Unit,\n+ ): LiveData> =\n+ dataSourceFactory.toLiveData(\n+ Config(\n+ pageSize = PAGE_SIZE,\n+ initialLoadSizeHint = INITIAL_LOAD_SIZE,\n+ enablePlaceholders = false,\n+ ),\n+ boundaryCallback =\n+ object : PagedList.BoundaryCallback() {\n+ override fun onZeroItemsLoaded() {\n+ zeroItemsLoadedFunction()\n+ }\n+ },\n+ )\n }\n \n-}\n-\n-abstract class PagingDataSourceFactory(val loadingStates: LoadingStates) :\n- DataSource.Factory() {\n+abstract class PagingDataSourceFactory(\n+ val loadingStates: LoadingStates,\n+) : DataSource.Factory() {\n private var currentDataSource: PagingDataSource? = null\n abstract val loadFunction: LoadFunction\n \n override fun create() =\n dataSource(\n loadingStates,\n- loadFunction\n+ loadFunction,\n ).also { currentDataSource = it }\n \n fun retryFailedRequest() {\n currentDataSource?.retryFailedRequest()\n }\n-\n }\n \n-fun dataSourceFactory(loadingStates: LoadingStates, loadFunction: LoadFunction) =\n- object : PagingDataSourceFactory(loadingStates) {\n- override val loadFunction: LoadFunction = loadFunction\n- }\n+fun dataSourceFactory(\n+ loadingStates: LoadingStates,\n+ loadFunction: LoadFunction,\n+) = object : PagingDataSourceFactory(loadingStates) {\n+ override val loadFunction: LoadFunction = loadFunction\n+}\n \n sealed class LoadingState {\n object InitialLoad : LoadingState()\n+\n object Loading : LoadingState()\n+\n object Complete : LoadingState()\n+\n object Error : LoadingState()\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/media/IdAndCaptions.kt b/app/src/main/java/fr/free/nrw/commons/media/IdAndCaptions.kt\nindex f9e6b4aeec..fe96eb8cb0 100644\n--- a/app/src/main/java/fr/free/nrw/commons/media/IdAndCaptions.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/media/IdAndCaptions.kt\n@@ -1,4 +1,6 @@\n package fr.free.nrw.commons.media\n \n-data class IdAndCaptions(val id: String, val captions: Map)\n-\n+data class IdAndCaptions(\n+ val id: String,\n+ val captions: Map,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt b/app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt\nindex 72ec08924e..3728a72029 100644\n--- a/app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt\n@@ -6,10 +6,10 @@ import fr.free.nrw.commons.category.ContinuationClient\n import fr.free.nrw.commons.explore.media.MediaConverter\n import fr.free.nrw.commons.utils.CommonsDateUtil\n import fr.free.nrw.commons.wikidata.model.Entities\n-import io.reactivex.Single\n import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage\n import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n-import java.util.*\n+import io.reactivex.Single\n+import java.util.Date\n import javax.inject.Inject\n import javax.inject.Singleton\n \n@@ -22,199 +22,200 @@ const val RADIUS = 10000\n * Media Client to handle custom calls to Commons MediaWiki APIs\n */\n @Singleton\n-class MediaClient @Inject constructor(\n- private val mediaInterface: MediaInterface,\n- private val pageMediaInterface: PageMediaInterface,\n- private val mediaDetailInterface: MediaDetailInterface,\n- private val mediaConverter: MediaConverter\n-) : ContinuationClient() {\n-\n- fun getMediaById(id: String) =\n- responseMapper(mediaInterface.getMediaById(id)).map { it.first() }\n-\n- /**\n- * Checks if a page exists on Commons\n- * The same method can be used to check for file or talk page\n- *\n- * @param title File:Test.jpg or Commons:Deletion_requests/File:Test1.jpeg\n- */\n- fun checkPageExistsUsingTitle(title: String?): Single {\n- return mediaInterface.checkPageExistsUsingTitle(title)\n- .map { it.query()!!.firstPage()!!.pageId() > 0 }\n- }\n-\n- /**\n- * Take the fileSha and returns whether a file with a matching SHA exists or not\n- *\n- * @param fileSha SHA of the file to be checked\n- */\n- fun checkFileExistsUsingSha(fileSha: String?): Single {\n- return mediaInterface.checkFileExistsUsingSha(fileSha)\n- .map { it.query()!!.allImages().size > 0 }\n- }\n-\n- /**\n- * This method takes the category as input and returns a list of Media objects filtered using image generator query\n- * It uses the generator query API to get the images searched using a query, 10 at a time.\n- *\n- * @param category the search category. Must start with \"Category:\"\n- * @return\n- */\n- fun getMediaListFromCategory(category: String): Single> {\n- return continuationRequest(CATEGORY_CONTINUATION_PREFIX, category) {\n- mediaInterface.getMediaListFromCategory(category, 10, it)\n- }\n- }\n-\n- /**\n- * This method takes the userName as input and returns a list of Media objects filtered using\n- * allimages query It uses the allimages query API to get the images contributed by the userName,\n- * 10 at a time.\n- *\n- * @param userName the username\n- * @return\n- */\n- fun getMediaListForUser(userName: String): Single> {\n- return continuationRequest(\"user_\", userName) {\n- mediaInterface.getMediaListForUser(userName, 10, it)\n- }\n- }\n-\n- /**\n- * This method takes a keyword as input and returns a list of Media objects filtered using image generator query\n- * It uses the generator query API to get the images searched using a query, 10 at a time.\n- *\n- * @param keyword the search keyword\n- * @param limit\n- * @param offset\n- * @return\n- */\n- fun getMediaListFromSearch(keyword: String?, limit: Int, offset: Int) =\n- responseMapper(mediaInterface.getMediaListFromSearch(keyword, limit, offset))\n-\n- /**\n- * This method takes coordinate as input and returns a list of Media objects.\n- * It uses the generator query API to get the images searched using a query.\n- *\n- * @param coordinate coordinate\n- * @return\n- */\n- fun getMediaListFromGeoSearch(coordinate: String?) =\n- responseMapper(mediaInterface.getMediaListFromGeoSearch(coordinate, LIMIT, RADIUS))\n-\n- /**\n- * @return list of images for a particular depict entity\n- */\n- fun fetchImagesForDepictedItem(\n- query: String,\n- srlimit: Int,\n- sroffset: Int\n- ): Single> {\n- return responseMapper(\n- mediaInterface.fetchImagesForDepictedItem(\n- \"haswbstatement:\" + BuildConfig.DEPICTS_PROPERTY + \"=\" + query,\n- srlimit.toString(),\n- sroffset.toString()\n+class MediaClient\n+ @Inject\n+ constructor(\n+ private val mediaInterface: MediaInterface,\n+ private val pageMediaInterface: PageMediaInterface,\n+ private val mediaDetailInterface: MediaDetailInterface,\n+ private val mediaConverter: MediaConverter,\n+ ) : ContinuationClient() {\n+ fun getMediaById(id: String) = responseMapper(mediaInterface.getMediaById(id)).map { it.first() }\n+\n+ /**\n+ * Checks if a page exists on Commons\n+ * The same method can be used to check for file or talk page\n+ *\n+ * @param title File:Test.jpg or Commons:Deletion_requests/File:Test1.jpeg\n+ */\n+ fun checkPageExistsUsingTitle(title: String?): Single =\n+ mediaInterface\n+ .checkPageExistsUsingTitle(title)\n+ .map { it.query()!!.firstPage()!!.pageId() > 0 }\n+\n+ /**\n+ * Take the fileSha and returns whether a file with a matching SHA exists or not\n+ *\n+ * @param fileSha SHA of the file to be checked\n+ */\n+ fun checkFileExistsUsingSha(fileSha: String?): Single =\n+ mediaInterface\n+ .checkFileExistsUsingSha(fileSha)\n+ .map { it.query()!!.allImages().size > 0 }\n+\n+ /**\n+ * This method takes the category as input and returns a list of Media objects filtered using image generator query\n+ * It uses the generator query API to get the images searched using a query, 10 at a time.\n+ *\n+ * @param category the search category. Must start with \"Category:\"\n+ * @return\n+ */\n+ fun getMediaListFromCategory(category: String): Single> =\n+ continuationRequest(CATEGORY_CONTINUATION_PREFIX, category) {\n+ mediaInterface.getMediaListFromCategory(category, 10, it)\n+ }\n+\n+ /**\n+ * This method takes the userName as input and returns a list of Media objects filtered using\n+ * allimages query It uses the allimages query API to get the images contributed by the userName,\n+ * 10 at a time.\n+ *\n+ * @param userName the username\n+ * @return\n+ */\n+ fun getMediaListForUser(userName: String): Single> =\n+ continuationRequest(\"user_\", userName) {\n+ mediaInterface.getMediaListForUser(userName, 10, it)\n+ }\n+\n+ /**\n+ * This method takes a keyword as input and returns a list of Media objects filtered using image generator query\n+ * It uses the generator query API to get the images searched using a query, 10 at a time.\n+ *\n+ * @param keyword the search keyword\n+ * @param limit\n+ * @param offset\n+ * @return\n+ */\n+ fun getMediaListFromSearch(\n+ keyword: String?,\n+ limit: Int,\n+ offset: Int,\n+ ) = responseMapper(mediaInterface.getMediaListFromSearch(keyword, limit, offset))\n+\n+ /**\n+ * This method takes coordinate as input and returns a list of Media objects.\n+ * It uses the generator query API to get the images searched using a query.\n+ *\n+ * @param coordinate coordinate\n+ * @return\n+ */\n+ fun getMediaListFromGeoSearch(coordinate: String?) =\n+ responseMapper(mediaInterface.getMediaListFromGeoSearch(coordinate, LIMIT, RADIUS))\n+\n+ /**\n+ * @return list of images for a particular depict entity\n+ */\n+ fun fetchImagesForDepictedItem(\n+ query: String,\n+ srlimit: Int,\n+ sroffset: Int,\n+ ): Single> =\n+ responseMapper(\n+ mediaInterface.fetchImagesForDepictedItem(\n+ \"haswbstatement:\" + BuildConfig.DEPICTS_PROPERTY + \"=\" + query,\n+ srlimit.toString(),\n+ sroffset.toString(),\n+ ),\n )\n- )\n- }\n-\n- /**\n- * Fetches Media object from the imageInfo API\n- *\n- * @param titles the tiles to be searched for. Can be filename or template name\n- * @return\n- */\n- fun getMedia(titles: String?): Single {\n- return responseMapper(mediaInterface.getMedia(titles))\n- .map { it.first() }\n- }\n-\n- /**\n- * Fetches Media object from the imageInfo API but suppress (known) errors\n- *\n- * @param titles the tiles to be searched for. Can be filename or template name\n- * @return\n- */\n- fun getMediaSuppressingErrors(titles: String?): Single {\n- return responseMapper(mediaInterface.getMediaSuppressingErrors(titles))\n- .map { it.first() }\n- }\n-\n- /**\n- * The method returns the picture of the day\n- *\n- * @return Media object corresponding to the picture of the day\n- */\n- fun getPictureOfTheDay(): Single {\n- val date = CommonsDateUtil.getIso8601DateFormatShort().format(Date())\n- return responseMapper(mediaInterface.getMediaWithGenerator(\"Template:Potd/$date\")).map { it.first() }\n- }\n-\n- fun getPageHtml(title: String?): Single {\n- return mediaInterface.getPageHtml(title)\n- .map { obj: MwParseResponse -> obj.parse()?.text() ?: \"\" }\n- }\n-\n- fun getEntities(entityIds: List): Single {\n- return if (entityIds.isEmpty())\n- Single.error(Exception(\"empty list passed for ids\"))\n- else\n- mediaDetailInterface.getEntity(entityIds.joinToString(\"|\"))\n- }\n-\n- fun doesPageContainMedia(title: String?): Single {\n- return pageMediaInterface.getMediaList(title)\n- .map { it.items.isNotEmpty() }\n- }\n-\n- fun resetCategoryContinuation(category: String) {\n- resetContinuation(CATEGORY_CONTINUATION_PREFIX, category)\n- }\n \n- /**\n- * Call the resetUserContinuation method\n- *\n- * @param userName the username\n- */\n- fun resetUserNameContinuation(userName: String) =\n- resetUserContinuation(\"user_\", userName)\n-\n- /**\n- * Get whole WikiText of required file\n- * @param title : Name of the file\n- * @return Observable\n- */\n- fun getCurrentWikiText(title: String): Single {\n- return mediaDetailInterface.getWikiText(title).map {\n- it.query()?.pages()?.get(0)?.revisions()?.get(0)?.content()\n+ /**\n+ * Fetches Media object from the imageInfo API\n+ *\n+ * @param titles the tiles to be searched for. Can be filename or template name\n+ * @return\n+ */\n+ fun getMedia(titles: String?): Single =\n+ responseMapper(mediaInterface.getMedia(titles))\n+ .map { it.first() }\n+\n+ /**\n+ * Fetches Media object from the imageInfo API but suppress (known) errors\n+ *\n+ * @param titles the tiles to be searched for. Can be filename or template name\n+ * @return\n+ */\n+ fun getMediaSuppressingErrors(titles: String?): Single =\n+ responseMapper(mediaInterface.getMediaSuppressingErrors(titles))\n+ .map { it.first() }\n+\n+ /**\n+ * The method returns the picture of the day\n+ *\n+ * @return Media object corresponding to the picture of the day\n+ */\n+ fun getPictureOfTheDay(): Single {\n+ val date = CommonsDateUtil.getIso8601DateFormatShort().format(Date())\n+ return responseMapper(mediaInterface.getMediaWithGenerator(\"Template:Potd/$date\")).map { it.first() }\n }\n- }\n \n- override fun responseMapper(\n- networkResult: Single,\n- key: String?\n- ): Single> {\n- return networkResult.map {\n- handleContinuationResponse(it.continuation(), key)\n- it.query()?.pages() ?: emptyList()\n- }.flatMap(::mediaFromPageAndEntity)\n- }\n+ fun getPageHtml(title: String?): Single =\n+ mediaInterface\n+ .getPageHtml(title)\n+ .map { obj: MwParseResponse -> obj.parse()?.text() ?: \"\" }\n+\n+ fun getEntities(entityIds: List): Single =\n+ if (entityIds.isEmpty()) {\n+ Single.error(Exception(\"empty list passed for ids\"))\n+ } else {\n+ mediaDetailInterface.getEntity(entityIds.joinToString(\"|\"))\n+ }\n+\n+ fun doesPageContainMedia(title: String?): Single =\n+ pageMediaInterface\n+ .getMediaList(title)\n+ .map { it.items.isNotEmpty() }\n+\n+ fun resetCategoryContinuation(category: String) {\n+ resetContinuation(CATEGORY_CONTINUATION_PREFIX, category)\n+ }\n \n- private fun mediaFromPageAndEntity(pages: List): Single> {\n- return if (pages.isEmpty()) {\n- Single.just(emptyList())\n- } else {\n- getEntities(pages.map { \"$PAGE_ID_PREFIX${it.pageId()}\" })\n+ /**\n+ * Call the resetUserContinuation method\n+ *\n+ * @param userName the username\n+ */\n+ fun resetUserNameContinuation(userName: String) = resetUserContinuation(\"user_\", userName)\n+\n+ /**\n+ * Get whole WikiText of required file\n+ * @param title : Name of the file\n+ * @return Observable\n+ */\n+ fun getCurrentWikiText(title: String): Single =\n+ mediaDetailInterface.getWikiText(title).map {\n+ it\n+ .query()\n+ ?.pages()\n+ ?.get(0)\n+ ?.revisions()\n+ ?.get(0)\n+ ?.content()\n+ }\n+\n+ override fun responseMapper(\n+ networkResult: Single,\n+ key: String?,\n+ ): Single> =\n+ networkResult\n .map {\n- pages.zip(it.entities().values)\n- .mapNotNull { (page, entity) ->\n- page.imageInfo()?.let {\n- mediaConverter.convert(page, entity, it)\n+ handleContinuationResponse(it.continuation(), key)\n+ it.query()?.pages() ?: emptyList()\n+ }.flatMap(::mediaFromPageAndEntity)\n+\n+ private fun mediaFromPageAndEntity(pages: List): Single> =\n+ if (pages.isEmpty()) {\n+ Single.just(emptyList())\n+ } else {\n+ getEntities(pages.map { \"$PAGE_ID_PREFIX${it.pageId()}\" })\n+ .map {\n+ pages\n+ .zip(it.entities().values)\n+ .mapNotNull { (page, entity) ->\n+ page.imageInfo()?.let {\n+ mediaConverter.convert(page, entity, it)\n+ }\n }\n- }\n- }\n- }\n-\n+ }\n+ }\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailInterface.kt b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailInterface.kt\nindex a77271d787..10b375340e 100644\n--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailInterface.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailInterface.kt\n@@ -20,7 +20,7 @@ interface MediaDetailInterface {\n @GET(\"w/api.php?action=wbgetentities&props=labels&format=json&languagefallback=1&sites=commonswiki\")\n fun fetchEntitiesByFileName(\n @Query(\"languages\") language: String?,\n- @Query(\"titles\") filename: String?\n+ @Query(\"titles\") filename: String?,\n ): Observable\n \n /**\n@@ -28,7 +28,9 @@ interface MediaDetailInterface {\n * @param entityId EntityId (Ex: Q81566) of the depict entity\n */\n @GET(\"/w/api.php?format=json&action=wbgetentities&props=labels&languagefallback=1\")\n- fun getEntity(@Query(\"ids\") entityId: String?): Single\n+ fun getEntity(\n+ @Query(\"ids\") entityId: String?,\n+ ): Single\n \n /**\n * Fetches caption using wikibaseIdentifier\n@@ -38,16 +40,16 @@ interface MediaDetailInterface {\n @GET(\"/w/api.php?action=wbgetentities&props=labels&format=json&languagefallback=1&sites=commonswiki\")\n fun getEntityForImage(\n @Query(\"languages\") language: String?,\n- @Query(\"ids\") wikibaseIdentifier: String?\n+ @Query(\"ids\") wikibaseIdentifier: String?,\n ): Observable\n \n /**\n * Fetches current wikitext\n * @param title file name\n * @return Single\n- */\n+ */\n @GET(WikidataConstants.MW_API_PREFIX + \"action=query&prop=revisions&rvprop=content|timestamp&rvlimit=1&converttitles=\")\n fun getWikiText(\n- @Query(\"titles\") title: String?\n+ @Query(\"titles\") title: String?,\n ): Single\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaInterface.kt b/app/src/main/java/fr/free/nrw/commons/media/MediaInterface.kt\nindex c1b2f7ab57..ef0ef1f9ca 100644\n--- a/app/src/main/java/fr/free/nrw/commons/media/MediaInterface.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaInterface.kt\n@@ -19,7 +19,9 @@ interface MediaInterface {\n * @return\n */\n @GET(\"w/api.php?action=query&format=json&formatversion=2\")\n- fun checkPageExistsUsingTitle(@Query(\"titles\") title: String?): Single\n+ fun checkPageExistsUsingTitle(\n+ @Query(\"titles\") title: String?,\n+ ): Single\n \n /**\n * Check if file exists\n@@ -28,7 +30,9 @@ interface MediaInterface {\n * @return\n */\n @GET(\"w/api.php?action=query&format=json&formatversion=2&list=allimages\")\n- fun checkFileExistsUsingSha(@Query(\"aisha1\") aisha1: String?): Single\n+ fun checkFileExistsUsingSha(\n+ @Query(\"aisha1\") aisha1: String?,\n+ ): Single\n \n /**\n * This method retrieves a list of Media objects filtered using image generator query\n@@ -39,13 +43,13 @@ interface MediaInterface {\n * @return\n */\n @GET(\n- \"w/api.php?action=query&format=json&formatversion=2\" + //Basic parameters\n- \"&generator=categorymembers&gcmtype=file&gcmsort=timestamp&gcmdir=desc$MEDIA_PARAMS\" //Category parameters\n+ \"w/api.php?action=query&format=json&formatversion=2\" + // Basic parameters\n+ \"&generator=categorymembers&gcmtype=file&gcmsort=timestamp&gcmdir=desc$MEDIA_PARAMS\", // Category parameters\n )\n fun getMediaListFromCategory(\n @Query(\"gcmtitle\") category: String?,\n @Query(\"gcmlimit\") itemLimit: Int,\n- @QueryMap continuation: Map\n+ @QueryMap continuation: Map,\n ): Single\n \n /**\n@@ -57,13 +61,13 @@ interface MediaInterface {\n * @return\n */\n @GET(\n- \"w/api.php?action=query&format=json&formatversion=2\" + //Basic parameters\n- \"&generator=allimages&gaisort=timestamp&gaidir=older$MEDIA_PARAMS\"\n+ \"w/api.php?action=query&format=json&formatversion=2\" + // Basic parameters\n+ \"&generator=allimages&gaisort=timestamp&gaidir=older$MEDIA_PARAMS\",\n )\n fun getMediaListForUser(\n @Query(\"gaiuser\") username: String?,\n @Query(\"gailimit\") itemLimit: Int,\n- @QueryMap(encoded = true) continuation: Map\n+ @QueryMap(encoded = true) continuation: Map,\n ): Single\n \n /**\n@@ -75,12 +79,13 @@ interface MediaInterface {\n * @return\n */\n @GET(\n- \"w/api.php?action=query&format=json&formatversion=2\" + //Basic parameters\n- \"&generator=search&gsrwhat=text&gsrnamespace=6$MEDIA_PARAMS\" //Search parameters\n+ \"w/api.php?action=query&format=json&formatversion=2\" + // Basic parameters\n+ \"&generator=search&gsrwhat=text&gsrnamespace=6$MEDIA_PARAMS\", // Search parameters\n )\n fun getMediaListFromSearch(\n @Query(\"gsrsearch\") keyword: String?,\n- @Query(\"gsrlimit\") itemLimit: Int, @Query(\"gsroffset\") offset: Int\n+ @Query(\"gsrlimit\") itemLimit: Int,\n+ @Query(\"gsroffset\") offset: Int,\n ): Single\n \n /**\n@@ -91,13 +96,13 @@ interface MediaInterface {\n * @return\n */\n @GET(\n- \"w/api.php?action=query&format=json&formatversion=2\" + //Basic parameters\n- \"&generator=geosearch&ggsnamespace=6$MEDIA_PARAMS\" //Search parameters\n+ \"w/api.php?action=query&format=json&formatversion=2\" + // Basic parameters\n+ \"&generator=geosearch&ggsnamespace=6$MEDIA_PARAMS\", // Search parameters\n )\n fun getMediaListFromGeoSearch(\n @Query(\"ggscoord\") location: String?,\n @Query(\"ggslimit\") itemLimit: Int,\n- @Query(\"ggsradius\") radius: Int\n+ @Query(\"ggsradius\") radius: Int,\n ): Single\n \n /**\n@@ -107,7 +112,9 @@ interface MediaInterface {\n * @return\n */\n @GET(\"w/api.php?action=query&format=json&formatversion=2$MEDIA_PARAMS_WITH_CATEGORY_DETAILS\")\n- fun getMedia(@Query(\"titles\") title: String?): Single\n+ fun getMedia(\n+ @Query(\"titles\") title: String?,\n+ ): Single\n \n /**\n * Fetches Media object from the imageInfo API but suppress (known) errors\n@@ -117,7 +124,9 @@ interface MediaInterface {\n */\n @GET(\"w/api.php?action=query&format=json&formatversion=2$MEDIA_PARAMS_WITH_CATEGORY_DETAILS\")\n @Headers(SUPPRESS_ERROR_LOG_HEADER)\n- fun getMediaSuppressingErrors(@Query(\"titles\") title: String?): Single\n+ fun getMediaSuppressingErrors(\n+ @Query(\"titles\") title: String?,\n+ ): Single\n \n /**\n * Fetches Media object from the imageInfo API\n@@ -127,7 +136,9 @@ interface MediaInterface {\n */\n @GET(\"w/api.php?action=query&format=json&formatversion=2$MEDIA_PARAMS\")\n @Headers(SUPPRESS_ERROR_LOG_HEADER)\n- fun getMediaById(@Query(\"pageids\") pageIds: String?): Single\n+ fun getMediaById(\n+ @Query(\"pageids\") pageIds: String?,\n+ ): Single\n \n /**\n * Fetches Media object from the imageInfo API\n@@ -137,11 +148,15 @@ interface MediaInterface {\n * @return\n */\n @GET(\"w/api.php?action=query&format=json&formatversion=2&generator=images$MEDIA_PARAMS\")\n- fun getMediaWithGenerator(@Query(\"titles\") title: String?): Single\n+ fun getMediaWithGenerator(\n+ @Query(\"titles\") title: String?,\n+ ): Single\n \n @GET(\"w/api.php?format=json&action=parse&prop=text\")\n @Headers(SUPPRESS_ERROR_LOG_HEADER)\n- fun getPageHtml(@Query(\"page\") title: String?): Single\n+ fun getPageHtml(\n+ @Query(\"page\") title: String?,\n+ ): Single\n \n /**\n * Fetches caption using file name\n@@ -151,7 +166,7 @@ interface MediaInterface {\n @GET(\"w/api.php?action=wbgetentities&props=labels&format=json&languagefallback=1\")\n fun fetchCaptionByFilename(\n @Query(\"language\") language: String?,\n- @Query(\"titles\") filename: String?\n+ @Query(\"titles\") filename: String?,\n ): Single\n \n /**\n@@ -161,12 +176,13 @@ interface MediaInterface {\n * @param sroffset number od depictions already fetched, this is useful in implementing pagination\n */\n @GET(\n- \"w/api.php?action=query&format=json&formatversion=2\" + //Basic parameters\n- \"&generator=search&gsrnamespace=6$MEDIA_PARAMS\" //Search parameters\n+ \"w/api.php?action=query&format=json&formatversion=2\" + // Basic parameters\n+ \"&generator=search&gsrnamespace=6$MEDIA_PARAMS\", // Search parameters\n )\n fun fetchImagesForDepictedItem(\n @Query(\"gsrsearch\") query: String?,\n- @Query(\"gsrlimit\") srlimit: String?, @Query(\"gsroffset\") sroffset: String?\n+ @Query(\"gsrlimit\") srlimit: String?,\n+ @Query(\"gsroffset\") sroffset: String?,\n ): Single\n \n companion object {\ndiff --git a/app/src/main/java/fr/free/nrw/commons/media/PageMediaInterface.kt b/app/src/main/java/fr/free/nrw/commons/media/PageMediaInterface.kt\nindex 2e8927778a..c229c2df69 100644\n--- a/app/src/main/java/fr/free/nrw/commons/media/PageMediaInterface.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/media/PageMediaInterface.kt\n@@ -15,5 +15,7 @@ interface PageMediaInterface {\n * @param title the title of the page\n */\n @GET(\"api/rest_v1/page/media-list/{title}\")\n- fun getMediaList(@Path(\"title\") title: String?): Single\n+ fun getMediaList(\n+ @Path(\"title\") title: String?,\n+ ): Single\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaClient.kt b/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaClient.kt\nindex 9fb7284435..2ad90d3f2f 100644\n--- a/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaClient.kt\n@@ -5,9 +5,9 @@ import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.category.ContinuationClient\n import fr.free.nrw.commons.explore.media.MediaConverter\n import fr.free.nrw.commons.wikidata.model.Entities\n-import io.reactivex.Single\n import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage\n import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n+import io.reactivex.Single\n import javax.inject.Inject\n import javax.inject.Singleton\n \n@@ -15,79 +15,79 @@ import javax.inject.Singleton\n * Media Client to handle custom calls to Commons MediaWiki APIs of production server\n */\n @Singleton\n-class WikidataMediaClient @Inject constructor(\n- private val wikidataMediaInterface: WikidataMediaInterface,\n- private val mediaDetailInterface: MediaDetailInterface,\n- private val mediaConverter: MediaConverter\n-) : ContinuationClient() {\n-\n- /**\n- * Fetch images for depict ID\n- *\n- * @param query depictionEntityId ex. \"Q9394\"\n- * @param srlimit the number of items to fetch\n- * @param sroffset number of depictions already fetched,\n- * this is useful in implementing pagination\n- * @return list of images for a particular depict ID\n- */\n- fun fetchImagesForDepictedItem(\n- query: String,\n- srlimit: Int,\n- sroffset: Int\n- ): Single> {\n- return responseMapper(\n- wikidataMediaInterface.fetchImagesForDepictedItem(\n- \"haswbstatement:\" + BetaConstants.DEPICTS_PROPERTY + \"=\" + query,\n- srlimit.toString(),\n- sroffset.toString()\n+class WikidataMediaClient\n+ @Inject\n+ constructor(\n+ private val wikidataMediaInterface: WikidataMediaInterface,\n+ private val mediaDetailInterface: MediaDetailInterface,\n+ private val mediaConverter: MediaConverter,\n+ ) : ContinuationClient() {\n+ /**\n+ * Fetch images for depict ID\n+ *\n+ * @param query depictionEntityId ex. \"Q9394\"\n+ * @param srlimit the number of items to fetch\n+ * @param sroffset number of depictions already fetched,\n+ * this is useful in implementing pagination\n+ * @return list of images for a particular depict ID\n+ */\n+ fun fetchImagesForDepictedItem(\n+ query: String,\n+ srlimit: Int,\n+ sroffset: Int,\n+ ): Single> =\n+ responseMapper(\n+ wikidataMediaInterface.fetchImagesForDepictedItem(\n+ \"haswbstatement:\" + BetaConstants.DEPICTS_PROPERTY + \"=\" + query,\n+ srlimit.toString(),\n+ sroffset.toString(),\n+ ),\n )\n- )\n- }\n \n- /**\n- * Helps to map to the required data from the API response\n- *\n- * @param networkResult MwQueryResponse\n- * @param key for handling continuation request, this is null in this case\n- */\n- override fun responseMapper(\n- networkResult: Single,\n- key: String?\n- ): Single> {\n- return networkResult.map {\n- handleContinuationResponse(it.continuation(), key)\n- it.query()?.pages() ?: emptyList()\n- }.flatMap(::mediaFromPageAndEntity)\n- }\n-\n- /**\n- * Gets list of Media from MwQueryPage\n- */\n- private fun mediaFromPageAndEntity(pages: List): Single> {\n- return if (pages.isEmpty())\n- Single.just(emptyList())\n- else\n- getEntities(pages.map { \"$PAGE_ID_PREFIX${it.pageId()}\" })\n+ /**\n+ * Helps to map to the required data from the API response\n+ *\n+ * @param networkResult MwQueryResponse\n+ * @param key for handling continuation request, this is null in this case\n+ */\n+ override fun responseMapper(\n+ networkResult: Single,\n+ key: String?,\n+ ): Single> =\n+ networkResult\n .map {\n- pages.zip(it.entities().values)\n- .mapNotNull { (page, entity) ->\n- page.imageInfo()?.let {\n- mediaConverter.convert(page, entity, it)\n+ handleContinuationResponse(it.continuation(), key)\n+ it.query()?.pages() ?: emptyList()\n+ }.flatMap(::mediaFromPageAndEntity)\n+\n+ /**\n+ * Gets list of Media from MwQueryPage\n+ */\n+ private fun mediaFromPageAndEntity(pages: List): Single> =\n+ if (pages.isEmpty()) {\n+ Single.just(emptyList())\n+ } else {\n+ getEntities(pages.map { \"$PAGE_ID_PREFIX${it.pageId()}\" })\n+ .map {\n+ pages\n+ .zip(it.entities().values)\n+ .mapNotNull { (page, entity) ->\n+ page.imageInfo()?.let {\n+ mediaConverter.convert(page, entity, it)\n+ }\n }\n- }\n- }\n- }\n+ }\n+ }\n \n- /**\n- * Gets Entities from IDs\n- *\n- * @param entityIds list of IDs of pages/entities ex. {\"M4254154\", \"M11413343\"}\n- */\n- fun getEntities(entityIds: List): Single {\n- return if (entityIds.isEmpty())\n- Single.error(Exception(\"empty list passed for ids\"))\n- else\n- mediaDetailInterface.getEntity(entityIds.joinToString(\"|\"))\n+ /**\n+ * Gets Entities from IDs\n+ *\n+ * @param entityIds list of IDs of pages/entities ex. {\"M4254154\", \"M11413343\"}\n+ */\n+ fun getEntities(entityIds: List): Single =\n+ if (entityIds.isEmpty()) {\n+ Single.error(Exception(\"empty list passed for ids\"))\n+ } else {\n+ mediaDetailInterface.getEntity(entityIds.joinToString(\"|\"))\n+ }\n }\n-\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaInterface.kt b/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaInterface.kt\nindex f250f7ac75..323799e6fa 100644\n--- a/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaInterface.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/media/WikidataMediaInterface.kt\n@@ -17,13 +17,14 @@ interface WikidataMediaInterface {\n * @param sroffset number of depictions already fetched,\n * this is useful in implementing pagination\n * @return Single\n- */\n+ */\n @GET(\n- \"w/api.php?action=query&format=json&formatversion=2\" + //Basic parameters\n- \"&generator=search&gsrnamespace=6$MEDIA_PARAMS\" //Search parameters\n+ \"w/api.php?action=query&format=json&formatversion=2\" + // Basic parameters\n+ \"&generator=search&gsrnamespace=6$MEDIA_PARAMS\", // Search parameters\n )\n fun fetchImagesForDepictedItem(\n @Query(\"gsrsearch\") query: String?,\n- @Query(\"gsrlimit\") srlimit: String?, @Query(\"gsroffset\") sroffset: String?\n+ @Query(\"gsrlimit\") srlimit: String?,\n+ @Query(\"gsroffset\") sroffset: String?,\n ): Single\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/media/ZoomableActivity.kt b/app/src/main/java/fr/free/nrw/commons/media/ZoomableActivity.kt\nindex 615dd78ee8..d08e3048c3 100644\n--- a/app/src/main/java/fr/free/nrw/commons/media/ZoomableActivity.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/media/ZoomableActivity.kt\n@@ -10,10 +10,7 @@ import android.os.Bundle\n import android.view.View\n import android.view.Window\n import android.widget.Button\n-import android.widget.ProgressBar\n-import android.widget.TextView\n import android.widget.Toast\n-import androidx.core.content.ContextCompat\n import androidx.lifecycle.ViewModelProvider\n import com.facebook.drawee.backends.pipeline.Fresco\n import com.facebook.drawee.controller.BaseControllerListener\n@@ -38,12 +35,16 @@ import fr.free.nrw.commons.customselector.ui.selector.CustomSelectorViewModel\n import fr.free.nrw.commons.customselector.ui.selector.CustomSelectorViewModelFactory\n import fr.free.nrw.commons.databinding.ActivityZoomableBinding\n import fr.free.nrw.commons.media.zoomControllers.zoomable.DoubleTapGestureListener\n-import fr.free.nrw.commons.media.zoomControllers.zoomable.ZoomableDraweeView\n import fr.free.nrw.commons.theme.BaseActivity\n import fr.free.nrw.commons.upload.FileProcessor\n import fr.free.nrw.commons.upload.FileUtilsWrapper\n import fr.free.nrw.commons.utils.CustomSelectorUtils\n-import kotlinx.coroutines.*\n+import kotlinx.coroutines.CoroutineDispatcher\n+import kotlinx.coroutines.CoroutineScope\n+import kotlinx.coroutines.Dispatchers\n+import kotlinx.coroutines.MainScope\n+import kotlinx.coroutines.cancel\n+import kotlinx.coroutines.launch\n import timber.log.Timber\n import javax.inject.Inject\n import kotlin.collections.ArrayList\n@@ -53,7 +54,6 @@ import kotlin.collections.ArrayList\n * like zoom, and swap gestures\n */\n class ZoomableActivity : BaseActivity() {\n-\n private lateinit var imageUri: Uri\n \n /**\n@@ -67,7 +67,7 @@ class ZoomableActivity : BaseActivity() {\n private lateinit var prefs: SharedPreferences\n \n private lateinit var binding: ActivityZoomableBinding\n- \n+\n var photoBackgroundColor: Int? = null\n \n /**\n@@ -126,36 +126,39 @@ class ZoomableActivity : BaseActivity() {\n lateinit var customSelectorViewModelFactory: CustomSelectorViewModelFactory\n \n /**\n- * Coroutine Dispatchers and Scope.\n- */\n- private var defaultDispatcher : CoroutineDispatcher = Dispatchers.Default\n- private var ioDispatcher : CoroutineDispatcher = Dispatchers.IO\n- private val scope : CoroutineScope = MainScope()\n+ * Coroutine Dispatchers and Scope.\n+ */\n+ private var defaultDispatcher: CoroutineDispatcher = Dispatchers.Default\n+ private var ioDispatcher: CoroutineDispatcher = Dispatchers.IO\n+ private val scope: CoroutineScope = MainScope()\n \n override fun onCreate(savedInstanceState: Bundle?) {\n super.onCreate(savedInstanceState)\n binding = ActivityZoomableBinding.inflate(layoutInflater)\n setContentView(binding.root)\n \n- prefs = applicationContext.getSharedPreferences(\n- ImageHelper.CUSTOM_SELECTOR_PREFERENCE_KEY,\n- MODE_PRIVATE\n- )\n+ prefs =\n+ applicationContext.getSharedPreferences(\n+ ImageHelper.CUSTOM_SELECTOR_PREFERENCE_KEY,\n+ MODE_PRIVATE,\n+ )\n \n- selectedImages = intent.getParcelableArrayListExtra(\n- CustomSelectorConstants.TOTAL_SELECTED_IMAGES\n- )\n+ selectedImages =\n+ intent.getParcelableArrayListExtra(\n+ CustomSelectorConstants.TOTAL_SELECTED_IMAGES,\n+ )\n position = intent.getIntExtra(CustomSelectorConstants.PRESENT_POSITION, 0)\n bucketId = intent.getLongExtra(CustomSelectorConstants.BUCKET_ID, 0L)\n- viewModel = ViewModelProvider(this, customSelectorViewModelFactory).get(\n- CustomSelectorViewModel::class.java\n- )\n+ viewModel =\n+ ViewModelProvider(this, customSelectorViewModelFactory).get(\n+ CustomSelectorViewModel::class.java,\n+ )\n viewModel.fetchImages()\n viewModel.result.observe(this) {\n handleResult(it)\n }\n \n- val origin = intent.getStringExtra(ZoomableActivityConstants.ORIGIN);\n+ val origin = intent.getStringExtra(ZoomableActivityConstants.ORIGIN)\n \n /**\n * If origin is \"null\" it means that ZoomableActivity was created by the custom picker\n@@ -166,15 +169,20 @@ class ZoomableActivity : BaseActivity() {\n if (prefs.getBoolean(CustomSelectorConstants.FULL_SCREEN_MODE_FIRST_LUNCH, true)) {\n // show welcome dialog on first launch\n showWelcomeDialog()\n- prefs.edit().putBoolean(\n- CustomSelectorConstants.FULL_SCREEN_MODE_FIRST_LUNCH,\n- false\n- ).apply()\n+ prefs\n+ .edit()\n+ .putBoolean(\n+ CustomSelectorConstants.FULL_SCREEN_MODE_FIRST_LUNCH,\n+ false,\n+ ).apply()\n }\n }\n- \n- val backgroundColor = intent.getIntExtra(ZoomableActivityConstants.PHOTO_BACKGROUND_COLOR,\n- MediaDetailFragment.DEFAULT_IMAGE_BACKGROUND_COLOR);\n+\n+ val backgroundColor =\n+ intent.getIntExtra(\n+ ZoomableActivityConstants.PHOTO_BACKGROUND_COLOR,\n+ MediaDetailFragment.DEFAULT_IMAGE_BACKGROUND_COLOR,\n+ )\n \n if (backgroundColor != MediaDetailFragment.DEFAULT_IMAGE_BACKGROUND_COLOR) {\n photoBackgroundColor = backgroundColor\n@@ -196,15 +204,16 @@ class ZoomableActivity : BaseActivity() {\n * Handle view model result.\n */\n private fun handleResult(result: Result) {\n- if(result.status is CallbackStatus.SUCCESS){\n+ if (result.status is CallbackStatus.SUCCESS) {\n val images = result.images\n- if(images.isNotEmpty()) {\n+ if (images.isNotEmpty()) {\n this@ZoomableActivity.images = ImageHelper.filterImages(images, bucketId)\n- imageUri = if (this@ZoomableActivity.images.isNullOrEmpty()) {\n- intent.data as Uri\n- } else {\n- this@ZoomableActivity.images!![position].uri\n- }\n+ imageUri =\n+ if (this@ZoomableActivity.images.isNullOrEmpty()) {\n+ intent.data as Uri\n+ } else {\n+ this@ZoomableActivity.images!![position].uri\n+ }\n Timber.d(\"URL = $imageUri\")\n init(imageUri)\n onSwipe()\n@@ -225,34 +234,36 @@ class ZoomableActivity : BaseActivity() {\n sharedPreferences.getBoolean(ImageHelper.SHOW_ALREADY_ACTIONED_IMAGES_PREFERENCE_KEY, true)\n \n if (!images.isNullOrEmpty()) {\n- binding.zoomable!!.setOnTouchListener(object : OnSwipeTouchListener(this) {\n- // Swipe left to view next image in the folder. (if available)\n- override fun onSwipeLeft() {\n- super.onSwipeLeft()\n- onLeftSwiped(showAlreadyActionedImages)\n- }\n+ binding.zoomable!!.setOnTouchListener(\n+ object : OnSwipeTouchListener(this) {\n+ // Swipe left to view next image in the folder. (if available)\n+ override fun onSwipeLeft() {\n+ super.onSwipeLeft()\n+ onLeftSwiped(showAlreadyActionedImages)\n+ }\n \n- // Swipe right to view previous image in the folder. (if available)\n- override fun onSwipeRight() {\n- super.onSwipeRight()\n- onRightSwiped(showAlreadyActionedImages)\n- }\n+ // Swipe right to view previous image in the folder. (if available)\n+ override fun onSwipeRight() {\n+ super.onSwipeRight()\n+ onRightSwiped(showAlreadyActionedImages)\n+ }\n \n- // Swipe up to select the picture (the equivalent of tapping it in non-fullscreen mode)\n- // and show the next picture skipping pictures that have either already been uploaded or\n- // marked as not for upload\n- override fun onSwipeUp() {\n- super.onSwipeUp()\n- onUpSwiped()\n- }\n+ // Swipe up to select the picture (the equivalent of tapping it in non-fullscreen mode)\n+ // and show the next picture skipping pictures that have either already been uploaded or\n+ // marked as not for upload\n+ override fun onSwipeUp() {\n+ super.onSwipeUp()\n+ onUpSwiped()\n+ }\n \n- // Swipe down to mark that picture as \"Not for upload\" (the equivalent of selecting it then\n- // tapping \"Mark as not for upload\" in non-fullscreen mode), and show the next picture.\n- override fun onSwipeDown() {\n- super.onSwipeDown()\n- onDownSwiped()\n- }\n- })\n+ // Swipe down to mark that picture as \"Not for upload\" (the equivalent of selecting it then\n+ // tapping \"Mark as not for upload\" in non-fullscreen mode), and show the next picture.\n+ override fun onSwipeDown() {\n+ super.onSwipeDown()\n+ onDownSwiped()\n+ }\n+ },\n+ )\n }\n }\n \n@@ -260,58 +271,66 @@ class ZoomableActivity : BaseActivity() {\n * Handles down swipe action\n */\n private fun onDownSwiped() {\n- if (binding.zoomable?.zoomableController?.isIdentity == false)\n+ if (binding.zoomable?.zoomableController?.isIdentity == false) {\n return\n+ }\n \n scope.launch {\n- val imageSHA1 = CustomSelectorUtils.getImageSHA1(\n- images!![position].uri,\n- ioDispatcher,\n- fileUtilsWrapper,\n- contentResolver\n- )\n+ val imageSHA1 =\n+ CustomSelectorUtils.getImageSHA1(\n+ images!![position].uri,\n+ ioDispatcher,\n+ fileUtilsWrapper,\n+ contentResolver,\n+ )\n var isUploaded = uploadedStatusDao.findByImageSHA1(imageSHA1, true)\n if (isUploaded > 0) {\n- Toast.makeText(\n- this@ZoomableActivity,\n- getString(R.string.this_image_is_already_uploaded),\n- Toast.LENGTH_SHORT\n- ).show()\n- } else {\n- val imageModifiedSHA1 = CustomSelectorUtils.generateModifiedSHA1(\n- images!![position],\n- defaultDispatcher,\n- this@ZoomableActivity,\n- fileProcessor,\n- fileUtilsWrapper\n- )\n- isUploaded = uploadedStatusDao.findByModifiedImageSHA1(\n- imageModifiedSHA1,\n- true\n- )\n- if (isUploaded > 0) {\n- Toast.makeText(\n+ Toast\n+ .makeText(\n this@ZoomableActivity,\n getString(R.string.this_image_is_already_uploaded),\n- Toast.LENGTH_SHORT\n+ Toast.LENGTH_SHORT,\n ).show()\n+ } else {\n+ val imageModifiedSHA1 =\n+ CustomSelectorUtils.generateModifiedSHA1(\n+ images!![position],\n+ defaultDispatcher,\n+ this@ZoomableActivity,\n+ fileProcessor,\n+ fileUtilsWrapper,\n+ )\n+ isUploaded =\n+ uploadedStatusDao.findByModifiedImageSHA1(\n+ imageModifiedSHA1,\n+ true,\n+ )\n+ if (isUploaded > 0) {\n+ Toast\n+ .makeText(\n+ this@ZoomableActivity,\n+ getString(R.string.this_image_is_already_uploaded),\n+ Toast.LENGTH_SHORT,\n+ ).show()\n } else {\n insertInNotForUpload(images!![position])\n- Toast.makeText(\n- this@ZoomableActivity,\n- getString(R.string.image_marked_as_not_for_upload),\n- Toast.LENGTH_SHORT\n- ).show()\n+ Toast\n+ .makeText(\n+ this@ZoomableActivity,\n+ getString(R.string.image_marked_as_not_for_upload),\n+ Toast.LENGTH_SHORT,\n+ ).show()\n shouldRefresh = true\n if (position < images!!.size - 1) {\n position++\n init(images!![position].uri)\n } else {\n- Toast.makeText(\n- this@ZoomableActivity,\n- getString(R.string.no_more_images_found),\n- Toast.LENGTH_SHORT\n- ).show()\n+ Toast\n+ .makeText(\n+ this@ZoomableActivity,\n+ getString(R.string.no_more_images_found),\n+ Toast.LENGTH_SHORT,\n+ ).show()\n }\n }\n }\n@@ -322,58 +341,66 @@ class ZoomableActivity : BaseActivity() {\n * Handles up swipe action\n */\n private fun onUpSwiped() {\n- if (binding.zoomable?.zoomableController?.isIdentity == false)\n+ if (binding.zoomable?.zoomableController?.isIdentity == false) {\n return\n+ }\n \n scope.launch {\n- val imageSHA1 = CustomSelectorUtils.getImageSHA1(\n- images!![position].uri,\n- ioDispatcher,\n- fileUtilsWrapper,\n- contentResolver\n- )\n+ val imageSHA1 =\n+ CustomSelectorUtils.getImageSHA1(\n+ images!![position].uri,\n+ ioDispatcher,\n+ fileUtilsWrapper,\n+ contentResolver,\n+ )\n var isNonActionable = notForUploadStatusDao.find(imageSHA1)\n if (isNonActionable > 0) {\n- Toast.makeText(\n- this@ZoomableActivity,\n- getString(R.string.can_not_select_this_image_for_upload),\n- Toast.LENGTH_SHORT\n- ).show()\n+ Toast\n+ .makeText(\n+ this@ZoomableActivity,\n+ getString(R.string.can_not_select_this_image_for_upload),\n+ Toast.LENGTH_SHORT,\n+ ).show()\n } else {\n isNonActionable =\n uploadedStatusDao.findByImageSHA1(imageSHA1, true)\n if (isNonActionable > 0) {\n- Toast.makeText(\n- this@ZoomableActivity,\n- getString(R.string.this_image_is_already_uploaded),\n- Toast.LENGTH_SHORT\n- ).show()\n- } else {\n- val imageModifiedSHA1 = CustomSelectorUtils.generateModifiedSHA1(\n- images!![position],\n- defaultDispatcher,\n- this@ZoomableActivity,\n- fileProcessor,\n- fileUtilsWrapper\n- )\n- isNonActionable = uploadedStatusDao.findByModifiedImageSHA1(\n- imageModifiedSHA1,\n- true\n- )\n- if (isNonActionable > 0) {\n- Toast.makeText(\n+ Toast\n+ .makeText(\n this@ZoomableActivity,\n getString(R.string.this_image_is_already_uploaded),\n- Toast.LENGTH_SHORT\n+ Toast.LENGTH_SHORT,\n ).show()\n+ } else {\n+ val imageModifiedSHA1 =\n+ CustomSelectorUtils.generateModifiedSHA1(\n+ images!![position],\n+ defaultDispatcher,\n+ this@ZoomableActivity,\n+ fileProcessor,\n+ fileUtilsWrapper,\n+ )\n+ isNonActionable =\n+ uploadedStatusDao.findByModifiedImageSHA1(\n+ imageModifiedSHA1,\n+ true,\n+ )\n+ if (isNonActionable > 0) {\n+ Toast\n+ .makeText(\n+ this@ZoomableActivity,\n+ getString(R.string.this_image_is_already_uploaded),\n+ Toast.LENGTH_SHORT,\n+ ).show()\n } else {\n if (!selectedImages!!.contains(images!![position])) {\n selectedImages!!.add(images!![position])\n- Toast.makeText(\n- this@ZoomableActivity,\n- getString(R.string.image_selected),\n- Toast.LENGTH_SHORT\n- ).show()\n+ Toast\n+ .makeText(\n+ this@ZoomableActivity,\n+ getString(R.string.image_selected),\n+ Toast.LENGTH_SHORT,\n+ ).show()\n }\n position = getNextActionableImage(position + 1)\n init(images!![position].uri)\n@@ -387,19 +414,21 @@ class ZoomableActivity : BaseActivity() {\n * Handles right swipe action\n */\n private fun onRightSwiped(showAlreadyActionedImages: Boolean) {\n- if (binding.zoomable?.zoomableController?.isIdentity == false)\n+ if (binding.zoomable?.zoomableController?.isIdentity == false) {\n return\n+ }\n \n if (showAlreadyActionedImages) {\n if (position > 0) {\n position--\n init(images!![position].uri)\n } else {\n- Toast.makeText(\n- this@ZoomableActivity,\n- getString(R.string.no_more_images_found),\n- Toast.LENGTH_SHORT\n- ).show()\n+ Toast\n+ .makeText(\n+ this@ZoomableActivity,\n+ getString(R.string.no_more_images_found),\n+ Toast.LENGTH_SHORT,\n+ ).show()\n }\n } else {\n if (position > 0) {\n@@ -408,11 +437,12 @@ class ZoomableActivity : BaseActivity() {\n init(images!![position].uri)\n }\n } else {\n- Toast.makeText(\n- this@ZoomableActivity,\n- getString(R.string.no_more_images_found),\n- Toast.LENGTH_SHORT\n- ).show()\n+ Toast\n+ .makeText(\n+ this@ZoomableActivity,\n+ getString(R.string.no_more_images_found),\n+ Toast.LENGTH_SHORT,\n+ ).show()\n }\n }\n }\n@@ -421,19 +451,21 @@ class ZoomableActivity : BaseActivity() {\n * Handles left swipe action\n */\n private fun onLeftSwiped(showAlreadyActionedImages: Boolean) {\n- if (binding.zoomable?.zoomableController?.isIdentity == false)\n+ if (binding.zoomable?.zoomableController?.isIdentity == false) {\n return\n+ }\n \n if (showAlreadyActionedImages) {\n if (position < images!!.size - 1) {\n position++\n init(images!![position].uri)\n } else {\n- Toast.makeText(\n- this@ZoomableActivity,\n- getString(R.string.no_more_images_found),\n- Toast.LENGTH_SHORT\n- ).show()\n+ Toast\n+ .makeText(\n+ this@ZoomableActivity,\n+ getString(R.string.no_more_images_found),\n+ Toast.LENGTH_SHORT,\n+ ).show()\n }\n } else {\n if (position < images!!.size - 1) {\n@@ -442,11 +474,12 @@ class ZoomableActivity : BaseActivity() {\n init(images!![position].uri)\n }\n } else {\n- Toast.makeText(\n- this@ZoomableActivity,\n- getString(R.string.no_more_images_found),\n- Toast.LENGTH_SHORT\n- ).show()\n+ Toast\n+ .makeText(\n+ this@ZoomableActivity,\n+ getString(R.string.no_more_images_found),\n+ Toast.LENGTH_SHORT,\n+ ).show()\n }\n }\n }\n@@ -459,29 +492,32 @@ class ZoomableActivity : BaseActivity() {\n */\n private suspend fun getNextActionableImage(index: Int): Int {\n var nextPosition = position\n- for(i in index until images!!.size){\n+ for (i in index until images!!.size) {\n nextPosition = i\n- val imageSHA1 = CustomSelectorUtils.getImageSHA1(\n- images!![i].uri,\n- ioDispatcher,\n- fileUtilsWrapper,\n- contentResolver\n- )\n+ val imageSHA1 =\n+ CustomSelectorUtils.getImageSHA1(\n+ images!![i].uri,\n+ ioDispatcher,\n+ fileUtilsWrapper,\n+ contentResolver,\n+ )\n var isNonActionable = notForUploadStatusDao.find(imageSHA1)\n if (isNonActionable <= 0) {\n isNonActionable = uploadedStatusDao.findByImageSHA1(imageSHA1, true)\n if (isNonActionable <= 0) {\n- val imageModifiedSHA1 = CustomSelectorUtils.generateModifiedSHA1(\n- images!![i],\n- defaultDispatcher,\n- this@ZoomableActivity,\n- fileProcessor,\n- fileUtilsWrapper\n- )\n- isNonActionable = uploadedStatusDao.findByModifiedImageSHA1(\n- imageModifiedSHA1,\n- true\n- )\n+ val imageModifiedSHA1 =\n+ CustomSelectorUtils.generateModifiedSHA1(\n+ images!![i],\n+ defaultDispatcher,\n+ this@ZoomableActivity,\n+ fileProcessor,\n+ fileUtilsWrapper,\n+ )\n+ isNonActionable =\n+ uploadedStatusDao.findByModifiedImageSHA1(\n+ imageModifiedSHA1,\n+ true,\n+ )\n if (isNonActionable <= 0) {\n return i\n } else {\n@@ -505,29 +541,32 @@ class ZoomableActivity : BaseActivity() {\n */\n private suspend fun getPreviousActionableImage(index: Int): Int {\n var previousPosition = position\n- for(i in index downTo 0){\n+ for (i in index downTo 0) {\n previousPosition = i\n- val imageSHA1 = CustomSelectorUtils.getImageSHA1(\n- images!![i].uri,\n- ioDispatcher,\n- fileUtilsWrapper,\n- contentResolver\n- )\n+ val imageSHA1 =\n+ CustomSelectorUtils.getImageSHA1(\n+ images!![i].uri,\n+ ioDispatcher,\n+ fileUtilsWrapper,\n+ contentResolver,\n+ )\n var isNonActionable = notForUploadStatusDao.find(imageSHA1)\n if (isNonActionable <= 0) {\n isNonActionable = uploadedStatusDao.findByImageSHA1(imageSHA1, true)\n if (isNonActionable <= 0) {\n- val imageModifiedSHA1 = CustomSelectorUtils.generateModifiedSHA1(\n- images!![i],\n- defaultDispatcher,\n- this@ZoomableActivity,\n- fileProcessor,\n- fileUtilsWrapper\n- )\n- isNonActionable = uploadedStatusDao.findByModifiedImageSHA1(\n- imageModifiedSHA1,\n- true\n- )\n+ val imageModifiedSHA1 =\n+ CustomSelectorUtils.generateModifiedSHA1(\n+ images!![i],\n+ defaultDispatcher,\n+ this@ZoomableActivity,\n+ fileProcessor,\n+ fileUtilsWrapper,\n+ )\n+ isNonActionable =\n+ uploadedStatusDao.findByModifiedImageSHA1(\n+ imageModifiedSHA1,\n+ true,\n+ )\n if (isNonActionable <= 0) {\n return i\n } else {\n@@ -561,9 +600,10 @@ class ZoomableActivity : BaseActivity() {\n /**\n * Get position of an image from list\n */\n- private fun getImagePosition(list: ArrayList?, image: Image): Int {\n- return list!!.indexOf(image)\n- }\n+ private fun getImagePosition(\n+ list: ArrayList?,\n+ image: Image,\n+ ): Int = list!!.indexOf(image)\n \n /**\n * Two types of loading indicators have been added to the zoom activity:\n@@ -573,19 +613,25 @@ class ZoomableActivity : BaseActivity() {\n */\n private val loadingListener: ControllerListener =\n object : BaseControllerListener() {\n- override fun onSubmit(id: String, callerContext: Any) {\n+ override fun onSubmit(\n+ id: String,\n+ callerContext: Any,\n+ ) {\n // Sometimes the spinner doesn't appear when rapidly switching between images, this fixes that\n binding.zoomProgressBar.visibility = View.VISIBLE\n }\n \n- override fun onIntermediateImageSet(id: String, imageInfo: ImageInfo?) {\n+ override fun onIntermediateImageSet(\n+ id: String,\n+ imageInfo: ImageInfo?,\n+ ) {\n binding.zoomProgressBar.visibility = View.GONE\n }\n \n override fun onFinalImageSet(\n id: String,\n imageInfo: ImageInfo?,\n- animatable: Animatable?\n+ animatable: Animatable?,\n ) {\n binding.zoomProgressBar.visibility = View.GONE\n }\n@@ -593,23 +639,27 @@ class ZoomableActivity : BaseActivity() {\n \n private fun init(imageUri: Uri?) {\n if (imageUri != null) {\n- val hierarchy = GenericDraweeHierarchyBuilder.newInstance(resources)\n- .setActualImageScaleType(ScalingUtils.ScaleType.FIT_CENTER)\n- .setProgressBarImage(ProgressBarDrawable())\n- .setProgressBarImageScaleType(ScalingUtils.ScaleType.FIT_CENTER)\n- .build()\n+ val hierarchy =\n+ GenericDraweeHierarchyBuilder\n+ .newInstance(resources)\n+ .setActualImageScaleType(ScalingUtils.ScaleType.FIT_CENTER)\n+ .setProgressBarImage(ProgressBarDrawable())\n+ .setProgressBarImageScaleType(ScalingUtils.ScaleType.FIT_CENTER)\n+ .build()\n with(binding.zoomable!!) {\n setHierarchy(hierarchy)\n setAllowTouchInterceptionWhileZoomed(true)\n setIsLongpressEnabled(false)\n setTapListener(DoubleTapGestureListener(this))\n }\n- val controller: DraweeController = Fresco.newDraweeControllerBuilder()\n- .setUri(imageUri)\n- .setControllerListener(loadingListener)\n- .build()\n+ val controller: DraweeController =\n+ Fresco\n+ .newDraweeControllerBuilder()\n+ .setUri(imageUri)\n+ .setControllerListener(loadingListener)\n+ .build()\n binding.zoomable!!.controller = controller\n- \n+\n if (photoBackgroundColor != null) {\n binding.zoomable!!.setBackgroundColor(photoBackgroundColor!!)\n }\n@@ -630,16 +680,17 @@ class ZoomableActivity : BaseActivity() {\n * Inserts an image in Not For Upload table\n */\n private suspend fun insertInNotForUpload(it: Image) {\n- val imageSHA1 = CustomSelectorUtils.getImageSHA1(\n- it.uri,\n- ioDispatcher,\n- fileUtilsWrapper,\n- contentResolver\n- )\n+ val imageSHA1 =\n+ CustomSelectorUtils.getImageSHA1(\n+ it.uri,\n+ ioDispatcher,\n+ fileUtilsWrapper,\n+ contentResolver,\n+ )\n notForUploadStatusDao.insert(\n NotForUploadStatus(\n- imageSHA1\n- )\n+ imageSHA1,\n+ ),\n )\n }\n \n@@ -651,7 +702,7 @@ class ZoomableActivity : BaseActivity() {\n val returnIntent = Intent()\n returnIntent.putParcelableArrayListExtra(\n CustomSelectorConstants.NEW_SELECTED_IMAGES,\n- selectedImages\n+ selectedImages,\n )\n returnIntent.putExtra(SHOULD_REFRESH, shouldRefresh)\n setResult(Activity.RESULT_OK, returnIntent)\n@@ -665,14 +716,14 @@ class ZoomableActivity : BaseActivity() {\n super.onDestroy()\n }\n \n- object ZoomableActivityConstants {\n+ object ZoomableActivityConstants {\n /**\n * Key for Accessing Intent Data Named \"Origin\", The value indicates what fragment\n * ZoomableActivity was created by. It is null if ZoomableActivity was created by\n * the custom picker.\n */\n- const val ORIGIN = \"Origin\";\n- \n+ const val ORIGIN = \"Origin\"\n+\n const val PHOTO_BACKGROUND_COLOR = \"photo_background_color\"\n }\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/media/model/PageMediaListResponse.kt b/app/src/main/java/fr/free/nrw/commons/media/model/PageMediaListResponse.kt\nindex 01306f05c4..98d51c9f37 100644\n--- a/app/src/main/java/fr/free/nrw/commons/media/model/PageMediaListResponse.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/media/model/PageMediaListResponse.kt\n@@ -3,7 +3,9 @@ package fr.free.nrw.commons.media.model\n data class PageMediaListResponse(\n val revision: String,\n val tid: String,\n- val items: List\n+ val items: List,\n )\n \n-data class PageMediaListItem(val title: String)\n+data class PageMediaListItem(\n+ val title: String,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/SparqlResponses.kt b/app/src/main/java/fr/free/nrw/commons/mwapi/SparqlResponses.kt\nindex 84c86bf9f5..5f9772fac1 100644\n--- a/app/src/main/java/fr/free/nrw/commons/mwapi/SparqlResponses.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/mwapi/SparqlResponses.kt\n@@ -1,14 +1,21 @@\n package fr.free.nrw.commons.mwapi\n \n-data class SparqlResponse(val results: Result)\n+data class SparqlResponse(\n+ val results: Result,\n+)\n \n-data class Result(val bindings: List)\n+data class Result(\n+ val bindings: List,\n+)\n \n data class Binding(\n- val item: SparqInfo\n+ val item: SparqInfo,\n ) {\n val id: String\n get() = item.value.substringAfterLast(\"/\")\n }\n \n-data class SparqInfo(val type: String, val value: String)\n+data class SparqInfo(\n+ val type: String,\n+ val value: String,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/UserClient.kt b/app/src/main/java/fr/free/nrw/commons/mwapi/UserClient.kt\nindex b6e3b873b7..45a6a94674 100644\n--- a/app/src/main/java/fr/free/nrw/commons/mwapi/UserClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/mwapi/UserClient.kt\n@@ -2,35 +2,38 @@ package fr.free.nrw.commons.mwapi\n \n import fr.free.nrw.commons.utils.DateUtil\n import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult\n-import fr.free.nrw.commons.wikidata.mwapi.UserInfo\n import io.reactivex.Single\n import java.text.ParseException\n import java.util.Date\n import javax.inject.Inject\n \n-class UserClient @Inject constructor(private val userInterface: UserInterface) {\n- /**\n- * Checks to see if a user is currently blocked from Commons\n- *\n- * @return whether or not the user is blocked from Commons\n- */\n- fun isUserBlockedFromCommons(): Single =\n- userInterface.getUserBlockInfo()\n- .map(::processBlockExpiry)\n- .single(false)\n+class UserClient\n+ @Inject\n+ constructor(\n+ private val userInterface: UserInterface,\n+ ) {\n+ /**\n+ * Checks to see if a user is currently blocked from Commons\n+ *\n+ * @return whether or not the user is blocked from Commons\n+ */\n+ fun isUserBlockedFromCommons(): Single =\n+ userInterface\n+ .getUserBlockInfo()\n+ .map(::processBlockExpiry)\n+ .single(false)\n \n- @Throws(ParseException::class)\n- private fun processBlockExpiry(response: MwQueryResponse): Boolean {\n- val blockExpiry = response.query()?.userInfo()?.blockexpiry()\n- return when {\n- blockExpiry.isNullOrEmpty() -> false\n- \"infinite\" == blockExpiry -> true\n- else -> {\n- val endDate = DateUtil.iso8601DateParse(blockExpiry)\n- val current = Date()\n- endDate.after(current)\n+ @Throws(ParseException::class)\n+ private fun processBlockExpiry(response: MwQueryResponse): Boolean {\n+ val blockExpiry = response.query()?.userInfo()?.blockexpiry()\n+ return when {\n+ blockExpiry.isNullOrEmpty() -> false\n+ \"infinite\" == blockExpiry -> true\n+ else -> {\n+ val endDate = DateUtil.iso8601DateParse(blockExpiry)\n+ val current = Date()\n+ endDate.after(current)\n+ }\n }\n }\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/UserInterface.kt b/app/src/main/java/fr/free/nrw/commons/mwapi/UserInterface.kt\nindex cd8c7ecae0..c130db6759 100644\n--- a/app/src/main/java/fr/free/nrw/commons/mwapi/UserInterface.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/mwapi/UserInterface.kt\n@@ -17,7 +17,7 @@ interface UserInterface {\n @GET(WikidataConstants.MW_API_PREFIX + \"action=query&list=logevents&letype=upload&leprop=title|timestamp|ids&lelimit=500\")\n fun getUserLogEvents(\n @Query(\"leuser\") user: String?,\n- @QueryMap continuation: Map?\n+ @QueryMap continuation: Map?,\n ): Observable\n \n /**\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/BottomSheetAdapter.kt b/app/src/main/java/fr/free/nrw/commons/nearby/BottomSheetAdapter.kt\nindex ca21f25adb..8bcc21e405 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/BottomSheetAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/BottomSheetAdapter.kt\n@@ -20,24 +20,32 @@ import fr.free.nrw.commons.nearby.model.BottomSheetItem\n * @property itemList The list of BottomSheetItem objects to display.\n * @constructor Creates an instance of BottomSheetAdapter.\n */\n-class BottomSheetAdapter(context: Context?, private val itemList: List) :\n- RecyclerView.Adapter() {\n+class BottomSheetAdapter(\n+ context: Context?,\n+ private val itemList: List,\n+) : RecyclerView.Adapter() {\n private val layoutInflater: LayoutInflater = LayoutInflater.from(context)\n private var itemClickListener: ItemClickListener? = null\n \n @NonNull\n- override fun onCreateViewHolder(@NonNull parent: ViewGroup, viewType: Int): ViewHolder {\n+ override fun onCreateViewHolder(\n+ @NonNull parent: ViewGroup,\n+ viewType: Int,\n+ ): ViewHolder {\n val view: View = layoutInflater.inflate(R.layout.bottom_sheet_item_layout, parent, false)\n return ViewHolder(view)\n }\n \n- override fun onBindViewHolder(@NonNull holder: ViewHolder, position: Int) {\n+ override fun onBindViewHolder(\n+ @NonNull holder: ViewHolder,\n+ position: Int,\n+ ) {\n val item = itemList[position]\n holder.imageView.setImageDrawable(\n ContextCompat.getDrawable(\n getContext(),\n- item.imageResourceId\n- )\n+ item.imageResourceId,\n+ ),\n )\n holder.title.setText(item.title)\n }\n@@ -47,9 +55,7 @@ class BottomSheetAdapter(context: Context?, private val itemList: List\n- if (item.imageResourceId == R.drawable.ic_round_star_filled_24px || item.imageResourceId == R.drawable.ic_round_star_border_24px) {\n+ if (item.imageResourceId == R.drawable.ic_round_star_filled_24px ||\n+ item.imageResourceId == R.drawable.ic_round_star_border_24px\n+ ) {\n item.imageResourceId = icon\n this.notifyItemChanged(index)\n return\n@@ -66,8 +74,11 @@ class BottomSheetAdapter(context: Context?, private val itemList: List Unit)? = null,\n@@ -26,7 +27,7 @@ fun placeAdapterDelegate(\n onOverFlowLongPressed: () -> Boolean,\n onDirectionsClicked: (Place) -> Unit,\n onDirectionsLongPressed: () -> Boolean,\n- inAppCameraLocationPermissionLauncher: ActivityResultLauncher>\n+ inAppCameraLocationPermissionLauncher: ActivityResultLauncher>,\n ) = adapterDelegateViewBinding({ layoutInflater, parent ->\n ItemPlaceBinding.inflate(layoutInflater, parent, false)\n }) {\n@@ -47,17 +48,17 @@ fun placeAdapterDelegate(\n nearbyButtonLayout.cameraButton.setOnLongClickListener { onCameraLongPressed() }\n \n nearbyButtonLayout.galleryButton.setOnClickListener { onGalleryClicked(item) }\n- nearbyButtonLayout.galleryButton.setOnLongClickListener{onGalleryLongPressed()}\n+ nearbyButtonLayout.galleryButton.setOnLongClickListener { onGalleryLongPressed() }\n bookmarkButtonImage.setOnClickListener {\n val isBookmarked = bookmarkLocationDao.updateBookmarkLocation(item)\n bookmarkButtonImage.setImageResource(\n- if (isBookmarked) R.drawable.ic_round_star_filled_24px else R.drawable.ic_round_star_border_24px\n+ if (isBookmarked) R.drawable.ic_round_star_filled_24px else R.drawable.ic_round_star_border_24px,\n )\n onBookmarkClicked(item, isBookmarked)\n }\n- bookmarkButtonImage.setOnLongClickListener{onBookmarkLongPressed()}\n+ bookmarkButtonImage.setOnLongClickListener { onBookmarkLongPressed() }\n nearbyButtonLayout.iconOverflow.setOnClickListener { onOverflowIconClicked(item, it) }\n- nearbyButtonLayout.iconOverflow.setOnLongClickListener{onOverFlowLongPressed()}\n+ nearbyButtonLayout.iconOverflow.setOnLongClickListener { onOverFlowLongPressed() }\n nearbyButtonLayout.directionsButton.setOnClickListener { onDirectionsClicked(item) }\n bind {\n tvName.text = item.name\n@@ -68,23 +69,28 @@ fun placeAdapterDelegate(\n } else {\n // Remove the label and display only texts inside pharentheses (description) since too long\n tvDesc.text =\n- descriptionText.substringAfter(tvName.text.toString() + \" (\")\n- .substringBeforeLast(\")\");\n+ descriptionText\n+ .substringAfter(tvName.text.toString() + \" (\")\n+ .substringBeforeLast(\")\")\n }\n distance.text = item.distance\n icon.setImageResource(item.label.icon)\n nearbyButtonLayout.iconOverflow.visibility =\n- if (item.hasCommonsLink() || item.hasWikidataLink()) VISIBLE\n- else GONE\n+ if (item.hasCommonsLink() || item.hasWikidataLink()) {\n+ VISIBLE\n+ } else {\n+ GONE\n+ }\n \n bookmarkButtonImage.setImageResource(\n- if (bookmarkLocationDao.findBookmarkLocation(item))\n+ if (bookmarkLocationDao.findBookmarkLocation(item)) {\n R.drawable.ic_round_star_filled_24px\n- else\n+ } else {\n R.drawable.ic_round_star_border_24px\n+ },\n )\n }\n- nearbyButtonLayout.directionsButton.setOnLongClickListener{onDirectionsLongPressed()}\n+ nearbyButtonLayout.directionsButton.setOnLongClickListener { onDirectionsLongPressed() }\n }\n }\n \n@@ -101,7 +107,7 @@ private fun AdapterDelegateViewBindingViewHolder.showOr\n (recyclerView.layoutManager as LinearLayoutManager?)\n ?.scrollToPositionWithOffset(\n lastPosition,\n- nearbyButtonLayout.buttonLayout.height\n+ nearbyButtonLayout.buttonLayout.height,\n )\n }\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/WikidataFeedback.kt b/app/src/main/java/fr/free/nrw/commons/nearby/WikidataFeedback.kt\nindex 060547d408..d238296d13 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/WikidataFeedback.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/WikidataFeedback.kt\n@@ -49,13 +49,15 @@ class WikidataFeedback : BaseActivity() {\n binding.radioButton1.setText(\n getString(\n R.string.does_not_exist_anymore_no_picture_can_ever_be_taken_of_it,\n- place\n- ))\n+ place,\n+ ),\n+ )\n binding.radioButton2.setText(\n getString(\n R.string.is_at_a_different_place_please_specify_the_correct_place_below_if_possible_tell_us_the_correct_latitude_longitude,\n- place\n- ))\n+ place,\n+ ),\n+ )\n binding.radioButton3.setText(getString(R.string.other_problem_or_information_please_explain_below))\n setSupportActionBar(binding.toolbarBinding.toolbar)\n supportActionBar!!.setDisplayHomeAsUpEnabled(true)\n@@ -64,21 +66,29 @@ class WikidataFeedback : BaseActivity() {\n var desc = findViewById(binding.radioGroup.checkedRadioButtonId).text\n var det = binding.detailsEditText.text.toString()\n if (binding.radioGroup.checkedRadioButtonId == R.id.radioButton3 && binding.detailsEditText.text.isNullOrEmpty()) {\n- Toast.makeText(\n- this,\n- getString(R.string.please_enter_some_comments), Toast.LENGTH_SHORT\n- ).show()\n+ Toast\n+ .makeText(\n+ this,\n+ getString(R.string.please_enter_some_comments),\n+ Toast.LENGTH_SHORT,\n+ ).show()\n } else {\n binding.radioGroup.clearCheck()\n binding.detailsEditText.setText(\"\")\n- Single.defer(Callable> {\n- pageEditHelper.makePageEdit(\n- this, pageTitle, preText,\n- desc.toString(),\n- det, lat, lng\n- )\n- } as Callable>)\n- .subscribeOn(Schedulers.io())\n+ Single\n+ .defer(\n+ Callable> {\n+ pageEditHelper.makePageEdit(\n+ this,\n+ pageTitle,\n+ preText,\n+ desc.toString(),\n+ det,\n+ lat,\n+ lng,\n+ )\n+ } as Callable>,\n+ ).subscribeOn(Schedulers.io())\n .observeOn(AndroidSchedulers.mainThread())\n .subscribe({ aBoolean: Boolean? ->\n }, { throwable: Throwable? ->\n@@ -92,5 +102,4 @@ class WikidataFeedback : BaseActivity() {\n onBackPressed()\n return true\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/AdvanceQueryFragment.kt b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/AdvanceQueryFragment.kt\nindex ed3b741d3d..d1f8e94b6a 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/AdvanceQueryFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/AdvanceQueryFragment.kt\n@@ -12,9 +12,8 @@ import androidx.fragment.app.Fragment\n import fr.free.nrw.commons.databinding.FragmentAdvanceQueryBinding\n \n class AdvanceQueryFragment : Fragment() {\n-\n private var _binding: FragmentAdvanceQueryBinding? = null\n- private val binding get() = _binding\n+ val binding get() = _binding\n \n lateinit var callback: Callback\n \n@@ -28,7 +27,7 @@ class AdvanceQueryFragment : Fragment() {\n override fun onCreateView(\n inflater: LayoutInflater,\n container: ViewGroup?,\n- savedInstanceState: Bundle?\n+ savedInstanceState: Bundle?,\n ): View? {\n _binding = FragmentAdvanceQueryBinding.inflate(inflater, container, false)\n etQuery = binding?.etQuery\n@@ -38,7 +37,10 @@ class AdvanceQueryFragment : Fragment() {\n return binding?.root\n }\n \n- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {\n+ override fun onViewCreated(\n+ view: View,\n+ savedInstanceState: Bundle?,\n+ ) {\n super.onViewCreated(view, savedInstanceState)\n \n setUi()\n@@ -79,7 +81,9 @@ class AdvanceQueryFragment : Fragment() {\n \n interface Callback {\n fun reset()\n+\n fun apply(query: String)\n+\n fun close()\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt\nindex 289f25976f..f3eecf1160 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt\n@@ -21,109 +21,126 @@ import timber.log.Timber\n import javax.inject.Inject\n import javax.inject.Named\n \n+class CommonPlaceClickActions\n+ @Inject\n+ constructor(\n+ @Named(\"default_preferences\") private val applicationKvStore: JsonKvStore,\n+ private val activity: Activity,\n+ private val contributionController: ContributionController,\n+ ) {\n+ fun onCameraClicked(): (Place, ActivityResultLauncher>) -> Unit =\n+ { place, launcher ->\n+ if (applicationKvStore.getBoolean(\"login_skipped\", false)) {\n+ showLoginDialog()\n+ } else {\n+ Timber.d(\"Camera button tapped. Image title: ${place.getName()}Image desc: ${place.longDescription}\")\n+ storeSharedPrefs(place)\n+ contributionController.initiateCameraPick(activity, launcher)\n+ }\n+ }\n \n-class CommonPlaceClickActions @Inject constructor(\n- @Named(\"default_preferences\") private val applicationKvStore: JsonKvStore,\n- private val activity: Activity,\n- private val contributionController: ContributionController\n-) {\n+ /**\n+ * Shows the Label for the Icon when it's long pressed\n+ **/\n+ fun onCameraLongPressed(): () -> Boolean =\n+ {\n+ Toast.makeText(activity, R.string.menu_from_camera, Toast.LENGTH_SHORT).show()\n+ true\n+ }\n \n- fun onCameraClicked(): (Place, ActivityResultLauncher>) -> Unit = { place, launcher ->\n- if (applicationKvStore.getBoolean(\"login_skipped\", false)) {\n- showLoginDialog()\n- } else {\n- Timber.d(\"Camera button tapped. Image title: ${place.getName()}Image desc: ${place.longDescription}\")\n- storeSharedPrefs(place)\n- contributionController.initiateCameraPick(activity, launcher)\n- }\n- }\n+ fun onGalleryLongPressed(): () -> Boolean =\n+ {\n+ Toast.makeText(activity, R.string.menu_from_gallery, Toast.LENGTH_SHORT).show()\n+ true\n+ }\n \n- /**\n- * Shows the Label for the Icon when it's long pressed\n- **/\n- fun onCameraLongPressed(): () -> Boolean = {\n- Toast.makeText(activity, R.string.menu_from_camera, Toast.LENGTH_SHORT).show()\n- true\n- }\n- fun onGalleryLongPressed(): () -> Boolean = {\n- Toast.makeText(activity, R.string.menu_from_gallery, Toast.LENGTH_SHORT).show()\n- true\n- }\n- fun onBookmarkLongPressed(): () -> Boolean = {\n- Toast.makeText(activity, R.string.menu_bookmark, Toast.LENGTH_SHORT).show()\n- true\n- }\n- fun onDirectionsLongPressed(): () -> Boolean = {\n- Toast.makeText(activity, R.string.nearby_directions, Toast.LENGTH_SHORT).show()\n- true\n- }\n- fun onOverflowLongPressed(): () -> Boolean = {\n- Toast.makeText(activity, R.string.more, Toast.LENGTH_SHORT).show()\n- true\n- }\n+ fun onBookmarkLongPressed(): () -> Boolean =\n+ {\n+ Toast.makeText(activity, R.string.menu_bookmark, Toast.LENGTH_SHORT).show()\n+ true\n+ }\n \n- fun onGalleryClicked(): (Place) -> Unit = {\n- if (applicationKvStore.getBoolean(\"login_skipped\", false)) {\n- showLoginDialog()\n- } else {\n- Timber.d(\"Gallery button tapped. Image title: ${it.getName()}Image desc: ${it.getLongDescription()}\")\n- storeSharedPrefs(it)\n- contributionController.initiateGalleryPick(activity, false)\n- }\n- }\n+ fun onDirectionsLongPressed(): () -> Boolean =\n+ {\n+ Toast.makeText(activity, R.string.nearby_directions, Toast.LENGTH_SHORT).show()\n+ true\n+ }\n+\n+ fun onOverflowLongPressed(): () -> Boolean =\n+ {\n+ Toast.makeText(activity, R.string.more, Toast.LENGTH_SHORT).show()\n+ true\n+ }\n \n- fun onOverflowClicked(): (Place, View) -> Unit = { place, view ->\n- PopupMenu(view.context, view).apply {\n- inflate(R.menu.nearby_info_dialog_options)\n- enableBy(R.id.nearby_info_menu_commons_article, place.hasCommonsLink())\n- enableBy(R.id.nearby_info_menu_wikidata_article, place.hasWikidataLink())\n- enableBy(R.id.nearby_info_menu_wikipedia_article, place.hasWikipediaLink())\n- setOnMenuItemClickListener { item: MenuItem ->\n- when (item.itemId) {\n- R.id.nearby_info_menu_commons_article -> openWebView(place.siteLinks.commonsLink)\n- R.id.nearby_info_menu_wikidata_article -> openWebView(place.siteLinks.wikidataLink)\n- R.id.nearby_info_menu_wikipedia_article -> openWebView(place.siteLinks.wikipediaLink)\n- else -> false\n+ fun onGalleryClicked(): (Place) -> Unit =\n+ {\n+ if (applicationKvStore.getBoolean(\"login_skipped\", false)) {\n+ showLoginDialog()\n+ } else {\n+ Timber.d(\"Gallery button tapped. Image title: ${it.getName()}Image desc: ${it.getLongDescription()}\")\n+ storeSharedPrefs(it)\n+ contributionController.initiateGalleryPick(activity, false)\n }\n }\n- }.show()\n- }\n \n- fun onDirectionsClicked(): (Place) -> Unit = {\n- Utils.handleGeoCoordinates(activity, it.getLocation())\n- }\n+ fun onOverflowClicked(): (Place, View) -> Unit =\n+ { place, view ->\n+ PopupMenu(view.context, view)\n+ .apply {\n+ inflate(R.menu.nearby_info_dialog_options)\n+ enableBy(R.id.nearby_info_menu_commons_article, place.hasCommonsLink())\n+ enableBy(R.id.nearby_info_menu_wikidata_article, place.hasWikidataLink())\n+ enableBy(R.id.nearby_info_menu_wikipedia_article, place.hasWikipediaLink())\n+ setOnMenuItemClickListener { item: MenuItem ->\n+ when (item.itemId) {\n+ R.id.nearby_info_menu_commons_article -> openWebView(place.siteLinks.commonsLink)\n+ R.id.nearby_info_menu_wikidata_article -> openWebView(place.siteLinks.wikidataLink)\n+ R.id.nearby_info_menu_wikipedia_article -> openWebView(place.siteLinks.wikipediaLink)\n+ else -> false\n+ }\n+ }\n+ }.show()\n+ }\n \n- private fun storeSharedPrefs(selectedPlace: Place) {\n- Timber.d(\"Store place object %s\", selectedPlace.toString())\n- applicationKvStore.putJson(WikidataConstants.PLACE_OBJECT, selectedPlace)\n- }\n+ fun onDirectionsClicked(): (Place) -> Unit =\n+ {\n+ Utils.handleGeoCoordinates(activity, it.getLocation())\n+ }\n \n- private fun openWebView(link: Uri): Boolean {\n- Utils.handleWebUrl(activity, link)\n- return true\n- }\n+ private fun storeSharedPrefs(selectedPlace: Place) {\n+ Timber.d(\"Store place object %s\", selectedPlace.toString())\n+ applicationKvStore.putJson(WikidataConstants.PLACE_OBJECT, selectedPlace)\n+ }\n \n- private fun PopupMenu.enableBy(menuId: Int, hasLink: Boolean) {\n- menu.findItem(menuId).isEnabled = hasLink\n- }\n+ private fun openWebView(link: Uri): Boolean {\n+ Utils.handleWebUrl(activity, link)\n+ return true\n+ }\n \n- private fun showLoginDialog() {\n- AlertDialog.Builder(activity)\n- .setMessage(R.string.login_alert_message)\n- .setPositiveButton(R.string.login) { dialog, which ->\n- setPositiveButton()\n- }\n- .show()\n- }\n+ private fun PopupMenu.enableBy(\n+ menuId: Int,\n+ hasLink: Boolean,\n+ ) {\n+ menu.findItem(menuId).isEnabled = hasLink\n+ }\n+\n+ private fun showLoginDialog() {\n+ AlertDialog\n+ .Builder(activity)\n+ .setMessage(R.string.login_alert_message)\n+ .setPositiveButton(R.string.login) { dialog, which ->\n+ setPositiveButton()\n+ }.show()\n+ }\n \n- private fun setPositiveButton() {\n- ActivityUtils.startActivityWithFlags(\n- activity,\n- LoginActivity::class.java,\n- Intent.FLAG_ACTIVITY_CLEAR_TOP,\n- Intent.FLAG_ACTIVITY_SINGLE_TOP\n- )\n- applicationKvStore.putBoolean(\"login_skipped\", false)\n- activity.finish()\n+ private fun setPositiveButton() {\n+ ActivityUtils.startActivityWithFlags(\n+ activity,\n+ LoginActivity::class.java,\n+ Intent.FLAG_ACTIVITY_CLEAR_TOP,\n+ Intent.FLAG_ACTIVITY_SINGLE_TOP,\n+ )\n+ applicationKvStore.putBoolean(\"login_skipped\", false)\n+ activity.finish()\n+ }\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/PlaceAdapter.kt b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/PlaceAdapter.kt\nindex e3d66e34a5..689aa7efca 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/PlaceAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/PlaceAdapter.kt\n@@ -11,9 +11,8 @@ class PlaceAdapter(\n onPlaceClicked: ((Place) -> Unit)? = null,\n onBookmarkClicked: (Place, Boolean) -> Unit,\n commonPlaceClickActions: CommonPlaceClickActions,\n- inAppCameraLocationPermissionLauncher: ActivityResultLauncher>\n-) :\n- BaseDelegateAdapter(\n+ inAppCameraLocationPermissionLauncher: ActivityResultLauncher>,\n+) : BaseDelegateAdapter(\n placeAdapterDelegate(\n bookmarkLocationsDao,\n onPlaceClicked,\n@@ -27,7 +26,7 @@ class PlaceAdapter(\n commonPlaceClickActions.onOverflowLongPressed(),\n commonPlaceClickActions.onDirectionsClicked(),\n commonPlaceClickActions.onDirectionsLongPressed(),\n- inAppCameraLocationPermissionLauncher\n+ inAppCameraLocationPermissionLauncher,\n ),\n- areItemsTheSame = {oldItem, newItem -> oldItem.wikiDataEntityId == newItem.wikiDataEntityId }\n+ areItemsTheSame = { oldItem, newItem -> oldItem.wikiDataEntityId == newItem.wikiDataEntityId },\n )\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/model/BottomSheetItem.kt b/app/src/main/java/fr/free/nrw/commons/nearby/model/BottomSheetItem.kt\nindex bf30be6ec3..bf09df7cad 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/model/BottomSheetItem.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/model/BottomSheetItem.kt\n@@ -1,3 +1,6 @@\n package fr.free.nrw.commons.nearby.model\n \n-class BottomSheetItem(var imageResourceId: Int, val title: String)\n+class BottomSheetItem(\n+ var imageResourceId: Int,\n+ val title: String,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/model/NearbyResponse.kt b/app/src/main/java/fr/free/nrw/commons/nearby/model/NearbyResponse.kt\nindex 20b38c75fb..629b931623 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/model/NearbyResponse.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/model/NearbyResponse.kt\n@@ -1,3 +1,5 @@\n package fr.free.nrw.commons.nearby.model\n \n-class NearbyResponse(val results: NearbyResults)\n\\ No newline at end of file\n+class NearbyResponse(\n+ val results: NearbyResults,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/model/NearbyResultItem.kt b/app/src/main/java/fr/free/nrw/commons/nearby/model/NearbyResultItem.kt\nindex 4da8740cc0..f28cc833e6 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/model/NearbyResultItem.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/model/NearbyResultItem.kt\n@@ -2,78 +2,50 @@ package fr.free.nrw.commons.nearby.model\n \n import com.google.gson.annotations.SerializedName\n \n-class NearbyResultItem(private val item: ResultTuple?,\n- private val wikipediaArticle: ResultTuple?,\n- private val commonsArticle: ResultTuple?,\n- private val location: ResultTuple?,\n- private val label: ResultTuple?,\n- @field:SerializedName(\"streetAddress\") private val address: ResultTuple?,\n- private val icon: ResultTuple?, @field:SerializedName(\"class\") private val className: ResultTuple?,\n- @field:SerializedName(\"classLabel\") private val classLabel: ResultTuple?,\n- @field:SerializedName(\"commonsCategory\") private val commonsCategory: ResultTuple?,\n- @field:SerializedName(\"pic\") private val pic: ResultTuple?,\n- @field:SerializedName(\"destroyed\") private val destroyed: ResultTuple?,\n- @field:SerializedName(\"description\") private val description: ResultTuple?,\n- @field:SerializedName(\"endTime\") private val endTime: ResultTuple?,\n- @field:SerializedName(\"monument\") private val monument: ResultTuple?) {\n-\n- fun getItem(): ResultTuple {\n- return item ?: ResultTuple()\n- }\n-\n- fun getWikipediaArticle(): ResultTuple {\n- return wikipediaArticle ?: ResultTuple()\n- }\n-\n- fun getCommonsArticle(): ResultTuple {\n- return commonsArticle ?: ResultTuple()\n- }\n-\n- fun getLocation(): ResultTuple {\n- return location ?: ResultTuple()\n- }\n-\n- fun getLabel(): ResultTuple {\n- return label ?: ResultTuple()\n- }\n-\n- fun getIcon(): ResultTuple {\n- return icon ?: ResultTuple()\n- }\n-\n- fun getClassName(): ResultTuple {\n- return className ?: ResultTuple()\n- }\n-\n- fun getClassLabel(): ResultTuple {\n- return classLabel ?: ResultTuple()\n- }\n-\n- fun getCommonsCategory(): ResultTuple {\n- return commonsCategory ?: ResultTuple()\n- }\n-\n- fun getPic(): ResultTuple {\n- return pic ?: ResultTuple()\n- }\n-\n- fun getDestroyed(): ResultTuple {\n- return destroyed ?: ResultTuple()\n- }\n-\n- fun getDescription(): ResultTuple {\n- return description ?: ResultTuple()\n- }\n-\n- fun getEndTime(): ResultTuple {\n- return endTime ?: ResultTuple()\n- }\n-\n- fun getAddress(): String {\n- return address?.value?:\"\"\n- }\n-\n- fun getMonument():ResultTuple?{\n- return monument\n- }\n-}\n\\ No newline at end of file\n+class NearbyResultItem(\n+ private val item: ResultTuple?,\n+ private val wikipediaArticle: ResultTuple?,\n+ private val commonsArticle: ResultTuple?,\n+ private val location: ResultTuple?,\n+ private val label: ResultTuple?,\n+ @field:SerializedName(\"streetAddress\") private val address: ResultTuple?,\n+ private val icon: ResultTuple?,\n+ @field:SerializedName(\"class\") private val className: ResultTuple?,\n+ @field:SerializedName(\"classLabel\") private val classLabel: ResultTuple?,\n+ @field:SerializedName(\"commonsCategory\") private val commonsCategory: ResultTuple?,\n+ @field:SerializedName(\"pic\") private val pic: ResultTuple?,\n+ @field:SerializedName(\"destroyed\") private val destroyed: ResultTuple?,\n+ @field:SerializedName(\"description\") private val description: ResultTuple?,\n+ @field:SerializedName(\"endTime\") private val endTime: ResultTuple?,\n+ @field:SerializedName(\"monument\") private val monument: ResultTuple?,\n+) {\n+ fun getItem(): ResultTuple = item ?: ResultTuple()\n+\n+ fun getWikipediaArticle(): ResultTuple = wikipediaArticle ?: ResultTuple()\n+\n+ fun getCommonsArticle(): ResultTuple = commonsArticle ?: ResultTuple()\n+\n+ fun getLocation(): ResultTuple = location ?: ResultTuple()\n+\n+ fun getLabel(): ResultTuple = label ?: ResultTuple()\n+\n+ fun getIcon(): ResultTuple = icon ?: ResultTuple()\n+\n+ fun getClassName(): ResultTuple = className ?: ResultTuple()\n+\n+ fun getClassLabel(): ResultTuple = classLabel ?: ResultTuple()\n+\n+ fun getCommonsCategory(): ResultTuple = commonsCategory ?: ResultTuple()\n+\n+ fun getPic(): ResultTuple = pic ?: ResultTuple()\n+\n+ fun getDestroyed(): ResultTuple = destroyed ?: ResultTuple()\n+\n+ fun getDescription(): ResultTuple = description ?: ResultTuple()\n+\n+ fun getEndTime(): ResultTuple = endTime ?: ResultTuple()\n+\n+ fun getAddress(): String = address?.value ?: \"\"\n+\n+ fun getMonument(): ResultTuple? = monument\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/model/NearbyResults.kt b/app/src/main/java/fr/free/nrw/commons/nearby/model/NearbyResults.kt\nindex 4a8832831a..53a07ffca6 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/model/NearbyResults.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/model/NearbyResults.kt\n@@ -1,3 +1,5 @@\n package fr.free.nrw.commons.nearby.model\n \n-class NearbyResults(val bindings: List)\n\\ No newline at end of file\n+class NearbyResults(\n+ val bindings: List,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/model/PlaceBindings.kt b/app/src/main/java/fr/free/nrw/commons/nearby/model/PlaceBindings.kt\nindex ccbdd156c4..857af27531 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/model/PlaceBindings.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/model/PlaceBindings.kt\n@@ -6,41 +6,40 @@ data class PlaceBindings(\n @SerializedName(\"item\") val item: Item,\n @SerializedName(\"label\") val label: Label,\n @SerializedName(\"location\") val location: Location,\n- @SerializedName(\"class\") val clas: Clas\n+ @SerializedName(\"class\") val clas: Clas,\n )\n \n data class ItemsClass(\n @SerializedName(\"head\") val head: Head,\n- @SerializedName(\"results\") val results: Results\n+ @SerializedName(\"results\") val results: Results,\n )\n \n data class Label(\n @SerializedName(\"xml:lang\") val xml: String,\n @SerializedName(\"type\") val type: String,\n- @SerializedName(\"value\") val value: String\n+ @SerializedName(\"value\") val value: String,\n )\n \n data class Location(\n @SerializedName(\"datatype\") val datatype: String,\n @SerializedName(\"type\") val type: String,\n- @SerializedName(\"value\") val value: String\n+ @SerializedName(\"value\") val value: String,\n )\n \n data class Results(\n- @SerializedName(\"bindings\") val bindings: List\n+ @SerializedName(\"bindings\") val bindings: List,\n )\n \n data class Item(\n @SerializedName(\"type\") val type: String,\n- @SerializedName(\"value\") val value: String\n+ @SerializedName(\"value\") val value: String,\n )\n \n data class Head(\n- @SerializedName(\"vars\") val vars: List\n+ @SerializedName(\"vars\") val vars: List,\n )\n \n-\n data class Clas(\n @SerializedName(\"type\") val type: String,\n- @SerializedName(\"value\") val value: String\n-)\n\\ No newline at end of file\n+ @SerializedName(\"value\") val value: String,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/nearby/model/ResultTuple.kt b/app/src/main/java/fr/free/nrw/commons/nearby/model/ResultTuple.kt\nindex 161b0c07fb..bd411c9388 100644\n--- a/app/src/main/java/fr/free/nrw/commons/nearby/model/ResultTuple.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/nearby/model/ResultTuple.kt\n@@ -19,5 +19,4 @@ class ResultTuple {\n type = \"\"\n value = \"\"\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificatinAdapter.kt b/app/src/main/java/fr/free/nrw/commons/notification/NotificatinAdapter.kt\nindex 6ad6876a32..41d7d48830 100644\n--- a/app/src/main/java/fr/free/nrw/commons/notification/NotificatinAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificatinAdapter.kt\n@@ -3,8 +3,9 @@ package fr.free.nrw.commons.notification\n import fr.free.nrw.commons.notification.models.Notification\n import fr.free.nrw.commons.upload.categories.BaseDelegateAdapter\n \n-internal class NotificatinAdapter(onNotificationClicked: (Notification) -> Unit) :\n- BaseDelegateAdapter(\n+internal class NotificatinAdapter(\n+ onNotificationClicked: (Notification) -> Unit,\n+) : BaseDelegateAdapter(\n notificationDelegate(onNotificationClicked),\n- areItemsTheSame = { oldItem, newItem -> oldItem.notificationId == newItem.notificationId }\n+ areItemsTheSame = { oldItem, newItem -> oldItem.notificationId == newItem.notificationId },\n )\ndiff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationAdapterDelegates.kt b/app/src/main/java/fr/free/nrw/commons/notification/NotificationAdapterDelegates.kt\nindex 7dedf1d55d..133ad3fa26 100644\n--- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationAdapterDelegates.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationAdapterDelegates.kt\n@@ -1,11 +1,10 @@\n package fr.free.nrw.commons.notification\n \n import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding\n-import fr.free.nrw.commons.notification.models.Notification\n import fr.free.nrw.commons.databinding.ItemNotificationBinding\n+import fr.free.nrw.commons.notification.models.Notification\n import fr.free.nrw.commons.utils.StringUtil\n \n-\n fun notificationDelegate(onNotificationClicked: (Notification) -> Unit) =\n adapterDelegateViewBinding({ layoutInflater, parent ->\n ItemNotificationBinding.inflate(layoutInflater, parent, false)\n@@ -15,11 +14,12 @@ fun notificationDelegate(onNotificationClicked: (Notification) -> Unit) =\n binding.title.text = item.processedNotificationText\n binding.time.text = item.date\n }\n-\n }\n \n private val Notification.processedNotificationText: CharSequence\n- get() = notificationText.trim()\n- .replace(\"(^\\\\s*)|(\\\\s*$)\".toRegex(), \"\")\n- .let { StringUtil.fromHtml(it).toString() }\n- .let { if (it.length > 280) \"${it.substring(0, 279)}...\" else it } + \" \"\n+ get() =\n+ notificationText\n+ .trim()\n+ .replace(\"(^\\\\s*)|(\\\\s*$)\".toRegex(), \"\")\n+ .let { StringUtil.fromHtml(it).toString() }\n+ .let { if (it.length > 280) \"${it.substring(0, 279)}...\" else it } + \" \"\ndiff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationClient.kt b/app/src/main/java/fr/free/nrw/commons/notification/NotificationClient.kt\nindex 6e29575ea8..aa998ffb56 100644\n--- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationClient.kt\n@@ -1,59 +1,63 @@\n package fr.free.nrw.commons.notification\n \n+import fr.free.nrw.commons.auth.csrf.CsrfTokenClient\n+import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException\n import fr.free.nrw.commons.di.NetworkingModule\n import fr.free.nrw.commons.notification.models.Notification\n import fr.free.nrw.commons.notification.models.NotificationType\n+import fr.free.nrw.commons.utils.DateUtil\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n import io.reactivex.Observable\n import io.reactivex.Single\n-import fr.free.nrw.commons.auth.csrf.CsrfTokenClient\n-import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n-import fr.free.nrw.commons.utils.DateUtil\n import javax.inject.Inject\n import javax.inject.Named\n import javax.inject.Singleton\n import fr.free.nrw.commons.wikidata.model.notifications.Notification as WikimediaNotification\n \n @Singleton\n-class NotificationClient @Inject constructor(\n- @param:Named(NetworkingModule.NAMED_COMMONS_CSRF) private val csrfTokenClient: CsrfTokenClient,\n- private val service: NotificationInterface\n-) {\n- fun getNotifications(archived: Boolean): Single> =\n- service.getAllNotifications(\n- wikiList = \"wikidatawiki|commonswiki|enwiki\",\n- filter = if (archived) \"read\" else \"!read\",\n- continueStr = null\n- ).map {\n- it.query()?.notifications()?.list() ?: emptyList()\n- }.flatMap {\n- Observable.fromIterable(it)\n- }.map {\n- it.toCommonsNotification()\n- }.toList()\n+class NotificationClient\n+ @Inject\n+ constructor(\n+ @param:Named(NetworkingModule.NAMED_COMMONS_CSRF) private val csrfTokenClient: CsrfTokenClient,\n+ private val service: NotificationInterface,\n+ ) {\n+ fun getNotifications(archived: Boolean): Single> =\n+ service\n+ .getAllNotifications(\n+ wikiList = \"wikidatawiki|commonswiki|enwiki\",\n+ filter = if (archived) \"read\" else \"!read\",\n+ continueStr = null,\n+ ).map {\n+ it.query()?.notifications()?.list() ?: emptyList()\n+ }.flatMap {\n+ Observable.fromIterable(it)\n+ }.map {\n+ it.toCommonsNotification()\n+ }.toList()\n \n- fun markNotificationAsRead(notificationId: String?): Observable {\n- return try {\n- service.markRead(\n- token = csrfTokenClient.getTokenBlocking(),\n- readList = notificationId,\n- unreadList = \"\"\n- ).map(MwQueryResponse::success)\n- } catch (throwable: Throwable) {\n- if (throwable is InvalidLoginTokenException) {\n- Observable.error(throwable)\n- } else {\n- Observable.just(false)\n+ fun markNotificationAsRead(notificationId: String?): Observable =\n+ try {\n+ service\n+ .markRead(\n+ token = csrfTokenClient.getTokenBlocking(),\n+ readList = notificationId,\n+ unreadList = \"\",\n+ ).map(MwQueryResponse::success)\n+ } catch (throwable: Throwable) {\n+ if (throwable is InvalidLoginTokenException) {\n+ Observable.error(throwable)\n+ } else {\n+ Observable.just(false)\n+ }\n }\n- }\n- }\n \n- private fun WikimediaNotification.toCommonsNotification() = Notification(\n- notificationType = NotificationType.UNKNOWN,\n- notificationText = contents?.compactHeader ?: \"\",\n- date = DateUtil.getMonthOnlyDateString(timestamp),\n- link = contents?.links?.primary?.url ?: \"\",\n- iconUrl = \"\",\n- notificationId = id().toString()\n- )\n-}\n+ private fun WikimediaNotification.toCommonsNotification() =\n+ Notification(\n+ notificationType = NotificationType.UNKNOWN,\n+ notificationText = contents?.compactHeader ?: \"\",\n+ date = DateUtil.getMonthOnlyDateString(timestamp),\n+ link = contents?.links?.primary?.url ?: \"\",\n+ iconUrl = \"\",\n+ notificationId = id().toString(),\n+ )\n+ }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationInterface.kt b/app/src/main/java/fr/free/nrw/commons/notification/NotificationInterface.kt\nindex 0b9fab865d..2d2a5c0ab4 100644\n--- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationInterface.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationInterface.kt\n@@ -1,8 +1,8 @@\n package fr.free.nrw.commons.notification\n \n import fr.free.nrw.commons.wikidata.WikidataConstants.MW_API_PREFIX\n-import io.reactivex.Observable\n import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n+import io.reactivex.Observable\n import retrofit2.http.Field\n import retrofit2.http.FormUrlEncoded\n import retrofit2.http.GET\n@@ -11,13 +11,12 @@ import retrofit2.http.POST\n import retrofit2.http.Query\n \n interface NotificationInterface {\n-\n @Headers(\"Cache-Control: no-cache\")\n @GET(MW_API_PREFIX + \"action=query&meta=notifications¬format=model¬limit=max\")\n fun getAllNotifications(\n @Query(\"notwikis\") wikiList: String?,\n @Query(\"notfilter\") filter: String?,\n- @Query(\"notcontinue\") continueStr: String?\n+ @Query(\"notcontinue\") continueStr: String?,\n ): Observable\n \n @FormUrlEncoded\n@@ -26,6 +25,6 @@ interface NotificationInterface {\n fun markRead(\n @Field(\"token\") token: String,\n @Field(\"list\") readList: String?,\n- @Field(\"unreadlist\") unreadList: String?\n+ @Field(\"unreadlist\") unreadList: String?,\n ): Observable\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/notification/models/Notification.kt b/app/src/main/java/fr/free/nrw/commons/notification/models/Notification.kt\nindex eddc22e5b5..b3bdc9d1eb 100644\n--- a/app/src/main/java/fr/free/nrw/commons/notification/models/Notification.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/notification/models/Notification.kt\n@@ -9,5 +9,5 @@ data class Notification(\n var date: String,\n var link: String,\n var iconUrl: String,\n- var notificationId: String\n-)\n\\ No newline at end of file\n+ var notificationId: String,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/profile/achievements/Achievements.kt b/app/src/main/java/fr/free/nrw/commons/profile/achievements/Achievements.kt\nindex 5c6cbcf14b..861040fcff 100644\n--- a/app/src/main/java/fr/free/nrw/commons/profile/achievements/Achievements.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/profile/achievements/Achievements.kt\n@@ -5,54 +5,44 @@ package fr.free.nrw.commons.profile.achievements\n */\n class Achievements {\n /**\n- * getter function to get count of unique images used by wiki\n- * @return\n- */\n- /**\n- * setter function to set count of uniques images used by wiki\n- * @param uniqueUsedImages\n+ * The count of unique images used by the wiki.\n+ * @return The count of unique images used.\n+ * @param uniqueUsedImages The count to set for unique images used.\n */\n var uniqueUsedImages = 0\n private var articlesUsingImages = 0\n+\n /**\n- * getter function to get count of thanks received\n- * @return\n- */\n- /**\n- * setter function to set count of thanks received\n- * @param thanksReceived\n+ * The count of thanks received.\n+ * @return The count of thanks received.\n+ * @param thanksReceived The count to set for thanks received.\n */\n var thanksReceived = 0\n+\n /**\n- * getter function to get count of featured images\n- * @return\n- */\n- /**\n- * setter function to set count of featured images\n- * @param featuredImages\n+ * The count of featured images.\n+ * @return The count of featured images.\n+ * @param featuredImages The count to set for featured images.\n */\n var featuredImages = 0\n+\n /**\n- * getter function to get count of featured images\n- * @return\n- */\n- /**\n- * setter function to set count of featured images\n- * @param featuredImages\n+ * The count of quality images.\n+ * @return The count of quality images.\n+ * @param qualityImages The count to set for quality images.\n */\n var qualityImages = 0\n+\n /**\n- * getter function to get count of images uploaded\n- * @return\n- */\n- /**\n- * setter function to count of images uploaded\n- * @param imagesUploaded\n+ * The count of images uploaded.\n+ * @return The count of images uploaded.\n+ * @param imagesUploaded The count to set for images uploaded.\n */\n var imagesUploaded = 0\n private var revertCount = 0\n \n constructor() {}\n+\n /**\n * constructor for achievements class to set its data members\n * @param uniqueUsedImages\n@@ -62,13 +52,15 @@ class Achievements {\n * @param imagesUploaded\n * @param revertCount\n */\n- constructor(uniqueUsedImages: Int,\n- articlesUsingImages: Int,\n- thanksReceived: Int,\n- featuredImages: Int,\n- qualityImages: Int,\n- imagesUploaded: Int,\n- revertCount: Int) {\n+ constructor(\n+ uniqueUsedImages: Int,\n+ articlesUsingImages: Int,\n+ thanksReceived: Int,\n+ featuredImages: Int,\n+ qualityImages: Int,\n+ imagesUploaded: Int,\n+ revertCount: Int,\n+ ) {\n this.uniqueUsedImages = uniqueUsedImages\n this.articlesUsingImages = articlesUsingImages\n this.thanksReceived = thanksReceived\n@@ -83,11 +75,12 @@ class Achievements {\n * @return\n */\n val notRevertPercentage: Int\n- get() = try {\n- (imagesUploaded - revertCount) * 100 / imagesUploaded\n- } catch (divideByZero: ArithmeticException) {\n- 100\n- }\n+ get() =\n+ try {\n+ (imagesUploaded - revertCount) * 100 / imagesUploaded\n+ } catch (divideByZero: ArithmeticException) {\n+ 100\n+ }\n \n companion object {\n /**\n@@ -97,15 +90,15 @@ class Achievements {\n * @return\n */\n @JvmStatic\n- fun from(response: FeedbackResponse): Achievements {\n- return Achievements(\n+ fun from(response: FeedbackResponse): Achievements =\n+ Achievements(\n response.uniqueUsedImages,\n response.articlesUsingImages,\n response.thanksReceived,\n response.featuredImages.featuredPicturesOnWikimediaCommons,\n- response.featuredImages.qualityImages, 0,\n- response.deletedUploads\n+ response.featuredImages.qualityImages,\n+ 0,\n+ response.deletedUploads,\n )\n- }\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/profile/achievements/FeaturedImages.kt b/app/src/main/java/fr/free/nrw/commons/profile/achievements/FeaturedImages.kt\nindex 0a54a778fb..4784103fdb 100644\n--- a/app/src/main/java/fr/free/nrw/commons/profile/achievements/FeaturedImages.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/profile/achievements/FeaturedImages.kt\n@@ -8,5 +8,5 @@ import com.google.gson.annotations.SerializedName\n */\n class FeaturedImages(\n @field:SerializedName(\"Quality_images\") val qualityImages: Int,\n- @field:SerializedName(\"Featured_pictures_on_Wikimedia_Commons\") val featuredPicturesOnWikimediaCommons: Int\n-)\n\\ No newline at end of file\n+ @field:SerializedName(\"Featured_pictures_on_Wikimedia_Commons\") val featuredPicturesOnWikimediaCommons: Int,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/profile/achievements/FeedbackResponse.kt b/app/src/main/java/fr/free/nrw/commons/profile/achievements/FeedbackResponse.kt\nindex f86ca3e9b1..5510db7c51 100644\n--- a/app/src/main/java/fr/free/nrw/commons/profile/achievements/FeedbackResponse.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/profile/achievements/FeedbackResponse.kt\n@@ -3,9 +3,11 @@ package fr.free.nrw.commons.profile.achievements\n /**\n * Represent the Feedback Response of the user\n */\n-data class FeedbackResponse(val uniqueUsedImages: Int,\n- val articlesUsingImages: Int,\n- val deletedUploads: Int,\n- val featuredImages: FeaturedImages,\n- val thanksReceived: Int,\n- val user: String)\n\\ No newline at end of file\n+data class FeedbackResponse(\n+ val uniqueUsedImages: Int,\n+ val articlesUsingImages: Int,\n+ val deletedUploads: Int,\n+ val featuredImages: FeaturedImages,\n+ val thanksReceived: Int,\n+ val user: String,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/profile/achievements/LevelController.kt b/app/src/main/java/fr/free/nrw/commons/profile/achievements/LevelController.kt\nindex 414bf271d7..6f852854b4 100644\n--- a/app/src/main/java/fr/free/nrw/commons/profile/achievements/LevelController.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/profile/achievements/LevelController.kt\n@@ -8,21 +8,55 @@ import fr.free.nrw.commons.R\n class LevelController {\n var level: LevelInfo? = null\n \n- enum class LevelInfo(val levelNumber: Int,\n- val levelStyle: Int,\n- val maxUniqueImages: Int,\n- val maxUploadCount: Int,\n- val minNonRevertPercentage: Int) {\n- LEVEL_1(1, R.style.LevelOne, 5, 20, 85), LEVEL_2(2, R.style.LevelTwo, 10, 30, 86), LEVEL_3(3, R.style.LevelThree, 15, 40, 87), LEVEL_4(4, R.style.LevelFour, 20, 50, 88), LEVEL_5(5, R.style.LevelFive, 25, 60, 89), LEVEL_6(6, R.style.LevelOne, 30, 70, 90), LEVEL_7(7, R.style.LevelTwo, 40, 80, 90), LEVEL_8(8, R.style.LevelThree, 45, 90, 90), LEVEL_9(9, R.style.LevelFour, 50, 100, 90), LEVEL_10(10, R.style.LevelFive, 55, 110, 90), LEVEL_11(11, R.style.LevelOne, 60, 120, 90), LEVEL_12(12, R.style.LevelTwo, 65, 130, 90), LEVEL_13(13, R.style.LevelThree, 70, 140, 90), LEVEL_14(14, R.style.LevelFour, 75, 150, 90), LEVEL_15(15, R.style.LevelFive, 80, 160, 90), LEVEL_16(16, R.style.LevelOne, 160, 320, 91), LEVEL_17(17, R.style.LevelTwo, 320, 640, 92), LEVEL_18(18, R.style.LevelThree, 640, 1280, 93), LEVEL_19(19, R.style.LevelFour, 1280, 2560, 94), LEVEL_20(20, R.style.LevelFive, 2560, 5120, 95), LEVEL_21(21, R.style.LevelOne, 5120, 10240, 96), LEVEL_22(22, R.style.LevelTwo, 10240, 20480, 97), LEVEL_23(23, R.style.LevelThree, 20480, 40960, 98), LEVEL_24(24, R.style.LevelFour, 40960, 81920, 98), LEVEL_25(25, R.style.LevelFive, 81920, 163840, 98), LEVEL_26(26, R.style.LevelOne, 163840, 327680, 98), LEVEL_27(27, R.style.LevelTwo, 327680, 655360, 98);\n+ enum class LevelInfo(\n+ val levelNumber: Int,\n+ val levelStyle: Int,\n+ val maxUniqueImages: Int,\n+ val maxUploadCount: Int,\n+ val minNonRevertPercentage: Int,\n+ ) {\n+ LEVEL_1(1, R.style.LevelOne, 5, 20, 85),\n+ LEVEL_2(2, R.style.LevelTwo, 10, 30, 86),\n+ LEVEL_3(3, R.style.LevelThree, 15, 40, 87),\n+ LEVEL_4(4, R.style.LevelFour, 20, 50, 88),\n+ LEVEL_5(5, R.style.LevelFive, 25, 60, 89),\n+ LEVEL_6(6, R.style.LevelOne, 30, 70, 90),\n+ LEVEL_7(7, R.style.LevelTwo, 40, 80, 90),\n+ LEVEL_8(8, R.style.LevelThree, 45, 90, 90),\n+ LEVEL_9(9, R.style.LevelFour, 50, 100, 90),\n+ LEVEL_10(10, R.style.LevelFive, 55, 110, 90),\n+ LEVEL_11(11, R.style.LevelOne, 60, 120, 90),\n+ LEVEL_12(12, R.style.LevelTwo, 65, 130, 90),\n+ LEVEL_13(13, R.style.LevelThree, 70, 140, 90),\n+ LEVEL_14(14, R.style.LevelFour, 75, 150, 90),\n+ LEVEL_15(15, R.style.LevelFive, 80, 160, 90),\n+ LEVEL_16(16, R.style.LevelOne, 160, 320, 91),\n+ LEVEL_17(17, R.style.LevelTwo, 320, 640, 92),\n+ LEVEL_18(18, R.style.LevelThree, 640, 1280, 93),\n+ LEVEL_19(19, R.style.LevelFour, 1280, 2560, 94),\n+ LEVEL_20(20, R.style.LevelFive, 2560, 5120, 95),\n+ LEVEL_21(21, R.style.LevelOne, 5120, 10240, 96),\n+ LEVEL_22(22, R.style.LevelTwo, 10240, 20480, 97),\n+ LEVEL_23(23, R.style.LevelThree, 20480, 40960, 98),\n+ LEVEL_24(24, R.style.LevelFour, 40960, 81920, 98),\n+ LEVEL_25(25, R.style.LevelFive, 81920, 163840, 98),\n+ LEVEL_26(26, R.style.LevelOne, 163840, 327680, 98),\n+ LEVEL_27(27, R.style.LevelTwo, 327680, 655360, 98),\n+ ;\n \n companion object {\n @JvmStatic\n- fun from(imagesUploaded: Int,\n- uniqueImagesUsed: Int,\n- nonRevertRate: Int): LevelInfo {\n+ fun from(\n+ imagesUploaded: Int,\n+ uniqueImagesUsed: Int,\n+ nonRevertRate: Int,\n+ ): LevelInfo {\n var level = LEVEL_15\n for (levelInfo in values()) {\n- if (imagesUploaded < levelInfo.maxUploadCount || uniqueImagesUsed < levelInfo.maxUniqueImages || nonRevertRate < levelInfo.minNonRevertPercentage) {\n+ if (imagesUploaded < levelInfo.maxUploadCount ||\n+ uniqueImagesUsed < levelInfo.maxUniqueImages ||\n+ nonRevertRate < levelInfo.minNonRevertPercentage\n+ ) {\n level = levelInfo\n return level\n }\n@@ -30,6 +64,5 @@ class LevelController {\n return level\n }\n }\n-\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/quiz/QuizQuestion.kt b/app/src/main/java/fr/free/nrw/commons/quiz/QuizQuestion.kt\nindex 0dbc9061e6..fd989c9742 100644\n--- a/app/src/main/java/fr/free/nrw/commons/quiz/QuizQuestion.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/quiz/QuizQuestion.kt\n@@ -5,13 +5,16 @@ import android.net.Uri\n /**\n * class contains information about all the quiz questions\n */\n-class QuizQuestion internal constructor(var questionNumber: Int, var question: String, private var url: String, var isAnswer: Boolean, var answerMessage: String) {\n- fun getUrl(): Uri {\n- return Uri.parse(url)\n- }\n+class QuizQuestion internal constructor(\n+ var questionNumber: Int,\n+ var question: String,\n+ private var url: String,\n+ var isAnswer: Boolean,\n+ var answerMessage: String,\n+) {\n+ fun getUrl(): Uri = Uri.parse(url)\n \n fun setUrl(url: String) {\n this.url = url\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/recentlanguages/Language.kt b/app/src/main/java/fr/free/nrw/commons/recentlanguages/Language.kt\nindex 9e7aa3ae84..c843492337 100644\n--- a/app/src/main/java/fr/free/nrw/commons/recentlanguages/Language.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/recentlanguages/Language.kt\n@@ -1,3 +1,6 @@\n package fr.free.nrw.commons.recentlanguages\n \n-data class Language(val languageName: String, val languageCode: String)\n+data class Language(\n+ val languageName: String,\n+ val languageCode: String,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/recentlanguages/RecentLanguagesAdapter.kt b/app/src/main/java/fr/free/nrw/commons/recentlanguages/RecentLanguagesAdapter.kt\nindex 79b9f23dee..81ef5533d9 100644\n--- a/app/src/main/java/fr/free/nrw/commons/recentlanguages/RecentLanguagesAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/recentlanguages/RecentLanguagesAdapter.kt\n@@ -17,22 +17,26 @@ import java.util.HashMap\n class RecentLanguagesAdapter constructor(\n context: Context,\n var recentLanguages: List,\n- private val selectedLanguages: HashMap<*, String>\n+ private val selectedLanguages: HashMap<*, String>,\n ) : ArrayAdapter(context, R.layout.row_item_languages_spinner) {\n-\n /**\n * Selected language code in UploadMediaDetailAdapter\n * Used for marking selected ones\n */\n var selectedLangCode = \"\"\n \n- override fun isEnabled(position: Int) = recentLanguages[position].languageCode.let {\n- it.isNotEmpty() && !selectedLanguages.containsValue(it) && it != selectedLangCode\n- }\n+ override fun isEnabled(position: Int) =\n+ recentLanguages[position].languageCode.let {\n+ it.isNotEmpty() && !selectedLanguages.containsValue(it) && it != selectedLangCode\n+ }\n \n override fun getCount() = recentLanguages.size\n \n- override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {\n+ override fun getView(\n+ position: Int,\n+ convertView: View?,\n+ parent: ViewGroup,\n+ ): View {\n val binding: RowItemLanguagesSpinnerBinding\n var rowView = convertView\n \n@@ -55,7 +59,7 @@ class RecentLanguagesAdapter constructor(\n } else {\n it.text =\n \"${StringUtils.capitalize(languageName)}\" +\n- \" [${LangCodeUtils.fixLanguageCode(languageCode)}]\"\n+ \" [${LangCodeUtils.fixLanguageCode(languageCode)}]\"\n }\n }\n return rowView\n@@ -64,14 +68,10 @@ class RecentLanguagesAdapter constructor(\n /**\n * Provides code of a language from recent languages for a specific position\n */\n- fun getLanguageCode(position: Int): String {\n- return recentLanguages[position].languageCode\n- }\n+ fun getLanguageCode(position: Int): String = recentLanguages[position].languageCode\n \n /**\n * Provides name of a language from recent languages for a specific position\n */\n- fun getLanguageName(position: Int): String {\n- return recentLanguages[position].languageName\n- }\n-}\n\\ No newline at end of file\n+ fun getLanguageName(position: Int): String = recentLanguages[position].languageName\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt b/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt\nindex 16b8d26de2..8a77c11edb 100644\n--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt\n@@ -1,138 +1,149 @@\n package fr.free.nrw.commons.review\n \n-import androidx.annotation.VisibleForTesting\n import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.media.MediaClient\n import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage\n import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage.Revision\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n import io.reactivex.Completable\n import io.reactivex.Observable\n import io.reactivex.Single\n import io.reactivex.android.schedulers.AndroidSchedulers\n import io.reactivex.schedulers.Schedulers\n-import org.apache.commons.lang3.StringUtils\n import timber.log.Timber\n-import java.util.Collections\n import javax.inject.Inject\n import javax.inject.Singleton\n \n @Singleton\n-class ReviewHelper @Inject constructor(\n- private val mediaClient: MediaClient,\n- private val reviewInterface: ReviewInterface\n-) {\n- @JvmField @Inject var dao: ReviewDao? = null\n+class ReviewHelper\n+ @Inject\n+ constructor(\n+ private val mediaClient: MediaClient,\n+ private val reviewInterface: ReviewInterface,\n+ ) {\n+ @JvmField @Inject\n+ var dao: ReviewDao? = null\n \n- /**\n- * Fetches recent changes from MediaWiki API\n- * Calls the API to get the latest 50 changes\n- * When more results are available, the query gets continued beyond this range\n- *\n- * @return\n- */\n- private fun getRecentChanges() = reviewInterface.getRecentChanges()\n- .map { it.query()?.pages() }\n- .map(MutableList::shuffled)\n- .flatMapIterable { changes: List? -> changes }\n- .filter { isChangeReviewable(it) }\n+ /**\n+ * Fetches recent changes from MediaWiki API\n+ * Calls the API to get the latest 50 changes\n+ * When more results are available, the query gets continued beyond this range\n+ *\n+ * @return\n+ */\n+ private fun getRecentChanges() =\n+ reviewInterface\n+ .getRecentChanges()\n+ .map { it.query()?.pages() }\n+ .map(MutableList::shuffled)\n+ .flatMapIterable { changes: List? -> changes }\n+ .filter { isChangeReviewable(it) }\n \n- /**\n- * Gets a random file change for review. Checks if the image has already been shown to the user\n- * - Picks a random file from those changes\n- * - Checks if the file is nominated for deletion\n- * - Retries upto 5 times for getting a file which is not nominated for deletion\n- *\n- * @return Random file change\n- */\n- fun getRandomMedia(): Single = getRecentChanges()\n- .flatMapSingle(::getRandomMediaFromRecentChange)\n- .filter { !it.filename.isNullOrBlank() && !getReviewStatus(it.pageId) }\n- .firstOrError()\n+ /**\n+ * Gets a random file change for review. Checks if the image has already been shown to the user\n+ * - Picks a random file from those changes\n+ * - Checks if the file is nominated for deletion\n+ * - Retries upto 5 times for getting a file which is not nominated for deletion\n+ *\n+ * @return Random file change\n+ */\n+ fun getRandomMedia(): Single =\n+ getRecentChanges()\n+ .flatMapSingle(::getRandomMediaFromRecentChange)\n+ .filter { !it.filename.isNullOrBlank() && !getReviewStatus(it.pageId) }\n+ .firstOrError()\n \n- /**\n- * Returns a proper Media object if the file is not already nominated for deletion\n- * Else it returns an empty Media object\n- *\n- * @param recentChange\n- * @return\n- */\n- private fun getRandomMediaFromRecentChange(recentChange: MwQueryPage) =\n- Single.just(recentChange)\n- .flatMap { mediaClient.checkPageExistsUsingTitle(\"Commons:Deletion_requests/${it.title()}\") }\n- .flatMap {\n- if (it) {\n- Single.error(Exception(\"${recentChange.title()} is deleted\"))\n- } else {\n- mediaClient.getMedia(recentChange.title())\n+ /**\n+ * Returns a proper Media object if the file is not already nominated for deletion\n+ * Else it returns an empty Media object\n+ *\n+ * @param recentChange\n+ * @return\n+ */\n+ private fun getRandomMediaFromRecentChange(recentChange: MwQueryPage) =\n+ Single\n+ .just(recentChange)\n+ .flatMap { mediaClient.checkPageExistsUsingTitle(\"Commons:Deletion_requests/${it.title()}\") }\n+ .flatMap {\n+ if (it) {\n+ Single.error(Exception(\"${recentChange.title()} is deleted\"))\n+ } else {\n+ mediaClient.getMedia(recentChange.title())\n+ }\n }\n- }\n \n- /**\n- * Checks if the image exists in the reviewed images entity\n- *\n- * @param image\n- * @return\n- */\n- fun getReviewStatus(image: String?): Boolean =\n- dao?.isReviewedAlready(image) ?: false\n+ /**\n+ * Checks if the image exists in the reviewed images entity\n+ *\n+ * @param image\n+ * @return\n+ */\n+ fun getReviewStatus(image: String?): Boolean = dao?.isReviewedAlready(image) ?: false\n \n- /**\n- * Gets the first revision of the file from filename\n- *\n- * @param filename\n- * @return\n- */\n- fun getFirstRevisionOfFile(filename: String?): Observable =\n- reviewInterface.getFirstRevisionOfFile(filename)\n- .map { it.query()?.firstPage()?.revisions()?.get(0) }\n+ /**\n+ * Gets the first revision of the file from filename\n+ *\n+ * @param filename\n+ * @return\n+ */\n+ fun getFirstRevisionOfFile(filename: String?): Observable =\n+ reviewInterface\n+ .getFirstRevisionOfFile(filename)\n+ .map {\n+ it\n+ .query()\n+ ?.firstPage()\n+ ?.revisions()\n+ ?.get(0)\n+ }\n \n- /**\n- * Checks Whether Given File is used in any Wiki page or not\n- * by calling api for given file\n- *\n- * @param filename\n- * @return\n- */\n- fun checkFileUsage(filename: String?): Observable =\n- reviewInterface.getGlobalUsageInfo(filename)\n- .map { it.query()?.firstPage()?.checkWhetherFileIsUsedInWikis() }\n+ /**\n+ * Checks Whether Given File is used in any Wiki page or not\n+ * by calling api for given file\n+ *\n+ * @param filename\n+ * @return\n+ */\n+ fun checkFileUsage(filename: String?): Observable =\n+ reviewInterface\n+ .getGlobalUsageInfo(filename)\n+ .map { it.query()?.firstPage()?.checkWhetherFileIsUsedInWikis() }\n \n- /**\n- * Checks if the change is reviewable or not.\n- * - checks the type and revisionId of the change\n- * - checks supported image extensions\n- *\n- * @param recentChange\n- * @return\n- */\n- private fun isChangeReviewable(recentChange: MwQueryPage): Boolean {\n- for (extension in imageExtensions) {\n- if (recentChange.title().endsWith(extension)) {\n- return true\n+ /**\n+ * Checks if the change is reviewable or not.\n+ * - checks the type and revisionId of the change\n+ * - checks supported image extensions\n+ *\n+ * @param recentChange\n+ * @return\n+ */\n+ private fun isChangeReviewable(recentChange: MwQueryPage): Boolean {\n+ for (extension in imageExtensions) {\n+ if (recentChange.title().endsWith(extension)) {\n+ return true\n+ }\n }\n+ return false\n }\n- return false\n- }\n \n- /**\n- * Adds reviewed/skipped images to the database\n- *\n- * @param imageId\n- */\n- fun addViewedImagesToDB(imageId: String?) {\n- Completable.fromAction { dao!!.insert(ReviewEntity(imageId)) }\n- .subscribeOn(Schedulers.io())\n- .observeOn(AndroidSchedulers.mainThread())\n- .subscribe(\n- {\n- // Inserted successfully\n- Timber.i(\"Image inserted successfully.\")\n- }\n- ) { throwable: Throwable? -> Timber.e(\"Image not inserted into the reviewed images database\") }\n- }\n+ /**\n+ * Adds reviewed/skipped images to the database\n+ *\n+ * @param imageId\n+ */\n+ fun addViewedImagesToDB(imageId: String?) {\n+ Completable\n+ .fromAction { dao!!.insert(ReviewEntity(imageId)) }\n+ .subscribeOn(Schedulers.io())\n+ .observeOn(AndroidSchedulers.mainThread())\n+ .subscribe(\n+ {\n+ // Inserted successfully\n+ Timber.i(\"Image inserted successfully.\")\n+ },\n+ ) { throwable: Throwable? -> Timber.e(\"Image not inserted into the reviewed images database\") }\n+ }\n \n- companion object {\n- private val imageExtensions = arrayOf(\".jpg\", \".jpeg\", \".png\")\n+ companion object {\n+ private val imageExtensions = arrayOf(\".jpg\", \".jpeg\", \".png\")\n+ }\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewInterface.kt b/app/src/main/java/fr/free/nrw/commons/review/ReviewInterface.kt\nindex 1fe9e1107b..f65b41b392 100644\n--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewInterface.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewInterface.kt\n@@ -18,12 +18,18 @@ interface ReviewInterface {\n * the limit is increased from 10 to 50 using gcmlimit\n *\n */\n- @GET(\"w/api.php?action=query&format=json&formatversion=2&generator=categorymembers&gcmtype=file&gcmsort=timestamp&gcmdir=desc&gcmtitle=Category:Uploaded_with_Mobile/Android&gcmlimit=50\")\n+ @GET(\n+ \"w/api.php?action=query&format=json&formatversion=2&generator=categorymembers&gcmtype=file&gcmsort=timestamp&gcmdir=desc&gcmtitle=Category:Uploaded_with_Mobile/Android&gcmlimit=50\",\n+ )\n fun getRecentChanges(): Observable\n \n @GET(\"w/api.php?action=query&format=json&formatversion=2&prop=revisions&rvprop=timestamp|ids|user&rvdir=newer&rvlimit=1\")\n- fun getFirstRevisionOfFile(@Query(\"titles\") titles: String?): Observable\n+ fun getFirstRevisionOfFile(\n+ @Query(\"titles\") titles: String?,\n+ ): Observable\n \n @GET(\"w/api.php?action=query&format=json&formatversion=2&prop=fileusage|globalusage\")\n- fun getGlobalUsageInfo(@Query(\"titles\") title: String?): Observable\n+ fun getGlobalUsageInfo(\n+ @Query(\"titles\") title: String?,\n+ ): Observable\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/CountingRequestBody.kt b/app/src/main/java/fr/free/nrw/commons/upload/CountingRequestBody.kt\nindex a777982013..e486685c4e 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/CountingRequestBody.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/CountingRequestBody.kt\n@@ -1,9 +1,12 @@\n package fr.free.nrw.commons.upload\n \n-import fr.free.nrw.commons.contributions.ChunkInfo\n import okhttp3.MediaType\n import okhttp3.RequestBody\n-import okio.*\n+import okio.Buffer\n+import okio.BufferedSink\n+import okio.ForwardingSink\n+import okio.Sink\n+import okio.buffer\n import java.io.IOException\n \n /**\n@@ -17,12 +20,11 @@ class CountingRequestBody(\n protected var delegate: RequestBody,\n protected var listener: Listener,\n var offset: Long,\n- var totalContentLength: Long\n+ var totalContentLength: Long,\n ) : RequestBody() {\n protected var countingSink: CountingSink? = null\n- override fun contentType(): MediaType? {\n- return delegate.contentType()\n- }\n+\n+ override fun contentType(): MediaType? = delegate.contentType()\n \n override fun contentLength(): Long {\n try {\n@@ -41,11 +43,16 @@ class CountingRequestBody(\n bufferedSink.flush()\n }\n \n- protected inner class CountingSink(delegate: Sink?) : ForwardingSink(delegate!!) {\n+ protected inner class CountingSink(\n+ delegate: Sink?,\n+ ) : ForwardingSink(delegate!!) {\n private var bytesWritten: Long = 0\n \n @Throws(IOException::class)\n- override fun write(source: Buffer, byteCount: Long) {\n+ override fun write(\n+ source: Buffer,\n+ byteCount: Long,\n+ ) {\n super.write(source, byteCount)\n bytesWritten += byteCount\n listener.onRequestProgress(offset + bytesWritten, totalContentLength)\n@@ -58,7 +65,9 @@ class CountingRequestBody(\n * @param bytesWritten\n * @param contentLength\n */\n- fun onRequestProgress(bytesWritten: Long, contentLength: Long)\n+ fun onRequestProgress(\n+ bytesWritten: Long,\n+ contentLength: Long,\n+ )\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/Description.kt b/app/src/main/java/fr/free/nrw/commons/upload/Description.kt\nindex 09bfa81d23..83902aae41 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/Description.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/Description.kt\n@@ -5,27 +5,27 @@ package fr.free.nrw.commons.upload\n */\n class Description {\n /**\n- * @return The language code ie. \"en\" or \"fr\"\n- */\n- /**\n- * @param languageCode The language code ie. \"en\" or \"fr\"\n+ * The language code, e.g., \"en\" or \"fr\".\n+ * @param languageCode The language code.\n */\n var languageCode: String? = null\n- var descriptionText: String? = null\n+\n /**\n- * @return the index of the language selected in a spinner with [SpinnerLanguagesAdapter]\n+ * The description text for the item being uploaded.\n+ * @param descriptionText The description text.\n */\n+ var descriptionText: String? = null\n+\n /**\n- * @param selectedLanguageIndex the index of the language selected in a spinner with [SpinnerLanguagesAdapter]\n+ * The index of the language selected in a spinner with [SpinnerLanguagesAdapter].\n+ * @param selectedLanguageIndex The index of the selected language.\n */\n var selectedLanguageIndex = -1\n+\n /**\n- * returns if the description was added manually (by the user, or we have added it programaticallly)\n- * @return\n- */\n- /**\n- * sets to true if the description was manually added by the user\n- * @param manuallyAdded\n+ * Indicates if the description was added manually (by the user or programmatically).\n+ * @param manuallyAdded Sets to true if the description was manually added by the user.\n+ * @return True if the description was manually added.\n */\n var isManuallyAdded = false\n \n@@ -44,12 +44,16 @@ class Description {\n val descListString = StringBuilder()\n for (description in descriptions) {\n if (!description.isEmpty) {\n- val individualDescription = String.format(\"{{%s|1=%s}}\", description.languageCode,\n- description.descriptionText)\n+ val individualDescription =\n+ String.format(\n+ \"{{%s|1=%s}}\",\n+ description.languageCode,\n+ description.descriptionText,\n+ )\n descListString.append(individualDescription)\n }\n }\n return descListString.toString()\n }\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/FailedUploadsAdapter.kt b/app/src/main/java/fr/free/nrw/commons/upload/FailedUploadsAdapter.kt\nindex aa0d6bd3de..fc57ffe41d 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/FailedUploadsAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/FailedUploadsAdapter.kt\n@@ -25,14 +25,18 @@ import java.io.File\n * @param callback The callback to handle user actions such as Delete Uploads and Restart Uploads\n * on failed uploads.\n */\n-class FailedUploadsAdapter(callback: Callback) :\n- PagedListAdapter(ContributionDiffCallback()) {\n+class FailedUploadsAdapter(\n+ callback: Callback,\n+) : PagedListAdapter(ContributionDiffCallback()) {\n private var callback: Callback = callback\n \n /**\n * Creates a new ViewHolder instance. Inflates the layout for each item in the list.\n */\n- override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {\n+ override fun onCreateViewHolder(\n+ parent: ViewGroup,\n+ viewType: Int,\n+ ): ViewHolder {\n val view: View =\n LayoutInflater.from(parent.context).inflate(R.layout.item_failed_upload, parent, false)\n return ViewHolder(view)\n@@ -42,7 +46,10 @@ class FailedUploadsAdapter(callback: Callback) :\n * Binds data to the provided ViewHolder. Sets up the item view with data from the\n * contribution at the specified position.\n */\n- override fun onBindViewHolder(holder: ViewHolder, position: Int) {\n+ override fun onBindViewHolder(\n+ holder: ViewHolder,\n+ position: Int,\n+ ) {\n val item: Contribution? = getItem(position)\n if (item != null) {\n holder.titleTextView.setText(item.media.displayTitle)\n@@ -86,7 +93,9 @@ class FailedUploadsAdapter(callback: Callback) :\n /**\n * ViewHolder for the failed upload item. Holds references to the views for each item.\n */\n- class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {\n+ class ViewHolder(\n+ itemView: View,\n+ ) : RecyclerView.ViewHolder(itemView) {\n var itemImage: com.facebook.drawee.view.SimpleDraweeView =\n itemView.findViewById(R.id.itemImage)\n var titleTextView: TextView = itemView.findViewById(R.id.titleTextView)\n@@ -100,22 +109,22 @@ class FailedUploadsAdapter(callback: Callback) :\n * Returns the ID of the item at the specified position. Uses the pageId of the contribution\n * for unique identification.\n */\n- override fun getItemId(position: Int): Long {\n- return getItem(position)?.pageId?.hashCode()?.toLong() ?: position.toLong()\n- }\n+ override fun getItemId(position: Int): Long = getItem(position)?.pageId?.hashCode()?.toLong() ?: position.toLong()\n \n /**\n * Uses DiffUtil to calculate the changes in the list\n * It has methods that check pageId and the content of the items to determine if its a new item\n */\n class ContributionDiffCallback : DiffUtil.ItemCallback() {\n- override fun areItemsTheSame(oldItem: Contribution, newItem: Contribution): Boolean {\n- return oldItem.pageId.hashCode() == newItem.pageId.hashCode()\n- }\n+ override fun areItemsTheSame(\n+ oldItem: Contribution,\n+ newItem: Contribution,\n+ ): Boolean = oldItem.pageId.hashCode() == newItem.pageId.hashCode()\n \n- override fun areContentsTheSame(oldItem: Contribution, newItem: Contribution): Boolean {\n- return oldItem.transferred == newItem.transferred\n- }\n+ override fun areContentsTheSame(\n+ oldItem: Contribution,\n+ newItem: Contribution,\n+ ): Boolean = oldItem.transferred == newItem.transferred\n }\n \n /**\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/FailedUploadsFragment.kt b/app/src/main/java/fr/free/nrw/commons/upload/FailedUploadsFragment.kt\nindex e2bea2ab6c..876fb3cd3f 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/FailedUploadsFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/FailedUploadsFragment.kt\n@@ -5,10 +5,8 @@ import android.os.Bundle\n import android.view.LayoutInflater\n import android.view.View\n import android.view.ViewGroup\n-import androidx.fragment.app.Fragment\n import androidx.paging.PagedList\n import androidx.recyclerview.widget.LinearLayoutManager\n-import fr.free.nrw.commons.CommonsApplication\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.auth.SessionManager\n import fr.free.nrw.commons.contributions.Contribution\n@@ -26,9 +24,10 @@ import javax.inject.Inject\n * Fragment for displaying a list of failed uploads in Upload Progress Activity. This fragment provides\n * functionality for the user to retry or cancel failed uploads.\n */\n-class FailedUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsContract.View,\n+class FailedUploadsFragment :\n+ CommonsDaggerSupportFragment(),\n+ PendingUploadsContract.View,\n FailedUploadsAdapter.Callback {\n-\n @Inject\n lateinit var pendingUploadsPresenter: PendingUploadsPresenter\n \n@@ -57,7 +56,7 @@ class FailedUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCont\n \n override fun onCreate(savedInstanceState: Bundle?) {\n super.onCreate(savedInstanceState)\n- //Now that we are allowing this fragment to be started for\n+ // Now that we are allowing this fragment to be started for\n // any userName- we expect it to be passed as an argument\n if (arguments != null) {\n userName = requireArguments().getString(ProfileActivity.KEY_USERNAME)\n@@ -69,8 +68,9 @@ class FailedUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCont\n }\n \n override fun onCreateView(\n- inflater: LayoutInflater, container: ViewGroup?,\n- savedInstanceState: Bundle?\n+ inflater: LayoutInflater,\n+ container: ViewGroup?,\n+ savedInstanceState: Bundle?,\n ): View? {\n binding = FragmentFailedUploadsBinding.inflate(layoutInflater)\n pendingUploadsPresenter.onAttachView(this)\n@@ -82,7 +82,10 @@ class FailedUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCont\n adapter = FailedUploadsAdapter(this)\n }\n \n- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {\n+ override fun onViewCreated(\n+ view: View,\n+ savedInstanceState: Bundle?,\n+ ) {\n super.onViewCreated(view, savedInstanceState)\n initRecyclerView()\n }\n@@ -95,7 +98,7 @@ class FailedUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCont\n binding.failedUploadsRecyclerView.adapter = adapter\n pendingUploadsPresenter!!.getFailedContributions()\n pendingUploadsPresenter!!.failedContributionList.observe(\n- viewLifecycleOwner\n+ viewLifecycleOwner,\n ) { list: PagedList ->\n adapter.submitList(list)\n contributionsList = ArrayList()\n@@ -125,7 +128,7 @@ class FailedUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCont\n pendingUploadsPresenter.restartUploads(\n contributionsList,\n 0,\n- this.requireContext().applicationContext\n+ this.requireContext().applicationContext,\n )\n }\n }\n@@ -138,7 +141,7 @@ class FailedUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCont\n pendingUploadsPresenter.restartUpload(\n contributionsList,\n index,\n- this.requireContext().applicationContext\n+ this.requireContext().applicationContext,\n )\n }\n }\n@@ -151,11 +154,11 @@ class FailedUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCont\n requireActivity(),\n String.format(\n Locale.getDefault(),\n- requireActivity().getString(R.string.cancelling_upload)\n+ requireActivity().getString(R.string.cancelling_upload),\n ),\n String.format(\n Locale.getDefault(),\n- requireActivity().getString(R.string.cancel_upload_dialog)\n+ requireActivity().getString(R.string.cancel_upload_dialog),\n ),\n String.format(Locale.getDefault(), requireActivity().getString(R.string.yes)),\n String.format(Locale.getDefault(), requireActivity().getString(R.string.no)),\n@@ -163,10 +166,10 @@ class FailedUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCont\n ViewUtil.showShortToast(context, R.string.cancelling_upload)\n pendingUploadsPresenter.deleteUpload(\n contribution,\n- this.requireContext().applicationContext\n+ this.requireContext().applicationContext,\n )\n },\n- {}\n+ {},\n )\n }\n \n@@ -179,11 +182,11 @@ class FailedUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCont\n requireActivity(),\n String.format(\n Locale.getDefault(),\n- requireActivity().getString(R.string.cancelling_all_the_uploads)\n+ requireActivity().getString(R.string.cancelling_all_the_uploads),\n ),\n String.format(\n Locale.getDefault(),\n- requireActivity().getString(R.string.are_you_sure_that_you_want_cancel_all_the_uploads)\n+ requireActivity().getString(R.string.are_you_sure_that_you_want_cancel_all_the_uploads),\n ),\n String.format(Locale.getDefault(), requireActivity().getString(R.string.yes)),\n String.format(Locale.getDefault(), requireActivity().getString(R.string.no)),\n@@ -191,11 +194,11 @@ class FailedUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCont\n ViewUtil.showShortToast(context, R.string.cancelling_upload)\n uploadProgressActivity.hidePendingIcons()\n pendingUploadsPresenter.deleteUploads(\n- listOf(Contribution.STATE_FAILED)\n+ listOf(Contribution.STATE_FAILED),\n )\n },\n- {}\n+ {},\n )\n }\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/FileProcessor.kt b/app/src/main/java/fr/free/nrw/commons/upload/FileProcessor.kt\nindex d73384b35c..68c6f13fbe 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/FileProcessor.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/FileProcessor.kt\n@@ -18,7 +18,7 @@ import io.reactivex.schedulers.Schedulers\n import timber.log.Timber\n import java.io.File\n import java.io.IOException\n-import java.util.*\n+import java.util.Locale\n import javax.inject.Inject\n import javax.inject.Named\n \n@@ -31,194 +31,205 @@ private const val MAX_SUGGESTION_RADIUS_IN_METRES = 1000\n private const val RADIUS_STEP_SIZE_IN_METRES = 100\n private const val MIN_NEARBY_RESULTS = 5\n \n-class FileProcessor @Inject constructor(\n- private val context: Context,\n- private val contentResolver: ContentResolver,\n- private val gpsCategoryModel: GpsCategoryModel,\n- private val depictsModel: DepictModel,\n- @param:Named(\"default_preferences\") private val defaultKvStore: JsonKvStore,\n- private val apiCall: CategoryApi,\n- private val okHttpJsonApiClient: OkHttpJsonApiClient\n-) {\n- private val compositeDisposable = CompositeDisposable()\n-\n- fun cleanup() {\n- compositeDisposable.clear()\n- }\n+class FileProcessor\n+ @Inject\n+ constructor(\n+ private val context: Context,\n+ private val contentResolver: ContentResolver,\n+ private val gpsCategoryModel: GpsCategoryModel,\n+ private val depictsModel: DepictModel,\n+ @param:Named(\"default_preferences\") private val defaultKvStore: JsonKvStore,\n+ private val apiCall: CategoryApi,\n+ private val okHttpJsonApiClient: OkHttpJsonApiClient,\n+ ) {\n+ private val compositeDisposable = CompositeDisposable()\n \n- /**\n- * Processes filePath coordinates, either from EXIF data or user location\n- */\n- fun processFileCoordinates(\n- similarImageInterface: SimilarImageInterface,\n- filePath: String?, inAppPictureLocation: LatLng?\n- )\n- : ImageCoordinates {\n- val exifInterface: ExifInterface? = try {\n- ExifInterface(filePath!!)\n- } catch (e: IOException) {\n- Timber.e(e)\n- null\n- }\n- // Redact EXIF data as indicated in preferences.\n- redactExifTags(exifInterface, getExifTagsToRedact())\n- Timber.d(\"Calling GPSExtractor\")\n- val originalImageCoordinates = ImageCoordinates(exifInterface, inAppPictureLocation)\n- if (originalImageCoordinates.decimalCoords == null) {\n- //Find other photos taken around the same time which has gps coordinates\n- findOtherImages(\n- File(filePath),\n- similarImageInterface\n- )\n- } else {\n- prePopulateCategoriesAndDepictionsBy(originalImageCoordinates)\n+ fun cleanup() {\n+ compositeDisposable.clear()\n }\n- return originalImageCoordinates\n- }\n-\n- /**\n- * Gets EXIF Tags from preferences to be redacted.\n- *\n- * @return tags to be redacted\n- */\n- fun getExifTagsToRedact(): Set {\n- val prefManageEXIFTags =\n- defaultKvStore.getStringSet(Prefs.MANAGED_EXIF_TAGS) ?: emptySet()\n- val redactTags: Set =\n- context.resources.getStringArray(R.array.pref_exifTag_values).toSet()\n- return redactTags - prefManageEXIFTags\n- }\n \n- /**\n- * Redacts EXIF metadata as indicated in preferences.\n- *\n- * @param exifInterface ExifInterface object\n- * @param redactTags tags to be redacted\n- */\n- fun redactExifTags(exifInterface: ExifInterface?, redactTags: Set) {\n- compositeDisposable.add(\n- Observable.fromIterable(redactTags)\n- .flatMap { Observable.fromArray(*FileMetadataUtils.getTagsFromPref(it)) }\n- .subscribe(\n- { redactTag(exifInterface, it) },\n- { Timber.d(it) },\n- { save(exifInterface) }\n+ /**\n+ * Processes filePath coordinates, either from EXIF data or user location\n+ */\n+ fun processFileCoordinates(\n+ similarImageInterface: SimilarImageInterface,\n+ filePath: String?,\n+ inAppPictureLocation: LatLng?,\n+ ): ImageCoordinates {\n+ val exifInterface: ExifInterface? =\n+ try {\n+ ExifInterface(filePath!!)\n+ } catch (e: IOException) {\n+ Timber.e(e)\n+ null\n+ }\n+ // Redact EXIF data as indicated in preferences.\n+ redactExifTags(exifInterface, getExifTagsToRedact())\n+ Timber.d(\"Calling GPSExtractor\")\n+ val originalImageCoordinates = ImageCoordinates(exifInterface, inAppPictureLocation)\n+ if (originalImageCoordinates.decimalCoords == null) {\n+ // Find other photos taken around the same time which has gps coordinates\n+ findOtherImages(\n+ File(filePath),\n+ similarImageInterface,\n )\n- )\n- }\n-\n- private fun save(exifInterface: ExifInterface?) {\n- try {\n- exifInterface?.saveAttributes()\n- } catch (e: IOException) {\n- Timber.w(\"EXIF redaction failed: %s\", e.toString())\n+ } else {\n+ prePopulateCategoriesAndDepictionsBy(originalImageCoordinates)\n+ }\n+ return originalImageCoordinates\n }\n- }\n \n- private fun redactTag(exifInterface: ExifInterface?, tag: String) {\n- Timber.d(\"Checking for tag: %s\", tag)\n- exifInterface?.getAttribute(tag)\n- ?.takeIf { it.isNotEmpty() }\n- ?.let { attributeName ->\n- exifInterface.setAttribute(tag, null).also {\n- Timber.d(\"Exif tag $tag with value $attributeName redacted.\")\n- }\n- }\n- }\n+ /**\n+ * Gets EXIF Tags from preferences to be redacted.\n+ *\n+ * @return tags to be redacted\n+ */\n+ fun getExifTagsToRedact(): Set {\n+ val prefManageEXIFTags =\n+ defaultKvStore.getStringSet(Prefs.MANAGED_EXIF_TAGS) ?: emptySet()\n+ val redactTags: Set =\n+ context.resources.getStringArray(R.array.pref_exifTag_values).toSet()\n+ return redactTags - prefManageEXIFTags\n+ }\n \n- /**\n- * Find other images around the same location that were taken within the last 20 sec\n- *\n- * @param originalImageCoordinates\n- * @param fileBeingProcessed\n- * @param similarImageInterface\n- */\n- private fun findOtherImages(\n- fileBeingProcessed: File,\n- similarImageInterface: SimilarImageInterface\n- ) {\n- val oneHundredAndTwentySeconds = 120 * 1000L\n- //Time when the original image was created\n- val timeOfCreation = fileBeingProcessed.lastModified()\n- LongRange\n- val timeOfCreationRange =\n- timeOfCreation - oneHundredAndTwentySeconds..timeOfCreation + oneHundredAndTwentySeconds\n- fileBeingProcessed.parentFile\n- .listFiles()\n- .asSequence()\n- .filter { it.lastModified() in timeOfCreationRange }\n- .map { Pair(it, readImageCoordinates(it)) }\n- .firstOrNull { it.second?.decimalCoords != null }\n- ?.let { fileCoordinatesPair ->\n- similarImageInterface.showSimilarImageFragment(\n- fileBeingProcessed.path,\n- fileCoordinatesPair.first.absolutePath,\n- fileCoordinatesPair.second\n- )\n- }\n- }\n+ /**\n+ * Redacts EXIF metadata as indicated in preferences.\n+ *\n+ * @param exifInterface ExifInterface object\n+ * @param redactTags tags to be redacted\n+ */\n+ fun redactExifTags(\n+ exifInterface: ExifInterface?,\n+ redactTags: Set,\n+ ) {\n+ compositeDisposable.add(\n+ Observable\n+ .fromIterable(redactTags)\n+ .flatMap { Observable.fromArray(*FileMetadataUtils.getTagsFromPref(it)) }\n+ .subscribe(\n+ { redactTag(exifInterface, it) },\n+ { Timber.d(it) },\n+ { save(exifInterface) },\n+ ),\n+ )\n+ }\n \n- private fun readImageCoordinates(file: File) =\n- try {\n- /* Used null location as location for similar images captured before is not available\n- in case it is not present in the EXIF. */\n- ImageCoordinates(contentResolver.openInputStream(Uri.fromFile(file))!!, null)\n- } catch (e: IOException) {\n- Timber.e(e)\n+ private fun save(exifInterface: ExifInterface?) {\n try {\n- ImageCoordinates(file.absolutePath, null)\n- } catch (ex: IOException) {\n- Timber.e(ex)\n- null\n+ exifInterface?.saveAttributes()\n+ } catch (e: IOException) {\n+ Timber.w(\"EXIF redaction failed: %s\", e.toString())\n }\n }\n \n- /**\n- * Initiates retrieval of image coordinates or user coordinates, and caching of coordinates. Then\n- * initiates the calls to MediaWiki API through an instance of CategoryApi.\n- *\n- * @param imageCoordinates\n- */\n- fun prePopulateCategoriesAndDepictionsBy(imageCoordinates: ImageCoordinates) {\n- requireNotNull(imageCoordinates.decimalCoords)\n- compositeDisposable.add(\n- apiCall.request(imageCoordinates.decimalCoords)\n- .subscribeOn(Schedulers.io())\n- .observeOn(Schedulers.io())\n- .subscribe(\n- gpsCategoryModel::setCategoriesFromLocation,\n- {\n- Timber.e(it)\n- gpsCategoryModel.clear()\n+ private fun redactTag(\n+ exifInterface: ExifInterface?,\n+ tag: String,\n+ ) {\n+ Timber.d(\"Checking for tag: %s\", tag)\n+ exifInterface\n+ ?.getAttribute(tag)\n+ ?.takeIf { it.isNotEmpty() }\n+ ?.let { attributeName ->\n+ exifInterface.setAttribute(tag, null).also {\n+ Timber.d(\"Exif tag $tag with value $attributeName redacted.\")\n }\n- )\n- )\n-\n- compositeDisposable.add(\n- suggestNearbyDepictions(imageCoordinates)\n- )\n- }\n+ }\n+ }\n \n- private val radiiProgressionInMetres =\n- (DEFAULT_SUGGESTION_RADIUS_IN_METRES..MAX_SUGGESTION_RADIUS_IN_METRES step RADIUS_STEP_SIZE_IN_METRES)\n-\n- private fun suggestNearbyDepictions(imageCoordinates: ImageCoordinates): Disposable {\n- return Observable.fromIterable(radiiProgressionInMetres.map { it / 1000.0 })\n- .concatMap {\n- Observable.fromCallable {\n- okHttpJsonApiClient.getNearbyPlaces(\n- imageCoordinates.latLng,\n- Locale.getDefault().language,\n- it\n+ /**\n+ * Find other images around the same location that were taken within the last 20 sec\n+ *\n+ * @param originalImageCoordinates\n+ * @param fileBeingProcessed\n+ * @param similarImageInterface\n+ */\n+ private fun findOtherImages(\n+ fileBeingProcessed: File,\n+ similarImageInterface: SimilarImageInterface,\n+ ) {\n+ val oneHundredAndTwentySeconds = 120 * 1000L\n+ // Time when the original image was created\n+ val timeOfCreation = fileBeingProcessed.lastModified()\n+ LongRange\n+ val timeOfCreationRange =\n+ timeOfCreation - oneHundredAndTwentySeconds..timeOfCreation + oneHundredAndTwentySeconds\n+ fileBeingProcessed.parentFile\n+ .listFiles()\n+ .asSequence()\n+ .filter { it.lastModified() in timeOfCreationRange }\n+ .map { Pair(it, readImageCoordinates(it)) }\n+ .firstOrNull { it.second?.decimalCoords != null }\n+ ?.let { fileCoordinatesPair ->\n+ similarImageInterface.showSimilarImageFragment(\n+ fileBeingProcessed.path,\n+ fileCoordinatesPair.first.absolutePath,\n+ fileCoordinatesPair.second,\n )\n }\n+ }\n+\n+ private fun readImageCoordinates(file: File) =\n+ try {\n+ /* Used null location as location for similar images captured before is not available\n+ in case it is not present in the EXIF. */\n+ ImageCoordinates(contentResolver.openInputStream(Uri.fromFile(file))!!, null)\n+ } catch (e: IOException) {\n+ Timber.e(e)\n+ try {\n+ ImageCoordinates(file.absolutePath, null)\n+ } catch (ex: IOException) {\n+ Timber.e(ex)\n+ null\n+ }\n }\n- .subscribeOn(Schedulers.io())\n- .filter { it.size >= MIN_NEARBY_RESULTS }\n- .take(1)\n- .subscribe(\n- { depictsModel.nearbyPlaces.offer(it) },\n- { Timber.e(it) }\n+\n+ /**\n+ * Initiates retrieval of image coordinates or user coordinates, and caching of coordinates. Then\n+ * initiates the calls to MediaWiki API through an instance of CategoryApi.\n+ *\n+ * @param imageCoordinates\n+ */\n+ fun prePopulateCategoriesAndDepictionsBy(imageCoordinates: ImageCoordinates) {\n+ requireNotNull(imageCoordinates.decimalCoords)\n+ compositeDisposable.add(\n+ apiCall\n+ .request(imageCoordinates.decimalCoords)\n+ .subscribeOn(Schedulers.io())\n+ .observeOn(Schedulers.io())\n+ .subscribe(\n+ gpsCategoryModel::setCategoriesFromLocation,\n+ {\n+ Timber.e(it)\n+ gpsCategoryModel.clear()\n+ },\n+ ),\n+ )\n+\n+ compositeDisposable.add(\n+ suggestNearbyDepictions(imageCoordinates),\n )\n+ }\n+\n+ private val radiiProgressionInMetres =\n+ (DEFAULT_SUGGESTION_RADIUS_IN_METRES..MAX_SUGGESTION_RADIUS_IN_METRES step RADIUS_STEP_SIZE_IN_METRES)\n+\n+ private fun suggestNearbyDepictions(imageCoordinates: ImageCoordinates): Disposable =\n+ Observable\n+ .fromIterable(radiiProgressionInMetres.map { it / 1000.0 })\n+ .concatMap {\n+ Observable.fromCallable {\n+ okHttpJsonApiClient.getNearbyPlaces(\n+ imageCoordinates.latLng,\n+ Locale.getDefault().language,\n+ it,\n+ )\n+ }\n+ }.subscribeOn(Schedulers.io())\n+ .filter { it.size >= MIN_NEARBY_RESULTS }\n+ .take(1)\n+ .subscribe(\n+ { depictsModel.nearbyPlaces.offer(it) },\n+ { Timber.e(it) },\n+ )\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/GpsCategoryModel.kt b/app/src/main/java/fr/free/nrw/commons/upload/GpsCategoryModel.kt\nindex 4fab5e6f5c..377c1a2d2d 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/GpsCategoryModel.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/GpsCategoryModel.kt\n@@ -6,14 +6,16 @@ import javax.inject.Inject\n import javax.inject.Singleton\n \n @Singleton\n-class GpsCategoryModel @Inject constructor() {\n- val categoriesFromLocation = BehaviorSubject.createDefault(emptyList())\n+class GpsCategoryModel\n+ @Inject\n+ constructor() {\n+ val categoriesFromLocation = BehaviorSubject.createDefault(emptyList())\n \n- fun clear() {\n- categoriesFromLocation.onNext(emptyList())\n- }\n+ fun clear() {\n+ categoriesFromLocation.onNext(emptyList())\n+ }\n \n- fun setCategoriesFromLocation(categoryList: List) {\n- categoriesFromLocation.onNext(categoryList)\n+ fun setCategoriesFromLocation(categoryList: List) {\n+ categoriesFromLocation.onNext(categoryList)\n+ }\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/ImageCoordinates.kt b/app/src/main/java/fr/free/nrw/commons/upload/ImageCoordinates.kt\nindex 3f2ab36a60..a6976407f5 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/ImageCoordinates.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/ImageCoordinates.kt\n@@ -12,23 +12,29 @@ import java.io.InputStream\n * Otherwise, if current user location is available while using the in-app camera,\n * use it to set image coordinates\n */\n-class ImageCoordinates internal constructor(exif: ExifInterface?, inAppPictureLocation: LatLng?) {\n+class ImageCoordinates internal constructor(\n+ exif: ExifInterface?,\n+ inAppPictureLocation: LatLng?,\n+) {\n var decLatitude = 0.0\n var decLongitude = 0.0\n var imageCoordsExists = false\n+\n /**\n * @return string of `\"[decLatitude]|[decLongitude]\"` or null if coordinates do not exist\n */\n var decimalCoords: String? = null\n- var zoomLevel : Double = 16.0\n+\n /**\n * @return double value of zoom or 16.0 by default\n */\n+ var zoomLevel: Double = 16.0\n \n /**\n * Construct from a stream.\n */\n internal constructor(stream: InputStream, inAppPictureLocation: LatLng?) : this(ExifInterface(stream), inAppPictureLocation)\n+\n /**\n * Construct from the file path of the image.\n * @param path file path of the image\n@@ -37,8 +43,8 @@ class ImageCoordinates internal constructor(exif: ExifInterface?, inAppPictureLo\n internal constructor(path: String, inAppPictureLocation: LatLng?) : this(ExifInterface(path), inAppPictureLocation)\n \n init {\n- //If image has no EXIF data and user has enabled GPS setting, get user's location\n- //Always return null as a temporary fix for #1599\n+ // If image has no EXIF data and user has enabled GPS setting, get user's location\n+ // Always return null as a temporary fix for #1599\n if (exif != null) {\n val latAndLong = exif.latLong\n if (latAndLong != null) {\n@@ -51,16 +57,22 @@ class ImageCoordinates internal constructor(exif: ExifInterface?, inAppPictureLo\n val longitudeRef = exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE_REF)\n if (latitude != null && longitude != null && latitudeRef != null && longitudeRef != null) {\n decLatitude =\n- if (ExifInterface.LATITUDE_NORTH == latitudeRef) convertToDegree(latitude)\n- else 0 - convertToDegree(latitude)\n+ if (ExifInterface.LATITUDE_NORTH == latitudeRef) {\n+ convertToDegree(latitude)\n+ } else {\n+ 0 - convertToDegree(latitude)\n+ }\n decLongitude =\n- if (ExifInterface.LONGITUDE_EAST == longitudeRef) convertToDegree(longitude)\n- else 0 - convertToDegree(longitude)\n+ if (ExifInterface.LONGITUDE_EAST == longitudeRef) {\n+ convertToDegree(longitude)\n+ } else {\n+ 0 - convertToDegree(longitude)\n+ }\n }\n }\n if (!(decLatitude == 0.0 && decLongitude == 0.0)) {\n decimalCoords = \"$decLatitude|$decLongitude\"\n- //If image has EXIF data, extract image coords\n+ // If image has EXIF data, extract image coords\n imageCoordsExists = true\n Timber.d(\"EXIF data has location info\")\n } else if (inAppPictureLocation != null) {\n@@ -91,6 +103,5 @@ class ImageCoordinates internal constructor(exif: ExifInterface?, inAppPictureLo\n degrees + minutes / 60 + seconds / 3600\n }\n \n- private fun evaluateExpression(dm: String) =\n- dm.split(\"/\").let { it[0].toDouble() / it[1].toDouble() }\n+ private fun evaluateExpression(dm: String) = dm.split(\"/\").let { it[0].toDouble() / it[1].toDouble() }\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/Language.kt b/app/src/main/java/fr/free/nrw/commons/upload/Language.kt\nindex 78b7f593d7..47389349a4 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/Language.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/Language.kt\n@@ -1,8 +1,9 @@\n package fr.free.nrw.commons.upload\n \n-import java.util.*\n+import java.util.Locale\n \n-class Language(var locale: Locale) {\n+class Language(\n+ var locale: Locale,\n+) {\n var isSet = false\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/LanguagesAdapter.kt b/app/src/main/java/fr/free/nrw/commons/upload/LanguagesAdapter.kt\nindex 9037e8a991..2847fa0c0b 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/LanguagesAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/LanguagesAdapter.kt\n@@ -9,10 +9,10 @@ import android.widget.Filter\n import androidx.core.os.ConfigurationCompat\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.databinding.RowItemLanguagesSpinnerBinding\n+import fr.free.nrw.commons.language.AppLanguageLookUpTable\n import fr.free.nrw.commons.utils.LangCodeUtils\n import org.apache.commons.lang3.StringUtils\n-import fr.free.nrw.commons.language.AppLanguageLookUpTable\n-import java.util.*\n+import java.util.Locale\n \n /**\n * This class handles the display of language dialog and their views for UploadMediaDetailFragment\n@@ -23,9 +23,8 @@ import java.util.*\n */\n class LanguagesAdapter constructor(\n context: Context,\n- private val selectedLanguages: HashMap<*, String>\n+ private val selectedLanguages: HashMap<*, String>,\n ) : ArrayAdapter(context, R.layout.row_item_languages_spinner) {\n-\n companion object {\n /**\n * Represents the default index for the language list. By default, this index corresponds to the\n@@ -41,6 +40,7 @@ class LanguagesAdapter constructor(\n \n var language: AppLanguageLookUpTable =\n AppLanguageLookUpTable(context)\n+\n init {\n languageNamesList = language.localizedNames\n languageCodesList = language.codes\n@@ -49,14 +49,18 @@ class LanguagesAdapter constructor(\n private val filter = LanguageFilter()\n var selectedLangCode = \"\"\n \n- override fun isEnabled(position: Int) = languageCodesList[position].let {\n- it.isNotEmpty() && !selectedLanguages.containsValue(it) && it != selectedLangCode\n- }\n+ override fun isEnabled(position: Int) =\n+ languageCodesList[position].let {\n+ it.isNotEmpty() && !selectedLanguages.containsValue(it) && it != selectedLangCode\n+ }\n \n override fun getCount() = languageNamesList.size\n \n-\n- override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {\n+ override fun getView(\n+ position: Int,\n+ convertView: View?,\n+ parent: ViewGroup,\n+ ): View {\n val binding: RowItemLanguagesSpinnerBinding\n var rowView = convertView\n \n@@ -79,22 +83,18 @@ class LanguagesAdapter constructor(\n } else {\n it.text =\n \"${StringUtils.capitalize(languageName)}\" +\n- \" [${LangCodeUtils.fixLanguageCode(languageCode)}]\"\n+ \" [${LangCodeUtils.fixLanguageCode(languageCode)}]\"\n }\n }\n return rowView\n }\n \n- fun getLanguageCode(position: Int): String {\n- return languageCodesList[position]\n- }\n+ fun getLanguageCode(position: Int): String = languageCodesList[position]\n \n /**\n * Provides name of a language from languages for a specific position\n */\n- fun getLanguageName(position: Int): String {\n- return languageNamesList[position]\n- }\n+ fun getLanguageName(position: Int): String = languageNamesList[position]\n \n /**\n * Retrieves the index of the user's default locale from the list of available languages.\n@@ -116,21 +116,15 @@ class LanguagesAdapter constructor(\n * Future contributors are advised not to simplify this function without addressing this concern.\n */\n fun getIndexOfUserDefaultLocale(context: Context): Int {\n-\n val userLanguageCode = context.locale?.language ?: return DEFAULT_INDEX\n return language.codes.indexOf(userLanguageCode).takeIf { it >= 0 } ?: DEFAULT_INDEX\n }\n \n- fun getIndexOfLanguageCode(languageCode: String): Int {\n-\n- return languageCodesList.indexOf(languageCode)\n- }\n-\n+ fun getIndexOfLanguageCode(languageCode: String): Int = languageCodesList.indexOf(languageCode)\n \n override fun getFilter() = filter\n \n inner class LanguageFilter : Filter() {\n-\n override fun performFiltering(constraint: CharSequence?): FilterResults {\n val filterResults = FilterResults()\n val temp: LinkedHashMap = LinkedHashMap()\n@@ -141,9 +135,14 @@ class LanguagesAdapter constructor(\n val key: String = language.codes[i]\n val value: String = language.localizedNames[i]\n val defaultlanguagecode = getIndexOfUserDefaultLocale(context)\n- if(value.contains(constraint, true) || Locale(key).getDisplayName(\n- Locale(language.codes[defaultlanguagecode])).contains(constraint, true))\n+ if (value.contains(constraint, true) ||\n+ Locale(key)\n+ .getDisplayName(\n+ Locale(language.codes[defaultlanguagecode]),\n+ ).contains(constraint, true)\n+ ) {\n temp[key] = value\n+ }\n i++\n }\n filterResults.values = temp\n@@ -152,7 +151,10 @@ class LanguagesAdapter constructor(\n return filterResults\n }\n \n- override fun publishResults(constraint: CharSequence?, results: FilterResults) {\n+ override fun publishResults(\n+ constraint: CharSequence?,\n+ results: FilterResults,\n+ ) {\n if (results.count > 0) {\n languageCodesList =\n ArrayList((results.values as LinkedHashMap).keys)\n@@ -164,11 +166,8 @@ class LanguagesAdapter constructor(\n languageNamesList = ArrayList()\n notifyDataSetChanged()\n }\n-\n }\n-\n }\n-\n }\n \n private val Context.locale: Locale?\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsAdapter.kt b/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsAdapter.kt\nindex 49e6f592d9..8edfcb472b 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsAdapter.kt\n@@ -15,7 +15,6 @@ import androidx.recyclerview.widget.RecyclerView\n import com.facebook.imagepipeline.request.ImageRequest\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.contributions.Contribution\n-import timber.log.Timber\n import java.io.File\n \n /**\n@@ -25,15 +24,20 @@ import java.io.File\n *\n * @param callback The callback to handle user actions such as Delete Uploads on pending uploads.\n */\n-class PendingUploadsAdapter(private val callback: Callback) :\n- PagedListAdapter(ContributionDiffCallback()) {\n-\n+class PendingUploadsAdapter(\n+ private val callback: Callback,\n+) : PagedListAdapter(ContributionDiffCallback()) {\n /**\n * Creates a new ViewHolder instance. Inflates the layout for each item in the list.\n */\n- override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {\n- val view: View = LayoutInflater.from(parent.context)\n- .inflate(R.layout.item_pending_upload, parent, false)\n+ override fun onCreateViewHolder(\n+ parent: ViewGroup,\n+ viewType: Int,\n+ ): ViewHolder {\n+ val view: View =\n+ LayoutInflater\n+ .from(parent.context)\n+ .inflate(R.layout.item_pending_upload, parent, false)\n return ViewHolder(view)\n }\n \n@@ -41,14 +45,19 @@ class PendingUploadsAdapter(private val callback: Callback) :\n * Binds data to the provided ViewHolder. Sets up the item view with data from the\n * contribution at the specified position utilizing payloads.\n */\n- override fun onBindViewHolder(holder: ViewHolder, position: Int, payloads: MutableList) {\n+ override fun onBindViewHolder(\n+ holder: ViewHolder,\n+ position: Int,\n+ payloads: MutableList,\n+ ) {\n if (payloads.isNotEmpty()) {\n when (val latestPayload = payloads.lastOrNull()) {\n- is ContributionChangePayload.Progress -> holder.bindProgress(\n- latestPayload.transferred,\n- latestPayload.total,\n- getItem(position)!!.state\n- )\n+ is ContributionChangePayload.Progress ->\n+ holder.bindProgress(\n+ latestPayload.transferred,\n+ latestPayload.total,\n+ getItem(position)!!.state,\n+ )\n \n is ContributionChangePayload.State -> holder.bindState(latestPayload.state)\n else -> onBindViewHolder(holder, position)\n@@ -62,7 +71,10 @@ class PendingUploadsAdapter(private val callback: Callback) :\n * Binds data to the provided ViewHolder. Sets up the item view with data from the\n * contribution at the specified position.\n */\n- override fun onBindViewHolder(holder: ViewHolder, position: Int) {\n+ override fun onBindViewHolder(\n+ holder: ViewHolder,\n+ position: Int,\n+ ) {\n val contribution = getItem(position)\n contribution?.let {\n holder.bind(it)\n@@ -75,7 +87,9 @@ class PendingUploadsAdapter(private val callback: Callback) :\n /**\n * ViewHolder class for holding and binding item views.\n */\n- class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {\n+ class ViewHolder(\n+ itemView: View,\n+ ) : RecyclerView.ViewHolder(itemView) {\n var itemImage: com.facebook.drawee.view.SimpleDraweeView =\n itemView.findViewById(R.id.itemImage)\n var titleTextView: TextView = itemView.findViewById(R.id.titleTextView)\n@@ -117,7 +131,11 @@ class PendingUploadsAdapter(private val callback: Callback) :\n }\n }\n \n- fun bindProgress(transferred: Long, total: Long, state: Int) {\n+ fun bindProgress(\n+ transferred: Long,\n+ total: Long,\n+ state: Int,\n+ ) {\n if (transferred == 0L) {\n errorTextView.text = \"Queued\"\n errorTextView.visibility = View.VISIBLE\n@@ -165,9 +183,10 @@ class PendingUploadsAdapter(private val callback: Callback) :\n * @param newItem The new contribution item.\n * @return True if the items are the same, false otherwise.\n */\n- override fun areItemsTheSame(oldItem: Contribution, newItem: Contribution): Boolean {\n- return oldItem.pageId.hashCode() == newItem.pageId.hashCode()\n- }\n+ override fun areItemsTheSame(\n+ oldItem: Contribution,\n+ newItem: Contribution,\n+ ): Boolean = oldItem.pageId.hashCode() == newItem.pageId.hashCode()\n \n /**\n * Checks if the content of two items is the same.\n@@ -175,9 +194,10 @@ class PendingUploadsAdapter(private val callback: Callback) :\n * @param newItem The new contribution item.\n * @return True if the contents are the same, false otherwise.\n */\n- override fun areContentsTheSame(oldItem: Contribution, newItem: Contribution): Boolean {\n- return oldItem.transferred == newItem.transferred\n- }\n+ override fun areContentsTheSame(\n+ oldItem: Contribution,\n+ newItem: Contribution,\n+ ): Boolean = oldItem.transferred == newItem.transferred\n \n /**\n * Returns a payload representing the change between the old and new items.\n@@ -185,8 +205,11 @@ class PendingUploadsAdapter(private val callback: Callback) :\n * @param newItem The new contribution item.\n * @return An object representing the change, or null if there are no changes.\n */\n- override fun getChangePayload(oldItem: Contribution, newItem: Contribution): Any? {\n- return when {\n+ override fun getChangePayload(\n+ oldItem: Contribution,\n+ newItem: Contribution,\n+ ): Any? =\n+ when {\n oldItem.transferred != newItem.transferred -> {\n ContributionChangePayload.Progress(newItem.transferred, newItem.dataLength)\n }\n@@ -197,7 +220,6 @@ class PendingUploadsAdapter(private val callback: Callback) :\n \n else -> super.getChangePayload(oldItem, newItem)\n }\n- }\n }\n \n /**\n@@ -205,9 +227,7 @@ class PendingUploadsAdapter(private val callback: Callback) :\n * @param position The position of the item.\n * @return The unique item ID.\n */\n- override fun getItemId(position: Int): Long {\n- return getItem(position)?.pageId?.hashCode()?.toLong() ?: position.toLong()\n- }\n+ override fun getItemId(position: Int): Long = getItem(position)?.pageId?.hashCode()?.toLong() ?: position.toLong()\n \n /**\n * Sealed interface representing different types of changes to a contribution.\n@@ -218,12 +238,17 @@ class PendingUploadsAdapter(private val callback: Callback) :\n * @param transferred The amount of data transferred.\n * @param total The total amount of data.\n */\n- data class Progress(val transferred: Long, val total: Long) : ContributionChangePayload\n+ data class Progress(\n+ val transferred: Long,\n+ val total: Long,\n+ ) : ContributionChangePayload\n \n /**\n * Represents a change in the state of a contribution.\n * @param state The state of the contribution.\n */\n- data class State(val state: Int) : ContributionChangePayload\n+ data class State(\n+ val state: Int,\n+ ) : ContributionChangePayload\n }\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsFragment.kt b/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsFragment.kt\nindex 788d1ed57e..4d79bc88e8 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsFragment.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsFragment.kt\n@@ -1,29 +1,19 @@\n package fr.free.nrw.commons.upload\n \n import android.content.Context\n-import android.os.AsyncTask\n-import android.os.Build.VERSION\n-import android.os.Build.VERSION_CODES\n import android.os.Bundle\n import android.view.LayoutInflater\n import android.view.View\n import android.view.ViewGroup\n import androidx.paging.PagedList\n-import androidx.paging.PositionalDataSource\n import androidx.recyclerview.widget.LinearLayoutManager\n-import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver\n import fr.free.nrw.commons.CommonsApplication\n import fr.free.nrw.commons.R\n-import fr.free.nrw.commons.auth.SessionManager\n import fr.free.nrw.commons.contributions.Contribution\n import fr.free.nrw.commons.databinding.FragmentPendingUploadsBinding\n import fr.free.nrw.commons.di.CommonsDaggerSupportFragment\n-import fr.free.nrw.commons.media.MediaClient\n-import fr.free.nrw.commons.profile.ProfileActivity\n import fr.free.nrw.commons.utils.DialogUtil.showAlertDialog\n import fr.free.nrw.commons.utils.ViewUtil\n-import org.apache.commons.lang3.StringUtils\n-import timber.log.Timber\n import java.util.Locale\n import javax.inject.Inject\n \n@@ -31,9 +21,10 @@ import javax.inject.Inject\n * Fragment for showing pending uploads in Upload Progress Activity. This fragment provides\n * functionality for the user to pause uploads.\n */\n-class PendingUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsContract.View,\n+class PendingUploadsFragment :\n+ CommonsDaggerSupportFragment(),\n+ PendingUploadsContract.View,\n PendingUploadsAdapter.Callback {\n-\n @Inject\n lateinit var pendingUploadsPresenter: PendingUploadsPresenter\n \n@@ -54,8 +45,9 @@ class PendingUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCon\n }\n \n override fun onCreateView(\n- inflater: LayoutInflater, container: ViewGroup?,\n- savedInstanceState: Bundle?\n+ inflater: LayoutInflater,\n+ container: ViewGroup?,\n+ savedInstanceState: Bundle?,\n ): View? {\n super.onCreate(savedInstanceState)\n binding = FragmentPendingUploadsBinding.inflate(inflater, container, false)\n@@ -68,7 +60,10 @@ class PendingUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCon\n adapter = PendingUploadsAdapter(this)\n }\n \n- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {\n+ override fun onViewCreated(\n+ view: View,\n+ savedInstanceState: Bundle?,\n+ ) {\n super.onViewCreated(view, savedInstanceState)\n initRecyclerView()\n }\n@@ -81,21 +76,21 @@ class PendingUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCon\n binding.pendingUploadsRecyclerView.adapter = adapter\n pendingUploadsPresenter!!.setup()\n pendingUploadsPresenter!!.totalContributionList.observe(\n- viewLifecycleOwner\n+ viewLifecycleOwner,\n ) { list: PagedList ->\n contributionsSize = list.size\n contributionsList = ArrayList()\n var pausedOrQueuedUploads = 0\n list.forEach {\n if (it != null) {\n- if (it.state == Contribution.STATE_PAUSED\n- || it.state == Contribution.STATE_QUEUED\n- || it.state == Contribution.STATE_IN_PROGRESS\n+ if (it.state == Contribution.STATE_PAUSED ||\n+ it.state == Contribution.STATE_QUEUED ||\n+ it.state == Contribution.STATE_IN_PROGRESS\n ) {\n contributionsList.add(it)\n }\n- if (it.state == Contribution.STATE_PAUSED\n- || it.state == Contribution.STATE_QUEUED\n+ if (it.state == Contribution.STATE_PAUSED ||\n+ it.state == Contribution.STATE_QUEUED\n ) {\n pausedOrQueuedUploads++\n }\n@@ -127,11 +122,11 @@ class PendingUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCon\n requireActivity(),\n String.format(\n Locale.getDefault(),\n- requireActivity().getString(R.string.cancelling_upload)\n+ requireActivity().getString(R.string.cancelling_upload),\n ),\n String.format(\n Locale.getDefault(),\n- requireActivity().getString(R.string.cancel_upload_dialog)\n+ requireActivity().getString(R.string.cancel_upload_dialog),\n ),\n String.format(Locale.getDefault(), requireActivity().getString(R.string.yes)),\n String.format(Locale.getDefault(), requireActivity().getString(R.string.no)),\n@@ -139,10 +134,10 @@ class PendingUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCon\n ViewUtil.showShortToast(context, R.string.cancelling_upload)\n pendingUploadsPresenter.deleteUpload(\n contribution,\n- this.requireContext().applicationContext\n+ this.requireContext().applicationContext,\n )\n },\n- {}\n+ {},\n )\n }\n \n@@ -154,7 +149,7 @@ class PendingUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCon\n pendingUploadsPresenter.restartUploads(\n contributionsList,\n 0,\n- this.requireContext().applicationContext\n+ this.requireContext().applicationContext,\n )\n }\n }\n@@ -174,11 +169,11 @@ class PendingUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCon\n requireActivity(),\n String.format(\n Locale.getDefault(),\n- requireActivity().getString(R.string.cancelling_all_the_uploads)\n+ requireActivity().getString(R.string.cancelling_all_the_uploads),\n ),\n String.format(\n Locale.getDefault(),\n- requireActivity().getString(R.string.are_you_sure_that_you_want_cancel_all_the_uploads)\n+ requireActivity().getString(R.string.are_you_sure_that_you_want_cancel_all_the_uploads),\n ),\n String.format(Locale.getDefault(), requireActivity().getString(R.string.yes)),\n String.format(Locale.getDefault(), requireActivity().getString(R.string.no)),\n@@ -189,12 +184,11 @@ class PendingUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCon\n listOf(\n Contribution.STATE_QUEUED,\n Contribution.STATE_IN_PROGRESS,\n- Contribution.STATE_PAUSED\n- )\n+ Contribution.STATE_PAUSED,\n+ ),\n )\n },\n- {}\n+ {},\n )\n-\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/StashUploadResult.kt b/app/src/main/java/fr/free/nrw/commons/upload/StashUploadResult.kt\nindex 91f17da07c..4baf52f993 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/StashUploadResult.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/StashUploadResult.kt\n@@ -3,12 +3,12 @@ package fr.free.nrw.commons.upload\n data class StashUploadResult(\n val state: StashUploadState,\n val fileKey: String?,\n- val errorMessage : String?\n+ val errorMessage: String?,\n )\n \n enum class StashUploadState {\n SUCCESS,\n PAUSED,\n FAILED,\n- CANCELLED\n+ CANCELLED,\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadClient.kt b/app/src/main/java/fr/free/nrw/commons/upload/UploadClient.kt\nindex 6da8da2dad..54f9b112fd 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadClient.kt\n@@ -29,257 +29,276 @@ import javax.inject.Inject\n import javax.inject.Singleton\n \n @Singleton\n-class UploadClient @Inject constructor(\n- private val uploadInterface: UploadInterface,\n- private val csrfTokenClient: CsrfTokenClient,\n- private val pageContentsCreator: PageContentsCreator,\n- private val fileUtilsWrapper: FileUtilsWrapper,\n- private val gson: Gson, private val timeProvider: TimeProvider,\n- private val contributionDao: ContributionDao\n-) {\n- private val CHUNK_SIZE = 512 * 1024 // 512 KB\n+class UploadClient\n+ @Inject\n+ constructor(\n+ private val uploadInterface: UploadInterface,\n+ private val csrfTokenClient: CsrfTokenClient,\n+ private val pageContentsCreator: PageContentsCreator,\n+ private val fileUtilsWrapper: FileUtilsWrapper,\n+ private val gson: Gson,\n+ private val timeProvider: TimeProvider,\n+ private val contributionDao: ContributionDao,\n+ ) {\n+ private val chunkSize = 512 * 1024 // 512 KB\n \n- //This is maximum duration for which a stash is persisted on MediaWiki\n- // https://www.mediawiki.org/wiki/Manual:$wgUploadStashMaxAge\n- private val MAX_CHUNK_AGE = 6 * 3600 * 1000 // 6 hours\n- private val compositeDisposable = CompositeDisposable()\n+ // This is maximum duration for which a stash is persisted on MediaWiki\n+ // https://www.mediawiki.org/wiki/Manual:$wgUploadStashMaxAge\n+ private val maxChunkAge = 6 * 3600 * 1000 // 6 hours\n+ private val compositeDisposable = CompositeDisposable()\n \n- /**\n- * Upload file to stash in chunks of specified size. Uploading files in chunks will make\n- * handling of large files easier. Also, it will be useful in supporting pause/resume of\n- * uploads\n- */\n- @Throws(IOException::class)\n- fun uploadFileToStash(\n- filename: String, contribution: Contribution,\n- notificationUpdater: NotificationUpdateProgressListener\n- ): Observable {\n- if (contribution.isCompleted()) {\n- return Observable.just(\n- StashUploadResult(StashUploadState.SUCCESS, contribution.fileKey,null)\n- )\n- }\n+ /**\n+ * Upload file to stash in chunks of specified size. Uploading files in chunks will make\n+ * handling of large files easier. Also, it will be useful in supporting pause/resume of\n+ * uploads\n+ */\n+ @Throws(IOException::class)\n+ fun uploadFileToStash(\n+ filename: String,\n+ contribution: Contribution,\n+ notificationUpdater: NotificationUpdateProgressListener,\n+ ): Observable {\n+ if (contribution.isCompleted()) {\n+ return Observable.just(\n+ StashUploadResult(StashUploadState.SUCCESS, contribution.fileKey, null),\n+ )\n+ }\n \n- val file = contribution.localUriPath\n- val fileChunks = fileUtilsWrapper.getFileChunks(file, CHUNK_SIZE)\n- val mediaType = fileUtilsWrapper.getMimeType(file).toMediaTypeOrNull()\n+ val file = contribution.localUriPath\n+ val fileChunks = fileUtilsWrapper.getFileChunks(file, chunkSize)\n+ val mediaType = fileUtilsWrapper.getMimeType(file).toMediaTypeOrNull()\n \n- val chunkInfo = AtomicReference()\n- if (isStashValid(contribution)) {\n- chunkInfo.set(contribution.chunkInfo)\n- Timber.d(\n- \"Chunk: Next Chunk: %s, Total Chunks: %s\",\n- contribution.chunkInfo!!.indexOfNextChunkToUpload,\n- contribution.chunkInfo!!.totalChunks\n- )\n- }\n+ val chunkInfo = AtomicReference()\n+ if (isStashValid(contribution)) {\n+ chunkInfo.set(contribution.chunkInfo)\n+ Timber.d(\n+ \"Chunk: Next Chunk: %s, Total Chunks: %s\",\n+ contribution.chunkInfo!!.indexOfNextChunkToUpload,\n+ contribution.chunkInfo!!.totalChunks,\n+ )\n+ }\n \n- val index = AtomicInteger()\n- val failures = AtomicBoolean()\n- val errorMessage = AtomicReference()\n- compositeDisposable.add(\n- Observable.fromIterable(fileChunks).forEach { chunkFile: File ->\n- if (canProcess(contributionDao, contribution, failures)) {\n- if (contributionDao.getContribution(contribution.pageId) == null) {\n- compositeDisposable.clear()\n- return@forEach\n- } else {\n- processChunk(\n- filename,\n- contribution,\n- notificationUpdater,\n- chunkFile,\n- failures,\n- chunkInfo,\n- index,\n- errorMessage,\n- mediaType!!,\n- file!!,\n- fileChunks.size\n- )\n+ val index = AtomicInteger()\n+ val failures = AtomicBoolean()\n+ val errorMessage = AtomicReference()\n+ compositeDisposable.add(\n+ Observable.fromIterable(fileChunks).forEach { chunkFile: File ->\n+ if (canProcess(contributionDao, contribution, failures)) {\n+ if (contributionDao.getContribution(contribution.pageId) == null) {\n+ compositeDisposable.clear()\n+ return@forEach\n+ } else {\n+ processChunk(\n+ filename,\n+ contribution,\n+ notificationUpdater,\n+ chunkFile,\n+ failures,\n+ chunkInfo,\n+ index,\n+ errorMessage,\n+ mediaType!!,\n+ file!!,\n+ fileChunks.size,\n+ )\n+ }\n }\n- }\n- }\n- )\n+ },\n+ )\n \n- return when {\n- contributionDao.getContribution(contribution.pageId) == null -> {\n- return Observable.just(StashUploadResult(StashUploadState.CANCELLED, null, \"Upload cancelled\"))\n- }\n- contributionDao.getContribution(contribution.pageId).state == Contribution.STATE_PAUSED\n- || CommonsApplication.isPaused -> {\n- Timber.d(\"Upload stash paused %s\", contribution.pageId)\n- Observable.just(StashUploadResult(StashUploadState.PAUSED, null, null))\n- }\n- failures.get() -> {\n- Timber.d(\"Upload stash contains failures %s\", contribution.pageId)\n- Observable.just(StashUploadResult(StashUploadState.FAILED, null, errorMessage.get()))\n- }\n- chunkInfo.get() != null -> {\n- Timber.d(\"Upload stash success %s\", contribution.pageId)\n- Observable.just(\n- StashUploadResult(\n- StashUploadState.SUCCESS,\n- chunkInfo.get()!!.uploadResult!!.filekey,\n- \"success\"\n+ return when {\n+ contributionDao.getContribution(contribution.pageId) == null -> {\n+ return Observable.just(StashUploadResult(StashUploadState.CANCELLED, null, \"Upload cancelled\"))\n+ }\n+ contributionDao.getContribution(contribution.pageId).state == Contribution.STATE_PAUSED ||\n+ CommonsApplication.isPaused -> {\n+ Timber.d(\"Upload stash paused %s\", contribution.pageId)\n+ Observable.just(StashUploadResult(StashUploadState.PAUSED, null, null))\n+ }\n+ failures.get() -> {\n+ Timber.d(\"Upload stash contains failures %s\", contribution.pageId)\n+ Observable.just(StashUploadResult(StashUploadState.FAILED, null, errorMessage.get()))\n+ }\n+ chunkInfo.get() != null -> {\n+ Timber.d(\"Upload stash success %s\", contribution.pageId)\n+ Observable.just(\n+ StashUploadResult(\n+ StashUploadState.SUCCESS,\n+ chunkInfo.get()!!.uploadResult!!.filekey,\n+ \"success\",\n+ ),\n )\n- )\n- }\n- else -> {\n- Timber.d(\"Upload stash failed %s\", contribution.pageId)\n- Observable.just(StashUploadResult(StashUploadState.FAILED, null,null))\n+ }\n+ else -> {\n+ Timber.d(\"Upload stash failed %s\", contribution.pageId)\n+ Observable.just(StashUploadResult(StashUploadState.FAILED, null, null))\n+ }\n }\n }\n- }\n \n- private fun processChunk(\n- filename: String, contribution: Contribution,\n- notificationUpdater: NotificationUpdateProgressListener, chunkFile: File,\n- failures: AtomicBoolean, chunkInfo: AtomicReference, index: AtomicInteger,\n- errorMessage : AtomicReference, mediaType: MediaType, file: File, totalChunks: Int\n- ) {\n- if (shouldSkip(chunkInfo, index)) {\n- index.incrementAndGet()\n- Timber.d(\"Chunk: Increment and return: %s\", index.get())\n- return\n- }\n+ private fun processChunk(\n+ filename: String,\n+ contribution: Contribution,\n+ notificationUpdater: NotificationUpdateProgressListener,\n+ chunkFile: File,\n+ failures: AtomicBoolean,\n+ chunkInfo: AtomicReference,\n+ index: AtomicInteger,\n+ errorMessage: AtomicReference,\n+ mediaType: MediaType,\n+ file: File,\n+ totalChunks: Int,\n+ ) {\n+ if (shouldSkip(chunkInfo, index)) {\n+ index.incrementAndGet()\n+ Timber.d(\"Chunk: Increment and return: %s\", index.get())\n+ return\n+ }\n \n- index.getAndIncrement()\n+ index.getAndIncrement()\n \n- val offset = if (chunkInfo.get() != null) chunkInfo.get()!!.uploadResult!!.offset else 0\n- Timber.d(\"Chunk: Sending Chunk number: %s, offset: %s\", index.get(), offset)\n+ val offset = if (chunkInfo.get() != null) chunkInfo.get()!!.uploadResult!!.offset else 0\n+ Timber.d(\"Chunk: Sending Chunk number: %s, offset: %s\", index.get(), offset)\n \n- val filekey = chunkInfo.get()?.let { it.uploadResult!!.filekey }\n- val requestBody = chunkFile.asRequestBody(mediaType)\n- val listener = { transferred: Long, total: Long ->\n- notificationUpdater.onProgress(transferred, total)\n- }\n- val countingRequestBody = CountingRequestBody(requestBody, listener, offset.toLong(), file.length())\n+ val filekey = chunkInfo.get()?.let { it.uploadResult!!.filekey }\n+ val requestBody = chunkFile.asRequestBody(mediaType)\n+ val listener = { transferred: Long, total: Long ->\n+ notificationUpdater.onProgress(transferred, total)\n+ }\n+ val countingRequestBody = CountingRequestBody(requestBody, listener, offset.toLong(), file.length())\n \n- compositeDisposable.add(\n- uploadChunkToStash(\n- filename, file.length(), offset.toLong(), filekey, countingRequestBody\n- ).subscribe(\n- { uploadResult: UploadResult ->\n- Timber.d(\n- \"Chunk: Received Chunk number: %s, offset: %s\",\n- index.get(),\n- uploadResult.offset\n- )\n- chunkInfo.set(ChunkInfo(uploadResult, index.get(), totalChunks))\n- notificationUpdater.onChunkUploaded(contribution, chunkInfo.get())\n- }, { throwable: Throwable? ->\n- Timber.e(throwable, \"Received error in chunk upload\")\n- errorMessage.set(throwable?.message)\n- failures.set(true)\n- }\n+ compositeDisposable.add(\n+ uploadChunkToStash(\n+ filename,\n+ file.length(),\n+ offset.toLong(),\n+ filekey,\n+ countingRequestBody,\n+ ).subscribe(\n+ { uploadResult: UploadResult ->\n+ Timber.d(\n+ \"Chunk: Received Chunk number: %s, offset: %s\",\n+ index.get(),\n+ uploadResult.offset,\n+ )\n+ chunkInfo.set(ChunkInfo(uploadResult, index.get(), totalChunks))\n+ notificationUpdater.onChunkUploaded(contribution, chunkInfo.get())\n+ },\n+ { throwable: Throwable? ->\n+ Timber.e(throwable, \"Received error in chunk upload\")\n+ errorMessage.set(throwable?.message)\n+ failures.set(true)\n+ },\n+ ),\n )\n- )\n- }\n+ }\n \n- /**\n- * Stash is valid for 6 hours. This function checks the validity of stash\n- *\n- * @param contribution\n- * @return\n- */\n- private fun isStashValid(contribution: Contribution): Boolean {\n- return contribution.chunkInfo != null &&\n- contribution.dateModified!!.after(Date(\n- timeProvider.currentTimeMillis() - MAX_CHUNK_AGE))\n- }\n+ /**\n+ * Stash is valid for 6 hours. This function checks the validity of stash\n+ *\n+ * @param contribution\n+ * @return\n+ */\n+ private fun isStashValid(contribution: Contribution): Boolean =\n+ contribution.chunkInfo != null &&\n+ contribution.dateModified!!.after(\n+ Date(\n+ timeProvider.currentTimeMillis() - maxChunkAge,\n+ ),\n+ )\n \n- /**\n- * Uploads a file chunk to stash\n- *\n- * @param filename The name of the file being uploaded\n- * @param fileSize The total size of the file\n- * @param offset The offset returned by the previous chunk upload\n- * @param fileKey The filekey returned by the previous chunk upload\n- * @param countingRequestBody Request body with chunk file\n- * @return\n- */\n- fun uploadChunkToStash(\n- filename: String?,\n- fileSize: Long,\n- offset: Long,\n- fileKey: String?,\n- countingRequestBody: CountingRequestBody\n- ): Observable {\n- val filePart: MultipartBody.Part\n- return try {\n- filePart = MultipartBody.Part.createFormData(\n- \"chunk\",\n- URLEncoder.encode(filename, \"utf-8\"),\n- countingRequestBody\n- )\n- uploadInterface.uploadFileToStash(\n- toRequestBody(filename),\n- toRequestBody(fileSize.toString()),\n- toRequestBody(offset.toString()),\n- toRequestBody(fileKey),\n- toRequestBody(csrfTokenClient.getTokenBlocking()),\n- filePart\n- ).map(UploadResponse::upload)\n- } catch (throwable: Throwable) {\n- Timber.e(throwable, \"Failed to upload chunk to stash\")\n- Observable.error(throwable)\n+ /**\n+ * Uploads a file chunk to stash\n+ *\n+ * @param filename The name of the file being uploaded\n+ * @param fileSize The total size of the file\n+ * @param offset The offset returned by the previous chunk upload\n+ * @param fileKey The filekey returned by the previous chunk upload\n+ * @param countingRequestBody Request body with chunk file\n+ * @return\n+ */\n+ fun uploadChunkToStash(\n+ filename: String?,\n+ fileSize: Long,\n+ offset: Long,\n+ fileKey: String?,\n+ countingRequestBody: CountingRequestBody,\n+ ): Observable {\n+ val filePart: MultipartBody.Part\n+ return try {\n+ filePart =\n+ MultipartBody.Part.createFormData(\n+ \"chunk\",\n+ URLEncoder.encode(filename, \"utf-8\"),\n+ countingRequestBody,\n+ )\n+ uploadInterface\n+ .uploadFileToStash(\n+ toRequestBody(filename),\n+ toRequestBody(fileSize.toString()),\n+ toRequestBody(offset.toString()),\n+ toRequestBody(fileKey),\n+ toRequestBody(csrfTokenClient.getTokenBlocking()),\n+ filePart,\n+ ).map(UploadResponse::upload)\n+ } catch (throwable: Throwable) {\n+ Timber.e(throwable, \"Failed to upload chunk to stash\")\n+ Observable.error(throwable)\n+ }\n }\n- }\n \n- /**\n- * Converts string value to request body\n- */\n- private fun toRequestBody(value: String?): RequestBody? {\n- return value?.toRequestBody(MultipartBody.FORM)\n- }\n+ /**\n+ * Converts string value to request body\n+ */\n+ private fun toRequestBody(value: String?): RequestBody? = value?.toRequestBody(MultipartBody.FORM)\n \n- fun uploadFileFromStash(\n- contribution: Contribution?,\n- uniqueFileName: String?,\n- fileKey: String?\n- ): Observable {\n- return try {\n- uploadInterface.uploadFileFromStash(\n- csrfTokenClient.getTokenBlocking(),\n- pageContentsCreator.createFrom(contribution),\n- CommonsApplication.DEFAULT_EDIT_SUMMARY,\n- uniqueFileName!!,\n- fileKey!!\n- ).map { uploadResponse: JsonObject? ->\n- val uploadResult = gson.fromJson(uploadResponse, UploadResponse::class.java)\n- if (uploadResult.upload == null) {\n- val exception = gson.fromJson(uploadResponse, MwException::class.java)\n- Timber.e(exception, \"Error in uploading file from stash\")\n- throw Exception(exception.getErrorCode())\n+ fun uploadFileFromStash(\n+ contribution: Contribution?,\n+ uniqueFileName: String?,\n+ fileKey: String?,\n+ ): Observable =\n+ try {\n+ uploadInterface\n+ .uploadFileFromStash(\n+ csrfTokenClient.getTokenBlocking(),\n+ pageContentsCreator.createFrom(contribution),\n+ CommonsApplication.DEFAULT_EDIT_SUMMARY,\n+ uniqueFileName!!,\n+ fileKey!!,\n+ ).map { uploadResponse: JsonObject? ->\n+ val uploadResult = gson.fromJson(uploadResponse, UploadResponse::class.java)\n+ if (uploadResult.upload == null) {\n+ val exception = gson.fromJson(uploadResponse, MwException::class.java)\n+ Timber.e(exception, \"Error in uploading file from stash\")\n+ throw Exception(exception.getErrorCode())\n+ }\n+ uploadResult.upload\n }\n- uploadResult.upload\n- }\n- } catch (throwable: Throwable) {\n- Timber.e(throwable, \"Exception occurred in uploading file from stash\")\n- Observable.error(throwable)\n- }\n- }\n+ } catch (throwable: Throwable) {\n+ Timber.e(throwable, \"Exception occurred in uploading file from stash\")\n+ Observable.error(throwable)\n+ }\n \n- fun interface TimeProvider {\n- fun currentTimeMillis(): Long\n+ fun interface TimeProvider {\n+ fun currentTimeMillis(): Long\n+ }\n }\n-}\n \n private fun canProcess(\n contributionDao: ContributionDao,\n contribution: Contribution,\n- failures: AtomicBoolean\n+ failures: AtomicBoolean,\n ): Boolean {\n // As long as the contribution hasn't been paused and there are no errors,\n // we can process the current chunk.\n- return !(contributionDao.getContribution(contribution.pageId).state == Contribution.STATE_PAUSED\n- || failures.get() || CommonsApplication.isPaused)\n+ return !(\n+ contributionDao.getContribution(contribution.pageId).state == Contribution.STATE_PAUSED ||\n+ failures.get() ||\n+ CommonsApplication.isPaused\n+ )\n }\n \n private fun shouldSkip(\n chunkInfo: AtomicReference,\n- index: AtomicInteger\n-): Boolean {\n- return chunkInfo.get() != null && index.get() < chunkInfo.get()!!.indexOfNextChunkToUpload\n-}\n+ index: AtomicInteger,\n+): Boolean = chunkInfo.get() != null && index.get() < chunkInfo.get()!!.indexOfNextChunkToUpload\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadInterface.kt b/app/src/main/java/fr/free/nrw/commons/upload/UploadInterface.kt\nindex a9386fc6aa..c756f89dab 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadInterface.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadInterface.kt\n@@ -21,7 +21,7 @@ interface UploadInterface {\n @Part(\"offset\") offset: RequestBody?,\n @Part(\"filekey\") fileKey: RequestBody?,\n @Part(\"token\") token: RequestBody?,\n- @Part filePart: MultipartBodyPart\n+ @Part filePart: MultipartBodyPart,\n ): Observable\n \n @Headers(\"Cache-Control: no-cache\")\n@@ -32,6 +32,6 @@ interface UploadInterface {\n @Field(\"text\") text: String,\n @Field(\"comment\") comment: String,\n @Field(\"filename\") filename: String,\n- @Field(\"filekey\") filekey: String\n+ @Field(\"filekey\") filekey: String,\n ): Observable\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetail.kt b/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetail.kt\nindex dd66a01abe..3756cee5b5 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetail.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetail.kt\n@@ -10,37 +10,40 @@ import kotlinx.parcelize.Parcelize\n @Parcelize\n data class UploadMediaDetail constructor(\n /**\n- * @return The language code ie. \"en\" or \"fr\"\n+ * The language code ie. \"en\" or \"fr\".\n+ * @param languageCode The language code ie. \"en\" or \"fr\".\n */\n+ var languageCode: String? = null,\n /**\n- * @param languageCode The language code ie. \"en\" or \"fr\"\n+ * The description text for the item being uploaded.\n+ * @param descriptionText The description text.\n */\n- var languageCode: String? = null,\n var descriptionText: String = \"\",\n- var captionText: String = \"\"\n+ /**\n+ * The caption text for the item being uploaded.\n+ * @param captionText The caption text.\n+ */\n+ var captionText: String = \"\",\n ) : Parcelable {\n fun javaCopy() = copy()\n \n constructor(place: Place) : this(\n place.language,\n place.longDescription,\n- place.name\n+ place.name,\n )\n+\n /**\n- * @return the index of the language selected in a spinner with [SpinnerLanguagesAdapter]\n- */\n- /**\n- * @param selectedLanguageIndex the index of the language selected in a spinner with [SpinnerLanguagesAdapter]\n+ * The index of the language selected in a spinner with [SpinnerLanguagesAdapter].\n+ * @return The index of the selected language.\n+ * @param selectedLanguageIndex The index of the language selected.\n */\n var selectedLanguageIndex: Int = -1\n+\n /**\n- * returns if the description was added manually (by the user, or we have added it programaticallly)\n- * @return\n- */\n- /**\n- * sets to true if the description was manually added by the user\n- * @param manuallyAdded\n+ * Returns if the description was added manually (by the user, or programmatically).\n+ * @return True if the description was manually added.\n+ * @param manuallyAdded Sets to true if the description was manually added.\n */\n var isManuallyAdded: Boolean = false\n-\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt b/app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt\nindex 82483fa3cf..aeaefa3022 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt\n@@ -1,6 +1,5 @@\n package fr.free.nrw.commons.upload\n \n-import android.annotation.SuppressLint\n import android.os.Bundle\n import android.view.Menu\n import android.view.MenuItem\n@@ -8,13 +7,9 @@ import androidx.fragment.app.Fragment\n import androidx.viewpager.widget.ViewPager\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.ViewPagerAdapter\n-import fr.free.nrw.commons.contributions.Contribution\n import fr.free.nrw.commons.contributions.ContributionDao\n import fr.free.nrw.commons.databinding.ActivityUploadProgressBinding\n import fr.free.nrw.commons.theme.BaseActivity\n-import io.reactivex.functions.Consumer\n-import io.reactivex.schedulers.Schedulers\n-import timber.log.Timber\n import javax.inject.Inject\n \n /**\n@@ -24,7 +19,6 @@ import javax.inject.Inject\n * failed uploads respectively.\n */\n class UploadProgressActivity : BaseActivity() {\n-\n private lateinit var binding: ActivityUploadProgressBinding\n private var pendingUploadsFragment: PendingUploadsFragment? = null\n private var failedUploadsFragment: FailedUploadsFragment? = null\n@@ -52,26 +46,29 @@ class UploadProgressActivity : BaseActivity() {\n setSupportActionBar(binding.toolbarBinding.toolbar)\n supportActionBar?.setDisplayHomeAsUpEnabled(true)\n \n- binding.uploadProgressViewPager.addOnPageChangeListener(object :\n- ViewPager.OnPageChangeListener {\n- override fun onPageScrolled(\n- position: Int, positionOffset: Float,\n- positionOffsetPixels: Int\n- ) {\n- }\n+ binding.uploadProgressViewPager.addOnPageChangeListener(\n+ object :\n+ ViewPager.OnPageChangeListener {\n+ override fun onPageScrolled(\n+ position: Int,\n+ positionOffset: Float,\n+ positionOffsetPixels: Int,\n+ ) {\n+ }\n \n- override fun onPageSelected(position: Int) {\n- updateMenuItems(position)\n- if (position == 2) {\n- binding.uploadProgressViewPager.setCanScroll(false)\n- } else {\n- binding.uploadProgressViewPager.setCanScroll(true)\n+ override fun onPageSelected(position: Int) {\n+ updateMenuItems(position)\n+ if (position == 2) {\n+ binding.uploadProgressViewPager.setCanScroll(false)\n+ } else {\n+ binding.uploadProgressViewPager.setCanScroll(true)\n+ }\n }\n- }\n \n- override fun onPageScrollStateChanged(state: Int) {\n- }\n- })\n+ override fun onPageScrollStateChanged(state: Int) {\n+ }\n+ },\n+ )\n setTabs()\n }\n \n@@ -119,75 +116,72 @@ class UploadProgressActivity : BaseActivity() {\n if (isPendingIconsVisible) {\n if (!isPaused) {\n if (menu!!.findItem(R.id.pause_icon) == null) {\n- menu!!.add(\n- Menu.NONE,\n- R.id.pause_icon,\n- Menu.NONE,\n- getString(R.string.pause)\n- )\n- .setIcon(R.drawable.pause_icon)\n+ menu!!\n+ .add(\n+ Menu.NONE,\n+ R.id.pause_icon,\n+ Menu.NONE,\n+ getString(R.string.pause),\n+ ).setIcon(R.drawable.pause_icon)\n .setOnMenuItemClickListener {\n pendingUploadsFragment!!.pauseUploads()\n setPausedIcon(true)\n true\n- }\n- .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)\n+ }.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)\n }\n if (menu!!.findItem(R.id.cancel_icon) == null) {\n- menu!!.add(\n- Menu.NONE,\n- R.id.cancel_icon,\n- Menu.NONE,\n- getString(R.string.cancel)\n- )\n- .setIcon(R.drawable.ic_cancel_upload)\n+ menu!!\n+ .add(\n+ Menu.NONE,\n+ R.id.cancel_icon,\n+ Menu.NONE,\n+ getString(R.string.cancel),\n+ ).setIcon(R.drawable.ic_cancel_upload)\n .setOnMenuItemClickListener {\n pendingUploadsFragment!!.deleteUploads()\n true\n- }\n- .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)\n+ }.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)\n }\n } else {\n if (menu!!.findItem(R.id.resume_icon) == null) {\n- menu!!.add(\n- Menu.NONE,\n- R.id.resume_icon,\n- Menu.NONE,\n- getString(R.string.resume)\n- )\n- .setIcon(R.drawable.play_icon)\n+ menu!!\n+ .add(\n+ Menu.NONE,\n+ R.id.resume_icon,\n+ Menu.NONE,\n+ getString(R.string.resume),\n+ ).setIcon(R.drawable.play_icon)\n .setOnMenuItemClickListener {\n pendingUploadsFragment!!.restartUploads()\n setPausedIcon(false)\n true\n- }\n- .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)\n+ }.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)\n }\n }\n }\n } else if (currentPosition == 1) {\n if (isErrorIconsVisisble) {\n if (menu!!.findItem(R.id.retry_icon) == null) {\n- menu!!.add(Menu.NONE, R.id.retry_icon, Menu.NONE, getString(R.string.retry))\n- .setIcon(R.drawable.ic_refresh_24dp).setOnMenuItemClickListener {\n+ menu!!\n+ .add(Menu.NONE, R.id.retry_icon, Menu.NONE, getString(R.string.retry))\n+ .setIcon(R.drawable.ic_refresh_24dp)\n+ .setOnMenuItemClickListener {\n failedUploadsFragment!!.restartUploads()\n true\n- }\n- .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)\n+ }.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)\n }\n if (menu!!.findItem(R.id.cancel_icon) == null) {\n- menu!!.add(\n- Menu.NONE,\n- R.id.cancel_icon,\n- Menu.NONE,\n- getString(R.string.cancel)\n- )\n- .setIcon(R.drawable.ic_cancel_upload)\n+ menu!!\n+ .add(\n+ Menu.NONE,\n+ R.id.cancel_icon,\n+ Menu.NONE,\n+ getString(R.string.cancel),\n+ ).setIcon(R.drawable.ic_cancel_upload)\n .setOnMenuItemClickListener {\n failedUploadsFragment!!.deleteUploads()\n true\n- }\n- .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)\n+ }.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)\n }\n }\n }\n@@ -219,5 +213,4 @@ class UploadProgressActivity : BaseActivity() {\n isErrorIconsVisisble = visible\n updateMenuItems(binding.uploadProgressViewPager.currentItem)\n }\n-\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadResponse.kt b/app/src/main/java/fr/free/nrw/commons/upload/UploadResponse.kt\nindex ff9dcc5b70..f1c5306ba0 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadResponse.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadResponse.kt\n@@ -1,3 +1,5 @@\n package fr.free.nrw.commons.upload\n \n-class UploadResponse(val upload: UploadResult?)\n\\ No newline at end of file\n+class UploadResponse(\n+ val upload: UploadResult?,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadResult.kt b/app/src/main/java/fr/free/nrw/commons/upload/UploadResult.kt\nindex 3f6d6d8180..dfd8cc2eae 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadResult.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadResult.kt\n@@ -5,42 +5,39 @@ import android.os.Parcelable\n \n private const val RESULT_SUCCESS = \"Success\"\n \n-\n data class UploadResult(\n val result: String,\n val filekey: String,\n val offset: Int,\n- val filename: String\n+ val filename: String,\n ) : Parcelable {\n constructor(parcel: Parcel) : this(\n- parcel.readString()?:\"\",\n- parcel.readString()?:\"\",\n- parcel.readInt()?:0,\n- parcel.readString()?:\"\"\n+ parcel.readString() ?: \"\",\n+ parcel.readString() ?: \"\",\n+ parcel.readInt() ?: 0,\n+ parcel.readString() ?: \"\",\n ) {\n }\n \n fun isSuccessful(): Boolean = result == RESULT_SUCCESS\n \n fun createCanonicalFileName() = \"File:$filename\"\n- override fun writeToParcel(parcel: Parcel, flags: Int) {\n+\n+ override fun writeToParcel(\n+ parcel: Parcel,\n+ flags: Int,\n+ ) {\n parcel.writeString(result)\n parcel.writeString(filekey)\n parcel.writeInt(offset)\n parcel.writeString(filename)\n }\n \n- override fun describeContents(): Int {\n- return 0\n- }\n+ override fun describeContents(): Int = 0\n \n companion object CREATOR : Parcelable.Creator {\n- override fun createFromParcel(parcel: Parcel): UploadResult {\n- return UploadResult(parcel)\n- }\n+ override fun createFromParcel(parcel: Parcel): UploadResult = UploadResult(parcel)\n \n- override fun newArray(size: Int): Array {\n- return arrayOfNulls(size)\n- }\n+ override fun newArray(size: Int): Array = arrayOfNulls(size)\n }\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/WikiBaseInterface.kt b/app/src/main/java/fr/free/nrw/commons/upload/WikiBaseInterface.kt\nindex 1bc5f84fcc..42484306d2 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/WikiBaseInterface.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/WikiBaseInterface.kt\n@@ -22,7 +22,7 @@ interface WikiBaseInterface {\n fun postEditEntity(\n @Field(\"id\") fileEntityId: String,\n @Field(\"token\") editToken: String,\n- @Field(\"data\") data: String\n+ @Field(\"data\") data: String,\n ): Observable\n \n /**\n@@ -32,18 +32,20 @@ interface WikiBaseInterface {\n * @param editToken editToken for the file\n * @param data data of the depicts to be uploaded\n * @return Observable\n- */\n+ */\n @Headers(\"Cache-Control: no-cache\")\n @FormUrlEncoded\n @POST(WikidataConstants.MW_API_PREFIX + \"action=wbeditentity&site=commonswiki\")\n fun postEditEntityByFilename(\n @Field(\"title\") filename: String,\n @Field(\"token\") editToken: String,\n- @Field(\"data\") data: String\n+ @Field(\"data\") data: String,\n ): Observable\n \n @GET(WikidataConstants.MW_API_PREFIX + \"action=query&prop=info\")\n- fun getFileEntityId(@Query(\"titles\") fileName: String?): Observable\n+ fun getFileEntityId(\n+ @Query(\"titles\") fileName: String?,\n+ ): Observable\n \n /**\n * Upload Captions for the image when upload is successful\n@@ -58,14 +60,14 @@ interface WikiBaseInterface {\n @Field(\"id\") fileEntityId: String?,\n @Field(\"token\") editToken: String?,\n @Field(\"language\") language: String?,\n- @Field(\"value\") captionValue: String?\n+ @Field(\"value\") captionValue: String?,\n ): Observable\n \n @GET(WikidataConstants.MW_API_PREFIX + \"action=wbgetclaims\")\n fun getClaimsByProperty(\n @Query(\"entity\") entityId: String,\n- @Query(\"property\") property: String\n- ) : Observable\n+ @Query(\"property\") property: String,\n+ ): Observable\n \n @Headers(\"Cache-Control: no-cache\")\n @FormUrlEncoded\n@@ -73,6 +75,6 @@ interface WikiBaseInterface {\n fun postDeleteClaims(\n @Field(\"token\") editToken: String,\n @Field(\"id\") entityId: String,\n- @Field(\"data\") data: String\n+ @Field(\"data\") data: String,\n ): Observable\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/WikidataItem.kt b/app/src/main/java/fr/free/nrw/commons/upload/WikidataItem.kt\nindex 5c8a639dfc..66320efb0e 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/WikidataItem.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/WikidataItem.kt\n@@ -1,6 +1,6 @@\n package fr.free.nrw.commons.upload\n \n interface WikidataItem {\n-val id:String\n-val name:String\n+ val id: String\n+ val name: String\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/WikidataPlace.kt b/app/src/main/java/fr/free/nrw/commons/upload/WikidataPlace.kt\nindex f0b6ec3005..5019dd4e72 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/WikidataPlace.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/WikidataPlace.kt\n@@ -12,26 +12,22 @@ data class WikidataPlace(\n val imageValue: String?,\n val wikipediaArticle: String?,\n val location: LatLng? = null,\n- var isMonumentUpload : Boolean =false\n-) :\n- WikidataItem, Parcelable {\n+ var isMonumentUpload: Boolean = false,\n+) : WikidataItem,\n+ Parcelable {\n constructor(place: Place) : this(\n place.wikiDataEntityId!!,\n place.name,\n place.pic.takeIf { it.isNotBlank() },\n place.siteLinks.wikipediaLink?.toString() ?: \"\",\n place.location,\n- isMonumentUpload=place.isMonument\n+ isMonumentUpload = place.isMonument,\n )\n \n companion object {\n @JvmStatic\n- fun from(place: Place?): WikidataPlace? {\n- return place?.let { WikidataPlace(it) }\n- }\n+ fun from(place: Place?): WikidataPlace? = place?.let { WikidataPlace(it) }\n }\n \n- fun getWikipediaPageTitle(): String? {\n- return wikipediaArticle?.substringAfterLast(\"/\")\n- }\n+ fun getWikipediaPageTitle(): String? = wikipediaArticle?.substringAfterLast(\"/\")\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/categories/BaseDelegateAdapter.kt b/app/src/main/java/fr/free/nrw/commons/upload/categories/BaseDelegateAdapter.kt\nindex 6937096906..f1e4917a0d 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/categories/BaseDelegateAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/categories/BaseDelegateAdapter.kt\n@@ -4,22 +4,24 @@ import androidx.recyclerview.widget.DiffUtil\n import com.hannesdorfmann.adapterdelegates4.AdapterDelegate\n import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter\n \n-\n abstract class BaseDelegateAdapter(\n vararg delegates: AdapterDelegate>,\n areItemsTheSame: (T, T) -> Boolean,\n- areContentsTheSame: (T, T) -> Boolean = { old, new -> old == new }\n+ areContentsTheSame: (T, T) -> Boolean = { old, new -> old == new },\n ) : AsyncListDifferDelegationAdapter(\n- object : DiffUtil.ItemCallback() {\n- override fun areItemsTheSame(oldItem: T, newItem: T) =\n- areItemsTheSame(oldItem, newItem)\n-\n- override fun areContentsTheSame(oldItem: T, newItem: T) =\n- areContentsTheSame(oldItem, newItem)\n- },\n- *delegates\n-) {\n-\n+ object : DiffUtil.ItemCallback() {\n+ override fun areItemsTheSame(\n+ oldItem: T,\n+ newItem: T,\n+ ) = areItemsTheSame(oldItem, newItem)\n+\n+ override fun areContentsTheSame(\n+ oldItem: T,\n+ newItem: T,\n+ ) = areContentsTheSame(oldItem, newItem)\n+ },\n+ *delegates,\n+ ) {\n fun addAll(newResults: List) {\n items = itemsOrEmpty + newResults\n }\n@@ -38,4 +40,3 @@ abstract class BaseDelegateAdapter(\n \n private val itemsOrEmpty get() = items ?: emptyList()\n }\n-\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt b/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt\nindex 49aa41c9eb..1822df8302 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt\n@@ -26,271 +26,289 @@ import javax.inject.Singleton\n * The presenter class for UploadCategoriesFragment\n */\n @Singleton\n-class CategoriesPresenter @Inject constructor(\n- private val repository: UploadRepository,\n- @param:Named(CommonsApplicationModule.IO_THREAD) private val ioScheduler: Scheduler,\n- @param:Named(CommonsApplicationModule.MAIN_THREAD) private val mainThreadScheduler: Scheduler\n-) : CategoriesContract.UserActionListener {\n+class CategoriesPresenter\n+ @Inject\n+ constructor(\n+ private val repository: UploadRepository,\n+ @param:Named(CommonsApplicationModule.IO_THREAD) private val ioScheduler: Scheduler,\n+ @param:Named(CommonsApplicationModule.MAIN_THREAD) private val mainThreadScheduler: Scheduler,\n+ ) : CategoriesContract.UserActionListener {\n+ companion object {\n+ private val DUMMY: CategoriesContract.View = proxy()\n+ }\n \n- companion object {\n- private val DUMMY: CategoriesContract.View = proxy()\n- }\n+ var view = DUMMY\n+ private val compositeDisposable = CompositeDisposable()\n+ private val searchTerms = PublishSubject.create()\n+ private var categoryList: MutableLiveData> = MutableLiveData()\n \n- var view = DUMMY\n- private val compositeDisposable = CompositeDisposable()\n- private val searchTerms = PublishSubject.create()\n- private var categoryList: MutableLiveData> = MutableLiveData()\n- /**\n- * Current media\n- */\n- private var media: Media? = null\n+ /**\n+ * Current media\n+ */\n+ private var media: Media? = null\n \n- /**\n- * helper class for editing categories\n- */\n- @Inject\n- lateinit var categoryEditHelper: CategoryEditHelper\n+ /**\n+ * helper class for editing categories\n+ */\n+ @Inject\n+ lateinit var categoryEditHelper: CategoryEditHelper\n \n- override fun onAttachView(view: CategoriesContract.View) {\n- this.view = view\n- compositeDisposable.add(\n- searchTerms\n- .observeOn(mainThreadScheduler)\n- .doOnNext {\n- view.showProgress(true)\n- }\n- .switchMap(::searchResults)\n- .map { repository.selectedCategories + it }\n- .map { it.distinctBy { categoryItem -> categoryItem.name } }\n- .observeOn(mainThreadScheduler)\n- .subscribe(\n- {\n- setCategoryListValue(it)\n- view.showProgress(false)\n- if (it.isEmpty()) {\n+ override fun onAttachView(view: CategoriesContract.View) {\n+ this.view = view\n+ compositeDisposable.add(\n+ searchTerms\n+ .observeOn(mainThreadScheduler)\n+ .doOnNext {\n+ view.showProgress(true)\n+ }.switchMap(::searchResults)\n+ .map { repository.selectedCategories + it }\n+ .map { it.distinctBy { categoryItem -> categoryItem.name } }\n+ .observeOn(mainThreadScheduler)\n+ .subscribe(\n+ {\n+ setCategoryListValue(it)\n+ view.showProgress(false)\n+ if (it.isEmpty()) {\n+ view.showError(R.string.no_categories_found)\n+ }\n+ },\n+ { t: Throwable? ->\n+ view.showProgress(false)\n view.showError(R.string.no_categories_found)\n- }\n- },\n- { t: Throwable? ->\n- view.showProgress(false)\n- view.showError(R.string.no_categories_found)\n- Timber.e(t)\n- }\n- )\n- )\n- }\n+ Timber.e(t)\n+ },\n+ ),\n+ )\n+ }\n \n- /**\n- * If media is null : Fetches categories from server according to the term\n- * Else : Fetches existing categories by their name, fetches categories from server according\n- * to the term and combines both in a list\n- */\n- private fun searchResults(term: String): Observable>? {\n- if (media == null) {\n- return repository.searchAll(term, getImageTitleList(), repository.selectedDepictions)\n- .subscribeOn(ioScheduler)\n- .map { it.filter { categoryItem -> !repository.isSpammyCategory(categoryItem.name)\n- || categoryItem.name==term } }\n- } else {\n- return Observable.zip(\n- repository.getCategories(repository.selectedExistingCategories)\n- .map { list -> list.map {\n- CategoryItem(it.name, it.description, it.thumbnail, true)\n+ /**\n+ * If media is null : Fetches categories from server according to the term\n+ * Else : Fetches existing categories by their name, fetches categories from server according\n+ * to the term and combines both in a list\n+ */\n+ private fun searchResults(term: String): Observable>? {\n+ if (media == null) {\n+ return repository\n+ .searchAll(term, getImageTitleList(), repository.selectedDepictions)\n+ .subscribeOn(ioScheduler)\n+ .map {\n+ it.filter { categoryItem ->\n+ !repository.isSpammyCategory(categoryItem.name) ||\n+ categoryItem.name == term\n+ }\n }\n- },\n- repository.searchAll(term, getImageTitleList(), repository.selectedDepictions)\n- ) { it1, it2 ->\n- it1 + it2\n+ } else {\n+ return Observable\n+ .zip(\n+ repository\n+ .getCategories(repository.selectedExistingCategories)\n+ .map { list ->\n+ list.map {\n+ CategoryItem(it.name, it.description, it.thumbnail, true)\n+ }\n+ },\n+ repository.searchAll(term, getImageTitleList(), repository.selectedDepictions),\n+ ) { it1, it2 ->\n+ it1 + it2\n+ }.subscribeOn(ioScheduler)\n+ .map {\n+ it.filter { categoryItem ->\n+ !repository.isSpammyCategory(categoryItem.name) ||\n+ categoryItem.name == term\n+ }\n+ }.map { it.filterNot { categoryItem -> categoryItem.thumbnail == \"hidden\" } }\n }\n- .subscribeOn(ioScheduler)\n- .map { it.filter { categoryItem -> !repository.isSpammyCategory(categoryItem.name)\n- || categoryItem.name==term } }\n- .map { it.filterNot { categoryItem -> categoryItem.thumbnail == \"hidden\" } }\n }\n- }\n \n- override fun onDetachView() {\n- view = DUMMY\n- compositeDisposable.clear()\n- }\n+ override fun onDetachView() {\n+ view = DUMMY\n+ compositeDisposable.clear()\n+ }\n \n- /**\n- * asks the repository to fetch categories for the query\n- * @param query\n- */\n- override fun searchForCategories(query: String) {\n- searchTerms.onNext(query)\n- }\n+ /**\n+ * asks the repository to fetch categories for the query\n+ * @param query\n+ */\n+ override fun searchForCategories(query: String) {\n+ searchTerms.onNext(query)\n+ }\n \n- /**\n- * Returns image title list from UploadItem\n- * @return\n- */\n- private fun getImageTitleList(): List {\n- return repository.uploads\n- .map { it.uploadMediaDetails[0].captionText }\n- .filterNot { TextUtils.isEmpty(it) }\n- }\n+ /**\n+ * Returns image title list from UploadItem\n+ * @return\n+ */\n+ private fun getImageTitleList(): List =\n+ repository.uploads\n+ .map { it.uploadMediaDetails[0].captionText }\n+ .filterNot { TextUtils.isEmpty(it) }\n \n- /**\n- * Verifies the number of categories selected, prompts the user if none selected\n- */\n- override fun verifyCategories() {\n- val selectedCategories = repository.selectedCategories\n- if (selectedCategories.isNotEmpty()) {\n- repository.setSelectedCategories(selectedCategories.map { it.name })\n- view.goToNextScreen()\n- } else {\n- view.showNoCategorySelected()\n+ /**\n+ * Verifies the number of categories selected, prompts the user if none selected\n+ */\n+ override fun verifyCategories() {\n+ val selectedCategories = repository.selectedCategories\n+ if (selectedCategories.isNotEmpty()) {\n+ repository.setSelectedCategories(selectedCategories.map { it.name })\n+ view.goToNextScreen()\n+ } else {\n+ view.showNoCategorySelected()\n+ }\n }\n- }\n \n- /**\n- * ask repository to handle category clicked\n- *\n- * @param categoryItem\n- */\n- override fun onCategoryItemClicked(categoryItem: CategoryItem) {\n- repository.onCategoryClicked(categoryItem, media)\n- }\n+ /**\n+ * ask repository to handle category clicked\n+ *\n+ * @param categoryItem\n+ */\n+ override fun onCategoryItemClicked(categoryItem: CategoryItem) {\n+ repository.onCategoryClicked(categoryItem, media)\n+ }\n \n- /**\n- * Attaches view and media\n- */\n- override fun onAttachViewWithMedia(view: CategoriesContract.View, media: Media) {\n- this.view = view\n- this.media = media\n- repository.selectedExistingCategories = view.existingCategories\n- compositeDisposable.add(\n- searchTerms\n- .observeOn(mainThreadScheduler)\n- .doOnNext {\n- view.showProgress(true)\n- }\n- .switchMap(::searchResults)\n- .map { repository.selectedCategories + it }\n- .map { it.distinctBy { categoryItem -> categoryItem.name } }\n- .observeOn(mainThreadScheduler)\n- .subscribe(\n- {\n- setCategoryListValue(it)\n- view.showProgress(false)\n- if (it.isEmpty()) {\n+ /**\n+ * Attaches view and media\n+ */\n+ override fun onAttachViewWithMedia(\n+ view: CategoriesContract.View,\n+ media: Media,\n+ ) {\n+ this.view = view\n+ this.media = media\n+ repository.selectedExistingCategories = view.existingCategories\n+ compositeDisposable.add(\n+ searchTerms\n+ .observeOn(mainThreadScheduler)\n+ .doOnNext {\n+ view.showProgress(true)\n+ }.switchMap(::searchResults)\n+ .map { repository.selectedCategories + it }\n+ .map { it.distinctBy { categoryItem -> categoryItem.name } }\n+ .observeOn(mainThreadScheduler)\n+ .subscribe(\n+ {\n+ setCategoryListValue(it)\n+ view.showProgress(false)\n+ if (it.isEmpty()) {\n+ view.showError(R.string.no_categories_found)\n+ }\n+ },\n+ { t: Throwable? ->\n+ view.showProgress(false)\n view.showError(R.string.no_categories_found)\n- }\n- },\n- { t: Throwable? ->\n- view.showProgress(false)\n- view.showError(R.string.no_categories_found)\n- Timber.e(t)\n- }\n- )\n- )\n- }\n+ Timber.e(t)\n+ },\n+ ),\n+ )\n+ }\n \n- /**\n- * Clears previous selections\n- */\n- override fun clearPreviousSelection() {\n- repository.cleanup()\n- }\n+ /**\n+ * Clears previous selections\n+ */\n+ override fun clearPreviousSelection() {\n+ repository.cleanup()\n+ }\n \n- /**\n- * Gets the selected categories and send them for posting to the server\n- *\n- * @param media media\n- * @param wikiText current WikiText from server\n- */\n- override fun updateCategories(media: Media, wikiText: String) {\n- //check if view.existingCategories is null\n- if (repository.selectedCategories.isNotEmpty()\n- || (view.existingCategories != null && repository.selectedExistingCategories.size != view.existingCategories.size)\n+ /**\n+ * Gets the selected categories and send them for posting to the server\n+ *\n+ * @param media media\n+ * @param wikiText current WikiText from server\n+ */\n+ override fun updateCategories(\n+ media: Media,\n+ wikiText: String,\n ) {\n- val selectedCategories: MutableList =\n- (repository.selectedCategories.map { it.name }.toMutableList()\n- + repository.selectedExistingCategories).toMutableList()\n+ // check if view.existingCategories is null\n+ if (repository.selectedCategories.isNotEmpty() ||\n+ (view.existingCategories != null && repository.selectedExistingCategories.size != view.existingCategories.size)\n+ ) {\n+ val selectedCategories: MutableList =\n+ (\n+ repository.selectedCategories.map { it.name }.toMutableList() +\n+ repository.selectedExistingCategories\n+ ).toMutableList()\n \n- if (selectedCategories.isNotEmpty()) {\n- view.showProgressDialog()\n+ if (selectedCategories.isNotEmpty()) {\n+ view.showProgressDialog()\n \n- try {\n- compositeDisposable.add(\n- categoryEditHelper.makeCategoryEdit(\n- view.fragmentContext, media,\n- selectedCategories, wikiText\n+ try {\n+ compositeDisposable.add(\n+ categoryEditHelper\n+ .makeCategoryEdit(\n+ view.fragmentContext,\n+ media,\n+ selectedCategories,\n+ wikiText,\n+ ).subscribeOn(Schedulers.io())\n+ .observeOn(AndroidSchedulers.mainThread())\n+ .subscribe({\n+ Timber.d(\"Categories are added.\")\n+ media.addedCategories = selectedCategories\n+ repository.cleanup()\n+ view.dismissProgressDialog()\n+ view.refreshCategories()\n+ view.goBackToPreviousScreen()\n+ }, {\n+ Timber.e(\n+ \"Failed to update categories\",\n+ )\n+ }),\n )\n- .subscribeOn(Schedulers.io())\n- .observeOn(AndroidSchedulers.mainThread())\n- .subscribe({\n- Timber.d(\"Categories are added.\")\n- media.addedCategories = selectedCategories\n- repository.cleanup()\n- view.dismissProgressDialog()\n- view.refreshCategories()\n- view.goBackToPreviousScreen()\n- }, {\n- Timber.e(\n- \"Failed to update categories\"\n- )\n- })\n- )\n- } catch (e: InvalidLoginTokenException) {\n- view.navigateToLoginScreen();\n+ } catch (e: InvalidLoginTokenException) {\n+ view.navigateToLoginScreen()\n+ }\n }\n-\n+ } else {\n+ repository.cleanup()\n+ view.showNoCategorySelected()\n }\n- } else {\n- repository.cleanup()\n- view.showNoCategorySelected()\n }\n- }\n \n- /**\n- * Selects each [CategoryItem] in a given list as if they were clicked by the user by calling\n- * [onCategoryItemClicked] for each category and adding the category to [categoryList]\n- */\n- private fun selectNewCategories(toSelect: List) {\n- toSelect.forEach{\n+ /**\n+ * Selects each [CategoryItem] in a given list as if they were clicked by the user by calling\n+ * [onCategoryItemClicked] for each category and adding the category to [categoryList]\n+ */\n+ private fun selectNewCategories(toSelect: List) {\n+ toSelect.forEach {\n it.isSelected = true\n repository.onCategoryClicked(it, media)\n }\n \n- // Add the new selections to the list of category items so that the selections appear\n- // immediately (i.e. without any search term queries)\n- categoryList.value?.toMutableList()\n- ?.let { toSelect + it }\n- ?.distinctBy(CategoryItem::name)\n- ?.let { setCategoryListValue(it) }\n- }\n+ // Add the new selections to the list of category items so that the selections appear\n+ // immediately (i.e. without any search term queries)\n+ categoryList.value\n+ ?.toMutableList()\n+ ?.let { toSelect + it }\n+ ?.distinctBy(CategoryItem::name)\n+ ?.let { setCategoryListValue(it) }\n+ }\n \n- /**\n- * Livedata being used to observe category list inside\n- * @see UploadCategoriesFragment\n- * Any changes to category list reflect immediately to the adapter list\n- */\n- override fun getCategories(): LiveData> {\n- return categoryList\n- }\n+ /**\n+ * Livedata being used to observe category list inside\n+ * @see UploadCategoriesFragment\n+ * Any changes to category list reflect immediately to the adapter list\n+ */\n+ override fun getCategories(): LiveData> = categoryList\n \n- /**\n- * needed for tests\n- */\n- fun setCategoryList(categoryList: MutableLiveData>) {\n- this.categoryList = categoryList\n- }\n+ /**\n+ * needed for tests\n+ */\n+ fun setCategoryList(categoryList: MutableLiveData>) {\n+ this.categoryList = categoryList\n+ }\n \n- /**\n- * needed for tests\n- */\n- fun setCategoryListValue(categoryItems: List) {\n- categoryList.postValue(categoryItems)\n- }\n+ /**\n+ * needed for tests\n+ */\n+ fun setCategoryListValue(categoryItems: List) {\n+ categoryList.postValue(categoryItems)\n+ }\n \n- override fun selectCategories() {\n- compositeDisposable.add(repository.placeCategories\n- .subscribeOn(ioScheduler)\n- .observeOn(mainThreadScheduler)\n- .subscribe(::selectNewCategories)\n- )\n+ override fun selectCategories() {\n+ compositeDisposable.add(\n+ repository.placeCategories\n+ .subscribeOn(ioScheduler)\n+ .observeOn(mainThreadScheduler)\n+ .subscribe(::selectNewCategories),\n+ )\n+ }\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoryAdapter.kt b/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoryAdapter.kt\nindex 2e301c66f0..145f11d065 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoryAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoryAdapter.kt\n@@ -4,13 +4,12 @@ import fr.free.nrw.commons.category.CategoryItem\n import org.jetbrains.annotations.NotNull\n \n class UploadCategoryAdapter(\n- onCategoryClicked: @NotNull() (CategoryItem) -> Unit, nearbyPlaceCategory: String?) :\n- BaseDelegateAdapter(\n+ onCategoryClicked: @NotNull (CategoryItem) -> Unit,\n+ nearbyPlaceCategory: String?,\n+) : BaseDelegateAdapter(\n uploadCategoryDelegate(onCategoryClicked, nearbyPlaceCategory),\n areItemsTheSame = { oldItem, newItem -> oldItem.name == newItem.name },\n areContentsTheSame = { oldItem, newItem ->\n oldItem.name == newItem.name && oldItem.isSelected == newItem.isSelected\n- }\n+ },\n )\n-\n-\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoryAdapterDelegates.kt b/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoryAdapterDelegates.kt\nindex fc5d143a44..619db9ab7a 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoryAdapterDelegates.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoryAdapterDelegates.kt\n@@ -6,42 +6,47 @@ import fr.free.nrw.commons.R\n import fr.free.nrw.commons.category.CategoryItem\n import fr.free.nrw.commons.databinding.LayoutUploadCategoriesItemBinding\n \n-fun uploadCategoryDelegate(onCategoryClicked: (CategoryItem) -> Unit, nearbyPlaceCategory: String?) =\n- adapterDelegateViewBinding({ layoutInflater, root ->\n- LayoutUploadCategoriesItemBinding.inflate(layoutInflater, root, false)\n- }) {\n- val onClickListener = { _: View? ->\n- if (item.name != nearbyPlaceCategory) {\n- item.isSelected = !item.isSelected\n- binding.uploadCategoryCheckbox.isChecked = item.isSelected\n- onCategoryClicked(item)\n- }\n+fun uploadCategoryDelegate(\n+ onCategoryClicked: (CategoryItem) -> Unit,\n+ nearbyPlaceCategory: String?,\n+) = adapterDelegateViewBinding<\n+ CategoryItem,\n+ CategoryItem,\n+ LayoutUploadCategoriesItemBinding,\n+>({ layoutInflater, root ->\n+ LayoutUploadCategoriesItemBinding.inflate(layoutInflater, root, false)\n+}) {\n+ val onClickListener = { _: View? ->\n+ if (item.name != nearbyPlaceCategory) {\n+ item.isSelected = !item.isSelected\n+ binding.uploadCategoryCheckbox.isChecked = item.isSelected\n+ onCategoryClicked(item)\n }\n+ }\n \n- binding.root.setOnClickListener(onClickListener)\n- binding.uploadCategoryCheckbox.setOnClickListener(onClickListener)\n+ binding.root.setOnClickListener(onClickListener)\n+ binding.uploadCategoryCheckbox.setOnClickListener(onClickListener)\n \n- bind {\n- if (item.name == nearbyPlaceCategory) {\n- item.isSelected = true\n- binding.uploadCategoryCheckbox.isChecked = true\n- binding.uploadCategoryCheckbox.isEnabled = false\n- } else {\n- binding.uploadCategoryCheckbox.isEnabled = true\n- binding.uploadCategoryCheckbox.isChecked = item.isSelected\n- }\n- binding.categoryLabel.text = item.name\n- if (item.thumbnail != \"null\") {\n- binding.categoryImage.setImageURI(item.thumbnail)\n- } else {\n- binding.categoryImage.setActualImageResource(R.drawable.commons)\n- }\n+ bind {\n+ if (item.name == nearbyPlaceCategory) {\n+ item.isSelected = true\n+ binding.uploadCategoryCheckbox.isChecked = true\n+ binding.uploadCategoryCheckbox.isEnabled = false\n+ } else {\n+ binding.uploadCategoryCheckbox.isEnabled = true\n+ binding.uploadCategoryCheckbox.isChecked = item.isSelected\n+ }\n+ binding.categoryLabel.text = item.name\n+ if (item.thumbnail != \"null\") {\n+ binding.categoryImage.setImageURI(item.thumbnail)\n+ } else {\n+ binding.categoryImage.setActualImageResource(R.drawable.commons)\n+ }\n \n- if (item.description != \"null\") {\n- binding.categoryDescription.text = item.description\n- } else {\n- binding.categoryDescription.text = \"\"\n- }\n+ if (item.description != \"null\") {\n+ binding.categoryDescription.text = item.description\n+ } else {\n+ binding.categoryDescription.text = \"\"\n }\n }\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/depicts/Claims.kt b/app/src/main/java/fr/free/nrw/commons/upload/depicts/Claims.kt\nindex e0a3a8e8be..6aac02d043 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/depicts/Claims.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/depicts/Claims.kt\n@@ -1,9 +1,9 @@\n package fr.free.nrw.commons.upload.depicts\n \n import com.google.gson.annotations.SerializedName\n-import fr.free.nrw.commons.wikidata.model.Statement_partial\n+import fr.free.nrw.commons.wikidata.model.StatementPartial\n \n data class Claims(\n @SerializedName(value = \"claims\")\n- val claims: Map> = emptyMap()\n-)\n\\ No newline at end of file\n+ val claims: Map> = emptyMap(),\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictEditHelper.kt b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictEditHelper.kt\nindex c681e5b7d1..4d267b7bbb 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictEditHelper.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictEditHelper.kt\n@@ -13,109 +13,116 @@ import io.reactivex.Observable\n import timber.log.Timber\n import javax.inject.Inject\n \n-class DepictEditHelper @Inject constructor (notificationHelper: NotificationHelper,\n- wikidataEditService: WikidataEditService,\n- viewUtilWrapper: ViewUtilWrapper) {\n-\n- /**\n- * Class for making post operations\n- */\n+class DepictEditHelper\n @Inject\n- lateinit var wikidataEditService: WikidataEditService\n+ constructor(\n+ notificationHelper: NotificationHelper,\n+ wikidataEditService: WikidataEditService,\n+ viewUtilWrapper: ViewUtilWrapper,\n+ ) {\n+ /**\n+ * Class for making post operations\n+ */\n+ @Inject\n+ lateinit var wikidataEditService: WikidataEditService\n \n- /**\n- * Class for creating notification\n- */\n- @Inject\n- lateinit var notificationHelper: NotificationHelper\n+ /**\n+ * Class for creating notification\n+ */\n+ @Inject\n+ lateinit var notificationHelper: NotificationHelper\n \n- /**\n- * Class for showing toast\n- */\n- @Inject\n- lateinit var viewUtilWrapper: ViewUtilWrapper\n+ /**\n+ * Class for showing toast\n+ */\n+ @Inject\n+ lateinit var viewUtilWrapper: ViewUtilWrapper\n \n- /**\n- * Public interface to edit depictions\n- *\n- * @param context context\n- * @param media media\n- * @param depictions selected depictions to be added ex: [\"Q12\", \"Q234\"]\n- * @return Single\n- */\n- fun makeDepictionEdit(\n- context: Context,\n- media: Media,\n- depictions: List\n- ): Observable {\n- viewUtilWrapper.showShortToast(\n- context,\n- context.getString(R.string.depictions_edit_helper_make_edit_toast)\n- )\n- return addDepiction(media, depictions)\n- .flatMap { result: Boolean ->\n- Observable.just(\n- showDepictionEditNotification(context, media, result)\n- )\n- }\n- }\n+ /**\n+ * Public interface to edit depictions\n+ *\n+ * @param context context\n+ * @param media media\n+ * @param depictions selected depictions to be added ex: [\"Q12\", \"Q234\"]\n+ * @return Single\n+ */\n+ fun makeDepictionEdit(\n+ context: Context,\n+ media: Media,\n+ depictions: List,\n+ ): Observable {\n+ viewUtilWrapper.showShortToast(\n+ context,\n+ context.getString(R.string.depictions_edit_helper_make_edit_toast),\n+ )\n+ return addDepiction(media, depictions)\n+ .flatMap { result: Boolean ->\n+ Observable.just(\n+ showDepictionEditNotification(context, media, result),\n+ )\n+ }\n+ }\n \n- /**\n- * Appends new depictions\n- *\n- * @param media media\n- * @param depictions to be added\n- * @return Observable\n- */\n- private fun addDepiction(media: Media, depictions: List): Observable {\n- Timber.d(\"thread is adding depiction %s\", Thread.currentThread().name)\n- return wikidataEditService.updateDepictsProperty(media.pageId, depictions)\n- }\n+ /**\n+ * Appends new depictions\n+ *\n+ * @param media media\n+ * @param depictions to be added\n+ * @return Observable\n+ */\n+ private fun addDepiction(\n+ media: Media,\n+ depictions: List,\n+ ): Observable {\n+ Timber.d(\"thread is adding depiction %s\", Thread.currentThread().name)\n+ return wikidataEditService.updateDepictsProperty(media.pageId, depictions)\n+ }\n \n- /**\n- * Helps to create notification about condition of editing depictions\n- *\n- * @param context context\n- * @param media media\n- * @param result response of result\n- * @return Single\n- */\n- private fun showDepictionEditNotification(\n- context: Context,\n- media: Media,\n- result: Boolean\n- ): Boolean {\n- val message: String\n- var title = context.getString(R.string.depictions_edit_helper_show_edit_title)\n- if (result) {\n- title += \": \" + context.getString(R.string.category_edit_helper_show_edit_title_success)\n- val depictsInMessage = StringBuilder()\n- val depictIdList = media.depictionIds\n- for (depiction in depictIdList) {\n- depictsInMessage.append(depiction)\n- if (depiction == depictIdList[depictIdList.size - 1]) {\n- continue\n+ /**\n+ * Helps to create notification about condition of editing depictions\n+ *\n+ * @param context context\n+ * @param media media\n+ * @param result response of result\n+ * @return Single\n+ */\n+ private fun showDepictionEditNotification(\n+ context: Context,\n+ media: Media,\n+ result: Boolean,\n+ ): Boolean {\n+ val message: String\n+ var title = context.getString(R.string.depictions_edit_helper_show_edit_title)\n+ if (result) {\n+ title += \": \" + context.getString(R.string.category_edit_helper_show_edit_title_success)\n+ val depictsInMessage = StringBuilder()\n+ val depictIdList = media.depictionIds\n+ for (depiction in depictIdList) {\n+ depictsInMessage.append(depiction)\n+ if (depiction == depictIdList[depictIdList.size - 1]) {\n+ continue\n+ }\n+ depictsInMessage.append(\",\")\n }\n- depictsInMessage.append(\",\")\n+ message =\n+ context.resources.getQuantityString(\n+ R.plurals.depictions_edit_helper_show_edit_message_if,\n+ depictIdList.size,\n+ depictsInMessage.toString(),\n+ )\n+ } else {\n+ title += \": \" + context.getString(R.string.depictions_edit_helper_show_edit_title)\n+ message = context.getString(R.string.depictions_edit_helper_edit_message_else)\n }\n- message = context.resources.getQuantityString(\n- R.plurals.depictions_edit_helper_show_edit_message_if,\n- depictIdList.size,\n- depictsInMessage.toString()\n+ val urlForFile = BuildConfig.COMMONS_URL + \"/wiki/\" + media.filename\n+ val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(urlForFile))\n+ notificationHelper.showNotification(\n+ context,\n+ title,\n+ message,\n+ NotificationHelper.NOTIFICATION_EDIT_DEPICTIONS,\n+ browserIntent,\n )\n- } else {\n- title += \": \" + context.getString(R.string.depictions_edit_helper_show_edit_title)\n- message = context.getString(R.string.depictions_edit_helper_edit_message_else)\n+ return result\n }\n- val urlForFile = BuildConfig.COMMONS_URL + \"/wiki/\" + media.filename\n- val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(urlForFile))\n- notificationHelper.showNotification(\n- context,\n- title,\n- message,\n- NotificationHelper.NOTIFICATION_EDIT_DEPICTIONS,\n- browserIntent\n- )\n- return result\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/depicts/Depicts.kt b/app/src/main/java/fr/free/nrw/commons/upload/depicts/Depicts.kt\nindex e1fc36e25b..b14e57c276 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/depicts/Depicts.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/depicts/Depicts.kt\n@@ -3,10 +3,13 @@ package fr.free.nrw.commons.upload.depicts\n import androidx.room.Entity\n import androidx.room.PrimaryKey\n import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n-import java.util.*\n+import java.util.Date\n \n /**\n * entity class for DepictsRoomDateBase\n */\n @Entity(tableName = \"depicts_table\")\n-data class Depicts (@PrimaryKey val item: DepictedItem, val lastUsed:Date)\n\\ No newline at end of file\n+data class Depicts(\n+ @PrimaryKey val item: DepictedItem,\n+ val lastUsed: Date,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsDao.kt b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsDao.kt\nindex d792406016..6844003014 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsDao.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsDao.kt\n@@ -20,10 +20,10 @@ import java.util.Date\n abstract class DepictsDao {\n /** The maximum number of depicts allowed in the database. */\n private val maxItemsAllowed = 10\n- \n+\n @Insert(onConflict = OnConflictStrategy.REPLACE)\n abstract suspend fun insert(depictedItem: Depicts)\n- \n+\n @Query(\"Select * From depicts_table order by lastUsed DESC\")\n abstract suspend fun getAllDepicts(): List\n \n@@ -38,18 +38,20 @@ abstract class DepictsDao {\n *\n * @return A list of Depicts objects.\n */\n- fun depictsList(): Deferred> = CoroutineScope(Dispatchers.IO).async {\n- getAllDepicts()\n- }\n+ fun depictsList(): Deferred> =\n+ CoroutineScope(Dispatchers.IO).async {\n+ getAllDepicts()\n+ }\n \n /**\n * Inserts a Depicts object into the database.\n *\n * @param depictedItem The Depicts object to insert.\n */\n- private fun insertDepict(depictedItem: Depicts) = CoroutineScope(Dispatchers.IO).launch { \n- insert(depictedItem)\n- }\n+ private fun insertDepict(depictedItem: Depicts) =\n+ CoroutineScope(Dispatchers.IO).launch {\n+ insert(depictedItem)\n+ }\n \n /**\n * Gets a list of Depicts objects that need to be deleted from the database.\n@@ -57,18 +59,20 @@ abstract class DepictsDao {\n * @param n The number of depicts to delete.\n * @return A list of Depicts objects to delete.\n */\n- private suspend fun depictsForDeletion(n: Int): Deferred> = CoroutineScope(Dispatchers.IO).async {\n- getDepictsForDeletion(n)\n- }\n+ private suspend fun depictsForDeletion(n: Int): Deferred> =\n+ CoroutineScope(Dispatchers.IO).async {\n+ getDepictsForDeletion(n)\n+ }\n \n /**\n * Deletes a Depicts object from the database.\n *\n * @param depicts The Depicts object to delete.\n */\n- private suspend fun deleteDepicts(depicts: Depicts) = CoroutineScope(Dispatchers.IO).launch {\n- delete(depicts)\n- }\n+ private suspend fun deleteDepicts(depicts: Depicts) =\n+ CoroutineScope(Dispatchers.IO).launch {\n+ delete(depicts)\n+ }\n \n /**\n * Saves a list of DepictedItems in the DepictsRoomDataBase.\n@@ -87,13 +91,12 @@ abstract class DepictsDao {\n }\n \n private suspend fun deleteOldDepictions(depictsListSize: Int) {\n- if(depictsListSize > maxItemsAllowed) {\n+ if (depictsListSize > maxItemsAllowed) {\n val depictsForDeletion = depictsForDeletion(depictsListSize).await()\n \n- for(depicts in depictsForDeletion) {\n+ for (depicts in depictsForDeletion) {\n deleteDepicts(depicts)\n }\n }\n }\n }\n-\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsInterface.kt b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsInterface.kt\nindex 27c4c6f56e..a71c908e79 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsInterface.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsInterface.kt\n@@ -24,9 +24,11 @@ interface DepictsInterface {\n @Query(\"limit\") limit: String?,\n @Query(\"language\") language: String?,\n @Query(\"uselang\") uselang: String?,\n- @Query(\"continue\") offset: String?\n+ @Query(\"continue\") offset: String?,\n ): Single\n \n @GET(\"/w/api.php?format=json&action=wbgetentities\")\n- fun getEntities(@Query(\"ids\") ids: String?): Single\n+ fun getEntities(\n+ @Query(\"ids\") ids: String?,\n+ ): Single\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt\nindex d236292d18..3beedd9d5c 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt\n@@ -3,9 +3,9 @@ package fr.free.nrw.commons.upload.depicts\n import android.annotation.SuppressLint\n import androidx.lifecycle.LiveData\n import androidx.lifecycle.MutableLiveData\n-import fr.free.nrw.commons.bookmarks.items.BookmarkItemsController\n import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException\n+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsController\n import fr.free.nrw.commons.di.CommonsApplicationModule\n import fr.free.nrw.commons.repository.UploadRepository\n import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n@@ -27,249 +27,264 @@ import javax.inject.Singleton\n * presenter for DepictsFragment\n */\n @Singleton\n-class DepictsPresenter @Inject constructor(\n- private val repository: UploadRepository,\n- @param:Named(CommonsApplicationModule.IO_THREAD) private val ioScheduler: Scheduler,\n- @param:Named(CommonsApplicationModule.MAIN_THREAD) private val mainThreadScheduler: Scheduler\n-) : DepictsContract.UserActionListener {\n-\n- companion object {\n- private val DUMMY = proxy()\n- }\n-\n- private var view = DUMMY\n- private val compositeDisposable: CompositeDisposable = CompositeDisposable()\n- private val searchTerm: PublishProcessor = PublishProcessor.create()\n- private val depictedItems: MutableLiveData> = MutableLiveData()\n- private var media: Media? = null\n+class DepictsPresenter\n @Inject\n- lateinit var depictsDao: DepictsDao\n+ constructor(\n+ private val repository: UploadRepository,\n+ @param:Named(CommonsApplicationModule.IO_THREAD) private val ioScheduler: Scheduler,\n+ @param:Named(CommonsApplicationModule.MAIN_THREAD) private val mainThreadScheduler: Scheduler,\n+ ) : DepictsContract.UserActionListener {\n+ companion object {\n+ private val DUMMY = proxy()\n+ }\n \n- /**\n- * Helps to get all bookmarked items\n- */\n- @Inject\n- lateinit var controller: BookmarkItemsController\n+ private var view = DUMMY\n+ private val compositeDisposable: CompositeDisposable = CompositeDisposable()\n+ private val searchTerm: PublishProcessor = PublishProcessor.create()\n+ private val depictedItems: MutableLiveData> = MutableLiveData()\n+ private var media: Media? = null\n \n- @Inject\n- lateinit var depictsHelper: DepictEditHelper\n+ @Inject\n+ lateinit var depictsDao: DepictsDao\n \n- override fun onAttachView(view: DepictsContract.View) {\n- this.view = view\n- compositeDisposable.add(\n- searchTerm\n- .observeOn(mainThreadScheduler)\n- .doOnNext { view.showProgress(true) }\n- .switchMap(::searchResultsWithTerm)\n- .observeOn(mainThreadScheduler)\n- .subscribe(\n- { (results, term) ->\n- view.showProgress(false)\n- view.showError(results.isEmpty() && term.isNotEmpty())\n- depictedItems.value = results\n- },\n- { t: Throwable? ->\n- view.showProgress(false)\n- view.showError(true)\n- Timber.e(t)\n- }\n- )\n- )\n- }\n+ /**\n+ * Helps to get all bookmarked items\n+ */\n+ @Inject\n+ lateinit var controller: BookmarkItemsController\n \n- private fun searchResultsWithTerm(term: String): Flowable, String>> {\n- return searchResults(term).map { Pair(it, term) }\n- }\n+ @Inject\n+ lateinit var depictsHelper: DepictEditHelper\n \n- private fun searchResults(querystring: String): Flowable> {\n- var recentDepictedItemList: MutableList = ArrayList();\n- //show recentDepictedItemList when queryString is empty\n- if (querystring.isEmpty()) {\n- recentDepictedItemList = getRecentDepictedItems().toMutableList()\n+ override fun onAttachView(view: DepictsContract.View) {\n+ this.view = view\n+ compositeDisposable.add(\n+ searchTerm\n+ .observeOn(mainThreadScheduler)\n+ .doOnNext { view.showProgress(true) }\n+ .switchMap(::searchResultsWithTerm)\n+ .observeOn(mainThreadScheduler)\n+ .subscribe(\n+ { (results, term) ->\n+ view.showProgress(false)\n+ view.showError(results.isEmpty() && term.isNotEmpty())\n+ depictedItems.value = results\n+ },\n+ { t: Throwable? ->\n+ view.showProgress(false)\n+ view.showError(true)\n+ Timber.e(t)\n+ },\n+ ),\n+ )\n }\n \n- if (media == null) {\n- return repository.searchAllEntities(querystring)\n- .subscribeOn(ioScheduler)\n- .map { repository.selectedDepictions + it + recentDepictedItemList + controller.loadFavoritesItems() }\n- .map { it.filterNot { item -> WikidataDisambiguationItems.isDisambiguationItem(item.instanceOfs) } }\n- .map { it.distinctBy(DepictedItem::id) }\n+ private fun searchResultsWithTerm(term: String): Flowable, String>> =\n+ searchResults(term).map { Pair(it, term) }\n \n- } else {\n- return Flowable.zip(repository.getDepictions(repository.selectedExistingDepictions)\n- .map { list -> list.map {\n- DepictedItem(it.name, it.description, it.imageUrl, it.instanceOfs,\n- it.commonsCategories, true, it.id)\n- }\n- },\n- repository.searchAllEntities(querystring)\n- ) { it1, it2 ->\n- it1 + it2\n+ private fun searchResults(querystring: String): Flowable> {\n+ var recentDepictedItemList: MutableList = ArrayList()\n+ // show recentDepictedItemList when queryString is empty\n+ if (querystring.isEmpty()) {\n+ recentDepictedItemList = getRecentDepictedItems().toMutableList()\n }\n- .subscribeOn(ioScheduler)\n- .map { repository.selectedDepictions + it + recentDepictedItemList + controller.loadFavoritesItems() }\n- .map { it.filterNot { item -> WikidataDisambiguationItems.isDisambiguationItem(item.instanceOfs) } }\n- .map { it.distinctBy(DepictedItem::id) }\n \n+ if (media == null) {\n+ return repository\n+ .searchAllEntities(querystring)\n+ .subscribeOn(ioScheduler)\n+ .map { repository.selectedDepictions + it + recentDepictedItemList + controller.loadFavoritesItems() }\n+ .map { it.filterNot { item -> WikidataDisambiguationItems.isDisambiguationItem(item.instanceOfs) } }\n+ .map { it.distinctBy(DepictedItem::id) }\n+ } else {\n+ return Flowable\n+ .zip(\n+ repository\n+ .getDepictions(repository.selectedExistingDepictions)\n+ .map { list ->\n+ list.map {\n+ DepictedItem(\n+ it.name,\n+ it.description,\n+ it.imageUrl,\n+ it.instanceOfs,\n+ it.commonsCategories,\n+ true,\n+ it.id,\n+ )\n+ }\n+ },\n+ repository.searchAllEntities(querystring),\n+ ) { it1, it2 ->\n+ it1 + it2\n+ }.subscribeOn(ioScheduler)\n+ .map { repository.selectedDepictions + it + recentDepictedItemList + controller.loadFavoritesItems() }\n+ .map { it.filterNot { item -> WikidataDisambiguationItems.isDisambiguationItem(item.instanceOfs) } }\n+ .map { it.distinctBy(DepictedItem::id) }\n+ }\n }\n- }\n-\n- override fun onDetachView() {\n- view = DUMMY\n- media = null\n- compositeDisposable.clear()\n- }\n \n- /**\n- * Selects the place depictions retrieved by the repository\n- */\n- override fun selectPlaceDepictions() {\n- compositeDisposable.add(repository.placeDepictions\n- .subscribeOn(ioScheduler)\n- .observeOn(mainThreadScheduler)\n- .subscribe(::selectNewDepictions)\n- )\n- }\n+ override fun onDetachView() {\n+ view = DUMMY\n+ media = null\n+ compositeDisposable.clear()\n+ }\n \n- /**\n- * Selects each [DepictedItem] in a given list as if they were clicked by the user by calling\n- * [onDepictItemClicked] for each depiction and adding the depictions to [depictedItems]\n- */\n- private fun selectNewDepictions(toSelect: List) {\n- toSelect.forEach {\n- it.isSelected = true\n- repository.onDepictItemClicked(it, media)\n+ /**\n+ * Selects the place depictions retrieved by the repository\n+ */\n+ override fun selectPlaceDepictions() {\n+ compositeDisposable.add(\n+ repository.placeDepictions\n+ .subscribeOn(ioScheduler)\n+ .observeOn(mainThreadScheduler)\n+ .subscribe(::selectNewDepictions),\n+ )\n }\n \n- // Add the new selections to the list of depicted items so that the selections appear\n- // immediately (i.e. without any search term queries)\n- depictedItems.value?.toMutableList()\n- ?.let { toSelect + it }\n- ?.distinctBy(DepictedItem::id)\n- ?.let { depictedItems.value = it }\n- }\n+ /**\n+ * Selects each [DepictedItem] in a given list as if they were clicked by the user by calling\n+ * [onDepictItemClicked] for each depiction and adding the depictions to [depictedItems]\n+ */\n+ private fun selectNewDepictions(toSelect: List) {\n+ toSelect.forEach {\n+ it.isSelected = true\n+ repository.onDepictItemClicked(it, media)\n+ }\n \n- override fun clearPreviousSelection() {\n- repository.cleanup()\n- }\n+ // Add the new selections to the list of depicted items so that the selections appear\n+ // immediately (i.e. without any search term queries)\n+ depictedItems.value\n+ ?.toMutableList()\n+ ?.let { toSelect + it }\n+ ?.distinctBy(DepictedItem::id)\n+ ?.let { depictedItems.value = it }\n+ }\n \n- override fun onPreviousButtonClicked() {\n- view.goToPreviousScreen()\n- }\n+ override fun clearPreviousSelection() {\n+ repository.cleanup()\n+ }\n \n- override fun onDepictItemClicked(depictedItem: DepictedItem) {\n- repository.onDepictItemClicked(depictedItem, media)\n- }\n+ override fun onPreviousButtonClicked() {\n+ view.goToPreviousScreen()\n+ }\n \n- override fun getDepictedItems(): LiveData> {\n- return depictedItems;\n- }\n+ override fun onDepictItemClicked(depictedItem: DepictedItem) {\n+ repository.onDepictItemClicked(depictedItem, media)\n+ }\n \n- /**\n- * asks the repository to fetch depictions for the query\n- * @param query\n- */\n- override fun searchForDepictions(query: String) {\n- searchTerm.onNext(query)\n- }\n+ override fun getDepictedItems(): LiveData> = depictedItems\n \n- /**\n- * Check if depictions were selected\n- * from the depiction list\n- */\n- override fun verifyDepictions() {\n- if (repository.selectedDepictions.isNotEmpty()) {\n- if (::depictsDao.isInitialized) {\n- //save all the selected Depicted item in room Database\n- depictsDao.savingDepictsInRoomDataBase(repository.selectedDepictions)\n- }\n- view.goToNextScreen()\n- } else {\n- view.noDepictionSelected()\n+ /**\n+ * asks the repository to fetch depictions for the query\n+ * @param query\n+ */\n+ override fun searchForDepictions(query: String) {\n+ searchTerm.onNext(query)\n }\n- }\n-\n- /**\n- * Gets the selected depicts and send them for posting to the server\n- * and saves them in local storage\n- */\n- @SuppressLint(\"CheckResult\")\n- override fun updateDepictions(media: Media) {\n- if (repository.selectedDepictions.isNotEmpty()\n- || repository.selectedExistingDepictions.size != view.existingDepictions.size\n- ) {\n- view.showProgressDialog()\n- val selectedDepictions: MutableList =\n- (repository.selectedDepictions.map { it.id }.toMutableList()\n- + repository.selectedExistingDepictions).toMutableList()\n \n- if (selectedDepictions.isNotEmpty()) {\n+ /**\n+ * Check if depictions were selected\n+ * from the depiction list\n+ */\n+ override fun verifyDepictions() {\n+ if (repository.selectedDepictions.isNotEmpty()) {\n if (::depictsDao.isInitialized) {\n- //save all the selected Depicted item in room Database\n+ // save all the selected Depicted item in room Database\n depictsDao.savingDepictsInRoomDataBase(repository.selectedDepictions)\n }\n+ view.goToNextScreen()\n+ } else {\n+ view.noDepictionSelected()\n+ }\n+ }\n \n- compositeDisposable.add(\n- depictsHelper.makeDepictionEdit(view.fragmentContext, media, selectedDepictions)\n- .subscribeOn(Schedulers.io())\n- .observeOn(AndroidSchedulers.mainThread())\n- .subscribe({\n- media.depictionIds = selectedDepictions\n- repository.cleanup()\n- view.dismissProgressDialog()\n- view.updateDepicts()\n- view.goBackToPreviousScreen()\n- }, { error ->\n- if (error is InvalidLoginTokenException) {\n- view.navigateToLoginScreen();\n- } else {\n- view.dismissProgressDialog()\n- Timber.e(\"Failed to update depictions\")\n- }\n- })\n- )\n+ /**\n+ * Gets the selected depicts and send them for posting to the server\n+ * and saves them in local storage\n+ */\n+ @SuppressLint(\"CheckResult\")\n+ override fun updateDepictions(media: Media) {\n+ if (repository.selectedDepictions.isNotEmpty() ||\n+ repository.selectedExistingDepictions.size != view.existingDepictions.size\n+ ) {\n+ view.showProgressDialog()\n+ val selectedDepictions: MutableList =\n+ (\n+ repository.selectedDepictions.map { it.id }.toMutableList() +\n+ repository.selectedExistingDepictions\n+ ).toMutableList()\n \n+ if (selectedDepictions.isNotEmpty()) {\n+ if (::depictsDao.isInitialized) {\n+ // save all the selected Depicted item in room Database\n+ depictsDao.savingDepictsInRoomDataBase(repository.selectedDepictions)\n+ }\n \n+ compositeDisposable.add(\n+ depictsHelper\n+ .makeDepictionEdit(view.fragmentContext, media, selectedDepictions)\n+ .subscribeOn(Schedulers.io())\n+ .observeOn(AndroidSchedulers.mainThread())\n+ .subscribe({\n+ media.depictionIds = selectedDepictions\n+ repository.cleanup()\n+ view.dismissProgressDialog()\n+ view.updateDepicts()\n+ view.goBackToPreviousScreen()\n+ }, { error ->\n+ if (error is InvalidLoginTokenException) {\n+ view.navigateToLoginScreen()\n+ } else {\n+ view.dismissProgressDialog()\n+ Timber.e(\"Failed to update depictions\")\n+ }\n+ }),\n+ )\n+ }\n+ } else {\n+ repository.cleanup()\n+ view.noDepictionSelected()\n }\n- } else {\n- repository.cleanup()\n- view.noDepictionSelected()\n }\n- }\n \n- override fun onAttachViewWithMedia(view: DepictsContract.View, media: Media) {\n- this.view = view\n- this.media = media\n- repository.selectedExistingDepictions = view.existingDepictions\n- compositeDisposable.add(\n- searchTerm\n- .observeOn(mainThreadScheduler)\n- .doOnNext { view.showProgress(true) }\n- .switchMap(::searchResultsWithTerm)\n- .observeOn(mainThreadScheduler)\n- .subscribe(\n- { (results, term) ->\n- view.showProgress(false)\n- view.showError(results.isEmpty() && term.isNotEmpty())\n- depictedItems.value = results\n- },\n- { t: Throwable? ->\n- view.showProgress(false)\n- view.showError(true)\n- Timber.e(t)\n- }\n- )\n- )\n- }\n+ override fun onAttachViewWithMedia(\n+ view: DepictsContract.View,\n+ media: Media,\n+ ) {\n+ this.view = view\n+ this.media = media\n+ repository.selectedExistingDepictions = view.existingDepictions\n+ compositeDisposable.add(\n+ searchTerm\n+ .observeOn(mainThreadScheduler)\n+ .doOnNext { view.showProgress(true) }\n+ .switchMap(::searchResultsWithTerm)\n+ .observeOn(mainThreadScheduler)\n+ .subscribe(\n+ { (results, term) ->\n+ view.showProgress(false)\n+ view.showError(results.isEmpty() && term.isNotEmpty())\n+ depictedItems.value = results\n+ },\n+ { t: Throwable? ->\n+ view.showProgress(false)\n+ view.showError(true)\n+ Timber.e(t)\n+ },\n+ ),\n+ )\n+ }\n \n- /**\n- * Get the depicts from DepictsRoomdataBase\n- */\n- private fun getRecentDepictedItems(): List = runBlocking {\n- val depictsList = depictsDao.depictsList().await()\n- return@runBlocking depictsList.map { it.item }\n+ /**\n+ * Get the depicts from DepictsRoomdataBase\n+ */\n+ private fun getRecentDepictedItems(): List =\n+ runBlocking {\n+ val depictsList = depictsDao.depictsList().await()\n+ return@runBlocking depictsList.map { it.item }\n+ }\n }\n-}\n \n /**\n * This creates a dynamic proxy instance of the class,\n@@ -277,5 +292,6 @@ class DepictsPresenter @Inject constructor(\n * here our target object is the view.\n * Thus we when onDettach method of fragment is called we replace the binding of view to our object with the proxy instance\n */\n-inline fun proxy() = Proxy\n- .newProxyInstance(T::class.java.classLoader, arrayOf(T::class.java)) { _, _, _ -> null } as T\n+inline fun proxy() =\n+ Proxy\n+ .newProxyInstance(T::class.java.classLoader, arrayOf(T::class.java)) { _, _, _ -> null } as T\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/depicts/UploadDepictsAdapter.kt b/app/src/main/java/fr/free/nrw/commons/upload/depicts/UploadDepictsAdapter.kt\nindex c179d99129..306795bde0 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/depicts/UploadDepictsAdapter.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/depicts/UploadDepictsAdapter.kt\n@@ -4,9 +4,11 @@ import fr.free.nrw.commons.nearby.Place\n import fr.free.nrw.commons.upload.categories.BaseDelegateAdapter\n import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n \n-class UploadDepictsAdapter(onDepictsClicked: (DepictedItem) -> Unit, nearbyPlace: Place?) :\n- BaseDelegateAdapter(\n+class UploadDepictsAdapter(\n+ onDepictsClicked: (DepictedItem) -> Unit,\n+ nearbyPlace: Place?,\n+) : BaseDelegateAdapter(\n uploadDepictsDelegate(onDepictsClicked, nearbyPlace),\n areItemsTheSame = { oldItem, newItem -> oldItem.id == newItem.id },\n- areContentsTheSame = { itemA, itemB -> itemA.isSelected == itemB.isSelected}\n+ areContentsTheSame = { itemA, itemB -> itemA.isSelected == itemB.isSelected },\n )\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/depicts/UploadDepictsAdapterDelegates.kt b/app/src/main/java/fr/free/nrw/commons/upload/depicts/UploadDepictsAdapterDelegates.kt\nindex 896def499c..0f02c9672b 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/depicts/UploadDepictsAdapterDelegates.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/depicts/UploadDepictsAdapterDelegates.kt\n@@ -9,36 +9,37 @@ import fr.free.nrw.commons.databinding.LayoutUploadDepictsItemBinding\n import fr.free.nrw.commons.nearby.Place\n import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n \n-\n-fun uploadDepictsDelegate(onDepictClicked: (DepictedItem) -> Unit, nearbyPlace: Place?) =\n- adapterDelegateViewBinding({ layoutInflater, parent ->\n- LayoutUploadDepictsItemBinding.inflate(layoutInflater, parent, false)\n- }) {\n- val onClickListener = { _: View? ->\n- if (item.name != nearbyPlace?.name) {\n- item.isSelected = !item.isSelected\n- binding.depictCheckbox.isChecked = item.isSelected\n- onDepictClicked(item)\n- }\n+fun uploadDepictsDelegate(\n+ onDepictClicked: (DepictedItem) -> Unit,\n+ nearbyPlace: Place?,\n+) = adapterDelegateViewBinding({ layoutInflater, parent ->\n+ LayoutUploadDepictsItemBinding.inflate(layoutInflater, parent, false)\n+}) {\n+ val onClickListener = { _: View? ->\n+ if (item.name != nearbyPlace?.name) {\n+ item.isSelected = !item.isSelected\n+ binding.depictCheckbox.isChecked = item.isSelected\n+ onDepictClicked(item)\n+ }\n+ }\n+ binding.root.setOnClickListener(onClickListener)\n+ binding.depictCheckbox.setOnClickListener(onClickListener)\n+ bind {\n+ if (item.name == nearbyPlace?.name) {\n+ item.isSelected = true\n+ binding.depictCheckbox.isChecked = true\n+ binding.depictCheckbox.isEnabled = false\n+ } else {\n+ binding.depictCheckbox.isEnabled = true\n+ binding.depictCheckbox.isChecked = item.isSelected\n }\n- binding.root.setOnClickListener(onClickListener)\n- binding.depictCheckbox.setOnClickListener(onClickListener)\n- bind {\n- if (item.name == nearbyPlace?.name) {\n- item.isSelected = true\n- binding.depictCheckbox.isChecked = true\n- binding.depictCheckbox.isEnabled = false\n- } else {\n- binding.depictCheckbox.isEnabled = true\n- binding.depictCheckbox.isChecked = item.isSelected\n- }\n- binding.depictsLabel.text = item.name\n- binding.description.text = item.description\n- val imageUrl = item.imageUrl\n- if (TextUtils.isEmpty(imageUrl)) {\n- binding.depictedImage.setActualImageResource(R.drawable.ic_wikidata_logo_24dp)\n- } else {\n- binding.depictedImage.setImageURI(Uri.parse(imageUrl))\n- }\n+ binding.depictsLabel.text = item.name\n+ binding.description.text = item.description\n+ val imageUrl = item.imageUrl\n+ if (TextUtils.isEmpty(imageUrl)) {\n+ binding.depictedImage.setActualImageResource(R.drawable.ic_wikidata_logo_24dp)\n+ } else {\n+ binding.depictedImage.setImageURI(Uri.parse(imageUrl))\n }\n }\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictModel.kt b/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictModel.kt\nindex 3caa2934df..7242b8eed3 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictModel.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictModel.kt\n@@ -5,7 +5,6 @@ import fr.free.nrw.commons.nearby.Place\n import fr.free.nrw.commons.repository.UploadRepository\n import io.github.coordinates2country.Coordinates2Country\n import io.reactivex.Flowable\n-import io.reactivex.Observable\n import io.reactivex.Single\n import io.reactivex.processors.BehaviorProcessor\n import timber.log.Timber\n@@ -16,79 +15,93 @@ import javax.inject.Singleton\n * The model class for depictions in upload\n */\n @Singleton\n-class DepictModel @Inject constructor(private val depictsClient: DepictsClient) {\n+class DepictModel\n+ @Inject\n+ constructor(\n+ private val depictsClient: DepictsClient,\n+ ) {\n+ val nearbyPlaces: BehaviorProcessor> = BehaviorProcessor.createDefault(emptyList())\n \n- val nearbyPlaces: BehaviorProcessor> = BehaviorProcessor.createDefault(emptyList())\n-\n- companion object {\n- private const val SEARCH_DEPICTS_LIMIT = 25\n- }\n+ companion object {\n+ private const val SEARCH_DEPICTS_LIMIT = 25\n+ }\n \n- /**\n- * Search for depictions\n- */\n- fun searchAllEntities(query: String, repository: UploadRepository): Flowable> {\n- return if (query.isBlank()) {\n- nearbyPlaces.switchMap { places: List ->\n- val qids = mutableSetOf()\n- for(place in places) {\n- place.wikiDataEntityId?.let { qids.add(it) }\n- }\n- repository.uploads.forEach { item ->\n- if(item.gpsCoords != null && item.gpsCoords.imageCoordsExists) {\n- Coordinates2Country.countryQID(item.gpsCoords.decLatitude,\n- item.gpsCoords.decLongitude)?.let { qids.add(\"Q$it\") }\n+ /**\n+ * Search for depictions\n+ */\n+ fun searchAllEntities(\n+ query: String,\n+ repository: UploadRepository,\n+ ): Flowable> =\n+ if (query.isBlank()) {\n+ nearbyPlaces.switchMap { places: List ->\n+ val qids = mutableSetOf()\n+ for (place in places) {\n+ place.wikiDataEntityId?.let { qids.add(it) }\n+ }\n+ repository.uploads.forEach { item ->\n+ if (item.gpsCoords != null && item.gpsCoords.imageCoordsExists) {\n+ Coordinates2Country\n+ .countryQID(\n+ item.gpsCoords.decLatitude,\n+ item.gpsCoords.decLongitude,\n+ )?.let { qids.add(\"Q$it\") }\n+ }\n }\n+ getPlaceDepictions(ArrayList(qids)).toFlowable()\n }\n- getPlaceDepictions(ArrayList(qids)).toFlowable()\n+ } else {\n+ networkItems(query)\n }\n- } else\n- networkItems(query)\n- }\n-\n- /**\n- * Provides [DepictedItem] instances via a [Single] for a given list of ids, providing an\n- * empty list if no places/country are provided or if there is an error\n- */\n- fun getPlaceDepictions(qids: List): Single> =\n- qids.toIds().let { ids ->\n- if (ids.isNotEmpty())\n- depictsClient.getEntities(ids)\n- .map{\n- it.entities()\n- .values\n- .mapIndexed { index, entity -> DepictedItem(entity)}\n- }\n- .onErrorResumeWithEmptyList()\n- else Single.just(emptyList())\n- }\n \n- fun getDepictions(ids: String): Single> =\n- if (ids.isNotEmpty())\n- depictsClient.getEntities(ids)\n- .map{\n- it.entities()\n- .values\n- .mapIndexed { _, entity -> DepictedItem(entity)}\n+ /**\n+ * Provides [DepictedItem] instances via a [Single] for a given list of ids, providing an\n+ * empty list if no places/country are provided or if there is an error\n+ */\n+ fun getPlaceDepictions(qids: List): Single> =\n+ qids.toIds().let { ids ->\n+ if (ids.isNotEmpty()) {\n+ depictsClient\n+ .getEntities(ids)\n+ .map {\n+ it\n+ .entities()\n+ .values\n+ .mapIndexed { index, entity -> DepictedItem(entity) }\n+ }.onErrorResumeWithEmptyList()\n+ } else {\n+ Single.just(emptyList())\n }\n- .onErrorResumeWithEmptyList()\n- else Single.just(emptyList())\n+ }\n \n+ fun getDepictions(ids: String): Single> =\n+ if (ids.isNotEmpty()) {\n+ depictsClient\n+ .getEntities(ids)\n+ .map {\n+ it\n+ .entities()\n+ .values\n+ .mapIndexed { _, entity -> DepictedItem(entity) }\n+ }.onErrorResumeWithEmptyList()\n+ } else {\n+ Single.just(emptyList())\n+ }\n \n- private fun networkItems(query: String): Flowable> {\n- return depictsClient.searchForDepictions(query, SEARCH_DEPICTS_LIMIT, 0)\n- .onErrorResumeWithEmptyList()\n- .toFlowable()\n- }\n+ private fun networkItems(query: String): Flowable> =\n+ depictsClient\n+ .searchForDepictions(query, SEARCH_DEPICTS_LIMIT, 0)\n+ .onErrorResumeWithEmptyList()\n+ .toFlowable()\n \n- fun cleanUp() {\n- nearbyPlaces.offer(emptyList())\n+ fun cleanUp() {\n+ nearbyPlaces.offer(emptyList())\n+ }\n }\n \n-}\n-\n private fun List.toIds() = mapNotNull { it }.joinToString(\"|\")\n \n-private fun Single>.onErrorResumeWithEmptyList() = onErrorResumeNext { t: Throwable ->\n- Single.just(emptyList()).also { Timber.e(t) }\n-}\n+private fun Single>.onErrorResumeWithEmptyList() =\n+ onErrorResumeNext { t: Throwable ->\n+ Single.just(emptyList()).also { Timber.e(t) }\n+ }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt b/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt\nindex 499011109a..0e4ed482d2 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt\n@@ -7,15 +7,17 @@ import fr.free.nrw.commons.category.CategoryItem\n import fr.free.nrw.commons.nearby.Place\n import fr.free.nrw.commons.upload.WikidataItem\n import fr.free.nrw.commons.wikidata.WikidataProperties\n-import fr.free.nrw.commons.wikidata.WikidataProperties.*\n+import fr.free.nrw.commons.wikidata.WikidataProperties.COMMONS_CATEGORY\n+import fr.free.nrw.commons.wikidata.WikidataProperties.IMAGE\n+import fr.free.nrw.commons.wikidata.WikidataProperties.INSTANCE_OF\n import fr.free.nrw.commons.wikidata.model.DataValue\n import fr.free.nrw.commons.wikidata.model.Entities\n-import fr.free.nrw.commons.wikidata.model.Statement_partial\n+import fr.free.nrw.commons.wikidata.model.StatementPartial\n import kotlinx.parcelize.Parcelize\n import java.math.BigInteger\n import java.security.MessageDigest\n import java.security.NoSuchAlgorithmException\n-import java.util.*\n+import java.util.Locale\n \n const val THUMB_IMAGE_SIZE = \"70px\"\n \n@@ -31,19 +33,19 @@ data class DepictedItem constructor(\n val instanceOfs: List,\n val commonsCategories: List,\n var isSelected: Boolean,\n- @PrimaryKey override val id: String\n-) : WikidataItem, Parcelable {\n-\n+ @PrimaryKey override val id: String,\n+) : WikidataItem,\n+ Parcelable {\n constructor(entity: Entities.Entity) : this(\n entity,\n entity.labels().byLanguageOrFirstOrEmpty(),\n- entity.descriptions().byLanguageOrFirstOrEmpty()\n+ entity.descriptions().byLanguageOrFirstOrEmpty(),\n )\n \n constructor(entity: Entities.Entity, place: Place) : this(\n entity,\n place.name,\n- place.longDescription\n+ place.longDescription,\n )\n \n constructor(entity: Entities.Entity, name: String, description: String) : this(\n@@ -53,56 +55,61 @@ data class DepictedItem constructor(\n getImageUrl(it.value, THUMB_IMAGE_SIZE)\n },\n entity[INSTANCE_OF].toIds(),\n- entity[COMMONS_CATEGORY]?.map { CategoryItem((it.mainSnak.dataValue as DataValue.ValueString).value,\n- \"\", \"\", false) }\n+ entity[COMMONS_CATEGORY]?.map {\n+ CategoryItem(\n+ (it.mainSnak.dataValue as DataValue.ValueString).value,\n+ \"\",\n+ \"\",\n+ false,\n+ )\n+ }\n ?: emptyList(),\n false,\n- entity.id()\n+ entity.id(),\n )\n \n- override fun equals(other: Any?) = when {\n- this === other -> true\n- other is DepictedItem -> name == other.name\n- else -> false\n- }\n-\n- override fun hashCode(): Int {\n- return name.hashCode()\n- }\n+ override fun equals(other: Any?) =\n+ when {\n+ this === other -> true\n+ other is DepictedItem -> name == other.name\n+ else -> false\n+ }\n \n+ override fun hashCode(): Int = name.hashCode()\n }\n \n-private fun List?.toIds(): List {\n- return this?.map { it.mainSnak.dataValue }\n+private fun List?.toIds(): List =\n+ this\n+ ?.map { it.mainSnak.dataValue }\n ?.filterIsInstance()\n ?.map { it.value.id }\n ?: emptyList()\n-}\n \n-private val List?.primaryImageValue: DataValue.ValueString?\n+private val List?.primaryImageValue: DataValue.ValueString?\n get() = this?.firstOrNull()?.mainSnak?.dataValue as? DataValue.ValueString\n \n-operator fun Entities.Entity.get(property: WikidataProperties) =\n- statements?.get(property.propertyName)\n+operator fun Entities.Entity.get(property: WikidataProperties) = statements?.get(property.propertyName)\n \n private fun Map.byLanguageOrFirstOrEmpty() =\n let { it[Locale.getDefault().language] ?: it.values.firstOrNull() }?.value() ?: \"\"\n \n-private fun getImageUrl(title: String, size: String): String {\n- return title.substringAfter(\":\")\n+private fun getImageUrl(\n+ title: String,\n+ size: String,\n+): String =\n+ title\n+ .substringAfter(\":\")\n .replace(\" \", \"_\")\n .let {\n- val MD5Hash = getMd5(it)\n- \"https://upload.wikimedia.org/wikipedia/commons/thumb/${MD5Hash[0]}/${MD5Hash[0]}${MD5Hash[1]}/$it/$size-$it\"\n+ val md5Hash = getMd5(it)\n+ \"https://upload.wikimedia.org/wikipedia/commons/thumb/${md5Hash[0]}/${md5Hash[0]}${md5Hash[1]}/$it/$size-$it\"\n }\n-}\n \n /**\n * Generates MD5 hash for the filename\n */\n-private fun getMd5(input: String): String {\n- return try {\n-\n+private fun getMd5(input: String): String =\n+ try {\n // Static getInstance method is called with hashing MD5\n val md = MessageDigest.getInstance(\"MD5\")\n \n@@ -119,8 +126,6 @@ private fun getMd5(input: String): String {\n hashtext = \"0$hashtext\"\n }\n hashtext\n- } // For specifying wrong message digest algorithms\n- catch (e: NoSuchAlgorithmException) {\n+ } catch (e: NoSuchAlgorithmException) {\n throw RuntimeException(e)\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt\nindex ebf930915e..2c9022d73c 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt\n@@ -43,14 +43,14 @@ import kotlinx.coroutines.MainScope\n import kotlinx.coroutines.launch\n import kotlinx.coroutines.withContext\n import timber.log.Timber\n-import java.util.*\n+import java.util.Date\n import java.util.regex.Pattern\n import javax.inject.Inject\n \n class UploadWorker(\n- private var appContext: Context, workerParams: WorkerParameters\n-): CoroutineWorker(appContext, workerParams) {\n-\n+ private var appContext: Context,\n+ workerParams: WorkerParameters,\n+) : CoroutineWorker(appContext, workerParams) {\n private var notificationManager: NotificationManagerCompat? = null\n \n @Inject\n@@ -74,24 +74,23 @@ class UploadWorker(\n @Inject\n lateinit var fileUtilsWrapper: FileUtilsWrapper\n \n- private val PROCESSING_UPLOADS_NOTIFICATION_TAG = BuildConfig.APPLICATION_ID + \" : upload_tag\"\n-\n- private val PROCESSING_UPLOADS_NOTIFICATION_ID = 101\n-\n+ private val processingUploadsNotificationTag = BuildConfig.APPLICATION_ID + \" : upload_tag\"\n \n+ private val processingUploadsNotificationId = 101\n \n- //Attributes of the current-upload notification\n- private var currentNotificationID: Int = -1// lateinit is not allowed with primitives\n+ // Attributes of the current-upload notification\n+ private var currentNotificationID: Int = -1 // lateinit is not allowed with primitives\n private lateinit var currentNotificationTag: String\n private var currentNotification: NotificationCompat.Builder\n \n- private val statesToProcess= ArrayList()\n+ private val statesToProcess = ArrayList()\n \n- private val STASH_ERROR_CODES = listOf(\n+ private val stashErrorCodes =\n+ listOf(\n \"uploadstash-file-not-found\",\n \"stashfailed\",\n \"verification-error\",\n- \"chunk-too-small\"\n+ \"chunk-too-small\",\n )\n \n init {\n@@ -113,55 +112,61 @@ class UploadWorker(\n \n open inner class NotificationUpdateProgressListener(\n private var notificationFinishingTitle: String?,\n- var contribution: Contribution?\n+ var contribution: Contribution?,\n ) {\n-\n- fun onProgress(transferred: Long, total: Long) {\n+ fun onProgress(\n+ transferred: Long,\n+ total: Long,\n+ ) {\n if (transferred == total) {\n // Completed!\n- currentNotification.setContentTitle(notificationFinishingTitle)\n+ currentNotification\n+ .setContentTitle(notificationFinishingTitle)\n .setProgress(0, 100, true)\n } else {\n currentNotification\n .setProgress(\n 100,\n (transferred.toDouble() / total.toDouble() * 100).toInt(),\n- false\n+ false,\n )\n }\n notificationManager?.cancel(\n- PROCESSING_UPLOADS_NOTIFICATION_TAG, PROCESSING_UPLOADS_NOTIFICATION_ID\n+ processingUploadsNotificationTag,\n+ processingUploadsNotificationId,\n )\n notificationManager?.notify(\n currentNotificationTag,\n currentNotificationID,\n- currentNotification.build()\n+ currentNotification.build(),\n )\n contribution!!.transferred = transferred\n contributionDao.update(contribution).blockingAwait()\n }\n \n- open fun onChunkUploaded(contribution: Contribution, chunkInfo: ChunkInfo?) {\n+ open fun onChunkUploaded(\n+ contribution: Contribution,\n+ chunkInfo: ChunkInfo?,\n+ ) {\n contribution.chunkInfo = chunkInfo\n contributionDao.update(contribution).blockingAwait()\n }\n }\n \n- private fun getNotificationBuilder(channelId: String): NotificationCompat.Builder? {\n- return NotificationCompat.Builder(appContext, channelId)\n+ private fun getNotificationBuilder(channelId: String): NotificationCompat.Builder? =\n+ NotificationCompat\n+ .Builder(appContext, channelId)\n .setAutoCancel(true)\n .setSmallIcon(R.drawable.ic_launcher)\n .setLargeIcon(\n BitmapFactory.decodeResource(\n appContext.resources,\n- R.drawable.ic_launcher\n- )\n- )\n- .setAutoCancel(true)\n+ R.drawable.ic_launcher,\n+ ),\n+ ).setAutoCancel(true)\n .setOnlyAlertOnce(true)\n .setProgress(100, 0, true)\n .setOngoing(true)\n- }\n \n override suspend fun doWork(): Result {\n try {\n@@ -169,16 +174,22 @@ class UploadWorker(\n // Start a foreground service\n setForeground(createForegroundInfo())\n notificationManager = NotificationManagerCompat.from(appContext)\n- val processingUploads = getNotificationBuilder(\n- CommonsApplication.NOTIFICATION_CHANNEL_ID_ALL\n- )!!\n+ val processingUploads =\n+ getNotificationBuilder(\n+ CommonsApplication.NOTIFICATION_CHANNEL_ID_ALL,\n+ )!!\n withContext(Dispatchers.IO) {\n- while (contributionDao.getContribution(statesToProcess)\n- .blockingGet().size > 0 && contributionDao.getContribution(\n- arrayListOf(\n- Contribution.STATE_IN_PROGRESS\n- )\n- ).blockingGet().size == 0\n+ while (contributionDao\n+ .getContribution(statesToProcess)\n+ .blockingGet()\n+ .size > 0 &&\n+ contributionDao\n+ .getContribution(\n+ arrayListOf(\n+ Contribution.STATE_IN_PROGRESS,\n+ ),\n+ ).blockingGet()\n+ .size == 0\n ) {\n /*\n queuedContributions receives the results from a one-shot query.\n@@ -189,23 +200,25 @@ class UploadWorker(\n Related issues (fixed):\n https://github.com/commons-app/apps-android-commons/issues/5136\n https://github.com/commons-app/apps-android-commons/issues/5346\n- */\n- val queuedContributions = contributionDao.getContribution(statesToProcess)\n- .blockingGet()\n- //Showing initial notification for the number of uploads being processed\n+ */\n+ val queuedContributions =\n+ contributionDao\n+ .getContribution(statesToProcess)\n+ .blockingGet()\n+ // Showing initial notification for the number of uploads being processed\n \n processingUploads.setContentTitle(appContext.getString(R.string.starting_uploads))\n processingUploads.setContentText(\n appContext.resources.getQuantityString(\n R.plurals.starting_multiple_uploads,\n queuedContributions.size,\n- queuedContributions.size\n- )\n+ queuedContributions.size,\n+ ),\n )\n notificationManager?.notify(\n- PROCESSING_UPLOADS_NOTIFICATION_TAG,\n- PROCESSING_UPLOADS_NOTIFICATION_ID,\n- processingUploads.build()\n+ processingUploadsNotificationTag,\n+ processingUploadsNotificationId,\n+ processingUploads.build(),\n )\n \n val sortedQueuedContributionsList: List =\n@@ -222,16 +235,17 @@ class UploadWorker(\n uploadContribution(contribution = contribution)\n }\n }\n- //Dismiss the global notification\n+ // Dismiss the global notification\n notificationManager?.cancel(\n- PROCESSING_UPLOADS_NOTIFICATION_TAG,\n- PROCESSING_UPLOADS_NOTIFICATION_ID\n+ processingUploadsNotificationTag,\n+ processingUploadsNotificationId,\n )\n }\n // Trigger WorkManager to process any new contributions that may have been added to the queue\n- val updatedContributionQueue = withContext(Dispatchers.IO) {\n- contributionDao.getContribution(statesToProcess).blockingGet()\n- }\n+ val updatedContributionQueue =\n+ withContext(Dispatchers.IO) {\n+ contributionDao.getContribution(statesToProcess).blockingGet()\n+ }\n if (updatedContributionQueue.isNotEmpty()) {\n return Result.retry()\n }\n@@ -248,28 +262,27 @@ class UploadWorker(\n /**\n * Create new notification for foreground service\n */\n- private fun createForegroundInfo(): ForegroundInfo {\n- return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {\n+ private fun createForegroundInfo(): ForegroundInfo =\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {\n ForegroundInfo(\n 1,\n createNotificationForForegroundService(),\n- ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC\n+ ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC,\n )\n } else {\n ForegroundInfo(\n 1,\n- createNotificationForForegroundService()\n+ createNotificationForForegroundService(),\n )\n }\n- }\n \n- override suspend fun getForegroundInfo(): ForegroundInfo {\n- return createForegroundInfo()\n- }\n+ override suspend fun getForegroundInfo(): ForegroundInfo = createForegroundInfo()\n+\n private fun createNotificationForForegroundService(): Notification {\n // TODO: Improve notification for foreground service\n return getNotificationBuilder(\n- CommonsApplication.NOTIFICATION_CHANNEL_ID_ALL)!!\n+ CommonsApplication.NOTIFICATION_CHANNEL_ID_ALL,\n+ )!!\n .setContentTitle(appContext.getString(R.string.upload_in_progress))\n .build()\n }\n@@ -296,85 +309,95 @@ class UploadWorker(\n currentNotification.setContentTitle(\n appContext.getString(\n R.string.upload_progress_notification_title_start,\n- displayTitle\n- )\n+ displayTitle,\n+ ),\n )\n \n notificationManager?.notify(\n currentNotificationTag,\n currentNotificationID,\n- currentNotification.build()\n+ currentNotification.build(),\n )\n \n val filename = media.filename\n \n- val notificationProgressUpdater = NotificationUpdateProgressListener(\n- appContext.getString(\n- R.string.upload_progress_notification_title_finishing,\n- displayTitle\n- ),\n- contribution\n- )\n+ val notificationProgressUpdater =\n+ NotificationUpdateProgressListener(\n+ appContext.getString(\n+ R.string.upload_progress_notification_title_finishing,\n+ displayTitle,\n+ ),\n+ contribution,\n+ )\n \n try {\n- //Upload the file to stash\n- val stashUploadResult = uploadClient.uploadFileToStash(\n- filename!!, contribution, notificationProgressUpdater\n- ).onErrorReturn{\n- return@onErrorReturn StashUploadResult(\n- StashUploadState.FAILED,fileKey = null,errorMessage = it.message\n- )\n- }.blockingSingle()\n+ // Upload the file to stash\n+ val stashUploadResult =\n+ uploadClient\n+ .uploadFileToStash(\n+ filename!!,\n+ contribution,\n+ notificationProgressUpdater,\n+ ).onErrorReturn {\n+ return@onErrorReturn StashUploadResult(\n+ StashUploadState.FAILED,\n+ fileKey = null,\n+ errorMessage = it.message,\n+ )\n+ }.blockingSingle()\n when (stashUploadResult.state) {\n StashUploadState.SUCCESS -> {\n- //If the stash upload succeeds\n+ // If the stash upload succeeds\n Timber.d(\"Upload to stash success for fileName: $filename\")\n Timber.d(\"Ensure uniqueness of filename\")\n val uniqueFileName = findUniqueFileName(filename)\n \n try {\n- //Upload the file from stash\n- val uploadResult = uploadClient.uploadFileFromStash(\n- contribution, uniqueFileName, stashUploadResult.fileKey\n- ).onErrorReturn {\n- return@onErrorReturn null\n- }.blockingSingle()\n+ // Upload the file from stash\n+ val uploadResult =\n+ uploadClient\n+ .uploadFileFromStash(\n+ contribution,\n+ uniqueFileName,\n+ stashUploadResult.fileKey,\n+ ).onErrorReturn {\n+ return@onErrorReturn null\n+ }.blockingSingle()\n \n if (null != uploadResult && uploadResult.isSuccessful()) {\n Timber.d(\n- \"Stash Upload success..proceeding to make wikidata edit\"\n+ \"Stash Upload success..proceeding to make wikidata edit\",\n )\n \n- wikidataEditService.addDepictionsAndCaptions(uploadResult, contribution)\n+ wikidataEditService\n+ .addDepictionsAndCaptions(uploadResult, contribution)\n .blockingSubscribe()\n- if(contribution.wikidataPlace==null){\n+ if (contribution.wikidataPlace == null) {\n Timber.d(\n- \"WikiDataEdit not required, upload success\"\n+ \"WikiDataEdit not required, upload success\",\n )\n- saveCompletedContribution(contribution,uploadResult)\n- }else{\n+ saveCompletedContribution(contribution, uploadResult)\n+ } else {\n Timber.d(\n- \"WikiDataEdit not required, making wikidata edit\"\n+ \"WikiDataEdit not required, making wikidata edit\",\n )\n makeWikiDataEdit(uploadResult, contribution)\n }\n showSuccessNotification(contribution)\n-\n } else {\n Timber.e(\"Stash Upload failed\")\n showFailedNotification(contribution)\n contribution.state = Contribution.STATE_FAILED\n contribution.chunkInfo = null\n contributionDao.save(contribution).blockingAwait()\n-\n }\n- }catch (exception : Exception){\n+ } catch (exception: Exception) {\n Timber.e(exception)\n Timber.e(\"Upload from stash failed for contribution : $filename\")\n showFailedNotification(contribution)\n- contribution.state=Contribution.STATE_FAILED\n+ contribution.state = Contribution.STATE_FAILED\n contributionDao.saveSynchronous(contribution)\n- if (STASH_ERROR_CODES.contains(exception.message)) {\n+ if (stashErrorCodes.contains(exception.message)) {\n clearChunks(contribution)\n }\n }\n@@ -396,66 +419,75 @@ class UploadWorker(\n showErrorNotification(contribution)\n contributionDao.saveSynchronous(contribution)\n if (stashUploadResult.errorMessage.equals(\n- CsrfTokenClient.INVALID_TOKEN_ERROR_MESSAGE)\n- ) {\n+ CsrfTokenClient.INVALID_TOKEN_ERROR_MESSAGE,\n+ )\n+ ) {\n Timber.e(\"Invalid Login, logging out\")\n showInvalidLoginNotification(contribution)\n val username = sessionManager.userName\n- var logoutListener = CommonsApplication.BaseLogoutListener(\n- appContext,\n- appContext.getString(R.string.invalid_login_message),\n- username\n- )\n- CommonsApplication.getInstance()\n+ var logoutListener =\n+ CommonsApplication.BaseLogoutListener(\n+ appContext,\n+ appContext.getString(R.string.invalid_login_message),\n+ username,\n+ )\n+ CommonsApplication\n+ .getInstance()\n .clearApplicationData(appContext, logoutListener)\n }\n }\n }\n- }catch (exception: Exception){\n+ } catch (exception: Exception) {\n Timber.e(exception)\n Timber.e(\"Stash upload failed for contribution: $filename\")\n showFailedNotification(contribution)\n- contribution.errorInfo=exception.message\n- contribution.state=Contribution.STATE_FAILED\n+ contribution.errorInfo = exception.message\n+ contribution.state = Contribution.STATE_FAILED\n clearChunks(contribution)\n }\n }\n \n private fun clearChunks(contribution: Contribution) {\n- contribution.chunkInfo=null\n+ contribution.chunkInfo = null\n contributionDao.saveSynchronous(contribution)\n }\n \n /**\n * Make the WikiData Edit, if applicable\n */\n- private suspend fun makeWikiDataEdit(uploadResult: UploadResult, contribution: Contribution) {\n+ private suspend fun makeWikiDataEdit(\n+ uploadResult: UploadResult,\n+ contribution: Contribution,\n+ ) {\n val wikiDataPlace = contribution.wikidataPlace\n if (wikiDataPlace != null && wikiDataPlace.imageValue == null) {\n if (!contribution.hasInvalidLocation()) {\n- var revisionID: Long?=null\n+ var revisionID: Long? = null\n try {\n- revisionID = wikidataEditService.createClaim(\n- wikiDataPlace, uploadResult.filename,\n- contribution.media.captions\n- )\n+ revisionID =\n+ wikidataEditService.createClaim(\n+ wikiDataPlace,\n+ uploadResult.filename,\n+ contribution.media.captions,\n+ )\n if (null != revisionID) {\n showSuccessNotification(contribution)\n }\n- }catch (exception: Exception){\n+ } catch (exception: Exception) {\n Timber.e(exception)\n }\n \n withContext(Dispatchers.Main) {\n wikidataEditService.handleImageClaimResult(\n contribution.wikidataPlace,\n- revisionID\n+ revisionID,\n )\n }\n } else {\n withContext(Dispatchers.Main) {\n wikidataEditService.handleImageClaimResult(\n- contribution.wikidataPlace, null\n+ contribution.wikidataPlace,\n+ null,\n )\n }\n }\n@@ -463,11 +495,16 @@ class UploadWorker(\n saveCompletedContribution(contribution, uploadResult)\n }\n \n- private fun saveCompletedContribution(contribution: Contribution, uploadResult: UploadResult) {\n- val contributionFromUpload = mediaClient.getMedia(\"File:\" + uploadResult.filename)\n- .map { media: Media? -> contribution.completeWith(media!!) }\n- .blockingGet()\n- contributionFromUpload.dateModified=Date()\n+ private fun saveCompletedContribution(\n+ contribution: Contribution,\n+ uploadResult: UploadResult,\n+ ) {\n+ val contributionFromUpload =\n+ mediaClient\n+ .getMedia(\"File:\" + uploadResult.filename)\n+ .map { media: Media? -> contribution.completeWith(media!!) }\n+ .blockingGet()\n+ contributionFromUpload.dateModified = Date()\n contributionDao.deleteAndSaveContribution(contribution, contributionFromUpload)\n \n // Upload success, save to uploaded status.\n@@ -487,8 +524,8 @@ class UploadWorker(\n imageSha1,\n modifiedSha1,\n imageSha1 == modifiedSha1,\n- true\n- )\n+ true,\n+ ),\n )\n }\n }\n@@ -498,25 +535,26 @@ class UploadWorker(\n var sequenceFileName: String?\n var sequenceNumber = 1\n while (true) {\n- sequenceFileName = if (sequenceNumber == 1) {\n- fileName\n- } else {\n- if (fileName.indexOf('.') == -1) {\n- \"$fileName $sequenceNumber\"\n+ sequenceFileName =\n+ if (sequenceNumber == 1) {\n+ fileName\n } else {\n- val regex =\n- Pattern.compile(\"^(.*)(\\\\..+?)$\")\n- val regexMatcher = regex.matcher(fileName)\n- regexMatcher.replaceAll(\"$1 $sequenceNumber$2\")\n+ if (fileName.indexOf('.') == -1) {\n+ \"$fileName $sequenceNumber\"\n+ } else {\n+ val regex =\n+ Pattern.compile(\"^(.*)(\\\\..+?)$\")\n+ val regexMatcher = regex.matcher(fileName)\n+ regexMatcher.replaceAll(\"$1 $sequenceNumber$2\")\n+ }\n }\n- }\n- if (!mediaClient.checkPageExistsUsingTitle(\n- String.format(\n- \"File:%s\",\n- sequenceFileName\n- )\n- )\n- .blockingGet()\n+ if (!mediaClient\n+ .checkPageExistsUsingTitle(\n+ String.format(\n+ \"File:%s\",\n+ sequenceFileName,\n+ ),\n+ ).blockingGet()\n ) {\n break\n }\n@@ -532,20 +570,21 @@ class UploadWorker(\n @SuppressLint(\"StringFormatInvalid\")\n private fun showSuccessNotification(contribution: Contribution) {\n val displayTitle = contribution.media.displayTitle\n- contribution.state=Contribution.STATE_COMPLETED\n+ contribution.state = Contribution.STATE_COMPLETED\n currentNotification.setContentIntent(getPendingIntent(MainActivity::class.java))\n- currentNotification.setContentTitle(\n- appContext.getString(\n- R.string.upload_completed_notification_title,\n- displayTitle\n- )\n- )\n- .setContentText(appContext.getString(R.string.upload_completed_notification_text))\n+ currentNotification\n+ .setContentTitle(\n+ appContext.getString(\n+ R.string.upload_completed_notification_title,\n+ displayTitle,\n+ ),\n+ ).setContentText(appContext.getString(R.string.upload_completed_notification_text))\n .setProgress(0, 0, false)\n .setOngoing(false)\n notificationManager?.notify(\n- currentNotificationTag, currentNotificationID,\n- currentNotification.build()\n+ currentNotificationTag,\n+ currentNotificationID,\n+ currentNotification.build(),\n )\n }\n \n@@ -557,35 +596,38 @@ class UploadWorker(\n private fun showFailedNotification(contribution: Contribution) {\n val displayTitle = contribution.media.displayTitle\n currentNotification.setContentIntent(getPendingIntent(UploadProgressActivity::class.java))\n- currentNotification.setContentTitle(\n- appContext.getString(\n- R.string.upload_failed_notification_title,\n- displayTitle\n- )\n- )\n- .setContentText(appContext.getString(R.string.upload_failed_notification_subtitle))\n+ currentNotification\n+ .setContentTitle(\n+ appContext.getString(\n+ R.string.upload_failed_notification_title,\n+ displayTitle,\n+ ),\n+ ).setContentText(appContext.getString(R.string.upload_failed_notification_subtitle))\n .setProgress(0, 0, false)\n .setOngoing(false)\n notificationManager?.notify(\n- currentNotificationTag, currentNotificationID,\n- currentNotification.build()\n+ currentNotificationTag,\n+ currentNotificationID,\n+ currentNotification.build(),\n )\n }\n+\n @SuppressLint(\"StringFormatInvalid\")\n private fun showInvalidLoginNotification(contribution: Contribution) {\n val displayTitle = contribution.media.displayTitle\n- currentNotification.setContentTitle(\n- appContext.getString(\n- R.string.upload_failed_notification_title,\n- displayTitle\n- )\n- )\n- .setContentText(appContext.getString(R.string.invalid_login_message))\n+ currentNotification\n+ .setContentTitle(\n+ appContext.getString(\n+ R.string.upload_failed_notification_title,\n+ displayTitle,\n+ ),\n+ ).setContentText(appContext.getString(R.string.invalid_login_message))\n .setProgress(0, 0, false)\n .setOngoing(false)\n notificationManager?.notify(\n- currentNotificationTag, currentNotificationID,\n- currentNotification.build()\n+ currentNotificationTag,\n+ currentNotificationID,\n+ currentNotification.build(),\n )\n }\n \n@@ -595,18 +637,19 @@ class UploadWorker(\n @SuppressLint(\"StringFormatInvalid\")\n private fun showErrorNotification(contribution: Contribution) {\n val displayTitle = contribution.media.displayTitle\n- currentNotification.setContentTitle(\n- appContext.getString(\n- R.string.upload_failed_notification_title,\n- displayTitle\n- )\n- )\n- .setContentText(contribution.errorInfo)\n+ currentNotification\n+ .setContentTitle(\n+ appContext.getString(\n+ R.string.upload_failed_notification_title,\n+ displayTitle,\n+ ),\n+ ).setContentText(contribution.errorInfo)\n .setProgress(0, 0, false)\n .setOngoing(false)\n notificationManager?.notify(\n- currentNotificationTag, currentNotificationID,\n- currentNotification.build()\n+ currentNotificationTag,\n+ currentNotificationID,\n+ currentNotification.build(),\n )\n }\n \n@@ -616,20 +659,21 @@ class UploadWorker(\n */\n private fun showPausedNotification(contribution: Contribution) {\n val displayTitle = contribution.media.displayTitle\n- \n+\n currentNotification.setContentIntent(getPendingIntent(UploadProgressActivity::class.java))\n- currentNotification.setContentTitle(\n- appContext.getString(\n- R.string.upload_paused_notification_title,\n- displayTitle\n- )\n- )\n- .setContentText(appContext.getString(R.string.upload_paused_notification_subtitle))\n+ currentNotification\n+ .setContentTitle(\n+ appContext.getString(\n+ R.string.upload_paused_notification_title,\n+ displayTitle,\n+ ),\n+ ).setContentText(appContext.getString(R.string.upload_paused_notification_subtitle))\n .setProgress(0, 0, false)\n .setOngoing(false)\n notificationManager!!.notify(\n- currentNotificationTag, currentNotificationID,\n- currentNotification.build()\n+ currentNotificationTag,\n+ currentNotificationID,\n+ currentNotification.build(),\n )\n }\n \n@@ -640,15 +684,16 @@ class UploadWorker(\n private fun showCancelledNotification(contribution: Contribution) {\n val displayTitle = contribution.media.displayTitle\n currentNotification.setContentIntent(getPendingIntent(UploadProgressActivity::class.java))\n- currentNotification.setContentTitle(\n- displayTitle\n- )\n- .setContentText(\"Upload has been cancelled!\")\n+ currentNotification\n+ .setContentTitle(\n+ displayTitle,\n+ ).setContentText(\"Upload has been cancelled!\")\n .setProgress(0, 0, false)\n .setOngoing(false)\n notificationManager!!.notify(\n- currentNotificationTag, currentNotificationID,\n- currentNotification.build()\n+ currentNotificationTag,\n+ currentNotificationID,\n+ currentNotification.build(),\n )\n }\n \n@@ -656,17 +701,18 @@ class UploadWorker(\n * Method used to get Pending intent for opening different screen after clicking on notification\n * @param toClass\n */\n- private fun getPendingIntent(toClass:Class):PendingIntent\n- {\n- val intent = Intent(appContext,toClass)\n+ private fun getPendingIntent(toClass: Class): PendingIntent {\n+ val intent = Intent(appContext, toClass)\n return TaskStackBuilder.create(appContext).run {\n- addNextIntentWithParentStack(intent)\n- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {\n- getPendingIntent(0,\n- PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)\n- } else {\n- getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT)\n- }\n- }\n+ addNextIntentWithParentStack(intent)\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {\n+ getPendingIntent(\n+ 0,\n+ PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,\n+ )\n+ } else {\n+ getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT)\n+ }\n+ }\n }\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/upload/worker/WorkRequestHelper.kt b/app/src/main/java/fr/free/nrw/commons/upload/worker/WorkRequestHelper.kt\nindex 7d6b383910..39d59a8d54 100644\n--- a/app/src/main/java/fr/free/nrw/commons/upload/worker/WorkRequestHelper.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/upload/worker/WorkRequestHelper.kt\n@@ -1,7 +1,12 @@\n package fr.free.nrw.commons.upload.worker\n \n import android.content.Context\n-import androidx.work.*\n+import androidx.work.BackoffPolicy\n+import androidx.work.Constraints\n+import androidx.work.ExistingWorkPolicy\n+import androidx.work.NetworkType\n+import androidx.work.OneTimeWorkRequest\n+import androidx.work.WorkManager\n import androidx.work.WorkRequest.Companion.MIN_BACKOFF_MILLIS\n import timber.log.Timber\n import java.util.concurrent.TimeUnit\n@@ -10,14 +15,14 @@ import java.util.concurrent.TimeUnit\n * Helper class for all the one time work requests\n */\n class WorkRequestHelper {\n-\n companion object {\n-\n private var isUploadWorkerRunning = false\n private val lock = Object()\n \n- fun makeOneTimeWorkRequest(context: Context, existingWorkPolicy: ExistingWorkPolicy) {\n-\n+ fun makeOneTimeWorkRequest(\n+ context: Context,\n+ existingWorkPolicy: ExistingWorkPolicy,\n+ ) {\n synchronized(lock) {\n if (isUploadWorkerRunning) {\n Timber.e(\"UploadWorker is already running. Cannot start another instance.\")\n@@ -35,23 +40,26 @@ class WorkRequestHelper {\n \n More details on when exactly it is retried:\n https://developer.android.com/guide/background/persistent/getting-started/define-work#retries_backoff\n- */\n- val constraints: Constraints = Constraints.Builder()\n- .setRequiredNetworkType(NetworkType.CONNECTED)\n- .build()\n+ */\n+ val constraints: Constraints =\n+ Constraints\n+ .Builder()\n+ .setRequiredNetworkType(NetworkType.CONNECTED)\n+ .build()\n val uploadRequest: OneTimeWorkRequest =\n- OneTimeWorkRequest.Builder(UploadWorker::class.java)\n+ OneTimeWorkRequest\n+ .Builder(UploadWorker::class.java)\n .setBackoffCriteria(\n BackoffPolicy.LINEAR,\n MIN_BACKOFF_MILLIS,\n- TimeUnit.MILLISECONDS\n- )\n- .setConstraints(constraints)\n+ TimeUnit.MILLISECONDS,\n+ ).setConstraints(constraints)\n .build()\n WorkManager.getInstance(context).enqueueUniqueWork(\n- UploadWorker::class.java.simpleName, existingWorkPolicy, uploadRequest\n+ UploadWorker::class.java.simpleName,\n+ existingWorkPolicy,\n+ uploadRequest,\n )\n-\n }\n \n /**\n@@ -64,4 +72,3 @@ class WorkRequestHelper {\n }\n }\n }\n-\ndiff --git a/app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.kt b/app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.kt\nindex 539c9246ee..bfd0bbb6b2 100644\n--- a/app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.kt\n@@ -9,16 +9,13 @@ object ConfigUtils {\n val isBetaFlavour: Boolean = BuildConfig.FLAVOR == \"beta\"\n \n @JvmStatic\n- private fun Context.getVersionName(): String {\n- return try {\n+ private fun Context.getVersionName(): String =\n+ try {\n packageManager.getPackageInfo(packageName, 0).versionName\n } catch (e: PackageManager.NameNotFoundException) {\n BuildConfig.VERSION_NAME\n }\n- }\n \n @JvmStatic\n- fun Context.getVersionNameWithSha(): String {\n- return \"${getVersionName()}~${BuildConfig.COMMIT_SHA}\"\n- }\n-}\n\\ No newline at end of file\n+ fun Context.getVersionNameWithSha(): String = \"${getVersionName()}~${BuildConfig.COMMIT_SHA}\"\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/utils/CustomSelectorUtils.kt b/app/src/main/java/fr/free/nrw/commons/utils/CustomSelectorUtils.kt\nindex daae40f61a..fc80252fc9 100644\n--- a/app/src/main/java/fr/free/nrw/commons/utils/CustomSelectorUtils.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/utils/CustomSelectorUtils.kt\n@@ -5,8 +5,8 @@ import android.content.Context\n import android.net.Uri\n import androidx.exifinterface.media.ExifInterface\n import fr.free.nrw.commons.customselector.model.Image\n-import fr.free.nrw.commons.filepicker.PickedFiles\n import fr.free.nrw.commons.customselector.ui.selector.ImageLoader\n+import fr.free.nrw.commons.filepicker.PickedFiles\n import fr.free.nrw.commons.media.MediaClient\n import fr.free.nrw.commons.upload.FileProcessor\n import fr.free.nrw.commons.upload.FileUtilsWrapper\n@@ -22,7 +22,6 @@ import java.net.UnknownHostException\n */\n class CustomSelectorUtils {\n companion object {\n-\n /**\n * Get image sha1 from uri, used to retrieve the original image sha1.\n */\n@@ -30,10 +29,9 @@ class CustomSelectorUtils {\n uri: Uri,\n ioDispatcher: CoroutineDispatcher,\n fileUtilsWrapper: FileUtilsWrapper,\n- contentResolver: ContentResolver\n- ): String {\n- return withContext(ioDispatcher) {\n-\n+ contentResolver: ContentResolver,\n+ ): String =\n+ withContext(ioDispatcher) {\n try {\n val result = fileUtilsWrapper.getSHA1(contentResolver.openInputStream(uri))\n result\n@@ -42,7 +40,6 @@ class CustomSelectorUtils {\n \"\"\n }\n }\n- }\n \n /**\n * Generates modified SHA1 of an image\n@@ -52,37 +49,37 @@ class CustomSelectorUtils {\n defaultDispatcher: CoroutineDispatcher,\n context: Context,\n fileProcessor: FileProcessor,\n- fileUtilsWrapper: FileUtilsWrapper\n- ): String {\n- return withContext(defaultDispatcher) {\n+ fileUtilsWrapper: FileUtilsWrapper,\n+ ): String =\n+ withContext(defaultDispatcher) {\n val uploadableFile = PickedFiles.pickedExistingPicture(context, image.uri)\n- val exifInterface: ExifInterface? = try {\n- ExifInterface(uploadableFile.file!!)\n- } catch (e: IOException) {\n- Timber.e(e)\n- null\n- }\n+ val exifInterface: ExifInterface? =\n+ try {\n+ ExifInterface(uploadableFile.file!!)\n+ } catch (e: IOException) {\n+ Timber.e(e)\n+ null\n+ }\n fileProcessor.redactExifTags(exifInterface, fileProcessor.getExifTagsToRedact())\n val sha1 =\n fileUtilsWrapper.getSHA1(\n- fileUtilsWrapper.getFileInputStream(uploadableFile.filePath)\n+ fileUtilsWrapper.getFileInputStream(uploadableFile.filePath),\n )\n uploadableFile.file.delete()\n sha1\n }\n- }\n \n /**\n * Query SHA1, return result if previously queried, otherwise start a new query.\n *\n * @return true if the image exists on Commons, false otherwise.\n */\n- suspend fun checkWhetherFileExistsOnCommonsUsingSHA1(SHA1: String,\n- ioDispatcher : CoroutineDispatcher,\n- mediaClient: MediaClient\n- ): ImageLoader.Result {\n- return withContext(ioDispatcher) {\n-\n+ suspend fun checkWhetherFileExistsOnCommonsUsingSHA1(\n+ SHA1: String,\n+ ioDispatcher: CoroutineDispatcher,\n+ mediaClient: MediaClient,\n+ ): ImageLoader.Result =\n+ withContext(ioDispatcher) {\n var result: ImageLoader.Result = ImageLoader.Result.FALSE\n try {\n if (mediaClient.checkFileExistsUsingSha(SHA1).blockingGet()) {\n@@ -98,6 +95,5 @@ class CustomSelectorUtils {\n }\n result\n }\n- }\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.kt b/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.kt\nindex f526677837..ed0487c6aa 100644\n--- a/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.kt\n@@ -12,8 +12,10 @@ object DialogUtil {\n * @param activity the activity\n * @param dialog the dialog to be shown\n */\n- private fun showSafely(activity: Activity?, dialog: AlertDialog?):AlertDialog? {\n-\n+ private fun showSafely(\n+ activity: Activity?,\n+ dialog: AlertDialog?,\n+ ): AlertDialog? {\n if (activity == null || dialog == null) {\n Timber.d(\"Show called with null activity / dialog. Ignoring.\")\n return null\n@@ -37,18 +39,17 @@ object DialogUtil {\n title: String?,\n message: String?,\n onPositiveBtnClick: Runnable?,\n- onNegativeBtnClick: Runnable?\n- ): AlertDialog? {\n- return createAndShowDialogSafely(\n+ onNegativeBtnClick: Runnable?,\n+ ): AlertDialog? =\n+ createAndShowDialogSafely(\n activity = activity,\n title = title,\n message = message,\n positiveButtonText = activity.getString(R.string.yes),\n negativeButtonText = activity.getString(R.string.no),\n onPositiveBtnClick = onPositiveBtnClick,\n- onNegativeBtnClick = onNegativeBtnClick\n+ onNegativeBtnClick = onNegativeBtnClick,\n )\n- }\n \n @JvmStatic\n fun showAlertDialog(\n@@ -59,17 +60,16 @@ object DialogUtil {\n negativeButtonText: String?,\n onPositiveBtnClick: Runnable?,\n onNegativeBtnClick: Runnable?,\n- ): AlertDialog? {\n- return createAndShowDialogSafely(\n+ ): AlertDialog? =\n+ createAndShowDialogSafely(\n activity = activity,\n title = title,\n message = message,\n positiveButtonText = positiveButtonText,\n negativeButtonText = negativeButtonText,\n onPositiveBtnClick = onPositiveBtnClick,\n- onNegativeBtnClick = onNegativeBtnClick\n+ onNegativeBtnClick = onNegativeBtnClick,\n )\n- }\n \n @JvmStatic\n fun showAlertDialog(\n@@ -79,9 +79,9 @@ object DialogUtil {\n onPositiveBtnClick: Runnable?,\n onNegativeBtnClick: Runnable?,\n customView: View?,\n- cancelable: Boolean\n- ): AlertDialog? {\n- return createAndShowDialogSafely(\n+ cancelable: Boolean,\n+ ): AlertDialog? =\n+ createAndShowDialogSafely(\n activity = activity,\n title = title,\n message = message,\n@@ -90,9 +90,8 @@ object DialogUtil {\n onPositiveBtnClick = onPositiveBtnClick,\n onNegativeBtnClick = onNegativeBtnClick,\n customView = customView,\n- cancelable = cancelable\n+ cancelable = cancelable,\n )\n- }\n \n @JvmStatic\n fun showAlertDialog(\n@@ -104,9 +103,9 @@ object DialogUtil {\n onPositiveBtnClick: Runnable?,\n onNegativeBtnClick: Runnable?,\n customView: View?,\n- cancelable: Boolean\n- ): AlertDialog? {\n- return createAndShowDialogSafely(\n+ cancelable: Boolean,\n+ ): AlertDialog? =\n+ createAndShowDialogSafely(\n activity = activity,\n title = title,\n message = message,\n@@ -115,9 +114,8 @@ object DialogUtil {\n onPositiveBtnClick = onPositiveBtnClick,\n onNegativeBtnClick = onNegativeBtnClick,\n customView = customView,\n- cancelable = cancelable\n+ cancelable = cancelable,\n )\n- }\n \n @JvmStatic\n fun showAlertDialog(\n@@ -126,17 +124,16 @@ object DialogUtil {\n message: String?,\n positiveButtonText: String?,\n onPositiveBtnClick: Runnable?,\n- cancelable: Boolean\n- ): AlertDialog? {\n- return createAndShowDialogSafely(\n+ cancelable: Boolean,\n+ ): AlertDialog? =\n+ createAndShowDialogSafely(\n activity = activity,\n title = title,\n message = message,\n positiveButtonText = positiveButtonText,\n onPositiveBtnClick = onPositiveBtnClick,\n- cancelable = cancelable\n+ cancelable = cancelable,\n )\n- }\n \n /**\n * show a dialog\n@@ -159,9 +156,8 @@ object DialogUtil {\n onPositiveBtnClick: Runnable? = null,\n onNegativeBtnClick: Runnable? = null,\n customView: View? = null,\n- cancelable: Boolean = true\n+ cancelable: Boolean = true,\n ): AlertDialog? {\n-\n /* If the custom view already has a parent, there is already a dialog showing with the view\n * This happens for on resume - return to avoid creating a second dialog - the first one\n * will still show\n@@ -170,17 +166,22 @@ object DialogUtil {\n return null\n }\n \n- return showSafely(activity, AlertDialog.Builder(activity).apply {\n- title?.also{setTitle(title)}\n- message?.also{setMessage(message)}\n- setView(customView)\n- setCancelable(cancelable)\n- positiveButtonText?.let {\n- setPositiveButton(it) { _, _ -> onPositiveBtnClick?.run() }\n- }\n- negativeButtonText?.let {\n- setNegativeButton(it) { _, _ -> onNegativeBtnClick?.run() }\n- }\n- }.create())\n+ return showSafely(\n+ activity,\n+ AlertDialog\n+ .Builder(activity)\n+ .apply {\n+ title?.also { setTitle(title) }\n+ message?.also { setMessage(message) }\n+ setView(customView)\n+ setCancelable(cancelable)\n+ positiveButtonText?.let {\n+ setPositiveButton(it) { _, _ -> onPositiveBtnClick?.run() }\n+ }\n+ negativeButtonText?.let {\n+ setNegativeButton(it) { _, _ -> onNegativeBtnClick?.run() }\n+ }\n+ }.create(),\n+ )\n }\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/utils/DownloadUtils.kt b/app/src/main/java/fr/free/nrw/commons/utils/DownloadUtils.kt\nindex 757dbc6cd6..08c030e337 100644\n--- a/app/src/main/java/fr/free/nrw/commons/utils/DownloadUtils.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/utils/DownloadUtils.kt\n@@ -1,6 +1,5 @@\n package fr.free.nrw.commons.utils\n \n-import android.Manifest.permission\n import android.app.Activity\n import android.app.DownloadManager\n import android.content.Context\n@@ -19,7 +18,10 @@ object DownloadUtils {\n * @param m Media file to download\n */\n @JvmStatic\n- fun downloadMedia(activity: Activity?, m: Media) {\n+ fun downloadMedia(\n+ activity: Activity?,\n+ m: Media,\n+ ) {\n val imageUrl = m.imageUrl\n var fileName = m.filename\n if (imageUrl == null || fileName == null || activity == null) {\n@@ -29,32 +31,37 @@ object DownloadUtils {\n // Strip 'File:' from beginning of filename, we really shouldn't store it\n fileName = fileName.substringAfter(\"File:\")\n val imageUri = Uri.parse(imageUrl)\n- val req = DownloadManager.Request(imageUri).apply {\n- setTitle(m.displayTitle)\n- setDescription(activity.getString(R.string.app_name))\n- setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName)\n- allowScanningByMediaScanner()\n- setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)\n- }\n+ val req =\n+ DownloadManager.Request(imageUri).apply {\n+ setTitle(m.displayTitle)\n+ setDescription(activity.getString(R.string.app_name))\n+ setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName)\n+ allowScanningByMediaScanner()\n+ setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)\n+ }\n PermissionUtils.checkPermissionsAndPerformAction(\n activity,\n { enqueueRequest(activity, req) },\n {\n- Toast.makeText(\n- activity,\n- R.string.download_failed_we_cannot_download_the_file_without_storage_permission,\n- Toast.LENGTH_SHORT\n- ).show()\n+ Toast\n+ .makeText(\n+ activity,\n+ R.string.download_failed_we_cannot_download_the_file_without_storage_permission,\n+ Toast.LENGTH_SHORT,\n+ ).show()\n },\n R.string.storage_permission,\n R.string.write_storage_permission_rationale,\n- *PermissionUtils.PERMISSIONS_STORAGE\n- )\n+ *PermissionUtils.PERMISSIONS_STORAGE,\n+ )\n }\n \n- private fun enqueueRequest(activity: Activity, req: DownloadManager.Request) {\n+ private fun enqueueRequest(\n+ activity: Activity,\n+ req: DownloadManager.Request,\n+ ) {\n val systemService =\n activity.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager\n systemService?.enqueue(req)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/utils/model/ConnectionType.kt b/app/src/main/java/fr/free/nrw/commons/utils/model/ConnectionType.kt\nindex f7ddfa86e4..682fa19181 100644\n--- a/app/src/main/java/fr/free/nrw/commons/utils/model/ConnectionType.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/utils/model/ConnectionType.kt\n@@ -1,9 +1,14 @@\n package fr.free.nrw.commons.utils.model\n \n-enum class ConnectionType(private val text: String) {\n- WIFI_NETWORK(\"wifi\"), CELLULAR_4G(\"cellular-4g\"), CELLULAR_3G(\"cellular-3g\"), CELLULAR(\"cellular\"), NO_INTERNET(\"no-internet\");\n+enum class ConnectionType(\n+ private val text: String,\n+) {\n+ WIFI_NETWORK(\"wifi\"),\n+ CELLULAR_4G(\"cellular-4g\"),\n+ CELLULAR_3G(\"cellular-3g\"),\n+ CELLULAR(\"cellular\"),\n+ NO_INTERNET(\"no-internet\"),\n+ ;\n \n- override fun toString(): String {\n- return text\n- }\n-}\n\\ No newline at end of file\n+ override fun toString(): String = text\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/utils/model/NetworkConnectionType.kt b/app/src/main/java/fr/free/nrw/commons/utils/model/NetworkConnectionType.kt\nindex d989932705..bf0c92128f 100644\n--- a/app/src/main/java/fr/free/nrw/commons/utils/model/NetworkConnectionType.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/utils/model/NetworkConnectionType.kt\n@@ -1,5 +1,9 @@\n package fr.free.nrw.commons.utils.model\n \n enum class NetworkConnectionType {\n- WIFI, TWO_G, THREE_G, FOUR_G, UNKNOWN\n-}\n\\ No newline at end of file\n+ WIFI,\n+ TWO_G,\n+ THREE_G,\n+ FOUR_G,\n+ UNKNOWN,\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/CommonsServiceFactory.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/CommonsServiceFactory.kt\nindex ca8cef4238..39dbf0cadc 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/CommonsServiceFactory.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/CommonsServiceFactory.kt\n@@ -5,20 +5,27 @@ import retrofit2.Retrofit\n import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory\n import retrofit2.converter.gson.GsonConverterFactory\n \n-class CommonsServiceFactory(private val okHttpClient: OkHttpClient) {\n-\n+class CommonsServiceFactory(\n+ private val okHttpClient: OkHttpClient,\n+) {\n private val builder: Retrofit.Builder by lazy {\n // All instances of retrofit share this configuration, but create it lazily\n- Retrofit.Builder().client(okHttpClient)\n+ Retrofit\n+ .Builder()\n+ .client(okHttpClient)\n .addCallAdapterFactory(RxJava2CallAdapterFactory.create())\n .addConverterFactory(GsonConverterFactory.create(GsonUtil.getDefaultGson()))\n }\n \n private val retrofitCache: MutableMap = mutableMapOf()\n \n- fun create(baseUrl: String, service: Class): T = retrofitCache.getOrPut(baseUrl) {\n- // Cache instances of retrofit based on API backend\n- builder.baseUrl(baseUrl).build()\n- }.create(service)\n-\n-}\n\\ No newline at end of file\n+ fun create(\n+ baseUrl: String,\n+ service: Class,\n+ ): T =\n+ retrofitCache\n+ .getOrPut(baseUrl) {\n+ // Cache instances of retrofit based on API backend\n+ builder.baseUrl(baseUrl).build()\n+ }.create(service)\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/WikiBaseClient.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/WikiBaseClient.kt\nindex d34a564a24..773c835907 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/WikiBaseClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/WikiBaseClient.kt\n@@ -16,65 +16,84 @@ import javax.inject.Singleton\n * Wikibase Client for calling WikiBase APIs\n */\n @Singleton\n-class WikiBaseClient @Inject constructor(\n- private val wikiBaseInterface: WikiBaseInterface,\n- @param:Named(NetworkingModule.NAMED_COMMONS_CSRF) private val csrfTokenClient: CsrfTokenClient\n-) {\n- fun postEditEntity(fileEntityId: String?, data: String?): Observable {\n- return csrfToken().switchMap { editToken ->\n- wikiBaseInterface.postEditEntity(fileEntityId!!, editToken, data!!)\n- .map { response: MwPostResponse -> response.successVal == 1 }\n- }\n- }\n+class WikiBaseClient\n+ @Inject\n+ constructor(\n+ private val wikiBaseInterface: WikiBaseInterface,\n+ @param:Named(NetworkingModule.NAMED_COMMONS_CSRF) private val csrfTokenClient: CsrfTokenClient,\n+ ) {\n+ fun postEditEntity(\n+ fileEntityId: String?,\n+ data: String?,\n+ ): Observable =\n+ csrfToken().switchMap { editToken ->\n+ wikiBaseInterface\n+ .postEditEntity(fileEntityId!!, editToken, data!!)\n+ .map { response: MwPostResponse -> response.successVal == 1 }\n+ }\n \n- /**\n- * Makes the server call for posting new depicts\n- *\n- * @param filename name of the file\n- * @param data data of the depicts to be uploaded\n- * @return Observable\n- */\n- fun postEditEntityByFilename(filename: String?, data: String?): Observable {\n- return csrfToken().switchMap { editToken ->\n- wikiBaseInterface.postEditEntityByFilename(filename!!, editToken, data!!)\n- .map { response: MwPostResponse -> response.successVal == 1 }\n- }\n- }\n+ /**\n+ * Makes the server call for posting new depicts\n+ *\n+ * @param filename name of the file\n+ * @param data data of the depicts to be uploaded\n+ * @return Observable\n+ */\n+ fun postEditEntityByFilename(\n+ filename: String?,\n+ data: String?,\n+ ): Observable =\n+ csrfToken().switchMap { editToken ->\n+ wikiBaseInterface\n+ .postEditEntityByFilename(filename!!, editToken, data!!)\n+ .map { response: MwPostResponse -> response.successVal == 1 }\n+ }\n \n- fun getClaimIdsByProperty(fileEntityId: String, property: String ): Observable> {\n- return wikiBaseInterface.getClaimsByProperty(fileEntityId, property).map { claimsResponse ->\n- claimsResponse.claims[property]?.mapNotNull { claim -> claim.id } ?: emptyList()\n- }\n- }\n+ fun getClaimIdsByProperty(\n+ fileEntityId: String,\n+ property: String,\n+ ): Observable> =\n+ wikiBaseInterface.getClaimsByProperty(fileEntityId, property).map { claimsResponse ->\n+ claimsResponse.claims[property]?.mapNotNull { claim -> claim.id } ?: emptyList()\n+ }\n \n- fun postDeleteClaims(entityId: String, data: String?): Observable {\n- return csrfToken().switchMap { editToken ->\n- wikiBaseInterface.postDeleteClaims(editToken, entityId, data!!)\n- .map { response: MwPostResponse -> response.successVal == 1 }\n- }\n- }\n+ fun postDeleteClaims(\n+ entityId: String,\n+ data: String?,\n+ ): Observable =\n+ csrfToken().switchMap { editToken ->\n+ wikiBaseInterface\n+ .postDeleteClaims(editToken, entityId, data!!)\n+ .map { response: MwPostResponse -> response.successVal == 1 }\n+ }\n \n- fun getFileEntityId(uploadResult: UploadResult): Observable {\n- return wikiBaseInterface.getFileEntityId(uploadResult.createCanonicalFileName())\n- .map { response: MwQueryResponse -> response.query()!!.pages()!![0].pageId().toLong() }\n- }\n+ fun getFileEntityId(uploadResult: UploadResult): Observable =\n+ wikiBaseInterface\n+ .getFileEntityId(uploadResult.createCanonicalFileName())\n+ .map { response: MwQueryResponse ->\n+ response\n+ .query()!!\n+ .pages()!![0]\n+ .pageId()\n+ .toLong()\n+ }\n \n- fun addLabelsToWikidata(\n- fileEntityId: Long,\n- languageCode: String?,\n- captionValue: String?\n- ): Observable {\n- return csrfToken().switchMap { editToken ->\n- wikiBaseInterface.addLabelstoWikidata(\n- PAGE_ID_PREFIX + fileEntityId,\n- editToken,\n- languageCode,\n- captionValue\n- )\n- }\n- }\n+ fun addLabelsToWikidata(\n+ fileEntityId: Long,\n+ languageCode: String?,\n+ captionValue: String?,\n+ ): Observable =\n+ csrfToken().switchMap { editToken ->\n+ wikiBaseInterface.addLabelstoWikidata(\n+ PAGE_ID_PREFIX + fileEntityId,\n+ editToken,\n+ languageCode,\n+ captionValue,\n+ )\n+ }\n \n- private fun csrfToken(): Observable = Observable.fromCallable {\n- csrfTokenClient.getTokenBlocking()\n+ private fun csrfToken(): Observable =\n+ Observable.fromCallable {\n+ csrfTokenClient.getTokenBlocking()\n+ }\n }\n-}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataClient.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataClient.kt\nindex d9d6dc33d8..3b3ea34015 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataClient.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataClient.kt\n@@ -1,32 +1,35 @@\n package fr.free.nrw.commons.wikidata\n \n import com.google.gson.Gson\n-import fr.free.nrw.commons.wikidata.model.Statement_partial\n+import fr.free.nrw.commons.wikidata.model.StatementPartial\n import fr.free.nrw.commons.wikidata.model.WbCreateClaimResponse\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n import io.reactivex.Observable\n import javax.inject.Inject\n import javax.inject.Singleton\n \n @Singleton\n-class WikidataClient @Inject constructor(\n- private val wikidataInterface: WikidataInterface,\n- private val gson: Gson\n-) {\n- /**\n- * Create wikidata claim to add P18 value\n- *\n- * @return revisionID of the edit\n- */\n- fun setClaim(claim: Statement_partial?, tags: String?): Observable {\n- return csrfToken().flatMap { csrfToken: String? ->\n- wikidataInterface.postSetClaim(gson.toJson(claim), tags!!, csrfToken!!)\n- }.map { mwPostResponse: WbCreateClaimResponse -> mwPostResponse.pageinfo.lastrevid }\n- }\n+class WikidataClient\n+ @Inject\n+ constructor(\n+ private val wikidataInterface: WikidataInterface,\n+ private val gson: Gson,\n+ ) {\n+ /**\n+ * Create wikidata claim to add P18 value\n+ *\n+ * @return revisionID of the edit\n+ */\n+ fun setClaim(\n+ claim: StatementPartial?,\n+ tags: String?,\n+ ): Observable =\n+ csrfToken()\n+ .flatMap { csrfToken: String? ->\n+ wikidataInterface.postSetClaim(gson.toJson(claim), tags!!, csrfToken!!)\n+ }.map { mwPostResponse: WbCreateClaimResponse -> mwPostResponse.pageinfo.lastrevid }\n \n- /**\n- * Get csrf token for wikidata edit\n- */\n- private fun csrfToken(): Observable =\n- wikidataInterface.getCsrfToken().map { it.query()?.csrfToken() }\n-}\n+ /**\n+ * Get csrf token for wikidata edit\n+ */\n+ private fun csrfToken(): Observable = wikidataInterface.getCsrfToken().map { it.query()?.csrfToken() }\n+ }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataDisambiguationItems.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataDisambiguationItems.kt\nindex fc36de81f6..7160df2ed0 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataDisambiguationItems.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataDisambiguationItems.kt\n@@ -1,8 +1,12 @@\n package fr.free.nrw.commons.wikidata\n \n-\n-enum class WikidataDisambiguationItems(val id: String) {\n- DISAMBIGUATION_PAGE(\"Q4167410\"), INTERNAL_ITEM(\"Q17442446\"), CATEGORY(\"Q4167836\");\n+enum class WikidataDisambiguationItems(\n+ val id: String,\n+) {\n+ DISAMBIGUATION_PAGE(\"Q4167410\"),\n+ INTERNAL_ITEM(\"Q17442446\"),\n+ CATEGORY(\"Q4167836\"),\n+ ;\n \n companion object {\n fun isDisambiguationItem(ids: List) =\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java\nindex 8e298cc9a6..21567f5e44 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java\n@@ -19,8 +19,8 @@\n import fr.free.nrw.commons.wikidata.model.DataValue.ValueString;\n import fr.free.nrw.commons.wikidata.model.EditClaim;\n import fr.free.nrw.commons.wikidata.model.RemoveClaim;\n-import fr.free.nrw.commons.wikidata.model.Snak_partial;\n-import fr.free.nrw.commons.wikidata.model.Statement_partial;\n+import fr.free.nrw.commons.wikidata.model.SnakPartial;\n+import fr.free.nrw.commons.wikidata.model.StatementPartial;\n import fr.free.nrw.commons.wikidata.model.WikiBaseMonolingualTextValue;\n import fr.free.nrw.commons.wikidata.mwapi.MwPostResponse;\n import io.reactivex.Observable;\n@@ -198,19 +198,19 @@ public Long createClaim(@Nullable final WikidataPlace wikidataPlace, final Strin\n \n public Long addImageAndMediaLegends(final WikidataItem wikidataItem, final String fileName,\n final Map captions) {\n- final Snak_partial p18 = new Snak_partial(\"value\",\n+ final SnakPartial p18 = new SnakPartial(\"value\",\n WikidataProperties.IMAGE.getPropertyName(),\n new ValueString(fileName.replace(\"File:\", \"\")));\n \n- final List snaks = new ArrayList<>();\n+ final List snaks = new ArrayList<>();\n for (final Map.Entry entry : captions.entrySet()) {\n- snaks.add(new Snak_partial(\"value\",\n+ snaks.add(new SnakPartial(\"value\",\n WikidataProperties.MEDIA_LEGENDS.getPropertyName(), new DataValue.MonoLingualText(\n new WikiBaseMonolingualTextValue(entry.getValue(), entry.getKey()))));\n }\n \n final String id = wikidataItem.getId() + \"$\" + UUID.randomUUID().toString();\n- final Statement_partial claim = new Statement_partial(p18, \"statement\", \"normal\", id,\n+ final StatementPartial claim = new StatementPartial(p18, \"statement\", \"normal\", id,\n Collections.singletonMap(WikidataProperties.MEDIA_LEGENDS.getPropertyName(), snaks),\n Arrays.asList(WikidataProperties.MEDIA_LEGENDS.getPropertyName()));\n \ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataInterface.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataInterface.kt\nindex 35b3e15935..7a56537ae8 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataInterface.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataInterface.kt\n@@ -26,6 +26,6 @@ interface WikidataInterface {\n fun postSetClaim(\n @Field(\"claim\") request: String,\n @Field(\"tags\") tags: String,\n- @Field(\"token\") token: String\n+ @Field(\"token\") token: String,\n ): Observable\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataProperties.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataProperties.kt\nindex dbeb0dc766..5e82c3c809 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataProperties.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataProperties.kt\n@@ -2,10 +2,12 @@ package fr.free.nrw.commons.wikidata\n \n import fr.free.nrw.commons.BuildConfig\n \n-enum class WikidataProperties(val propertyName: String) {\n+enum class WikidataProperties(\n+ val propertyName: String,\n+) {\n IMAGE(\"P18\"),\n DEPICTS(BuildConfig.DEPICTS_PROPERTY),\n COMMONS_CATEGORY(\"P373\"),\n INSTANCE_OF(\"P31\"),\n- MEDIA_LEGENDS(\"P2096\");\n+ MEDIA_LEGENDS(\"P2096\"),\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/cookies/CommonsCookieJar.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/cookies/CommonsCookieJar.kt\nindex fbc88f55a3..6e0c0e9016 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/cookies/CommonsCookieJar.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/cookies/CommonsCookieJar.kt\n@@ -4,7 +4,9 @@ import okhttp3.Cookie\n import okhttp3.CookieJar\n import okhttp3.HttpUrl\n \n-class CommonsCookieJar(private val cookieStorage: CommonsCookieStorage) : CookieJar {\n+class CommonsCookieJar(\n+ private val cookieStorage: CommonsCookieStorage,\n+) : CookieJar {\n override fun loadForRequest(url: HttpUrl): List {\n val cookieList = mutableListOf()\n val domain: String = url.toUri().getAuthority()\n@@ -21,7 +23,10 @@ class CommonsCookieJar(private val cookieStorage: CommonsCookieStorage) : Cookie\n return cookieList\n }\n \n- override fun saveFromResponse(url: HttpUrl, cookies: List) {\n+ override fun saveFromResponse(\n+ url: HttpUrl,\n+ cookies: List,\n+ ) {\n if (cookies.isEmpty()) {\n return\n }\n@@ -66,7 +71,9 @@ class CommonsCookieJar(private val cookieStorage: CommonsCookieStorage) : Cookie\n }\n \n private fun buildCookieList(\n- outList: MutableList, inList: MutableList, prefix: String?\n+ outList: MutableList,\n+ inList: MutableList,\n+ prefix: String?,\n ) {\n var cookieJarModified = false\n \n@@ -90,14 +97,11 @@ class CommonsCookieJar(private val cookieStorage: CommonsCookieStorage) : Cookie\n }\n }\n \n- private fun Cookie.expiredOrDeleted(): Boolean =\n- expiresAt < System.currentTimeMillis() || \"deleted\" == value\n+ private fun Cookie.expiredOrDeleted(): Boolean = expiresAt < System.currentTimeMillis() || \"deleted\" == value\n \n- private fun Cookie.domainSpec(url: HttpUrl): String =\n- domain.ifEmpty { url.toUri().getAuthority() }\n+ private fun Cookie.domainSpec(url: HttpUrl): String = domain.ifEmpty { url.toUri().getAuthority() }\n \n fun clear() {\n cookieStorage.clear()\n }\n-\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/cookies/CommonsCookieStorage.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/cookies/CommonsCookieStorage.kt\nindex 211b2a5013..2b0e780704 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/cookies/CommonsCookieStorage.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/cookies/CommonsCookieStorage.kt\n@@ -5,27 +5,32 @@ import com.google.gson.TypeAdapter\n import com.google.gson.stream.JsonReader\n import com.google.gson.stream.JsonWriter\n import fr.free.nrw.commons.kvstore.JsonKvStore\n+import fr.free.nrw.commons.wikidata.model.WikiSite\n import okhttp3.Cookie\n import okhttp3.HttpUrl\n import okhttp3.HttpUrl.Companion.toHttpUrlOrNull\n-import fr.free.nrw.commons.wikidata.model.WikiSite\n \n private const val COOKIE_STORE = \"cookie_store\"\n \n-class CommonsCookieStorage(private val preferences: JsonKvStore? = null) {\n- private val gson = GsonBuilder().registerTypeAdapter(\n- CommonsCookieStorage::class.java,\n- CookieStorageTypeAdapter()\n- ).create()\n+class CommonsCookieStorage(\n+ private val preferences: JsonKvStore? = null,\n+) {\n+ private val gson =\n+ GsonBuilder()\n+ .registerTypeAdapter(\n+ CommonsCookieStorage::class.java,\n+ CookieStorageTypeAdapter(),\n+ ).create()\n private val cookieMap: MutableMap> = mutableMapOf()\n \n- val domains : Set get() = cookieMap.keys.toSet()\n+ val domains: Set get() = cookieMap.keys.toSet()\n \n- operator fun set(domainSpec: String, cookies: MutableList) =\n- cookieMap.put(domainSpec, cookies.toList())\n+ operator fun set(\n+ domainSpec: String,\n+ cookies: MutableList,\n+ ) = cookieMap.put(domainSpec, cookies.toList())\n \n- operator fun get(domainSpec: String): MutableList =\n- cookieMap[domainSpec]?.toMutableList() ?: mutableListOf()\n+ operator fun get(domainSpec: String): MutableList = cookieMap[domainSpec]?.toMutableList() ?: mutableListOf()\n \n fun clear() {\n cookieMap.clear()\n@@ -41,22 +46,24 @@ class CommonsCookieStorage(private val preferences: JsonKvStore? = null) {\n }\n }\n \n- fun save() =\n- preferences!!.putString(COOKIE_STORE, gson.toJson(this))\n+ fun save() = preferences!!.putString(COOKIE_STORE, gson.toJson(this))\n \n- fun contains(domainSpec: String): Boolean =\n- cookieMap.containsKey(domainSpec)\n+ fun contains(domainSpec: String): Boolean = cookieMap.containsKey(domainSpec)\n \n companion object {\n- fun from(map: Map>) = CommonsCookieStorage().apply {\n- cookieMap.clear()\n- cookieMap.putAll(map)\n- }\n+ fun from(map: Map>) =\n+ CommonsCookieStorage().apply {\n+ cookieMap.clear()\n+ cookieMap.putAll(map)\n+ }\n }\n }\n \n private class CookieStorageTypeAdapter : TypeAdapter() {\n- override fun write(out: JsonWriter, value: CommonsCookieStorage) {\n+ override fun write(\n+ out: JsonWriter,\n+ value: CommonsCookieStorage,\n+ ) {\n out.beginObject()\n value.domains.forEach { domain ->\n out.name(domain).beginArray()\n@@ -90,4 +97,4 @@ private class CookieStorageTypeAdapter : TypeAdapter() {\n endArray()\n return list\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/AddEditTagResponse.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/model/AddEditTagResponse.kt\nindex 735f9a344f..7d7ecdab70 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/AddEditTagResponse.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/AddEditTagResponse.kt\n@@ -10,4 +10,4 @@ class AddEditTagResponse {\n @SerializedName(\"tag\")\n @Expose\n var tag: List? = null\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/BaseModel.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/model/BaseModel.kt\nindex 88c5aa5e8e..951dd860c8 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/BaseModel.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/BaseModel.kt\n@@ -5,15 +5,9 @@ import org.apache.commons.lang3.builder.HashCodeBuilder\n import org.apache.commons.lang3.builder.ToStringBuilder\n \n abstract class BaseModel {\n- override fun toString(): String {\n- return ToStringBuilder.reflectionToString(this)\n- }\n+ override fun toString(): String = ToStringBuilder.reflectionToString(this)\n \n- override fun hashCode(): Int {\n- return HashCodeBuilder.reflectionHashCode(this)\n- }\n+ override fun hashCode(): Int = HashCodeBuilder.reflectionHashCode(this)\n \n- override fun equals(other: Any?): Boolean {\n- return EqualsBuilder.reflectionEquals(this, other)\n- }\n+ override fun equals(other: Any?): Boolean = EqualsBuilder.reflectionEquals(this, other)\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/DataValue.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/model/DataValue.kt\nindex 4790822be0..88453a4ac8 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/DataValue.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/DataValue.kt\n@@ -2,16 +2,19 @@ package fr.free.nrw.commons.wikidata.model\n \n import fr.free.nrw.commons.wikidata.json.RuntimeTypeAdapterFactory\n \n-sealed class DataValue(val type: String) {\n+sealed class DataValue(\n+ val type: String,\n+) {\n companion object {\n @JvmStatic\n val polymorphicTypeAdapter =\n- RuntimeTypeAdapterFactory.of(DataValue::class.java, DataValue::type.name)\n+ RuntimeTypeAdapterFactory\n+ .of(DataValue::class.java, DataValue::type.name)\n .registerSubtype(EntityId::class.java, EntityId.TYPE)\n .registerSubtype(ValueString::class.java, ValueString.TYPE)\n- .registerSubtype(GlobeCoordinate_partial::class.java, GlobeCoordinate_partial.TYPE)\n- .registerSubtype(Time_partial::class.java, Time_partial.TYPE)\n- .registerSubtype(Quantity_partial::class.java, Quantity_partial.TYPE)\n+ .registerSubtype(GlobeCoordinatePartial::class.java, GlobeCoordinatePartial.TYPE)\n+ .registerSubtype(TimePartial::class.java, TimePartial.TYPE)\n+ .registerSubtype(QuantityPartial::class.java, QuantityPartial.TYPE)\n .registerSubtype(MonoLingualText::class.java, MonoLingualText.TYPE)\n }\n \n@@ -22,7 +25,9 @@ sealed class DataValue(val type: String) {\n // },\n // \"type\": \"wikibase-entityid\"\n // }\n- data class EntityId(val value: WikiBaseEntityValue) : DataValue(TYPE) {\n+ data class EntityId(\n+ val value: WikiBaseEntityValue,\n+ ) : DataValue(TYPE) {\n companion object {\n const val TYPE = \"wikibase-entityid\"\n }\n@@ -32,7 +37,9 @@ sealed class DataValue(val type: String) {\n // \"value\": \"SomePicture.jpg\",\n // \"type\": \"string\"\n // }\n- data class ValueString(val value: String) : DataValue(TYPE) {\n+ data class ValueString(\n+ val value: String,\n+ ) : DataValue(TYPE) {\n companion object {\n const val TYPE = \"string\"\n }\n@@ -47,7 +54,7 @@ sealed class DataValue(val type: String) {\n // },\n // \"type\": \"globecoordinate\"\n // }\n- class GlobeCoordinate_partial() : DataValue(TYPE) {\n+ class GlobeCoordinatePartial : DataValue(TYPE) {\n companion object {\n const val TYPE = \"globecoordinate\"\n }\n@@ -63,7 +70,7 @@ sealed class DataValue(val type: String) {\n // },\n // \"type\": \"time\"\n // }\n- class Time_partial() : DataValue(TYPE) {\n+ class TimePartial : DataValue(TYPE) {\n companion object {\n const val TYPE = \"time\"\n }\n@@ -75,7 +82,7 @@ sealed class DataValue(val type: String) {\n // \"unit\": \"http://www.wikidata.org/entity/Q828224\"\n // }\n // }\n- class Quantity_partial() : DataValue(TYPE) {\n+ class QuantityPartial : DataValue(TYPE) {\n companion object {\n const val TYPE = \"quantity\"\n }\n@@ -87,7 +94,9 @@ sealed class DataValue(val type: String) {\n // \"language\": \"ko\"\n // }\n // }\n- class MonoLingualText(val value: WikiBaseMonolingualTextValue) : DataValue(TYPE) {\n+ class MonoLingualText(\n+ val value: WikiBaseMonolingualTextValue,\n+ ) : DataValue(TYPE) {\n companion object {\n const val TYPE = \"monolingualtext\"\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/DepictSearchItem.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/model/DepictSearchItem.kt\nindex 596426f507..b1d9d45ad4 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/DepictSearchItem.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/DepictSearchItem.kt\n@@ -23,5 +23,5 @@ class DepictSearchItem(\n val pageid: String,\n val url: String,\n val label: String,\n- val description: String?\n+ val description: String?,\n )\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/EditClaim.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/model/EditClaim.kt\nindex 5d2ab7e389..5919fff103 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/EditClaim.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/EditClaim.kt\n@@ -1,30 +1,34 @@\n package fr.free.nrw.commons.wikidata.model\n \n-\n-data class EditClaim(val claims: List) {\n-\n+data class EditClaim(\n+ val claims: List,\n+) {\n companion object {\n @JvmStatic\n- fun from(entityIds: List, propertyName: String): EditClaim {\n-\n- val list = mutableListOf()\n+ fun from(\n+ entityIds: List,\n+ propertyName: String,\n+ ): EditClaim {\n+ val list = mutableListOf()\n entityIds.forEach {\n list.add(\n- Statement_partial(\n- mainSnak = Snak_partial(\n- snakType = \"value\",\n- property = propertyName,\n- dataValue = DataValue.EntityId(\n- WikiBaseEntityValue(\n- entityType = \"item\",\n- id = it,\n- numericId = it.removePrefix(\"Q\").toLong()\n- )\n- )\n- ),\n+ StatementPartial(\n+ mainSnak =\n+ SnakPartial(\n+ snakType = \"value\",\n+ property = propertyName,\n+ dataValue =\n+ DataValue.EntityId(\n+ WikiBaseEntityValue(\n+ entityType = \"item\",\n+ id = it,\n+ numericId = it.removePrefix(\"Q\").toLong(),\n+ ),\n+ ),\n+ ),\n type = \"statement\",\n- rank = \"preferred\"\n- )\n+ rank = \"preferred\",\n+ ),\n )\n }\n return EditClaim(list)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/EditTag.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/model/EditTag.kt\nindex 3ff8b7e28a..4d63f4f525 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/EditTag.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/EditTag.kt\n@@ -6,4 +6,10 @@ import com.google.gson.annotations.SerializedName\n /**\n * Tag class used when adding wikidata edit tag\n */\n-class EditTag(@field:Expose @field:SerializedName(\"revid\") val revid: Int, @field:Expose @field:SerializedName(\"status\") val status: String, @field:Expose @field:SerializedName(\"actionlogid\") val actionlogid: Int, @field:Expose @field:SerializedName(\"added\") val added: List, @field:Expose @field:SerializedName(\"removed\") val removed: List)\n\\ No newline at end of file\n+class EditTag(\n+ @field:Expose @field:SerializedName(\"revid\") val revid: Int,\n+ @field:Expose @field:SerializedName(\"status\") val status: String,\n+ @field:Expose @field:SerializedName(\"actionlogid\") val actionlogid: Int,\n+ @field:Expose @field:SerializedName(\"added\") val added: List,\n+ @field:Expose @field:SerializedName(\"removed\") val removed: List,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/Entities.java b/app/src/main/java/fr/free/nrw/commons/wikidata/model/Entities.java\nindex ea9ec6c2a5..9dab836cf8 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/Entities.java\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/Entities.java\n@@ -44,7 +44,7 @@ public static class Entity {\n @Nullable private Map labels;\n @Nullable private Map descriptions;\n @Nullable private Map sitelinks;\n- @Nullable @SerializedName(value = \"statements\", alternate = \"claims\") private Map> statements;\n+ @Nullable @SerializedName(value = \"statements\", alternate = \"claims\") private Map> statements;\n @Nullable private String missing;\n \n @NonNull public String id() {\n@@ -64,7 +64,7 @@ public static class Entity {\n }\n \n @Nullable\n- public Map> getStatements() {\n+ public Map> getStatements() {\n return statements;\n }\n \ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/EnumCodeMap.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/model/EnumCodeMap.kt\nindex 3f804f333e..4b358cc498 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/EnumCodeMap.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/EnumCodeMap.kt\n@@ -2,16 +2,16 @@ package fr.free.nrw.commons.wikidata.model\n \n import android.util.SparseArray\n \n-class EnumCodeMap(enumeration: Class) where T : Enum, T : EnumCode {\n+class EnumCodeMap(\n+ enumeration: Class,\n+) where T : Enum, T : EnumCode {\n private val map: SparseArray\n \n init {\n map = codeToEnumMap(enumeration)\n }\n \n- operator fun get(code: Int): T {\n- return map.get(code) ?: throw IllegalArgumentException(\"code=$code\")\n- }\n+ operator fun get(code: Int): T = map.get(code) ?: throw IllegalArgumentException(\"code=$code\")\n \n private fun codeToEnumMap(enumeration: Class): SparseArray {\n val ret = SparseArray()\n@@ -21,7 +21,5 @@ class EnumCodeMap(enumeration: Class) where T : Enum, T : EnumCode {\n return ret\n }\n \n- fun size(): Int {\n- return map.size()\n- }\n+ fun size(): Int = map.size()\n }\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/GetWikidataEditCountResponse.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/model/GetWikidataEditCountResponse.kt\nindex 973ac25272..44e715151e 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/GetWikidataEditCountResponse.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/GetWikidataEditCountResponse.kt\n@@ -2,4 +2,6 @@ package fr.free.nrw.commons.wikidata.model\n \n import com.google.gson.annotations.SerializedName\n \n-class GetWikidataEditCountResponse(@field:SerializedName(\"edits\") val wikidataEditCount: Int)\n\\ No newline at end of file\n+class GetWikidataEditCountResponse(\n+ @field:SerializedName(\"edits\") val wikidataEditCount: Int,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/PageInfo.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/model/PageInfo.kt\nindex 97e6cb4c21..1b580d3430 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/PageInfo.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/PageInfo.kt\n@@ -6,4 +6,6 @@ import com.google.gson.annotations.SerializedName\n /**\n * PageInfo model class with last revision id of the edited Wikidata entity\n */\n-class PageInfo(@field:Expose @field:SerializedName(\"lastrevid\") val lastrevid: Long)\n\\ No newline at end of file\n+class PageInfo(\n+ @field:Expose @field:SerializedName(\"lastrevid\") val lastrevid: Long,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/RemoveClaim.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/model/RemoveClaim.kt\nindex 1e553ae3ee..02a88c4e22 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/RemoveClaim.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/RemoveClaim.kt\n@@ -1,6 +1,8 @@\n package fr.free.nrw.commons.wikidata.model\n \n-data class RemoveClaim(val claims: List) {\n+data class RemoveClaim(\n+ val claims: List,\n+) {\n companion object {\n @JvmStatic\n fun from(claimIds: List): RemoveClaim {\n@@ -8,7 +10,7 @@ data class RemoveClaim(val claims: List) {\n \n claimIds.forEach {\n claimsToRemove.add(\n- ClaimRemoveRequest(id = it, remove = \"\")\n+ ClaimRemoveRequest(id = it, remove = \"\"),\n )\n }\n \n@@ -17,4 +19,7 @@ data class RemoveClaim(val claims: List) {\n }\n }\n \n-data class ClaimRemoveRequest(val id: String, val remove: String)\n\\ No newline at end of file\n+data class ClaimRemoveRequest(\n+ val id: String,\n+ val remove: String,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/Snak_partial.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/model/SnakPartial.kt\nsimilarity index 84%\nrename from app/src/main/java/fr/free/nrw/commons/wikidata/model/Snak_partial.kt\nrename to app/src/main/java/fr/free/nrw/commons/wikidata/model/SnakPartial.kt\nindex 9ffe054346..576fb2fa94 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/Snak_partial.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/SnakPartial.kt\n@@ -15,8 +15,8 @@ import com.google.gson.annotations.SerializedName\n },\n \"datatype\": \"wikibase-item\",\n }*/\n-data class Snak_partial(\n+data class SnakPartial(\n @SerializedName(\"snaktype\") val snakType: String,\n val property: String,\n- @SerializedName(\"datavalue\") val dataValue: DataValue\n+ @SerializedName(\"datavalue\") val dataValue: DataValue,\n )\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/Statement_partial.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/model/StatementPartial.kt\nsimilarity index 75%\nrename from app/src/main/java/fr/free/nrw/commons/wikidata/model/Statement_partial.kt\nrename to app/src/main/java/fr/free/nrw/commons/wikidata/model/StatementPartial.kt\nindex 5bfb33e192..4d357f85ca 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/Statement_partial.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/StatementPartial.kt\n@@ -18,11 +18,11 @@ import com.google.gson.annotations.SerializedName\n }\n ]\n }*/\n-data class Statement_partial(\n- @SerializedName(\"mainsnak\") val mainSnak: Snak_partial,\n+data class StatementPartial(\n+ @SerializedName(\"mainsnak\") val mainSnak: SnakPartial,\n val type: String,\n val rank: String,\n val id: String? = null,\n- val qualifiers: Map> = mapOf(),\n- @SerializedName(\"qualifiers-order\") val qualifiersOrder: List = listOf()\n+ val qualifiers: Map> = mapOf(),\n+ @SerializedName(\"qualifiers-order\") val qualifiersOrder: List = listOf(),\n )\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/WbCreateClaimResponse.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/model/WbCreateClaimResponse.kt\nindex 425931b474..2188939464 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/WbCreateClaimResponse.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/WbCreateClaimResponse.kt\n@@ -6,4 +6,7 @@ import com.google.gson.annotations.SerializedName\n /**\n * Wikidata create claim response model class\n */\n-class WbCreateClaimResponse(@field:Expose @field:SerializedName(\"pageinfo\") val pageinfo: PageInfo, @field:Expose @field:SerializedName(\"success\") val success: Int)\n\\ No newline at end of file\n+class WbCreateClaimResponse(\n+ @field:Expose @field:SerializedName(\"pageinfo\") val pageinfo: PageInfo,\n+ @field:Expose @field:SerializedName(\"success\") val success: Int,\n+)\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/WikiBaseEntityValue.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/model/WikiBaseEntityValue.kt\nindex f35b525614..d672b0840f 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/WikiBaseEntityValue.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/WikiBaseEntityValue.kt\n@@ -10,5 +10,5 @@ import com.google.gson.annotations.SerializedName\n data class WikiBaseEntityValue(\n @SerializedName(\"entity-type\") val entityType: String,\n val id: String,\n- val numericId: Long\n+ val numericId: Long,\n )\ndiff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/WikiBaseMonolingualTextValue.kt b/app/src/main/java/fr/free/nrw/commons/wikidata/model/WikiBaseMonolingualTextValue.kt\nindex 6b58c17805..84a78e646b 100644\n--- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/WikiBaseMonolingualTextValue.kt\n+++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/WikiBaseMonolingualTextValue.kt\n@@ -1,7 +1,5 @@\n package fr.free.nrw.commons.wikidata.model\n \n-import com.google.gson.annotations.SerializedName\n-\n /*\"value\": {\n \"type\": \"monolingualtext\",\n \"value\": {\n@@ -10,4 +8,7 @@ import com.google.gson.annotations.SerializedName\n }\n }*/\n \n-data class WikiBaseMonolingualTextValue(val text: String, val language: String)\n\\ No newline at end of file\n+data class WikiBaseMonolingualTextValue(\n+ val text: String,\n+ val language: String,\n+)\n", "test_patch": "diff --git a/app/src/androidTest/java/fr/free/nrw/commons/AboutActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/AboutActivityTest.kt\nindex 9425a1d476..b5a752ef90 100644\n--- a/app/src/androidTest/java/fr/free/nrw/commons/AboutActivityTest.kt\n+++ b/app/src/androidTest/java/fr/free/nrw/commons/AboutActivityTest.kt\n@@ -25,7 +25,6 @@ import org.junit.runner.RunWith\n \n @RunWith(AndroidJUnit4::class)\n class AboutActivityTest {\n-\n @get:Rule\n var activityRule: ActivityTestRule<*> = ActivityTestRule(AboutActivity::class.java)\n \n@@ -36,7 +35,8 @@ class AboutActivityTest {\n device.setOrientationNatural()\n device.freezeRotation()\n Intents.init()\n- Intents.intending(CoreMatchers.not(IntentMatchers.isInternal()))\n+ Intents\n+ .intending(CoreMatchers.not(IntentMatchers.isInternal()))\n .respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, null))\n }\n \n@@ -47,11 +47,12 @@ class AboutActivityTest {\n \n @Test\n fun testBuildNumber() {\n- Espresso.onView(ViewMatchers.withId(R.id.about_version))\n+ Espresso\n+ .onView(ViewMatchers.withId(R.id.about_version))\n .check(\n ViewAssertions.matches(\n- withText(getApplicationContext().getVersionNameWithSha())\n- )\n+ withText(getApplicationContext().getVersionNameWithSha()),\n+ ),\n )\n }\n \n@@ -61,8 +62,8 @@ class AboutActivityTest {\n Intents.intended(\n CoreMatchers.allOf(\n IntentMatchers.hasAction(Intent.ACTION_VIEW),\n- IntentMatchers.hasData(Urls.WEBSITE_URL)\n- )\n+ IntentMatchers.hasData(Urls.WEBSITE_URL),\n+ ),\n )\n }\n \n@@ -73,8 +74,8 @@ class AboutActivityTest {\n CoreMatchers.anyOf(\n IntentMatchers.hasAction(Intent.ACTION_VIEW),\n IntentMatchers.hasData(Urls.FACEBOOK_WEB_URL),\n- IntentMatchers.hasPackage(Urls.FACEBOOK_PACKAGE_NAME)\n- )\n+ IntentMatchers.hasPackage(Urls.FACEBOOK_PACKAGE_NAME),\n+ ),\n )\n }\n \n@@ -84,8 +85,8 @@ class AboutActivityTest {\n Intents.intended(\n CoreMatchers.allOf(\n IntentMatchers.hasAction(Intent.ACTION_VIEW),\n- IntentMatchers.hasData(Urls.GITHUB_REPO_URL)\n- )\n+ IntentMatchers.hasData(Urls.GITHUB_REPO_URL),\n+ ),\n )\n }\n \n@@ -95,8 +96,8 @@ class AboutActivityTest {\n Intents.intended(\n CoreMatchers.allOf(\n IntentMatchers.hasAction(Intent.ACTION_VIEW),\n- IntentMatchers.hasData(BuildConfig.PRIVACY_POLICY_URL)\n- )\n+ IntentMatchers.hasData(BuildConfig.PRIVACY_POLICY_URL),\n+ ),\n )\n }\n \n@@ -108,8 +109,8 @@ class AboutActivityTest {\n Intents.intended(\n CoreMatchers.allOf(\n IntentMatchers.hasAction(Intent.ACTION_VIEW),\n- IntentMatchers.hasData(\"${Urls.TRANSLATE_WIKI_URL}$langCode\")\n- )\n+ IntentMatchers.hasData(\"${Urls.TRANSLATE_WIKI_URL}$langCode\"),\n+ ),\n )\n }\n \n@@ -119,27 +120,30 @@ class AboutActivityTest {\n Intents.intended(\n CoreMatchers.allOf(\n IntentMatchers.hasAction(Intent.ACTION_VIEW),\n- IntentMatchers.hasData(Urls.CREDITS_URL)\n- )\n+ IntentMatchers.hasData(Urls.CREDITS_URL),\n+ ),\n )\n }\n \n @Test\n fun testLaunchUserGuide() {\n Espresso.onView(ViewMatchers.withId(R.id.about_user_guide)).perform(ViewActions.click())\n- Intents.intended(CoreMatchers.allOf(IntentMatchers.hasAction(Intent.ACTION_VIEW),\n- IntentMatchers.hasData(Urls.USER_GUIDE_URL)))\n+ Intents.intended(\n+ CoreMatchers.allOf(\n+ IntentMatchers.hasAction(Intent.ACTION_VIEW),\n+ IntentMatchers.hasData(Urls.USER_GUIDE_URL),\n+ ),\n+ )\n }\n \n-\n @Test\n fun testLaunchAboutFaq() {\n Espresso.onView(ViewMatchers.withId(R.id.about_faq)).perform(ViewActions.click())\n Intents.intended(\n CoreMatchers.allOf(\n IntentMatchers.hasAction(Intent.ACTION_VIEW),\n- IntentMatchers.hasData(Urls.FAQ_URL)\n- )\n+ IntentMatchers.hasData(Urls.FAQ_URL),\n+ ),\n )\n }\n }\ndiff --git a/app/src/androidTest/java/fr/free/nrw/commons/LoginActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/LoginActivityTest.kt\nindex 5039a24954..9bfc9321b4 100644\n--- a/app/src/androidTest/java/fr/free/nrw/commons/LoginActivityTest.kt\n+++ b/app/src/androidTest/java/fr/free/nrw/commons/LoginActivityTest.kt\n@@ -18,12 +18,14 @@ import fr.free.nrw.commons.auth.LoginActivity\n import fr.free.nrw.commons.auth.SignupActivity\n import org.hamcrest.CoreMatchers\n import org.hamcrest.CoreMatchers.not\n-import org.junit.*\n+import org.junit.After\n+import org.junit.Before\n+import org.junit.Rule\n+import org.junit.Test\n import org.junit.runner.RunWith\n \n @RunWith(AndroidJUnit4::class)\n class LoginActivityTest {\n-\n @get:Rule\n var activityRule = ActivityTestRule(LoginActivity::class.java)\n \n@@ -49,8 +51,8 @@ class LoginActivityTest {\n Intents.intended(\n CoreMatchers.allOf(\n IntentMatchers.hasAction(Intent.ACTION_VIEW),\n- IntentMatchers.hasData(BuildConfig.FORGOT_PASSWORD_URL)\n- )\n+ IntentMatchers.hasData(BuildConfig.FORGOT_PASSWORD_URL),\n+ ),\n )\n }\n \n@@ -64,4 +66,4 @@ class LoginActivityTest {\n fun orientationChange() {\n UITestHelper.changeOrientation(activityRule)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/androidTest/java/fr/free/nrw/commons/MainActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/MainActivityTest.kt\nindex 458d8de3ea..3d2fc9e481 100644\n--- a/app/src/androidTest/java/fr/free/nrw/commons/MainActivityTest.kt\n+++ b/app/src/androidTest/java/fr/free/nrw/commons/MainActivityTest.kt\n@@ -21,20 +21,23 @@ import fr.free.nrw.commons.kvstore.JsonKvStore\n import fr.free.nrw.commons.notification.NotificationActivity\n import org.hamcrest.CoreMatchers\n import org.hamcrest.Matchers\n-import org.junit.*\n+import org.junit.After\n+import org.junit.Before\n+import org.junit.Rule\n+import org.junit.Test\n import org.junit.runner.RunWith\n \n @LargeTest\n @RunWith(AndroidJUnit4::class)\n class MainActivityTest {\n-\n @get:Rule\n var activityRule: ActivityTestRule<*> = ActivityTestRule(LoginActivity::class.java)\n \n @get:Rule\n- var mGrantPermissionRule: GrantPermissionRule = GrantPermissionRule.grant(\n- \"android.permission.ACCESS_FINE_LOCATION\"\n- )\n+ var mGrantPermissionRule: GrantPermissionRule =\n+ GrantPermissionRule.grant(\n+ \"android.permission.ACCESS_FINE_LOCATION\",\n+ )\n \n private val device: UiDevice =\n UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())\n@@ -48,7 +51,8 @@ class MainActivityTest {\n UITestHelper.loginUser()\n UITestHelper.skipWelcome()\n Intents.init()\n- Intents.intending(CoreMatchers.not(IntentMatchers.isInternal()))\n+ Intents\n+ .intending(CoreMatchers.not(IntentMatchers.isInternal()))\n .respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, null))\n val context = InstrumentationRegistry.getInstrumentation().targetContext\n val storeName = context.packageName + \"_preferences\"\n@@ -62,137 +66,149 @@ class MainActivityTest {\n \n @Test\n fun testNearby() {\n- Espresso.onView(\n- Matchers.allOf(\n- childAtPosition(\n+ Espresso\n+ .onView(\n+ Matchers.allOf(\n childAtPosition(\n- ViewMatchers.withId(R.id.fragment_main_nav_tab_layout),\n- 0\n+ childAtPosition(\n+ ViewMatchers.withId(R.id.fragment_main_nav_tab_layout),\n+ 0,\n+ ),\n+ 1,\n ),\n- 1\n+ ViewMatchers.isDisplayed(),\n ),\n- ViewMatchers.isDisplayed()\n- )\n- ).perform(ViewActions.click())\n- Espresso.onView(ViewMatchers.withId(R.id.fragmentContainer))\n+ ).perform(ViewActions.click())\n+ Espresso\n+ .onView(ViewMatchers.withId(R.id.fragmentContainer))\n .check(matches(ViewMatchers.isDisplayed()))\n UITestHelper.sleep(10000)\n- val actionMenuItemView2 = Espresso.onView(\n- Matchers.allOf(\n- ViewMatchers.withId(R.id.list_sheet), ViewMatchers.withContentDescription(\"List\"),\n- childAtPosition(\n+ val actionMenuItemView2 =\n+ Espresso.onView(\n+ Matchers.allOf(\n+ ViewMatchers.withId(R.id.list_sheet),\n+ ViewMatchers.withContentDescription(\"List\"),\n childAtPosition(\n- ViewMatchers.withId(R.id.toolbar),\n- 1\n+ childAtPosition(\n+ ViewMatchers.withId(R.id.toolbar),\n+ 1,\n+ ),\n+ 0,\n ),\n- 0\n+ ViewMatchers.isDisplayed(),\n ),\n- ViewMatchers.isDisplayed()\n )\n- )\n actionMenuItemView2.perform(ViewActions.click())\n UITestHelper.sleep(1000)\n }\n \n @Test\n fun testExplore() {\n- Espresso.onView(\n- Matchers.allOf(\n- childAtPosition(\n+ Espresso\n+ .onView(\n+ Matchers.allOf(\n childAtPosition(\n- ViewMatchers.withId(R.id.fragment_main_nav_tab_layout),\n- 0\n+ childAtPosition(\n+ ViewMatchers.withId(R.id.fragment_main_nav_tab_layout),\n+ 0,\n+ ),\n+ 2,\n ),\n- 2\n+ ViewMatchers.isDisplayed(),\n ),\n- ViewMatchers.isDisplayed()\n- )\n- ).perform(ViewActions.click())\n- Espresso.onView(ViewMatchers.withId(R.id.fragmentContainer))\n+ ).perform(ViewActions.click())\n+ Espresso\n+ .onView(ViewMatchers.withId(R.id.fragmentContainer))\n .check(matches(ViewMatchers.isDisplayed()))\n UITestHelper.sleep(1000)\n }\n \n @Test\n fun testContributions() {\n- Espresso.onView(\n- Matchers.allOf(\n- childAtPosition(\n+ Espresso\n+ .onView(\n+ Matchers.allOf(\n childAtPosition(\n- ViewMatchers.withId(R.id.fragment_main_nav_tab_layout),\n- 0\n+ childAtPosition(\n+ ViewMatchers.withId(R.id.fragment_main_nav_tab_layout),\n+ 0,\n+ ),\n+ 0,\n ),\n- 0\n+ ViewMatchers.isDisplayed(),\n ),\n- ViewMatchers.isDisplayed()\n- )\n- ).perform(ViewActions.click())\n- Espresso.onView(ViewMatchers.withId(R.id.fragmentContainer))\n+ ).perform(ViewActions.click())\n+ Espresso\n+ .onView(ViewMatchers.withId(R.id.fragmentContainer))\n .check(matches(ViewMatchers.isDisplayed()))\n- Espresso.onView(\n- Matchers.allOf(\n- ViewMatchers.withId(R.id.contributionImage),\n- childAtPosition(\n+ Espresso\n+ .onView(\n+ Matchers.allOf(\n+ ViewMatchers.withId(R.id.contributionImage),\n childAtPosition(\n- ViewMatchers.withId(R.id.contributionsList),\n- 0\n+ childAtPosition(\n+ ViewMatchers.withId(R.id.contributionsList),\n+ 0,\n+ ),\n+ 1,\n ),\n- 1\n+ ViewMatchers.isDisplayed(),\n ),\n- ViewMatchers.isDisplayed()\n- )\n- ).perform(ViewActions.click())\n- val actionMenuItemView = Espresso.onView(\n- Matchers.allOf(\n- ViewMatchers.withId(R.id.menu_bookmark_current_image),\n- childAtPosition(\n+ ).perform(ViewActions.click())\n+ val actionMenuItemView =\n+ Espresso.onView(\n+ Matchers.allOf(\n+ ViewMatchers.withId(R.id.menu_bookmark_current_image),\n childAtPosition(\n- ViewMatchers.withId(R.id.toolbar),\n- 1\n+ childAtPosition(\n+ ViewMatchers.withId(R.id.toolbar),\n+ 1,\n+ ),\n+ 0,\n ),\n- 0\n+ ViewMatchers.isDisplayed(),\n ),\n- ViewMatchers.isDisplayed()\n )\n- )\n actionMenuItemView.perform(ViewActions.click())\n UITestHelper.sleep(3000)\n }\n \n @Test\n fun testBookmarks() {\n- Espresso.onView(\n- Matchers.allOf(\n- childAtPosition(\n+ Espresso\n+ .onView(\n+ Matchers.allOf(\n childAtPosition(\n- ViewMatchers.withId(R.id.fragment_main_nav_tab_layout),\n- 0\n+ childAtPosition(\n+ ViewMatchers.withId(R.id.fragment_main_nav_tab_layout),\n+ 0,\n+ ),\n+ 3,\n ),\n- 3\n+ ViewMatchers.isDisplayed(),\n ),\n- ViewMatchers.isDisplayed()\n- )\n- ).perform(ViewActions.click())\n+ ).perform(ViewActions.click())\n UITestHelper.sleep(1000)\n }\n \n @Test\n fun testNotifications() {\n- Espresso.onView(\n- Matchers.allOf(\n- ViewMatchers.withId(R.id.notifications),\n- childAtPosition(\n+ Espresso\n+ .onView(\n+ Matchers.allOf(\n+ ViewMatchers.withId(R.id.notifications),\n childAtPosition(\n- ViewMatchers.withId(R.id.toolbar),\n- 1\n+ childAtPosition(\n+ ViewMatchers.withId(R.id.toolbar),\n+ 1,\n+ ),\n+ 1,\n ),\n- 1\n+ ViewMatchers.isDisplayed(),\n ),\n- ViewMatchers.isDisplayed()\n- )\n- ).perform(ViewActions.click())\n+ ).perform(ViewActions.click())\n Intents.intended(IntentMatchers.hasComponent(NotificationActivity::class.java.name))\n Espresso.pressBack()\n UITestHelper.sleep(1000)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/androidTest/java/fr/free/nrw/commons/ProfileActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/ProfileActivityTest.kt\nindex 524274d544..003fc06745 100644\n--- a/app/src/androidTest/java/fr/free/nrw/commons/ProfileActivityTest.kt\n+++ b/app/src/androidTest/java/fr/free/nrw/commons/ProfileActivityTest.kt\n@@ -4,7 +4,6 @@ import android.app.Activity\n import android.app.Instrumentation\n import androidx.test.espresso.Espresso.onView\n import androidx.test.espresso.action.ViewActions\n-import androidx.test.espresso.action.ViewActions.swipeRight\n import androidx.test.espresso.intent.Intents\n import androidx.test.espresso.intent.matcher.IntentMatchers\n import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent\n@@ -26,7 +25,6 @@ import org.junit.runner.RunWith\n \n @RunWith(AndroidJUnit4::class)\n class ProfileActivityTest {\n-\n @get:Rule\n var activityRule = IntentsTestRule(LoginActivity::class.java)\n \n@@ -38,7 +36,8 @@ class ProfileActivityTest {\n device.freezeRotation()\n UITestHelper.loginUser()\n UITestHelper.skipWelcome()\n- Intents.intending(CoreMatchers.not(IntentMatchers.isInternal()))\n+ Intents\n+ .intending(CoreMatchers.not(IntentMatchers.isInternal()))\n .respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, null))\n }\n \n@@ -50,20 +49,19 @@ class ProfileActivityTest {\n childAtPosition(\n childAtPosition(\n withId(R.id.fragment_main_nav_tab_layout),\n- 0\n+ 0,\n ),\n- 4\n+ 4,\n ),\n- ViewMatchers.isDisplayed()\n- )\n+ ViewMatchers.isDisplayed(),\n+ ),\n ).perform(ViewActions.click())\n onView(Matchers.allOf(withId(R.id.more_profile))).perform(\n ViewActions.scrollTo(),\n- ViewActions.click()\n+ ViewActions.click(),\n )\n- device.swipe(1033,1346,531,1346,20)\n+ device.swipe(1033, 1346, 531, 1346, 20)\n UITestHelper.sleep(5000)\n Intents.intended(hasComponent(ProfileActivity::class.java.name))\n }\n-\n }\ndiff --git a/app/src/androidTest/java/fr/free/nrw/commons/ReviewActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/ReviewActivityTest.kt\nindex dd52dbc3b2..3f6487e470 100644\n--- a/app/src/androidTest/java/fr/free/nrw/commons/ReviewActivityTest.kt\n+++ b/app/src/androidTest/java/fr/free/nrw/commons/ReviewActivityTest.kt\n@@ -9,7 +9,6 @@ import org.junit.runner.RunWith\n \n @RunWith(AndroidJUnit4::class)\n class ReviewActivityTest {\n-\n @get:Rule\n var activityRule: ActivityTestRule<*> = ActivityTestRule(ReviewActivity::class.java)\n \n@@ -17,5 +16,4 @@ class ReviewActivityTest {\n fun orientationChange() {\n UITestHelper.changeOrientation(activityRule)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/androidTest/java/fr/free/nrw/commons/SearchActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/SearchActivityTest.kt\nindex c42b49e92b..69ce412b94 100644\n--- a/app/src/androidTest/java/fr/free/nrw/commons/SearchActivityTest.kt\n+++ b/app/src/androidTest/java/fr/free/nrw/commons/SearchActivityTest.kt\n@@ -16,7 +16,6 @@ import org.junit.runner.RunWith\n \n @RunWith(AndroidJUnit4::class)\n class SearchActivityTest {\n-\n @get:Rule\n var activityRule = ActivityTestRule(SearchActivity::class.java)\n \n@@ -31,21 +30,22 @@ class SearchActivityTest {\n \n @Test\n fun exploreActivityTest() {\n- val searchAutoComplete = Espresso.onView(\n- Matchers.allOf(\n- UITestHelper.childAtPosition(\n- Matchers.allOf(\n- ViewMatchers.withClassName(Matchers.`is`(\"android.widget.LinearLayout\")),\n- UITestHelper.childAtPosition(\n+ val searchAutoComplete =\n+ Espresso.onView(\n+ Matchers.allOf(\n+ UITestHelper.childAtPosition(\n+ Matchers.allOf(\n ViewMatchers.withClassName(Matchers.`is`(\"android.widget.LinearLayout\")),\n- 1\n- )\n+ UITestHelper.childAtPosition(\n+ ViewMatchers.withClassName(Matchers.`is`(\"android.widget.LinearLayout\")),\n+ 1,\n+ ),\n+ ),\n+ 0,\n ),\n- 0\n+ ViewMatchers.isDisplayed(),\n ),\n- ViewMatchers.isDisplayed()\n )\n- )\n searchAutoComplete.perform(ViewActions.replaceText(\"cat\"), ViewActions.closeSoftKeyboard())\n UITestHelper.sleep(5000)\n device.swipe(1000, 1400, 500, 1400, 20)\n@@ -56,4 +56,4 @@ class SearchActivityTest {\n device.swipe(800, 1400, 600, 1400, 20)\n UITestHelper.sleep(1000)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityLoggedInTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityLoggedInTest.kt\nindex 3d464fb5a1..ec132b4473 100644\n--- a/app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityLoggedInTest.kt\n+++ b/app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityLoggedInTest.kt\n@@ -22,7 +22,6 @@ import org.junit.runner.RunWith\n \n @RunWith(AndroidJUnit4::class)\n class SettingsActivityLoggedInTest {\n-\n @get:Rule\n var activityRule: ActivityTestRule<*> = ActivityTestRule(LoginActivity::class.java)\n \n@@ -35,31 +34,32 @@ class SettingsActivityLoggedInTest {\n device.freezeRotation()\n UITestHelper.loginUser()\n UITestHelper.skipWelcome()\n- Intents.intending(CoreMatchers.not(IntentMatchers.isInternal()))\n+ Intents\n+ .intending(CoreMatchers.not(IntentMatchers.isInternal()))\n .respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, null))\n }\n \n @Test\n fun testSettings() {\n- Espresso.onView(\n- Matchers.allOf(\n- ViewMatchers.withContentDescription(\"More\"),\n- UITestHelper.childAtPosition(\n+ Espresso\n+ .onView(\n+ Matchers.allOf(\n+ ViewMatchers.withContentDescription(\"More\"),\n UITestHelper.childAtPosition(\n- ViewMatchers.withId(R.id.fragment_main_nav_tab_layout),\n- 0\n+ UITestHelper.childAtPosition(\n+ ViewMatchers.withId(R.id.fragment_main_nav_tab_layout),\n+ 0,\n+ ),\n+ 4,\n ),\n- 4\n+ ViewMatchers.isDisplayed(),\n ),\n- ViewMatchers.isDisplayed()\n- )\n- ).perform(ViewActions.click())\n+ ).perform(ViewActions.click())\n Espresso.onView(Matchers.allOf(ViewMatchers.withId(R.id.more_settings))).perform(\n ViewActions.scrollTo(),\n- ViewActions.click()\n+ ViewActions.click(),\n )\n Intents.intended(IntentMatchers.hasComponent(SettingsActivity::class.java.name))\n UITestHelper.sleep(1000)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityTest.kt\nindex 211483a83b..c5a91cd568 100644\n--- a/app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityTest.kt\n+++ b/app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityTest.kt\n@@ -23,7 +23,6 @@ import org.junit.runner.RunWith\n \n @RunWith(AndroidJUnit4::class)\n class SettingsActivityTest {\n-\n private lateinit var defaultKvStore: JsonKvStore\n \n @get:Rule\n@@ -44,22 +43,24 @@ class SettingsActivityTest {\n fun useAuthorNameTogglesOn() {\n // Turn on \"Use author name\" preference if currently off\n if (!defaultKvStore.getBoolean(\"useAuthorName\", false)) {\n- Espresso.onView(\n- allOf(\n- withId(R.id.recycler_view),\n- childAtPosition(withId(android.R.id.list_container), 0)\n+ Espresso\n+ .onView(\n+ allOf(\n+ withId(R.id.recycler_view),\n+ childAtPosition(withId(android.R.id.list_container), 0),\n+ ),\n+ ).perform(\n+ RecyclerViewActions.actionOnItemAtPosition(6, click()),\n )\n- ).perform(\n- RecyclerViewActions.actionOnItemAtPosition(6, click())\n- )\n }\n // Check authorName preference is enabled\n- Espresso.onView(\n- allOf(\n- withId(R.id.recycler_view),\n- childAtPosition(withId(android.R.id.list_container), 0)\n- )\n- ).check(matches(isEnabled()))\n+ Espresso\n+ .onView(\n+ allOf(\n+ withId(R.id.recycler_view),\n+ childAtPosition(withId(android.R.id.list_container), 0),\n+ ),\n+ ).check(matches(isEnabled()))\n }\n \n @Test\ndiff --git a/app/src/androidTest/java/fr/free/nrw/commons/UITestHelper.kt b/app/src/androidTest/java/fr/free/nrw/commons/UITestHelper.kt\nindex 26d6f92463..ebb06e4af1 100644\n--- a/app/src/androidTest/java/fr/free/nrw/commons/UITestHelper.kt\n+++ b/app/src/androidTest/java/fr/free/nrw/commons/UITestHelper.kt\n@@ -10,17 +10,20 @@ import androidx.test.espresso.action.ViewActions\n import androidx.test.espresso.matcher.ViewMatchers\n import androidx.test.rule.ActivityTestRule\n import org.apache.commons.lang3.StringUtils\n-import org.hamcrest.*\n+import org.hamcrest.BaseMatcher\n+import org.hamcrest.Description\n+import org.hamcrest.Matcher\n+import org.hamcrest.Matchers\n+import org.hamcrest.TypeSafeMatcher\n import timber.log.Timber\n \n-\n class UITestHelper {\n companion object {\n fun skipWelcome() {\n try {\n onView(ViewMatchers.withId(R.id.button_ok))\n .perform(ViewActions.click())\n- //Skip tutorial\n+ // Skip tutorial\n onView(ViewMatchers.withId(R.id.finishTutorialButton))\n .perform(ViewActions.click())\n } catch (ignored: NoMatchingViewException) {\n@@ -29,27 +32,31 @@ class UITestHelper {\n \n fun skipLogin() {\n try {\n- //Skip Login\n- val htmlTextView = onView(\n- Matchers.allOf(\n- ViewMatchers.withId(R.id.skip_login), ViewMatchers.withText(\"Skip\"),\n- ViewMatchers.isDisplayed()\n+ // Skip Login\n+ val htmlTextView =\n+ onView(\n+ Matchers.allOf(\n+ ViewMatchers.withId(R.id.skip_login),\n+ ViewMatchers.withText(\"Skip\"),\n+ ViewMatchers.isDisplayed(),\n+ ),\n )\n- )\n htmlTextView.perform(ViewActions.click())\n \n- val appCompatButton = onView(\n- Matchers.allOf(\n- ViewMatchers.withId(android.R.id.button1), ViewMatchers.withText(\"Yes\"),\n- childAtPosition(\n+ val appCompatButton =\n+ onView(\n+ Matchers.allOf(\n+ ViewMatchers.withId(android.R.id.button1),\n+ ViewMatchers.withText(\"Yes\"),\n childAtPosition(\n- ViewMatchers.withId(R.id.buttonPanel),\n- 0\n+ childAtPosition(\n+ ViewMatchers.withId(R.id.buttonPanel),\n+ 0,\n+ ),\n+ 3,\n ),\n- 3\n- )\n+ ),\n )\n- )\n appCompatButton.perform(ViewActions.scrollTo(), ViewActions.click())\n } catch (ignored: NoMatchingViewException) {\n }\n@@ -57,18 +64,18 @@ class UITestHelper {\n \n fun loginUser() {\n try {\n- //Perform Login\n+ // Perform Login\n sleep(3000)\n onView(ViewMatchers.withId(R.id.login_username))\n .perform(\n ViewActions.replaceText(getTestUsername()),\n- ViewActions.closeSoftKeyboard()\n+ ViewActions.closeSoftKeyboard(),\n )\n sleep(2000)\n onView(ViewMatchers.withId(R.id.login_password))\n .perform(\n ViewActions.replaceText(getTestUserPassword()),\n- ViewActions.closeSoftKeyboard()\n+ ViewActions.closeSoftKeyboard(),\n )\n sleep(2000)\n onView(ViewMatchers.withId(R.id.login_button))\n@@ -76,7 +83,6 @@ class UITestHelper {\n sleep(10000)\n } catch (ignored: NoMatchingViewException) {\n }\n-\n }\n \n fun logoutUser() {\n@@ -87,36 +93,38 @@ class UITestHelper {\n childAtPosition(\n childAtPosition(\n ViewMatchers.withId(R.id.fragment_main_nav_tab_layout),\n- 0\n+ 0,\n ),\n- 4\n+ 4,\n ),\n- ViewMatchers.isDisplayed()\n- )\n+ ViewMatchers.isDisplayed(),\n+ ),\n ).perform(ViewActions.click())\n onView(\n Matchers.allOf(\n- ViewMatchers.withId(R.id.more_logout), ViewMatchers.withText(\"Logout\"),\n+ ViewMatchers.withId(R.id.more_logout),\n+ ViewMatchers.withText(\"Logout\"),\n childAtPosition(\n childAtPosition(\n ViewMatchers.withId(R.id.scroll_view_more_bottom_sheet),\n- 0\n+ 0,\n ),\n- 6\n- )\n- )\n+ 6,\n+ ),\n+ ),\n ).perform(ViewActions.scrollTo(), ViewActions.click())\n onView(\n Matchers.allOf(\n- ViewMatchers.withId(android.R.id.button1), ViewMatchers.withText(\"Yes\"),\n+ ViewMatchers.withId(android.R.id.button1),\n+ ViewMatchers.withText(\"Yes\"),\n childAtPosition(\n childAtPosition(\n ViewMatchers.withId(R.id.buttonPanel),\n- 0\n+ 0,\n ),\n- 3\n- )\n- )\n+ 3,\n+ ),\n+ ),\n ).perform(ViewActions.scrollTo(), ViewActions.click())\n sleep(5000)\n } catch (ignored: NoMatchingViewException) {\n@@ -124,9 +132,9 @@ class UITestHelper {\n }\n \n fun childAtPosition(\n- parentMatcher: Matcher, position: Int\n+ parentMatcher: Matcher,\n+ position: Int,\n ): Matcher {\n-\n return object : TypeSafeMatcher() {\n override fun describeTo(description: Description) {\n description.appendText(\"Child at position $position in parent \")\n@@ -135,8 +143,9 @@ class UITestHelper {\n \n public override fun matchesSafely(view: View): Boolean {\n val parent = view.parent\n- return parent is ViewGroup && parentMatcher.matches(parent)\n- && view == parent.getChildAt(position)\n+ return parent is ViewGroup &&\n+ parentMatcher.matches(parent) &&\n+ view == parent.getChildAt(position)\n }\n }\n }\n@@ -154,14 +163,18 @@ class UITestHelper {\n val username = BuildConfig.TEST_USERNAME\n if (StringUtils.isEmpty(username) || username == \"null\") {\n throw NotImplementedError(\"Configure your beta account's username\")\n- } else return username\n+ } else {\n+ return username\n+ }\n }\n \n private fun getTestUserPassword(): String {\n val password = BuildConfig.TEST_PASSWORD\n if (StringUtils.isEmpty(password) || password == \"null\") {\n throw NotImplementedError(\"Configure your beta account's password\")\n- } else return password\n+ } else {\n+ return password\n+ }\n }\n \n fun changeOrientation(activityRule: ActivityTestRule) {\n@@ -174,6 +187,7 @@ class UITestHelper {\n fun first(matcher: Matcher): Matcher? {\n return object : BaseMatcher() {\n var isFirst = true\n+\n override fun matches(item: Any): Boolean {\n if (isFirst && matcher.matches(item)) {\n isFirst = false\n@@ -188,4 +202,4 @@ class UITestHelper {\n }\n }\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/androidTest/java/fr/free/nrw/commons/UploadCancelledTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/UploadCancelledTest.kt\nindex 4041b92e54..0277b83248 100644\n--- a/app/src/androidTest/java/fr/free/nrw/commons/UploadCancelledTest.kt\n+++ b/app/src/androidTest/java/fr/free/nrw/commons/UploadCancelledTest.kt\n@@ -4,7 +4,10 @@ import android.app.Activity\n import android.app.Instrumentation\n import androidx.recyclerview.widget.RecyclerView\n import androidx.test.espresso.Espresso.onView\n-import androidx.test.espresso.action.ViewActions.*\n+import androidx.test.espresso.action.ViewActions.click\n+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard\n+import androidx.test.espresso.action.ViewActions.replaceText\n+import androidx.test.espresso.action.ViewActions.scrollTo\n import androidx.test.espresso.contrib.RecyclerViewActions\n import androidx.test.espresso.intent.Intents\n import androidx.test.espresso.intent.matcher.IntentMatchers\n@@ -28,7 +31,6 @@ import org.junit.runner.RunWith\n \n @RunWith(AndroidJUnit4::class)\n class UploadCancelledTest {\n-\n @Rule\n @JvmField\n var mActivityTestRule = ActivityTestRule(LoginActivity::class.java)\n@@ -37,7 +39,7 @@ class UploadCancelledTest {\n @JvmField\n var mGrantPermissionRule: GrantPermissionRule =\n GrantPermissionRule.grant(\n- \"android.permission.WRITE_EXTERNAL_STORAGE\"\n+ \"android.permission.WRITE_EXTERNAL_STORAGE\",\n )\n \n private val device: UiDevice =\n@@ -48,14 +50,14 @@ class UploadCancelledTest {\n try {\n Intents.init()\n } catch (ex: IllegalStateException) {\n-\n }\n device.unfreezeRotation()\n device.setOrientationNatural()\n device.freezeRotation()\n UITestHelper.loginUser()\n UITestHelper.skipWelcome()\n- Intents.intending(CoreMatchers.not(IntentMatchers.isInternal()))\n+ Intents\n+ .intending(CoreMatchers.not(IntentMatchers.isInternal()))\n .respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, null))\n }\n \n@@ -64,130 +66,137 @@ class UploadCancelledTest {\n try {\n Intents.release()\n } catch (ex: IllegalStateException) {\n-\n }\n }\n \n @Test\n fun uploadCancelledAfterLocationPickedTest() {\n-\n- val bottomNavigationItemView = onView(\n- allOf(\n- childAtPosition(\n+ val bottomNavigationItemView =\n+ onView(\n+ allOf(\n childAtPosition(\n- withId(R.id.fragment_main_nav_tab_layout),\n- 0\n+ childAtPosition(\n+ withId(R.id.fragment_main_nav_tab_layout),\n+ 0,\n+ ),\n+ 1,\n ),\n- 1\n+ isDisplayed(),\n ),\n- isDisplayed()\n )\n- )\n bottomNavigationItemView.perform(click())\n \n UITestHelper.sleep(12000)\n \n- val actionMenuItemView = onView(\n- allOf(\n- withId(R.id.list_sheet),\n- childAtPosition(\n+ val actionMenuItemView =\n+ onView(\n+ allOf(\n+ withId(R.id.list_sheet),\n childAtPosition(\n- withId(R.id.toolbar),\n- 1\n+ childAtPosition(\n+ withId(R.id.toolbar),\n+ 1,\n+ ),\n+ 0,\n ),\n- 0\n+ isDisplayed(),\n ),\n- isDisplayed()\n )\n- )\n actionMenuItemView.perform(click())\n \n- val recyclerView = onView(\n- allOf(\n- withId(R.id.rv_nearby_list),\n+ val recyclerView =\n+ onView(\n+ allOf(\n+ withId(R.id.rv_nearby_list),\n+ ),\n )\n- )\n recyclerView.perform(\n RecyclerViewActions.actionOnItemAtPosition(\n 0,\n- click()\n- )\n+ click(),\n+ ),\n )\n \n- val linearLayout3 = onView(\n- allOf(\n- withId(R.id.cameraButton),\n- childAtPosition(\n- allOf(\n- withId(R.id.nearby_button_layout),\n+ val linearLayout3 =\n+ onView(\n+ allOf(\n+ withId(R.id.cameraButton),\n+ childAtPosition(\n+ allOf(\n+ withId(R.id.nearby_button_layout),\n+ ),\n+ 0,\n ),\n- 0\n+ isDisplayed(),\n ),\n- isDisplayed()\n )\n- )\n linearLayout3.perform(click())\n \n- val pasteSensitiveTextInputEditText = onView(\n- allOf(\n- withId(R.id.caption_item_edit_text),\n- childAtPosition(\n+ val pasteSensitiveTextInputEditText =\n+ onView(\n+ allOf(\n+ withId(R.id.caption_item_edit_text),\n childAtPosition(\n- withId(R.id.caption_item_edit_text_input_layout),\n- 0\n+ childAtPosition(\n+ withId(R.id.caption_item_edit_text_input_layout),\n+ 0,\n+ ),\n+ 0,\n ),\n- 0\n+ isDisplayed(),\n ),\n- isDisplayed()\n )\n- )\n pasteSensitiveTextInputEditText.perform(replaceText(\"test\"), closeSoftKeyboard())\n \n- val pasteSensitiveTextInputEditText2 = onView(\n- allOf(\n- withId(R.id.description_item_edit_text),\n- childAtPosition(\n+ val pasteSensitiveTextInputEditText2 =\n+ onView(\n+ allOf(\n+ withId(R.id.description_item_edit_text),\n childAtPosition(\n- withId(R.id.description_item_edit_text_input_layout),\n- 0\n+ childAtPosition(\n+ withId(R.id.description_item_edit_text_input_layout),\n+ 0,\n+ ),\n+ 0,\n ),\n- 0\n+ isDisplayed(),\n ),\n- isDisplayed()\n )\n- )\n pasteSensitiveTextInputEditText2.perform(replaceText(\"test\"), closeSoftKeyboard())\n \n- val appCompatButton2 = onView(\n- allOf(\n- withId(R.id.btn_next),\n- childAtPosition(\n+ val appCompatButton2 =\n+ onView(\n+ allOf(\n+ withId(R.id.btn_next),\n childAtPosition(\n- withId(R.id.ll_container_media_detail),\n- 2\n+ childAtPosition(\n+ withId(R.id.ll_container_media_detail),\n+ 2,\n+ ),\n+ 1,\n ),\n- 1\n+ isDisplayed(),\n ),\n- isDisplayed()\n )\n- )\n appCompatButton2.perform(click())\n \n- val appCompatButton3 = onView(\n- allOf(\n- withId(android.R.id.button1),\n+ val appCompatButton3 =\n+ onView(\n+ allOf(\n+ withId(android.R.id.button1),\n+ ),\n )\n- )\n appCompatButton3.perform(scrollTo(), click())\n \n Intents.intended(IntentMatchers.hasComponent(LocationPickerActivity::class.java.name))\n \n- val floatingActionButton3 = onView(\n- allOf(\n- withId(R.id.location_chosen_button),\n- isDisplayed()\n+ val floatingActionButton3 =\n+ onView(\n+ allOf(\n+ withId(R.id.location_chosen_button),\n+ isDisplayed(),\n+ ),\n )\n- )\n UITestHelper.sleep(2000)\n floatingActionButton3.perform(click())\n }\ndiff --git a/app/src/androidTest/java/fr/free/nrw/commons/UploadTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/UploadTest.kt\nindex 8370e9848a..88c7e5d3d5 100644\n--- a/app/src/androidTest/java/fr/free/nrw/commons/UploadTest.kt\n+++ b/app/src/androidTest/java/fr/free/nrw/commons/UploadTest.kt\n@@ -19,7 +19,10 @@ import androidx.test.espresso.intent.Intents.intended\n import androidx.test.espresso.intent.Intents.intending\n import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction\n import androidx.test.espresso.intent.matcher.IntentMatchers.hasType\n-import androidx.test.espresso.matcher.ViewMatchers.*\n+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed\n+import androidx.test.espresso.matcher.ViewMatchers.withId\n+import androidx.test.espresso.matcher.ViewMatchers.withParent\n+import androidx.test.espresso.matcher.ViewMatchers.withText\n import androidx.test.ext.junit.runners.AndroidJUnit4\n import androidx.test.filters.LargeTest\n import androidx.test.rule.ActivityTestRule\n@@ -29,21 +32,29 @@ import fr.free.nrw.commons.upload.UploadMediaDetailAdapter\n import fr.free.nrw.commons.util.MyViewAction\n import fr.free.nrw.commons.utils.ConfigUtils\n import org.hamcrest.core.AllOf.allOf\n-import org.junit.*\n+import org.junit.After\n+import org.junit.Before\n+import org.junit.Ignore\n+import org.junit.Rule\n+import org.junit.Test\n import org.junit.runner.RunWith\n import timber.log.Timber\n import java.io.File\n import java.io.FileOutputStream\n import java.io.IOException\n import java.text.SimpleDateFormat\n-import java.util.*\n+import java.util.Date\n+import java.util.Random\n \n @LargeTest\n @RunWith(AndroidJUnit4::class)\n class UploadTest {\n @get:Rule\n- var permissionRule = GrantPermissionRule.grant(Manifest.permission.WRITE_EXTERNAL_STORAGE,\n- Manifest.permission.ACCESS_FINE_LOCATION)!!\n+ var permissionRule =\n+ GrantPermissionRule.grant(\n+ Manifest.permission.WRITE_EXTERNAL_STORAGE,\n+ Manifest.permission.ACCESS_FINE_LOCATION,\n+ )!!\n \n @get:Rule\n var activityRule = ActivityTestRule(LoginActivity::class.java)\n@@ -61,7 +72,6 @@ class UploadTest {\n try {\n Intents.init()\n } catch (ex: IllegalStateException) {\n-\n }\n UITestHelper.loginUser()\n UITestHelper.skipWelcome()\n@@ -94,14 +104,13 @@ class UploadTest {\n dismissWarning(\"Yes\")\n \n onView(allOf(isDisplayed(), withId(R.id.tv_title)))\n- .perform(replaceText(commonsFileName))\n+ .perform(replaceText(commonsFileName))\n \n onView(allOf(isDisplayed(), withId(R.id.description_item_edit_text)))\n- .perform(replaceText(commonsFileName))\n-\n+ .perform(replaceText(commonsFileName))\n \n onView(allOf(isDisplayed(), withId(R.id.btn_next)))\n- .perform(click())\n+ .perform(click())\n \n UITestHelper.sleep(5000)\n dismissWarning(\"Yes\")\n@@ -109,29 +118,30 @@ class UploadTest {\n UITestHelper.sleep(3000)\n \n onView(allOf(isDisplayed(), withId(R.id.et_search)))\n- .perform(replaceText(\"Uploaded with Mobile/Android Tests\"))\n+ .perform(replaceText(\"Uploaded with Mobile/Android Tests\"))\n \n UITestHelper.sleep(3000)\n \n try {\n onView(allOf(isDisplayed(), UITestHelper.first(withParent(withId(R.id.rv_categories)))))\n- .perform(click())\n+ .perform(click())\n } catch (ignored: NoMatchingViewException) {\n }\n \n onView(allOf(isDisplayed(), withId(R.id.btn_next)))\n- .perform(click())\n+ .perform(click())\n \n dismissWarning(\"Yes, Submit\")\n \n UITestHelper.sleep(500)\n \n onView(allOf(isDisplayed(), withId(R.id.btn_submit)))\n- .perform(click())\n+ .perform(click())\n \n UITestHelper.sleep(10000)\n \n- val fileUrl = \"https://commons.wikimedia.beta.wmflabs.org/wiki/File:\" +\n+ val fileUrl =\n+ \"https://commons.wikimedia.beta.wmflabs.org/wiki/File:\" +\n commonsFileName.replace(' ', '_') + \".jpg\"\n Timber.i(\"File should be uploaded to $fileUrl\")\n }\n@@ -139,8 +149,8 @@ class UploadTest {\n private fun dismissWarning(warningText: String) {\n try {\n onView(withText(warningText))\n- .check(matches(isDisplayed()))\n- .perform(click())\n+ .check(matches(isDisplayed()))\n+ .perform(click())\n } catch (ignored: NoMatchingViewException) {\n }\n }\n@@ -167,10 +177,10 @@ class UploadTest {\n dismissWarning(\"Yes\")\n \n onView(allOf(isDisplayed(), withId(R.id.tv_title)))\n- .perform(replaceText(commonsFileName))\n+ .perform(replaceText(commonsFileName))\n \n onView(allOf(isDisplayed(), withId(R.id.btn_next)))\n- .perform(click())\n+ .perform(click())\n \n UITestHelper.sleep(10000)\n dismissWarning(\"Yes\")\n@@ -178,29 +188,30 @@ class UploadTest {\n UITestHelper.sleep(3000)\n \n onView(allOf(isDisplayed(), withId(R.id.et_search)))\n- .perform(replaceText(\"Test\"))\n+ .perform(replaceText(\"Test\"))\n \n UITestHelper.sleep(3000)\n \n try {\n onView(allOf(isDisplayed(), UITestHelper.first(withParent(withId(R.id.rv_categories)))))\n- .perform(click())\n+ .perform(click())\n } catch (ignored: NoMatchingViewException) {\n }\n \n onView(allOf(isDisplayed(), withId(R.id.btn_next)))\n- .perform(click())\n+ .perform(click())\n \n dismissWarning(\"Yes, Submit\")\n \n UITestHelper.sleep(500)\n \n onView(allOf(isDisplayed(), withId(R.id.btn_submit)))\n- .perform(click())\n+ .perform(click())\n \n UITestHelper.sleep(10000)\n \n- val fileUrl = \"https://commons.wikimedia.beta.wmflabs.org/wiki/File:\" +\n+ val fileUrl =\n+ \"https://commons.wikimedia.beta.wmflabs.org/wiki/File:\" +\n commonsFileName.replace(' ', '_') + \".jpg\"\n Timber.i(\"File should be uploaded to $fileUrl\")\n }\n@@ -227,23 +238,29 @@ class UploadTest {\n dismissWarningDialog()\n \n onView(allOf(isDisplayed(), withId(R.id.tv_title)))\n- .perform(replaceText(commonsFileName))\n+ .perform(replaceText(commonsFileName))\n \n onView(withId(R.id.rv_descriptions)).perform(\n- RecyclerViewActions\n- .actionOnItemAtPosition(0,\n- MyViewAction.typeTextInChildViewWithId(R.id.description_item_edit_text, \"Test description\")))\n+ RecyclerViewActions\n+ .actionOnItemAtPosition(\n+ 0,\n+ MyViewAction.typeTextInChildViewWithId(R.id.description_item_edit_text, \"Test description\"),\n+ ),\n+ )\n \n onView(withId(R.id.btn_add))\n- .perform(click())\n+ .perform(click())\n \n onView(withId(R.id.rv_descriptions)).perform(\n- RecyclerViewActions\n- .actionOnItemAtPosition(1,\n- MyViewAction.typeTextInChildViewWithId(R.id.description_item_edit_text, \"Description\")))\n+ RecyclerViewActions\n+ .actionOnItemAtPosition(\n+ 1,\n+ MyViewAction.typeTextInChildViewWithId(R.id.description_item_edit_text, \"Description\"),\n+ ),\n+ )\n \n onView(allOf(isDisplayed(), withId(R.id.btn_next)))\n- .perform(click())\n+ .perform(click())\n \n UITestHelper.sleep(5000)\n dismissWarning(\"Yes\")\n@@ -251,29 +268,30 @@ class UploadTest {\n UITestHelper.sleep(3000)\n \n onView(allOf(isDisplayed(), withId(R.id.et_search)))\n- .perform(replaceText(\"Test\"))\n+ .perform(replaceText(\"Test\"))\n \n UITestHelper.sleep(3000)\n \n try {\n onView(allOf(isDisplayed(), UITestHelper.first(withParent(withId(R.id.rv_categories)))))\n- .perform(click())\n+ .perform(click())\n } catch (ignored: NoMatchingViewException) {\n }\n \n onView(allOf(isDisplayed(), withId(R.id.btn_next)))\n- .perform(click())\n+ .perform(click())\n \n dismissWarning(\"Yes, Submit\")\n \n UITestHelper.sleep(500)\n \n onView(allOf(isDisplayed(), withId(R.id.btn_submit)))\n- .perform(click())\n+ .perform(click())\n \n UITestHelper.sleep(10000)\n \n- val fileUrl = \"https://commons.wikimedia.beta.wmflabs.org/wiki/File:\" +\n+ val fileUrl =\n+ \"https://commons.wikimedia.beta.wmflabs.org/wiki/File:\" +\n commonsFileName.replace(' ', '_') + \".jpg\"\n Timber.i(\"File should be uploaded to $fileUrl\")\n }\n@@ -306,7 +324,6 @@ class UploadTest {\n } catch (e: IOException) {\n e.printStackTrace()\n }\n-\n }\n }\n \n@@ -328,8 +345,8 @@ class UploadTest {\n private fun dismissWarningDialog() {\n try {\n onView(withText(\"Yes\"))\n- .check(matches(isDisplayed()))\n- .perform(click())\n+ .check(matches(isDisplayed()))\n+ .perform(click())\n } catch (ignored: NoMatchingViewException) {\n }\n }\n@@ -337,10 +354,10 @@ class UploadTest {\n private fun openGallery() {\n // Open FAB\n onView(allOf(withId(R.id.fab_plus), isDisplayed()))\n- .perform(click())\n+ .perform(click())\n \n // Click gallery\n onView(allOf(withId(R.id.fab_gallery), isDisplayed()))\n- .perform(click())\n+ .perform(click())\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/androidTest/java/fr/free/nrw/commons/WelcomeActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/WelcomeActivityTest.kt\nindex 777a1859a6..d48a75b91e 100644\n--- a/app/src/androidTest/java/fr/free/nrw/commons/WelcomeActivityTest.kt\n+++ b/app/src/androidTest/java/fr/free/nrw/commons/WelcomeActivityTest.kt\n@@ -3,7 +3,6 @@ package fr.free.nrw.commons\n import androidx.test.espresso.Espresso.onView\n import androidx.test.espresso.action.ViewActions\n import androidx.test.espresso.assertion.ViewAssertions.matches\n-import androidx.test.espresso.matcher.ViewMatchers\n import androidx.test.espresso.matcher.ViewMatchers.isDisplayed\n import androidx.test.espresso.matcher.ViewMatchers.withId\n import androidx.test.ext.junit.runners.AndroidJUnit4\n@@ -22,7 +21,6 @@ import org.junit.runner.RunWith\n @LargeTest\n @RunWith(AndroidJUnit4::class)\n class WelcomeActivityTest {\n-\n @get:Rule\n var activityRule: ActivityTestRule<*> = ActivityTestRule(WelcomeActivity::class.java)\n \n@@ -130,4 +128,4 @@ class WelcomeActivityTest {\n fun orientationChange() {\n UITestHelper.changeOrientation(activityRule)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/androidTest/java/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt\nindex 37ea557d1b..aedbcb133b 100644\n--- a/app/src/androidTest/java/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt\n+++ b/app/src/androidTest/java/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt\n@@ -11,7 +11,6 @@ import org.junit.runner.RunWith\n \n @RunWith(AndroidJUnit4::class)\n class PasteSensitiveTextInputEditTextTest {\n-\n private var context: Context? = null\n private var textView: PasteSensitiveTextInputEditText? = null\n \n@@ -23,9 +22,13 @@ class PasteSensitiveTextInputEditTextTest {\n \n // this test has no real value, just % for test code coverage\n @Test\n- fun extractFormattingAttributeSet(){\n- val methodExtractFormattingAttribute = textView!!.javaClass.getDeclaredMethod(\n- \"extractFormattingAttribute\", Context::class.java, AttributeSet::class.java)\n+ fun extractFormattingAttributeSet() {\n+ val methodExtractFormattingAttribute =\n+ textView!!.javaClass.getDeclaredMethod(\n+ \"extractFormattingAttribute\",\n+ Context::class.java,\n+ AttributeSet::class.java,\n+ )\n methodExtractFormattingAttribute.isAccessible = true\n methodExtractFormattingAttribute.invoke(textView, context, null)\n }\n@@ -40,4 +43,4 @@ class PasteSensitiveTextInputEditTextTest {\n textView!!.setFormattingAllowed(false)\n Assert.assertFalse(fieldFormattingAllowed.getBoolean(textView))\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/androidTest/java/fr/free/nrw/commons/util/MyViewAction.kt b/app/src/androidTest/java/fr/free/nrw/commons/util/MyViewAction.kt\nindex 955c712b9e..52ac18e4dc 100644\n--- a/app/src/androidTest/java/fr/free/nrw/commons/util/MyViewAction.kt\n+++ b/app/src/androidTest/java/fr/free/nrw/commons/util/MyViewAction.kt\n@@ -9,56 +9,58 @@ import org.hamcrest.Matcher\n \n class MyViewAction {\n companion object {\n- fun typeTextInChildViewWithId(id: Int, textToBeTyped: String): ViewAction {\n- return object : ViewAction {\n- override fun getConstraints(): Matcher? {\n- return null\n- }\n+ fun typeTextInChildViewWithId(\n+ id: Int,\n+ textToBeTyped: String,\n+ ): ViewAction =\n+ object : ViewAction {\n+ override fun getConstraints(): Matcher? = null\n \n- override fun getDescription(): String {\n- return \"Click on a child view with specified id.\"\n- }\n+ override fun getDescription(): String = \"Click on a child view with specified id.\"\n \n- override fun perform(uiController: UiController, view: View) {\n+ override fun perform(\n+ uiController: UiController,\n+ view: View,\n+ ) {\n val v = view.findViewById(id) as EditText\n v.setText(textToBeTyped)\n }\n }\n- }\n \n- fun selectSpinnerItemInChildViewWithId(id: Int, position: Int): ViewAction {\n- return object : ViewAction {\n- override fun getConstraints(): Matcher? {\n- return null\n- }\n+ fun selectSpinnerItemInChildViewWithId(\n+ id: Int,\n+ position: Int,\n+ ): ViewAction =\n+ object : ViewAction {\n+ override fun getConstraints(): Matcher? = null\n \n- override fun getDescription(): String {\n- return \"Click on a child view with specified id.\"\n- }\n+ override fun getDescription(): String = \"Click on a child view with specified id.\"\n \n- override fun perform(uiController: UiController, view: View) {\n+ override fun perform(\n+ uiController: UiController,\n+ view: View,\n+ ) {\n val v = view.findViewById(id) as AppCompatSpinner\n v.setSelection(position)\n }\n }\n- }\n \n- fun clickItemWithId(id: Int, position: Int): ViewAction {\n- return object : ViewAction {\n- override fun getConstraints(): Matcher? {\n- return null\n- }\n+ fun clickItemWithId(\n+ id: Int,\n+ position: Int,\n+ ): ViewAction =\n+ object : ViewAction {\n+ override fun getConstraints(): Matcher? = null\n \n- override fun getDescription(): String {\n- return \"Click on a child view with specified id.\"\n- }\n+ override fun getDescription(): String = \"Click on a child view with specified id.\"\n \n- override fun perform(uiController: UiController, view: View) {\n+ override fun perform(\n+ uiController: UiController,\n+ view: View,\n+ ) {\n val v = view.findViewById(id) as View\n v.performClick()\n }\n }\n- }\n-\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/AboutActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/AboutActivityUnitTests.kt\nindex 6c033d8c32..56549fa1c7 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/AboutActivityUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/AboutActivityUnitTests.kt\n@@ -18,11 +18,9 @@ import org.robolectric.fakes.RoboMenu\n import org.robolectric.fakes.RoboMenuItem\n import org.robolectric.shadows.ShadowActivity\n \n-\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class AboutActivityUnitTests {\n-\n private lateinit var activity: AboutActivity\n \n private lateinit var context: Context\n@@ -116,5 +114,4 @@ class AboutActivityUnitTests {\n fun testOnSupportNavigateUp() {\n activity.onSupportNavigateUp()\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/FakeContextWrapper.kt b/app/src/test/kotlin/fr/free/nrw/commons/FakeContextWrapper.kt\nindex 429df1dcc2..bf7d6f6460 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/FakeContextWrapper.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/FakeContextWrapper.kt\n@@ -8,16 +8,18 @@ import org.mockito.Mock\n import org.mockito.Mockito\n import org.mockito.MockitoAnnotations\n \n-class FakeContextWrapper(base: Context?) : ContextWrapper(base) {\n-\n+class FakeContextWrapper(\n+ base: Context?,\n+) : ContextWrapper(base) {\n @Mock\n private lateinit var mMockAccountManager: AccountManager\n \n- override fun getSystemService(name: String): Any {\n- return if (ACCOUNT_SERVICE == name) {\n+ override fun getSystemService(name: String): Any =\n+ if (ACCOUNT_SERVICE == name) {\n mMockAccountManager\n- } else super.getSystemService(name)\n- }\n+ } else {\n+ super.getSystemService(name)\n+ }\n \n companion object {\n private val ACCOUNT = Account(\"test@example.com\", BuildConfig.ACCOUNT_TYPE)\n@@ -27,7 +29,8 @@ class FakeContextWrapper(base: Context?) : ContextWrapper(base) {\n init {\n MockitoAnnotations.openMocks(this)\n Mockito.`when`(mMockAccountManager.accounts).thenReturn(ACCOUNTS)\n- Mockito.`when`(mMockAccountManager.getAccountsByType(BuildConfig.ACCOUNT_TYPE))\n+ Mockito\n+ .`when`(mMockAccountManager.getAccountsByType(BuildConfig.ACCOUNT_TYPE))\n .thenReturn(ACCOUNTS)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/FakeContextWrapperWithException.kt b/app/src/test/kotlin/fr/free/nrw/commons/FakeContextWrapperWithException.kt\nindex c9f08ad043..035da1f12e 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/FakeContextWrapperWithException.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/FakeContextWrapperWithException.kt\n@@ -7,20 +7,23 @@ import org.mockito.Mock\n import org.mockito.Mockito\n import org.mockito.MockitoAnnotations\n \n-class FakeContextWrapperWithException(base: Context?) : ContextWrapper(base) {\n-\n+class FakeContextWrapperWithException(\n+ base: Context?,\n+) : ContextWrapper(base) {\n @Mock\n private lateinit var mMockAccountManager: AccountManager\n \n- override fun getSystemService(name: String): Any {\n- return if (ACCOUNT_SERVICE == name) {\n+ override fun getSystemService(name: String): Any =\n+ if (ACCOUNT_SERVICE == name) {\n mMockAccountManager\n- } else super.getSystemService(name)\n- }\n+ } else {\n+ super.getSystemService(name)\n+ }\n \n init {\n MockitoAnnotations.openMocks(this)\n- Mockito.`when`(mMockAccountManager.getAccountsByType(BuildConfig.ACCOUNT_TYPE))\n+ Mockito\n+ .`when`(mMockAccountManager.getAccountsByType(BuildConfig.ACCOUNT_TYPE))\n .thenThrow(SecurityException(\"Permission Denied\"))\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/LatLngTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/LatLngTests.kt\nindex efafa4e3ab..d9ef4d6e8d 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/LatLngTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/LatLngTests.kt\n@@ -59,6 +59,8 @@ class LatLngTests {\n assertPrettyCoordinateString(\"0.0 S, 1.0 W\", place)\n }\n \n- private fun assertPrettyCoordinateString(expected: String, place: LatLng) =\n- assertEquals(expected, place.prettyCoordinateString)\n+ private fun assertPrettyCoordinateString(\n+ expected: String,\n+ place: LatLng,\n+ ) = assertEquals(expected, place.prettyCoordinateString)\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/MediaDataExtractorTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/MediaDataExtractorTest.kt\nindex 82f3b3ada9..802e8c206e 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/MediaDataExtractorTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/MediaDataExtractorTest.kt\n@@ -1,25 +1,23 @@\n package fr.free.nrw.commons\n \n-import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.media.MediaClient\n import io.reactivex.Single\n-import org.junit.Assert.assertTrue\n import org.junit.Before\n import org.junit.Test\n import org.mockito.ArgumentMatchers\n import org.mockito.InjectMocks\n import org.mockito.Mock\n-import org.mockito.Mockito.`when`\n import org.mockito.Mockito.mock\n+import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n \n /**\n * Test methods in media data extractor\n */\n class MediaDataExtractorTest {\n-\n @Mock\n internal var mediaClient: MediaClient? = null\n+\n @InjectMocks\n var mediaDataExtractor: MediaDataExtractor? = null\n \n@@ -38,17 +36,17 @@ class MediaDataExtractorTest {\n @Test\n fun fetchMediaDetails() {\n `when`(mediaClient?.getMedia(ArgumentMatchers.anyString()))\n- .thenReturn(Single.just(mock(Media::class.java)))\n+ .thenReturn(Single.just(mock(Media::class.java)))\n \n `when`(mediaClient?.checkPageExistsUsingTitle(ArgumentMatchers.anyString()))\n- .thenReturn(Single.just(true))\n+ .thenReturn(Single.just(true))\n \n `when`(mediaClient?.getPageHtml(ArgumentMatchers.anyString()))\n- .thenReturn(Single.just(\"Test\"))\n+ .thenReturn(Single.just(\"Test\"))\n \n- //val fetchMediaDetails = mediaDataExtractor?.fetchMediaDetails(\"File:Test.jpg\", null)\n+ // val fetchMediaDetails = mediaDataExtractor?.fetchMediaDetails(\"File:Test.jpg\", null)\n \n- //assertTrue(fetchMediaDetails is Media)\n+ // assertTrue(fetchMediaDetails is Media)\n }\n \n @Test\n@@ -56,4 +54,4 @@ class MediaDataExtractorTest {\n `when`(mediaDataExtractor?.getCurrentWikiText(ArgumentMatchers.anyString()))\n .thenReturn(Single.just(\"Test\"))\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/MediaTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/MediaTest.kt\nindex f55857edbf..9f3f05223e 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/MediaTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/MediaTest.kt\n@@ -22,5 +22,3 @@ class MediaTest {\n assertEquals(\"Example 1 2\", m.displayTitle)\n }\n }\n-\n-\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/ModelFunctions.kt b/app/src/test/kotlin/fr/free/nrw/commons/ModelFunctions.kt\nindex 7d63863db3..76f9c21d0c 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/ModelFunctions.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/ModelFunctions.kt\n@@ -7,9 +7,13 @@ import fr.free.nrw.commons.nearby.Label\n import fr.free.nrw.commons.nearby.Place\n import fr.free.nrw.commons.nearby.Sitelinks\n import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n+import fr.free.nrw.commons.wikidata.model.DataValue\n import fr.free.nrw.commons.wikidata.model.DepictSearchItem\n-import fr.free.nrw.commons.wikidata.model.*\n-import java.util.*\n+import fr.free.nrw.commons.wikidata.model.Entities\n+import fr.free.nrw.commons.wikidata.model.SnakPartial\n+import fr.free.nrw.commons.wikidata.model.StatementPartial\n+import fr.free.nrw.commons.wikidata.model.WikiBaseEntityValue\n+import java.util.Date\n \n fun depictedItem(\n name: String = \"label\",\n@@ -18,7 +22,7 @@ fun depictedItem(\n instanceOfs: List = listOf(),\n commonsCategories: List = listOf(),\n isSelected: Boolean = false,\n- id: String = \"entityId\"\n+ id: String = \"entityId\",\n ) = DepictedItem(\n name = name,\n description = description,\n@@ -26,12 +30,15 @@ fun depictedItem(\n instanceOfs = instanceOfs,\n commonsCategories = commonsCategories,\n isSelected = isSelected,\n- id = id\n+ id = id,\n )\n \n-fun categoryItem(name: String = \"name\", description: String = \"desc\",\n- thumbUrl: String = \"thumbUrl\", selected: Boolean = false) =\n- CategoryItem(name, description, thumbUrl, selected)\n+fun categoryItem(\n+ name: String = \"name\",\n+ description: String = \"desc\",\n+ thumbUrl: String = \"thumbUrl\",\n+ selected: Boolean = false,\n+) = CategoryItem(name, description, thumbUrl, selected)\n \n fun media(\n thumbUrl: String? = \"thumbUrl\",\n@@ -42,13 +49,13 @@ fun media(\n license: String? = \"license\",\n licenseUrl: String? = \"licenseUrl\",\n author: String? = \"creator\",\n- user:String?=\"user\",\n+ user: String? = \"user\",\n pageId: String = \"pageId\",\n categories: List? = listOf(\"categories\"),\n coordinates: LatLng? = LatLng(0.0, 0.0, 0.0f),\n captions: Map = mapOf(\"en\" to \"caption\"),\n descriptions: Map = mapOf(\"en\" to \"description\"),\n- depictionIds: List = listOf(\"depictionId\")\n+ depictionIds: List = listOf(\"depictionId\"),\n ) = Media(\n pageId,\n thumbUrl,\n@@ -64,7 +71,7 @@ fun media(\n coordinates,\n captions,\n descriptions,\n- depictionIds\n+ depictionIds,\n )\n \n fun depictSearchItem(\n@@ -72,7 +79,7 @@ fun depictSearchItem(\n pageId: String = \"pageid\",\n url: String = \"url\",\n label: String = \"label\",\n- description: String = \"description\"\n+ description: String = \"description\",\n ) = DepictSearchItem(id, pageId, url, label, description)\n \n fun place(\n@@ -85,39 +92,36 @@ fun place(\n siteLinks: Sitelinks? = null,\n pic: String = \"pic\",\n exists: Boolean = false,\n- entityID: String = \"entityID\"\n-): Place {\n- return Place(lang, name, label, longDescription, latLng, category, siteLinks, pic, exists, entityID)\n-}\n+ entityID: String = \"entityID\",\n+): Place = Place(lang, name, label, longDescription, latLng, category, siteLinks, pic, exists, entityID)\n \n-fun entityId(wikiBaseEntityValue: WikiBaseEntityValue = wikiBaseEntityValue()) =\n- DataValue.EntityId(wikiBaseEntityValue)\n+fun entityId(wikiBaseEntityValue: WikiBaseEntityValue = wikiBaseEntityValue()) = DataValue.EntityId(wikiBaseEntityValue)\n \n fun wikiBaseEntityValue(\n entityType: String = \"type\",\n id: String = \"id\",\n- numericId: Long = 0\n+ numericId: Long = 0,\n ) = WikiBaseEntityValue(entityType, id, numericId)\n \n fun statement(\n- mainSnak: Snak_partial = snak(),\n+ mainSnak: SnakPartial = snak(),\n rank: String = \"rank\",\n- type: String = \"type\"\n-) = Statement_partial(mainSnak, type, rank)\n+ type: String = \"type\",\n+) = StatementPartial(mainSnak, type, rank)\n \n fun snak(\n snakType: String = \"type\",\n property: String = \"property\",\n- dataValue: DataValue = valueString(\"\")\n-) = Snak_partial(snakType, property, dataValue)\n+ dataValue: DataValue = valueString(\"\"),\n+) = SnakPartial(snakType, property, dataValue)\n \n fun valueString(value: String) = DataValue.ValueString(value)\n \n fun entity(\n labels: Map = emptyMap(),\n descriptions: Map = emptyMap(),\n- statements: Map>? = emptyMap(),\n- id: String = \"id\"\n+ statements: Map>? = emptyMap(),\n+ id: String = \"id\",\n ) = mock().apply {\n val mockedLabels = labels.mockLabels()\n whenever(labels()).thenReturn(mockedLabels)\n@@ -127,8 +131,7 @@ fun entity(\n whenever(id()).thenReturn(id)\n }\n \n-private fun Map.mockLabels(): Map {\n- return mapValues { entry ->\n+private fun Map.mockLabels(): Map =\n+ mapValues { entry ->\n mock().also { whenever(it.value()).thenReturn(entry.value) }\n }\n-}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/NearbyControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/NearbyControllerTest.kt\nindex 28b12fe0fe..eae9180115 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/NearbyControllerTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/NearbyControllerTest.kt\n@@ -2,7 +2,6 @@ package fr.free.nrw.commons\n \n import fr.free.nrw.commons.location.LatLng\n import fr.free.nrw.commons.nearby.NearbyController.loadAttractionsFromLocationToBaseMarkerOptions\n-import androidx.test.core.app.ApplicationProvider\n import org.junit.Assert.assertEquals\n import org.junit.Test\n import org.junit.runner.RunWith\n@@ -12,13 +11,15 @@ import org.robolectric.annotation.Config\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class NearbyControllerTest {\n-\n @Test\n fun testNullAttractions() {\n val location = LatLng(0.0, 0.0, 0f)\n \n- val options = loadAttractionsFromLocationToBaseMarkerOptions(\n- location, null)\n+ val options =\n+ loadAttractionsFromLocationToBaseMarkerOptions(\n+ location,\n+ null,\n+ )\n \n assertEquals(0, options.size.toLong())\n }\n@@ -27,8 +28,11 @@ class NearbyControllerTest {\n fun testEmptyList() {\n val location = LatLng(0.0, 0.0, 0f)\n \n- val options = loadAttractionsFromLocationToBaseMarkerOptions(\n- location, emptyList())\n+ val options =\n+ loadAttractionsFromLocationToBaseMarkerOptions(\n+ location,\n+ emptyList(),\n+ )\n \n assertEquals(0, options.size.toLong())\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt\nindex 98db40fd04..3431efd6b8 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt\n@@ -46,14 +46,15 @@ class OkHttpJsonApiClientTests {\n @Before\n fun setUp() {\n MockitoAnnotations.openMocks(this)\n- okHttpJsonApiClient = OkHttpJsonApiClient(\n- okhttpClient,\n- depictsClient,\n- wikiMediaToolforgeUrl,\n- sparqlQueryUrl,\n- campaignsUrl,\n- gson\n- )\n+ okHttpJsonApiClient =\n+ OkHttpJsonApiClient(\n+ okhttpClient,\n+ depictsClient,\n+ wikiMediaToolforgeUrl,\n+ sparqlQueryUrl,\n+ campaignsUrl,\n+ gson,\n+ )\n Mockito.`when`(okhttpClient.newCall(any())).thenReturn(call)\n Mockito.`when`(call.execute()).thenReturn(response)\n }\n@@ -69,7 +70,6 @@ class OkHttpJsonApiClientTests {\n }\n verify(okhttpClient).newCall(any())\n verify(call).execute()\n-\n }\n \n @Test\n@@ -83,6 +83,5 @@ class OkHttpJsonApiClientTests {\n }\n verify(okhttpClient).newCall(any())\n verify(call).execute()\n-\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/TestCommonsApplication.kt b/app/src/test/kotlin/fr/free/nrw/commons/TestCommonsApplication.kt\nindex 9c6e081717..84ec5a2cba 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/TestCommonsApplication.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/TestCommonsApplication.kt\n@@ -17,28 +17,30 @@ import fr.free.nrw.commons.location.LocationServiceManager\n class TestCommonsApplication : Application() {\n private var mockApplicationComponent: CommonsApplicationComponent? = null\n \n-\n override fun onCreate() {\n if (mockApplicationComponent == null) {\n- mockApplicationComponent = DaggerCommonsApplicationComponent.builder()\n+ mockApplicationComponent =\n+ DaggerCommonsApplicationComponent\n+ .builder()\n .appModule(MockCommonsApplicationModule(this))\n .build()\n }\n super.onCreate()\n setTheme(R.style.Theme_AppCompat)\n- context=applicationContext\n+ context = applicationContext\n }\n \n- companion object{\n- private var context: Context?=null\n- fun getContext(): Context? {\n- return context\n- }\n+ companion object {\n+ private var context: Context? = null\n+\n+ fun getContext(): Context? = context\n }\n }\n \n @Suppress(\"MemberVisibilityCanBePrivate\")\n-class MockCommonsApplicationModule(appContext: Context) : CommonsApplicationModule(appContext) {\n+class MockCommonsApplicationModule(\n+ appContext: Context,\n+) : CommonsApplicationModule(appContext) {\n val accountUtil: AccountUtil = mock()\n val defaultSharedPreferences: JsonKvStore = mock()\n val locationServiceManager: LocationServiceManager = mock()\n@@ -58,7 +60,10 @@ class MockCommonsApplicationModule(appContext: Context) : CommonsApplicationModu\n \n override fun providesAccountUtil(context: Context): AccountUtil = accountUtil\n \n- override fun providesDefaultKvStore(context: Context, gson: Gson): JsonKvStore = defaultSharedPreferences\n+ override fun providesDefaultKvStore(\n+ context: Context,\n+ gson: Gson,\n+ ): JsonKvStore = defaultSharedPreferences\n \n override fun provideLocationServiceManager(context: Context): LocationServiceManager = locationServiceManager\n \ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/TestConnectionFactory.kt b/app/src/test/kotlin/fr/free/nrw/commons/TestConnectionFactory.kt\nindex bac63cda48..3bea1dc262 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/TestConnectionFactory.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/TestConnectionFactory.kt\n@@ -1,15 +1,17 @@\n package fr.free.nrw.commons\n \n+import fr.free.nrw.commons.OkHttpConnectionFactory.HttpStatusException\n import okhttp3.Interceptor\n import okhttp3.OkHttpClient\n import okhttp3.Response\n-import fr.free.nrw.commons.OkHttpConnectionFactory.HttpStatusException\n import java.io.IOException\n \n-fun createTestClient(): OkHttpClient = OkHttpClient.Builder()\n- .addInterceptor(UnsuccessfulResponseInterceptor())\n- .addInterceptor(TestStubInterceptor())\n- .build()\n+fun createTestClient(): OkHttpClient =\n+ OkHttpClient\n+ .Builder()\n+ .addInterceptor(UnsuccessfulResponseInterceptor())\n+ .addInterceptor(TestStubInterceptor())\n+ .build()\n \n private class TestStubInterceptor : Interceptor {\n interface Callback {\n@@ -18,14 +20,15 @@ private class TestStubInterceptor : Interceptor {\n }\n \n @Throws(IOException::class)\n- override fun intercept(chain: Interceptor.Chain): Response {\n- return if (CALLBACK != null) {\n- CALLBACK!!.getResponse(chain)\n- } else chain.proceed(chain.request())\n- }\n+ override fun intercept(chain: Interceptor.Chain): Response =\n+ if (callback != null) {\n+ callback!!.getResponse(chain)\n+ } else {\n+ chain.proceed(chain.request())\n+ }\n \n companion object {\n- var CALLBACK: Callback? = null\n+ var callback: Callback? = null\n }\n }\n \ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/TestUtility.kt b/app/src/test/kotlin/fr/free/nrw/commons/TestUtility.kt\nindex 45de962685..31cc07b37f 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/TestUtility.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/TestUtility.kt\n@@ -5,7 +5,10 @@ import java.lang.reflect.Modifier\n \n object TestUtility {\n @Throws(java.lang.Exception::class)\n- fun setFinalStatic(field: Field, newValue: Any?) {\n+ fun setFinalStatic(\n+ field: Field,\n+ newValue: Any?,\n+ ) {\n try {\n field.isAccessible = true\n // remove final modifier from field\n@@ -21,4 +24,4 @@ object TestUtility {\n e.stackTrace\n }\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/UtilsTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/UtilsTest.kt\nindex d074e4a8f1..e9e68a3ada 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/UtilsTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/UtilsTest.kt\n@@ -2,7 +2,7 @@ package fr.free.nrw.commons\n \n import org.junit.Test\n import org.junit.jupiter.api.Assertions\n-import java.util.*\n+import java.util.Calendar\n \n class UtilsTest {\n @Test\n@@ -25,4 +25,4 @@ class UtilsTest {\n cal.set(2022, Calendar.DECEMBER, 1)\n Assertions.assertEquals(2022, Utils.getWikiLovesMonumentsYear(cal))\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/WelcomeActivityUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/WelcomeActivityUnitTest.kt\nindex 7d6ecd23ae..18627796b7 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/WelcomeActivityUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/WelcomeActivityUnitTest.kt\n@@ -21,7 +21,6 @@ import org.robolectric.shadows.ShadowIntent\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class WelcomeActivityUnitTest {\n-\n private lateinit var activity: WelcomeActivity\n private lateinit var finishTutorialButton: TextView\n \n@@ -32,8 +31,10 @@ class WelcomeActivityUnitTest {\n @Before\n fun setUp() {\n val intent = Intent().putExtra(\"isQuiz\", true)\n- activity = Robolectric.buildActivity(WelcomeActivity::class.java, intent)\n- .get()\n+ activity =\n+ Robolectric\n+ .buildActivity(WelcomeActivity::class.java, intent)\n+ .get()\n activity.onCreate(null)\n finishTutorialButton = activity.findViewById(R.id.finishTutorialButton)\n }\n@@ -77,5 +78,4 @@ class WelcomeActivityUnitTest {\n fun testOnBackPressed() {\n activity.onBackPressed()\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/actions/PageEditClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/actions/PageEditClientTest.kt\nindex be0937e9d0..d98515c96a 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/actions/PageEditClientTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/actions/PageEditClientTest.kt\n@@ -2,6 +2,8 @@ package fr.free.nrw.commons.actions\n \n import com.nhaarman.mockitokotlin2.eq\n import com.nhaarman.mockitokotlin2.verify\n+import fr.free.nrw.commons.auth.csrf.CsrfTokenClient\n+import fr.free.nrw.commons.wikidata.model.edit.Edit\n import io.reactivex.Observable\n import org.junit.Before\n import org.junit.Test\n@@ -9,12 +11,11 @@ import org.mockito.ArgumentMatchers\n import org.mockito.Mock\n import org.mockito.Mockito\n import org.mockito.MockitoAnnotations\n-import fr.free.nrw.commons.auth.csrf.CsrfTokenClient\n-import fr.free.nrw.commons.wikidata.model.edit.Edit\n \n class PageEditClientTest {\n @Mock\n private lateinit var csrfTokenClient: CsrfTokenClient\n+\n @Mock\n private lateinit var pageEditInterface: PageEditInterface\n \n@@ -52,16 +53,17 @@ class PageEditClientTest {\n @Test\n fun testAppendEdit() {\n Mockito.`when`(csrfTokenClient.getTokenBlocking()).thenReturn(\"test\")\n- Mockito.`when`(\n- pageEditInterface.postAppendEdit(\n- ArgumentMatchers.anyString(),\n- ArgumentMatchers.anyString(),\n- ArgumentMatchers.anyString(),\n- ArgumentMatchers.anyString()\n+ Mockito\n+ .`when`(\n+ pageEditInterface.postAppendEdit(\n+ ArgumentMatchers.anyString(),\n+ ArgumentMatchers.anyString(),\n+ ArgumentMatchers.anyString(),\n+ ArgumentMatchers.anyString(),\n+ ),\n+ ).thenReturn(\n+ Observable.just(edit),\n )\n- ).thenReturn(\n- Observable.just(edit)\n- )\n Mockito.`when`(edit.edit()).thenReturn(editResult)\n Mockito.`when`(editResult.editSucceeded()).thenReturn(true)\n pageEditClient.appendEdit(\"test\", \"test\", \"test\").test()\n@@ -88,7 +90,12 @@ class PageEditClientTest {\n fun testSetCaptions() {\n Mockito.`when`(csrfTokenClient.getTokenBlocking()).thenReturn(\"test\")\n pageEditClient.setCaptions(\"test\", \"test\", \"en\", \"test\")\n- verify(pageEditInterface).postCaptions(eq(\"test\"), eq(\"test\"), eq(\"en\"),\n- eq(\"test\"), eq(\"test\"))\n+ verify(pageEditInterface).postCaptions(\n+ eq(\"test\"),\n+ eq(\"test\"),\n+ eq(\"en\"),\n+ eq(\"test\"),\n+ eq(\"test\"),\n+ )\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt\nindex c3257ddab7..d409016ae2 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt\n@@ -3,6 +3,7 @@ package fr.free.nrw.commons.actions\n import com.nhaarman.mockitokotlin2.eq\n import com.nhaarman.mockitokotlin2.verify\n import fr.free.nrw.commons.CommonsApplication\n+import fr.free.nrw.commons.auth.csrf.CsrfTokenClient\n import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n@@ -14,13 +15,13 @@ import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n import org.powermock.core.classloader.annotations.PrepareForTest\n import org.robolectric.RobolectricTestRunner\n-import fr.free.nrw.commons.auth.csrf.CsrfTokenClient\n \n @RunWith(RobolectricTestRunner::class)\n @PrepareForTest(CommonsApplication::class)\n class ThanksClientTest {\n @Mock\n private lateinit var csrfTokenClient: CsrfTokenClient\n+\n @Mock\n private lateinit var service: ThanksInterface\n \n@@ -52,4 +53,4 @@ class ThanksClientTest {\n thanksClient.thank(1L)\n verify(service).thank(ArgumentMatchers.anyString(), ArgumentMatchers.any(), eq(\"test\"), eq(\"test\"))\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/auth/AccountUtilUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/auth/AccountUtilUnitTest.kt\nindex 72aab70365..b45b844c06 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/auth/AccountUtilUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/auth/AccountUtilUnitTest.kt\n@@ -14,7 +14,6 @@ import org.robolectric.annotation.Config\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class AccountUtilUnitTest {\n-\n private lateinit var context: FakeContextWrapper\n private lateinit var accountUtil: AccountUtil\n \n@@ -58,4 +57,4 @@ class AccountUtilUnitTest {\n FakeContextWrapperWithException(ApplicationProvider.getApplicationContext())\n Assert.assertEquals(AccountUtil.account(context), null)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/auth/LoginActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/auth/LoginActivityUnitTests.kt\nindex 2d80c65c94..b50c820a0d 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/auth/LoginActivityUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/auth/LoginActivityUnitTests.kt\n@@ -13,8 +13,8 @@ import androidx.test.core.app.ApplicationProvider\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.auth.login.LoginResult\n+import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.kvstore.JsonKvStore\n import org.junit.Assert\n import org.junit.Before\n@@ -30,11 +30,9 @@ import org.robolectric.annotation.Config\n import org.robolectric.fakes.RoboMenuItem\n import java.lang.reflect.Method\n \n-\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class LoginActivityUnitTests {\n-\n private lateinit var menuItem: MenuItem\n private lateinit var context: Context\n \n@@ -92,12 +90,13 @@ class LoginActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnEditorActionCaseDefault() {\n- val method: Method = LoginActivity::class.java.getDeclaredMethod(\n- \"onEditorAction\",\n- TextView::class.java,\n- Int::class.java,\n- KeyEvent::class.java\n- )\n+ val method: Method =\n+ LoginActivity::class.java.getDeclaredMethod(\n+ \"onEditorAction\",\n+ TextView::class.java,\n+ Int::class.java,\n+ KeyEvent::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, textView, 0, keyEvent)\n }\n@@ -105,9 +104,10 @@ class LoginActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testSkipLogin() {\n- val method: Method = LoginActivity::class.java.getDeclaredMethod(\n- \"skipLogin\"\n- )\n+ val method: Method =\n+ LoginActivity::class.java.getDeclaredMethod(\n+ \"skipLogin\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -115,9 +115,10 @@ class LoginActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testForgotPassword() {\n- val method: Method = LoginActivity::class.java.getDeclaredMethod(\n- \"forgotPassword\"\n- )\n+ val method: Method =\n+ LoginActivity::class.java.getDeclaredMethod(\n+ \"forgotPassword\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -125,9 +126,10 @@ class LoginActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnPrivacyPolicyClicked() {\n- val method: Method = LoginActivity::class.java.getDeclaredMethod(\n- \"onPrivacyPolicyClicked\"\n- )\n+ val method: Method =\n+ LoginActivity::class.java.getDeclaredMethod(\n+ \"onPrivacyPolicyClicked\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -135,9 +137,10 @@ class LoginActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testSignUp() {\n- val method: Method = LoginActivity::class.java.getDeclaredMethod(\n- \"signUp\"\n- )\n+ val method: Method =\n+ LoginActivity::class.java.getDeclaredMethod(\n+ \"signUp\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -145,10 +148,11 @@ class LoginActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnPostCreate() {\n- val method: Method = LoginActivity::class.java.getDeclaredMethod(\n- \"onPostCreate\",\n- Bundle::class.java\n- )\n+ val method: Method =\n+ LoginActivity::class.java.getDeclaredMethod(\n+ \"onPostCreate\",\n+ Bundle::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, bundle)\n }\n@@ -157,9 +161,10 @@ class LoginActivityUnitTests {\n @Throws(Exception::class)\n fun testOnDestroy() {\n `when`(progressDialog.isShowing).thenReturn(true)\n- val method: Method = LoginActivity::class.java.getDeclaredMethod(\n- \"onDestroy\"\n- )\n+ val method: Method =\n+ LoginActivity::class.java.getDeclaredMethod(\n+ \"onDestroy\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -168,9 +173,10 @@ class LoginActivityUnitTests {\n @Throws(Exception::class)\n fun testOnDestroyWithException() {\n `when`(progressDialog.isShowing).thenThrow(NullPointerException())\n- val method: Method = LoginActivity::class.java.getDeclaredMethod(\n- \"onDestroy\"\n- )\n+ val method: Method =\n+ LoginActivity::class.java.getDeclaredMethod(\n+ \"onDestroy\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -178,10 +184,11 @@ class LoginActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnLoginSuccessCaseDefault() {\n- val method: Method = LoginActivity::class.java.getDeclaredMethod(\n- \"onLoginSuccess\",\n- LoginResult::class.java\n- )\n+ val method: Method =\n+ LoginActivity::class.java.getDeclaredMethod(\n+ \"onLoginSuccess\",\n+ LoginResult::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, loginResult)\n }\n@@ -190,10 +197,11 @@ class LoginActivityUnitTests {\n @Throws(Exception::class)\n fun testOnLoginSuccess() {\n `when`(progressDialog.isShowing).thenReturn(true)\n- val method: Method = LoginActivity::class.java.getDeclaredMethod(\n- \"onLoginSuccess\",\n- LoginResult::class.java\n- )\n+ val method: Method =\n+ LoginActivity::class.java.getDeclaredMethod(\n+ \"onLoginSuccess\",\n+ LoginResult::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, loginResult)\n }\n@@ -201,9 +209,10 @@ class LoginActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testShowPasswordResetPrompt() {\n- val method: Method = LoginActivity::class.java.getDeclaredMethod(\n- \"showPasswordResetPrompt\"\n- )\n+ val method: Method =\n+ LoginActivity::class.java.getDeclaredMethod(\n+ \"showPasswordResetPrompt\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -211,9 +220,10 @@ class LoginActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testHideProgress() {\n- val method: Method = LoginActivity::class.java.getDeclaredMethod(\n- \"hideProgress\"\n- )\n+ val method: Method =\n+ LoginActivity::class.java.getDeclaredMethod(\n+ \"hideProgress\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -225,9 +235,10 @@ class LoginActivityUnitTests {\n `when`(applicationKvStore.getBoolean(\"login_skipped\", false)).thenReturn(true)\n `when`(sessionManager.currentAccount).thenReturn(account)\n `when`(sessionManager.isUserLoggedIn).thenReturn(true)\n- val method: Method = LoginActivity::class.java.getDeclaredMethod(\n- \"onResume\"\n- )\n+ val method: Method =\n+ LoginActivity::class.java.getDeclaredMethod(\n+ \"onResume\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -235,9 +246,10 @@ class LoginActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnStart() {\n- val method: Method = LoginActivity::class.java.getDeclaredMethod(\n- \"onStart\"\n- )\n+ val method: Method =\n+ LoginActivity::class.java.getDeclaredMethod(\n+ \"onStart\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -245,9 +257,10 @@ class LoginActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnStop() {\n- val method: Method = LoginActivity::class.java.getDeclaredMethod(\n- \"onStop\"\n- )\n+ val method: Method =\n+ LoginActivity::class.java.getDeclaredMethod(\n+ \"onStop\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -255,9 +268,10 @@ class LoginActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnPostResume() {\n- val method: Method = LoginActivity::class.java.getDeclaredMethod(\n- \"onPostResume\"\n- )\n+ val method: Method =\n+ LoginActivity::class.java.getDeclaredMethod(\n+ \"onPostResume\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/auth/SessionManagerUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/auth/SessionManagerUnitTests.kt\nindex 1103978aa9..7b7c260e86 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/auth/SessionManagerUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/auth/SessionManagerUnitTests.kt\n@@ -20,12 +20,10 @@ import org.robolectric.annotation.Config\n import org.robolectric.annotation.LooperMode\n import java.lang.reflect.Method\n \n-\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class SessionManagerUnitTests {\n-\n private lateinit var sessionManager: SessionManager\n private lateinit var accountManager: AccountManager\n \n@@ -59,9 +57,10 @@ class SessionManagerUnitTests {\n @Test\n @Throws(Exception::class)\n fun testRemoveAccountCaseNull() {\n- val method: Method = SessionManager::class.java.getDeclaredMethod(\n- \"removeAccount\"\n- )\n+ val method: Method =\n+ SessionManager::class.java.getDeclaredMethod(\n+ \"removeAccount\",\n+ )\n method.isAccessible = true\n method.invoke(sessionManager)\n }\n@@ -71,10 +70,11 @@ class SessionManagerUnitTests {\n fun testUpdateAccount() {\n `when`(loginResult.userName).thenReturn(\"username\")\n `when`(loginResult.password).thenReturn(\"password\")\n- val method: Method = SessionManager::class.java.getDeclaredMethod(\n- \"updateAccount\",\n- LoginResult::class.java\n- )\n+ val method: Method =\n+ SessionManager::class.java.getDeclaredMethod(\n+ \"updateAccount\",\n+ LoginResult::class.java,\n+ )\n method.isAccessible = true\n method.invoke(sessionManager, loginResult)\n }\n@@ -118,11 +118,12 @@ class SessionManagerUnitTests {\n @Test\n @Throws(Exception::class)\n fun testCreateAccount() {\n- val method: Method = SessionManager::class.java.getDeclaredMethod(\n- \"createAccount\",\n- String::class.java,\n- String::class.java\n- )\n+ val method: Method =\n+ SessionManager::class.java.getDeclaredMethod(\n+ \"createAccount\",\n+ String::class.java,\n+ String::class.java,\n+ )\n method.isAccessible = true\n Assert.assertEquals(method.invoke(sessionManager, \"username\", \"password\"), true)\n }\n@@ -130,10 +131,11 @@ class SessionManagerUnitTests {\n @Test\n @Throws(Exception::class)\n fun testSetUserLoggedIn() {\n- val method: Method = SessionManager::class.java.getDeclaredMethod(\n- \"setUserLoggedIn\",\n- Boolean::class.java\n- )\n+ val method: Method =\n+ SessionManager::class.java.getDeclaredMethod(\n+ \"setUserLoggedIn\",\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(sessionManager, true)\n }\n@@ -141,9 +143,10 @@ class SessionManagerUnitTests {\n @Test\n @Throws(Exception::class)\n fun testGetUserName() {\n- val method: Method = SessionManager::class.java.getDeclaredMethod(\n- \"getUserName\"\n- )\n+ val method: Method =\n+ SessionManager::class.java.getDeclaredMethod(\n+ \"getUserName\",\n+ )\n method.isAccessible = true\n Assert.assertEquals(method.invoke(sessionManager), null)\n }\n@@ -151,11 +154,11 @@ class SessionManagerUnitTests {\n @Test\n @Throws(Exception::class)\n fun testGetPassword() {\n- val method: Method = SessionManager::class.java.getDeclaredMethod(\n- \"getPassword\"\n- )\n+ val method: Method =\n+ SessionManager::class.java.getDeclaredMethod(\n+ \"getPassword\",\n+ )\n method.isAccessible = true\n Assert.assertEquals(method.invoke(sessionManager), null)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/auth/SignupActivityTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/auth/SignupActivityTest.kt\nindex bb9c677809..054bf851e7 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/auth/SignupActivityTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/auth/SignupActivityTest.kt\n@@ -14,11 +14,9 @@ import org.robolectric.Robolectric\n import org.robolectric.RobolectricTestRunner\n import org.robolectric.annotation.Config\n \n-\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class SignupActivityTest {\n-\n private lateinit var activity: SignupActivity\n \n @Mock\n@@ -49,4 +47,4 @@ class SignupActivityTest {\n `when`(webView.canGoBack()).thenReturn(true)\n activity.onBackPressed()\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/auth/WikiAccountAuthenticatorServiceUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/auth/WikiAccountAuthenticatorServiceUnitTest.kt\nindex 3fc00c6696..c1c2094623 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/auth/WikiAccountAuthenticatorServiceUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/auth/WikiAccountAuthenticatorServiceUnitTest.kt\n@@ -7,7 +7,6 @@ import org.mockito.MockitoAnnotations\n import java.lang.reflect.Field\n \n class WikiAccountAuthenticatorServiceUnitTest {\n-\n private lateinit var service: WikiAccountAuthenticatorService\n \n @Before\n@@ -30,5 +29,4 @@ class WikiAccountAuthenticatorServiceUnitTest {\n field.set(service, null)\n Assert.assertEquals(service.onBind(null), null)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/auth/WikiAccountAuthenticatorUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/auth/WikiAccountAuthenticatorUnitTest.kt\nindex f1c11d56e8..856e5015d0 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/auth/WikiAccountAuthenticatorUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/auth/WikiAccountAuthenticatorUnitTest.kt\n@@ -23,7 +23,6 @@ import org.robolectric.annotation.LooperMode\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class WikiAccountAuthenticatorUnitTest {\n-\n private lateinit var context: Context\n private lateinit var authenticator: WikiAccountAuthenticator\n \n@@ -64,7 +63,7 @@ class WikiAccountAuthenticatorUnitTest {\n val intent: Intent? = bundle.getParcelable(AccountManager.KEY_INTENT)\n Assert.assertEquals(\n intent?.extras!![AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE],\n- response\n+ response,\n )\n }\n \n@@ -89,7 +88,7 @@ class WikiAccountAuthenticatorUnitTest {\n fun testGetAuthTokenLabelCaseNonNull() {\n Assert.assertEquals(\n authenticator.getAuthTokenLabel(BuildConfig.ACCOUNT_TYPE),\n- AccountUtil.AUTH_TOKEN_TYPE\n+ AccountUtil.AUTH_TOKEN_TYPE,\n )\n }\n \n@@ -110,5 +109,4 @@ class WikiAccountAuthenticatorUnitTest {\n val bundle: Bundle? = authenticator.getAccountRemovalAllowed(response, account)\n Assert.assertEquals(bundle?.getBoolean(AccountManager.KEY_BOOLEAN_RESULT), true)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/auth/csrf/CsrfTokenClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/auth/csrf/CsrfTokenClientTest.kt\nindex 238c9f30da..2e502d21f9 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/auth/csrf/CsrfTokenClientTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/auth/csrf/CsrfTokenClientTest.kt\n@@ -2,8 +2,10 @@ package fr.free.nrw.commons.auth.csrf\n \n import com.google.gson.stream.MalformedJsonException\n import fr.free.nrw.commons.MockWebServerTest\n+import fr.free.nrw.commons.OkHttpConnectionFactory.HttpStatusException\n import fr.free.nrw.commons.auth.SessionManager\n import fr.free.nrw.commons.auth.login.LoginClient\n+import fr.free.nrw.commons.wikidata.mwapi.MwException\n import org.junit.Test\n import org.mockito.ArgumentMatchers.any\n import org.mockito.ArgumentMatchers.eq\n@@ -11,8 +13,6 @@ import org.mockito.ArgumentMatchers.isA\n import org.mockito.Mockito.mock\n import org.mockito.Mockito.never\n import org.mockito.Mockito.verify\n-import fr.free.nrw.commons.wikidata.mwapi.MwException\n-import fr.free.nrw.commons.OkHttpConnectionFactory.HttpStatusException\n \n class CsrfTokenClientTest : MockWebServerTest() {\n private val cb = mock(CsrfTokenClient.Callback::class.java)\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/auth/login/UserExtendedInfoClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/auth/login/UserExtendedInfoClientTest.kt\nindex 755f8ea8b9..dbf7e20957 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/auth/login/UserExtendedInfoClientTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/auth/login/UserExtendedInfoClientTest.kt\n@@ -4,16 +4,16 @@ import android.net.Uri\n import com.google.gson.GsonBuilder\n import com.google.gson.stream.MalformedJsonException\n import fr.free.nrw.commons.MockWebServerTest\n-import io.reactivex.observers.TestObserver\n-import org.junit.Before\n-import org.junit.Test\n-import fr.free.nrw.commons.wikidata.model.WikiSite\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n import fr.free.nrw.commons.wikidata.json.NamespaceTypeAdapter\n import fr.free.nrw.commons.wikidata.json.PostProcessingTypeAdapter\n import fr.free.nrw.commons.wikidata.json.UriTypeAdapter\n import fr.free.nrw.commons.wikidata.json.WikiSiteTypeAdapter\n+import fr.free.nrw.commons.wikidata.model.WikiSite\n import fr.free.nrw.commons.wikidata.model.page.Namespace\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n+import io.reactivex.observers.TestObserver\n+import org.junit.Before\n+import org.junit.Test\n import retrofit2.Retrofit\n import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory\n import retrofit2.converter.gson.GsonConverterFactory\n@@ -21,29 +21,36 @@ import retrofit2.converter.gson.GsonConverterFactory\n class UserExtendedInfoClientTest : MockWebServerTest() {\n private var apiService: LoginInterface? = null\n private val observer = TestObserver()\n- private val gson = GsonBuilder()\n- .registerTypeHierarchyAdapter(Uri::class.java, UriTypeAdapter()\n- .nullSafe())\n- .registerTypeHierarchyAdapter(\n- Namespace::class.java, NamespaceTypeAdapter()\n- .nullSafe())\n- .registerTypeAdapter(\n- WikiSite::class.java, WikiSiteTypeAdapter()\n- .nullSafe())\n- .registerTypeAdapterFactory(PostProcessingTypeAdapter())\n- .create()\n+ private val gson =\n+ GsonBuilder()\n+ .registerTypeHierarchyAdapter(\n+ Uri::class.java,\n+ UriTypeAdapter()\n+ .nullSafe(),\n+ ).registerTypeHierarchyAdapter(\n+ Namespace::class.java,\n+ NamespaceTypeAdapter()\n+ .nullSafe(),\n+ ).registerTypeAdapter(\n+ WikiSite::class.java,\n+ WikiSiteTypeAdapter()\n+ .nullSafe(),\n+ ).registerTypeAdapterFactory(PostProcessingTypeAdapter())\n+ .create()\n \n @Before\n @Throws(Throwable::class)\n override fun setUp() {\n super.setUp()\n \n- apiService = Retrofit.Builder()\n- .addCallAdapterFactory(RxJava2CallAdapterFactory.create())\n- .addConverterFactory(GsonConverterFactory.create(gson))\n- .baseUrl(server().url)\n- .build()\n- .create(LoginInterface::class.java)\n+ apiService =\n+ Retrofit\n+ .Builder()\n+ .addCallAdapterFactory(RxJava2CallAdapterFactory.create())\n+ .addConverterFactory(GsonConverterFactory.create(gson))\n+ .baseUrl(server().url)\n+ .build()\n+ .create(LoginInterface::class.java)\n }\n \n @Test\n@@ -57,9 +64,14 @@ class UserExtendedInfoClientTest : MockWebServerTest() {\n .assertComplete()\n .assertNoErrors()\n .assertValue { result: MwQueryResponse ->\n- result.query()!!\n- .userInfo()!!.id() == 24531888 && result.query()!!.getUserResponse(\"USER\")!!\n- .name() == \"USER\"\n+ result\n+ .query()!!\n+ .userInfo()!!\n+ .id() == 24531888 &&\n+ result\n+ .query()!!\n+ .getUserResponse(\"USER\")!!\n+ .name() == \"USER\"\n }\n }\n \ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/BookmarkListRootFragmentUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/BookmarkListRootFragmentUnitTest.kt\nindex 2029c1cbc4..5098bd0c1a 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/BookmarkListRootFragmentUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/BookmarkListRootFragmentUnitTest.kt\n@@ -18,9 +18,9 @@ import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesFragment\n import fr.free.nrw.commons.contributions.MainActivity\n+import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.databinding.FragmentBookmarksBinding\n import fr.free.nrw.commons.databinding.FragmentFeaturedRootBinding\n import fr.free.nrw.commons.explore.ParentViewPager\n@@ -44,7 +44,6 @@ import java.lang.reflect.Field\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class BookmarkListRootFragmentUnitTest {\n-\n private lateinit var fragment: BookmarkListRootFragment\n private lateinit var fragmentManager: FragmentManager\n private lateinit var layoutInflater: LayoutInflater\n@@ -328,5 +327,4 @@ class BookmarkListRootFragmentUnitTest {\n field.set(fragment, null)\n Assert.assertEquals(fragment.backPressed(), false)\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapterTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapterTests.kt\nindex 2301faccfb..9423c90958 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapterTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapterTests.kt\n@@ -44,4 +44,4 @@ class BookmarksPagerAdapterTests {\n fun testGetPageTitle() {\n bookmarksPagerAdapter.getPageTitle(0)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/LoggedOutBookmarksPagerAdapterTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/LoggedOutBookmarksPagerAdapterTests.kt\nindex d5401ad7d0..4c20bdda93 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/LoggedOutBookmarksPagerAdapterTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/LoggedOutBookmarksPagerAdapterTests.kt\n@@ -63,4 +63,4 @@ class LoggedOutBookmarksPagerAdapterTests {\n fun testGetPageTitle() {\n bookmarksPagerAdapter.getPageTitle(0)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsControllerTest.kt\nindex 513f13162a..98279520d0 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsControllerTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsControllerTest.kt\n@@ -14,6 +14,7 @@ import java.util.ArrayList\n class BookmarkItemsControllerTest {\n @Mock\n var bookmarkDao: BookmarkItemsDao? = null\n+\n @InjectMocks\n lateinit var bookmarkItemsController: BookmarkItemsController\n \n@@ -33,9 +34,21 @@ class BookmarkItemsControllerTest {\n val list = ArrayList()\n list.add(\n DepictedItem(\n- \"name\", \"description\", \"image url\", listOf(\"instance\"),\n- listOf(CategoryItem(\"category name\", \"category description\",\n- \"category thumbnail\", false)), true, \"id\")\n+ \"name\",\n+ \"description\",\n+ \"image url\",\n+ listOf(\"instance\"),\n+ listOf(\n+ CategoryItem(\n+ \"category name\",\n+ \"category description\",\n+ \"category thumbnail\",\n+ false,\n+ ),\n+ ),\n+ true,\n+ \"id\",\n+ ),\n )\n return list\n }\n@@ -49,4 +62,4 @@ class BookmarkItemsControllerTest {\n bookmarkItemsController.loadFavoritesItems()\n Assert.assertEquals(1, bookmarkedItems.size.toLong())\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDaoTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDaoTest.kt\nindex 15d04283c3..60ae7869de 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDaoTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDaoTest.kt\n@@ -7,9 +7,31 @@ import android.database.MatrixCursor\n import android.database.sqlite.SQLiteDatabase\n import android.net.Uri\n import android.os.RemoteException\n-import com.nhaarman.mockitokotlin2.*\n+import com.nhaarman.mockitokotlin2.any\n+import com.nhaarman.mockitokotlin2.anyOrNull\n+import com.nhaarman.mockitokotlin2.argumentCaptor\n+import com.nhaarman.mockitokotlin2.eq\n+import com.nhaarman.mockitokotlin2.inOrder\n+import com.nhaarman.mockitokotlin2.isA\n+import com.nhaarman.mockitokotlin2.isNull\n+import com.nhaarman.mockitokotlin2.mock\n+import com.nhaarman.mockitokotlin2.verify\n+import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.*\n+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.COLUMN_CATEGORIES_DESCRIPTION_LIST\n+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.COLUMN_CATEGORIES_NAME_LIST\n+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.COLUMN_CATEGORIES_THUMBNAIL_LIST\n+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.COLUMN_DESCRIPTION\n+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.COLUMN_ID\n+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.COLUMN_IMAGE\n+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.COLUMN_INSTANCE_LIST\n+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.COLUMN_IS_SELECTED\n+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.COLUMN_NAME\n+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.CREATE_TABLE_STATEMENT\n+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.DROP_TABLE_STATEMENT\n+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.onCreate\n+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.onDelete\n+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.onUpdate\n import fr.free.nrw.commons.category.CategoryItem\n import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n import org.junit.Assert\n@@ -23,17 +45,18 @@ import org.robolectric.annotation.Config\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class BookmarkItemsDaoTest {\n- private val columns = arrayOf(\n- COLUMN_NAME,\n- COLUMN_DESCRIPTION,\n- COLUMN_IMAGE,\n- COLUMN_INSTANCE_LIST,\n- COLUMN_CATEGORIES_NAME_LIST,\n- COLUMN_CATEGORIES_DESCRIPTION_LIST,\n- COLUMN_CATEGORIES_THUMBNAIL_LIST,\n- COLUMN_IS_SELECTED,\n- COLUMN_ID,\n- )\n+ private val columns =\n+ arrayOf(\n+ COLUMN_NAME,\n+ COLUMN_DESCRIPTION,\n+ COLUMN_IMAGE,\n+ COLUMN_INSTANCE_LIST,\n+ COLUMN_CATEGORIES_NAME_LIST,\n+ COLUMN_CATEGORIES_DESCRIPTION_LIST,\n+ COLUMN_CATEGORIES_THUMBNAIL_LIST,\n+ COLUMN_IS_SELECTED,\n+ COLUMN_ID,\n+ )\n private val client: ContentProviderClient = mock()\n private val database: SQLiteDatabase = mock()\n private val captor = argumentCaptor()\n@@ -46,12 +69,23 @@ class BookmarkItemsDaoTest {\n */\n @Before\n fun setUp() {\n- exampleItemBookmark = DepictedItem(\"itemName\", \"itemDescription\",\n- \"itemImageUrl\", listOf(\"instance\"), listOf(\n- CategoryItem(\"category name\", \"category description\",\n- \"category thumbnail\", false)\n- ), false,\n- \"itemID\")\n+ exampleItemBookmark =\n+ DepictedItem(\n+ \"itemName\",\n+ \"itemDescription\",\n+ \"itemImageUrl\",\n+ listOf(\"instance\"),\n+ listOf(\n+ CategoryItem(\n+ \"category name\",\n+ \"category description\",\n+ \"category thumbnail\",\n+ false,\n+ ),\n+ ),\n+ false,\n+ \"itemID\",\n+ )\n testObject = BookmarkItemsDao { client }\n }\n \n@@ -79,9 +113,17 @@ class BookmarkItemsDaoTest {\n Assert.assertEquals(\"itemDescription\", it.description)\n Assert.assertEquals(\"itemImageUrl\", it.imageUrl)\n Assert.assertEquals(listOf(\"instance\"), it.instanceOfs)\n- Assert.assertEquals(listOf(CategoryItem(\"category name\",\n- \"category description\",\n- \"category thumbnail\", false)), it.commonsCategories)\n+ Assert.assertEquals(\n+ listOf(\n+ CategoryItem(\n+ \"category name\",\n+ \"category description\",\n+ \"category thumbnail\",\n+ false,\n+ ),\n+ ),\n+ it.commonsCategories,\n+ )\n Assert.assertEquals(false, it.isSelected)\n Assert.assertEquals(\"itemID\", it.id)\n }\n@@ -96,13 +138,12 @@ class BookmarkItemsDaoTest {\n val result = testObject.allBookmarksItems\n \n Assert.assertEquals(14, (result.size))\n-\n }\n \n @Test(expected = RuntimeException::class)\n fun getAllItemsBookmarksTranslatesExceptions() {\n whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenThrow(\n- RemoteException(\"\")\n+ RemoteException(\"\"),\n )\n testObject.allBookmarksItems\n }\n@@ -131,7 +172,6 @@ class BookmarkItemsDaoTest {\n verify(mockCursor).close()\n }\n \n-\n @Test\n fun updateNewItemBookmark() {\n whenever(client.insert(any(), any())).thenReturn(Uri.EMPTY)\n@@ -143,39 +183,39 @@ class BookmarkItemsDaoTest {\n Assert.assertEquals(9, cv.size())\n Assert.assertEquals(\n exampleItemBookmark.name,\n- cv.getAsString(COLUMN_NAME)\n+ cv.getAsString(COLUMN_NAME),\n )\n Assert.assertEquals(\n exampleItemBookmark.description,\n- cv.getAsString(COLUMN_DESCRIPTION)\n+ cv.getAsString(COLUMN_DESCRIPTION),\n )\n Assert.assertEquals(\n exampleItemBookmark.imageUrl,\n- cv.getAsString(COLUMN_IMAGE)\n+ cv.getAsString(COLUMN_IMAGE),\n )\n Assert.assertEquals(\n exampleItemBookmark.instanceOfs[0],\n- cv.getAsString(COLUMN_INSTANCE_LIST)\n+ cv.getAsString(COLUMN_INSTANCE_LIST),\n )\n Assert.assertEquals(\n exampleItemBookmark.commonsCategories[0].name,\n- cv.getAsString(COLUMN_CATEGORIES_NAME_LIST)\n+ cv.getAsString(COLUMN_CATEGORIES_NAME_LIST),\n )\n Assert.assertEquals(\n exampleItemBookmark.commonsCategories[0].description,\n- cv.getAsString(COLUMN_CATEGORIES_DESCRIPTION_LIST)\n+ cv.getAsString(COLUMN_CATEGORIES_DESCRIPTION_LIST),\n )\n Assert.assertEquals(\n exampleItemBookmark.commonsCategories[0].thumbnail,\n- cv.getAsString(COLUMN_CATEGORIES_THUMBNAIL_LIST)\n+ cv.getAsString(COLUMN_CATEGORIES_THUMBNAIL_LIST),\n )\n Assert.assertEquals(\n exampleItemBookmark.isSelected,\n- cv.getAsBoolean(COLUMN_IS_SELECTED)\n+ cv.getAsBoolean(COLUMN_IS_SELECTED),\n )\n Assert.assertEquals(\n exampleItemBookmark.id,\n- cv.getAsString(COLUMN_ID)\n+ cv.getAsString(COLUMN_ID),\n )\n }\n }\n@@ -186,8 +226,11 @@ class BookmarkItemsDaoTest {\n whenever(client.query(any(), any(), any(), any(), anyOrNull())).thenReturn(createCursor(1))\n \n Assert.assertFalse(testObject.updateBookmarkItem(exampleItemBookmark))\n- verify(client).delete(eq(BookmarkItemsContentProvider.uriForName(exampleItemBookmark.id)),\n- isNull(), isNull())\n+ verify(client).delete(\n+ eq(BookmarkItemsContentProvider.uriForName(exampleItemBookmark.id)),\n+ isNull(),\n+ isNull(),\n+ )\n }\n \n @Test\n@@ -199,7 +242,7 @@ class BookmarkItemsDaoTest {\n @Test(expected = RuntimeException::class)\n fun findItemBookmarkTranslatesExceptions() {\n whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenThrow(\n- RemoteException(\"\")\n+ RemoteException(\"\"),\n )\n testObject.findBookmarkItem(exampleItemBookmark.id)\n }\n@@ -351,12 +394,22 @@ class BookmarkItemsDaoTest {\n verifyNoInteractions(database)\n }\n \n- private fun createCursor(rowCount: Int) = MatrixCursor(columns, rowCount).apply {\n-\n- for (i in 0 until rowCount) {\n- addRow(listOf(\"itemName\", \"itemDescription\",\n- \"itemImageUrl\", \"instance\", \"category name\", \"category description\",\n- \"category thumbnail\", false, \"itemID\"))\n+ private fun createCursor(rowCount: Int) =\n+ MatrixCursor(columns, rowCount).apply {\n+ for (i in 0 until rowCount) {\n+ addRow(\n+ listOf(\n+ \"itemName\",\n+ \"itemDescription\",\n+ \"itemImageUrl\",\n+ \"instance\",\n+ \"category name\",\n+ \"category description\",\n+ \"category thumbnail\",\n+ false,\n+ \"itemID\",\n+ ),\n+ )\n+ }\n }\n- }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsFragmentUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsFragmentUnitTest.kt\nindex c68ca34b9a..12292af917 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsFragmentUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsFragmentUnitTest.kt\n@@ -5,7 +5,6 @@ import android.os.Bundle\n import android.view.LayoutInflater\n import android.view.View\n import android.widget.ProgressBar\n-import android.widget.RelativeLayout\n import android.widget.TextView\n import androidx.fragment.app.FragmentManager\n import androidx.fragment.app.FragmentTransaction\n@@ -15,8 +14,8 @@ import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.category.CategoryItem\n+import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.databinding.FragmentBookmarksItemsBinding\n import fr.free.nrw.commons.profile.ProfileActivity\n import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n@@ -32,13 +31,11 @@ import org.robolectric.RobolectricTestRunner\n import org.robolectric.annotation.Config\n import org.robolectric.annotation.LooperMode\n import java.lang.reflect.Method\n-import java.util.*\n \n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class BookmarkItemsFragmentUnitTest {\n-\n private lateinit var fragment: BookmarkItemsFragment\n private lateinit var context: Context\n private lateinit var view: View\n@@ -63,11 +60,21 @@ class BookmarkItemsFragmentUnitTest {\n val list = ArrayList()\n list.add(\n DepictedItem(\n- \"name\", \"description\", \"image url\", listOf(\"instance\"),\n+ \"name\",\n+ \"description\",\n+ \"image url\",\n+ listOf(\"instance\"),\n listOf(\n- CategoryItem(\"category name\", \"category description\",\n- \"category thumbnail\", false)\n- ), true, \"id\")\n+ CategoryItem(\n+ \"category name\",\n+ \"category description\",\n+ \"category thumbnail\",\n+ false,\n+ ),\n+ ),\n+ true,\n+ \"id\",\n+ ),\n )\n return list\n }\n@@ -88,8 +95,9 @@ class BookmarkItemsFragmentUnitTest {\n fragmentTransaction.commit()\n \n layoutInflater = LayoutInflater.from(activity)\n- view = layoutInflater\n- .inflate(R.layout.fragment_bookmarks_items, null) as View\n+ view =\n+ layoutInflater\n+ .inflate(R.layout.fragment_bookmarks_items, null) as View\n binding = FragmentBookmarksItemsBinding.inflate(layoutInflater)\n \n statusTextView = view.findViewById(R.id.status_message)\n@@ -99,14 +107,13 @@ class BookmarkItemsFragmentUnitTest {\n fragment.controller = controller\n \n Whitebox.setInternalState(fragment, \"binding\", binding)\n-\n }\n \n /**\n * test init items when non empty\n */\n @Test\n- fun testInitNonEmpty(){\n+ fun testInitNonEmpty() {\n whenever(controller.loadFavoritesItems()).thenReturn(mockBookmarkList)\n val method: Method =\n BookmarkItemsFragment::class.java.getDeclaredMethod(\"initList\", Context::class.java)\n@@ -120,8 +127,7 @@ class BookmarkItemsFragmentUnitTest {\n @Test\n @Throws(Exception::class)\n fun testOnCreateView() {\n-\n- fragment.onCreateView(layoutInflater,null,savedInstanceState)\n+ fragment.onCreateView(layoutInflater, null, savedInstanceState)\n }\n \n /**\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt\nindex 3edda40169..391dd8d17a 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt\n@@ -7,15 +7,44 @@ import android.database.MatrixCursor\n import android.database.sqlite.SQLiteDatabase\n import android.net.Uri\n import android.os.RemoteException\n-import com.nhaarman.mockitokotlin2.*\n+import com.nhaarman.mockitokotlin2.any\n+import com.nhaarman.mockitokotlin2.anyOrNull\n+import com.nhaarman.mockitokotlin2.argumentCaptor\n+import com.nhaarman.mockitokotlin2.eq\n+import com.nhaarman.mockitokotlin2.inOrder\n+import com.nhaarman.mockitokotlin2.isA\n+import com.nhaarman.mockitokotlin2.isNull\n+import com.nhaarman.mockitokotlin2.mock\n+import com.nhaarman.mockitokotlin2.verify\n+import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsContentProvider.BASE_URI\n-import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.*\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_CATEGORY\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_COMMONS_LINK\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_DESCRIPTION\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_EXISTS\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_IMAGE_URL\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_LABEL_ICON\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_LABEL_TEXT\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_LANGUAGE\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_LAT\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_LONG\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_NAME\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_PIC\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_WIKIDATA_LINK\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_WIKIPEDIA_LINK\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.CREATE_TABLE_STATEMENT\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.DROP_TABLE_STATEMENT\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.onCreate\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.onDelete\n+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.onUpdate\n import fr.free.nrw.commons.location.LatLng\n import fr.free.nrw.commons.nearby.Label\n import fr.free.nrw.commons.nearby.Place\n import fr.free.nrw.commons.nearby.Sitelinks\n-import org.junit.Assert.*\n+import org.junit.Assert.assertEquals\n+import org.junit.Assert.assertFalse\n+import org.junit.Assert.assertTrue\n import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n@@ -26,20 +55,23 @@ import org.robolectric.annotation.Config\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class BookMarkLocationDaoTest {\n- private val columns = arrayOf(COLUMN_NAME,\n- COLUMN_LANGUAGE,\n- COLUMN_DESCRIPTION,\n- COLUMN_CATEGORY,\n- COLUMN_LABEL_TEXT,\n- COLUMN_LABEL_ICON,\n- COLUMN_IMAGE_URL,\n- COLUMN_WIKIPEDIA_LINK,\n- COLUMN_WIKIDATA_LINK,\n- COLUMN_COMMONS_LINK,\n- COLUMN_LAT,\n- COLUMN_LONG,\n- COLUMN_PIC,\n- COLUMN_EXISTS)\n+ private val columns =\n+ arrayOf(\n+ COLUMN_NAME,\n+ COLUMN_LANGUAGE,\n+ COLUMN_DESCRIPTION,\n+ COLUMN_CATEGORY,\n+ COLUMN_LABEL_TEXT,\n+ COLUMN_LABEL_ICON,\n+ COLUMN_IMAGE_URL,\n+ COLUMN_WIKIPEDIA_LINK,\n+ COLUMN_WIKIDATA_LINK,\n+ COLUMN_COMMONS_LINK,\n+ COLUMN_LAT,\n+ COLUMN_LONG,\n+ COLUMN_PIC,\n+ COLUMN_EXISTS,\n+ )\n private val client: ContentProviderClient = mock()\n private val database: SQLiteDatabase = mock()\n private val captor = argumentCaptor()\n@@ -55,16 +87,25 @@ class BookMarkLocationDaoTest {\n fun setUp() {\n exampleLabel = Label.FOREST\n exampleUri = Uri.parse(\"wikimedia/uri\")\n- exampleLocation = LatLng(40.0,51.4, 1f)\n+ exampleLocation = LatLng(40.0, 51.4, 1f)\n \n builder = Sitelinks.Builder()\n builder.setWikipediaLink(\"wikipediaLink\")\n builder.setWikidataLink(\"wikidataLink\")\n builder.setCommonsLink(\"commonsLink\")\n \n-\n- examplePlaceBookmark = Place(\"en\", \"placeName\", exampleLabel, \"placeDescription\"\n- , exampleLocation, \"placeCategory\", builder.build(),\"picName\",false)\n+ examplePlaceBookmark =\n+ Place(\n+ \"en\",\n+ \"placeName\",\n+ exampleLabel,\n+ \"placeDescription\",\n+ exampleLocation,\n+ \"placeCategory\",\n+ builder.build(),\n+ \"picName\",\n+ false,\n+ )\n testObject = BookmarkLocationsDao { client }\n }\n \n@@ -276,8 +317,8 @@ class BookMarkLocationDaoTest {\n verify(database).execSQL(\"ALTER TABLE bookmarksLocations ADD COLUMN location_exists STRING;\")\n }\n \n- private fun createCursor(rows: Int): Cursor {\n- return MatrixCursor(columns, rows).apply {\n+ private fun createCursor(rows: Int): Cursor =\n+ MatrixCursor(columns, rows).apply {\n repeat(rows) {\n newRow().apply {\n add(\"placeName\")\n@@ -297,5 +338,4 @@ class BookMarkLocationDaoTest {\n }\n }\n }\n- }\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationControllerTest.kt\nindex 232ded8da0..d0db8e0371 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationControllerTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationControllerTest.kt\n@@ -13,15 +13,16 @@ import java.util.ArrayList\n class BookmarkLocationControllerTest {\n @Mock\n var bookmarkDao: BookmarkLocationsDao? = null\n+\n @InjectMocks\n lateinit var bookmarkLocationsController: BookmarkLocationsController\n \n- @Before\n- fun setup() {\n- MockitoAnnotations.initMocks(this)\n- whenever(bookmarkDao!!.allBookmarksLocations)\n- .thenReturn(mockBookmarkList)\n- }\n+ @Before\n+ fun setup() {\n+ MockitoAnnotations.initMocks(this)\n+ whenever(bookmarkDao!!.allBookmarksLocations)\n+ .thenReturn(mockBookmarkList)\n+ }\n \n /**\n * Get mock bookmark list\n@@ -32,7 +33,17 @@ class BookmarkLocationControllerTest {\n val list = ArrayList()\n list.add(\n Place(\n- \"en\", \"a place\", null, \"a description\", null, \"a cat\", null, null, true, \"entityID\")\n+ \"en\",\n+ \"a place\",\n+ null,\n+ \"a description\",\n+ null,\n+ \"a cat\",\n+ null,\n+ null,\n+ true,\n+ \"entityID\",\n+ ),\n )\n list.add(\n Place(\n@@ -45,8 +56,8 @@ class BookmarkLocationControllerTest {\n null,\n null,\n true,\n- \"entityID\"\n- )\n+ \"entityID\",\n+ ),\n )\n return list\n }\n@@ -60,4 +71,4 @@ class BookmarkLocationControllerTest {\n bookmarkLocationsController!!.loadFavoritesLocations()\n Assert.assertEquals(2, bookmarkedLocations.size.toLong())\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationFragmentUnitTests.kt\nindex 10d4756fda..24693dc856 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationFragmentUnitTests.kt\n@@ -5,7 +5,6 @@ import android.os.Bundle\n import android.view.LayoutInflater\n import android.view.View\n import android.widget.ProgressBar\n-import android.widget.RelativeLayout\n import android.widget.TextView\n import androidx.fragment.app.FragmentManager\n import androidx.fragment.app.FragmentTransaction\n@@ -15,8 +14,8 @@ import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.contributions.ContributionController\n+import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.databinding.FragmentBookmarksLocationsBinding\n import fr.free.nrw.commons.kvstore.JsonKvStore\n import fr.free.nrw.commons.nearby.Place\n@@ -40,7 +39,6 @@ import java.lang.reflect.Method\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class BookmarkLocationFragmentUnitTests {\n-\n private lateinit var fragment: BookmarkLocationsFragment\n private lateinit var context: Context\n private lateinit var view: View\n@@ -87,7 +85,8 @@ class BookmarkLocationFragmentUnitTests {\n null,\n null,\n true,\n- \"entityID\")\n+ \"entityID\",\n+ ),\n )\n return list\n }\n@@ -108,28 +107,28 @@ class BookmarkLocationFragmentUnitTests {\n fragmentTransaction.commit()\n \n layoutInflater = LayoutInflater.from(activity)\n- view = layoutInflater\n- .inflate(R.layout.fragment_bookmarks_locations, null) as View\n+ view =\n+ layoutInflater\n+ .inflate(R.layout.fragment_bookmarks_locations, null) as View\n binding = FragmentBookmarksLocationsBinding.bind(view)\n \n statusTextView = view.findViewById(R.id.statusMessage)\n progressBar = view.findViewById(R.id.loadingImagesProgressBar)\n recyclerView = view.findViewById(R.id.listView)\n- commonPlaceClickActions = CommonPlaceClickActions(store,activity,contributionController)\n+ commonPlaceClickActions = CommonPlaceClickActions(store, activity, contributionController)\n \n fragment.bookmarkLocationDao = bookmarkLocationDao\n fragment.controller = controller\n fragment.commonPlaceClickActions = commonPlaceClickActions\n Whitebox.setInternalState(fragment, \"adapter\", adapter)\n Whitebox.setInternalState(fragment, \"binding\", binding)\n-\n }\n \n /**\n * test init places when non empty\n */\n @Test\n- fun testInitNonEmpty(){\n+ fun testInitNonEmpty() {\n whenever(controller.loadFavoritesLocations()).thenReturn(mockBookmarkList)\n val method: Method =\n BookmarkLocationsFragment::class.java.getDeclaredMethod(\"initList\")\n@@ -143,7 +142,7 @@ class BookmarkLocationFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnCreateView() {\n- fragment.onCreateView(layoutInflater,null,savedInstanceState)\n+ fragment.onCreateView(layoutInflater, null, savedInstanceState)\n }\n \n /**\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPictureDaoTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPictureDaoTest.kt\nindex 51d53e3dbc..02668ff1c8 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPictureDaoTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPictureDaoTest.kt\n@@ -7,23 +7,39 @@ import android.database.MatrixCursor\n import android.database.sqlite.SQLiteDatabase\n import android.net.Uri\n import android.os.RemoteException\n-import com.nhaarman.mockitokotlin2.*\n+import com.nhaarman.mockitokotlin2.any\n+import com.nhaarman.mockitokotlin2.anyOrNull\n+import com.nhaarman.mockitokotlin2.argumentCaptor\n+import com.nhaarman.mockitokotlin2.eq\n+import com.nhaarman.mockitokotlin2.inOrder\n+import com.nhaarman.mockitokotlin2.isA\n+import com.nhaarman.mockitokotlin2.isNull\n+import com.nhaarman.mockitokotlin2.mock\n+import com.nhaarman.mockitokotlin2.verify\n+import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.bookmarks.models.Bookmark\n import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesContentProvider.BASE_URI\n-import org.junit.runner.RunWith\n-import org.robolectric.RobolectricTestRunner\n-import org.robolectric.annotation.Config\n-import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao.Table.*\n-import org.junit.Assert.*\n+import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao.Table.COLUMN_CREATOR\n+import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao.Table.COLUMN_MEDIA_NAME\n+import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao.Table.CREATE_TABLE_STATEMENT\n+import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao.Table.DROP_TABLE_STATEMENT\n+import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao.Table.onCreate\n+import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao.Table.onDelete\n+import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao.Table.onUpdate\n+import org.junit.Assert.assertEquals\n+import org.junit.Assert.assertFalse\n+import org.junit.Assert.assertTrue\n import org.junit.Before\n import org.junit.Test\n+import org.junit.runner.RunWith\n import org.mockito.Mockito.verifyNoInteractions\n+import org.robolectric.RobolectricTestRunner\n+import org.robolectric.annotation.Config\n \n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class BookmarkPictureDaoTest {\n-\n private val columns = arrayOf(COLUMN_MEDIA_NAME, COLUMN_CREATOR)\n private val client: ContentProviderClient = mock()\n private val database: SQLiteDatabase = mock()\n@@ -70,8 +86,7 @@ class BookmarkPictureDaoTest {\n \n var result = testObject.allBookmarks\n \n- assertEquals(14,(result.size))\n-\n+ assertEquals(14, (result.size))\n }\n \n @Test(expected = RuntimeException::class)\n@@ -103,7 +118,6 @@ class BookmarkPictureDaoTest {\n verify(mockCursor).close()\n }\n \n-\n @Test\n fun updateNewBookmark() {\n whenever(client.insert(any(), any())).thenReturn(exampleBookmark.contentUri)\n@@ -210,9 +224,10 @@ class BookmarkPictureDaoTest {\n verify(database).execSQL(CREATE_TABLE_STATEMENT)\n }\n \n- private fun createCursor(rowCount: Int) = MatrixCursor(columns, rowCount).apply {\n- for (i in 0 until rowCount) {\n- addRow(listOf(\"mediaName\", \"creatorName\"))\n+ private fun createCursor(rowCount: Int) =\n+ MatrixCursor(columns, rowCount).apply {\n+ for (i in 0 until rowCount) {\n+ addRow(listOf(\"mediaName\", \"creatorName\"))\n+ }\n }\n- }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesControllerTest.kt\nindex 94cec4054f..bb0718c278 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesControllerTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesControllerTest.kt\n@@ -14,7 +14,6 @@ import org.mockito.ArgumentMatchers\n import org.mockito.InjectMocks\n import org.mockito.Mock\n import org.mockito.MockitoAnnotations\n-import java.util.*\n \n /**\n * Tests for bookmark pictures controller\n@@ -40,10 +39,9 @@ class BookmarkPicturesControllerTest {\n .thenReturn(mockBookmarkList)\n whenever(\n mediaClient!!.getMedia(\n- ArgumentMatchers.anyString()\n- )\n- )\n- .thenReturn(Single.just(mockMedia))\n+ ArgumentMatchers.anyString(),\n+ ),\n+ ).thenReturn(Single.just(mockMedia))\n }\n \n /**\n@@ -83,7 +81,7 @@ class BookmarkPicturesControllerTest {\n }\n \n private val mockMedia: Media\n- private get() = media(filename=\"File:Test.jpg\")\n+ private get() = media(filename = \"File:Test.jpg\")\n \n /**\n * Test case where current bookmarks don't match the bookmarks in DB\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragmentUnitTests.kt\nindex 0267b543f1..301e31d6da 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragmentUnitTests.kt\n@@ -5,7 +5,6 @@ import android.content.Context\n import android.os.Bundle\n import android.os.Looper.getMainLooper\n import android.view.LayoutInflater\n-import android.view.View\n import android.view.View.GONE\n import android.view.View.VISIBLE\n import android.widget.GridView\n@@ -18,13 +17,11 @@ import androidx.test.core.app.ApplicationProvider\n import com.nhaarman.mockitokotlin2.any\n import com.nhaarman.mockitokotlin2.times\n import com.nhaarman.mockitokotlin2.verify\n-import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.OkHttpConnectionFactory\n-import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.category.GridViewAdapter\n+import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.databinding.FragmentBookmarksPicturesBinding\n import fr.free.nrw.commons.media.MediaClient\n import fr.free.nrw.commons.profile.ProfileActivity\n@@ -43,12 +40,10 @@ import org.robolectric.annotation.Config\n import org.robolectric.annotation.LooperMode\n import java.lang.reflect.Method\n \n-\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class BookmarkPicturesFragmentUnitTests {\n-\n private lateinit var fragment: BookmarkPicturesFragment\n \n private lateinit var binding: FragmentBookmarksPicturesBinding\n@@ -107,11 +102,15 @@ class BookmarkPicturesFragmentUnitTests {\n \n fragment.controller = controller\n \n- Whitebox.setInternalState(fragment, \"gridAdapter\", GridViewAdapter(\n- context,\n- 0,\n- listOf(media())\n- ))\n+ Whitebox.setInternalState(\n+ fragment,\n+ \"gridAdapter\",\n+ GridViewAdapter(\n+ context,\n+ 0,\n+ listOf(media()),\n+ ),\n+ )\n Whitebox.setInternalState(fragment, \"binding\", binding)\n \n Whitebox.setInternalState(binding, \"statusMessage\", statusTextView)\n@@ -178,10 +177,11 @@ class BookmarkPicturesFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testHandleError() {\n- val method: Method = BookmarkPicturesFragment::class.java.getDeclaredMethod(\n- \"handleError\",\n- Throwable::class.java\n- )\n+ val method: Method =\n+ BookmarkPicturesFragment::class.java.getDeclaredMethod(\n+ \"handleError\",\n+ Throwable::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, throwable)\n }\n@@ -190,10 +190,11 @@ class BookmarkPicturesFragmentUnitTests {\n @Throws(Exception::class)\n fun testHandleSuccess() {\n gridAdapter.addItems(listOf(media()))\n- val method: Method = BookmarkPicturesFragment::class.java.getDeclaredMethod(\n- \"handleSuccess\",\n- List::class.java\n- )\n+ val method: Method =\n+ BookmarkPicturesFragment::class.java.getDeclaredMethod(\n+ \"handleSuccess\",\n+ List::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, listOf(media()))\n verify(progressBar, times(1)).setVisibility(GONE)\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/campaigns/CampaignViewUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/campaigns/CampaignViewUnitTests.kt\nindex efb5b65643..ea8dec1929 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/campaigns/CampaignViewUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/campaigns/CampaignViewUnitTests.kt\n@@ -4,9 +4,9 @@ import android.app.Activity\n import android.view.View\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.campaigns.models.Campaign\n import fr.free.nrw.commons.contributions.MainActivity\n+import fr.free.nrw.commons.createTestClient\n import org.junit.Assert\n import org.junit.Before\n import org.junit.Test\n@@ -22,7 +22,6 @@ import java.lang.reflect.Method\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class CampaignViewUnitTests {\n-\n private lateinit var activityController: ActivityController\n private lateinit var activity: MainActivity\n private lateinit var campaignView: CampaignView\n@@ -80,11 +79,11 @@ class CampaignViewUnitTests {\n @Test\n @Throws(Exception::class)\n fun testInit() {\n- val method: Method = CampaignView::class.java.getDeclaredMethod(\n- \"init\"\n- )\n+ val method: Method =\n+ CampaignView::class.java.getDeclaredMethod(\n+ \"init\",\n+ )\n method.isAccessible = true\n method.invoke(campaignView)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/campaigns/CampaignsPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/campaigns/CampaignsPresenterTest.kt\nindex 4b0c8a3a04..7efdfd1ad4 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/campaigns/CampaignsPresenterTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/campaigns/CampaignsPresenterTest.kt\n@@ -13,7 +13,9 @@ import org.mockito.Mockito\n import org.mockito.MockitoAnnotations\n import java.lang.reflect.Field\n import java.text.SimpleDateFormat\n-import java.util.*\n+import java.util.Calendar\n+import java.util.Locale\n+import java.util.TimeZone\n import kotlin.collections.ArrayList\n \n class CampaignsPresenterTest {\n@@ -44,9 +46,9 @@ class CampaignsPresenterTest {\n @Throws(Exception::class)\n fun setUp() {\n MockitoAnnotations.initMocks(this)\n- testScheduler=TestScheduler()\n- campaignsSingle= Single.just(campaignResponseDTO)\n- campaignsPresenter= CampaignsPresenter(okHttpJsonApiClient,testScheduler,testScheduler)\n+ testScheduler = TestScheduler()\n+ campaignsSingle = Single.just(campaignResponseDTO)\n+ campaignsPresenter = CampaignsPresenter(okHttpJsonApiClient, testScheduler, testScheduler)\n campaignsPresenter.onAttachView(view)\n Mockito.`when`(okHttpJsonApiClient.campaigns).thenReturn(campaignsSingle)\n }\n@@ -62,17 +64,17 @@ class CampaignsPresenterTest {\n @Test\n fun getCampaignsTestNonEmptyCampaigns() {\n campaignsPresenter.getCampaigns()\n- var campaigns= ArrayList()\n+ var campaigns = ArrayList()\n campaigns.add(campaign)\n val simpleDateFormat = SimpleDateFormat(\"yyyy-MM-dd\", Locale.ROOT)\n simpleDateFormat.timeZone = TimeZone.getTimeZone(\"UTC\")\n Mockito.`when`(campaignResponseDTO.campaigns).thenReturn(campaigns)\n var calendar = Calendar.getInstance()\n- calendar.add(Calendar.DATE,-1)\n+ calendar.add(Calendar.DATE, -1)\n val startDateString = simpleDateFormat.format(calendar.time).toString()\n- calendar= Calendar.getInstance()\n- calendar.add(Calendar.DATE,3)\n- val endDateString= simpleDateFormat.format(calendar.time).toString()\n+ calendar = Calendar.getInstance()\n+ calendar.add(Calendar.DATE, 3)\n+ val endDateString = simpleDateFormat.format(calendar.time).toString()\n Mockito.`when`(campaign.endDate).thenReturn(endDateString)\n Mockito.`when`(campaign.startDate).thenReturn(startDateString)\n Mockito.`when`(campaignResponseDTO.campaigns).thenReturn(campaigns)\n@@ -105,5 +107,4 @@ class CampaignsPresenterTest {\n disposableField.set(campaignsPresenter, disposable)\n campaignsPresenter.onDetachView()\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt\nindex 16f7ec2c2e..cc5340fbb7 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt\n@@ -15,9 +15,8 @@ import org.mockito.ArgumentMatchers\n import org.mockito.Mock\n import org.mockito.MockitoAnnotations\n \n-//class for testing CategoriesModel class\n+// class for testing CategoriesModel class\n class CategoriesModelTest {\n-\n @Mock\n internal lateinit var categoryDao: CategoryDao\n \n@@ -41,59 +40,125 @@ class CategoriesModelTest {\n fun searchAllFoundCaseTest() {\n val categoriesModel = CategoriesModel(categoryClient, mock(), mock())\n \n- val expectedList = listOf(CategoryItem(\n- \"Test\", \"\", \"\", false))\n+ val expectedList =\n+ listOf(\n+ CategoryItem(\n+ \"Test\",\n+ \"\",\n+ \"\",\n+ false,\n+ ),\n+ )\n whenever(\n categoryClient.searchCategoriesForPrefix(\n ArgumentMatchers.anyString(),\n ArgumentMatchers.anyInt(),\n- ArgumentMatchers.anyInt()\n- )\n- )\n- .thenReturn(Single.just(expectedList))\n+ ArgumentMatchers.anyInt(),\n+ ),\n+ ).thenReturn(Single.just(expectedList))\n \n // Checking if both return \"Test\"\n- val expectedItems = expectedList.map { CategoryItem(\n- it.name, it.description, it.thumbnail, false) }\n+ val expectedItems =\n+ expectedList.map {\n+ CategoryItem(\n+ it.name,\n+ it.description,\n+ it.thumbnail,\n+ false,\n+ )\n+ }\n var categoryTerm = \"Test\"\n- categoriesModel.searchAll(categoryTerm, emptyList(), emptyList())\n+ categoriesModel\n+ .searchAll(categoryTerm, emptyList(), emptyList())\n .test()\n .assertValues(expectedItems)\n \n verify(categoryClient).searchCategoriesForPrefix(\n categoryTerm,\n- CategoriesModel.SEARCH_CATS_LIMIT\n+ CategoriesModel.SEARCH_CATS_LIMIT,\n )\n \n- categoriesModel.searchAll(categoryTerm, emptyList(), emptyList())\n+ categoriesModel\n+ .searchAll(categoryTerm, emptyList(), emptyList())\n .test()\n .assertValues(expectedItems)\n }\n \n-\n @Test\n fun `searchAll with empty search terms creates results from gps, title search & recents`() {\n val gpsCategoryModel: GpsCategoryModel = mock()\n- val depictedItem = depictedItem(commonsCategories = listOf(CategoryItem(\n- \"depictionCategory\", \"\", \"\", false)))\n+ val depictedItem =\n+ depictedItem(\n+ commonsCategories =\n+ listOf(\n+ CategoryItem(\n+ \"depictionCategory\",\n+ \"\",\n+ \"\",\n+ false,\n+ ),\n+ ),\n+ )\n \n whenever(gpsCategoryModel.categoriesFromLocation)\n- .thenReturn(BehaviorSubject.createDefault(listOf(CategoryItem(\n- \"gpsCategory\", \"\", \"\", false))))\n+ .thenReturn(\n+ BehaviorSubject.createDefault(\n+ listOf(\n+ CategoryItem(\n+ \"gpsCategory\",\n+ \"\",\n+ \"\",\n+ false,\n+ ),\n+ ),\n+ ),\n+ )\n whenever(\n categoryClient.searchCategories(\n ArgumentMatchers.anyString(),\n ArgumentMatchers.anyInt(),\n- ArgumentMatchers.anyInt()\n- )\n+ ArgumentMatchers.anyInt(),\n+ ),\n+ ).thenReturn(\n+ Single.just(\n+ listOf(\n+ CategoryItem(\n+ \"titleSearch\",\n+ \"\",\n+ \"\",\n+ false,\n+ ),\n+ ),\n+ ),\n+ )\n+ whenever(categoryDao.recentCategories(25)).thenReturn(\n+ listOf(\n+ CategoryItem(\n+ \"recentCategories\",\n+ \"\",\n+ \"\",\n+ false,\n+ ),\n+ ),\n+ )\n+ whenever(\n+ categoryClient.getCategoriesByName(\n+ \"depictionCategory\",\n+ \"depictionCategory\",\n+ 25,\n+ ),\n+ ).thenReturn(\n+ Single.just(\n+ listOf(\n+ CategoryItem(\n+ \"commonsCategories\",\n+ \"\",\n+ \"\",\n+ false,\n+ ),\n+ ),\n+ ),\n )\n- .thenReturn(Single.just(listOf(CategoryItem(\n- \"titleSearch\", \"\", \"\", false))))\n- whenever(categoryDao.recentCategories(25)).thenReturn(listOf(CategoryItem(\n- \"recentCategories\",\"\",\"\", false)))\n- whenever(categoryClient.getCategoriesByName(\"depictionCategory\",\n- \"depictionCategory\", 25)).thenReturn(Single.just(listOf(CategoryItem(\n- \"commonsCategories\",\"\",\"\", false))))\n val imageTitleList = listOf(\"Test\")\n CategoriesModel(categoryClient, categoryDao, gpsCategoryModel)\n .searchAll(\"\", imageTitleList, listOf(depictedItem))\n@@ -103,8 +168,8 @@ class CategoriesModelTest {\n categoryItem(\"commonsCategories\"),\n categoryItem(\"gpsCategory\"),\n categoryItem(\"titleSearch\"),\n- categoryItem(\"recentCategories\")\n- )\n+ categoryItem(\"recentCategories\"),\n+ ),\n )\n imageTitleList.forEach {\n verify(categoryClient).searchCategories(it, CategoriesModel.SEARCH_CATS_LIMIT)\n@@ -113,103 +178,121 @@ class CategoriesModelTest {\n \n @Test\n @Throws(Exception::class)\n- fun testGetCategoriesByName(){\n+ fun testGetCategoriesByName() {\n categoriesModel.getCategoriesByName(listOf(\"Test\"))\n }\n \n @Test\n @Throws(Exception::class)\n- fun `Test buildCategories when it returns non empty list`(){\n- whenever(categoryClient.getCategoriesByName(\"Test\",\n- \"Test\", CategoriesModel.SEARCH_CATS_LIMIT\n- )).thenReturn(Single.just(listOf(categoryItem())))\n+ fun `Test buildCategories when it returns non empty list`() {\n+ whenever(\n+ categoryClient.getCategoriesByName(\n+ \"Test\",\n+ \"Test\",\n+ CategoriesModel.SEARCH_CATS_LIMIT,\n+ ),\n+ ).thenReturn(Single.just(listOf(categoryItem())))\n categoriesModel.buildCategories(\"Test\")\n }\n \n @Test\n @Throws(Exception::class)\n- fun `Test buildCategories when it returns empty list`(){\n- whenever(categoryClient.getCategoriesByName(\"Test\",\n- \"Test\", CategoriesModel.SEARCH_CATS_LIMIT\n- )).thenReturn(Single.just(emptyList()))\n+ fun `Test buildCategories when it returns empty list`() {\n+ whenever(\n+ categoryClient.getCategoriesByName(\n+ \"Test\",\n+ \"Test\",\n+ CategoriesModel.SEARCH_CATS_LIMIT,\n+ ),\n+ ).thenReturn(Single.just(emptyList()))\n categoriesModel.buildCategories(\"Test\")\n }\n \n @Test\n @Throws(Exception::class)\n- fun testGetSelectedExistingCategories(){\n+ fun testGetSelectedExistingCategories() {\n categoriesModel.getSelectedExistingCategories()\n }\n \n @Test\n @Throws(Exception::class)\n- fun testSetSelectedExistingCategories(){\n+ fun testSetSelectedExistingCategories() {\n categoriesModel.setSelectedExistingCategories(mutableListOf(\"Test\"))\n }\n \n @Test\n @Throws(Exception::class)\n- fun `Test onCategoryItemClicked when media is null and item is selected`(){\n+ fun `Test onCategoryItemClicked when media is null and item is selected`() {\n categoriesModel.onCategoryItemClicked(\n CategoryItem(\n \"name\",\n \"des\",\n \"image\",\n- true\n- ), null)\n+ true,\n+ ),\n+ null,\n+ )\n }\n \n @Test\n @Throws(Exception::class)\n- fun `Test onCategoryItemClicked when media is null and item is not selected`(){\n+ fun `Test onCategoryItemClicked when media is null and item is not selected`() {\n categoriesModel.onCategoryItemClicked(categoryItem(), null)\n }\n \n @Test\n @Throws(Exception::class)\n- fun `Test onCategoryItemClicked when media is not null and item is selected and media contains category`(){\n+ fun `Test onCategoryItemClicked when media is not null and item is selected and media contains category`() {\n categoriesModel.onCategoryItemClicked(\n CategoryItem(\n \"categories\",\n \"des\",\n \"image\",\n- true\n- ), media())\n+ true,\n+ ),\n+ media(),\n+ )\n }\n \n @Test\n @Throws(Exception::class)\n- fun `Test onCategoryItemClicked when media is not null and item is selected and media does not contains category`(){\n+ fun `Test onCategoryItemClicked when media is not null and item is selected and media does not contains category`() {\n categoriesModel.onCategoryItemClicked(\n CategoryItem(\n \"name\",\n \"des\",\n \"image\",\n- true\n- ), media())\n+ true,\n+ ),\n+ media(),\n+ )\n }\n \n @Test\n @Throws(Exception::class)\n- fun `Test onCategoryItemClicked when media is not null and item is not selected and media contains category`(){\n+ fun `Test onCategoryItemClicked when media is not null and item is not selected and media contains category`() {\n categoriesModel.onCategoryItemClicked(\n CategoryItem(\n \"categories\",\n \"des\",\n \"image\",\n- false\n- ), media())\n+ false,\n+ ),\n+ media(),\n+ )\n }\n \n @Test\n @Throws(Exception::class)\n- fun `Test onCategoryItemClicked when media is not null and item is not selected and media does not contains category`(){\n+ fun `Test onCategoryItemClicked when media is not null and item is not selected and media does not contains category`() {\n categoriesModel.onCategoryItemClicked(\n CategoryItem(\n \"name\",\n \"des\",\n \"image\",\n- false\n- ), media())\n+ false,\n+ ),\n+ media(),\n+ )\n }\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryClientTest.kt\nindex 1081dc0be8..5c95215a87 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryClientTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryClientTest.kt\n@@ -2,17 +2,19 @@ package fr.free.nrw.commons.category\n \n import com.nhaarman.mockitokotlin2.mock\n import com.nhaarman.mockitokotlin2.whenever\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult\n import io.reactivex.Single\n import org.junit.Before\n import org.junit.Test\n-import org.mockito.ArgumentMatchers.*\n+import org.mockito.ArgumentMatchers.anyInt\n+import org.mockito.ArgumentMatchers.anyMap\n+import org.mockito.ArgumentMatchers.anyString\n import org.mockito.InjectMocks\n import org.mockito.Mock\n import org.mockito.Mockito.mock\n import org.mockito.MockitoAnnotations\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult\n \n class CategoryClientTest {\n @Mock\n@@ -32,10 +34,12 @@ class CategoryClientTest {\n val mockResponse = withMockResponse(\"Category:Test\")\n whenever(categoryInterface.searchCategories(anyString(), anyInt(), anyInt()))\n .thenReturn(Single.just(mockResponse))\n- categoryClient.searchCategories(\"tes\", 10)\n+ categoryClient\n+ .searchCategories(\"tes\", 10)\n .test()\n .assertValues(listOf(CategoryItem(\"Test\", \"\", \"\", false)))\n- categoryClient.searchCategories(\"tes\", 10, 10)\n+ categoryClient\n+ .searchCategories(\"tes\", 10, 10)\n .test()\n .assertValues(listOf(CategoryItem(\"Test\", \"\", \"\", false)))\n }\n@@ -45,22 +49,27 @@ class CategoryClientTest {\n val mockResponse = withNullPages()\n whenever(categoryInterface.searchCategories(anyString(), anyInt(), anyInt()))\n .thenReturn(Single.just(mockResponse))\n- categoryClient.searchCategories(\"tes\", 10)\n+ categoryClient\n+ .searchCategories(\"tes\", 10)\n .test()\n .assertValues(emptyList())\n- categoryClient.searchCategories(\"tes\", 10, 10)\n+ categoryClient\n+ .searchCategories(\"tes\", 10, 10)\n .test()\n .assertValues(emptyList())\n }\n+\n @Test\n fun searchCategoriesForPrefixFound() {\n val mockResponse = withMockResponse(\"Category:Test\")\n whenever(categoryInterface.searchCategoriesForPrefix(anyString(), anyInt(), anyInt()))\n .thenReturn(Single.just(mockResponse))\n- categoryClient.searchCategoriesForPrefix(\"tes\", 10)\n+ categoryClient\n+ .searchCategoriesForPrefix(\"tes\", 10)\n .test()\n .assertValues(listOf(CategoryItem(\"Test\", \"\", \"\", false)))\n- categoryClient.searchCategoriesForPrefix(\"tes\", 10, 10)\n+ categoryClient\n+ .searchCategoriesForPrefix(\"tes\", 10, 10)\n .test()\n .assertValues(listOf(CategoryItem(\"Test\", \"\", \"\", false)))\n }\n@@ -70,10 +79,12 @@ class CategoryClientTest {\n val mockResponse = withNullPages()\n whenever(categoryInterface.searchCategoriesForPrefix(anyString(), anyInt(), anyInt()))\n .thenReturn(Single.just(mockResponse))\n- categoryClient.searchCategoriesForPrefix(\"tes\", 10)\n+ categoryClient\n+ .searchCategoriesForPrefix(\"tes\", 10)\n .test()\n .assertValues(emptyList())\n- categoryClient.searchCategoriesForPrefix(\"tes\", 10, 10)\n+ categoryClient\n+ .searchCategoriesForPrefix(\"tes\", 10, 10)\n .test()\n .assertValues(emptyList())\n }\n@@ -81,33 +92,71 @@ class CategoryClientTest {\n @Test\n fun getCategoriesByNameFound() {\n val mockResponse = withMockResponse(\"Category:Test\")\n- whenever(categoryInterface.getCategoriesByName(anyString(), anyString(),\n- anyInt(), anyInt()))\n- .thenReturn(Single.just(mockResponse))\n- categoryClient.getCategoriesByName(\"tes\", \"tes\", 10)\n- .test()\n- .assertValues(listOf(CategoryItem(\"Test\", \"\",\n- \"\", false)))\n- categoryClient.getCategoriesByName(\"tes\" , \"tes\",\n- 10, 10)\n- .test()\n- .assertValues(listOf(CategoryItem(\"Test\", \"\",\n- \"\", false)))\n+ whenever(\n+ categoryInterface.getCategoriesByName(\n+ anyString(),\n+ anyString(),\n+ anyInt(),\n+ anyInt(),\n+ ),\n+ ).thenReturn(Single.just(mockResponse))\n+ categoryClient\n+ .getCategoriesByName(\"tes\", \"tes\", 10)\n+ .test()\n+ .assertValues(\n+ listOf(\n+ CategoryItem(\n+ \"Test\",\n+ \"\",\n+ \"\",\n+ false,\n+ ),\n+ ),\n+ )\n+ categoryClient\n+ .getCategoriesByName(\n+ \"tes\",\n+ \"tes\",\n+ 10,\n+ 10,\n+ ).test()\n+ .assertValues(\n+ listOf(\n+ CategoryItem(\n+ \"Test\",\n+ \"\",\n+ \"\",\n+ false,\n+ ),\n+ ),\n+ )\n }\n \n @Test\n fun getCategoriesByNameNull() {\n val mockResponse = withNullPages()\n- whenever(categoryInterface.getCategoriesByName(anyString(), anyString(),\n- anyInt(), anyInt()))\n- .thenReturn(Single.just(mockResponse))\n- categoryClient.getCategoriesByName(\"tes\", \"tes\",\n- 10)\n- .test()\n+ whenever(\n+ categoryInterface.getCategoriesByName(\n+ anyString(),\n+ anyString(),\n+ anyInt(),\n+ anyInt(),\n+ ),\n+ ).thenReturn(Single.just(mockResponse))\n+ categoryClient\n+ .getCategoriesByName(\n+ \"tes\",\n+ \"tes\",\n+ 10,\n+ ).test()\n .assertValues(emptyList())\n- categoryClient.getCategoriesByName(\"tes\", \"tes\",\n- 10, 10)\n- .test()\n+ categoryClient\n+ .getCategoriesByName(\n+ \"tes\",\n+ \"tes\",\n+ 10,\n+ 10,\n+ ).test()\n .assertValues(emptyList())\n }\n \n@@ -116,7 +165,8 @@ class CategoryClientTest {\n val mockResponse = withMockResponse(\"Category:Test\")\n whenever(categoryInterface.getParentCategoryList(anyString(), anyMap()))\n .thenReturn(Single.just(mockResponse))\n- categoryClient.getParentCategoryList(\"tes\")\n+ categoryClient\n+ .getParentCategoryList(\"tes\")\n .test()\n .assertValues(listOf(CategoryItem(\"Test\", \"\", \"\", false)))\n }\n@@ -126,7 +176,8 @@ class CategoryClientTest {\n val mockResponse = withNullPages()\n whenever(categoryInterface.getParentCategoryList(anyString(), anyMap()))\n .thenReturn(Single.just(mockResponse))\n- categoryClient.getParentCategoryList(\"tes\")\n+ categoryClient\n+ .getParentCategoryList(\"tes\")\n .test()\n .assertValues(emptyList())\n }\n@@ -136,7 +187,8 @@ class CategoryClientTest {\n val mockResponse = withMockResponse(\"Category:Test\")\n whenever(categoryInterface.getSubCategoryList(\"tes\", emptyMap()))\n .thenReturn(Single.just(mockResponse))\n- categoryClient.getSubCategoryList(\"tes\")\n+ categoryClient\n+ .getSubCategoryList(\"tes\")\n .test()\n .assertValues(listOf(CategoryItem(\"Test\", \"\", \"\", false)))\n }\n@@ -144,12 +196,14 @@ class CategoryClientTest {\n @Test\n fun getSubCategoryListNull() {\n val mockResponse = withNullPages()\n- whenever(categoryInterface.getSubCategoryList(\n- anyString(),\n- anyMap()\n- ))\n- .thenReturn(Single.just(mockResponse))\n- categoryClient.getSubCategoryList(\"tes\")\n+ whenever(\n+ categoryInterface.getSubCategoryList(\n+ anyString(),\n+ anyMap(),\n+ ),\n+ ).thenReturn(Single.just(mockResponse))\n+ categoryClient\n+ .getSubCategoryList(\"tes\")\n .test()\n .assertValues(emptyList())\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryDaoTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryDaoTest.kt\nindex f663a6cc8c..ab222b4ebe 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryDaoTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryDaoTest.kt\n@@ -6,27 +6,55 @@ import android.database.Cursor\n import android.database.MatrixCursor\n import android.database.sqlite.SQLiteDatabase\n import android.os.RemoteException\n-import com.nhaarman.mockitokotlin2.*\n-import fr.free.nrw.commons.BuildConfig\n+import com.nhaarman.mockitokotlin2.any\n+import com.nhaarman.mockitokotlin2.anyOrNull\n+import com.nhaarman.mockitokotlin2.argumentCaptor\n+import com.nhaarman.mockitokotlin2.eq\n+import com.nhaarman.mockitokotlin2.inOrder\n+import com.nhaarman.mockitokotlin2.isA\n+import com.nhaarman.mockitokotlin2.isNull\n+import com.nhaarman.mockitokotlin2.mock\n+import com.nhaarman.mockitokotlin2.verify\n+import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.category.CategoryContentProvider.BASE_URI\n import fr.free.nrw.commons.category.CategoryContentProvider.uriForId\n-import fr.free.nrw.commons.category.CategoryDao.Table.*\n-import org.junit.Assert.*\n+import fr.free.nrw.commons.category.CategoryDao.Table.ALL_FIELDS\n+import fr.free.nrw.commons.category.CategoryDao.Table.COLUMN_DESCRIPTION\n+import fr.free.nrw.commons.category.CategoryDao.Table.COLUMN_ID\n+import fr.free.nrw.commons.category.CategoryDao.Table.COLUMN_LAST_USED\n+import fr.free.nrw.commons.category.CategoryDao.Table.COLUMN_NAME\n+import fr.free.nrw.commons.category.CategoryDao.Table.COLUMN_THUMBNAIL\n+import fr.free.nrw.commons.category.CategoryDao.Table.COLUMN_TIMES_USED\n+import fr.free.nrw.commons.category.CategoryDao.Table.CREATE_TABLE_STATEMENT\n+import fr.free.nrw.commons.category.CategoryDao.Table.DROP_TABLE_STATEMENT\n+import fr.free.nrw.commons.category.CategoryDao.Table.onCreate\n+import fr.free.nrw.commons.category.CategoryDao.Table.onDelete\n+import fr.free.nrw.commons.category.CategoryDao.Table.onUpdate\n+import org.junit.Assert.assertEquals\n+import org.junit.Assert.assertNotNull\n+import org.junit.Assert.assertNull\n+import org.junit.Assert.assertTrue\n import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n import org.mockito.Mockito.verifyNoInteractions\n import org.robolectric.RobolectricTestRunner\n import org.robolectric.annotation.Config\n-import java.util.*\n+import java.util.Date\n \n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class CategoryDaoTest {\n-\n- private val columns = arrayOf(COLUMN_ID, COLUMN_NAME, COLUMN_DESCRIPTION,\n- COLUMN_THUMBNAIL, COLUMN_LAST_USED, COLUMN_TIMES_USED)\n+ private val columns =\n+ arrayOf(\n+ COLUMN_ID,\n+ COLUMN_NAME,\n+ COLUMN_DESCRIPTION,\n+ COLUMN_THUMBNAIL,\n+ COLUMN_LAST_USED,\n+ COLUMN_TIMES_USED,\n+ )\n private val client: ContentProviderClient = mock()\n private val database: SQLiteDatabase = mock()\n private val captor = argumentCaptor()\n@@ -138,8 +166,15 @@ class CategoryDaoTest {\n fun saveNewCategory() {\n val contentUri = CategoryContentProvider.uriForId(111)\n whenever(client.insert(isA(), isA())).thenReturn(contentUri)\n- val category = Category(null, \"showImageWithItem\", \"description\",\n- \"image\", Date(234L), 1)\n+ val category =\n+ Category(\n+ null,\n+ \"showImageWithItem\",\n+ \"description\",\n+ \"image\",\n+ Date(234L),\n+ 1,\n+ )\n \n testObject.save(category)\n \n@@ -199,11 +234,11 @@ class CategoryDaoTest {\n assertEquals(2, category?.timesUsed)\n \n verify(client).query(\n- eq(BASE_URI),\n- eq(ALL_FIELDS),\n- eq(\"$COLUMN_NAME=?\"),\n- queryCaptor.capture(),\n- isNull()\n+ eq(BASE_URI),\n+ eq(ALL_FIELDS),\n+ eq(\"$COLUMN_NAME=?\"),\n+ queryCaptor.capture(),\n+ isNull(),\n )\n assertEquals(\"showImageWithItem\", queryCaptor.firstValue[0])\n }\n@@ -253,11 +288,11 @@ class CategoryDaoTest {\n assertEquals(\"showImageWithItem\", result[0].name)\n \n verify(client).query(\n- eq(BASE_URI),\n- eq(ALL_FIELDS),\n- isNull(),\n- queryCaptor.capture(),\n- eq(\"$COLUMN_LAST_USED DESC\")\n+ eq(BASE_URI),\n+ eq(ALL_FIELDS),\n+ isNull(),\n+ queryCaptor.capture(),\n+ eq(\"$COLUMN_LAST_USED DESC\"),\n )\n assertEquals(0, queryCaptor.firstValue.size)\n }\n@@ -271,10 +306,10 @@ class CategoryDaoTest {\n assertEquals(5, result.size)\n }\n \n- private fun createCursor(rowCount: Int) = MatrixCursor(columns, rowCount).apply {\n- for (i in 0 until rowCount) {\n- addRow(listOf(\"1\", \"showImageWithItem\", \"description\", \"image\", \"123\", \"2\"))\n+ private fun createCursor(rowCount: Int) =\n+ MatrixCursor(columns, rowCount).apply {\n+ for (i in 0 until rowCount) {\n+ addRow(listOf(\"1\", \"showImageWithItem\", \"description\", \"image\", \"123\", \"2\"))\n+ }\n }\n- }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryDetailsActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryDetailsActivityUnitTests.kt\nindex e5e17704da..fd6bc7976a 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryDetailsActivityUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryDetailsActivityUnitTests.kt\n@@ -24,7 +24,6 @@ import java.lang.reflect.Field\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class CategoryDetailsActivityUnitTests {\n-\n private lateinit var activity: CategoryDetailsActivity\n \n private lateinit var context: Context\n@@ -38,7 +37,6 @@ class CategoryDetailsActivityUnitTests {\n \n @Before\n fun setUp() {\n-\n MockitoAnnotations.openMocks(this)\n \n OkHttpConnectionFactory.CLIENT = createTestClient()\n@@ -110,5 +108,4 @@ class CategoryDetailsActivityUnitTests {\n fun testViewPagerNotifyDataSetChanged() {\n activity.viewPagerNotifyDataSetChanged()\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryEditHelperUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryEditHelperUnitTests.kt\nindex 2f25c815ce..ec7b5111b1 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryEditHelperUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryEditHelperUnitTests.kt\n@@ -26,7 +26,6 @@ import org.robolectric.annotation.LooperMode\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class CategoryEditHelperUnitTests {\n-\n private lateinit var context: Context\n private lateinit var helper: CategoryEditHelper\n \n@@ -46,18 +45,25 @@ class CategoryEditHelperUnitTests {\n fun setUp() {\n MockitoAnnotations.openMocks(this)\n context = ApplicationProvider.getApplicationContext()\n- helper = CategoryEditHelper(notificationHelper, pageEditClient, viewUtilWrapper,\n- \"\")\n+ helper =\n+ CategoryEditHelper(\n+ notificationHelper,\n+ pageEditClient,\n+ viewUtilWrapper,\n+ \"\",\n+ )\n Mockito.`when`(media.filename).thenReturn(\"File:Example.jpg\")\n- Mockito.`when`(pageEditClient.getCurrentWikiText(ArgumentMatchers.anyString()))\n+ Mockito\n+ .`when`(pageEditClient.getCurrentWikiText(ArgumentMatchers.anyString()))\n .thenReturn(Single.just(\"\"))\n- Mockito.`when`(\n- pageEditClient.edit(\n- ArgumentMatchers.anyString(),\n- ArgumentMatchers.anyString(),\n- ArgumentMatchers.anyString()\n- )\n- ).thenReturn(Observable.just(true))\n+ Mockito\n+ .`when`(\n+ pageEditClient.edit(\n+ ArgumentMatchers.anyString(),\n+ ArgumentMatchers.anyString(),\n+ ArgumentMatchers.anyString(),\n+ ),\n+ ).thenReturn(Observable.just(true))\n }\n \n @Test\n@@ -72,19 +78,23 @@ class CategoryEditHelperUnitTests {\n helper.makeCategoryEdit(context, media, listOf(\"Test\"), \"[[Category:Test]]\")\n Mockito.verify(viewUtilWrapper, Mockito.times(1)).showShortToast(\n context,\n- context.getString(R.string.category_edit_helper_make_edit_toast)\n+ context.getString(R.string.category_edit_helper_make_edit_toast),\n )\n Mockito.verify(pageEditClient, Mockito.times(1)).edit(\n ArgumentMatchers.anyString(),\n ArgumentMatchers.anyString(),\n- ArgumentMatchers.anyString()\n+ ArgumentMatchers.anyString(),\n )\n }\n \n @Test\n @Throws(Exception::class)\n fun testMakeUnCategoryEdit() {\n- helper.makeCategoryEdit(context, media, listOf(\"Test\"), \"== {{int:filedesc}} ==\\n\" +\n+ helper.makeCategoryEdit(\n+ context,\n+ media,\n+ listOf(\"Test\"),\n+ \"== {{int:filedesc}} ==\\n\" +\n \"{{Information\\n\" +\n \"|description=\\n\" +\n \"|source={{own}}\\n\" +\n@@ -97,15 +107,16 @@ class CategoryEditHelperUnitTests {\n \"{{self|cc-zero}}\\n\" +\n \"\\n\" +\n \"{{Uploaded from Mobile|platform=Android|version=3.1.1-debug-master~e7a9ba9ad}}\\n\" +\n- \"{{Uncategorized|year=2022|month=April|day=23}}\")\n+ \"{{Uncategorized|year=2022|month=April|day=23}}\",\n+ )\n Mockito.verify(viewUtilWrapper, Mockito.times(1)).showShortToast(\n context,\n- context.getString(R.string.category_edit_helper_make_edit_toast)\n+ context.getString(R.string.category_edit_helper_make_edit_toast),\n )\n Mockito.verify(pageEditClient, Mockito.times(1)).edit(\n ArgumentMatchers.anyString(),\n ArgumentMatchers.anyString(),\n- ArgumentMatchers.anyString()\n+ ArgumentMatchers.anyString(),\n )\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/category/GridViewAdapterUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/category/GridViewAdapterUnitTest.kt\nindex 3921b31b35..d3901113a0 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/category/GridViewAdapterUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/category/GridViewAdapterUnitTest.kt\n@@ -26,7 +26,6 @@ import java.lang.reflect.Method\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class GridViewAdapterUnitTest {\n-\n private lateinit var gridViewAdapter: GridViewAdapter\n private lateinit var activity: CategoryDetailsActivity\n private lateinit var context: Context\n@@ -47,10 +46,8 @@ class GridViewAdapterUnitTest {\n @Before\n @Throws(Exception::class)\n fun setUp() {\n-\n MockitoAnnotations.openMocks(this)\n \n-\n context = ApplicationProvider.getApplicationContext()\n \n SoLoader.setInTestMode()\n@@ -59,8 +56,10 @@ class GridViewAdapterUnitTest {\n \n activity = Robolectric.buildActivity(CategoryDetailsActivity::class.java).get()\n \n- convertView = LayoutInflater.from(activity)\n- .inflate(R.layout.layout_category_images, null) as View\n+ convertView =\n+ LayoutInflater\n+ .from(activity)\n+ .inflate(R.layout.layout_category_images, null) as View\n \n gridViewAdapter = GridViewAdapter(context, 0, images)\n }\n@@ -116,11 +115,13 @@ class GridViewAdapterUnitTest {\n @Test\n fun testSetUploaderView() {\n `when`(media1.author).thenReturn(\"author\")\n- val method: Method = GridViewAdapter::class.java.getDeclaredMethod(\n- \"setUploaderView\", Media::class.java, TextView::class.java\n- )\n+ val method: Method =\n+ GridViewAdapter::class.java.getDeclaredMethod(\n+ \"setUploaderView\",\n+ Media::class.java,\n+ TextView::class.java,\n+ )\n method.isAccessible = true\n method.invoke(gridViewAdapter, media1, textView)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionBoundaryCallbackTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionBoundaryCallbackTest.kt\nindex 88657e101a..19b36521df 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionBoundaryCallbackTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionBoundaryCallbackTest.kt\n@@ -62,8 +62,8 @@ class ContributionBoundaryCallbackTest {\n whenever(mediaClient.getMediaListForUser(anyString()))\n .thenReturn(Single.just(listOf(media())))\n contributionBoundaryCallback.onZeroItemsLoaded()\n- verify(repository).save(anyList());\n- verify(mediaClient).getMediaListForUser(anyString());\n+ verify(repository).save(anyList())\n+ verify(mediaClient).getMediaListForUser(anyString())\n }\n \n @Test\n@@ -74,8 +74,8 @@ class ContributionBoundaryCallbackTest {\n whenever(mediaClient.getMediaListForUser(anyString()))\n .thenReturn(Single.just(listOf(media())))\n contributionBoundaryCallback.onItemAtEndLoaded(mock(Contribution::class.java))\n- verify(repository).save(anyList());\n- verify(mediaClient).getMediaListForUser(anyString());\n+ verify(repository).save(anyList())\n+ verify(mediaClient).getMediaListForUser(anyString())\n }\n \n @Test\n@@ -94,27 +94,29 @@ class ContributionBoundaryCallbackTest {\n .thenReturn(Single.just(listOf(1L, 2L)))\n whenever(sessionManager.userName).thenReturn(\"Test\")\n whenever(mediaClient.getMediaListForUser(anyString())).thenReturn(\n- Single.just(listOf(media()))\n- )\n- val method: Method = ContributionBoundaryCallback::class.java.getDeclaredMethod(\n- \"fetchContributions\"\n+ Single.just(listOf(media())),\n )\n+ val method: Method =\n+ ContributionBoundaryCallback::class.java.getDeclaredMethod(\n+ \"fetchContributions\",\n+ )\n method.isAccessible = true\n method.invoke(contributionBoundaryCallback)\n- verify(repository).save(anyList());\n- verify(mediaClient).getMediaListForUser(anyString());\n+ verify(repository).save(anyList())\n+ verify(mediaClient).getMediaListForUser(anyString())\n }\n \n @Test\n fun testFetchContributionsFailed() {\n whenever(sessionManager.userName).thenReturn(\"Test\")\n whenever(mediaClient.getMediaListForUser(anyString())).thenReturn(Single.error(Exception(\"Error\")))\n- val method: Method = ContributionBoundaryCallback::class.java.getDeclaredMethod(\n- \"fetchContributions\"\n- )\n+ val method: Method =\n+ ContributionBoundaryCallback::class.java.getDeclaredMethod(\n+ \"fetchContributions\",\n+ )\n method.isAccessible = true\n method.invoke(contributionBoundaryCallback)\n verifyNoInteractions(repository)\n- verify(mediaClient).getMediaListForUser(anyString());\n+ verify(mediaClient).getMediaListForUser(anyString())\n }\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionViewHolderUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionViewHolderUnitTests.kt\nindex 3f56c109d3..397e030704 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionViewHolderUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionViewHolderUnitTests.kt\n@@ -4,13 +4,8 @@ import android.net.Uri\n import android.os.Looper\n import android.view.LayoutInflater\n import android.view.View\n-import android.widget.ImageButton\n-import android.widget.ProgressBar\n-import android.widget.RelativeLayout\n-import android.widget.TextView\n import androidx.test.core.app.ApplicationProvider\n import com.facebook.drawee.backends.pipeline.Fresco\n-import com.facebook.drawee.view.SimpleDraweeView\n import com.facebook.soloader.SoLoader\n import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.R\n@@ -25,7 +20,7 @@ import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n import org.mockito.Mock\n-import org.mockito.Mockito.*\n+import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n import org.powermock.core.classloader.annotations.PrepareForTest\n import org.powermock.reflect.Whitebox\n@@ -34,16 +29,13 @@ import org.robolectric.RobolectricTestRunner\n import org.robolectric.Shadows\n import org.robolectric.annotation.Config\n import org.robolectric.annotation.LooperMode\n-import java.lang.reflect.Field\n import java.lang.reflect.Method\n-import java.lang.reflect.Modifier\n \n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n @PrepareForTest(ContributionViewHolder::class)\n class ContributionViewHolderUnitTests {\n-\n private lateinit var contributionViewHolder: ContributionViewHolder\n private lateinit var activity: ProfileActivity\n private lateinit var parent: View\n@@ -66,7 +58,7 @@ class ContributionViewHolderUnitTests {\n @Mock\n private lateinit var media: Media\n \n- private lateinit var bindind : LayoutContributionBinding\n+ private lateinit var bindind: LayoutContributionBinding\n \n @Before\n fun setUp() {\n@@ -82,8 +74,9 @@ class ContributionViewHolderUnitTests {\n Whitebox.setInternalState(contributionViewHolder, \"binding\", bindind)\n \n setFinalStatic(\n- ContributionViewHolder::class.java.getDeclaredField(\"compositeDisposable\"),\n- compositeDisposable)\n+ ContributionViewHolder::class.java.getDeclaredField(\"compositeDisposable\"),\n+ compositeDisposable,\n+ )\n }\n \n @Test\n@@ -108,11 +101,12 @@ class ContributionViewHolderUnitTests {\n @Throws(Exception::class)\n fun testChooseImageSource() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = ContributionViewHolder::class.java.getDeclaredMethod(\n- \"chooseImageSource\",\n- String::class.java,\n- Uri::class.java\n- )\n+ val method: Method =\n+ ContributionViewHolder::class.java.getDeclaredMethod(\n+ \"chooseImageSource\",\n+ String::class.java,\n+ Uri::class.java,\n+ )\n method.isAccessible = true\n method.invoke(contributionViewHolder, \"\", uri)\n }\n@@ -121,10 +115,11 @@ class ContributionViewHolderUnitTests {\n @Throws(Exception::class)\n fun testDisplayWikipediaButton() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = ContributionViewHolder::class.java.getDeclaredMethod(\n- \"displayWikipediaButton\",\n- Boolean::class.javaObjectType\n- )\n+ val method: Method =\n+ ContributionViewHolder::class.java.getDeclaredMethod(\n+ \"displayWikipediaButton\",\n+ Boolean::class.javaObjectType,\n+ )\n method.isAccessible = true\n method.invoke(contributionViewHolder, false)\n }\n@@ -134,10 +129,11 @@ class ContributionViewHolderUnitTests {\n fun testCheckIfMediaExistsOnWikipediaPageCaseNull() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n `when`(contribution.wikidataPlace).thenReturn(null)\n- val method: Method = ContributionViewHolder::class.java.getDeclaredMethod(\n- \"checkIfMediaExistsOnWikipediaPage\",\n- Contribution::class.java\n- )\n+ val method: Method =\n+ ContributionViewHolder::class.java.getDeclaredMethod(\n+ \"checkIfMediaExistsOnWikipediaPage\",\n+ Contribution::class.java,\n+ )\n method.isAccessible = true\n method.invoke(contributionViewHolder, contribution)\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsFragmentUnitTests.kt\nindex 098bab8523..4fd5689da4 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsFragmentUnitTests.kt\n@@ -3,7 +3,11 @@ package fr.free.nrw.commons.contributions\n import android.content.Context\n import android.os.Bundle\n import android.os.Looper\n-import android.view.*\n+import android.view.LayoutInflater\n+import android.view.Menu\n+import android.view.MenuInflater\n+import android.view.MenuItem\n+import android.view.View\n import android.widget.LinearLayout\n import android.widget.TextView\n import androidx.fragment.app.FragmentManager\n@@ -12,10 +16,9 @@ import androidx.test.core.app.ApplicationProvider\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.campaigns.CampaignView\n import fr.free.nrw.commons.campaigns.models.Campaign\n-import fr.free.nrw.commons.databinding.FragmentContributionsBinding\n+import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.kvstore.JsonKvStore\n import fr.free.nrw.commons.media.MediaDetailPagerFragment\n import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient\n@@ -29,7 +32,10 @@ import org.junit.Assert\n import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n-import org.mockito.ArgumentMatchers.*\n+import org.mockito.ArgumentMatchers.any\n+import org.mockito.ArgumentMatchers.anyBoolean\n+import org.mockito.ArgumentMatchers.anyInt\n+import org.mockito.ArgumentMatchers.anyString\n import org.mockito.Mock\n import org.mockito.Mockito.verify\n import org.mockito.Mockito.`when`\n@@ -46,7 +52,6 @@ import java.lang.reflect.Method\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class ContributionsFragmentUnitTests {\n-\n @Mock\n private lateinit var mediaDetailPagerFragment: MediaDetailPagerFragment\n \n@@ -105,7 +110,6 @@ class ContributionsFragmentUnitTests {\n context = ApplicationProvider.getApplicationContext()\n activity = Robolectric.buildActivity(MainActivity::class.java).create().get()\n \n-\n fragment = ContributionsFragment.newInstance()\n val fragmentManager: FragmentManager = activity.supportFragmentManager\n val fragmentTransaction: FragmentTransaction = fragmentManager.beginTransaction()\n@@ -113,8 +117,10 @@ class ContributionsFragmentUnitTests {\n fragmentTransaction.commit()\n \n layoutInflater = LayoutInflater.from(activity)\n- view = LayoutInflater.from(activity)\n- .inflate(R.layout.fragment_contributions, null) as View\n+ view =\n+ LayoutInflater\n+ .from(activity)\n+ .inflate(R.layout.fragment_contributions, null) as View\n \n nearbyNotificationCardView = view.findViewById(R.id.card_view_nearby)\n campaignView = view.findViewById(R.id.campaigns_view)\n@@ -157,17 +163,20 @@ class ContributionsFragmentUnitTests {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n `when`(notificationController.getNotifications(anyBoolean())).thenReturn(singleNotification)\n `when`(notificationController.getNotifications(anyBoolean()).subscribeOn(any())).thenReturn(\n- singleNotification\n+ singleNotification,\n )\n `when`(\n notificationController.getNotifications(anyBoolean()).subscribeOn(any()).observeOn(\n- any()\n- )\n+ any(),\n+ ),\n ).thenReturn(singleNotification)\n `when`(\n- notificationController.getNotifications(anyBoolean()).subscribeOn(any()).observeOn(\n- any()\n- ).subscribe()\n+ notificationController\n+ .getNotifications(anyBoolean())\n+ .subscribeOn(any())\n+ .observeOn(\n+ any(),\n+ ).subscribe(),\n ).thenReturn(compositeDisposable)\n fragment.setNotificationCount()\n }\n@@ -176,10 +185,11 @@ class ContributionsFragmentUnitTests {\n @Throws(Exception::class)\n fun testInitNotificationViewsCaseEmptyList() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = ContributionsFragment::class.java.getDeclaredMethod(\n- \"initNotificationViews\",\n- List::class.java\n- )\n+ val method: Method =\n+ ContributionsFragment::class.java.getDeclaredMethod(\n+ \"initNotificationViews\",\n+ List::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, listOf())\n }\n@@ -190,10 +200,11 @@ class ContributionsFragmentUnitTests {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n val list: List =\n listOf(Notification(NotificationType.UNKNOWN, \"\", \"\", \"\", \"\", \"\"))\n- val method: Method = ContributionsFragment::class.java.getDeclaredMethod(\n- \"initNotificationViews\",\n- List::class.java\n- )\n+ val method: Method =\n+ ContributionsFragment::class.java.getDeclaredMethod(\n+ \"initNotificationViews\",\n+ List::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, list)\n }\n@@ -209,7 +220,7 @@ class ContributionsFragmentUnitTests {\n \n @Test\n @Throws(Exception::class)\n- fun testScrollToTop(){\n+ fun testScrollToTop() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n fragment.scrollToTop()\n verify(contributionsListFragment).scrollToTop()\n@@ -348,5 +359,4 @@ class ContributionsFragmentUnitTests {\n `when`(mediaDetailPagerFragment.isVisible).thenReturn(false)\n fragment.showDetail(0, false)\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListFragmentUnitTests.kt\nindex 00c0b12dce..db2475f63c 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListFragmentUnitTests.kt\n@@ -30,7 +30,6 @@ import java.lang.reflect.Method\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class ContributionsListFragmentUnitTests {\n-\n private lateinit var scenario: FragmentScenario\n private lateinit var fragment: ContributionsListFragment\n \n@@ -43,17 +42,19 @@ class ContributionsListFragmentUnitTests {\n fun setUp() {\n OkHttpConnectionFactory.CLIENT = createTestClient()\n \n- scenario = launchFragmentInContainer(\n- initialState = Lifecycle.State.RESUMED,\n- themeResId = R.style.LightAppTheme\n- ) {\n- ContributionsListFragment().apply {\n- contributionsListPresenter = mock()\n- callback = mock()\n- }.also {\n- fragment = it\n+ scenario =\n+ launchFragmentInContainer(\n+ initialState = Lifecycle.State.RESUMED,\n+ themeResId = R.style.LightAppTheme,\n+ ) {\n+ ContributionsListFragment()\n+ .apply {\n+ contributionsListPresenter = mock()\n+ callback = mock()\n+ }.also {\n+ fragment = it\n+ }\n }\n- }\n \n scenario.onFragment {\n it.adapter = adapter\n@@ -129,10 +130,11 @@ class ContributionsListFragmentUnitTests {\n @Throws(Exception::class)\n fun testShowAddImageToWikipediaInstructions() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = ContributionsListFragment::class.java.getDeclaredMethod(\n- \"showAddImageToWikipediaInstructions\",\n- Contribution::class.java\n- )\n+ val method: Method =\n+ ContributionsListFragment::class.java.getDeclaredMethod(\n+ \"showAddImageToWikipediaInstructions\",\n+ Contribution::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, contribution)\n }\n@@ -193,10 +195,11 @@ class ContributionsListFragmentUnitTests {\n scenario.onFragment {\n it.requireView().findViewById(R.id.fab_plus).hide()\n }\n- val method: Method = ContributionsListFragment::class.java.getDeclaredMethod(\n- \"animateFAB\",\n- Boolean::class.java\n- )\n+ val method: Method =\n+ ContributionsListFragment::class.java.getDeclaredMethod(\n+ \"animateFAB\",\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, true)\n }\n@@ -208,10 +211,11 @@ class ContributionsListFragmentUnitTests {\n scenario.onFragment {\n it.requireView().findViewById(R.id.fab_plus).show()\n }\n- val method: Method = ContributionsListFragment::class.java.getDeclaredMethod(\n- \"animateFAB\",\n- Boolean::class.java\n- )\n+ val method: Method =\n+ ContributionsListFragment::class.java.getDeclaredMethod(\n+ \"animateFAB\",\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, true)\n }\n@@ -223,10 +227,11 @@ class ContributionsListFragmentUnitTests {\n scenario.onFragment {\n it.requireView().findViewById(R.id.fab_plus).show()\n }\n- val method: Method = ContributionsListFragment::class.java.getDeclaredMethod(\n- \"animateFAB\",\n- Boolean::class.java\n- )\n+ val method: Method =\n+ ContributionsListFragment::class.java.getDeclaredMethod(\n+ \"animateFAB\",\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, false)\n }\n@@ -235,9 +240,10 @@ class ContributionsListFragmentUnitTests {\n @Throws(Exception::class)\n fun testSetListeners() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = ContributionsListFragment::class.java.getDeclaredMethod(\n- \"setListeners\"\n- )\n+ val method: Method =\n+ ContributionsListFragment::class.java.getDeclaredMethod(\n+ \"setListeners\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -246,9 +252,10 @@ class ContributionsListFragmentUnitTests {\n @Throws(Exception::class)\n fun testInitializeAnimations() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = ContributionsListFragment::class.java.getDeclaredMethod(\n- \"initializeAnimations\"\n- )\n+ val method: Method =\n+ ContributionsListFragment::class.java.getDeclaredMethod(\n+ \"initializeAnimations\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -261,4 +268,4 @@ class ContributionsListFragmentUnitTests {\n newConfig.orientation = Configuration.ORIENTATION_LANDSCAPE\n fragment.onConfigurationChanged(newConfig)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListPresenterTest.kt\nindex ff47f66f03..5c35f71eda 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListPresenterTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListPresenterTest.kt\n@@ -2,18 +2,11 @@ package fr.free.nrw.commons.contributions\n \n import androidx.arch.core.executor.testing.InstantTaskExecutorRule\n import com.nhaarman.mockitokotlin2.times\n-import com.nhaarman.mockitokotlin2.verify\n-import com.nhaarman.mockitokotlin2.whenever\n-import io.reactivex.Completable\n import io.reactivex.Scheduler\n import io.reactivex.schedulers.Schedulers\n import org.junit.Before\n import org.junit.Rule\n-import org.junit.Test\n-import org.mockito.ArgumentMatchers\n-import org.mockito.ArgumentMatchers.any\n import org.mockito.Mock\n-import org.mockito.Mockito.mock\n import org.mockito.MockitoAnnotations\n \n /**\n@@ -50,8 +43,7 @@ class ContributionsListPresenterTest {\n contributionBoundaryCallback,\n remoteDataSource,\n repository,\n- scheduler\n- );\n+ scheduler,\n+ )\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsPresenterTest.kt\nindex d75fc22854..de226c97c8 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsPresenterTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsPresenterTest.kt\n@@ -7,14 +7,11 @@ import androidx.lifecycle.MutableLiveData\n import androidx.loader.content.CursorLoader\n import androidx.loader.content.Loader\n import com.nhaarman.mockitokotlin2.verify\n-import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.repository.UploadRepository\n-import io.reactivex.Completable\n import io.reactivex.schedulers.TestScheduler\n import org.junit.Before\n import org.junit.Rule\n import org.junit.Test\n-import org.mockito.ArgumentMatchers\n import org.mockito.Mock\n import org.mockito.Mockito\n import org.mockito.MockitoAnnotations\n@@ -72,6 +69,4 @@ class ContributionsPresenterTest {\n contributionsPresenter.getContributionsWithTitle(\"ashish\")\n verify(repository).getContributionWithFileName(\"ashish\")\n }\n-\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsRepositoryTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsRepositoryTest.kt\nindex b90b4420cb..b98603b494 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsRepositoryTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsRepositoryTest.kt\n@@ -8,8 +8,11 @@ import io.reactivex.Scheduler\n import io.reactivex.Single\n import org.junit.Before\n import org.junit.Test\n-import org.mockito.*\n+import org.mockito.ArgumentMatchers\n+import org.mockito.InjectMocks\n+import org.mockito.Mock\n import org.mockito.Mockito.mock\n+import org.mockito.MockitoAnnotations\n \n /**\n * The unit test class for ContributionsRepositoryTest\n@@ -38,7 +41,7 @@ class ContributionsRepositoryTest {\n whenever(localDataSource.getContributions())\n .thenReturn(createMockDataSourceFactory(listOf(contribution)))\n val contributionsFactory = contributionsRepository.fetchContributions()\n- verify(localDataSource, times(1)).getContributions();\n+ verify(localDataSource, times(1)).getContributions()\n }\n \n @Test\n@@ -46,8 +49,9 @@ class ContributionsRepositoryTest {\n val contributions = listOf(mock(Contribution::class.java))\n whenever(localDataSource.saveContributions(ArgumentMatchers.anyList()))\n .thenReturn(Single.just(listOf(1L)))\n- val save = contributionsRepository.save(contributions).test().assertValueAt(0) {\n- it.size == 1 && it.get(0) == 1L\n- }\n+ val save =\n+ contributionsRepository.save(contributions).test().assertValueAt(0) {\n+ it.size == 1 && it.get(0) == 1L\n+ }\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/MainActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/MainActivityUnitTests.kt\nindex 44330fabb6..a2eb41615a 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/MainActivityUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/MainActivityUnitTests.kt\n@@ -9,13 +9,12 @@ import androidx.fragment.app.Fragment\n import androidx.test.core.app.ApplicationProvider\n import androidx.work.Configuration\n import androidx.work.testing.WorkManagerTestInitHelper\n-import fr.free.nrw.commons.CommonsApplication\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.bookmarks.BookmarkFragment\n import fr.free.nrw.commons.contributions.MainActivity.ActiveFragment\n+import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.explore.ExploreFragment\n import fr.free.nrw.commons.kvstore.JsonKvStore\n import fr.free.nrw.commons.navtab.NavTabLayout\n@@ -40,12 +39,10 @@ import org.robolectric.fakes.RoboMenuItem\n import java.lang.reflect.Field\n import java.lang.reflect.Method\n \n-\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class MainActivityUnitTests {\n-\n private lateinit var activity: MainActivity\n private lateinit var context: Context\n private lateinit var menuItem: RoboMenuItem\n@@ -198,9 +195,10 @@ class MainActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testSetUpPager() {\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"setUpPager\"\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"setUpPager\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -208,9 +206,10 @@ class MainActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testSetUpLoggedOutPager() {\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"setUpLoggedOutPager\"\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"setUpLoggedOutPager\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -218,11 +217,12 @@ class MainActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testLoadFragmentCaseContributionsFragment() {\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"loadFragment\",\n- Fragment::class.java,\n- Boolean::class.java\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"loadFragment\",\n+ Fragment::class.java,\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, contributionsFragment, false)\n }\n@@ -232,14 +232,15 @@ class MainActivityUnitTests {\n fun testLoadFragmentCaseContributionsFragmentCaseTrue() {\n activeFragment = ActiveFragment.CONTRIBUTIONS\n activity.activeFragment = activeFragment\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"loadFragment\",\n- Fragment::class.java,\n- Boolean::class.java\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"loadFragment\",\n+ Fragment::class.java,\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, contributionsFragment, false)\n- verify(contributionsFragment).scrollToTop();\n+ verify(contributionsFragment).scrollToTop()\n }\n \n @Test\n@@ -247,11 +248,12 @@ class MainActivityUnitTests {\n fun testLoadFragmentCaseNearbyParentFragmentCaseTrue() {\n activeFragment = ActiveFragment.NEARBY\n activity.activeFragment = activeFragment\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"loadFragment\",\n- Fragment::class.java,\n- Boolean::class.java\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"loadFragment\",\n+ Fragment::class.java,\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, nearbyParentFragment, false)\n }\n@@ -259,11 +261,12 @@ class MainActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testLoadFragmentCaseNearbyParentFragment() {\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"loadFragment\",\n- Fragment::class.java,\n- Boolean::class.java\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"loadFragment\",\n+ Fragment::class.java,\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, nearbyParentFragment, false)\n }\n@@ -273,11 +276,12 @@ class MainActivityUnitTests {\n fun testLoadFragmentCaseExploreFragmentCaseTrue() {\n activeFragment = ActiveFragment.EXPLORE\n activity.activeFragment = activeFragment\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"loadFragment\",\n- Fragment::class.java,\n- Boolean::class.java\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"loadFragment\",\n+ Fragment::class.java,\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, exploreFragment, false)\n }\n@@ -285,11 +289,12 @@ class MainActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testLoadFragmentCaseExploreFragment() {\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"loadFragment\",\n- Fragment::class.java,\n- Boolean::class.java\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"loadFragment\",\n+ Fragment::class.java,\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, exploreFragment, false)\n }\n@@ -299,11 +304,12 @@ class MainActivityUnitTests {\n fun testLoadFragmentCaseBookmarkFragmentCaseTrue() {\n activeFragment = ActiveFragment.BOOKMARK\n activity.activeFragment = activeFragment\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"loadFragment\",\n- Fragment::class.java,\n- Boolean::class.java\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"loadFragment\",\n+ Fragment::class.java,\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, bookmarkFrament, false)\n }\n@@ -311,11 +317,12 @@ class MainActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testLoadFragmentCaseBookmarkFragment() {\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"loadFragment\",\n- Fragment::class.java,\n- Boolean::class.java\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"loadFragment\",\n+ Fragment::class.java,\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, bookmarkFrament, false)\n }\n@@ -323,11 +330,12 @@ class MainActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testLoadFragmentCaseNull() {\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"loadFragment\",\n- Fragment::class.java,\n- Boolean::class.java\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"loadFragment\",\n+ Fragment::class.java,\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, null, true)\n }\n@@ -335,12 +343,13 @@ class MainActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnActivityResult() {\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"onActivityResult\",\n- Int::class.java,\n- Int::class.java,\n- Intent::class.java\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"onActivityResult\",\n+ Int::class.java,\n+ Int::class.java,\n+ Intent::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, 0, 0, null)\n }\n@@ -348,9 +357,10 @@ class MainActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnResume() {\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"onResume\"\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"onResume\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -358,9 +368,10 @@ class MainActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnDestroy() {\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"onDestroy\"\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"onDestroy\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -368,10 +379,11 @@ class MainActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnPostCreate() {\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"onPostCreate\",\n- Bundle::class.java\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"onPostCreate\",\n+ Bundle::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, null)\n }\n@@ -380,10 +392,11 @@ class MainActivityUnitTests {\n @Throws(Exception::class)\n fun testOnSaveInstanceState() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"onSaveInstanceState\",\n- Bundle::class.java\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"onSaveInstanceState\",\n+ Bundle::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, bundle)\n }\n@@ -393,10 +406,11 @@ class MainActivityUnitTests {\n fun testOnRestoreInstanceStateCaseContributions() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n `when`(bundle.getString(\"activeFragment\")).thenReturn(ActiveFragment.CONTRIBUTIONS.name)\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"onRestoreInstanceState\",\n- Bundle::class.java\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"onRestoreInstanceState\",\n+ Bundle::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, bundle)\n }\n@@ -406,10 +420,11 @@ class MainActivityUnitTests {\n fun testOnRestoreInstanceStateCaseNearby() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n `when`(bundle.getString(\"activeFragment\")).thenReturn(ActiveFragment.NEARBY.name)\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"onRestoreInstanceState\",\n- Bundle::class.java\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"onRestoreInstanceState\",\n+ Bundle::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, bundle)\n }\n@@ -419,10 +434,11 @@ class MainActivityUnitTests {\n fun testOnRestoreInstanceStateCaseExplore() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n `when`(bundle.getString(\"activeFragment\")).thenReturn(ActiveFragment.EXPLORE.name)\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"onRestoreInstanceState\",\n- Bundle::class.java\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"onRestoreInstanceState\",\n+ Bundle::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, bundle)\n }\n@@ -432,34 +448,34 @@ class MainActivityUnitTests {\n fun testOnRestoreInstanceStateCaseBookmark() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n `when`(bundle.getString(\"activeFragment\")).thenReturn(ActiveFragment.BOOKMARK.name)\n- val method: Method = MainActivity::class.java.getDeclaredMethod(\n- \"onRestoreInstanceState\",\n- Bundle::class.java\n- )\n+ val method: Method =\n+ MainActivity::class.java.getDeclaredMethod(\n+ \"onRestoreInstanceState\",\n+ Bundle::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, bundle)\n }\n \n @Test\n @Throws(Exception::class)\n- fun testOnSetUpPagerNearBy(){\n+ fun testOnSetUpPagerNearBy() {\n val item = Mockito.mock(MenuItem::class.java)\n `when`(item.title).thenReturn(activity.getString(R.string.nearby_fragment))\n activity.navListener.onNavigationItemSelected(item)\n verify(item, Mockito.times(3)).title\n- verify(applicationKvStore,Mockito.times(1))\n- .putBoolean(\"last_opened_nearby\",true)\n+ verify(applicationKvStore, Mockito.times(1))\n+ .putBoolean(\"last_opened_nearby\", true)\n }\n \n @Test\n @Throws(Exception::class)\n- fun testOnSetUpPagerOtherThanNearBy(){\n+ fun testOnSetUpPagerOtherThanNearBy() {\n val item = Mockito.mock(MenuItem::class.java)\n `when`(item.title).thenReturn(activity.getString(R.string.bookmarks))\n activity.navListener.onNavigationItemSelected(item)\n verify(item, Mockito.times(3)).title\n- verify(applicationKvStore,Mockito.times(1))\n- .putBoolean(\"last_opened_nearby\",false)\n+ verify(applicationKvStore, Mockito.times(1))\n+ .putBoolean(\"last_opened_nearby\", false)\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/coordinates/CoordinateEditHelperUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/coordinates/CoordinateEditHelperUnitTest.kt\nindex c364ccbde2..fb1c4db6b3 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/coordinates/CoordinateEditHelperUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/coordinates/CoordinateEditHelperUnitTest.kt\n@@ -17,7 +17,9 @@ import org.junit.jupiter.api.Assertions.assertEquals\n import org.junit.runner.RunWith\n import org.mockito.ArgumentMatchers.anyString\n import org.mockito.Mock\n-import org.mockito.Mockito.*\n+import org.mockito.Mockito.times\n+import org.mockito.Mockito.verify\n+import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n import org.robolectric.RobolectricTestRunner\n import org.robolectric.annotation.Config\n@@ -28,7 +30,6 @@ import java.lang.reflect.Method\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class CoordinateEditHelperUnitTest {\n-\n private lateinit var context: Context\n private lateinit var helper: CoordinateEditHelper\n \n@@ -55,8 +56,8 @@ class CoordinateEditHelperUnitTest {\n pageEditClient.edit(\n anyString(),\n anyString(),\n- anyString()\n- )\n+ anyString(),\n+ ),\n ).thenReturn(Observable.just(true))\n }\n \n@@ -72,7 +73,7 @@ class CoordinateEditHelperUnitTest {\n helper.makeCoordinatesEdit(context, media, \"0.0\", \"0.0\", \"0.0F\")\n verify(viewUtilWrapper, times(1)).showShortToast(\n context,\n- context.getString(R.string.coordinates_edit_helper_make_edit_toast)\n+ context.getString(R.string.coordinates_edit_helper_make_edit_toast),\n )\n verify(pageEditClient, times(1)).getCurrentWikiText(anyString())\n verify(pageEditClient, times(1)).edit(anyString(), anyString(), anyString())\n@@ -81,94 +82,118 @@ class CoordinateEditHelperUnitTest {\n @Test\n @Throws(Exception::class)\n fun testGetFormattedWikiTextCaseNewLineContainsLocation() {\n- val method: Method = CoordinateEditHelper::class.java.getDeclaredMethod(\n- \"getFormattedWikiText\", String::class.java, String::class.java\n- )\n+ val method: Method =\n+ CoordinateEditHelper::class.java.getDeclaredMethod(\n+ \"getFormattedWikiText\",\n+ String::class.java,\n+ String::class.java,\n+ )\n method.isAccessible = true\n assertEquals(\n method.invoke(\n helper,\n \"== {{int:filedesc}} == {{user|Test}} == \\n{{Location|0.0|0.0|0.0F}}\",\n- \"{{Location|0.1|0.1|0.1F}}\"\n- ), \"== {{int:filedesc}} == {{user|Test}} == \\n\" +\n- \"{Location|0.1|0.1|0.1F}}\\n\"\n+ \"{{Location|0.1|0.1|0.1F}}\",\n+ ),\n+ \"== {{int:filedesc}} == {{user|Test}} == \\n\" +\n+ \"{Location|0.1|0.1|0.1F}}\\n\",\n )\n }\n \n @Test\n @Throws(Exception::class)\n fun testGetFormattedWikiTextCaseContainsLocation() {\n- val method: Method = CoordinateEditHelper::class.java.getDeclaredMethod(\n- \"getFormattedWikiText\", String::class.java, String::class.java\n- )\n+ val method: Method =\n+ CoordinateEditHelper::class.java.getDeclaredMethod(\n+ \"getFormattedWikiText\",\n+ String::class.java,\n+ String::class.java,\n+ )\n method.isAccessible = true\n assertEquals(\n method.invoke(\n helper,\n \"== {{int:filedesc}} == {{Location|0.0|0.0|0.0F}}\",\n- \"{{Location|0.1|0.1|0.1F}}\"\n- ), \"== {{int:filedesc}} == {{Location|0.1|0.1|0.1F}}\"\n+ \"{{Location|0.1|0.1|0.1F}}\",\n+ ),\n+ \"== {{int:filedesc}} == {{Location|0.1|0.1|0.1F}}\",\n )\n }\n \n @Test\n @Throws(Exception::class)\n fun testGetFormattedWikiTextCaseDoesContainsLocationHasSubString() {\n- val method: Method = CoordinateEditHelper::class.java.getDeclaredMethod(\n- \"getFormattedWikiText\", String::class.java, String::class.java\n- )\n+ val method: Method =\n+ CoordinateEditHelper::class.java.getDeclaredMethod(\n+ \"getFormattedWikiText\",\n+ String::class.java,\n+ String::class.java,\n+ )\n method.isAccessible = true\n assertEquals(\n method.invoke(\n helper,\n \"== {{int:filedesc}} == {{user|Test}} == {{int:license-header}} ==\",\n- \"{{Location|0.1|0.1|0.1F}}\"\n+ \"{{Location|0.1|0.1|0.1F}}\",\n ),\n \"== {{int:filedesc}} == {{user|Test}} {Location|0.1|0.1|0.1F}}\\n\" +\n- \"== {{int:license-header}} ==\"\n+ \"== {{int:license-header}} ==\",\n )\n }\n \n @Test\n @Throws(Exception::class)\n fun testGetFormattedWikiTextCaseDoesContainsLocationDoesNotHaveSubString() {\n- val method: Method = CoordinateEditHelper::class.java.getDeclaredMethod(\n- \"getFormattedWikiText\", String::class.java, String::class.java\n- )\n+ val method: Method =\n+ CoordinateEditHelper::class.java.getDeclaredMethod(\n+ \"getFormattedWikiText\",\n+ String::class.java,\n+ String::class.java,\n+ )\n method.isAccessible = true\n assertEquals(\n method.invoke(\n helper,\n \"== {{int:filedesc}} {{int:license-header}} ==\",\n- \"{{Location|0.1|0.1|0.1F}}\"\n+ \"{{Location|0.1|0.1|0.1F}}\",\n ),\n- \"== {{int:filedesc}} {{int:license-header}} =={{Location|0.1|0.1|0.1F}}\"\n+ \"== {{int:filedesc}} {{int:license-header}} =={{Location|0.1|0.1|0.1F}}\",\n )\n }\n \n @Test\n @Throws(Exception::class)\n fun testGetFormattedWikiTextCaseDoesNotContainFileDesc() {\n- val method: Method = CoordinateEditHelper::class.java.getDeclaredMethod(\n- \"getFormattedWikiText\", String::class.java, String::class.java\n- )\n+ val method: Method =\n+ CoordinateEditHelper::class.java.getDeclaredMethod(\n+ \"getFormattedWikiText\",\n+ String::class.java,\n+ String::class.java,\n+ )\n method.isAccessible = true\n assertEquals(\n method.invoke(\n helper,\n \"{{Location|0.0|0.0|0.0F}}\",\n- \"{{Location|0.1|0.1|0.1F}}\"\n- ), \"== {{int:filedesc}} =={{Location|0.1|0.1|0.1F}}{{Location|0.0|0.0|0.0F}}\"\n+ \"{{Location|0.1|0.1|0.1F}}\",\n+ ),\n+ \"== {{int:filedesc}} =={{Location|0.1|0.1|0.1F}}{{Location|0.0|0.0|0.0F}}\",\n )\n }\n \n @Test\n @Throws(Exception::class)\n fun testShowCoordinatesEditNotificationCaseTrue() {\n- val method: Method = CoordinateEditHelper::class.java.getDeclaredMethod(\n- \"showCoordinatesEditNotification\", Context::class.java, Media::class.java,\n- String::class.java, String::class.java, String::class.java, Boolean::class.java\n- )\n+ val method: Method =\n+ CoordinateEditHelper::class.java.getDeclaredMethod(\n+ \"showCoordinatesEditNotification\",\n+ Context::class.java,\n+ Media::class.java,\n+ String::class.java,\n+ String::class.java,\n+ String::class.java,\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n assertEquals(method.invoke(helper, context, media, \"0.0\", \"0.0\", \"0.0F\", true), true)\n }\n@@ -176,12 +201,17 @@ class CoordinateEditHelperUnitTest {\n @Test\n @Throws(Exception::class)\n fun testShowCoordinatesEditNotificationCaseFalse() {\n- val method: Method = CoordinateEditHelper::class.java.getDeclaredMethod(\n- \"showCoordinatesEditNotification\", Context::class.java, Media::class.java,\n- String::class.java, String::class.java, String::class.java, Boolean::class.java\n- )\n+ val method: Method =\n+ CoordinateEditHelper::class.java.getDeclaredMethod(\n+ \"showCoordinatesEditNotification\",\n+ Context::class.java,\n+ Media::class.java,\n+ String::class.java,\n+ String::class.java,\n+ String::class.java,\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n assertEquals(method.invoke(helper, context, media, \"0.0\", \"0.0\", \"0.0F\", false), false)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/helper/ImageHelperTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/helper/ImageHelperTest.kt\nindex 880eca38bd..d8b501522d 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/helper/ImageHelperTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/helper/ImageHelperTest.kt\n@@ -3,16 +3,14 @@ package fr.free.nrw.commons.customselector.helper\n import android.net.Uri\n import fr.free.nrw.commons.customselector.model.Folder\n import fr.free.nrw.commons.customselector.model.Image\n-import org.junit.jupiter.api.Assertions.*\n-\n import org.junit.Test\n+import org.junit.jupiter.api.Assertions.assertEquals\n import org.mockito.Mockito.mock\n \n /**\n * Custom Selector Image Helper Test\n */\n internal class ImageHelperTest {\n-\n var uri: Uri = mock(Uri::class.java)\n private val folderImage1 = Image(1, \"image1\", uri, \"abc/abc\", 1, \"bucket1\")\n private val folderImage2 = Image(2, \"image1\", uri, \"xyz/xyz\", 2, \"bucket2\")\n@@ -42,7 +40,7 @@ internal class ImageHelperTest {\n */\n @Test\n fun getIndex() {\n- assertEquals(1,ImageHelper.getIndex(mockImageList, folderImage2))\n+ assertEquals(1, ImageHelper.getIndex(mockImageList, folderImage2))\n }\n \n /**\n@@ -52,4 +50,4 @@ internal class ImageHelperTest {\n fun getIndexList() {\n assertEquals(ArrayList(listOf(0)), ImageHelper.getIndexList(mockImageList, folderImageList2))\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListenerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListenerTest.kt\nindex 4e206f2a67..b1bd7ac35e 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListenerTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListenerTest.kt\n@@ -8,8 +8,8 @@ import androidx.test.core.app.ApplicationProvider\n import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.TestUtility.setFinalStatic\n+import fr.free.nrw.commons.createTestClient\n import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n@@ -23,7 +23,6 @@ import org.robolectric.annotation.Config\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @PrepareForTest(OnSwipeTouchListener::class)\n internal class OnSwipeTouchListenerTest {\n-\n private lateinit var context: Context\n private lateinit var onSwipeTouchListener: OnSwipeTouchListener\n private lateinit var gesListener: OnSwipeTouchListener.GestureListener\n@@ -49,8 +48,9 @@ internal class OnSwipeTouchListenerTest {\n onSwipeTouchListener = OnSwipeTouchListener(context)\n gesListener = OnSwipeTouchListener(context).GestureListener()\n setFinalStatic(\n- OnSwipeTouchListener::class.java.getDeclaredField(\"gestureDetector\"),\n- gestureDetector)\n+ OnSwipeTouchListener::class.java.getDeclaredField(\"gestureDetector\"),\n+ gestureDetector,\n+ )\n }\n \n /**\n@@ -58,13 +58,12 @@ internal class OnSwipeTouchListenerTest {\n */\n @Test\n fun onTouch() {\n- val motionEvent = MotionEvent.obtain(200, 300, MotionEvent.ACTION_MOVE, 15.0f, 10.0f, 0);\n+ val motionEvent = MotionEvent.obtain(200, 300, MotionEvent.ACTION_MOVE, 15.0f, 10.0f, 0)\n val func = onSwipeTouchListener.javaClass.getDeclaredMethod(\"onTouch\", View::class.java, MotionEvent::class.java)\n func.isAccessible = true\n func.invoke(onSwipeTouchListener, view, motionEvent)\n }\n \n-\n /**\n * Test onSwipeRight\n */\n@@ -144,4 +143,4 @@ internal class OnSwipeTouchListenerTest {\n whenever(motionEvent2.y).thenReturn(1f)\n gesListener.onFling(motionEvent1, motionEvent2, 0f, 2000f)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/adapter/FolderAdapterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/adapter/FolderAdapterTest.kt\nindex a08acbeef0..08dadca25a 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/adapter/FolderAdapterTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/adapter/FolderAdapterTest.kt\n@@ -1,7 +1,6 @@\n package fr.free.nrw.commons.customselector.ui.adapter\n \n import android.content.ContentResolver\n-import fr.free.nrw.commons.R\n import android.content.Context\n import android.net.Uri\n import android.view.LayoutInflater\n@@ -9,8 +8,8 @@ import android.view.View\n import android.widget.GridLayout\n import com.nhaarman.mockitokotlin2.any\n import com.nhaarman.mockitokotlin2.whenever\n+import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.TestUtility.setFinalStatic\n import fr.free.nrw.commons.customselector.listeners.FolderClickListener\n import fr.free.nrw.commons.customselector.model.Folder\n import fr.free.nrw.commons.customselector.model.Image\n@@ -22,12 +21,9 @@ import org.junit.runner.RunWith\n import org.mockito.Mock\n import org.mockito.Mockito\n import org.mockito.MockitoAnnotations\n-import org.powermock.reflect.Whitebox\n import org.robolectric.Robolectric\n import org.robolectric.RobolectricTestRunner\n import org.robolectric.annotation.Config\n-import java.lang.reflect.Field\n-import java.lang.reflect.Modifier\n \n /**\n * Custom Selector Folder Adapter Test.\n@@ -35,7 +31,6 @@ import java.lang.reflect.Modifier\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class FolderAdapterTest {\n-\n private var uri: Uri = Mockito.mock(Uri::class.java)\n private lateinit var activity: CustomSelectorActivity\n private lateinit var folderAdapter: FolderAdapter\n@@ -98,4 +93,4 @@ class FolderAdapterTest {\n fun getItemCount() {\n assertEquals(0, folderAdapter.itemCount)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapterTest.kt\nindex 93a1ea8f97..2a4c8c7915 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapterTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapterTest.kt\n@@ -10,7 +10,6 @@ import android.widget.GridLayout\n import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.TestUtility.setFinalStatic\n import fr.free.nrw.commons.customselector.listeners.ImageSelectListener\n import fr.free.nrw.commons.customselector.model.Image\n import fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivity\n@@ -34,8 +33,7 @@ import org.robolectric.Robolectric\n import org.robolectric.RobolectricTestRunner\n import org.robolectric.annotation.Config\n import java.lang.reflect.Field\n-import java.lang.reflect.Modifier\n-import java.util.*\n+import java.util.TreeMap\n import kotlin.collections.ArrayList\n \n /**\n@@ -47,25 +45,28 @@ import kotlin.collections.ArrayList\n class ImageAdapterTest {\n @Mock\n private lateinit var imageLoader: ImageLoader\n+\n @Mock\n private lateinit var imageSelectListener: ImageSelectListener\n+\n @Mock\n private lateinit var context: Context\n+\n @Mock\n private lateinit var mockContentResolver: ContentResolver\n+\n @Mock\n private lateinit var sharedPreferences: SharedPreferences\n \n private lateinit var activity: CustomSelectorActivity\n private lateinit var imageAdapter: ImageAdapter\n- private lateinit var images : ArrayList\n+ private lateinit var images: ArrayList\n private lateinit var holder: ImageAdapter.ImageViewHolder\n private lateinit var selectedImageField: Field\n private var uri: Uri = Mockito.mock(Uri::class.java)\n private lateinit var image: Image\n private val testDispatcher = TestCoroutineDispatcher()\n \n-\n /**\n * Set up variables.\n */\n@@ -106,7 +107,6 @@ class ImageAdapterTest {\n */\n @Test\n fun onBindViewHolder() {\n-\n whenever(context.contentResolver).thenReturn(mockContentResolver)\n whenever(mockContentResolver.getType(uri)).thenReturn(\"jpg\")\n // Parameters.\n@@ -125,22 +125,38 @@ class ImageAdapterTest {\n * Test processThumbnailForActionedImage\n */\n @Test\n- fun processThumbnailForActionedImage() = runBlocking {\n- Whitebox.setInternalState(imageAdapter, \"allImages\", listOf(image))\n- whenever(imageLoader.nextActionableImage(listOf(image), Dispatchers.IO, Dispatchers.Default,\n- 0, emptyList())).thenReturn(0)\n- imageAdapter.processThumbnailForActionedImage(holder, 0, emptyList())\n- }\n+ fun processThumbnailForActionedImage() =\n+ runBlocking {\n+ Whitebox.setInternalState(imageAdapter, \"allImages\", listOf(image))\n+ whenever(\n+ imageLoader.nextActionableImage(\n+ listOf(image),\n+ Dispatchers.IO,\n+ Dispatchers.Default,\n+ 0,\n+ emptyList(),\n+ ),\n+ ).thenReturn(0)\n+ imageAdapter.processThumbnailForActionedImage(holder, 0, emptyList())\n+ }\n \n /**\n * Test processThumbnailForActionedImage\n */\n @Test\n- fun `processThumbnailForActionedImage when reached end of the folder`() = runBlocking {\n- whenever(imageLoader.nextActionableImage(ArrayList(), Dispatchers.IO, Dispatchers.Default,\n- 0, emptyList())).thenReturn(-1)\n- imageAdapter.processThumbnailForActionedImage(holder, 0, emptyList())\n- }\n+ fun `processThumbnailForActionedImage when reached end of the folder`() =\n+ runBlocking {\n+ whenever(\n+ imageLoader.nextActionableImage(\n+ ArrayList(),\n+ Dispatchers.IO,\n+ Dispatchers.Default,\n+ 0,\n+ emptyList(),\n+ ),\n+ ).thenReturn(-1)\n+ imageAdapter.processThumbnailForActionedImage(holder, 0, emptyList())\n+ }\n \n /**\n * Test init.\n@@ -156,7 +172,12 @@ class ImageAdapterTest {\n @Test\n fun selectOrRemoveImage() {\n // Access function\n- val func = imageAdapter.javaClass.getDeclaredMethod(\"selectOrRemoveImage\", ImageAdapter.ImageViewHolder::class.java, Int::class.java)\n+ val func =\n+ imageAdapter.javaClass.getDeclaredMethod(\n+ \"selectOrRemoveImage\",\n+ ImageAdapter.ImageViewHolder::class.java,\n+ Int::class.java,\n+ )\n func.isAccessible = true\n \n // Parameters\n@@ -183,11 +204,12 @@ class ImageAdapterTest {\n images.add(image)\n Whitebox.setInternalState(imageAdapter, \"images\", images)\n // Access function\n- val func = imageAdapter.javaClass.getDeclaredMethod(\n- \"onThumbnailClicked\",\n- Int::class.java,\n- ImageAdapter.ImageViewHolder::class.java\n- )\n+ val func =\n+ imageAdapter.javaClass.getDeclaredMethod(\n+ \"onThumbnailClicked\",\n+ Int::class.java,\n+ ImageAdapter.ImageViewHolder::class.java,\n+ )\n func.isAccessible = true\n func.invoke(imageAdapter, 0, holder)\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivityTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivityTest.kt\nindex efa04d1b2a..0274fed7d3 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivityTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivityTest.kt\n@@ -30,12 +30,11 @@ import java.lang.reflect.Method\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class CustomSelectorActivityTest {\n-\n private lateinit var activity: CustomSelectorActivity\n \n private lateinit var imageFragment: ImageFragment\n \n- private lateinit var images : java.util.ArrayList\n+ private lateinit var images: java.util.ArrayList\n \n private var uri: Uri = Mockito.mock(Uri::class.java)\n \n@@ -52,18 +51,20 @@ class CustomSelectorActivityTest {\n MockitoAnnotations.openMocks(this)\n OkHttpConnectionFactory.CLIENT = createTestClient()\n \n- activity = Robolectric.buildActivity(CustomSelectorActivity::class.java)\n- .get()\n+ activity =\n+ Robolectric\n+ .buildActivity(CustomSelectorActivity::class.java)\n+ .get()\n val onCreate = activity.javaClass.getDeclaredMethod(\"onCreate\", Bundle::class.java)\n onCreate.isAccessible = true\n onCreate.invoke(activity, null)\n- imageFragment = ImageFragment.newInstance(1,0)\n+ imageFragment = ImageFragment.newInstance(1, 0)\n image = Image(1, \"image\", uri, \"abc/abc\", 1, \"bucket1\")\n images = ArrayList()\n \n Whitebox.setInternalState(activity, \"imageFragment\", imageFragment)\n Whitebox.setInternalState(imageFragment, \"imageAdapter\", Mockito.mock(ImageAdapter::class.java))\n- Whitebox.setInternalState(imageFragment,\"contributionDao\",contributionDao)\n+ Whitebox.setInternalState(imageFragment, \"contributionDao\", contributionDao)\n }\n \n /**\n@@ -93,7 +94,7 @@ class CustomSelectorActivityTest {\n @Test\n @Throws(Exception::class)\n fun testOnFolderClick() {\n- activity.onFolderClick(1, \"test\", 0);\n+ activity.onFolderClick(1, \"test\", 0)\n }\n \n /**\n@@ -102,12 +103,13 @@ class CustomSelectorActivityTest {\n @Test\n @Throws(Exception::class)\n fun testOnActivityResult() {\n- val func = activity.javaClass.getDeclaredMethod(\n- \"onActivityResult\",\n- Int::class.java,\n- Int::class.java,\n- Intent::class.java\n- )\n+ val func =\n+ activity.javaClass.getDeclaredMethod(\n+ \"onActivityResult\",\n+ Int::class.java,\n+ Int::class.java,\n+ Intent::class.java,\n+ )\n func.isAccessible = true\n func.invoke(activity, 512, -1, Mockito.mock(Intent::class.java))\n }\n@@ -118,26 +120,27 @@ class CustomSelectorActivityTest {\n @Test\n @Throws(Exception::class)\n fun testShowWelcomeDialog() {\n- val func = activity.javaClass.getDeclaredMethod(\n- \"showWelcomeDialog\"\n- )\n+ val func =\n+ activity.javaClass.getDeclaredMethod(\n+ \"showWelcomeDialog\",\n+ )\n func.isAccessible = true\n func.invoke(activity)\n }\n \n-\n /**\n * Test onLongPress function.\n */\n @Test\n @Throws(Exception::class)\n fun testOnLongPress() {\n- val func = activity.javaClass.getDeclaredMethod(\n- \"onLongPress\",\n- Int::class.java,\n- ArrayList::class.java,\n- ArrayList::class.java\n- )\n+ val func =\n+ activity.javaClass.getDeclaredMethod(\n+ \"onLongPress\",\n+ Int::class.java,\n+ ArrayList::class.java,\n+ ArrayList::class.java,\n+ )\n images.add(image)\n \n func.isAccessible = true\n@@ -164,7 +167,7 @@ class CustomSelectorActivityTest {\n activity.onFolderClick(1, \"test\", 0)\n activity.onSelectedImagesChanged(\n ArrayList(arrayListOf(Image(1, \"test\", Uri.parse(\"test\"), \"test\", 1))),\n- 1\n+ 1,\n )\n activity.onDone()\n }\n@@ -176,14 +179,15 @@ class CustomSelectorActivityTest {\n @Throws(Exception::class)\n fun testOnClickNotForUpload() {\n activity.onFolderClick(1, \"test\", 0)\n- val method: Method = CustomSelectorActivity::class.java.getDeclaredMethod(\n- \"onClickNotForUpload\"\n- )\n+ val method: Method =\n+ CustomSelectorActivity::class.java.getDeclaredMethod(\n+ \"onClickNotForUpload\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n activity.onSelectedImagesChanged(\n ArrayList(arrayListOf(Image(1, \"test\", Uri.parse(\"test\"), \"test\", 1))),\n- 0\n+ 0,\n )\n method.invoke(activity)\n }\n@@ -212,9 +216,10 @@ class CustomSelectorActivityTest {\n @Test\n @Throws(Exception::class)\n fun testOnDestroy() {\n- val method: Method = CustomSelectorActivity::class.java.getDeclaredMethod(\n- \"onDestroy\"\n- )\n+ val method: Method =\n+ CustomSelectorActivity::class.java.getDeclaredMethod(\n+ \"onDestroy\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -225,9 +230,10 @@ class CustomSelectorActivityTest {\n @Test\n @Throws(Exception::class)\n fun testDisplayUploadLimitWarning() {\n- val method: Method = CustomSelectorActivity::class.java.getDeclaredMethod(\n- \"displayUploadLimitWarning\"\n- )\n+ val method: Method =\n+ CustomSelectorActivity::class.java.getDeclaredMethod(\n+ \"displayUploadLimitWarning\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -252,11 +258,19 @@ class CustomSelectorActivityTest {\n \n // test with list size limit\n for (i in 1..limit.getInt(activity)) {\n- images.add(Image(i.toLong(), i.toString(), uri,\n- \"abc/abc\", 1, \"bucket1\"))\n+ images.add(\n+ Image(\n+ i.toLong(),\n+ i.toString(),\n+ uri,\n+ \"abc/abc\",\n+ 1,\n+ \"bucket1\",\n+ ),\n+ )\n }\n activity.onFolderClick(1, \"test\", 0)\n- activity.onSelectedImagesChanged(images,0)\n+ activity.onSelectedImagesChanged(images, 0)\n assertEquals(false, overLimit.getBoolean(activity))\n assertEquals(0, exceededBy.getInt(activity))\n activity.onSelectedImagesChanged(images, 1)\n@@ -265,20 +279,20 @@ class CustomSelectorActivityTest {\n \n // test with list size limit+1\n images.add(image)\n- activity.onSelectedImagesChanged(images,0)\n+ activity.onSelectedImagesChanged(images, 0)\n assertEquals(true, overLimit.getBoolean(activity))\n assertEquals(1, exceededBy.getInt(activity))\n- activity.onSelectedImagesChanged(images,1)\n+ activity.onSelectedImagesChanged(images, 1)\n assertEquals(true, overLimit.getBoolean(activity))\n assertEquals(1, exceededBy.getInt(activity))\n \n- //test with list size 1\n+ // test with list size 1\n images.clear()\n images.add(image)\n- activity.onSelectedImagesChanged(images,0)\n+ activity.onSelectedImagesChanged(images, 0)\n assertEquals(false, overLimit.getBoolean(activity))\n assertEquals(0, exceededBy.getInt(activity))\n- activity.onSelectedImagesChanged(images,1)\n+ activity.onSelectedImagesChanged(images, 1)\n assertEquals(false, overLimit.getBoolean(activity))\n assertEquals(0, exceededBy.getInt(activity))\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorViewModelTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorViewModelTest.kt\nindex 309392d4dc..d4e5f1818f 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorViewModelTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorViewModelTest.kt\n@@ -10,7 +10,6 @@ import org.mockito.MockitoAnnotations\n * Custom Selector View Model test.\n */\n class CustomSelectorViewModelTest {\n-\n private lateinit var viewModel: CustomSelectorViewModel\n \n @Mock\n@@ -23,19 +22,18 @@ class CustomSelectorViewModelTest {\n * Set up the test.\n */\n @Before\n- fun setUp(){\n+ fun setUp() {\n MockitoAnnotations.initMocks(this)\n- viewModel = CustomSelectorViewModel(context, imageFileLoader);\n+ viewModel = CustomSelectorViewModel(context, imageFileLoader)\n }\n \n /**\n * Test onCleared();\n */\n @Test\n- fun testOnCleared(){\n+ fun testOnCleared() {\n val func = viewModel.javaClass.getDeclaredMethod(\"onCleared\")\n func.isAccessible = true\n- func.invoke(viewModel);\n+ func.invoke(viewModel)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/FolderFragmentTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/FolderFragmentTest.kt\nindex bac523d476..49da532591 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/FolderFragmentTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/FolderFragmentTest.kt\n@@ -40,14 +40,13 @@ import java.lang.reflect.Field\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class FolderFragmentTest {\n-\n private lateinit var fragment: FolderFragment\n private lateinit var view: View\n- private lateinit var selectorRV : RecyclerView\n- private lateinit var loader : ProgressBar\n+ private lateinit var selectorRV: RecyclerView\n+ private lateinit var loader: ProgressBar\n private lateinit var layoutInflater: LayoutInflater\n private lateinit var context: Context\n- private lateinit var viewModelField:Field\n+ private lateinit var viewModelField: Field\n \n @Mock\n private lateinit var adapter: FolderAdapter\n@@ -80,7 +79,7 @@ class FolderFragmentTest {\n loader = view.findViewById(R.id.loader)\n \n Whitebox.setInternalState(fragment, \"folderAdapter\", adapter)\n- Whitebox.setInternalState(fragment, \"selectorRV\", selectorRV )\n+ Whitebox.setInternalState(fragment, \"selectorRV\", selectorRV)\n Whitebox.setInternalState(fragment, \"loader\", loader)\n \n viewModelField = fragment.javaClass.getDeclaredField(\"viewModel\")\n@@ -137,5 +136,4 @@ class FolderFragmentTest {\n func.isAccessible = true\n func.invoke(fragment)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageFileLoaderTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageFileLoaderTest.kt\nindex f89fc467cb..7b4891c98c 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageFileLoaderTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageFileLoaderTest.kt\n@@ -18,14 +18,11 @@ import org.junit.runner.RunWith\n import org.mockito.Mock\n import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n-import org.powermock.reflect.Whitebox\n import org.robolectric.RobolectricTestRunner\n import org.robolectric.annotation.Config\n import org.robolectric.annotation.LooperMode\n import org.robolectric.fakes.RoboCursor\n import java.io.File\n-import java.lang.reflect.Field\n-import java.lang.reflect.Modifier\n import kotlin.coroutines.CoroutineContext\n \n /**\n@@ -35,12 +32,11 @@ import kotlin.coroutines.CoroutineContext\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class ImageFileLoaderTest {\n-\n @Mock\n private lateinit var mockContentResolver: ContentResolver\n \n @Mock\n- private lateinit var context: Context;\n+ private lateinit var context: Context\n \n @Mock\n private lateinit var imageLoaderListener: ImageLoaderListener\n@@ -62,17 +58,19 @@ class ImageFileLoaderTest {\n coroutineContext = Dispatchers.Main\n imageCursor = RoboCursor()\n imageFileLoader = ImageFileLoader(context)\n- projection = listOf(\n- MediaStore.Images.Media._ID,\n- MediaStore.Images.Media.DISPLAY_NAME,\n- MediaStore.Images.Media.DATA,\n- MediaStore.Images.Media.BUCKET_ID,\n- MediaStore.Images.Media.BUCKET_DISPLAY_NAME,\n- MediaStore.Images.Media.DATE_ADDED\n- )\n+ projection =\n+ listOf(\n+ MediaStore.Images.Media._ID,\n+ MediaStore.Images.Media.DISPLAY_NAME,\n+ MediaStore.Images.Media.DATA,\n+ MediaStore.Images.Media.BUCKET_ID,\n+ MediaStore.Images.Media.BUCKET_DISPLAY_NAME,\n+ MediaStore.Images.Media.DATE_ADDED,\n+ )\n setFinalStatic(\n- ImageFileLoader::class.java.getDeclaredField(\"coroutineContext\"),\n- coroutineContext)\n+ ImageFileLoader::class.java.getDeclaredField(\"coroutineContext\"),\n+ coroutineContext,\n+ )\n }\n \n /**\n@@ -88,10 +86,11 @@ class ImageFileLoaderTest {\n */\n @Test\n fun testGetImages() {\n- val func = imageFileLoader.javaClass.getDeclaredMethod(\n- \"getImages\",\n- ImageLoaderListener::class.java\n- )\n+ val func =\n+ imageFileLoader.javaClass.getDeclaredMethod(\n+ \"getImages\",\n+ ImageLoaderListener::class.java,\n+ )\n func.isAccessible = true\n \n val image1 = arrayOf(1, \"imageLoaderTestFile\", \"src/test/resources/imageLoaderTestFile\", 1, \"downloads\")\n@@ -99,31 +98,32 @@ class ImageFileLoaderTest {\n File(\"src/test/resources/imageLoaderTestFile\").createNewFile()\n \n imageCursor.setColumnNames(projection)\n- imageCursor.setResults(arrayOf(image1, image2));\n+ imageCursor.setResults(arrayOf(image1, image2))\n \n- val contentResolver: ContentResolver = mock {\n- on {\n- query(\n- same(MediaStore.Images.Media.EXTERNAL_CONTENT_URI),\n- anyOrNull(),\n- anyOrNull(),\n- anyOrNull(),\n- anyOrNull(),\n- anyOrNull()\n- )\n- } doReturn imageCursor;\n- }\n+ val contentResolver: ContentResolver =\n+ mock {\n+ on {\n+ query(\n+ same(MediaStore.Images.Media.EXTERNAL_CONTENT_URI),\n+ anyOrNull(),\n+ anyOrNull(),\n+ anyOrNull(),\n+ anyOrNull(),\n+ anyOrNull(),\n+ )\n+ } doReturn imageCursor\n+ }\n \n // test null cursor.\n `when`(\n- context.contentResolver\n+ context.contentResolver,\n ).thenReturn(mockContentResolver)\n- func.invoke(imageFileLoader, imageLoaderListener);\n+ func.invoke(imageFileLoader, imageLoaderListener)\n \n // test demo cursor.\n `when`(\n- context.contentResolver\n+ context.contentResolver,\n ).thenReturn(contentResolver)\n- func.invoke(imageFileLoader, imageLoaderListener);\n+ func.invoke(imageFileLoader, imageLoaderListener)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageFragmentTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageFragmentTest.kt\nindex e517f9a2c7..eeb6db46a5 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageFragmentTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageFragmentTest.kt\n@@ -46,12 +46,11 @@ import java.lang.reflect.Field\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class ImageFragmentTest {\n-\n private lateinit var fragment: ImageFragment\n private lateinit var activity: CustomSelectorActivity\n private lateinit var view: View\n- private lateinit var selectorRV : RecyclerView\n- private lateinit var loader : ProgressBar\n+ private lateinit var selectorRV: RecyclerView\n+ private lateinit var loader: ProgressBar\n private lateinit var layoutInflater: LayoutInflater\n private lateinit var context: Context\n private lateinit var viewModelField: Field\n@@ -75,7 +74,7 @@ class ImageFragmentTest {\n * Setup the image fragment.\n */\n @Before\n- fun setUp(){\n+ fun setUp() {\n MockitoAnnotations.initMocks(this)\n context = ApplicationProvider.getApplicationContext()\n OkHttpConnectionFactory.CLIENT = createTestClient()\n@@ -83,7 +82,7 @@ class ImageFragmentTest {\n Fresco.initialize(context)\n activity = Robolectric.buildActivity(CustomSelectorActivity::class.java).create().get()\n \n- fragment = ImageFragment.newInstance(1,0)\n+ fragment = ImageFragment.newInstance(1, 0)\n val fragmentManager: FragmentManager = activity.supportFragmentManager\n val fragmentTransaction: FragmentTransaction = fragmentManager.beginTransaction()\n fragmentTransaction.add(fragment, null)\n@@ -95,9 +94,9 @@ class ImageFragmentTest {\n loader = view.findViewById(R.id.loader)\n \n Whitebox.setInternalState(fragment, \"imageAdapter\", adapter)\n- Whitebox.setInternalState(fragment, \"selectorRV\", selectorRV )\n+ Whitebox.setInternalState(fragment, \"selectorRV\", selectorRV)\n Whitebox.setInternalState(fragment, \"loader\", loader)\n- Whitebox.setInternalState(fragment, \"filteredImages\", arrayListOf(image,image))\n+ Whitebox.setInternalState(fragment, \"filteredImages\", arrayListOf(image, image))\n Whitebox.setInternalState(fragment, \"contributionDao\", contributionDao)\n \n viewModelField = fragment.javaClass.getDeclaredField(\"viewModel\")\n@@ -109,9 +108,9 @@ class ImageFragmentTest {\n */\n @Test\n @Throws(Exception::class)\n- fun testOnCreate(){\n+ fun testOnCreate() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- fragment.onCreate(savedInstanceState);\n+ fragment.onCreate(savedInstanceState)\n }\n \n /**\n@@ -129,11 +128,11 @@ class ImageFragmentTest {\n * Test handleResult.\n */\n @Test\n- fun testHandleResult(){\n+ fun testHandleResult() {\n val func = fragment.javaClass.getDeclaredMethod(\"handleResult\", Result::class.java)\n func.isAccessible = true\n func.invoke(fragment, Result(CallbackStatus.SUCCESS, arrayListOf()))\n- func.invoke(fragment, Result(CallbackStatus.SUCCESS, arrayListOf(image,image)))\n+ func.invoke(fragment, Result(CallbackStatus.SUCCESS, arrayListOf(image, image)))\n }\n \n /**\n@@ -184,5 +183,4 @@ class ImageFragmentTest {\n func.isAccessible = true\n func.invoke(fragment)\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageLoaderTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageLoaderTest.kt\nindex 01e0ff279c..64447384b8 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageLoaderTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageLoaderTest.kt\n@@ -4,7 +4,8 @@ import android.content.ContentResolver\n import android.content.Context\n import android.content.SharedPreferences\n import android.net.Uri\n-import com.nhaarman.mockitokotlin2.*\n+import com.nhaarman.mockitokotlin2.any\n+import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.TestUtility.setFinalStatic\n import fr.free.nrw.commons.customselector.database.NotForUploadStatusDao\n@@ -18,29 +19,32 @@ import fr.free.nrw.commons.media.MediaClient\n import fr.free.nrw.commons.upload.FileProcessor\n import fr.free.nrw.commons.upload.FileUtilsWrapper\n import io.reactivex.Single\n-import org.junit.Assert\n import kotlinx.coroutines.Dispatchers\n import kotlinx.coroutines.ExperimentalCoroutinesApi\n-import kotlinx.coroutines.test.*\n+import kotlinx.coroutines.test.TestCoroutineDispatcher\n+import kotlinx.coroutines.test.resetMain\n+import kotlinx.coroutines.test.runBlockingTest\n+import kotlinx.coroutines.test.setMain\n import org.junit.After\n+import org.junit.Assert\n import org.junit.Before\n import org.junit.Test\n-import org.junit.jupiter.api.AfterAll\n import org.junit.jupiter.api.BeforeAll\n import org.junit.runner.RunWith\n-import org.mockito.*\n+import org.mockito.BDDMockito\n+import org.mockito.Mock\n+import org.mockito.MockedStatic\n+import org.mockito.Mockito\n import org.mockito.Mockito.mockStatic\n-import org.powermock.api.mockito.PowerMockito\n+import org.mockito.MockitoAnnotations\n import org.powermock.core.classloader.annotations.PrepareForTest\n-import org.powermock.modules.junit4.PowerMockRunner\n import org.powermock.reflect.Whitebox\n import org.robolectric.RobolectricTestRunner\n import org.robolectric.annotation.Config\n import java.io.File\n import java.io.FileInputStream\n-import java.lang.reflect.Field\n-import java.lang.reflect.Modifier\n-import java.util.*\n+import java.util.Calendar\n+import java.util.Date\n import kotlin.collections.HashMap\n \n /**\n@@ -51,9 +55,8 @@ import kotlin.collections.HashMap\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @ExperimentalCoroutinesApi\n class ImageLoaderTest {\n-\n @Mock\n- private lateinit var uri:Uri\n+ private lateinit var uri: Uri\n \n @Mock\n private lateinit var mediaClient: MediaClient\n@@ -91,9 +94,9 @@ class ImageLoaderTest {\n @ExperimentalCoroutinesApi\n private val testDispacher = TestCoroutineDispatcher()\n \n- private lateinit var imageLoader: ImageLoader;\n+ private lateinit var imageLoader: ImageLoader\n private var mapImageSHA1: HashMap = HashMap()\n- private var mapHolderImage : HashMap = HashMap()\n+ private var mapHolderImage: HashMap = HashMap()\n private var mapResult: HashMap = HashMap()\n private var mapModifiedImageSHA1: HashMap = HashMap()\n private lateinit var image: Image\n@@ -111,24 +114,32 @@ class ImageLoaderTest {\n MockitoAnnotations.initMocks(this)\n \n imageLoader =\n- ImageLoader(mediaClient, fileProcessor, fileUtilsWrapper, uploadedStatusDao,\n- notForUploadStatusDao, context)\n- uploadedStatus= UploadedStatus(\n- \"testSha1\",\n- \"testSha1\",\n- false,\n- false,\n- Calendar.getInstance().time\n- )\n+ ImageLoader(\n+ mediaClient,\n+ fileProcessor,\n+ fileUtilsWrapper,\n+ uploadedStatusDao,\n+ notForUploadStatusDao,\n+ context,\n+ )\n+ uploadedStatus =\n+ UploadedStatus(\n+ \"testSha1\",\n+ \"testSha1\",\n+ false,\n+ false,\n+ Calendar.getInstance().time,\n+ )\n image = Image(1, \"test\", uri, \"test\", 0, \"test\")\n \n- Whitebox.setInternalState(imageLoader, \"mapImageSHA1\", mapImageSHA1);\n- Whitebox.setInternalState(imageLoader, \"mapHolderImage\", mapHolderImage);\n- Whitebox.setInternalState(imageLoader, \"mapModifiedImageSHA1\", mapModifiedImageSHA1);\n- Whitebox.setInternalState(imageLoader, \"mapResult\", mapResult);\n+ Whitebox.setInternalState(imageLoader, \"mapImageSHA1\", mapImageSHA1)\n+ Whitebox.setInternalState(imageLoader, \"mapHolderImage\", mapHolderImage)\n+ Whitebox.setInternalState(imageLoader, \"mapModifiedImageSHA1\", mapModifiedImageSHA1)\n+ Whitebox.setInternalState(imageLoader, \"mapResult\", mapResult)\n setFinalStatic(\n- ImageLoader::class.java.getDeclaredField(\"context\"),\n- context)\n+ ImageLoader::class.java.getDeclaredField(\"context\"),\n+ context,\n+ )\n whenever(contentResolver.openInputStream(uri)).thenReturn(inputStream)\n whenever(context.contentResolver).thenReturn(contentResolver)\n whenever(fileUtilsWrapper.getSHA1(inputStream)).thenReturn(\"testSha1\")\n@@ -143,110 +154,119 @@ class ImageLoaderTest {\n fun tearDown() {\n Dispatchers.resetMain()\n testDispacher.cleanupTestCoroutines()\n- mockedPickedFiles.close();\n+ mockedPickedFiles.close()\n }\n \n /**\n * Test queryAndSetView with upload Status as null.\n */\n @Test\n- fun testQueryAndSetViewUploadedStatusNull() = testDispacher.runBlockingTest {\n- whenever(uploadedStatusDao.getUploadedFromImageSHA1(any())).thenReturn(null)\n- whenever(notForUploadStatusDao.find(any())).thenReturn(0)\n- mapModifiedImageSHA1[image] = \"testSha1\"\n- mapImageSHA1[uri] = \"testSha1\"\n- whenever(context.getSharedPreferences(\"custom_selector\", 0))\n- .thenReturn(Mockito.mock(SharedPreferences::class.java))\n-\n- mapResult[\"testSha1\"] = ImageLoader.Result.TRUE\n- imageLoader.queryAndSetView(holder, image, testDispacher, testDispacher, ArrayList())\n-\n- mapResult[\"testSha1\"] = ImageLoader.Result.FALSE\n- imageLoader.queryAndSetView(holder, image, testDispacher, testDispacher, ArrayList())\n- }\n+ fun testQueryAndSetViewUploadedStatusNull() =\n+ testDispacher.runBlockingTest {\n+ whenever(uploadedStatusDao.getUploadedFromImageSHA1(any())).thenReturn(null)\n+ whenever(notForUploadStatusDao.find(any())).thenReturn(0)\n+ mapModifiedImageSHA1[image] = \"testSha1\"\n+ mapImageSHA1[uri] = \"testSha1\"\n+ whenever(context.getSharedPreferences(\"custom_selector\", 0))\n+ .thenReturn(Mockito.mock(SharedPreferences::class.java))\n+\n+ mapResult[\"testSha1\"] = ImageLoader.Result.TRUE\n+ imageLoader.queryAndSetView(holder, image, testDispacher, testDispacher, ArrayList())\n+\n+ mapResult[\"testSha1\"] = ImageLoader.Result.FALSE\n+ imageLoader.queryAndSetView(holder, image, testDispacher, testDispacher, ArrayList())\n+ }\n \n /**\n * Test queryAndSetView with upload Status not null (ie retrieved from table)\n */\n @Test\n- fun testQueryAndSetViewUploadedStatusNotNull() = testDispacher.runBlockingTest {\n- whenever(uploadedStatusDao.getUploadedFromImageSHA1(any())).thenReturn(uploadedStatus)\n- whenever(notForUploadStatusDao.find(any())).thenReturn(0)\n- whenever(context.getSharedPreferences(\"custom_selector\", 0))\n- .thenReturn(Mockito.mock(SharedPreferences::class.java))\n- imageLoader.queryAndSetView(holder, image, testDispacher, testDispacher, ArrayList())\n- }\n+ fun testQueryAndSetViewUploadedStatusNotNull() =\n+ testDispacher.runBlockingTest {\n+ whenever(uploadedStatusDao.getUploadedFromImageSHA1(any())).thenReturn(uploadedStatus)\n+ whenever(notForUploadStatusDao.find(any())).thenReturn(0)\n+ whenever(context.getSharedPreferences(\"custom_selector\", 0))\n+ .thenReturn(Mockito.mock(SharedPreferences::class.java))\n+ imageLoader.queryAndSetView(holder, image, testDispacher, testDispacher, ArrayList())\n+ }\n \n /**\n * Test nextActionableImage\n */\n @Test\n- fun testNextActionableImage() = testDispacher.runBlockingTest {\n- whenever(notForUploadStatusDao.find(any())).thenReturn(0)\n- whenever(uploadedStatusDao.findByImageSHA1(any(), any())).thenReturn(0)\n- whenever(uploadedStatusDao.findByModifiedImageSHA1(any(), any())).thenReturn(0)\n+ fun testNextActionableImage() =\n+ testDispacher.runBlockingTest {\n+ whenever(notForUploadStatusDao.find(any())).thenReturn(0)\n+ whenever(uploadedStatusDao.findByImageSHA1(any(), any())).thenReturn(0)\n+ whenever(uploadedStatusDao.findByModifiedImageSHA1(any(), any())).thenReturn(0)\n // mockStatic(PickedFiles::class.java)\n- BDDMockito.given(PickedFiles.pickedExistingPicture(context, image.uri))\n- .willReturn(UploadableFile(uri, File(\"ABC\")))\n- whenever(fileUtilsWrapper.getFileInputStream(\"ABC\")).thenReturn(inputStream)\n- whenever(fileUtilsWrapper.getSHA1(inputStream)).thenReturn(\"testSha1\")\n- whenever(PickedFiles.pickedExistingPicture(context, Uri.parse(\"test\"))).thenReturn(\n- uploadableFile\n- )\n- imageLoader.nextActionableImage(listOf(image), testDispacher, testDispacher, 0, emptyList())\n-\n- whenever(notForUploadStatusDao.find(any())).thenReturn(1)\n- imageLoader.nextActionableImage(listOf(image), testDispacher, testDispacher, 0, emptyList())\n-\n- whenever(uploadedStatusDao.findByImageSHA1(any(), any())).thenReturn(2)\n- imageLoader.nextActionableImage(listOf(image), testDispacher, testDispacher, 0, emptyList())\n-\n- whenever(uploadedStatusDao.findByModifiedImageSHA1(any(), any())).thenReturn(2)\n- imageLoader.nextActionableImage(listOf(image), testDispacher, testDispacher, 0, emptyList())\n- }\n+ BDDMockito\n+ .given(PickedFiles.pickedExistingPicture(context, image.uri))\n+ .willReturn(UploadableFile(uri, File(\"ABC\")))\n+ whenever(fileUtilsWrapper.getFileInputStream(\"ABC\")).thenReturn(inputStream)\n+ whenever(fileUtilsWrapper.getSHA1(inputStream)).thenReturn(\"testSha1\")\n+ whenever(PickedFiles.pickedExistingPicture(context, Uri.parse(\"test\"))).thenReturn(\n+ uploadableFile,\n+ )\n+ imageLoader.nextActionableImage(listOf(image), testDispacher, testDispacher, 0, emptyList())\n+\n+ whenever(notForUploadStatusDao.find(any())).thenReturn(1)\n+ imageLoader.nextActionableImage(listOf(image), testDispacher, testDispacher, 0, emptyList())\n+\n+ whenever(uploadedStatusDao.findByImageSHA1(any(), any())).thenReturn(2)\n+ imageLoader.nextActionableImage(listOf(image), testDispacher, testDispacher, 0, emptyList())\n+\n+ whenever(uploadedStatusDao.findByModifiedImageSHA1(any(), any())).thenReturn(2)\n+ imageLoader.nextActionableImage(listOf(image), testDispacher, testDispacher, 0, emptyList())\n+ }\n \n /**\n * Test getSha1\n */\n @Test\n @ExperimentalCoroutinesApi\n- fun testGetSha1() = testDispacher.runBlockingTest {\n-\n- BDDMockito.given(PickedFiles.pickedExistingPicture(context, image.uri))\n- .willReturn(UploadableFile(uri, File(\"ABC\")))\n+ fun testGetSha1() =\n+ testDispacher.runBlockingTest {\n+ BDDMockito\n+ .given(PickedFiles.pickedExistingPicture(context, image.uri))\n+ .willReturn(UploadableFile(uri, File(\"ABC\")))\n \n+ whenever(fileUtilsWrapper.getFileInputStream(\"ABC\")).thenReturn(inputStream)\n+ whenever(fileUtilsWrapper.getSHA1(inputStream)).thenReturn(\"testSha1\")\n \n- whenever(fileUtilsWrapper.getFileInputStream(\"ABC\")).thenReturn(inputStream)\n- whenever(fileUtilsWrapper.getSHA1(inputStream)).thenReturn(\"testSha1\")\n-\n- Assert.assertEquals(\"testSha1\", imageLoader.getSHA1(image, testDispacher));\n- whenever(PickedFiles.pickedExistingPicture(context, Uri.parse(\"test\"))).thenReturn(\n- uploadableFile\n- )\n+ Assert.assertEquals(\"testSha1\", imageLoader.getSHA1(image, testDispacher))\n+ whenever(PickedFiles.pickedExistingPicture(context, Uri.parse(\"test\"))).thenReturn(\n+ uploadableFile,\n+ )\n \n- mapModifiedImageSHA1[image] = \"testSha2\"\n- Assert.assertEquals(\"testSha2\", imageLoader.getSHA1(image, testDispacher));\n- }\n+ mapModifiedImageSHA1[image] = \"testSha2\"\n+ Assert.assertEquals(\"testSha2\", imageLoader.getSHA1(image, testDispacher))\n+ }\n \n /**\n * Test getResultFromUploadedStatus.\n */\n @Test\n fun testGetResultFromUploadedStatus() {\n- val func = imageLoader.javaClass.getDeclaredMethod(\n- \"getResultFromUploadedStatus\",\n- UploadedStatus::class.java)\n+ val func =\n+ imageLoader.javaClass.getDeclaredMethod(\n+ \"getResultFromUploadedStatus\",\n+ UploadedStatus::class.java,\n+ )\n func.isAccessible = true\n \n // test Result.INVALID\n- uploadedStatus.lastUpdated = Date(0);\n- Assert.assertEquals(ImageLoader.Result.INVALID,\n- imageLoader.getResultFromUploadedStatus(uploadedStatus))\n+ uploadedStatus.lastUpdated = Date(0)\n+ Assert.assertEquals(\n+ ImageLoader.Result.INVALID,\n+ imageLoader.getResultFromUploadedStatus(uploadedStatus),\n+ )\n \n // test Result.TRUE\n- uploadedStatus.imageResult = true;\n- Assert.assertEquals(ImageLoader.Result.TRUE,\n- imageLoader.getResultFromUploadedStatus(uploadedStatus))\n+ uploadedStatus.imageResult = true\n+ Assert.assertEquals(\n+ ImageLoader.Result.TRUE,\n+ imageLoader.getResultFromUploadedStatus(uploadedStatus),\n+ )\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt\nindex 0d5d79909d..9e60b74e6a 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt\n@@ -6,24 +6,19 @@ import com.nhaarman.mockitokotlin2.eq\n import com.nhaarman.mockitokotlin2.mock\n import com.nhaarman.mockitokotlin2.verify\n import com.nhaarman.mockitokotlin2.whenever\n-import fr.free.nrw.commons.FakeContextWrapper\n import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.actions.PageEditClient\n-import fr.free.nrw.commons.contributions.ContributionsListFragment\n import fr.free.nrw.commons.review.ReviewController\n import io.reactivex.Observable\n-import io.reactivex.Single\n+import org.junit.Assert.assertEquals\n import org.junit.Assert.assertNotNull\n import org.junit.Assert.assertTrue\n-import org.junit.Assert.assertEquals\n import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n-import org.junit.runner.Runner\n import org.mockito.ArgumentMatchers\n import org.mockito.Mock\n-import org.mockito.Mockito\n import org.mockito.MockitoAnnotations\n import org.robolectric.RobolectricTestRunner\n import org.robolectric.RuntimeEnvironment\n@@ -37,18 +32,17 @@ import org.robolectric.annotation.LooperMode\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class DeleteHelperTest {\n-\n @Mock\n private lateinit var callback: ReviewController.ReviewCallback\n \n @Mock\n- internal lateinit var pageEditClient: PageEditClient\n+ internal lateinit var pageEditClient: PageEditClient\n \n @Mock\n- internal lateinit var context: Context\n+ internal lateinit var context: Context\n \n @Mock\n- internal lateinit var media: Media\n+ internal lateinit var media: Media\n \n lateinit var deleteHelper: DeleteHelper\n \n@@ -67,11 +61,11 @@ class DeleteHelperTest {\n @Test\n fun makeDeletion() {\n whenever(pageEditClient.prependEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))\n- .thenReturn(Observable.just(true))\n+ .thenReturn(Observable.just(true))\n whenever(pageEditClient.appendEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))\n- .thenReturn(Observable.just(true))\n+ .thenReturn(Observable.just(true))\n whenever(pageEditClient.edit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))\n- .thenReturn(Observable.just(true))\n+ .thenReturn(Observable.just(true))\n \n whenever(media.displayTitle).thenReturn(\"Test file\")\n \n@@ -90,11 +84,11 @@ class DeleteHelperTest {\n @Test(expected = RuntimeException::class)\n fun makeDeletionForPrependEditFailure() {\n whenever(pageEditClient.prependEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))\n- .thenReturn(Observable.just(false))\n+ .thenReturn(Observable.just(false))\n whenever(pageEditClient.appendEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))\n- .thenReturn(Observable.just(true))\n+ .thenReturn(Observable.just(true))\n whenever(pageEditClient.edit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))\n- .thenReturn(Observable.just(true))\n+ .thenReturn(Observable.just(true))\n whenever(media.displayTitle).thenReturn(\"Test file\")\n whenever(media.filename).thenReturn(\"Test file.jpg\")\n whenever(media.author).thenReturn(\"Creator (page does not exist)\")\n@@ -105,11 +99,11 @@ class DeleteHelperTest {\n @Test(expected = RuntimeException::class)\n fun makeDeletionForEditFailure() {\n whenever(pageEditClient.prependEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))\n- .thenReturn(Observable.just(true))\n+ .thenReturn(Observable.just(true))\n whenever(pageEditClient.appendEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))\n- .thenReturn(Observable.just(true))\n+ .thenReturn(Observable.just(true))\n whenever(pageEditClient.edit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))\n- .thenReturn(Observable.just(false))\n+ .thenReturn(Observable.just(false))\n whenever(media.displayTitle).thenReturn(\"Test file\")\n whenever(media.filename).thenReturn(\"Test file.jpg\")\n whenever(media.author).thenReturn(\"Creator (page does not exist)\")\n@@ -120,11 +114,11 @@ class DeleteHelperTest {\n @Test(expected = RuntimeException::class)\n fun makeDeletionForAppendEditFailure() {\n whenever(pageEditClient.prependEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))\n- .thenReturn(Observable.just(true))\n+ .thenReturn(Observable.just(true))\n whenever(pageEditClient.appendEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))\n- .thenReturn(Observable.just(false))\n+ .thenReturn(Observable.just(false))\n whenever(pageEditClient.edit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))\n- .thenReturn(Observable.just(true))\n+ .thenReturn(Observable.just(true))\n whenever(media.displayTitle).thenReturn(\"Test file\")\n whenever(media.filename).thenReturn(\"Test file.jpg\")\n whenever(media.author).thenReturn(\"Creator (page does not exist)\")\n@@ -141,21 +135,21 @@ class DeleteHelperTest {\n @Test\n fun askReasonAndExecuteCopyrightViolationTest() {\n val mContext = RuntimeEnvironment.getApplication().applicationContext\n- deleteHelper.askReasonAndExecute(media, mContext, \"My Question\", ReviewController.DeleteReason.COPYRIGHT_VIOLATION, callback);\n+ deleteHelper.askReasonAndExecute(media, mContext, \"My Question\", ReviewController.DeleteReason.COPYRIGHT_VIOLATION, callback)\n }\n \n @Test\n fun alertDialogPositiveButtonDisableTest() {\n val mContext = RuntimeEnvironment.getApplication().applicationContext\n- deleteHelper.askReasonAndExecute(media, mContext, \"My Question\", ReviewController.DeleteReason.COPYRIGHT_VIOLATION, callback);\n+ deleteHelper.askReasonAndExecute(media, mContext, \"My Question\", ReviewController.DeleteReason.COPYRIGHT_VIOLATION, callback)\n assertEquals(false, deleteHelper.dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled)\n }\n \n- @Test\n+ @Test\n fun alertDialogPositiveButtonEnableTest() {\n val mContext = RuntimeEnvironment.getApplication().applicationContext\n- deleteHelper.askReasonAndExecute(media, mContext, \"My Question\", ReviewController.DeleteReason.COPYRIGHT_VIOLATION, callback);\n- deleteHelper.listener.onClick(deleteHelper.dialog,1,true);\n+ deleteHelper.askReasonAndExecute(media, mContext, \"My Question\", ReviewController.DeleteReason.COPYRIGHT_VIOLATION, callback)\n+ deleteHelper.listener.onClick(deleteHelper.dialog, 1, true)\n assertEquals(true, deleteHelper.dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled)\n }\n \ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/delete/ReasonBuilderTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/delete/ReasonBuilderTest.kt\nindex 812f32f9a6..75aadc17a4 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/delete/ReasonBuilderTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/delete/ReasonBuilderTest.kt\n@@ -17,19 +17,25 @@ import org.junit.Test\n import org.mockito.ArgumentMatchers.anyInt\n import org.mockito.InjectMocks\n import org.mockito.Mock\n-import org.mockito.Mockito.*\n+import org.mockito.Mockito.any\n+import org.mockito.Mockito.anyString\n+import org.mockito.Mockito.mock\n+import org.mockito.Mockito.times\n+import org.mockito.Mockito.verify\n+import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n-import java.util.*\n-\n+import java.util.Date\n \n class ReasonBuilderTest {\n-\n @Mock\n internal var sessionManager: SessionManager? = null\n+\n @Mock\n internal var okHttpJsonApiClient: OkHttpJsonApiClient? = null\n+\n @Mock\n internal var context: Context? = null\n+\n @Mock\n internal var viewUtilWrapper: ViewUtilWrapper? = null\n \n@@ -56,13 +62,13 @@ class ReasonBuilderTest {\n `when`(sessionManager?.userName).thenReturn(\"Testuser\")\n `when`(sessionManager?.doesAccountExist()).thenReturn(true)\n `when`(okHttpJsonApiClient!!.getAchievements(anyString()))\n- .thenReturn(Single.just(mock(FeedbackResponse::class.java)))\n+ .thenReturn(Single.just(mock(FeedbackResponse::class.java)))\n `when`(okHttpJsonApiClient!!.getLeaderboard(anyString(), anyString(), anyString(), anyString(), anyString()))\n .thenReturn(Observable.just(mock(LeaderboardResponse::class.java)))\n `when`(okHttpJsonApiClient!!.setAvatar(anyString(), anyString()))\n .thenReturn(Single.just(mock(UpdateAvatarResponse::class.java)))\n \n- val media = media(filename=\"test_file\", dateUploaded = Date())\n+ val media = media(filename = \"test_file\", dateUploaded = Date())\n \n reasonBuilder!!.getReason(media, \"test\")\n verify(sessionManager, times(0))!!.forceLogin(any(Context::class.java))\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt\nindex 19cc945cdf..00f438e1e3 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt\n@@ -10,7 +10,6 @@ import android.os.Looper\n import android.view.LayoutInflater\n import android.view.View\n import androidx.recyclerview.widget.RecyclerView\n-import androidx.test.core.app.ApplicationProvider\n import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n@@ -26,7 +25,6 @@ import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n import org.mockito.Mock\n-import org.mockito.Mockito.verify\n import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n import org.powermock.reflect.Whitebox\n@@ -39,13 +37,12 @@ import org.robolectric.annotation.LooperMode\n import org.robolectric.shadows.ShadowAlertDialog\n import org.robolectric.shadows.ShadowProgressDialog\n import java.lang.reflect.Method\n-import java.util.*\n+import java.util.Date\n \n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class DescriptionEditActivityUnitTest {\n-\n private lateinit var context: Context\n private lateinit var activity: Activity\n private lateinit var uploadMediaDetails: ArrayList\n@@ -64,10 +61,19 @@ class DescriptionEditActivityUnitTest {\n fun setUp() {\n MockitoAnnotations.initMocks(this)\n context = RuntimeEnvironment.getApplication().applicationContext\n- uploadMediaDetails = mutableListOf(UploadMediaDetail(\"en\", \"desc\"))\n+ uploadMediaDetails =\n+ mutableListOf(UploadMediaDetail(\"en\", \"desc\"))\n as ArrayList\n- media = Media(\"filename\", \"creator\", \"url\", \"thumburl\",\n- \"localpath\", Date(197000), \"extmetadata\")\n+ media =\n+ Media(\n+ \"filename\",\n+ \"creator\",\n+ \"url\",\n+ \"thumburl\",\n+ \"localpath\",\n+ Date(197000),\n+ \"extmetadata\",\n+ )\n \n val intent = Intent().putExtra(\"title\", \"read\")\n val bundle = Bundle()\n@@ -87,7 +93,7 @@ class DescriptionEditActivityUnitTest {\n Whitebox.setInternalState(activity, \"binding\", binding)\n Whitebox.setInternalState(activity, \"savedLanguageValue\", \"bn\")\n Whitebox.setInternalState(activity, \"media\", media)\n- Whitebox.setInternalState(activity,\"descriptionAndCaptions\",uploadMediaDetails)\n+ Whitebox.setInternalState(activity, \"descriptionAndCaptions\", uploadMediaDetails)\n `when`(uploadMediaDetailAdapter.items).thenReturn(uploadMediaDetails)\n }\n \n@@ -101,9 +107,10 @@ class DescriptionEditActivityUnitTest {\n @Throws(Exception::class)\n fun testShowLoggingProgressBar() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = DescriptionEditActivity::class.java.getDeclaredMethod(\n- \"showLoggingProgressBar\"\n- )\n+ val method: Method =\n+ DescriptionEditActivity::class.java.getDeclaredMethod(\n+ \"showLoggingProgressBar\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n val dialog: ProgressDialog = ShadowProgressDialog.getLatestDialog() as ProgressDialog\n@@ -114,9 +121,11 @@ class DescriptionEditActivityUnitTest {\n @Throws(Exception::class)\n fun testUpdateDescription() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = DescriptionEditActivity::class.java.getDeclaredMethod(\n- \"updateDescription\", List::class.java\n- )\n+ val method: Method =\n+ DescriptionEditActivity::class.java.getDeclaredMethod(\n+ \"updateDescription\",\n+ List::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, mutableListOf(UploadMediaDetail(\"en\", \"desc\")))\n assertEquals(activity.isFinishing, true)\n@@ -126,9 +135,11 @@ class DescriptionEditActivityUnitTest {\n @Throws(Exception::class)\n fun testOnSubmitButtonClicked() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = DescriptionEditActivity::class.java.getDeclaredMethod(\n- \"onSubmitButtonClicked\", View::class.java\n- )\n+ val method: Method =\n+ DescriptionEditActivity::class.java.getDeclaredMethod(\n+ \"onSubmitButtonClicked\",\n+ View::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, null)\n assertEquals(activity.isFinishing, true)\n@@ -138,9 +149,11 @@ class DescriptionEditActivityUnitTest {\n @Throws(Exception::class)\n fun testOnBackButtonClicked() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = DescriptionEditActivity::class.java.getDeclaredMethod(\n- \"onBackButtonClicked\", View::class.java\n- )\n+ val method: Method =\n+ DescriptionEditActivity::class.java.getDeclaredMethod(\n+ \"onBackButtonClicked\",\n+ View::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, null)\n assertEquals(activity.isFinishing, true)\n@@ -150,9 +163,11 @@ class DescriptionEditActivityUnitTest {\n @Throws(Exception::class)\n fun testOnPrimaryCaptionTextChange() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = DescriptionEditActivity::class.java.getDeclaredMethod(\n- \"onPrimaryCaptionTextChange\", Boolean::class.java\n- )\n+ val method: Method =\n+ DescriptionEditActivity::class.java.getDeclaredMethod(\n+ \"onPrimaryCaptionTextChange\",\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, true)\n }\n@@ -161,17 +176,19 @@ class DescriptionEditActivityUnitTest {\n @Throws(Exception::class)\n fun testShowInfoAlert() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = DescriptionEditActivity::class.java.getDeclaredMethod(\n- \"showInfoAlert\", Int::class.java, Int::class.java\n- )\n+ val method: Method =\n+ DescriptionEditActivity::class.java.getDeclaredMethod(\n+ \"showInfoAlert\",\n+ Int::class.java,\n+ Int::class.java,\n+ )\n method.isAccessible = true\n method.invoke(\n activity,\n android.R.string.ok,\n- android.R.string.ok\n+ android.R.string.ok,\n )\n val dialog: AlertDialog = ShadowAlertDialog.getLatestDialog() as AlertDialog\n assertEquals(dialog.isShowing, true)\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditHelperUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditHelperUnitTest.kt\nindex 614ab97483..5415a87a61 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditHelperUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditHelperUnitTest.kt\n@@ -10,12 +10,13 @@ import org.junit.Test\n import org.junit.jupiter.api.Assertions.assertEquals\n import org.mockito.ArgumentMatchers.anyString\n import org.mockito.Mock\n-import org.mockito.Mockito.*\n+import org.mockito.Mockito.times\n+import org.mockito.Mockito.verify\n+import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n import java.lang.reflect.Method\n \n class DescriptionEditHelperUnitTest {\n-\n private lateinit var helper: DescriptionEditHelper\n \n @Mock\n@@ -43,8 +44,8 @@ class DescriptionEditHelperUnitTest {\n pageEditClient.edit(\n anyString(),\n anyString(),\n- anyString()\n- )\n+ anyString(),\n+ ),\n ).thenReturn(Observable.just(true))\n helper.addDescription(context, media, \"test\")\n verify(pageEditClient, times(1)).edit(anyString(), anyString(), anyString())\n@@ -58,56 +59,67 @@ class DescriptionEditHelperUnitTest {\n anyString(),\n anyString(),\n anyString(),\n- anyString()\n- )\n+ anyString(),\n+ ),\n ).thenReturn(Observable.just(0))\n helper.addCaption(context, media, \"test\", \"test\")\n verify(pageEditClient, times(1)).setCaptions(\n anyString(),\n anyString(),\n anyString(),\n- anyString()\n+ anyString(),\n )\n }\n \n @Test\n fun testShowCaptionEditNotificationCaseFalse() {\n- val method: Method = DescriptionEditHelper::class.java.getDeclaredMethod(\n- \"showCaptionEditNotification\", Context::class.java, Media::class.java,\n- Int::class.java\n- )\n+ val method: Method =\n+ DescriptionEditHelper::class.java.getDeclaredMethod(\n+ \"showCaptionEditNotification\",\n+ Context::class.java,\n+ Media::class.java,\n+ Int::class.java,\n+ )\n method.isAccessible = true\n assertEquals(method.invoke(helper, context, media, 0), false)\n }\n \n @Test\n fun testShowCaptionEditNotificationCaseTrue() {\n- val method: Method = DescriptionEditHelper::class.java.getDeclaredMethod(\n- \"showCaptionEditNotification\", Context::class.java, Media::class.java,\n- Int::class.java\n- )\n+ val method: Method =\n+ DescriptionEditHelper::class.java.getDeclaredMethod(\n+ \"showCaptionEditNotification\",\n+ Context::class.java,\n+ Media::class.java,\n+ Int::class.java,\n+ )\n method.isAccessible = true\n assertEquals(method.invoke(helper, context, media, 1), true)\n }\n \n @Test\n fun testShowDescriptionEditNotificationCaseFalse() {\n- val method: Method = DescriptionEditHelper::class.java.getDeclaredMethod(\n- \"showDescriptionEditNotification\", Context::class.java, Media::class.java,\n- Boolean::class.java\n- )\n+ val method: Method =\n+ DescriptionEditHelper::class.java.getDeclaredMethod(\n+ \"showDescriptionEditNotification\",\n+ Context::class.java,\n+ Media::class.java,\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n assertEquals(method.invoke(helper, context, media, false), false)\n }\n \n @Test\n fun testShowDescriptionEditNotificationCaseTrue() {\n- val method: Method = DescriptionEditHelper::class.java.getDeclaredMethod(\n- \"showDescriptionEditNotification\", Context::class.java, Media::class.java,\n- Boolean::class.java\n- )\n+ val method: Method =\n+ DescriptionEditHelper::class.java.getDeclaredMethod(\n+ \"showDescriptionEditNotification\",\n+ Context::class.java,\n+ Media::class.java,\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n assertEquals(method.invoke(helper, context, media, true), true)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/BasePagingPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/BasePagingPresenterTest.kt\nindex 69cc2eadfa..e3d69d41c6 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/BasePagingPresenterTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/BasePagingPresenterTest.kt\n@@ -7,7 +7,11 @@ import com.jraska.livedata.test\n import com.nhaarman.mockitokotlin2.mock\n import com.nhaarman.mockitokotlin2.verify\n import com.nhaarman.mockitokotlin2.whenever\n-import fr.free.nrw.commons.explore.paging.*\n+import fr.free.nrw.commons.explore.paging.BasePagingPresenter\n+import fr.free.nrw.commons.explore.paging.FooterItem\n+import fr.free.nrw.commons.explore.paging.LoadingState\n+import fr.free.nrw.commons.explore.paging.PageableBaseDataSource\n+import fr.free.nrw.commons.explore.paging.PagingContract\n import io.reactivex.processors.PublishProcessor\n import io.reactivex.schedulers.TestScheduler\n import org.junit.Before\n@@ -17,7 +21,6 @@ import org.mockito.Mock\n import org.mockito.MockitoAnnotations\n \n class BasePagingPresenterTest {\n-\n @Rule\n @JvmField\n var instantTaskExecutorRule = InstantTaskExecutorRule()\n@@ -45,7 +48,7 @@ class BasePagingPresenterTest {\n MockitoAnnotations.openMocks(this)\n whenever(pageableBaseDataSource.pagingResults).thenReturn(searchResults)\n whenever(pageableBaseDataSource.loadingStates).thenReturn(loadingStates)\n- whenever(pageableBaseDataSource.noItemsLoadedQueries)\n+ whenever(pageableBaseDataSource.noItemsLoadedEvent)\n .thenReturn(noItemLoadedQueries)\n testScheduler = TestScheduler()\n basePagingPresenter =\n@@ -70,7 +73,8 @@ class BasePagingPresenterTest {\n @Test\n fun `Complete offers an empty list item and hides initial loader`() {\n onLoadingState(LoadingState.Complete)\n- basePagingPresenter.listFooterData.test()\n+ basePagingPresenter.listFooterData\n+ .test()\n .assertValue(emptyList())\n verify(view).hideInitialLoadProgress()\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/ExploreFragmentUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/ExploreFragmentUnitTest.kt\nindex 4e0f0712a0..41c999791a 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/ExploreFragmentUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/ExploreFragmentUnitTest.kt\n@@ -2,7 +2,11 @@ package fr.free.nrw.commons.explore\n \n import android.content.Context\n import android.os.Looper.getMainLooper\n-import android.view.*\n+import android.view.LayoutInflater\n+import android.view.Menu\n+import android.view.MenuInflater\n+import android.view.MenuItem\n+import android.view.View\n import androidx.fragment.app.FragmentManager\n import androidx.fragment.app.FragmentTransaction\n import androidx.test.core.app.ApplicationProvider\n@@ -10,8 +14,8 @@ import com.google.android.material.tabs.TabLayout\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.contributions.MainActivity\n+import fr.free.nrw.commons.createTestClient\n import org.junit.Assert\n import org.junit.Before\n import org.junit.Ignore\n@@ -34,7 +38,6 @@ import org.robolectric.fakes.RoboMenuItem\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class ExploreFragmentUnitTest {\n-\n private lateinit var fragment: ExploreFragment\n private lateinit var fragmentManager: FragmentManager\n private lateinit var context: Context\n@@ -69,7 +72,6 @@ class ExploreFragmentUnitTest {\n layoutInflater = LayoutInflater.from(activity)\n view = fragment.onCreateView(layoutInflater, null, null) as View\n viewPager = view.findViewById(R.id.viewPager)\n-\n }\n \n @Test\n@@ -101,7 +103,8 @@ class ExploreFragmentUnitTest {\n Assert.assertEquals(fragment.onBackPressed(), true)\n }\n \n- @Test @Ignore(\"TODO fix this test\")\n+ @Test\n+ @Ignore(\"TODO fix this test\")\n @Throws(Exception::class)\n fun testOnBackPressedCaseTrueSelectedTabNonZero() {\n Whitebox.setInternalState(fragment, \"mobileRootFragment\", exploreRootFragment)\n@@ -150,5 +153,4 @@ class ExploreFragmentUnitTest {\n fragment.onCreateOptionsMenu(menu, inflater)\n verify(inflater).inflate(R.menu.menu_search, menu)\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/ExploreListRootFragmentUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/ExploreListRootFragmentUnitTest.kt\nindex 582bafd6cc..9dc94293f0 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/ExploreListRootFragmentUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/ExploreListRootFragmentUnitTest.kt\n@@ -11,8 +11,8 @@ import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.contributions.MainActivity\n+import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.databinding.FragmentFeaturedRootBinding\n import fr.free.nrw.commons.explore.categories.media.CategoriesMediaFragment\n import fr.free.nrw.commons.media.MediaDetailPagerFragment\n@@ -36,7 +36,6 @@ import java.lang.reflect.Field\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class ExploreListRootFragmentUnitTest {\n-\n private lateinit var fragment: ExploreListRootFragment\n private lateinit var fragmentManager: FragmentManager\n private lateinit var context: Context\n@@ -83,7 +82,6 @@ class ExploreListRootFragmentUnitTest {\n Whitebox.setInternalState(fragment, \"mediaDetails\", mediaDetails)\n Whitebox.setInternalState(fragment, \"listFragment\", listFragment)\n \n-\n `when`(childFragmentManager.beginTransaction()).thenReturn(childFragmentTransaction)\n `when`(childFragmentTransaction.hide(any())).thenReturn(childFragmentTransaction)\n `when`(childFragmentTransaction.add(anyInt(), any())).thenReturn(childFragmentTransaction)\n@@ -249,5 +247,4 @@ class ExploreListRootFragmentUnitTest {\n fun `testBackPressed_Case null != mediaDetails && mediaDetails_isNotVisible`() {\n Assert.assertEquals(fragment.backPressed(), false)\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/PageableBaseDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/PageableBaseDataSourceTest.kt\nindex f2c1ac20ed..c0f9bd7430 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/PageableBaseDataSourceTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/PageableBaseDataSourceTest.kt\n@@ -2,7 +2,12 @@ package fr.free.nrw.commons.explore\n \n import androidx.lifecycle.LiveData\n import androidx.paging.PagedList\n-import com.nhaarman.mockitokotlin2.*\n+import com.nhaarman.mockitokotlin2.KArgumentCaptor\n+import com.nhaarman.mockitokotlin2.argumentCaptor\n+import com.nhaarman.mockitokotlin2.mock\n+import com.nhaarman.mockitokotlin2.spy\n+import com.nhaarman.mockitokotlin2.verify\n+import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.explore.depictions.search.LoadFunction\n import fr.free.nrw.commons.explore.paging.LiveDataConverter\n import fr.free.nrw.commons.explore.paging.PageableBaseDataSource\n@@ -14,7 +19,6 @@ import org.mockito.Mock\n import org.mockito.MockitoAnnotations\n \n class PageableBaseDataSourceTest {\n-\n @Mock\n private lateinit var liveDataConverter: LiveDataConverter\n \n@@ -23,17 +27,18 @@ class PageableBaseDataSourceTest {\n @Before\n fun setUp() {\n MockitoAnnotations.openMocks(this)\n- pageableBaseDataSource = object: PageableBaseDataSource(liveDataConverter){\n- override val loadFunction: LoadFunction\n- get() = mock()\n-\n- }\n+ pageableBaseDataSource =\n+ object : PageableBaseDataSource(liveDataConverter) {\n+ override val loadFunction: LoadFunction\n+ get() = mock()\n+ }\n }\n \n @Test\n fun `onQueryUpdated emits new liveData`() {\n val (_, liveData) = expectNewLiveData()\n- pageableBaseDataSource.pagingResults.test()\n+ pageableBaseDataSource.pagingResults\n+ .test()\n .also { pageableBaseDataSource.onQueryUpdated(\"test\") }\n .assertValue(liveData)\n }\n@@ -42,14 +47,15 @@ class PageableBaseDataSourceTest {\n fun `onQueryUpdated invokes livedatconverter with no items emitter`() {\n val (zeroItemsFuncCaptor, _) = expectNewLiveData()\n pageableBaseDataSource.onQueryUpdated(\"test\")\n- pageableBaseDataSource.noItemsLoadedQueries.test()\n+ pageableBaseDataSource.noItemsLoadedEvent\n+ .test()\n .also { zeroItemsFuncCaptor.firstValue.invoke() }\n .assertValue(\"test\")\n }\n \n /*\n- * Just for coverage, no way to really assert this\n- * */\n+ * Just for coverage, no way to really assert this\n+ * */\n @Test\n fun `retryFailedRequest does nothing without a factory`() {\n pageableBaseDataSource.retryFailedRequest()\n@@ -65,7 +71,11 @@ class PageableBaseDataSourceTest {\n verify(dataSourceFactory).retryFailedRequest()\n }\n \n- private fun expectNewLiveData(): Triple Unit>, LiveData>, KArgumentCaptor>> {\n+ private fun expectNewLiveData(): Triple<\n+ KArgumentCaptor<() -> Unit>,\n+ LiveData>,\n+ KArgumentCaptor>,\n+ > {\n val captor = argumentCaptor<() -> Unit>()\n val dataSourceFactoryCaptor = argumentCaptor>()\n val liveData: LiveData> = mock()\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/PagingDataSourceFactoryTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/PagingDataSourceFactoryTest.kt\nindex 49ea93c8a5..9460999f49 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/PagingDataSourceFactoryTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/PagingDataSourceFactoryTest.kt\n@@ -10,7 +10,6 @@ import fr.free.nrw.commons.explore.paging.PagingDataSourceFactory\n import io.reactivex.processors.PublishProcessor\n import org.hamcrest.CoreMatchers.instanceOf\n import org.hamcrest.MatcherAssert\n-import org.junit.Assert\n import org.junit.Before\n import org.junit.Ignore\n import org.junit.Test\n@@ -19,7 +18,6 @@ import org.mockito.Mockito\n import org.mockito.MockitoAnnotations\n \n class PagingDataSourceFactoryTest {\n-\n @Mock\n private lateinit var depictsClient: DepictsClient\n \n@@ -32,16 +30,17 @@ class PagingDataSourceFactoryTest {\n @Before\n fun setUp() {\n MockitoAnnotations.openMocks(this)\n- factory = object : PagingDataSourceFactory(loadingStates) {\n- override val loadFunction get() = function\n- }\n+ factory =\n+ object : PagingDataSourceFactory(loadingStates) {\n+ override val loadFunction get() = function\n+ }\n }\n \n @Test\n fun `create returns a dataSource`() {\n MatcherAssert.assertThat(\n factory.create(),\n- instanceOf(PagingDataSource::class.java)\n+ instanceOf(PagingDataSource::class.java),\n )\n }\n \ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/PagingDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/PagingDataSourceTest.kt\nindex a6ca017ab0..f8621ad880 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/PagingDataSourceTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/PagingDataSourceTest.kt\n@@ -1,7 +1,11 @@\n package fr.free.nrw.commons.explore\n \n import androidx.paging.PositionalDataSource\n-import com.nhaarman.mockitokotlin2.*\n+import com.nhaarman.mockitokotlin2.any\n+import com.nhaarman.mockitokotlin2.mock\n+import com.nhaarman.mockitokotlin2.never\n+import com.nhaarman.mockitokotlin2.verify\n+import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.explore.depictions.search.LoadingStates\n import fr.free.nrw.commons.explore.paging.LoadingState\n import fr.free.nrw.commons.explore.paging.PagingDataSource\n@@ -16,7 +20,6 @@ import org.mockito.Mockito.verifyNoInteractions\n import org.mockito.MockitoAnnotations\n \n class PagingDataSourceTest {\n-\n private lateinit var loadingStates: PublishProcessor\n private lateinit var searchDepictionsDataSource: TestPagingDataSource\n \n@@ -31,7 +34,7 @@ class PagingDataSourceTest {\n searchDepictionsDataSource =\n TestPagingDataSource(\n loadingStates,\n- mockGetItems\n+ mockGetItems,\n )\n }\n \n@@ -97,7 +100,8 @@ class PagingDataSourceTest {\n val callback: PositionalDataSource.LoadRangeCallback = mock()\n val params = PositionalDataSource.LoadRangeParams(0, 1)\n whenever(mockGetItems.getItems(params.loadSize, params.startPosition))\n- .thenThrow(RuntimeException()).thenReturn(emptyList())\n+ .thenThrow(RuntimeException())\n+ .thenReturn(emptyList())\n val testSubscriber = loadingStates.test()\n searchDepictionsDataSource.loadRange(params, callback)\n verify(callback, never()).onResult(any())\n@@ -107,17 +111,24 @@ class PagingDataSourceTest {\n LoadingState.Loading,\n LoadingState.Error,\n LoadingState.Loading,\n- LoadingState.Complete\n+ LoadingState.Complete,\n )\n }\n }\n \n-class TestPagingDataSource(loadingStates: LoadingStates, val mockGetItems: MockGetItems) :\n- PagingDataSource(loadingStates) {\n- override fun getItems(loadSize: Int, startPosition: Int): List =\n- mockGetItems.getItems(loadSize, startPosition)\n+class TestPagingDataSource(\n+ loadingStates: LoadingStates,\n+ val mockGetItems: MockGetItems,\n+) : PagingDataSource(loadingStates) {\n+ override fun getItems(\n+ loadSize: Int,\n+ startPosition: Int,\n+ ): List = mockGetItems.getItems(loadSize, startPosition)\n }\n \n interface MockGetItems {\n- fun getItems(loadSize: Int, startPosition: Int): List\n+ fun getItems(\n+ loadSize: Int,\n+ startPosition: Int,\n+ ): List\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/parent/PageableParentCategoriesDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/parent/PageableParentCategoriesDataSourceTest.kt\nindex 77b3876c74..5a08dea611 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/parent/PageableParentCategoriesDataSourceTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/parent/PageableParentCategoriesDataSourceTest.kt\n@@ -12,9 +12,10 @@ import org.junit.Test\n import org.mockito.Mock\n import org.mockito.MockitoAnnotations\n \n-class PageableParentCategoriesDataSourceTest{\n+class PageableParentCategoriesDataSourceTest {\n @Mock\n lateinit var categoryClient: CategoryClient\n+\n @Mock\n lateinit var liveDataConverter: LiveDataConverter\n \ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/sub/PageableSubCategoriesDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/sub/PageableSubCategoriesDataSourceTest.kt\nindex 41e024db58..a7c2af98be 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/sub/PageableSubCategoriesDataSourceTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/sub/PageableSubCategoriesDataSourceTest.kt\n@@ -12,9 +12,10 @@ import org.junit.Test\n import org.mockito.Mock\n import org.mockito.MockitoAnnotations\n \n-class PageableSubCategoriesDataSourceTest{\n+class PageableSubCategoriesDataSourceTest {\n @Mock\n lateinit var categoryClient: CategoryClient\n+\n @Mock\n lateinit var liveDataConverter: LiveDataConverter\n \ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/DepictsClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/DepictsClientTest.kt\nindex 689fa8e7b0..3c1d7ade4e 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/DepictsClientTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/DepictsClientTest.kt\n@@ -9,17 +9,20 @@ import fr.free.nrw.commons.mwapi.Result\n import fr.free.nrw.commons.mwapi.SparqlResponse\n import fr.free.nrw.commons.upload.depicts.DepictsInterface\n import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n+import fr.free.nrw.commons.wikidata.model.DataValue\n import fr.free.nrw.commons.wikidata.model.DepictSearchResponse\n+import fr.free.nrw.commons.wikidata.model.Entities\n+import fr.free.nrw.commons.wikidata.model.SnakPartial\n+import fr.free.nrw.commons.wikidata.model.StatementPartial\n+import fr.free.nrw.commons.wikidata.model.WikiBaseEntityValue\n import io.reactivex.Single\n import org.junit.Before\n import org.junit.Test\n import org.mockito.Mock\n import org.mockito.MockitoAnnotations\n-import fr.free.nrw.commons.wikidata.model.*\n import java.lang.reflect.Method\n \n class DepictsClientTest {\n-\n @Mock\n private lateinit var depictsInterface: DepictsInterface\n private lateinit var depictsClient: DepictsClient\n@@ -35,16 +38,16 @@ class DepictsClientTest {\n val depictSearchResponse = mock()\n whenever(depictsInterface.searchForDepicts(\"query\", \"1\", \"en\", \"en\", \"0\"))\n .thenReturn(Single.just(depictSearchResponse))\n- whenever(depictSearchResponse.search).thenReturn(listOf(depictSearchItem(\"1\"),depictSearchItem(\"2\")))\n+ whenever(depictSearchResponse.search).thenReturn(listOf(depictSearchItem(\"1\"), depictSearchItem(\"2\")))\n val entities = mock()\n whenever(depictsInterface.getEntities(\"1|2\")).thenReturn(Single.just(entities))\n whenever(entities.entities()).thenReturn(emptyMap())\n- depictsClient.searchForDepictions(\"query\", 1, 0)\n+ depictsClient\n+ .searchForDepictions(\"query\", 1, 0)\n .test()\n .assertValue(emptyList())\n }\n \n-\n @Test\n fun getEntities() {\n val entities = mock()\n@@ -64,25 +67,37 @@ class DepictsClientTest {\n whenever(binding2.id).thenReturn(\"2\")\n val entities = mock()\n val entity = mock()\n- val statementPartial = mock()\n+ val statementPartial = mock()\n whenever(depictsInterface.getEntities(\"1|2\")).thenReturn(Single.just(entities))\n whenever(entities.entities()).thenReturn(mapOf(\"en\" to entity))\n whenever(entity.statements).thenReturn(mapOf(\"P31\" to listOf(statementPartial)))\n whenever(statementPartial.mainSnak).thenReturn(\n- Snak_partial(\"test\", \"P31\",\n+ SnakPartial(\n+ \"test\",\n+ \"P31\",\n DataValue.EntityId(\n- WikiBaseEntityValue(\"wikibase-entityid\", \"Q10\", 10L)\n- )\n- )\n+ WikiBaseEntityValue(\"wikibase-entityid\", \"Q10\", 10L),\n+ ),\n+ ),\n )\n whenever(depictsInterface.getEntities(\"Q10\")).thenReturn(Single.just(entities))\n whenever(entity.id()).thenReturn(\"Q10\")\n- depictsClient.toDepictions(Single.just(sparqlResponse))\n+ depictsClient\n+ .toDepictions(Single.just(sparqlResponse))\n .test()\n- .assertValue(listOf(\n- DepictedItem(\"\", \"\", null,\n- listOf(\"Q10\"), emptyList(), false, \"Q10\")\n- ))\n+ .assertValue(\n+ listOf(\n+ DepictedItem(\n+ \"\",\n+ \"\",\n+ null,\n+ listOf(\"Q10\"),\n+ emptyList(),\n+ false,\n+ \"Q10\",\n+ ),\n+ ),\n+ )\n }\n \n @Test\n@@ -99,34 +114,49 @@ class DepictsClientTest {\n val entity = mock()\n whenever(depictsInterface.getEntities(\"1|2\")).thenReturn(Single.just(entities))\n whenever(entities.entities()).thenReturn(mapOf(\"en\" to entity))\n- whenever(entity.descriptions()).thenReturn(mapOf(\"en\" to\n- Entities.Label(\"en\", \"Test description\")\n- ))\n+ whenever(entity.descriptions()).thenReturn(\n+ mapOf(\n+ \"en\" to\n+ Entities.Label(\"en\", \"Test description\"),\n+ ),\n+ )\n whenever(entity.id()).thenReturn(\"Q10\")\n- depictsClient.toDepictions(Single.just(sparqlResponse))\n+ depictsClient\n+ .toDepictions(Single.just(sparqlResponse))\n .test()\n- .assertValue(listOf(\n- DepictedItem(\"\", \"\", null, listOf(\"Q10\"),\n- emptyList(), false, \"Q10\")\n- ))\n+ .assertValue(\n+ listOf(\n+ DepictedItem(\n+ \"\",\n+ \"\",\n+ null,\n+ listOf(\"Q10\"),\n+ emptyList(),\n+ false,\n+ \"Q10\",\n+ ),\n+ ),\n+ )\n }\n \n @Test\n fun `Test mapToDepictItem when description is not empty`() {\n- val method: Method = DepictsClient::class.java.getDeclaredMethod(\n- \"mapToDepictItem\",\n- Entities.Entity::class.java\n- )\n+ val method: Method =\n+ DepictsClient::class.java.getDeclaredMethod(\n+ \"mapToDepictItem\",\n+ Entities.Entity::class.java,\n+ )\n method.isAccessible = true\n method.invoke(depictsClient, entity(descriptions = mapOf(\"en\" to \"Test\")))\n }\n \n @Test\n fun `Test mapToDepictItem when description is empty and P31 doesn't exists`() {\n- val method: Method = DepictsClient::class.java.getDeclaredMethod(\n- \"mapToDepictItem\",\n- Entities.Entity::class.java\n- )\n+ val method: Method =\n+ DepictsClient::class.java.getDeclaredMethod(\n+ \"mapToDepictItem\",\n+ Entities.Entity::class.java,\n+ )\n method.isAccessible = true\n method.invoke(depictsClient, entity())\n }\n@@ -135,23 +165,26 @@ class DepictsClientTest {\n fun `Test mapToDepictItem when description is empty and P31 exists`() {\n val entities = mock()\n val entity = mock()\n- val statementPartial = mock()\n+ val statementPartial = mock()\n whenever(entity.statements).thenReturn(mapOf(\"P31\" to listOf(statementPartial)))\n whenever(statementPartial.mainSnak).thenReturn(\n- Snak_partial(\"test\", \"P31\",\n+ SnakPartial(\n+ \"test\",\n+ \"P31\",\n DataValue.EntityId(\n- WikiBaseEntityValue(\"wikibase-entityid\", \"Q10\", 10L)\n- )\n- )\n+ WikiBaseEntityValue(\"wikibase-entityid\", \"Q10\", 10L),\n+ ),\n+ ),\n )\n whenever(depictsInterface.getEntities(\"Q10\")).thenReturn(Single.just(entities))\n whenever(entities.entities())\n .thenReturn(mapOf(\"test\" to entity))\n whenever(entity.id()).thenReturn(\"Q10\")\n- val method: Method = DepictsClient::class.java.getDeclaredMethod(\n- \"mapToDepictItem\",\n- Entities.Entity::class.java\n- )\n+ val method: Method =\n+ DepictsClient::class.java.getDeclaredMethod(\n+ \"mapToDepictItem\",\n+ Entities.Entity::class.java,\n+ )\n method.isAccessible = true\n method.invoke(depictsClient, entity)\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/PageableDepictionsDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/PageableDepictionsDataSourceTest.kt\nindex 8dfc9b279d..027c90f9c0 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/PageableDepictionsDataSourceTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/PageableDepictionsDataSourceTest.kt\n@@ -8,7 +8,6 @@ import org.junit.Assert\n import org.junit.Test\n \n class PageableDepictionsDataSourceTest {\n-\n @Test\n fun `loadFunction loads depictions`() {\n val depictsClient: DepictsClient = mock()\n@@ -18,8 +17,7 @@ class PageableDepictionsDataSourceTest {\n pageableDepictionsDataSource.onQueryUpdated(\"test\")\n Assert.assertEquals(\n pageableDepictionsDataSource.loadFunction.invoke(0, 1),\n- emptyList()\n+ emptyList(),\n )\n }\n }\n-\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/WikidataItemDetailsActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/WikidataItemDetailsActivityUnitTests.kt\nindex 5db886cdff..bf5aca6e2f 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/WikidataItemDetailsActivityUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/WikidataItemDetailsActivityUnitTests.kt\n@@ -1,18 +1,12 @@\n package fr.free.nrw.commons.explore.depictions\n \n import android.content.Intent\n-import android.view.LayoutInflater\n-import android.view.View\n-import android.widget.FrameLayout\n import androidx.fragment.app.FragmentManager\n import androidx.test.core.app.ApplicationProvider\n-import androidx.viewpager.widget.ViewPager\n-import com.google.android.material.tabs.TabLayout\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.createTestClient\n-import fr.free.nrw.commons.databinding.ActivityWikidataItemDetailsBinding\n import fr.free.nrw.commons.explore.depictions.media.DepictedImagesFragment\n import fr.free.nrw.commons.media.MediaDetailPagerFragment\n import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n@@ -35,7 +29,6 @@ import org.robolectric.fakes.RoboMenuItem\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class WikidataItemDetailsActivityUnitTests {\n-\n private lateinit var activity: WikidataItemDetailsActivity\n \n @Mock\n@@ -53,32 +46,31 @@ class WikidataItemDetailsActivityUnitTests {\n @Mock\n private lateinit var wikidataItem: DepictedItem\n \n-\n @Before\n fun setUp() {\n MockitoAnnotations.openMocks(this)\n OkHttpConnectionFactory.CLIENT = createTestClient()\n- val intent = Intent(\n- ApplicationProvider.getApplicationContext(),\n- WikidataItemDetailsActivity::class.java\n- )\n+ val intent =\n+ Intent(\n+ ApplicationProvider.getApplicationContext(),\n+ WikidataItemDetailsActivity::class.java,\n+ )\n intent.putExtra(\"wikidataItemName\", \"depictionName\")\n intent.putExtra(\"entityId\", 0)\n activity =\n- Robolectric.buildActivity(WikidataItemDetailsActivity::class.java, intent).create()\n+ Robolectric\n+ .buildActivity(WikidataItemDetailsActivity::class.java, intent)\n+ .create()\n .get()\n Whitebox.setInternalState(activity, \"mediaDetailPagerFragment\", mediaDetailPagerFragment)\n Whitebox.setInternalState(\n activity,\n \"depictionImagesListFragment\",\n- depictionImagesListFragment\n+ depictionImagesListFragment,\n )\n Whitebox.setInternalState(activity, \"supportFragmentManager\", supportFragmentManager)\n \n-\n Whitebox.setInternalState(activity, \"wikidataItem\", wikidataItem)\n-\n-\n }\n \n @Test\n@@ -142,7 +134,7 @@ class WikidataItemDetailsActivityUnitTests {\n fun testOnOptionsItemSelectedCaseOne() {\n Assert.assertEquals(\n activity.onOptionsItemSelected(RoboMenuItem(R.id.browser_actions_menu_items)),\n- true\n+ true,\n )\n }\n \n@@ -169,5 +161,4 @@ class WikidataItemDetailsActivityUnitTests {\n fun testOnMediaClicked() {\n activity.onMediaClicked(0)\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/child/PageableChildDepictionsDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/child/PageableChildDepictionsDataSourceTest.kt\nindex 809f7b5d40..7102b84523 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/child/PageableChildDepictionsDataSourceTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/child/PageableChildDepictionsDataSourceTest.kt\n@@ -14,6 +14,7 @@ import org.mockito.MockitoAnnotations\n class PageableChildDepictionsDataSourceTest {\n @Mock\n lateinit var okHttpJsonApiClient: OkHttpJsonApiClient\n+\n @Mock\n lateinit var liveDataConverter: LiveDataConverter\n \ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/media/PageableDepictedMediaDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/media/PageableDepictedMediaDataSourceTest.kt\nindex c65ccb7021..e51ca29b95 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/media/PageableDepictedMediaDataSourceTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/media/PageableDepictedMediaDataSourceTest.kt\n@@ -2,20 +2,19 @@ package fr.free.nrw.commons.explore.depictions.media\n \n import com.nhaarman.mockitokotlin2.mock\n import com.nhaarman.mockitokotlin2.whenever\n-import fr.free.nrw.commons.media.MediaClient\n import fr.free.nrw.commons.media.WikidataMediaClient\n import io.reactivex.Single\n import org.junit.Assert\n import org.junit.Test\n \n-class PageableDepictedMediaDataSourceTest{\n+class PageableDepictedMediaDataSourceTest {\n @Test\n fun `loadFunction loads Media`() {\n val mediaClient = mock()\n- whenever(mediaClient.fetchImagesForDepictedItem(\"test\",0,1))\n+ whenever(mediaClient.fetchImagesForDepictedItem(\"test\", 0, 1))\n .thenReturn(Single.just(emptyList()))\n val pageableDepictedMediaDataSource = PageableDepictedMediaDataSource(mock(), mediaClient)\n pageableDepictedMediaDataSource.onQueryUpdated(\"test\")\n- Assert.assertEquals(pageableDepictedMediaDataSource.loadFunction(0,1), emptyList())\n+ Assert.assertEquals(pageableDepictedMediaDataSource.loadFunction(0, 1), emptyList())\n }\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/parent/PageableParentDepictionsDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/parent/PageableParentDepictionsDataSourceTest.kt\nindex b0e2f81885..de573641c8 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/parent/PageableParentDepictionsDataSourceTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/parent/PageableParentDepictionsDataSourceTest.kt\n@@ -33,4 +33,3 @@ class PageableParentDepictionsDataSourceTest {\n Assert.assertEquals(dataSource.loadFunction(1, 0), listOf(depictedItem()))\n }\n }\n-\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/media/MediaConverterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/media/MediaConverterTest.kt\nindex 6d75598acf..e1e1b2ed74 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/media/MediaConverterTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/media/MediaConverterTest.kt\n@@ -1,36 +1,34 @@\n package fr.free.nrw.commons.explore.media\n \n-import com.nhaarman.mockitokotlin2.any\n-import com.nhaarman.mockitokotlin2.eq\n-import com.nhaarman.mockitokotlin2.notNull\n import fr.free.nrw.commons.Media\n+import fr.free.nrw.commons.wikidata.model.Entities\n+import fr.free.nrw.commons.wikidata.model.gallery.ExtMetadata\n+import fr.free.nrw.commons.wikidata.model.gallery.ImageInfo\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage\n import org.junit.Assert.assertEquals\n import org.junit.Before\n import org.junit.Test\n-import org.mockito.ArgumentMatchers\n import org.mockito.Mock\n import org.mockito.Mockito\n import org.mockito.MockitoAnnotations\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage\n-import fr.free.nrw.commons.wikidata.model.gallery.ExtMetadata\n-import fr.free.nrw.commons.wikidata.model.gallery.ImageInfo\n-import fr.free.nrw.commons.wikidata.model.Entities\n import java.lang.IllegalArgumentException\n \n class MediaConverterTest {\n @Mock\n lateinit var page: MwQueryPage\n+\n @Mock\n lateinit var entity: Entities.Entity\n+\n @Mock\n lateinit var imageInfo: ImageInfo\n+\n @Mock\n lateinit var metadata: ExtMetadata\n \n lateinit var mediaConverter: MediaConverter\n lateinit var media: Media\n \n-\n @Before\n fun setUp() {\n MockitoAnnotations.openMocks(this)\n@@ -63,4 +61,4 @@ class MediaConverterTest {\n media = mediaConverter.convert(page, entity, imageInfo)\n assertEquals(media.thumbUrl, \"thumbUrl\")\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/media/PageableMediaDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/media/PageableMediaDataSourceTest.kt\nindex 5832e21862..1d487bf542 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/media/PageableMediaDataSourceTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/media/PageableMediaDataSourceTest.kt\n@@ -13,6 +13,7 @@ import org.mockito.MockitoAnnotations\n class PageableMediaDataSourceTest {\n @Mock\n lateinit var mediaConverter: MediaConverter\n+\n @Mock\n lateinit var mediaClient: MediaClient\n \n@@ -27,6 +28,6 @@ class PageableMediaDataSourceTest {\n .thenReturn(Single.just(emptyList()))\n val pageableMediaDataSource = PageableMediaDataSource(mock(), mediaClient)\n pageableMediaDataSource.onQueryUpdated(\"test\")\n- Assert.assertEquals(pageableMediaDataSource.loadFunction(0,1), emptyList())\n+ Assert.assertEquals(pageableMediaDataSource.loadFunction(0, 1), emptyList())\n }\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesDaoTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesDaoTest.kt\nindex 6aa0aae5f0..3e550b6705 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesDaoTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesDaoTest.kt\n@@ -6,25 +6,43 @@ import android.database.Cursor\n import android.database.MatrixCursor\n import android.database.sqlite.SQLiteDatabase\n import android.os.RemoteException\n-import com.nhaarman.mockitokotlin2.*\n+import com.nhaarman.mockitokotlin2.any\n+import com.nhaarman.mockitokotlin2.anyOrNull\n+import com.nhaarman.mockitokotlin2.argumentCaptor\n+import com.nhaarman.mockitokotlin2.eq\n+import com.nhaarman.mockitokotlin2.inOrder\n+import com.nhaarman.mockitokotlin2.isA\n+import com.nhaarman.mockitokotlin2.isNull\n+import com.nhaarman.mockitokotlin2.mock\n+import com.nhaarman.mockitokotlin2.verify\n+import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.explore.models.RecentSearch\n import fr.free.nrw.commons.explore.recentsearches.RecentSearchesContentProvider.BASE_URI\n import fr.free.nrw.commons.explore.recentsearches.RecentSearchesContentProvider.uriForId\n-import fr.free.nrw.commons.explore.recentsearches.RecentSearchesDao.Table.*\n-import org.junit.Assert.*\n+import fr.free.nrw.commons.explore.recentsearches.RecentSearchesDao.Table.ALL_FIELDS\n+import fr.free.nrw.commons.explore.recentsearches.RecentSearchesDao.Table.COLUMN_ID\n+import fr.free.nrw.commons.explore.recentsearches.RecentSearchesDao.Table.COLUMN_LAST_USED\n+import fr.free.nrw.commons.explore.recentsearches.RecentSearchesDao.Table.COLUMN_NAME\n+import fr.free.nrw.commons.explore.recentsearches.RecentSearchesDao.Table.CREATE_TABLE_STATEMENT\n+import fr.free.nrw.commons.explore.recentsearches.RecentSearchesDao.Table.DROP_TABLE_STATEMENT\n+import fr.free.nrw.commons.explore.recentsearches.RecentSearchesDao.Table.onCreate\n+import fr.free.nrw.commons.explore.recentsearches.RecentSearchesDao.Table.onDelete\n+import fr.free.nrw.commons.explore.recentsearches.RecentSearchesDao.Table.onUpdate\n+import org.junit.Assert.assertEquals\n+import org.junit.Assert.assertNotNull\n+import org.junit.Assert.assertNull\n import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n import org.mockito.Mockito.verifyNoInteractions\n import org.robolectric.RobolectricTestRunner\n import org.robolectric.annotation.Config\n-import java.util.*\n+import java.util.Date\n \n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class RecentSearchesDaoTest {\n-\n private val columns = arrayOf(COLUMN_ID, COLUMN_NAME, COLUMN_LAST_USED)\n private val client: ContentProviderClient = mock()\n private val database: SQLiteDatabase = mock()\n@@ -238,11 +256,11 @@ class RecentSearchesDaoTest {\n assertEquals(123L, recentSearch?.lastSearched?.time)\n \n verify(client).query(\n- eq(BASE_URI),\n- eq(ALL_FIELDS),\n- eq(\"$COLUMN_NAME=?\"),\n- queryCaptor.capture(),\n- isNull()\n+ eq(BASE_URI),\n+ eq(ALL_FIELDS),\n+ eq(\"$COLUMN_NAME=?\"),\n+ queryCaptor.capture(),\n+ isNull(),\n )\n assertEquals(\"butterfly\", queryCaptor.firstValue[0])\n }\n@@ -274,11 +292,11 @@ class RecentSearchesDaoTest {\n assertEquals(\"butterfly\", result[0])\n \n verify(client).query(\n- eq(BASE_URI),\n- eq(ALL_FIELDS),\n- isNull(),\n- queryCaptor.capture(),\n- eq(\"$COLUMN_LAST_USED DESC\")\n+ eq(BASE_URI),\n+ eq(ALL_FIELDS),\n+ isNull(),\n+ queryCaptor.capture(),\n+ eq(\"$COLUMN_LAST_USED DESC\"),\n )\n assertEquals(0, queryCaptor.firstValue.size)\n }\n@@ -299,10 +317,10 @@ class RecentSearchesDaoTest {\n * Unit Test for creating entries in recent searches database.\n * @param rowCount No of rows\n */\n- private fun createCursor(rowCount: Int) = MatrixCursor(columns, rowCount).apply {\n- for (i in 0 until rowCount) {\n- addRow(listOf(\"1\", \"butterfly\", \"123\"))\n+ private fun createCursor(rowCount: Int) =\n+ MatrixCursor(columns, rowCount).apply {\n+ for (i in 0 until rowCount) {\n+ addRow(listOf(\"1\", \"butterfly\", \"123\"))\n+ }\n }\n- }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragmentUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragmentUnitTest.kt\nindex 85dcaf97b4..8173dfc443 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragmentUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragmentUnitTest.kt\n@@ -3,17 +3,12 @@ package fr.free.nrw.commons.explore.recentsearches\n import android.content.Context\n import android.content.DialogInterface\n import android.view.LayoutInflater\n-import android.view.View\n import android.widget.ArrayAdapter\n-import android.widget.ImageView\n-import android.widget.ListView\n-import android.widget.TextView\n import androidx.fragment.app.FragmentManager\n import androidx.fragment.app.FragmentTransaction\n import androidx.test.core.app.ApplicationProvider\n import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.OkHttpConnectionFactory\n-import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.contributions.MainActivity\n import fr.free.nrw.commons.createTestClient\n@@ -34,7 +29,6 @@ import java.lang.reflect.Method\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class RecentSearchesFragmentUnitTest {\n-\n private lateinit var fragment: RecentSearchesFragment\n private lateinit var fragmentManager: FragmentManager\n private lateinit var context: Context\n@@ -43,7 +37,6 @@ class RecentSearchesFragmentUnitTest {\n @Mock\n private lateinit var recentSearchesDao: RecentSearchesDao\n \n-\n @Mock\n private lateinit var adapter: ArrayAdapter<*>\n \n@@ -96,10 +89,11 @@ class RecentSearchesFragmentUnitTest {\n @Test\n @Throws(Exception::class)\n fun testShowDeleteRecentAlertDialog() {\n- val method: Method = RecentSearchesFragment::class.java.getDeclaredMethod(\n- \"showDeleteRecentAlertDialog\",\n- Context::class.java\n- )\n+ val method: Method =\n+ RecentSearchesFragment::class.java.getDeclaredMethod(\n+ \"showDeleteRecentAlertDialog\",\n+ Context::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, context)\n }\n@@ -107,11 +101,12 @@ class RecentSearchesFragmentUnitTest {\n @Test\n @Throws(Exception::class)\n fun testSetDeleteRecentPositiveButton() {\n- val method: Method = RecentSearchesFragment::class.java.getDeclaredMethod(\n- \"setDeleteRecentPositiveButton\",\n- Context::class.java,\n- DialogInterface::class.java\n- )\n+ val method: Method =\n+ RecentSearchesFragment::class.java.getDeclaredMethod(\n+ \"setDeleteRecentPositiveButton\",\n+ Context::class.java,\n+ DialogInterface::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, context, dialog)\n }\n@@ -119,11 +114,12 @@ class RecentSearchesFragmentUnitTest {\n @Test\n @Throws(Exception::class)\n fun testShowDeleteAlertDialog() {\n- val method: Method = RecentSearchesFragment::class.java.getDeclaredMethod(\n- \"showDeleteAlertDialog\",\n- Context::class.java,\n- Int::class.java\n- )\n+ val method: Method =\n+ RecentSearchesFragment::class.java.getDeclaredMethod(\n+ \"showDeleteAlertDialog\",\n+ Context::class.java,\n+ Int::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, context, 0)\n }\n@@ -131,14 +127,14 @@ class RecentSearchesFragmentUnitTest {\n @Test\n @Throws(Exception::class)\n fun testSetDeletePositiveButton() {\n- val method: Method = RecentSearchesFragment::class.java.getDeclaredMethod(\n- \"setDeletePositiveButton\",\n- Context::class.java,\n- DialogInterface::class.java,\n- Int::class.java\n- )\n+ val method: Method =\n+ RecentSearchesFragment::class.java.getDeclaredMethod(\n+ \"setDeletePositiveButton\",\n+ Context::class.java,\n+ DialogInterface::class.java,\n+ Int::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, context, dialog, 0)\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/search/SearchActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/search/SearchActivityUnitTests.kt\nindex c0b99c6607..751046e7f7 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/explore/search/SearchActivityUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/search/SearchActivityUnitTests.kt\n@@ -1,16 +1,12 @@\n package fr.free.nrw.commons.explore.search\n \n import android.content.Context\n-import android.widget.SearchView\n-import androidx.fragment.app.FragmentController\n import androidx.fragment.app.FragmentManager\n import androidx.test.core.app.ApplicationProvider\n-import androidx.viewpager.widget.ViewPager\n import com.nhaarman.mockitokotlin2.verify\n import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.ViewPagerAdapter\n-import fr.free.nrw.commons.databinding.ActivitySearchBinding\n import fr.free.nrw.commons.explore.SearchActivity\n import fr.free.nrw.commons.explore.categories.search.SearchCategoryFragment\n import fr.free.nrw.commons.explore.depictions.search.SearchDepictionsFragment\n@@ -37,12 +33,10 @@ import org.robolectric.annotation.Config\n import org.robolectric.annotation.LooperMode\n import java.lang.reflect.Method\n \n-\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class SearchActivityUnitTests {\n-\n @Mock\n private lateinit var activity: SearchActivity\n \n@@ -175,10 +169,11 @@ class SearchActivityUnitTests {\n fun testHandleSearchCaseEmpty() {\n Whitebox.setInternalState(activity, \"recentSearchesFragment\", recentSearchesFragment)\n val query = \"\"\n- val method: Method = SearchActivity::class.java.getDeclaredMethod(\n- \"handleSearch\",\n- CharSequence::class.java\n- )\n+ val method: Method =\n+ SearchActivity::class.java.getDeclaredMethod(\n+ \"handleSearch\",\n+ CharSequence::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, query)\n verify(recentSearchesFragment).updateRecentSearches()\n@@ -209,10 +204,11 @@ class SearchActivityUnitTests {\n `when`(searchMediaFragment.isRemoving).thenReturn(false)\n `when`(searchCategoryFragment.isRemoving).thenReturn(false)\n \n- val method: Method = SearchActivity::class.java.getDeclaredMethod(\n- \"handleSearch\",\n- CharSequence::class.java\n- )\n+ val method: Method =\n+ SearchActivity::class.java.getDeclaredMethod(\n+ \"handleSearch\",\n+ CharSequence::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, query)\n verify(recentSearchesDao).find(query)\n@@ -220,5 +216,4 @@ class SearchActivityUnitTests {\n verify(searchMediaFragment).onQueryUpdated(query)\n verify(searchCategoryFragment).onQueryUpdated(query)\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/feedback/FeedbackContentCreatorUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/feedback/FeedbackContentCreatorUnitTests.kt\nindex a238d8f7ae..5ca2f544b3 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/feedback/FeedbackContentCreatorUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/feedback/FeedbackContentCreatorUnitTests.kt\n@@ -22,7 +22,7 @@ class FeedbackContentCreatorUnitTests {\n private lateinit var feedback: Feedback\n \n private lateinit var context: Context\n- \n+\n @Before\n fun setup() {\n MockitoAnnotations.openMocks(this)\n@@ -37,5 +37,4 @@ class FeedbackContentCreatorUnitTests {\n Assert.assertNotNull(creator.getSectionText())\n Assert.assertNotNull(creator.getSectionTitle())\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/feedback/FeedbackDialogTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/feedback/FeedbackDialogTests.kt\nindex 7b3c2738cf..e625057078 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/feedback/FeedbackDialogTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/feedback/FeedbackDialogTests.kt\n@@ -7,9 +7,9 @@ import androidx.test.core.app.ApplicationProvider\n import com.nhaarman.mockitokotlin2.doReturn\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.TestUtility.setFinalStatic\n import fr.free.nrw.commons.contributions.MainActivity\n+import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.databinding.DialogFeedbackBinding\n import fr.free.nrw.commons.ui.PasteSensitiveTextInputEditText\n import org.junit.Assert\n@@ -66,8 +66,9 @@ class FeedbackDialogTests {\n val editable = mock(Editable::class.java)\n val ed = mock(PasteSensitiveTextInputEditText::class.java)\n setFinalStatic(\n- DialogFeedbackBinding::class.java.getDeclaredField(\"feedbackItemEditText\"),\n- ed)\n+ DialogFeedbackBinding::class.java.getDeclaredField(\"feedbackItemEditText\"),\n+ ed,\n+ )\n `when`(ed?.text).thenReturn(editable)\n doReturn(editable).`when`(ed)?.text\n doReturn(\"\").`when`(editable).toString()\n@@ -80,13 +81,13 @@ class FeedbackDialogTests {\n val editable: Editable = mock(Editable::class.java)\n val ed = mock(PasteSensitiveTextInputEditText::class.java)\n setFinalStatic(\n- DialogFeedbackBinding::class.java.getDeclaredField(\"feedbackItemEditText\"),\n- ed)\n+ DialogFeedbackBinding::class.java.getDeclaredField(\"feedbackItemEditText\"),\n+ ed,\n+ )\n `when`(ed?.text).thenReturn(editable)\n `when`(editable.toString()).thenReturn(\"1234\")\n \n Assert.assertEquals(ed.text.toString(), \"1234\")\n dialog.submitFeedback()\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/feedback/FeedbackUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/feedback/FeedbackUnitTests.kt\nindex dc690e4598..81c3bc1517 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/feedback/FeedbackUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/feedback/FeedbackUnitTests.kt\n@@ -61,5 +61,4 @@ class FeedbackUnitTests {\n feedback.networkType = \"network\"\n Assert.assertEquals(feedback.networkType, \"network\")\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt\nindex b98c5a1c9a..171e04b4e0 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt\n@@ -15,9 +15,13 @@ import org.junit.Assert.assertEquals\n import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n-import org.mockito.*\n-import org.mockito.Mockito.`when`\n+import org.mockito.ArgumentCaptor\n+import org.mockito.ArgumentMatchers\n+import org.mockito.Captor\n+import org.mockito.Mock\n import org.mockito.Mockito.mock\n+import org.mockito.Mockito.`when`\n+import org.mockito.MockitoAnnotations\n import org.robolectric.RobolectricTestRunner\n import org.robolectric.annotation.Config\n import org.robolectric.annotation.LooperMode\n@@ -28,11 +32,10 @@ import kotlin.random.Random.Default.nextBoolean\n @Config(\n sdk = [21],\n application = TestCommonsApplication::class,\n- shadows = [ShadowFileProvider::class]\n+ shadows = [ShadowFileProvider::class],\n )\n @LooperMode(LooperMode.Mode.PAUSED)\n class FilePickerTest {\n-\n @Mock\n internal lateinit var activity: Activity\n \n@@ -64,7 +67,7 @@ class FilePickerTest {\n FilePicker.openGallery(activity, 0, nextBoolean())\n verify(activity).startActivityForResult(\n ArgumentMatchers.any(),\n- requestCodeCaptor?.capture()?.toInt()!!\n+ requestCodeCaptor?.capture()?.toInt()!!,\n )\n assertEquals(requestCodeCaptor?.value, RequestCodes.PICK_PICTURE_FROM_GALLERY)\n }\n@@ -79,7 +82,7 @@ class FilePickerTest {\n FilePicker.openCameraForImage(activity, 0)\n verify(activity).startActivityForResult(\n ArgumentMatchers.any(),\n- requestCodeCaptor?.capture()?.toInt()!!\n+ requestCodeCaptor?.capture()?.toInt()!!,\n )\n assertEquals(requestCodeCaptor?.value, RequestCodes.TAKE_PICTURE)\n }\n@@ -87,10 +90,11 @@ class FilePickerTest {\n @Test\n fun testCreateCameraPictureFile() {\n val mockFilePicker = mock(FilePicker::class.java)\n- val method: Method = FilePicker::class.java.getDeclaredMethod(\n- \"createCameraPictureFile\",\n- Context::class.java\n- )\n+ val method: Method =\n+ FilePicker::class.java.getDeclaredMethod(\n+ \"createCameraPictureFile\",\n+ Context::class.java,\n+ )\n method.isAccessible = true\n method.invoke(mockFilePicker, context)\n }\n@@ -98,11 +102,12 @@ class FilePickerTest {\n @Test\n fun testCreateCameraForImageIntent() {\n val mockFilePicker = mock(FilePicker::class.java)\n- val method: Method = FilePicker::class.java.getDeclaredMethod(\n- \"createCameraForImageIntent\",\n- Context::class.java,\n- Int::class.java\n- )\n+ val method: Method =\n+ FilePicker::class.java.getDeclaredMethod(\n+ \"createCameraForImageIntent\",\n+ Context::class.java,\n+ Int::class.java,\n+ )\n method.isAccessible = true\n method.invoke(mockFilePicker, context, 0)\n }\n@@ -112,11 +117,12 @@ class FilePickerTest {\n val mockFilePicker = mock(FilePicker::class.java)\n val mockUri = mock(Uri::class.java)\n val mockContext = mock(Context::class.java)\n- val method: Method = FilePicker::class.java.getDeclaredMethod(\n- \"revokeWritePermission\",\n- Context::class.java,\n- Uri::class.java\n- )\n+ val method: Method =\n+ FilePicker::class.java.getDeclaredMethod(\n+ \"revokeWritePermission\",\n+ Context::class.java,\n+ Uri::class.java,\n+ )\n method.isAccessible = true\n method.invoke(mockFilePicker, mockContext, mockUri)\n }\n@@ -124,10 +130,11 @@ class FilePickerTest {\n @Test\n fun testRestoreType() {\n val mockFilePicker = mock(FilePicker::class.java)\n- val method: Method = FilePicker::class.java.getDeclaredMethod(\n- \"restoreType\",\n- Context::class.java\n- )\n+ val method: Method =\n+ FilePicker::class.java.getDeclaredMethod(\n+ \"restoreType\",\n+ Context::class.java,\n+ )\n method.isAccessible = true\n method.invoke(mockFilePicker, context)\n }\n@@ -135,10 +142,11 @@ class FilePickerTest {\n @Test\n fun testTakenCameraPicture() {\n val mockFilePicker = mock(FilePicker::class.java)\n- val method: Method = FilePicker::class.java.getDeclaredMethod(\n- \"takenCameraPicture\",\n- Context::class.java\n- )\n+ val method: Method =\n+ FilePicker::class.java.getDeclaredMethod(\n+ \"takenCameraPicture\",\n+ Context::class.java,\n+ )\n method.isAccessible = true\n method.invoke(mockFilePicker, context)\n }\n@@ -148,10 +156,11 @@ class FilePickerTest {\n val mockFilePicker = mock(FilePicker::class.java)\n `when`(PreferenceManager.getDefaultSharedPreferences(activity)).thenReturn(sharedPref)\n `when`(sharedPref.getString(\"last_photo\", null)).thenReturn(\"\")\n- val method: Method = FilePicker::class.java.getDeclaredMethod(\n- \"takenCameraPicture\",\n- Context::class.java\n- )\n+ val method: Method =\n+ FilePicker::class.java.getDeclaredMethod(\n+ \"takenCameraPicture\",\n+ Context::class.java,\n+ )\n method.isAccessible = true\n method.invoke(mockFilePicker, activity)\n }\n@@ -159,10 +168,11 @@ class FilePickerTest {\n @Test\n fun testTakenCameraVideo() {\n val mockFilePicker = mock(FilePicker::class.java)\n- val method: Method = FilePicker::class.java.getDeclaredMethod(\n- \"takenCameraVideo\",\n- Context::class.java\n- )\n+ val method: Method =\n+ FilePicker::class.java.getDeclaredMethod(\n+ \"takenCameraVideo\",\n+ Context::class.java,\n+ )\n method.isAccessible = true\n method.invoke(mockFilePicker, context)\n }\n@@ -172,10 +182,11 @@ class FilePickerTest {\n val mockFilePicker = mock(FilePicker::class.java)\n `when`(PreferenceManager.getDefaultSharedPreferences(activity)).thenReturn(sharedPref)\n `when`(sharedPref.getString(\"last_video\", null)).thenReturn(\"\")\n- val method: Method = FilePicker::class.java.getDeclaredMethod(\n- \"takenCameraVideo\",\n- Context::class.java\n- )\n+ val method: Method =\n+ FilePicker::class.java.getDeclaredMethod(\n+ \"takenCameraVideo\",\n+ Context::class.java,\n+ )\n method.isAccessible = true\n method.invoke(mockFilePicker, activity)\n }\n@@ -184,10 +195,11 @@ class FilePickerTest {\n fun testIsPhoto() {\n val mockFilePicker = mock(FilePicker::class.java)\n val mockIntent = mock(Intent::class.java)\n- val method: Method = FilePicker::class.java.getDeclaredMethod(\n- \"isPhoto\",\n- Intent::class.java\n- )\n+ val method: Method =\n+ FilePicker::class.java.getDeclaredMethod(\n+ \"isPhoto\",\n+ Intent::class.java,\n+ )\n method.isAccessible = true\n method.invoke(mockFilePicker, mockIntent)\n }\n@@ -201,24 +213,28 @@ class FilePickerTest {\n mockIntent,\n activity,\n object : DefaultCallback() {\n- override fun onCanceled(source: FilePicker.ImageSource, type: Int) {\n+ override fun onCanceled(\n+ source: FilePicker.ImageSource,\n+ type: Int,\n+ ) {\n super.onCanceled(source, type)\n }\n \n override fun onImagePickerError(\n e: Exception,\n source: FilePicker.ImageSource,\n- type: Int\n+ type: Int,\n ) {\n }\n \n override fun onImagesPicked(\n imagesFiles: List,\n source: FilePicker.ImageSource,\n- type: Int\n+ type: Int,\n ) {\n }\n- })\n+ },\n+ )\n }\n \n @Test\n@@ -230,4 +246,4 @@ class FilePickerTest {\n verify(activity).startActivityForResult(ArgumentMatchers.any(), requestCodeCaptor?.capture()?.toInt()!!)\n assertEquals(requestCodeCaptor?.value, RequestCodes.PICK_PICTURE_FROM_CUSTOM_SELECTOR)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/leaderboard/LeaderboardFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/leaderboard/LeaderboardFragmentUnitTests.kt\nindex 7efc3b9450..9ee45fd102 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/leaderboard/LeaderboardFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/leaderboard/LeaderboardFragmentUnitTests.kt\n@@ -4,20 +4,15 @@ import android.accounts.Account\n import android.content.Context\n import android.os.Looper.getMainLooper\n import android.view.LayoutInflater\n-import android.view.View\n import android.view.ViewGroup\n-import android.widget.Button\n-import android.widget.ProgressBar\n-import android.widget.Spinner\n import androidx.fragment.app.FragmentManager\n import androidx.fragment.app.FragmentTransaction\n-import androidx.recyclerview.widget.RecyclerView\n import androidx.test.core.app.ApplicationProvider\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.auth.SessionManager\n+import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.databinding.FragmentLeaderboardBinding\n import fr.free.nrw.commons.profile.ProfileActivity\n import fr.free.nrw.commons.profile.leaderboard.LeaderboardFragment\n@@ -44,13 +39,11 @@ import java.lang.reflect.Method\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class LeaderboardFragmentUnitTests {\n-\n private lateinit var fragment: LeaderboardFragment\n private lateinit var fragmentManager: FragmentManager\n private lateinit var context: Context\n private lateinit var layoutInflater: LayoutInflater\n \n-\n @Mock\n private lateinit var viewModel: LeaderboardListViewModel\n \n@@ -104,9 +97,10 @@ class LeaderboardFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testRefreshLeaderboard() {\n- val method: Method = LeaderboardFragment::class.java.getDeclaredMethod(\n- \"refreshLeaderboard\"\n- )\n+ val method: Method =\n+ LeaderboardFragment::class.java.getDeclaredMethod(\n+ \"refreshLeaderboard\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -114,9 +108,10 @@ class LeaderboardFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testScrollToUserRank() {\n- val method: Method = LeaderboardFragment::class.java.getDeclaredMethod(\n- \"scrollToUserRank\"\n- )\n+ val method: Method =\n+ LeaderboardFragment::class.java.getDeclaredMethod(\n+ \"scrollToUserRank\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -126,9 +121,10 @@ class LeaderboardFragmentUnitTests {\n fun testScrollToUserRankCaseNonZeroTrue() {\n Whitebox.setInternalState(fragment, \"userRank\", 1)\n `when`(adapter.itemCount).thenReturn(3)\n- val method: Method = LeaderboardFragment::class.java.getDeclaredMethod(\n- \"scrollToUserRank\"\n- )\n+ val method: Method =\n+ LeaderboardFragment::class.java.getDeclaredMethod(\n+ \"scrollToUserRank\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -138,26 +134,27 @@ class LeaderboardFragmentUnitTests {\n fun testScrollToUserRankCaseNonZeroFalse() {\n Whitebox.setInternalState(fragment, \"userRank\", 1)\n `when`(adapter.itemCount).thenReturn(1)\n- val method: Method = LeaderboardFragment::class.java.getDeclaredMethod(\n- \"scrollToUserRank\"\n- )\n+ val method: Method =\n+ LeaderboardFragment::class.java.getDeclaredMethod(\n+ \"scrollToUserRank\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n \n-\n @Test\n @Throws(Exception::class)\n fun testSetLeaderboard() {\n Whitebox.setInternalState(fragment, \"sessionManager\", sessionManager)\n `when`(sessionManager.currentAccount).thenReturn(account)\n- val method: Method = LeaderboardFragment::class.java.getDeclaredMethod(\n- \"setLeaderboard\",\n- String::class.java,\n- String::class.java,\n- Int::class.java,\n- Int::class.java\n- )\n+ val method: Method =\n+ LeaderboardFragment::class.java.getDeclaredMethod(\n+ \"setLeaderboard\",\n+ String::class.java,\n+ String::class.java,\n+ Int::class.java,\n+ Int::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"\", \"\", 0, 0)\n }\n@@ -165,9 +162,10 @@ class LeaderboardFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testHideProgressBar() {\n- val method: Method = LeaderboardFragment::class.java.getDeclaredMethod(\n- \"hideProgressBar\"\n- )\n+ val method: Method =\n+ LeaderboardFragment::class.java.getDeclaredMethod(\n+ \"hideProgressBar\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -175,9 +173,10 @@ class LeaderboardFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testShowProgressBar() {\n- val method: Method = LeaderboardFragment::class.java.getDeclaredMethod(\n- \"showProgressBar\"\n- )\n+ val method: Method =\n+ LeaderboardFragment::class.java.getDeclaredMethod(\n+ \"showProgressBar\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -185,9 +184,10 @@ class LeaderboardFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnError() {\n- val method: Method = LeaderboardFragment::class.java.getDeclaredMethod(\n- \"onError\"\n- )\n+ val method: Method =\n+ LeaderboardFragment::class.java.getDeclaredMethod(\n+ \"onError\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -195,10 +195,11 @@ class LeaderboardFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testMenuVisibilityOverrideNotVisible() {\n- val method: Method = LeaderboardFragment::class.java.getDeclaredMethod(\n- \"setMenuVisibility\",\n- Boolean::class.java\n- )\n+ val method: Method =\n+ LeaderboardFragment::class.java.getDeclaredMethod(\n+ \"setMenuVisibility\",\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, false)\n Assert.assertNull(ShadowToast.getLatestToast())\n@@ -209,23 +210,22 @@ class LeaderboardFragmentUnitTests {\n fun testMenuVisibilityOverrideVisibleWithContext() {\n shadowOf(getMainLooper()).idle()\n `when`(parentView.context).thenReturn(context)\n- val method: Method = LeaderboardFragment::class.java.getDeclaredMethod(\n- \"setMenuVisibility\",\n- Boolean::class.java\n- )\n+ val method: Method =\n+ LeaderboardFragment::class.java.getDeclaredMethod(\n+ \"setMenuVisibility\",\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, true)\n- if(isBetaFlavour) {\n+ if (isBetaFlavour) {\n Assert.assertEquals(\n ShadowToast.getTextOfLatestToast().toString(),\n- context.getString(R.string.leaderboard_unavailable_beta)\n+ context.getString(R.string.leaderboard_unavailable_beta),\n )\n } else {\n Assert.assertNull(\n- ShadowToast.getTextOfLatestToast()\n+ ShadowToast.getTextOfLatestToast(),\n )\n }\n-\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/leaderboard/LeaderboardListAdapterUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/leaderboard/LeaderboardListAdapterUnitTests.kt\nindex d65c11f42b..50932d67b9 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/leaderboard/LeaderboardListAdapterUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/leaderboard/LeaderboardListAdapterUnitTests.kt\n@@ -28,7 +28,6 @@ import java.lang.reflect.Field\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class LeaderboardListAdapterUnitTests {\n-\n private lateinit var context: Context\n private lateinit var adapter: LeaderboardListAdapter\n \n@@ -97,5 +96,4 @@ class LeaderboardListAdapterUnitTests {\n `when`(pagedList.size).thenReturn(list.size)\n return pagedList\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/location/LatLngTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/location/LatLngTest.kt\nindex 1e7fa67fed..051b18d18f 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/location/LatLngTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/location/LatLngTest.kt\n@@ -9,7 +9,6 @@ class LatLngTest {\n \n @Before\n fun setup() {\n-\n }\n \n @Test\n@@ -40,14 +39,14 @@ class LatLngTest {\n fun testHashCodeDiffersWenLngZero() {\n latLng1 = LatLng(2.0, 0.0, 0.0f)\n latLng2 = LatLng(1.0, 0.0, 0.0f)\n- assert(latLng1.hashCode()!=latLng2.hashCode())\n+ assert(latLng1.hashCode() != latLng2.hashCode())\n }\n \n @Test\n fun testHashCodeDiffersWenLatZero() {\n latLng1 = LatLng(0.0, 1.0, 0.0f)\n latLng2 = LatLng(0.0, 2.0, 0.0f)\n- assert(latLng1.hashCode()!=latLng2.hashCode())\n+ assert(latLng1.hashCode() != latLng2.hashCode())\n }\n \n @Test\n@@ -62,4 +61,4 @@ class LatLngTest {\n latLng1 = LatLng(1.0, 2.0, 5.0f)\n assert(latLng1.toString().equals(\"lat/lng: (1.0,2.0)\"))\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerActivityUnitTests.kt\nindex e52028844a..6405ac9db8 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerActivityUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerActivityUnitTests.kt\n@@ -19,12 +19,12 @@ import fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment.LAST_ZO\n import io.reactivex.android.plugins.RxAndroidPlugins\n import io.reactivex.schedulers.Schedulers\n import org.junit.Assert\n-import org.junit.Assert.*\n import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n import org.mockito.Mock\n-import org.mockito.Mockito.*\n+import org.mockito.Mockito.any\n+import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n import org.osmdroid.util.GeoPoint\n import org.powermock.reflect.Whitebox\n@@ -40,7 +40,6 @@ import java.lang.reflect.Method\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class LocationPickerActivityUnitTests {\n-\n private lateinit var activity: LocationPickerActivity\n private lateinit var context: Context\n \n@@ -114,9 +113,10 @@ class LocationPickerActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testAddCredits() {\n- val method: Method = LocationPickerActivity::class.java.getDeclaredMethod(\n- \"addCredits\"\n- )\n+ val method: Method =\n+ LocationPickerActivity::class.java.getDeclaredMethod(\n+ \"addCredits\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n verify(tvAttribution).text = any()\n@@ -126,9 +126,10 @@ class LocationPickerActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnClickModifyLocation() {\n- val method: Method = LocationPickerActivity::class.java.getDeclaredMethod(\n- \"onClickModifyLocation\"\n- )\n+ val method: Method =\n+ LocationPickerActivity::class.java.getDeclaredMethod(\n+ \"onClickModifyLocation\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n verify(placeSelectedButton, times(1)).visibility = View.VISIBLE\n@@ -145,9 +146,10 @@ class LocationPickerActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnClickRemoveLocation() {\n- val method: Method = LocationPickerActivity::class.java.getDeclaredMethod(\n- \"onClickRemoveLocation\"\n- )\n+ val method: Method =\n+ LocationPickerActivity::class.java.getDeclaredMethod(\n+ \"onClickRemoveLocation\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -156,22 +158,20 @@ class LocationPickerActivityUnitTests {\n @Throws(Exception::class)\n fun testPlaceSelected() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- Whitebox.setInternalState(activity,\"activity\", \"NoLocationUploadActivity\")\n+ Whitebox.setInternalState(activity, \"activity\", \"NoLocationUploadActivity\")\n val position = GeoPoint(51.50550, -0.07520)\n- val method: Method = LocationPickerActivity::class.java.getDeclaredMethod(\n- \"placeSelected\"\n- )\n+ val method: Method =\n+ LocationPickerActivity::class.java.getDeclaredMethod(\n+ \"placeSelected\",\n+ )\n `when`(mapView.mapCenter).thenReturn(position)\n `when`(mapView.zoomLevel).thenReturn(15)\n method.isAccessible = true\n method.invoke(activity)\n verify(applicationKvStore, times(1)).putString(\n LAST_LOCATION,\n- position.latitude.toString() + \",\" + position.longitude.toString()\n+ position.latitude.toString() + \",\" + position.longitude.toString(),\n )\n verify(applicationKvStore, times(1)).putString(LAST_ZOOM, mapView.zoomLevel.toString())\n }\n-\n-\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerViewModelUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerViewModelUnitTests.kt\nindex b75927ffd8..84a74741dd 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerViewModelUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerViewModelUnitTests.kt\n@@ -18,7 +18,6 @@ import retrofit2.Call\n import retrofit2.Response\n \n class LocationPickerViewModelUnitTests {\n-\n private lateinit var viewModel: LocationPickerViewModel\n \n @Mock\n@@ -68,5 +67,4 @@ class LocationPickerViewModelUnitTests {\n fun testGetResult() {\n viewModel.result\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/login/LoginActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/login/LoginActivityUnitTests.kt\nindex 3a0bf557ad..ba6aa6c55d 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/login/LoginActivityUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/login/LoginActivityUnitTests.kt\n@@ -9,8 +9,8 @@ import androidx.test.core.app.ApplicationProvider\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.auth.LoginActivity\n+import fr.free.nrw.commons.createTestClient\n import org.junit.Assert\n import org.junit.Before\n import org.junit.Test\n@@ -23,11 +23,9 @@ import org.robolectric.annotation.Config\n import org.robolectric.fakes.RoboMenuItem\n import java.lang.reflect.Field\n \n-\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class LoginActivityUnitTests {\n-\n @Mock\n private lateinit var activity: LoginActivity\n \n@@ -46,7 +44,6 @@ class LoginActivityUnitTests {\n \n @Before\n fun setUp() {\n-\n MockitoAnnotations.openMocks(this)\n \n OkHttpConnectionFactory.CLIENT = createTestClient()\n@@ -116,5 +113,4 @@ class LoginActivityUnitTests {\n fun testSetContentView() {\n activity.setContentView(view, params)\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/media/CustomOkHttpNetworkFetcherUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/media/CustomOkHttpNetworkFetcherUnitTest.kt\nindex 2c7e12a4cc..16a35a67ba 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/media/CustomOkHttpNetworkFetcherUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/media/CustomOkHttpNetworkFetcherUnitTest.kt\n@@ -12,7 +12,13 @@ import com.nhaarman.mockitokotlin2.verify\n import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.CommonsApplication\n import fr.free.nrw.commons.kvstore.JsonKvStore\n-import okhttp3.*\n+import okhttp3.CacheControl\n+import okhttp3.Call\n+import okhttp3.OkHttpClient\n+import okhttp3.Protocol\n+import okhttp3.Request\n+import okhttp3.Response\n+import okhttp3.ResponseBody\n import org.junit.Assert\n import org.junit.Before\n import org.junit.Test\n@@ -24,7 +30,6 @@ import java.lang.reflect.Method\n import java.util.concurrent.Executor\n \n class CustomOkHttpNetworkFetcherUnitTest {\n-\n private lateinit var fetcher: CustomOkHttpNetworkFetcher\n private lateinit var okHttpClient: OkHttpClient\n private lateinit var state: CustomOkHttpNetworkFetcher.OkHttpNetworkFetchState\n@@ -91,8 +96,8 @@ class CustomOkHttpNetworkFetcherUnitTest {\n whenever(\n defaultKvStore.getBoolean(\n CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED,\n- false\n- )\n+ false,\n+ ),\n ).thenReturn(true)\n fetcher.fetch(state, callback)\n verify(callback).onFailure(any())\n@@ -105,8 +110,8 @@ class CustomOkHttpNetworkFetcherUnitTest {\n whenever(\n defaultKvStore.getBoolean(\n CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED,\n- false\n- )\n+ false,\n+ ),\n ).thenReturn(false)\n fetcher.fetch(state, callback)\n fetcher.onFetchCompletion(state, 0)\n@@ -120,8 +125,8 @@ class CustomOkHttpNetworkFetcherUnitTest {\n whenever(\n defaultKvStore.getBoolean(\n CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED,\n- false\n- )\n+ false,\n+ ),\n ).thenReturn(false)\n fetcher.fetch(state, callback)\n verify(callback).onFailure(any())\n@@ -138,9 +143,11 @@ class CustomOkHttpNetworkFetcherUnitTest {\n @Throws(Exception::class)\n fun testOnFetchCancellationRequested() {\n Whitebox.setInternalState(fetcher, \"mCancellationExecutor\", executor)\n- val method: Method = CustomOkHttpNetworkFetcher::class.java.getDeclaredMethod(\n- \"onFetchCancellationRequested\", Call::class.java,\n- )\n+ val method: Method =\n+ CustomOkHttpNetworkFetcher::class.java.getDeclaredMethod(\n+ \"onFetchCancellationRequested\",\n+ Call::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fetcher, call)\n verify(executor).execute(any())\n@@ -152,13 +159,14 @@ class CustomOkHttpNetworkFetcherUnitTest {\n whenever(response.body).thenReturn(body)\n whenever(response.isSuccessful).thenReturn(false)\n whenever(call.isCanceled()).thenReturn(true)\n- val method: Method = CustomOkHttpNetworkFetcher::class.java.getDeclaredMethod(\n- \"onFetchResponse\",\n- CustomOkHttpNetworkFetcher.OkHttpNetworkFetchState::class.java,\n- Call::class.java,\n- Response::class.java,\n- NetworkFetcher.Callback::class.java,\n- )\n+ val method: Method =\n+ CustomOkHttpNetworkFetcher::class.java.getDeclaredMethod(\n+ \"onFetchResponse\",\n+ CustomOkHttpNetworkFetcher.OkHttpNetworkFetchState::class.java,\n+ Call::class.java,\n+ Response::class.java,\n+ NetworkFetcher.Callback::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fetcher, state, call, response, callback)\n verify(callback).onCancellation()\n@@ -174,22 +182,25 @@ class CustomOkHttpNetworkFetcherUnitTest {\n whenever(body.contentLength()).thenReturn(-1)\n \n // Build Response object with Content-Range header\n- val responseBuilder = Response.Builder()\n- .request(Request.Builder().url(\"http://example.com\").build())\n- .protocol(Protocol.HTTP_1_1)\n- .code(200)\n- .message(\"OK\")\n- .header(\"Content-Range\", \"bytes 200-1000/67589\")\n- .body(body)\n+ val responseBuilder =\n+ Response\n+ .Builder()\n+ .request(Request.Builder().url(\"http://example.com\").build())\n+ .protocol(Protocol.HTTP_1_1)\n+ .code(200)\n+ .message(\"OK\")\n+ .header(\"Content-Range\", \"bytes 200-1000/67589\")\n+ .body(body)\n whenever(call.execute()).thenReturn(responseBuilder.build())\n \n- val method: Method = CustomOkHttpNetworkFetcher::class.java.getDeclaredMethod(\n- \"onFetchResponse\",\n- CustomOkHttpNetworkFetcher.OkHttpNetworkFetchState::class.java,\n- Call::class.java,\n- Response::class.java,\n- NetworkFetcher.Callback::class.java,\n- )\n+ val method: Method =\n+ CustomOkHttpNetworkFetcher::class.java.getDeclaredMethod(\n+ \"onFetchResponse\",\n+ CustomOkHttpNetworkFetcher.OkHttpNetworkFetchState::class.java,\n+ Call::class.java,\n+ Response::class.java,\n+ NetworkFetcher.Callback::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fetcher, state, call, responseBuilder.build(), callback)\n verify(callback).onResponse(null, 0)\n@@ -205,25 +216,27 @@ class CustomOkHttpNetworkFetcherUnitTest {\n whenever(body.contentLength()).thenReturn(-1)\n \n // Build Response object with Content-Range header\n- val responseBuilder = Response.Builder()\n- .request(Request.Builder().url(\"http://example.com\").build())\n- .protocol(Protocol.HTTP_1_1)\n- .code(200)\n- .message(\"OK\")\n- .header(\"Content-Range\", \"Test\")\n- .body(body)\n+ val responseBuilder =\n+ Response\n+ .Builder()\n+ .request(Request.Builder().url(\"http://example.com\").build())\n+ .protocol(Protocol.HTTP_1_1)\n+ .code(200)\n+ .message(\"OK\")\n+ .header(\"Content-Range\", \"Test\")\n+ .body(body)\n whenever(call.execute()).thenReturn(responseBuilder.build())\n \n- val method: Method = CustomOkHttpNetworkFetcher::class.java.getDeclaredMethod(\n- \"onFetchResponse\",\n- CustomOkHttpNetworkFetcher.OkHttpNetworkFetchState::class.java,\n- Call::class.java,\n- Response::class.java,\n- NetworkFetcher.Callback::class.java,\n- )\n+ val method: Method =\n+ CustomOkHttpNetworkFetcher::class.java.getDeclaredMethod(\n+ \"onFetchResponse\",\n+ CustomOkHttpNetworkFetcher.OkHttpNetworkFetchState::class.java,\n+ Call::class.java,\n+ Response::class.java,\n+ NetworkFetcher.Callback::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fetcher, state, call, responseBuilder.build(), callback)\n verify(callback).onFailure(any())\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaClientTest.kt\nindex c7f5a0e47a..cc6cdb6179 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaClientTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaClientTest.kt\n@@ -6,6 +6,11 @@ import fr.free.nrw.commons.BuildConfig\n import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.explore.media.MediaConverter\n import fr.free.nrw.commons.media.model.PageMediaListResponse\n+import fr.free.nrw.commons.wikidata.model.Entities\n+import fr.free.nrw.commons.wikidata.model.gallery.ImageInfo\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult\n import io.reactivex.Single\n import media\n import org.junit.Before\n@@ -13,15 +18,8 @@ import org.junit.Test\n import org.mockito.ArgumentMatchers\n import org.mockito.Mock\n import org.mockito.MockitoAnnotations\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult\n-import fr.free.nrw.commons.wikidata.model.gallery.ImageInfo\n-import fr.free.nrw.commons.wikidata.model.Entities\n-\n \n class MediaClientTest {\n-\n @Mock\n internal lateinit var mediaInterface: MediaInterface\n \n@@ -71,9 +69,10 @@ class MediaClientTest {\n \n @Test\n fun `checkFileExistsUsingSha returns false with no Images`() {\n- val mwQueryResponse = mockQuery {\n- whenever(allImages()).thenReturn(listOf())\n- }\n+ val mwQueryResponse =\n+ mockQuery {\n+ whenever(allImages()).thenReturn(listOf())\n+ }\n whenever(mediaInterface.checkFileExistsUsingSha(\"\"))\n .thenReturn(Single.just(mwQueryResponse))\n mediaClient.checkFileExistsUsingSha(\"\").test().assertValue(false)\n@@ -81,9 +80,10 @@ class MediaClientTest {\n \n @Test\n fun `checkFileExistsUsingSha returns true with Images`() {\n- val mwQueryResponse = mockQuery {\n- whenever(allImages()).thenReturn(listOf(mock()))\n- }\n+ val mwQueryResponse =\n+ mockQuery {\n+ whenever(allImages()).thenReturn(listOf(mock()))\n+ }\n whenever(mediaInterface.checkFileExistsUsingSha(\"\"))\n .thenReturn(Single.just(mwQueryResponse))\n mediaClient.checkFileExistsUsingSha(\"\").test().assertValue(true)\n@@ -101,7 +101,7 @@ class MediaClientTest {\n mediaClient.getMediaListFromCategory(\"\").test().assertError { true }\n \n mediaClient.resetCategoryContinuation(\"\")\n- val (resetMwQueryResponse, resetMedia)=expectSuccessfulMapping()\n+ val (resetMwQueryResponse, resetMedia) = expectSuccessfulMapping()\n whenever(mediaInterface.getMediaListFromCategory(\"\", 10, emptyMap()))\n .thenReturn(Single.just(resetMwQueryResponse))\n mediaClient.getMediaListFromCategory(\"\").test().assertValues(listOf(resetMedia))\n@@ -121,7 +121,8 @@ class MediaClientTest {\n val (mwQueryResponse, media) = expectSuccessfulMapping()\n whenever(mediaInterface.getMediaListFromSearch(\"\", 0, 1))\n .thenReturn(Single.just(mwQueryResponse))\n- mediaClient.getMediaListFromSearch(\"\", 0, 1)\n+ mediaClient\n+ .getMediaListFromSearch(\"\", 0, 1)\n .test()\n .assertValues(listOf(media))\n }\n@@ -131,7 +132,8 @@ class MediaClientTest {\n val (mwQueryResponse, media) = expectSuccessfulMapping()\n whenever(mediaInterface.fetchImagesForDepictedItem(\"haswbstatement:${BuildConfig.DEPICTS_PROPERTY}=\", \"0\", \"1\"))\n .thenReturn(Single.just(mwQueryResponse))\n- mediaClient.fetchImagesForDepictedItem(\"\", 0, 1)\n+ mediaClient\n+ .fetchImagesForDepictedItem(\"\", 0, 1)\n .test()\n .assertValues(listOf(media))\n }\n@@ -178,7 +180,7 @@ class MediaClientTest {\n fun `getEntities invokes interface with non empty ids`() {\n val entities = mock()\n whenever(mediaDetailInterface.getEntity(\"1|2\")).thenReturn(Single.just(entities))\n- mediaClient.getEntities(listOf(\"1\",\"2\")).test().assertValue(entities)\n+ mediaClient.getEntities(listOf(\"1\", \"2\")).test().assertValue(entities)\n }\n \n @Test\n@@ -213,21 +215,21 @@ class MediaClientTest {\n return mwQueryResponse\n }\n \n- private fun expectResponseWithPageId(expectedId: Int): MwQueryResponse {\n- return mockQuery {\n+ private fun expectResponseWithPageId(expectedId: Int): MwQueryResponse =\n+ mockQuery {\n val mwQueryPage = mock()\n whenever(firstPage()).thenReturn(mwQueryPage)\n whenever(mwQueryPage.pageId()).thenReturn(expectedId)\n }\n- }\n \n private fun expectSuccessfulMapping(continuationMap: Map? = emptyMap()): Pair {\n val media = media()\n val mwQueryPage = mock()\n- val mwQueryResponse = mockQuery {\n- whenever(pages()).thenReturn(listOf(mwQueryPage, mwQueryPage))\n- whenever(mwQueryPage.pageId()).thenReturn(1, 2)\n- }\n+ val mwQueryResponse =\n+ mockQuery {\n+ whenever(pages()).thenReturn(listOf(mwQueryPage, mwQueryPage))\n+ whenever(mwQueryPage.pageId()).thenReturn(1, 2)\n+ }\n whenever(mwQueryResponse.continuation()).thenReturn(continuationMap)\n val entities = mock()\n whenever(mediaDetailInterface.getEntity(\"M1|M2\")).thenReturn(Single.just(entities))\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt\nindex a153027c85..7f9e3d5763 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt\n@@ -12,7 +12,13 @@ import android.view.View\n import android.view.View.GONE\n import android.view.ViewTreeObserver\n import android.webkit.WebView\n-import android.widget.*\n+import android.widget.Button\n+import android.widget.LinearLayout\n+import android.widget.ListView\n+import android.widget.ProgressBar\n+import android.widget.ScrollView\n+import android.widget.Spinner\n+import android.widget.TextView\n import androidx.fragment.app.FragmentManager\n import androidx.fragment.app.FragmentTransaction\n import androidx.test.core.app.ApplicationProvider\n@@ -25,7 +31,6 @@ import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.LocationPicker.LocationPickerActivity\n import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.OkHttpConnectionFactory\n-import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.databinding.FragmentMediaDetailBinding\n@@ -41,8 +46,18 @@ import org.junit.Assert\n import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n-import org.mockito.*\n-import org.mockito.Mockito.*\n+import org.mockito.ArgumentMatchers\n+import org.mockito.Mock\n+import org.mockito.Mockito\n+import org.mockito.Mockito.anyInt\n+import org.mockito.Mockito.anyString\n+import org.mockito.Mockito.mock\n+import org.mockito.Mockito.never\n+import org.mockito.Mockito.spy\n+import org.mockito.Mockito.times\n+import org.mockito.Mockito.verify\n+import org.mockito.Mockito.`when`\n+import org.mockito.MockitoAnnotations\n import org.powermock.reflect.Whitebox\n import org.robolectric.Robolectric\n import org.robolectric.RobolectricTestRunner\n@@ -54,15 +69,15 @@ import org.robolectric.shadows.ShadowActivity\n import org.robolectric.shadows.ShadowIntent\n import java.lang.reflect.Field\n import java.lang.reflect.Method\n-import java.util.*\n+import java.util.Date\n+import java.util.Locale\n \n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class MediaDetailFragmentUnitTests {\n-\n- private val REQUEST_CODE = 1001\n- private val LAST_LOCATION = \"last_location_while_uploading\"\n+ private val requestCode = 1001\n+ private val lastLocation = \"last_location_while_uploading\"\n private lateinit var fragment: MediaDetailFragment\n private lateinit var fragmentManager: FragmentManager\n private lateinit var layoutInflater: LayoutInflater\n@@ -80,7 +95,6 @@ class MediaDetailFragmentUnitTests {\n @Mock\n private lateinit var delete: Button\n \n-\n private var isDeleted = true\n \n @Mock\n@@ -138,21 +152,20 @@ class MediaDetailFragmentUnitTests {\n private lateinit var intent: Intent\n \n private lateinit var activity: SearchActivity\n- \n+\n @Mock\n private lateinit var mockContext: Context\n- \n+\n @Mock\n private lateinit var mockSharedPreferences: SharedPreferences\n- \n+\n @Mock\n- private lateinit var mockSharedPreferencesEditor: SharedPreferences.Editor\n+ private lateinit var mockSharedPreferencesEditor: SharedPreferences.Editor\n \n private lateinit var binding: FragmentMediaDetailBinding\n \n @Before\n fun setUp() {\n-\n MockitoAnnotations.openMocks(this)\n \n context = ApplicationProvider.getApplicationContext()\n@@ -221,19 +234,19 @@ class MediaDetailFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnActivityResultLocationPickerActivity() {\n- fragment.onActivityResult(REQUEST_CODE, Activity.RESULT_CANCELED, intent)\n+ fragment.onActivityResult(requestCode, Activity.RESULT_CANCELED, intent)\n }\n \n @Test\n @Throws(Exception::class)\n fun `test OnActivity Result Cancelled LocationPickerActivity`() {\n- fragment.onActivityResult(REQUEST_CODE, Activity.RESULT_CANCELED, intent)\n+ fragment.onActivityResult(requestCode, Activity.RESULT_CANCELED, intent)\n }\n \n @Test\n @Throws(Exception::class)\n fun `test OnActivity Result Cancelled DescriptionEditActivity`() {\n- fragment.onActivityResult(REQUEST_CODE, Activity.RESULT_OK, intent)\n+ fragment.onActivityResult(requestCode, Activity.RESULT_OK, intent)\n }\n \n @Test\n@@ -254,7 +267,7 @@ class MediaDetailFragmentUnitTests {\n fun testOnUpdateCoordinatesClickedCurrentLocationNull() {\n `when`(media.coordinates).thenReturn(null)\n `when`(locationManager.lastLocation).thenReturn(null)\n- `when`(applicationKvStore.getString(LAST_LOCATION)).thenReturn(\"37.773972,-122.431297\")\n+ `when`(applicationKvStore.getString(lastLocation)).thenReturn(\"37.773972,-122.431297\")\n fragment.onUpdateCoordinatesClicked()\n Mockito.verify(media, Mockito.times(1)).coordinates\n Mockito.verify(locationManager, Mockito.times(1)).lastLocation\n@@ -268,7 +281,7 @@ class MediaDetailFragmentUnitTests {\n @Throws(Exception::class)\n fun testOnUpdateCoordinatesClickedNotNullValue() {\n `when`(media.coordinates).thenReturn(LatLng(-0.000001, -0.999999, 0f))\n- `when`(applicationKvStore.getString(LAST_LOCATION)).thenReturn(\"37.773972,-122.431297\")\n+ `when`(applicationKvStore.getString(lastLocation)).thenReturn(\"37.773972,-122.431297\")\n fragment.onUpdateCoordinatesClicked()\n Mockito.verify(media, Mockito.times(3)).coordinates\n val shadowActivity: ShadowActivity = shadowOf(activity)\n@@ -282,7 +295,7 @@ class MediaDetailFragmentUnitTests {\n fun testOnUpdateCoordinatesClickedCurrentLocationNotNull() {\n `when`(media.coordinates).thenReturn(null)\n `when`(locationManager.lastLocation).thenReturn(LatLng(-0.000001, -0.999999, 0f))\n- `when`(applicationKvStore.getString(LAST_LOCATION)).thenReturn(\"37.773972,-122.431297\")\n+ `when`(applicationKvStore.getString(lastLocation)).thenReturn(\"37.773972,-122.431297\")\n \n fragment.onUpdateCoordinatesClicked()\n Mockito.verify(locationManager, Mockito.times(3)).lastLocation\n@@ -327,10 +340,11 @@ class MediaDetailFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testExtractDescription() {\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"extractDescription\",\n- String::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"extractDescription\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"\")\n }\n@@ -339,9 +353,10 @@ class MediaDetailFragmentUnitTests {\n @Throws(Exception::class)\n fun testGetDescription() {\n `when`(media.filename).thenReturn(\"\")\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"getDescription\"\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"getDescription\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -352,7 +367,8 @@ class MediaDetailFragmentUnitTests {\n `when`(media.filename).thenReturn(\"\")\n val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\"getDescriptions\", String::class.java)\n method.isAccessible = true\n- val s = \"=={{int:filedesc}}==\\n\" +\n+ val s =\n+ \"=={{int:filedesc}}==\\n\" +\n \"{{Information\\n\" +\n \"|description={{en|1=Antique cash register in a cafe, Darjeeling}}\\n\" +\n \"|date=2017-05-17 17:07:26\\n\" +\n@@ -373,7 +389,8 @@ class MediaDetailFragmentUnitTests {\n `when`(media.filename).thenReturn(\"\")\n val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\"getDescriptions\", String::class.java)\n method.isAccessible = true\n- val s = \"=={{int:filedesc}}==\\n\" +\n+ val s =\n+ \"=={{int:filedesc}}==\\n\" +\n \"{{Information\\n\" +\n \"|description={{en|1=[[:en:Fitzrovia Chapel|Fitzrovia Chapel]] ceiling
                  \\n\" +\n \"{{On Wikidata|Q17549757}}}}\\n\" +\n@@ -396,7 +413,8 @@ class MediaDetailFragmentUnitTests {\n `when`(media.filename).thenReturn(\"\")\n val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\"getDescriptions\", String::class.java)\n method.isAccessible = true\n- val s = \"=={{int:filedesc}}==\\n\" +\n+ val s =\n+ \"=={{int:filedesc}}==\\n\" +\n \"{{Information\\n\" +\n \"|description={{en|1=[[:en:Fitzrovia Chapel|Fitzrovia Chapel]] ceiling
                  \\n\" +\n \"}}{{Listed building England|1223496}}\\n\" +\n@@ -419,13 +437,18 @@ class MediaDetailFragmentUnitTests {\n `when`(media.filename).thenReturn(\"\")\n val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\"getDescriptions\", String::class.java)\n method.isAccessible = true\n- val s = \"=={{int:filedesc}}==\\n\" +\n+ val s =\n+ \"=={{int:filedesc}}==\\n\" +\n \"{{Artwork\\n\" +\n \" |artist = {{Creator:Filippo Peroni}} Restored by {{Creator:Adam Cuerden}}\\n\" +\n \" |author = \\n\" +\n \" |title = Ricchi giardini nel Palazzo di Monforte a Palermo\\n\" +\n- \" |description = {{en|''Ricchi giardini nel Palazzo di Monforte a Palermo'', set design for ''I Vespri siciliani'' act 5 (undated).}} {{it|''Ricchi giardini nel Palazzo di Monforte a Palermo'', bozzetto per ''I Vespri siciliani'' atto 5 (s.d.).}}\\n\" +\n- \" |date = {{between|1855|1878}} (Premi\u00e9re of the opera and death of the artist, respectively)\\n\" +\n+ \" |description = {{en|''Ricchi giardini nel Palazzo di Monforte a Palermo'',\" +\n+ \" set design for ''I Vespri siciliani'' act 5 (undated).}} {{it|''Ricchi\" +\n+ \" giardini nel Palazzo di Monforte a Palermo'', bozzetto per ''I Vespri\" +\n+ \" siciliani'' atto 5 (s.d.).}}\\n\" +\n+ \" |date = {{between|1855|1878}} (Premi\u00e9re of the opera and death of the artist, \" +\n+ \"respectively)\\n\" +\n \" |medium = {{technique|watercolor|and=tempera|and2=|over=paper}}\\n\" +\n \" |dimensions = {{Size|unit=mm|height=210|width=270}}\\n\" +\n \" |institution = {{Institution:Archivio Storico Ricordi}}\\n\" +\n@@ -438,17 +461,28 @@ class MediaDetailFragmentUnitTests {\n \" |notes = \\n\" +\n \" |accession number = ICON000132\\n\" +\n \" |place of creation = \\n\" +\n- \" |source = [https://www.archivioricordi.com/chi-siamo/glam-archivio-ricordi/#/ Archivio Storico Ricordi], [https://www.digitalarchivioricordi.com/it/works/display/108/Vespri_Siciliani__I Collezione Digitale Ricordi]\\n\" +\n+ \" |source = [https://www.archivioricordi.com/chi-siamo/glam-archivio-ricordi/#/\" +\n+ \" Archivio Storico Ricordi], [https://www.digitalarchivioricordi.com/it/\" +\n+ \"works/display/108/Vespri_Siciliani__I Collezione Digitale Ricordi]\\n\" +\n \" |permission={{PermissionTicket|id=2022031410007974|user=Ruthven}} \\n\" +\n \" |other_versions = \\n\" +\n- \"* [[:File:Ricchi giardini nel Palazzo di Monforte a Palermo, bozzetto di Filippo Peroni per I Vespri siciliani (s.d.) - Archivio Storico Ricordi ICON000132 - Restoration.jpg]] - Restoration (JPEG)\\n\" +\n- \"* [[:File:Ricchi giardini nel Palazzo di Monforte a Palermo, bozzetto di Filippo Peroni per I Vespri siciliani (s.d.) - Archivio Storico Ricordi ICON000132 - Restoration.png]] - Restoration (PNG)\\n\" +\n- \"* [[:File:Ricchi giardini nel Palazzo di Monforte a Palermo, bozzetto di Filippo Peroni per I Vespri siciliani (s.d.) - Archivio Storico Ricordi ICON000132.jpg]] - Original (JPEG)\\n\" +\n+ \"* [[:File:Ricchi giardini nel Palazzo di Monforte a Palermo, bozzetto di\" +\n+ \" Filippo Peroni per I Vespri siciliani (s.d.) - Archivio Storico Ricordi\" +\n+ \" ICON000132 - Restoration.jpg]] - Restoration (JPEG)\\n\" +\n+ \"* [[:File:Ricchi giardini nel Palazzo di Monforte a Palermo, bozzetto di\" +\n+ \" Filippo Peroni per I Vespri siciliani (s.d.) - Archivio Storico Ricordi\" +\n+ \" ICON000132 - Restoration.png]] - Restoration (PNG)\\n\" +\n+ \"* [[:File:Ricchi giardini nel Palazzo di Monforte a Palermo, bozzetto di\" +\n+ \" Filippo Peroni per I Vespri siciliani (s.d.) - Archivio Storico Ricordi\" +\n+ \" ICON000132.jpg]] - Original (JPEG)\\n\" +\n \" |references = \\n\" +\n \" |wikidata = \\n\" +\n \"}}\"\n- val map = linkedMapOf(\"en\" to \"''Ricchi giardini nel Palazzo di Monforte a Palermo'', set design for ''I Vespri siciliani'' act 5 (undated).\",\n- \"it\" to \"''Ricchi giardini nel Palazzo di Monforte a Palermo'', bozzetto per ''I Vespri siciliani'' atto 5 (s.d.).\")\n+ val map =\n+ linkedMapOf(\n+ \"en\" to \"''Ricchi giardini nel Palazzo di Monforte a Palermo'', set design for ''I Vespri siciliani'' act 5 (undated).\",\n+ \"it\" to \"''Ricchi giardini nel Palazzo di Monforte a Palermo'', bozzetto per ''I Vespri siciliani'' atto 5 (s.d.).\",\n+ )\n Assert.assertEquals(map, method.invoke(fragment, s))\n }\n \n@@ -458,7 +492,8 @@ class MediaDetailFragmentUnitTests {\n `when`(media.filename).thenReturn(\"\")\n val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\"getDescriptions\", String::class.java)\n method.isAccessible = true\n- val s = \"=={{int:filedesc}}==\\n\" +\n+ val s =\n+ \"=={{int:filedesc}}==\\n\" +\n \"{{Information\\n\" +\n \"|Description ={{en|1=The interior of Sacred Heart RC Church, Wimbledon, London.}}\\n\" +\n \"|Source ={{own}}\\n\" +\n@@ -475,9 +510,10 @@ class MediaDetailFragmentUnitTests {\n @Throws(Exception::class)\n fun testGetDescriptionList() {\n `when`(media.filename).thenReturn(\"\")\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"getDescriptionList\"\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"getDescriptionList\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -486,9 +522,10 @@ class MediaDetailFragmentUnitTests {\n @Throws(Exception::class)\n fun testGetCaptions() {\n `when`(media.captions).thenReturn(mapOf(Pair(\"a\", \"b\")))\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"getCaptions\"\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"getCaptions\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -497,9 +534,10 @@ class MediaDetailFragmentUnitTests {\n @Throws(Exception::class)\n fun testGetCaptionsCaseEmpty() {\n `when`(media.captions).thenReturn(mapOf())\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"getCaptions\"\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"getCaptions\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -512,9 +550,10 @@ class MediaDetailFragmentUnitTests {\n MediaDetailFragment::class.java.getDeclaredField(\"descriptionHtmlCode\")\n field.isAccessible = true\n field.set(fragment, null)\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"setUpCaptionAndDescriptionLayout\"\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"setUpCaptionAndDescriptionLayout\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -557,10 +596,11 @@ class MediaDetailFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testPrettyCoordinatesCaseNull() {\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"prettyCoordinates\",\n- Media::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"prettyCoordinates\",\n+ Media::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, media)\n }\n@@ -569,10 +609,11 @@ class MediaDetailFragmentUnitTests {\n @Throws(Exception::class)\n fun testPrettyCoordinates() {\n `when`(media.coordinates).thenReturn(LatLng(-0.000001, -0.999999, 0f))\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"prettyCoordinates\",\n- Media::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"prettyCoordinates\",\n+ Media::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, media)\n }\n@@ -581,10 +622,11 @@ class MediaDetailFragmentUnitTests {\n @Throws(Exception::class)\n fun testPrettyUploadedDateCaseNull() {\n `when`(media.dateUploaded).thenReturn(null)\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"prettyUploadedDate\",\n- Media::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"prettyUploadedDate\",\n+ Media::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, media)\n }\n@@ -593,10 +635,11 @@ class MediaDetailFragmentUnitTests {\n @Throws(Exception::class)\n fun testPrettyUploadedDateCaseNonNull() {\n `when`(media.dateUploaded).thenReturn(Date(2000, 1, 1))\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"prettyUploadedDate\",\n- Media::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"prettyUploadedDate\",\n+ Media::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, media)\n }\n@@ -605,10 +648,11 @@ class MediaDetailFragmentUnitTests {\n @Throws(Exception::class)\n fun testPrettyLicenseCaseNull() {\n `when`(media.license).thenReturn(null)\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"prettyLicense\",\n- Media::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"prettyLicense\",\n+ Media::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, media)\n }\n@@ -617,10 +661,11 @@ class MediaDetailFragmentUnitTests {\n @Throws(Exception::class)\n fun testPrettyLicenseCaseNonNull() {\n `when`(media.license).thenReturn(\"licence\")\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"prettyLicense\",\n- Media::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"prettyLicense\",\n+ Media::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, media)\n }\n@@ -628,10 +673,11 @@ class MediaDetailFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testPrettyDiscussion() {\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"prettyDiscussion\",\n- String::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"prettyDiscussion\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"mock\")\n }\n@@ -639,10 +685,11 @@ class MediaDetailFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testExtractCaptionDescription() {\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"extractCaptionDescription\",\n- String::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"extractCaptionDescription\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"mock\")\n }\n@@ -650,10 +697,11 @@ class MediaDetailFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testGetDescriptions() {\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"getDescriptions\",\n- String::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"getDescriptions\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"mock\")\n }\n@@ -662,10 +710,11 @@ class MediaDetailFragmentUnitTests {\n @Throws(Exception::class)\n fun testPrettyCaptionCaseEmpty() {\n `when`(media.captions).thenReturn(mapOf(Pair(\"a\", \"\")))\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"prettyCaption\",\n- Media::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"prettyCaption\",\n+ Media::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, media)\n }\n@@ -674,10 +723,11 @@ class MediaDetailFragmentUnitTests {\n @Throws(Exception::class)\n fun testPrettyCaptionCaseNonEmpty() {\n `when`(media.captions).thenReturn(mapOf(Pair(\"a\", \"b\")))\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"prettyCaption\",\n- Media::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"prettyCaption\",\n+ Media::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, media)\n }\n@@ -686,10 +736,11 @@ class MediaDetailFragmentUnitTests {\n @Throws(Exception::class)\n fun testPrettyCaption() {\n `when`(media.captions).thenReturn(mapOf())\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"prettyCaption\",\n- Media::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"prettyCaption\",\n+ Media::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, media)\n }\n@@ -697,9 +748,10 @@ class MediaDetailFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testSetupImageView() {\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"setupImageView\"\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"setupImageView\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -707,10 +759,11 @@ class MediaDetailFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnDiscussionLoaded() {\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"onDiscussionLoaded\",\n- String::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"onDiscussionLoaded\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"\")\n }\n@@ -723,16 +776,25 @@ class MediaDetailFragmentUnitTests {\n `when`(media.imageUrl).thenReturn(\"test@example.com\")\n `when`(spinner.selectedItemPosition).thenReturn(0)\n `when`(reasonListEnglishMappings?.get(spinner.selectedItemPosition)).thenReturn(\"TESTING\")\n- `when`(applicationKvStore.getBoolean(String.format(MediaDetailFragment.NOMINATING_FOR_DELETION_MEDIA,media.imageUrl\n- ))).thenReturn(true)\n- doReturn(Single.just(true)).`when`(deleteHelper).makeDeletion(ArgumentMatchers.any(),ArgumentMatchers.any(), ArgumentMatchers.any())\n+ `when`(\n+ applicationKvStore.getBoolean(\n+ String.format(\n+ MediaDetailFragment.NOMINATING_FOR_DELETION_MEDIA,\n+ media.imageUrl,\n+ ),\n+ ),\n+ ).thenReturn(true)\n+ doReturn(\n+ Single.just(true),\n+ ).`when`(deleteHelper).makeDeletion(ArgumentMatchers.any(), ArgumentMatchers.any(), ArgumentMatchers.any())\n \n doReturn(Single.just(\"\")).`when`(reasonBuilder).getReason(ArgumentMatchers.any(), ArgumentMatchers.any())\n \n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"onDeleteClicked\",\n- Spinner::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"onDeleteClicked\",\n+ Spinner::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, spinner)\n }\n@@ -769,9 +831,10 @@ class MediaDetailFragmentUnitTests {\n @Throws(Exception::class)\n fun testDisplayMediaDetails() {\n whenever(media.filename).thenReturn(\"File:Example.jpg\")\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"displayMediaDetails\"\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"displayMediaDetails\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n verify(media, times(4)).filename\n@@ -780,10 +843,11 @@ class MediaDetailFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testGotoCategoryEditor() {\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"gotoCategoryEditor\",\n- String::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"gotoCategoryEditor\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"[[Category:Test]]\")\n }\n@@ -791,14 +855,15 @@ class MediaDetailFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnMediaRefreshed() {\n- val method: Method = MediaDetailFragment::class.java.getDeclaredMethod(\n- \"onMediaRefreshed\",\n- Media::class.java\n- )\n+ val method: Method =\n+ MediaDetailFragment::class.java.getDeclaredMethod(\n+ \"onMediaRefreshed\",\n+ Media::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, media)\n }\n- \n+\n @Test\n fun testOnImageBackgroundChangedWithDifferentColor() {\n val spyFragment = spy(fragment)\n@@ -808,11 +873,10 @@ class MediaDetailFragmentUnitTests {\n \n spyFragment.onImageBackgroundChanged(color)\n \n- verify(simpleDraweeView, times(1)).setBackgroundColor(color) \n+ verify(simpleDraweeView, times(1)).setBackgroundColor(color)\n verify(mockSharedPreferencesEditor, times(1)).putInt(anyString(), anyInt())\n }\n \n-\n @Test\n fun testOnImageBackgroundChangedWithSameColor() {\n val spyFragment = spy(fragment)\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailPagerFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailPagerFragmentUnitTests.kt\nindex 33cfc3c452..a6c925543f 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailPagerFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailPagerFragmentUnitTests.kt\n@@ -20,8 +20,8 @@ import com.nhaarman.mockitokotlin2.verify\n import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.auth.SessionManager\n+import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.databinding.FragmentMediaDetailPagerBinding\n import fr.free.nrw.commons.explore.SearchActivity\n import io.reactivex.android.plugins.RxAndroidPlugins\n@@ -77,9 +77,8 @@ class MediaDetailPagerFragmentUnitTests {\n fun setUp() {\n RxAndroidPlugins.setMainThreadSchedulerHandler { Schedulers.trampoline() }\n RxJavaPlugins.setNewThreadSchedulerHandler { Schedulers.trampoline() }\n- \n- MockitoAnnotations.openMocks(this)\n \n+ MockitoAnnotations.openMocks(this)\n \n context = ApplicationProvider.getApplicationContext()\n \n@@ -111,7 +110,7 @@ class MediaDetailPagerFragmentUnitTests {\n doReturn(menuItem).`when`(menuItem).isEnabled = any()\n doReturn(menuItem).`when`(menuItem).isVisible = any()\n }\n- \n+\n @After\n fun tearDown() {\n RxAndroidPlugins.reset()\n@@ -152,10 +151,11 @@ class MediaDetailPagerFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testSetWallpaperCaseNull() {\n- val method: Method = MediaDetailPagerFragment::class.java.getDeclaredMethod(\n- \"setWallpaper\",\n- Media::class.java\n- )\n+ val method: Method =\n+ MediaDetailPagerFragment::class.java.getDeclaredMethod(\n+ \"setWallpaper\",\n+ Media::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, media)\n }\n@@ -165,22 +165,23 @@ class MediaDetailPagerFragmentUnitTests {\n fun testSetWallpaperCaseNonNull() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n `when`(media.imageUrl).thenReturn(\"url\")\n- val method: Method = MediaDetailPagerFragment::class.java.getDeclaredMethod(\n- \"setWallpaper\",\n- Media::class.java\n- )\n+ val method: Method =\n+ MediaDetailPagerFragment::class.java.getDeclaredMethod(\n+ \"setWallpaper\",\n+ Media::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, media)\n }\n \n-\n @Test\n @Throws(Exception::class)\n fun testSetAvatarCaseNull() {\n- val method: Method = MediaDetailPagerFragment::class.java.getDeclaredMethod(\n- \"setAvatar\",\n- Media::class.java\n- )\n+ val method: Method =\n+ MediaDetailPagerFragment::class.java.getDeclaredMethod(\n+ \"setAvatar\",\n+ Media::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, media)\n }\n@@ -237,11 +238,12 @@ class MediaDetailPagerFragmentUnitTests {\n }\n \n private fun invokeHandleBackgroundColorMenuItems(getBitmap: Callable) {\n- val method: Method = MediaDetailPagerFragment::class.java.getDeclaredMethod(\n- \"handleBackgroundColorMenuItems\",\n- Callable::class.java,\n- Menu::class.java\n- )\n+ val method: Method =\n+ MediaDetailPagerFragment::class.java.getDeclaredMethod(\n+ \"handleBackgroundColorMenuItems\",\n+ Callable::class.java,\n+ Menu::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, getBitmap, menu)\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/media/ZoomableActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/media/ZoomableActivityUnitTests.kt\nindex 7543562cb6..848e0881aa 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/media/ZoomableActivityUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/media/ZoomableActivityUnitTests.kt\n@@ -29,7 +29,6 @@ import java.lang.reflect.Field\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class ZoomableActivityUnitTests {\n-\n private lateinit var context: Context\n private lateinit var activity: ZoomableActivity\n private lateinit var viewModelField: Field\n@@ -70,18 +69,18 @@ class ZoomableActivityUnitTests {\n * Test handleResult.\n */\n @Test\n- fun testHandleResult(){\n+ fun testHandleResult() {\n val func = activity.javaClass.getDeclaredMethod(\"handleResult\", Result::class.java)\n func.isAccessible = true\n func.invoke(activity, Result(CallbackStatus.SUCCESS, arrayListOf()))\n- func.invoke(activity, Result(CallbackStatus.SUCCESS, arrayListOf(image,image)))\n+ func.invoke(activity, Result(CallbackStatus.SUCCESS, arrayListOf(image, image)))\n }\n \n /**\n * Test onLeftSwiped.\n */\n @Test\n- fun testOnLeftSwiped(){\n+ fun testOnLeftSwiped() {\n val func = activity.javaClass.getDeclaredMethod(\"onLeftSwiped\", Boolean::class.java)\n func.isAccessible = true\n func.invoke(activity, true)\n@@ -97,7 +96,7 @@ class ZoomableActivityUnitTests {\n * Test onRightSwiped.\n */\n @Test\n- fun testOnRightSwiped(){\n+ fun testOnRightSwiped() {\n val func = activity.javaClass.getDeclaredMethod(\"onRightSwiped\", Boolean::class.java)\n func.isAccessible = true\n func.invoke(activity, true)\n@@ -113,7 +112,7 @@ class ZoomableActivityUnitTests {\n * Test onUpSwiped.\n */\n @Test\n- fun testOnUpSwiped(){\n+ fun testOnUpSwiped() {\n val func = activity.javaClass.getDeclaredMethod(\"onUpSwiped\")\n func.isAccessible = true\n func.invoke(activity)\n@@ -123,7 +122,7 @@ class ZoomableActivityUnitTests {\n * Test onDownSwiped.\n */\n @Test\n- fun testOnDownSwiped(){\n+ fun testOnDownSwiped() {\n val func = activity.javaClass.getDeclaredMethod(\"onDownSwiped\")\n func.isAccessible = true\n func.invoke(activity)\n@@ -133,20 +132,19 @@ class ZoomableActivityUnitTests {\n * Test onBackPressed.\n */\n @Test\n- fun testOnBackPressed(){\n+ fun testOnBackPressed() {\n val func = activity.javaClass.getDeclaredMethod(\"onBackPressed\")\n func.isAccessible = true\n func.invoke(activity)\n }\n \n-\n /**\n * Test onDestroy.\n */\n @Test\n- fun testOnDestroy(){\n+ fun testOnDestroy() {\n val func = activity.javaClass.getDeclaredMethod(\"onDestroy\")\n func.isAccessible = true\n func.invoke(activity)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/media/zoomControllers/MultiPointerGestureDetectorUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/media/zoomControllers/MultiPointerGestureDetectorUnitTest.kt\nindex d07acdd543..2f62589a74 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/media/zoomControllers/MultiPointerGestureDetectorUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/media/zoomControllers/MultiPointerGestureDetectorUnitTest.kt\n@@ -14,7 +14,6 @@ import org.powermock.reflect.Whitebox\n import java.lang.reflect.Method\n \n class MultiPointerGestureDetectorUnitTest {\n-\n private lateinit var detector: MultiPointerGestureDetector\n \n @Mock\n@@ -42,9 +41,10 @@ class MultiPointerGestureDetectorUnitTest {\n @Test\n @Throws(Exception::class)\n fun testSetAvatarCaseNull() {\n- val method: Method = MultiPointerGestureDetector::class.java.getDeclaredMethod(\n- \"shouldStartGesture\"\n- )\n+ val method: Method =\n+ MultiPointerGestureDetector::class.java.getDeclaredMethod(\n+ \"shouldStartGesture\",\n+ )\n method.isAccessible = true\n Assert.assertEquals(method.invoke(detector), true)\n }\n@@ -52,9 +52,10 @@ class MultiPointerGestureDetectorUnitTest {\n @Test\n @Throws(Exception::class)\n fun testStartGesture() {\n- val method: Method = MultiPointerGestureDetector::class.java.getDeclaredMethod(\n- \"startGesture\"\n- )\n+ val method: Method =\n+ MultiPointerGestureDetector::class.java.getDeclaredMethod(\n+ \"startGesture\",\n+ )\n method.isAccessible = true\n method.invoke(detector)\n verify(listener).onGestureBegin(detector)\n@@ -64,9 +65,10 @@ class MultiPointerGestureDetectorUnitTest {\n @Throws(Exception::class)\n fun testStopGesture() {\n Whitebox.setInternalState(detector, \"mGestureInProgress\", true)\n- val method: Method = MultiPointerGestureDetector::class.java.getDeclaredMethod(\n- \"stopGesture\"\n- )\n+ val method: Method =\n+ MultiPointerGestureDetector::class.java.getDeclaredMethod(\n+ \"stopGesture\",\n+ )\n method.isAccessible = true\n method.invoke(detector)\n verify(listener).onGestureEnd(detector)\n@@ -77,9 +79,11 @@ class MultiPointerGestureDetectorUnitTest {\n fun testUpdatePointersOnTap() {\n whenever(event.pointerCount).thenReturn(3)\n whenever(event.actionMasked).thenReturn(MotionEvent.ACTION_UP)\n- val method: Method = MultiPointerGestureDetector::class.java.getDeclaredMethod(\n- \"updatePointersOnTap\", MotionEvent::class.java\n- )\n+ val method: Method =\n+ MultiPointerGestureDetector::class.java.getDeclaredMethod(\n+ \"updatePointersOnTap\",\n+ MotionEvent::class.java,\n+ )\n method.isAccessible = true\n method.invoke(detector, event)\n verify(event, times(2)).actionIndex\n@@ -172,5 +176,4 @@ class MultiPointerGestureDetectorUnitTest {\n whenever(event.actionMasked).thenReturn(MotionEvent.ACTION_CANCEL)\n Assert.assertEquals(detector.onTouchEvent(event), true)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/media/zoomControllers/TransformGestureDetectorUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/media/zoomControllers/TransformGestureDetectorUnitTest.kt\nindex 3b1f8b352d..6252f6fb85 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/media/zoomControllers/TransformGestureDetectorUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/media/zoomControllers/TransformGestureDetectorUnitTest.kt\n@@ -14,7 +14,6 @@ import org.powermock.reflect.Whitebox\n import java.lang.reflect.Method\n \n class TransformGestureDetectorUnitTest {\n-\n private lateinit var detector: TransformGestureDetector\n \n @Mock\n@@ -155,7 +154,6 @@ class TransformGestureDetectorUnitTest {\n Assert.assertEquals(detector.rotation, 0f)\n }\n \n-\n @Test\n @Throws(Exception::class)\n fun testGetRotationCaseGreaterThan2() {\n@@ -177,11 +175,13 @@ class TransformGestureDetectorUnitTest {\n val array = FloatArray(2)\n array[0] = 0.0f\n array[1] = 1.0f\n- val method: Method = TransformGestureDetector::class.java.getDeclaredMethod(\n- \"calcAverage\", FloatArray::class.java, Int::class.java\n- )\n+ val method: Method =\n+ TransformGestureDetector::class.java.getDeclaredMethod(\n+ \"calcAverage\",\n+ FloatArray::class.java,\n+ Int::class.java,\n+ )\n method.isAccessible = true\n Assert.assertEquals(method.invoke(detector, array, 2), 0.5f)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/mwapi/UserClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/mwapi/UserClientTest.kt\nindex b8728f485a..52c7953ec5 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/mwapi/UserClientTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/mwapi/UserClientTest.kt\n@@ -1,18 +1,21 @@\n package fr.free.nrw.commons.mwapi\n \n+import fr.free.nrw.commons.utils.DateUtil\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult\n+import fr.free.nrw.commons.wikidata.mwapi.UserInfo\n import io.reactivex.Observable\n import org.junit.Assert.assertFalse\n import org.junit.Assert.assertTrue\n import org.junit.Before\n import org.junit.Test\n-import org.mockito.*\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult\n-import fr.free.nrw.commons.wikidata.mwapi.UserInfo\n-import fr.free.nrw.commons.utils.DateUtil\n-import java.util.*\n+import org.mockito.InjectMocks\n+import org.mockito.Mock\n+import org.mockito.Mockito\n+import org.mockito.MockitoAnnotations\n+import java.util.Date\n \n-class UserClientTest{\n+class UserClientTest {\n @Mock\n internal var userInterface: UserInterface? = null\n \n@@ -33,8 +36,9 @@ class UserClientTest{\n Mockito.`when`(mwQueryResult.userInfo()).thenReturn(userInfo)\n val mockResponse = Mockito.mock(MwQueryResponse::class.java)\n Mockito.`when`(mockResponse.query()).thenReturn(mwQueryResult)\n- Mockito.`when`(userInterface!!.getUserBlockInfo())\n- .thenReturn(Observable.just(mockResponse))\n+ Mockito\n+ .`when`(userInterface!!.getUserBlockInfo())\n+ .thenReturn(Observable.just(mockResponse))\n \n val isBanned = userClient!!.isUserBlockedFromCommons().blockingGet()\n assertTrue(isBanned)\n@@ -51,8 +55,9 @@ class UserClientTest{\n Mockito.`when`(mwQueryResult.userInfo()).thenReturn(userInfo)\n val mockResponse = Mockito.mock(MwQueryResponse::class.java)\n Mockito.`when`(mockResponse.query()).thenReturn(mwQueryResult)\n- Mockito.`when`(userInterface!!.getUserBlockInfo())\n- .thenReturn(Observable.just(mockResponse))\n+ Mockito\n+ .`when`(userInterface!!.getUserBlockInfo())\n+ .thenReturn(Observable.just(mockResponse))\n \n val isBanned = userClient!!.isUserBlockedFromCommons().blockingGet()\n assertTrue(isBanned)\n@@ -66,11 +71,11 @@ class UserClientTest{\n Mockito.`when`(mwQueryResult.userInfo()).thenReturn(userInfo)\n val mockResponse = Mockito.mock(MwQueryResponse::class.java)\n Mockito.`when`(mockResponse.query()).thenReturn(mwQueryResult)\n- Mockito.`when`(userInterface!!.getUserBlockInfo())\n- .thenReturn(Observable.just(mockResponse))\n+ Mockito\n+ .`when`(userInterface!!.getUserBlockInfo())\n+ .thenReturn(Observable.just(mockResponse))\n \n val isBanned = userClient!!.isUserBlockedFromCommons().blockingGet()\n assertFalse(isBanned)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/navtab/MoreBottomSheetFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/navtab/MoreBottomSheetFragmentUnitTests.kt\nindex a5faed37e5..68adb62957 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/navtab/MoreBottomSheetFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/navtab/MoreBottomSheetFragmentUnitTests.kt\n@@ -16,8 +16,8 @@ import fr.free.nrw.commons.CommonsApplication\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.actions.PageEditClient\n+import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.feedback.model.Feedback\n import fr.free.nrw.commons.kvstore.JsonKvStore\n import fr.free.nrw.commons.profile.ProfileActivity\n@@ -27,7 +27,10 @@ import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n import org.mockito.Mock\n-import org.mockito.Mockito.*\n+import org.mockito.Mockito.anyString\n+import org.mockito.Mockito.doReturn\n+import org.mockito.Mockito.mock\n+import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n import org.powermock.reflect.Whitebox\n import org.robolectric.Robolectric\n@@ -40,12 +43,10 @@ import org.robolectric.shadows.ShadowAlertDialog\n import org.robolectric.shadows.ShadowDialog\n import java.lang.reflect.Method\n \n-\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class MoreBottomSheetFragmentUnitTests {\n-\n private lateinit var fragment: MoreBottomSheetFragment\n private lateinit var view: View\n private lateinit var layoutInflater: LayoutInflater\n@@ -75,7 +76,7 @@ class MoreBottomSheetFragmentUnitTests {\n Whitebox.setInternalState(fragment, \"pageEditClient\", pageEditClient)\n \n `when`(store.getBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED)).thenReturn(\n- true\n+ true,\n )\n \n layoutInflater = LayoutInflater.from(activity)\n@@ -197,8 +198,7 @@ class MoreBottomSheetFragmentUnitTests {\n Assert.assertEquals(startedIntent.`data`, Uri.parse(\"mailto:\"))\n Assert.assertEquals(\n startedIntent.extras?.get(Intent.EXTRA_SUBJECT),\n- CommonsApplication.FEEDBACK_EMAIL_SUBJECT\n+ CommonsApplication.FEEDBACK_EMAIL_SUBJECT,\n )\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/navtab/MoreBottomSheetLoggedOutFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/navtab/MoreBottomSheetLoggedOutFragmentUnitTests.kt\nindex 3a9741f372..c2906b501e 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/navtab/MoreBottomSheetLoggedOutFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/navtab/MoreBottomSheetLoggedOutFragmentUnitTests.kt\n@@ -5,6 +5,7 @@ import androidx.fragment.app.testing.FragmentScenario\n import androidx.fragment.app.testing.launchFragmentInContainer\n import androidx.lifecycle.Lifecycle\n import androidx.test.ext.junit.runners.AndroidJUnit4\n+import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n import org.junit.Before\n import org.junit.Test\n@@ -12,7 +13,6 @@ import org.junit.runner.RunWith\n import org.robolectric.Shadows\n import org.robolectric.annotation.Config\n import org.robolectric.annotation.LooperMode\n-import fr.free.nrw.commons.R\n \n @RunWith(AndroidJUnit4::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n@@ -22,12 +22,13 @@ class MoreBottomSheetLoggedOutFragmentUnitTests {\n \n @Before\n fun setUp() {\n- scenario = launchFragmentInContainer(\n- initialState = Lifecycle.State.RESUMED,\n- themeResId = R.style.LightAppTheme\n- ) {\n- MoreBottomSheetLoggedOutFragment()\n- }\n+ scenario =\n+ launchFragmentInContainer(\n+ initialState = Lifecycle.State.RESUMED,\n+ themeResId = R.style.LightAppTheme,\n+ ) {\n+ MoreBottomSheetLoggedOutFragment()\n+ }\n }\n \n @Test\n@@ -57,4 +58,4 @@ class MoreBottomSheetLoggedOutFragmentUnitTests {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n scenario.onFragment { it.onLogoutClicked() }\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/AdvanceQueryFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/AdvanceQueryFragmentUnitTests.kt\nindex e8bf0460b0..409d15080b 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/AdvanceQueryFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/AdvanceQueryFragmentUnitTests.kt\n@@ -34,7 +34,6 @@ import org.robolectric.annotation.LooperMode\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class AdvanceQueryFragmentUnitTests {\n-\n private lateinit var view: View\n private lateinit var activity: MainActivity\n private lateinit var layoutInflater: LayoutInflater\n@@ -105,7 +104,6 @@ class AdvanceQueryFragmentUnitTests {\n assertEquals(defaultQuery, etQuery.text.toString())\n }\n \n-\n @Test\n fun `when no query is passed in fragment argument, nothing is visible in text field`() {\n `when`(bundle.getString(\"query\")).thenReturn(\"\")\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckboxTriStatesTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckBoxTriStatesTest.kt\nsimilarity index 97%\nrename from app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckboxTriStatesTest.kt\nrename to app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckBoxTriStatesTest.kt\nindex fe5d352f32..b2177b1d2d 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckboxTriStatesTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckBoxTriStatesTest.kt\n@@ -21,6 +21,7 @@ import org.robolectric.annotation.Config\n class CheckBoxTriStatesTest {\n @Mock\n internal lateinit var callback: CheckBoxTriStates.Callback\n+\n @Mock\n internal lateinit var onCheckChangeListener: CompoundButton.OnCheckedChangeListener\n private lateinit var checkBoxTriStates: CheckBoxTriStates\n@@ -52,7 +53,7 @@ class CheckBoxTriStatesTest {\n */\n @Test\n fun testSetStateWhenDiffState() {\n- NearbyController.currentLocation = LatLng(0.0,0.0,0.0f)\n+ NearbyController.currentLocation = LatLng(0.0, 0.0, 0.0f)\n checkBoxTriStates.state = CHECKED\n checkBoxTriStates.setState(UNCHECKED)\n verify(callback).filterByMarkerType(null, UNCHECKED, false, true)\n@@ -68,4 +69,4 @@ class CheckBoxTriStatesTest {\n checkBoxTriStates.setState(UNCHECKED)\n verifyNoInteractions(callback)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/CommonPlaceClickActionsUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/CommonPlaceClickActionsUnitTest.kt\nindex 7d0cc5eed1..3cfbf9d134 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/CommonPlaceClickActionsUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/CommonPlaceClickActionsUnitTest.kt\n@@ -22,7 +22,6 @@ import java.lang.reflect.Method\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class CommonPlaceClickActionsUnitTest {\n-\n private lateinit var commonPlaceClickActions: CommonPlaceClickActions\n \n @Mock\n@@ -65,10 +64,11 @@ class CommonPlaceClickActionsUnitTest {\n @Test\n @Throws(Exception::class)\n fun testStoreSharedPrefs() {\n- val method: Method = CommonPlaceClickActions::class.java.getDeclaredMethod(\n- \"storeSharedPrefs\",\n- Place::class.java\n- )\n+ val method: Method =\n+ CommonPlaceClickActions::class.java.getDeclaredMethod(\n+ \"storeSharedPrefs\",\n+ Place::class.java,\n+ )\n method.isAccessible = true\n method.invoke(commonPlaceClickActions, place)\n }\n@@ -76,10 +76,11 @@ class CommonPlaceClickActionsUnitTest {\n @Test\n @Throws(Exception::class)\n fun testOpenWebView() {\n- val method: Method = CommonPlaceClickActions::class.java.getDeclaredMethod(\n- \"openWebView\",\n- Uri::class.java\n- )\n+ val method: Method =\n+ CommonPlaceClickActions::class.java.getDeclaredMethod(\n+ \"openWebView\",\n+ Uri::class.java,\n+ )\n method.isAccessible = true\n Assert.assertEquals(method.invoke(commonPlaceClickActions, uri), true)\n }\n@@ -87,9 +88,10 @@ class CommonPlaceClickActionsUnitTest {\n @Test\n @Throws(Exception::class)\n fun testShowLoginDialog() {\n- val method: Method = CommonPlaceClickActions::class.java.getDeclaredMethod(\n- \"showLoginDialog\"\n- )\n+ val method: Method =\n+ CommonPlaceClickActions::class.java.getDeclaredMethod(\n+ \"showLoginDialog\",\n+ )\n method.isAccessible = true\n method.invoke(commonPlaceClickActions)\n }\n@@ -97,11 +99,11 @@ class CommonPlaceClickActionsUnitTest {\n @Test\n @Throws(Exception::class)\n fun testSetPositiveButton() {\n- val method: Method = CommonPlaceClickActions::class.java.getDeclaredMethod(\n- \"setPositiveButton\"\n- )\n+ val method: Method =\n+ CommonPlaceClickActions::class.java.getDeclaredMethod(\n+ \"setPositiveButton\",\n+ )\n method.isAccessible = true\n method.invoke(commonPlaceClickActions)\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/LabelTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/LabelTest.kt\nindex e66765ef61..446bad2cb3 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/LabelTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/LabelTest.kt\n@@ -1,7 +1,6 @@\n package fr.free.nrw.commons.nearby\n \n import fr.free.nrw.commons.R\n-import fr.free.nrw.commons.R.*\n import org.junit.Before\n import org.junit.Test\n \n@@ -33,5 +32,4 @@ class LabelTest {\n var nullLabel: Label = Label.fromText(\"a random text not exist in label texts\")\n assert(nullLabel.icon.equals(R.drawable.round_icon_unknown))\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyControllerTest.kt\nindex 5f0c264f93..60fabc8571 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyControllerTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyControllerTest.kt\n@@ -22,13 +22,13 @@ import org.powermock.reflect.Whitebox\n import org.robolectric.RobolectricTestRunner\n import org.robolectric.annotation.Config\n import org.robolectric.annotation.LooperMode\n-import java.util.*\n+import java.util.Collections\n+import java.util.Locale\n \n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class NearbyControllerTest {\n-\n @Mock\n private lateinit var place: Place\n \n@@ -47,7 +47,6 @@ class NearbyControllerTest {\n @Mock\n private lateinit var currentLatLng: LatLng\n \n-\n private lateinit var context: Context\n private var customQuery: String = \"test\"\n private lateinit var nearbyController: NearbyController\n@@ -69,7 +68,7 @@ class NearbyControllerTest {\n searchLatLong,\n false,\n true,\n- customQuery\n+ customQuery,\n )\n nearbyController.loadAttractionsFromLocation(\n currentLatLng,\n@@ -79,13 +78,13 @@ class NearbyControllerTest {\n false,\n true,\n false,\n- customQuery\n+ customQuery,\n )\n Mockito.verify(nearbyPlaces).radiusExpander(\n eq(searchLatLong),\n any(String::class.java),\n eq(false),\n- eq(customQuery)\n+ eq(customQuery),\n )\n }\n \n@@ -98,13 +97,13 @@ class NearbyControllerTest {\n searchLatLong,\n false,\n true,\n- null\n+ null,\n )\n Mockito.verify(nearbyPlaces).radiusExpander(\n eq(searchLatLong),\n any(String::class.java),\n eq(false),\n- eq(null)\n+ eq(null),\n )\n }\n \n@@ -116,50 +115,56 @@ class NearbyControllerTest {\n null,\n false,\n true,\n- customQuery\n- ), null\n+ customQuery,\n+ ),\n+ null,\n )\n }\n \n @Test\n fun testLoadAttractionsFromLocationCase1() {\n- val place1 = Place(\n- \"en\",\n- \"placeName\",\n- Label.FOREST,\n- \"placeDescription\",\n- LatLng(0.0, 0.0, 1.0F),\n- \"placeCategory\",\n- Sitelinks.Builder().build(),\n- \"picName\",\n- false,\n- \"entityID\"\n- )\n- val place2 = Place(\n- \"en\",\n- \"placeName\",\n- Label.FOREST,\n- \"placeDescription\",\n- LatLng(-40.69, -74.04, 1.0F),\n- \"placeCategory\",\n- Sitelinks.Builder().build(),\n- \"picName\",\n- false,\n- \"entityID\"\n- )\n+ val place1 =\n+ Place(\n+ \"en\",\n+ \"placeName\",\n+ Label.FOREST,\n+ \"placeDescription\",\n+ LatLng(0.0, 0.0, 1.0F),\n+ \"placeCategory\",\n+ Sitelinks.Builder().build(),\n+ \"picName\",\n+ false,\n+ \"entityID\",\n+ )\n+ val place2 =\n+ Place(\n+ \"en\",\n+ \"placeName\",\n+ Label.FOREST,\n+ \"placeDescription\",\n+ LatLng(-40.69, -74.04, 1.0F),\n+ \"placeCategory\",\n+ Sitelinks.Builder().build(),\n+ \"picName\",\n+ false,\n+ \"entityID\",\n+ )\n `when`(\n nearbyPlaces.radiusExpander(\n- searchLatLong, Locale.getDefault().language, false,\n- customQuery\n- )\n+ searchLatLong,\n+ Locale.getDefault().language,\n+ false,\n+ customQuery,\n+ ),\n ).thenReturn(mutableListOf(place1, place2))\n- val result = nearbyController.loadAttractionsFromLocation(\n- currentLatLng,\n- searchLatLong,\n- false,\n- true,\n- customQuery\n- )\n+ val result =\n+ nearbyController.loadAttractionsFromLocation(\n+ currentLatLng,\n+ searchLatLong,\n+ false,\n+ true,\n+ customQuery,\n+ )\n nearbyController.loadAttractionsFromLocation(\n currentLatLng,\n screenTopRight,\n@@ -168,7 +173,7 @@ class NearbyControllerTest {\n false,\n true,\n false,\n- customQuery\n+ customQuery,\n )\n assertEquals(result.currentLatLng, currentLatLng)\n assertEquals(result.searchLatLng, searchLatLong)\n@@ -176,86 +181,96 @@ class NearbyControllerTest {\n \n @Test\n fun testLoadAttractionsFromLocationCase2() {\n- val place1 = Place(\n- \"en\",\n- \"placeName\",\n- Label.FOREST,\n- \"placeDescription\",\n- LatLng(0.0, 0.0, 1.0F),\n- \"placeCategory\",\n- Sitelinks.Builder().build(),\n- \"picName\",\n- false,\n- \"entityID\"\n- )\n- val place2 = Place(\n- \"en\",\n- \"placeName\",\n- Label.FOREST,\n- \"placeDescription\",\n- LatLng(40.69, -74.04, 1.0F),\n- \"placeCategory\",\n- Sitelinks.Builder().build(),\n- \"picName\",\n- false,\n- \"entityID\"\n- )\n+ val place1 =\n+ Place(\n+ \"en\",\n+ \"placeName\",\n+ Label.FOREST,\n+ \"placeDescription\",\n+ LatLng(0.0, 0.0, 1.0F),\n+ \"placeCategory\",\n+ Sitelinks.Builder().build(),\n+ \"picName\",\n+ false,\n+ \"entityID\",\n+ )\n+ val place2 =\n+ Place(\n+ \"en\",\n+ \"placeName\",\n+ Label.FOREST,\n+ \"placeDescription\",\n+ LatLng(40.69, -74.04, 1.0F),\n+ \"placeCategory\",\n+ Sitelinks.Builder().build(),\n+ \"picName\",\n+ false,\n+ \"entityID\",\n+ )\n `when`(\n nearbyPlaces.radiusExpander(\n- searchLatLong, Locale.getDefault().language, false,\n- customQuery\n- )\n+ searchLatLong,\n+ Locale.getDefault().language,\n+ false,\n+ customQuery,\n+ ),\n ).thenReturn(mutableListOf(place1, place2))\n- val result = nearbyController.loadAttractionsFromLocation(\n- currentLatLng,\n- searchLatLong,\n- false,\n- true,\n- customQuery\n- )\n+ val result =\n+ nearbyController.loadAttractionsFromLocation(\n+ currentLatLng,\n+ searchLatLong,\n+ false,\n+ true,\n+ customQuery,\n+ )\n assertEquals(result.currentLatLng, currentLatLng)\n assertEquals(result.searchLatLng, searchLatLong)\n }\n \n @Test\n fun testLoadAttractionsFromLocationCase3() {\n- val place1 = Place(\n- \"en\",\n- \"placeName\",\n- Label.FOREST,\n- \"placeDescription\",\n- LatLng(0.0, 0.0, 1.0F),\n- \"placeCategory\",\n- Sitelinks.Builder().build(),\n- \"picName\",\n- false,\n- \"entityID\"\n- )\n- val place2 = Place(\n- \"en\",\n- \"placeName\",\n- Label.FOREST,\n- \"placeDescription\",\n- LatLng(40.69, 74.04, 1.0F),\n- \"placeCategory\",\n- Sitelinks.Builder().build(),\n- \"picName\",\n- false,\n- \"entityID\"\n- )\n+ val place1 =\n+ Place(\n+ \"en\",\n+ \"placeName\",\n+ Label.FOREST,\n+ \"placeDescription\",\n+ LatLng(0.0, 0.0, 1.0F),\n+ \"placeCategory\",\n+ Sitelinks.Builder().build(),\n+ \"picName\",\n+ false,\n+ \"entityID\",\n+ )\n+ val place2 =\n+ Place(\n+ \"en\",\n+ \"placeName\",\n+ Label.FOREST,\n+ \"placeDescription\",\n+ LatLng(40.69, 74.04, 1.0F),\n+ \"placeCategory\",\n+ Sitelinks.Builder().build(),\n+ \"picName\",\n+ false,\n+ \"entityID\",\n+ )\n `when`(\n nearbyPlaces.radiusExpander(\n- searchLatLong, Locale.getDefault().language, false,\n- customQuery\n- )\n+ searchLatLong,\n+ Locale.getDefault().language,\n+ false,\n+ customQuery,\n+ ),\n ).thenReturn(mutableListOf(place1, place2))\n- val result = nearbyController.loadAttractionsFromLocation(\n- currentLatLng,\n- searchLatLong,\n- false,\n- true,\n- customQuery\n- )\n+ val result =\n+ nearbyController.loadAttractionsFromLocation(\n+ currentLatLng,\n+ searchLatLong,\n+ false,\n+ true,\n+ customQuery,\n+ )\n assertEquals(result.currentLatLng, currentLatLng)\n assertEquals(result.searchLatLng, searchLatLong)\n }\n@@ -265,108 +280,117 @@ class NearbyControllerTest {\n assertEquals(\n loadAttractionsFromLocationToBaseMarkerOptions(\n currentLatLng,\n- null\n- ), listOf()\n+ null,\n+ ),\n+ listOf(),\n )\n }\n \n @Test\n fun testLoadAttractionsFromLocationToBaseMarkerOptionsCaseIsMonument() {\n- place = Place(\n- \"en\",\n- \"placeName\",\n- Label.FOREST,\n- \"placeDescription\",\n- currentLatLng,\n- \"placeCategory\",\n- Sitelinks.Builder().build(),\n- \"picName\",\n- false,\n- \"entityID\"\n- )\n+ place =\n+ Place(\n+ \"en\",\n+ \"placeName\",\n+ Label.FOREST,\n+ \"placeDescription\",\n+ currentLatLng,\n+ \"placeCategory\",\n+ Sitelinks.Builder().build(),\n+ \"picName\",\n+ false,\n+ \"entityID\",\n+ )\n place.isMonument = true\n `when`(currentLatLng.latitude).thenReturn(0.0)\n `when`(currentLatLng.longitude).thenReturn(0.0)\n assertEquals(\n loadAttractionsFromLocationToBaseMarkerOptions(\n currentLatLng,\n- listOf(place)\n- )[0].place, place\n+ listOf(place),\n+ )[0].place,\n+ place,\n )\n }\n \n @Test\n fun testLoadAttractionsFromLocationToBaseMarkerOptionsCaseIsNotMonumentPicNotEmpty() {\n- place = Place(\n- \"en\",\n- \"placeName\",\n- Label.FOREST,\n- \"placeDescription\",\n- currentLatLng,\n- \"placeCategory\",\n- Sitelinks.Builder().build(),\n- \"picName\",\n- false,\n- \"entityID\"\n- )\n+ place =\n+ Place(\n+ \"en\",\n+ \"placeName\",\n+ Label.FOREST,\n+ \"placeDescription\",\n+ currentLatLng,\n+ \"placeCategory\",\n+ Sitelinks.Builder().build(),\n+ \"picName\",\n+ false,\n+ \"entityID\",\n+ )\n place.isMonument = false\n `when`(currentLatLng.latitude).thenReturn(0.0)\n `when`(currentLatLng.longitude).thenReturn(0.0)\n assertEquals(\n loadAttractionsFromLocationToBaseMarkerOptions(\n currentLatLng,\n- listOf(place)\n- )[0].place, place\n+ listOf(place),\n+ )[0].place,\n+ place,\n )\n }\n \n @Test\n fun testLoadAttractionsFromLocationToBaseMarkerOptionsCaseIsNotMonumentPicEmptyPlaceDoesNotExists() {\n- place = Place(\n- \"en\",\n- \"placeName\",\n- Label.FOREST,\n- \"placeDescription\",\n- currentLatLng,\n- \"placeCategory\",\n- Sitelinks.Builder().build(),\n- \"\",\n- false,\n- \"entityID\"\n- )\n+ place =\n+ Place(\n+ \"en\",\n+ \"placeName\",\n+ Label.FOREST,\n+ \"placeDescription\",\n+ currentLatLng,\n+ \"placeCategory\",\n+ Sitelinks.Builder().build(),\n+ \"\",\n+ false,\n+ \"entityID\",\n+ )\n place.isMonument = false\n `when`(currentLatLng.latitude).thenReturn(0.0)\n `when`(currentLatLng.longitude).thenReturn(0.0)\n assertEquals(\n loadAttractionsFromLocationToBaseMarkerOptions(\n currentLatLng,\n- listOf(place)\n- )[0].place, place\n+ listOf(place),\n+ )[0].place,\n+ place,\n )\n }\n \n @Test\n fun testLoadAttractionsFromLocationToBaseMarkerOptionsCaseIsNotMonumentPicEmptyPlaceExists() {\n- place = Place(\n- \"en\",\n- \"placeName\",\n- Label.FOREST,\n- \"placeDescription\",\n- currentLatLng,\n- \"placeCategory\",\n- Sitelinks.Builder().build(),\n- \"\",\n- true,\n- \"entityID\"\n- )\n+ place =\n+ Place(\n+ \"en\",\n+ \"placeName\",\n+ Label.FOREST,\n+ \"placeDescription\",\n+ currentLatLng,\n+ \"placeCategory\",\n+ Sitelinks.Builder().build(),\n+ \"\",\n+ true,\n+ \"entityID\",\n+ )\n place.isMonument = false\n `when`(currentLatLng.latitude).thenReturn(0.0)\n `when`(currentLatLng.longitude).thenReturn(0.0)\n assertEquals(\n loadAttractionsFromLocationToBaseMarkerOptions(\n currentLatLng,\n- listOf(place)\n- )[0].place, place\n+ listOf(place),\n+ )[0].place,\n+ place,\n )\n }\n \n@@ -378,7 +402,7 @@ class NearbyControllerTest {\n Whitebox.setInternalState(\n NearbyController::class.java,\n \"markerLabelList\",\n- list\n+ list,\n )\n updateMarkerLabelListBookmark(place, false)\n assertEquals(list[0].isBookmarked, false)\n@@ -393,7 +417,7 @@ class NearbyControllerTest {\n Whitebox.setInternalState(\n NearbyController::class.java,\n \"markerLabelList\",\n- list\n+ list,\n )\n updateMarkerLabelListBookmark(place, true)\n assertEquals(list[0].isBookmarked, true)\n@@ -401,4 +425,4 @@ class NearbyControllerTest {\n }\n \n fun any(type: Class): T = Mockito.any(type)\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapterUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapterUnitTests.kt\nindex 961590d1c8..7432cdf45a 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapterUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapterUnitTests.kt\n@@ -16,13 +16,11 @@ import org.mockito.MockitoAnnotations\n import org.robolectric.RobolectricTestRunner\n import org.robolectric.annotation.Config\n import org.robolectric.annotation.LooperMode\n-import java.util.*\n \n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class NearbyFilterSearchRecyclerViewAdapterUnitTests {\n-\n private lateinit var context: Context\n private lateinit var adapter: NearbyFilterSearchRecyclerViewAdapter\n \n@@ -101,5 +99,4 @@ class NearbyFilterSearchRecyclerViewAdapterUnitTests {\n fun testSetRecyclerViewAdapterAllSelected() {\n adapter.setRecyclerViewAdapterAllSelected()\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentPresenterTest.kt\nindex cb887d7b4c..d112ba5079 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentPresenterTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentPresenterTest.kt\n@@ -1,6 +1,8 @@\n package fr.free.nrw.commons.nearby\n \n-import com.nhaarman.mockitokotlin2.*\n+import com.nhaarman.mockitokotlin2.verify\n+import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions\n+import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao\n import fr.free.nrw.commons.location.LatLng\n import fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType\n@@ -9,7 +11,6 @@ import fr.free.nrw.commons.nearby.presenter.NearbyParentFragmentPresenter\n import org.junit.Assert.assertFalse\n import org.junit.Assert.assertTrue\n import org.junit.Before\n-import org.junit.Ignore\n import org.junit.Test\n import org.mockito.ArgumentMatchers\n import org.mockito.Mock\n@@ -18,13 +19,12 @@ import org.mockito.Mockito.any\n import org.mockito.Mockito.anyBoolean\n import org.mockito.Mockito.verifyNoInteractions\n import org.mockito.MockitoAnnotations\n-import java.util.*\n+import java.util.Collections\n \n /**\n * The unit test class for NearbyParentFragmentPresenter\n */\n class NearbyParentFragmentPresenterTest {\n-\n @Mock\n internal lateinit var nearbyParentFragmentView: NearbyParentFragmentContract.View\n \n@@ -54,7 +54,6 @@ class NearbyParentFragmentPresenterTest {\n MockitoAnnotations.openMocks(this)\n nearbyPresenter = NearbyParentFragmentPresenter(bookmarkLocationsDao)\n nearbyPresenter.attachView(nearbyParentFragmentView)\n-\n }\n \n /**\n@@ -67,7 +66,7 @@ class NearbyParentFragmentPresenterTest {\n expectMapAndListUpdate()\n whenever(nearbyParentFragmentView.lastMapFocus).thenReturn(LatLng(2.0, 1.0, 0.0F))\n nearbyPresenter.updateMapAndList(LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED)\n- verify(nearbyParentFragmentView).disableFABRecenter();\n+ verify(nearbyParentFragmentView).disableFABRecenter()\n verify(nearbyParentFragmentView).`setProgressBarVisibility`(true)\n assertTrue(null == nearbyParentFragmentView.mapCenter)\n verify(nearbyParentFragmentView).populatePlaces(null)\n@@ -134,13 +133,14 @@ class NearbyParentFragmentPresenterTest {\n * Test updateMapAndList method updates parent fragment view with latest location of user\n * at significant location change\n */\n- @Test\n+ @Test\n fun testPlacesPopulatedForLatestLocationWhenLocationSignificantlyChanged() {\n expectMapAndListUpdate()\n- whenever(nearbyParentFragmentView.mapCenter).thenReturn(LatLng(2.0, 1.0, 0.0F));\n+ whenever(nearbyParentFragmentView.mapCenter).thenReturn(LatLng(2.0, 1.0, 0.0F))\n nearbyPresenter.updateMapAndList(LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED)\n updateMapSignificantly()\n }\n+\n /**\n * Test updateMapAndList method updates parent fragment view with latest location of user\n * at map is updated location change type\n@@ -148,7 +148,7 @@ class NearbyParentFragmentPresenterTest {\n @Test\n fun testPlacesPopulatedForLatestLocationWhenLocationMapUpdated() {\n expectMapAndListUpdate()\n- whenever(nearbyParentFragmentView.mapCenter).thenReturn(LatLng(2.0, 1.0, 0.0F));\n+ whenever(nearbyParentFragmentView.mapCenter).thenReturn(LatLng(2.0, 1.0, 0.0F))\n nearbyPresenter.updateMapAndList(LocationChangeType.MAP_UPDATED)\n updateMapSignificantly()\n }\n@@ -167,7 +167,7 @@ class NearbyParentFragmentPresenterTest {\n fun testPlacesPopulatedForCameraTargetLocationWhenSearchCustomArea() {\n expectMapAndListUpdate()\n whenever(nearbyParentFragmentView.getCameraTarget()).thenReturn(LatLng(2.0, 1.0, 0.0F))\n- whenever(nearbyParentFragmentView.mapCenter).thenReturn(LatLng(2.0, 1.0, 0.0F));\n+ whenever(nearbyParentFragmentView.mapCenter).thenReturn(LatLng(2.0, 1.0, 0.0F))\n whenever(nearbyParentFragmentView.mapFocus).thenReturn(LatLng(2.0, 1.0, 0.0F))\n nearbyPresenter.updateMapAndList(LocationChangeType.SEARCH_CUSTOM_AREA)\n verify(nearbyParentFragmentView).disableFABRecenter()\n@@ -183,7 +183,7 @@ class NearbyParentFragmentPresenterTest {\n fun testUserTrackedWhenCurrentLocationMarkerVisible() {\n expectMapAndListUpdate()\n whenever(nearbyParentFragmentView.lastMapFocus).thenReturn(LatLng(2.0, 1.0, 0.0F))\n- whenever(nearbyParentFragmentView.mapCenter).thenReturn(null);\n+ whenever(nearbyParentFragmentView.mapCenter).thenReturn(null)\n nearbyPresenter.updateMapAndList(LocationChangeType.LOCATION_SLIGHTLY_CHANGED)\n verify(nearbyParentFragmentView).getLastMapFocus()\n verify(nearbyParentFragmentView).recenterMap(nearbyParentFragmentView.lastMapFocus)\n@@ -198,7 +198,7 @@ class NearbyParentFragmentPresenterTest {\n expectMapAndListUpdate()\n verify(nearbyParentFragmentView).enableFABRecenter()\n whenever(nearbyParentFragmentView.lastMapFocus).thenReturn(LatLng(2.0, 1.0, 0.0F))\n- whenever(nearbyParentFragmentView.mapCenter).thenReturn(null);\n+ whenever(nearbyParentFragmentView.mapCenter).thenReturn(null)\n nearbyPresenter.updateMapAndList(LocationChangeType.LOCATION_SLIGHTLY_CHANGED)\n verify(nearbyParentFragmentView).isNetworkConnectionEstablished()\n verify(nearbyParentFragmentView).getLastMapFocus()\n@@ -248,8 +248,8 @@ class NearbyParentFragmentPresenterTest {\n verify(nearbyParentFragmentView).filterMarkersByLabels(\n ArgumentMatchers.anyList(),\n ArgumentMatchers.anyBoolean(),\n- ArgumentMatchers.anyBoolean()\n- );\n+ ArgumentMatchers.anyBoolean(),\n+ )\n verify(nearbyParentFragmentView).setRecyclerViewAdapterAllSelected()\n verifyNoMoreInteractions(nearbyParentFragmentView)\n }\n@@ -263,8 +263,8 @@ class NearbyParentFragmentPresenterTest {\n verify(nearbyParentFragmentView).filterMarkersByLabels(\n any(),\n anyBoolean(),\n- anyBoolean()\n- );\n+ anyBoolean(),\n+ )\n verifyNoMoreInteractions(nearbyParentFragmentView)\n }\n \n@@ -294,9 +294,9 @@ class NearbyParentFragmentPresenterTest {\n */\n @Test\n fun testSearchCloseToCurrentLocationWhenFar() {\n- whenever(nearbyParentFragmentView.lastMapFocus).thenReturn(LatLng(2.0, 1.0, 0.0F));\n+ whenever(nearbyParentFragmentView.lastMapFocus).thenReturn(LatLng(2.0, 1.0, 0.0F))\n whenever(nearbyParentFragmentView.mapFocus).thenReturn(LatLng(2.0, 1.0, 0.0F))\n- //111.19 km real distance, return false if 148306.444306 > currentLocationSearchRadius\n+ // 111.19 km real distance, return false if 148306.444306 > currentLocationSearchRadius\n NearbyController.currentLocationSearchRadius = 148306.0\n val isClose = nearbyPresenter?.searchCloseToCurrentLocation()\n assertFalse(isClose!!.equals(false))\n@@ -308,7 +308,7 @@ class NearbyParentFragmentPresenterTest {\n @Test\n fun testSearchCloseToCurrentLocationWhenClose() {\n whenever(nearbyParentFragmentView.getCameraTarget()).thenReturn(LatLng(2.0, 1.0, 0.0F))\n- //111.19 km real distance, return false if 148253.333 > currentLocationSearchRadius\n+ // 111.19 km real distance, return false if 148253.333 > currentLocationSearchRadius\n NearbyController.currentLocationSearchRadius = 148307.0\n val isClose = nearbyPresenter?.searchCloseToCurrentLocation()\n assertTrue(isClose!!)\n@@ -361,14 +361,14 @@ class NearbyParentFragmentPresenterTest {\n @Test\n fun testMarkerUnselected() {\n nearbyPresenter.markerUnselected()\n- verify(nearbyParentFragmentView).hideBottomSheet();\n+ verify(nearbyParentFragmentView).hideBottomSheet()\n }\n \n @Test\n fun testOnWikidataEditSuccessful() {\n nearbyPresenter.onWikidataEditSuccessful()\n expectMapAndListUpdate()\n- whenever(nearbyParentFragmentView.mapCenter).thenReturn(LatLng(2.0, 1.0, 0.0F));\n+ whenever(nearbyParentFragmentView.mapCenter).thenReturn(LatLng(2.0, 1.0, 0.0F))\n nearbyPresenter.updateMapAndList(LocationChangeType.MAP_UPDATED)\n updateMapSignificantly()\n }\n@@ -376,8 +376,8 @@ class NearbyParentFragmentPresenterTest {\n @Test\n fun testOnLocationChangedSignificantly() {\n expectMapAndListUpdate()\n- whenever(nearbyParentFragmentView.mapCenter).thenReturn(LatLng(2.0, 1.0, 0.0F));\n- latestLocation=LatLng(2.0, 1.0, 0.0F)\n+ whenever(nearbyParentFragmentView.mapCenter).thenReturn(LatLng(2.0, 1.0, 0.0F))\n+ latestLocation = LatLng(2.0, 1.0, 0.0F)\n nearbyPresenter.onLocationChangedSignificantly(latestLocation)\n updateMapSignificantly()\n }\n@@ -461,6 +461,5 @@ class NearbyParentFragmentPresenterTest {\n Mockito.verify(nearbyParentFragmentView).updateMapMarkers(any())\n Mockito.verify(nearbyParentFragmentView).setProgressBarVisibility(false)\n Mockito.verify(nearbyParentFragmentView).updateListFragment(nearbyPlacesInfo.placeList)\n-\n }\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentUnitTest.kt\nindex aeef0c1048..6584550b06 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentUnitTest.kt\n@@ -1,6 +1,5 @@\n package fr.free.nrw.commons.nearby\n \n-import android.app.AlertDialog\n import android.content.Context\n import android.content.res.Configuration\n import android.net.Uri\n@@ -24,9 +23,9 @@ import fr.free.nrw.commons.BaseMarker\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao\n import fr.free.nrw.commons.contributions.MainActivity\n+import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.kvstore.JsonKvStore\n import fr.free.nrw.commons.location.LocationServiceManager\n import fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType\n@@ -39,7 +38,9 @@ import org.junit.Ignore\n import org.junit.Test\n import org.junit.runner.RunWith\n import org.mockito.Mock\n-import org.mockito.Mockito.*\n+import org.mockito.Mockito.mock\n+import org.mockito.Mockito.times\n+import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n import org.osmdroid.util.GeoPoint\n import org.powermock.reflect.Whitebox\n@@ -49,14 +50,12 @@ import org.robolectric.Shadows\n import org.robolectric.annotation.Config\n import org.robolectric.annotation.LooperMode\n import org.robolectric.shadows.ShadowActivity\n-import org.robolectric.shadows.ShadowAlertDialog\n import java.lang.reflect.Method\n \n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class NearbyParentFragmentUnitTest {\n-\n @Mock\n private lateinit var mapView: org.osmdroid.views.MapView\n \n@@ -165,51 +164,59 @@ class NearbyParentFragmentUnitTest {\n Whitebox.setInternalState(\n fragment,\n \"nearbyParentFragmentInstanceReadyCallback\",\n- nearbyParentFragmentInstanceReadyCallback\n+ nearbyParentFragmentInstanceReadyCallback,\n )\n }\n \n @Test @Ignore\n @Throws(Exception::class)\n fun `Start map without gps test when last location known`() {\n- val method: Method = NearbyParentFragment::class.java.getDeclaredMethod(\n- \"startMapWithCondition\",\n- String::class.java\n- )\n+ val method: Method =\n+ NearbyParentFragment::class.java.getDeclaredMethod(\n+ \"startMapWithCondition\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"Without GPS\")\n verify(applicationKvStore, times(1)).getString(\"LastLocation\")\n verify(presenter, times(1)).onMapReady()\n- val position = GeoPoint(51.50550,\n- -0.07520)\n+ val position =\n+ GeoPoint(\n+ 51.50550,\n+ -0.07520,\n+ )\n verify(mapView, times(1))\n- .controller.animateTo(position)\n+ .controller\n+ .animateTo(position)\n }\n \n @Test @Ignore\n @Throws(Exception::class)\n fun `Start map without gps test when last location unknown`() {\n `when`(applicationKvStore.getString(\"LastLocation\")).thenReturn(\"23.76,56.876\")\n- val method: Method = NearbyParentFragment::class.java.getDeclaredMethod(\n- \"startMapWithCondition\",\n- String::class.java\n- )\n+ val method: Method =\n+ NearbyParentFragment::class.java.getDeclaredMethod(\n+ \"startMapWithCondition\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"Without GPS\")\n verify(applicationKvStore, times(2)).getString(\"LastLocation\")\n verify(presenter, times(1)).onMapReady()\n- val position = GeoPoint(23.76,56.876)\n+ val position = GeoPoint(23.76, 56.876)\n verify(mapView, times(1))\n- .controller.animateTo(position)\n+ .controller\n+ .animateTo(position)\n }\n \n @Test @Ignore\n @Throws(Exception::class)\n fun `Start map without location permission test when last location known`() {\n- val method: Method = NearbyParentFragment::class.java.getDeclaredMethod(\n- \"startMapWithCondition\",\n- String::class.java\n- )\n+ val method: Method =\n+ NearbyParentFragment::class.java.getDeclaredMethod(\n+ \"startMapWithCondition\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"Without Permission\")\n verify(applicationKvStore, times(1)).getString(\"LastLocation\")\n@@ -222,10 +229,11 @@ class NearbyParentFragmentUnitTest {\n @Throws(Exception::class)\n fun `Start map without location permission test when last location unknown`() {\n `when`(applicationKvStore.getString(\"LastLocation\")).thenReturn(\"23.76,56.876\")\n- val method: Method = NearbyParentFragment::class.java.getDeclaredMethod(\n- \"startMapWithCondition\",\n- String::class.java\n- )\n+ val method: Method =\n+ NearbyParentFragment::class.java.getDeclaredMethod(\n+ \"startMapWithCondition\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"Without Permission\")\n verify(applicationKvStore, times(2)).getString(\"LastLocation\")\n@@ -256,20 +264,22 @@ class NearbyParentFragmentUnitTest {\n @Throws(Exception::class)\n fun testSetNearbyParentFragmentInstanceReadyCallback() {\n fragment.setNearbyParentFragmentInstanceReadyCallback(\n- nearbyParentFragmentInstanceReadyCallback\n+ nearbyParentFragmentInstanceReadyCallback,\n )\n Assert.assertEquals(\n nearbyParentFragmentInstanceReadyCallback,\n- nearbyParentFragmentInstanceReadyCallback\n+ nearbyParentFragmentInstanceReadyCallback,\n )\n }\n \n @Test @Ignore\n @Throws(Exception::class)\n fun testSetUserVisibleHintCaseFalse() {\n- val method: Method = NearbyParentFragment::class.java.getDeclaredMethod(\n- \"setUserVisibleHint\", Boolean::class.java\n- )\n+ val method: Method =\n+ NearbyParentFragment::class.java.getDeclaredMethod(\n+ \"setUserVisibleHint\",\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, false)\n verify(bottomSheetBehavior, times(2)).state = BottomSheetBehavior.STATE_HIDDEN\n@@ -279,9 +289,11 @@ class NearbyParentFragmentUnitTest {\n @Throws(Exception::class)\n fun testSetUserVisibleHintCaseTrue() {\n Whitebox.setInternalState(fragment, \"mState\", 4)\n- val method: Method = NearbyParentFragment::class.java.getDeclaredMethod(\n- \"setUserVisibleHint\", Boolean::class.java\n- )\n+ val method: Method =\n+ NearbyParentFragment::class.java.getDeclaredMethod(\n+ \"setUserVisibleHint\",\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, true)\n }\n@@ -360,5 +372,4 @@ class NearbyParentFragmentUnitTest {\n val shadowActivity: ShadowActivity = Shadows.shadowOf(activity)\n Assert.assertEquals(shadowActivity.nextStartedActivityForResult, null)\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyPlacesTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyPlacesTest.kt\nindex 13fa2eac38..f83aab4534 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyPlacesTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyPlacesTest.kt\n@@ -33,7 +33,7 @@ class NearbyPlacesTest {\n eq(currentLatLong),\n eq(\"test\"),\n any(),\n- eq(\"test\")\n+ eq(\"test\"),\n )\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationActivityUnitTests.kt\nindex 08d08772ab..0ff92af2ad 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationActivityUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationActivityUnitTests.kt\n@@ -32,7 +32,6 @@ import java.lang.reflect.Method\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class, shadows = [ShadowActionBar::class])\n class NotificationActivityUnitTests {\n-\n @Mock\n private lateinit var activity: NotificationActivity\n \n@@ -53,7 +52,6 @@ class NotificationActivityUnitTests {\n \n @Before\n fun setUp() {\n-\n MockitoAnnotations.initMocks(this)\n \n networkUtils = mock(NetworkUtils::class.java)\n@@ -77,7 +75,6 @@ class NotificationActivityUnitTests {\n NotificationActivity::class.java.getDeclaredField(\"notificationMenuItem\")\n notificationMenuItem.isAccessible = true\n notificationMenuItem.set(activity, menuItemWithId)\n-\n }\n \n @Test\n@@ -147,9 +144,10 @@ class NotificationActivityUnitTests {\n NotificationActivity::class.java.getDeclaredField(\"isRead\")\n isRead.isAccessible = true\n isRead.set(activity, true)\n- val method: Method = NotificationActivity::class.java.getDeclaredMethod(\n- \"setEmptyView\"\n- )\n+ val method: Method =\n+ NotificationActivity::class.java.getDeclaredMethod(\n+ \"setEmptyView\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -161,9 +159,10 @@ class NotificationActivityUnitTests {\n NotificationActivity::class.java.getDeclaredField(\"isRead\")\n isRead.isAccessible = true\n isRead.set(activity, false)\n- val method: Method = NotificationActivity::class.java.getDeclaredMethod(\n- \"setEmptyView\"\n- )\n+ val method: Method =\n+ NotificationActivity::class.java.getDeclaredMethod(\n+ \"setEmptyView\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -175,9 +174,10 @@ class NotificationActivityUnitTests {\n NotificationActivity::class.java.getDeclaredField(\"isRead\")\n isRead.isAccessible = true\n isRead.set(activity, true)\n- val method: Method = NotificationActivity::class.java.getDeclaredMethod(\n- \"setMenuItemTitle\"\n- )\n+ val method: Method =\n+ NotificationActivity::class.java.getDeclaredMethod(\n+ \"setMenuItemTitle\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -189,9 +189,10 @@ class NotificationActivityUnitTests {\n NotificationActivity::class.java.getDeclaredField(\"isRead\")\n isRead.isAccessible = true\n isRead.set(activity, false)\n- val method: Method = NotificationActivity::class.java.getDeclaredMethod(\n- \"setMenuItemTitle\"\n- )\n+ val method: Method =\n+ NotificationActivity::class.java.getDeclaredMethod(\n+ \"setMenuItemTitle\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -203,9 +204,10 @@ class NotificationActivityUnitTests {\n NotificationActivity::class.java.getDeclaredField(\"isRead\")\n isRead.isAccessible = true\n isRead.set(activity, true)\n- val method: Method = NotificationActivity::class.java.getDeclaredMethod(\n- \"setPageTitle\"\n- )\n+ val method: Method =\n+ NotificationActivity::class.java.getDeclaredMethod(\n+ \"setPageTitle\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -217,9 +219,10 @@ class NotificationActivityUnitTests {\n NotificationActivity::class.java.getDeclaredField(\"isRead\")\n isRead.isAccessible = true\n isRead.set(activity, false)\n- val method: Method = NotificationActivity::class.java.getDeclaredMethod(\n- \"setPageTitle\"\n- )\n+ val method: Method =\n+ NotificationActivity::class.java.getDeclaredMethod(\n+ \"setPageTitle\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -227,9 +230,11 @@ class NotificationActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testSetItemsListNull() {\n- val method: Method = NotificationActivity::class.java.getDeclaredMethod(\n- \"setItems\", List::class.java\n- )\n+ val method: Method =\n+ NotificationActivity::class.java.getDeclaredMethod(\n+ \"setItems\",\n+ List::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, null)\n }\n@@ -237,9 +242,11 @@ class NotificationActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testSetItemsListNonNull() {\n- val method: Method = NotificationActivity::class.java.getDeclaredMethod(\n- \"setItems\", List::class.java\n- )\n+ val method: Method =\n+ NotificationActivity::class.java.getDeclaredMethod(\n+ \"setItems\",\n+ List::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, notificationList)\n }\n@@ -247,9 +254,11 @@ class NotificationActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testHandleUrlNull() {\n- val method: Method = NotificationActivity::class.java.getDeclaredMethod(\n- \"handleUrl\", String::class.java\n- )\n+ val method: Method =\n+ NotificationActivity::class.java.getDeclaredMethod(\n+ \"handleUrl\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, null)\n }\n@@ -257,9 +266,11 @@ class NotificationActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testHandleUrlNonNull() {\n- val method: Method = NotificationActivity::class.java.getDeclaredMethod(\n- \"handleUrl\", String::class.java\n- )\n+ val method: Method =\n+ NotificationActivity::class.java.getDeclaredMethod(\n+ \"handleUrl\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, \"string\")\n }\n@@ -271,9 +282,11 @@ class NotificationActivityUnitTests {\n NotificationActivity::class.java.getDeclaredField(\"mNotificationWorkerFragment\")\n mNotificationWorkerFragment.isAccessible = true\n mNotificationWorkerFragment.set(activity, null)\n- val method: Method = NotificationActivity::class.java.getDeclaredMethod(\n- \"addNotifications\", Boolean::class.java\n- )\n+ val method: Method =\n+ NotificationActivity::class.java.getDeclaredMethod(\n+ \"addNotifications\",\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, true)\n }\n@@ -285,9 +298,11 @@ class NotificationActivityUnitTests {\n NotificationActivity::class.java.getDeclaredField(\"mNotificationWorkerFragment\")\n mNotificationWorkerFragment.isAccessible = true\n mNotificationWorkerFragment.set(activity, notificationWorkerFragment)\n- val method: Method = NotificationActivity::class.java.getDeclaredMethod(\n- \"addNotifications\", Boolean::class.java\n- )\n+ val method: Method =\n+ NotificationActivity::class.java.getDeclaredMethod(\n+ \"addNotifications\",\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, true)\n }\n@@ -299,9 +314,10 @@ class NotificationActivityUnitTests {\n NotificationActivity::class.java.getDeclaredField(\"isRead\")\n isRead.isAccessible = true\n isRead.set(activity, false)\n- val method: Method = NotificationActivity::class.java.getDeclaredMethod(\n- \"initListView\"\n- )\n+ val method: Method =\n+ NotificationActivity::class.java.getDeclaredMethod(\n+ \"initListView\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -313,9 +329,10 @@ class NotificationActivityUnitTests {\n NotificationActivity::class.java.getDeclaredField(\"isRead\")\n isRead.isAccessible = true\n isRead.set(activity, true)\n- val method: Method = NotificationActivity::class.java.getDeclaredMethod(\n- \"initListView\"\n- )\n+ val method: Method =\n+ NotificationActivity::class.java.getDeclaredMethod(\n+ \"initListView\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -323,12 +340,12 @@ class NotificationActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testRefreshNull() {\n- val method: Method = NotificationActivity::class.java.getDeclaredMethod(\n- \"refresh\", Boolean::class.java\n- )\n+ val method: Method =\n+ NotificationActivity::class.java.getDeclaredMethod(\n+ \"refresh\",\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, true)\n }\n-\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationClientTest.kt\nindex 74ffb31826..e9451cd759 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationClientTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationClientTest.kt\n@@ -2,7 +2,12 @@ package fr.free.nrw.commons.notification\n \n import androidx.test.ext.junit.runners.AndroidJUnit4\n import fr.free.nrw.commons.TestCommonsApplication\n+import fr.free.nrw.commons.auth.csrf.CsrfTokenClient\n import fr.free.nrw.commons.notification.models.NotificationType\n+import fr.free.nrw.commons.wikidata.GsonUtil\n+import fr.free.nrw.commons.wikidata.model.notifications.Notification\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult\n import io.reactivex.Observable\n import junit.framework.TestCase.assertEquals\n import org.junit.Before\n@@ -17,17 +22,11 @@ import org.mockito.Mockito.verify\n import org.mockito.MockitoAnnotations\n import org.robolectric.annotation.Config\n import org.robolectric.annotation.LooperMode\n-import fr.free.nrw.commons.auth.csrf.CsrfTokenClient\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult\n-import fr.free.nrw.commons.wikidata.GsonUtil\n-import fr.free.nrw.commons.wikidata.model.notifications.Notification\n \n @RunWith(AndroidJUnit4::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class NotificationClientTest {\n-\n @Mock\n private lateinit var service: NotificationInterface\n \n@@ -61,7 +60,8 @@ class NotificationClientTest {\n \n @Test\n fun getNotificationTest() {\n- Mockito.`when`(service.getAllNotifications(anyString(), anyString(), any()))\n+ Mockito\n+ .`when`(service.getAllNotifications(anyString(), anyString(), any()))\n .thenReturn(Observable.just(mQueryResponse))\n Mockito.`when`(mQueryResponse.query()).thenReturn(mQueryResult)\n Mockito.`when`(mQueryResult.notifications()).thenReturn(mQueryResultNotificationsList)\n@@ -71,9 +71,9 @@ class NotificationClientTest {\n primaryUrl = \"foo\",\n compactHeader = \"header\",\n timestamp = \"2024-01-22T10:12:00Z\",\n- notificationId = 1234L\n- )\n- )\n+ notificationId = 1234L,\n+ ),\n+ ),\n )\n \n val result = notificationClient.getNotifications(true).test().values()\n@@ -81,7 +81,7 @@ class NotificationClientTest {\n verify(service).getAllNotifications(\n eq(\"wikidatawiki|commonswiki|enwiki\"),\n eq(\"read\"),\n- eq(null)\n+ eq(null),\n )\n \n val notificationList = result.first()\n@@ -103,7 +103,8 @@ class NotificationClientTest {\n @Test\n fun markNotificationAsReadTest() {\n Mockito.`when`(csrfTokenClient.getTokenBlocking()).thenReturn(\"test\")\n- Mockito.`when`(service.markRead(anyString(), anyString(), anyString()))\n+ Mockito\n+ .`when`(service.markRead(anyString(), anyString(), anyString()))\n .thenReturn(Observable.just(mQueryResponse))\n Mockito.`when`(mQueryResponse.success()).thenReturn(true)\n notificationClient.markNotificationAsRead(\"test\")\n@@ -112,24 +113,33 @@ class NotificationClientTest {\n \n @Suppress(\"SameParameterValue\")\n private fun createWikimediaNotification(\n- primaryUrl: String, compactHeader: String, timestamp: String, notificationId: Long\n+ primaryUrl: String,\n+ compactHeader: String,\n+ timestamp: String,\n+ notificationId: Long,\n ) = Notification().apply {\n setId(notificationId)\n \n- setTimestamp(Notification.Timestamp().apply {\n- setUtciso8601(timestamp)\n- })\n-\n- contents = Notification.Contents().apply {\n- setCompactHeader(compactHeader)\n+ setTimestamp(\n+ Notification.Timestamp().apply {\n+ setUtciso8601(timestamp)\n+ },\n+ )\n \n- links = Notification.Links().apply {\n- setPrimary(\n- GsonUtil.getDefaultGson().toJsonTree(Notification.Link().apply {\n- setUrl(primaryUrl)\n- })\n- )\n+ contents =\n+ Notification.Contents().apply {\n+ setCompactHeader(compactHeader)\n+\n+ links =\n+ Notification.Links().apply {\n+ setPrimary(\n+ GsonUtil.getDefaultGson().toJsonTree(\n+ Notification.Link().apply {\n+ setUrl(primaryUrl)\n+ },\n+ ),\n+ )\n+ }\n }\n- }\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationControllerTest.kt\nindex b329bb7889..dfe4c1cba5 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationControllerTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationControllerTest.kt\n@@ -6,14 +6,14 @@ import org.junit.Test\n import org.mockito.ArgumentMatchers\n import org.mockito.ArgumentMatchers.eq\n import org.mockito.Mock\n-import org.mockito.Mockito.`when`\n import org.mockito.Mockito.verify\n+import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n \n class NotificationControllerTest {\n-\n @Mock\n private lateinit var notificationClient: NotificationClient\n+\n @Mock\n private lateinit var notification: Notification\n private lateinit var notificationController: NotificationController\n@@ -46,4 +46,4 @@ class NotificationControllerTest {\n notificationController.markAsRead(notification)\n verify(notificationClient).markNotificationAsRead(eq(\"test\"))\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationHelperUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationHelperUnitTests.kt\nindex 6503f0d2e8..49c50ff7fe 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationHelperUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationHelperUnitTests.kt\n@@ -20,7 +20,6 @@ import java.lang.reflect.Field\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class NotificationHelperUnitTests {\n-\n private lateinit var notificationHelper: NotificationHelper\n private lateinit var context: Context\n \n@@ -63,7 +62,7 @@ class NotificationHelperUnitTests {\n date = \"\",\n link = \"\",\n iconUrl = \"\",\n- notificationId = \"\"\n+ notificationId = \"\",\n )\n }\n \n@@ -76,8 +75,7 @@ class NotificationHelperUnitTests {\n date = \"\",\n link = \"\",\n iconUrl = \"\",\n- notificationId = \"\"\n+ notificationId = \"\",\n )\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationWorkerFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationWorkerFragmentUnitTests.kt\nindex 86ad998587..3db0f3bec1 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationWorkerFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationWorkerFragmentUnitTests.kt\n@@ -5,7 +5,6 @@ import org.junit.Before\n import org.junit.Test\n \n class NotificationWorkerFragmentUnitTests {\n-\n private lateinit var fragment: NotificationWorkerFragment\n \n @Before\n@@ -36,5 +35,4 @@ class NotificationWorkerFragmentUnitTests {\n fun testGetNotificationList() {\n fragment.notificationList\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/profile/ProfileActivityTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/profile/ProfileActivityTest.kt\nindex 328c617fc6..2dfeb42719 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/profile/ProfileActivityTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/profile/ProfileActivityTest.kt\n@@ -5,7 +5,6 @@ import android.graphics.Bitmap\n import android.os.Looper\n import android.view.Menu\n import android.view.MenuItem\n-import androidx.appcompat.widget.Toolbar\n import androidx.test.core.app.ApplicationProvider\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n@@ -23,11 +22,9 @@ import org.robolectric.fakes.RoboMenu\n import org.robolectric.fakes.RoboMenuItem\n import java.lang.reflect.Method\n \n-\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class ProfileActivityTest {\n-\n @Mock\n private lateinit var activity: ProfileActivity\n \n@@ -95,9 +92,11 @@ class ProfileActivityTest {\n @Throws(Exception::class)\n fun testShareScreen() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = ProfileActivity::class.java.getDeclaredMethod(\n- \"shareScreen\", Bitmap::class.java\n- )\n+ val method: Method =\n+ ProfileActivity::class.java.getDeclaredMethod(\n+ \"shareScreen\",\n+ Bitmap::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, bitmap)\n }\n@@ -107,6 +106,7 @@ class ProfileActivityTest {\n fun testOnSupportNavigateUp() {\n activity.onSupportNavigateUp()\n }\n+\n @Test\n fun testToolbarNotNull() {\n val toolbar = activity.binding.toolbarBinding.toolbar\n@@ -119,5 +119,4 @@ class ProfileActivityTest {\n activity.onCreateOptionsMenu(menu)\n Assert.assertEquals(1, menu.size())\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/profile/achievements/AchievementsFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/profile/achievements/AchievementsFragmentUnitTests.kt\nindex fee4f5d8d3..4f845962fc 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/profile/achievements/AchievementsFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/profile/achievements/AchievementsFragmentUnitTests.kt\n@@ -13,8 +13,8 @@ import androidx.test.core.app.ApplicationProvider\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.auth.SessionManager\n+import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.profile.ProfileActivity\n import fr.free.nrw.commons.utils.ConfigUtils\n import org.junit.Assert\n@@ -34,12 +34,10 @@ import org.robolectric.fakes.RoboMenuItem\n import org.robolectric.shadows.ShadowToast\n import java.lang.reflect.Method\n \n-\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class AchievementsFragmentUnitTests {\n-\n private lateinit var fragment: AchievementsFragment\n \n private lateinit var context: Context\n@@ -73,7 +71,7 @@ class AchievementsFragmentUnitTests {\n context = ApplicationProvider.getApplicationContext()\n menuItem = RoboMenuItem(context)\n OkHttpConnectionFactory.CLIENT = createTestClient()\n- \n+\n val activity = Robolectric.buildActivity(ProfileActivity::class.java).create().get()\n val fragmentManager: FragmentManager = activity.supportFragmentManager\n val fragmentTransaction: FragmentTransaction = fragmentManager.beginTransaction()\n@@ -165,11 +163,12 @@ class AchievementsFragmentUnitTests {\n @Throws(Exception::class)\n fun testLaunchAlert() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = AchievementsFragment::class.java.getDeclaredMethod(\n- \"launchAlert\",\n- String::class.java,\n- String::class.java\n- )\n+ val method: Method =\n+ AchievementsFragment::class.java.getDeclaredMethod(\n+ \"launchAlert\",\n+ String::class.java,\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"\", \"\")\n }\n@@ -178,10 +177,11 @@ class AchievementsFragmentUnitTests {\n @Throws(Exception::class)\n fun testHideProgressBar() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = AchievementsFragment::class.java.getDeclaredMethod(\n- \"hideProgressBar\",\n- Achievements::class.java\n- )\n+ val method: Method =\n+ AchievementsFragment::class.java.getDeclaredMethod(\n+ \"hideProgressBar\",\n+ Achievements::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, achievements)\n }\n@@ -190,11 +190,12 @@ class AchievementsFragmentUnitTests {\n @Throws(Exception::class)\n fun testSetAchievementsUploadCount() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = AchievementsFragment::class.java.getDeclaredMethod(\n- \"setAchievementsUploadCount\",\n- Achievements::class.java,\n- Int::class.java\n- )\n+ val method: Method =\n+ AchievementsFragment::class.java.getDeclaredMethod(\n+ \"setAchievementsUploadCount\",\n+ Achievements::class.java,\n+ Int::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, achievements, 0)\n }\n@@ -203,9 +204,10 @@ class AchievementsFragmentUnitTests {\n @Throws(Exception::class)\n fun testCheckAccount() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = AchievementsFragment::class.java.getDeclaredMethod(\n- \"checkAccount\"\n- )\n+ val method: Method =\n+ AchievementsFragment::class.java.getDeclaredMethod(\n+ \"checkAccount\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -214,10 +216,11 @@ class AchievementsFragmentUnitTests {\n @Throws(Exception::class)\n fun testSetUploadCount() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = AchievementsFragment::class.java.getDeclaredMethod(\n- \"setUploadCount\",\n- Achievements::class.java\n- )\n+ val method: Method =\n+ AchievementsFragment::class.java.getDeclaredMethod(\n+ \"setUploadCount\",\n+ Achievements::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, achievements)\n }\n@@ -226,9 +229,10 @@ class AchievementsFragmentUnitTests {\n @Throws(Exception::class)\n fun testOnError() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = AchievementsFragment::class.java.getDeclaredMethod(\n- \"onError\"\n- )\n+ val method: Method =\n+ AchievementsFragment::class.java.getDeclaredMethod(\n+ \"onError\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -237,9 +241,11 @@ class AchievementsFragmentUnitTests {\n @Throws(Exception::class)\n fun testShowSnackBarWithRetryTrue() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = AchievementsFragment::class.java.getDeclaredMethod(\n- \"showSnackBarWithRetry\", Boolean::class.java\n- )\n+ val method: Method =\n+ AchievementsFragment::class.java.getDeclaredMethod(\n+ \"showSnackBarWithRetry\",\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, true)\n }\n@@ -248,9 +254,11 @@ class AchievementsFragmentUnitTests {\n @Throws(Exception::class)\n fun testShowSnackBarWithRetryFalse() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = AchievementsFragment::class.java.getDeclaredMethod(\n- \"showSnackBarWithRetry\", Boolean::class.java\n- )\n+ val method: Method =\n+ AchievementsFragment::class.java.getDeclaredMethod(\n+ \"showSnackBarWithRetry\",\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, false)\n }\n@@ -259,9 +267,10 @@ class AchievementsFragmentUnitTests {\n @Throws(Exception::class)\n fun testSetWikidataEditCount() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = AchievementsFragment::class.java.getDeclaredMethod(\n- \"setWikidataEditCount\"\n- )\n+ val method: Method =\n+ AchievementsFragment::class.java.getDeclaredMethod(\n+ \"setWikidataEditCount\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -270,9 +279,10 @@ class AchievementsFragmentUnitTests {\n @Throws(Exception::class)\n fun testSetAchievements() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = AchievementsFragment::class.java.getDeclaredMethod(\n- \"setAchievements\"\n- )\n+ val method: Method =\n+ AchievementsFragment::class.java.getDeclaredMethod(\n+ \"setAchievements\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -281,10 +291,11 @@ class AchievementsFragmentUnitTests {\n @Throws(Exception::class)\n fun testMenuVisibilityOverrideNotVisible() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = AchievementsFragment::class.java.getDeclaredMethod(\n- \"setMenuVisibility\",\n- Boolean::class.java\n- )\n+ val method: Method =\n+ AchievementsFragment::class.java.getDeclaredMethod(\n+ \"setMenuVisibility\",\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, false)\n assertToast()\n@@ -295,10 +306,11 @@ class AchievementsFragmentUnitTests {\n fun testMenuVisibilityOverrideVisibleWithContext() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n Mockito.`when`(parentView.context).thenReturn(context)\n- val method: Method = AchievementsFragment::class.java.getDeclaredMethod(\n- \"setMenuVisibility\",\n- Boolean::class.java\n- )\n+ val method: Method =\n+ AchievementsFragment::class.java.getDeclaredMethod(\n+ \"setMenuVisibility\",\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, true)\n assertToast()\n@@ -308,14 +320,13 @@ class AchievementsFragmentUnitTests {\n if (ConfigUtils.isBetaFlavour) {\n Assert.assertEquals(\n ShadowToast.getTextOfLatestToast().toString(),\n- context.getString(R.string.achievements_unavailable_beta)\n+ context.getString(R.string.achievements_unavailable_beta),\n )\n } else {\n Assert.assertEquals(\n context.getString(R.string.user_not_logged_in),\n- ShadowToast.getTextOfLatestToast().toString()\n+ ShadowToast.getTextOfLatestToast().toString(),\n )\n }\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/profile/achievements/LevelControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/profile/achievements/LevelControllerTest.kt\nindex 624150d4ba..bfb8cb4a15 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/profile/achievements/LevelControllerTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/profile/achievements/LevelControllerTest.kt\n@@ -11,15 +11,14 @@ import org.mockito.MockitoAnnotations\n * Test for the Level Controller Class for Achievements\n */\n class LevelControllerTest {\n-\n @Mock\n private lateinit var levelController: LevelController\n \n- private val IMAGES_UPLOADED_SAMPLE_VALUE = 0\n+ private val imagesUploadedSampleValue = 0\n \n- private val UNIQUE_IMAGES_USED_SAMPLE_VALUE = 0\n+ private val uniqueImagesUsedSampleValue = 0\n \n- private val NON_REVERT_RATE_SAMPLE_VALUE = 0\n+ private val nonRevertRateSampleValue = 0\n \n private lateinit var levelInfo: LevelController.LevelInfo\n \n@@ -30,11 +29,12 @@ class LevelControllerTest {\n fun setUp() {\n MockitoAnnotations.openMocks(this)\n levelController = LevelController()\n- levelInfo = LevelController.LevelInfo.from(\n- IMAGES_UPLOADED_SAMPLE_VALUE,\n- UNIQUE_IMAGES_USED_SAMPLE_VALUE,\n- NON_REVERT_RATE_SAMPLE_VALUE\n- )\n+ levelInfo =\n+ LevelController.LevelInfo.from(\n+ imagesUploadedSampleValue,\n+ uniqueImagesUsedSampleValue,\n+ nonRevertRateSampleValue,\n+ )\n }\n \n /**\n@@ -79,4 +79,4 @@ class LevelControllerTest {\n fun testMinNonRevertPercentage() {\n assertEquals(levelInfo.minNonRevertPercentage, 85)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizActivityUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizActivityUnitTest.kt\nindex 112be9ae03..a0508ea5ea 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizActivityUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizActivityUnitTest.kt\n@@ -25,9 +25,8 @@ import org.robolectric.annotation.Config\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class QuizActivityUnitTest {\n-\n- private val SAMPLE_ALERT_TITLE_VALUE = \"Title\"\n- private val SAMPLE_ALERT_MESSAGE_VALUE = \"Message\"\n+ private val sampleAlertTitleValue = \"Title\"\n+ private val sampleAlertMessageValue = \"Message\"\n \n private lateinit var activity: QuizActivity\n private lateinit var positiveAnswer: Button\n@@ -45,9 +44,12 @@ class QuizActivityUnitTest {\n Fresco.initialize(ApplicationProvider.getApplicationContext())\n activity = Robolectric.buildActivity(QuizActivity::class.java).create().get()\n context = mock(Context::class.java)\n- view = LayoutInflater.from(activity)\n- .inflate(R.layout.answer_layout, null) as View\n- Mockito.`when`(context.getString(Mockito.any(Int::class.java)))\n+ view =\n+ LayoutInflater\n+ .from(activity)\n+ .inflate(R.layout.answer_layout, null) as View\n+ Mockito\n+ .`when`(context.getString(Mockito.any(Int::class.java)))\n .thenReturn(\"\")\n quizController = QuizController()\n quizController.initialize(context)\n@@ -86,7 +88,6 @@ class QuizActivityUnitTest {\n @Test\n @Throws(Exception::class)\n fun testCustomAlert() {\n- activity.customAlert(SAMPLE_ALERT_TITLE_VALUE, SAMPLE_ALERT_MESSAGE_VALUE)\n+ activity.customAlert(sampleAlertTitleValue, sampleAlertMessageValue)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizCheckerUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizCheckerUnitTest.kt\nindex d566f15c98..0b7498592c 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizCheckerUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizCheckerUnitTest.kt\n@@ -27,7 +27,6 @@ import java.lang.reflect.Method\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class QuizCheckerUnitTest {\n-\n private lateinit var quizChecker: QuizChecker\n private lateinit var activity: Activity\n \n@@ -52,7 +51,8 @@ class QuizCheckerUnitTest {\n quizChecker = QuizChecker(sessionManager, okHttpJsonApiClient, jsonKvStore)\n Mockito.`when`(sessionManager.userName).thenReturn(\"\")\n Mockito.`when`(okHttpJsonApiClient.getUploadCount(any())).thenReturn(Single.just(0))\n- Mockito.`when`(okHttpJsonApiClient.getAchievements(any()))\n+ Mockito\n+ .`when`(okHttpJsonApiClient.getAchievements(any()))\n .thenReturn(Single.just(feedbackResponse))\n }\n \n@@ -77,10 +77,11 @@ class QuizCheckerUnitTest {\n @Test\n @Throws(Exception::class)\n fun testSetTotalUploadCount() {\n- val method: Method = QuizChecker::class.java.getDeclaredMethod(\n- \"setTotalUploadCount\",\n- Int::class.java\n- )\n+ val method: Method =\n+ QuizChecker::class.java.getDeclaredMethod(\n+ \"setTotalUploadCount\",\n+ Int::class.java,\n+ )\n method.isAccessible = true\n method.invoke(quizChecker, -1)\n }\n@@ -88,10 +89,11 @@ class QuizCheckerUnitTest {\n @Test\n @Throws(Exception::class)\n fun testSetRevertParameter() {\n- val method: Method = QuizChecker::class.java.getDeclaredMethod(\n- \"setRevertParameter\",\n- Int::class.java\n- )\n+ val method: Method =\n+ QuizChecker::class.java.getDeclaredMethod(\n+ \"setRevertParameter\",\n+ Int::class.java,\n+ )\n method.isAccessible = true\n method.invoke(quizChecker, -1)\n }\n@@ -100,10 +102,11 @@ class QuizCheckerUnitTest {\n @Throws(Exception::class)\n fun testCalculateRevertParameterAndShowQuiz() {\n Whitebox.setInternalState(quizChecker, \"revertCount\", -1)\n- val method: Method = QuizChecker::class.java.getDeclaredMethod(\n- \"calculateRevertParameterAndShowQuiz\",\n- Activity::class.java\n- )\n+ val method: Method =\n+ QuizChecker::class.java.getDeclaredMethod(\n+ \"calculateRevertParameterAndShowQuiz\",\n+ Activity::class.java,\n+ )\n method.isAccessible = true\n method.invoke(quizChecker, activity)\n }\n@@ -115,10 +118,11 @@ class QuizCheckerUnitTest {\n Whitebox.setInternalState(quizChecker, \"isUploadCountFetched\", true)\n Whitebox.setInternalState(quizChecker, \"totalUploadCount\", 5)\n Whitebox.setInternalState(quizChecker, \"revertCount\", 5)\n- val method: Method = QuizChecker::class.java.getDeclaredMethod(\n- \"calculateRevertParameterAndShowQuiz\",\n- Activity::class.java\n- )\n+ val method: Method =\n+ QuizChecker::class.java.getDeclaredMethod(\n+ \"calculateRevertParameterAndShowQuiz\",\n+ Activity::class.java,\n+ )\n method.isAccessible = true\n method.invoke(quizChecker, activity)\n }\n@@ -126,12 +130,12 @@ class QuizCheckerUnitTest {\n @Test\n @Throws(Exception::class)\n fun testStartQuizActivity() {\n- val method: Method = QuizChecker::class.java.getDeclaredMethod(\n- \"startQuizActivity\",\n- Activity::class.java\n- )\n+ val method: Method =\n+ QuizChecker::class.java.getDeclaredMethod(\n+ \"startQuizActivity\",\n+ Activity::class.java,\n+ )\n method.isAccessible = true\n method.invoke(quizChecker, activity)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizControllerTest.kt\nindex 52180aae98..c0e3c4db23 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizControllerTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizControllerTest.kt\n@@ -5,13 +5,11 @@ import org.junit.Assert.assertNotNull\n import org.junit.Before\n import org.junit.Test\n import org.mockito.Mock\n-import org.mockito.Mockito.`when`\n import org.mockito.Mockito.any\n+import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n \n-\n class QuizControllerTest {\n-\n @Mock\n private lateinit var quizController: QuizController\n \n@@ -35,5 +33,4 @@ class QuizControllerTest {\n fun testGetQuiz() {\n assertNotNull(quizController.getQuiz())\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizQuestionTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizQuestionTest.kt\nindex c591f277f0..6c6b25420a 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizQuestionTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizQuestionTest.kt\n@@ -14,38 +14,37 @@ import org.robolectric.annotation.Config\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class QuizQuestionTest {\n-\n @Mock\n private lateinit var quizQuestion: QuizQuestion\n \n- private val QUESTION_NUM_SAMPLE_VALUE = 1\n- private val QUESTION_SAMPLE_VALUE = \"Is this picture OK to upload?\"\n- private val QUESTION_URL_SAMPLE_VALUE_ONE = \"https://i.imgur.com/0fMYcpM.jpg\"\n- private val QUESTION_URL_SAMPLE_VALUE_TWO = \"https://example.com\"\n- private val IS_ANSWER_SAMPLE_VALUE = false\n- private val ANSWER_MESSAGE_SAMPLE_VALUE = \"Continue\"\n+ private val questionNumSampleValue = 1\n+ private val questionSampleValue = \"Is this picture OK to upload?\"\n+ private val questionUrlSampleValueOne = \"https://i.imgur.com/0fMYcpM.jpg\"\n+ private val questionUrlSampleValueTwo = \"https://example.com\"\n+ private val isAnswerSampleValue = false\n+ private val answerMessageSampleValue = \"Continue\"\n \n @Before\n fun setup() {\n MockitoAnnotations.openMocks(this)\n- quizQuestion = QuizQuestion(\n- QUESTION_NUM_SAMPLE_VALUE,\n- QUESTION_SAMPLE_VALUE,\n- QUESTION_URL_SAMPLE_VALUE_ONE,\n- IS_ANSWER_SAMPLE_VALUE,\n- ANSWER_MESSAGE_SAMPLE_VALUE\n- )\n+ quizQuestion =\n+ QuizQuestion(\n+ questionNumSampleValue,\n+ questionSampleValue,\n+ questionUrlSampleValueOne,\n+ isAnswerSampleValue,\n+ answerMessageSampleValue,\n+ )\n }\n \n @Test\n fun testGetUrl() {\n- assertEquals(quizQuestion.getUrl(), Uri.parse(QUESTION_URL_SAMPLE_VALUE_ONE))\n+ assertEquals(quizQuestion.getUrl(), Uri.parse(questionUrlSampleValueOne))\n }\n \n @Test\n fun testSetUrl() {\n- quizQuestion.setUrl(QUESTION_URL_SAMPLE_VALUE_TWO)\n- assertEquals(quizQuestion.getUrl(), Uri.parse(QUESTION_URL_SAMPLE_VALUE_TWO))\n+ quizQuestion.setUrl(questionUrlSampleValueTwo)\n+ assertEquals(quizQuestion.getUrl(), Uri.parse(questionUrlSampleValueTwo))\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizResultActivityUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizResultActivityUnitTest.kt\nindex f2785777ec..8af4c4e19b 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizResultActivityUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizResultActivityUnitTest.kt\n@@ -19,7 +19,6 @@ import org.robolectric.fakes.RoboMenu\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class QuizResultActivityUnitTest {\n-\n private lateinit var activity: QuizResultActivity\n private lateinit var quizResultActivity: QuizResultActivity\n private lateinit var menu: RoboMenu\n@@ -84,5 +83,4 @@ class QuizResultActivityUnitTest {\n fun tesShareScreen() {\n activity.shareScreen(bitmap)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/quiz/RadioGroupHelperUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/quiz/RadioGroupHelperUnitTest.kt\nindex 0464ca325a..12eebfd698 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/quiz/RadioGroupHelperUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/quiz/RadioGroupHelperUnitTest.kt\n@@ -8,12 +8,9 @@ import org.junit.Assert\n import org.junit.Before\n import org.junit.Test\n import org.mockito.Mock\n-import org.mockito.Mockito.`when`\n-import org.mockito.Mockito.anyInt\n import org.mockito.MockitoAnnotations\n \n class RadioGroupHelperUnitTest {\n-\n private lateinit var radioGroupHelper: RadioGroupHelper\n \n @Mock\n@@ -54,5 +51,4 @@ class RadioGroupHelperUnitTest {\n fun constructor2() {\n radioGroupHelper = RadioGroupHelper(activity)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesAdapterUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesAdapterUnitTest.kt\nindex f49c83e7f9..6c9a192739 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesAdapterUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesAdapterUnitTest.kt\n@@ -4,14 +4,14 @@ import android.content.Context\n import android.view.LayoutInflater\n import android.view.View\n import android.view.ViewGroup\n+import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n+import fr.free.nrw.commons.contributions.MainActivity\n import org.junit.Assert\n import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n import org.mockito.Mock\n-import fr.free.nrw.commons.R\n-import fr.free.nrw.commons.contributions.MainActivity\n import org.mockito.MockitoAnnotations\n import org.robolectric.Robolectric\n import org.robolectric.RobolectricTestRunner\n@@ -24,7 +24,6 @@ import java.lang.reflect.Field\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class RecentLanguagesAdapterUnitTest {\n-\n private lateinit var context: Context\n private lateinit var convertView: View\n private lateinit var activity: MainActivity\n@@ -44,10 +43,11 @@ class RecentLanguagesAdapterUnitTest {\n \n convertView = LayoutInflater.from(context).inflate(R.layout.row_item_languages_spinner, null) as View\n \n- languages = listOf(\n- Language(\"English\", \"en\"),\n- Language(\"Bengali\", \"bn\")\n- )\n+ languages =\n+ listOf(\n+ Language(\"English\", \"en\"),\n+ Language(\"Bengali\", \"bn\"),\n+ )\n adapter = RecentLanguagesAdapter(context, languages, hashMapOf(1 to \"en\"))\n }\n \ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesContentProviderUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesContentProviderUnitTest.kt\nindex a1f2020551..c6880ad7bd 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesContentProviderUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesContentProviderUnitTest.kt\n@@ -16,14 +16,13 @@ import org.robolectric.annotation.Config\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class RecentLanguagesContentProviderUnitTest {\n-\n private lateinit var contentProvider: RecentLanguagesContentProvider\n \n @Mock\n lateinit var dbOpenHelper: DBOpenHelper\n \n @Before\n- fun setUp(){\n+ fun setUp() {\n MockitoAnnotations.openMocks(this)\n contentProvider = RecentLanguagesContentProvider()\n Whitebox.setInternalState(contentProvider, \"dbOpenHelper\", dbOpenHelper)\n@@ -34,4 +33,4 @@ class RecentLanguagesContentProviderUnitTest {\n fun testGetType() {\n contentProvider.getType(mock(Uri::class.java))\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesDaoUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesDaoUnitTest.kt\nindex ef4f066e82..087640a44c 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesDaoUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesDaoUnitTest.kt\n@@ -6,9 +6,19 @@ import android.database.Cursor\n import android.database.MatrixCursor\n import android.database.sqlite.SQLiteDatabase\n import android.os.RemoteException\n-import com.nhaarman.mockitokotlin2.*\n+import com.nhaarman.mockitokotlin2.anyOrNull\n+import com.nhaarman.mockitokotlin2.argumentCaptor\n+import com.nhaarman.mockitokotlin2.inOrder\n+import com.nhaarman.mockitokotlin2.mock\n+import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.recentlanguages.RecentLanguagesDao.Table.*\n+import fr.free.nrw.commons.recentlanguages.RecentLanguagesDao.Table.COLUMN_CODE\n+import fr.free.nrw.commons.recentlanguages.RecentLanguagesDao.Table.COLUMN_NAME\n+import fr.free.nrw.commons.recentlanguages.RecentLanguagesDao.Table.CREATE_TABLE_STATEMENT\n+import fr.free.nrw.commons.recentlanguages.RecentLanguagesDao.Table.DROP_TABLE_STATEMENT\n+import fr.free.nrw.commons.recentlanguages.RecentLanguagesDao.Table.onCreate\n+import fr.free.nrw.commons.recentlanguages.RecentLanguagesDao.Table.onDelete\n+import fr.free.nrw.commons.recentlanguages.RecentLanguagesDao.Table.onUpdate\n import org.junit.Assert\n import org.junit.Before\n import org.junit.Test\n@@ -17,18 +27,17 @@ import org.mockito.ArgumentMatchers.any\n import org.mockito.ArgumentMatchers.eq\n import org.mockito.Mockito.verify\n import org.mockito.Mockito.verifyNoInteractions\n-import org.mockito.Mockito.verifyNoInteractions\n import org.robolectric.RobolectricTestRunner\n import org.robolectric.annotation.Config\n \n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class RecentLanguagesDaoUnitTest {\n-\n- private val columns = arrayOf(\n- COLUMN_NAME,\n- COLUMN_CODE\n- )\n+ private val columns =\n+ arrayOf(\n+ COLUMN_NAME,\n+ COLUMN_CODE,\n+ )\n \n private val client: ContentProviderClient = mock()\n private val database: SQLiteDatabase = mock()\n@@ -79,13 +88,12 @@ class RecentLanguagesDaoUnitTest {\n val result = testObject.recentLanguages\n \n Assert.assertEquals(14, (result.size))\n-\n }\n \n @Test(expected = RuntimeException::class)\n fun getGetRecentLanguagesTranslatesExceptions() {\n whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenThrow(\n- RemoteException(\"\")\n+ RemoteException(\"\"),\n )\n testObject.recentLanguages\n }\n@@ -123,7 +131,7 @@ class RecentLanguagesDaoUnitTest {\n @Test(expected = RuntimeException::class)\n fun findLanguageTranslatesExceptions() {\n whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenThrow(\n- RemoteException(\"\")\n+ RemoteException(\"\"),\n )\n testObject.findRecentLanguage(exampleLanguage.languageCode)\n }\n@@ -291,11 +299,11 @@ class RecentLanguagesDaoUnitTest {\n Assert.assertEquals(2, cv.size())\n Assert.assertEquals(\n exampleLanguage.languageName,\n- cv.getAsString(COLUMN_NAME)\n+ cv.getAsString(COLUMN_NAME),\n )\n Assert.assertEquals(\n exampleLanguage.languageCode,\n- cv.getAsString(COLUMN_CODE)\n+ cv.getAsString(COLUMN_CODE),\n )\n }\n }\n@@ -306,10 +314,10 @@ class RecentLanguagesDaoUnitTest {\n testObject.deleteRecentLanguage(exampleLanguage.languageCode)\n }\n \n- private fun createCursor(rowCount: Int) = MatrixCursor(columns, rowCount).apply {\n-\n- for (i in 0 until rowCount) {\n- addRow(listOf(\"languageName\", \"languageCode\"))\n+ private fun createCursor(rowCount: Int) =\n+ MatrixCursor(columns, rowCount).apply {\n+ for (i in 0 until rowCount) {\n+ addRow(listOf(\"languageName\", \"languageCode\"))\n+ }\n }\n- }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewActivityTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewActivityTest.kt\nindex b401d7e813..f2faf769ac 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewActivityTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewActivityTest.kt\n@@ -20,7 +20,9 @@ import org.junit.Test\n import org.junit.runner.RunWith\n import org.mockito.ArgumentMatchers\n import org.mockito.Mock\n-import org.mockito.Mockito.*\n+import org.mockito.Mockito.anyInt\n+import org.mockito.Mockito.doReturn\n+import org.mockito.Mockito.mock\n import org.mockito.MockitoAnnotations\n import org.powermock.reflect.Whitebox\n import org.robolectric.Robolectric\n@@ -36,7 +38,6 @@ import java.lang.reflect.Method\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class ReviewActivityTest {\n-\n private lateinit var activity: ReviewActivity\n \n private lateinit var menuItem: MenuItem\n@@ -79,12 +80,11 @@ class ReviewActivityTest {\n menuItem = RoboMenuItem(null)\n \n menu = RoboMenu(context)\n- Whitebox.setInternalState(binding, \"viewPagerReview\", reviewPager);\n- Whitebox.setInternalState(activity, \"hasNonHiddenCategories\", hasNonHiddenCategories);\n- Whitebox.setInternalState(activity, \"reviewHelper\", reviewHelper);\n- Whitebox.setInternalState(activity, \"reviewImageFragment\", reviewImageFragment);\n- Whitebox.setInternalState(activity, \"reviewPagerAdapter\", reviewPagerAdapter);\n-\n+ Whitebox.setInternalState(binding, \"viewPagerReview\", reviewPager)\n+ Whitebox.setInternalState(activity, \"hasNonHiddenCategories\", hasNonHiddenCategories)\n+ Whitebox.setInternalState(activity, \"reviewHelper\", reviewHelper)\n+ Whitebox.setInternalState(activity, \"reviewImageFragment\", reviewImageFragment)\n+ Whitebox.setInternalState(activity, \"reviewPagerAdapter\", reviewPagerAdapter)\n }\n \n @Test\n@@ -103,7 +103,7 @@ class ReviewActivityTest {\n @Throws(Exception::class)\n fun testSwipeToNext() {\n shadowOf(getMainLooper()).idle()\n- doReturn(1,2).`when`(reviewPager)?.currentItem\n+ doReturn(1, 2).`when`(reviewPager)?.currentItem\n activity.swipeToNext()\n }\n \n@@ -120,7 +120,7 @@ class ReviewActivityTest {\n reviewHelper\n ?.getRandomMedia()\n ?.test()\n- ?.assertValue(media);\n+ ?.assertValue(media)\n activity.swipeToNext()\n }\n \n@@ -135,11 +135,9 @@ class ReviewActivityTest {\n doNothing().`when`(reviewImageFragment).disableButtons()\n \n var findNonHiddenCategory: Method =\n- ReviewActivity::class.java.getDeclaredMethod(\"findNonHiddenCategories\"\n- , Media::class.java)\n+ ReviewActivity::class.java.getDeclaredMethod(\"findNonHiddenCategories\", Media::class.java)\n findNonHiddenCategory.isAccessible = true\n findNonHiddenCategory.invoke(activity, media)\n-\n }\n \n @Test\n@@ -195,5 +193,4 @@ class ReviewActivityTest {\n fun testOnBackPressed() {\n activity.onBackPressed()\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewControllerTest.kt\nindex a8387919a9..059583f8a3 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewControllerTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewControllerTest.kt\n@@ -14,6 +14,7 @@ import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.delete.DeleteHelper\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage\n import media\n import org.junit.Assert.assertEquals\n import org.junit.Assert.assertNotNull\n@@ -30,15 +31,13 @@ import org.robolectric.annotation.Config\n import org.robolectric.annotation.LooperMode\n import org.robolectric.shadows.ShadowNotificationManager\n import org.robolectric.shadows.ShadowToast\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage\n import java.lang.reflect.Method\n-import java.util.*\n+import java.util.Date\n \n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class ReviewControllerTest {\n-\n private lateinit var controller: ReviewController\n private lateinit var context: Context\n private lateinit var activity: Activity\n@@ -82,7 +81,7 @@ class ReviewControllerTest {\n activity,\n activity.resources.getString(R.string.review_spam_report_question),\n ReviewController.DeleteReason.SPAM,\n- reviewCallback\n+ reviewCallback,\n )\n }\n \n@@ -95,7 +94,7 @@ class ReviewControllerTest {\n activity,\n activity.resources.getString(R.string.review_c_violation_report_question),\n ReviewController.DeleteReason.COPYRIGHT_VIOLATION,\n- reviewCallback\n+ reviewCallback,\n )\n }\n \n@@ -105,28 +104,33 @@ class ReviewControllerTest {\n controller.reportWrongCategory(activity, reviewCallback)\n assertEquals(\n ShadowToast.getTextOfLatestToast().toString(),\n- context.getString(R.string.check_category_toast, media.displayTitle)\n+ context.getString(R.string.check_category_toast, media.displayTitle),\n )\n }\n \n @Test\n fun testPublishProgress() {\n shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = ReviewController::class.java.getDeclaredMethod(\n- \"publishProgress\", Context::class.java, Int::class.java\n- )\n+ val method: Method =\n+ ReviewController::class.java.getDeclaredMethod(\n+ \"publishProgress\",\n+ Context::class.java,\n+ Int::class.java,\n+ )\n method.isAccessible = true\n method.invoke(controller, context, 1)\n assertNotNull(ShadowNotificationManager().allNotifications)\n }\n \n-\n @Test\n fun testShowNotification() {\n shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = ReviewController::class.java.getDeclaredMethod(\n- \"showNotification\", String::class.java, String::class.java\n- )\n+ val method: Method =\n+ ReviewController::class.java.getDeclaredMethod(\n+ \"showNotification\",\n+ String::class.java,\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(controller, \"\", \"\")\n assertNotNull(ShadowNotificationManager().allNotifications)\n@@ -141,26 +145,30 @@ class ReviewControllerTest {\n assertEquals(\n ShadowToast.getTextOfLatestToast().toString(),\n context.getString(\n- R.string.send_thank_toast, media.displayTitle\n- )\n+ R.string.send_thank_toast,\n+ media.displayTitle,\n+ ),\n )\n \n- val method: Method = ReviewController::class.java.getDeclaredMethod(\n- \"displayThanksToast\", Context::class.java, Boolean::class.java\n- )\n+ val method: Method =\n+ ReviewController::class.java.getDeclaredMethod(\n+ \"displayThanksToast\",\n+ Context::class.java,\n+ Boolean::class.java,\n+ )\n \n method.isAccessible = true\n- method.invoke(controller,context,true)\n+ method.invoke(controller, context, true)\n \n assertEquals(\n ShadowToast.getTextOfLatestToast().toString(),\n context.getString(\n- R.string.send_thank_success_message, media.displayTitle\n- )\n+ R.string.send_thank_success_message,\n+ media.displayTitle,\n+ ),\n )\n }\n \n-\n @Test\n fun testSendThanksCaseNull() {\n shadowOf(Looper.getMainLooper()).idle()\n@@ -168,8 +176,9 @@ class ReviewControllerTest {\n assertEquals(\n ShadowToast.getTextOfLatestToast().toString(),\n context.getString(\n- R.string.send_thank_toast, media.displayTitle\n- )\n+ R.string.send_thank_toast,\n+ media.displayTitle,\n+ ),\n )\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewDaoTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewDaoTest.kt\nindex 55623b3cb8..96aacf6f84 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewDaoTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewDaoTest.kt\n@@ -18,7 +18,7 @@ import org.robolectric.annotation.LooperMode\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class ReviewDaoTest {\n- private lateinit var reviewDao: ReviewDao\n+ private lateinit var reviewDao: ReviewDao\n private lateinit var database: AppDatabase\n \n /**\n@@ -26,10 +26,11 @@ class ReviewDaoTest {\n */\n @Before\n fun createDb() {\n- database = inMemoryDatabaseBuilder(\n- context = ApplicationProvider.getApplicationContext(),\n- klass = AppDatabase::class.java\n- ).allowMainThreadQueries().build()\n+ database =\n+ inMemoryDatabaseBuilder(\n+ context = ApplicationProvider.getApplicationContext(),\n+ klass = AppDatabase::class.java,\n+ ).allowMainThreadQueries().build()\n reviewDao = database.ReviewDao()\n }\n \n@@ -70,4 +71,4 @@ class ReviewDaoTest {\n val isInserted = reviewDao.isReviewedAlready(imageId)\n MatcherAssert.assertThat(isInserted, CoreMatchers.equalTo(false))\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt\nindex 74be27d5b3..283bbf268e 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt\n@@ -13,18 +13,19 @@ import org.junit.Assert.assertNull\n import org.junit.Assert.assertTrue\n import org.junit.Before\n import org.junit.Test\n-import org.mockito.Mockito.*\n+import org.mockito.Mockito.any\n+import org.mockito.Mockito.mock\n+import org.mockito.Mockito.times\n+import org.mockito.Mockito.verify\n \n /**\n * Test class for ReviewHelper\n */\n class ReviewHelperTest {\n-\n private val reviewInterface = mock()\n private val mediaClient = mock()\n private val reviewHelper = ReviewHelper(mediaClient, reviewInterface)\n \n-\n private val mwQueryResult = mock()\n private val mockResponse = mock()\n \n@@ -132,16 +133,21 @@ class ReviewHelperTest {\n assertTrue(result)\n }\n \n- private fun setupMedia(file: String, vararg revision: MwQueryPage.Revision): MwQueryPage = mock().apply {\n- whenever(title()).thenReturn(file)\n- if (revision.isNotEmpty()) {\n- whenever(revisions()).thenReturn(*revision.toMutableList())\n+ private fun setupMedia(\n+ file: String,\n+ vararg revision: MwQueryPage.Revision,\n+ ): MwQueryPage =\n+ mock().apply {\n+ whenever(title()).thenReturn(file)\n+ if (revision.isNotEmpty()) {\n+ whenever(revisions()).thenReturn(*revision.toMutableList())\n+ }\n+\n+ val media =\n+ mock().apply {\n+ whenever(filename).thenReturn(file)\n+ whenever(pageId).thenReturn(file.split(\".\").first())\n+ }\n+ whenever(mediaClient.getMedia(file)).thenReturn(Single.just(media))\n }\n-\n- val media = mock().apply {\n- whenever(filename).thenReturn(file)\n- whenever(pageId).thenReturn(file.split(\".\").first())\n- }\n- whenever(mediaClient.getMedia(file)).thenReturn(Single.just(media))\n- }\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewImageFragmentTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewImageFragmentTest.kt\nindex 6e08dc665b..bf4bd18784 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewImageFragmentTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewImageFragmentTest.kt\n@@ -62,7 +62,6 @@ class ReviewImageFragmentTest {\n \n @Before\n fun setUp() {\n-\n MockitoAnnotations.openMocks(this)\n context = ApplicationProvider.getApplicationContext()\n OkHttpConnectionFactory.CLIENT = createTestClient()\n@@ -79,8 +78,10 @@ class ReviewImageFragmentTest {\n fragmentTransaction.add(fragment, null)\n fragmentTransaction.commit()\n \n- view = LayoutInflater.from(activity)\n- .inflate(R.layout.fragment_review_image, null) as View\n+ view =\n+ LayoutInflater\n+ .from(activity)\n+ .inflate(R.layout.fragment_review_image, null) as View\n binding = FragmentReviewImageBinding.inflate(LayoutInflater.from(activity))\n \n noButton = view.findViewById(R.id.button_no)\n@@ -105,7 +106,6 @@ class ReviewImageFragmentTest {\n assertEquals(noButton.alpha, 0.5f)\n }\n \n-\n @Test\n @Throws(Exception::class)\n fun testOnEnableButton() {\n@@ -116,7 +116,6 @@ class ReviewImageFragmentTest {\n assertEquals(noButton.alpha, 1f)\n }\n \n-\n @Test\n @Throws(Exception::class)\n fun testOnUpdateCategoriesQuestion() {\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsActivityUnitTests.kt\nindex e8a3fe19a8..2caef0566f 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsActivityUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsActivityUnitTests.kt\n@@ -24,7 +24,6 @@ import java.lang.reflect.Method\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class SettingsActivityUnitTests {\n-\n private lateinit var activity: SettingsActivity\n private lateinit var context: Context\n private lateinit var menuItem: MenuItem\n@@ -69,12 +68,12 @@ class SettingsActivityUnitTests {\n @Throws(Exception::class)\n fun testSetTotalUploadCount() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = SettingsActivity::class.java.getDeclaredMethod(\n- \"onPostCreate\",\n- Bundle::class.java\n- )\n+ val method: Method =\n+ SettingsActivity::class.java.getDeclaredMethod(\n+ \"onPostCreate\",\n+ Bundle::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, savedInstanceState)\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt\nindex c05d810298..6c9ee9d039 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt\n@@ -22,7 +22,6 @@ import fr.free.nrw.commons.recentlanguages.RecentLanguagesDao\n import fr.free.nrw.commons.settings.SettingsFragment.createLocale\n import org.junit.Assert\n import org.junit.Assert.assertEquals\n-import org.junit.Assert.assertNull\n import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n@@ -38,12 +37,10 @@ import org.robolectric.annotation.LooperMode\n import java.lang.reflect.Method\n import java.util.Locale\n \n-\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class SettingsFragmentUnitTests {\n-\n private lateinit var fragment: SettingsFragment\n private lateinit var fragmentManager: FragmentManager\n private lateinit var layoutInflater: LayoutInflater\n@@ -79,11 +76,17 @@ class SettingsFragmentUnitTests {\n layoutInflater = LayoutInflater.from(activity)\n \n Whitebox.setInternalState(fragment, \"recentLanguagesDao\", recentLanguagesDao)\n- Whitebox.setInternalState(fragment, \"recentLanguagesTextView\",\n- recentLanguagesTextView)\n+ Whitebox.setInternalState(\n+ fragment,\n+ \"recentLanguagesTextView\",\n+ recentLanguagesTextView,\n+ )\n Whitebox.setInternalState(fragment, \"separator\", separator)\n- Whitebox.setInternalState(fragment, \"languageHistoryListView\",\n- languageHistoryListView)\n+ Whitebox.setInternalState(\n+ fragment,\n+ \"languageHistoryListView\",\n+ languageHistoryListView,\n+ )\n }\n \n @Test\n@@ -95,9 +98,10 @@ class SettingsFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testRequestExternalStoragePermissions() {\n- val method: Method = SettingsFragment::class.java.getDeclaredMethod(\n- \"requestExternalStoragePermissions\"\n- )\n+ val method: Method =\n+ SettingsFragment::class.java.getDeclaredMethod(\n+ \"requestExternalStoragePermissions\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -106,9 +110,10 @@ class SettingsFragmentUnitTests {\n @Throws(Exception::class)\n fun testCheckPermissionsAndSendLogs() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = SettingsFragment::class.java.getDeclaredMethod(\n- \"checkPermissionsAndSendLogs\"\n- )\n+ val method: Method =\n+ SettingsFragment::class.java.getDeclaredMethod(\n+ \"checkPermissionsAndSendLogs\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -117,10 +122,11 @@ class SettingsFragmentUnitTests {\n @Throws(Exception::class)\n fun testGetCurrentLanguageCode() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = SettingsFragment::class.java.getDeclaredMethod(\n- \"getCurrentLanguageCode\",\n- String::class.java\n- )\n+ val method: Method =\n+ SettingsFragment::class.java.getDeclaredMethod(\n+ \"getCurrentLanguageCode\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"\")\n }\n@@ -129,11 +135,12 @@ class SettingsFragmentUnitTests {\n @Throws(Exception::class)\n fun testSaveLanguageValueCase_appUiDefaultLanguagePref() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = SettingsFragment::class.java.getDeclaredMethod(\n- \"saveLanguageValue\",\n- String::class.java,\n- String::class.java\n- )\n+ val method: Method =\n+ SettingsFragment::class.java.getDeclaredMethod(\n+ \"saveLanguageValue\",\n+ String::class.java,\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"\", \"appUiDefaultLanguagePref\")\n }\n@@ -142,12 +149,13 @@ class SettingsFragmentUnitTests {\n @Throws(Exception::class)\n fun `Test prepareAppLanguages when recently used languages is empty`() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = SettingsFragment::class.java.getDeclaredMethod(\n- \"prepareAppLanguages\",\n- String::class.java\n- )\n+ val method: Method =\n+ SettingsFragment::class.java.getDeclaredMethod(\n+ \"prepareAppLanguages\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n- method.invoke(fragment, \"appUiDefaultLanguagePref\")\n+ method.invoke(fragment, \"appUiDefaultLanguagePref\")\n verify(recentLanguagesDao, times(1)).recentLanguages\n }\n \n@@ -157,19 +165,22 @@ class SettingsFragmentUnitTests {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n whenever(recentLanguagesDao.recentLanguages)\n .thenReturn(\n- mutableListOf(Language(\"English\", \"en\"),\n- Language(\"English\", \"en\"),\n- Language(\"English\", \"en\"),\n- Language(\"English\", \"en\"),\n- Language(\"English\", \"en\"),\n- Language(\"English\", \"en\"))\n+ mutableListOf(\n+ Language(\"English\", \"en\"),\n+ Language(\"English\", \"en\"),\n+ Language(\"English\", \"en\"),\n+ Language(\"English\", \"en\"),\n+ Language(\"English\", \"en\"),\n+ Language(\"English\", \"en\"),\n+ ),\n+ )\n+ val method: Method =\n+ SettingsFragment::class.java.getDeclaredMethod(\n+ \"prepareAppLanguages\",\n+ String::class.java,\n )\n- val method: Method = SettingsFragment::class.java.getDeclaredMethod(\n- \"prepareAppLanguages\",\n- String::class.java\n- )\n method.isAccessible = true\n- method.invoke(fragment, \"appUiDefaultLanguagePref\")\n+ method.invoke(fragment, \"appUiDefaultLanguagePref\")\n verify(recentLanguagesDao, times(2)).recentLanguages\n }\n \n@@ -177,11 +188,12 @@ class SettingsFragmentUnitTests {\n @Throws(Exception::class)\n fun testSaveLanguageValueCase_descriptionDefaultLanguagePref() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = SettingsFragment::class.java.getDeclaredMethod(\n- \"saveLanguageValue\",\n- String::class.java,\n- String::class.java\n- )\n+ val method: Method =\n+ SettingsFragment::class.java.getDeclaredMethod(\n+ \"saveLanguageValue\",\n+ String::class.java,\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"\", \"descriptionDefaultLanguagePref\")\n }\n@@ -190,9 +202,10 @@ class SettingsFragmentUnitTests {\n @Throws(Exception::class)\n fun testHideRecentLanguagesSection() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = SettingsFragment::class.java.getDeclaredMethod(\n- \"hideRecentLanguagesSection\"\n- )\n+ val method: Method =\n+ SettingsFragment::class.java.getDeclaredMethod(\n+ \"hideRecentLanguagesSection\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n verify(recentLanguagesTextView, times(1)).visibility = any()\n@@ -206,18 +219,21 @@ class SettingsFragmentUnitTests {\n whenever(recentLanguagesDao.findRecentLanguage(any()))\n .thenReturn(true)\n whenever(adapterView.adapter)\n- .thenReturn(RecentLanguagesAdapter(context,\n- listOf(Language(\"English\", \"en\")),\n- hashMapOf()\n- )\n+ .thenReturn(\n+ RecentLanguagesAdapter(\n+ context,\n+ listOf(Language(\"English\", \"en\")),\n+ hashMapOf(),\n+ ),\n+ )\n+ val method: Method =\n+ SettingsFragment::class.java.getDeclaredMethod(\n+ \"onRecentLanguageClicked\",\n+ String::class.java,\n+ Dialog::class.java,\n+ AdapterView::class.java,\n+ Int::class.java,\n )\n- val method: Method = SettingsFragment::class.java.getDeclaredMethod(\n- \"onRecentLanguageClicked\",\n- String::class.java,\n- Dialog::class.java,\n- AdapterView::class.java,\n- Int::class.java\n- )\n method.isAccessible = true\n method.invoke(fragment, \"test\", Mockito.mock(Dialog::class.java), adapterView, 0)\n verify(recentLanguagesDao, times(1)).findRecentLanguage(any())\n@@ -226,13 +242,14 @@ class SettingsFragmentUnitTests {\n \n @Test\n fun `Test setUpRecentLanguagesSection when list is empty`() {\n- val method: Method = SettingsFragment::class.java.getDeclaredMethod(\n- \"setUpRecentLanguagesSection\",\n- List::class.java,\n- HashMap::class.java\n- )\n+ val method: Method =\n+ SettingsFragment::class.java.getDeclaredMethod(\n+ \"setUpRecentLanguagesSection\",\n+ List::class.java,\n+ HashMap::class.java,\n+ )\n method.isAccessible = true\n- method.invoke(fragment, emptyList(), hashMapOf())\n+ method.invoke(fragment, emptyList(), hashMapOf())\n verify(languageHistoryListView, times(1)).visibility = View.GONE\n verify(separator, times(1)).visibility = View.GONE\n verify(recentLanguagesTextView, times(1)).visibility = View.GONE\n@@ -240,20 +257,25 @@ class SettingsFragmentUnitTests {\n \n @Test\n fun `Test setUpRecentLanguagesSection when list is not empty`() {\n- val method: Method = SettingsFragment::class.java.getDeclaredMethod(\n- \"setUpRecentLanguagesSection\",\n- List::class.java,\n- HashMap::class.java\n- )\n+ val method: Method =\n+ SettingsFragment::class.java.getDeclaredMethod(\n+ \"setUpRecentLanguagesSection\",\n+ List::class.java,\n+ HashMap::class.java,\n+ )\n method.isAccessible = true\n- method.invoke(fragment, listOf(\n- Language(\"Bengali\", \"bn\"),\n- Language(\"Bengali\", \"bn\"),\n- Language(\"Bengali\", \"bn\"),\n- Language(\"Bengali\", \"bn\"),\n- Language(\"Bengali\", \"bn\"),\n- Language(\"Bengali\", \"bn\")\n- ), hashMapOf())\n+ method.invoke(\n+ fragment,\n+ listOf(\n+ Language(\"Bengali\", \"bn\"),\n+ Language(\"Bengali\", \"bn\"),\n+ Language(\"Bengali\", \"bn\"),\n+ Language(\"Bengali\", \"bn\"),\n+ Language(\"Bengali\", \"bn\"),\n+ Language(\"Bengali\", \"bn\"),\n+ ),\n+ hashMapOf(),\n+ )\n verify(languageHistoryListView, times(1)).visibility = View.VISIBLE\n verify(separator, times(1)).visibility = View.VISIBLE\n verify(recentLanguagesTextView, times(1)).visibility = View.VISIBLE\n@@ -264,8 +286,8 @@ class SettingsFragmentUnitTests {\n val locale: Locale = createLocale(\"en\")\n \n assertEquals(\"en\", locale.language)\n- assertEquals(\"\",locale.country)\n- assertEquals(\"\",locale.variant)\n+ assertEquals(\"\", locale.country)\n+ assertEquals(\"\", locale.variant)\n }\n \n @Test\n@@ -273,8 +295,8 @@ class SettingsFragmentUnitTests {\n val locale: Locale = createLocale(\"zh-CN\")\n \n assertEquals(\"zh\", locale.language)\n- assertEquals(\"CN\",locale.country)\n- assertEquals(\"\",locale.variant)\n+ assertEquals(\"CN\", locale.country)\n+ assertEquals(\"\", locale.variant)\n }\n \n @Test\n@@ -282,7 +304,7 @@ class SettingsFragmentUnitTests {\n val locale: Locale = createLocale(\"pt-BR-variant\")\n \n assertEquals(\"pt\", locale.language)\n- assertEquals(\"BR\",locale.country)\n- assertEquals(\"variant\",locale.variant)\n+ assertEquals(\"BR\", locale.country)\n+ assertEquals(\"variant\", locale.variant)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/CategoriesPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/CategoriesPresenterTest.kt\nindex 679a25c8d9..4b321071fe 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/CategoriesPresenterTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/CategoriesPresenterTest.kt\n@@ -2,7 +2,11 @@ package fr.free.nrw.commons.upload\n \n import androidx.lifecycle.MutableLiveData\n import categoryItem\n-import com.nhaarman.mockitokotlin2.*\n+import com.nhaarman.mockitokotlin2.any\n+import com.nhaarman.mockitokotlin2.mock\n+import com.nhaarman.mockitokotlin2.verify\n+import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions\n+import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.category.CategoryItem\n import fr.free.nrw.commons.repository.UploadRepository\n@@ -17,7 +21,6 @@ import org.mockito.Mock\n import org.mockito.MockitoAnnotations\n import java.lang.reflect.Method\n \n-\n /**\n * The class contains unit test cases for CategoriesPresenter\n */\n@@ -41,7 +44,6 @@ class CategoriesPresenterTest {\n MockitoAnnotations.openMocks(this)\n testScheduler = TestScheduler()\n categoriesPresenter = CategoriesPresenter(repository, testScheduler, testScheduler)\n-\n }\n \n @Test\n@@ -58,12 +60,14 @@ class CategoriesPresenterTest {\n .thenReturn(Observable.just(mutableListOf(categoryItem())))\n whenever(repository.searchAll(\"mock\", emptyList(), repository.selectedDepictions))\n .thenReturn(Observable.just(mutableListOf(categoryItem())))\n- val method: Method = CategoriesPresenter::class.java.getDeclaredMethod(\n- \"searchResults\",\n- String::class.java\n- )\n+ val method: Method =\n+ CategoriesPresenter::class.java.getDeclaredMethod(\n+ \"searchResults\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n- method.invoke(categoriesPresenter, \"mock\") }\n+ method.invoke(categoriesPresenter, \"mock\")\n+ }\n \n /**\n * unit test case for method CategoriesPresenter.searchForCategories\n@@ -73,8 +77,11 @@ class CategoriesPresenterTest {\n categoriesPresenter.onAttachView(view)\n val liveData = MutableLiveData>()\n categoriesPresenter.setCategoryList(liveData)\n- categoriesPresenter.setCategoryListValue(listOf(\n- categoryItem(\"selected\", \"\", \"\", true)))\n+ categoriesPresenter.setCategoryListValue(\n+ listOf(\n+ categoryItem(\"selected\", \"\", \"\", true),\n+ ),\n+ )\n val nonEmptyCaptionUploadItem = mock()\n whenever(nonEmptyCaptionUploadItem.uploadMediaDetails)\n .thenReturn(listOf(UploadMediaDetail(captionText = \"nonEmpty\")))\n@@ -84,22 +91,25 @@ class CategoriesPresenterTest {\n whenever(repository.uploads).thenReturn(\n listOf(\n nonEmptyCaptionUploadItem,\n- emptyCaptionUploadItem\n- )\n+ emptyCaptionUploadItem,\n+ ),\n )\n whenever(repository.searchAll(any(), any(), any()))\n .thenReturn(\n Observable.just(\n listOf(\n categoryItem(\"selected\"),\n- categoryItem(\"doesContainYear\")\n- )\n- )\n+ categoryItem(\"doesContainYear\"),\n+ ),\n+ ),\n )\n whenever(repository.isSpammyCategory(\"selected\")).thenReturn(false)\n whenever(repository.isSpammyCategory(\"doesContainYear\")).thenReturn(true)\n- whenever(repository.selectedCategories).thenReturn(listOf(\n- categoryItem(\"selected\", \"\", \"\",true)))\n+ whenever(repository.selectedCategories).thenReturn(\n+ listOf(\n+ categoryItem(\"selected\", \"\", \"\", true),\n+ ),\n+ )\n categoriesPresenter.searchForCategories(\"test\")\n testScheduler.triggerActions()\n verify(view).showProgress(true)\n@@ -123,10 +133,11 @@ class CategoriesPresenterTest {\n whenever(repository.selectedCategories).thenReturn(listOf())\n categoriesPresenter.searchForCategories(query)\n testScheduler.triggerActions()\n- val method: Method = CategoriesPresenter::class.java.getDeclaredMethod(\n- \"searchResults\",\n- String::class.java\n- )\n+ val method: Method =\n+ CategoriesPresenter::class.java.getDeclaredMethod(\n+ \"searchResults\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(categoriesPresenter, query)\n \ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/DepictsPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/DepictsPresenterTest.kt\nindex a22b3d9691..748b95ea6d 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/DepictsPresenterTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/DepictsPresenterTest.kt\n@@ -22,9 +22,7 @@ import org.mockito.MockitoAnnotations\n import org.powermock.reflect.Whitebox\n import java.lang.reflect.Method\n \n-\n class DepictsPresenterTest {\n-\n @get:Rule\n var testRule = InstantTaskExecutorRule()\n \n@@ -65,14 +63,15 @@ class DepictsPresenterTest {\n \n @Test\n fun `search results emission returns distinct results + selected items without disambiguations`() {\n- val searchResults = listOf(\n- depictedItem(id=\"nonUnique\"),\n- depictedItem(id=\"nonUnique\"),\n- depictedItem(\n- instanceOfs = listOf(WikidataDisambiguationItems.CATEGORY.id),\n- id = \"unique\"\n+ val searchResults =\n+ listOf(\n+ depictedItem(id = \"nonUnique\"),\n+ depictedItem(id = \"nonUnique\"),\n+ depictedItem(\n+ instanceOfs = listOf(WikidataDisambiguationItems.CATEGORY.id),\n+ id = \"unique\",\n+ ),\n )\n- )\n whenever(repository.searchAllEntities(\"\")).thenReturn(Flowable.just(searchResults))\n val selectedItem = depictedItem(id = \"selected\")\n whenever(repository.selectedDepictions).thenReturn(listOf(selectedItem))\n@@ -82,7 +81,6 @@ class DepictsPresenterTest {\n verify(view).showError(true)\n }\n \n-\n @Test\n fun `empty search results with empty term do not show error`() {\n whenever(repository.searchAllEntities(\"\")).thenReturn(Flowable.just(emptyList()))\n@@ -151,10 +149,11 @@ class DepictsPresenterTest {\n fun `Test searchResults when media is null`() {\n whenever(repository.searchAllEntities(\"querystring\"))\n .thenReturn(Flowable.just(listOf(depictedItem())))\n- val method: Method = DepictsPresenter::class.java.getDeclaredMethod(\n- \"searchResults\",\n- String::class.java\n- )\n+ val method: Method =\n+ DepictsPresenter::class.java.getDeclaredMethod(\n+ \"searchResults\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(depictsPresenter, \"querystring\")\n verify(repository, times(1)).searchAllEntities(\"querystring\")\n@@ -167,10 +166,11 @@ class DepictsPresenterTest {\n .thenReturn(Flowable.just(listOf(depictedItem())))\n whenever(repository.searchAllEntities(\"querystring\"))\n .thenReturn(Flowable.just(listOf(depictedItem())))\n- val method: Method = DepictsPresenter::class.java.getDeclaredMethod(\n- \"searchResults\",\n- String::class.java\n- )\n+ val method: Method =\n+ DepictsPresenter::class.java.getDeclaredMethod(\n+ \"searchResults\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(depictsPresenter, \"querystring\")\n verify(repository, times(1)).searchAllEntities(\"querystring\")\n@@ -179,19 +179,21 @@ class DepictsPresenterTest {\n @Test\n fun testSelectNewDepictions() {\n Whitebox.setInternalState(depictsPresenter, \"media\", media)\n- val method: Method = DepictsPresenter::class.java.getDeclaredMethod(\n- \"selectNewDepictions\",\n- List::class.java\n- )\n+ val method: Method =\n+ DepictsPresenter::class.java.getDeclaredMethod(\n+ \"selectNewDepictions\",\n+ List::class.java,\n+ )\n method.isAccessible = true\n method.invoke(depictsPresenter, listOf(depictedItem()))\n }\n \n @Test\n fun testClearPreviousSelection() {\n- val method: Method = DepictsPresenter::class.java.getDeclaredMethod(\n- \"clearPreviousSelection\"\n- )\n+ val method: Method =\n+ DepictsPresenter::class.java.getDeclaredMethod(\n+ \"clearPreviousSelection\",\n+ )\n method.isAccessible = true\n method.invoke(depictsPresenter)\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/FileMetadataUtilsTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/FileMetadataUtilsTest.kt\nindex 1aa0df1679..385189fefe 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/FileMetadataUtilsTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/FileMetadataUtilsTest.kt\n@@ -1,22 +1,37 @@\n package fr.free.nrw.commons.upload\n \n-import androidx.exifinterface.media.ExifInterface.*\n+import androidx.exifinterface.media.ExifInterface.TAG_ARTIST\n+import androidx.exifinterface.media.ExifInterface.TAG_BODY_SERIAL_NUMBER\n+import androidx.exifinterface.media.ExifInterface.TAG_CAMERA_OWNER_NAME\n+import androidx.exifinterface.media.ExifInterface.TAG_COPYRIGHT\n+import androidx.exifinterface.media.ExifInterface.TAG_GPS_ALTITUDE\n+import androidx.exifinterface.media.ExifInterface.TAG_GPS_ALTITUDE_REF\n+import androidx.exifinterface.media.ExifInterface.TAG_GPS_LATITUDE\n+import androidx.exifinterface.media.ExifInterface.TAG_GPS_LATITUDE_REF\n+import androidx.exifinterface.media.ExifInterface.TAG_GPS_LONGITUDE\n+import androidx.exifinterface.media.ExifInterface.TAG_GPS_LONGITUDE_REF\n+import androidx.exifinterface.media.ExifInterface.TAG_LENS_MAKE\n+import androidx.exifinterface.media.ExifInterface.TAG_LENS_MODEL\n+import androidx.exifinterface.media.ExifInterface.TAG_LENS_SERIAL_NUMBER\n+import androidx.exifinterface.media.ExifInterface.TAG_LENS_SPECIFICATION\n+import androidx.exifinterface.media.ExifInterface.TAG_MAKE\n+import androidx.exifinterface.media.ExifInterface.TAG_MODEL\n+import androidx.exifinterface.media.ExifInterface.TAG_SOFTWARE\n import org.junit.Assert.assertTrue\n import org.junit.Test\n-import java.util.*\n+import java.util.Arrays\n \n /**\n * Test cases for FileMetadataUtils\n */\n class FileMetadataUtilsTest {\n-\n /**\n * Test method to verify EXIF tags for \"Author\"\n */\n @Test\n fun getTagsFromPrefAuthor() {\n val author = FileMetadataUtils.getTagsFromPref(\"Author\")\n- val authorRef = arrayOf(TAG_ARTIST, TAG_CAMERA_OWNER_NAME);\n+ val authorRef = arrayOf(TAG_ARTIST, TAG_CAMERA_OWNER_NAME)\n \n assertTrue(Arrays.deepEquals(author, authorRef))\n }\n@@ -27,9 +42,15 @@ class FileMetadataUtilsTest {\n @Test\n fun getTagsFromPrefLocation() {\n val author = FileMetadataUtils.getTagsFromPref(\"Location\")\n- val authorRef = arrayOf(TAG_GPS_LATITUDE, TAG_GPS_LATITUDE_REF,\n- TAG_GPS_LONGITUDE, TAG_GPS_LONGITUDE_REF,\n- TAG_GPS_ALTITUDE, TAG_GPS_ALTITUDE_REF)\n+ val authorRef =\n+ arrayOf(\n+ TAG_GPS_LATITUDE,\n+ TAG_GPS_LATITUDE_REF,\n+ TAG_GPS_LONGITUDE,\n+ TAG_GPS_LONGITUDE_REF,\n+ TAG_GPS_ALTITUDE,\n+ TAG_GPS_ALTITUDE_REF,\n+ )\n \n assertTrue(Arrays.deepEquals(author, authorRef))\n }\n@@ -88,4 +109,4 @@ class FileMetadataUtilsTest {\n \n assertTrue(Arrays.deepEquals(author, authorRef))\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/GpsCategoryModelTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/GpsCategoryModelTest.kt\nindex 5d3988826d..1ef103272e 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/GpsCategoryModelTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/GpsCategoryModelTest.kt\n@@ -19,16 +19,20 @@ class GpsCategoryModelTest {\n \n @Test\n fun `setCategoriesFromLocation emits the new value`() {\n- val expectedList = listOf(\n- CategoryItem(\"category\", \"\", \"\", false))\n- gpsCategoryModel.categoriesFromLocation.test()\n+ val expectedList =\n+ listOf(\n+ CategoryItem(\"category\", \"\", \"\", false),\n+ )\n+ gpsCategoryModel.categoriesFromLocation\n+ .test()\n .also { gpsCategoryModel.setCategoriesFromLocation(expectedList) }\n .assertValues(emptyList(), expectedList)\n }\n \n @Test\n fun `clear emits an empty value`() {\n- gpsCategoryModel.categoriesFromLocation.test()\n+ gpsCategoryModel.categoriesFromLocation\n+ .test()\n .also { gpsCategoryModel.clear() }\n .assertValues(emptyList(), emptyList())\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/ImageProcessingServiceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/ImageProcessingServiceTest.kt\nindex cf720c6a47..30f553e722 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/ImageProcessingServiceTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/ImageProcessingServiceTest.kt\n@@ -13,21 +13,28 @@ import org.junit.Test\n import org.mockito.ArgumentMatchers\n import org.mockito.InjectMocks\n import org.mockito.Mock\n-import org.mockito.Mockito.*\n+import org.mockito.Mockito.any\n+import org.mockito.Mockito.mock\n+import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n import java.io.FileInputStream\n \n class ImageProcessingServiceTest {\n @Mock\n internal var fileUtilsWrapper: FileUtilsWrapper? = null\n+\n @Mock\n internal var imageUtilsWrapper: ImageUtilsWrapper? = null\n+\n @Mock\n- internal var readFBMD: ReadFBMD?=null\n+ internal var readFBMD: ReadFBMD? = null\n+\n @Mock\n- internal var readEXIF: EXIFReader?=null\n+ internal var readEXIF: EXIFReader? = null\n+\n @Mock\n internal var mediaClient: MediaClient? = null\n+\n @Mock\n internal var location: LatLng? = null\n \n@@ -60,31 +67,31 @@ class ImageProcessingServiceTest {\n `when`(uploadItem.fileName).thenReturn(\"File:jpg\")\n \n `when`(fileUtilsWrapper!!.getFileInputStream(ArgumentMatchers.anyString()))\n- .thenReturn(mock(FileInputStream::class.java))\n+ .thenReturn(mock(FileInputStream::class.java))\n `when`(fileUtilsWrapper!!.getSHA1(any(FileInputStream::class.java)))\n- .thenReturn(\"fileSha\")\n+ .thenReturn(\"fileSha\")\n \n `when`(fileUtilsWrapper!!.getGeolocationOfFile(ArgumentMatchers.anyString(), any(LatLng::class.java)))\n- .thenReturn(\"latLng\")\n+ .thenReturn(\"latLng\")\n \n `when`(imageUtilsWrapper?.checkIfImageIsTooDark(ArgumentMatchers.anyString()))\n- .thenReturn(Single.just(ImageUtils.IMAGE_OK))\n+ .thenReturn(Single.just(ImageUtils.IMAGE_OK))\n \n `when`(imageUtilsWrapper!!.checkImageGeolocationIsDifferent(ArgumentMatchers.anyString(), any(LatLng::class.java)))\n- .thenReturn(Single.just(ImageUtils.IMAGE_OK))\n+ .thenReturn(Single.just(ImageUtils.IMAGE_OK))\n \n `when`(fileUtilsWrapper!!.getFileInputStream(ArgumentMatchers.anyString()))\n- .thenReturn(mock(FileInputStream::class.java))\n+ .thenReturn(mock(FileInputStream::class.java))\n `when`(fileUtilsWrapper!!.getSHA1(any(FileInputStream::class.java)))\n- .thenReturn(\"fileSha\")\n+ .thenReturn(\"fileSha\")\n `when`(mediaClient!!.checkFileExistsUsingSha(ArgumentMatchers.anyString()))\n- .thenReturn(Single.just(false))\n+ .thenReturn(Single.just(false))\n `when`(mediaClient?.checkPageExistsUsingTitle(ArgumentMatchers.anyString()))\n- .thenReturn(Single.just(false))\n+ .thenReturn(Single.just(false))\n `when`(readFBMD?.processMetadata(ArgumentMatchers.any()))\n- .thenReturn(Single.just(ImageUtils.IMAGE_OK))\n+ .thenReturn(Single.just(ImageUtils.IMAGE_OK))\n `when`(readEXIF?.processMetadata(ArgumentMatchers.anyString()))\n- .thenReturn(Single.just(ImageUtils.IMAGE_OK))\n+ .thenReturn(Single.just(ImageUtils.IMAGE_OK))\n }\n \n @Test\n@@ -97,7 +104,7 @@ class ImageProcessingServiceTest {\n @Test\n fun validateImageForDuplicateImage() {\n `when`(mediaClient!!.checkFileExistsUsingSha(ArgumentMatchers.anyString()))\n- .thenReturn(Single.just(true))\n+ .thenReturn(Single.just(true))\n val validateImage = imageProcessingService!!.validateImage(uploadItem, location)\n assertEquals(ImageUtils.IMAGE_DUPLICATE, validateImage.blockingGet())\n }\n@@ -111,7 +118,7 @@ class ImageProcessingServiceTest {\n @Test\n fun validateImageForDarkImage() {\n `when`(imageUtilsWrapper?.checkIfImageIsTooDark(ArgumentMatchers.anyString()))\n- .thenReturn(Single.just(ImageUtils.IMAGE_DARK))\n+ .thenReturn(Single.just(ImageUtils.IMAGE_DARK))\n val validateImage = imageProcessingService!!.validateImage(uploadItem, location)\n assertEquals(ImageUtils.IMAGE_DARK, validateImage.blockingGet())\n }\n@@ -119,7 +126,7 @@ class ImageProcessingServiceTest {\n @Test\n fun validateImageForWrongGeoLocation() {\n `when`(imageUtilsWrapper!!.checkImageGeolocationIsDifferent(ArgumentMatchers.anyString(), any(LatLng::class.java)))\n- .thenReturn(Single.just(ImageUtils.IMAGE_GEOLOCATION_DIFFERENT))\n+ .thenReturn(Single.just(ImageUtils.IMAGE_GEOLOCATION_DIFFERENT))\n val validateImage = imageProcessingService!!.validateImage(uploadItem, location)\n assertEquals(ImageUtils.IMAGE_GEOLOCATION_DIFFERENT, validateImage.blockingGet())\n }\n@@ -127,7 +134,7 @@ class ImageProcessingServiceTest {\n @Test\n fun validateImageForFileNameExistsWithCheckTitleOn() {\n `when`(mediaClient?.checkPageExistsUsingTitle(ArgumentMatchers.anyString()))\n- .thenReturn(Single.just(true))\n+ .thenReturn(Single.just(true))\n val validateImage = imageProcessingService!!.validateCaption(uploadItem)\n assertEquals(ImageUtils.FILE_NAME_EXISTS, validateImage.blockingGet())\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/LanguagesAdapterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/LanguagesAdapterTest.kt\nindex 3ba3f8dc0b..801d4e9005 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/LanguagesAdapterTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/LanguagesAdapterTest.kt\n@@ -8,6 +8,7 @@ import androidx.core.os.ConfigurationCompat\n import androidx.test.core.app.ApplicationProvider\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n+import fr.free.nrw.commons.language.AppLanguageLookUpTable\n import org.junit.Assert\n import org.junit.Before\n import org.junit.Test\n@@ -19,18 +20,18 @@ import org.mockito.MockitoAnnotations\n import org.robolectric.RobolectricTestRunner\n import org.robolectric.annotation.Config\n import org.robolectric.annotation.LooperMode\n-import fr.free.nrw.commons.language.AppLanguageLookUpTable\n-import java.util.*\n+import java.util.Collections\n+import java.util.Locale\n \n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class LanguagesAdapterTest {\n-\n private lateinit var context: Context\n \n @Mock\n private lateinit var selectedLanguages: HashMap\n+\n @Mock\n private lateinit var parent: ViewGroup\n \n@@ -48,8 +49,10 @@ class LanguagesAdapterTest {\n MockitoAnnotations.openMocks(this)\n context = ApplicationProvider.getApplicationContext()\n language = AppLanguageLookUpTable(context)\n- convertView = LayoutInflater.from(context)\n- .inflate(R.layout.row_item_languages_spinner, null) as View\n+ convertView =\n+ LayoutInflater\n+ .from(context)\n+ .inflate(R.layout.row_item_languages_spinner, null) as View\n \n languageNamesList = language.localizedNames\n languageCodesList = language.codes\n@@ -79,10 +82,14 @@ class LanguagesAdapterTest {\n @Test\n fun testGetIndexOfUserDefaultLocale() {\n languagesAdapter = LanguagesAdapter(context, selectedLanguages)\n- Assertions.assertEquals(ConfigurationCompat.getLocales(context.resources.configuration)[0]?.let {\n- languageCodesList.indexOf(\n- it.language)\n- }, languagesAdapter.getIndexOfUserDefaultLocale(context))\n+ Assertions.assertEquals(\n+ ConfigurationCompat.getLocales(context.resources.configuration)[0]?.let {\n+ languageCodesList.indexOf(\n+ it.language,\n+ )\n+ },\n+ languagesAdapter.getIndexOfUserDefaultLocale(context),\n+ )\n }\n \n @Test\n@@ -108,21 +115,27 @@ class LanguagesAdapterTest {\n val constraint = \"spa\"\n languagesAdapter.filter.filter(constraint)\n val length: Int = languageNamesList.size\n- val defaultlanguagecode = ConfigurationCompat.getLocales(context.resources.configuration)[0]?.let {\n- languageCodesList.indexOf(\n- it.language)\n- }\n+ val defaultlanguagecode =\n+ ConfigurationCompat.getLocales(context.resources.configuration)[0]?.let {\n+ languageCodesList.indexOf(\n+ it.language,\n+ )\n+ }\n var i = 0\n var s = 0\n while (i < length) {\n val key: String = language.codes[i]\n val value: String = language.localizedNames[i]\n- if(value.contains(constraint, true) || Locale(key).getDisplayName(\n- Locale(language.codes[defaultlanguagecode!!])).contains(constraint, true))\n+ if (value.contains(constraint, true) ||\n+ Locale(key)\n+ .getDisplayName(\n+ Locale(language.codes[defaultlanguagecode!!]),\n+ ).contains(constraint, true)\n+ ) {\n s++\n+ }\n i++\n }\n Assertions.assertEquals(s, languagesAdapter.count)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/MediaLicensePresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/MediaLicensePresenterTest.kt\nindex d71593caaf..68b1c95cb3 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/MediaLicensePresenterTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/MediaLicensePresenterTest.kt\n@@ -17,9 +17,7 @@ import org.mockito.MockedStatic\n import org.mockito.Mockito\n import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n-import org.powermock.api.mockito.PowerMockito\n import org.powermock.core.classloader.annotations.PrepareForTest\n-import org.powermock.modules.junit4.PowerMockRunner\n import org.robolectric.RobolectricTestRunner\n \n /**\n@@ -60,7 +58,6 @@ class MediaLicensePresenterTest {\n mockedUtil.close()\n }\n \n-\n /**\n * unit test case for method MediaLicensePresenter.getLicense\n */\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadActivityUnitTests.kt\nindex b406dd09ee..d15fe06e5f 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadActivityUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadActivityUnitTests.kt\n@@ -9,8 +9,8 @@ import fr.free.nrw.commons.CommonsApplication\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.contributions.ContributionController\n+import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.filepicker.UploadableFile\n import fr.free.nrw.commons.upload.categories.UploadCategoriesFragment\n import fr.free.nrw.commons.upload.license.MediaLicenseFragment\n@@ -28,12 +28,10 @@ import org.robolectric.annotation.Config\n import org.robolectric.annotation.LooperMode\n import java.lang.reflect.Method\n \n-\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class UploadActivityUnitTests {\n-\n private lateinit var activity: UploadActivity\n private lateinit var context: Context\n \n@@ -83,9 +81,10 @@ class UploadActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnResume() {\n- val method: Method = UploadActivity::class.java.getDeclaredMethod(\n- \"onResume\"\n- )\n+ val method: Method =\n+ UploadActivity::class.java.getDeclaredMethod(\n+ \"onResume\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -93,9 +92,10 @@ class UploadActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnStop() {\n- val method: Method = UploadActivity::class.java.getDeclaredMethod(\n- \"onStop\"\n- )\n+ val method: Method =\n+ UploadActivity::class.java.getDeclaredMethod(\n+ \"onStop\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -170,12 +170,13 @@ class UploadActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnActivityResult() {\n- val method: Method = UploadActivity::class.java.getDeclaredMethod(\n- \"onActivityResult\",\n- Int::class.java,\n- Int::class.java,\n- Intent::class.java\n- )\n+ val method: Method =\n+ UploadActivity::class.java.getDeclaredMethod(\n+ \"onActivityResult\",\n+ Int::class.java,\n+ Int::class.java,\n+ Intent::class.java,\n+ )\n method.isAccessible = true\n method.invoke(activity, CommonsApplication.OPEN_APPLICATION_DETAIL_SETTINGS, 0, Intent())\n }\n@@ -183,9 +184,10 @@ class UploadActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testReceiveSharedItems() {\n- val method: Method = UploadActivity::class.java.getDeclaredMethod(\n- \"receiveSharedItems\"\n- )\n+ val method: Method =\n+ UploadActivity::class.java.getDeclaredMethod(\n+ \"receiveSharedItems\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -193,9 +195,10 @@ class UploadActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testReceiveExternalSharedItems() {\n- val method: Method = UploadActivity::class.java.getDeclaredMethod(\n- \"receiveExternalSharedItems\"\n- )\n+ val method: Method =\n+ UploadActivity::class.java.getDeclaredMethod(\n+ \"receiveExternalSharedItems\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -203,9 +206,10 @@ class UploadActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testReceiveInternalSharedItems() {\n- val method: Method = UploadActivity::class.java.getDeclaredMethod(\n- \"receiveInternalSharedItems\"\n- )\n+ val method: Method =\n+ UploadActivity::class.java.getDeclaredMethod(\n+ \"receiveInternalSharedItems\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -225,9 +229,10 @@ class UploadActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testHandleNullMedia() {\n- val method: Method = UploadActivity::class.java.getDeclaredMethod(\n- \"handleNullMedia\"\n- )\n+ val method: Method =\n+ UploadActivity::class.java.getDeclaredMethod(\n+ \"handleNullMedia\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -256,16 +261,19 @@ class UploadActivityUnitTests {\n Whitebox.setInternalState(\n activity,\n \"mediaLicenseFragment\",\n- mock(MediaLicenseFragment::class.java)\n+ mock(MediaLicenseFragment::class.java),\n )\n Whitebox.setInternalState(\n- activity, \"uploadCategoriesFragment\", mock(\n- UploadCategoriesFragment::class.java\n- )\n- )\n- val method: Method = UploadActivity::class.java.getDeclaredMethod(\n- \"onDestroy\"\n+ activity,\n+ \"uploadCategoriesFragment\",\n+ mock(\n+ UploadCategoriesFragment::class.java,\n+ ),\n )\n+ val method: Method =\n+ UploadActivity::class.java.getDeclaredMethod(\n+ \"onDestroy\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n@@ -273,11 +281,11 @@ class UploadActivityUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnBackPressed() {\n- val method: Method = UploadActivity::class.java.getDeclaredMethod(\n- \"onBackPressed\"\n- )\n+ val method: Method =\n+ UploadActivity::class.java.getDeclaredMethod(\n+ \"onBackPressed\",\n+ )\n method.isAccessible = true\n method.invoke(activity)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadClientTest.kt\nindex 4757d52583..97aac88fe6 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadClientTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadClientTest.kt\n@@ -9,7 +9,6 @@ import com.nhaarman.mockitokotlin2.argumentCaptor\n import com.nhaarman.mockitokotlin2.eq\n import com.nhaarman.mockitokotlin2.mock\n import com.nhaarman.mockitokotlin2.times\n-import com.nhaarman.mockitokotlin2.verify\n import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.CommonsApplication.DEFAULT_EDIT_SUMMARY\n import fr.free.nrw.commons.auth.csrf.CsrfTokenClient\n@@ -22,24 +21,17 @@ import fr.free.nrw.commons.wikidata.mwapi.MwServiceError\n import io.reactivex.Observable\n import junit.framework.TestCase.assertEquals\n import junit.framework.TestCase.assertSame\n-import kotlinx.coroutines.runBlocking\n import okhttp3.MediaType.Companion.toMediaType\n import okhttp3.MultipartBody\n import okhttp3.RequestBody\n import okhttp3.RequestBody.Companion.toRequestBody\n import okio.Buffer\n-import org.junit.Assert\n import org.junit.Before\n-import org.junit.Ignore\n import org.junit.Test\n-import org.junit.jupiter.api.assertThrows\n-import org.junit.platform.commons.annotation.Testable\n import java.io.File\n import java.util.Date\n \n-\n class UploadClientTest {\n-\n private val contribution = mock()\n private val uploadResult = mock()\n private val uploadInterface = mock()\n@@ -49,15 +41,16 @@ class UploadClientTest {\n private val gson = mock()\n private val contributionDao = mock { }\n private val timeProvider = mock()\n- private val uploadClient = UploadClient(\n- uploadInterface,\n- csrfTokenClient,\n- pageContentsCreator,\n- fileUtilsWrapper,\n- gson,\n- timeProvider,\n- contributionDao\n- )\n+ private val uploadClient =\n+ UploadClient(\n+ uploadInterface,\n+ csrfTokenClient,\n+ pageContentsCreator,\n+ fileUtilsWrapper,\n+ gson,\n+ timeProvider,\n+ contributionDao,\n+ )\n \n private val expectedChunkSize = 512 * 1024\n private val testToken = \"test-token\"\n@@ -86,8 +79,8 @@ class UploadClientTest {\n createdContent,\n DEFAULT_EDIT_SUMMARY,\n filename,\n- filekey\n- )\n+ filekey,\n+ ),\n ).thenReturn(Observable.just(uploadJson))\n \n val result = uploadClient.uploadFileFromStash(contribution, filename, filekey).test()\n@@ -110,8 +103,8 @@ class UploadClientTest {\n createdContent,\n DEFAULT_EDIT_SUMMARY,\n filename,\n- filekey\n- )\n+ filekey,\n+ ),\n ).thenReturn(Observable.just(uploadJson))\n \n val result = uploadClient.uploadFileFromStash(contribution, filename, filekey).test()\n@@ -129,10 +122,9 @@ class UploadClientTest {\n createdContent,\n DEFAULT_EDIT_SUMMARY,\n filename,\n- filekey\n- )\n- )\n- .thenReturn(Observable.error(exception))\n+ filekey,\n+ ),\n+ ).thenReturn(Observable.error(exception))\n \n val result = uploadClient.uploadFileFromStash(contribution, filename, filekey).test()\n \n@@ -156,9 +148,13 @@ class UploadClientTest {\n \n whenever(\n uploadInterface.uploadFileToStash(\n- filenameCaptor.capture(), totalFileSizeCaptor.capture(), offsetCaptor.capture(),\n- fileKeyCaptor.capture(), tokenCaptor.capture(), fileCaptor.capture()\n- )\n+ filenameCaptor.capture(),\n+ totalFileSizeCaptor.capture(),\n+ offsetCaptor.capture(),\n+ fileKeyCaptor.capture(),\n+ tokenCaptor.capture(),\n+ fileCaptor.capture(),\n+ ),\n ).thenReturn(Observable.just(uploadResponse))\n \n val result =\n@@ -211,7 +207,7 @@ class UploadClientTest {\n whenever(contribution.localUriPath).thenReturn(tempFile)\n whenever(fileUtilsWrapper.getMimeType(anyOrNull())).thenReturn(\"image/png\")\n whenever(fileUtilsWrapper.getFileChunks(anyOrNull(), eq(expectedChunkSize))).thenReturn(emptyList())\n- val result = uploadClient.uploadFileToStash(filename, contribution, mock() ).test()\n+ val result = uploadClient.uploadFileToStash(filename, contribution, mock()).test()\n result.assertNoErrors()\n assertEquals(StashUploadState.FAILED, result.values()[0].state)\n }\n@@ -229,8 +225,8 @@ class UploadClientTest {\n whenever(\n fileUtilsWrapper.getFileChunks(\n anyOrNull(),\n- eq(expectedChunkSize)\n- )\n+ eq(expectedChunkSize),\n+ ),\n ).thenReturn(listOf(mockFile))\n whenever(\n uploadInterface.uploadFileToStash(\n@@ -239,8 +235,8 @@ class UploadClientTest {\n any(),\n any(),\n any(),\n- any()\n- )\n+ any(),\n+ ),\n ).thenReturn(Observable.just(uploadResponse))\n \n val result = uploadClient.uploadFileToStash(filename, contribution, mock()).test()\n@@ -272,15 +268,19 @@ class UploadClientTest {\n whenever(\n fileUtilsWrapper.getFileChunks(\n anyOrNull(),\n- eq(expectedChunkSize)\n- )\n+ eq(expectedChunkSize),\n+ ),\n ).thenReturn(listOf(mockFile))\n \n whenever(\n uploadInterface.uploadFileToStash(\n- anyOrNull(), anyOrNull(), anyOrNull(),\n- anyOrNull(), anyOrNull(), anyOrNull()\n- )\n+ anyOrNull(),\n+ anyOrNull(),\n+ anyOrNull(),\n+ anyOrNull(),\n+ anyOrNull(),\n+ anyOrNull(),\n+ ),\n ).thenReturn(Observable.just(uploadResponse))\n \n val result = uploadClient.uploadFileToStash(filename, contribution, mock()).test()\n@@ -290,13 +290,11 @@ class UploadClientTest {\n assertEquals(filekey, result.values()[0].fileKey)\n }\n \n-\n- private fun KArgumentCaptor.asString(): String =\n- firstValue.asString()\n+ private fun KArgumentCaptor.asString(): String = firstValue.asString()\n \n private fun RequestBody.asString(): String {\n val b = Buffer()\n writeTo(b)\n return b.readUtf8()\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaDetailAdapterUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaDetailAdapterUnitTest.kt\nindex c1547df779..db5b20f7e6 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaDetailAdapterUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaDetailAdapterUnitTest.kt\n@@ -16,7 +16,6 @@ import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.recentlanguages.Language\n import fr.free.nrw.commons.recentlanguages.RecentLanguagesAdapter\n import fr.free.nrw.commons.recentlanguages.RecentLanguagesDao\n-import fr.free.nrw.commons.settings.SettingsFragment\n import fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment\n import org.junit.Assert\n import org.junit.Before\n@@ -38,7 +37,6 @@ import java.lang.reflect.Method\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class UploadMediaDetailAdapterUnitTest {\n-\n private lateinit var adapter: UploadMediaDetailAdapter\n private lateinit var context: Context\n private lateinit var viewHolder: UploadMediaDetailAdapter.ViewHolder\n@@ -58,7 +56,7 @@ class UploadMediaDetailAdapterUnitTest {\n private lateinit var textView: TextView\n \n @Mock\n- private lateinit var fragment : UploadMediaDetailFragment\n+ private lateinit var fragment: UploadMediaDetailFragment\n \n @Mock\n private lateinit var view: View\n@@ -75,7 +73,7 @@ class UploadMediaDetailAdapterUnitTest {\n uploadMediaDetails = mutableListOf(uploadMediaDetail, uploadMediaDetail)\n activity = Robolectric.buildActivity(UploadActivity::class.java).get()\n fragment = mock(UploadMediaDetailFragment::class.java)\n- adapter = UploadMediaDetailAdapter(fragment,\"\", recentLanguagesDao)\n+ adapter = UploadMediaDetailAdapter(fragment, \"\", recentLanguagesDao)\n context = ApplicationProvider.getApplicationContext()\n Whitebox.setInternalState(adapter, \"uploadMediaDetails\", uploadMediaDetails)\n Whitebox.setInternalState(adapter, \"eventListener\", eventListener)\n@@ -184,9 +182,10 @@ class UploadMediaDetailAdapterUnitTest {\n \n @Test\n fun testHideRecentLanguagesSection() {\n- val method: Method = UploadMediaDetailAdapter.ViewHolder::class.java.getDeclaredMethod(\n- \"hideRecentLanguagesSection\"\n- )\n+ val method: Method =\n+ UploadMediaDetailAdapter.ViewHolder::class.java.getDeclaredMethod(\n+ \"hideRecentLanguagesSection\",\n+ )\n method.isAccessible = true\n method.invoke(viewHolder)\n verify(listView, times(1)).visibility = View.GONE\n@@ -196,10 +195,11 @@ class UploadMediaDetailAdapterUnitTest {\n \n @Test\n fun `Test setUpRecentLanguagesSection when list is empty`() {\n- val method: Method = UploadMediaDetailAdapter.ViewHolder::class.java.getDeclaredMethod(\n- \"setUpRecentLanguagesSection\",\n- List::class.java\n- )\n+ val method: Method =\n+ UploadMediaDetailAdapter.ViewHolder::class.java.getDeclaredMethod(\n+ \"setUpRecentLanguagesSection\",\n+ List::class.java,\n+ )\n method.isAccessible = true\n method.invoke(viewHolder, emptyList())\n verify(listView, times(1)).visibility = View.GONE\n@@ -209,19 +209,23 @@ class UploadMediaDetailAdapterUnitTest {\n \n @Test\n fun `Test setUpRecentLanguagesSection when list is not empty`() {\n- val method: Method = UploadMediaDetailAdapter.ViewHolder::class.java.getDeclaredMethod(\n- \"setUpRecentLanguagesSection\",\n- List::class.java\n- )\n+ val method: Method =\n+ UploadMediaDetailAdapter.ViewHolder::class.java.getDeclaredMethod(\n+ \"setUpRecentLanguagesSection\",\n+ List::class.java,\n+ )\n method.isAccessible = true\n- method.invoke(viewHolder, listOf(\n- Language(\"Bengali\", \"bn\"),\n- Language(\"Bengali\", \"bn\"),\n- Language(\"Bengali\", \"bn\"),\n- Language(\"Bengali\", \"bn\"),\n- Language(\"Bengali\", \"bn\"),\n- Language(\"Bengali\", \"bn\")\n- ))\n+ method.invoke(\n+ viewHolder,\n+ listOf(\n+ Language(\"Bengali\", \"bn\"),\n+ Language(\"Bengali\", \"bn\"),\n+ Language(\"Bengali\", \"bn\"),\n+ Language(\"Bengali\", \"bn\"),\n+ Language(\"Bengali\", \"bn\"),\n+ Language(\"Bengali\", \"bn\"),\n+ ),\n+ )\n verify(listView, times(1)).visibility = View.VISIBLE\n verify(view, times(1)).visibility = View.VISIBLE\n verify(textView, times(1)).visibility = View.VISIBLE\n@@ -234,21 +238,28 @@ class UploadMediaDetailAdapterUnitTest {\n .thenReturn(true)\n whenever(adapterView.adapter)\n .thenReturn(\n- RecentLanguagesAdapter(context,\n- listOf(Language(\"English\", \"en\")),\n- hashMapOf()\n- )\n+ RecentLanguagesAdapter(\n+ context,\n+ listOf(Language(\"English\", \"en\")),\n+ hashMapOf(),\n+ ),\n+ )\n+ val method: Method =\n+ UploadMediaDetailAdapter.ViewHolder::class.java.getDeclaredMethod(\n+ \"onRecentLanguageClicked\",\n+ Dialog::class.java,\n+ AdapterView::class.java,\n+ Int::class.java,\n+ UploadMediaDetail::class.java,\n )\n- val method: Method = UploadMediaDetailAdapter.ViewHolder::class.java.getDeclaredMethod(\n- \"onRecentLanguageClicked\",\n- Dialog::class.java,\n- AdapterView::class.java,\n- Int::class.java,\n- UploadMediaDetail::class.java\n- )\n method.isAccessible = true\n- method.invoke(viewHolder, Mockito.mock(Dialog::class.java), adapterView, 0,\n- Mockito.mock(UploadMediaDetail::class.java))\n+ method.invoke(\n+ viewHolder,\n+ Mockito.mock(Dialog::class.java),\n+ adapterView,\n+ 0,\n+ Mockito.mock(UploadMediaDetail::class.java),\n+ )\n verify(recentLanguagesDao, times(1)).findRecentLanguage(any())\n verify(adapterView, times(3)).adapter\n }\n@@ -265,13 +276,13 @@ class UploadMediaDetailAdapterUnitTest {\n Assert.assertEquals(expected2, viewHolder.removeLeadingAndTrailingWhitespace(test2))\n \n // No whitespace\n- val test3 = \"No trailing space\";\n- val expected3 = \"No trailing space\";\n+ val test3 = \"No trailing space\"\n+ val expected3 = \"No trailing space\"\n Assert.assertEquals(expected3, viewHolder.removeLeadingAndTrailingWhitespace(test3))\n \n // blank string\n val test4 = \" \\r \\t \"\n- val expected4 = \"\";\n+ val expected4 = \"\"\n Assert.assertEquals(expected4, viewHolder.removeLeadingAndTrailingWhitespace(test4))\n }\n \n@@ -293,10 +304,10 @@ class UploadMediaDetailAdapterUnitTest {\n fun testCaptionJapaneseCharacters() {\n val test1 = \"\u30c6\u30b9\u30c8\u3000\u30c6\u30b9\u30c8\"\n val expected1 = \"\u30c6\u30b9\u30c8 \u30c6\u30b9\u30c8\"\n- Assert.assertEquals(expected1, viewHolder.convertIdeographicSpaceToLatinSpace(test1));\n+ Assert.assertEquals(expected1, viewHolder.convertIdeographicSpaceToLatinSpace(test1))\n \n val test2 = \"\u3000\\r\u3000\\t\u3000\u30c6\u30b9\u30c8\u3000\\r\u3000\\t\u3000\"\n val expected2 = \"\u30c6\u30b9\u30c8\"\n Assert.assertEquals(expected2, viewHolder.removeLeadingAndTrailingWhitespace(test2))\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaDetailInputFilterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaDetailInputFilterTest.kt\nindex 90c5e60423..efd1c832b0 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaDetailInputFilterTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaDetailInputFilterTest.kt\n@@ -13,7 +13,6 @@ import org.robolectric.annotation.LooperMode\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class UploadMediaDetailInputFilterTest {\n-\n @Test\n fun testFilterGeneric() {\n val filter = UploadMediaDetailInputFilter()\n@@ -32,7 +31,7 @@ class UploadMediaDetailInputFilterTest {\n val builder = SpannableStringBuilder(\"\")\n builder.filters = arrayOf(UploadMediaDetailInputFilter())\n \n- //All unusual space characters\n+ // All unusual space characters\n val tests = intArrayOf(0x00A0, 0x1680, 0x180E, 0x2000, 0x2005, 0x200B, 0x2028, 0x2029, 0x202F, 0x205F)\n for (test: Int in tests) {\n builder.insert(0, String(Character.toChars(test)))\n@@ -46,7 +45,7 @@ class UploadMediaDetailInputFilterTest {\n val builder = SpannableStringBuilder(\"\")\n builder.filters = arrayOf(UploadMediaDetailInputFilter())\n \n- //Sample of BiDI override characters\n+ // Sample of BiDI override characters\n val tests = intArrayOf(0x202A, 0x202B, 0x202C, 0x202D, 0x202E)\n for (test: Int in tests) {\n builder.insert(0, String(Character.toChars(test)))\n@@ -60,7 +59,7 @@ class UploadMediaDetailInputFilterTest {\n val builder = SpannableStringBuilder(\"\")\n builder.filters = arrayOf(UploadMediaDetailInputFilter())\n \n- //Sample of control characters\n+ // Sample of control characters\n val tests = intArrayOf(0x00, 0x08, 0x10, 0x18, 0x1F, 0x7F, 0x3A)\n for (test: Int in tests) {\n builder.insert(0, String(Character.toChars(test)))\n@@ -94,7 +93,7 @@ class UploadMediaDetailInputFilterTest {\n val builder = SpannableStringBuilder(\"\")\n builder.filters = arrayOf(UploadMediaDetailInputFilter())\n \n- //Sample of surrogate and special characters\n+ // Sample of surrogate and special characters\n val tests = intArrayOf(0xE000, 0xE63F, 0xEC7E, 0xF2BD, 0xF8FF, 0xFFF0, 0xFFF4, 0xFFFC, 0xFFFF)\n for (test: Int in tests) {\n builder.insert(0, String(Character.toChars(test)))\n@@ -108,7 +107,7 @@ class UploadMediaDetailInputFilterTest {\n val builder = SpannableStringBuilder(\"\")\n builder.filters = arrayOf(UploadMediaDetailInputFilter())\n \n- //Sample of characters over 5 hex places not in the Han set\n+ // Sample of characters over 5 hex places not in the Han set\n val testsExclude = intArrayOf(0x1FFFF, 0x44444, 0xFFFFF)\n for (test: Int in testsExclude) {\n builder.insert(0, String(Character.toChars(test)))\n@@ -116,7 +115,7 @@ class UploadMediaDetailInputFilterTest {\n builder.clear()\n }\n \n- //Sample of characters over 5 hex places in the Han set\n+ // Sample of characters over 5 hex places in the Han set\n val testsInclude = intArrayOf(0x20000, 0x2B740, 0x2F800)\n val expected = SpannableStringBuilder(\"\")\n for (test: Int in testsInclude) {\n@@ -125,4 +124,4 @@ class UploadMediaDetailInputFilterTest {\n }\n Assert.assertEquals(builder.toString(), expected.toString())\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt\nindex d2b6a49480..bf27280aae 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt\n@@ -10,7 +10,9 @@ import fr.free.nrw.commons.nearby.Place\n import fr.free.nrw.commons.repository.UploadRepository\n import fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailsContract\n import fr.free.nrw.commons.upload.mediaDetails.UploadMediaPresenter\n-import fr.free.nrw.commons.utils.ImageUtils.*\n+import fr.free.nrw.commons.utils.ImageUtils.EMPTY_CAPTION\n+import fr.free.nrw.commons.utils.ImageUtils.FILE_NAME_EXISTS\n+import fr.free.nrw.commons.utils.ImageUtils.IMAGE_OK\n import io.github.coordinates2country.Coordinates2Country\n import io.reactivex.Observable\n import io.reactivex.Single\n@@ -20,13 +22,17 @@ import org.junit.Assert.assertEquals\n import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n-import org.mockito.*\n+import org.mockito.ArgumentCaptor\n+import org.mockito.ArgumentMatchers\n+import org.mockito.Mock\n+import org.mockito.MockedStatic\n+import org.mockito.Mockito\n import org.mockito.Mockito.mockStatic\n import org.mockito.Mockito.verify\n+import org.mockito.MockitoAnnotations\n import org.powermock.core.classloader.annotations.PrepareForTest\n import org.robolectric.RobolectricTestRunner\n-import java.util.*\n-\n+import java.util.Collections\n \n /**\n * The class contains unit test cases for UploadMediaPresenter\n@@ -82,9 +88,13 @@ class UploadMediaPresenterTest {\n testObservableUploadItem = Observable.just(uploadItem)\n testSingleImageResult = Single.just(1)\n testScheduler = TestScheduler()\n- uploadMediaPresenter = UploadMediaPresenter(\n- repository, jsonKvStore, testScheduler, testScheduler\n- )\n+ uploadMediaPresenter =\n+ UploadMediaPresenter(\n+ repository,\n+ jsonKvStore,\n+ testScheduler,\n+ testScheduler,\n+ )\n uploadMediaPresenter.onAttachView(view)\n mockedCountry = mockStatic(Coordinates2Country::class.java)\n }\n@@ -94,7 +104,6 @@ class UploadMediaPresenterTest {\n mockedCountry.close()\n }\n \n-\n /**\n * unit test for method UploadMediaPresenter.receiveImage\n */\n@@ -105,15 +114,15 @@ class UploadMediaPresenterTest {\n ArgumentMatchers.any(UploadableFile::class.java),\n ArgumentMatchers.any(Place::class.java),\n ArgumentMatchers.any(UploadMediaPresenter::class.java),\n- ArgumentMatchers.any(LatLng::class.java)\n- )\n+ ArgumentMatchers.any(LatLng::class.java),\n+ ),\n ).thenReturn(testObservableUploadItem)\n uploadMediaPresenter.receiveImage(uploadableFile, place, location)\n verify(view).showProgress(true)\n testScheduler.triggerActions()\n verify(view).onImageProcessed(\n ArgumentMatchers.any(UploadItem::class.java),\n- ArgumentMatchers.any(Place::class.java)\n+ ArgumentMatchers.any(Place::class.java),\n )\n }\n \n@@ -157,7 +166,7 @@ class UploadMediaPresenterTest {\n */\n @Test\n fun emptyFileNameTest() {\n- uploadMediaPresenter.handleCaptionResult(EMPTY_CAPTION, uploadItem);\n+ uploadMediaPresenter.handleCaptionResult(EMPTY_CAPTION, uploadItem)\n verify(view).showMessage(ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt())\n }\n \n@@ -237,7 +246,6 @@ class UploadMediaPresenterTest {\n \n @Test\n fun setCorrectCountryCodeForReceivedImage() {\n-\n val germanyAsPlace =\n Place(null, null, null, null, LatLng(50.1, 10.2, 1.0f), null, null, null, true, null)\n germanyAsPlace.isMonument = true\n@@ -245,8 +253,8 @@ class UploadMediaPresenterTest {\n whenever(\n Coordinates2Country.country(\n ArgumentMatchers.eq(germanyAsPlace.getLocation().latitude),\n- ArgumentMatchers.eq(germanyAsPlace.getLocation().longitude)\n- )\n+ ArgumentMatchers.eq(germanyAsPlace.getLocation().longitude),\n+ ),\n ).thenReturn(\"Germany\")\n \n val item: Observable =\n@@ -257,8 +265,8 @@ class UploadMediaPresenterTest {\n ArgumentMatchers.any(UploadableFile::class.java),\n ArgumentMatchers.any(Place::class.java),\n ArgumentMatchers.any(UploadMediaPresenter::class.java),\n- ArgumentMatchers.any(LatLng::class.java)\n- )\n+ ArgumentMatchers.any(LatLng::class.java),\n+ ),\n ).thenReturn(item)\n \n uploadMediaPresenter.receiveImage(uploadableFile, germanyAsPlace, location)\n@@ -268,9 +276,9 @@ class UploadMediaPresenterTest {\n val captor: ArgumentCaptor = ArgumentCaptor.forClass(UploadItem::class.java)\n verify(view).onImageProcessed(\n captor.capture(),\n- ArgumentMatchers.any(Place::class.java)\n+ ArgumentMatchers.any(Place::class.java),\n )\n \n- assertEquals(\"Exptected contry code\", \"de\", captor.value.countryCode);\n+ assertEquals(\"Exptected contry code\", \"de\", captor.value.countryCode)\n }\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadModelUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadModelUnitTest.kt\nindex c782917317..fb1f07e338 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadModelUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadModelUnitTest.kt\n@@ -12,41 +12,43 @@ import org.mockito.Mockito.mock\n import org.mockito.MockitoAnnotations\n \n class UploadModelUnitTest {\n-\n private lateinit var uploadModel: UploadModel\n \n @Before\n fun setUp() {\n MockitoAnnotations.openMocks(this)\n- uploadModel = UploadModel(\n- listOf(),\n- mock(JsonKvStore::class.java),\n- mapOf(),\n- mock(Context::class.java),\n- mock(SessionManager::class.java),\n- mock(FileProcessor::class.java),\n- mock(ImageProcessingService::class.java)\n- )\n+ uploadModel =\n+ UploadModel(\n+ listOf(),\n+ mock(JsonKvStore::class.java),\n+ mapOf(),\n+ mock(Context::class.java),\n+ mock(SessionManager::class.java),\n+ mock(FileProcessor::class.java),\n+ mock(ImageProcessingService::class.java),\n+ )\n }\n \n @Ignore\n @Test\n- fun `Test onDepictItemClicked when DepictedItem is selected`(){\n+ fun `Test onDepictItemClicked when DepictedItem is selected`() {\n uploadModel.onDepictItemClicked(\n DepictedItem(\n- \"Test\",\n+ \"Test\",\n \"Test\",\n \"test\",\n listOf(),\n listOf(),\n true,\n- \"depictionId\"\n- ), media(filename = \"File:Example.jpg\"))\n+ \"depictionId\",\n+ ),\n+ media(filename = \"File:Example.jpg\"),\n+ )\n }\n \n @Ignore\n @Test\n- fun `Test onDepictItemClicked when DepictedItem is not selected`(){\n+ fun `Test onDepictItemClicked when DepictedItem is not selected`() {\n uploadModel.onDepictItemClicked(\n DepictedItem(\n \"Test\",\n@@ -55,14 +57,15 @@ class UploadModelUnitTest {\n listOf(),\n listOf(),\n false,\n- \"depictionId\"\n- ), media(filename = \"File:Example.jpg\")\n+ \"depictionId\",\n+ ),\n+ media(filename = \"File:Example.jpg\"),\n )\n }\n \n @Ignore\n @Test\n- fun `Test onDepictItemClicked when DepictedItem is not selected and not included in media`(){\n+ fun `Test onDepictItemClicked when DepictedItem is not selected and not included in media`() {\n uploadModel.onDepictItemClicked(\n DepictedItem(\n \"Test\",\n@@ -71,14 +74,15 @@ class UploadModelUnitTest {\n listOf(),\n listOf(),\n false,\n- \"id\"\n- ), media(filename = \"File:Example.jpg\")\n+ \"id\",\n+ ),\n+ media(filename = \"File:Example.jpg\"),\n )\n }\n \n @Ignore\n @Test\n- fun `Test onDepictItemClicked when media is null and DepictedItem is not selected`(){\n+ fun `Test onDepictItemClicked when media is null and DepictedItem is not selected`() {\n uploadModel.onDepictItemClicked(\n DepictedItem(\n \"Test\",\n@@ -87,13 +91,15 @@ class UploadModelUnitTest {\n listOf(),\n listOf(),\n false,\n- \"id\"\n- ), null)\n+ \"id\",\n+ ),\n+ null,\n+ )\n }\n \n @Ignore\n @Test\n- fun `Test onDepictItemClicked when media is not null and DepictedItem is selected`(){\n+ fun `Test onDepictItemClicked when media is not null and DepictedItem is selected`() {\n uploadModel.onDepictItemClicked(\n DepictedItem(\n \"Test\",\n@@ -102,13 +108,15 @@ class UploadModelUnitTest {\n listOf(),\n listOf(),\n true,\n- \"id\"\n- ), media(filename = \"File:Example.jpg\"))\n+ \"id\",\n+ ),\n+ media(filename = \"File:Example.jpg\"),\n+ )\n }\n \n @Ignore\n @Test\n- fun `Test onDepictItemClicked when media is null and DepictedItem is selected`(){\n+ fun `Test onDepictItemClicked when media is null and DepictedItem is selected`() {\n uploadModel.onDepictItemClicked(\n DepictedItem(\n \"Test\",\n@@ -117,19 +125,21 @@ class UploadModelUnitTest {\n listOf(),\n listOf(),\n true,\n- \"id\"\n- ), null)\n+ \"id\",\n+ ),\n+ null,\n+ )\n }\n \n @Ignore\n @Test\n- fun testGetSelectedExistingDepictions(){\n+ fun testGetSelectedExistingDepictions() {\n uploadModel.selectedExistingDepictions\n }\n \n @Ignore\n @Test\n- fun testSetSelectedExistingDepictions(){\n+ fun testSetSelectedExistingDepictions() {\n uploadModel.selectedExistingDepictions = listOf(\"\")\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadPresenterTest.kt\nindex ac6fb3f9d9..bbaaaec1cf 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadPresenterTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadPresenterTest.kt\n@@ -6,7 +6,6 @@ import fr.free.nrw.commons.contributions.Contribution\n import fr.free.nrw.commons.filepicker.UploadableFile\n import fr.free.nrw.commons.kvstore.JsonKvStore\n import fr.free.nrw.commons.repository.UploadRepository\n-import fr.free.nrw.commons.upload.ImageCoordinates\n import io.reactivex.Observable\n import org.junit.Before\n import org.junit.Ignore\n@@ -14,21 +13,20 @@ import org.junit.Test\n import org.mockito.ArgumentMatchers\n import org.mockito.InjectMocks\n import org.mockito.Mock\n-import org.mockito.Mockito.`when`\n import org.mockito.Mockito.times\n+import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n-import java.util.*\n-\n \n /**\n * The clas contains unit test cases for UploadPresenter\n */\n class UploadPresenterTest {\n-\n @Mock\n internal lateinit var repository: UploadRepository\n+\n @Mock\n internal lateinit var view: UploadContract.View\n+\n @Mock\n lateinit var contribution: Contribution\n \n@@ -43,6 +41,7 @@ class UploadPresenterTest {\n \n @Mock\n private lateinit var imageCoords: ImageCoordinates\n+\n @Mock\n private lateinit var uploadItem: UploadItem\n \n@@ -90,16 +89,16 @@ class UploadPresenterTest {\n \n // test 1 - insufficient count\n `when`(\n- defaultKvStore.getInt(UploadPresenter.COUNTER_OF_CONSECUTIVE_UPLOADS_WITHOUT_COORDINATES, 0))\n- .thenReturn(UploadPresenter.CONSECUTIVE_UPLOADS_WITHOUT_COORDINATES_REMINDER_THRESHOLD - 1)\n+ defaultKvStore.getInt(UploadPresenter.COUNTER_OF_CONSECUTIVE_UPLOADS_WITHOUT_COORDINATES, 0),\n+ ).thenReturn(UploadPresenter.CONSECUTIVE_UPLOADS_WITHOUT_COORDINATES_REMINDER_THRESHOLD - 1)\n uploadPresenter.handleSubmit()\n // no alert dialog expected as insufficient consecutive count\n verify(view, times(0)).showAlertDialog(ArgumentMatchers.anyInt(), ArgumentMatchers.any())\n \n // test 2 - sufficient count\n `when`(\n- defaultKvStore.getInt(UploadPresenter.COUNTER_OF_CONSECUTIVE_UPLOADS_WITHOUT_COORDINATES, 0))\n- .thenReturn(UploadPresenter.CONSECUTIVE_UPLOADS_WITHOUT_COORDINATES_REMINDER_THRESHOLD)\n+ defaultKvStore.getInt(UploadPresenter.COUNTER_OF_CONSECUTIVE_UPLOADS_WITHOUT_COORDINATES, 0),\n+ ).thenReturn(UploadPresenter.CONSECUTIVE_UPLOADS_WITHOUT_COORDINATES_REMINDER_THRESHOLD)\n uploadPresenter.handleSubmit()\n // alert dialog expected as consecutive count is at threshold\n verify(view).showAlertDialog(ArgumentMatchers.anyInt(), ArgumentMatchers.any())\n@@ -109,8 +108,8 @@ class UploadPresenterTest {\n @Test\n fun handleSubmitImagesWithLocationWithConsecutiveNoLocationUploads() {\n `when`(\n- defaultKvStore.getInt(UploadPresenter.COUNTER_OF_CONSECUTIVE_UPLOADS_WITHOUT_COORDINATES, 0))\n- .thenReturn(UploadPresenter.CONSECUTIVE_UPLOADS_WITHOUT_COORDINATES_REMINDER_THRESHOLD)\n+ defaultKvStore.getInt(UploadPresenter.COUNTER_OF_CONSECUTIVE_UPLOADS_WITHOUT_COORDINATES, 0),\n+ ).thenReturn(UploadPresenter.CONSECUTIVE_UPLOADS_WITHOUT_COORDINATES_REMINDER_THRESHOLD)\n `when`(imageCoords.imageCoordsExists).thenReturn(true)\n `when`(uploadItem.getGpsCoords()).thenReturn(imageCoords)\n `when`(repository.uploads).thenReturn(uploadableItems)\n@@ -128,8 +127,9 @@ class UploadPresenterTest {\n defaultKvStore\n .getBoolean(\n CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED,\n- false\n- )).thenReturn(true)\n+ false,\n+ ),\n+ ).thenReturn(true)\n `when`(view.isLoggedIn).thenReturn(true)\n uploadPresenter.handleSubmit()\n verify(view).isLoggedIn\n@@ -148,10 +148,9 @@ class UploadPresenterTest {\n uploadPresenter.handleSubmit()\n verify(view).isLoggedIn\n verify(view).askUserToLogIn()\n-\n }\n \n- private fun deletePictureBaseTest(){\n+ private fun deletePictureBaseTest() {\n uploadableFiles.clear()\n }\n \n@@ -160,7 +159,7 @@ class UploadPresenterTest {\n */\n @Ignore\n @Test\n- fun hideTopCardWhenReachedTheLastFile(){\n+ fun hideTopCardWhenReachedTheLastFile() {\n deletePictureBaseTest()\n uploadableFiles.add(uploadableFile)\n uploadPresenter.deletePictureAtIndex(0)\n@@ -172,12 +171,13 @@ class UploadPresenterTest {\n */\n @Ignore\n @Test\n- fun testDeleteWhenSingleUpload(){\n+ fun testDeleteWhenSingleUpload() {\n deletePictureBaseTest()\n uploadableFiles.add(uploadableFile)\n uploadPresenter.deletePictureAtIndex(0)\n verify(repository).deletePicture(ArgumentMatchers.anyString())\n- verify(view).showMessage(ArgumentMatchers.anyInt())//As there is only one while which we are asking for deletion, upload should be cancelled and this flow should be triggered\n+ // As there is only one while which we are asking for deletion, upload should be cancelled and this flow should be triggered\n+ verify(view).showMessage(ArgumentMatchers.anyInt())\n verify(view).finish()\n }\n \n@@ -186,7 +186,7 @@ class UploadPresenterTest {\n */\n @Ignore\n @Test\n- fun testDeleteWhenMultipleFilesUpload(){\n+ fun testDeleteWhenMultipleFilesUpload() {\n deletePictureBaseTest()\n uploadableFiles.add(uploadableFile)\n uploadableFiles.add(anotherUploadableFile)\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadRepositoryUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadRepositoryUnitTest.kt\nindex 75c5117d34..54d35494a3 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadRepositoryUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadRepositoryUnitTest.kt\n@@ -17,17 +17,15 @@ import fr.free.nrw.commons.upload.structure.depictions.DepictedItem\n import io.reactivex.Completable\n import io.reactivex.Single\n import org.junit.Before\n-import org.junit.Ignore\n import org.junit.Test\n import org.junit.jupiter.api.Assertions.assertEquals\n import org.mockito.Mock\n-import org.mockito.Mockito.`when`\n import org.mockito.Mockito.mock\n+import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n import java.lang.reflect.Method\n \n class UploadRepositoryUnitTest {\n-\n private lateinit var repository: UploadRepository\n \n @Mock\n@@ -84,14 +82,15 @@ class UploadRepositoryUnitTest {\n @Before\n fun setUp() {\n MockitoAnnotations.openMocks(this)\n- repository = UploadRepository(\n- uploadModel,\n- uploadController,\n- categoriesModel,\n- nearbyPlaces,\n- depictModel,\n- contributionDao\n- )\n+ repository =\n+ UploadRepository(\n+ uploadModel,\n+ uploadController,\n+ categoriesModel,\n+ nearbyPlaces,\n+ depictModel,\n+ contributionDao,\n+ )\n `when`(contributionDao.save(contribution)).thenReturn(completable)\n }\n \n@@ -104,7 +103,7 @@ class UploadRepositoryUnitTest {\n fun testPrepareMedia() {\n assertEquals(\n repository.prepareMedia(contribution),\n- uploadController.prepareMedia(contribution)\n+ uploadController.prepareMedia(contribution),\n )\n }\n \n@@ -112,7 +111,7 @@ class UploadRepositoryUnitTest {\n fun testSaveContribution() {\n assertEquals(\n repository.saveContribution(contribution),\n- contributionDao.save(contribution).blockingAwait()\n+ contributionDao.save(contribution).blockingAwait(),\n )\n }\n \n@@ -138,7 +137,7 @@ class UploadRepositoryUnitTest {\n fun testSearchAll() {\n assertEquals(\n repository.searchAll(\"\", listOf(), listOf()),\n- categoriesModel.searchAll(\"\", listOf(), listOf())\n+ categoriesModel.searchAll(\"\", listOf(), listOf()),\n )\n }\n \n@@ -157,7 +156,8 @@ class UploadRepositoryUnitTest {\n @Test\n fun testContainsYear() {\n assertEquals(\n- repository.isSpammyCategory(\"\"), categoriesModel.isSpammyCategory(\"\")\n+ repository.isSpammyCategory(\"\"),\n+ categoriesModel.isSpammyCategory(\"\"),\n )\n }\n \n@@ -180,7 +180,7 @@ class UploadRepositoryUnitTest {\n fun testPreProcessImage() {\n assertEquals(\n repository.preProcessImage(uploadableFile, place, similarImageInterface, location),\n- uploadModel.preProcessImage(uploadableFile, place, similarImageInterface, location)\n+ uploadModel.preProcessImage(uploadableFile, place, similarImageInterface, location),\n )\n }\n \n@@ -188,7 +188,7 @@ class UploadRepositoryUnitTest {\n fun testGetImageQuality() {\n assertEquals(\n repository.getImageQuality(uploadItem, location),\n- uploadModel.getImageQuality(uploadItem, location)\n+ uploadModel.getImageQuality(uploadItem, location),\n )\n }\n \n@@ -196,7 +196,7 @@ class UploadRepositoryUnitTest {\n fun testGetCaptionQuality() {\n assertEquals(\n repository.getCaptionQuality(uploadItem),\n- uploadModel.getCaptionQuality(uploadItem)\n+ uploadModel.getCaptionQuality(uploadItem),\n )\n }\n \n@@ -210,7 +210,7 @@ class UploadRepositoryUnitTest {\n `when`(uploadModel.items).thenReturn(listOf(uploadItem))\n assertEquals(\n repository.getUploadItem(0),\n- uploadModel.items[0]\n+ uploadModel.items[0],\n )\n }\n \n@@ -228,7 +228,7 @@ class UploadRepositoryUnitTest {\n fun testSetSelectedExistingDepictions() {\n assertEquals(\n repository.setSelectedExistingDepictions(listOf(\"\")),\n- uploadModel.setSelectedExistingDepictions(listOf(\"\"))\n+ uploadModel.setSelectedExistingDepictions(listOf(\"\")),\n )\n }\n \n@@ -236,7 +236,7 @@ class UploadRepositoryUnitTest {\n fun testOnDepictItemClicked() {\n assertEquals(\n repository.onDepictItemClicked(depictedItem, mock()),\n- uploadModel.onDepictItemClicked(depictedItem, mock())\n+ uploadModel.onDepictItemClicked(depictedItem, mock()),\n )\n }\n \n@@ -254,7 +254,7 @@ class UploadRepositoryUnitTest {\n fun testSearchAllEntities() {\n assertEquals(\n repository.searchAllEntities(\"\"),\n- depictModel.searchAllEntities(\"\", repository)\n+ depictModel.searchAllEntities(\"\", repository),\n )\n }\n \n@@ -265,7 +265,7 @@ class UploadRepositoryUnitTest {\n `when`(place.wikiDataEntityId).thenReturn(\"1\")\n assertEquals(\n repository.placeDepictions,\n- depictModel.getPlaceDepictions(listOf(\"1\"))\n+ depictModel.getPlaceDepictions(listOf(\"1\")),\n )\n }\n \n@@ -274,13 +274,16 @@ class UploadRepositoryUnitTest {\n `when`(\n nearbyPlaces.getFromWikidataQuery(\n LatLng(0.0, 0.0, 0.0f),\n- java.util.Locale.getDefault().language, 0.1,\n- null\n- )\n+ java.util.Locale\n+ .getDefault()\n+ .language,\n+ 0.1,\n+ null,\n+ ),\n ).thenReturn(listOf(place))\n assertEquals(\n repository.checkNearbyPlaces(0.0, 0.0),\n- place\n+ place,\n )\n }\n \n@@ -288,7 +291,7 @@ class UploadRepositoryUnitTest {\n fun testCheckNearbyPlacesWithoutExceptionCaseNull() {\n assertEquals(\n repository.checkNearbyPlaces(0.0, 0.0),\n- null\n+ null,\n )\n }\n \n@@ -297,13 +300,16 @@ class UploadRepositoryUnitTest {\n `when`(\n nearbyPlaces.getFromWikidataQuery(\n LatLng(0.0, 0.0, 0.0f),\n- java.util.Locale.getDefault().language, 0.1,\n- null\n- )\n+ java.util.Locale\n+ .getDefault()\n+ .language,\n+ 0.1,\n+ null,\n+ ),\n ).thenThrow(Exception())\n assertEquals(\n repository.checkNearbyPlaces(0.0, 0.0),\n- null\n+ null,\n )\n }\n \n@@ -311,7 +317,7 @@ class UploadRepositoryUnitTest {\n fun testUseSimilarPictureCoordinates() {\n assertEquals(\n repository.useSimilarPictureCoordinates(imageCoordinates, 0),\n- uploadModel.useSimilarPictureCoordinates(imageCoordinates, 0)\n+ uploadModel.useSimilarPictureCoordinates(imageCoordinates, 0),\n )\n }\n \n@@ -321,7 +327,7 @@ class UploadRepositoryUnitTest {\n `when`(uploadItem.isWLMUpload).thenReturn(true)\n assertEquals(\n repository.isWMLSupportedForThisPlace,\n- true\n+ true,\n )\n }\n \n@@ -329,30 +335,33 @@ class UploadRepositoryUnitTest {\n fun testGetDepictions() {\n `when`(depictModel.getDepictions(\"Q12\"))\n .thenReturn(Single.just(listOf(mock(DepictedItem::class.java))))\n- val method: Method = UploadRepository::class.java.getDeclaredMethod(\n- \"getDepictions\",\n- List::class.java\n- )\n+ val method: Method =\n+ UploadRepository::class.java.getDeclaredMethod(\n+ \"getDepictions\",\n+ List::class.java,\n+ )\n method.isAccessible = true\n method.invoke(repository, listOf(\"Q12\"))\n }\n \n @Test\n fun testJoinIDs() {\n- val method: Method = UploadRepository::class.java.getDeclaredMethod(\n- \"joinQIDs\",\n- List::class.java\n- )\n+ val method: Method =\n+ UploadRepository::class.java.getDeclaredMethod(\n+ \"joinQIDs\",\n+ List::class.java,\n+ )\n method.isAccessible = true\n method.invoke(repository, listOf(\"Q12\", \"Q23\"))\n }\n \n @Test\n fun `test joinIDs when depictIDs is null`() {\n- val method: Method = UploadRepository::class.java.getDeclaredMethod(\n- \"joinQIDs\",\n- List::class.java\n- )\n+ val method: Method =\n+ UploadRepository::class.java.getDeclaredMethod(\n+ \"joinQIDs\",\n+ List::class.java,\n+ )\n method.isAccessible = true\n method.invoke(repository, null)\n }\n@@ -361,7 +370,7 @@ class UploadRepositoryUnitTest {\n fun testGetSelectedExistingCategories() {\n assertEquals(\n repository.selectedExistingCategories,\n- categoriesModel.getSelectedExistingCategories()\n+ categoriesModel.getSelectedExistingCategories(),\n )\n }\n \n@@ -369,7 +378,7 @@ class UploadRepositoryUnitTest {\n fun testSetSelectedExistingCategories() {\n assertEquals(\n repository.setSelectedExistingCategories(listOf(\"Test\")),\n- categoriesModel.setSelectedExistingCategories(mutableListOf(\"Test\"))\n+ categoriesModel.setSelectedExistingCategories(mutableListOf(\"Test\")),\n )\n }\n \n@@ -377,7 +386,7 @@ class UploadRepositoryUnitTest {\n fun testGetCategories() {\n assertEquals(\n repository.getCategories(listOf(\"Test\")),\n- categoriesModel.getCategoriesByName(mutableListOf(\"Test\"))\n+ categoriesModel.getCategoriesByName(mutableListOf(\"Test\")),\n )\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/categories/UploadCategoriesFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/categories/UploadCategoriesFragmentUnitTests.kt\nindex ff7eb6625f..ee2d54ee7c 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/categories/UploadCategoriesFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/categories/UploadCategoriesFragmentUnitTests.kt\n@@ -1,30 +1,18 @@\n package fr.free.nrw.commons.upload.categories\n \n-import android.app.ProgressDialog\n import android.content.Context\n import android.os.Looper\n-import android.text.Editable\n-import android.util.Log\n import android.view.LayoutInflater\n-import android.view.View\n-import android.widget.Button\n-import android.widget.ImageView\n-import android.widget.ProgressBar\n-import android.widget.TextView\n import androidx.fragment.app.FragmentManager\n import androidx.fragment.app.FragmentTransaction\n-import androidx.recyclerview.widget.RecyclerView\n import androidx.test.core.app.ApplicationProvider\n-import com.google.android.material.textfield.TextInputLayout\n import com.nhaarman.mockitokotlin2.times\n-import com.nhaarman.mockitokotlin2.verify\n import fr.free.nrw.commons.Media\n import fr.free.nrw.commons.OkHttpConnectionFactory\n import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.databinding.UploadCategoriesFragmentBinding\n-import fr.free.nrw.commons.ui.PasteSensitiveTextInputEditText\n import fr.free.nrw.commons.upload.UploadActivity\n import fr.free.nrw.commons.upload.UploadBaseFragment\n import io.reactivex.disposables.Disposable\n@@ -33,7 +21,6 @@ import org.junit.Before\n import org.junit.Test\n import org.junit.runner.RunWith\n import org.mockito.Mock\n-import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n import org.powermock.reflect.Whitebox\n import org.robolectric.Robolectric\n@@ -47,7 +34,6 @@ import java.lang.reflect.Method\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class UploadCategoriesFragmentUnitTests {\n-\n private lateinit var fragment: UploadCategoriesFragment\n private lateinit var context: Context\n private lateinit var fragmentManager: FragmentManager\n@@ -68,8 +54,7 @@ class UploadCategoriesFragmentUnitTests {\n @Mock\n private lateinit var media: Media\n \n- private lateinit var binding : UploadCategoriesFragmentBinding\n-\n+ private lateinit var binding: UploadCategoriesFragmentBinding\n \n @Before\n fun setUp() {\n@@ -102,15 +87,16 @@ class UploadCategoriesFragmentUnitTests {\n @Throws(Exception::class)\n fun testOnCreateView() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- fragment.onCreateView(layoutInflater,null, null)\n+ fragment.onCreateView(layoutInflater, null, null)\n }\n \n @Test\n @Throws(Exception::class)\n fun testInitMethod() {\n- val method: Method = UploadCategoriesFragment::class.java.getDeclaredMethod(\n- \"init\"\n- )\n+ val method: Method =\n+ UploadCategoriesFragment::class.java.getDeclaredMethod(\n+ \"init\",\n+ )\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n method.isAccessible = true\n method.invoke(fragment)\n@@ -120,9 +106,10 @@ class UploadCategoriesFragmentUnitTests {\n @Throws(Exception::class)\n fun `Test init when media is non null`() {\n Whitebox.setInternalState(fragment, \"media\", media)\n- val method: Method = UploadCategoriesFragment::class.java.getDeclaredMethod(\n- \"init\"\n- )\n+ val method: Method =\n+ UploadCategoriesFragment::class.java.getDeclaredMethod(\n+ \"init\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -130,9 +117,10 @@ class UploadCategoriesFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testFragmentOnBecameVisible() {\n- val method: Method = UploadCategoriesFragment::class.java.getDeclaredMethod(\n- \"onBecameVisible\"\n- )\n+ val method: Method =\n+ UploadCategoriesFragment::class.java.getDeclaredMethod(\n+ \"onBecameVisible\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -261,9 +249,10 @@ class UploadCategoriesFragmentUnitTests {\n @Throws(Exception::class)\n fun testOnBecameVisible() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = UploadCategoriesFragment::class.java.getDeclaredMethod(\n- \"onBecameVisible\"\n- )\n+ val method: Method =\n+ UploadCategoriesFragment::class.java.getDeclaredMethod(\n+ \"onBecameVisible\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -272,9 +261,10 @@ class UploadCategoriesFragmentUnitTests {\n @Throws(Exception::class)\n fun testAddTextChangeListenerToEtSearch() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = UploadCategoriesFragment::class.java.getDeclaredMethod(\n- \"addTextChangeListenerToEtSearch\"\n- )\n+ val method: Method =\n+ UploadCategoriesFragment::class.java.getDeclaredMethod(\n+ \"addTextChangeListenerToEtSearch\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -283,10 +273,11 @@ class UploadCategoriesFragmentUnitTests {\n @Throws(Exception::class)\n fun testSearchForCategory() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = UploadCategoriesFragment::class.java.getDeclaredMethod(\n- \"searchForCategory\",\n- String::class.java\n- )\n+ val method: Method =\n+ UploadCategoriesFragment::class.java.getDeclaredMethod(\n+ \"searchForCategory\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"\")\n }\n@@ -295,9 +286,10 @@ class UploadCategoriesFragmentUnitTests {\n @Throws(Exception::class)\n fun testInitRecyclerView() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = UploadCategoriesFragment::class.java.getDeclaredMethod(\n- \"initRecyclerView\"\n- )\n+ val method: Method =\n+ UploadCategoriesFragment::class.java.getDeclaredMethod(\n+ \"initRecyclerView\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -306,9 +298,10 @@ class UploadCategoriesFragmentUnitTests {\n @Throws(Exception::class)\n fun testInit() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = UploadCategoriesFragment::class.java.getDeclaredMethod(\n- \"init\"\n- )\n+ val method: Method =\n+ UploadCategoriesFragment::class.java.getDeclaredMethod(\n+ \"init\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -318,9 +311,10 @@ class UploadCategoriesFragmentUnitTests {\n fun `Test init when media is not null`() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n Whitebox.setInternalState(fragment, \"media\", media)\n- val method: Method = UploadCategoriesFragment::class.java.getDeclaredMethod(\n- \"init\"\n- )\n+ val method: Method =\n+ UploadCategoriesFragment::class.java.getDeclaredMethod(\n+ \"init\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -329,11 +323,11 @@ class UploadCategoriesFragmentUnitTests {\n @Throws(Exception::class)\n fun `Test init when callback is null`() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = UploadCategoriesFragment::class.java.getDeclaredMethod(\n- \"init\"\n- )\n+ val method: Method =\n+ UploadCategoriesFragment::class.java.getDeclaredMethod(\n+ \"init\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictEditHelperUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictEditHelperUnitTest.kt\nindex 47c2236069..d90a288cab 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictEditHelperUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictEditHelperUnitTest.kt\n@@ -28,7 +28,6 @@ import java.lang.reflect.Method\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class DepictEditHelperUnitTest {\n-\n private lateinit var context: Context\n private lateinit var helper: DepictEditHelper\n \n@@ -68,7 +67,7 @@ class DepictEditHelperUnitTest {\n helper.makeDepictionEdit(context, media, listOf(\"Q12\"))\n Mockito.verify(viewUtilWrapper, Mockito.times(1)).showShortToast(\n context,\n- context.getString(R.string.depictions_edit_helper_make_edit_toast)\n+ context.getString(R.string.depictions_edit_helper_make_edit_toast),\n )\n }\n \n@@ -76,34 +75,34 @@ class DepictEditHelperUnitTest {\n @Throws(Exception::class)\n fun testShowCoordinatesEditNotificationCaseTrue() {\n whenever(media.depictionIds).thenReturn(listOf(\"id\", \"id2\"))\n- val method: Method = DepictEditHelper::class.java.getDeclaredMethod(\n- \"showDepictionEditNotification\",\n- Context::class.java,\n- Media::class.java,\n- Boolean::class.java\n- )\n+ val method: Method =\n+ DepictEditHelper::class.java.getDeclaredMethod(\n+ \"showDepictionEditNotification\",\n+ Context::class.java,\n+ Media::class.java,\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n Assertions.assertEquals(\n method.invoke(helper, context, media, true),\n- true\n+ true,\n )\n }\n \n @Test\n @Throws(Exception::class)\n fun testShowCoordinatesEditNotificationCaseFalse() {\n- val method: Method = DepictEditHelper::class.java.getDeclaredMethod(\n- \"showDepictionEditNotification\",\n- Context::class.java,\n- Media::class.java,\n- Boolean::class.java\n- )\n+ val method: Method =\n+ DepictEditHelper::class.java.getDeclaredMethod(\n+ \"showDepictionEditNotification\",\n+ Context::class.java,\n+ Media::class.java,\n+ Boolean::class.java,\n+ )\n method.isAccessible = true\n Assertions.assertEquals(\n method.invoke(helper, context, media, false),\n- false\n+ false,\n )\n }\n-\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictsFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictsFragmentUnitTests.kt\nindex 54f1edc686..84b878aeef 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictsFragmentUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictsFragmentUnitTests.kt\n@@ -7,9 +7,7 @@ import android.view.LayoutInflater\n import android.view.View\n import androidx.fragment.app.FragmentManager\n import androidx.fragment.app.FragmentTransaction\n-import androidx.recyclerview.widget.RecyclerView\n import androidx.test.core.app.ApplicationProvider\n-import com.google.android.material.textfield.TextInputLayout\n import com.nhaarman.mockitokotlin2.whenever\n import depictedItem\n import fr.free.nrw.commons.Media\n@@ -18,7 +16,6 @@ import fr.free.nrw.commons.R\n import fr.free.nrw.commons.TestCommonsApplication\n import fr.free.nrw.commons.createTestClient\n import fr.free.nrw.commons.kvstore.JsonKvStore\n-import fr.free.nrw.commons.ui.PasteSensitiveTextInputEditText\n import fr.free.nrw.commons.upload.UploadActivity\n import fr.free.nrw.commons.upload.UploadBaseFragment\n import io.reactivex.disposables.Disposable\n@@ -39,7 +36,6 @@ import java.lang.reflect.Method\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class DepictsFragmentUnitTests {\n-\n private lateinit var fragment: DepictsFragment\n private lateinit var fragmentManager: FragmentManager\n private lateinit var layoutInflater: LayoutInflater\n@@ -82,9 +78,10 @@ class DepictsFragmentUnitTests {\n \n layoutInflater = LayoutInflater.from(activity)\n \n- view = LayoutInflater.from(activity)\n- .inflate(R.layout.upload_depicts_fragment, null) as View\n-\n+ view =\n+ LayoutInflater\n+ .from(activity)\n+ .inflate(R.layout.upload_depicts_fragment, null) as View\n \n Whitebox.setInternalState(fragment, \"callback\", callback)\n Whitebox.setInternalState(fragment, \"subscribe\", disposable)\n@@ -106,9 +103,10 @@ class DepictsFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testInit() {\n- val method: Method = DepictsFragment::class.java.getDeclaredMethod(\n- \"init\"\n- )\n+ val method: Method =\n+ DepictsFragment::class.java.getDeclaredMethod(\n+ \"init\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -117,9 +115,10 @@ class DepictsFragmentUnitTests {\n @Throws(Exception::class)\n fun `Test init when media is not null`() {\n Whitebox.setInternalState(fragment, \"media\", media)\n- val method: Method = DepictsFragment::class.java.getDeclaredMethod(\n- \"init\"\n- )\n+ val method: Method =\n+ DepictsFragment::class.java.getDeclaredMethod(\n+ \"init\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -127,9 +126,10 @@ class DepictsFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnBecameVisible() {\n- val method: Method = DepictsFragment::class.java.getDeclaredMethod(\n- \"onBecameVisible\"\n- )\n+ val method: Method =\n+ DepictsFragment::class.java.getDeclaredMethod(\n+ \"onBecameVisible\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -211,10 +211,11 @@ class DepictsFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testSearchForDepictions() {\n- val method: Method = DepictsFragment::class.java.getDeclaredMethod(\n- \"searchForDepictions\",\n- String::class.java\n- )\n+ val method: Method =\n+ DepictsFragment::class.java.getDeclaredMethod(\n+ \"searchForDepictions\",\n+ String::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, \"\")\n }\n@@ -234,9 +235,10 @@ class DepictsFragmentUnitTests {\n @Test\n @Throws(Exception::class)\n fun testInitRecyclerView() {\n- val method: Method = DepictsFragment::class.java.getDeclaredMethod(\n- \"initRecyclerView\"\n- )\n+ val method: Method =\n+ DepictsFragment::class.java.getDeclaredMethod(\n+ \"initRecyclerView\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -245,9 +247,10 @@ class DepictsFragmentUnitTests {\n @Throws(Exception::class)\n fun `Test initRecyclerView when media is not null`() {\n Whitebox.setInternalState(fragment, \"media\", media)\n- val method: Method = DepictsFragment::class.java.getDeclaredMethod(\n- \"initRecyclerView\"\n- )\n+ val method: Method =\n+ DepictsFragment::class.java.getDeclaredMethod(\n+ \"initRecyclerView\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt\nindex c81d0548db..ed76b4519f 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt\n@@ -57,7 +57,6 @@ import java.lang.reflect.Method\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class UploadMediaDetailFragmentUnitTest {\n-\n private lateinit var fragment: UploadMediaDetailFragment\n private lateinit var fragmentManager: FragmentManager\n private lateinit var context: Context\n@@ -73,8 +72,8 @@ class UploadMediaDetailFragmentUnitTest {\n private lateinit var btnCopyToSubsequentMedia: AppCompatButton\n private lateinit var photoViewBackgroundImage: PhotoView\n private lateinit var locationStatusLl: LinearLayout\n- private lateinit var locationImageView : ImageView\n- private lateinit var locationTextView : TextView\n+ private lateinit var locationImageView: ImageView\n+ private lateinit var locationTextView: TextView\n private lateinit var llContainerMediaDetail: LinearLayout\n private lateinit var ibExpandCollapse: AppCompatImageButton\n \n@@ -120,8 +119,10 @@ class UploadMediaDetailFragmentUnitTest {\n activity = Robolectric.buildActivity(UploadActivity::class.java).create().get()\n layoutInflater = LayoutInflater.from(activity)\n \n- view = LayoutInflater.from(activity)\n- .inflate(R.layout.fragment_upload_media_detail_fragment, null) as View\n+ view =\n+ LayoutInflater\n+ .from(activity)\n+ .inflate(R.layout.fragment_upload_media_detail_fragment, null) as View\n \n fragment = UploadMediaDetailFragment()\n fragmentManager = activity.supportFragmentManager\n@@ -190,9 +191,10 @@ class UploadMediaDetailFragmentUnitTest {\n fun testInit() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n Whitebox.setInternalState(fragment, \"presenter\", presenter)\n- val method: Method = UploadMediaDetailFragment::class.java.getDeclaredMethod(\n- \"init\"\n- )\n+ val method: Method =\n+ UploadMediaDetailFragment::class.java.getDeclaredMethod(\n+ \"init\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -204,9 +206,10 @@ class UploadMediaDetailFragmentUnitTest {\n Whitebox.setInternalState(fragment, \"presenter\", presenter)\n `when`(callback.getIndexInViewFlipper(fragment)).thenReturn(1)\n `when`(callback.totalNumberOfSteps).thenReturn(5)\n- val method: Method = UploadMediaDetailFragment::class.java.getDeclaredMethod(\n- \"init\"\n- )\n+ val method: Method =\n+ UploadMediaDetailFragment::class.java.getDeclaredMethod(\n+ \"init\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -215,9 +218,12 @@ class UploadMediaDetailFragmentUnitTest {\n @Throws(Exception::class)\n fun testShowInfoAlert() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- val method: Method = UploadMediaDetailFragment::class.java.getDeclaredMethod(\n- \"showInfoAlert\", Int::class.java, Int::class.java\n- )\n+ val method: Method =\n+ UploadMediaDetailFragment::class.java.getDeclaredMethod(\n+ \"showInfoAlert\",\n+ Int::class.java,\n+ Int::class.java,\n+ )\n method.isAccessible = true\n method.invoke(fragment, R.string.media_detail_step_title, R.string.media_details_tooltip)\n }\n@@ -283,9 +289,10 @@ class UploadMediaDetailFragmentUnitTest {\n Whitebox.setInternalState(fragment, \"showNearbyFound\", true)\n Whitebox.setInternalState(fragment, \"nearbyPlace\", place)\n Whitebox.setInternalState(fragment, \"uploadItem\", uploadItem)\n- val method: Method = UploadMediaDetailFragment::class.java.getDeclaredMethod(\n- \"onBecameVisible\"\n- )\n+ val method: Method =\n+ UploadMediaDetailFragment::class.java.getDeclaredMethod(\n+ \"onBecameVisible\",\n+ )\n method.isAccessible = true\n method.invoke(fragment)\n }\n@@ -321,7 +328,6 @@ class UploadMediaDetailFragmentUnitTest {\n fragment.showDuplicatePicturePopup(uploadItem)\n }\n \n-\n @Test\n @Throws(Exception::class)\n fun testShowConnectionErrorPopupForCaptionCheck() {\n@@ -374,7 +380,7 @@ class UploadMediaDetailFragmentUnitTest {\n Whitebox.setInternalState(cameraPosition, \"latitude\", latLng.latitude)\n Whitebox.setInternalState(cameraPosition, \"longitude\", latLng.longitude)\n Whitebox.setInternalState(fragment, \"editableUploadItem\", uploadItem)\n- Whitebox.setInternalState(fragment,\"isMissingLocationDialog\",true)\n+ Whitebox.setInternalState(fragment, \"isMissingLocationDialog\", true)\n Whitebox.setInternalState(fragment, \"presenter\", presenter)\n \n `when`(LocationPicker.getCameraPosition(intent)).thenReturn(cameraPosition)\n@@ -433,20 +439,20 @@ class UploadMediaDetailFragmentUnitTest {\n @Throws(Exception::class)\n fun testDisplayAddLocationDialog() {\n Shadows.shadowOf(Looper.getMainLooper()).idle()\n- runnable = Runnable { }\n+ runnable = Runnable { }\n fragment.displayAddLocationDialog(runnable)\n }\n \n @Test\n @Throws(Exception::class)\n- fun testRememberedZoomLevelOnNull(){\n+ fun testRememberedZoomLevelOnNull() {\n shadowOf(Looper.getMainLooper()).idle()\n Whitebox.setInternalState(fragment, \"defaultKvStore\", defaultKvStore)\n `when`(uploadItem.gpsCoords).thenReturn(null)\n `when`(defaultKvStore.getString(LAST_ZOOM)).thenReturn(\"13.0\")\n fragment.showExternalMap(uploadItem)\n- Mockito.verify(uploadItem,Mockito.times(1)).gpsCoords\n- Mockito.verify(defaultKvStore,Mockito.times(2)).getString(LAST_ZOOM)\n+ Mockito.verify(uploadItem, Mockito.times(1)).gpsCoords\n+ Mockito.verify(defaultKvStore, Mockito.times(2)).getString(LAST_ZOOM)\n val shadowActivity: ShadowActivity = shadowOf(activity)\n val startedIntent = shadowActivity.nextStartedActivity\n val shadowIntent: ShadowIntent = shadowOf(startedIntent)\n@@ -455,7 +461,7 @@ class UploadMediaDetailFragmentUnitTest {\n \n @Test\n @Throws(Exception::class)\n- fun testRememberedZoomLevelOnNotNull(){\n+ fun testRememberedZoomLevelOnNotNull() {\n shadowOf(Looper.getMainLooper()).idle()\n `when`(uploadItem.gpsCoords).thenReturn(imageCoordinates)\n `when`(imageCoordinates.decLatitude).thenReturn(8.0)\n@@ -463,11 +469,10 @@ class UploadMediaDetailFragmentUnitTest {\n `when`(imageCoordinates.zoomLevel).thenReturn(14.0)\n `when`(defaultKvStore.getString(LAST_ZOOM)).thenReturn(null)\n fragment.showExternalMap(uploadItem)\n- Mockito.verify(uploadItem.gpsCoords,Mockito.times(1)).zoomLevel\n+ Mockito.verify(uploadItem.gpsCoords, Mockito.times(1)).zoomLevel\n val shadowActivity: ShadowActivity = shadowOf(activity)\n val startedIntent = shadowActivity.nextStartedActivity\n val shadowIntent: ShadowIntent = shadowOf(startedIntent)\n Assert.assertEquals(shadowIntent.intentClass, LocationPickerActivity::class.java)\n }\n-\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/structure/depictions/DepictedItemTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/structure/depictions/DepictedItemTest.kt\nindex ed89e3583d..892d501fd2 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/structure/depictions/DepictedItemTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/structure/depictions/DepictedItemTest.kt\n@@ -6,7 +6,6 @@ import entity\n import entityId\n import fr.free.nrw.commons.wikidata.WikidataProperties\n import org.junit.Assert\n-import org.junit.Ignore\n import org.junit.Test\n import place\n import snak\n@@ -15,7 +14,6 @@ import valueString\n import wikiBaseEntityValue\n \n class DepictedItemTest {\n-\n @Test\n fun `name and description get user language label`() {\n val depictedItem =\n@@ -53,12 +51,13 @@ class DepictedItemTest {\n Assert.assertEquals(\n DepictedItem(\n entity(\n- statements = mapOf(\n- WikidataProperties.IMAGE.propertyName to listOf(statement(snak(dataValue = mock())))\n- )\n- )\n+ statements =\n+ mapOf(\n+ WikidataProperties.IMAGE.propertyName to listOf(statement(snak(dataValue = mock()))),\n+ ),\n+ ),\n ).imageUrl,\n- null\n+ null,\n )\n }\n \n@@ -67,14 +66,17 @@ class DepictedItemTest {\n Assert.assertEquals(\n DepictedItem(\n entity(\n- statements = mapOf(\n- WikidataProperties.IMAGE.propertyName to listOf(\n- statement(snak(dataValue = valueString(\"prefix: example_\")))\n- )\n- )\n- )\n+ statements =\n+ mapOf(\n+ WikidataProperties.IMAGE.propertyName to\n+ listOf(\n+ statement(snak(dataValue = valueString(\"prefix: example_\"))),\n+ ),\n+ ),\n+ ),\n ).imageUrl,\n- \"https://upload.wikimedia.org/wikipedia/commons/thumb/b/b7/_example_/70px-_example_\")\n+ \"https://upload.wikimedia.org/wikipedia/commons/thumb/b/b7/_example_/70px-_example_\",\n+ )\n }\n \n @Test\n@@ -82,16 +84,19 @@ class DepictedItemTest {\n Assert.assertEquals(\n DepictedItem(\n entity(\n- statements = mapOf(\n- WikidataProperties.INSTANCE_OF.propertyName to listOf(\n- statement(snak(dataValue = valueString(\"prefix: example_\"))),\n- statement(snak(dataValue = entityId(wikiBaseEntityValue(id = \"1\")))),\n- statement(snak(dataValue = entityId(wikiBaseEntityValue(id = \"2\"))))\n- )\n- )\n- )\n+ statements =\n+ mapOf(\n+ WikidataProperties.INSTANCE_OF.propertyName to\n+ listOf(\n+ statement(snak(dataValue = valueString(\"prefix: example_\"))),\n+ statement(snak(dataValue = entityId(wikiBaseEntityValue(id = \"1\")))),\n+ statement(snak(dataValue = entityId(wikiBaseEntityValue(id = \"2\")))),\n+ ),\n+ ),\n+ ),\n ).instanceOfs,\n- listOf(\"1\", \"2\"))\n+ listOf(\"1\", \"2\"),\n+ )\n }\n \n @Test\n@@ -104,15 +109,18 @@ class DepictedItemTest {\n Assert.assertEquals(\n DepictedItem(\n entity(\n- statements = mapOf(\n- WikidataProperties.COMMONS_CATEGORY.propertyName to listOf(\n- statement(snak(dataValue = valueString(\"1\"))),\n- statement(snak(dataValue = valueString(\"2\")))\n- )\n- )\n- )\n+ statements =\n+ mapOf(\n+ WikidataProperties.COMMONS_CATEGORY.propertyName to\n+ listOf(\n+ statement(snak(dataValue = valueString(\"1\"))),\n+ statement(snak(dataValue = valueString(\"2\"))),\n+ ),\n+ ),\n+ ),\n ).commonsCategories.map { it.name },\n- listOf(\"1\", \"2\"))\n+ listOf(\"1\", \"2\"),\n+ )\n }\n \n @Test\n@@ -137,7 +145,6 @@ class DepictedItemTest {\n Assert.assertEquals(depictedItem.description, \"2\")\n }\n \n-\n @Test\n fun `same object is Equal`() {\n val depictedItem = depictedItem()\n@@ -152,24 +159,26 @@ class DepictedItemTest {\n @Test\n fun `if names are equal is Equal`() {\n Assert.assertEquals(\n- depictedItem(name=\"a\", id = \"0\") == depictedItem(name=\"a\", id = \"1\"),\n- true)\n+ depictedItem(name = \"a\", id = \"0\") == depictedItem(name = \"a\", id = \"1\"),\n+ true,\n+ )\n }\n \n @Test\n fun `if names are not equal is not Equal`() {\n Assert.assertEquals(\n- depictedItem(name=\"a\") == depictedItem(name=\"b\"),\n- false)\n+ depictedItem(name = \"a\") == depictedItem(name = \"b\"),\n+ false,\n+ )\n }\n \n @Test\n fun `hashCode returns same values for objects with same name`() {\n- Assert.assertEquals(depictedItem(name=\"a\").hashCode(), depictedItem(name=\"a\").hashCode())\n+ Assert.assertEquals(depictedItem(name = \"a\").hashCode(), depictedItem(name = \"a\").hashCode())\n }\n- \n+\n @Test\n fun `hashCode returns different values for objects with different name`() {\n- Assert.assertNotEquals(depictedItem(name=\"a\").hashCode(), depictedItem(name=\"b\").hashCode())\n+ Assert.assertNotEquals(depictedItem(name = \"a\").hashCode(), depictedItem(name = \"b\").hashCode())\n }\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/utils/CommonsDateUtilTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/utils/CommonsDateUtilTest.kt\nindex 52acbf5cd9..40f848a487 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/utils/CommonsDateUtilTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/utils/CommonsDateUtilTest.kt\n@@ -4,16 +4,17 @@ import org.junit.Assert\n import org.junit.Test\n \n class CommonsDateUtilTest {\n-\n @Test\n fun `Iso8601DateFormatTimestamp parses legal date`() {\n- val iso8601DateFormatTimestamp = CommonsDateUtil\n- .getIso8601DateFormatTimestamp()\n- val parsedDate = iso8601DateFormatTimestamp\n- .parse(\"2020-04-07T14:21:57Z\")\n+ val iso8601DateFormatTimestamp =\n+ CommonsDateUtil\n+ .getIso8601DateFormatTimestamp()\n+ val parsedDate =\n+ iso8601DateFormatTimestamp\n+ .parse(\"2020-04-07T14:21:57Z\")\n Assert.assertEquals(\n \"2020-04-07T14:21:57Z\",\n- iso8601DateFormatTimestamp.format(parsedDate)\n+ iso8601DateFormatTimestamp.format(parsedDate),\n )\n }\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/utils/FileUtilsTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/utils/FileUtilsTest.kt\nindex d186899788..45385f4412 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/utils/FileUtilsTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/utils/FileUtilsTest.kt\n@@ -4,9 +4,8 @@ import com.nhaarman.mockitokotlin2.mock\n import fr.free.nrw.commons.upload.FileUtils\n import fr.free.nrw.commons.upload.FileUtilsWrapper\n import org.junit.Assert.assertEquals\n-import org.junit.Ignore\n import org.junit.Test\n-import java.io.*\n+import java.io.File\n \n class FileUtilsTest {\n @Test\n@@ -24,23 +23,25 @@ class FileUtilsTest {\n val fileUtilsWrapper = FileUtilsWrapper(mock())\n \n assertEquals(\n- \"907d14fb3af2b0d4f18c2d46abe8aedce17367bd\",\n- fileUtilsWrapper.getSHA1(\"Hello, World\".byteInputStream())\n+ \"907d14fb3af2b0d4f18c2d46abe8aedce17367bd\",\n+ fileUtilsWrapper.getSHA1(\"Hello, World\".byteInputStream()),\n )\n \n assertEquals(\n- \"8b971da6347bd126872ea2f4f8d394e70c74073a\",\n- fileUtilsWrapper.getSHA1(\"apps-android-commons\".byteInputStream())\n+ \"8b971da6347bd126872ea2f4f8d394e70c74073a\",\n+ fileUtilsWrapper.getSHA1(\"apps-android-commons\".byteInputStream()),\n )\n \n assertEquals(\n- \"e9d30f5a3a82792b9d79c258366bd53207ceaeb3\",\n- fileUtilsWrapper.getSHA1(\"domdomegg was here\".byteInputStream())\n+ \"e9d30f5a3a82792b9d79c258366bd53207ceaeb3\",\n+ fileUtilsWrapper.getSHA1(\"domdomegg was here\".byteInputStream()),\n )\n \n assertEquals(\n- \"96e733a3e59261c0621ba99be5bd10bb21abe53e\",\n- fileUtilsWrapper.getSHA1(\"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=\".byteInputStream())\n+ \"96e733a3e59261c0621ba99be5bd10bb21abe53e\",\n+ fileUtilsWrapper.getSHA1(\n+ \"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=\".byteInputStream(),\n+ ),\n )\n }\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/utils/ImageUtilsTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/utils/ImageUtilsTest.kt\nindex 08d95d60d7..da7ca208ee 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/utils/ImageUtilsTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/utils/ImageUtilsTest.kt\n@@ -5,39 +5,29 @@ import android.content.Context\n import android.graphics.Bitmap\n import android.net.Uri\n import androidx.test.core.app.ApplicationProvider\n-import androidx.work.Data\n-import androidx.work.ListenableWorker\n import androidx.work.WorkManager\n-import androidx.work.testing.TestListenableWorkerBuilder\n import androidx.work.testing.WorkManagerTestInitHelper\n import fr.free.nrw.commons.TestCommonsApplication\n-import fr.free.nrw.commons.contributions.SetWallpaperWorker\n import fr.free.nrw.commons.location.LatLng\n import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient\n import io.reactivex.disposables.CompositeDisposable\n import org.junit.Assert\n import org.junit.Before\n import org.junit.Test\n-import org.junit.jupiter.api.Assertions.assertTrue\n import org.junit.runner.RunWith\n import org.mockito.Mock\n import org.mockito.Mockito.mock\n-import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n import org.robolectric.RobolectricTestRunner\n import org.robolectric.annotation.Config\n import org.robolectric.annotation.LooperMode\n import java.io.File\n-import java.lang.reflect.Field\n import java.lang.reflect.Method\n \n-\n-\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n @LooperMode(LooperMode.Mode.PAUSED)\n class ImageUtilsTest {\n-\n private lateinit var context: Context\n \n @Mock\n@@ -65,30 +55,23 @@ class ImageUtilsTest {\n \n @Test\n fun testCheckIfImageIsTooDarkCaseException() {\n- Assert.assertEquals(ImageUtils.checkIfImageIsTooDark(\"\")\n- , ImageUtils.IMAGE_OK)\n+ Assert.assertEquals(ImageUtils.checkIfImageIsTooDark(\"\"), ImageUtils.IMAGE_OK)\n }\n \n // Refer: testCheckIfImageIsTooDarkCaseException()\n @Test\n fun testCheckIfProperImageIsTooDark() {\n- Assert.assertEquals(ImageUtils.checkIfImageIsTooDark(\"src/test/resources/ImageTest/ok1.jpg\")\n- , ImageUtils.IMAGE_OK)\n- Assert.assertEquals(ImageUtils.checkIfImageIsTooDark(\"src/test/resources/ImageTest/ok2.jpg\")\n- , ImageUtils.IMAGE_OK)\n- Assert.assertEquals(ImageUtils.checkIfImageIsTooDark(\"src/test/resources/ImageTest/ok3.jpg\")\n- , ImageUtils.IMAGE_OK)\n- Assert.assertEquals(ImageUtils.checkIfImageIsTooDark(\"src/test/resources/ImageTest/ok4.jpg\")\n- , ImageUtils.IMAGE_OK)\n+ Assert.assertEquals(ImageUtils.checkIfImageIsTooDark(\"src/test/resources/ImageTest/ok1.jpg\"), ImageUtils.IMAGE_OK)\n+ Assert.assertEquals(ImageUtils.checkIfImageIsTooDark(\"src/test/resources/ImageTest/ok2.jpg\"), ImageUtils.IMAGE_OK)\n+ Assert.assertEquals(ImageUtils.checkIfImageIsTooDark(\"src/test/resources/ImageTest/ok3.jpg\"), ImageUtils.IMAGE_OK)\n+ Assert.assertEquals(ImageUtils.checkIfImageIsTooDark(\"src/test/resources/ImageTest/ok4.jpg\"), ImageUtils.IMAGE_OK)\n }\n \n // Refer: testCheckIfImageIsTooDarkCaseException()\n @Test\n fun testCheckIfDarkImageIsTooDark() {\n- Assert.assertEquals(ImageUtils.checkIfImageIsTooDark(\"src/test/resources/ImageTest/dark1.jpg\")\n- , ImageUtils.IMAGE_DARK)\n- Assert.assertEquals(ImageUtils.checkIfImageIsTooDark(\"src/test/resources/ImageTest/dark2.jpg\")\n- , ImageUtils.IMAGE_DARK)\n+ Assert.assertEquals(ImageUtils.checkIfImageIsTooDark(\"src/test/resources/ImageTest/dark1.jpg\"), ImageUtils.IMAGE_DARK)\n+ Assert.assertEquals(ImageUtils.checkIfImageIsTooDark(\"src/test/resources/ImageTest/dark2.jpg\"), ImageUtils.IMAGE_DARK)\n }\n \n @Test\n@@ -100,11 +83,12 @@ class ImageUtilsTest {\n @Test\n fun testSetWallpaper() {\n val mockImageUtils = mock(ImageUtils::class.java)\n- val method: Method = ImageUtils::class.java.getDeclaredMethod(\n- \"enqueueSetWallpaperWork\",\n- Context::class.java,\n- Uri::class.java\n- )\n+ val method: Method =\n+ ImageUtils::class.java.getDeclaredMethod(\n+ \"enqueueSetWallpaperWork\",\n+ Context::class.java,\n+ Uri::class.java,\n+ )\n method.isAccessible = true\n \n method.invoke(mockImageUtils, context, imageUri)\n@@ -113,10 +97,11 @@ class ImageUtilsTest {\n @Test\n fun testShowSettingAvatarProgressBar() {\n val mockImageUtils = mock(ImageUtils::class.java)\n- val method: Method = ImageUtils::class.java.getDeclaredMethod(\n- \"showSettingAvatarProgressBar\",\n- Context::class.java\n- )\n+ val method: Method =\n+ ImageUtils::class.java.getDeclaredMethod(\n+ \"showSettingAvatarProgressBar\",\n+ Context::class.java,\n+ )\n method.isAccessible = true\n method.invoke(mockImageUtils, context)\n }\n@@ -163,7 +148,7 @@ class ImageUtilsTest {\n \"\",\n \"\",\n okHttpJsonApiClient,\n- compositeDisposable\n+ compositeDisposable,\n )\n }\n \n@@ -172,8 +157,9 @@ class ImageUtilsTest {\n Assert.assertEquals(\n ImageUtils.checkImageGeolocationIsDifferent(\n \"test\",\n- null\n- ), false\n+ null,\n+ ),\n+ false,\n )\n }\n \n@@ -182,18 +168,20 @@ class ImageUtilsTest {\n Assert.assertEquals(\n ImageUtils.checkImageGeolocationIsDifferent(\n \"0.0|0.0\",\n- LatLng(0.0, 0.0, 0f)\n- ), false\n+ LatLng(0.0, 0.0, 0f),\n+ ),\n+ false,\n )\n }\n \n @Test\n fun testCheckIfImageIsDark() {\n val mockImageUtils = mock(ImageUtils::class.java)\n- val method: Method = ImageUtils::class.java.getDeclaredMethod(\n- \"checkIfImageIsDark\",\n- Bitmap::class.java\n- )\n+ val method: Method =\n+ ImageUtils::class.java.getDeclaredMethod(\n+ \"checkIfImageIsDark\",\n+ Bitmap::class.java,\n+ )\n method.isAccessible = true\n method.invoke(mockImageUtils, null)\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/utils/LengthUtilsTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/utils/LengthUtilsTest.kt\nindex 23ea105ea8..ce2f6eacbe 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/utils/LengthUtilsTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/utils/LengthUtilsTest.kt\n@@ -131,17 +131,28 @@ class LengthUtilsTest {\n \n // Test assertion helper functions\n \n- private fun assertFormattedDistanceBetween(expected: String, pointA: LatLng, pointB: LatLng) =\n- assertEquals(expected, LengthUtils.formatDistanceBetween(pointA, pointB))\n-\n- private fun assertFormattedDistance(expected: String, distance: Int) =\n- assertEquals(expected, LengthUtils.formatDistance(distance))\n-\n- private fun assertDistanceBetween(expected: Double, pointA: LatLng, pointB: LatLng) =\n- // Acceptable error: 1cm\n- assertEquals(expected, LengthUtils.computeDistanceBetween(pointA, pointB), 0.01)\n-\n- private fun assertBearing(expected: Double, pointA: LatLng, pointB: LatLng) =\n- // Acceptable error: 1 degree\n- assertEquals(expected, LengthUtils.computeBearing(pointA,pointB), 1.0)\n-}\n\\ No newline at end of file\n+ private fun assertFormattedDistanceBetween(\n+ expected: String,\n+ pointA: LatLng,\n+ pointB: LatLng,\n+ ) = assertEquals(expected, LengthUtils.formatDistanceBetween(pointA, pointB))\n+\n+ private fun assertFormattedDistance(\n+ expected: String,\n+ distance: Int,\n+ ) = assertEquals(expected, LengthUtils.formatDistance(distance))\n+\n+ private fun assertDistanceBetween(\n+ expected: Double,\n+ pointA: LatLng,\n+ pointB: LatLng,\n+ ) = // Acceptable error: 1cm\n+ assertEquals(expected, LengthUtils.computeDistanceBetween(pointA, pointB), 0.01)\n+\n+ private fun assertBearing(\n+ expected: Double,\n+ pointA: LatLng,\n+ pointB: LatLng,\n+ ) = // Acceptable error: 1 degree\n+ assertEquals(expected, LengthUtils.computeBearing(pointA, pointB), 1.0)\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/utils/LocationUtilsTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/utils/LocationUtilsTest.kt\nindex 316abd3c9e..1b3980a0b0 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/utils/LocationUtilsTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/utils/LocationUtilsTest.kt\n@@ -1,6 +1,5 @@\n package fr.free.nrw.commons.utils\n \n-import fr.free.nrw.commons.location.LatLng\n import org.junit.Test\n import org.junit.jupiter.api.Assertions.assertEquals\n \n@@ -8,7 +7,6 @@ import org.junit.jupiter.api.Assertions.assertEquals\n * Test class for location utils\n */\n class LocationUtilsTest {\n-\n @Test\n fun testCalculateDistance() {\n val lat1 = 37.7749\n@@ -22,5 +20,4 @@ class LocationUtilsTest {\n \n assertEquals(expectedDistance, actualDistance, 0.2) // Tolerance = 0.2 km\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/utils/PagedListMock.kt b/app/src/test/kotlin/fr/free/nrw/commons/utils/PagedListMock.kt\nindex 39f8f88995..633ee39641 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/utils/PagedListMock.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/utils/PagedListMock.kt\n@@ -1,6 +1,5 @@\n package fr.free.nrw.commons.utils\n \n-\n import android.database.Cursor\n import androidx.lifecycle.LiveData\n import androidx.paging.DataSource\n@@ -14,15 +13,17 @@ import com.nhaarman.mockitokotlin2.whenever\n import org.mockito.Mockito.mock\n \n fun List.asPagedList(config: PagedList.Config? = null): LiveData> {\n- val defaultConfig = PagedList.Config.Builder()\n- .setEnablePlaceholders(false)\n- .setPageSize(size)\n- .setMaxSize(size + 2)\n- .setPrefetchDistance(1)\n- .build()\n+ val defaultConfig =\n+ PagedList.Config\n+ .Builder()\n+ .setEnablePlaceholders(false)\n+ .setPageSize(size)\n+ .setMaxSize(size + 2)\n+ .setPrefetchDistance(1)\n+ .build()\n return LivePagedListBuilder(\n createMockDataSourceFactory(this),\n- config ?: defaultConfig\n+ config ?: defaultConfig,\n ).build()\n }\n \n@@ -38,39 +39,48 @@ fun createMockDataSourceFactory(itemList: List): DataSource.Factory(private val itemList: List) :\n- LimitOffsetDataSource(mockDb(), mockQuery(), false, \"\") {\n- override fun convertRows(cursor: Cursor): MutableList {\n- return itemList.toMutableList()\n- }\n+class MockLimitDataSource(\n+ private val itemList: List,\n+) : LimitOffsetDataSource(mockDb(), mockQuery(), false, \"\") {\n+ override fun convertRows(cursor: Cursor): MutableList = itemList.toMutableList()\n+\n override fun countItems(): Int = itemList.count()\n+\n override fun isInvalid(): Boolean = false\n- override fun loadRange(params: LoadRangeParams, callback: LoadRangeCallback) {\n- }\n \n- override fun loadRange(startPosition: Int, loadCount: Int): MutableList {\n- return itemList.subList(startPosition, startPosition + loadCount).toMutableList()\n+ override fun loadRange(\n+ params: LoadRangeParams,\n+ callback: LoadRangeCallback,\n+ ) {\n }\n \n- override fun loadInitial(params: LoadInitialParams, callback: LoadInitialCallback) {\n+ override fun loadRange(\n+ startPosition: Int,\n+ loadCount: Int,\n+ ): MutableList = itemList.subList(startPosition, startPosition + loadCount).toMutableList()\n+\n+ override fun loadInitial(\n+ params: LoadInitialParams,\n+ callback: LoadInitialCallback,\n+ ) {\n callback.onResult(itemList, 0)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/utils/StringSortingUtilsTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/utils/StringSortingUtilsTest.kt\nindex 7bdee0c2e9..37a7906ba0 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/utils/StringSortingUtilsTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/utils/StringSortingUtilsTest.kt\n@@ -7,21 +7,24 @@ import org.junit.Test\n import java.util.Collections.sort\n \n class StringSortingUtilsTest {\n-\n @Test\n fun testSortingNumbersBySimilarity() {\n- val actualList = listOf(\n- CategoryItem(\"1234567\", \"\", \"\", false),\n- CategoryItem(\"4567\", \"\", \"\", false),\n- CategoryItem(\"12345\", \"\", \"\", false),\n- CategoryItem(\"123\", \"\", \"\", false),\n- CategoryItem(\"1234\", \"\", \"\", false))\n- val expectedList = listOf(\n- CategoryItem(\"1234\", \"\", \"\", false),\n- CategoryItem(\"12345\", \"\", \"\", false),\n- CategoryItem(\"123\", \"\", \"\", false),\n- CategoryItem(\"1234567\", \"\", \"\", false),\n- CategoryItem(\"4567\", \"\", \"\", false))\n+ val actualList =\n+ listOf(\n+ CategoryItem(\"1234567\", \"\", \"\", false),\n+ CategoryItem(\"4567\", \"\", \"\", false),\n+ CategoryItem(\"12345\", \"\", \"\", false),\n+ CategoryItem(\"123\", \"\", \"\", false),\n+ CategoryItem(\"1234\", \"\", \"\", false),\n+ )\n+ val expectedList =\n+ listOf(\n+ CategoryItem(\"1234\", \"\", \"\", false),\n+ CategoryItem(\"12345\", \"\", \"\", false),\n+ CategoryItem(\"123\", \"\", \"\", false),\n+ CategoryItem(\"1234567\", \"\", \"\", false),\n+ CategoryItem(\"4567\", \"\", \"\", false),\n+ )\n \n sort(actualList, sortBySimilarity(\"1234\"))\n \n@@ -30,24 +33,26 @@ class StringSortingUtilsTest {\n \n @Test\n fun testSortingTextBySimilarity() {\n- val actualList = listOf(\n- CategoryItem(\"The quick brown fox\", \"\", \"\", false),\n- CategoryItem(\"quick brown fox\", \"\", \"\", false),\n- CategoryItem(\"The\", \"\", \"\", false),\n- CategoryItem(\"The quick \", \"\", \"\", false),\n- CategoryItem(\"The fox\", \"\", \"\", false),\n- CategoryItem(\"brown fox\", \"\", \"\", false),\n- CategoryItem(\"fox\", \"\", \"\", false)\n- )\n- val expectedList = listOf(\n- CategoryItem(\"The\", \"\", \"\", false),\n- CategoryItem(\"The fox\", \"\", \"\", false),\n- CategoryItem(\"The quick \", \"\", \"\", false),\n- CategoryItem(\"The quick brown fox\", \"\", \"\", false),\n- CategoryItem(\"quick brown fox\", \"\", \"\", false),\n- CategoryItem(\"brown fox\", \"\", \"\", false),\n- CategoryItem(\"fox\", \"\", \"\", false)\n- )\n+ val actualList =\n+ listOf(\n+ CategoryItem(\"The quick brown fox\", \"\", \"\", false),\n+ CategoryItem(\"quick brown fox\", \"\", \"\", false),\n+ CategoryItem(\"The\", \"\", \"\", false),\n+ CategoryItem(\"The quick \", \"\", \"\", false),\n+ CategoryItem(\"The fox\", \"\", \"\", false),\n+ CategoryItem(\"brown fox\", \"\", \"\", false),\n+ CategoryItem(\"fox\", \"\", \"\", false),\n+ )\n+ val expectedList =\n+ listOf(\n+ CategoryItem(\"The\", \"\", \"\", false),\n+ CategoryItem(\"The fox\", \"\", \"\", false),\n+ CategoryItem(\"The quick \", \"\", \"\", false),\n+ CategoryItem(\"The quick brown fox\", \"\", \"\", false),\n+ CategoryItem(\"quick brown fox\", \"\", \"\", false),\n+ CategoryItem(\"brown fox\", \"\", \"\", false),\n+ CategoryItem(\"fox\", \"\", \"\", false),\n+ )\n \n sort(actualList, sortBySimilarity(\"The\"))\n \n@@ -56,20 +61,22 @@ class StringSortingUtilsTest {\n \n @Test\n fun testSortingSymbolsBySimilarity() {\n- val actualList = listOf(\n- CategoryItem(\"$$$$$\", \"\", \"\", false),\n- CategoryItem(\"****\", \"\", \"\", false),\n- CategoryItem(\"**$*\", \"\", \"\", false),\n- CategoryItem(\"*$*$\", \"\", \"\", false),\n- CategoryItem(\".*$\", \"\", \"\", false)\n- )\n- val expectedList = listOf(\n- CategoryItem(\"**$*\", \"\", \"\", false),\n- CategoryItem(\"*$*$\", \"\", \"\", false),\n- CategoryItem(\".*$\", \"\", \"\", false),\n- CategoryItem(\"****\", \"\", \"\", false),\n- CategoryItem(\"$$$$$\", \"\", \"\", false)\n- )\n+ val actualList =\n+ listOf(\n+ CategoryItem(\"$$$$$\", \"\", \"\", false),\n+ CategoryItem(\"****\", \"\", \"\", false),\n+ CategoryItem(\"**$*\", \"\", \"\", false),\n+ CategoryItem(\"*$*$\", \"\", \"\", false),\n+ CategoryItem(\".*$\", \"\", \"\", false),\n+ )\n+ val expectedList =\n+ listOf(\n+ CategoryItem(\"**$*\", \"\", \"\", false),\n+ CategoryItem(\"*$*$\", \"\", \"\", false),\n+ CategoryItem(\".*$\", \"\", \"\", false),\n+ CategoryItem(\"****\", \"\", \"\", false),\n+ CategoryItem(\"$$$$$\", \"\", \"\", false),\n+ )\n \n sort(actualList, sortBySimilarity(\"**$\"))\n \n@@ -79,27 +86,29 @@ class StringSortingUtilsTest {\n @Test\n fun testSortingMixedStringsBySimilarity() {\n // Sample from Category:2018 Android phones\n- val actualList = listOf(\n- CategoryItem(\"ASUS ZenFone 5 (2018)\", \"\", \"\", false),\n- CategoryItem(\"Google Pixel 3\", \"\", \"\", false),\n- CategoryItem(\"HTC U12\", \"\", \"\", false),\n- CategoryItem(\"Huawei P20\", \"\", \"\", false),\n- CategoryItem(\"LG G7 ThinQ\", \"\", \"\", false),\n- CategoryItem(\"Samsung Galaxy A8 (2018)\", \"\", \"\", false),\n- CategoryItem(\"Samsung Galaxy S9\", \"\", \"\", false),\n+ val actualList =\n+ listOf(\n+ CategoryItem(\"ASUS ZenFone 5 (2018)\", \"\", \"\", false),\n+ CategoryItem(\"Google Pixel 3\", \"\", \"\", false),\n+ CategoryItem(\"HTC U12\", \"\", \"\", false),\n+ CategoryItem(\"Huawei P20\", \"\", \"\", false),\n+ CategoryItem(\"LG G7 ThinQ\", \"\", \"\", false),\n+ CategoryItem(\"Samsung Galaxy A8 (2018)\", \"\", \"\", false),\n+ CategoryItem(\"Samsung Galaxy S9\", \"\", \"\", false),\n // One with more complicated symbols\n- CategoryItem(\"MadeUpPhone 2018.$\u00a3#\u4f60\u597d\", \"\", \"\", false)\n- )\n- val expectedList = listOf(\n- CategoryItem(\"Samsung Galaxy S9\", \"\", \"\", false),\n- CategoryItem(\"ASUS ZenFone 5 (2018)\", \"\", \"\", false),\n- CategoryItem(\"Samsung Galaxy A8 (2018)\", \"\", \"\", false),\n- CategoryItem(\"Google Pixel 3\", \"\", \"\", false),\n- CategoryItem(\"HTC U12\", \"\", \"\", false),\n- CategoryItem(\"Huawei P20\", \"\", \"\", false),\n- CategoryItem(\"LG G7 ThinQ\", \"\", \"\", false),\n- CategoryItem(\"MadeUpPhone 2018.$\u00a3#\u4f60\u597d\", \"\", \"\", false)\n- )\n+ CategoryItem(\"MadeUpPhone 2018.$\u00a3#\u4f60\u597d\", \"\", \"\", false),\n+ )\n+ val expectedList =\n+ listOf(\n+ CategoryItem(\"Samsung Galaxy S9\", \"\", \"\", false),\n+ CategoryItem(\"ASUS ZenFone 5 (2018)\", \"\", \"\", false),\n+ CategoryItem(\"Samsung Galaxy A8 (2018)\", \"\", \"\", false),\n+ CategoryItem(\"Google Pixel 3\", \"\", \"\", false),\n+ CategoryItem(\"HTC U12\", \"\", \"\", false),\n+ CategoryItem(\"Huawei P20\", \"\", \"\", false),\n+ CategoryItem(\"LG G7 ThinQ\", \"\", \"\", false),\n+ CategoryItem(\"MadeUpPhone 2018.$\u00a3#\u4f60\u597d\", \"\", \"\", false),\n+ )\n \n sort(actualList, sortBySimilarity(\"S9\"))\n \n@@ -108,31 +117,33 @@ class StringSortingUtilsTest {\n \n @Test\n fun testSortingWithEmptyStrings() {\n- val actualList = listOf(\n- CategoryItem(\"brown fox\", \"\", \"\", false),\n- CategoryItem(\"\", \"\", \"\", false),\n- CategoryItem(\"quick brown fox\", \"\", \"\", false),\n- CategoryItem(\"the\", \"\", \"\", false),\n- CategoryItem(\"\", \"\", \"\", false),\n- CategoryItem(\"the fox\", \"\", \"\", false),\n- CategoryItem(\"fox\", \"\", \"\", false),\n- CategoryItem(\"\", \"\", \"\", false),\n- CategoryItem(\"\", \"\", \"\", false)\n- )\n- val expectedList = listOf(\n- CategoryItem(\"the fox\", \"\", \"\", false),\n- CategoryItem(\"brown fox\", \"\", \"\", false),\n- CategoryItem(\"the\", \"\", \"\", false),\n- CategoryItem(\"fox\", \"\", \"\", false),\n- CategoryItem(\"quick brown fox\", \"\", \"\", false),\n- CategoryItem(\"\", \"\", \"\", false),\n- CategoryItem(\"\", \"\", \"\", false),\n- CategoryItem(\"\", \"\", \"\", false),\n- CategoryItem(\"\", \"\", \"\", false)\n- )\n+ val actualList =\n+ listOf(\n+ CategoryItem(\"brown fox\", \"\", \"\", false),\n+ CategoryItem(\"\", \"\", \"\", false),\n+ CategoryItem(\"quick brown fox\", \"\", \"\", false),\n+ CategoryItem(\"the\", \"\", \"\", false),\n+ CategoryItem(\"\", \"\", \"\", false),\n+ CategoryItem(\"the fox\", \"\", \"\", false),\n+ CategoryItem(\"fox\", \"\", \"\", false),\n+ CategoryItem(\"\", \"\", \"\", false),\n+ CategoryItem(\"\", \"\", \"\", false),\n+ )\n+ val expectedList =\n+ listOf(\n+ CategoryItem(\"the fox\", \"\", \"\", false),\n+ CategoryItem(\"brown fox\", \"\", \"\", false),\n+ CategoryItem(\"the\", \"\", \"\", false),\n+ CategoryItem(\"fox\", \"\", \"\", false),\n+ CategoryItem(\"quick brown fox\", \"\", \"\", false),\n+ CategoryItem(\"\", \"\", \"\", false),\n+ CategoryItem(\"\", \"\", \"\", false),\n+ CategoryItem(\"\", \"\", \"\", false),\n+ CategoryItem(\"\", \"\", \"\", false),\n+ )\n \n sort(actualList, sortBySimilarity(\"the fox\"))\n \n assertEquals(expectedList, actualList)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/utils/UtilsFixExtensionTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/utils/UtilsFixExtensionTest.kt\nindex 8f0dc8a80a..24e9b233aa 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/utils/UtilsFixExtensionTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/utils/UtilsFixExtensionTest.kt\n@@ -5,7 +5,6 @@ import org.junit.Assert.assertEquals\n import org.junit.Test\n \n class UtilsFixExtensionTest {\n-\n @Test\n fun jpegResultsInJpg() {\n assertEquals(\"SampleFile.jpg\", fixExtension(\"SampleFile.jpeg\", \"jpeg\"))\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/widget/HeightLimitedRecyclerViewUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/widget/HeightLimitedRecyclerViewUnitTests.kt\nindex adc94605e2..115848e55a 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/widget/HeightLimitedRecyclerViewUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/widget/HeightLimitedRecyclerViewUnitTests.kt\n@@ -15,12 +15,10 @@ import java.lang.reflect.Method\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class HeightLimitedRecyclerViewUnitTests {\n-\n private lateinit var activityController: ActivityController\n private lateinit var activity: Activity\n private lateinit var recyclerView: HeightLimitedRecyclerView\n \n-\n @Before\n fun setUp() {\n activityController = Robolectric.buildActivity(Activity::class.java)\n@@ -40,13 +38,13 @@ class HeightLimitedRecyclerViewUnitTests {\n @Test\n @Throws(Exception::class)\n fun testOnMeasure() {\n- val method: Method = HeightLimitedRecyclerView::class.java.getDeclaredMethod(\n- \"onMeasure\",\n- Int::class.java,\n- Int::class.java\n- )\n+ val method: Method =\n+ HeightLimitedRecyclerView::class.java.getDeclaredMethod(\n+ \"onMeasure\",\n+ Int::class.java,\n+ Int::class.java,\n+ )\n method.isAccessible = true\n method.invoke(recyclerView, 0, 0)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/widget/PicOfDayAppWidgetUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/widget/PicOfDayAppWidgetUnitTests.kt\nindex 1547c313b3..623bd2affe 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/widget/PicOfDayAppWidgetUnitTests.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/widget/PicOfDayAppWidgetUnitTests.kt\n@@ -28,7 +28,6 @@ import java.lang.reflect.Method\n @RunWith(RobolectricTestRunner::class)\n @Config(sdk = [21], application = TestCommonsApplication::class)\n class PicOfDayAppWidgetUnitTests {\n-\n private lateinit var widget: PicOfDayAppWidget\n private lateinit var context: Context\n \n@@ -83,14 +82,15 @@ class PicOfDayAppWidgetUnitTests {\n @Test\n @Throws(Exception::class)\n fun testLoadImageFromUrl() {\n- val method: Method = PicOfDayAppWidget::class.java.getDeclaredMethod(\n- \"loadImageFromUrl\",\n- String::class.java,\n- Context::class.java,\n- RemoteViews::class.java,\n- AppWidgetManager::class.java,\n- Int::class.java\n- )\n+ val method: Method =\n+ PicOfDayAppWidget::class.java.getDeclaredMethod(\n+ \"loadImageFromUrl\",\n+ String::class.java,\n+ Context::class.java,\n+ RemoteViews::class.java,\n+ AppWidgetManager::class.java,\n+ Int::class.java,\n+ )\n method.isAccessible = true\n method.invoke(widget, \"\", context, views, appWidgetManager, 1)\n }\n@@ -99,15 +99,15 @@ class PicOfDayAppWidgetUnitTests {\n @Throws(Exception::class)\n fun testLoadPictureOfTheDay() {\n `when`(mediaClient.getPictureOfTheDay()).thenReturn(Single.just(Media()))\n- val method: Method = PicOfDayAppWidget::class.java.getDeclaredMethod(\n- \"loadPictureOfTheDay\",\n- Context::class.java,\n- RemoteViews::class.java,\n- AppWidgetManager::class.java,\n- Int::class.java\n- )\n+ val method: Method =\n+ PicOfDayAppWidget::class.java.getDeclaredMethod(\n+ \"loadPictureOfTheDay\",\n+ Context::class.java,\n+ RemoteViews::class.java,\n+ AppWidgetManager::class.java,\n+ Int::class.java,\n+ )\n method.isAccessible = true\n method.invoke(widget, context, views, appWidgetManager, 1)\n }\n-\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikiBaseClientUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikiBaseClientUnitTest.kt\nindex 6aa97ee6f4..a2f3d10fbf 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikiBaseClientUnitTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikiBaseClientUnitTest.kt\n@@ -13,12 +13,10 @@ import junit.framework.TestCase.assertEquals\n import junit.framework.TestCase.assertSame\n import junit.framework.TestCase.assertTrue\n import org.junit.Before\n-import org.junit.Ignore\n import org.junit.Test\n import org.mockito.Mockito.mock\n \n class WikiBaseClientUnitTest {\n-\n private val csrfTokenClient: CsrfTokenClient = mock()\n private val wikiBaseInterface: WikiBaseInterface = mock()\n private val wikiBaseClient = WikiBaseClient(wikiBaseInterface, csrfTokenClient)\n@@ -74,12 +72,17 @@ class WikiBaseClientUnitTest {\n @Test\n fun addLabelstoWikidata() {\n val mwPostResponse = mock()\n- whenever(wikiBaseInterface.addLabelstoWikidata(\n- \"M123\", \"test\", \"en\", \"caption\"\n- )).thenReturn(Observable.just(mwPostResponse))\n+ whenever(\n+ wikiBaseInterface.addLabelstoWikidata(\n+ \"M123\",\n+ \"test\",\n+ \"en\",\n+ \"caption\",\n+ ),\n+ ).thenReturn(Observable.just(mwPostResponse))\n \n val result = wikiBaseClient.addLabelsToWikidata(123L, \"en\", \"caption\").blockingFirst()\n \n assertSame(mwPostResponse, result)\n }\n-}\n\\ No newline at end of file\n+}\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataClientTest.kt\nindex 038fe30845..3223011447 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataClientTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataClientTest.kt\n@@ -3,7 +3,10 @@ package fr.free.nrw.commons.wikidata\n import com.google.gson.Gson\n import com.nhaarman.mockitokotlin2.whenever\n import fr.free.nrw.commons.wikidata.model.PageInfo\n+import fr.free.nrw.commons.wikidata.model.StatementPartial\n import fr.free.nrw.commons.wikidata.model.WbCreateClaimResponse\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n+import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult\n import io.reactivex.Observable\n import org.junit.Before\n import org.junit.Test\n@@ -11,16 +14,11 @@ import org.mockito.ArgumentMatchers.any\n import org.mockito.ArgumentMatchers.anyString\n import org.mockito.InjectMocks\n import org.mockito.Mock\n-import org.mockito.Mockito.`when`\n import org.mockito.Mockito.mock\n+import org.mockito.Mockito.`when`\n import org.mockito.MockitoAnnotations\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse\n-import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult\n-import fr.free.nrw.commons.wikidata.model.Statement_partial\n-import org.junit.Ignore\n \n class WikidataClientTest {\n-\n @Mock\n internal var wikidataInterface: WikidataInterface? = null\n \n@@ -50,10 +48,13 @@ class WikidataClientTest {\n whenever(response.pageinfo).thenReturn(pageInfo)\n `when`(wikidataInterface!!.postSetClaim(anyString(), anyString(), anyString()))\n .thenReturn(Observable.just(response))\n- whenever(gson!!.toJson(any(Statement_partial::class.java))).thenReturn(\"claim\")\n- val request = mock(Statement_partial::class.java)\n-\n- val claim = wikidataClient!!.setClaim(request, \"test\").test()\n- .assertValue(1L)\n+ whenever(gson!!.toJson(any(StatementPartial::class.java))).thenReturn(\"claim\")\n+ val request = mock(StatementPartial::class.java)\n+\n+ val claim =\n+ wikidataClient!!\n+ .setClaim(request, \"test\")\n+ .test()\n+ .assertValue(1L)\n }\n }\ndiff --git a/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataEditServiceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataEditServiceTest.kt\nindex 3530574350..c22195c7c6 100644\n--- a/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataEditServiceTest.kt\n+++ b/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataEditServiceTest.kt\n@@ -55,11 +55,17 @@ class WikidataEditServiceTest {\n fun testUpdateDepictsProperty() {\n val fileEntityId = \"12345\"\n \n- whenever(wikibaseClient.getClaimIdsByProperty(\"M\" + fileEntityId,\n- WikidataProperties.DEPICTS.propertyName))\n- .thenReturn(Observable.just(emptyList()))\n- whenever(wikibaseClient.postDeleteClaims(\"M\" + fileEntityId,\n- gson.toJson(Mockito.mock(RemoveClaim::class.java)))\n+ whenever(\n+ wikibaseClient.getClaimIdsByProperty(\n+ \"M\" + fileEntityId,\n+ WikidataProperties.DEPICTS.propertyName,\n+ ),\n+ ).thenReturn(Observable.just(emptyList()))\n+ whenever(\n+ wikibaseClient.postDeleteClaims(\n+ \"M\" + fileEntityId,\n+ gson.toJson(Mockito.mock(RemoveClaim::class.java)),\n+ ),\n ).thenReturn(Observable.just(true))\n \n wikidataEditService.updateDepictsProperty(fileEntityId, listOf())\n@@ -78,7 +84,7 @@ class WikidataEditServiceTest {\n wikidataEditService.createClaim(\n wikidataPlace,\n uploadResult.filename,\n- hashMapOf()\n+ hashMapOf(),\n )\n }\n }\n", "n2p_tests": "{\"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.createTable\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.utils.LengthUtilsTest.testBearingRandomPoints\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewActivityTest.testShowReviewImageInfo\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v13_to_v14\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is not null and item is selected and media does not contains category\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsActivityUnitTests.testOnOptionsItemSelectedCaseHome\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.WelcomeActivityUnitTest.testOnDestroy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.ImageFragmentTest.testHandleResult\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionViewHolderUnitTests.testInitCaseImageSource_LocalUri\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.checkActivityNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test buildCategories when it returns empty list\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v11_to_v12\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.notification.NotificationClientTest.markNotificationAsReadTest\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.AccountUtilUnitTest.testAccountWithException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.saveExistingQuery\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.cursorsAreClosedAfterUse\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testHideProgress\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewActivityTest.testOnCreateOptionsMenu\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v5_to_v6\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v14_to_v15\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.place constructor uses place name and longDescription\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.ImageFragmentTest.testRefresh\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is null and item is not selected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewActivityTest.testOnSupportNavigateUp\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testSetContentView\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.migrateTableVersionFrom_v5_to_v6\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.recentSearchesReturnsLessThanLimit\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.WikiAccountAuthenticatorUnitTest.testAddAccountCaseSupportedType\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testShowPasswordResetPrompt\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testSignUp\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.ZoomableActivityUnitTests.testOnRightSwiped\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnNextButtonClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.ImageFragmentTest.testOnAttach\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.utils.LengthUtilsTest.testBearingSamePlace\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.name and description get user language label\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testSkipLogin\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadClientTest.uploadFileToStash_returnsFailureIfAnyChunkFails\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.WikiAccountAuthenticatorUnitTest.testGetAuthTokenLabelCaseNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.ZoomableActivityUnitTests.testOnLeftSwiped\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.WikiAccountAuthenticatorServiceUnitTest.checkNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadClientTest.testUploadFileFromStash_WithError\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadClientTest.testUploadFileFromStash_Failure\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v19_to_v19\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.updateNewItemBookmark\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.ImageFragmentTest.testOnResume\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v18_to_v19\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.ImageProcessingServiceTest.validateImageForWrongGeoLocation\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v16_to_v17\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.LatLngTests.testNorthPole\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.image is empty with no image statement\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.WikiAccountAuthenticatorUnitTest.testGetAuthToken\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.migrateTableVersionFrom_v4_to_v5\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v6_to_v7\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is null and item is selected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.LatLngTests.testSouthPole\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewHelperTest.getFirstRevisionOfFile\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionViewHolderUnitTests.testInitCaseImageSource_HttpURL\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnEditorActionCaseDefault\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.testGetCategoriesByName\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.csrf.CsrfTokenClientTest.testRequestResponseFailure\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.utils.LengthUtilsTest.testFormattedOneDegreeFortyFiveDegrees\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.createFromCursor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.searchAll with empty search terms creates results from gps, title search & recents\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewImageFragmentTest.testOnGetReviewCallback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewActivityTest.testSwipeToNext\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testAskUserForTwoFactorAuth\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testIsWLMUpload\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionViewHolderUnitTests.testDisplayWikipediaButton\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v8_to_v9\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewHelperTest.testReviewStatus\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.if names are equal is Equal\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionViewHolderUnitTests.testInitCaseNonNull_STATE_QUEUED\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testHandleNullMedia\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.utils.LengthUtilsTest.testDistanceOneDegreeSouthPole\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewImageFragmentTest.testOnEnableButton\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.utils.LengthUtilsTest.testDistanceBetweenSamePoints\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.migrateTableVersionFrom_v7_to_v8\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewHelperTest.getRandomMedia\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testReceiveInternalSharedItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadClientTest.testUploadChunkToStash_Success\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadClientTest.uploadFileToStash_returnsFailureIfNothingToUpload\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.LatLngTests.testRoundingAgain\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewActivityTest.testSetUpMediaDetailOnOrientation\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsFragmentUnitTest.testInitNonEmpty\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionViewHolderUnitTests.testImageClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testShowProgressCaseTrue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.WikiAccountAuthenticatorUnitTest.testEditProperties\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.hashCode returns same values for objects with same name\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionViewHolderUnitTests.checkNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.media.PageableMediaDataSourceTest.loadFunction invokes mediaClient and has Label\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnNextButtonClickedCaseFalse\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionViewHolderUnitTests.testInitCaseNonNull_STATE_FAILED\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.updateExistingItemBookmark\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.findExistingItemBookmark\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnResume\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.whenTheresNoDataFindReturnsNull_emptyCursor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.PagingDataSourceFactoryTest.create returns a dataSource\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnBackPressed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.commonsCategory is empty with no values\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewActivityTest.checkActivityNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.recentSearchesHonorsLimit\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionViewHolderUnitTests.testInitCaseNonNull_STATE_COMPLETED\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.instancesOf is empty with no values\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.WikiAccountAuthenticatorUnitTest.testConfirmCredentials\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionViewHolderUnitTests.testInitCaseImageSource_NULL\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v9_to_v10\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.AccountUtilUnitTest.testAccount\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testGetMenuInflater\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.ImageProcessingServiceTest.validateImageForDarkImage\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.getAllItemsBookmarksTranslatesExceptions\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadClientTest.uploadFileToStash_successWithOneChunk\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.testGetSelectedExistingCategories\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnStart\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionViewHolderUnitTests.testInitCaseNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testMakeUploadRequest\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.csrf.CsrfTokenClientTest.testRequestSuccess\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v4_to_v5\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadClientTest.testUploadChunkToStash_Failure\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.ImageProcessingServiceTest.validateImageForKeepImage\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.findNotExistingItemBookmarkReturnsNull_emptyCursor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnUploadMediaDeleted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.cursorsAreClosedAfterFindItemBookmarkQuery\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.migrateTableVersionFrom_v6_to_v7\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.utils.LengthUtilsTest.testDistancePoleToPole\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.notification.NotificationControllerTest.testGetNotifications\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewHelperTest.getRandomMediaWithWithOneMediaNominatedForDeletion\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testPerformLogin\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsFragmentUnitTest.testOnCreateView\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnResume\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewImageFragmentTest.testOnGetReviewActivity\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.ZoomableActivityUnitTests.checkActivityNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testShowMessage\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.createTable\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.hashCode returns different values for objects with different name\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.AccountUtilUnitTest.checkNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.utils.LengthUtilsTest.testFormattedOneDegreeOnEquator\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.ZoomableActivityUnitTests.testOnBackPressed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.notification.NotificationClientTest.getNotificationTest\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.WikiAccountAuthenticatorUnitTest.testHasFeatures\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.image is not empty with dataValue of ValueString type\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewImageFragmentTest.testOnDisableButton\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testReceiveExternalSharedItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.utils.LengthUtilsTest.testIllegalFormatDistance\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testGetUploadableFiles\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnPostCreate\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.ZoomableActivityUnitTests.testHandleResult\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.WelcomeActivityUnitTest.testFinishTutorial\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.migrateTableVersionFrom_v3_to_v4\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.utils.LengthUtilsTest.testDistanceOneDegreeOnEquator\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewActivityTest.testOnBackPressed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.id is entityId\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.cursorsAreClosedAfterRecentSearchQuery\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.utils.LengthUtilsTest.testFormattedOneDegreeSouthPole\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.getAllItemsBookmarks\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsFragmentUnitTest.checkFragmentNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is not null and item is not selected and media does not contains category\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testShowHideTopCard\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testGetIndexInViewFlipper\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnOptionsItemSelectedCaseDefault\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.WikiAccountAuthenticatorServiceUnitTest.testOnBindCaseNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.MediaDataExtractorTest.fetchMediaDetails\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.findRecentSearchQuery\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnDestroy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v2_to_v3\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnPrivacyPolicyClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.LatLngTests.testZeroZero\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.migrateTableVersionFrom_v2_to_v3\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v15_to_v16\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.ImageProcessingServiceTest.validateImageForOkImage\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.testSetSelectedExistingCategories\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionViewHolderUnitTests.testInitCaseNonNull_STATE_IN_PROGRESS\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.instancesOf maps EntityIds to ids\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.MediaDataExtractorTest.getWikiText\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.getAllItemsBookmarksReturnsEmptyList_nullCursor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.getAllItemsBookmarksReturnsEmptyList_emptyCursor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.different type is not Equal\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.LatLngTests.testLargerNumbers\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.deleteTable\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.ImageFragmentTest.testOnDestroy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.searchAllFoundCaseTest\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testGetIsMultipleFilesSelected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewActivityTest.testSetUpMediaDetailFragment\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.name and descriptions get first language label if user language not present\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsActivityUnitTests.testOnSupportNavigateUp\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewHelperTest.checkFileUsage\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is not null and item is not selected and media contains category\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.checkActivityNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testGetTotalNumberOfSteps\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnActivityResult\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.WelcomeActivityUnitTest.testOnBackPressed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v12_to_v13\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test buildCategories when it returns non empty list\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.ZoomableActivityUnitTests.testOnDownSwiped\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.utils.LengthUtilsTest.testFormattedDistanceBetweenSamePoints\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testReceiveSharedItems\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.ImageFragmentTest.testOnCreateView\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.saveNewQuery\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewActivityTest.testSwipeToLastFragment\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testShowProgressCaseFalse\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.isSelected is false at creation\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsActivityUnitTests.checkActivityNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.AccountUtilUnitTest.testGetUserNameWithException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v7_to_v8\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionViewHolderUnitTests.testWikipediaButtonClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewActivityTest.testOnOptionsItemSelected\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.LatLngTests.testTooBigWestValue\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.WikiAccountAuthenticatorUnitTest.checkNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewActivityTest.testOnDestroy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.deleteTable\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewImageFragmentTest.testOnYesButtonClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.createFromCursor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.MediaLicensePresenterTest.selectLicenseTest\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.same object is Equal\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnDestroy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.utils.LengthUtilsTest.testBearingPoleToPole\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.findItemBookmarkTranslatesExceptions\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.image is empty with dataValue not of ValueString type\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnPreviousButtonClicked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.WikiAccountAuthenticatorUnitTest.testUpdateCredentials\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionViewHolderUnitTests.testCheckIfMediaExistsOnWikipediaPageCaseNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadClientTest.uploadFileToStash_completedContribution\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewActivityTest.testShowSkipImageInfo\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.ImageProcessingServiceTest.validateImageForFileNameExistsWithCheckTitleOn\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testShowSuccessAndDismissDialog\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.utils.LengthUtilsTest.testFormattedNullToNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testIsLoggedIn\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsActivityUnitTests.testOnOptionsItemSelectedCaseDefault\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.ImageFragmentTest.testOnCreate\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewImageFragmentTest.testOnUpdateCategoriesQuestion\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnDestroyWithException\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionViewHolderUnitTests.testChooseImageSource\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.commonsCategory maps ValueString to strings\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.utils.LengthUtilsTest.testFormatDistance\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewImageFragmentTest.testOnSaveInstanceState\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.if names are not equal is not Equal\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.MediaLicensePresenterTest.getLicenseTest\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.name and descriptions get empty if nothing present\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.ZoomableActivityUnitTests.testOnUpSwiped\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v1_to_v2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testStartMainActivity\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v10_to_v11\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.csrf.CsrfTokenClientTest.testRequestResponseApiError\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testResetDirectPrefs\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.settings.SettingsActivityUnitTests.testSetTotalUploadCount\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.structure.depictions.DepictedItemTest.image is empty with null statements\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.ImageProcessingServiceTest.validateImageForDuplicateImage\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testForgotPassword\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.migrateTableVersionFrom_v3_to_v4\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.utils.LengthUtilsTest.testDistanceOneDegreeFortyFiveDegrees\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.AccountUtilUnitTest.testGetUserName\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.WikiAccountAuthenticatorUnitTest.testGetAccountRemovalAllowed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnPostResume\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.whenTheresNoDataFindReturnsNull_nullCursor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.notification.NotificationControllerTest.testMarkNotificationsAsRead\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.LatLngTests.testNegativeNumbers\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.csrf.CsrfTokenClientTest.testRequestResponseMalformed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testOnStop\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.LatLngTests.testRounding\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.findRecentSearchTranslatesExceptions\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnLoginSuccessCaseDefault\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewActivityTest.testFindNonHiddenCategories\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.LatLngTests.testAntipode\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnStop\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.WelcomeActivityUnitTest.checkActivityNotNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testOnLoginSuccess\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.utils.LengthUtilsTest.testFormattedPoleToPole\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.review.ReviewHelperTest.getRandomMediaWithWithAllMediaNominatedForDeletion\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testShowMessageAndCancelDialogRes\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.WikiAccountAuthenticatorUnitTest.testAddAccountCaseNotSupportedType\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadActivityUnitTests.testUpdateTopCardTitle\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.upload.UploadClientTest.testUploadFileFromStash_NoErrors\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.customselector.ui.selector.ImageFragmentTest.testGetSpanCount\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.LoginActivityUnitTests.testShowMessageAndCancelDialog\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.media.ZoomableActivityUnitTests.testOnDestroy\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.findNotExistingItemBookmarkReturnsNull_nullCursor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.contributions.ContributionViewHolderUnitTests.testInitCaseNonNull_STATE_PAUSED\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.auth.WikiAccountAuthenticatorUnitTest.testGetAuthTokenLabelCaseNonNull\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.bookmarks.items.BookmarkItemsDaoTest.cursorsAreClosedAfterGetAllItemsBookmarksQuery\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.explore.recentsearches.RecentSearchesDaoTest.migrateTableVersionFrom_v1_to_v2\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"fr.free.nrw.commons.category.CategoriesModelTest.Test onCategoryItemClicked when media is not null and item is selected and media contains category\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-5622", "org": "element-hq", "repo": "element-x-android", "number": 5622, "state": "closed", "title": "Add ability to forward a media from the media viewer and the gallery", "body": "\r\n \r\n## Content\r\n\r\n\r\nAdd ability to forward a media from the media viewer and the gallery.\r\n\r\nFirst commit extract the forward Node to its own module so that it can be used by other modules in particular `JoinedRoomLoadedFlowNode`. To be able to push a Node to the backstack above the Overlay of the media viewer wew could not use the backstack of the media gallery / the messages node.\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #5454\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\n## Tests\r\n\r\n\r\n\r\n### Case 1\r\n\r\n- From a timelline, click on an image\r\n- click on info (top end icon)\r\n- observe a new \"Forward\" action\r\n- try it, cancel it, etc.\r\n\r\n### Case 2\r\n\r\n- open the room settings from the room list\r\n- open the media gallery\r\n- long click on an item\r\n- observe a new \"Forward\" action\r\n- try it, cancel it, etc.\r\n\r\n### Case 3\r\n\r\n- same than case 2 but open the room setting from a timeline\r\n\r\n### Case 4\r\n\r\n- same than case 2 and 3 but from the gallery open the image first.\r\n- test the new Forward action like on case 1\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 24\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"1aaf363f5f5595cf77729a95a23cafb54efaefd8\"}", "resolved_issues": "[{\"number\": 5454, \"title\": \"[Task] Add the Forward option to the info sheet in Media and Files\", \"body\": \"Please see and discuss the details in the meta issue.\\n\\n[Figma](https://www.figma.com/design/Ni6Ii8YKtmXCKYNE90cC67/Timeline--new-?node-id=1732-80010&t=6BlabuIHijm3tqKP-0)\\n\\nThis sheet is displayed in 2 places\\n- [x] Gallery\\n- [x] Media full screen\\n\"}]", "lang": "kotlin", "problem_statement": "[Task] Add the Forward option to the info sheet in Media and Files\nPlease see and discuss the details in the meta issue.\n\n[Figma](https://www.figma.com/design/Ni6Ii8YKtmXCKYNE90cC67/Timeline--new-?node-id=1732-80010&t=6BlabuIHijm3tqKP-0)\n\nThis sheet is displayed in 2 places\n- [x] Gallery\n- [x] Media full screen\n\n", "hints": NaN, "pull_url": "https://github.com/element-hq/element-x-android/pull/5622", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/5454\"]", "test_command": "./gradlew :libraries:mediaviewer:impl:testDebugUnitTest --tests \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest\" --tests \"io.element.android.libraries.mediaviewer.impl.DefaultMediaViewerEntryPointTest\" --tests \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest\" --tests \"io.element.android.libraries.mediaviewer.impl.details.MediaDetailsBottomSheetTest\" --tests \"io.element.android.libraries.mediaviewer.impl.DefaultMediaGalleryEntryPointTest\" :features:forward:impl:testDebugUnitTest --tests \"io.element.android.features.forward.impl.ForwardMessagesViewTest\" --tests \"io.element.android.features.forward.impl.ForwardMessagesPresenterTest\" --tests \"io.element.android.features.forward.impl.DefaultForwardEntryPointTest\" :features:messages:impl:testDebugUnitTest --tests \"io.element.android.features.messages.impl.DefaultMessagesEntryPointTest\" :features:roomdetails:impl:testDebugUnitTest --tests \"io.element.android.features.roomdetails.impl.DefaultRoomDetailsEntryPointTest\" :appnav:testDebugUnitTest --tests \"io.element.android.appnav.JoinedRoomLoadedFlowNodeTest\"", "fix_patch": "diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt\nindex eb1df5643ef..da09add2dc5 100644\n--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt\n+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt\n@@ -342,10 +342,6 @@ class LoggedInFlowNode(\n backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), serverNames))\n }\n \n- override fun onForwardedToSingleRoom(roomId: RoomId) {\n- sessionCoroutineScope.launch { attachRoom(roomId.toRoomIdOrAlias(), clearBackstack = false) }\n- }\n-\n override fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean) {\n when (data) {\n is PermalinkData.UserLink -> {\n@@ -473,9 +469,8 @@ class LoggedInFlowNode(\n .callback(object : ShareEntryPoint.Callback {\n override fun onDone(roomIds: List) {\n navigateUp()\n- if (roomIds.size == 1) {\n- val targetRoomId = roomIds.first()\n- backstack.push(NavTarget.Room(targetRoomId.toRoomIdOrAlias()))\n+ roomIds.singleOrNull()?.let { roomId ->\n+ backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias()))\n }\n }\n })\ndiff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt\nindex aab9590a9b2..8b0cca900a1 100644\n--- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt\n+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt\n@@ -16,12 +16,14 @@ import com.bumble.appyx.core.modality.BuildContext\n import com.bumble.appyx.core.node.Node\n import com.bumble.appyx.core.plugin.Plugin\n import com.bumble.appyx.navmodel.backstack.BackStack\n+import com.bumble.appyx.navmodel.backstack.operation.pop\n import com.bumble.appyx.navmodel.backstack.operation.push\n import dev.zacsweers.metro.Assisted\n import dev.zacsweers.metro.AssistedInject\n import io.element.android.annotations.ContributesNode\n import io.element.android.appnav.di.RoomGraphFactory\n import io.element.android.appnav.room.RoomNavigationTarget\n+import io.element.android.features.forward.api.ForwardEntryPoint\n import io.element.android.features.messages.api.MessagesEntryPoint\n import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint\n import io.element.android.features.space.api.SpaceEntryPoint\n@@ -41,6 +43,8 @@ import io.element.android.libraries.matrix.api.room.JoinedRoom\n import io.element.android.services.appnavstate.api.ActiveRoomsHolder\n import io.element.android.services.appnavstate.api.AppNavigationStateService\n import kotlinx.coroutines.CoroutineScope\n+import kotlinx.coroutines.flow.MutableStateFlow\n+import kotlinx.coroutines.flow.asStateFlow\n import kotlinx.coroutines.launch\n import kotlinx.parcelize.Parcelize\n import timber.log.Timber\n@@ -53,6 +57,7 @@ class JoinedRoomLoadedFlowNode(\n private val messagesEntryPoint: MessagesEntryPoint,\n private val roomDetailsEntryPoint: RoomDetailsEntryPoint,\n private val spaceEntryPoint: SpaceEntryPoint,\n+ private val forwardEntryPoint: ForwardEntryPoint,\n private val appNavigationStateService: AppNavigationStateService,\n @SessionCoroutineScope\n private val sessionCoroutineScope: CoroutineScope,\n@@ -70,7 +75,6 @@ class JoinedRoomLoadedFlowNode(\n interface Callback : Plugin {\n fun onOpenRoom(roomId: RoomId, serverNames: List)\n fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean)\n- fun onForwardedToSingleRoom(roomId: RoomId)\n fun onOpenGlobalNotificationSettings()\n }\n \n@@ -128,8 +132,8 @@ class JoinedRoomLoadedFlowNode(\n callbacks.forEach { it.onPermalinkClick(data, pushToBackstack) }\n }\n \n- override fun onForwardedToSingleRoom(roomId: RoomId) {\n- callbacks.forEach { it.onForwardedToSingleRoom(roomId) }\n+ override fun forwardEvent(eventId: EventId) {\n+ backstack.push(NavTarget.ForwardEvent(eventId))\n }\n }\n return roomDetailsEntryPoint.nodeBuilder(this, buildContext)\n@@ -158,6 +162,22 @@ class JoinedRoomLoadedFlowNode(\n NavTarget.Space -> {\n createSpaceNode(buildContext)\n }\n+ is NavTarget.ForwardEvent -> {\n+ val timelineProvider = { MutableStateFlow(inputs.room.liveTimeline).asStateFlow() }\n+ val params = ForwardEntryPoint.Params(navTarget.eventId, timelineProvider)\n+ val callback = object : ForwardEntryPoint.Callback {\n+ override fun onDone(roomIds: List) {\n+ backstack.pop()\n+ roomIds.singleOrNull()?.let { roomId ->\n+ callbacks.forEach { it.onOpenRoom(roomId, emptyList()) }\n+ }\n+ }\n+ }\n+ forwardEntryPoint.nodeBuilder(this, buildContext)\n+ .params(params)\n+ .callback(callback)\n+ .build()\n+ }\n }\n }\n \n@@ -198,8 +218,12 @@ class JoinedRoomLoadedFlowNode(\n callbacks.forEach { it.onPermalinkClick(data, pushToBackstack) }\n }\n \n- override fun onForwardedToSingleRoom(roomId: RoomId) {\n- callbacks.forEach { it.onForwardedToSingleRoom(roomId) }\n+ override fun forwardEvent(eventId: EventId) {\n+ backstack.push(NavTarget.ForwardEvent(eventId))\n+ }\n+\n+ override fun openRoom(roomId: RoomId) {\n+ callbacks.forEach { it.onOpenRoom(roomId, emptyList()) }\n }\n }\n val params = MessagesEntryPoint.Params(\n@@ -227,6 +251,9 @@ class JoinedRoomLoadedFlowNode(\n @Parcelize\n data class RoomMemberDetails(val userId: UserId) : NavTarget\n \n+ @Parcelize\n+ data class ForwardEvent(val eventId: EventId) : NavTarget\n+\n @Parcelize\n data object RoomNotificationSettings : NavTarget\n }\ndiff --git a/features/forward/api/build.gradle.kts b/features/forward/api/build.gradle.kts\nnew file mode 100644\nindex 00000000000..b5c73539d70\n--- /dev/null\n+++ b/features/forward/api/build.gradle.kts\n@@ -0,0 +1,19 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+plugins {\n+ id(\"io.element.android-library\")\n+}\n+\n+android {\n+ namespace = \"io.element.android.features.forward.api\"\n+}\n+\n+dependencies {\n+ implementation(projects.libraries.architecture)\n+ implementation(projects.libraries.matrix.api)\n+}\ndiff --git a/features/forward/api/src/main/kotlin/io/element/android/features/forward/api/ForwardEntryPoint.kt b/features/forward/api/src/main/kotlin/io/element/android/features/forward/api/ForwardEntryPoint.kt\nnew file mode 100644\nindex 00000000000..d822c0adb83\n--- /dev/null\n+++ b/features/forward/api/src/main/kotlin/io/element/android/features/forward/api/ForwardEntryPoint.kt\n@@ -0,0 +1,36 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.features.forward.api\n+\n+import com.bumble.appyx.core.modality.BuildContext\n+import com.bumble.appyx.core.node.Node\n+import com.bumble.appyx.core.plugin.Plugin\n+import io.element.android.libraries.architecture.FeatureEntryPoint\n+import io.element.android.libraries.architecture.NodeInputs\n+import io.element.android.libraries.matrix.api.core.EventId\n+import io.element.android.libraries.matrix.api.core.RoomId\n+import io.element.android.libraries.matrix.api.timeline.TimelineProvider\n+\n+interface ForwardEntryPoint : FeatureEntryPoint {\n+ interface NodeBuilder {\n+ fun params(params: Params): NodeBuilder\n+ fun callback(callback: Callback): NodeBuilder\n+ fun build(): Node\n+ }\n+\n+ interface Callback : Plugin {\n+ fun onDone(roomIds: List)\n+ }\n+\n+ data class Params(\n+ val eventId: EventId,\n+ val timelineProvider: TimelineProvider,\n+ ) : NodeInputs\n+\n+ fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder\n+}\ndiff --git a/features/forward/impl/build.gradle.kts b/features/forward/impl/build.gradle.kts\nnew file mode 100644\nindex 00000000000..32da0ed7a29\n--- /dev/null\n+++ b/features/forward/impl/build.gradle.kts\n@@ -0,0 +1,38 @@\n+import extension.setupDependencyInjection\n+import extension.testCommonDependencies\n+\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+plugins {\n+ id(\"io.element.android-compose-library\")\n+ id(\"kotlin-parcelize\")\n+}\n+\n+android {\n+ namespace = \"io.element.android.features.forward.impl\"\n+\n+ testOptions {\n+ unitTests {\n+ isIncludeAndroidResources = true\n+ }\n+ }\n+}\n+\n+setupDependencyInjection()\n+\n+dependencies {\n+ api(projects.features.forward.api)\n+ implementation(projects.libraries.architecture)\n+ implementation(projects.libraries.designsystem)\n+ implementation(projects.libraries.matrix.api)\n+ implementation(projects.libraries.roomselect.api)\n+\n+ testCommonDependencies(libs, true)\n+ testImplementation(projects.libraries.matrix.test)\n+ testImplementation(projects.libraries.testtags)\n+}\ndiff --git a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPoint.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPoint.kt\nnew file mode 100644\nindex 00000000000..55eede7b572\n--- /dev/null\n+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPoint.kt\n@@ -0,0 +1,42 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.features.forward.impl\n+\n+import com.bumble.appyx.core.modality.BuildContext\n+import com.bumble.appyx.core.node.Node\n+import com.bumble.appyx.core.plugin.Plugin\n+import dev.zacsweers.metro.ContributesBinding\n+import io.element.android.features.forward.api.ForwardEntryPoint\n+import io.element.android.libraries.architecture.createNode\n+import io.element.android.libraries.di.SessionScope\n+\n+@ContributesBinding(SessionScope::class)\n+class DefaultForwardEntryPoint : ForwardEntryPoint {\n+ override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): ForwardEntryPoint.NodeBuilder {\n+ val plugins = ArrayList()\n+\n+ return object : ForwardEntryPoint.NodeBuilder {\n+ override fun params(params: ForwardEntryPoint.Params): ForwardEntryPoint.NodeBuilder {\n+ plugins += ForwardMessagesNode.Inputs(\n+ eventId = params.eventId,\n+ timelineProvider = params.timelineProvider,\n+ )\n+ return this\n+ }\n+\n+ override fun callback(callback: ForwardEntryPoint.Callback): ForwardEntryPoint.NodeBuilder {\n+ plugins += callback\n+ return this\n+ }\n+\n+ override fun build(): Node {\n+ return parentNode.createNode(buildContext, plugins)\n+ }\n+ }\n+ }\n+}\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesEvents.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesEvents.kt\nsimilarity index 83%\nrename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesEvents.kt\nrename to features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesEvents.kt\nindex 05a77b61a78..06495cfc24e 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesEvents.kt\n+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesEvents.kt\n@@ -5,7 +5,7 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.features.messages.impl.forward\n+package io.element.android.features.forward.impl\n \n sealed interface ForwardMessagesEvents {\n data object ClearError : ForwardMessagesEvents\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesNode.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt\nsimilarity index 82%\nrename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesNode.kt\nrename to features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt\nindex 2cf0c6e1e7f..27e95898d2f 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesNode.kt\n+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt\n@@ -5,7 +5,7 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.features.messages.impl.forward\n+package io.element.android.features.forward.impl\n \n import android.os.Parcelable\n import androidx.compose.foundation.layout.Box\n@@ -20,9 +20,10 @@ import com.bumble.appyx.core.plugin.Plugin\n import dev.zacsweers.metro.Assisted\n import dev.zacsweers.metro.AssistedInject\n import io.element.android.annotations.ContributesNode\n+import io.element.android.features.forward.api.ForwardEntryPoint\n import io.element.android.libraries.architecture.NodeInputs\n import io.element.android.libraries.architecture.inputs\n-import io.element.android.libraries.di.RoomScope\n+import io.element.android.libraries.di.SessionScope\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.core.RoomId\n import io.element.android.libraries.matrix.api.timeline.TimelineProvider\n@@ -30,7 +31,7 @@ import io.element.android.libraries.roomselect.api.RoomSelectEntryPoint\n import io.element.android.libraries.roomselect.api.RoomSelectMode\n import kotlinx.parcelize.Parcelize\n \n-@ContributesNode(RoomScope::class)\n+@ContributesNode(SessionScope::class)\n @AssistedInject\n class ForwardMessagesNode(\n @Assisted buildContext: BuildContext,\n@@ -48,10 +49,6 @@ class ForwardMessagesNode(\n @Parcelize\n object NavTarget : Parcelable\n \n- interface Callback : Plugin {\n- fun onForwardedToSingleRoom(roomId: RoomId)\n- }\n-\n data class Inputs(\n val eventId: EventId,\n val timelineProvider: TimelineProvider,\n@@ -59,7 +56,7 @@ class ForwardMessagesNode(\n \n private val inputs = inputs()\n private val presenter = presenterFactory.create(inputs.eventId.value, inputs.timelineProvider)\n- private val callbacks = plugins.filterIsInstance()\n+ private val callbacks = plugins.filterIsInstance()\n \n override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {\n val callback = object : RoomSelectEntryPoint.Callback {\n@@ -68,7 +65,7 @@ class ForwardMessagesNode(\n }\n \n override fun onCancel() {\n- navigateUp()\n+ onForwardDone(emptyList())\n }\n }\n \n@@ -89,16 +86,12 @@ class ForwardMessagesNode(\n val state = presenter.present()\n ForwardMessagesView(\n state = state,\n- onForwardSuccess = ::onForwardSuccess,\n+ onForwardSuccess = ::onForwardDone,\n )\n }\n }\n \n- private fun onForwardSuccess(roomIds: List) {\n- navigateUp()\n- if (roomIds.size == 1) {\n- val targetRoomId = roomIds.first()\n- callbacks.forEach { it.onForwardedToSingleRoom(targetRoomId) }\n- }\n+ private fun onForwardDone(roomIds: List) {\n+ callbacks.forEach { it.onDone(roomIds) }\n }\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenter.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt\nsimilarity index 83%\nrename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenter.kt\nrename to features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt\nindex 3e3860db3e0..63fbb0bc7cc 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenter.kt\n+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt\n@@ -5,7 +5,7 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.features.messages.impl.forward\n+package io.element.android.features.forward.impl\n \n import androidx.compose.runtime.Composable\n import androidx.compose.runtime.MutableState\n@@ -21,8 +21,6 @@ import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.core.RoomId\n import io.element.android.libraries.matrix.api.timeline.TimelineProvider\n import io.element.android.libraries.matrix.api.timeline.getActiveTimeline\n-import kotlinx.collections.immutable.ImmutableList\n-import kotlinx.collections.immutable.toImmutableList\n import kotlinx.coroutines.CoroutineScope\n import kotlinx.coroutines.launch\n \n@@ -36,14 +34,14 @@ class ForwardMessagesPresenter(\n private val eventId: EventId = EventId(eventId)\n \n @AssistedFactory\n- interface Factory {\n+ fun interface Factory {\n fun create(eventId: String, timelineProvider: TimelineProvider): ForwardMessagesPresenter\n }\n \n private val forwardingActionState: MutableState>> = mutableStateOf(AsyncAction.Uninitialized)\n \n fun onRoomSelected(roomIds: List) {\n- sessionCoroutineScope.forwardEvent(eventId, roomIds.toImmutableList(), forwardingActionState)\n+ sessionCoroutineScope.forwardEvent(eventId, roomIds)\n }\n \n @Composable\n@@ -62,12 +60,11 @@ class ForwardMessagesPresenter(\n \n private fun CoroutineScope.forwardEvent(\n eventId: EventId,\n- roomIds: ImmutableList,\n- isForwardMessagesState: MutableState>>,\n+ roomIds: List,\n ) = launch {\n suspend {\n timelineProvider.getActiveTimeline().forwardEvent(eventId, roomIds).getOrThrow()\n roomIds\n- }.runCatchingUpdatingState(isForwardMessagesState)\n+ }.runCatchingUpdatingState(forwardingActionState)\n }\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesState.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesState.kt\nsimilarity index 88%\nrename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesState.kt\nrename to features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesState.kt\nindex a1de911c728..a6d93f39da9 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesState.kt\n+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesState.kt\n@@ -5,7 +5,7 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.features.messages.impl.forward\n+package io.element.android.features.forward.impl\n \n import io.element.android.libraries.architecture.AsyncAction\n import io.element.android.libraries.matrix.api.core.RoomId\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesStateProvider.kt\nsimilarity index 95%\nrename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt\nrename to features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesStateProvider.kt\nindex b1728f46572..f5789549c57 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt\n+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesStateProvider.kt\n@@ -5,7 +5,7 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.features.messages.impl.forward\n+package io.element.android.features.forward.impl\n \n import androidx.compose.ui.tooling.preview.PreviewParameterProvider\n import io.element.android.libraries.architecture.AsyncAction\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt\nsimilarity index 95%\nrename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt\nrename to features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt\nindex 9ea76d754f6..214c7958519 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt\n+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt\n@@ -5,7 +5,7 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.features.messages.impl.forward\n+package io.element.android.features.forward.impl\n \n import androidx.compose.runtime.Composable\n import androidx.compose.ui.tooling.preview.PreviewParameter\ndiff --git a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt\nindex 706e292dbbb..8478a57940a 100644\n--- a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt\n+++ b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt\n@@ -38,7 +38,8 @@ interface MessagesEntryPoint : FeatureEntryPoint {\n fun onRoomDetailsClick()\n fun onUserDataClick(userId: UserId)\n fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean)\n- fun onForwardedToSingleRoom(roomId: RoomId)\n+ fun forwardEvent(eventId: EventId)\n+ fun openRoom(roomId: RoomId)\n }\n \n data class Params(val initialTarget: InitialTarget) : NodeInputs\ndiff --git a/features/messages/impl/build.gradle.kts b/features/messages/impl/build.gradle.kts\nindex 43efad9da07..ee2d7f48b06 100644\n--- a/features/messages/impl/build.gradle.kts\n+++ b/features/messages/impl/build.gradle.kts\n@@ -29,6 +29,7 @@ dependencies {\n implementation(projects.appconfig)\n implementation(projects.features.call.api)\n implementation(projects.features.enterprise.api)\n+ implementation(projects.features.forward.api)\n implementation(projects.features.location.api)\n implementation(projects.features.poll.api)\n implementation(projects.features.roomcall.api)\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt\nindex 82aafcf545a..8807dd77cb7 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt\n@@ -18,6 +18,7 @@ import com.bumble.appyx.core.node.Node\n import com.bumble.appyx.core.plugin.Plugin\n import com.bumble.appyx.core.plugin.plugins\n import com.bumble.appyx.navmodel.backstack.BackStack\n+import com.bumble.appyx.navmodel.backstack.operation.pop\n import com.bumble.appyx.navmodel.backstack.operation.push\n import dev.zacsweers.metro.Assisted\n import dev.zacsweers.metro.AssistedInject\n@@ -25,6 +26,7 @@ import im.vector.app.features.analytics.plan.Interaction\n import io.element.android.annotations.ContributesNode\n import io.element.android.features.call.api.CallType\n import io.element.android.features.call.api.ElementCallEntryPoint\n+import io.element.android.features.forward.api.ForwardEntryPoint\n import io.element.android.features.knockrequests.api.list.KnockRequestsListEntryPoint\n import io.element.android.features.location.api.Location\n import io.element.android.features.location.api.LocationService\n@@ -33,7 +35,6 @@ import io.element.android.features.location.api.ShowLocationEntryPoint\n import io.element.android.features.messages.api.MessagesEntryPoint\n import io.element.android.features.messages.impl.attachments.Attachment\n import io.element.android.features.messages.impl.attachments.preview.AttachmentsPreviewNode\n-import io.element.android.features.messages.impl.forward.ForwardMessagesNode\n import io.element.android.features.messages.impl.pinned.PinnedEventsTimelineProvider\n import io.element.android.features.messages.impl.pinned.list.PinnedMessagesListNode\n import io.element.android.features.messages.impl.report.ReportMessageNode\n@@ -103,6 +104,7 @@ class MessagesFlowNode(\n private val createPollEntryPoint: CreatePollEntryPoint,\n private val elementCallEntryPoint: ElementCallEntryPoint,\n private val mediaViewerEntryPoint: MediaViewerEntryPoint,\n+ private val forwardEntryPoint: ForwardEntryPoint,\n private val analyticsService: AnalyticsService,\n private val locationService: LocationService,\n private val room: BaseRoom,\n@@ -149,7 +151,10 @@ class MessagesFlowNode(\n data class EventDebugInfo(val eventId: EventId?, val debugInfo: TimelineItemDebugInfo) : NavTarget\n \n @Parcelize\n- data class ForwardEvent(val eventId: EventId, val fromPinnedEvents: Boolean) : NavTarget\n+ data class ForwardEvent(\n+ val eventId: EventId,\n+ val fromPinnedEvents: Boolean,\n+ ) : NavTarget\n \n @Parcelize\n data class ReportMessage(val eventId: EventId, val senderId: UserId) : NavTarget\n@@ -305,6 +310,11 @@ class MessagesFlowNode(\n override fun onViewInTimeline(eventId: EventId) {\n viewInTimeline(eventId)\n }\n+\n+ override fun onForwardEvent(eventId: EventId) {\n+ // Need to go to the parent because of the overlay\n+ forwardEvent(eventId)\n+ }\n }\n mediaViewerEntryPoint.nodeBuilder(this, buildContext)\n .params(params)\n@@ -333,13 +343,19 @@ class MessagesFlowNode(\n } else {\n timelineController\n }\n- val inputs = ForwardMessagesNode.Inputs(navTarget.eventId, timelineProvider)\n- val callback = object : ForwardMessagesNode.Callback {\n- override fun onForwardedToSingleRoom(roomId: RoomId) {\n- callbacks.forEach { it.onForwardedToSingleRoom(roomId) }\n+ val params = ForwardEntryPoint.Params(navTarget.eventId, timelineProvider)\n+ val callback = object : ForwardEntryPoint.Callback {\n+ override fun onDone(roomIds: List) {\n+ backstack.pop()\n+ roomIds.singleOrNull()?.let { roomId ->\n+ callbacks.forEach { it.openRoom(roomId) }\n+ }\n }\n }\n- createNode(buildContext, listOf(inputs, callback))\n+ forwardEntryPoint.nodeBuilder(this, buildContext)\n+ .params(params)\n+ .callback(callback)\n+ .build()\n }\n is NavTarget.ReportMessage -> {\n val inputs = ReportMessageNode.Inputs(navTarget.eventId, navTarget.senderId)\n@@ -485,6 +501,10 @@ class MessagesFlowNode(\n callbacks.forEach { it.onPermalinkClick(permalinkData, pushToBackstack = false) }\n }\n \n+ private fun forwardEvent(eventId: EventId) {\n+ callbacks.forEach { it.forwardEvent(eventId) }\n+ }\n+\n private fun processEventClick(\n timelineMode: Timeline.Mode,\n event: TimelineItem.Event,\ndiff --git a/features/roomdetails/api/src/main/kotlin/io/element/android/features/roomdetails/api/RoomDetailsEntryPoint.kt b/features/roomdetails/api/src/main/kotlin/io/element/android/features/roomdetails/api/RoomDetailsEntryPoint.kt\nindex 0d725938f61..48fcac8ee61 100644\n--- a/features/roomdetails/api/src/main/kotlin/io/element/android/features/roomdetails/api/RoomDetailsEntryPoint.kt\n+++ b/features/roomdetails/api/src/main/kotlin/io/element/android/features/roomdetails/api/RoomDetailsEntryPoint.kt\n@@ -13,6 +13,7 @@ import com.bumble.appyx.core.node.Node\n import com.bumble.appyx.core.plugin.Plugin\n import io.element.android.libraries.architecture.FeatureEntryPoint\n import io.element.android.libraries.architecture.NodeInputs\n+import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.core.RoomId\n import io.element.android.libraries.matrix.api.core.UserId\n import io.element.android.libraries.matrix.api.permalink.PermalinkData\n@@ -39,7 +40,7 @@ interface RoomDetailsEntryPoint : FeatureEntryPoint {\n fun onOpenGlobalNotificationSettings()\n fun onOpenRoom(roomId: RoomId, serverNames: List)\n fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean)\n- fun onForwardedToSingleRoom(roomId: RoomId)\n+ fun forwardEvent(eventId: EventId)\n }\n \n interface NodeBuilder {\ndiff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt\nindex 2b4bf10d672..a72f0394b47 100644\n--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt\n+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt\n@@ -294,6 +294,10 @@ class RoomDetailsFlowNode(\n override fun onViewInTimeline(eventId: EventId) {\n // Cannot happen\n }\n+\n+ override fun onForwardEvent(eventId: EventId) {\n+ // Cannot happen\n+ }\n }\n mediaViewerEntryPoint.nodeBuilder(this, buildContext)\n .avatar(\n@@ -321,6 +325,10 @@ class RoomDetailsFlowNode(\n it.onPermalinkClick(permalinkData, pushToBackstack = false)\n }\n }\n+\n+ override fun forwardEvent(eventId: EventId) {\n+ plugins().forEach { it.forwardEvent(eventId) }\n+ }\n }\n mediaGalleryEntryPoint.nodeBuilder(this, buildContext)\n .callback(callback)\n@@ -343,8 +351,12 @@ class RoomDetailsFlowNode(\n plugins().forEach { it.onPermalinkClick(data, pushToBackstack) }\n }\n \n- override fun onForwardedToSingleRoom(roomId: RoomId) {\n- plugins().forEach { it.onForwardedToSingleRoom(roomId) }\n+ override fun forwardEvent(eventId: EventId) {\n+ plugins().forEach { it.forwardEvent(eventId) }\n+ }\n+\n+ override fun openRoom(roomId: RoomId) {\n+ plugins().forEach { it.onOpenRoom(roomId, emptyList()) }\n }\n }\n return messagesEntryPoint.nodeBuilder(this, buildContext)\ndiff --git a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareNode.kt b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareNode.kt\nindex e2684199205..12d2f5bff53 100644\n--- a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareNode.kt\n+++ b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareNode.kt\n@@ -61,7 +61,7 @@ class ShareNode(\n }\n \n override fun onCancel() {\n- navigateUp()\n+ onShareDone(emptyList())\n }\n }\n \n@@ -82,12 +82,12 @@ class ShareNode(\n val state = presenter.present()\n ShareView(\n state = state,\n- onShareSuccess = ::onShareSuccess,\n+ onShareSuccess = ::onShareDone,\n )\n }\n }\n \n- private fun onShareSuccess(roomIds: List) {\n+ private fun onShareDone(roomIds: List) {\n callbacks.forEach { it.onDone(roomIds) }\n }\n }\ndiff --git a/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/UserProfileFlowNode.kt b/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/UserProfileFlowNode.kt\nindex 5828d60c256..da3adef973b 100644\n--- a/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/UserProfileFlowNode.kt\n+++ b/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/UserProfileFlowNode.kt\n@@ -101,6 +101,10 @@ class UserProfileFlowNode(\n override fun onViewInTimeline(eventId: EventId) {\n // Cannot happen\n }\n+\n+ override fun onForwardEvent(eventId: EventId) {\n+ // Cannot happen\n+ }\n }\n mediaViewerEntryPoint.nodeBuilder(this, buildContext)\n .avatar(\ndiff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/TimelineProvider.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/TimelineProvider.kt\nindex acc18ee1a0b..592b5ab3bad 100644\n--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/TimelineProvider.kt\n+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/TimelineProvider.kt\n@@ -16,7 +16,7 @@ import kotlinx.coroutines.flow.first\n * It could be the live timeline, a pinned timeline or a detached timeline.\n * By default, the active timeline is the live timeline.\n */\n-interface TimelineProvider {\n+fun interface TimelineProvider {\n fun activeTimelineFlow(): StateFlow\n }\n \ndiff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaGalleryEntryPoint.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaGalleryEntryPoint.kt\nindex 841e82f1959..119c1002c86 100644\n--- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaGalleryEntryPoint.kt\n+++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaGalleryEntryPoint.kt\n@@ -24,5 +24,6 @@ interface MediaGalleryEntryPoint : FeatureEntryPoint {\n interface Callback : Plugin {\n fun onBackClick()\n fun onViewInTimeline(eventId: EventId)\n+ fun forwardEvent(eventId: EventId)\n }\n }\ndiff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaViewerEntryPoint.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaViewerEntryPoint.kt\nindex 906283c4570..b16de69b98b 100644\n--- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaViewerEntryPoint.kt\n+++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaViewerEntryPoint.kt\n@@ -31,6 +31,7 @@ interface MediaViewerEntryPoint : FeatureEntryPoint {\n interface Callback : Plugin {\n fun onDone()\n fun onViewInTimeline(eventId: EventId)\n+ fun onForwardEvent(eventId: EventId)\n }\n \n data class Params(\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheet.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheet.kt\nindex 22c29c590bc..35d5a3e5182 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheet.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheet.kt\n@@ -49,6 +49,7 @@ fun MediaDetailsBottomSheet(\n state: MediaBottomSheetState.MediaDetailsBottomSheetState,\n onViewInTimeline: (EventId) -> Unit,\n onShare: (EventId) -> Unit,\n+ onForward: (EventId) -> Unit,\n onDownload: (EventId) -> Unit,\n onDelete: (EventId) -> Unit,\n onDismiss: () -> Unit,\n@@ -102,6 +103,14 @@ fun MediaDetailsBottomSheet(\n onShare(state.eventId)\n }\n )\n+ ListItem(\n+ leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Forward())),\n+ headlineContent = { Text(stringResource(CommonStrings.action_forward)) },\n+ style = ListItemStyle.Primary,\n+ onClick = {\n+ onForward(state.eventId)\n+ }\n+ )\n ListItem(\n leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Download())),\n headlineContent = { Text(stringResource(CommonStrings.action_save)) },\n@@ -216,6 +225,7 @@ internal fun MediaDetailsBottomSheetPreview() = ElementPreview {\n state = aMediaDetailsBottomSheetState(),\n onViewInTimeline = {},\n onShare = {},\n+ onForward = {},\n onDownload = {},\n onDelete = {},\n onDismiss = {},\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryEvents.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryEvents.kt\nindex df7d82c7b29..1a5bf70170a 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryEvents.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryEvents.kt\n@@ -16,8 +16,9 @@ import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n sealed interface MediaGalleryEvents {\n data class ChangeMode(val mode: MediaGalleryMode) : MediaGalleryEvents\n data class LoadMore(val direction: Timeline.PaginationDirection) : MediaGalleryEvents\n- data class Share(val eventId: EventId?) : MediaGalleryEvents\n- data class SaveOnDisk(val eventId: EventId?) : MediaGalleryEvents\n+ data class Share(val eventId: EventId) : MediaGalleryEvents\n+ data class Forward(val eventId: EventId) : MediaGalleryEvents\n+ data class SaveOnDisk(val eventId: EventId) : MediaGalleryEvents\n data class OpenInfo(val mediaItem: MediaItem.Event) : MediaGalleryEvents\n data class ViewInTimeline(val eventId: EventId) : MediaGalleryEvents\n \ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNavigator.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNavigator.kt\nindex 0195e7f39cb..8ce4860c530 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNavigator.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNavigator.kt\n@@ -11,4 +11,5 @@ import io.element.android.libraries.matrix.api.core.EventId\n \n interface MediaGalleryNavigator {\n fun onViewInTimelineClick(eventId: EventId)\n+ fun onForwardClick(eventId: EventId)\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt\nindex 06a3c6a58f4..6ee31c65200 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt\n@@ -40,6 +40,7 @@ class MediaGalleryNode(\n fun onBackClick()\n fun onItemClick(item: MediaItem.Event)\n fun onViewInTimeline(eventId: EventId)\n+ fun onForward(eventId: EventId)\n }\n \n private fun onBackClick() {\n@@ -54,6 +55,12 @@ class MediaGalleryNode(\n }\n }\n \n+ override fun onForwardClick(eventId: EventId) {\n+ plugins().forEach {\n+ it.onForward(eventId)\n+ }\n+ }\n+\n private fun onItemClick(item: MediaItem.Event) {\n plugins().forEach {\n it.onItemClick(item)\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt\nindex ba3d4d5e1f8..3f8a31cc261 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt\n@@ -105,6 +105,10 @@ class MediaGalleryPresenter(\n share(it)\n }\n }\n+ is MediaGalleryEvents.Forward -> {\n+ mediaBottomSheetState = MediaBottomSheetState.Hidden\n+ navigator.onForwardClick(event.eventId)\n+ }\n is MediaGalleryEvents.ViewInTimeline -> {\n mediaBottomSheetState = MediaBottomSheetState.Hidden\n navigator.onViewInTimelineClick(event.eventId)\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt\nindex a48ff93d714..50a7fe9aad6 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt\n@@ -166,6 +166,9 @@ fun MediaGalleryView(\n onShare = { eventId ->\n state.eventSink(MediaGalleryEvents.Share(eventId))\n },\n+ onForward = { eventId ->\n+ state.eventSink(MediaGalleryEvents.Forward(eventId))\n+ },\n onDownload = { eventId ->\n state.eventSink(MediaGalleryEvents.SaveOnDisk(eventId))\n },\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryFlowNode.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryFlowNode.kt\nindex e617829ad0d..76f025006fe 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryFlowNode.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryFlowNode.kt\n@@ -44,7 +44,7 @@ import kotlinx.parcelize.Parcelize\n class MediaGalleryFlowNode(\n @Assisted buildContext: BuildContext,\n @Assisted plugins: List,\n- private val mediaViewerEntryPoint: MediaViewerEntryPoint\n+ private val mediaViewerEntryPoint: MediaViewerEntryPoint,\n ) : BaseFlowNode(\n backstack = BackStack(\n initialElement = NavTarget.Root,\n@@ -82,6 +82,12 @@ class MediaGalleryFlowNode(\n }\n }\n \n+ private fun forwardEvent(eventId: EventId) {\n+ plugins().forEach {\n+ it.forwardEvent(eventId)\n+ }\n+ }\n+\n override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {\n return when (navTarget) {\n NavTarget.Root -> {\n@@ -94,6 +100,10 @@ class MediaGalleryFlowNode(\n this@MediaGalleryFlowNode.onViewInTimeline(eventId)\n }\n \n+ override fun onForward(eventId: EventId) {\n+ forwardEvent(eventId)\n+ }\n+\n override fun onItemClick(item: MediaItem.Event) {\n val mode = when (item) {\n is MediaItem.Audio,\n@@ -124,6 +134,11 @@ class MediaGalleryFlowNode(\n override fun onViewInTimeline(eventId: EventId) {\n this@MediaGalleryFlowNode.onViewInTimeline(eventId)\n }\n+\n+ override fun onForwardEvent(eventId: EventId) {\n+ // Need to go to the parent because of the overlay\n+ forwardEvent(eventId)\n+ }\n }\n mediaViewerEntryPoint.nodeBuilder(this, buildContext)\n .params(\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerEvents.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerEvents.kt\nindex 708c423d363..519100b6104 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerEvents.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerEvents.kt\n@@ -17,6 +17,7 @@ sealed interface MediaViewerEvents {\n data class OpenWith(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents\n data class ClearLoadingError(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents\n data class ViewInTimeline(val eventId: EventId) : MediaViewerEvents\n+ data class Forward(val eventId: EventId) : MediaViewerEvents\n data class OpenInfo(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents\n data class ConfirmDelete(\n val eventId: EventId,\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNavigator.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNavigator.kt\nindex c75db00afe7..77e253dfa5b 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNavigator.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNavigator.kt\n@@ -11,5 +11,6 @@ import io.element.android.libraries.matrix.api.core.EventId\n \n interface MediaViewerNavigator {\n fun onViewInTimelineClick(eventId: EventId)\n+ fun onForwardClick(eventId: EventId)\n fun onItemDeleted()\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt\nindex 6599411411b..ee874156cdd 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt\n@@ -71,6 +71,12 @@ class MediaViewerNode(\n }\n }\n \n+ override fun onForwardClick(eventId: EventId) {\n+ plugins().forEach {\n+ it.onForwardEvent(eventId)\n+ }\n+ }\n+\n override fun onItemDeleted() {\n onDone()\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt\nindex c7b93a227f0..726e9989ce9 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt\n@@ -117,6 +117,10 @@ class MediaViewerPresenter(\n mediaBottomSheetState = MediaBottomSheetState.Hidden\n navigator.onViewInTimelineClick(event.eventId)\n }\n+ is MediaViewerEvents.Forward -> {\n+ mediaBottomSheetState = MediaBottomSheetState.Hidden\n+ navigator.onForwardClick(event.eventId)\n+ }\n is MediaViewerEvents.OpenInfo -> coroutineScope.launch {\n mediaBottomSheetState = MediaBottomSheetState.MediaDetailsBottomSheetState(\n eventId = event.data.eventId,\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt\nindex 110054eb20b..791bd1bc8e9 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt\n@@ -247,6 +247,9 @@ fun MediaViewerView(\n state.eventSink(MediaViewerEvents.Share(currentData))\n }\n },\n+ onForward = {\n+ state.eventSink(MediaViewerEvents.Forward(it))\n+ },\n onDownload = {\n (currentData as? MediaViewerPageData.MediaViewerData)?.let {\n state.eventSink(MediaViewerEvents.SaveOnDisk(currentData))\n", "test_patch": "diff --git a/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt\nindex f8a18fa24a0..8e73165cb6c 100644\n--- a/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt\n+++ b/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt\n@@ -20,6 +20,7 @@ import com.google.common.truth.Truth.assertThat\n import io.element.android.appnav.di.RoomGraphFactory\n import io.element.android.appnav.room.RoomNavigationTarget\n import io.element.android.appnav.room.joined.JoinedRoomLoadedFlowNode\n+import io.element.android.features.forward.api.ForwardEntryPoint\n import io.element.android.features.messages.api.MessagesEntryPoint\n import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint\n import io.element.android.features.space.api.SpaceEntryPoint\n@@ -122,11 +123,22 @@ class JoinedRoomLoadedFlowNodeTest {\n }\n }\n \n+ private class FakeForwardEntryPoint : ForwardEntryPoint {\n+ override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): ForwardEntryPoint.NodeBuilder {\n+ return object : ForwardEntryPoint.NodeBuilder {\n+ override fun params(params: ForwardEntryPoint.Params) = this\n+ override fun callback(callback: ForwardEntryPoint.Callback) = this\n+ override fun build() = node(buildContext) {}\n+ }\n+ }\n+ }\n+\n private fun TestScope.createJoinedRoomLoadedFlowNode(\n plugins: List,\n messagesEntryPoint: MessagesEntryPoint = FakeMessagesEntryPoint(),\n roomDetailsEntryPoint: RoomDetailsEntryPoint = FakeRoomDetailsEntryPoint(),\n spaceEntryPoint: SpaceEntryPoint = FakeSpaceEntryPoint(),\n+ forwardEntryPoint: ForwardEntryPoint = FakeForwardEntryPoint(),\n activeRoomsHolder: ActiveRoomsHolder = ActiveRoomsHolder(),\n ) = JoinedRoomLoadedFlowNode(\n buildContext = BuildContext.root(savedStateMap = null),\n@@ -134,6 +146,7 @@ class JoinedRoomLoadedFlowNodeTest {\n messagesEntryPoint = messagesEntryPoint,\n roomDetailsEntryPoint = roomDetailsEntryPoint,\n spaceEntryPoint = spaceEntryPoint,\n+ forwardEntryPoint = forwardEntryPoint,\n appNavigationStateService = FakeAppNavigationStateService(),\n sessionCoroutineScope = this,\n roomGraphFactory = FakeRoomGraphFactory(),\ndiff --git a/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPointTest.kt b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPointTest.kt\nnew file mode 100644\nindex 00000000000..dabb8af4a13\n--- /dev/null\n+++ b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPointTest.kt\n@@ -0,0 +1,68 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.features.forward.impl\n+\n+import androidx.arch.core.executor.testing.InstantTaskExecutorRule\n+import com.bumble.appyx.core.modality.BuildContext\n+import com.bumble.appyx.core.node.Node\n+import com.bumble.appyx.testing.junit4.util.MainDispatcherRule\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.features.forward.api.ForwardEntryPoint\n+import io.element.android.libraries.matrix.api.core.RoomId\n+import io.element.android.libraries.matrix.test.AN_EVENT_ID\n+import io.element.android.libraries.matrix.test.timeline.FakeTimelineProvider\n+import io.element.android.libraries.roomselect.api.RoomSelectEntryPoint\n+import io.element.android.tests.testutils.lambda.lambdaError\n+import io.element.android.tests.testutils.node.TestParentNode\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Rule\n+import org.junit.Test\n+\n+class DefaultForwardEntryPointTest {\n+ @get:Rule\n+ val instantTaskExecutorRule = InstantTaskExecutorRule()\n+\n+ @get:Rule\n+ val mainDispatcherRule = MainDispatcherRule()\n+\n+ @Test\n+ fun `test node builder`() = runTest {\n+ val entryPoint = DefaultForwardEntryPoint()\n+ val parentNode = TestParentNode.create { buildContext, plugins ->\n+ ForwardMessagesNode(\n+ buildContext = buildContext,\n+ plugins = plugins,\n+ presenterFactory = { _, _ -> createForwardMessagesPresenter() },\n+ roomSelectEntryPoint = object : RoomSelectEntryPoint {\n+ override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): RoomSelectEntryPoint.NodeBuilder {\n+ lambdaError()\n+ }\n+ }\n+ )\n+ }\n+ val callback = object : ForwardEntryPoint.Callback {\n+ override fun onDone(roomIds: List) = lambdaError()\n+ }\n+ val params = ForwardEntryPoint.Params(\n+ eventId = AN_EVENT_ID,\n+ timelineProvider = FakeTimelineProvider(),\n+ )\n+ val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))\n+ .params(params)\n+ .callback(callback)\n+ .build()\n+ assertThat(result).isInstanceOf(ForwardMessagesNode::class.java)\n+ assertThat(result.plugins).contains(\n+ ForwardMessagesNode.Inputs(\n+ eventId = params.eventId,\n+ timelineProvider = params.timelineProvider,\n+ )\n+ )\n+ assertThat(result.plugins).contains(callback)\n+ }\n+}\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenterTest.kt b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenterTest.kt\nsimilarity index 86%\nrename from features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenterTest.kt\nrename to features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenterTest.kt\nindex 757e682592e..6850a5ef07f 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenterTest.kt\n+++ b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenterTest.kt\n@@ -5,7 +5,7 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.features.messages.impl.forward\n+package io.element.android.features.forward.impl\n \n import app.cash.molecule.RecompositionMode\n import app.cash.molecule.moleculeFlow\n@@ -32,7 +32,7 @@ class ForwardMessagesPresenterTest {\n \n @Test\n fun `present - initial state`() = runTest {\n- val presenter = aForwardMessagesPresenter()\n+ val presenter = createForwardMessagesPresenter()\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -50,7 +50,7 @@ class ForwardMessagesPresenterTest {\n this.forwardEventLambda = forwardEventLambda\n }\n val room = FakeJoinedRoom(liveTimeline = timeline)\n- val presenter = aForwardMessagesPresenter(fakeRoom = room)\n+ val presenter = createForwardMessagesPresenter(fakeRoom = room)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -74,7 +74,7 @@ class ForwardMessagesPresenterTest {\n this.forwardEventLambda = forwardEventLambda\n }\n val room = FakeJoinedRoom(liveTimeline = timeline)\n- val presenter = aForwardMessagesPresenter(fakeRoom = room)\n+ val presenter = createForwardMessagesPresenter(fakeRoom = room)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -90,13 +90,13 @@ class ForwardMessagesPresenterTest {\n forwardEventLambda.assertions().isCalledOnce()\n }\n }\n-\n- private fun TestScope.aForwardMessagesPresenter(\n- eventId: EventId = AN_EVENT_ID,\n- fakeRoom: FakeJoinedRoom = FakeJoinedRoom(),\n- ) = ForwardMessagesPresenter(\n- eventId = eventId.value,\n- timelineProvider = LiveTimelineProvider(fakeRoom),\n- sessionCoroutineScope = this,\n- )\n }\n+\n+fun TestScope.createForwardMessagesPresenter(\n+ eventId: EventId = AN_EVENT_ID,\n+ fakeRoom: FakeJoinedRoom = FakeJoinedRoom(),\n+) = ForwardMessagesPresenter(\n+ eventId = eventId.value,\n+ timelineProvider = LiveTimelineProvider(fakeRoom),\n+ sessionCoroutineScope = this,\n+)\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesViewTest.kt b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesViewTest.kt\nsimilarity index 97%\nrename from features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesViewTest.kt\nrename to features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesViewTest.kt\nindex 0912fcc75c1..9cecda6973b 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesViewTest.kt\n+++ b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesViewTest.kt\n@@ -5,7 +5,7 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.features.messages.impl.forward\n+package io.element.android.features.forward.impl\n \n import androidx.activity.ComponentActivity\n import androidx.compose.ui.test.junit4.AndroidComposeTestRule\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPointTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPointTest.kt\nindex 2de761ad694..dc7e5ad5d49 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPointTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPointTest.kt\n@@ -15,6 +15,7 @@ import com.bumble.appyx.testing.junit4.util.MainDispatcherRule\n import com.google.common.truth.Truth.assertThat\n import io.element.android.features.call.api.CallType\n import io.element.android.features.call.api.ElementCallEntryPoint\n+import io.element.android.features.forward.api.ForwardEntryPoint\n import io.element.android.features.knockrequests.api.list.KnockRequestsListEntryPoint\n import io.element.android.features.location.api.SendLocationEntryPoint\n import io.element.android.features.location.api.ShowLocationEntryPoint\n@@ -90,6 +91,9 @@ class DefaultMessagesEntryPointTest {\n mediaViewerEntryPoint = object : MediaViewerEntryPoint {\n override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()\n },\n+ forwardEntryPoint = object : ForwardEntryPoint {\n+ override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()\n+ },\n analyticsService = FakeAnalyticsService(),\n locationService = FakeLocationService(),\n room = FakeBaseRoom(),\n@@ -115,7 +119,8 @@ class DefaultMessagesEntryPointTest {\n override fun onRoomDetailsClick() = lambdaError()\n override fun onUserDataClick(userId: UserId) = lambdaError()\n override fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean) = lambdaError()\n- override fun onForwardedToSingleRoom(roomId: RoomId) = lambdaError()\n+ override fun forwardEvent(eventId: EventId) = lambdaError()\n+ override fun openRoom(roomId: RoomId) = lambdaError()\n }\n val initialTarget = MessagesEntryPoint.InitialTarget.Messages(focusedEventId = AN_EVENT_ID)\n val params = MessagesEntryPoint.Params(initialTarget)\ndiff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt\nindex f2412e616bc..a9d528ace56 100644\n--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt\n+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt\n@@ -97,7 +97,7 @@ class DefaultRoomDetailsEntryPointTest {\n override fun onOpenGlobalNotificationSettings() = lambdaError()\n override fun onOpenRoom(roomId: RoomId, serverNames: List) = lambdaError()\n override fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean) = lambdaError()\n- override fun onForwardedToSingleRoom(roomId: RoomId) = lambdaError()\n+ override fun forwardEvent(eventId: EventId) = lambdaError()\n }\n val params = RoomDetailsEntryPoint.Params(\n initialElement = RoomDetailsEntryPoint.InitialTarget.RoomDetails,\ndiff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimelineProvider.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimelineProvider.kt\nnew file mode 100644\nindex 00000000000..519789c0030\n--- /dev/null\n+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimelineProvider.kt\n@@ -0,0 +1,24 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.matrix.test.timeline\n+\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.libraries.matrix.api.timeline.TimelineProvider\n+import kotlinx.coroutines.flow.MutableStateFlow\n+import kotlinx.coroutines.flow.StateFlow\n+import kotlinx.coroutines.flow.asStateFlow\n+\n+class FakeTimelineProvider(\n+ initialTimeline: Timeline? = null,\n+) : TimelineProvider {\n+ private val timelineFlow = MutableStateFlow(initialTimeline)\n+\n+ override fun activeTimelineFlow(): StateFlow {\n+ return timelineFlow.asStateFlow()\n+ }\n+}\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaGalleryEntryPointTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaGalleryEntryPointTest.kt\nindex 0f8b0fedfb4..38040426e16 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaGalleryEntryPointTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaGalleryEntryPointTest.kt\n@@ -37,12 +37,13 @@ class DefaultMediaGalleryEntryPointTest {\n plugins = plugins,\n mediaViewerEntryPoint = object : MediaViewerEntryPoint {\n override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()\n- }\n+ },\n )\n }\n val callback = object : MediaGalleryEntryPoint.Callback {\n override fun onBackClick() = lambdaError()\n override fun onViewInTimeline(eventId: EventId) = lambdaError()\n+ override fun forwardEvent(eventId: EventId) = lambdaError()\n }\n val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))\n .callback(callback)\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPointTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPointTest.kt\nindex ddc04fc6cea..a1f60cc124c 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPointTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPointTest.kt\n@@ -72,6 +72,7 @@ class DefaultMediaViewerEntryPointTest {\n val callback = object : MediaViewerEntryPoint.Callback {\n override fun onDone() = lambdaError()\n override fun onViewInTimeline(eventId: EventId) = lambdaError()\n+ override fun onForwardEvent(eventId: EventId) = lambdaError()\n }\n val params = createMediaViewerEntryPointParams()\n val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))\n@@ -115,6 +116,7 @@ class DefaultMediaViewerEntryPointTest {\n val callback = object : MediaViewerEntryPoint.Callback {\n override fun onDone() = lambdaError()\n override fun onViewInTimeline(eventId: EventId) = lambdaError()\n+ override fun onForwardEvent(eventId: EventId) = lambdaError()\n }\n val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))\n .avatar(\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheetTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheetTest.kt\nindex bd4373a4203..3177ed0774d 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheetTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheetTest.kt\n@@ -56,6 +56,19 @@ class MediaDetailsBottomSheetTest {\n }\n }\n \n+ @Test\n+ @Config(qualifiers = \"h1024dp\")\n+ fun `clicking on Forward invokes expected callback`() {\n+ val state = aMediaDetailsBottomSheetState()\n+ ensureCalledOnceWithParam(state.eventId) { callback ->\n+ rule.setMediaDetailsBottomSheet(\n+ state = state,\n+ onForward = callback,\n+ )\n+ rule.clickOn(CommonStrings.action_forward)\n+ }\n+ }\n+\n @Test\n @Config(qualifiers = \"h1024dp\")\n fun `clicking on Save invokes expected callback`() {\n@@ -100,6 +113,7 @@ private fun AndroidComposeTestRule.setMedia\n state: MediaBottomSheetState.MediaDetailsBottomSheetState,\n onViewInTimeline: (EventId) -> Unit = EnsureNeverCalledWithParam(),\n onShare: (EventId) -> Unit = EnsureNeverCalledWithParam(),\n+ onForward: (EventId) -> Unit = EnsureNeverCalledWithParam(),\n onDownload: (EventId) -> Unit = EnsureNeverCalledWithParam(),\n onDelete: (EventId) -> Unit = EnsureNeverCalledWithParam(),\n onDismiss: () -> Unit = EnsureNeverCalled(),\n@@ -109,6 +123,7 @@ private fun AndroidComposeTestRule.setMedia\n state = state,\n onViewInTimeline = onViewInTimeline,\n onShare = onShare,\n+ onForward = onForward,\n onDownload = onDownload,\n onDelete = onDelete,\n onDismiss = onDismiss,\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/FakeMediaGalleryNavigator.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/FakeMediaGalleryNavigator.kt\nindex 2566ef91a45..8727335e6d4 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/FakeMediaGalleryNavigator.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/FakeMediaGalleryNavigator.kt\n@@ -11,9 +11,14 @@ import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.tests.testutils.lambda.lambdaError\n \n class FakeMediaGalleryNavigator(\n- private val onViewInTimelineClickLambda: (EventId) -> Unit = { lambdaError() }\n+ private val onViewInTimelineClickLambda: (EventId) -> Unit = { lambdaError() },\n+ private val onForwardClickLambda: (EventId) -> Unit = { lambdaError() },\n ) : MediaGalleryNavigator {\n override fun onViewInTimelineClick(eventId: EventId) {\n onViewInTimelineClickLambda(eventId)\n }\n+\n+ override fun onForwardClick(eventId: EventId) {\n+ onForwardClickLambda(eventId)\n+ }\n }\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt\nindex f126dab2b5d..b09aae5d26f 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt\n@@ -345,7 +345,7 @@ class MediaGalleryPresenterTest {\n }\n \n @Test\n- fun `present - view in timeline invokes the navigator`() = runTest {\n+ fun `present - view in timeline closes the bottom sheet and invokes the navigator`() = runTest {\n val onViewInTimelineClickLambda = lambdaRecorder { }\n val navigator = FakeMediaGalleryNavigator(\n onViewInTimelineClickLambda = onViewInTimelineClickLambda,\n@@ -353,16 +353,59 @@ class MediaGalleryPresenterTest {\n val presenter = createMediaGalleryPresenter(\n room = FakeJoinedRoom(\n createTimelineResult = { Result.success(FakeTimeline()) },\n+ baseRoom = FakeBaseRoom(\n+ canRedactOwnResult = { Result.success(true) },\n+ ),\n ),\n navigator = navigator,\n )\n presenter.test {\n val initialState = awaitFirstItem()\n- initialState.eventSink(MediaGalleryEvents.ViewInTimeline(AN_EVENT_ID))\n+ val item = aMediaItemImage(\n+ eventId = AN_EVENT_ID,\n+ senderId = A_USER_ID,\n+ )\n+ initialState.eventSink(MediaGalleryEvents.OpenInfo(item))\n+ val withBottomSheetState = awaitItem()\n+ assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDetailsBottomSheetState::class.java)\n+ withBottomSheetState.eventSink(MediaGalleryEvents.ViewInTimeline(AN_EVENT_ID))\n+ val finalState = awaitItem()\n+ assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)\n onViewInTimelineClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))\n }\n }\n \n+ @Test\n+ fun `present - forward closes the bottom sheet and invokes the navigator`() = runTest {\n+ val onForwardClickLambda = lambdaRecorder { }\n+ val navigator = FakeMediaGalleryNavigator(\n+ onForwardClickLambda = onForwardClickLambda,\n+ )\n+ val presenter = createMediaGalleryPresenter(\n+ room = FakeJoinedRoom(\n+ createTimelineResult = { Result.success(FakeTimeline()) },\n+ baseRoom = FakeBaseRoom(\n+ canRedactOwnResult = { Result.success(true) },\n+ ),\n+ ),\n+ navigator = navigator,\n+ )\n+ presenter.test {\n+ val initialState = awaitFirstItem()\n+ val item = aMediaItemImage(\n+ eventId = AN_EVENT_ID,\n+ senderId = A_USER_ID,\n+ )\n+ initialState.eventSink(MediaGalleryEvents.OpenInfo(item))\n+ val withBottomSheetState = awaitItem()\n+ assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDetailsBottomSheetState::class.java)\n+ withBottomSheetState.eventSink(MediaGalleryEvents.Forward(AN_EVENT_ID))\n+ val finalState = awaitItem()\n+ assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)\n+ onForwardClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))\n+ }\n+ }\n+\n @Test\n fun `present - load more`() = runTest {\n val loadMoreLambda = lambdaRecorder { }\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/FakeMediaViewerNavigator.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/FakeMediaViewerNavigator.kt\nindex 6c0148b1245..791527445b7 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/FakeMediaViewerNavigator.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/FakeMediaViewerNavigator.kt\n@@ -12,12 +12,17 @@ import io.element.android.tests.testutils.lambda.lambdaError\n \n class FakeMediaViewerNavigator(\n private val onViewInTimelineClickLambda: (EventId) -> Unit = { lambdaError() },\n+ private val onForwardClickLambda: (EventId) -> Unit = { lambdaError() },\n private val onItemDeletedLambda: () -> Unit = { lambdaError() },\n ) : MediaViewerNavigator {\n override fun onViewInTimelineClick(eventId: EventId) {\n onViewInTimelineClickLambda(eventId)\n }\n \n+ override fun onForwardClick(eventId: EventId) {\n+ onForwardClickLambda(eventId)\n+ }\n+\n override fun onItemDeleted() {\n onItemDeletedLambda()\n }\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt\nindex b9964d8d3d5..359eda7a5eb 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt\n@@ -759,7 +759,7 @@ class MediaViewerPresenterTest {\n }\n \n @Test\n- fun `present - view in timeline hide the bottom sheet and invokes the navigator`() = runTest {\n+ fun `present - view in timeline hides the bottom sheet and invokes the navigator`() = runTest {\n val onViewInTimelineClickLambda = lambdaRecorder { }\n val navigator = FakeMediaViewerNavigator(\n onViewInTimelineClickLambda = onViewInTimelineClickLambda,\n@@ -783,6 +783,31 @@ class MediaViewerPresenterTest {\n }\n }\n \n+ @Test\n+ fun `present - forward hides the bottom sheet and invokes the navigator`() = runTest {\n+ val onForwardClickLambda = lambdaRecorder { }\n+ val navigator = FakeMediaViewerNavigator(\n+ onForwardClickLambda = onForwardClickLambda,\n+ )\n+ val presenter = createMediaViewerPresenter(\n+ localMediaFactory = localMediaFactory,\n+ mediaViewerNavigator = navigator,\n+ room = FakeJoinedRoom(\n+ baseRoom = FakeBaseRoom(canRedactOwnResult = { Result.success(true) }),\n+ ),\n+ )\n+ presenter.test {\n+ val initialState = awaitItem()\n+ initialState.eventSink(MediaViewerEvents.OpenInfo(aMediaViewerPageData()))\n+ val withBottomSheetState = awaitItem()\n+ assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDetailsBottomSheetState::class.java)\n+ initialState.eventSink(MediaViewerEvents.Forward(AN_EVENT_ID))\n+ val finalState = awaitItem()\n+ assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)\n+ onForwardClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))\n+ }\n+ }\n+\n private suspend fun ReceiveTurbine.awaitFirstItem(): T {\n return awaitItem()\n }\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_0_en.png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_0_en.png\nrename to tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_0_en.png\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_1_en.png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_1_en.png\nrename to tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_1_en.png\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_2_en.png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_2_en.png\nrename to tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_2_en.png\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_3_en.png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_3_en.png\nrename to tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_3_en.png\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_0_en.png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_0_en.png\nrename to tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_0_en.png\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_1_en.png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_1_en.png\nrename to tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_1_en.png\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_2_en.png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_2_en.png\nrename to tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_2_en.png\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_3_en.png\nsimilarity index 100%\nrename from tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_3_en.png\nrename to tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_3_en.png\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en.png\nindex 2ecb6f0e65f..9ebcafa2e01 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:964bac6ba83961f303f2309438a81fb4a09a87a0bc269df1f644b97b52044192\n-size 38109\n+oid sha256:81bdd5170870d3ea5874960b12d9548c36b105a95dcb018f648182b9206f17d6\n+size 40196\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en.png\nindex ebed9fbaea4..03f88988e53 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:e423c47cee8f2c69b31d418a7a8db850542ee2b0040c99775c85a4260b286235\n-size 36787\n+oid sha256:51594e2535dbe22f9085ff3443fa89ab7fc39c22beab5f592b1a4953bab3a1c9\n+size 38931\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en.png\nindex a2ec7507eda..2f643f7ffd6 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:090412a4d7df8699d54070a04f5514580d46adc497cdbc1b354631506eeeda3b\n-size 40872\n+oid sha256:0309be2e3e391a852cb00d5490c92b45255b64d088fd1ae8a5b8472a47ce9f88\n+size 40129\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en.png\nindex bf10c81b0b6..9248804599f 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:b7bba63c8d4018b9bba182e78397e94e85040f8a50596d1c528895278e219ea1\n-size 39333\n+oid sha256:add239fbe0f1047435c7ad5df8b62ba765098eb0c5b9703192a7276b6c4e0ccc\n+size 38692\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_11_en.png\nindex b094052a007..df4212be1ec 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_11_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_11_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:f47067ff716b6ada901650d138a7f1f88e1f1cb29d9a919d4d5af5d834b571ab\n-size 38045\n+oid sha256:d004bb0bb2e6dec6e5bc28038cfb2bddbd68f0c430b9bf3bc1c08de1d90a3301\n+size 38738\n", "n2p_tests": "{\"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - snackbar displayed when there is no more items forward images and videos\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - delete bottom sheet\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - snackbar displayed when there is no more items backward images and videos\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - bottom sheet state - own message and can delete own\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - data source update\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - bottom sheet state - own message and cannot delete own\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.DefaultMediaViewerEntryPointTest.test node builder avatar\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - change mode\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - bottom sheet state - other message and cannot delete other\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - view in timeline hides the bottom sheet and invokes the navigator\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.forward.impl.DefaultForwardEntryPointTest.test node builder\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - initial state cannot show info\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - snackbar displayed when there is no more items forward files and audio\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - delete\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - view in timeline closes the bottom sheet and invokes the navigator\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.details.MediaDetailsBottomSheetTest.clicking on View in timeline invokes expected callback\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.DefaultRoomDetailsEntryPointTest.test node builder\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.DefaultMessagesEntryPointTest.test initial target to nav target mapping\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.appnav.JoinedRoomLoadedFlowNodeTest.the ActiveRoomsHolder will be updated with the loaded room on create\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.appnav.JoinedRoomLoadedFlowNodeTest.given a room flow node when initialized then it loads messages entry point if room is not space\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - save on disk\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - delete item\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - initial state null Event\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.DefaultMediaViewerEntryPointTest.test node builder\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.details.MediaDetailsBottomSheetTest.clicking on Forward invokes expected callback\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - load more\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - load more\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - save on disk - item found - download error\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - load media\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - share item - item not found\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - share item - item found\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - forward hides the bottom sheet and invokes the navigator\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.forward.impl.ForwardMessagesViewTest.cancel error emits the expected event\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.forward.impl.ForwardMessagesPresenterTest.present - select a room and forward failed, then clear\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.forward.impl.ForwardMessagesPresenterTest.present - forward successful\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.DefaultMessagesEntryPointTest.test node builder\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - snackbar displayed when there is no more items backward files and audio\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.appnav.JoinedRoomLoadedFlowNodeTest.given a room flow node when initialized then it loads space entry point if room is space\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - initial state Event\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.appnav.JoinedRoomLoadedFlowNodeTest.the ActiveRoomsHolder will be removed on destroy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.forward.impl.ForwardMessagesPresenterTest.present - initial state\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - share item - item found - download error\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - initial state Event from other\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.appnav.JoinedRoomLoadedFlowNodeTest.given a room flow node when callback on room details is triggered then it loads room details entry point\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - open info\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - save on disk - item not found\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - no snackbar displayed when there is no more items but not displaying a loading item\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.details.MediaDetailsBottomSheetTest.Remove is not present if canDelete is false\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.details.MediaDetailsBottomSheetTest.clicking on Save invokes expected callback\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - bottom sheet state - other message and can delete other\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - forward closes the bottom sheet and invokes the navigator\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.DefaultMediaGalleryEntryPointTest.test node builder\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - initial state\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - open with\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - on navigate to\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - delete and cancel\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.details.MediaDetailsBottomSheetTest.clicking on Share invokes expected callback\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - clear loading error\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.details.MediaDetailsBottomSheetTest.clicking on Remove invokes expected callback\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.DefaultRoomDetailsEntryPointTest.test initial target to nav target mapping\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.forward.impl.ForwardMessagesViewTest.success invokes onForwardSuccess\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - share\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - save on disk - item found\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-5498", "org": "element-hq", "repo": "element-x-android", "number": 5498, "state": "closed", "title": "Filter out direct room in the leave space screen.", "body": "\r\n \r\n## Content\r\n\r\n\r\nFilter out direct room in the leave space screen.\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #5496\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\nNo expected change\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Add a DM to a space (using a client capable of doing this)\r\n- Attempt to leave the space\r\n- Observe that the DM is not listed in the room that can be left\r\n- leave the space\r\n- observe that the DM has not been left.\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 24\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"dbc0c42e312ed3aaafc01232c48b26f724c0d044\"}", "resolved_issues": "[{\"number\": 5496, \"title\": \"Leave space: DMs should not be displayed in the list\", \"body\": \"In the first iteration, we consider DMs important rooms we do not want to leave.\"}]", "lang": "kotlin", "problem_statement": "Leave space: DMs should not be displayed in the list\nIn the first iteration, we consider DMs important rooms we do not want to leave.\n", "hints": NaN, "pull_url": "https://github.com/element-hq/element-x-android/pull/5498", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/5496\"]", "test_command": "./gradlew :features:space:impl:testDebugUnitTest --tests \"io.element.android.features.space.impl.leave.LeaveSpacePresenterTest\"", "fix_patch": "diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt\nindex 31271104a31..19e593bf7c0 100644\n--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt\n+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt\n@@ -66,7 +66,8 @@ class LeaveSpacePresenter(\n .orEmpty()\n .partition { it.spaceRoom.roomId == leaveSpaceHandle.id }\n // By default select all rooms that can be left\n- selectedRoomIds = otherRooms\n+ val otherRoomsExcludingDm = otherRooms.filter { it.spaceRoom.isDirect != true }\n+ selectedRoomIds = otherRoomsExcludingDm\n .filter { it.isLastAdmin.not() }\n .map { it.spaceRoom.roomId }\n leaveSpaceRooms = rooms.fold(\n@@ -74,7 +75,7 @@ class LeaveSpacePresenter(\n AsyncData.Success(\n LeaveSpaceRooms(\n current = currentRoom.firstOrNull(),\n- others = otherRooms.toImmutableList(),\n+ others = otherRoomsExcludingDm.toImmutableList(),\n )\n )\n },\n", "test_patch": "diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt\nindex 81920dd0f22..3d123f3f41c 100644\n--- a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt\n+++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt\n@@ -16,6 +16,7 @@ import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n import io.element.android.libraries.matrix.test.AN_EXCEPTION\n import io.element.android.libraries.matrix.test.A_ROOM_ID\n import io.element.android.libraries.matrix.test.A_ROOM_ID_2\n+import io.element.android.libraries.matrix.test.A_ROOM_ID_3\n import io.element.android.libraries.matrix.test.A_SPACE_ID\n import io.element.android.libraries.matrix.test.A_SPACE_NAME\n import io.element.android.libraries.matrix.test.spaces.FakeLeaveSpaceHandle\n@@ -91,6 +92,50 @@ class LeaveSpacePresenterTest {\n }\n }\n \n+ @Test\n+ fun `present - direct rooms are filtered out`() = runTest {\n+ val leaveResult = lambdaRecorder, Result> { Result.success(Unit) }\n+ val presenter = createLeaveSpacePresenter(\n+ leaveSpaceHandle = FakeLeaveSpaceHandle(\n+ roomsResult = {\n+ Result.success(\n+ listOf(\n+ aLeaveSpaceRoom(spaceRoom = aSpace),\n+ aLeaveSpaceRoom(\n+ spaceRoom = aSpaceRoom(roomId = A_ROOM_ID, isDirect = false)\n+ ),\n+ aLeaveSpaceRoom(\n+ spaceRoom = aSpaceRoom(roomId = A_ROOM_ID_2, isDirect = true)\n+ ),\n+ aLeaveSpaceRoom(\n+ spaceRoom = aSpaceRoom(roomId = A_ROOM_ID_3, isDirect = null)\n+ ),\n+ )\n+ )\n+ },\n+ leaveResult = leaveResult,\n+ )\n+ )\n+ presenter.test {\n+ val state = awaitItem()\n+ assertThat(state.spaceName).isNull()\n+ skipItems(3)\n+ val finalState = awaitItem()\n+ // The current state is not in the sub room list\n+ assertThat(finalState.selectableSpaceRooms.dataOrNull()!!.map { it.spaceRoom.roomId }).containsExactly(A_ROOM_ID, A_ROOM_ID_3)\n+ assertThat(finalState.selectedRoomsCount).isEqualTo(2)\n+ // Leaving the space will not include the DM\n+ finalState.eventSink(LeaveSpaceEvents.LeaveSpace)\n+ val stateLeaving = awaitItem()\n+ assertThat(stateLeaving.leaveSpaceAction).isEqualTo(AsyncAction.Loading)\n+ val stateLeft = awaitItem()\n+ assertThat(stateLeft.leaveSpaceAction.isSuccess()).isTrue()\n+ leaveResult.assertions().isCalledOnce().with(\n+ value(listOf(A_ROOM_ID, A_ROOM_ID_3))\n+ )\n+ }\n+ }\n+\n @Test\n fun `present - leave space and sub rooms`() = runTest {\n val leaveResult = lambdaRecorder, Result> { Result.success(Unit) }\n", "n2p_tests": "{\"io.element.android.features.space.impl.leave.LeaveSpacePresenterTest.present - initial state\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.space.impl.leave.LeaveSpacePresenterTest.present - current space name and is last admin\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.space.impl.leave.LeaveSpacePresenterTest.present - leave space error and close\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.space.impl.leave.LeaveSpacePresenterTest.present - direct rooms are filtered out\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"io.element.android.features.space.impl.leave.LeaveSpacePresenterTest.present - leave space and sub rooms\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"io.element.android.features.space.impl.leave.LeaveSpacePresenterTest.present - fail to load rooms\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-5320", "org": "element-hq", "repo": "element-x-android", "number": 5320, "state": "closed", "title": "Space list", "body": "\r\n \r\n## Content\r\n\r\n\r\nAllow navigation in the Space hierarchy, including ending up opening rooms.\r\n\r\nNote: the branch `feature/fga/space_list2` is a new branch with @ganfra 's commits from the branch `feature/fga/space_list`, and cleanup commits and commits that add TU from me.\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #5125\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\n## Tests\r\n\r\n\r\n\r\n- With an account with Spaces\r\n- Enable Spaces FF\r\n- Navigate to the space tab\r\n- Observe that you can now click on any listed Spaces, in this case, it will open the Space screen with header and room / space list if the space has already been joined. Joining space is not part of this PR.\r\n- Observe that you can now click on any listed room, in this case, it will open the timeline if the room has been joined, or the already existing screen for room preview.\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 24\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"7e0931c299774b4fdb668bc17c3fcb3c5f1ac215\"}", "resolved_issues": "[{\"number\": 5125, \"title\": \"[Task] Create a SpaceList screen.\", \"body\": \"This is the top-level screen shown in the Spaces tab.\\n\\nPlease see and discuss the details in the meta issue.\\n\"}]", "lang": "kotlin", "problem_statement": "[Task] Create a SpaceList screen.\nThis is the top-level screen shown in the Spaces tab.\n\nPlease see and discuss the details in the meta issue.\n\n", "hints": NaN, "pull_url": "https://github.com/element-hq/element-x-android/pull/5320", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/5125\"]", "test_command": "./gradlew :libraries:matrix:impl:testDebugUnitTest --tests \"io.element.android.libraries.matrix.impl.spaces.SpaceRoomCacheTest\" --tests \"io.element.android.libraries.matrix.impl.fixtures.factories.SpaceRoom\" --tests \"io.element.android.libraries.matrix.impl.spaces.RoomSummaryListProcessorTest\" --tests \"io.element.android.libraries.matrix.impl.spaces.RustSpaceRoomListTest\" :features:space:impl:testDebugUnitTest --tests \"io.element.android.features.space.impl.SpacePresenterTest\"", "fix_patch": "diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt\nindex 2d08d5f6f5c..97fff8ee5c2 100644\n--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt\n+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt\n@@ -60,6 +60,7 @@ import io.element.android.features.roomdirectory.api.RoomDescription\n import io.element.android.features.roomdirectory.api.RoomDirectoryEntryPoint\n import io.element.android.features.securebackup.api.SecureBackupEntryPoint\n import io.element.android.features.share.api.ShareEntryPoint\n+import io.element.android.features.space.api.SpaceEntryPoint\n import io.element.android.features.startchat.api.StartChatEntryPoint\n import io.element.android.features.userprofile.api.UserProfileEntryPoint\n import io.element.android.features.verifysession.api.IncomingVerificationEntryPoint\n@@ -334,7 +335,7 @@ class LoggedInFlowNode(\n .build()\n }\n is NavTarget.Room -> {\n- val callback = object : JoinedRoomLoadedFlowNode.Callback {\n+ val joinedRoomCallback = object : JoinedRoomLoadedFlowNode.Callback {\n override fun onOpenRoom(roomId: RoomId, serverNames: List) {\n backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), serverNames))\n }\n@@ -373,6 +374,11 @@ class LoggedInFlowNode(\n backstack.push(NavTarget.Settings(PreferencesEntryPoint.InitialTarget.NotificationSettings))\n }\n }\n+ val spaceCallback = object : SpaceEntryPoint.Callback {\n+ override fun onOpenRoom(roomId: RoomId) {\n+ backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias()))\n+ }\n+ }\n val inputs = RoomFlowNode.Inputs(\n roomIdOrAlias = navTarget.roomIdOrAlias,\n roomDescription = Optional.ofNullable(navTarget.roomDescription),\n@@ -380,7 +386,7 @@ class LoggedInFlowNode(\n trigger = Optional.ofNullable(navTarget.trigger),\n initialElement = navTarget.initialElement\n )\n- createNode(buildContext, plugins = listOf(inputs, callback))\n+ createNode(buildContext, plugins = listOf(inputs, joinedRoomCallback, spaceCallback))\n }\n is NavTarget.UserProfile -> {\n val callback = object : UserProfileEntryPoint.Callback {\ndiff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt\nindex 12d9df78cfa..f2df6ee8c9f 100644\n--- a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt\n+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt\n@@ -30,7 +30,9 @@ import io.element.android.appnav.room.joined.JoinedRoomLoadedFlowNode\n import io.element.android.appnav.room.joined.LoadingRoomNodeView\n import io.element.android.features.joinroom.api.JoinRoomEntryPoint\n import io.element.android.features.roomaliasesolver.api.RoomAliasResolverEntryPoint\n+import io.element.android.features.roomaliasesolver.api.RoomAliasResolverEntryPoint.Params\n import io.element.android.features.roomdirectory.api.RoomDescription\n+import io.element.android.features.space.api.SpaceEntryPoint\n import io.element.android.libraries.architecture.BackstackView\n import io.element.android.libraries.architecture.BaseFlowNode\n import io.element.android.libraries.architecture.NodeInputs\n@@ -72,6 +74,7 @@ class RoomFlowNode(\n private val roomAliasResolverEntryPoint: RoomAliasResolverEntryPoint,\n private val syncService: SyncService,\n private val membershipObserver: RoomMembershipObserver,\n+ private val spaceEntryPoint: SpaceEntryPoint,\n ) : BaseFlowNode(\n backstack = BackStack(\n initialElement = NavTarget.Loading,\n@@ -106,6 +109,9 @@ class RoomFlowNode(\n \n @Parcelize\n data class JoinedRoom(val roomId: RoomId) : NavTarget\n+\n+ @Parcelize\n+ data class Space(val spaceId: RoomId) : NavTarget\n }\n \n override fun onBuilt() {\n@@ -146,17 +152,7 @@ class RoomFlowNode(\n when (membership) {\n CurrentUserMembership.JOINED -> {\n if (isSpace) {\n- // It should not happen, but probably due to an issue in the sliding sync,\n- // we can have a space here in case the space has just been joined.\n- // So navigate to the JoinRoom target for now, which will\n- // handle the space not supported screen\n- backstack.newRoot(\n- NavTarget.JoinRoom(\n- roomId = roomId,\n- serverNames = serverNames,\n- trigger = inputs.trigger.getOrNull() ?: JoinedRoom.Trigger.Invite,\n- )\n- )\n+ backstack.newRoot(NavTarget.Space(spaceId = roomId))\n } else {\n backstack.newRoot(NavTarget.JoinedRoom(roomId))\n }\n@@ -194,7 +190,7 @@ class RoomFlowNode(\n )\n }\n }\n- val params = RoomAliasResolverEntryPoint.Params(navTarget.roomAlias)\n+ val params = Params(navTarget.roomAlias)\n roomAliasResolverEntryPoint.nodeBuilder(this, buildContext)\n .callback(callback)\n .params(params)\n@@ -218,6 +214,13 @@ class RoomFlowNode(\n )\n createNode(buildContext, plugins = listOf(inputs) + roomFlowNodeCallback)\n }\n+ is NavTarget.Space -> {\n+ val spaceCallback = plugins().single()\n+ spaceEntryPoint.nodeBuilder(this, buildContext)\n+ .inputs(SpaceEntryPoint.Inputs(roomId = navTarget.spaceId))\n+ .callback(spaceCallback)\n+ .build()\n+ }\n }\n }\n \ndiff --git a/features/home/impl/build.gradle.kts b/features/home/impl/build.gradle.kts\nindex 57fefaf4132..f0ebe6c02d9 100644\n--- a/features/home/impl/build.gradle.kts\n+++ b/features/home/impl/build.gradle.kts\n@@ -55,6 +55,7 @@ dependencies {\n implementation(libs.haze.materials)\n implementation(projects.features.reportroom.api)\n implementation(projects.features.changeroommemberroles.api)\n+ implementation(projects.libraries.previewutils)\n api(projects.features.home.api)\n \n testImplementation(libs.androidx.compose.ui.test.junit)\ndiff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt\nindex 6d531504ab4..37727712fba 100644\n--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt\n+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt\n@@ -269,7 +269,7 @@ private fun HomeScaffold(\n .hazeSource(state = hazeState),\n state = state.homeSpacesState,\n onSpaceClick = { spaceId ->\n- // TODO\n+ onRoomClick(spaceId)\n }\n )\n }\ndiff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt\nindex 9c77ab816ae..b8e299c5e96 100644\n--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt\n+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt\n@@ -36,7 +36,6 @@ import io.element.android.features.leaveroom.api.LeaveRoomEvent\n import io.element.android.features.leaveroom.api.LeaveRoomState\n import io.element.android.libraries.architecture.AsyncData\n import io.element.android.libraries.architecture.Presenter\n-import io.element.android.libraries.core.coroutine.mapState\n import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState\n import io.element.android.libraries.matrix.api.MatrixClient\n import io.element.android.libraries.matrix.api.core.RoomId\n@@ -44,6 +43,7 @@ import io.element.android.libraries.matrix.api.encryption.EncryptionService\n import io.element.android.libraries.matrix.api.encryption.RecoveryState\n import io.element.android.libraries.matrix.api.roomlist.RoomList\n import io.element.android.libraries.matrix.api.timeline.ReceiptType\n+import io.element.android.libraries.matrix.ui.safety.rememberHideInvitesAvatar\n import io.element.android.libraries.preferences.api.store.AppPreferencesStore\n import io.element.android.libraries.preferences.api.store.SessionPreferencesStore\n import io.element.android.libraries.push.api.battery.BatteryOptimizationState\n@@ -101,12 +101,7 @@ class RoomListPresenter(\n var securityBannerDismissed by rememberSaveable { mutableStateOf(false) }\n \n // Avatar indicator\n- val hideInvitesAvatar by remember {\n- client\n- .mediaPreviewService()\n- .mediaPreviewConfigFlow\n- .mapState { config -> config.hideInviteAvatar }\n- }.collectAsState()\n+ val hideInvitesAvatar by client.rememberHideInvitesAvatar()\n \n val contextMenu = remember { mutableStateOf(RoomListState.ContextMenu.Hidden) }\n val declineInviteMenu = remember { mutableStateOf(RoomListState.DeclineInviteMenu.Hidden) }\ndiff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesPresenter.kt\nindex 29ceca14bfc..dea6defc0a1 100644\n--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesPresenter.kt\n+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesPresenter.kt\n@@ -13,10 +13,9 @@ import androidx.compose.runtime.getValue\n import androidx.compose.runtime.remember\n import dev.zacsweers.metro.Inject\n import io.element.android.features.invite.api.SeenInvitesStore\n-import io.element.android.features.invite.api.seenSpaceIds\n import io.element.android.libraries.architecture.Presenter\n-import io.element.android.libraries.core.coroutine.mapState\n import io.element.android.libraries.matrix.api.MatrixClient\n+import io.element.android.libraries.matrix.ui.safety.rememberHideInvitesAvatar\n import kotlinx.collections.immutable.persistentSetOf\n import kotlinx.collections.immutable.toPersistentSet\n import kotlinx.coroutines.flow.map\n@@ -28,15 +27,10 @@ class HomeSpacesPresenter(\n ) : Presenter {\n @Composable\n override fun present(): HomeSpacesState {\n- val hideInvitesAvatar by remember {\n- client\n- .mediaPreviewService()\n- .mediaPreviewConfigFlow\n- .mapState { config -> config.hideInviteAvatar }\n- }.collectAsState()\n- val spaceRooms by client.spaceService.spaceRooms.collectAsState(emptyList())\n+ val hideInvitesAvatar by client.rememberHideInvitesAvatar()\n+ val spaceRooms by client.spaceService.spaceRoomsFlow.collectAsState(emptyList())\n val seenSpaceInvites by remember {\n- seenInvitesStore.seenSpaceIds().map { it.toPersistentSet() }\n+ seenInvitesStore.seenRoomIds().map { it.toPersistentSet() }\n }.collectAsState(persistentSetOf())\n \n fun handleEvents(event: HomeSpacesEvents) {\ndiff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesState.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesState.kt\nindex 6def46c7b35..96733991f9c 100644\n--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesState.kt\n+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesState.kt\n@@ -7,14 +7,14 @@\n \n package io.element.android.features.home.impl.spaces\n \n-import io.element.android.libraries.matrix.api.core.SpaceId\n+import io.element.android.libraries.matrix.api.core.RoomId\n import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n import kotlinx.collections.immutable.ImmutableSet\n \n data class HomeSpacesState(\n val space: CurrentSpace,\n val spaceRooms: List,\n- val seenSpaceInvites: ImmutableSet,\n+ val seenSpaceInvites: ImmutableSet,\n val hideInvitesAvatar: Boolean,\n val eventSink: (HomeSpacesEvents) -> Unit,\n )\ndiff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesStateProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesStateProvider.kt\nindex 466f515b263..921c3408864 100644\n--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesStateProvider.kt\n+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesStateProvider.kt\n@@ -8,8 +8,9 @@\n package io.element.android.features.home.impl.spaces\n \n import androidx.compose.ui.tooling.preview.PreviewParameterProvider\n-import io.element.android.libraries.matrix.api.core.SpaceId\n+import io.element.android.libraries.matrix.api.core.RoomId\n import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n+import io.element.android.libraries.previewutils.room.aSpaceRoom\n import kotlinx.collections.immutable.toImmutableSet\n \n open class HomeSpacesStateProvider : PreviewParameterProvider {\n@@ -18,12 +19,12 @@ open class HomeSpacesStateProvider : PreviewParameterProvider {\n aHomeSpacesState(\n spaceRooms = SpaceRoomProvider().values.toList(),\n seenSpaceInvites = setOf(\n- SpaceId(\"!spaceId3:example.com\"),\n+ RoomId(\"!spaceId3:example.com\"),\n ),\n ),\n aHomeSpacesState(\n space = CurrentSpace.Space(\n- spaceRoom = aSpaceRooms(spaceId = SpaceId(\"!mySpace:example.com\"))\n+ spaceRoom = aSpaceRoom(roomId = RoomId(\"!mySpace:example.com\"))\n ),\n spaceRooms = aListOfSpaceRooms(),\n ),\n@@ -33,7 +34,7 @@ open class HomeSpacesStateProvider : PreviewParameterProvider {\n internal fun aHomeSpacesState(\n space: CurrentSpace = CurrentSpace.Root,\n spaceRooms: List = aListOfSpaceRooms(),\n- seenSpaceInvites: Set = emptySet(),\n+ seenSpaceInvites: Set = emptySet(),\n hideInvitesAvatar: Boolean = false,\n eventSink: (HomeSpacesEvents) -> Unit = {},\n ) = HomeSpacesState(\n@@ -46,8 +47,8 @@ internal fun aHomeSpacesState(\n \n fun aListOfSpaceRooms(): List {\n return listOf(\n- aSpaceRooms(spaceId = SpaceId(\"!spaceId0:example.com\")),\n- aSpaceRooms(spaceId = SpaceId(\"!spaceId1:example.com\")),\n- aSpaceRooms(spaceId = SpaceId(\"!spaceId2:example.com\")),\n+ aSpaceRoom(roomId = RoomId(\"!spaceId0:example.com\")),\n+ aSpaceRoom(roomId = RoomId(\"!spaceId1:example.com\")),\n+ aSpaceRoom(roomId = RoomId(\"!spaceId2:example.com\")),\n )\n }\ndiff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt\nindex be6639e94b8..8b07b9f5260 100644\n--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt\n+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt\n@@ -14,17 +14,18 @@ import androidx.compose.ui.tooling.preview.PreviewParameter\n import io.element.android.libraries.designsystem.components.avatar.AvatarSize\n import io.element.android.libraries.designsystem.preview.ElementPreview\n import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n-import io.element.android.libraries.matrix.api.core.SpaceId\n+import io.element.android.libraries.matrix.api.core.RoomId\n import io.element.android.libraries.matrix.api.room.CurrentUserMembership\n import io.element.android.libraries.matrix.ui.components.SpaceHeaderRootView\n import io.element.android.libraries.matrix.ui.components.SpaceHeaderView\n+import io.element.android.libraries.matrix.ui.components.SpaceRoomItemView\n import io.element.android.libraries.matrix.ui.model.getAvatarData\n import kotlinx.collections.immutable.toImmutableList\n \n @Composable\n fun HomeSpacesView(\n state: HomeSpacesState,\n- onSpaceClick: (SpaceId) -> Unit,\n+ onSpaceClick: (RoomId) -> Unit,\n modifier: Modifier = Modifier,\n ) {\n LazyColumn(modifier) {\n@@ -51,15 +52,18 @@ fun HomeSpacesView(\n )\n }\n }\n- state.spaceRooms.forEach {\n- item(it.spaceId) {\n- val isInvitation = it.state == CurrentUserMembership.INVITED\n- HomeSpaceItemView(\n- spaceRoom = it,\n- showUnreadIndicator = isInvitation && it.spaceId !in state.seenSpaceInvites,\n+ state.spaceRooms.forEach { spaceRoom ->\n+ item(spaceRoom.roomId) {\n+ val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED\n+ SpaceRoomItemView(\n+ spaceRoom = spaceRoom,\n+ showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,\n hideAvatars = isInvitation && state.hideInvitesAvatar,\n onClick = {\n- onSpaceClick(it.spaceId)\n+ onSpaceClick(spaceRoom.roomId)\n+ },\n+ onLongClick = {\n+ // TODO\n }\n )\n }\ndiff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt\nindex 29c18c78a0e..474e08293a2 100644\n--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt\n+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt\n@@ -8,77 +8,44 @@\n package io.element.android.features.home.impl.spaces\n \n import androidx.compose.ui.tooling.preview.PreviewParameterProvider\n-import io.element.android.libraries.matrix.api.core.RoomAlias\n-import io.element.android.libraries.matrix.api.core.SpaceId\n+import io.element.android.libraries.matrix.api.core.RoomId\n import io.element.android.libraries.matrix.api.room.CurrentUserMembership\n-import io.element.android.libraries.matrix.api.room.RoomType\n-import io.element.android.libraries.matrix.api.room.join.JoinRule\n import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n-import io.element.android.libraries.matrix.api.user.MatrixUser\n+import io.element.android.libraries.previewutils.room.aSpaceRoom\n \n class SpaceRoomProvider : PreviewParameterProvider {\n override val values: Sequence = sequenceOf(\n- aSpaceRooms(),\n- aSpaceRooms(\n+ aSpaceRoom(),\n+ aSpaceRoom(\n numJoinedMembers = 5,\n childrenCount = 10,\n worldReadable = true,\n- spaceId = SpaceId(\"!spaceId0:example.com\"),\n+ roomId = RoomId(\"!spaceId0:example.com\"),\n ),\n- aSpaceRooms(\n+ aSpaceRoom(\n numJoinedMembers = 5,\n childrenCount = 10,\n worldReadable = true,\n avatarUrl = \"anUrl\",\n- spaceId = SpaceId(\"!spaceId1:example.com\"),\n+ roomId = RoomId(\"!spaceId1:example.com\"),\n ),\n- aSpaceRooms(\n+ aSpaceRoom(\n name = null,\n numJoinedMembers = 5,\n childrenCount = 10,\n worldReadable = true,\n avatarUrl = \"anUrl\",\n- spaceId = SpaceId(\"!spaceId2:example.com\"),\n+ roomId = RoomId(\"!spaceId2:example.com\"),\n state = CurrentUserMembership.INVITED,\n ),\n- aSpaceRooms(\n+ aSpaceRoom(\n name = null,\n numJoinedMembers = 5,\n childrenCount = 10,\n worldReadable = true,\n avatarUrl = \"anUrl\",\n- spaceId = SpaceId(\"!spaceId3:example.com\"),\n+ roomId = RoomId(\"!spaceId3:example.com\"),\n state = CurrentUserMembership.INVITED,\n ),\n )\n }\n-\n-fun aSpaceRooms(\n- name: String? = \"Space name\",\n- avatarUrl: String? = null,\n- canonicalAlias: RoomAlias? = null,\n- childrenCount: Int = 0,\n- guestCanJoin: Boolean = false,\n- heroes: List = emptyList(),\n- joinRule: JoinRule? = null,\n- numJoinedMembers: Int = 0,\n- spaceId: SpaceId = SpaceId(\"!spaceId:example.com\"),\n- roomType: RoomType = RoomType.Space,\n- state: CurrentUserMembership? = null,\n- topic: String? = null,\n- worldReadable: Boolean = false,\n-) = SpaceRoom(\n- name = name,\n- avatarUrl = avatarUrl,\n- canonicalAlias = canonicalAlias,\n- childrenCount = childrenCount,\n- guestCanJoin = guestCanJoin,\n- heroes = heroes,\n- joinRule = joinRule,\n- numJoinedMembers = numJoinedMembers,\n- spaceId = spaceId,\n- roomType = roomType,\n- state = state,\n- topic = topic,\n- worldReadable = worldReadable\n-)\ndiff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/SeenInvitesStore.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/SeenInvitesStore.kt\nindex 6c609e3810f..682970ffe7d 100644\n--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/SeenInvitesStore.kt\n+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/SeenInvitesStore.kt\n@@ -8,10 +8,7 @@\n package io.element.android.features.invite.api\n \n import io.element.android.libraries.matrix.api.core.RoomId\n-import io.element.android.libraries.matrix.api.core.SpaceId\n-import io.element.android.libraries.matrix.api.core.toSpaceId\n import kotlinx.coroutines.flow.Flow\n-import kotlinx.coroutines.flow.map\n \n interface SeenInvitesStore {\n /**\n@@ -38,9 +35,3 @@ interface SeenInvitesStore {\n */\n suspend fun clear()\n }\n-\n-fun SeenInvitesStore.seenSpaceIds(): Flow> {\n- return seenRoomIds().map { roomIds ->\n- roomIds.map { it.toSpaceId() }.toSet()\n- }\n-}\ndiff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt\nindex 04e5b904e64..5fe12a42d9f 100644\n--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt\n+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt\n@@ -34,7 +34,6 @@ import io.element.android.features.roomdirectory.api.RoomDescription\n import io.element.android.libraries.architecture.AsyncAction\n import io.element.android.libraries.architecture.Presenter\n import io.element.android.libraries.architecture.runUpdatingState\n-import io.element.android.libraries.core.coroutine.mapState\n import io.element.android.libraries.core.meta.BuildMeta\n import io.element.android.libraries.matrix.api.MatrixClient\n import io.element.android.libraries.matrix.api.core.RoomId\n@@ -50,6 +49,7 @@ import io.element.android.libraries.matrix.api.room.join.JoinRoom\n import io.element.android.libraries.matrix.api.room.join.JoinRule\n import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo\n import io.element.android.libraries.matrix.ui.model.toInviteSender\n+import io.element.android.libraries.matrix.ui.safety.rememberHideInvitesAvatar\n import kotlinx.coroutines.CoroutineScope\n import kotlinx.coroutines.launch\n import java.util.Optional\n@@ -93,12 +93,7 @@ class JoinRoomPresenter(\n val forgetRoomAction: MutableState> = remember { mutableStateOf(AsyncAction.Uninitialized) }\n var knockMessage by rememberSaveable { mutableStateOf(\"\") }\n var isDismissingContent by remember { mutableStateOf(false) }\n- val hideInviteAvatars by remember {\n- matrixClient\n- .mediaPreviewService()\n- .mediaPreviewConfigFlow\n- .mapState { config -> config.hideInviteAvatar }\n- }.collectAsState()\n+ val hideInviteAvatars by matrixClient.rememberHideInvitesAvatar()\n val canReportRoom by produceState(false) { value = matrixClient.canReportRoom() }\n \n val contentState by produceState(\ndiff --git a/features/space/api/build.gradle.kts b/features/space/api/build.gradle.kts\nnew file mode 100644\nindex 00000000000..dd19efefece\n--- /dev/null\n+++ b/features/space/api/build.gradle.kts\n@@ -0,0 +1,18 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+plugins {\n+ id(\"io.element.android-library\")\n+}\n+\n+android {\n+ namespace = \"io.element.android.features.space.api\"\n+}\n+\n+dependencies {\n+ implementation(projects.libraries.architecture)\n+ implementation(projects.libraries.matrix.api)\n+}\ndiff --git a/features/space/api/src/main/kotlin/io/element/android/features/space/api/SpaceEntryPoint.kt b/features/space/api/src/main/kotlin/io/element/android/features/space/api/SpaceEntryPoint.kt\nnew file mode 100644\nindex 00000000000..88cbbad5ddd\n--- /dev/null\n+++ b/features/space/api/src/main/kotlin/io/element/android/features/space/api/SpaceEntryPoint.kt\n@@ -0,0 +1,35 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.features.space.api\n+\n+import com.bumble.appyx.core.modality.BuildContext\n+import com.bumble.appyx.core.node.Node\n+import com.bumble.appyx.core.plugin.Plugin\n+import io.element.android.libraries.architecture.FeatureEntryPoint\n+import io.element.android.libraries.matrix.api.core.RoomId\n+\n+interface SpaceEntryPoint : FeatureEntryPoint {\n+ fun nodeBuilder(\n+ parentNode: Node,\n+ buildContext: BuildContext,\n+ ): NodeBuilder\n+\n+ interface NodeBuilder {\n+ fun inputs(inputs: Inputs): NodeBuilder\n+ fun callback(callback: Callback): NodeBuilder\n+ fun build(): Node\n+ }\n+\n+ data class Inputs(\n+ val roomId: RoomId\n+ ) : Plugin\n+\n+ interface Callback : Plugin {\n+ fun onOpenRoom(roomId: RoomId)\n+ }\n+}\ndiff --git a/features/space/impl/build.gradle.kts b/features/space/impl/build.gradle.kts\nnew file mode 100644\nindex 00000000000..b41f8ebc939\n--- /dev/null\n+++ b/features/space/impl/build.gradle.kts\n@@ -0,0 +1,57 @@\n+import extension.setupDependencyInjection\n+\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+plugins {\n+ id(\"io.element.android-compose-library\")\n+ id(\"kotlin-parcelize\")\n+}\n+\n+android {\n+ namespace = \"io.element.android.features.space.impl\"\n+\n+ testOptions {\n+ unitTests {\n+ isIncludeAndroidResources = true\n+ }\n+ }\n+}\n+\n+setupDependencyInjection()\n+\n+dependencies {\n+ implementation(projects.libraries.core)\n+ implementation(projects.libraries.architecture)\n+ implementation(projects.libraries.matrix.api)\n+ implementation(projects.libraries.matrixui)\n+ implementation(projects.libraries.designsystem)\n+ implementation(projects.libraries.uiStrings)\n+ implementation(projects.libraries.androidutils)\n+ implementation(projects.libraries.deeplink.api)\n+ implementation(projects.services.analytics.api)\n+ implementation(libs.coil.compose)\n+ implementation(projects.libraries.featureflag.api)\n+ implementation(projects.features.invite.api)\n+ implementation(projects.libraries.previewutils)\n+ api(projects.features.space.api)\n+\n+ testImplementation(libs.test.junit)\n+ testImplementation(libs.test.mockk)\n+ testImplementation(libs.coroutines.test)\n+ testImplementation(libs.molecule.runtime)\n+ testImplementation(libs.test.truth)\n+ testImplementation(libs.test.turbine)\n+ testImplementation(libs.test.robolectric)\n+ testImplementation(projects.services.analytics.test)\n+ testImplementation(projects.libraries.matrix.test)\n+ testImplementation(projects.libraries.featureflag.test)\n+ testImplementation(projects.tests.testutils)\n+ testImplementation(libs.androidx.compose.ui.test.junit)\n+ testImplementation(projects.features.invite.test)\n+ testReleaseImplementation(libs.androidx.compose.ui.test.manifest)\n+}\ndiff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPoint.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPoint.kt\nnew file mode 100644\nindex 00000000000..1ef8275b275\n--- /dev/null\n+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPoint.kt\n@@ -0,0 +1,40 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.features.space.impl\n+\n+import com.bumble.appyx.core.modality.BuildContext\n+import com.bumble.appyx.core.node.Node\n+import com.bumble.appyx.core.plugin.Plugin\n+import dev.zacsweers.metro.ContributesBinding\n+import dev.zacsweers.metro.Inject\n+import io.element.android.features.space.api.SpaceEntryPoint\n+import io.element.android.libraries.architecture.createNode\n+import io.element.android.libraries.di.SessionScope\n+\n+@ContributesBinding(SessionScope::class)\n+@Inject\n+class DefaultSpaceEntryPoint : SpaceEntryPoint {\n+ override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): SpaceEntryPoint.NodeBuilder {\n+ val plugins = mutableSetOf()\n+ return object : SpaceEntryPoint.NodeBuilder {\n+ override fun inputs(inputs: SpaceEntryPoint.Inputs): SpaceEntryPoint.NodeBuilder {\n+ plugins.add(inputs)\n+ return this\n+ }\n+\n+ override fun callback(callback: SpaceEntryPoint.Callback): SpaceEntryPoint.NodeBuilder {\n+ plugins.add(callback)\n+ return this\n+ }\n+\n+ override fun build(): Node {\n+ return parentNode.createNode(buildContext, plugins = plugins.toList())\n+ }\n+ }\n+ }\n+}\ndiff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceEvents.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceEvents.kt\nnew file mode 100644\nindex 00000000000..848dac3ebce\n--- /dev/null\n+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceEvents.kt\n@@ -0,0 +1,12 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.features.space.impl\n+\n+sealed interface SpaceEvents {\n+ data object LoadMore : SpaceEvents\n+}\ndiff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceNode.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceNode.kt\nnew file mode 100644\nindex 00000000000..d37be4c76cf\n--- /dev/null\n+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceNode.kt\n@@ -0,0 +1,44 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.features.space.impl\n+\n+import androidx.compose.runtime.Composable\n+import androidx.compose.ui.Modifier\n+import com.bumble.appyx.core.modality.BuildContext\n+import com.bumble.appyx.core.node.Node\n+import com.bumble.appyx.core.plugin.Plugin\n+import dev.zacsweers.metro.Assisted\n+import dev.zacsweers.metro.Inject\n+import io.element.android.annotations.ContributesNode\n+import io.element.android.features.space.api.SpaceEntryPoint\n+import io.element.android.libraries.di.SessionScope\n+\n+@ContributesNode(SessionScope::class)\n+@Inject\n+class SpaceNode(\n+ @Assisted buildContext: BuildContext,\n+ @Assisted plugins: List,\n+ presenterFactory: SpacePresenter.Factory,\n+) : Node(buildContext, plugins = plugins) {\n+ private val inputs = plugins.filterIsInstance().single()\n+ private val callback = plugins.filterIsInstance().single()\n+ private val presenter = presenterFactory.create(inputs)\n+\n+ @Composable\n+ override fun View(modifier: Modifier) {\n+ val state = presenter.present()\n+ SpaceView(\n+ state = state,\n+ onBackClick = ::navigateUp,\n+ onRoomClick = { roomId ->\n+ callback.onOpenRoom(roomId)\n+ },\n+ modifier = modifier\n+ )\n+ }\n+}\ndiff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpacePresenter.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpacePresenter.kt\nnew file mode 100644\nindex 00000000000..95597371a6a\n--- /dev/null\n+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpacePresenter.kt\n@@ -0,0 +1,87 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.features.space.impl\n+\n+import androidx.compose.runtime.Composable\n+import androidx.compose.runtime.LaunchedEffect\n+import androidx.compose.runtime.collectAsState\n+import androidx.compose.runtime.getValue\n+import androidx.compose.runtime.remember\n+import androidx.compose.runtime.rememberCoroutineScope\n+import dev.zacsweers.metro.Assisted\n+import dev.zacsweers.metro.AssistedFactory\n+import dev.zacsweers.metro.Inject\n+import io.element.android.features.invite.api.SeenInvitesStore\n+import io.element.android.features.space.api.SpaceEntryPoint\n+import io.element.android.libraries.architecture.Presenter\n+import io.element.android.libraries.core.coroutine.mapState\n+import io.element.android.libraries.matrix.api.MatrixClient\n+import io.element.android.libraries.matrix.api.spaces.SpaceRoomList\n+import io.element.android.libraries.matrix.ui.safety.rememberHideInvitesAvatar\n+import kotlinx.collections.immutable.persistentSetOf\n+import kotlinx.collections.immutable.toPersistentList\n+import kotlinx.collections.immutable.toPersistentSet\n+import kotlinx.coroutines.CoroutineScope\n+import kotlinx.coroutines.flow.map\n+import kotlinx.coroutines.launch\n+\n+@Inject\n+class SpacePresenter(\n+ @Assisted private val inputs: SpaceEntryPoint.Inputs,\n+ private val client: MatrixClient,\n+ private val seenInvitesStore: SeenInvitesStore,\n+) : Presenter {\n+ @AssistedFactory\n+ interface Factory {\n+ fun create(inputs: SpaceEntryPoint.Inputs): SpacePresenter\n+ }\n+\n+ private val spaceRoomList = client.spaceService.spaceRoomList(inputs.roomId)\n+\n+ @Composable\n+ override fun present(): SpaceState {\n+ LaunchedEffect(Unit) {\n+ paginate()\n+ }\n+ val hideInvitesAvatar by client.rememberHideInvitesAvatar()\n+ val seenSpaceInvites by remember {\n+ seenInvitesStore.seenRoomIds().map { it.toPersistentSet() }\n+ }.collectAsState(persistentSetOf())\n+\n+ val coroutineScope = rememberCoroutineScope()\n+ val children by spaceRoomList.spaceRoomsFlow.collectAsState(emptyList())\n+ val hasMoreToLoad by remember {\n+ spaceRoomList.paginationStatusFlow.mapState { status ->\n+ when (status) {\n+ is SpaceRoomList.PaginationStatus.Idle -> status.hasMoreToLoad\n+ SpaceRoomList.PaginationStatus.Loading -> true\n+ }\n+ }\n+ }.collectAsState()\n+\n+ val currentSpace by remember { spaceRoomList.currentSpaceFlow() }.collectAsState(null)\n+\n+ fun handleEvents(event: SpaceEvents) {\n+ when (event) {\n+ SpaceEvents.LoadMore -> coroutineScope.paginate()\n+ }\n+ }\n+ return SpaceState(\n+ currentSpace = currentSpace,\n+ children = children.toPersistentList(),\n+ seenSpaceInvites = seenSpaceInvites,\n+ hideInvitesAvatar = hideInvitesAvatar,\n+ hasMoreToLoad = hasMoreToLoad,\n+ eventSink = ::handleEvents,\n+ )\n+ }\n+\n+ private fun CoroutineScope.paginate() = launch {\n+ spaceRoomList.paginate()\n+ }\n+}\ndiff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceState.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceState.kt\nnew file mode 100644\nindex 00000000000..ad822283ca6\n--- /dev/null\n+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceState.kt\n@@ -0,0 +1,22 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.features.space.impl\n+\n+import io.element.android.libraries.matrix.api.core.RoomId\n+import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n+import kotlinx.collections.immutable.ImmutableList\n+import kotlinx.collections.immutable.ImmutableSet\n+\n+data class SpaceState(\n+ val currentSpace: SpaceRoom?,\n+ val children: ImmutableList,\n+ val seenSpaceInvites: ImmutableSet,\n+ val hideInvitesAvatar: Boolean,\n+ val hasMoreToLoad: Boolean,\n+ val eventSink: (SpaceEvents) -> Unit\n+)\ndiff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceStateProvider.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceStateProvider.kt\nnew file mode 100644\nindex 00000000000..36c2ab62b02\n--- /dev/null\n+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceStateProvider.kt\n@@ -0,0 +1,60 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.features.space.impl\n+\n+import androidx.compose.ui.tooling.preview.PreviewParameterProvider\n+import io.element.android.libraries.matrix.api.core.RoomId\n+import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n+import io.element.android.libraries.previewutils.room.aSpaceRoom\n+import kotlinx.collections.immutable.toImmutableList\n+import kotlinx.collections.immutable.toImmutableSet\n+\n+open class SpaceStateProvider : PreviewParameterProvider {\n+ override val values: Sequence\n+ get() = sequenceOf(\n+ aSpaceState(),\n+ aSpaceState(hasMoreToLoad = true),\n+ aSpaceState(\n+ hasMoreToLoad = true,\n+ children = aListOfSpaceRooms(),\n+ ),\n+ aSpaceState(\n+ hasMoreToLoad = false,\n+ children = aListOfSpaceRooms()\n+ )\n+ // Add other states here\n+ )\n+}\n+\n+fun aSpaceState(\n+ parentSpace: SpaceRoom? = aSpaceRoom(\n+ numJoinedMembers = 5,\n+ childrenCount = 10,\n+ worldReadable = true,\n+ roomId = RoomId(\"!spaceId0:example.com\"),\n+ ),\n+ children: List = emptyList(),\n+ seenSpaceInvites: Set = emptySet(),\n+ hideInvitesAvatar: Boolean = false,\n+ hasMoreToLoad: Boolean = false,\n+) = SpaceState(\n+ currentSpace = parentSpace,\n+ children = children.toImmutableList(),\n+ seenSpaceInvites = seenSpaceInvites.toImmutableSet(),\n+ hideInvitesAvatar = hideInvitesAvatar,\n+ hasMoreToLoad = hasMoreToLoad,\n+ eventSink = {}\n+)\n+\n+private fun aListOfSpaceRooms(): List {\n+ return listOf(\n+ aSpaceRoom(roomId = RoomId(\"!spaceId0:example.com\")),\n+ aSpaceRoom(roomId = RoomId(\"!spaceId1:example.com\")),\n+ aSpaceRoom(roomId = RoomId(\"!spaceId2:example.com\")),\n+ )\n+}\ndiff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceView.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceView.kt\nnew file mode 100644\nindex 00000000000..f3bdf7379b2\n--- /dev/null\n+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceView.kt\n@@ -0,0 +1,205 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.features.space.impl\n+\n+import androidx.compose.foundation.layout.Box\n+import androidx.compose.foundation.layout.Row\n+import androidx.compose.foundation.layout.fillMaxSize\n+import androidx.compose.foundation.layout.fillMaxWidth\n+import androidx.compose.foundation.layout.padding\n+import androidx.compose.foundation.lazy.LazyColumn\n+import androidx.compose.material3.ExperimentalMaterial3Api\n+import androidx.compose.runtime.Composable\n+import androidx.compose.runtime.LaunchedEffect\n+import androidx.compose.runtime.getValue\n+import androidx.compose.runtime.rememberUpdatedState\n+import androidx.compose.ui.Alignment\n+import androidx.compose.ui.Modifier\n+import androidx.compose.ui.res.stringResource\n+import androidx.compose.ui.semantics.heading\n+import androidx.compose.ui.semantics.semantics\n+import androidx.compose.ui.text.font.FontStyle\n+import androidx.compose.ui.text.style.TextOverflow\n+import androidx.compose.ui.tooling.preview.PreviewParameter\n+import androidx.compose.ui.unit.dp\n+import io.element.android.compound.theme.ElementTheme\n+import io.element.android.libraries.designsystem.components.avatar.Avatar\n+import io.element.android.libraries.designsystem.components.avatar.AvatarData\n+import io.element.android.libraries.designsystem.components.avatar.AvatarSize\n+import io.element.android.libraries.designsystem.components.avatar.AvatarType\n+import io.element.android.libraries.designsystem.components.button.BackButton\n+import io.element.android.libraries.designsystem.preview.ElementPreview\n+import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n+import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator\n+import io.element.android.libraries.designsystem.theme.components.Scaffold\n+import io.element.android.libraries.designsystem.theme.components.Text\n+import io.element.android.libraries.designsystem.theme.components.TopAppBar\n+import io.element.android.libraries.matrix.api.core.RoomId\n+import io.element.android.libraries.matrix.api.room.CurrentUserMembership\n+import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n+import io.element.android.libraries.matrix.ui.components.SpaceHeaderView\n+import io.element.android.libraries.matrix.ui.components.SpaceRoomItemView\n+import io.element.android.libraries.matrix.ui.model.getAvatarData\n+import io.element.android.libraries.ui.strings.CommonStrings\n+import kotlinx.collections.immutable.toImmutableList\n+\n+@Composable\n+fun SpaceView(\n+ state: SpaceState,\n+ onBackClick: () -> Unit,\n+ onRoomClick: (roomId: RoomId) -> Unit,\n+ modifier: Modifier = Modifier,\n+) {\n+ Scaffold(\n+ modifier = modifier,\n+ topBar = {\n+ SpaceViewTopBar(currentSpace = state.currentSpace, onBackClick = onBackClick)\n+ },\n+ content = { padding ->\n+ Box(\n+ modifier = Modifier.padding(padding)\n+ ) {\n+ SpaceViewContent(\n+ state = state,\n+ onRoomClick = onRoomClick\n+ )\n+ }\n+ },\n+ )\n+}\n+\n+@Composable\n+private fun SpaceViewContent(\n+ state: SpaceState,\n+ onRoomClick: (roomId: RoomId) -> Unit,\n+ modifier: Modifier = Modifier,\n+) {\n+ LazyColumn(modifier.fillMaxSize()) {\n+ val currentSpace = state.currentSpace\n+ if (currentSpace != null) {\n+ item {\n+ SpaceHeaderView(\n+ avatarData = currentSpace.getAvatarData(AvatarSize.SpaceHeader),\n+ name = currentSpace.name,\n+ topic = currentSpace.topic,\n+ joinRule = currentSpace.joinRule,\n+ heroes = currentSpace.heroes.toImmutableList(),\n+ numberOfMembers = currentSpace.numJoinedMembers,\n+ numberOfRooms = currentSpace.childrenCount,\n+ )\n+ }\n+ }\n+ state.children.forEach { spaceRoom ->\n+ item {\n+ val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED\n+ SpaceRoomItemView(\n+ spaceRoom = spaceRoom,\n+ showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,\n+ hideAvatars = isInvitation && state.hideInvitesAvatar,\n+ onClick = {\n+ onRoomClick(spaceRoom.roomId)\n+ },\n+ onLongClick = {\n+ // TODO\n+ }\n+ )\n+ }\n+ }\n+ if (state.hasMoreToLoad) {\n+ item {\n+ LoadingMoreIndicator(eventSink = state.eventSink)\n+ }\n+ }\n+ }\n+}\n+\n+@Composable\n+private fun LoadingMoreIndicator(\n+ eventSink: (SpaceEvents) -> Unit,\n+ modifier: Modifier = Modifier\n+) {\n+ Box(\n+ modifier = modifier.fillMaxWidth(),\n+ contentAlignment = Alignment.Center,\n+ ) {\n+ CircularProgressIndicator(\n+ strokeWidth = 2.dp,\n+ modifier = Modifier.padding(vertical = 8.dp)\n+ )\n+ val latestEventSink by rememberUpdatedState(eventSink)\n+ LaunchedEffect(Unit) {\n+ latestEventSink(SpaceEvents.LoadMore)\n+ }\n+ }\n+}\n+\n+@OptIn(ExperimentalMaterial3Api::class)\n+@Composable\n+private fun SpaceViewTopBar(\n+ currentSpace: SpaceRoom?,\n+ onBackClick: () -> Unit,\n+ modifier: Modifier = Modifier,\n+) {\n+ TopAppBar(\n+ modifier = modifier,\n+ navigationIcon = {\n+ BackButton(onClick = onBackClick)\n+ },\n+ title = {\n+ if (currentSpace != null) {\n+ SpaceAvatarAndNameRow(\n+ name = currentSpace.name,\n+ avatarData = currentSpace.getAvatarData(AvatarSize.TimelineRoom),\n+ )\n+ }\n+ },\n+ actions = {\n+ },\n+ )\n+}\n+\n+@Composable\n+private fun SpaceAvatarAndNameRow(\n+ name: String?,\n+ avatarData: AvatarData,\n+ modifier: Modifier = Modifier\n+) {\n+ Row(\n+ modifier = modifier,\n+ verticalAlignment = Alignment.CenterVertically\n+ ) {\n+ Avatar(\n+ avatarData = avatarData,\n+ avatarType = AvatarType.Space(),\n+ )\n+ Text(\n+ modifier = Modifier\n+ .padding(horizontal = 8.dp)\n+ .semantics {\n+ heading()\n+ },\n+ text = name ?: stringResource(CommonStrings.common_no_room_name),\n+ style = ElementTheme.typography.fontBodyLgMedium,\n+ fontStyle = FontStyle.Italic.takeIf { name == null },\n+ maxLines = 1,\n+ overflow = TextOverflow.Ellipsis\n+ )\n+ }\n+}\n+\n+@PreviewsDayNight\n+@Composable\n+internal fun SpaceViewPreview(\n+ @PreviewParameter(SpaceStateProvider::class) state: SpaceState\n+) = ElementPreview {\n+ SpaceView(\n+ state = state,\n+ onRoomClick = {},\n+ onBackClick = {},\n+ )\n+}\ndiff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomId.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomId.kt\nindex 1fab64020d7..8d339ae7040 100644\n--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomId.kt\n+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomId.kt\n@@ -20,5 +20,3 @@ value class RoomId(val value: String) : Serializable {\n \n override fun toString(): String = value\n }\n-\n-fun RoomId.toSpaceId(): SpaceId = SpaceId(this.value)\ndiff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt\nindex ce697089c7c..d4e1d57826b 100644\n--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt\n+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt\n@@ -8,7 +8,7 @@\n package io.element.android.libraries.matrix.api.spaces\n \n import io.element.android.libraries.matrix.api.core.RoomAlias\n-import io.element.android.libraries.matrix.api.core.SpaceId\n+import io.element.android.libraries.matrix.api.core.RoomId\n import io.element.android.libraries.matrix.api.room.CurrentUserMembership\n import io.element.android.libraries.matrix.api.room.RoomType\n import io.element.android.libraries.matrix.api.room.join.JoinRule\n@@ -23,9 +23,11 @@ data class SpaceRoom(\n val heroes: List,\n val joinRule: JoinRule?,\n val numJoinedMembers: Int,\n- val spaceId: SpaceId,\n+ val roomId: RoomId,\n val roomType: RoomType,\n val state: CurrentUserMembership?,\n val topic: String?,\n val worldReadable: Boolean,\n-)\n+) {\n+ val isSpace = roomType == RoomType.Space\n+}\ndiff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomList.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomList.kt\nnew file mode 100644\nindex 00000000000..a591fc25371\n--- /dev/null\n+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomList.kt\n@@ -0,0 +1,24 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.matrix.api.spaces\n+\n+import kotlinx.coroutines.flow.Flow\n+import kotlinx.coroutines.flow.StateFlow\n+\n+interface SpaceRoomList {\n+ sealed interface PaginationStatus {\n+ data object Loading : PaginationStatus\n+ data class Idle(val hasMoreToLoad: Boolean) : PaginationStatus\n+ }\n+\n+ fun currentSpaceFlow(): Flow\n+\n+ val spaceRoomsFlow: Flow>\n+ val paginationStatusFlow: StateFlow\n+ suspend fun paginate(): Result\n+}\ndiff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceService.kt\nindex 58494502f7d..b4572ad0bb8 100644\n--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceService.kt\n+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceService.kt\n@@ -7,9 +7,12 @@\n \n package io.element.android.libraries.matrix.api.spaces\n \n+import io.element.android.libraries.matrix.api.core.RoomId\n import kotlinx.coroutines.flow.SharedFlow\n \n interface SpaceService {\n- val spaceRooms: SharedFlow>\n+ val spaceRoomsFlow: SharedFlow>\n suspend fun joinedSpaces(): Result>\n+\n+ fun spaceRoomList(id: RoomId): SpaceRoomList\n }\ndiff --git a/libraries/matrix/impl/build.gradle.kts b/libraries/matrix/impl/build.gradle.kts\nindex a0fa346be28..757d7aa1fc0 100644\n--- a/libraries/matrix/impl/build.gradle.kts\n+++ b/libraries/matrix/impl/build.gradle.kts\n@@ -47,6 +47,7 @@ dependencies {\n testImplementation(projects.libraries.featureflag.test)\n testImplementation(projects.libraries.matrix.test)\n testImplementation(projects.libraries.preferences.test)\n+ testImplementation(projects.libraries.previewutils)\n testImplementation(projects.libraries.sessionStorage.test)\n testImplementation(projects.services.analytics.test)\n testImplementation(projects.services.toolbox.test)\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceRoomList.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceRoomList.kt\nnew file mode 100644\nindex 00000000000..e3f2132a2fd\n--- /dev/null\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceRoomList.kt\n@@ -0,0 +1,80 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.matrix.impl.spaces\n+\n+import io.element.android.libraries.core.extensions.runCatchingExceptions\n+import io.element.android.libraries.matrix.api.core.RoomId\n+import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n+import io.element.android.libraries.matrix.api.spaces.SpaceRoomList\n+import kotlinx.coroutines.CompletableDeferred\n+import kotlinx.coroutines.CoroutineScope\n+import kotlinx.coroutines.flow.Flow\n+import kotlinx.coroutines.flow.MutableSharedFlow\n+import kotlinx.coroutines.flow.MutableStateFlow\n+import kotlinx.coroutines.flow.collect\n+import kotlinx.coroutines.flow.onEach\n+import kotlinx.coroutines.launch\n+import uniffi.matrix_sdk_ui.SpaceRoomListPaginationState\n+import org.matrix.rustcomponents.sdk.SpaceRoomList as InnerSpaceRoomList\n+\n+class RustSpaceRoomList(\n+ private val roomId: RoomId,\n+ private val innerProvider: suspend () -> InnerSpaceRoomList,\n+ sessionCoroutineScope: CoroutineScope,\n+ spaceRoomMapper: SpaceRoomMapper,\n+ private val spaceRoomCache: SpaceRoomCache,\n+) : SpaceRoomList {\n+ private val inner = CompletableDeferred()\n+\n+ override fun currentSpaceFlow(): Flow {\n+ return spaceRoomCache.getSpaceRoomFlow(roomId)\n+ }\n+\n+ override val spaceRoomsFlow = MutableSharedFlow>(replay = 1, extraBufferCapacity = Int.MAX_VALUE)\n+ override val paginationStatusFlow: MutableStateFlow =\n+ MutableStateFlow(SpaceRoomList.PaginationStatus.Idle(hasMoreToLoad = false))\n+ private val spaceListUpdateProcessor = SpaceListUpdateProcessor(\n+ spaceRoomsFlow = spaceRoomsFlow,\n+ mapper = spaceRoomMapper,\n+ spaceRoomCache = spaceRoomCache\n+ )\n+\n+ init {\n+ sessionCoroutineScope.launch {\n+ inner.complete(innerProvider())\n+ }\n+ sessionCoroutineScope.launch {\n+ inner.await().paginationStateFlow()\n+ .onEach { paginationStatus ->\n+ paginationStatusFlow.emit(paginationStatus.into())\n+ }\n+ .collect()\n+ }\n+\n+ sessionCoroutineScope.launch {\n+ inner.await().spaceListUpdateFlow()\n+ .onEach { updates ->\n+ spaceListUpdateProcessor.postUpdates(updates)\n+ }\n+ .collect()\n+ }\n+ }\n+\n+ override suspend fun paginate(): Result {\n+ return runCatchingExceptions {\n+ inner.await().paginate()\n+ }\n+ }\n+\n+ private fun SpaceRoomListPaginationState.into(): SpaceRoomList.PaginationStatus {\n+ return when (this) {\n+ is SpaceRoomListPaginationState.Idle -> SpaceRoomList.PaginationStatus.Idle(hasMoreToLoad = !endReached)\n+ SpaceRoomListPaginationState.Loading -> SpaceRoomList.PaginationStatus.Loading\n+ }\n+ }\n+}\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceService.kt\nindex b059d476bcc..2a633675774 100644\n--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceService.kt\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceService.kt\n@@ -8,7 +8,9 @@\n package io.element.android.libraries.matrix.impl.spaces\n \n import io.element.android.libraries.core.extensions.runCatchingExceptions\n+import io.element.android.libraries.matrix.api.core.RoomId\n import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n+import io.element.android.libraries.matrix.api.spaces.SpaceRoomList\n import io.element.android.libraries.matrix.api.spaces.SpaceService\n import io.element.android.libraries.matrix.impl.util.cancelAndDestroy\n import kotlinx.coroutines.CoroutineDispatcher\n@@ -21,11 +23,8 @@ import kotlinx.coroutines.flow.MutableSharedFlow\n import kotlinx.coroutines.flow.buffer\n import kotlinx.coroutines.flow.callbackFlow\n import kotlinx.coroutines.flow.catch\n-import kotlinx.coroutines.flow.first\n import kotlinx.coroutines.flow.launchIn\n import kotlinx.coroutines.flow.onEach\n-import kotlinx.coroutines.sync.Mutex\n-import kotlinx.coroutines.sync.withLock\n import kotlinx.coroutines.withContext\n import org.matrix.rustcomponents.sdk.SpaceListUpdate\n import org.matrix.rustcomponents.sdk.SpaceServiceInterface\n@@ -38,104 +37,55 @@ class RustSpaceService(\n private val sessionCoroutineScope: CoroutineScope,\n private val sessionDispatcher: CoroutineDispatcher,\n ) : SpaceService {\n- private val mapper = SpaceRoomMapper()\n- private val mutex = Mutex()\n-\n- override val spaceRooms = MutableSharedFlow>(replay = 1, extraBufferCapacity = 1)\n+ private val spaceRoomMapper = SpaceRoomMapper()\n+ private val spaceRoomCache = SpaceRoomCache()\n+ override val spaceRoomsFlow = MutableSharedFlow>(replay = 1, extraBufferCapacity = 1)\n+ private val spaceListUpdateProcessor = SpaceListUpdateProcessor(\n+ spaceRoomsFlow = spaceRoomsFlow,\n+ mapper = spaceRoomMapper,\n+ spaceRoomCache = spaceRoomCache\n+ )\n \n override suspend fun joinedSpaces(): Result> = withContext(sessionDispatcher) {\n runCatchingExceptions {\n innerSpaceService.joinedSpaces()\n .map {\n- it.let(mapper::map)\n+ it.let(spaceRoomMapper::map)\n }\n }\n }\n \n- // override suspend fun spaceRoomList(spaceId: SpaceId): Result> = withContext(sessionDispatcher) {\n- // runCatchingExceptions {\n- // innerSpaceService.spaceRoomList(spaceId.value)\n- // }\n- // }\n+ override fun spaceRoomList(id: RoomId): SpaceRoomList {\n+ return RustSpaceRoomList(\n+ roomId = id,\n+ innerProvider = { innerSpaceService.spaceRoomList(id.value) },\n+ sessionCoroutineScope = sessionCoroutineScope,\n+ spaceRoomMapper = spaceRoomMapper,\n+ spaceRoomCache = spaceRoomCache,\n+ )\n+ }\n \n init {\n innerSpaceService\n- .spaceDiffFlow()\n- .onEach {\n- handeUpdate(it)\n+ .spaceListUpdate()\n+ .onEach { updates ->\n+ spaceListUpdateProcessor.postUpdates(updates)\n }\n .launchIn(sessionCoroutineScope)\n }\n-\n- private suspend fun handeUpdate(spaceListUpdates: List) {\n- mutex.withLock {\n- val current = if (spaceRooms.replayCache.isNotEmpty()) {\n- spaceRooms.first().toMutableList()\n- } else {\n- mutableListOf()\n- }\n- spaceListUpdates.forEach { update ->\n- current.applyUpdate(update)\n- }\n- spaceRooms.emit(current)\n- }\n- }\n-\n- private fun MutableList.applyUpdate(update: SpaceListUpdate) {\n- when (update) {\n- is SpaceListUpdate.Append -> {\n- val newSpaces = update.values.map(mapper::map)\n- addAll(newSpaces)\n- }\n- SpaceListUpdate.Clear -> clear()\n- is SpaceListUpdate.Insert -> {\n- val newSpace = mapper.map(update.value)\n- add(update.index.toInt(), newSpace)\n- }\n- SpaceListUpdate.PopBack -> {\n- removeAt(lastIndex)\n- }\n- SpaceListUpdate.PopFront -> {\n- removeAt(0)\n- }\n- is SpaceListUpdate.PushBack -> {\n- val newSpace = mapper.map(update.value)\n- add(newSpace)\n- }\n- is SpaceListUpdate.PushFront -> {\n- val newSpace = mapper.map(update.value)\n- add(0, newSpace)\n- }\n- is SpaceListUpdate.Remove -> {\n- removeAt(update.index.toInt())\n- }\n- is SpaceListUpdate.Reset -> {\n- clear()\n- val newSpaces = update.values.map(mapper::map)\n- addAll(newSpaces)\n- }\n- is SpaceListUpdate.Set -> {\n- val newSpace = mapper.map(update.value)\n- this[update.index.toInt()] = newSpace\n- }\n- is SpaceListUpdate.Truncate -> {\n- subList(update.length.toInt(), size).clear()\n- }\n- }\n- }\n }\n \n-internal fun SpaceServiceInterface.spaceDiffFlow(): Flow> =\n+internal fun SpaceServiceInterface.spaceListUpdate(): Flow> =\n callbackFlow {\n val listener = object : SpaceServiceJoinedSpacesListener {\n override fun onUpdate(roomUpdates: List) {\n trySendBlocking(roomUpdates)\n }\n }\n- Timber.d(\"Open spaceDiffFlow for SpaceServiceInterface ${this@spaceDiffFlow}\")\n+ Timber.d(\"Open spaceDiffFlow for SpaceServiceInterface ${this@spaceListUpdate}\")\n val taskHandle = subscribeToJoinedSpaces(listener)\n awaitClose {\n- Timber.d(\"Close spaceDiffFlow for SpaceServiceInterface ${this@spaceDiffFlow}\")\n+ Timber.d(\"Close spaceDiffFlow for SpaceServiceInterface ${this@spaceListUpdate}\")\n taskHandle.cancelAndDestroy()\n }\n }.catch {\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceListUpdateProcessor.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceListUpdateProcessor.kt\nnew file mode 100644\nindex 00000000000..f1193661eaf\n--- /dev/null\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceListUpdateProcessor.kt\n@@ -0,0 +1,86 @@\n+/*\n+ * Copyright 2023, 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.matrix.impl.spaces\n+\n+import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n+import kotlinx.coroutines.flow.MutableSharedFlow\n+import kotlinx.coroutines.flow.first\n+import kotlinx.coroutines.sync.Mutex\n+import kotlinx.coroutines.sync.withLock\n+import org.matrix.rustcomponents.sdk.SpaceListUpdate\n+import timber.log.Timber\n+\n+internal class SpaceListUpdateProcessor(\n+ private val spaceRoomsFlow: MutableSharedFlow>,\n+ private val mapper: SpaceRoomMapper,\n+ private val spaceRoomCache: SpaceRoomCache,\n+) {\n+ private val mutex = Mutex()\n+\n+ suspend fun postUpdates(updates: List) {\n+ Timber.v(\"Update space rooms from postUpdates (with ${updates.size} items) on ${Thread.currentThread()}\")\n+ updateSpaceRooms {\n+ updates.forEach { update -> applyUpdate(update) }\n+ }\n+ }\n+\n+ private suspend fun updateSpaceRooms(block: MutableList.() -> Unit) =\n+ mutex.withLock {\n+ val spaceRooms = if (spaceRoomsFlow.replayCache.isNotEmpty()) {\n+ spaceRoomsFlow.first().toMutableList()\n+ } else {\n+ mutableListOf()\n+ }\n+ block(spaceRooms)\n+ spaceRoomCache.update(spaceRooms)\n+ spaceRoomsFlow.emit(spaceRooms)\n+ }\n+\n+ private fun MutableList.applyUpdate(update: SpaceListUpdate) {\n+ when (update) {\n+ is SpaceListUpdate.Append -> {\n+ val newSpaces = update.values.map(mapper::map)\n+ addAll(newSpaces)\n+ }\n+ SpaceListUpdate.Clear -> clear()\n+ is SpaceListUpdate.Insert -> {\n+ val newSpace = mapper.map(update.value)\n+ add(update.index.toInt(), newSpace)\n+ }\n+ SpaceListUpdate.PopBack -> {\n+ removeAt(lastIndex)\n+ }\n+ SpaceListUpdate.PopFront -> {\n+ removeAt(0)\n+ }\n+ is SpaceListUpdate.PushBack -> {\n+ val newSpace = mapper.map(update.value)\n+ add(newSpace)\n+ }\n+ is SpaceListUpdate.PushFront -> {\n+ val newSpace = mapper.map(update.value)\n+ add(0, newSpace)\n+ }\n+ is SpaceListUpdate.Remove -> {\n+ removeAt(update.index.toInt())\n+ }\n+ is SpaceListUpdate.Reset -> {\n+ clear()\n+ val newSpaces = update.values.map(mapper::map)\n+ addAll(newSpaces)\n+ }\n+ is SpaceListUpdate.Set -> {\n+ val newSpace = mapper.map(update.value)\n+ this[update.index.toInt()] = newSpace\n+ }\n+ is SpaceListUpdate.Truncate -> {\n+ subList(update.length.toInt(), size).clear()\n+ }\n+ }\n+ }\n+}\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomCache.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomCache.kt\nnew file mode 100644\nindex 00000000000..8b7d1f5e1b5\n--- /dev/null\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomCache.kt\n@@ -0,0 +1,35 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.matrix.impl.spaces\n+\n+import io.element.android.libraries.core.coroutine.mapState\n+import io.element.android.libraries.matrix.api.core.RoomId\n+import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n+import kotlinx.coroutines.flow.Flow\n+import kotlinx.coroutines.flow.MutableStateFlow\n+import kotlinx.coroutines.flow.update\n+\n+/**\n+ * An in memory cache of space rooms.\n+ * Only caches Rooms with roomType [io.element.android.libraries.matrix.api.room.RoomType.Space].\n+ */\n+class SpaceRoomCache {\n+ private val inMemoryCache = MutableStateFlow>(emptyMap())\n+ fun getSpaceRoomFlow(roomId: RoomId): Flow {\n+ return inMemoryCache.mapState { it[roomId] }\n+ }\n+\n+ fun update(spaceRooms: List) {\n+ inMemoryCache.update { currentValues ->\n+ val newValues = spaceRooms\n+ .filter { it.isSpace }\n+ .associateBy { it.roomId }\n+ currentValues + newValues\n+ }\n+ }\n+}\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomListExtensions.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomListExtensions.kt\nnew file mode 100644\nindex 00000000000..3d1a002e4d5\n--- /dev/null\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomListExtensions.kt\n@@ -0,0 +1,57 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.matrix.impl.spaces\n+\n+import io.element.android.libraries.matrix.impl.util.cancelAndDestroy\n+import kotlinx.coroutines.channels.Channel\n+import kotlinx.coroutines.channels.awaitClose\n+import kotlinx.coroutines.channels.trySendBlocking\n+import kotlinx.coroutines.flow.Flow\n+import kotlinx.coroutines.flow.buffer\n+import kotlinx.coroutines.flow.callbackFlow\n+import kotlinx.coroutines.flow.catch\n+import org.matrix.rustcomponents.sdk.SpaceListUpdate\n+import org.matrix.rustcomponents.sdk.SpaceRoomListEntriesListener\n+import org.matrix.rustcomponents.sdk.SpaceRoomListInterface\n+import org.matrix.rustcomponents.sdk.SpaceRoomListPaginationStateListener\n+import timber.log.Timber\n+import uniffi.matrix_sdk_ui.SpaceRoomListPaginationState\n+\n+internal fun SpaceRoomListInterface.paginationStateFlow(): Flow = callbackFlow {\n+ val listener = object : SpaceRoomListPaginationStateListener {\n+ override fun onUpdate(paginationState: SpaceRoomListPaginationState) {\n+ trySend(paginationState)\n+ }\n+ }\n+ // Send the initial value\n+ trySend(paginationState())\n+ // Then subscribe to updates\n+ val result = subscribeToPaginationStateUpdates(listener)\n+ awaitClose {\n+ result.cancelAndDestroy()\n+ }\n+}.catch {\n+ Timber.d(it, \"paginationStateFlow() failed\")\n+}.buffer(Channel.UNLIMITED)\n+\n+internal fun SpaceRoomListInterface.spaceListUpdateFlow(): Flow> =\n+ callbackFlow {\n+ val listener = object : SpaceRoomListEntriesListener {\n+ override fun onUpdate(rooms: List) {\n+ trySendBlocking(rooms)\n+ }\n+ }\n+ Timber.d(\"Open spaceListUpdateFlow for SpaceRoomListInterface ${this@spaceListUpdateFlow}\")\n+ val taskHandle = subscribeToRoomUpdate(listener)\n+ awaitClose {\n+ Timber.d(\"Close spaceListUpdateFlow for SpaceRoomListInterface ${this@spaceListUpdateFlow}\")\n+ taskHandle.cancelAndDestroy()\n+ }\n+ }.catch {\n+ Timber.d(it, \"spaceListUpdateFlow() failed\")\n+ }.buffer(Channel.UNLIMITED)\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomMapper.kt\nindex 5622ee2c8c1..c217f941c73 100644\n--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomMapper.kt\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomMapper.kt\n@@ -9,7 +9,7 @@ package io.element.android.libraries.matrix.impl.spaces\n \n import io.element.android.libraries.core.bool.orFalse\n import io.element.android.libraries.matrix.api.core.RoomAlias\n-import io.element.android.libraries.matrix.api.core.SpaceId\n+import io.element.android.libraries.matrix.api.core.RoomId\n import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n import io.element.android.libraries.matrix.impl.room.join.map\n import io.element.android.libraries.matrix.impl.room.map\n@@ -26,7 +26,7 @@ class SpaceRoomMapper {\n joinRule = spaceRoom.joinRule?.map(),\n name = spaceRoom.name,\n numJoinedMembers = spaceRoom.numJoinedMembers.toInt(),\n- spaceId = spaceRoom.roomId.let(::SpaceId),\n+ roomId = RoomId(spaceRoom.roomId),\n roomType = spaceRoom.roomType.map(),\n state = spaceRoom.state?.map(),\n topic = spaceRoom.topic,\ndiff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpaceItemView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomItemView.kt\nsimilarity index 66%\nrename from features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpaceItemView.kt\nrename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomItemView.kt\nindex 461c550d8e7..be540d486dd 100644\n--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpaceItemView.kt\n+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomItemView.kt\n@@ -5,7 +5,7 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.features.home.impl.spaces\n+package io.element.android.libraries.matrix.ui.components\n \n import androidx.compose.foundation.combinedClickable\n import androidx.compose.foundation.interaction.MutableInteractionSource\n@@ -22,88 +22,66 @@ import androidx.compose.foundation.layout.size\n import androidx.compose.foundation.layout.width\n import androidx.compose.material3.ripple\n import androidx.compose.runtime.Composable\n+import androidx.compose.runtime.ReadOnlyComposable\n import androidx.compose.runtime.remember\n import androidx.compose.ui.Alignment\n import androidx.compose.ui.Modifier\n+import androidx.compose.ui.graphics.vector.ImageVector\n import androidx.compose.ui.res.pluralStringResource\n import androidx.compose.ui.res.stringResource\n import androidx.compose.ui.text.font.FontStyle\n import androidx.compose.ui.text.style.TextOverflow\n-import androidx.compose.ui.tooling.preview.PreviewParameter\n import androidx.compose.ui.unit.dp\n import io.element.android.compound.theme.ElementTheme\n import io.element.android.compound.tokens.generated.CompoundIcons\n import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom\n import io.element.android.libraries.designsystem.atomic.molecules.InviteButtonsRowMolecule\n import io.element.android.libraries.designsystem.components.avatar.Avatar\n+import io.element.android.libraries.designsystem.components.avatar.AvatarData\n import io.element.android.libraries.designsystem.components.avatar.AvatarSize\n import io.element.android.libraries.designsystem.components.avatar.AvatarType\n import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction\n-import io.element.android.libraries.designsystem.preview.ElementPreview\n-import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n import io.element.android.libraries.designsystem.theme.components.Icon\n import io.element.android.libraries.designsystem.theme.components.Text\n import io.element.android.libraries.designsystem.theme.unreadIndicator\n import io.element.android.libraries.matrix.api.room.CurrentUserMembership\n+import io.element.android.libraries.matrix.api.room.join.JoinRule\n import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n import io.element.android.libraries.matrix.ui.model.getAvatarData\n import io.element.android.libraries.ui.strings.CommonPlurals\n import io.element.android.libraries.ui.strings.CommonStrings\n \n @Composable\n-internal fun HomeSpaceItemView(\n+fun SpaceRoomItemView(\n spaceRoom: SpaceRoom,\n showUnreadIndicator: Boolean,\n hideAvatars: Boolean,\n onClick: () -> Unit,\n+ onLongClick: () -> Unit,\n modifier: Modifier = Modifier,\n ) {\n- SpaceScaffoldRow(\n+ SpaceRoomItemScaffold(\n modifier = modifier,\n- spaceRoom = spaceRoom,\n- onClick = onClick,\n+ avatarData = spaceRoom.getAvatarData(AvatarSize.SpaceListItem),\n+ isSpace = spaceRoom.isSpace,\n hideAvatars = hideAvatars,\n- onLongClick = { },\n+ onClick = onClick,\n+ onLongClick = onLongClick,\n ) {\n NameAndIndicatorRow(\n name = spaceRoom.name,\n- showIndicator = showUnreadIndicator,\n+ showIndicator = showUnreadIndicator\n )\n Spacer(modifier = Modifier.height(1.dp))\n- if (!spaceRoom.worldReadable) {\n- Row(\n- modifier = Modifier.fillMaxWidth(),\n- verticalAlignment = Alignment.CenterVertically,\n- ) {\n- Icon(\n- modifier = Modifier\n- .size(16.dp)\n- .padding(end = 4.dp),\n- imageVector = CompoundIcons.LockSolid(),\n- contentDescription = null,\n- tint = ElementTheme.colors.iconTertiary,\n- )\n- Text(\n- modifier = Modifier.weight(1f),\n- style = ElementTheme.typography.fontBodyMdRegular,\n- text = stringResource(CommonStrings.common_private_space),\n- fontStyle = FontStyle.Italic.takeIf { spaceRoom.name == null },\n- color = ElementTheme.colors.textSecondary,\n- maxLines = 1,\n- overflow = TextOverflow.Ellipsis\n- )\n- }\n- Spacer(modifier = Modifier.height(1.dp))\n- }\n- val spaceSummary = stringResource(\n- CommonStrings.screen_space_list_details,\n- pluralStringResource(CommonPlurals.common_rooms, spaceRoom.childrenCount, spaceRoom.childrenCount),\n- pluralStringResource(CommonPlurals.common_member_count, spaceRoom.numJoinedMembers, spaceRoom.numJoinedMembers),\n+ SubtitleRow(\n+ visibilityIcon = spaceRoom.visibilityIcon(),\n+ subtitle = spaceRoom.subtitle()\n )\n+ Spacer(modifier = Modifier.height(1.dp))\n Text(\n modifier = Modifier.weight(1f),\n style = ElementTheme.typography.fontBodyMdRegular,\n- text = spaceSummary,\n+ text = spaceRoom.info(),\n fontStyle = FontStyle.Italic.takeIf { spaceRoom.name == null },\n color = ElementTheme.colors.textSecondary,\n maxLines = 1,\n@@ -119,6 +97,37 @@ internal fun HomeSpaceItemView(\n }\n }\n \n+@Composable\n+private fun SubtitleRow(\n+ visibilityIcon: ImageVector?,\n+ subtitle: String,\n+ modifier: Modifier = Modifier,\n+) {\n+ Row(\n+ modifier = modifier.fillMaxWidth(),\n+ verticalAlignment = Alignment.CenterVertically,\n+ ) {\n+ if (visibilityIcon != null) {\n+ Icon(\n+ modifier = Modifier\n+ .size(16.dp)\n+ .padding(end = 4.dp),\n+ imageVector = visibilityIcon,\n+ contentDescription = null,\n+ tint = ElementTheme.colors.iconTertiary,\n+ )\n+ }\n+ Text(\n+ modifier = Modifier.weight(1f),\n+ style = ElementTheme.typography.fontBodyMdRegular,\n+ text = subtitle,\n+ color = ElementTheme.colors.textSecondary,\n+ maxLines = 1,\n+ overflow = TextOverflow.Ellipsis\n+ )\n+ }\n+}\n+\n @Composable\n private fun NameAndIndicatorRow(\n name: String?,\n@@ -148,8 +157,9 @@ private fun NameAndIndicatorRow(\n }\n \n @Composable\n-private fun SpaceScaffoldRow(\n- spaceRoom: SpaceRoom,\n+private fun SpaceRoomItemScaffold(\n+ avatarData: AvatarData,\n+ isSpace: Boolean,\n onClick: () -> Unit,\n onLongClick: () -> Unit,\n hideAvatars: Boolean,\n@@ -173,8 +183,8 @@ private fun SpaceScaffoldRow(\n .height(IntrinsicSize.Min),\n ) {\n Avatar(\n- avatarData = spaceRoom.getAvatarData(AvatarSize.SpaceListItem),\n- avatarType = AvatarType.Space(),\n+ avatarData = avatarData,\n+ avatarType = if (isSpace) AvatarType.Space() else AvatarType.Room(),\n hideImage = hideAvatars,\n )\n Spacer(modifier = Modifier.width(16.dp))\n@@ -185,13 +195,39 @@ private fun SpaceScaffoldRow(\n }\n }\n \n-@PreviewsDayNight\n @Composable\n-internal fun HomeSpaceItemViewPreview(@PreviewParameter(SpaceRoomProvider::class) spaceRoom: SpaceRoom) = ElementPreview {\n- HomeSpaceItemView(\n- spaceRoom = spaceRoom,\n- showUnreadIndicator = false,\n- hideAvatars = true,\n- onClick = {},\n- )\n+@ReadOnlyComposable\n+private fun SpaceRoom.subtitle(): String {\n+ return if (isSpace) {\n+ if (joinRule == JoinRule.Public) {\n+ stringResource(CommonStrings.common_public_space)\n+ } else {\n+ stringResource(CommonStrings.common_private_space)\n+ }\n+ } else {\n+ pluralStringResource(CommonPlurals.common_member_count, numJoinedMembers, numJoinedMembers)\n+ }\n+}\n+\n+@Composable\n+@ReadOnlyComposable\n+private fun SpaceRoom.info(): String {\n+ return if (isSpace) {\n+ stringResource(\n+ CommonStrings.screen_space_list_details,\n+ pluralStringResource(CommonPlurals.common_rooms, childrenCount, childrenCount),\n+ pluralStringResource(CommonPlurals.common_member_count, numJoinedMembers, numJoinedMembers),\n+ )\n+ } else {\n+ topic.orEmpty()\n+ }\n+}\n+\n+@Composable\n+private fun SpaceRoom.visibilityIcon(): ImageVector? {\n+ return if (joinRule == JoinRule.Public) {\n+ CompoundIcons.Public()\n+ } else {\n+ CompoundIcons.LockSolid()\n+ }\n }\ndiff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SpaceExtension.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SpaceExtension.kt\nindex afe03b68772..e4b056fdea7 100644\n--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SpaceExtension.kt\n+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SpaceExtension.kt\n@@ -12,7 +12,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize\n import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n \n fun SpaceRoom.getAvatarData(size: AvatarSize) = AvatarData(\n- id = spaceId.value,\n+ id = roomId.value,\n name = name,\n url = avatarUrl,\n size = size,\ndiff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/safety/Avatars.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/safety/Avatars.kt\nnew file mode 100644\nindex 00000000000..0eb2b37ea4f\n--- /dev/null\n+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/safety/Avatars.kt\n@@ -0,0 +1,24 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.matrix.ui.safety\n+\n+import androidx.compose.runtime.Composable\n+import androidx.compose.runtime.State\n+import androidx.compose.runtime.collectAsState\n+import androidx.compose.runtime.remember\n+import io.element.android.libraries.core.coroutine.mapState\n+import io.element.android.libraries.matrix.api.MatrixClient\n+\n+@Composable\n+fun MatrixClient.rememberHideInvitesAvatar(): State {\n+ return remember {\n+ mediaPreviewService()\n+ .mediaPreviewConfigFlow\n+ .mapState { config -> config.hideInviteAvatar }\n+ }.collectAsState()\n+}\n", "test_patch": "diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/SpacePresenterTest.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/SpacePresenterTest.kt\nnew file mode 100644\nindex 00000000000..0bcd1303ae9\n--- /dev/null\n+++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/SpacePresenterTest.kt\n@@ -0,0 +1,167 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+@file:OptIn(ExperimentalCoroutinesApi::class)\n+\n+package io.element.android.features.space.impl\n+\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.features.invite.api.SeenInvitesStore\n+import io.element.android.features.invite.test.InMemorySeenInvitesStore\n+import io.element.android.features.space.api.SpaceEntryPoint\n+import io.element.android.libraries.matrix.api.MatrixClient\n+import io.element.android.libraries.matrix.api.spaces.SpaceRoomList\n+import io.element.android.libraries.matrix.test.A_ROOM_ID\n+import io.element.android.libraries.matrix.test.FakeMatrixClient\n+import io.element.android.libraries.matrix.test.spaces.FakeSpaceRoomList\n+import io.element.android.libraries.matrix.test.spaces.FakeSpaceService\n+import io.element.android.libraries.previewutils.room.aSpaceRoom\n+import io.element.android.tests.testutils.lambda.lambdaRecorder\n+import io.element.android.tests.testutils.test\n+import kotlinx.coroutines.ExperimentalCoroutinesApi\n+import kotlinx.coroutines.test.advanceUntilIdle\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Test\n+\n+class SpacePresenterTest {\n+ @Test\n+ fun `present - initial state`() = runTest {\n+ val paginateResult = lambdaRecorder> {\n+ Result.success(Unit)\n+ }\n+ val presenter = createSpacePresenter(\n+ client = FakeMatrixClient(\n+ spaceService = FakeSpaceService(\n+ spaceRoomListResult = {\n+ FakeSpaceRoomList(\n+ paginateResult = paginateResult,\n+ )\n+ },\n+ ),\n+ ),\n+ )\n+ presenter.test {\n+ val state = awaitItem()\n+ assertThat(state.currentSpace).isNull()\n+ assertThat(state.children).isEmpty()\n+ assertThat(state.seenSpaceInvites).isEmpty()\n+ assertThat(state.hideInvitesAvatar).isFalse()\n+ assertThat(state.hasMoreToLoad).isTrue()\n+ advanceUntilIdle()\n+ paginateResult.assertions().isCalledOnce()\n+ }\n+ }\n+\n+ @Test\n+ fun `present - load more`() = runTest {\n+ val paginateResult = lambdaRecorder> {\n+ Result.success(Unit)\n+ }\n+ val presenter = createSpacePresenter(\n+ client = FakeMatrixClient(\n+ spaceService = FakeSpaceService(\n+ spaceRoomListResult = {\n+ FakeSpaceRoomList(\n+ paginateResult = paginateResult,\n+ )\n+ },\n+ ),\n+ ),\n+ )\n+ presenter.test {\n+ val state = awaitItem()\n+ advanceUntilIdle()\n+ paginateResult.assertions().isCalledOnce()\n+ state.eventSink(SpaceEvents.LoadMore)\n+ advanceUntilIdle()\n+ paginateResult.assertions().isCalledExactly(2)\n+ }\n+ }\n+\n+ @Test\n+ fun `present - has more to load value`() = runTest {\n+ val fakeSpaceRoomList = FakeSpaceRoomList(\n+ paginateResult = { Result.success(Unit) },\n+ )\n+ val presenter = createSpacePresenter(\n+ client = FakeMatrixClient(\n+ spaceService = FakeSpaceService(\n+ spaceRoomListResult = { fakeSpaceRoomList },\n+ ),\n+ ),\n+ )\n+ presenter.test {\n+ val state = awaitItem()\n+ advanceUntilIdle()\n+ assertThat(state.hasMoreToLoad).isTrue()\n+ fakeSpaceRoomList.emitPaginationStatus(\n+ SpaceRoomList.PaginationStatus.Idle(hasMoreToLoad = false)\n+ )\n+ assertThat(awaitItem().hasMoreToLoad).isFalse()\n+ fakeSpaceRoomList.emitPaginationStatus(\n+ SpaceRoomList.PaginationStatus.Idle(hasMoreToLoad = true)\n+ )\n+ assertThat(awaitItem().hasMoreToLoad).isTrue()\n+ }\n+ }\n+\n+ @Test\n+ fun `present - current space value`() = runTest {\n+ val fakeSpaceRoomList = FakeSpaceRoomList(\n+ paginateResult = { Result.success(Unit) },\n+ )\n+ val presenter = createSpacePresenter(\n+ client = FakeMatrixClient(\n+ spaceService = FakeSpaceService(\n+ spaceRoomListResult = { fakeSpaceRoomList },\n+ ),\n+ ),\n+ )\n+ presenter.test {\n+ val state = awaitItem()\n+ advanceUntilIdle()\n+ assertThat(state.currentSpace).isNull()\n+ val aSpace = aSpaceRoom()\n+ fakeSpaceRoomList.emitCurrentSpace(aSpace)\n+ assertThat(awaitItem().currentSpace).isEqualTo(aSpace)\n+ }\n+ }\n+\n+ @Test\n+ fun `present - children value`() = runTest {\n+ val fakeSpaceRoomList = FakeSpaceRoomList(\n+ paginateResult = { Result.success(Unit) },\n+ )\n+ val presenter = createSpacePresenter(\n+ client = FakeMatrixClient(\n+ spaceService = FakeSpaceService(\n+ spaceRoomListResult = { fakeSpaceRoomList },\n+ ),\n+ ),\n+ )\n+ presenter.test {\n+ val state = awaitItem()\n+ advanceUntilIdle()\n+ assertThat(state.children).isEmpty()\n+ val aSpace = aSpaceRoom()\n+ fakeSpaceRoomList.emitSpaceRooms(listOf(aSpace))\n+ assertThat(awaitItem().children).containsExactly(aSpace)\n+ }\n+ }\n+\n+ private fun createSpacePresenter(\n+ inputs: SpaceEntryPoint.Inputs = SpaceEntryPoint.Inputs(A_ROOM_ID),\n+ client: MatrixClient = FakeMatrixClient(),\n+ seenInvitesStore: SeenInvitesStore = InMemorySeenInvitesStore(),\n+ ): SpacePresenter {\n+ return SpacePresenter(\n+ inputs = inputs,\n+ client = client,\n+ seenInvitesStore = seenInvitesStore,\n+ )\n+ }\n+}\ndiff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SpaceRoom.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SpaceRoom.kt\nnew file mode 100644\nindex 00000000000..c699ef80973\n--- /dev/null\n+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SpaceRoom.kt\n@@ -0,0 +1,46 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.matrix.impl.fixtures.factories\n+\n+import io.element.android.libraries.matrix.api.core.RoomId\n+import io.element.android.libraries.matrix.test.A_ROOM_ID\n+import org.matrix.rustcomponents.sdk.JoinRule\n+import org.matrix.rustcomponents.sdk.Membership\n+import org.matrix.rustcomponents.sdk.RoomHero\n+import org.matrix.rustcomponents.sdk.RoomType\n+import org.matrix.rustcomponents.sdk.SpaceRoom\n+\n+fun aRustSpaceRoom(\n+ roomId: RoomId = A_ROOM_ID,\n+ canonicalAlias: String? = null,\n+ name: String? = null,\n+ topic: String? = null,\n+ avatarUrl: String? = null,\n+ roomType: RoomType = RoomType.Space,\n+ numJoinedMembers: ULong = 0uL,\n+ joinRule: JoinRule? = null,\n+ worldReadable: Boolean? = null,\n+ guestCanJoin: Boolean = false,\n+ childrenCount: ULong = 0uL,\n+ state: Membership? = null,\n+ heroes: List = emptyList(),\n+) = SpaceRoom(\n+ roomId = roomId.value,\n+ canonicalAlias = canonicalAlias,\n+ name = name,\n+ topic = topic,\n+ avatarUrl = avatarUrl,\n+ roomType = roomType,\n+ numJoinedMembers = numJoinedMembers,\n+ joinRule = joinRule,\n+ worldReadable = worldReadable,\n+ guestCanJoin = guestCanJoin,\n+ childrenCount = childrenCount,\n+ state = state,\n+ heroes = heroes,\n+)\ndiff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSpaceRoomList.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSpaceRoomList.kt\nnew file mode 100644\nindex 00000000000..171afd49fcf\n--- /dev/null\n+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSpaceRoomList.kt\n@@ -0,0 +1,58 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.matrix.impl.fixtures.fakes\n+\n+import io.element.android.tests.testutils.lambda.lambdaError\n+import io.element.android.tests.testutils.simulateLongTask\n+import org.matrix.rustcomponents.sdk.NoPointer\n+import org.matrix.rustcomponents.sdk.SpaceListUpdate\n+import org.matrix.rustcomponents.sdk.SpaceRoom\n+import org.matrix.rustcomponents.sdk.SpaceRoomList\n+import org.matrix.rustcomponents.sdk.SpaceRoomListEntriesListener\n+import org.matrix.rustcomponents.sdk.SpaceRoomListPaginationStateListener\n+import org.matrix.rustcomponents.sdk.TaskHandle\n+import uniffi.matrix_sdk_ui.SpaceRoomListPaginationState\n+\n+class FakeFfiSpaceRoomList(\n+ private val paginateResult: () -> Unit = { lambdaError() },\n+ private val paginationStateResult: () -> SpaceRoomListPaginationState = { lambdaError() },\n+ private val roomsResult: () -> List = { lambdaError() },\n+) : SpaceRoomList(NoPointer) {\n+ private var spaceRoomListPaginationStateListener: SpaceRoomListPaginationStateListener? = null\n+ private var spaceRoomListEntriesListener: SpaceRoomListEntriesListener? = null\n+\n+ override suspend fun paginate() = simulateLongTask {\n+ paginateResult()\n+ }\n+\n+ override fun paginationState(): SpaceRoomListPaginationState {\n+ return paginationStateResult()\n+ }\n+\n+ override fun rooms(): List {\n+ return roomsResult()\n+ }\n+\n+ override fun subscribeToPaginationStateUpdates(listener: SpaceRoomListPaginationStateListener): TaskHandle {\n+ spaceRoomListPaginationStateListener = listener\n+ return FakeFfiTaskHandle()\n+ }\n+\n+ fun triggerPaginationStateUpdate(state: SpaceRoomListPaginationState) {\n+ spaceRoomListPaginationStateListener?.onUpdate(state)\n+ }\n+\n+ override fun subscribeToRoomUpdate(listener: SpaceRoomListEntriesListener): TaskHandle {\n+ spaceRoomListEntriesListener = listener\n+ return FakeFfiTaskHandle()\n+ }\n+\n+ fun triggerRoomListUpdate(rooms: List) {\n+ spaceRoomListEntriesListener?.onUpdate(rooms)\n+ }\n+}\ndiff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/RoomSummaryListProcessorTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/RoomSummaryListProcessorTest.kt\nnew file mode 100644\nindex 00000000000..47c3a19a6ba\n--- /dev/null\n+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/RoomSummaryListProcessorTest.kt\n@@ -0,0 +1,190 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.matrix.impl.spaces\n+\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustSpaceRoom\n+import io.element.android.libraries.matrix.test.A_ROOM_ID\n+import io.element.android.libraries.matrix.test.A_ROOM_ID_2\n+import io.element.android.libraries.matrix.test.A_ROOM_ID_3\n+import io.element.android.libraries.previewutils.room.aSpaceRoom\n+import kotlinx.coroutines.flow.MutableSharedFlow\n+import kotlinx.coroutines.flow.MutableStateFlow\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Test\n+import org.matrix.rustcomponents.sdk.SpaceListUpdate\n+\n+class RoomSummaryListProcessorTest {\n+ private val spaceRoomsFlow = MutableStateFlow>(emptyList())\n+\n+ @Test\n+ fun `Append adds new entries at the end of the list`() = runTest {\n+ spaceRoomsFlow.value = listOf(aSpaceRoom())\n+ val processor = createProcessor()\n+\n+ val newEntry = aRustSpaceRoom(roomId = A_ROOM_ID_2)\n+ processor.postUpdates(listOf(SpaceListUpdate.Append(listOf(newEntry, newEntry, newEntry))))\n+\n+ assertThat(spaceRoomsFlow.value.count()).isEqualTo(4)\n+ assertThat(spaceRoomsFlow.value.subList(1, 4).all { it.roomId == A_ROOM_ID_2 }).isTrue()\n+ }\n+\n+ @Test\n+ fun `PushBack adds a new entry at the end of the list`() = runTest {\n+ spaceRoomsFlow.value = listOf(aSpaceRoom())\n+ val processor = createProcessor()\n+ processor.postUpdates(listOf(SpaceListUpdate.PushBack(aRustSpaceRoom(roomId = A_ROOM_ID_2))))\n+\n+ assertThat(spaceRoomsFlow.value.count()).isEqualTo(2)\n+ assertThat(spaceRoomsFlow.value.last().roomId).isEqualTo(A_ROOM_ID_2)\n+ }\n+\n+ @Test\n+ fun `PushFront inserts a new entry at the start of the list`() = runTest {\n+ spaceRoomsFlow.value = listOf(aSpaceRoom())\n+ val processor = createProcessor()\n+ processor.postUpdates(listOf(SpaceListUpdate.PushFront(aRustSpaceRoom(roomId = A_ROOM_ID_2))))\n+\n+ assertThat(spaceRoomsFlow.value.count()).isEqualTo(2)\n+ assertThat(spaceRoomsFlow.value.first().roomId).isEqualTo(A_ROOM_ID_2)\n+ }\n+\n+ @Test\n+ fun `Set replaces an entry at some index`() = runTest {\n+ spaceRoomsFlow.value = listOf(aSpaceRoom())\n+ val processor = createProcessor()\n+ val index = 0\n+\n+ processor.postUpdates(listOf(SpaceListUpdate.Set(index.toUInt(), aRustSpaceRoom(roomId = A_ROOM_ID_2))))\n+\n+ assertThat(spaceRoomsFlow.value.count()).isEqualTo(1)\n+ assertThat(spaceRoomsFlow.value[index].roomId).isEqualTo(A_ROOM_ID_2)\n+ }\n+\n+ @Test\n+ fun `Insert inserts a new entry at the provided index`() = runTest {\n+ spaceRoomsFlow.value = listOf(aSpaceRoom())\n+ val processor = createProcessor()\n+ val index = 0\n+\n+ processor.postUpdates(listOf(SpaceListUpdate.Insert(index.toUInt(), aRustSpaceRoom(roomId = A_ROOM_ID_2))))\n+\n+ assertThat(spaceRoomsFlow.value.count()).isEqualTo(2)\n+ assertThat(spaceRoomsFlow.value[index].roomId).isEqualTo(A_ROOM_ID_2)\n+ }\n+\n+ @Test\n+ fun `Remove removes an entry at some index`() = runTest {\n+ spaceRoomsFlow.value = listOf(\n+ aSpaceRoom(roomId = A_ROOM_ID),\n+ aSpaceRoom(roomId = A_ROOM_ID_2)\n+ )\n+ val processor = createProcessor()\n+ val index = 0\n+\n+ processor.postUpdates(listOf(SpaceListUpdate.Remove(index.toUInt())))\n+\n+ assertThat(spaceRoomsFlow.value.count()).isEqualTo(1)\n+ assertThat(spaceRoomsFlow.value[index].roomId).isEqualTo(A_ROOM_ID_2)\n+ }\n+\n+ @Test\n+ fun `PopBack removes an entry at the end of the list`() = runTest {\n+ spaceRoomsFlow.value = listOf(\n+ aSpaceRoom(roomId = A_ROOM_ID),\n+ aSpaceRoom(roomId = A_ROOM_ID_2)\n+ )\n+ val processor = createProcessor()\n+ val index = 0\n+\n+ processor.postUpdates(listOf(SpaceListUpdate.PopBack))\n+\n+ assertThat(spaceRoomsFlow.value.count()).isEqualTo(1)\n+ assertThat(spaceRoomsFlow.value[index].roomId).isEqualTo(A_ROOM_ID)\n+ }\n+\n+ @Test\n+ fun `PopFront removes an entry at the start of the list`() = runTest {\n+ spaceRoomsFlow.value = listOf(\n+ aSpaceRoom(roomId = A_ROOM_ID),\n+ aSpaceRoom(roomId = A_ROOM_ID_2)\n+ )\n+ val processor = createProcessor()\n+ val index = 0\n+\n+ processor.postUpdates(listOf(SpaceListUpdate.PopFront))\n+\n+ assertThat(spaceRoomsFlow.value.count()).isEqualTo(1)\n+ assertThat(spaceRoomsFlow.value[index].roomId).isEqualTo(A_ROOM_ID_2)\n+ }\n+\n+ @Test\n+ fun `Clear removes all the entries`() = runTest {\n+ spaceRoomsFlow.value = listOf(\n+ aSpaceRoom(roomId = A_ROOM_ID),\n+ aSpaceRoom(roomId = A_ROOM_ID_2)\n+ )\n+ val processor = createProcessor()\n+\n+ processor.postUpdates(listOf(SpaceListUpdate.Clear))\n+\n+ assertThat(spaceRoomsFlow.value).isEmpty()\n+ }\n+\n+ @Test\n+ fun `Truncate removes all entries after the provided length`() = runTest {\n+ spaceRoomsFlow.value = listOf(\n+ aSpaceRoom(roomId = A_ROOM_ID),\n+ aSpaceRoom(roomId = A_ROOM_ID_2)\n+ )\n+ val processor = createProcessor()\n+ val index = 0\n+\n+ processor.postUpdates(listOf(SpaceListUpdate.Truncate(1u)))\n+\n+ assertThat(spaceRoomsFlow.value.count()).isEqualTo(1)\n+ assertThat(spaceRoomsFlow.value[index].roomId).isEqualTo(A_ROOM_ID)\n+ }\n+\n+ @Test\n+ fun `Reset removes all entries and add the provided ones`() = runTest {\n+ spaceRoomsFlow.value = listOf(\n+ aSpaceRoom(roomId = A_ROOM_ID),\n+ aSpaceRoom(roomId = A_ROOM_ID_2)\n+ )\n+ val processor = createProcessor()\n+ val index = 0\n+\n+ processor.postUpdates(listOf(SpaceListUpdate.Reset(listOf(aRustSpaceRoom(A_ROOM_ID_3)))))\n+\n+ assertThat(spaceRoomsFlow.value.count()).isEqualTo(1)\n+ assertThat(spaceRoomsFlow.value[index].roomId).isEqualTo(A_ROOM_ID_3)\n+ }\n+\n+ @Test\n+ fun `When there is no replay cache SpaceListUpdateProcessor starts with an empty list`() = runTest {\n+ val spaceRoomsSharedFlow = MutableSharedFlow>(replay = 1)\n+ val processor = createProcessor(\n+ spaceRoomsFlow = spaceRoomsSharedFlow,\n+ )\n+ assertThat(spaceRoomsSharedFlow.replayCache).isEmpty()\n+ val newEntry = aRustSpaceRoom(roomId = A_ROOM_ID)\n+ processor.postUpdates(listOf(SpaceListUpdate.Append(listOf(newEntry))))\n+ assertThat(spaceRoomsSharedFlow.replayCache).hasSize(1)\n+ assertThat(spaceRoomsSharedFlow.replayCache.first()).hasSize(1)\n+ }\n+\n+ private fun createProcessor(\n+ spaceRoomsFlow: MutableSharedFlow> = this.spaceRoomsFlow,\n+ ) = SpaceListUpdateProcessor(\n+ spaceRoomsFlow = spaceRoomsFlow,\n+ mapper = SpaceRoomMapper(),\n+ spaceRoomCache = SpaceRoomCache(),\n+ )\n+}\ndiff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceRoomListTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceRoomListTest.kt\nnew file mode 100644\nindex 00000000000..6ef32596574\n--- /dev/null\n+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceRoomListTest.kt\n@@ -0,0 +1,118 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+@file:OptIn(ExperimentalCoroutinesApi::class)\n+\n+package io.element.android.libraries.matrix.impl.spaces\n+\n+import app.cash.turbine.test\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.matrix.api.core.RoomId\n+import io.element.android.libraries.matrix.api.spaces.SpaceRoomList\n+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustSpaceRoom\n+import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiSpaceRoomList\n+import io.element.android.libraries.matrix.test.A_ROOM_ID\n+import io.element.android.libraries.matrix.test.A_ROOM_ID_2\n+import io.element.android.libraries.previewutils.room.aSpaceRoom\n+import io.element.android.tests.testutils.lambda.lambdaRecorder\n+import kotlinx.coroutines.ExperimentalCoroutinesApi\n+import kotlinx.coroutines.test.TestScope\n+import kotlinx.coroutines.test.runCurrent\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Test\n+import org.matrix.rustcomponents.sdk.SpaceListUpdate\n+import uniffi.matrix_sdk_ui.SpaceRoomListPaginationState\n+import org.matrix.rustcomponents.sdk.SpaceRoomList as InnerSpaceRoomList\n+\n+class RustSpaceRoomListTest {\n+ @Test\n+ fun `paginationStatusFlow emits values`() = runTest {\n+ val innerSpaceRoomList = FakeFfiSpaceRoomList(\n+ paginationStateResult = { SpaceRoomListPaginationState.Idle(false) }\n+ )\n+ val sut = createRustSpaceRoomList(\n+ innerSpaceRoomList = innerSpaceRoomList,\n+ )\n+ sut.paginationStatusFlow.test {\n+ // First value is the initial one\n+ assertThat(awaitItem()).isEqualTo(SpaceRoomList.PaginationStatus.Idle(hasMoreToLoad = false))\n+ // First value after the subscription occurs\n+ assertThat(awaitItem()).isEqualTo(SpaceRoomList.PaginationStatus.Idle(hasMoreToLoad = true))\n+ innerSpaceRoomList.triggerPaginationStateUpdate(SpaceRoomListPaginationState.Loading)\n+ assertThat(awaitItem()).isEqualTo(SpaceRoomList.PaginationStatus.Loading)\n+ innerSpaceRoomList.triggerPaginationStateUpdate(SpaceRoomListPaginationState.Idle(true))\n+ assertThat(awaitItem()).isEqualTo(SpaceRoomList.PaginationStatus.Idle(hasMoreToLoad = false))\n+ innerSpaceRoomList.triggerPaginationStateUpdate(SpaceRoomListPaginationState.Idle(false))\n+ assertThat(awaitItem()).isEqualTo(SpaceRoomList.PaginationStatus.Idle(hasMoreToLoad = true))\n+ }\n+ }\n+\n+ @Test\n+ fun `spaceRoomsFlow emits values`() = runTest {\n+ val innerSpaceRoomList = FakeFfiSpaceRoomList(\n+ paginationStateResult = { SpaceRoomListPaginationState.Idle(false) }\n+ )\n+ val sut = createRustSpaceRoomList(\n+ innerSpaceRoomList = innerSpaceRoomList,\n+ )\n+ sut.spaceRoomsFlow.test {\n+ // Give time for the subscription to be set\n+ runCurrent()\n+ innerSpaceRoomList.triggerRoomListUpdate(\n+ listOf(\n+ SpaceListUpdate.PushBack(aRustSpaceRoom(roomId = A_ROOM_ID_2))\n+ )\n+ )\n+ val rooms = awaitItem()\n+ assertThat(rooms).hasSize(1)\n+ assertThat(rooms[0].roomId).isEqualTo(A_ROOM_ID_2)\n+ }\n+ }\n+\n+ @Test\n+ fun `paginate invokes paginate on the inner class`() = runTest {\n+ val paginateResult = lambdaRecorder { }\n+ val innerSpaceRoomList = FakeFfiSpaceRoomList(\n+ paginateResult = paginateResult,\n+ )\n+ val sut = createRustSpaceRoomList(\n+ innerSpaceRoomList = innerSpaceRoomList,\n+ )\n+ sut.paginate()\n+ paginateResult.assertions().isCalledOnce()\n+ }\n+\n+ @Test\n+ fun `currentSpaceFlow reads value from the SpaceRoomCache`() = runTest {\n+ val spaceRoomCache = SpaceRoomCache()\n+ val sut = createRustSpaceRoomList(\n+ spaceRoomCache = spaceRoomCache,\n+ )\n+ sut.currentSpaceFlow().test {\n+ assertThat(awaitItem()).isNull()\n+ val spaceRoom = aSpaceRoom(roomId = A_ROOM_ID)\n+ spaceRoomCache.update(listOf(spaceRoom))\n+ assertThat(awaitItem()).isEqualTo(spaceRoom)\n+ }\n+ }\n+\n+ private fun TestScope.createRustSpaceRoomList(\n+ roomId: RoomId = A_ROOM_ID,\n+ innerSpaceRoomList: InnerSpaceRoomList = FakeFfiSpaceRoomList(),\n+ innerProvider: suspend () -> InnerSpaceRoomList = { innerSpaceRoomList },\n+ spaceRoomMapper: SpaceRoomMapper = SpaceRoomMapper(),\n+ spaceRoomCache: SpaceRoomCache = SpaceRoomCache(),\n+ ): RustSpaceRoomList {\n+ return RustSpaceRoomList(\n+ roomId = roomId,\n+ innerProvider = innerProvider,\n+ sessionCoroutineScope = backgroundScope,\n+ spaceRoomMapper = spaceRoomMapper,\n+ spaceRoomCache = spaceRoomCache,\n+ )\n+ }\n+}\ndiff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomCacheTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomCacheTest.kt\nnew file mode 100644\nindex 00000000000..0679ce1a331\n--- /dev/null\n+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomCacheTest.kt\n@@ -0,0 +1,46 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.matrix.impl.spaces\n+\n+import app.cash.turbine.test\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.matrix.api.room.RoomType\n+import io.element.android.libraries.matrix.test.A_ROOM_ID\n+import io.element.android.libraries.matrix.test.A_ROOM_ID_2\n+import io.element.android.libraries.previewutils.room.aSpaceRoom\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Test\n+\n+class SpaceRoomCacheTest {\n+ @Test\n+ fun `getSpaceRoomFlow emits items`() = runTest {\n+ val sut = SpaceRoomCache()\n+ sut.getSpaceRoomFlow(A_ROOM_ID).test {\n+ assertThat(awaitItem()).isNull()\n+ val room = aSpaceRoom(\n+ roomId = A_ROOM_ID,\n+ roomType = RoomType.Room,\n+ )\n+ sut.update(listOf(room))\n+ // Not a space, should not be cached\n+ expectNoEvents()\n+ val space = aSpaceRoom(\n+ roomId = A_ROOM_ID,\n+ roomType = RoomType.Space,\n+ )\n+ sut.update(listOf(space))\n+ assertThat(awaitItem()).isEqualTo(space)\n+ val spaceOther = aSpaceRoom(\n+ roomId = A_ROOM_ID_2,\n+ roomType = RoomType.Space,\n+ )\n+ sut.update(listOf(spaceOther))\n+ expectNoEvents()\n+ }\n+ }\n+}\ndiff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeSpaceRoomList.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeSpaceRoomList.kt\nnew file mode 100644\nindex 00000000000..cd5bf7eb538\n--- /dev/null\n+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeSpaceRoomList.kt\n@@ -0,0 +1,49 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.matrix.test.spaces\n+\n+import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n+import io.element.android.libraries.matrix.api.spaces.SpaceRoomList\n+import io.element.android.tests.testutils.lambda.lambdaError\n+import io.element.android.tests.testutils.simulateLongTask\n+import kotlinx.coroutines.flow.Flow\n+import kotlinx.coroutines.flow.MutableStateFlow\n+import kotlinx.coroutines.flow.StateFlow\n+import kotlinx.coroutines.flow.asStateFlow\n+\n+class FakeSpaceRoomList(\n+ initialSpaceFlowValue: SpaceRoom? = null,\n+ initialSpaceRoomsValue: List = emptyList(),\n+ initialSpaceRoomList: SpaceRoomList.PaginationStatus = SpaceRoomList.PaginationStatus.Loading,\n+ private val paginateResult: () -> Result = { lambdaError() },\n+) : SpaceRoomList {\n+ private val currentSpaceMutableStateFlow: MutableStateFlow = MutableStateFlow(initialSpaceFlowValue)\n+ override fun currentSpaceFlow(): Flow = currentSpaceMutableStateFlow.asStateFlow()\n+\n+ fun emitCurrentSpace(value: SpaceRoom?) {\n+ currentSpaceMutableStateFlow.value = value\n+ }\n+\n+ private val _spaceRoomsFlow: MutableStateFlow> = MutableStateFlow(initialSpaceRoomsValue)\n+ override val spaceRoomsFlow: Flow> = _spaceRoomsFlow.asStateFlow()\n+\n+ fun emitSpaceRooms(value: List) {\n+ _spaceRoomsFlow.value = value\n+ }\n+\n+ private val _paginationStatusFlow: MutableStateFlow = MutableStateFlow(initialSpaceRoomList)\n+ override val paginationStatusFlow: StateFlow = _paginationStatusFlow.asStateFlow()\n+\n+ fun emitPaginationStatus(value: SpaceRoomList.PaginationStatus) {\n+ _paginationStatusFlow.value = value\n+ }\n+\n+ override suspend fun paginate(): Result = simulateLongTask {\n+ paginateResult()\n+ }\n+}\ndiff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeSpaceService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeSpaceService.kt\nindex 54005b122b8..43cc8ae8d29 100644\n--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeSpaceService.kt\n+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeSpaceService.kt\n@@ -7,7 +7,9 @@\n \n package io.element.android.libraries.matrix.test.spaces\n \n+import io.element.android.libraries.matrix.api.core.RoomId\n import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n+import io.element.android.libraries.matrix.api.spaces.SpaceRoomList\n import io.element.android.libraries.matrix.api.spaces.SpaceService\n import io.element.android.tests.testutils.lambda.lambdaError\n import io.element.android.tests.testutils.simulateLongTask\n@@ -16,17 +18,22 @@ import kotlinx.coroutines.flow.SharedFlow\n import kotlinx.coroutines.flow.asSharedFlow\n \n class FakeSpaceService(\n- private val joinedSpacesResult: () -> Result> = { lambdaError() }\n+ private val joinedSpacesResult: () -> Result> = { lambdaError() },\n+ private val spaceRoomListResult: (RoomId) -> SpaceRoomList = { lambdaError() },\n ) : SpaceService {\n- private val _spaceRooms = MutableSharedFlow>()\n- override val spaceRooms: SharedFlow>\n- get() = _spaceRooms.asSharedFlow()\n+ private val _spaceRoomsFlow = MutableSharedFlow>()\n+ override val spaceRoomsFlow: SharedFlow>\n+ get() = _spaceRoomsFlow.asSharedFlow()\n \n suspend fun emitSpaceRoomList(value: List) {\n- _spaceRooms.emit(value)\n+ _spaceRoomsFlow.emit(value)\n }\n \n override suspend fun joinedSpaces(): Result> = simulateLongTask {\n return joinedSpacesResult()\n }\n+\n+ override fun spaceRoomList(id: RoomId): SpaceRoomList {\n+ return spaceRoomListResult(id)\n+ }\n }\ndiff --git a/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt b/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt\nnew file mode 100644\nindex 00000000000..3acea6255b6\n--- /dev/null\n+++ b/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt\n@@ -0,0 +1,46 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.previewutils.room\n+\n+import io.element.android.libraries.matrix.api.core.RoomAlias\n+import io.element.android.libraries.matrix.api.core.RoomId\n+import io.element.android.libraries.matrix.api.room.CurrentUserMembership\n+import io.element.android.libraries.matrix.api.room.RoomType\n+import io.element.android.libraries.matrix.api.room.join.JoinRule\n+import io.element.android.libraries.matrix.api.spaces.SpaceRoom\n+import io.element.android.libraries.matrix.api.user.MatrixUser\n+\n+fun aSpaceRoom(\n+ name: String? = \"Space name\",\n+ avatarUrl: String? = null,\n+ canonicalAlias: RoomAlias? = null,\n+ childrenCount: Int = 0,\n+ guestCanJoin: Boolean = false,\n+ heroes: List = emptyList(),\n+ joinRule: JoinRule? = null,\n+ numJoinedMembers: Int = 0,\n+ roomId: RoomId = RoomId(\"!roomId:example.com\"),\n+ roomType: RoomType = RoomType.Space,\n+ state: CurrentUserMembership? = null,\n+ topic: String? = null,\n+ worldReadable: Boolean = false,\n+) = SpaceRoom(\n+ name = name,\n+ avatarUrl = avatarUrl,\n+ canonicalAlias = canonicalAlias,\n+ childrenCount = childrenCount,\n+ guestCanJoin = guestCanJoin,\n+ heroes = heroes,\n+ joinRule = joinRule,\n+ numJoinedMembers = numJoinedMembers,\n+ roomId = roomId,\n+ roomType = roomType,\n+ state = state,\n+ topic = topic,\n+ worldReadable = worldReadable\n+)\ndiff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Day_0_en.png\ndeleted file mode 100644\nindex 4dc4712e677..00000000000\n--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Day_0_en.png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:a241e70cffe61158784ac75425e13cd8d2695406f6e52a93ca7dddfdc9f99caa\n-size 14164\ndiff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Day_1_en.png\ndeleted file mode 100644\nindex dc4f56f39b7..00000000000\n--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Day_1_en.png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:864ab3319f7074643b58d2dd6da22a4c5493bae25502c89bf2c3503bc57cfe91\n-size 11628\ndiff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Day_2_en.png\ndeleted file mode 100644\nindex 403a96cbad0..00000000000\n--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Day_2_en.png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:ba93e44b8732d7bf78b25200a5db6e8a329f970aa1fb6a002033c9ebfd09b805\n-size 11723\ndiff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Day_3_en.png\ndeleted file mode 100644\nindex f12b559ded0..00000000000\n--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Day_3_en.png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:59b6f98dc65ae4be92b7cdfde9778b390b6474205f75d48061d6345eece53675\n-size 19034\ndiff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Day_4_en.png\ndeleted file mode 100644\nindex 833415fba7a..00000000000\n--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Day_4_en.png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:b4a8cef8dc61dd71458d7518548e83f5e4484fd9dc740fefc690769ffbf6bd80\n-size 18949\ndiff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Night_0_en.png\ndeleted file mode 100644\nindex 175a0f01518..00000000000\n--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Night_0_en.png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:7ce65c4dd01458194792d0a14eafc66e6e6f0a0e0f59259e4661322d0cf9a46d\n-size 13819\ndiff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Night_1_en.png\ndeleted file mode 100644\nindex 443230a1595..00000000000\n--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Night_1_en.png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:3e3765e543cce879b97a35b8c3e1cdef4b6c9ce4b1739b9d9a544d6a56118399\n-size 11414\ndiff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Night_2_en.png\ndeleted file mode 100644\nindex 9ad249a00f1..00000000000\n--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Night_2_en.png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:51b283fb8e976c8717abeef61dcf294f3efd52b7291fdf023c09759e6df6513d\n-size 11337\ndiff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Night_3_en.png\ndeleted file mode 100644\nindex ceafbe6d6a9..00000000000\n--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Night_3_en.png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:c440b9628b8105b73f5f576c1b99269a74a89ab07f56080ad53cc888aca24da3\n-size 18111\ndiff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Night_4_en.png\ndeleted file mode 100644\nindex 3cf9c17cda2..00000000000\n--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpaceItemView_Night_4_en.png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:9ddecc15d26dbdd648ec7abbff51718da03326ebf32a2d675563110c096a198b\n-size 18141\ndiff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_0_en.png\nindex bd804824f93..f36c5aa998e 100644\n--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:dff393d500d855842d84d311b3bb5cb60bab6fc2e8e9efe3b593d675218d5024\n-size 123012\n+oid sha256:4053802814238aa74a5c606a4b37e0afcb923282c3e7cece737b0ec4f6828351\n+size 106332\ndiff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_0_en.png\nindex 6159775dd07..b77735afed0 100644\n--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:9993c1937c780b4b7e3a47bfb53fa5735ac7bc20f29559281384ca32eb7c13ae\n-size 120701\n+oid sha256:d02259f3163c49b5c39d38d7a84af50583f6a0ce2a66e8ad013ac18278de65c0\n+size 103621\ndiff --git a/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Day_0_en.png\nnew file mode 100644\nindex 00000000000..59cd1f1de1b\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Day_0_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:7e69f830b7f15de531fc46efc02964fb641a4e3754b5108fb8020e97bbfb4b56\n+size 15698\ndiff --git a/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Day_1_en.png\nnew file mode 100644\nindex 00000000000..393434d50b9\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Day_1_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:b5fba00f44ab63c07978ec0143f2f1fefc8fd1d78aed22a367e831c105b806c7\n+size 17306\ndiff --git a/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Day_2_en.png\nnew file mode 100644\nindex 00000000000..2fa59b0adaf\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Day_2_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:6c7b387db1b0637745dfc93559b9afa3c637e5a492bf19f6f1d0dbe802ed73bb\n+size 47156\ndiff --git a/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Day_3_en.png\nnew file mode 100644\nindex 00000000000..8cb2f6776ce\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Day_3_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:9892ec0c06bfa6e0b3a95fd35efa97e44f2e1f6264a324d6fdd994847f1830d1\n+size 45897\ndiff --git a/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Night_0_en.png\nnew file mode 100644\nindex 00000000000..a2c2d2043d4\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Night_0_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:91ad7e392e21afe93606956e8e7eab7f0b075574e782ff15e873a71fc3ab16ab\n+size 15637\ndiff --git a/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Night_1_en.png\nnew file mode 100644\nindex 00000000000..67cdaf4a391\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Night_1_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:9d50be9f20ed0e75e337d790edb329996abf9e626591882088817301338fadb6\n+size 17213\ndiff --git a/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Night_2_en.png\nnew file mode 100644\nindex 00000000000..6e55a5816ee\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Night_2_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:d76f7b10d8c88f39ab36581be35dd2a5ca5e7c3a92c69b96d4f3ec87f2e93468\n+size 46564\ndiff --git a/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Night_3_en.png\nnew file mode 100644\nindex 00000000000..298a35ce39b\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.space.impl_SpaceView_Night_3_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:057ceb522ff354d0d7e8b73d59eb53c559f9c22a2727d24744dc6a34b9daaa55\n+size 45034\n", "n2p_tests": "{\"io.element.android.libraries.matrix.impl.spaces.RoomSummaryListProcessorTest.Remove removes an entry at some index\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.spaces.RoomSummaryListProcessorTest.Clear removes all the entries\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.spaces.RoomSummaryListProcessorTest.Append adds new entries at the end of the list\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.space.impl.SpacePresenterTest.present - initial state\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.spaces.RoomSummaryListProcessorTest.Set replaces an entry at some index\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.spaces.RoomSummaryListProcessorTest.PushFront inserts a new entry at the start of the list\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.spaces.RoomSummaryListProcessorTest.PushBack adds a new entry at the end of the list\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.spaces.RoomSummaryListProcessorTest.PopFront removes an entry at the start of the list\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.space.impl.SpacePresenterTest.present - load more\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.space.impl.SpacePresenterTest.present - has more to load value\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.spaces.RoomSummaryListProcessorTest.When there is no replay cache SpaceListUpdateProcessor starts with an empty list\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.spaces.RoomSummaryListProcessorTest.Insert inserts a new entry at the provided index\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.space.impl.SpacePresenterTest.present - children value\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.spaces.RoomSummaryListProcessorTest.Truncate removes all entries after the provided length\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.spaces.RustSpaceRoomListTest.currentSpaceFlow reads value from the SpaceRoomCache\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.spaces.RustSpaceRoomListTest.spaceRoomsFlow emits values\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.spaces.RoomSummaryListProcessorTest.Reset removes all entries and add the provided ones\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.space.impl.SpacePresenterTest.present - current space value\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.spaces.RustSpaceRoomListTest.paginationStatusFlow emits values\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.spaces.RoomSummaryListProcessorTest.PopBack removes an entry at the end of the list\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.spaces.RustSpaceRoomListTest.paginate invokes paginate on the inner class\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.spaces.SpaceRoomCacheTest.getSpaceRoomFlow emits items\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-5161", "org": "element-hq", "repo": "element-x-android", "number": 5161, "state": "closed", "title": "Move push history entry point from notification settings to developer settings", "body": "\r\n\r\n \r\n## Content\r\n\r\n\r\nMove push history entry point from notification settings to developer settings\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #5159\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Check the new entry point location of \"Push history\"\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 24\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"516c3cfda36d7158405dadbb0ff573e7e7db1618\"}", "resolved_issues": "[{\"number\": 5159, \"title\": \"Move the Push history screen to Developer options\", \"body\": \"The Push history is a developer focused screen. It is very technical and needs good knowledge of the Matrix protocol and push rules to use it. It is expected to have errors there like for unread pushes pushes for example. As developers, we cannot expect non tech people to make a good use of it. We have a dedicated section of the app for this with the Developer options. Tech people knows about it.\\n\\nOn the other hand, the Troubleshooting screen is useful to everyone. It's important to keep it. Everyone can solve their own problem, for example, by allowing notifications.\"}]", "lang": "kotlin", "problem_statement": "Move the Push history screen to Developer options\nThe Push history is a developer focused screen. It is very technical and needs good knowledge of the Matrix protocol and push rules to use it. It is expected to have errors there like for unread pushes pushes for example. As developers, we cannot expect non tech people to make a good use of it. We have a dedicated section of the app for this with the Developer options. Tech people knows about it.\n\nOn the other hand, the Troubleshooting screen is useful to everyone. It's important to keep it. Everyone can solve their own problem, for example, by allowing notifications.\n", "hints": NaN, "pull_url": "https://github.com/element-hq/element-x-android/pull/5161", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/5159\"]", "test_command": "./gradlew :features:preferences:impl:testDebugUnitTest --tests \"io.element.android.features.preferences.impl.developer.DeveloperSettingsViewTest\" --tests \"io.element.android.features.preferences.impl.notifications.NotificationSettingsViewTest\"", "fix_patch": "diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt\nindex 234b4c683b0..b38b835f362 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt\n@@ -167,7 +167,12 @@ class PreferencesFlowNode @AssistedInject constructor(\n createNode(buildContext, plugins = listOf(callback))\n }\n NavTarget.DeveloperSettings -> {\n- createNode(buildContext)\n+ val developerSettingsCallback = object : DeveloperSettingsNode.Callback {\n+ override fun onPushHistoryClick() {\n+ backstack.push(NavTarget.PushHistory)\n+ }\n+ }\n+ createNode(buildContext, listOf(developerSettingsCallback))\n }\n NavTarget.About -> {\n val callback = object : AboutNode.Callback {\n@@ -189,10 +194,6 @@ class PreferencesFlowNode @AssistedInject constructor(\n override fun onTroubleshootNotificationsClick() {\n backstack.push(NavTarget.TroubleshootNotifications)\n }\n-\n- override fun onPushHistoryClick() {\n- backstack.push(NavTarget.PushHistory)\n- }\n }\n createNode(buildContext, listOf(notificationSettingsCallback))\n }\ndiff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt\nindex fafe5fc9205..392a6af903d 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt\n@@ -14,6 +14,7 @@ import com.airbnb.android.showkase.models.Showkase\n import com.bumble.appyx.core.modality.BuildContext\n import com.bumble.appyx.core.node.Node\n import com.bumble.appyx.core.plugin.Plugin\n+import com.bumble.appyx.core.plugin.plugins\n import dagger.assisted.Assisted\n import dagger.assisted.AssistedInject\n import io.element.android.anvilannotations.ContributesNode\n@@ -26,6 +27,16 @@ class DeveloperSettingsNode @AssistedInject constructor(\n @Assisted plugins: List,\n private val presenter: DeveloperSettingsPresenter,\n ) : Node(buildContext, plugins = plugins) {\n+ interface Callback : Plugin {\n+ fun onPushHistoryClick()\n+ }\n+\n+ private val callbacks = plugins()\n+\n+ private fun onPushHistoryClick() {\n+ callbacks.forEach { it.onPushHistoryClick() }\n+ }\n+\n @Composable\n override fun View(modifier: Modifier) {\n val activity = requireNotNull(LocalActivity.current)\n@@ -39,6 +50,7 @@ class DeveloperSettingsNode @AssistedInject constructor(\n state = state,\n modifier = modifier,\n onOpenShowkase = ::openShowkase,\n+ onPushHistoryClick = ::onPushHistoryClick,\n onBackClick = ::navigateUp\n )\n }\ndiff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt\nindex 9a9cc61d680..e00b178dee7 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt\n@@ -42,6 +42,7 @@ import kotlinx.collections.immutable.toPersistentList\n fun DeveloperSettingsView(\n state: DeveloperSettingsState,\n onOpenShowkase: () -> Unit,\n+ onPushHistoryClick: () -> Unit,\n onBackClick: () -> Unit,\n modifier: Modifier = Modifier,\n ) {\n@@ -57,6 +58,7 @@ fun DeveloperSettingsView(\n ) {\n FeatureListContent(state)\n }\n+ NotificationCategory(onPushHistoryClick)\n ElementCallCategory(state = state)\n \n PreferenceCategory(title = \"Rust SDK\") {\n@@ -159,6 +161,18 @@ private fun ElementCallCategory(\n }\n }\n \n+@Composable\n+private fun NotificationCategory(onPushHistoryClick: () -> Unit) {\n+ PreferenceCategory(title = stringResource(id = R.string.screen_notification_settings_title)) {\n+ ListItem(\n+ headlineContent = {\n+ Text(stringResource(R.string.troubleshoot_notifications_entry_point_push_history_title))\n+ },\n+ onClick = onPushHistoryClick,\n+ )\n+ }\n+}\n+\n @Composable\n private fun FeatureListContent(\n state: DeveloperSettingsState,\n@@ -179,6 +193,7 @@ internal fun DeveloperSettingsViewPreview(@PreviewParameter(DeveloperSettingsSta\n DeveloperSettingsView(\n state = state,\n onOpenShowkase = {},\n+ onPushHistoryClick = {},\n onBackClick = {}\n )\n }\ndiff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsNode.kt\nindex 75f38f60eeb..15a6afcd89a 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsNode.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsNode.kt\n@@ -27,7 +27,6 @@ class NotificationSettingsNode @AssistedInject constructor(\n interface Callback : Plugin {\n fun editDefaultNotificationMode(isOneToOne: Boolean)\n fun onTroubleshootNotificationsClick()\n- fun onPushHistoryClick()\n }\n \n private val callbacks = plugins()\n@@ -40,10 +39,6 @@ class NotificationSettingsNode @AssistedInject constructor(\n callbacks.forEach { it.onTroubleshootNotificationsClick() }\n }\n \n- private fun onPushHistoryClick() {\n- callbacks.forEach { it.onPushHistoryClick() }\n- }\n-\n @Composable\n override fun View(modifier: Modifier) {\n val state = presenter.present()\n@@ -52,7 +47,6 @@ class NotificationSettingsNode @AssistedInject constructor(\n onOpenEditDefault = { openEditDefault(isOneToOne = it) },\n onBackClick = ::navigateUp,\n onTroubleshootNotificationsClick = ::onTroubleshootNotificationsClick,\n- onPushHistoryClick = ::onPushHistoryClick,\n modifier = modifier,\n )\n }\ndiff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt\nindex f73fecaf3c4..26b2de590e3 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt\n@@ -51,7 +51,6 @@ fun NotificationSettingsView(\n state: NotificationSettingsState,\n onOpenEditDefault: (isOneToOne: Boolean) -> Unit,\n onTroubleshootNotificationsClick: () -> Unit,\n- onPushHistoryClick: () -> Unit,\n onBackClick: () -> Unit,\n modifier: Modifier = Modifier,\n ) {\n@@ -84,7 +83,6 @@ fun NotificationSettingsView(\n // onCallsNotificationsChanged = { state.eventSink(NotificationSettingsEvents.SetCallNotificationsEnabled(it)) },\n onInviteForMeNotificationsChange = { state.eventSink(NotificationSettingsEvents.SetInviteForMeNotificationsEnabled(it)) },\n onTroubleshootNotificationsClick = onTroubleshootNotificationsClick,\n- onPushHistoryClick = onPushHistoryClick,\n )\n }\n AsyncActionView(\n@@ -108,7 +106,6 @@ private fun NotificationSettingsContentView(\n // onCallsNotificationsChanged: (Boolean) -> Unit,\n onInviteForMeNotificationsChange: (Boolean) -> Unit,\n onTroubleshootNotificationsClick: () -> Unit,\n- onPushHistoryClick: () -> Unit,\n ) {\n val context = LocalContext.current\n val systemSettings: NotificationSettingsState.AppSettings = state.appSettings\n@@ -207,12 +204,6 @@ private fun NotificationSettingsContentView(\n },\n onClick = onTroubleshootNotificationsClick\n )\n- ListItem(\n- headlineContent = {\n- Text(stringResource(R.string.troubleshoot_notifications_entry_point_push_history_title))\n- },\n- onClick = onPushHistoryClick\n- )\n }\n if (state.showAdvancedSettings) {\n PreferenceCategory(title = stringResource(id = CommonStrings.common_advanced_settings)) {\n@@ -313,6 +304,5 @@ internal fun NotificationSettingsViewPreview(@PreviewParameter(NotificationSetti\n onBackClick = {},\n onOpenEditDefault = {},\n onTroubleshootNotificationsClick = {},\n- onPushHistoryClick = {},\n )\n }\n", "test_patch": "diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsViewTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsViewTest.kt\nindex 5d0030af8e0..f10fdc93c46 100644\n--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsViewTest.kt\n+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsViewTest.kt\n@@ -52,6 +52,21 @@ class DeveloperSettingsViewTest {\n }\n }\n \n+ @Config(qualifiers = \"h1500dp\")\n+ @Test\n+ fun `clicking on push history notification invokes the expected callback`() {\n+ val eventsRecorder = EventsRecorder(expectEvents = false)\n+ ensureCalledOnce {\n+ rule.setDeveloperSettingsView(\n+ state = aDeveloperSettingsState(\n+ eventSink = eventsRecorder\n+ ),\n+ onPushHistoryClick = it\n+ )\n+ rule.clickOn(R.string.troubleshoot_notifications_entry_point_push_history_title)\n+ }\n+ }\n+\n @Config(qualifiers = \"h1500dp\")\n @Test\n fun `clicking on element call url open the dialogs and submit emits the expected event`() {\n@@ -68,7 +83,7 @@ class DeveloperSettingsViewTest {\n eventsRecorder.assertSingle(DeveloperSettingsEvents.SetCustomElementCallBaseUrl(\"https://call.element.dev\"))\n }\n \n- @Config(qualifiers = \"h1200dp\")\n+ @Config(qualifiers = \"h2000dp\")\n @Test\n fun `clicking on open showkase invokes the expected callback`() {\n val eventsRecorder = EventsRecorder(expectEvents = false)\n@@ -97,7 +112,7 @@ class DeveloperSettingsViewTest {\n eventsRecorder.assertSingle(DeveloperSettingsEvents.SetTracingLogLevel(LogLevelItem.DEBUG))\n }\n \n- @Config(qualifiers = \"h1700dp\")\n+ @Config(qualifiers = \"h2000dp\")\n @Test\n fun `clicking on clear cache emits the expected event`() {\n val eventsRecorder = EventsRecorder()\n@@ -114,12 +129,14 @@ class DeveloperSettingsViewTest {\n private fun AndroidComposeTestRule.setDeveloperSettingsView(\n state: DeveloperSettingsState,\n onOpenShowkase: () -> Unit = EnsureNeverCalled(),\n+ onPushHistoryClick: () -> Unit = EnsureNeverCalled(),\n onBackClick: () -> Unit = EnsureNeverCalled()\n ) {\n setContent {\n DeveloperSettingsView(\n state = state,\n onOpenShowkase = onOpenShowkase,\n+ onPushHistoryClick = onPushHistoryClick,\n onBackClick = onBackClick,\n )\n }\ndiff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsViewTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsViewTest.kt\nindex 3b2a2663a51..2aa485a1920 100644\n--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsViewTest.kt\n+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsViewTest.kt\n@@ -66,22 +66,6 @@ class NotificationSettingsViewTest {\n eventsRecorder.assertSingle(NotificationSettingsEvents.RefreshSystemNotificationsEnabled)\n }\n \n- @Config(qualifiers = \"h1024dp\")\n- @Test\n- fun `clicking on push history notification invokes the expected callback`() {\n- val eventsRecorder = EventsRecorder()\n- ensureCalledOnce {\n- rule.setNotificationSettingsView(\n- state = aValidNotificationSettingsState(\n- eventSink = eventsRecorder\n- ),\n- onPushHistoryClick = it\n- )\n- rule.clickOn(R.string.troubleshoot_notifications_entry_point_push_history_title)\n- }\n- eventsRecorder.assertSingle(NotificationSettingsEvents.RefreshSystemNotificationsEnabled)\n- }\n-\n @Config(qualifiers = \"h1024dp\")\n @Test\n fun `clicking on group chats invokes the expected callback`() {\n@@ -300,7 +284,6 @@ private fun AndroidComposeTestRule.setNotif\n state: NotificationSettingsState,\n onOpenEditDefault: (isOneToOne: Boolean) -> Unit = EnsureNeverCalledWithParam(),\n onTroubleshootNotificationsClick: () -> Unit = EnsureNeverCalled(),\n- onPushHistoryClick: () -> Unit = EnsureNeverCalled(),\n onBackClick: () -> Unit = EnsureNeverCalled(),\n ) {\n setContent {\n@@ -308,7 +291,6 @@ private fun AndroidComposeTestRule.setNotif\n state = state,\n onOpenEditDefault = onOpenEditDefault,\n onTroubleshootNotificationsClick = onTroubleshootNotificationsClick,\n- onPushHistoryClick = onPushHistoryClick,\n onBackClick = onBackClick,\n )\n }\ndiff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_0_en.png\nindex 246b5d52eb9..9da2df7e98d 100644\n--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:7a028014d94f3aa7c0f2a81f00d9b686df19103ed9c0a0f32f09db27c2bdc742\n-size 53850\n+oid sha256:e8c417f2c0b856499c3a1733ef6d7415097a324139621fbbfc8fb9d0fe6d1a82\n+size 46108\ndiff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_1_en.png\nindex 246b5d52eb9..9da2df7e98d 100644\n--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_1_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_1_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:7a028014d94f3aa7c0f2a81f00d9b686df19103ed9c0a0f32f09db27c2bdc742\n-size 53850\n+oid sha256:e8c417f2c0b856499c3a1733ef6d7415097a324139621fbbfc8fb9d0fe6d1a82\n+size 46108\ndiff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_2_en.png\nindex 43edfa29151..68c365da4ca 100644\n--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_2_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_2_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:67cb6c4c1135742ddd2ca9def6580dec715fe92fcf1abcbcee133793d6fc5c9f\n-size 52424\n+oid sha256:9eda74b1b65aca54f03ed4a07230d49ff6495672747975c5efa1da1c60b29f56\n+size 44657\ndiff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_0_en.png\nindex 8a161c66e8b..b442c94aa38 100644\n--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:aa42d10fcea58c37f4b4c90fc4b174f31b20abbfd25f926937d58355bbaa89b0\n-size 52250\n+oid sha256:657b03d76516c88bf748b70287b9270266b82064918463c71dab6df7eae23bd5\n+size 44817\ndiff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_1_en.png\nindex 8a161c66e8b..b442c94aa38 100644\n--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_1_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_1_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:aa42d10fcea58c37f4b4c90fc4b174f31b20abbfd25f926937d58355bbaa89b0\n-size 52250\n+oid sha256:657b03d76516c88bf748b70287b9270266b82064918463c71dab6df7eae23bd5\n+size 44817\ndiff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_2_en.png\nindex c2de3888ddc..02c1eb313e6 100644\n--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_2_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_2_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:2822c565f450ff21fab05751db31d4d8d003fca74aff48802c37a45bf8159015\n-size 50860\n+oid sha256:38f81f8a388f31511ec4b6479e0f188e852d8c5556a38661f5f666e1b191d091\n+size 43357\n", "n2p_tests": "{\"io.element.android.features.preferences.impl.developer.DeveloperSettingsViewTest.clicking on push history notification invokes the expected callback\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.developer.DeveloperSettingsViewTest.clicking on log level emits the expected event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.notifications.NotificationSettingsViewTest.clicking on troubleshoot notification invokes the expected callback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.developer.DeveloperSettingsViewTest.clicking on clear cache emits the expected event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.notifications.NotificationSettingsViewTest.clicking on direct chats invokes the expected callback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.developer.DeveloperSettingsViewTest.clicking on element call url open the dialogs and submit emits the expected event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.developer.DeveloperSettingsViewTest.clicking on open showkase invokes the expected callback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.developer.DeveloperSettingsViewTest.clicking on back invokes the expected callback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.notifications.NotificationSettingsViewTest.clicking on disable notify me on at room emits the expected events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.notifications.NotificationSettingsViewTest.clicking on enable notify me on invitation emits the expected events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.notifications.NotificationSettingsViewTest.clicking on disable notify me on invitation emits the expected events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.notifications.NotificationSettingsViewTest.with invalid configuration, clicking on continue emits the expected events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.notifications.NotificationSettingsViewTest.clicking on enable notifications emits the expected events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.notifications.NotificationSettingsViewTest.clicking on a push provider emits the expected event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.notifications.NotificationSettingsViewTest.clicking on back invokes the expected callback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.notifications.NotificationSettingsViewTest.clicking on Push notification provider emits the expected event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.notifications.NotificationSettingsViewTest.clicking on enable notify me on at room emits the expected events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.notifications.NotificationSettingsViewTest.clicking on group chats invokes the expected callback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.notifications.NotificationSettingsViewTest.clicking on disable notifications emits the expected events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.notifications.NotificationSettingsViewTest.with invalid configuration and error, clicking on OK emits the expected events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.notifications.NotificationSettingsViewTest.with an error configuration, clicking on continue emits the expected events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-5160", "org": "element-hq", "repo": "element-x-android", "number": 5160, "state": "closed", "title": "Remove old feature flags", "body": "\r\n \r\n## Content\r\n\r\n\r\nRemove a bunch of feature flags.\r\nCan be reviewed commit per commit.\r\n\r\nDraft as I spot a regression in the composer preview. There is actually no regression, the current behavior is the same. When adding a caption, the send voice message button is displayed. We should fix that separately. (I think there is an existing issue about it, but GH is broken now, so I cannot find it).\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #5154\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\n## Tests\r\n\r\n\r\n\r\n- There should not be any change in the default application behavior.\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 24\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"516c3cfda36d7158405dadbb0ff573e7e7db1618\"}", "resolved_issues": "[{\"number\": 5154, \"title\": \"Clean up feature flags\", \"body\": \"When we are actively developing a feature, we start by creating a feature flag so that users do not have access to the WIP. The list of feature flags has increased a lot and we have a way to make the flag not visible in the developer setting screen, which is used. But now we want to go further and fully remove the flags.\\n\\nHere is the list of flags, with the current state and the action to do on it.\\n\\n## Flags to remove:\\n\\n- [x] `LocationSharing`\\n- [x] `Polls`\\n- [x] `NotificationSettings`\\n- [x] `VoiceMessages`\\n- [x] `PinUnlock`\\n- [x] `MarkAsUnread`\\n- [x] `QrCodeLogin`\\n- [x] `IncomingShare`\\n- [x] `PinnedEvents`\\n- [x] `SyncOnPush`\\n- [x] `MediaUploadOnSendQueue`\\n- [x] `MediaCaptionCreation` \\n- [x] `MediaCaptionWarning`\\n- [x] `MediaGallery`\\n- [ ] `SharePos`\\n\\n\\n## Flags to keep\\n\\n- `RoomDirectorySearch`\\n- `ShowBlockedUsersDetails`\\n- `OnlySignedDeviceIsolationMode`\\n- `EnableKeyShareOnInvite`\\n- `Space` -> Keep (WIP)\\n- `PrintLogsToLogcat`\\n- `SelectableMediaQuality` -> it has been added recently.\\n\\n## Others\\n\\n- `Knock` -> Disabled by default. Enable and remove?\\n\"}]", "lang": "kotlin", "problem_statement": "Clean up feature flags\nWhen we are actively developing a feature, we start by creating a feature flag so that users do not have access to the WIP. The list of feature flags has increased a lot and we have a way to make the flag not visible in the developer setting screen, which is used. But now we want to go further and fully remove the flags.\n\nHere is the list of flags, with the current state and the action to do on it.\n\n## Flags to remove:\n\n- [x] `LocationSharing`\n- [x] `Polls`\n- [x] `NotificationSettings`\n- [x] `VoiceMessages`\n- [x] `PinUnlock`\n- [x] `MarkAsUnread`\n- [x] `QrCodeLogin`\n- [x] `IncomingShare`\n- [x] `PinnedEvents`\n- [x] `SyncOnPush`\n- [x] `MediaUploadOnSendQueue`\n- [x] `MediaCaptionCreation` \n- [x] `MediaCaptionWarning`\n- [x] `MediaGallery`\n- [ ] `SharePos`\n\n\n## Flags to keep\n\n- `RoomDirectorySearch`\n- `ShowBlockedUsersDetails`\n- `OnlySignedDeviceIsolationMode`\n- `EnableKeyShareOnInvite`\n- `Space` -> Keep (WIP)\n- `PrintLogsToLogcat`\n- `SelectableMediaQuality` -> it has been added recently.\n\n## Others\n\n- `Knock` -> Disabled by default. Enable and remove?\n\n", "hints": "For information, here are the flags on EXI:\n\n\"Image\"", "pull_url": "https://github.com/element-hq/element-x-android/pull/5160", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/5154\"]", "test_command": "./gradlew :appnav:testDebugUnitTest --tests \"io.element.android.appnav.RootPresenterTest\" :features:login:impl:testDebugUnitTest --tests \"io.element.android.features.login.impl.screens.onboarding.OnBoardingPresenterTest\" :features:home:impl:testDebugUnitTest --tests \"io.element.android.features.home.impl.roomlist.RoomListPresenterTest\" :features:messages:impl:testDebugUnitTest --tests \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest\" --tests \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest\" --tests \"io.element.android.features.messages.impl.pinned.banner.PinnedMessagesBannerPresenterTest\" --tests \"io.element.android.features.messages.impl.pinned.list.PinnedMessagesListPresenterTest\" --tests \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest\" --tests \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest\" --tests \"io.element.android.features.messages.impl.MessagesPresenterTest\" :features:preferences:impl:testDebugUnitTest --tests \"io.element.android.features.preferences.impl.root.PreferencesRootPresenterTest\" :features:roomdetails:impl:testDebugUnitTest --tests \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest\" :libraries:matrix:impl:testDebugUnitTest --tests \"io.element.android.libraries.matrix.impl.RustMatrixClientTest\" --tests \"io.element.android.libraries.matrix.impl.timeline.RustTimelineTest\" :libraries:featureflag:impl:testDebugUnitTest --tests \"io.element.android.libraries.featureflag.impl.DefaultFeatureFlagServiceTest\" :features:location:impl:testDebugUnitTest --tests \"io.element.android.features.location.impl.common.actions.AndroidLocationActionsTest\"", "fix_patch": "diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml\nindex ef6bda9ebc2..34a8fe31f50 100644\n--- a/app/src/main/AndroidManifest.xml\n+++ b/app/src/main/AndroidManifest.xml\n@@ -147,14 +147,6 @@\n \n \n \n- \n-\n- \n- \n \n \n \n@@ -171,7 +163,7 @@\n \n \n \n- \n+                   \n \n ,\n private val appErrorStateService: AppErrorStateService,\n private val analyticsService: AnalyticsService,\n- private val shareService: ShareService,\n private val sdkMetadata: SdkMetadata,\n ) : Presenter {\n @Composable\n@@ -45,10 +43,6 @@ class RootPresenter @Inject constructor(\n )\n }\n \n- LaunchedEffect(Unit) {\n- shareService.observeFeatureFlag(this)\n- }\n-\n return RootState(\n rageshakeDetectionState = rageshakeDetectionState,\n crashDetectionState = crashDetectionState,\ndiff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenu.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenu.kt\nindex f729667e536..6ef73770f6e 100644\n--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenu.kt\n+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenu.kt\n@@ -101,36 +101,34 @@ private fun RoomListModalBottomSheetContent(\n )\n }\n )\n- if (contextMenu.markAsUnreadFeatureFlagEnabled) {\n- if (contextMenu.hasNewContent) {\n- ListItem(\n- headlineContent = {\n- Text(\n- text = stringResource(id = R.string.screen_roomlist_mark_as_read),\n- style = MaterialTheme.typography.bodyLarge,\n- )\n- },\n- onClick = onRoomMarkReadClick,\n- leadingContent = ListItemContent.Icon(\n- iconSource = IconSource.Vector(CompoundIcons.MarkAsRead())\n- ),\n- style = ListItemStyle.Primary,\n- )\n- } else {\n- ListItem(\n- headlineContent = {\n- Text(\n- text = stringResource(id = R.string.screen_roomlist_mark_as_unread),\n- style = MaterialTheme.typography.bodyLarge,\n- )\n- },\n- onClick = onRoomMarkUnreadClick,\n- leadingContent = ListItemContent.Icon(\n- iconSource = IconSource.Vector(CompoundIcons.MarkAsUnread())\n- ),\n- style = ListItemStyle.Primary,\n- )\n- }\n+ if (contextMenu.hasNewContent) {\n+ ListItem(\n+ headlineContent = {\n+ Text(\n+ text = stringResource(id = R.string.screen_roomlist_mark_as_read),\n+ style = MaterialTheme.typography.bodyLarge,\n+ )\n+ },\n+ onClick = onRoomMarkReadClick,\n+ leadingContent = ListItemContent.Icon(\n+ iconSource = IconSource.Vector(CompoundIcons.MarkAsRead())\n+ ),\n+ style = ListItemStyle.Primary,\n+ )\n+ } else {\n+ ListItem(\n+ headlineContent = {\n+ Text(\n+ text = stringResource(id = R.string.screen_roomlist_mark_as_unread),\n+ style = MaterialTheme.typography.bodyLarge,\n+ )\n+ },\n+ onClick = onRoomMarkUnreadClick,\n+ leadingContent = ListItemContent.Icon(\n+ iconSource = IconSource.Vector(CompoundIcons.MarkAsUnread())\n+ ),\n+ style = ListItemStyle.Primary,\n+ )\n }\n ListItem(\n headlineContent = {\ndiff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt\nindex 1cab8460210..ba5007c57c3 100644\n--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt\n+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt\n@@ -36,8 +36,6 @@ import io.element.android.features.leaveroom.api.LeaveRoomState\n import io.element.android.libraries.architecture.AsyncData\n import io.element.android.libraries.architecture.Presenter\n import io.element.android.libraries.core.coroutine.mapState\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState\n import io.element.android.libraries.matrix.api.MatrixClient\n import io.element.android.libraries.matrix.api.core.RoomId\n@@ -74,7 +72,6 @@ class RoomListPresenter @Inject constructor(\n private val client: MatrixClient,\n private val leaveRoomPresenter: Presenter,\n private val roomListDataSource: RoomListDataSource,\n- private val featureFlagService: FeatureFlagService,\n private val filtersPresenter: Presenter,\n private val searchPresenter: Presenter,\n private val sessionPreferencesStore: SessionPreferencesStore,\n@@ -244,7 +241,6 @@ class RoomListPresenter @Inject constructor(\n roomName = event.roomSummary.name,\n isDm = event.roomSummary.isDm,\n isFavorite = event.roomSummary.isFavorite,\n- markAsUnreadFeatureFlagEnabled = featureFlagService.isFeatureEnabled(FeatureFlags.MarkAsUnread),\n hasNewContent = event.roomSummary.hasNewContent,\n displayClearRoomCacheAction = appPreferencesStore.isDeveloperModeEnabledFlow().first(),\n )\ndiff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListState.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListState.kt\nindex 4cfa82fbfcd..4a301f08975 100644\n--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListState.kt\n+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListState.kt\n@@ -41,7 +41,6 @@ data class RoomListState(\n val roomName: String?,\n val isDm: Boolean,\n val isFavorite: Boolean,\n- val markAsUnreadFeatureFlagEnabled: Boolean,\n val hasNewContent: Boolean,\n val displayClearRoomCacheAction: Boolean,\n ) : ContextMenu\ndiff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateContextMenuShownProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateContextMenuShownProvider.kt\nindex 0cd3117de4c..856b7662af4 100644\n--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateContextMenuShownProvider.kt\n+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateContextMenuShownProvider.kt\n@@ -28,7 +28,6 @@ internal fun aContextMenuShown(\n roomId = RoomId(\"!aRoom:aDomain\"),\n roomName = roomName,\n isDm = isDm,\n- markAsUnreadFeatureFlagEnabled = true,\n hasNewContent = hasNewContent,\n isFavorite = isFavorite,\n displayClearRoomCacheAction = false,\ndiff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt\nindex 85ec2e31307..8be72a113ee 100644\n--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt\n+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt\n@@ -18,8 +18,6 @@ import io.element.android.features.lockscreen.impl.storage.LockScreenStore\n import io.element.android.libraries.di.AppScope\n import io.element.android.libraries.di.SingleIn\n import io.element.android.libraries.di.annotations.AppCoroutineScope\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n import io.element.android.libraries.sessionstorage.api.observer.SessionListener\n import io.element.android.libraries.sessionstorage.api.observer.SessionObserver\n import io.element.android.services.appnavstate.api.AppForegroundStateService\n@@ -29,7 +27,6 @@ import kotlinx.coroutines.delay\n import kotlinx.coroutines.flow.Flow\n import kotlinx.coroutines.flow.MutableStateFlow\n import kotlinx.coroutines.flow.StateFlow\n-import kotlinx.coroutines.flow.combine\n import kotlinx.coroutines.flow.first\n import kotlinx.coroutines.flow.map\n import kotlinx.coroutines.launch\n@@ -40,7 +37,6 @@ import kotlin.time.Duration\n @ContributesBinding(AppScope::class)\n class DefaultLockScreenService @Inject constructor(\n private val lockScreenConfig: LockScreenConfig,\n- private val featureFlagService: FeatureFlagService,\n private val lockScreenStore: LockScreenStore,\n private val pinCodeManager: PinCodeManager,\n @AppCoroutineScope\n@@ -108,12 +104,7 @@ class DefaultLockScreenService @Inject constructor(\n }\n \n override fun isPinSetup(): Flow {\n- return combine(\n- featureFlagService.isFeatureEnabledFlow(FeatureFlags.PinUnlock),\n- pinCodeManager.hasPinCode()\n- ) { isEnabled, hasPinCode ->\n- isEnabled && hasPinCode\n- }\n+ return pinCodeManager.hasPinCode()\n }\n \n override fun isSetupRequired(): Flow {\ndiff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt\nindex ba60cfd2220..0e545f44e62 100644\n--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt\n+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt\n@@ -27,14 +27,11 @@ import io.element.android.features.login.impl.login.LoginHelper\n import io.element.android.features.rageshake.api.RageshakeFeatureAvailability\n import io.element.android.libraries.architecture.Presenter\n import io.element.android.libraries.core.meta.BuildMeta\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n import io.element.android.libraries.ui.utils.MultipleTapToUnlock\n \n class OnBoardingPresenter @AssistedInject constructor(\n @Assisted private val params: OnBoardingNode.Params,\n private val buildMeta: BuildMeta,\n- private val featureFlagService: FeatureFlagService,\n private val enterpriseService: EnterpriseService,\n private val defaultAccountProviderAccessControl: DefaultAccountProviderAccessControl,\n private val rageshakeFeatureAvailability: RageshakeFeatureAvailability,\n@@ -80,8 +77,7 @@ class OnBoardingPresenter @AssistedInject constructor(\n forcedAccountProvider ?: linkAccountProvider\n }\n val canLoginWithQrCode by produceState(initialValue = false, linkAccountProvider) {\n- value = linkAccountProvider == null &&\n- featureFlagService.isFeatureEnabled(FeatureFlags.QrCodeLogin)\n+ value = linkAccountProvider == null\n }\n val canReportBug by remember { rageshakeFeatureAvailability.isAvailable() }.collectAsState(false)\n var showReportBug by rememberSaveable { mutableStateOf(false) }\ndiff --git a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/pinned/IsPinnedMessagesFeatureEnabled.kt b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/pinned/IsPinnedMessagesFeatureEnabled.kt\ndeleted file mode 100644\nindex c430eedf4f1..00000000000\n--- a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/pinned/IsPinnedMessagesFeatureEnabled.kt\n+++ /dev/null\n@@ -1,15 +0,0 @@\n-/*\n- * Copyright 2024 New Vector Ltd.\n- *\n- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n- * Please see LICENSE files in the repository root for full details.\n- */\n-\n-package io.element.android.features.messages.api.pinned\n-\n-import androidx.compose.runtime.Composable\n-\n-fun interface IsPinnedMessagesFeatureEnabled {\n- @Composable\n- operator fun invoke(): Boolean\n-}\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt\nindex 3390b55d5e0..434f6643d44 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt\n@@ -63,8 +63,6 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage\n import io.element.android.libraries.designsystem.utils.snackbar.collectSnackbarMessageAsState\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n import io.element.android.libraries.matrix.api.encryption.EncryptionService\n import io.element.android.libraries.matrix.api.encryption.identity.IdentityState\n import io.element.android.libraries.matrix.api.permalink.PermalinkParser\n@@ -111,7 +109,6 @@ class MessagesPresenter @AssistedInject constructor(\n private val snackbarDispatcher: SnackbarDispatcher,\n private val dispatchers: CoroutineDispatchers,\n private val clipboardHelper: ClipboardHelper,\n- private val featureFlagsService: FeatureFlagService,\n private val htmlConverterProvider: HtmlConverterProvider,\n private val buildMeta: BuildMeta,\n private val timelineController: TimelineController,\n@@ -187,11 +184,6 @@ class MessagesPresenter @AssistedInject constructor(\n \n val snackbarMessage by snackbarDispatcher.collectSnackbarMessageAsState()\n \n- var enableVoiceMessages by remember { mutableStateOf(false) }\n- LaunchedEffect(featureFlagsService) {\n- enableVoiceMessages = featureFlagsService.isFeatureEnabled(FeatureFlags.VoiceMessages)\n- }\n-\n var dmUserVerificationState by remember { mutableStateOf(null) }\n \n val membersState by room.membersStateFlow.collectAsState()\n@@ -261,7 +253,6 @@ class MessagesPresenter @AssistedInject constructor(\n showReinvitePrompt = showReinvitePrompt,\n inviteProgress = inviteProgress.value,\n enableTextFormatting = MessageComposerConfig.ENABLE_RICH_TEXT_EDITING,\n- enableVoiceMessages = enableVoiceMessages,\n appName = buildMeta.applicationName,\n roomCallState = roomCallState,\n pinnedMessagesBannerState = pinnedMessagesBannerState,\n@@ -449,7 +440,6 @@ class MessagesPresenter @AssistedInject constructor(\n val composerMode = MessageComposerMode.EditCaption(\n eventOrTransactionId = targetEvent.eventOrTransactionId,\n content = \"\",\n- showCaptionCompatibilityWarning = featureFlagsService.isFeatureEnabled(FeatureFlags.MediaCaptionWarning),\n )\n composerState.eventSink(\n MessageComposerEvents.SetMode(composerMode)\n@@ -463,7 +453,6 @@ class MessagesPresenter @AssistedInject constructor(\n val composerMode = MessageComposerMode.EditCaption(\n eventOrTransactionId = targetEvent.eventOrTransactionId,\n content = (targetEvent.content as? TimelineItemEventContentWithAttachment)?.caption.orEmpty(),\n- showCaptionCompatibilityWarning = featureFlagsService.isFeatureEnabled(FeatureFlags.MediaCaptionWarning),\n )\n composerState.eventSink(\n MessageComposerEvents.SetMode(composerMode)\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesState.kt\nindex bedce147dcc..ddeff51b7ed 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesState.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesState.kt\n@@ -51,7 +51,6 @@ data class MessagesState(\n val inviteProgress: AsyncData,\n val showReinvitePrompt: Boolean,\n val enableTextFormatting: Boolean,\n- val enableVoiceMessages: Boolean,\n val roomCallState: RoomCallState,\n val appName: String,\n val pinnedMessagesBannerState: PinnedMessagesBannerState,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesStateProvider.kt\nindex 8fa539dd948..b45bb781c51 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesStateProvider.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesStateProvider.kt\n@@ -61,14 +61,12 @@ open class MessagesStateProvider : PreviewParameterProvider {\n aMessagesState(roomName = null),\n aMessagesState(composerState = aMessageComposerState(showTextFormatting = true)),\n aMessagesState(\n- enableVoiceMessages = true,\n voiceMessageComposerState = aVoiceMessageComposerState(showPermissionRationaleDialog = true),\n ),\n aMessagesState(\n roomCallState = anOngoingCallState(),\n ),\n aMessagesState(\n- enableVoiceMessages = true,\n voiceMessageComposerState = aVoiceMessageComposerState(\n voiceMessageState = aVoiceMessagePreviewState(),\n showSendFailureDialog = true\n@@ -113,7 +111,6 @@ fun aMessagesState(\n reactionSummaryState: ReactionSummaryState = aReactionSummaryState(),\n hasNetworkConnection: Boolean = true,\n showReinvitePrompt: Boolean = false,\n- enableVoiceMessages: Boolean = true,\n roomCallState: RoomCallState = aStandByCallState(),\n pinnedMessagesBannerState: PinnedMessagesBannerState = aLoadedPinnedMessagesBannerState(),\n dmUserVerificationState: IdentityState? = null,\n@@ -141,7 +138,6 @@ fun aMessagesState(\n inviteProgress = AsyncData.Uninitialized,\n showReinvitePrompt = showReinvitePrompt,\n enableTextFormatting = true,\n- enableVoiceMessages = enableVoiceMessages,\n roomCallState = roomCallState,\n appName = \"Element\",\n pinnedMessagesBannerState = pinnedMessagesBannerState,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt\nindex 7c52cc9bab3..d7ad1055166 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt\n@@ -377,7 +377,7 @@ private fun MessagesViewContent(\n enableTextFormatting = state.enableTextFormatting,\n )\n \n- if (state.enableVoiceMessages && state.voiceMessageComposerState.showPermissionRationaleDialog) {\n+ if (state.voiceMessageComposerState.showPermissionRationaleDialog) {\n VoiceMessagePermissionRationaleDialog(\n onContinue = {\n state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvents.AcceptPermissionRationale)\n@@ -388,7 +388,7 @@ private fun MessagesViewContent(\n appName = state.appName\n )\n }\n- if (state.enableVoiceMessages && state.voiceMessageComposerState.showSendFailureDialog) {\n+ if (state.voiceMessageComposerState.showSendFailureDialog) {\n VoiceMessageSendingFailedDialog(\n onDismiss = { state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvents.DismissSendFailureDialog) },\n )\n@@ -464,7 +464,6 @@ private fun MessagesViewComposerBottomSheetContents(\n MessageComposerView(\n state = state.composerState,\n voiceMessageState = state.voiceMessageComposerState,\n- enableVoiceMessages = state.enableVoiceMessages,\n modifier = Modifier.fillMaxWidth(),\n )\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt\nindex 9c2760bf6c5..375e2bdefe5 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt\n@@ -18,7 +18,6 @@ import com.squareup.anvil.annotations.ContributesBinding\n import dagger.assisted.Assisted\n import dagger.assisted.AssistedFactory\n import dagger.assisted.AssistedInject\n-import io.element.android.features.messages.api.pinned.IsPinnedMessagesFeatureEnabled\n import io.element.android.features.messages.impl.UserEventPermissions\n import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction\n import io.element.android.features.messages.impl.actionlist.model.TimelineItemActionComparator\n@@ -40,8 +39,6 @@ import io.element.android.libraries.architecture.Presenter\n import io.element.android.libraries.dateformatter.api.DateFormatter\n import io.element.android.libraries.dateformatter.api.DateFormatterMode\n import io.element.android.libraries.di.RoomScope\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.room.BaseRoom\n import io.element.android.libraries.preferences.api.store.AppPreferencesStore\n@@ -62,10 +59,8 @@ class DefaultActionListPresenter @AssistedInject constructor(\n @Assisted\n private val postProcessor: TimelineItemActionPostProcessor,\n private val appPreferencesStore: AppPreferencesStore,\n- private val isPinnedMessagesFeatureEnabled: IsPinnedMessagesFeatureEnabled,\n private val room: BaseRoom,\n private val userSendFailureFactory: VerifiedUserSendFailureFactory,\n- private val featureFlagService: FeatureFlagService,\n private val dateFormatter: DateFormatter,\n ) : ActionListPresenter {\n @AssistedFactory\n@@ -87,7 +82,6 @@ class DefaultActionListPresenter @AssistedInject constructor(\n val isDeveloperModeEnabled by remember {\n appPreferencesStore.isDeveloperModeEnabledFlow()\n }.collectAsState(initial = false)\n- val isPinnedEventsEnabled = isPinnedMessagesFeatureEnabled()\n val pinnedEventIds by remember {\n room.roomInfoFlow.map { it.pinnedEventIds }\n }.collectAsState(initial = persistentListOf())\n@@ -99,7 +93,6 @@ class DefaultActionListPresenter @AssistedInject constructor(\n timelineItem = event.event,\n usersEventPermissions = event.userEventPermissions,\n isDeveloperModeEnabled = isDeveloperModeEnabled,\n- isPinnedEventsEnabled = isPinnedEventsEnabled,\n pinnedEventIds = pinnedEventIds,\n target = target,\n )\n@@ -116,7 +109,6 @@ class DefaultActionListPresenter @AssistedInject constructor(\n timelineItem: TimelineItem.Event,\n usersEventPermissions: UserEventPermissions,\n isDeveloperModeEnabled: Boolean,\n- isPinnedEventsEnabled: Boolean,\n pinnedEventIds: ImmutableList,\n target: MutableState\n ) = launch {\n@@ -126,7 +118,6 @@ class DefaultActionListPresenter @AssistedInject constructor(\n timelineItem = timelineItem,\n usersEventPermissions = usersEventPermissions,\n isDeveloperModeEnabled = isDeveloperModeEnabled,\n- isPinnedEventsEnabled = isPinnedEventsEnabled,\n isEventPinned = pinnedEventIds.contains(timelineItem.eventId),\n )\n \n@@ -154,7 +145,6 @@ class DefaultActionListPresenter @AssistedInject constructor(\n timelineItem: TimelineItem.Event,\n usersEventPermissions: UserEventPermissions,\n isDeveloperModeEnabled: Boolean,\n- isPinnedEventsEnabled: Boolean,\n isEventPinned: Boolean,\n ): List {\n val canRedact = timelineItem.isMine && usersEventPermissions.canRedactOwn || !timelineItem.isMine && usersEventPermissions.canRedactOther\n@@ -173,9 +163,7 @@ class DefaultActionListPresenter @AssistedInject constructor(\n if (timelineItem.content is TimelineItemEventContentWithAttachment) {\n // Caption\n if (timelineItem.content.caption == null) {\n- if (featureFlagService.isFeatureEnabled(FeatureFlags.MediaCaptionCreation)) {\n- add(TimelineItemAction.AddCaption)\n- }\n+ add(TimelineItemAction.AddCaption)\n } else {\n add(TimelineItemAction.EditCaption)\n add(TimelineItemAction.RemoveCaption)\n@@ -189,7 +177,7 @@ class DefaultActionListPresenter @AssistedInject constructor(\n if (canRedact && timelineItem.content is TimelineItemPollContent && !timelineItem.content.isEnded) {\n add(TimelineItemAction.EndPoll)\n }\n- val canPinUnpin = isPinnedEventsEnabled && usersEventPermissions.canPinUnpin && timelineItem.isRemote\n+ val canPinUnpin = usersEventPermissions.canPinUnpin && timelineItem.isRemote\n if (canPinUnpin) {\n if (isEventPinned) {\n add(TimelineItemAction.Unpin)\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt\nindex 6af30333451..45c5c33e119 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt\n@@ -10,7 +10,6 @@ package io.element.android.features.messages.impl.attachments.preview\n import androidx.compose.runtime.Composable\n import androidx.compose.runtime.LaunchedEffect\n import androidx.compose.runtime.MutableState\n-import androidx.compose.runtime.collectAsState\n import androidx.compose.runtime.getValue\n import androidx.compose.runtime.mutableStateOf\n import androidx.compose.runtime.remember\n@@ -32,8 +31,6 @@ import io.element.android.libraries.core.extensions.runCatchingExceptions\n import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeImage\n import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeVideo\n import io.element.android.libraries.di.annotations.SessionCoroutineScope\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.core.ProgressCallback\n import io.element.android.libraries.matrix.api.permalink.PermalinkBuilder\n@@ -58,7 +55,6 @@ class AttachmentsPreviewPresenter @AssistedInject constructor(\n private val mediaSender: MediaSender,\n private val permalinkBuilder: PermalinkBuilder,\n private val temporaryUriDeleter: TemporaryUriDeleter,\n- private val featureFlagService: FeatureFlagService,\n private val mediaOptimizationSelectorPresenterFactory: MediaOptimizationSelectorPresenter.Factory,\n @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,\n private val dispatchers: CoroutineDispatchers,\n@@ -86,14 +82,6 @@ class AttachmentsPreviewPresenter @AssistedInject constructor(\n \n val ongoingSendAttachmentJob = remember { mutableStateOf(null) }\n \n- val allowCaption by remember {\n- featureFlagService.isFeatureEnabledFlow(FeatureFlags.MediaCaptionCreation)\n- }.collectAsState(initial = false)\n- val showCaptionCompatibilityWarning by remember {\n- featureFlagService.isFeatureEnabledFlow(FeatureFlags.MediaCaptionWarning)\n- }.collectAsState(initial = false)\n-\n- var useSendQueue by remember { mutableStateOf(false) }\n var preprocessMediaJob by remember { mutableStateOf(null) }\n \n val mediaAttachment = attachment as Attachment.Media\n@@ -106,10 +94,6 @@ class AttachmentsPreviewPresenter @AssistedInject constructor(\n \n var displayFileTooLargeError by remember { mutableStateOf(false) }\n \n- LaunchedEffect(Unit) {\n- useSendQueue = featureFlagService.isFeatureEnabled(FeatureFlags.MediaUploadOnSendQueue)\n- }\n-\n LaunchedEffect(mediaOptimizationSelectorState.displayMediaSelectorViews) {\n // If the media optimization selector is not displayed, we can pre-process the media\n // to prepare it for sending. This is done to avoid blocking the UI thread when the\n@@ -182,18 +166,17 @@ class AttachmentsPreviewPresenter @AssistedInject constructor(\n .takeIf { it.isNotEmpty() }\n \n // If we're supposed to send the media as a background job, we can dismiss this screen already\n- if (useSendQueue && coroutineContext.isActive) {\n+ if (coroutineContext.isActive) {\n onDoneListener()\n }\n \n- // If using the send queue, send it using the session coroutine scope so it doesn't matter if this screen or the chat one are closed\n- val sendMediaCoroutineScope = if (useSendQueue) sessionCoroutineScope else coroutineScope\n- sendMediaCoroutineScope.launch(dispatchers.io) {\n+ // Send the media using the session coroutine scope so it doesn't matter if this screen or the chat one are closed\n+ sessionCoroutineScope.launch(dispatchers.io) {\n sendPreProcessedMedia(\n mediaUploadInfo = mediaUploadInfo,\n caption = caption,\n sendActionState = sendActionState,\n- dismissAfterSend = !useSendQueue,\n+ dismissAfterSend = false,\n inReplyToEventId = null,\n )\n \n@@ -238,8 +221,6 @@ class AttachmentsPreviewPresenter @AssistedInject constructor(\n attachment = attachment,\n sendActionState = sendActionState.value,\n textEditorState = textEditorState,\n- allowCaption = allowCaption,\n- showCaptionCompatibilityWarning = showCaptionCompatibilityWarning,\n mediaOptimizationSelectorState = mediaOptimizationSelectorState,\n displayFileTooLargeError = displayFileTooLargeError,\n eventSink = ::handleEvents\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt\nindex a935dd3afe7..71d29cbfb69 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt\n@@ -17,8 +17,6 @@ data class AttachmentsPreviewState(\n val attachment: Attachment,\n val sendActionState: SendActionState,\n val textEditorState: TextEditorState,\n- val allowCaption: Boolean,\n- val showCaptionCompatibilityWarning: Boolean,\n val mediaOptimizationSelectorState: MediaOptimizationSelectorState,\n val displayFileTooLargeError: Boolean,\n val eventSink: (AttachmentsPreviewEvents) -> Unit\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewStateProvider.kt\nindex b1985482f62..43410efa466 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewStateProvider.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewStateProvider.kt\n@@ -41,8 +41,6 @@ open class AttachmentsPreviewStateProvider : PreviewParameterProvider\n@@ -376,7 +367,6 @@ class MessageComposerPresenter @AssistedInject constructor(\n showAttachmentSourcePicker = showAttachmentSourcePicker,\n showTextFormatting = showTextFormatting,\n canShareLocation = canShareLocation.value,\n- canCreatePoll = canCreatePoll.value,\n suggestions = suggestions.toPersistentList(),\n resolveMentionDisplay = resolveMentionDisplay,\n resolveAtRoomMentionDisplay = resolveAtRoomMentionDisplay,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerState.kt\nindex 1f1f80b2032..6eadc142604 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerState.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerState.kt\n@@ -22,7 +22,6 @@ data class MessageComposerState(\n val showAttachmentSourcePicker: Boolean,\n val showTextFormatting: Boolean,\n val canShareLocation: Boolean,\n- val canCreatePoll: Boolean,\n val suggestions: ImmutableList,\n val resolveMentionDisplay: (String, String) -> TextDisplay,\n val resolveAtRoomMentionDisplay: () -> TextDisplay,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt\nindex 590cfd20cf3..36e2c69f968 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt\n@@ -30,7 +30,6 @@ fun aMessageComposerState(\n showTextFormatting: Boolean = false,\n showAttachmentSourcePicker: Boolean = false,\n canShareLocation: Boolean = true,\n- canCreatePoll: Boolean = true,\n suggestions: ImmutableList = persistentListOf(),\n eventSink: (MessageComposerEvents) -> Unit = {},\n ) = MessageComposerState(\n@@ -40,7 +39,6 @@ fun aMessageComposerState(\n showTextFormatting = showTextFormatting,\n showAttachmentSourcePicker = showAttachmentSourcePicker,\n canShareLocation = canShareLocation,\n- canCreatePoll = canCreatePoll,\n suggestions = suggestions,\n resolveMentionDisplay = { _, _ -> TextDisplay.Plain },\n resolveAtRoomMentionDisplay = { TextDisplay.Plain },\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt\nindex b3d8e5bf2dc..0cc5bd93ec5 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt\n@@ -33,7 +33,6 @@ import kotlinx.coroutines.launch\n internal fun MessageComposerView(\n state: MessageComposerState,\n voiceMessageState: VoiceMessageComposerState,\n- enableVoiceMessages: Boolean,\n modifier: Modifier = Modifier,\n ) {\n val view = LocalView.current\n@@ -104,7 +103,6 @@ internal fun MessageComposerView(\n onResetComposerMode = ::onCloseSpecialMode,\n onAddAttachment = ::onAddAttachment,\n onDismissTextFormatting = ::onDismissTextFormatting,\n- enableVoiceMessages = enableVoiceMessages,\n onVoiceRecorderEvent = onVoiceRecorderEvent,\n onVoicePlayerEvent = onVoicePlayerEvent,\n onSendVoiceMessage = onSendVoiceMessage,\n@@ -128,13 +126,11 @@ internal fun MessageComposerViewPreview(\n modifier = Modifier.height(IntrinsicSize.Min),\n state = state,\n voiceMessageState = aVoiceMessageComposerState(),\n- enableVoiceMessages = true,\n )\n MessageComposerView(\n modifier = Modifier.height(200.dp),\n state = state,\n voiceMessageState = aVoiceMessageComposerState(),\n- enableVoiceMessages = true,\n )\n DisabledComposerView()\n }\n@@ -150,7 +146,6 @@ internal fun MessageComposerViewVoicePreview(\n modifier = Modifier.height(IntrinsicSize.Min),\n state = aMessageComposerState(),\n voiceMessageState = state,\n- enableVoiceMessages = true,\n )\n }\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/DefaultIsPinnedMessagesFeatureEnabled.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/DefaultIsPinnedMessagesFeatureEnabled.kt\ndeleted file mode 100644\nindex 7c7448f536c..00000000000\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/DefaultIsPinnedMessagesFeatureEnabled.kt\n+++ /dev/null\n@@ -1,41 +0,0 @@\n-/*\n- * Copyright 2024 New Vector Ltd.\n- *\n- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n- * Please see LICENSE files in the repository root for full details.\n- */\n-\n-package io.element.android.features.messages.impl.pinned\n-\n-import androidx.compose.runtime.Composable\n-import androidx.compose.runtime.LaunchedEffect\n-import androidx.compose.runtime.getValue\n-import androidx.compose.runtime.mutableStateOf\n-import androidx.compose.runtime.saveable.rememberSaveable\n-import androidx.compose.runtime.setValue\n-import com.squareup.anvil.annotations.ContributesBinding\n-import io.element.android.features.messages.api.pinned.IsPinnedMessagesFeatureEnabled\n-import io.element.android.libraries.di.AppScope\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n-import kotlinx.coroutines.flow.launchIn\n-import kotlinx.coroutines.flow.onEach\n-import javax.inject.Inject\n-\n-@ContributesBinding(AppScope::class)\n-class DefaultIsPinnedMessagesFeatureEnabled @Inject constructor(\n- private val featureFlagService: FeatureFlagService,\n-) : IsPinnedMessagesFeatureEnabled {\n- @Composable\n- override operator fun invoke(): Boolean {\n- var isFeatureEnabled by rememberSaveable {\n- mutableStateOf(false)\n- }\n- LaunchedEffect(Unit) {\n- featureFlagService.isFeatureEnabledFlow(FeatureFlags.PinnedEvents)\n- .onEach { isFeatureEnabled = it }\n- .launchIn(this)\n- }\n- return isFeatureEnabled\n- }\n-}\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/PinnedEventsTimelineProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/PinnedEventsTimelineProvider.kt\nindex 5210631409c..9f18ec86aeb 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/PinnedEventsTimelineProvider.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/PinnedEventsTimelineProvider.kt\n@@ -12,8 +12,6 @@ import io.element.android.libraries.core.coroutine.CoroutineDispatchers\n import io.element.android.libraries.core.coroutine.mapState\n import io.element.android.libraries.di.RoomScope\n import io.element.android.libraries.di.SingleIn\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n import io.element.android.libraries.matrix.api.room.CreateTimelineParams\n import io.element.android.libraries.matrix.api.room.JoinedRoom\n import io.element.android.libraries.matrix.api.sync.SyncService\n@@ -23,7 +21,6 @@ import kotlinx.coroutines.CoroutineScope\n import kotlinx.coroutines.coroutineScope\n import kotlinx.coroutines.flow.MutableStateFlow\n import kotlinx.coroutines.flow.StateFlow\n-import kotlinx.coroutines.flow.combine\n import kotlinx.coroutines.flow.distinctUntilChanged\n import kotlinx.coroutines.flow.launchIn\n import kotlinx.coroutines.flow.map\n@@ -35,7 +32,6 @@ import javax.inject.Inject\n class PinnedEventsTimelineProvider @Inject constructor(\n private val room: JoinedRoom,\n private val syncService: SyncService,\n- private val featureFlagService: FeatureFlagService,\n private val dispatchers: CoroutineDispatchers,\n ) : TimelineProvider {\n private val _timelineStateFlow: MutableStateFlow> =\n@@ -66,20 +62,10 @@ class PinnedEventsTimelineProvider @Inject constructor(\n }\n \n private suspend fun onActive() = coroutineScope {\n- combine(\n- featureFlagService.isFeatureEnabledFlow(FeatureFlags.PinnedEvents),\n- syncService.syncState,\n- ) { isEnabled, _ ->\n+ syncService.syncState.onEach {\n // do not use syncState here as data can be loaded from cache, it's just to trigger retry if needed\n- isEnabled\n+ loadTimelineIfNeeded()\n }\n- .onEach { isFeatureEnabled ->\n- if (isFeatureEnabled) {\n- loadTimelineIfNeeded()\n- } else {\n- resetTimeline()\n- }\n- }\n .launchIn(this)\n }\n \ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt\nindex c6a6e3c10cf..f9e705b1ca7 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt\n@@ -28,8 +28,6 @@ import io.element.android.features.messages.impl.utils.TextPillificationHelper\n import io.element.android.libraries.androidutils.filesize.FileSizeFormatter\n import io.element.android.libraries.androidutils.text.safeLinkify\n import io.element.android.libraries.core.mimetype.MimeTypes\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.permalink.PermalinkParser\n import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageType\n@@ -56,7 +54,6 @@ import kotlin.time.Duration\n class TimelineItemContentMessageFactory @Inject constructor(\n private val fileSizeFormatter: FileSizeFormatter,\n private val fileExtensionExtractor: FileExtensionExtractor,\n- private val featureFlagService: FeatureFlagService,\n private val htmlConverterProvider: HtmlConverterProvider,\n private val permalinkParser: PermalinkParser,\n private val textPillificationHelper: TextPillificationHelper,\n@@ -177,38 +174,20 @@ class TimelineItemContentMessageFactory @Inject constructor(\n )\n }\n is VoiceMessageType -> {\n- when (featureFlagService.isFeatureEnabled(FeatureFlags.VoiceMessages)) {\n- true -> {\n- TimelineItemVoiceContent(\n- eventId = eventId,\n- filename = messageType.filename,\n- fileSize = messageType.info?.size ?: 0,\n- caption = messageType.caption?.trimEnd(),\n- formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(),\n- isEdited = content.isEdited,\n- mediaSource = messageType.source,\n- duration = messageType.info?.duration ?: Duration.ZERO,\n- mimeType = messageType.info?.mimetype ?: MimeTypes.OctetStream,\n- waveform = messageType.details?.waveform?.toImmutableList() ?: persistentListOf(),\n- formattedFileSize = fileSizeFormatter.format(messageType.info?.size ?: 0),\n- fileExtension = fileExtensionExtractor.extractFromName(messageType.filename)\n- )\n- }\n- false -> {\n- TimelineItemAudioContent(\n- filename = messageType.filename,\n- fileSize = messageType.info?.size ?: 0,\n- caption = messageType.caption?.trimEnd(),\n- formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(),\n- isEdited = content.isEdited,\n- mediaSource = messageType.source,\n- duration = messageType.info?.duration ?: Duration.ZERO,\n- mimeType = messageType.info?.mimetype ?: MimeTypes.OctetStream,\n- formattedFileSize = fileSizeFormatter.format(messageType.info?.size ?: 0),\n- fileExtension = fileExtensionExtractor.extractFromName(messageType.filename),\n- )\n- }\n- }\n+ TimelineItemVoiceContent(\n+ eventId = eventId,\n+ filename = messageType.filename,\n+ fileSize = messageType.info?.size ?: 0,\n+ caption = messageType.caption?.trimEnd(),\n+ formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(),\n+ isEdited = content.isEdited,\n+ mediaSource = messageType.source,\n+ duration = messageType.info?.duration ?: Duration.ZERO,\n+ mimeType = messageType.info?.mimetype ?: MimeTypes.OctetStream,\n+ waveform = messageType.details?.waveform?.toImmutableList() ?: persistentListOf(),\n+ formattedFileSize = fileSizeFormatter.format(messageType.info?.size ?: 0),\n+ fileExtension = fileExtensionExtractor.extractFromName(messageType.filename)\n+ )\n }\n is FileMessageType -> {\n val fileExtension = fileExtensionExtractor.extractFromName(messageType.filename)\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentPollFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentPollFactory.kt\nindex ba3d397b61f..c0da622d156 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentPollFactory.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentPollFactory.kt\n@@ -9,23 +9,18 @@ package io.element.android.features.messages.impl.timeline.factories.event\n \n import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent\n import io.element.android.features.messages.impl.timeline.model.event.TimelineItemPollContent\n-import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent\n import io.element.android.features.poll.api.pollcontent.PollContentStateFactory\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem\n import io.element.android.libraries.matrix.api.timeline.item.event.PollContent\n import javax.inject.Inject\n \n class TimelineItemContentPollFactory @Inject constructor(\n- private val featureFlagService: FeatureFlagService,\n private val pollContentStateFactory: PollContentStateFactory,\n ) {\n suspend fun create(\n event: EventTimelineItem,\n content: PollContent,\n ): TimelineItemEventContent {\n- if (!featureFlagService.isFeatureEnabled(FeatureFlags.Polls)) return TimelineItemUnknownContent\n val pollContentState = pollContentStateFactory.create(event, content)\n return TimelineItemPollContent(\n isMine = pollContentState.isMine,\ndiff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt\nindex ee73b7f7215..b0bcfed44c3 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt\n@@ -23,8 +23,6 @@ import io.element.android.features.rageshake.api.RageshakeFeatureAvailability\n import io.element.android.libraries.architecture.Presenter\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n import io.element.android.libraries.designsystem.utils.snackbar.collectSnackbarMessageAsState\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n import io.element.android.libraries.indicator.api.IndicatorService\n import io.element.android.libraries.matrix.api.MatrixClient\n import io.element.android.libraries.matrix.api.oidc.AccountManagementAction\n@@ -42,7 +40,6 @@ class PreferencesRootPresenter @Inject constructor(\n private val analyticsService: AnalyticsService,\n private val versionFormatter: VersionFormatter,\n private val snackbarDispatcher: SnackbarDispatcher,\n- private val featureFlagService: FeatureFlagService,\n private val indicatorService: IndicatorService,\n private val directLogoutPresenter: Presenter,\n private val showDeveloperSettingsProvider: ShowDeveloperSettingsProvider,\n@@ -60,15 +57,6 @@ class PreferencesRootPresenter @Inject constructor(\n val snackbarMessage by snackbarDispatcher.collectSnackbarMessageAsState()\n val hasAnalyticsProviders = remember { analyticsService.getAvailableAnalyticsProviders().isNotEmpty() }\n \n- val showNotificationSettings = remember { mutableStateOf(false) }\n- LaunchedEffect(Unit) {\n- showNotificationSettings.value = featureFlagService.isFeatureEnabled(FeatureFlags.NotificationSettings)\n- }\n- val showLockScreenSettings = remember { mutableStateOf(false) }\n- LaunchedEffect(Unit) {\n- showLockScreenSettings.value = featureFlagService.isFeatureEnabled(FeatureFlags.PinUnlock)\n- }\n-\n // We should display the 'complete verification' option if the current session can be verified\n val canVerifyUserSession by sessionVerificationService.needsSessionVerification.collectAsState(false)\n \n@@ -122,8 +110,6 @@ class PreferencesRootPresenter @Inject constructor(\n canReportBug = canReportBug,\n showDeveloperSettings = showDeveloperSettings,\n canDeactivateAccount = canDeactivateAccount,\n- showNotificationSettings = showNotificationSettings.value,\n- showLockScreenSettings = showLockScreenSettings.value,\n showBlockedUsersItem = showBlockedUsersItem,\n directLogoutState = directLogoutState,\n snackbarMessage = snackbarMessage,\ndiff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootState.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootState.kt\nindex 2e5cb4fa148..ebe8aaf57f5 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootState.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootState.kt\n@@ -24,8 +24,6 @@ data class PreferencesRootState(\n val showAnalyticsSettings: Boolean,\n val showDeveloperSettings: Boolean,\n val canDeactivateAccount: Boolean,\n- val showLockScreenSettings: Boolean,\n- val showNotificationSettings: Boolean,\n val showBlockedUsersItem: Boolean,\n val directLogoutState: DirectLogoutState,\n val snackbarMessage: SnackbarMessage?,\ndiff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootStateProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootStateProvider.kt\nindex 43307e9988f..91b32fe12d3 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootStateProvider.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootStateProvider.kt\n@@ -27,8 +27,6 @@ fun aPreferencesRootState(\n showAnalyticsSettings = true,\n canReportBug = true,\n showDeveloperSettings = true,\n- showNotificationSettings = true,\n- showLockScreenSettings = true,\n showBlockedUsersItem = true,\n canDeactivateAccount = true,\n snackbarMessage = SnackbarMessage(CommonStrings.common_verification_complete),\ndiff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt\nindex 337544ed7f0..85c180ddacc 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt\n@@ -121,20 +121,16 @@ private fun ColumnScope.ManageAppSection(\n onOpenLockScreenSettings: () -> Unit,\n onSecureBackupClick: () -> Unit,\n ) {\n- if (state.showNotificationSettings) {\n- ListItem(\n- headlineContent = { Text(stringResource(id = R.string.screen_notification_settings_title)) },\n- leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Notifications())),\n- onClick = onOpenNotificationSettings,\n- )\n- }\n- if (state.showLockScreenSettings) {\n- ListItem(\n- headlineContent = { Text(stringResource(id = CommonStrings.common_screen_lock)) },\n- leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Lock())),\n- onClick = onOpenLockScreenSettings,\n- )\n- }\n+ ListItem(\n+ headlineContent = { Text(stringResource(id = R.string.screen_notification_settings_title)) },\n+ leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Notifications())),\n+ onClick = onOpenNotificationSettings,\n+ )\n+ ListItem(\n+ headlineContent = { Text(stringResource(id = CommonStrings.common_screen_lock)) },\n+ leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Lock())),\n+ onClick = onOpenLockScreenSettings,\n+ )\n if (state.showSecureBackup) {\n ListItem(\n headlineContent = { Text(stringResource(id = CommonStrings.common_encryption)) },\n@@ -143,9 +139,7 @@ private fun ColumnScope.ManageAppSection(\n onClick = onSecureBackupClick,\n )\n }\n- if (state.showNotificationSettings || state.showLockScreenSettings || state.showSecureBackup) {\n- HorizontalDivider()\n- }\n+ HorizontalDivider()\n }\n \n @Composable\ndiff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt\nindex 3356c899d0a..026b6169965 100644\n--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt\n+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt\n@@ -12,14 +12,12 @@ import androidx.compose.runtime.LaunchedEffect\n import androidx.compose.runtime.collectAsState\n import androidx.compose.runtime.derivedStateOf\n import androidx.compose.runtime.getValue\n-import androidx.compose.runtime.mutableStateOf\n import androidx.compose.runtime.produceState\n import androidx.compose.runtime.remember\n import androidx.compose.runtime.rememberCoroutineScope\n import im.vector.app.features.analytics.plan.Interaction\n import io.element.android.features.leaveroom.api.LeaveRoomEvent\n import io.element.android.features.leaveroom.api.LeaveRoomState\n-import io.element.android.features.messages.api.pinned.IsPinnedMessagesFeatureEnabled\n import io.element.android.features.roomcall.api.RoomCallState\n import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsPresenter\n import io.element.android.features.roomdetails.impl.securityandprivacy.permissions.securityAndPrivacyPermissionsAsState\n@@ -69,7 +67,6 @@ class RoomDetailsPresenter @Inject constructor(\n private val roomCallStatePresenter: Presenter,\n private val dispatchers: CoroutineDispatchers,\n private val analyticsService: AnalyticsService,\n- private val isPinnedMessagesFeatureEnabled: IsPinnedMessagesFeatureEnabled,\n private val clipboardHelper: ClipboardHelper,\n private val appPreferencesStore: AppPreferencesStore,\n ) : Presenter {\n@@ -77,7 +74,6 @@ class RoomDetailsPresenter @Inject constructor(\n override fun present(): RoomDetailsState {\n val scope = rememberCoroutineScope()\n val leaveRoomState = leaveRoomPresenter.present()\n- val canShowNotificationSettings = remember { mutableStateOf(false) }\n val roomInfo by room.roomInfoFlow.collectAsState()\n val isUserAdmin = room.isOwnUserAdmin()\n val syncUpdateFlow = room.syncUpdateFlow.collectAsState()\n@@ -88,19 +84,11 @@ class RoomDetailsPresenter @Inject constructor(\n val isFavorite by remember { derivedStateOf { roomInfo.isFavorite } }\n val joinRule by remember { derivedStateOf { roomInfo.joinRule } }\n \n- val canShowPinnedMessages = isPinnedMessagesFeatureEnabled()\n val pinnedMessagesCount by remember { derivedStateOf { roomInfo.pinnedEventIds.size } }\n \n- val canShowMediaGallery by remember {\n- featureFlagService.isFeatureEnabledFlow(FeatureFlags.MediaGallery)\n- }.collectAsState(false)\n-\n LaunchedEffect(Unit) {\n- canShowNotificationSettings.value = featureFlagService.isFeatureEnabled(FeatureFlags.NotificationSettings)\n- if (canShowNotificationSettings.value) {\n- room.updateRoomNotificationSettings()\n- observeNotificationSettings()\n- }\n+ room.updateRoomNotificationSettings()\n+ observeNotificationSettings()\n }\n \n val membersState by room.membersStateFlow.collectAsState()\n@@ -197,7 +185,6 @@ class RoomDetailsPresenter @Inject constructor(\n isEncrypted = isEncrypted,\n canInvite = canInvite,\n canEdit = (canEditAvatar || canEditName || canEditTopic) && roomType == RoomDetailsType.Room,\n- canShowNotificationSettings = canShowNotificationSettings.value,\n roomCallState = roomCallState,\n roomType = roomType,\n roomMemberDetailsState = roomMemberDetailsState,\n@@ -207,8 +194,6 @@ class RoomDetailsPresenter @Inject constructor(\n displayRolesAndPermissionsSettings = !isDm && isUserAdmin,\n isPublic = joinRule == JoinRule.Public,\n heroes = roomInfo.heroes.toPersistentList(),\n- canShowPinnedMessages = canShowPinnedMessages,\n- canShowMediaGallery = canShowMediaGallery,\n pinnedMessagesCount = pinnedMessagesCount,\n snackbarMessage = snackbarMessage,\n canShowKnockRequests = canShowKnockRequests,\ndiff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt\nindex 331329a0340..70810ee46b2 100644\n--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt\n+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt\n@@ -32,7 +32,6 @@ data class RoomDetailsState(\n val roomMemberDetailsState: UserProfileState?,\n val canEdit: Boolean,\n val canInvite: Boolean,\n- val canShowNotificationSettings: Boolean,\n val roomCallState: RoomCallState,\n val leaveRoomState: LeaveRoomState,\n val roomNotificationSettings: RoomNotificationSettings?,\n@@ -40,8 +39,6 @@ data class RoomDetailsState(\n val displayRolesAndPermissionsSettings: Boolean,\n val isPublic: Boolean,\n val heroes: ImmutableList,\n- val canShowPinnedMessages: Boolean,\n- val canShowMediaGallery: Boolean,\n val pinnedMessagesCount: Int?,\n val snackbarMessage: SnackbarMessage?,\n val canShowKnockRequests: Boolean,\ndiff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt\nindex 9631be01c25..e41392ee76b 100644\n--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt\n+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt\n@@ -100,7 +100,6 @@ fun aRoomDetailsState(\n isEncrypted: Boolean = true,\n canInvite: Boolean = false,\n canEdit: Boolean = false,\n- canShowNotificationSettings: Boolean = true,\n roomCallState: RoomCallState = aStandByCallState(),\n roomType: RoomDetailsType = RoomDetailsType.Room,\n roomMemberDetailsState: UserProfileState? = null,\n@@ -110,8 +109,6 @@ fun aRoomDetailsState(\n displayAdminSettings: Boolean = false,\n isPublic: Boolean = true,\n heroes: List = emptyList(),\n- canShowPinnedMessages: Boolean = true,\n- canShowMediaGallery: Boolean = true,\n pinnedMessagesCount: Int? = null,\n snackbarMessage: SnackbarMessage? = null,\n canShowKnockRequests: Boolean = false,\n@@ -132,7 +129,6 @@ fun aRoomDetailsState(\n isEncrypted = isEncrypted,\n canInvite = canInvite,\n canEdit = canEdit,\n- canShowNotificationSettings = canShowNotificationSettings,\n roomCallState = roomCallState,\n roomType = roomType,\n roomMemberDetailsState = roomMemberDetailsState,\n@@ -142,8 +138,6 @@ fun aRoomDetailsState(\n displayRolesAndPermissionsSettings = displayAdminSettings,\n isPublic = isPublic,\n heroes = heroes.toPersistentList(),\n- canShowPinnedMessages = canShowPinnedMessages,\n- canShowMediaGallery = canShowMediaGallery,\n pinnedMessagesCount = pinnedMessagesCount,\n snackbarMessage = snackbarMessage,\n canShowKnockRequests = canShowKnockRequests,\ndiff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt\nindex fe14fd983c6..3fdb2a08008 100644\n--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt\n+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt\n@@ -185,7 +185,7 @@ fun RoomDetailsView(\n }\n \n PreferenceCategory {\n- if (state.canShowNotificationSettings && state.roomNotificationSettings != null) {\n+ if (state.roomNotificationSettings != null) {\n NotificationItem(\n isDefaultMode = state.roomNotificationSettings.isDefault,\n openRoomNotificationSettings = openRoomNotificationSettings\n@@ -237,20 +237,16 @@ fun RoomDetailsView(\n }\n \n PreferenceCategory {\n- if (state.canShowPinnedMessages) {\n- PinnedMessagesItem(\n- pinnedMessagesCount = state.pinnedMessagesCount,\n- onPinnedMessagesClick = onPinnedMessagesClick\n- )\n- }\n+ PinnedMessagesItem(\n+ pinnedMessagesCount = state.pinnedMessagesCount,\n+ onPinnedMessagesClick = onPinnedMessagesClick\n+ )\n PollsItem(\n openPollHistory = openPollHistory\n )\n- if (state.canShowMediaGallery) {\n- MediaGalleryItem(\n- onClick = openMediaGallery\n- )\n- }\n+ MediaGalleryItem(\n+ onClick = openMediaGallery\n+ )\n }\n \n if (state.roomType is RoomDetailsType.Dm && state.roomMemberDetailsState != null) {\n@@ -337,8 +333,7 @@ private fun MainActionsSection(\n .padding(horizontal = 16.dp),\n horizontalArrangement = Arrangement.SpaceEvenly,\n ) {\n- val roomNotificationSettings = state.roomNotificationSettings\n- if (state.canShowNotificationSettings && roomNotificationSettings != null) {\n+ state.roomNotificationSettings?.let { roomNotificationSettings ->\n if (roomNotificationSettings.mode == RoomNotificationMode.MUTE) {\n MainActionButton(\n title = stringResource(CommonStrings.common_unmute),\ndiff --git a/features/share/api/src/main/kotlin/io/element/android/features/share/api/ShareService.kt b/features/share/api/src/main/kotlin/io/element/android/features/share/api/ShareService.kt\ndeleted file mode 100644\nindex db5bdd7f297..00000000000\n--- a/features/share/api/src/main/kotlin/io/element/android/features/share/api/ShareService.kt\n+++ /dev/null\n@@ -1,14 +0,0 @@\n-/*\n- * Copyright 2024 New Vector Ltd.\n- *\n- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n- * Please see LICENSE files in the repository root for full details.\n- */\n-\n-package io.element.android.features.share.api\n-\n-import kotlinx.coroutines.CoroutineScope\n-\n-interface ShareService {\n- fun observeFeatureFlag(coroutineScope: CoroutineScope)\n-}\ndiff --git a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareService.kt b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareService.kt\ndeleted file mode 100644\nindex 87f8088fdc6..00000000000\n--- a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareService.kt\n+++ /dev/null\n@@ -1,74 +0,0 @@\n-/*\n- * Copyright 2024 New Vector Ltd.\n- *\n- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n- * Please see LICENSE files in the repository root for full details.\n- */\n-\n-package io.element.android.features.share.impl\n-\n-import android.content.ComponentName\n-import android.content.Context\n-import android.content.pm.PackageManager\n-import com.squareup.anvil.annotations.ContributesBinding\n-import io.element.android.features.share.api.ShareService\n-import io.element.android.libraries.di.AppScope\n-import io.element.android.libraries.di.ApplicationContext\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n-import kotlinx.coroutines.CoroutineScope\n-import kotlinx.coroutines.flow.launchIn\n-import kotlinx.coroutines.flow.onEach\n-import timber.log.Timber\n-import javax.inject.Inject\n-\n-@ContributesBinding(AppScope::class)\n-class DefaultShareService @Inject constructor(\n- private val featureFlagService: FeatureFlagService,\n- @ApplicationContext private val context: Context,\n-) : ShareService {\n- override fun observeFeatureFlag(coroutineScope: CoroutineScope) {\n- val shareActivityComponent = getShareActivityComponent()\n- ?: return Unit.also {\n- Timber.w(\"ShareActivity not found\")\n- }\n- featureFlagService.isFeatureEnabledFlow(FeatureFlags.IncomingShare)\n- .onEach { enabled ->\n- shareActivityComponent.enableOrDisable(enabled)\n- }\n- .launchIn(coroutineScope)\n- }\n-\n- private fun getShareActivityComponent(): ComponentName? {\n- return context.packageManager\n- .getPackageInfo(\n- context.packageName,\n- PackageManager.GET_ACTIVITIES or PackageManager.MATCH_DISABLED_COMPONENTS\n- )\n- .activities\n- ?.firstOrNull { it.name.endsWith(\".ShareActivity\") }\n- ?.let { shareActivityInfo ->\n- ComponentName(\n- shareActivityInfo.packageName,\n- shareActivityInfo.name,\n- )\n- }\n- }\n-\n- private fun ComponentName.enableOrDisable(enabled: Boolean) {\n- val state = if (enabled) {\n- PackageManager.COMPONENT_ENABLED_STATE_DEFAULT\n- } else {\n- PackageManager.COMPONENT_ENABLED_STATE_DISABLED\n- }\n- try {\n- context.packageManager.setComponentEnabledSetting(\n- this,\n- state,\n- PackageManager.DONT_KILL_APP,\n- )\n- } catch (e: Exception) {\n- Timber.e(e, \"Failed to enable or disable the component\")\n- }\n- }\n-}\ndiff --git a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt\nindex 16a6d6839ac..9d34c03a932 100644\n--- a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt\n+++ b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt\n@@ -7,7 +7,6 @@\n \n package io.element.android.libraries.featureflag.api\n \n-import io.element.android.appconfig.OnBoardingConfig\n import io.element.android.libraries.core.meta.BuildMeta\n import io.element.android.libraries.core.meta.BuildType\n \n@@ -21,46 +20,6 @@ enum class FeatureFlags(\n override val defaultValue: (BuildMeta) -> Boolean,\n override val isFinished: Boolean,\n ) : Feature {\n- LocationSharing(\n- key = \"feature.locationsharing\",\n- title = \"Allow user to share location\",\n- defaultValue = { true },\n- isFinished = true,\n- ),\n- Polls(\n- key = \"feature.polls\",\n- title = \"Polls\",\n- description = \"Create poll and render poll events in the timeline\",\n- defaultValue = { true },\n- isFinished = true,\n- ),\n- NotificationSettings(\n- key = \"feature.notificationsettings\",\n- title = \"Show notification settings\",\n- defaultValue = { true },\n- isFinished = true,\n- ),\n- VoiceMessages(\n- key = \"feature.voicemessages\",\n- title = \"Voice messages\",\n- description = \"Send and receive voice messages\",\n- defaultValue = { true },\n- isFinished = true,\n- ),\n- PinUnlock(\n- key = \"feature.pinunlock\",\n- title = \"Pin unlock\",\n- description = \"Allow user to lock/unlock the app with a pin code or biometrics\",\n- defaultValue = { true },\n- isFinished = true,\n- ),\n- MarkAsUnread(\n- key = \"feature.markAsUnread\",\n- title = \"Mark as unread\",\n- description = \"Allow user to mark a room as unread\",\n- defaultValue = { true },\n- isFinished = false,\n- ),\n RoomDirectorySearch(\n key = \"feature.roomdirectorysearch\",\n title = \"Room directory search\",\n@@ -75,27 +34,6 @@ enum class FeatureFlags(\n defaultValue = { false },\n isFinished = false,\n ),\n- QrCodeLogin(\n- key = \"feature.qrCodeLogin\",\n- title = \"Enable login using QR code\",\n- description = \"Allow the user to login using the QR code flow\",\n- defaultValue = { OnBoardingConfig.CAN_LOGIN_WITH_QR_CODE },\n- isFinished = false,\n- ),\n- IncomingShare(\n- key = \"feature.incomingShare\",\n- title = \"Incoming Share support\",\n- description = \"Allow the application to receive data from other applications\",\n- defaultValue = { true },\n- isFinished = false,\n- ),\n- PinnedEvents(\n- key = \"feature.pinnedEvents\",\n- title = \"Pinned Events\",\n- description = \"Allow user to pin events in a room\",\n- defaultValue = { true },\n- isFinished = false,\n- ),\n SyncOnPush(\n key = \"feature.syncOnPush\",\n title = \"Sync on push\",\n@@ -137,34 +75,6 @@ enum class FeatureFlags(\n defaultValue = { false },\n isFinished = false,\n ),\n- MediaUploadOnSendQueue(\n- key = \"feature.media_upload_through_send_queue\",\n- title = \"Media upload through send queue\",\n- description = \"Support for treating media uploads as regular events, with an improved retry and cancellation implementation.\",\n- defaultValue = { true },\n- isFinished = true,\n- ),\n- MediaCaptionCreation(\n- key = \"feature.media_caption_creation\",\n- title = \"Allow creation of media captions\",\n- description = null,\n- defaultValue = { true },\n- isFinished = false,\n- ),\n- MediaCaptionWarning(\n- key = \"feature.media_caption_creation_warning\",\n- title = \"Show a compatibility warning on media captions creation\",\n- description = null,\n- defaultValue = { true },\n- isFinished = false,\n- ),\n- MediaGallery(\n- key = \"feature.media_gallery\",\n- title = \"Allow user to open the media gallery\",\n- description = null,\n- defaultValue = { true },\n- isFinished = false,\n- ),\n PrintLogsToLogcat(\n key = \"feature.print_logs_to_logcat\",\n title = \"Print logs to logcat\",\n@@ -175,15 +85,6 @@ enum class FeatureFlags(\n // False so it's displayed in the developer options screen\n isFinished = false,\n ),\n- SharePos(\n- key = \"feature.share_pos_v2\",\n- title = \"Share pos in sliding sync\",\n- description = \"Keep the sliding sync pos to make initial syncs faster. Requires an app restart to take effect.\" +\n- \"\\n\\nWARNING: this may cause issues with syncs.\",\n- defaultValue = { true },\n- // False so it's displayed in the developer options screen\n- isFinished = false,\n- ),\n SelectableMediaQuality(\n key = \"feature.selectable_media_quality\",\n title = \"Select media quality per upload\",\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt\nindex 50c311e56a1..6d7218a8297 100644\n--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt\n@@ -14,7 +14,6 @@ import io.element.android.libraries.core.coroutine.childScope\n import io.element.android.libraries.core.data.tryOrNull\n import io.element.android.libraries.core.extensions.mapFailure\n import io.element.android.libraries.core.extensions.runCatchingExceptions\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n import io.element.android.libraries.matrix.api.MatrixClient\n import io.element.android.libraries.matrix.api.core.DeviceId\n import io.element.android.libraries.matrix.api.core.ProgressCallback\n@@ -136,7 +135,6 @@ class RustMatrixClient(\n baseCacheDirectory: File,\n clock: SystemClock,\n timelineEventTypeFilterFactory: TimelineEventTypeFilterFactory,\n- featureFlagService: FeatureFlagService,\n ) : MatrixClient {\n override val sessionId: UserId = UserId(innerClient.userId())\n override val deviceId: DeviceId = DeviceId(innerClient.deviceId())\n@@ -205,7 +203,6 @@ class RustMatrixClient(\n roomContentForwarder = RoomContentForwarder(innerRoomListService),\n roomSyncSubscriber = roomSyncSubscriber,\n timelineEventTypeFilterFactory = timelineEventTypeFilterFactory,\n- featureFlagService = featureFlagService,\n roomMembershipObserver = roomMembershipObserver,\n roomInfoMapper = roomInfoMapper,\n )\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt\nindex 6086da5d5bc..2a4abe6dc28 100644\n--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt\n@@ -78,7 +78,7 @@ class RustMatrixClientFactory @Inject constructor(\n client.setUtdDelegate(UtdTracker(analyticsService))\n \n val syncService = client.syncService()\n- .withSharePos(enable = featureFlagService.isFeatureEnabled(FeatureFlags.SharePos))\n+ .withSharePos(true)\n .withOfflineMode()\n .finish()\n \n@@ -93,7 +93,6 @@ class RustMatrixClientFactory @Inject constructor(\n baseCacheDirectory = cacheDirectory,\n clock = clock,\n timelineEventTypeFilterFactory = timelineEventTypeFilterFactory,\n- featureFlagService = featureFlagService,\n ).also {\n Timber.tag(it.toString()).d(\"Creating Client with access token '$anonymizedAccessToken' and refresh token '$anonymizedRefreshToken'\")\n }\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt\nindex 889c583c4ef..5edff19d848 100644\n--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt\n@@ -11,7 +11,6 @@ import io.element.android.libraries.core.coroutine.CoroutineDispatchers\n import io.element.android.libraries.core.coroutine.childScope\n import io.element.android.libraries.core.extensions.mapFailure\n import io.element.android.libraries.core.extensions.runCatchingExceptions\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n import io.element.android.libraries.matrix.api.core.DeviceId\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.core.RoomAlias\n@@ -84,7 +83,6 @@ class JoinedRustRoom(\n private val coroutineDispatchers: CoroutineDispatchers,\n private val systemClock: SystemClock,\n private val roomContentForwarder: RoomContentForwarder,\n- private val featureFlagService: FeatureFlagService,\n ) : JoinedRoom, BaseRoom by baseRoom {\n // Create a dispatcher for all room methods...\n private val roomDispatcher = coroutineDispatchers.io.limitedParallelism(32)\n@@ -478,7 +476,6 @@ class JoinedRustRoom(\n dispatcher = roomDispatcher,\n roomContentForwarder = roomContentForwarder,\n onNewSyncedEvent = onNewSyncedEvent,\n- featureFlagsService = featureFlagService,\n )\n }\n }\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt\nindex c842c258763..4450050c187 100644\n--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt\n@@ -9,7 +9,6 @@ package io.element.android.libraries.matrix.impl.room\n \n import io.element.android.appconfig.TimelineConfig\n import io.element.android.libraries.core.coroutine.CoroutineDispatchers\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n import io.element.android.libraries.matrix.api.core.DeviceId\n import io.element.android.libraries.matrix.api.core.RoomId\n import io.element.android.libraries.matrix.api.core.SessionId\n@@ -49,7 +48,6 @@ class RustRoomFactory(\n private val innerRoomListService: InnerRoomListService,\n private val roomSyncSubscriber: RoomSyncSubscriber,\n private val timelineEventTypeFilterFactory: TimelineEventTypeFilterFactory,\n- private val featureFlagService: FeatureFlagService,\n private val roomMembershipObserver: RoomMembershipObserver,\n private val roomInfoMapper: RoomInfoMapper,\n ) {\n@@ -127,7 +125,6 @@ class RustRoomFactory(\n liveInnerTimeline = timeline,\n coroutineDispatchers = dispatchers,\n systemClock = systemClock,\n- featureFlagService = featureFlagService,\n )\n )\n } else {\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt\nindex 00f89e39a3b..b1540d353dd 100644\n--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt\n@@ -8,8 +8,6 @@\n package io.element.android.libraries.matrix.impl.timeline\n \n import io.element.android.libraries.core.extensions.runCatchingExceptions\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.core.ProgressCallback\n import io.element.android.libraries.matrix.api.core.RoomId\n@@ -89,7 +87,6 @@ class RustTimeline(\n private val coroutineScope: CoroutineScope,\n private val dispatcher: CoroutineDispatcher,\n private val roomContentForwarder: RoomContentForwarder,\n- private val featureFlagsService: FeatureFlagService,\n onNewSyncedEvent: () -> Unit,\n ) : Timeline {\n private val _timelineItems: MutableSharedFlow> =\n@@ -342,7 +339,6 @@ class RustTimeline(\n progressCallback: ProgressCallback?,\n inReplyToEventId: EventId?,\n ): Result {\n- val useSendQueue = featureFlagsService.isFeatureEnabled(FeatureFlags.MediaUploadOnSendQueue)\n return sendAttachment(listOfNotNull(file, thumbnailFile)) {\n inner.sendImage(\n params = UploadParameters(\n@@ -351,7 +347,7 @@ class RustTimeline(\n formattedCaption = formattedCaption?.let {\n FormattedBody(body = it, format = MessageFormat.Html)\n },\n- useSendQueue = useSendQueue,\n+ useSendQueue = true,\n mentions = null,\n inReplyTo = inReplyToEventId?.value,\n ),\n@@ -371,7 +367,6 @@ class RustTimeline(\n progressCallback: ProgressCallback?,\n inReplyToEventId: EventId?,\n ): Result {\n- val useSendQueue = featureFlagsService.isFeatureEnabled(FeatureFlags.MediaUploadOnSendQueue)\n return sendAttachment(listOfNotNull(file, thumbnailFile)) {\n inner.sendVideo(\n params = UploadParameters(\n@@ -380,7 +375,7 @@ class RustTimeline(\n formattedCaption = formattedCaption?.let {\n FormattedBody(body = it, format = MessageFormat.Html)\n },\n- useSendQueue = useSendQueue,\n+ useSendQueue = true,\n mentions = null,\n inReplyTo = inReplyToEventId?.value,\n ),\n@@ -399,7 +394,6 @@ class RustTimeline(\n progressCallback: ProgressCallback?,\n inReplyToEventId: EventId?,\n ): Result {\n- val useSendQueue = featureFlagsService.isFeatureEnabled(FeatureFlags.MediaUploadOnSendQueue)\n return sendAttachment(listOf(file)) {\n inner.sendAudio(\n params = UploadParameters(\n@@ -408,7 +402,7 @@ class RustTimeline(\n formattedCaption = formattedCaption?.let {\n FormattedBody(body = it, format = MessageFormat.Html)\n },\n- useSendQueue = useSendQueue,\n+ useSendQueue = true,\n mentions = null,\n inReplyTo = inReplyToEventId?.value,\n ),\n@@ -426,7 +420,6 @@ class RustTimeline(\n progressCallback: ProgressCallback?,\n inReplyToEventId: EventId?,\n ): Result {\n- val useSendQueue = featureFlagsService.isFeatureEnabled(FeatureFlags.MediaUploadOnSendQueue)\n return sendAttachment(listOf(file)) {\n inner.sendFile(\n params = UploadParameters(\n@@ -435,7 +428,7 @@ class RustTimeline(\n formattedCaption = formattedCaption?.let {\n FormattedBody(body = it, format = MessageFormat.Html)\n },\n- useSendQueue = useSendQueue,\n+ useSendQueue = true,\n mentions = null,\n inReplyTo = inReplyToEventId?.value,\n ),\n@@ -489,7 +482,6 @@ class RustTimeline(\n progressCallback: ProgressCallback?,\n inReplyToEventId: EventId?,\n ): Result {\n- val useSendQueue = featureFlagsService.isFeatureEnabled(FeatureFlags.MediaUploadOnSendQueue)\n return sendAttachment(listOf(file)) {\n inner.sendVoiceMessage(\n params = UploadParameters(\n@@ -497,7 +489,7 @@ class RustTimeline(\n // Maybe allow a caption in the future?\n caption = null,\n formattedCaption = null,\n- useSendQueue = useSendQueue,\n+ useSendQueue = true,\n mentions = null,\n inReplyTo = inReplyToEventId?.value,\n ),\ndiff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt\nindex 91e36de12c8..1126a39466a 100644\n--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt\n+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt\n@@ -91,7 +91,6 @@ import io.element.android.wysiwyg.compose.RichTextEditor\n import io.element.android.wysiwyg.display.TextDisplay\n import kotlinx.collections.immutable.ImmutableList\n import kotlinx.collections.immutable.persistentListOf\n-import kotlinx.collections.immutable.toPersistentList\n import kotlinx.coroutines.launch\n import uniffi.wysiwyg_composer.MenuAction\n import kotlin.time.Duration.Companion.seconds\n@@ -101,7 +100,6 @@ fun TextComposer(\n state: TextEditorState,\n voiceMessageState: VoiceMessageState,\n composerMode: MessageComposerMode,\n- enableVoiceMessages: Boolean,\n onRequestFocus: () -> Unit,\n onSendMessage: () -> Unit,\n onResetComposerMode: () -> Unit,\n@@ -141,8 +139,8 @@ fun TextComposer(\n }\n \n val layoutModifier = modifier\n- .fillMaxSize()\n- .height(IntrinsicSize.Min)\n+ .fillMaxSize()\n+ .height(IntrinsicSize.Min)\n \n val composerOptionsButton: @Composable () -> Unit = remember(composerMode) {\n @Composable {\n@@ -171,22 +169,17 @@ fun TextComposer(\n } else {\n stringResource(id = R.string.rich_text_editor_composer_placeholder)\n }\n- val textInput: @Composable () -> Unit = if ((composerMode as? MessageComposerMode.Attachment)?.allowCaption == false) {\n- {\n- // No text input when in attachment mode and caption not allowed.\n- }\n- } else {\n- when (state) {\n- is TextEditorState.Rich -> {\n- val coroutineScope = rememberCoroutineScope()\n- val view = LocalView.current\n- remember(state.richTextEditorState, composerMode, onResetComposerMode, onError) {\n- @Composable {\n- TextInputBox(\n- modifier = Modifier\n+ val textInput: @Composable () -> Unit = when (state) {\n+ is TextEditorState.Rich -> {\n+ val coroutineScope = rememberCoroutineScope()\n+ val view = LocalView.current\n+ remember(state.richTextEditorState, composerMode, onResetComposerMode, onError) {\n+ @Composable {\n+ TextInputBox(\n+ modifier = Modifier\n .clickable(\n- interactionSource = remember { MutableInteractionSource() },\n- indication = null,\n+ interactionSource = remember { MutableInteractionSource() },\n+ indication = null,\n ) {\n coroutineScope.launch {\n state.requestFocus()\n@@ -196,49 +189,48 @@ fun TextComposer(\n .semantics {\n hideFromAccessibility()\n },\n- composerMode = composerMode,\n- onResetComposerMode = onResetComposerMode,\n- isTextEmpty = state.richTextEditorState.messageHtml.isEmpty(),\n- ) {\n- RichTextEditor(\n- state = state.richTextEditorState,\n- placeholder = placeholder,\n- registerStateUpdates = true,\n- modifier = Modifier\n- .padding(top = 6.dp, bottom = 6.dp)\n- .fillMaxWidth(),\n- style = ElementRichTextEditorStyle.composerStyle(hasFocus = state.richTextEditorState.hasFocus),\n- resolveMentionDisplay = resolveMentionDisplay,\n- resolveRoomMentionDisplay = resolveAtRoomMentionDisplay,\n- onError = onError,\n- onRichContentSelected = onSelectRichContent,\n- onTyping = onTyping,\n- )\n- }\n- }\n- }\n- }\n- is TextEditorState.Markdown -> {\n- @Composable {\n- val style = ElementRichTextEditorStyle.composerStyle(hasFocus = state.hasFocus())\n- TextInputBox(\n composerMode = composerMode,\n onResetComposerMode = onResetComposerMode,\n- isTextEmpty = state.state.text.value().isEmpty(),\n+ isTextEmpty = state.richTextEditorState.messageHtml.isEmpty(),\n ) {\n- MarkdownTextInput(\n- state = state.state,\n+ RichTextEditor(\n+ state = state.richTextEditorState,\n placeholder = placeholder,\n- placeholderColor = ElementTheme.colors.textSecondary,\n+ registerStateUpdates = true,\n+ modifier = Modifier\n+ .padding(top = 6.dp, bottom = 6.dp)\n+ .fillMaxWidth(),\n+ style = ElementRichTextEditorStyle.composerStyle(hasFocus = state.richTextEditorState.hasFocus),\n+ resolveMentionDisplay = resolveMentionDisplay,\n+ resolveRoomMentionDisplay = resolveAtRoomMentionDisplay,\n+ onError = onError,\n+ onRichContentSelected = onSelectRichContent,\n onTyping = onTyping,\n- onReceiveSuggestion = onReceiveSuggestion,\n- richTextEditorStyle = style,\n- onSelectRichContent = onSelectRichContent,\n )\n }\n }\n }\n }\n+ is TextEditorState.Markdown -> {\n+ @Composable {\n+ val style = ElementRichTextEditorStyle.composerStyle(hasFocus = state.hasFocus())\n+ TextInputBox(\n+ composerMode = composerMode,\n+ onResetComposerMode = onResetComposerMode,\n+ isTextEmpty = state.state.text.value().isEmpty(),\n+ ) {\n+ MarkdownTextInput(\n+ state = state.state,\n+ placeholder = placeholder,\n+ placeholderColor = ElementTheme.colors.textSecondary,\n+ onTyping = onTyping,\n+ onReceiveSuggestion = onReceiveSuggestion,\n+ richTextEditorStyle = style,\n+ onSelectRichContent = onSelectRichContent,\n+ )\n+ }\n+ }\n+ }\n }\n \n val canSendMessage = markdown.isNotBlank() || composerMode is MessageComposerMode.Attachment\n@@ -273,7 +265,7 @@ fun TextComposer(\n }\n \n val sendOrRecordButton = when {\n- enableVoiceMessages && !canSendMessage ->\n+ !canSendMessage ->\n when (voiceMessageState) {\n VoiceMessageState.Idle,\n is VoiceMessageState.Recording -> recordVoiceButton\n@@ -288,7 +280,6 @@ fun TextComposer(\n val endButtonA11y = endButtonA11y(\n composerMode = composerMode,\n voiceMessageState = voiceMessageState,\n- enableVoiceMessages = enableVoiceMessages,\n canSendMessage = canSendMessage,\n )\n \n@@ -341,7 +332,6 @@ fun TextComposer(\n } else {\n StandardLayout(\n voiceMessageState = voiceMessageState,\n- enableVoiceMessages = enableVoiceMessages,\n isRoomEncrypted = state.isRoomEncrypted,\n modifier = layoutModifier,\n composerOptionsButton = composerOptionsButton,\n@@ -378,12 +368,11 @@ fun TextComposer(\n private fun endButtonA11y(\n composerMode: MessageComposerMode,\n voiceMessageState: VoiceMessageState,\n- enableVoiceMessages: Boolean,\n canSendMessage: Boolean,\n ): (SemanticsPropertyReceiver) -> Unit {\n val a11ySendButtonDescription = stringResource(\n id = when {\n- enableVoiceMessages && !canSendMessage ->\n+ !canSendMessage ->\n when (voiceMessageState) {\n VoiceMessageState.Idle,\n is VoiceMessageState.Recording -> if (voiceMessageState is VoiceMessageState.Recording) {\n@@ -410,7 +399,6 @@ private fun endButtonA11y(\n @Composable\n private fun StandardLayout(\n voiceMessageState: VoiceMessageState,\n- enableVoiceMessages: Boolean,\n isRoomEncrypted: Boolean?,\n textInput: @Composable () -> Unit,\n composerOptionsButton: @Composable () -> Unit,\n@@ -427,12 +415,12 @@ private fun StandardLayout(\n Spacer(Modifier.height(4.dp))\n }\n Row(verticalAlignment = Alignment.Bottom) {\n- if (enableVoiceMessages && voiceMessageState !is VoiceMessageState.Idle) {\n+ if (voiceMessageState !is VoiceMessageState.Idle) {\n if (voiceMessageState is VoiceMessageState.Preview || voiceMessageState is VoiceMessageState.Recording) {\n Box(\n modifier = Modifier\n- .padding(bottom = 5.dp, top = 5.dp, end = 3.dp, start = 3.dp)\n- .size(48.dp),\n+ .padding(bottom = 5.dp, top = 5.dp, end = 3.dp, start = 3.dp)\n+ .size(48.dp),\n contentAlignment = Alignment.Center,\n ) {\n voiceDeleteButton()\n@@ -442,8 +430,8 @@ private fun StandardLayout(\n }\n Box(\n modifier = Modifier\n- .padding(bottom = 8.dp, top = 8.dp)\n- .weight(1f)\n+ .padding(bottom = 8.dp, top = 8.dp)\n+ .weight(1f)\n ) {\n voiceRecording()\n }\n@@ -456,17 +444,17 @@ private fun StandardLayout(\n }\n Box(\n modifier = Modifier\n- .padding(bottom = 8.dp, top = 8.dp)\n- .weight(1f)\n+ .padding(bottom = 8.dp, top = 8.dp)\n+ .weight(1f)\n ) {\n textInput()\n }\n }\n Box(\n Modifier\n- .padding(bottom = 5.dp, top = 5.dp, end = 6.dp, start = 6.dp)\n- .size(48.dp)\n- .clearAndSetSemantics(endButtonA11y),\n+ .padding(bottom = 5.dp, top = 5.dp, end = 6.dp, start = 6.dp)\n+ .size(48.dp)\n+ .clearAndSetSemantics(endButtonA11y),\n contentAlignment = Alignment.Center,\n ) {\n endButton()\n@@ -517,8 +505,8 @@ private fun TextFormattingLayout(\n }\n Box(\n modifier = Modifier\n- .weight(1f)\n- .padding(horizontal = 12.dp)\n+ .weight(1f)\n+ .padding(horizontal = 12.dp)\n ) {\n textInput()\n }\n@@ -537,11 +525,11 @@ private fun TextFormattingLayout(\n }\n Box(\n modifier = Modifier\n- .padding(\n- start = 14.dp,\n- end = 6.dp,\n- )\n- .clearAndSetSemantics(endButtonA11y)\n+ .padding(\n+ start = 14.dp,\n+ end = 6.dp,\n+ )\n+ .clearAndSetSemantics(endButtonA11y)\n ) {\n sendButton()\n }\n@@ -563,12 +551,12 @@ private fun TextInputBox(\n \n Column(\n modifier = Modifier\n- .clip(roundedCorners)\n- .border(0.5.dp, borderColor, roundedCorners)\n- .background(color = bgColor)\n- .requiredHeightIn(min = 42.dp)\n- .fillMaxSize()\n- .then(modifier),\n+ .clip(roundedCorners)\n+ .border(0.5.dp, borderColor, roundedCorners)\n+ .background(color = bgColor)\n+ .requiredHeightIn(min = 42.dp)\n+ .fillMaxSize()\n+ .then(modifier),\n ) {\n if (composerMode is MessageComposerMode.Special) {\n ComposerModeView(\n@@ -578,8 +566,8 @@ private fun TextInputBox(\n }\n Box(\n modifier = Modifier\n- .padding(top = 4.dp, bottom = 4.dp, start = 12.dp, end = 12.dp)\n- .then(Modifier.testTag(TestTags.textEditor)),\n+ .padding(top = 4.dp, bottom = 4.dp, start = 12.dp, end = 12.dp)\n+ .then(Modifier.testTag(TestTags.textEditor)),\n contentAlignment = Alignment.CenterStart,\n ) {\n textInput()\n@@ -587,9 +575,9 @@ private fun TextInputBox(\n var showBottomSheet by remember { mutableStateOf(false) }\n Icon(\n modifier = Modifier\n- .clickable { showBottomSheet = true }\n- .padding(horizontal = 8.dp, vertical = 4.dp)\n- .align(Alignment.CenterEnd),\n+ .clickable { showBottomSheet = true }\n+ .padding(horizontal = 8.dp, vertical = 4.dp)\n+ .align(Alignment.CenterEnd),\n imageVector = CompoundIcons.InfoSolid(),\n tint = ElementTheme.colors.iconCriticalPrimary,\n contentDescription = null,\n@@ -631,12 +619,11 @@ private fun aTextEditorStateRichList(isRoomEncrypted: Boolean? = null) = persist\n internal fun TextComposerSimplePreview() = ElementPreview {\n PreviewColumn(\n items = aTextEditorStateMarkdownList()\n- ) { _, textEditorState ->\n+ ) { textEditorState ->\n ATextComposer(\n state = textEditorState,\n voiceMessageState = VoiceMessageState.Idle,\n composerMode = MessageComposerMode.Normal,\n- enableVoiceMessages = true,\n )\n }\n }\n@@ -646,12 +633,11 @@ internal fun TextComposerSimplePreview() = ElementPreview {\n internal fun TextComposerSimpleNotEncryptedPreview() = ElementPreview {\n PreviewColumn(\n items = aTextEditorStateMarkdownList(isRoomEncrypted = false),\n- ) { _, textEditorState ->\n+ ) { textEditorState ->\n ATextComposer(\n state = textEditorState,\n voiceMessageState = VoiceMessageState.Idle,\n composerMode = MessageComposerMode.Normal,\n- enableVoiceMessages = true,\n )\n }\n }\n@@ -661,13 +647,12 @@ internal fun TextComposerSimpleNotEncryptedPreview() = ElementPreview {\n internal fun TextComposerFormattingPreview() = ElementPreview {\n PreviewColumn(\n items = aTextEditorStateRichList()\n- ) { _, textEditorState ->\n+ ) { textEditorState ->\n ATextComposer(\n state = textEditorState,\n voiceMessageState = VoiceMessageState.Idle,\n showTextFormatting = true,\n composerMode = MessageComposerMode.Normal,\n- enableVoiceMessages = true,\n )\n }\n }\n@@ -677,13 +662,12 @@ internal fun TextComposerFormattingPreview() = ElementPreview {\n internal fun TextComposerFormattingNotEncryptedPreview() = ElementPreview {\n PreviewColumn(\n items = aTextEditorStateRichList(isRoomEncrypted = false)\n- ) { _, textEditorState ->\n+ ) { textEditorState ->\n ATextComposer(\n state = textEditorState,\n voiceMessageState = VoiceMessageState.Idle,\n showTextFormatting = true,\n composerMode = MessageComposerMode.Normal,\n- enableVoiceMessages = true,\n )\n }\n }\n@@ -693,12 +677,11 @@ internal fun TextComposerFormattingNotEncryptedPreview() = ElementPreview {\n internal fun TextComposerEditPreview() = ElementPreview {\n PreviewColumn(\n items = aTextEditorStateRichList()\n- ) { _, textEditorState ->\n+ ) { textEditorState ->\n ATextComposer(\n state = textEditorState,\n voiceMessageState = VoiceMessageState.Idle,\n composerMode = aMessageComposerModeEdit(),\n- enableVoiceMessages = true,\n )\n }\n }\n@@ -708,12 +691,11 @@ internal fun TextComposerEditPreview() = ElementPreview {\n internal fun TextComposerEditNotEncryptedPreview() = ElementPreview {\n PreviewColumn(\n items = aTextEditorStateRichList(isRoomEncrypted = false)\n- ) { _, textEditorState ->\n+ ) { textEditorState ->\n ATextComposer(\n state = textEditorState,\n voiceMessageState = VoiceMessageState.Idle,\n composerMode = aMessageComposerModeEdit(),\n- enableVoiceMessages = true,\n )\n }\n }\n@@ -723,7 +705,7 @@ internal fun TextComposerEditNotEncryptedPreview() = ElementPreview {\n internal fun TextComposerEditCaptionPreview() = ElementPreview {\n PreviewColumn(\n items = aTextEditorStateRichList()\n- ) { _, textEditorState ->\n+ ) { textEditorState ->\n ATextComposer(\n state = textEditorState,\n voiceMessageState = VoiceMessageState.Idle,\n@@ -731,7 +713,6 @@ internal fun TextComposerEditCaptionPreview() = ElementPreview {\n // Set an existing caption so that the UI will be in edit caption mode\n content = \"An existing caption\",\n ),\n- enableVoiceMessages = false,\n )\n }\n }\n@@ -741,16 +722,14 @@ internal fun TextComposerEditCaptionPreview() = ElementPreview {\n internal fun TextComposerAddCaptionPreview() = ElementPreview {\n PreviewColumn(\n items = aTextEditorStateRichList()\n- ) { index, textEditorState ->\n+ ) { textEditorState ->\n ATextComposer(\n state = textEditorState,\n voiceMessageState = VoiceMessageState.Idle,\n composerMode = aMessageComposerModeEditCaption(\n // No caption so that the UI will be in add caption mode\n content = \"\",\n- showCompatibilityWarning = index == 0,\n ),\n- enableVoiceMessages = false,\n )\n }\n }\n@@ -760,12 +739,11 @@ internal fun TextComposerAddCaptionPreview() = ElementPreview {\n internal fun MarkdownTextComposerEditPreview() = ElementPreview {\n PreviewColumn(\n items = aTextEditorStateMarkdownList()\n- ) { _, textEditorState ->\n+ ) { textEditorState ->\n ATextComposer(\n state = textEditorState,\n voiceMessageState = VoiceMessageState.Idle,\n composerMode = aMessageComposerModeEdit(),\n- enableVoiceMessages = true,\n )\n }\n }\n@@ -775,14 +753,13 @@ internal fun MarkdownTextComposerEditPreview() = ElementPreview {\n internal fun TextComposerReplyPreview(@PreviewParameter(InReplyToDetailsProvider::class) inReplyToDetails: InReplyToDetails) = ElementPreview {\n PreviewColumn(\n items = aTextEditorStateRichList()\n- ) { _, textEditorState ->\n+ ) { textEditorState ->\n ATextComposer(\n state = textEditorState,\n voiceMessageState = VoiceMessageState.Idle,\n composerMode = aMessageComposerModeReply(\n replyToDetails = inReplyToDetails,\n ),\n- enableVoiceMessages = true,\n )\n }\n }\n@@ -800,14 +777,13 @@ internal fun TextComposerReplyPreview(@PreviewParameter(InReplyToDetailsProvider\n internal fun TextComposerReplyNotEncryptedPreview(@PreviewParameter(InReplyToDetailsProvider::class) inReplyToDetails: InReplyToDetails) = ElementPreview {\n PreviewColumn(\n items = aTextEditorStateRichList(isRoomEncrypted = false)\n- ) { _, textEditorState ->\n+ ) { textEditorState ->\n ATextComposer(\n state = textEditorState,\n voiceMessageState = VoiceMessageState.Idle,\n composerMode = aMessageComposerModeReply(\n replyToDetails = inReplyToDetails,\n ),\n- enableVoiceMessages = true,\n )\n }\n }\n@@ -817,16 +793,12 @@ internal fun TextComposerReplyNotEncryptedPreview(@PreviewParameter(InReplyToDet\n internal fun TextComposerCaptionPreview() = ElementPreview {\n val list = aTextEditorStateMarkdownList()\n PreviewColumn(\n- items = (list + aTextEditorStateMarkdown(initialText = \"NO_CAPTION\", initialFocus = true)).toPersistentList()\n- ) { index, textEditorState ->\n+ items = list,\n+ ) { textEditorState ->\n ATextComposer(\n state = textEditorState,\n voiceMessageState = VoiceMessageState.Idle,\n- composerMode = MessageComposerMode.Attachment(\n- allowCaption = index < list.size,\n- showCaptionCompatibilityWarning = index == 0,\n- ),\n- enableVoiceMessages = false,\n+ composerMode = MessageComposerMode.Attachment,\n )\n }\n }\n@@ -862,12 +834,11 @@ internal fun TextComposerVoicePreview() = ElementPreview {\n playbackProgress = 0.0f\n ),\n )\n- ) { _, voiceMessageState ->\n+ ) { voiceMessageState ->\n ATextComposer(\n state = aTextEditorStateRich(initialFocus = true),\n voiceMessageState = voiceMessageState,\n composerMode = MessageComposerMode.Normal,\n- enableVoiceMessages = true,\n )\n }\n }\n@@ -903,12 +874,11 @@ internal fun TextComposerVoiceNotEncryptedPreview() = ElementPreview {\n playbackProgress = 0.0f\n ),\n )\n- ) { _, voiceMessageState ->\n+ ) { voiceMessageState ->\n ATextComposer(\n state = aTextEditorStateRich(initialFocus = true, isRoomEncrypted = false),\n voiceMessageState = voiceMessageState,\n composerMode = MessageComposerMode.Normal,\n- enableVoiceMessages = true,\n )\n }\n }\n@@ -916,15 +886,15 @@ internal fun TextComposerVoiceNotEncryptedPreview() = ElementPreview {\n @Composable\n private fun PreviewColumn(\n items: ImmutableList,\n- view: @Composable (Int, T) -> Unit,\n+ view: @Composable (T) -> Unit,\n ) {\n Column {\n- items.forEachIndexed { index, item ->\n+ items.forEach { item ->\n HorizontalDivider()\n Box(\n modifier = Modifier.height(IntrinsicSize.Min)\n ) {\n- view(index, item)\n+ view(item)\n }\n }\n }\n@@ -935,7 +905,6 @@ private fun ATextComposer(\n state: TextEditorState,\n voiceMessageState: VoiceMessageState,\n composerMode: MessageComposerMode,\n- enableVoiceMessages: Boolean,\n showTextFormatting: Boolean = false,\n ) {\n TextComposer(\n@@ -943,7 +912,6 @@ private fun ATextComposer(\n showTextFormatting = showTextFormatting,\n voiceMessageState = voiceMessageState,\n composerMode = composerMode,\n- enableVoiceMessages = enableVoiceMessages,\n onRequestFocus = {},\n onSendMessage = {},\n onResetComposerMode = {},\n@@ -973,11 +941,9 @@ fun aMessageComposerModeEdit(\n fun aMessageComposerModeEditCaption(\n eventOrTransactionId: EventOrTransactionId = EventId(\"$1234\").toEventOrTransactionId(),\n content: String,\n- showCompatibilityWarning: Boolean = false,\n ) = MessageComposerMode.EditCaption(\n eventOrTransactionId = eventOrTransactionId,\n content = content,\n- showCaptionCompatibilityWarning = showCompatibilityWarning,\n )\n \n fun aMessageComposerModeReply(\ndiff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MessageComposerMode.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MessageComposerMode.kt\nindex 2fa596e8750..002fefec628 100644\n--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MessageComposerMode.kt\n+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MessageComposerMode.kt\n@@ -18,10 +18,7 @@ import io.element.android.libraries.matrix.ui.messages.reply.eventId\n sealed interface MessageComposerMode {\n data object Normal : MessageComposerMode\n \n- data class Attachment(\n- val allowCaption: Boolean,\n- val showCaptionCompatibilityWarning: Boolean,\n- ) : MessageComposerMode\n+ data object Attachment : MessageComposerMode\n \n sealed interface Special : MessageComposerMode\n \n@@ -33,7 +30,6 @@ sealed interface MessageComposerMode {\n data class EditCaption(\n val eventOrTransactionId: EventOrTransactionId,\n val content: String,\n- val showCaptionCompatibilityWarning: Boolean,\n ) : Special\n \n data class Reply(\n@@ -58,8 +54,8 @@ sealed interface MessageComposerMode {\n \n fun MessageComposerMode.showCaptionCompatibilityWarning(): Boolean {\n return when (this) {\n- is MessageComposerMode.Attachment -> showCaptionCompatibilityWarning\n- is MessageComposerMode.EditCaption -> showCaptionCompatibilityWarning && content.isEmpty()\n+ is MessageComposerMode.Attachment -> true\n+ is MessageComposerMode.EditCaption -> content.isEmpty()\n else -> false\n }\n }\n", "test_patch": "diff --git a/appnav/src/test/kotlin/io/element/android/appnav/RootPresenterTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/RootPresenterTest.kt\nindex 6d0878d812d..4c8b2a803d7 100644\n--- a/appnav/src/test/kotlin/io/element/android/appnav/RootPresenterTest.kt\n+++ b/appnav/src/test/kotlin/io/element/android/appnav/RootPresenterTest.kt\n@@ -14,16 +14,12 @@ import com.google.common.truth.Truth.assertThat\n import io.element.android.appnav.root.RootPresenter\n import io.element.android.features.rageshake.api.crash.aCrashDetectionState\n import io.element.android.features.rageshake.api.detection.aRageshakeDetectionState\n-import io.element.android.features.share.api.ShareService\n-import io.element.android.features.share.test.FakeShareService\n import io.element.android.libraries.matrix.test.FakeSdkMetadata\n import io.element.android.services.analytics.test.FakeAnalyticsService\n import io.element.android.services.apperror.api.AppErrorState\n import io.element.android.services.apperror.api.AppErrorStateService\n import io.element.android.services.apperror.impl.DefaultAppErrorStateService\n import io.element.android.tests.testutils.WarmUpRule\n-import io.element.android.tests.testutils.lambda.lambdaRecorder\n-import kotlinx.coroutines.CoroutineScope\n import kotlinx.coroutines.test.runTest\n import org.junit.Rule\n import org.junit.Test\n@@ -43,22 +39,6 @@ class RootPresenterTest {\n }\n }\n \n- @Test\n- fun `present - check that share service is invoked`() = runTest {\n- val lambda = lambdaRecorder { _ -> }\n- val presenter = createRootPresenter(\n- shareService = FakeShareService {\n- lambda(it)\n- }\n- )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n- skipItems(1)\n- lambda.assertions().isCalledOnce()\n- }\n- }\n-\n @Test\n fun `present - passes app error state`() = runTest {\n val presenter = createRootPresenter(\n@@ -82,14 +62,12 @@ class RootPresenterTest {\n \n private fun createRootPresenter(\n appErrorService: AppErrorStateService = DefaultAppErrorStateService(),\n- shareService: ShareService = FakeShareService {},\n ): RootPresenter {\n return RootPresenter(\n crashDetectionPresenter = { aCrashDetectionState() },\n rageshakeDetectionPresenter = { aRageshakeDetectionState() },\n appErrorStateService = appErrorService,\n analyticsService = FakeAnalyticsService(),\n- shareService = shareService,\n sdkMetadata = FakeSdkMetadata(\"sha\")\n )\n }\ndiff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt\nindex 11db1b80a57..044c150ad2f 100644\n--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt\n+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt\n@@ -32,8 +32,6 @@ import io.element.android.libraries.dateformatter.api.DateFormatter\n import io.element.android.libraries.dateformatter.test.FakeDateFormatter\n import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter\n import io.element.android.libraries.eventformatter.test.FakeRoomLastMessageFormatter\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.fullscreenintent.api.aFullScreenIntentPermissionsState\n import io.element.android.libraries.matrix.api.MatrixClient\n import io.element.android.libraries.matrix.api.core.RoomId\n@@ -217,7 +215,6 @@ class RoomListPresenterTest {\n roomName = summary.name,\n isDm = false,\n isFavorite = false,\n- markAsUnreadFeatureFlagEnabled = true,\n hasNewContent = false,\n displayClearRoomCacheAction = false,\n )\n@@ -235,7 +232,6 @@ class RoomListPresenterTest {\n roomName = summary.name,\n isDm = false,\n isFavorite = true,\n- markAsUnreadFeatureFlagEnabled = true,\n hasNewContent = false,\n displayClearRoomCacheAction = false,\n )\n@@ -263,7 +259,6 @@ class RoomListPresenterTest {\n roomName = summary.name,\n isDm = false,\n isFavorite = false,\n- markAsUnreadFeatureFlagEnabled = true,\n // true here.\n hasNewContent = false,\n displayClearRoomCacheAction = true,\n@@ -295,7 +290,6 @@ class RoomListPresenterTest {\n roomName = summary.name,\n isDm = false,\n isFavorite = false,\n- markAsUnreadFeatureFlagEnabled = true,\n hasNewContent = false,\n displayClearRoomCacheAction = false,\n )\n@@ -604,7 +598,6 @@ class RoomListPresenterTest {\n dateFormatter: DateFormatter = FakeDateFormatter(),\n roomLastMessageFormatter: RoomLastMessageFormatter = FakeRoomLastMessageFormatter(),\n sessionPreferencesStore: SessionPreferencesStore = InMemorySessionPreferencesStore(),\n- featureFlagService: FeatureFlagService = FakeFeatureFlagService(),\n analyticsService: AnalyticsService = FakeAnalyticsService(),\n filtersPresenter: Presenter = Presenter { aRoomListFiltersState() },\n searchPresenter: Presenter = Presenter { aRoomListSearchState() },\n@@ -626,7 +619,6 @@ class RoomListPresenterTest {\n sessionCoroutineScope = backgroundScope,\n dateTimeObserver = FakeDateTimeObserver(),\n ),\n- featureFlagService = featureFlagService,\n searchPresenter = searchPresenter,\n sessionPreferencesStore = sessionPreferencesStore,\n filtersPresenter = filtersPresenter,\ndiff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActionsTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActionsTest.kt\nindex 5b584a39f88..3d8ab975043 100644\n--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActionsTest.kt\n+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActionsTest.kt\n@@ -67,6 +67,7 @@ internal class AndroidLocationActionsTest {\n accuracy = 0f\n )\n // Set a locale with comma as decimal separator\n+ @Suppress(\"DEPRECATION\")\n Locale.setDefault(Locale.Category.FORMAT, Locale(\"pt\", \"BR\"))\n \n val actual = buildUrl(location, \"(weird/stuff here)\", ::urlEncoder)\ndiff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenterTest.kt\nindex c559db90566..b47adf4cd83 100644\n--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenterTest.kt\n+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenterTest.kt\n@@ -19,9 +19,6 @@ import io.element.android.features.login.impl.web.WebClientUrlForAuthenticationR\n import io.element.android.features.wellknown.test.FakeWellknownRetriever\n import io.element.android.libraries.architecture.AsyncData\n import io.element.android.libraries.core.meta.BuildMeta\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService\n import io.element.android.libraries.matrix.test.AN_ACCOUNT_PROVIDER\n import io.element.android.libraries.matrix.test.AN_ACCOUNT_PROVIDER_2\n@@ -70,13 +67,8 @@ class OnBoardingPresenterTest {\n productionApplicationName = \"B\",\n desktopApplicationName = \"C\",\n )\n- val featureFlagService = FakeFeatureFlagService(\n- initialState = mapOf(FeatureFlags.QrCodeLogin.key to true),\n- buildMeta = buildMeta,\n- )\n val presenter = createPresenter(\n buildMeta = buildMeta,\n- featureFlagService = featureFlagService,\n enterpriseService = FakeEnterpriseService(\n defaultHomeserverListResult = { listOf(ACCOUNT_PROVIDER_FROM_CONFIG, EnterpriseService.ANY_ACCOUNT_PROVIDER) },\n ),\n@@ -131,9 +123,6 @@ class OnBoardingPresenterTest {\n accountProvider = ACCOUNT_PROVIDER_FROM_LINK,\n loginHint = null,\n ),\n- featureFlagService = FakeFeatureFlagService(\n- initialState = mapOf(FeatureFlags.QrCodeLogin.key to true),\n- ),\n enterpriseService = FakeEnterpriseService(\n defaultHomeserverListResult = { listOf(ACCOUNT_PROVIDER_FROM_CONFIG, EnterpriseService.ANY_ACCOUNT_PROVIDER) },\n isAllowedToConnectToHomeserverResult = { true },\n@@ -156,9 +145,6 @@ class OnBoardingPresenterTest {\n accountProvider = ACCOUNT_PROVIDER_FROM_LINK,\n loginHint = null,\n ),\n- featureFlagService = FakeFeatureFlagService(\n- initialState = mapOf(FeatureFlags.QrCodeLogin.key to true),\n- ),\n enterpriseService = FakeEnterpriseService(\n defaultHomeserverListResult = { listOf(ACCOUNT_PROVIDER_FROM_CONFIG, ACCOUNT_PROVIDER_FROM_CONFIG_2) },\n isAllowedToConnectToHomeserverResult = { false },\n@@ -181,9 +167,6 @@ class OnBoardingPresenterTest {\n accountProvider = ACCOUNT_PROVIDER_FROM_LINK,\n loginHint = null,\n ),\n- featureFlagService = FakeFeatureFlagService(\n- initialState = mapOf(FeatureFlags.QrCodeLogin.key to true),\n- ),\n enterpriseService = FakeEnterpriseService(\n defaultHomeserverListResult = { listOf(ACCOUNT_PROVIDER_FROM_CONFIG) },\n )\n@@ -237,7 +220,6 @@ class OnBoardingPresenterTest {\n private fun createPresenter(\n params: OnBoardingNode.Params = OnBoardingNode.Params(null, null),\n buildMeta: BuildMeta = aBuildMeta(),\n- featureFlagService: FeatureFlagService = FakeFeatureFlagService(),\n enterpriseService: EnterpriseService = FakeEnterpriseService(),\n wellknownRetriever: WellknownRetriever = FakeWellknownRetriever(),\n rageshakeFeatureAvailability: () -> Flow = { flowOf(true) },\n@@ -245,7 +227,6 @@ private fun createPresenter(\n ) = OnBoardingPresenter(\n params = params,\n buildMeta = buildMeta,\n- featureFlagService = featureFlagService,\n enterpriseService = enterpriseService,\n defaultAccountProviderAccessControl = DefaultAccountProviderAccessControl(\n enterpriseService = enterpriseService,\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt\nindex 001da88bd4f..a64fa03e2b9 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt\n@@ -46,9 +46,6 @@ import io.element.android.libraries.core.mimetype.MimeTypes\n import io.element.android.libraries.designsystem.components.avatar.AvatarData\n import io.element.android.libraries.designsystem.components.avatar.AvatarSize\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.core.RoomId\n import io.element.android.libraries.matrix.api.core.UserId\n@@ -994,37 +991,6 @@ class MessagesPresenterTest {\n composerMode = MessageComposerMode.EditCaption(\n eventOrTransactionId = AN_EVENT_ID.toEventOrTransactionId(),\n content = A_CAPTION,\n- showCaptionCompatibilityWarning = true,\n- )\n- )\n- )\n- }\n- }\n-\n- @Test\n- fun `present - handle action edit caption without warning`() = runTest {\n- val messageEvent = aMessageEvent(\n- content = aTimelineItemImageContent(\n- caption = A_CAPTION,\n- )\n- )\n- val composerRecorder = EventsRecorder()\n- val presenter = createMessagesPresenter(\n- messageComposerPresenter = { aMessageComposerState(eventSink = composerRecorder) },\n- featureFlagService = FakeFeatureFlagService(\n- initialState = mapOf(FeatureFlags.MediaCaptionWarning.key to false)\n- )\n- )\n- presenter.testWithLifecycleOwner {\n- val initialState = awaitItem()\n- initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.EditCaption, messageEvent))\n- awaitItem()\n- composerRecorder.assertSingle(\n- MessageComposerEvents.SetMode(\n- composerMode = MessageComposerMode.EditCaption(\n- eventOrTransactionId = AN_EVENT_ID.toEventOrTransactionId(),\n- content = A_CAPTION,\n- showCaptionCompatibilityWarning = false,\n )\n )\n )\n@@ -1051,37 +1017,6 @@ class MessagesPresenterTest {\n composerMode = MessageComposerMode.EditCaption(\n eventOrTransactionId = AN_EVENT_ID.toEventOrTransactionId(),\n content = \"\",\n- showCaptionCompatibilityWarning = true,\n- )\n- )\n- )\n- }\n- }\n-\n- @Test\n- fun `present - handle action add caption without warning`() = runTest {\n- val composerRecorder = EventsRecorder()\n- val presenter = createMessagesPresenter(\n- messageComposerPresenter = { aMessageComposerState(eventSink = composerRecorder) },\n- featureFlagService = FakeFeatureFlagService(\n- initialState = mapOf(FeatureFlags.MediaCaptionWarning.key to false)\n- )\n- )\n- val messageEvent = aMessageEvent(\n- content = aTimelineItemImageContent(\n- caption = null,\n- )\n- )\n- presenter.testWithLifecycleOwner {\n- val initialState = awaitItem()\n- initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.AddCaption, messageEvent))\n- awaitItem()\n- composerRecorder.assertSingle(\n- MessageComposerEvents.SetMode(\n- composerMode = MessageComposerMode.EditCaption(\n- eventOrTransactionId = AN_EVENT_ID.toEventOrTransactionId(),\n- content = \"\",\n- showCaptionCompatibilityWarning = false,\n )\n )\n )\n@@ -1234,7 +1169,6 @@ class MessagesPresenterTest {\n typingNoticeResult = { Result.success(Unit) },\n ),\n navigator: FakeMessagesNavigator = FakeMessagesNavigator(),\n- featureFlagService: FeatureFlagService = FakeFeatureFlagService(),\n clipboardHelper: FakeClipboardHelper = FakeClipboardHelper(),\n analyticsService: FakeAnalyticsService = FakeAnalyticsService(),\n timelineEventSink: (TimelineEvents) -> Unit = {},\n@@ -1270,7 +1204,6 @@ class MessagesPresenterTest {\n snackbarDispatcher = SnackbarDispatcher(),\n navigator = navigator,\n clipboardHelper = clipboardHelper,\n- featureFlagsService = featureFlagService,\n buildMeta = aBuildMeta(),\n dispatchers = coroutineDispatchers,\n htmlConverterProvider = FakeHtmlConverterProvider(),\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt\nindex a082b36b391..50dbb2b7ca3 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt\n@@ -27,8 +27,6 @@ import io.element.android.features.messages.impl.timeline.model.event.aTimelineI\n import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemVoiceContent\n import io.element.android.features.poll.api.pollcontent.aPollAnswerItemList\n import io.element.android.libraries.dateformatter.test.FakeDateFormatter\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.matrix.api.room.BaseRoom\n import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState\n import io.element.android.libraries.matrix.test.AN_EVENT_ID\n@@ -52,7 +50,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - initial state`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -63,7 +61,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for message from me redacted`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -100,7 +98,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for message from others redacted`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -141,7 +139,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for others message`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -188,7 +186,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for others message in a thread`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n presenter.test {\n val initialState = awaitItem()\n val messageEvent = aMessageEvent(\n@@ -234,7 +232,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for others message cannot sent message`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -280,7 +278,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for others message and can redact`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -328,7 +326,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for others message and cannot send reaction`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -376,7 +374,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for my message`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -423,7 +421,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for my message in a thread`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n presenter.test {\n val initialState = awaitItem()\n val messageEvent = aMessageEvent(\n@@ -469,7 +467,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for my message cannot redact`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -515,7 +513,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for my message no permission`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -558,7 +556,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for a media item`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -603,61 +601,9 @@ class ActionListPresenterTest {\n }\n }\n \n- @Test\n- fun `present - compute for a media item - caption disabled`() = runTest {\n- val presenter = createActionListPresenter(\n- isDeveloperModeEnabled = true,\n- isPinFeatureEnabled = true,\n- allowCaption = false,\n- )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n- val initialState = awaitItem()\n- val messageEvent = aMessageEvent(\n- isMine = true,\n- isEditable = true,\n- content = aTimelineItemImageContent(),\n- )\n- initialState.eventSink.invoke(\n- ActionListEvents.ComputeForMessage(\n- event = messageEvent,\n- userEventPermissions = aUserEventPermissions(\n- canRedactOwn = true,\n- canRedactOther = false,\n- canSendMessage = true,\n- canSendReaction = true,\n- canPinUnpin = true,\n- ),\n- )\n- )\n- val successState = awaitItem()\n- assertThat(successState.target).isEqualTo(\n- ActionListState.Target.Success(\n- event = messageEvent,\n- sentTimeFull = \"0 Full true\",\n- displayEmojiReactions = true,\n- verifiedUserSendFailure = VerifiedUserSendFailure.None,\n- actions = persistentListOf(\n- TimelineItemAction.Reply,\n- TimelineItemAction.Forward,\n- // Not here\n- // TimelineItemAction.AddCaption,\n- TimelineItemAction.CopyLink,\n- TimelineItemAction.Pin,\n- TimelineItemAction.ViewSource,\n- TimelineItemAction.Redact,\n- )\n- )\n- )\n- initialState.eventSink.invoke(ActionListEvents.Clear)\n- assertThat(awaitItem().target).isEqualTo(ActionListState.Target.None)\n- }\n- }\n-\n @Test\n fun `present - compute for a media with caption item`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -708,7 +654,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for a media with caption item - other user event`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -757,7 +703,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for a state item in debug build`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -797,7 +743,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for a state item in non-debuggable build`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = false, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = false)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -824,7 +770,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute message in non-debuggable build`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = false, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = false)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -870,7 +816,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute message when user can't pin`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -921,7 +867,6 @@ class ActionListPresenterTest {\n }\n val presenter = createActionListPresenter(\n isDeveloperModeEnabled = true,\n- isPinFeatureEnabled = true,\n room = room\n )\n moleculeFlow(RecompositionMode.Immediate) {\n@@ -970,7 +915,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute message with no actions`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = false, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = false)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -1017,7 +962,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute not sent message`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = false, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = false)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -1061,7 +1006,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for editable poll message`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = false, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = false)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -1105,7 +1050,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for non-editable poll message`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = false, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = false)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -1148,7 +1093,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for ended poll message`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = false, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = false)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -1190,7 +1135,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for voice message`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = false, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = false)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -1235,7 +1180,7 @@ class ActionListPresenterTest {\n \n @Test\n fun `present - compute for call notify`() = runTest {\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = true)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -1275,7 +1220,7 @@ class ActionListPresenterTest {\n val room = FakeBaseRoom(\n userDisplayNameResult = { Result.success(\"Alice\") }\n )\n- val presenter = createActionListPresenter(isDeveloperModeEnabled = false, isPinFeatureEnabled = false, room = room)\n+ val presenter = createActionListPresenter(isDeveloperModeEnabled = false, room = room)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n@@ -1299,22 +1244,14 @@ class ActionListPresenterTest {\n \n private fun createActionListPresenter(\n isDeveloperModeEnabled: Boolean,\n- isPinFeatureEnabled: Boolean,\n room: BaseRoom = FakeBaseRoom(),\n- allowCaption: Boolean = true,\n ): ActionListPresenter {\n val preferencesStore = InMemoryAppPreferencesStore(isDeveloperModeEnabled = isDeveloperModeEnabled)\n return DefaultActionListPresenter(\n postProcessor = TimelineItemActionPostProcessor.Default,\n appPreferencesStore = preferencesStore,\n- isPinnedMessagesFeatureEnabled = { isPinFeatureEnabled },\n room = room,\n userSendFailureFactory = VerifiedUserSendFailureFactory(room),\n- featureFlagService = FakeFeatureFlagService(\n- initialState = mapOf(\n- FeatureFlags.MediaCaptionCreation.key to allowCaption,\n- ),\n- ),\n dateFormatter = FakeDateFormatter(),\n )\n }\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt\nindex 18808d9ddfc..7f8e10c5b13 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt\n@@ -25,8 +25,6 @@ import io.element.android.features.messages.test.attachments.video.FakeMediaOpti\n import io.element.android.libraries.androidutils.file.TemporaryUriDeleter\n import io.element.android.libraries.architecture.AsyncData\n import io.element.android.libraries.core.mimetype.MimeTypes\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.core.ProgressCallback\n import io.element.android.libraries.matrix.api.media.AudioInfo\n@@ -84,34 +82,8 @@ class AttachmentsPreviewPresenterTest {\n @Test\n fun `present - initial state`() = runTest {\n createAttachmentsPreviewPresenter().test {\n- skipItems(1)\n val initialState = awaitItem()\n assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)\n- assertThat(initialState.allowCaption).isTrue()\n- assertThat(initialState.showCaptionCompatibilityWarning).isTrue()\n- }\n- }\n-\n- @Test\n- fun `present - initial state no caption warning`() = runTest {\n- createAttachmentsPreviewPresenter(\n- showCaptionCompatibilityWarning = false,\n- ).test {\n- skipItems(1)\n- val initialState = awaitItem()\n- assertThat(initialState.showCaptionCompatibilityWarning).isFalse()\n- }\n- }\n-\n- @Test\n- fun `present - initial state - caption not allowed`() = runTest {\n- createAttachmentsPreviewPresenter(\n- allowCaption = false,\n- ).test {\n- skipItems(1)\n- val initialState = awaitItem()\n- assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)\n- assertThat(initialState.allowCaption).isFalse()\n }\n }\n \n@@ -144,7 +116,6 @@ class AttachmentsPreviewPresenterTest {\n }.test {\n val initialState = awaitItem()\n assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Idle)\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))\n initialState.eventSink(AttachmentsPreviewEvents.SendAttachment)\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = true))\n@@ -186,7 +157,6 @@ class AttachmentsPreviewPresenterTest {\n // Pre-processing finishes\n processLatch.complete(Unit)\n advanceUntilIdle()\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Idle)\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))\n initialState.eventSink(AttachmentsPreviewEvents.SendAttachment)\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo))\n@@ -221,7 +191,6 @@ class AttachmentsPreviewPresenterTest {\n }.test {\n val initialState = awaitItem()\n assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Idle)\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))\n initialState.eventSink(AttachmentsPreviewEvents.SendAttachment)\n // Pre-processing finishes\n@@ -253,7 +222,6 @@ class AttachmentsPreviewPresenterTest {\n val initialState = awaitItem()\n assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)\n initialState.eventSink(AttachmentsPreviewEvents.SendAttachment)\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Idle)\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))\n // Pre-processing finishes\n processLatch.complete(Unit)\n@@ -282,7 +250,6 @@ class AttachmentsPreviewPresenterTest {\n processLatch.complete(Unit)\n advanceUntilIdle()\n initialState.eventSink(AttachmentsPreviewEvents.SendAttachment)\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Idle)\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))\n assertThat(awaitItem().sendActionState).isInstanceOf(SendActionState.Failure::class.java)\n }\n@@ -304,7 +271,6 @@ class AttachmentsPreviewPresenterTest {\n val initialState = awaitItem()\n assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)\n initialState.eventSink(AttachmentsPreviewEvents.CancelAndDismiss)\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Idle)\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Done)\n deleteCallback.assertions().isCalledOnce()\n onDoneListener.assertions().isCalledOnce()\n@@ -339,7 +305,6 @@ class AttachmentsPreviewPresenterTest {\n assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)\n initialState.textEditorState.setMarkdown(A_CAPTION)\n initialState.eventSink(AttachmentsPreviewEvents.SendAttachment)\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Idle)\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))\n assertThat(awaitItem().sendActionState).isInstanceOf(SendActionState.Sending.ReadyToUpload::class.java)\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Done)\n@@ -383,7 +348,6 @@ class AttachmentsPreviewPresenterTest {\n assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)\n initialState.textEditorState.setMarkdown(A_CAPTION)\n initialState.eventSink(AttachmentsPreviewEvents.SendAttachment)\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Idle)\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))\n assertThat(awaitItem().sendActionState).isInstanceOf(SendActionState.Sending.ReadyToUpload::class.java)\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Done)\n@@ -425,7 +389,6 @@ class AttachmentsPreviewPresenterTest {\n assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)\n initialState.textEditorState.setMarkdown(A_CAPTION)\n initialState.eventSink(AttachmentsPreviewEvents.SendAttachment)\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Idle)\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))\n assertThat(awaitItem().sendActionState).isInstanceOf(SendActionState.Sending.ReadyToUpload::class.java)\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Done)\n@@ -442,38 +405,7 @@ class AttachmentsPreviewPresenterTest {\n }\n \n @Test\n- fun `present - send media failure scenario without media queue`() = runTest {\n- val failure = MediaPreProcessor.Failure(null)\n- val sendFileResult =\n- lambdaRecorder> { _, _, _, _, _, _ ->\n- Result.failure(failure)\n- }\n- val room = FakeJoinedRoom(\n- liveTimeline = FakeTimeline().apply {\n- sendFileLambda = sendFileResult\n- },\n- )\n- val presenter = createAttachmentsPreviewPresenter(room = room, mediaUploadOnSendQueueEnabled = false)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n- val initialState = awaitItem()\n- assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)\n- initialState.eventSink(AttachmentsPreviewEvents.SendAttachment)\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Idle)\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo))\n- val failureState = awaitItem()\n- assertThat(failureState.sendActionState).isEqualTo(SendActionState.Failure(failure, mediaUploadInfo))\n- sendFileResult.assertions().isCalledOnce()\n- failureState.eventSink(AttachmentsPreviewEvents.CancelAndClearSendState)\n- val clearedState = awaitLastSequentialItem()\n- assertThat(clearedState.sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo))\n- }\n- }\n-\n- @Test\n- fun `present - send media failure scenario with media queue`() = runTest {\n+ fun `present - send media failure scenario`() = runTest {\n val failure = MediaPreProcessor.Failure(null)\n val sendFileResult =\n lambdaRecorder> { _, _, _, _, _, _ ->\n@@ -485,14 +417,13 @@ class AttachmentsPreviewPresenterTest {\n sendFileLambda = sendFileResult\n },\n )\n- val presenter = createAttachmentsPreviewPresenter(room = room, mediaUploadOnSendQueueEnabled = true, onDoneListener = onDoneListenerResult)\n+ val presenter = createAttachmentsPreviewPresenter(room = room, onDoneListener = onDoneListenerResult)\n moleculeFlow(RecompositionMode.Immediate) {\n presenter.present()\n }.test {\n val initialState = awaitItem()\n assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)\n initialState.eventSink(AttachmentsPreviewEvents.SendAttachment)\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Idle)\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo))\n \n@@ -509,25 +440,7 @@ class AttachmentsPreviewPresenterTest {\n }\n \n @Test\n- fun `present - dismissing the progress dialog stops media upload without media queue`() = runTest {\n- val presenter = createAttachmentsPreviewPresenter(mediaUploadOnSendQueueEnabled = false)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n- val initialState = awaitItem()\n- assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Idle)\n- initialState.eventSink(AttachmentsPreviewEvents.SendAttachment)\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo))\n- initialState.eventSink(AttachmentsPreviewEvents.CancelAndClearSendState)\n- // The sending is cancelled and the state is kept at ReadyToUpload\n- ensureAllEventsConsumed()\n- }\n- }\n-\n- @Test\n- fun `present - dismissing the progress dialog stops media upload with media queue`() = runTest {\n+ fun `present - dismissing the progress dialog stops media upload`() = runTest {\n val onDoneListenerResult = lambdaRecorder {}\n val presenter = createAttachmentsPreviewPresenter(\n room = FakeJoinedRoom(\n@@ -537,7 +450,6 @@ class AttachmentsPreviewPresenterTest {\n }\n }\n ),\n- mediaUploadOnSendQueueEnabled = true,\n onDoneListener = onDoneListenerResult,\n )\n moleculeFlow(RecompositionMode.Immediate) {\n@@ -546,7 +458,6 @@ class AttachmentsPreviewPresenterTest {\n val initialState = awaitItem()\n assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)\n initialState.eventSink(AttachmentsPreviewEvents.SendAttachment)\n- assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Idle)\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))\n assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo))\n initialState.eventSink(AttachmentsPreviewEvents.CancelAndClearSendState)\n@@ -574,7 +485,6 @@ class AttachmentsPreviewPresenterTest {\n }\n }\n ),\n- mediaUploadOnSendQueueEnabled = true,\n onDoneListener = onDoneListenerResult,\n mediaOptimizationSelectorPresenterFactory = FakeMediaOptimizationSelectorPresenterFactory {\n MediaOptimizationSelectorState(\n@@ -616,7 +526,6 @@ class AttachmentsPreviewPresenterTest {\n }\n }\n ),\n- mediaUploadOnSendQueueEnabled = true,\n onDoneListener = onDoneListenerResult,\n mediaOptimizationSelectorPresenterFactory = FakeMediaOptimizationSelectorPresenterFactory {\n MediaOptimizationSelectorState(\n@@ -672,9 +581,6 @@ class AttachmentsPreviewPresenterTest {\n mediaPreProcessor: MediaPreProcessor = FakeMediaPreProcessor(),\n temporaryUriDeleter: TemporaryUriDeleter = FakeTemporaryUriDeleter(),\n onDoneListener: OnDoneListener = OnDoneListener { lambdaError() },\n- mediaUploadOnSendQueueEnabled: Boolean = true,\n- allowCaption: Boolean = true,\n- showCaptionCompatibilityWarning: Boolean = true,\n displayMediaQualitySelectorViews: Boolean = false,\n mediaOptimizationSelectorPresenterFactory: FakeMediaOptimizationSelectorPresenterFactory = FakeMediaOptimizationSelectorPresenterFactory(\n fakePresenter = {\n@@ -698,13 +604,6 @@ class AttachmentsPreviewPresenterTest {\n }),\n permalinkBuilder = permalinkBuilder,\n temporaryUriDeleter = temporaryUriDeleter,\n- featureFlagService = FakeFeatureFlagService(\n- initialState = mapOf(\n- FeatureFlags.MediaUploadOnSendQueue.key to mediaUploadOnSendQueueEnabled,\n- FeatureFlags.MediaCaptionCreation.key to allowCaption,\n- FeatureFlags.MediaCaptionWarning.key to showCaptionCompatibilityWarning,\n- ),\n- ),\n sessionCoroutineScope = this,\n dispatchers = testCoroutineDispatchers(),\n mediaOptimizationSelectorPresenterFactory = mediaOptimizationSelectorPresenterFactory,\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/TimelineItemsFactoryFixtures.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/TimelineItemsFactoryFixtures.kt\nindex b62e77e08e3..2cf0f8a3c99 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/TimelineItemsFactoryFixtures.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/TimelineItemsFactoryFixtures.kt\n@@ -30,7 +30,6 @@ import io.element.android.features.poll.test.pollcontent.FakePollContentStateFac\n import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter\n import io.element.android.libraries.dateformatter.test.FakeDateFormatter\n import io.element.android.libraries.eventformatter.api.TimelineEventFormatter\n-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem\n import io.element.android.libraries.matrix.test.FakeMatrixClient\n import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser\n@@ -60,7 +59,6 @@ internal fun TestScope.aTimelineItemsFactory(\n messageFactory = TimelineItemContentMessageFactory(\n fileSizeFormatter = FakeFileSizeFormatter(),\n fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),\n- featureFlagService = FakeFeatureFlagService(),\n htmlConverterProvider = FakeHtmlConverterProvider(),\n permalinkParser = FakePermalinkParser(),\n textPillificationHelper = FakeTextPillificationHelper(),\n@@ -70,7 +68,7 @@ internal fun TestScope.aTimelineItemsFactory(\n fileSizeFormatter = FakeFileSizeFormatter(),\n fileExtensionExtractor = FileExtensionExtractorWithoutValidation()\n ),\n- pollFactory = TimelineItemContentPollFactory(FakeFeatureFlagService(), FakePollContentStateFactory()),\n+ pollFactory = TimelineItemContentPollFactory(FakePollContentStateFactory()),\n utdFactory = TimelineItemContentUTDFactory(),\n roomMembershipFactory = TimelineItemContentRoomMembershipFactory(timelineEventFormatter),\n profileChangeFactory = TimelineItemContentProfileChangeFactory(timelineEventFormatter),\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt\nindex a677207b13b..c0df1a2b196 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt\n@@ -32,9 +32,6 @@ import io.element.android.features.messages.impl.utils.FakeTextPillificationHelp\n import io.element.android.features.messages.impl.utils.TextPillificationHelper\n import io.element.android.libraries.core.mimetype.MimeTypes\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.core.RoomId\n import io.element.android.libraries.matrix.api.core.ThreadId\n@@ -125,9 +122,6 @@ class MessageComposerPresenterTest {\n private val pickerProvider = FakePickerProvider().apply {\n givenResult(mockk()) // Uri is not available in JVM, so the only way to have a non-null Uri is using Mockk\n }\n- private val featureFlagService = FakeFeatureFlagService(\n- mapOf(FeatureFlags.LocationSharing.key to true)\n- )\n private val mediaPreProcessor = FakeMediaPreProcessor()\n private val snackbarDispatcher = SnackbarDispatcher()\n private val mockMediaUrl: Uri = mockk(\"localMediaUri\")\n@@ -1529,7 +1523,6 @@ class MessageComposerPresenterTest {\n ),\n navigator: MessagesNavigator = FakeMessagesNavigator(),\n pickerProvider: PickerProvider = this@MessageComposerPresenterTest.pickerProvider,\n- featureFlagService: FeatureFlagService = this@MessageComposerPresenterTest.featureFlagService,\n locationService: LocationService = FakeLocationService(true),\n sessionPreferencesStore: SessionPreferencesStore = InMemorySessionPreferencesStore(),\n mediaPreProcessor: MediaPreProcessor = this@MessageComposerPresenterTest.mediaPreProcessor,\n@@ -1551,7 +1544,6 @@ class MessageComposerPresenterTest {\n sessionCoroutineScope = this,\n room = room,\n mediaPickerProvider = pickerProvider,\n- featureFlagService = featureFlagService,\n sessionPreferencesStore = sessionPreferencesStore,\n localMediaFactory = localMediaFactory,\n mediaSender = MediaSender(\n@@ -1593,11 +1585,9 @@ fun anEditMode(\n fun anEditCaptionMode(\n eventOrTransactionId: EventOrTransactionId = AN_EVENT_ID.toEventOrTransactionId(),\n caption: String = A_CAPTION,\n- showCaptionCompatibilityWarning: Boolean = false,\n ) = MessageComposerMode.EditCaption(\n eventOrTransactionId = eventOrTransactionId,\n content = caption,\n- showCaptionCompatibilityWarning = showCaptionCompatibilityWarning,\n )\n \n fun aReplyMode() = MessageComposerMode.Reply(\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt\nindex f1fcd7e7873..4840d5bed1d 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt\n@@ -10,8 +10,6 @@ package io.element.android.features.messages.impl.pinned.banner\n import com.google.common.truth.Truth.assertThat\n import io.element.android.features.messages.impl.pinned.PinnedEventsTimelineProvider\n import io.element.android.libraries.eventformatter.test.FakePinnedMessagesBannerFormatter\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.matrix.api.room.JoinedRoom\n import io.element.android.libraries.matrix.api.sync.SyncService\n import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem\n@@ -35,7 +33,7 @@ import org.junit.Test\n class PinnedMessagesBannerPresenterTest {\n @Test\n fun `present - initial state`() = runTest {\n- val presenter = createPinnedMessagesBannerPresenter(isFeatureEnabled = true)\n+ val presenter = createPinnedMessagesBannerPresenter()\n presenter.test {\n val initialState = awaitItem()\n assertThat(initialState).isEqualTo(PinnedMessagesBannerState.Hidden)\n@@ -43,15 +41,6 @@ class PinnedMessagesBannerPresenterTest {\n }\n }\n \n- @Test\n- fun `present - feature disabled`() = runTest {\n- val presenter = createPinnedMessagesBannerPresenter(isFeatureEnabled = false)\n- presenter.test {\n- val initialState = awaitItem()\n- assertThat(initialState).isEqualTo(PinnedMessagesBannerState.Hidden)\n- }\n- }\n-\n @Test\n fun `present - loading state`() = runTest {\n val room = FakeJoinedRoom(\n@@ -188,14 +177,10 @@ class PinnedMessagesBannerPresenterTest {\n )\n ),\n syncService: SyncService = FakeSyncService(),\n- isFeatureEnabled: Boolean = true,\n ): PinnedMessagesBannerPresenter {\n val timelineProvider = PinnedEventsTimelineProvider(\n room = room,\n syncService = syncService,\n- featureFlagService = FakeFeatureFlagService(\n- initialState = mapOf(FeatureFlags.PinnedEvents.key to isFeatureEnabled)\n- ),\n dispatchers = testCoroutineDispatchers(),\n )\n timelineProvider.launchIn(backgroundScope)\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenterTest.kt\nindex 535b11c5220..507edf9d9ac 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenterTest.kt\n@@ -17,8 +17,6 @@ import io.element.android.features.messages.impl.pinned.PinnedEventsTimelineProv\n import io.element.android.features.messages.impl.timeline.model.TimelineItem\n import io.element.android.features.messages.impl.timeline.protection.aTimelineProtectionState\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.room.JoinedRoom\n import io.element.android.libraries.matrix.api.sync.SyncService\n@@ -51,34 +49,17 @@ import org.junit.Test\n @OptIn(ExperimentalCoroutinesApi::class)\n class PinnedMessagesListPresenterTest {\n @Test\n- fun `present - initial state feature disabled`() = runTest {\n+ fun `present - initial state`() = runTest {\n val room = FakeJoinedRoom(\n baseRoom = FakeBaseRoom(\n- canRedactOwnResult = { Result.success(true) },\n- canRedactOtherResult = { Result.success(true) },\n- canUserPinUnpinResult = { Result.success(true) },\n+ canRedactOwnResult = { Result.success(true) },\n+ canRedactOtherResult = { Result.success(true) },\n+ canUserPinUnpinResult = { Result.success(true) },\n+ ).apply {\n+ givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))\n+ }\n )\n- )\n- val presenter = createPinnedMessagesListPresenter(room = room, isFeatureEnabled = false)\n- presenter.test {\n- val initialState = awaitItem()\n- assertThat(initialState).isEqualTo(PinnedMessagesListState.Loading)\n- cancelAndIgnoreRemainingEvents()\n- }\n- }\n-\n- @Test\n- fun `present - initial state feature enabled`() = runTest {\n- val room = FakeJoinedRoom(\n- baseRoom = FakeBaseRoom(\n- canRedactOwnResult = { Result.success(true) },\n- canRedactOtherResult = { Result.success(true) },\n- canUserPinUnpinResult = { Result.success(true) },\n- ).apply {\n- givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))\n- }\n- )\n- val presenter = createPinnedMessagesListPresenter(room = room, isFeatureEnabled = true)\n+ val presenter = createPinnedMessagesListPresenter(room = room)\n presenter.test {\n val initialState = awaitItem()\n assertThat(initialState).isEqualTo(PinnedMessagesListState.Loading)\n@@ -90,15 +71,15 @@ class PinnedMessagesListPresenterTest {\n fun `present - timeline failure state`() = runTest {\n val room = FakeJoinedRoom(\n baseRoom = FakeBaseRoom(\n- canRedactOwnResult = { Result.success(true) },\n- canRedactOtherResult = { Result.success(true) },\n- canUserPinUnpinResult = { Result.success(true) },\n- ).apply {\n- givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))\n- },\n+ canRedactOwnResult = { Result.success(true) },\n+ canRedactOtherResult = { Result.success(true) },\n+ canUserPinUnpinResult = { Result.success(true) },\n+ ).apply {\n+ givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))\n+ },\n createTimelineResult = { Result.failure(RuntimeException()) },\n )\n- val presenter = createPinnedMessagesListPresenter(room = room, isFeatureEnabled = true)\n+ val presenter = createPinnedMessagesListPresenter(room = room)\n presenter.test {\n skipItems(3)\n val failureState = awaitItem()\n@@ -111,15 +92,15 @@ class PinnedMessagesListPresenterTest {\n fun `present - empty state`() = runTest {\n val room = FakeJoinedRoom(\n baseRoom = FakeBaseRoom(\n- canRedactOwnResult = { Result.success(true) },\n- canRedactOtherResult = { Result.success(true) },\n- canUserPinUnpinResult = { Result.success(true) },\n- ).apply {\n- givenRoomInfo(aRoomInfo(pinnedEventIds = listOf()))\n- },\n+ canRedactOwnResult = { Result.success(true) },\n+ canRedactOtherResult = { Result.success(true) },\n+ canUserPinUnpinResult = { Result.success(true) },\n+ ).apply {\n+ givenRoomInfo(aRoomInfo(pinnedEventIds = listOf()))\n+ },\n createTimelineResult = { Result.success(FakeTimeline()) },\n )\n- val presenter = createPinnedMessagesListPresenter(room = room, isFeatureEnabled = true)\n+ val presenter = createPinnedMessagesListPresenter(room = room)\n presenter.test {\n skipItems(3)\n val emptyState = awaitItem()\n@@ -133,15 +114,15 @@ class PinnedMessagesListPresenterTest {\n val pinnedEventsTimeline = createPinnedMessagesTimeline()\n val room = FakeJoinedRoom(\n baseRoom = FakeBaseRoom(\n- canRedactOwnResult = { Result.success(true) },\n- canRedactOtherResult = { Result.success(true) },\n- canUserPinUnpinResult = { Result.success(true) },\n- ).apply {\n- givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))\n- },\n+ canRedactOwnResult = { Result.success(true) },\n+ canRedactOtherResult = { Result.success(true) },\n+ canUserPinUnpinResult = { Result.success(true) },\n+ ).apply {\n+ givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))\n+ },\n createTimelineResult = { Result.success(pinnedEventsTimeline) },\n )\n- val presenter = createPinnedMessagesListPresenter(room = room, isFeatureEnabled = true)\n+ val presenter = createPinnedMessagesListPresenter(room = room)\n presenter.test {\n skipItems(3)\n val filledState = awaitItem() as PinnedMessagesListState.Filled\n@@ -162,15 +143,15 @@ class PinnedMessagesListPresenterTest {\n val analyticsService = FakeAnalyticsService()\n val room = FakeJoinedRoom(\n baseRoom = FakeBaseRoom(\n- canRedactOwnResult = { Result.success(true) },\n- canRedactOtherResult = { Result.success(true) },\n- canUserPinUnpinResult = { Result.success(true) },\n- ).apply {\n- givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))\n- },\n+ canRedactOwnResult = { Result.success(true) },\n+ canRedactOtherResult = { Result.success(true) },\n+ canUserPinUnpinResult = { Result.success(true) },\n+ ).apply {\n+ givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))\n+ },\n createTimelineResult = { Result.success(pinnedEventsTimeline) },\n )\n- val presenter = createPinnedMessagesListPresenter(room = room, isFeatureEnabled = true, analyticsService = analyticsService)\n+ val presenter = createPinnedMessagesListPresenter(room = room, analyticsService = analyticsService)\n presenter.test {\n skipItems(3)\n val filledState = awaitItem() as PinnedMessagesListState.Filled\n@@ -210,15 +191,15 @@ class PinnedMessagesListPresenterTest {\n val pinnedEventsTimeline = createPinnedMessagesTimeline()\n val room = FakeJoinedRoom(\n baseRoom = FakeBaseRoom(\n- canRedactOwnResult = { Result.success(true) },\n- canRedactOtherResult = { Result.success(true) },\n- canUserPinUnpinResult = { Result.success(true) },\n- ).apply {\n- givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))\n- },\n+ canRedactOwnResult = { Result.success(true) },\n+ canRedactOtherResult = { Result.success(true) },\n+ canUserPinUnpinResult = { Result.success(true) },\n+ ).apply {\n+ givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))\n+ },\n createTimelineResult = { Result.success(pinnedEventsTimeline) },\n )\n- val presenter = createPinnedMessagesListPresenter(room = room, navigator = navigator, isFeatureEnabled = true)\n+ val presenter = createPinnedMessagesListPresenter(room = room, navigator = navigator)\n presenter.test {\n skipItems(3)\n val filledState = awaitItem() as PinnedMessagesListState.Filled\n@@ -241,15 +222,15 @@ class PinnedMessagesListPresenterTest {\n val pinnedEventsTimeline = createPinnedMessagesTimeline()\n val room = FakeJoinedRoom(\n baseRoom = FakeBaseRoom(\n- canRedactOwnResult = { Result.success(true) },\n- canRedactOtherResult = { Result.success(true) },\n- canUserPinUnpinResult = { Result.success(true) },\n- ).apply {\n- givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))\n- },\n+ canRedactOwnResult = { Result.success(true) },\n+ canRedactOtherResult = { Result.success(true) },\n+ canUserPinUnpinResult = { Result.success(true) },\n+ ).apply {\n+ givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))\n+ },\n createTimelineResult = { Result.success(pinnedEventsTimeline) },\n )\n- val presenter = createPinnedMessagesListPresenter(room = room, navigator = navigator, isFeatureEnabled = true)\n+ val presenter = createPinnedMessagesListPresenter(room = room, navigator = navigator)\n presenter.test {\n skipItems(3)\n val filledState = awaitItem() as PinnedMessagesListState.Filled\n@@ -272,15 +253,15 @@ class PinnedMessagesListPresenterTest {\n val pinnedEventsTimeline = createPinnedMessagesTimeline()\n val room = FakeJoinedRoom(\n baseRoom = FakeBaseRoom(\n- canRedactOwnResult = { Result.success(true) },\n- canRedactOtherResult = { Result.success(true) },\n- canUserPinUnpinResult = { Result.success(true) },\n- ).apply {\n- givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))\n- },\n+ canRedactOwnResult = { Result.success(true) },\n+ canRedactOtherResult = { Result.success(true) },\n+ canUserPinUnpinResult = { Result.success(true) },\n+ ).apply {\n+ givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))\n+ },\n createTimelineResult = { Result.success(pinnedEventsTimeline) },\n )\n- val presenter = createPinnedMessagesListPresenter(room = room, navigator = navigator, isFeatureEnabled = true)\n+ val presenter = createPinnedMessagesListPresenter(room = room, navigator = navigator)\n presenter.test {\n skipItems(3)\n val filledState = awaitItem() as PinnedMessagesListState.Filled\n@@ -315,15 +296,11 @@ class PinnedMessagesListPresenterTest {\n navigator: PinnedMessagesListNavigator = FakePinnedMessagesListNavigator(),\n room: JoinedRoom = FakeJoinedRoom(),\n syncService: SyncService = FakeSyncService(),\n- isFeatureEnabled: Boolean = true,\n analyticsService: AnalyticsService = FakeAnalyticsService(),\n ): PinnedMessagesListPresenter {\n val timelineProvider = PinnedEventsTimelineProvider(\n room = room,\n syncService = syncService,\n- featureFlagService = FakeFeatureFlagService(\n- initialState = mapOf(FeatureFlags.PinnedEvents.key to isFeatureEnabled)\n- ),\n dispatchers = testCoroutineDispatchers(),\n )\n timelineProvider.launchIn(backgroundScope)\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt\nindex 9aaa49f4caf..10efc72e71f 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt\n@@ -32,9 +32,6 @@ import io.element.android.features.messages.impl.utils.FakeTextPillificationHelp\n import io.element.android.features.messages.test.timeline.FakeHtmlConverterProvider\n import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter\n import io.element.android.libraries.core.mimetype.MimeTypes\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.api.FeatureFlags\n-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.matrix.api.media.AudioDetails\n import io.element.android.libraries.matrix.api.media.AudioInfo\n import io.element.android.libraries.matrix.api.media.FileInfo\n@@ -430,35 +427,6 @@ class TimelineItemContentMessageFactoryTest {\n assertThat(result).isEqualTo(expected)\n }\n \n- @Test\n- fun `test create VoiceMessageType feature disabled`() = runTest {\n- val sut = createTimelineItemContentMessageFactory(\n- featureFlagService = FakeFeatureFlagService(\n- initialState = mapOf(\n- FeatureFlags.VoiceMessages.key to false,\n- )\n- )\n- )\n- val result = sut.create(\n- content = createMessageContent(type = VoiceMessageType(\"filename\", null, null, MediaSource(\"url\"), null, null)),\n- senderDisambiguatedDisplayName = \"Bob\",\n- eventId = AN_EVENT_ID,\n- )\n- val expected = TimelineItemAudioContent(\n- filename = \"filename\",\n- fileSize = 0L,\n- caption = null,\n- formattedCaption = null,\n- isEdited = false,\n- duration = Duration.ZERO,\n- mediaSource = MediaSource(url = \"url\", json = null),\n- mimeType = MimeTypes.OctetStream,\n- formattedFileSize = \"0 Bytes\",\n- fileExtension = \"\"\n- )\n- assertThat(result).isEqualTo(expected)\n- }\n-\n @Test\n fun `test create ImageMessageType`() = runTest {\n val sut = createTimelineItemContentMessageFactory()\n@@ -794,13 +762,11 @@ class TimelineItemContentMessageFactoryTest {\n }\n \n private fun createTimelineItemContentMessageFactory(\n- featureFlagService: FeatureFlagService = FakeFeatureFlagService(),\n htmlConverterTransform: (String) -> CharSequence = { it },\n permalinkParser: FakePermalinkParser = FakePermalinkParser(),\n ) = TimelineItemContentMessageFactory(\n fileSizeFormatter = FakeFileSizeFormatter(),\n fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),\n- featureFlagService = featureFlagService,\n htmlConverterProvider = FakeHtmlConverterProvider(htmlConverterTransform),\n permalinkParser = permalinkParser,\n textPillificationHelper = FakeTextPillificationHelper(),\ndiff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt\nindex a65e61661ec..42fee711a77 100644\n--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt\n+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt\n@@ -16,7 +16,6 @@ import io.element.android.features.preferences.impl.utils.ShowDeveloperSettingsP\n import io.element.android.features.rageshake.api.RageshakeFeatureAvailability\n import io.element.android.libraries.core.meta.BuildType\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.indicator.api.IndicatorService\n import io.element.android.libraries.indicator.test.FakeIndicatorService\n import io.element.android.libraries.matrix.api.oidc.AccountManagementAction\n@@ -77,8 +76,6 @@ class PreferencesRootPresenterTest {\n assertThat(loadedState.devicesManagementUrl).isNull()\n assertThat(loadedState.showAnalyticsSettings).isFalse()\n assertThat(loadedState.showDeveloperSettings).isTrue()\n- assertThat(loadedState.showLockScreenSettings).isTrue()\n- assertThat(loadedState.showNotificationSettings).isTrue()\n assertThat(loadedState.canDeactivateAccount).isTrue()\n assertThat(loadedState.canReportBug).isTrue()\n assertThat(loadedState.directLogoutState).isEqualTo(aDirectLogoutState())\n@@ -194,7 +191,6 @@ class PreferencesRootPresenterTest {\n analyticsService = FakeAnalyticsService(),\n versionFormatter = FakeVersionFormatter(),\n snackbarDispatcher = SnackbarDispatcher(),\n- featureFlagService = FakeFeatureFlagService(),\n indicatorService = indicatorService,\n directLogoutPresenter = { aDirectLogoutState() },\n showDeveloperSettingsProvider = showDeveloperSettingsProvider,\ndiff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenterTest.kt\nindex 7dd954011e8..bfcfa184cbb 100644\n--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenterTest.kt\n+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenterTest.kt\n@@ -79,11 +79,9 @@ class RoomDetailsPresenterTest {\n analyticsService: AnalyticsService = FakeAnalyticsService(),\n featureFlagService: FeatureFlagService = FakeFeatureFlagService(\n mapOf(\n- FeatureFlags.NotificationSettings.key to true,\n FeatureFlags.Knock.key to false,\n )\n ),\n- isPinnedMessagesFeatureEnabled: Boolean = true,\n encryptionService: FakeEncryptionService = FakeEncryptionService(),\n clipboardHelper: ClipboardHelper = FakeClipboardHelper(),\n appPreferencesStore: AppPreferencesStore = InMemoryAppPreferencesStore()\n@@ -111,7 +109,6 @@ class RoomDetailsPresenterTest {\n leaveRoomPresenter = { leaveRoomState },\n roomCallStatePresenter = { aStandByCallState() },\n dispatchers = dispatchers,\n- isPinnedMessagesFeatureEnabled = { isPinnedMessagesFeatureEnabled },\n analyticsService = analyticsService,\n clipboardHelper = clipboardHelper,\n appPreferencesStore = appPreferencesStore,\n@@ -133,7 +130,6 @@ class RoomDetailsPresenterTest {\n assertThat(initialState.roomAvatarUrl).isEqualTo(room.info().avatarUrl)\n assertThat(initialState.roomTopic).isEqualTo(RoomTopicState.ExistingTopic(room.info().topic!!))\n assertThat(initialState.memberCount).isEqualTo(room.info().joinedMembersCount)\n- assertThat(initialState.canShowPinnedMessages).isTrue()\n assertThat(initialState.pinnedMessagesCount).isEqualTo(0)\n assertThat(initialState.canShowSecurityAndPrivacy).isFalse()\n assertThat(initialState.showDebugInfo).isFalse()\ndiff --git a/features/share/test/build.gradle.kts b/features/share/test/build.gradle.kts\ndeleted file mode 100644\nindex 871e856adbb..00000000000\n--- a/features/share/test/build.gradle.kts\n+++ /dev/null\n@@ -1,19 +0,0 @@\n-/*\n- * Copyright 2024 New Vector Ltd.\n- *\n- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n- * Please see LICENSE files in the repository root for full details.\n- */\n-plugins {\n- id(\"io.element.android-library\")\n-}\n-\n-android {\n- namespace = \"io.element.android.features.share.test\"\n-}\n-\n-dependencies {\n- implementation(projects.features.share.api)\n- implementation(libs.coroutines.core)\n- implementation(projects.tests.testutils)\n-}\ndiff --git a/features/share/test/src/main/kotlin/io/element/android/features/share/test/FakeShareService.kt b/features/share/test/src/main/kotlin/io/element/android/features/share/test/FakeShareService.kt\ndeleted file mode 100644\nindex b5b6111004a..00000000000\n--- a/features/share/test/src/main/kotlin/io/element/android/features/share/test/FakeShareService.kt\n+++ /dev/null\n@@ -1,20 +0,0 @@\n-/*\n- * Copyright 2024 New Vector Ltd.\n- *\n- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n- * Please see LICENSE files in the repository root for full details.\n- */\n-\n-package io.element.android.features.share.test\n-\n-import io.element.android.features.share.api.ShareService\n-import io.element.android.tests.testutils.lambda.lambdaError\n-import kotlinx.coroutines.CoroutineScope\n-\n-class FakeShareService(\n- private val observeFeatureFlagLambda: (CoroutineScope) -> Unit = { lambdaError() }\n-) : ShareService {\n- override fun observeFeatureFlag(coroutineScope: CoroutineScope) {\n- observeFeatureFlagLambda(coroutineScope)\n- }\n-}\ndiff --git a/libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeatureFlagServiceTest.kt b/libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeatureFlagServiceTest.kt\nindex 9794fdd6d49..097e3186097 100644\n--- a/libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeatureFlagServiceTest.kt\n+++ b/libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeatureFlagServiceTest.kt\n@@ -19,8 +19,8 @@ class DefaultFeatureFlagServiceTest {\n fun `given service without provider when feature is checked then it returns the default value`() = runTest {\n val buildMeta = aBuildMeta()\n val featureFlagService = DefaultFeatureFlagService(emptySet(), buildMeta)\n- featureFlagService.isFeatureEnabledFlow(FeatureFlags.LocationSharing).test {\n- assertThat(awaitItem()).isEqualTo(FeatureFlags.LocationSharing.defaultValue(buildMeta))\n+ featureFlagService.isFeatureEnabledFlow(FeatureFlags.Space).test {\n+ assertThat(awaitItem()).isEqualTo(FeatureFlags.Space.defaultValue(buildMeta))\n cancelAndIgnoreRemainingEvents()\n }\n }\n@@ -28,7 +28,7 @@ class DefaultFeatureFlagServiceTest {\n @Test\n fun `given service without provider when set enabled feature is called then it returns false`() = runTest {\n val featureFlagService = DefaultFeatureFlagService(emptySet(), aBuildMeta())\n- val result = featureFlagService.setFeatureEnabled(FeatureFlags.LocationSharing, true)\n+ val result = featureFlagService.setFeatureEnabled(FeatureFlags.Space, true)\n assertThat(result).isFalse()\n }\n \n@@ -37,7 +37,7 @@ class DefaultFeatureFlagServiceTest {\n val buildMeta = aBuildMeta()\n val featureFlagProvider = FakeMutableFeatureFlagProvider(0, buildMeta)\n val featureFlagService = DefaultFeatureFlagService(setOf(featureFlagProvider), buildMeta)\n- val result = featureFlagService.setFeatureEnabled(FeatureFlags.LocationSharing, true)\n+ val result = featureFlagService.setFeatureEnabled(FeatureFlags.Space, true)\n assertThat(result).isTrue()\n }\n \n@@ -46,10 +46,10 @@ class DefaultFeatureFlagServiceTest {\n val buildMeta = aBuildMeta()\n val featureFlagProvider = FakeMutableFeatureFlagProvider(0, buildMeta)\n val featureFlagService = DefaultFeatureFlagService(setOf(featureFlagProvider), buildMeta)\n- featureFlagService.setFeatureEnabled(FeatureFlags.LocationSharing, true)\n- featureFlagService.isFeatureEnabledFlow(FeatureFlags.LocationSharing).test {\n+ featureFlagService.setFeatureEnabled(FeatureFlags.Space, true)\n+ featureFlagService.isFeatureEnabledFlow(FeatureFlags.Space).test {\n assertThat(awaitItem()).isTrue()\n- featureFlagService.setFeatureEnabled(FeatureFlags.LocationSharing, false)\n+ featureFlagService.setFeatureEnabled(FeatureFlags.Space, false)\n assertThat(awaitItem()).isFalse()\n }\n }\n@@ -60,9 +60,9 @@ class DefaultFeatureFlagServiceTest {\n val lowPriorityFeatureFlagProvider = FakeMutableFeatureFlagProvider(LOW_PRIORITY, buildMeta)\n val highPriorityFeatureFlagProvider = FakeMutableFeatureFlagProvider(HIGH_PRIORITY, buildMeta)\n val featureFlagService = DefaultFeatureFlagService(setOf(lowPriorityFeatureFlagProvider, highPriorityFeatureFlagProvider), buildMeta)\n- lowPriorityFeatureFlagProvider.setFeatureEnabled(FeatureFlags.LocationSharing, false)\n- highPriorityFeatureFlagProvider.setFeatureEnabled(FeatureFlags.LocationSharing, true)\n- featureFlagService.isFeatureEnabledFlow(FeatureFlags.LocationSharing).test {\n+ lowPriorityFeatureFlagProvider.setFeatureEnabled(FeatureFlags.Space, false)\n+ highPriorityFeatureFlagProvider.setFeatureEnabled(FeatureFlags.Space, true)\n+ featureFlagService.isFeatureEnabledFlow(FeatureFlags.Space).test {\n assertThat(awaitItem()).isTrue()\n }\n }\ndiff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientTest.kt\nindex 91d0f06d1ca..cb316452c5c 100644\n--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientTest.kt\n+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientTest.kt\n@@ -8,7 +8,6 @@\n package io.element.android.libraries.matrix.impl\n \n import com.google.common.truth.Truth.assertThat\n-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiClient\n import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiSyncService\n import io.element.android.libraries.matrix.impl.room.FakeTimelineEventTypeFilterFactory\n@@ -67,6 +66,5 @@ class RustMatrixClientTest {\n baseCacheDirectory = File(\"\"),\n clock = FakeSystemClock(),\n timelineEventTypeFilterFactory = FakeTimelineEventTypeFilterFactory(),\n- featureFlagService = FakeFeatureFlagService(),\n )\n }\ndiff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimelineTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimelineTest.kt\nindex 3fea130ecee..2819dd6ac74 100644\n--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimelineTest.kt\n+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimelineTest.kt\n@@ -10,8 +10,6 @@ package io.element.android.libraries.matrix.impl.timeline\n \n import app.cash.turbine.test\n import com.google.common.truth.Truth.assertThat\n-import io.element.android.libraries.featureflag.api.FeatureFlagService\n-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.matrix.api.room.JoinedRoom\n import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem\n import io.element.android.libraries.matrix.api.timeline.Timeline\n@@ -98,7 +96,6 @@ private fun TestScope.createRustTimeline(\n coroutineScope: CoroutineScope = backgroundScope,\n dispatcher: CoroutineDispatcher = testCoroutineDispatchers().io,\n roomContentForwarder: RoomContentForwarder = RoomContentForwarder(FakeFfiRoomListService()),\n- featureFlagsService: FeatureFlagService = FakeFeatureFlagService(),\n onNewSyncedEvent: () -> Unit = {},\n ): RustTimeline {\n return RustTimeline(\n@@ -109,7 +106,6 @@ private fun TestScope.createRustTimeline(\n coroutineScope = coroutineScope,\n dispatcher = dispatcher,\n roomContentForwarder = roomContentForwarder,\n- featureFlagsService = featureFlagsService,\n onNewSyncedEvent = onNewSyncedEvent,\n )\n }\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_10_en.png\ndeleted file mode 100644\nindex 23c8cbc45b1..00000000000\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_10_en.png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:dbeb0287f75afc662c28cca13fe39f9d24e67ee5b507cf976324d5d9dd4c381b\n-size 83505\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_6_en.png\nindex 78b7a336068..8b48d015f0c 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_6_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_6_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:ba8fe03e073a2279c68c49c25388568182ddb1da1e20d7df1ce72d150df51d86\n-size 395881\n+oid sha256:b8119afe2e6a12bd41f8e838461c9e3f311ed0b5e5ce3c524a70226feb120996\n+size 72836\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_7_en.png\nindex 8cb4e5d4f98..fefd103edb7 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_7_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_7_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:400426592b0020e5de30899574ce0abb70cebccbcff10c43728ee6dae4a421f3\n-size 400259\n+oid sha256:8e0cf2a3fc5f92c5b7e8caff9e60ad9495ba1703dbb160aa64f9fd0a1bd4822f\n+size 406105\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_8_en.png\nindex 8b48d015f0c..23c8cbc45b1 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_8_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_8_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:b8119afe2e6a12bd41f8e838461c9e3f311ed0b5e5ce3c524a70226feb120996\n-size 72836\n+oid sha256:dbeb0287f75afc662c28cca13fe39f9d24e67ee5b507cf976324d5d9dd4c381b\n+size 83505\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_9_en.png\ndeleted file mode 100644\nindex fefd103edb7..00000000000\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_9_en.png\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-version https://git-lfs.github.com/spec/v1\n-oid sha256:8e0cf2a3fc5f92c5b7e8caff9e60ad9495ba1703dbb160aa64f9fd0a1bd4822f\n-size 406105\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerAddCaption_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerAddCaption_Day_0_en.png\nindex 1d53e616bf3..619f22f3604 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerAddCaption_Day_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerAddCaption_Day_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:55a3aa36196ff755f207e47abb3060a4727a6baa79fe02ce5f5a62d3648619b5\n-size 53661\n+oid sha256:4d33345e7d8cb2a55e6d291ae9dcabe66c8ec1ea4124ebc32b679566e585ca0e\n+size 54020\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerAddCaption_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerAddCaption_Night_0_en.png\nindex 6ec843bdffa..e2ef3acc251 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerAddCaption_Night_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerAddCaption_Night_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:2c8cd2e6427bc0ffacca88900511cb3761e7bf57fcafb3dbc9ec7f519ec8349d\n-size 51678\n+oid sha256:a6af3cf20ad9b57abbe61107f758c143a676dec960fdf583b517d18e404411a3\n+size 51953\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerCaption_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerCaption_Day_0_en.png\nindex 8f01f227dd5..5a1a036cf94 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerCaption_Day_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerCaption_Day_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:9d9c7a841dbe183f84c8527a8745d30aaeee6d7b4aa8a472794b7b4d739b21cd\n-size 47268\n+oid sha256:936a9e86eddcb00e20de8af1fe60ae2153c3dfa384f8070466026969a34eb057\n+size 45074\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerCaption_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerCaption_Night_0_en.png\nindex 4bb783fb040..718abc20fdb 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerCaption_Night_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerCaption_Night_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:e8275ab2ec26aed30fc162be1d5b49d6b9e9d73c303b00220ac91306dd04280e\n-size 45645\n+oid sha256:dee196ccc9872a15897426f2581c178ff92a393136aefc5f7342ba1984d8e418\n+size 43492\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditCaption_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditCaption_Day_0_en.png\nindex 8d4fe5ebfd3..dae95c00b88 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditCaption_Day_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditCaption_Day_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:59d57f02efee0ab0f413e3d14d22d069862143e9d6d69fb29fa6972348356016\n-size 52332\n+oid sha256:dea3e3f516afb98543f458e0db6472a7157428e25d8170bee6abbc505ece7bd7\n+size 52677\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditCaption_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditCaption_Night_0_en.png\nindex a2ac20fad57..cc6c7917b2e 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditCaption_Night_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditCaption_Night_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:ae8804def7f6922e29ee4564f96d490d233909d6383dc5b92ed091d239ffb609\n-size 50797\n+oid sha256:8ff7e86b3aefc4092514c0312a91747ac0a8a3f90234ca9774cd52ab90eeab17\n+size 51072\n", "n2p_tests": "{\"io.element.android.features.messages.impl.pinned.list.PinnedMessagesListPresenterTest.present - initial state\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - dismissing the progress dialog stops media upload\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send media failure scenario\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{\"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - initial state is updated with a new roomInfo\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - room with successor room includes successor info in state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to an image media message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.featureflag.impl.DefaultFeatureFlagServiceTest.given service with a runtime provider and feature enabled when feature is checked then it returns the correct value\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.login.impl.screens.onboarding.OnBoardingPresenterTest.present - ensure initial conditions\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create TextMessageType with HTML formatted body\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.pinned.list.PinnedMessagesListPresenterTest.present - filled state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - check that the room's unread flag is removed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - leave room event is passed on to leave room presenter\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - when room is encrypted and a DM, the DM user's identity state is fetched onResume\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.login.impl.screens.onboarding.OnBoardingPresenterTest.present - default account provider - login and clear error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action copy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action pin\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - toggle fullscreen\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action edit\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when memberlist is error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - room member mention suggestions\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - send message with rich text enabled\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.pinned.list.PinnedMessagesListPresenterTest.present - show view source action\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle dismiss action\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create EmoteMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Record video with permission request\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.featureflag.impl.DefaultFeatureFlagServiceTest.given service with a runtime provider when set enabled feature is called then it returns true\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - initial state when user can edit attributes in a DM\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.pinned.list.PinnedMessagesListPresenterTest.present - timeline failure state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.pinned.banner.PinnedMessagesBannerPresenterTest.present - timeline failed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.pinned.list.PinnedMessagesListPresenterTest.present - empty state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - change message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Pick file from storage will open the preview\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - when save draft event is invoked and composer is not empty then service is called\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message when user can't pin\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.root.PreferencesRootPresenterTest.present - initial state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create ImageMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.home.impl.roomlist.RoomListPresenterTest.present - when room service returns no room, then contentState is Empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action report content\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.a message with plain URL in a formatted body Spanned format gets linkified too\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - change mode to edit\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - shows prompt to reinvite users in DM\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.pinned.list.PinnedMessagesListPresenterTest.present - unpin event\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action remove caption\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.appnav.RootPresenterTest.present - initial state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message and can redact\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message and cannot send reaction\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.login.impl.screens.onboarding.OnBoardingPresenterTest.present - clicking on version 7 times will reveal the report a problem button\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.login.impl.screens.onboarding.OnBoardingPresenterTest.present - initial state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action add caption\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - topic state is 'can add topic' when no topic and user has permission\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle toggling a reaction\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - initial state when user can edit all attributes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - initial state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - initial state with no room name\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - show knock requests\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.root.PreferencesRootPresenterTest.present - developer settings can be enabled in release builds\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.pinned.banner.PinnedMessagesBannerPresenterTest.present - loaded state - multiple pinned messages\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute not sent message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.location.impl.common.actions.AndroidLocationActionsTest.buildUrl - appends label if set\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create TextMessageType with unknown formatted body does nothing\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create LocationMessageType not null\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action view in timeline, it should have no effect\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.login.impl.screens.onboarding.OnBoardingPresenterTest.present - opening the app using link with not allowed account provider, and the app does not force account provider\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.home.impl.roomlist.RoomListPresenterTest.present - toggle search menu\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.root.PreferencesRootPresenterTest.present - secure backup badge\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - permission to post\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - room member mention suggestions in a DM\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - change mode to reply\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.a message with existing URLSpans keeps it after linkification\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - permission to redact own\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.home.impl.roomlist.RoomListPresenterTest.present - leave room calls into leave room presenter\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - mute room notifications\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to a file media message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.home.impl.roomlist.RoomListPresenterTest.present - UpdateVisibleRange will cancel the previous subscription if called too soon\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action end poll\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.pinned.banner.PinnedMessagesBannerPresenterTest.present - initial state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action edit caption\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - reply message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - initial state with DM member sets custom DM roomType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send media with pre-processing failure after user sends media\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.pinned.list.PinnedMessagesListPresenterTest.present - navigate to event\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for non-editable poll message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - initial state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a media with caption item\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create EmoteMessageType with HTML formatted body\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - file too large will display error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - errors are tracked\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a state item in non-debuggable build\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.login.impl.screens.onboarding.OnBoardingPresenterTest.present - clicking on version 7 times has no effect if rageshake not available\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action copy link\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.featureflag.impl.DefaultFeatureFlagServiceTest.given service with 2 runtime providers when feature is checked then it uses the priority correctly\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - video size estimations too large will display error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message cannot sent message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.home.impl.roomlist.RoomListPresenterTest.present - show context menu with view source on\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create FileMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.home.impl.roomlist.RoomListPresenterTest.present - when set is favorite event is emitted, then the action is called\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create NoticeMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create TextMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for verified user send failure\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.location.impl.common.actions.AndroidLocationActionsTest.buildUrl - URL encodes label\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action forward\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - changes in room info updates the is favorite flag\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.home.impl.roomlist.RoomListPresenterTest.present - handle DismissRequestVerificationPrompt\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action unpin\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for editable poll message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - handle typing notice event\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.pinned.banner.PinnedMessagesBannerPresenterTest.present - loading state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create NoticeMessageType with HTML formatted body\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - initial state when user can not invite others to room\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.a message with plain URL in a formatted body with plain text format gets linkified too\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - edit sent message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message in a thread\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.root.PreferencesRootPresenterTest.present - cannot report bug\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - change mode to edit caption and send the caption\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.appnav.RootPresenterTest.present - passes app error state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.timeline.RustTimelineTest.ensure that the timeline emits new loading item when pagination does not bring new events\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.RustMatrixClientTest.ensure that sessionId and deviceId can be retrieved from the client\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.root.PreferencesRootPresenterTest.present - developer settings is hidden by default in release builds\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.home.impl.roomlist.RoomListPresenterTest.present - handle DismissRecoveryKeyPrompt\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - when there is no draft, nothing is restored\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - handle typing notice event when sending typing notice is disabled\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.home.impl.roomlist.RoomListPresenterTest.present - hide context menu\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - when there is a draft for edit, it is restored\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - cancel reply\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.home.impl.roomlist.RoomListPresenterTest.present - check that the room is marked as read with correct RR and as unread\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.root.PreferencesRootPresenterTest.present - can deactivate account is false if the Matrix client say so\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create StickerMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle toggling a reaction twice\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when memberlist is ready\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action redact\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - send message with plain text enabled\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create VideoMessageType with info\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create AudioMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for my message cannot redact\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - initial state when user can invite others to room\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to a poll\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send image with caption success scenario\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for ended poll message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - when there is a draft for reply, it is restored\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - ToggleTextFormatting toggles text formatting\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Dismiss attachments menu\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Take photo\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when memberlist is not ready\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a media with caption item - other user event\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create LocationMessageType null\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message in non-debuggable build\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Open attachments menu\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send media before pre-processing success scenario\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for my message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.home.impl.roomlist.RoomListPresenterTest.present - change in notification settings updates the summary for decorations\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - initial state when canInvite errors\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action edit poll\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create VoiceMessageType with info\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create TextMessageType with simple link\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when inviting fails\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - change mode to edit caption\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - share location\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - permission to redact other\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a state item in debug build\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Pick image from gallery\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - show debug info\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.home.impl.roomlist.RoomListPresenterTest.present - when a room is invited then accept and decline events are sent to acceptDeclinePresenter\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create VideoMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for message from others redacted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Pick media from gallery & cancel does nothing\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - initial state when user can edit no attributes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - no permission to post\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create FileMessageType with info\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send media success scenario\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.location.impl.common.actions.AndroidLocationActionsTest.buildUrl - truncates excessive decimals to 6dp\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - cancel scenario\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Record video\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - room without successor room has null successor info in state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for call notify\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.home.impl.roomlist.RoomListPresenterTest.present - show context menu\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - edit not sent message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send media with pre-processing failure before user sends media\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - create poll\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - doesn't show reinvite prompt if other party is present\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - edit sent message event not found\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.login.impl.screens.onboarding.OnBoardingPresenterTest.present - opening the app using link, and the app forces account provider\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create ImageMessageType with info\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - doesn't show reinvite prompt in non-direct room\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - when save draft event is invoked and composer is empty then service is called with null draft\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Take photo with permission request\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - initial state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create AudioMessageType with info\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - when there is a draft for new message with rich text, it is restored\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - initial state when user can edit one attribute\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message when event is already pinned\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.featureflag.impl.DefaultFeatureFlagServiceTest.given service without provider when feature is checked then it returns the default value\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.pinned.list.PinnedMessagesListPresenterTest.present - forward event\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.home.impl.roomlist.RoomListPresenterTest.present - load 1 room with success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - notification mode changes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.location.impl.common.actions.AndroidLocationActionsTest.buildUrl - URL encodes coordinates in locale with comma decimal separator\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create OtherMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - initial state when in a DM with no topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - change mode to reply after edit\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send media after pre-processing success scenario\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - when set is favorite event is emitted, then the action is called\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for voice message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - when there is a draft for new message with plain text, it is restored\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for message from me redacted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.featureflag.impl.DefaultFeatureFlagServiceTest.given service without provider when set enabled feature is called then it returns false\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to an event with no id does nothing\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - send messages with intentional mentions\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for my message in a thread\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to a video media message\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - unmute room notifications\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.login.impl.screens.onboarding.OnBoardingPresenterTest.present - opening the app using link with allowed account provider, and the app does not force account provider\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - send uri\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - initial state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for my message no permission\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a media item\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message with no actions\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - initial state is created from initial room info\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - show security and privacy\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenterTest.present - Pick video from gallery\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action show developer info\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send video with caption success scenario\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomdetails.impl.RoomDetailsPresenterTest.present - topic state is hidden when no topic and user has no permission\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create VoiceMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.matrix.impl.RustMatrixClientTest.clear cache invokes the method clearCaches from the client and close it\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send audio with caption success scenario\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.home.impl.roomlist.RoomListPresenterTest.present - UpdateVisibleRange subscribes to rooms in visible range\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.pinned.banner.PinnedMessagesBannerPresenterTest.present - loaded state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-4845", "org": "element-hq", "repo": "element-x-android", "number": 4845, "state": "closed", "title": "Add a banner to ask the user to disable battery optimization when Event cannot be resolved from Push", "body": "\r\n \r\n## Content\r\n\r\n\r\nWhen an Event cannot be resolved from Push, let the application render a banner in the room list to propose the user to disable battery optimization.\r\n\r\nWhen battery optimization is disabled, it should help to resolve more events when a Push is received. The cost is a higher battery consumption. User always has the ability to revert the change by navigating to the system settings.\r\n\r\nDraft as we're waiting for product decision and the wording of the banner may be updated (and must be added to Localazy).\r\n\r\n## Motivation and context\r\n\r\n\r\nImprove Notification resolution and limit the risk of not shown notification because not resolve. In a separate PR we will ensure that a notification is always displayed when a not resolved Push is happening.\r\n\r\nCloses #4611\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\n\r\nhttps://github.com/user-attachments/assets/5bed12ad-fdce-41db-9942-cf50d435a5a8\r\n\r\nhttps://github.com/user-attachments/assets/3ddf267b-3ef2-4061-8aa2-90b2f4e71251\r\n\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Have an unresolved event\r\n- Open the app\r\n- See the banner\r\n- Option 1: Close the banner: it should not be displayed again. From the application, clear the cache to be able to test it again\r\n- Option 2: click on \"Yes, disable\"\r\n- A system dialog is displayed (can depend on OS / device)\r\n- Option 1: click on \"Deny\"\r\n- The system dialog is gone and the banner is gone until the application is started again\r\n- Option 2: click on \"Accept\"\r\n- The system dialog is gone and the banner is gone until the battery optimization setting remains unchanged.\r\n\r\n## Tested devices\r\n\r\n- [x] Physical\r\n- [ ] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 24\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"fd8fce04c44ea113e9c3ea8d306909a3e107eee0\"}", "resolved_issues": "[{\"number\": 4611, \"title\": \"Add check/info to disable battery optimization to F-Droid-build's notification settings/troubleshooter\", \"body\": \"### Your use case\\n\\n#### What would you like to do?\\n\\nHave a reminder or test if battery optimization is set to \\\"unrestricted\\\" in Element X F-Droid build's notification settings/troubleshooter.\\n\\n#### Why would you like to do it?\\n\\nRecently, I installed Element X to 2 de-Googled phones, set up unified push using Nextcloud/NextPush and then ntfy, but in both cases notifications worked fine when the phones were unlocked (awake) but kept failing after they were locked for a few minutes. \\n(Failing in a sense that they never arrived, were simply skipped/lost).\\n\\nInitially I kept checking all the battery optimizations and tweaks of NextPush and ntfy, without success. \\nThen I realized that maybe also Element needs to be unrestricted. \\nAnd this fixed the issue.\\n\\n#### How would you like to achieve it?\\n\\nIt would be handy to have hint/check about the battery optimizations also for Element in the notification settings/troubleshooter, as all the green checkmarks kinda create a false sense of \\\"here's everything alright\\\" even tho it's not \\ud83d\\ude01 \\n\\n**Thanks for a great app** \\ud83d\\ude09 \\u2764 \\n\\n![Image](https://github.com/user-attachments/assets/1be8d095-d4af-4cf5-9a17-a9bf0357ddf3)\\n\\n![Image](https://github.com/user-attachments/assets/26f5093f-befb-4c97-aa23-199f1260af1d)\\n\\n### Have you considered any alternatives?\\n\\n_No response_\\n\\n### Additional context\\n\\n_No response_\\n\\n### Are you willing to provide a PR?\\n\\nNo\"}]", "lang": "kotlin", "problem_statement": "Add check/info to disable battery optimization to F-Droid-build's notification settings/troubleshooter\n### Your use case\n\n#### What would you like to do?\n\nHave a reminder or test if battery optimization is set to \"unrestricted\" in Element X F-Droid build's notification settings/troubleshooter.\n\n#### Why would you like to do it?\n\nRecently, I installed Element X to 2 de-Googled phones, set up unified push using Nextcloud/NextPush and then ntfy, but in both cases notifications worked fine when the phones were unlocked (awake) but kept failing after they were locked for a few minutes. \n(Failing in a sense that they never arrived, were simply skipped/lost).\n\nInitially I kept checking all the battery optimizations and tweaks of NextPush and ntfy, without success. \nThen I realized that maybe also Element needs to be unrestricted. \nAnd this fixed the issue.\n\n#### How would you like to achieve it?\n\nIt would be handy to have hint/check about the battery optimizations also for Element in the notification settings/troubleshooter, as all the green checkmarks kinda create a false sense of \"here's everything alright\" even tho it's not \ud83d\ude01 \n\n**Thanks for a great app** \ud83d\ude09 \u2764 \n\n![Image](https://github.com/user-attachments/assets/1be8d095-d4af-4cf5-9a17-a9bf0357ddf3)\n\n![Image](https://github.com/user-attachments/assets/26f5093f-befb-4c97-aa23-199f1260af1d)\n\n### Have you considered any alternatives?\n\n_No response_\n\n### Additional context\n\n_No response_\n\n### Are you willing to provide a PR?\n\nNo\n", "hints": NaN, "pull_url": "https://github.com/element-hq/element-x-android/pull/4845", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/4611\"]", "test_command": "./gradlew :libraries:push:impl:testDebugUnitTest --tests \"io.element.android.libraries.push.impl.battery.AndroidBatteryOptimizationTest\" --tests \"io.element.android.libraries.push.impl.push.DefaultPushHandlerTest\" --tests \"io.element.android.libraries.push.impl.battery.BatteryOptimizationPresenterTest\" :libraries:fullscreenintent:impl:testDebugUnitTest --tests \"io.element.android.libraries.fullscreenintent.test.FullScreenIntentPermissionsPresenterTest\" :features:roomlist:impl:testDebugUnitTest --tests \"io.element.android.features.roomlist.impl.RoomListPresenterTest\"", "fix_patch": "diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt\nindex 8f2543c161f..f73fecaf3c4 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt\n@@ -38,6 +38,7 @@ import io.element.android.libraries.designsystem.theme.components.IconSource\n import io.element.android.libraries.designsystem.theme.components.ListItem\n import io.element.android.libraries.designsystem.theme.components.Text\n import io.element.android.libraries.designsystem.utils.OnLifecycleEvent\n+import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsEvents\n import io.element.android.libraries.matrix.api.room.RoomNotificationMode\n import io.element.android.libraries.ui.strings.CommonStrings\n import kotlinx.collections.immutable.toImmutableList\n@@ -149,7 +150,7 @@ private fun NotificationSettingsContentView(\n Text(stringResource(R.string.full_screen_intent_banner_message))\n },\n onClick = {\n- state.fullScreenIntentPermissionsState.openFullScreenIntentSettings()\n+ state.fullScreenIntentPermissionsState.eventSink(FullScreenIntentPermissionsEvents.OpenSettings)\n }\n )\n }\ndiff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContentStateProvider.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContentStateProvider.kt\nindex 7435424b15b..5825c0a1e5d 100644\n--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContentStateProvider.kt\n+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContentStateProvider.kt\n@@ -12,6 +12,8 @@ import io.element.android.features.roomlist.impl.model.RoomListRoomSummary\n import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState\n import io.element.android.libraries.fullscreenintent.api.aFullScreenIntentPermissionsState\n import io.element.android.libraries.matrix.api.core.RoomId\n+import io.element.android.libraries.push.api.battery.BatteryOptimizationState\n+import io.element.android.libraries.push.api.battery.aBatteryOptimizationState\n import kotlinx.collections.immutable.ImmutableList\n import kotlinx.collections.immutable.persistentListOf\n import kotlinx.collections.immutable.toPersistentSet\n@@ -31,10 +33,12 @@ internal fun aRoomsContentState(\n securityBannerState: SecurityBannerState = SecurityBannerState.None,\n summaries: ImmutableList = aRoomListRoomSummaryList(),\n fullScreenIntentPermissionsState: FullScreenIntentPermissionsState = aFullScreenIntentPermissionsState(),\n+ batteryOptimizationState: BatteryOptimizationState = aBatteryOptimizationState(),\n seenRoomInvites: Set = emptySet(),\n ) = RoomListContentState.Rooms(\n securityBannerState = securityBannerState,\n fullScreenIntentPermissionsState = fullScreenIntentPermissionsState,\n+ batteryOptimizationState = batteryOptimizationState,\n summaries = summaries,\n seenRoomInvites = seenRoomInvites.toPersistentSet(),\n )\ndiff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt\nindex 7746f982049..9e8199cd80a 100644\n--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt\n+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt\n@@ -52,6 +52,7 @@ import io.element.android.libraries.matrix.api.sync.SyncService\n import io.element.android.libraries.matrix.api.timeline.ReceiptType\n import io.element.android.libraries.preferences.api.store.AppPreferencesStore\n import io.element.android.libraries.preferences.api.store.SessionPreferencesStore\n+import io.element.android.libraries.push.api.battery.BatteryOptimizationState\n import io.element.android.libraries.push.api.notifications.NotificationCleaner\n import io.element.android.services.analytics.api.AnalyticsService\n import io.element.android.services.analyticsproviders.api.trackers.captureInteraction\n@@ -88,6 +89,7 @@ class RoomListPresenter @Inject constructor(\n private val analyticsService: AnalyticsService,\n private val acceptDeclineInvitePresenter: Presenter,\n private val fullScreenIntentPermissionsPresenter: Presenter,\n+ private val batteryOptimizationPresenter: Presenter,\n private val notificationCleaner: NotificationCleaner,\n private val logoutPresenter: Presenter,\n private val appPreferencesStore: AppPreferencesStore,\n@@ -248,6 +250,7 @@ class RoomListPresenter @Inject constructor(\n RoomListContentState.Rooms(\n securityBannerState = securityBannerState,\n fullScreenIntentPermissionsState = fullScreenIntentPermissionsPresenter.present(),\n+ batteryOptimizationState = batteryOptimizationPresenter.present(),\n summaries = roomSummaries.dataOrNull().orEmpty().toPersistentList(),\n seenRoomInvites = seenRoomInvites.toPersistentSet(),\n )\ndiff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt\nindex f685d5f3791..0cf6147df7e 100644\n--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt\n+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt\n@@ -18,6 +18,7 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage\n import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState\n import io.element.android.libraries.matrix.api.core.RoomId\n import io.element.android.libraries.matrix.api.user.MatrixUser\n+import io.element.android.libraries.push.api.battery.BatteryOptimizationState\n import kotlinx.collections.immutable.ImmutableList\n import kotlinx.collections.immutable.ImmutableSet\n \n@@ -78,6 +79,7 @@ sealed interface RoomListContentState {\n data class Rooms(\n val securityBannerState: SecurityBannerState,\n val fullScreenIntentPermissionsState: FullScreenIntentPermissionsState,\n+ val batteryOptimizationState: BatteryOptimizationState,\n val summaries: ImmutableList,\n val seenRoomInvites: ImmutableSet,\n ) : RoomListContentState\ndiff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt\nindex 4a221d3c973..cb4818ddd10 100644\n--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt\n+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt\n@@ -27,6 +27,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage\n import io.element.android.libraries.matrix.api.core.UserId\n import io.element.android.libraries.matrix.api.user.MatrixUser\n+import io.element.android.libraries.push.api.battery.aBatteryOptimizationState\n import io.element.android.libraries.ui.strings.CommonStrings\n import kotlinx.collections.immutable.ImmutableList\n import kotlinx.collections.immutable.persistentListOf\n@@ -45,6 +46,7 @@ open class RoomListStateProvider : PreviewParameterProvider {\n aRoomListState(contentState = aSkeletonContentState()),\n aRoomListState(searchState = aRoomListSearchState(isSearchActive = true, query = \"Test\")),\n aRoomListState(contentState = aRoomsContentState(securityBannerState = SecurityBannerState.SetUpRecovery)),\n+ aRoomListState(contentState = aRoomsContentState(batteryOptimizationState = aBatteryOptimizationState(shouldDisplayBanner = true))),\n )\n }\n \ndiff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/BatteryOptimizationBanner.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/BatteryOptimizationBanner.kt\nnew file mode 100644\nindex 00000000000..8fde1834d2e\n--- /dev/null\n+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/BatteryOptimizationBanner.kt\n@@ -0,0 +1,45 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.features.roomlist.impl.components\n+\n+import androidx.compose.runtime.Composable\n+import androidx.compose.ui.Modifier\n+import androidx.compose.ui.res.stringResource\n+import io.element.android.features.roomlist.impl.R\n+import io.element.android.libraries.designsystem.components.Announcement\n+import io.element.android.libraries.designsystem.components.AnnouncementType\n+import io.element.android.libraries.designsystem.preview.ElementPreview\n+import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n+import io.element.android.libraries.push.api.battery.BatteryOptimizationEvents\n+import io.element.android.libraries.push.api.battery.BatteryOptimizationState\n+import io.element.android.libraries.push.api.battery.aBatteryOptimizationState\n+\n+@Composable\n+internal fun BatteryOptimizationBanner(\n+ state: BatteryOptimizationState,\n+ modifier: Modifier = Modifier,\n+) {\n+ Announcement(\n+ modifier = modifier.roomListBannerPadding(),\n+ title = stringResource(R.string.banner_battery_optimization_title_android),\n+ description = stringResource(R.string.banner_battery_optimization_content_android),\n+ type = AnnouncementType.Actionable(\n+ actionText = stringResource(R.string.banner_battery_optimization_submit_android),\n+ onActionClick = { state.eventSink(BatteryOptimizationEvents.RequestDisableOptimizations) },\n+ onDismissClick = { state.eventSink(BatteryOptimizationEvents.Dismiss) },\n+ ),\n+ )\n+}\n+\n+@PreviewsDayNight\n+@Composable\n+internal fun BatteryOptimizationBannerPreview() = ElementPreview {\n+ BatteryOptimizationBanner(\n+ state = aBatteryOptimizationState(),\n+ )\n+}\ndiff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/FullScreenIntentPermissionBanner.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/FullScreenIntentPermissionBanner.kt\nindex 7e84a26ab3e..339b5f4fa6a 100644\n--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/FullScreenIntentPermissionBanner.kt\n+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/FullScreenIntentPermissionBanner.kt\n@@ -15,6 +15,7 @@ import io.element.android.libraries.designsystem.components.Announcement\n import io.element.android.libraries.designsystem.components.AnnouncementType\n import io.element.android.libraries.designsystem.preview.ElementPreview\n import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n+import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsEvents\n import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState\n import io.element.android.libraries.fullscreenintent.api.aFullScreenIntentPermissionsState\n import io.element.android.libraries.ui.strings.CommonStrings\n@@ -29,8 +30,8 @@ fun FullScreenIntentPermissionBanner(\n description = stringResource(R.string.full_screen_intent_banner_message),\n type = AnnouncementType.Actionable(\n actionText = stringResource(CommonStrings.action_continue),\n- onDismissClick = state.dismissFullScreenIntentBanner,\n- onActionClick = state.openFullScreenIntentSettings,\n+ onDismissClick = { state.eventSink(FullScreenIntentPermissionsEvents.Dismiss) },\n+ onActionClick = { state.eventSink(FullScreenIntentPermissionsEvents.OpenSettings) },\n ),\n modifier = modifier.roomListBannerPadding(),\n )\ndiff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt\nindex 0118a4fb819..b27f21c7f64 100644\n--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt\n+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt\n@@ -149,7 +149,7 @@ private fun EmptyView(\n onDismissClick = { eventSink(RoomListEvents.DismissBanner) },\n )\n }\n- else -> Unit\n+ SecurityBannerState.None -> Unit\n }\n }\n }\n@@ -234,6 +234,10 @@ private fun RoomsViewList(\n item {\n FullScreenIntentPermissionBanner(state = state.fullScreenIntentPermissionsState)\n }\n+ } else if (state.batteryOptimizationState.shouldDisplayBanner) {\n+ item {\n+ BatteryOptimizationBanner(state = state.batteryOptimizationState)\n+ }\n }\n }\n \ndiff --git a/features/roomlist/impl/src/main/res/values/localazy.xml b/features/roomlist/impl/src/main/res/values/localazy.xml\nindex d72af71f84b..a7b7ce80470 100644\n--- a/features/roomlist/impl/src/main/res/values/localazy.xml\n+++ b/features/roomlist/impl/src/main/res/values/localazy.xml\n@@ -1,5 +1,8 @@\n \n \n+ \"Disable battery optimization for this app, to make sure all notifications are received.\"\n+ \"Disable optimization\"\n+ \"Notifications not arriving?\"\n \"Recover your cryptographic identity and message history with a recovery key if you have lost all your existing devices.\"\n \"Set up recovery\"\n \"Set up recovery to protect your account\"\ndiff --git a/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsEvents.kt b/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsEvents.kt\nnew file mode 100644\nindex 00000000000..e0b84337499\n--- /dev/null\n+++ b/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsEvents.kt\n@@ -0,0 +1,13 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.fullscreenintent.api\n+\n+sealed interface FullScreenIntentPermissionsEvents {\n+ data object Dismiss : FullScreenIntentPermissionsEvents\n+ data object OpenSettings : FullScreenIntentPermissionsEvents\n+}\ndiff --git a/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsState.kt b/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsState.kt\nindex 3d77ebb4b57..5b3f84f977c 100644\n--- a/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsState.kt\n+++ b/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsState.kt\n@@ -10,6 +10,5 @@ package io.element.android.libraries.fullscreenintent.api\n data class FullScreenIntentPermissionsState(\n val permissionGranted: Boolean,\n val shouldDisplayBanner: Boolean,\n- val dismissFullScreenIntentBanner: () -> Unit,\n- val openFullScreenIntentSettings: () -> Unit,\n+ val eventSink: (FullScreenIntentPermissionsEvents) -> Unit,\n )\ndiff --git a/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsStateProvider.kt b/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsStateProvider.kt\nindex 7dbe340c396..25ab2ab5220 100644\n--- a/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsStateProvider.kt\n+++ b/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsStateProvider.kt\n@@ -10,11 +10,9 @@ package io.element.android.libraries.fullscreenintent.api\n fun aFullScreenIntentPermissionsState(\n permissionGranted: Boolean = true,\n shouldDisplay: Boolean = false,\n- openFullScreenIntentSettings: () -> Unit = {},\n- dismissFullScreenIntentBanner: () -> Unit = {},\n+ eventSink: (FullScreenIntentPermissionsEvents) -> Unit = {},\n ) = FullScreenIntentPermissionsState(\n permissionGranted = permissionGranted,\n shouldDisplayBanner = shouldDisplay,\n- openFullScreenIntentSettings = openFullScreenIntentSettings,\n- dismissFullScreenIntentBanner = dismissFullScreenIntentBanner,\n+ eventSink = eventSink,\n )\ndiff --git a/libraries/fullscreenintent/impl/src/main/kotlin/io/element/android/libraries/fullscreenintent/impl/FullScreenIntentPermissionsPresenter.kt b/libraries/fullscreenintent/impl/src/main/kotlin/io/element/android/libraries/fullscreenintent/impl/FullScreenIntentPermissionsPresenter.kt\nindex 3e427b6fa62..14cc438f41f 100644\n--- a/libraries/fullscreenintent/impl/src/main/kotlin/io/element/android/libraries/fullscreenintent/impl/FullScreenIntentPermissionsPresenter.kt\n+++ b/libraries/fullscreenintent/impl/src/main/kotlin/io/element/android/libraries/fullscreenintent/impl/FullScreenIntentPermissionsPresenter.kt\n@@ -23,6 +23,7 @@ import io.element.android.libraries.architecture.Presenter\n import io.element.android.libraries.core.meta.BuildMeta\n import io.element.android.libraries.di.AppScope\n import io.element.android.libraries.di.SingleIn\n+import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsEvents\n import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState\n import io.element.android.libraries.preferences.api.store.PreferenceDataStoreFactory\n import io.element.android.services.toolbox.api.intent.ExternalIntentLauncher\n@@ -60,15 +61,20 @@ class FullScreenIntentPermissionsPresenter @Inject constructor(\n val coroutineScope = rememberCoroutineScope()\n val isGranted = notificationManagerCompat.canUseFullScreenIntent()\n val isBannerDismissed by isFullScreenIntentBannerDismissed.collectAsState(initial = true)\n+\n+ fun handleEvents(event: FullScreenIntentPermissionsEvents) {\n+ when (event) {\n+ FullScreenIntentPermissionsEvents.Dismiss -> coroutineScope.launch {\n+ dismissFullScreenIntentBanner()\n+ }\n+ FullScreenIntentPermissionsEvents.OpenSettings -> openFullScreenIntentSettings()\n+ }\n+ }\n+\n return FullScreenIntentPermissionsState(\n permissionGranted = isGranted,\n shouldDisplayBanner = !isBannerDismissed && !isGranted,\n- dismissFullScreenIntentBanner = {\n- coroutineScope.launch {\n- dismissFullScreenIntentBanner()\n- }\n- },\n- openFullScreenIntentSettings = ::openFullScreenIntentSettings,\n+ eventSink = ::handleEvents,\n )\n }\n \ndiff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationEvents.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationEvents.kt\nnew file mode 100644\nindex 00000000000..ab8d9e92e54\n--- /dev/null\n+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationEvents.kt\n@@ -0,0 +1,13 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.push.api.battery\n+\n+sealed interface BatteryOptimizationEvents {\n+ data object Dismiss : BatteryOptimizationEvents\n+ data object RequestDisableOptimizations : BatteryOptimizationEvents\n+}\ndiff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationState.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationState.kt\nnew file mode 100644\nindex 00000000000..7e7c2b2bd6a\n--- /dev/null\n+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationState.kt\n@@ -0,0 +1,13 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.push.api.battery\n+\n+data class BatteryOptimizationState(\n+ val shouldDisplayBanner: Boolean,\n+ val eventSink: (BatteryOptimizationEvents) -> Unit,\n+)\ndiff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationStateProvider.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationStateProvider.kt\nnew file mode 100644\nindex 00000000000..d6d4e5774b3\n--- /dev/null\n+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationStateProvider.kt\n@@ -0,0 +1,16 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.push.api.battery\n+\n+fun aBatteryOptimizationState(\n+ shouldDisplayBanner: Boolean = false,\n+ eventSink: (BatteryOptimizationEvents) -> Unit = {},\n+) = BatteryOptimizationState(\n+ shouldDisplayBanner = shouldDisplayBanner,\n+ eventSink = eventSink,\n+)\ndiff --git a/libraries/push/impl/src/main/AndroidManifest.xml b/libraries/push/impl/src/main/AndroidManifest.xml\nindex 49ca55decc9..c08c16ed5f3 100644\n--- a/libraries/push/impl/src/main/AndroidManifest.xml\n+++ b/libraries/push/impl/src/main/AndroidManifest.xml\n@@ -7,6 +7,9 @@\n \n \n \n+\n+ \n+\n \n ()\n+ ?.isIgnoringBatteryOptimizations(context.packageName) == true\n+ }\n+\n+ @SuppressLint(\"BatteryLife\")\n+ override fun requestDisablingBatteryOptimization(): Boolean {\n+ val ignoreBatteryOptimizationsResult = launchAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, withData = true)\n+ if (ignoreBatteryOptimizationsResult) {\n+ return true\n+ }\n+ // Open settings as a fallback if the first attempt fails\n+ return launchAction(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS, withData = false)\n+ }\n+\n+ private fun launchAction(\n+ action: String,\n+ withData: Boolean,\n+ ): Boolean {\n+ val intent = Intent()\n+ intent.action = action\n+ if (withData) {\n+ intent.data = (\"package:\" + context.packageName).toUri()\n+ }\n+ return try {\n+ externalIntentLauncher.launch(intent)\n+ true\n+ } catch (exception: ActivityNotFoundException) {\n+ Timber.w(exception, \"Cannot launch intent with action $action.\")\n+ false\n+ }\n+ }\n+}\ndiff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenter.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenter.kt\nnew file mode 100644\nindex 00000000000..9fa17f05449\n--- /dev/null\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenter.kt\n@@ -0,0 +1,71 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.push.impl.battery\n+\n+import androidx.compose.runtime.Composable\n+import androidx.compose.runtime.collectAsState\n+import androidx.compose.runtime.getValue\n+import androidx.compose.runtime.mutableStateOf\n+import androidx.compose.runtime.remember\n+import androidx.compose.runtime.rememberCoroutineScope\n+import androidx.compose.runtime.setValue\n+import androidx.lifecycle.compose.LifecycleResumeEffect\n+import io.element.android.libraries.architecture.Presenter\n+import io.element.android.libraries.push.api.battery.BatteryOptimizationEvents\n+import io.element.android.libraries.push.api.battery.BatteryOptimizationState\n+import io.element.android.libraries.push.impl.push.MutableBatteryOptimizationStore\n+import io.element.android.libraries.push.impl.store.PushDataStore\n+import kotlinx.coroutines.launch\n+import javax.inject.Inject\n+\n+class BatteryOptimizationPresenter @Inject constructor(\n+ private val pushDataStore: PushDataStore,\n+ private val mutableBatteryOptimizationStore: MutableBatteryOptimizationStore,\n+ private val batteryOptimization: BatteryOptimization,\n+) : Presenter {\n+ @Composable\n+ override fun present(): BatteryOptimizationState {\n+ val coroutineScope = rememberCoroutineScope()\n+ var isRequestSent by remember { mutableStateOf(false) }\n+ var localShouldDisplayBanner by remember { mutableStateOf(true) }\n+ val storeShouldDisplayBanner by pushDataStore.shouldDisplayBatteryOptimizationBannerFlow.collectAsState(initial = false)\n+ var isSystemIgnoringBatteryOptimizations by remember {\n+ mutableStateOf(batteryOptimization.isIgnoringBatteryOptimizations())\n+ }\n+\n+ LifecycleResumeEffect(Unit) {\n+ isSystemIgnoringBatteryOptimizations = batteryOptimization.isIgnoringBatteryOptimizations()\n+ if (isRequestSent) {\n+ localShouldDisplayBanner = false\n+ }\n+ onPauseOrDispose {}\n+ }\n+\n+ fun handleEvents(event: BatteryOptimizationEvents) {\n+ when (event) {\n+ BatteryOptimizationEvents.Dismiss -> coroutineScope.launch {\n+ mutableBatteryOptimizationStore.onOptimizationBannerDismissed()\n+ }\n+ BatteryOptimizationEvents.RequestDisableOptimizations -> {\n+ isRequestSent = true\n+ if (batteryOptimization.requestDisablingBatteryOptimization().not()) {\n+ // If not able to perform the request, ensure that we do not display the banner again\n+ coroutineScope.launch {\n+ mutableBatteryOptimizationStore.onOptimizationBannerDismissed()\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ return BatteryOptimizationState(\n+ shouldDisplayBanner = localShouldDisplayBanner && storeShouldDisplayBanner && !isSystemIgnoringBatteryOptimizations,\n+ eventSink = ::handleEvents,\n+ )\n+ }\n+}\ndiff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/di/PushModule.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/di/PushModule.kt\nindex 3e7c7ddae3f..bb8b7e1624b 100644\n--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/di/PushModule.kt\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/di/PushModule.kt\n@@ -10,16 +10,25 @@ package io.element.android.libraries.push.impl.di\n import android.content.Context\n import androidx.core.app.NotificationManagerCompat\n import com.squareup.anvil.annotations.ContributesTo\n+import dagger.Binds\n import dagger.Module\n import dagger.Provides\n+import io.element.android.libraries.architecture.Presenter\n import io.element.android.libraries.di.AppScope\n import io.element.android.libraries.di.ApplicationContext\n+import io.element.android.libraries.push.api.battery.BatteryOptimizationState\n+import io.element.android.libraries.push.impl.battery.BatteryOptimizationPresenter\n \n @Module\n @ContributesTo(AppScope::class)\n-object PushModule {\n- @Provides\n- fun provideNotificationCompatManager(@ApplicationContext context: Context): NotificationManagerCompat {\n- return NotificationManagerCompat.from(context)\n+interface PushModule {\n+ companion object {\n+ @Provides\n+ fun provideNotificationCompatManager(@ApplicationContext context: Context): NotificationManagerCompat {\n+ return NotificationManagerCompat.from(context)\n+ }\n }\n+\n+ @Binds\n+ fun bindBatteryOptimizationPresenter(presenter: BatteryOptimizationPresenter): Presenter\n }\ndiff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt\nindex a426cdcf426..d42ca28c884 100644\n--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt\n@@ -50,6 +50,7 @@ class DefaultPushHandler @Inject constructor(\n private val onNotifiableEventReceived: OnNotifiableEventReceived,\n private val onRedactedEventReceived: OnRedactedEventReceived,\n private val incrementPushDataStore: IncrementPushDataStore,\n+ private val mutableBatteryOptimizationStore: MutableBatteryOptimizationStore,\n private val userPushStoreFactory: UserPushStoreFactory,\n private val pushClientSecret: PushClientSecret,\n private val buildMeta: BuildMeta,\n@@ -102,6 +103,7 @@ class DefaultPushHandler @Inject constructor(\n sessionId = request.sessionId,\n reason = exception.message ?: exception.javaClass.simpleName,\n )\n+ mutableBatteryOptimizationStore.showBatteryOptimizationBanner()\n }\n )\n }\ndiff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/MutableBatteryOptimizationStore.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/MutableBatteryOptimizationStore.kt\nnew file mode 100644\nindex 00000000000..1c1d9186f68\n--- /dev/null\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/MutableBatteryOptimizationStore.kt\n@@ -0,0 +1,31 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.push.impl.push\n+\n+import com.squareup.anvil.annotations.ContributesBinding\n+import io.element.android.libraries.di.AppScope\n+import io.element.android.libraries.push.impl.store.DefaultPushDataStore\n+import javax.inject.Inject\n+\n+interface MutableBatteryOptimizationStore {\n+ suspend fun showBatteryOptimizationBanner()\n+ suspend fun onOptimizationBannerDismissed()\n+}\n+\n+@ContributesBinding(AppScope::class)\n+class DefaultMutableBatteryOptimizationStore @Inject constructor(\n+ private val defaultPushDataStore: DefaultPushDataStore,\n+) : MutableBatteryOptimizationStore {\n+ override suspend fun showBatteryOptimizationBanner() {\n+ defaultPushDataStore.setBatteryOptimizationBannerState(DefaultPushDataStore.BATTERY_OPTIMIZATION_BANNER_STATE_SHOW)\n+ }\n+\n+ override suspend fun onOptimizationBannerDismissed() {\n+ defaultPushDataStore.setBatteryOptimizationBannerState(DefaultPushDataStore.BATTERY_OPTIMIZATION_BANNER_STATE_DISMISSED)\n+ }\n+}\ndiff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/store/DefaultPushDataStore.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/store/DefaultPushDataStore.kt\nindex 2130e91c723..a4d9413cb14 100644\n--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/store/DefaultPushDataStore.kt\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/store/DefaultPushDataStore.kt\n@@ -43,10 +43,24 @@ class DefaultPushDataStore @Inject constructor(\n ) : PushDataStore {\n private val pushCounter = intPreferencesKey(\"push_counter\")\n \n+ /**\n+ * Integer preference to track the state of the battery optimization banner.\n+ * Possible values:\n+ * [BATTERY_OPTIMIZATION_BANNER_STATE_INIT]: Should not show the banner\n+ * [BATTERY_OPTIMIZATION_BANNER_STATE_SHOW]: Should show the banner\n+ * [BATTERY_OPTIMIZATION_BANNER_STATE_DISMISSED]: Banner has been shown and user has dismissed it\n+ */\n+ private val batteryOptimizationBannerState = intPreferencesKey(\"battery_optimization_banner_state\")\n+\n override val pushCounterFlow: Flow = context.dataStore.data.map { preferences ->\n preferences[pushCounter] ?: 0\n }\n \n+ @Suppress(\"UnnecessaryParentheses\")\n+ override val shouldDisplayBatteryOptimizationBannerFlow: Flow = context.dataStore.data.map { preferences ->\n+ (preferences[batteryOptimizationBannerState] ?: BATTERY_OPTIMIZATION_BANNER_STATE_INIT) == BATTERY_OPTIMIZATION_BANNER_STATE_SHOW\n+ }\n+\n suspend fun incrementPushCounter() {\n context.dataStore.edit { settings ->\n val currentCounterValue = settings[pushCounter] ?: 0\n@@ -54,6 +68,18 @@ class DefaultPushDataStore @Inject constructor(\n }\n }\n \n+ suspend fun setBatteryOptimizationBannerState(newState: Int) {\n+ context.dataStore.edit { settings ->\n+ val currentValue = settings[batteryOptimizationBannerState] ?: BATTERY_OPTIMIZATION_BANNER_STATE_INIT\n+ settings[batteryOptimizationBannerState] = when (currentValue) {\n+ BATTERY_OPTIMIZATION_BANNER_STATE_INIT,\n+ BATTERY_OPTIMIZATION_BANNER_STATE_SHOW -> newState\n+ BATTERY_OPTIMIZATION_BANNER_STATE_DISMISSED -> currentValue\n+ else -> error(\"Invalid value for showBatteryOptimizationBanner: $currentValue\")\n+ }\n+ }\n+ }\n+\n override fun getPushHistoryItemsFlow(): Flow> {\n return pushDatabase.pushHistoryQueries.selectAll()\n .asFlow()\n@@ -84,4 +110,10 @@ class DefaultPushDataStore @Inject constructor(\n it.clear()\n }\n }\n+\n+ companion object {\n+ const val BATTERY_OPTIMIZATION_BANNER_STATE_INIT = 0\n+ const val BATTERY_OPTIMIZATION_BANNER_STATE_SHOW = 1\n+ const val BATTERY_OPTIMIZATION_BANNER_STATE_DISMISSED = 2\n+ }\n }\ndiff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/store/PushDataStore.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/store/PushDataStore.kt\nindex 13c4e06347d..de8f6dbbc1e 100644\n--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/store/PushDataStore.kt\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/store/PushDataStore.kt\n@@ -11,6 +11,7 @@ import io.element.android.libraries.push.api.history.PushHistoryItem\n import kotlinx.coroutines.flow.Flow\n \n interface PushDataStore {\n+ val shouldDisplayBatteryOptimizationBannerFlow: Flow\n val pushCounterFlow: Flow\n \n /**\ndiff --git a/tools/localazy/config.json b/tools/localazy/config.json\nindex b299c39ef71..b4721f8be53 100644\n--- a/tools/localazy/config.json\n+++ b/tools/localazy/config.json\n@@ -168,6 +168,7 @@\n \"session_verification_banner_.*\",\n \"confirm_recovery_key_banner_.*\",\n \"banner\\\\.set_up_recovery\\\\..*\",\n+ \"banner\\\\.battery_optimization\\\\..*\",\n \"full_screen_intent_banner_.*\",\n \"screen_migration_.*\",\n \"screen_invites_.*\",\n", "test_patch": "diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt\nindex 446a864f0b7..3184a44a1cd 100644\n--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt\n+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt\n@@ -75,6 +75,7 @@ import io.element.android.libraries.preferences.api.store.AppPreferencesStore\n import io.element.android.libraries.preferences.api.store.SessionPreferencesStore\n import io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore\n import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore\n+import io.element.android.libraries.push.api.battery.aBatteryOptimizationState\n import io.element.android.libraries.push.api.notifications.NotificationCleaner\n import io.element.android.libraries.push.test.notifications.FakeNotificationCleaner\n import io.element.android.services.analytics.api.AnalyticsService\n@@ -712,6 +713,7 @@ class RoomListPresenterTest {\n analyticsService = analyticsService,\n acceptDeclineInvitePresenter = acceptDeclineInvitePresenter,\n fullScreenIntentPermissionsPresenter = { aFullScreenIntentPermissionsState() },\n+ batteryOptimizationPresenter = { aBatteryOptimizationState() },\n notificationCleaner = notificationCleaner,\n logoutPresenter = { aDirectLogoutState() },\n appPreferencesStore = appPreferencesStore,\ndiff --git a/libraries/fullscreenintent/impl/src/test/kotlin/io/element/android/libraries/fullscreenintent/test/FullScreenIntentPermissionsPresenterTest.kt b/libraries/fullscreenintent/impl/src/test/kotlin/io/element/android/libraries/fullscreenintent/test/FullScreenIntentPermissionsPresenterTest.kt\nindex 8cf508562b9..0d10032da0a 100644\n--- a/libraries/fullscreenintent/impl/src/test/kotlin/io/element/android/libraries/fullscreenintent/test/FullScreenIntentPermissionsPresenterTest.kt\n+++ b/libraries/fullscreenintent/impl/src/test/kotlin/io/element/android/libraries/fullscreenintent/test/FullScreenIntentPermissionsPresenterTest.kt\n@@ -15,6 +15,7 @@ import app.cash.molecule.moleculeFlow\n import app.cash.turbine.test\n import com.google.common.truth.Truth.assertThat\n import io.element.android.libraries.core.meta.BuildMeta\n+import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsEvents\n import io.element.android.libraries.fullscreenintent.impl.FullScreenIntentPermissionsPresenter\n import io.element.android.libraries.matrix.test.core.aBuildMeta\n import io.element.android.libraries.preferences.test.FakePreferenceDataStoreFactory\n@@ -76,10 +77,8 @@ class FullScreenIntentPermissionsPresenterTest {\n }.test {\n skipItems(1)\n val loadedItem = awaitItem()\n- loadedItem.dismissFullScreenIntentBanner()\n-\n+ loadedItem.eventSink(FullScreenIntentPermissionsEvents.Dismiss)\n runCurrent()\n-\n assertThat(awaitItem().shouldDisplayBanner).isFalse()\n }\n }\n@@ -94,10 +93,8 @@ class FullScreenIntentPermissionsPresenterTest {\n }.test {\n skipItems(1)\n val loadedItem = awaitItem()\n- loadedItem.openFullScreenIntentSettings()\n-\n+ loadedItem.eventSink(FullScreenIntentPermissionsEvents.OpenSettings)\n launchLambda.assertions().isCalledOnce()\n-\n cancelAndIgnoreRemainingEvents()\n }\n }\n@@ -115,10 +112,8 @@ class FullScreenIntentPermissionsPresenterTest {\n }.test {\n skipItems(1)\n val loadedItem = awaitItem()\n- loadedItem.openFullScreenIntentSettings()\n-\n+ loadedItem.eventSink(FullScreenIntentPermissionsEvents.OpenSettings)\n launchLambda.assertions().isNeverCalled()\n-\n cancelAndIgnoreRemainingEvents()\n }\n }\ndiff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/AndroidBatteryOptimizationTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/AndroidBatteryOptimizationTest.kt\nnew file mode 100644\nindex 00000000000..e3a28550ca6\n--- /dev/null\n+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/AndroidBatteryOptimizationTest.kt\n@@ -0,0 +1,113 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.push.impl.battery\n+\n+import android.content.ActivityNotFoundException\n+import android.content.Intent\n+import android.provider.Settings\n+import androidx.test.platform.app.InstrumentationRegistry\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.services.toolbox.api.intent.ExternalIntentLauncher\n+import io.element.android.services.toolbox.test.intent.FakeExternalIntentLauncher\n+import io.element.android.tests.testutils.lambda.lambdaRecorder\n+import org.junit.Test\n+import org.junit.runner.RunWith\n+import org.robolectric.RobolectricTestRunner\n+\n+@RunWith(RobolectricTestRunner::class)\n+class AndroidBatteryOptimizationTest {\n+ @Test\n+ fun `isIgnoringBatteryOptimizations should return false`() {\n+ val sut = createAndroidBatteryOptimization()\n+ assertThat(sut.isIgnoringBatteryOptimizations()).isFalse()\n+ }\n+\n+ @Test\n+ fun `requestDisablingBatteryOptimization is called once with expected intent`() {\n+ val launchLambda = lambdaRecorder { intent ->\n+ assertThat(intent.action).isEqualTo(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)\n+ assertThat(intent.data.toString()).isEqualTo(\"package:${InstrumentationRegistry.getInstrumentation().context.packageName}\")\n+ }\n+ val externalIntentLauncher = FakeExternalIntentLauncher(launchLambda)\n+ val sut = createAndroidBatteryOptimization(\n+ externalIntentLauncher = externalIntentLauncher,\n+ )\n+ val result = sut.requestDisablingBatteryOptimization()\n+ launchLambda.assertions().isCalledOnce()\n+ assertThat(result).isTrue()\n+ }\n+\n+ @Test\n+ fun `in case of 1 error, requestDisablingBatteryOptimization returns true`() {\n+ var callNumber = 0\n+ val launchLambda = lambdaRecorder { intent ->\n+ callNumber++\n+ when (callNumber) {\n+ 1 -> {\n+ assertThat(intent.action).isEqualTo(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)\n+ assertThat(intent.data.toString()).isEqualTo(\"package:${InstrumentationRegistry.getInstrumentation().context.packageName}\")\n+ throw ActivityNotFoundException(\"Test exception\")\n+ }\n+ 2 -> {\n+ assertThat(intent.action).isEqualTo(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS)\n+ assertThat(intent.data).isNull()\n+ // No error\n+ }\n+ else -> {\n+ throw AssertionError(\"Unexpected call number: $callNumber\")\n+ }\n+ }\n+ }\n+ val externalIntentLauncher = FakeExternalIntentLauncher(launchLambda)\n+ val sut = createAndroidBatteryOptimization(\n+ externalIntentLauncher = externalIntentLauncher,\n+ )\n+ val result = sut.requestDisablingBatteryOptimization()\n+ launchLambda.assertions().isCalledExactly(2)\n+ assertThat(result).isTrue()\n+ }\n+\n+ @Test\n+ fun `in case of 2 errors, requestDisablingBatteryOptimization returns false`() {\n+ var callNumber = 0\n+ val launchLambda = lambdaRecorder { intent ->\n+ callNumber++\n+ when (callNumber) {\n+ 1 -> {\n+ assertThat(intent.action).isEqualTo(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)\n+ assertThat(intent.data.toString()).isEqualTo(\"package:${InstrumentationRegistry.getInstrumentation().context.packageName}\")\n+ throw ActivityNotFoundException(\"Test exception\")\n+ }\n+ 2 -> {\n+ assertThat(intent.action).isEqualTo(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS)\n+ assertThat(intent.data).isNull()\n+ throw ActivityNotFoundException(\"Test exception\")\n+ }\n+ else -> {\n+ throw AssertionError(\"Unexpected call number: $callNumber\")\n+ }\n+ }\n+ }\n+ val externalIntentLauncher = FakeExternalIntentLauncher(launchLambda)\n+ val sut = createAndroidBatteryOptimization(\n+ externalIntentLauncher = externalIntentLauncher,\n+ )\n+ val result = sut.requestDisablingBatteryOptimization()\n+ launchLambda.assertions().isCalledExactly(2)\n+ assertThat(result).isFalse()\n+ }\n+\n+ private fun createAndroidBatteryOptimization(\n+ externalIntentLauncher: ExternalIntentLauncher = FakeExternalIntentLauncher(),\n+ ): AndroidBatteryOptimization {\n+ return AndroidBatteryOptimization(\n+ context = InstrumentationRegistry.getInstrumentation().context,\n+ externalIntentLauncher = externalIntentLauncher,\n+ )\n+ }\n+}\ndiff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenterTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenterTest.kt\nnew file mode 100644\nindex 00000000000..d5dd7c48d45\n--- /dev/null\n+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenterTest.kt\n@@ -0,0 +1,170 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.push.impl.battery\n+\n+import androidx.lifecycle.Lifecycle\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.push.api.battery.BatteryOptimizationEvents\n+import io.element.android.libraries.push.impl.push.FakeMutableBatteryOptimizationStore\n+import io.element.android.libraries.push.impl.push.MutableBatteryOptimizationStore\n+import io.element.android.libraries.push.impl.store.InMemoryPushDataStore\n+import io.element.android.libraries.push.impl.store.PushDataStore\n+import io.element.android.tests.testutils.FakeLifecycleOwner\n+import io.element.android.tests.testutils.WarmUpRule\n+import io.element.android.tests.testutils.lambda.lambdaRecorder\n+import io.element.android.tests.testutils.testWithLifecycleOwner\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Rule\n+import org.junit.Test\n+\n+class BatteryOptimizationPresenterTest {\n+ @get:Rule\n+ val warmUpRule = WarmUpRule()\n+\n+ @Test\n+ fun `present - initial state`() = runTest {\n+ val presenter = createPresenter(\n+ pushDataStore = InMemoryPushDataStore(\n+ initialShouldDisplayBatteryOptimizationBanner = false,\n+ ),\n+ batteryOptimization = FakeBatteryOptimization(\n+ isIgnoringBatteryOptimizationsResult = false,\n+ ),\n+ )\n+ val lifeCycleOwner = FakeLifecycleOwner()\n+ presenter.testWithLifecycleOwner(lifeCycleOwner) {\n+ val initialState = awaitItem()\n+ assertThat(initialState.shouldDisplayBanner).isFalse()\n+ lifeCycleOwner.givenState(Lifecycle.State.RESUMED)\n+ }\n+ }\n+\n+ @Test\n+ fun `present - should display banner`() = runTest {\n+ val presenter = createPresenter(\n+ pushDataStore = InMemoryPushDataStore(\n+ initialShouldDisplayBatteryOptimizationBanner = true,\n+ ),\n+ batteryOptimization = FakeBatteryOptimization(\n+ isIgnoringBatteryOptimizationsResult = false,\n+ ),\n+ )\n+ presenter.testWithLifecycleOwner {\n+ val initialState = awaitItem()\n+ assertThat(initialState.shouldDisplayBanner).isFalse()\n+ assertThat(awaitItem().shouldDisplayBanner).isTrue()\n+ }\n+ }\n+\n+ @Test\n+ fun `present - should display banner, but setting already performed`() = runTest {\n+ val presenter = createPresenter(\n+ pushDataStore = InMemoryPushDataStore(\n+ initialShouldDisplayBatteryOptimizationBanner = true,\n+ ),\n+ batteryOptimization = FakeBatteryOptimization(\n+ isIgnoringBatteryOptimizationsResult = true,\n+ ),\n+ )\n+ presenter.testWithLifecycleOwner {\n+ val initialState = awaitItem()\n+ assertThat(initialState.shouldDisplayBanner).isFalse()\n+ assertThat(awaitItem().shouldDisplayBanner).isFalse()\n+ }\n+ }\n+\n+ @Test\n+ fun `present - should display banner, user dismisses`() = runTest {\n+ val onOptimizationBannerDismissedResult = lambdaRecorder { }\n+ val presenter = createPresenter(\n+ pushDataStore = InMemoryPushDataStore(\n+ initialShouldDisplayBatteryOptimizationBanner = true,\n+ ),\n+ batteryOptimization = FakeBatteryOptimization(\n+ isIgnoringBatteryOptimizationsResult = false,\n+ ),\n+ mutableBatteryOptimizationStore = FakeMutableBatteryOptimizationStore(\n+ onOptimizationBannerDismissedResult = onOptimizationBannerDismissedResult,\n+ ),\n+ )\n+ presenter.testWithLifecycleOwner {\n+ val initialState = awaitItem()\n+ assertThat(initialState.shouldDisplayBanner).isFalse()\n+ val displayedItem = awaitItem()\n+ assertThat(displayedItem.shouldDisplayBanner).isTrue()\n+ displayedItem.eventSink(BatteryOptimizationEvents.Dismiss)\n+ onOptimizationBannerDismissedResult.assertions().isCalledOnce()\n+ }\n+ }\n+\n+ @Test\n+ fun `present - should display banner, user continue, error case`() = runTest {\n+ val onOptimizationBannerDismissedResult = lambdaRecorder { }\n+ val requestDisablingBatteryOptimizationResult = lambdaRecorder { false }\n+ val presenter = createPresenter(\n+ pushDataStore = InMemoryPushDataStore(\n+ initialShouldDisplayBatteryOptimizationBanner = true,\n+ ),\n+ batteryOptimization = FakeBatteryOptimization(\n+ isIgnoringBatteryOptimizationsResult = false,\n+ requestDisablingBatteryOptimizationResult = requestDisablingBatteryOptimizationResult\n+ ),\n+ mutableBatteryOptimizationStore = FakeMutableBatteryOptimizationStore(\n+ onOptimizationBannerDismissedResult = onOptimizationBannerDismissedResult,\n+ ),\n+ )\n+ presenter.testWithLifecycleOwner {\n+ val initialState = awaitItem()\n+ assertThat(initialState.shouldDisplayBanner).isFalse()\n+ val displayedItem = awaitItem()\n+ assertThat(displayedItem.shouldDisplayBanner).isTrue()\n+ displayedItem.eventSink(BatteryOptimizationEvents.RequestDisableOptimizations)\n+ requestDisablingBatteryOptimizationResult.assertions().isCalledOnce()\n+ onOptimizationBannerDismissedResult.assertions().isCalledOnce()\n+ }\n+ }\n+\n+ @Test\n+ fun `present - should display banner, user continue, nominal case`() = runTest {\n+ val requestDisablingBatteryOptimizationResult = lambdaRecorder { true }\n+ val batteryOptimization = FakeBatteryOptimization(\n+ isIgnoringBatteryOptimizationsResult = false,\n+ requestDisablingBatteryOptimizationResult = requestDisablingBatteryOptimizationResult\n+ )\n+ val presenter = createPresenter(\n+ pushDataStore = InMemoryPushDataStore(\n+ initialShouldDisplayBatteryOptimizationBanner = true,\n+ ),\n+ batteryOptimization = batteryOptimization,\n+ mutableBatteryOptimizationStore = FakeMutableBatteryOptimizationStore(),\n+ )\n+ val lifeCycleOwner = FakeLifecycleOwner()\n+ presenter.testWithLifecycleOwner(lifeCycleOwner) {\n+ val initialState = awaitItem()\n+ assertThat(initialState.shouldDisplayBanner).isFalse()\n+ val displayedItem = awaitItem()\n+ assertThat(displayedItem.shouldDisplayBanner).isTrue()\n+ displayedItem.eventSink(BatteryOptimizationEvents.RequestDisableOptimizations)\n+ requestDisablingBatteryOptimizationResult.assertions().isCalledOnce()\n+ batteryOptimization.isIgnoringBatteryOptimizationsResult = true\n+ lifeCycleOwner.givenState(Lifecycle.State.RESUMED)\n+ assertThat(awaitItem().shouldDisplayBanner).isFalse()\n+ assertThat(awaitItem().shouldDisplayBanner).isFalse()\n+ }\n+ }\n+\n+ private fun createPresenter(\n+ pushDataStore: PushDataStore = InMemoryPushDataStore(),\n+ mutableBatteryOptimizationStore: MutableBatteryOptimizationStore = FakeMutableBatteryOptimizationStore(),\n+ batteryOptimization: BatteryOptimization = FakeBatteryOptimization(),\n+ ) = BatteryOptimizationPresenter(\n+ pushDataStore = pushDataStore,\n+ mutableBatteryOptimizationStore = mutableBatteryOptimizationStore,\n+ batteryOptimization = batteryOptimization\n+ )\n+}\ndiff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/FakeBatteryOptimization.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/FakeBatteryOptimization.kt\nnew file mode 100644\nindex 00000000000..0adb3d25202\n--- /dev/null\n+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/FakeBatteryOptimization.kt\n@@ -0,0 +1,23 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.push.impl.battery\n+\n+import io.element.android.tests.testutils.lambda.lambdaError\n+\n+class FakeBatteryOptimization(\n+ var isIgnoringBatteryOptimizationsResult: Boolean = false,\n+ private val requestDisablingBatteryOptimizationResult: () -> Boolean = { lambdaError() }\n+) : BatteryOptimization {\n+ override fun isIgnoringBatteryOptimizations(): Boolean {\n+ return isIgnoringBatteryOptimizationsResult\n+ }\n+\n+ override fun requestDisablingBatteryOptimization(): Boolean {\n+ return requestDisablingBatteryOptimizationResult()\n+ }\n+}\ndiff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt\nindex 933c830525b..64a3b87aa73 100644\n--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt\n+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt\n@@ -86,7 +86,7 @@ class DefaultPushHandlerTest {\n fun `when classical PushData is received, the notification drawer is informed`() = runTest {\n val aNotifiableMessageEvent = aNotifiableMessageEvent()\n val notifiableEventResult =\n- lambdaRecorder, Result>>> { _, _, ->\n+ lambdaRecorder, Result>>> { _, _ ->\n val request = NotificationEventRequest(A_SESSION_ID, A_ROOM_ID, AN_EVENT_ID, A_PUSHER_INFO)\n Result.success(mapOf(request to Result.success(ResolvedPushEvent.Event(aNotifiableMessageEvent))))\n }\n@@ -268,11 +268,35 @@ class DefaultPushHandlerTest {\n }\n \n @Test\n- fun `when classical PushData is received, but not able to resolve the event, nothing happen`() =\n+ fun `when classical PushData is received, but a failure occurs (session not found), nothing happen`() {\n+ `test notification resolver failure`(\n+ notificationResolveResult = { _ ->\n+ Result.failure(ResolvingException(\"Unable to restore session\"))\n+ },\n+ shouldSetOptimizationBatteryBanner = false,\n+ )\n+ }\n+\n+ @Test\n+ fun `when classical PushData is received, but not able to resolve the event, the banner to disable battery optimization will be displayed`() {\n+ `test notification resolver failure`(\n+ notificationResolveResult = { requests: List ->\n+ Result.success(\n+ requests.associateWith { Result.failure(ResolvingException(\"Unable to resolve event\")) }\n+ )\n+ },\n+ shouldSetOptimizationBatteryBanner = true,\n+ )\n+ }\n+\n+ private fun `test notification resolver failure`(\n+ notificationResolveResult: (List) -> Result>>,\n+ shouldSetOptimizationBatteryBanner: Boolean,\n+ ) {\n runTest {\n val notifiableEventResult =\n- lambdaRecorder, Result>>> { _, _ ->\n- Result.failure(ResolvingException(\"Unable to resolve\"))\n+ lambdaRecorder, Result>>> { _, requests ->\n+ notificationResolveResult(requests)\n }\n val onNotifiableEventsReceived = lambdaRecorder, Unit> {}\n val incrementPushCounterResult = lambdaRecorder {}\n@@ -286,6 +310,7 @@ class DefaultPushHandlerTest {\n val pushHistoryService = FakePushHistoryService(\n onPushReceivedResult = onPushReceivedResult,\n )\n+ val showBatteryOptimizationBannerResult = lambdaRecorder {}\n val defaultPushHandler = createDefaultPushHandler(\n onNotifiableEventsReceived = onNotifiableEventsReceived,\n notifiableEventsResult = notifiableEventResult,\n@@ -297,6 +322,9 @@ class DefaultPushHandlerTest {\n getUserIdFromSecretResult = { A_USER_ID }\n ),\n incrementPushCounterResult = incrementPushCounterResult,\n+ mutableBatteryOptimizationStore = FakeMutableBatteryOptimizationStore(\n+ showBatteryOptimizationBannerResult = showBatteryOptimizationBannerResult,\n+ ),\n pushHistoryService = pushHistoryService,\n )\n defaultPushHandler.handle(aPushData, A_PUSHER_INFO)\n@@ -313,7 +341,15 @@ class DefaultPushHandlerTest {\n onPushReceivedResult.assertions()\n .isCalledOnce()\n .with(any(), value(AN_EVENT_ID), value(A_ROOM_ID), value(A_USER_ID), value(false), value(true), any())\n+ showBatteryOptimizationBannerResult.assertions().let {\n+ if (shouldSetOptimizationBatteryBanner) {\n+ it.isCalledOnce()\n+ } else {\n+ it.isNeverCalled()\n+ }\n+ }\n }\n+ }\n \n @Test\n fun `when ringing call PushData is received, the incoming call will be handled`() = runTest {\n@@ -542,7 +578,7 @@ class DefaultPushHandlerTest {\n fun `when receiving several push notifications at the same time, those are batched before being processed`() = runTest {\n val aNotifiableMessageEvent = aNotifiableMessageEvent()\n val notifiableEventResult =\n- lambdaRecorder, Result>>> { _, _, ->\n+ lambdaRecorder, Result>>> { _, _ ->\n val request = NotificationEventRequest(A_SESSION_ID, A_ROOM_ID, AN_EVENT_ID, A_PUSHER_INFO)\n Result.success(mapOf(request to Result.success(ResolvedPushEvent.Event(aNotifiableMessageEvent))))\n }\n@@ -595,8 +631,9 @@ class DefaultPushHandlerTest {\n onNotifiableEventsReceived: (List) -> Unit = { lambdaError() },\n onRedactedEventsReceived: (List) -> Unit = { lambdaError() },\n notifiableEventsResult: (SessionId, List) -> Result>> =\n- { _, _, -> lambdaError() },\n+ { _, _ -> lambdaError() },\n incrementPushCounterResult: () -> Unit = { lambdaError() },\n+ mutableBatteryOptimizationStore: MutableBatteryOptimizationStore = FakeMutableBatteryOptimizationStore(),\n userPushStore: UserPushStore = FakeUserPushStore(),\n pushClientSecret: PushClientSecret = FakePushClientSecret(),\n buildMeta: BuildMeta = aBuildMeta(),\n@@ -614,6 +651,7 @@ class DefaultPushHandlerTest {\n incrementPushCounterResult()\n }\n },\n+ mutableBatteryOptimizationStore = mutableBatteryOptimizationStore,\n userPushStoreFactory = FakeUserPushStoreFactory { userPushStore },\n pushClientSecret = pushClientSecret,\n buildMeta = buildMeta,\ndiff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/FakeMutableBatteryOptimizationStore.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/FakeMutableBatteryOptimizationStore.kt\nnew file mode 100644\nindex 00000000000..9e526debbb0\n--- /dev/null\n+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/FakeMutableBatteryOptimizationStore.kt\n@@ -0,0 +1,23 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.push.impl.push\n+\n+import io.element.android.tests.testutils.lambda.lambdaError\n+\n+class FakeMutableBatteryOptimizationStore(\n+ private val showBatteryOptimizationBannerResult: () -> Unit = { lambdaError() },\n+ private val onOptimizationBannerDismissedResult: () -> Unit = { lambdaError() },\n+) : MutableBatteryOptimizationStore {\n+ override suspend fun showBatteryOptimizationBanner() {\n+ showBatteryOptimizationBannerResult()\n+ }\n+\n+ override suspend fun onOptimizationBannerDismissed() {\n+ onOptimizationBannerDismissedResult()\n+ }\n+}\ndiff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/store/InMemoryPushDataStore.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/store/InMemoryPushDataStore.kt\nindex 7ea038791b3..4f710e09b6f 100644\n--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/store/InMemoryPushDataStore.kt\n+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/store/InMemoryPushDataStore.kt\n@@ -15,12 +15,16 @@ import kotlinx.coroutines.flow.asStateFlow\n \n class InMemoryPushDataStore(\n initialPushCounter: Int = 0,\n+ initialShouldDisplayBatteryOptimizationBanner: Boolean = false,\n initialPushHistoryItems: List = emptyList(),\n private val resetResult: () -> Unit = { lambdaError() }\n ) : PushDataStore {\n private val mutablePushCounterFlow = MutableStateFlow(initialPushCounter)\n override val pushCounterFlow: Flow = mutablePushCounterFlow.asStateFlow()\n \n+ private val mutableShouldDisplayBatteryOptimizationBannerFlow = MutableStateFlow(initialShouldDisplayBatteryOptimizationBanner)\n+ override val shouldDisplayBatteryOptimizationBannerFlow: Flow = mutableShouldDisplayBatteryOptimizationBannerFlow.asStateFlow()\n+\n private val mutablePushHistoryItemsFlow = MutableStateFlow(initialPushHistoryItems)\n \n override fun getPushHistoryItemsFlow(): Flow> {\ndiff --git a/services/toolbox/test/build.gradle.kts b/services/toolbox/test/build.gradle.kts\nindex 9f3f9bfee3f..8d2f2b8a2d8 100644\n--- a/services/toolbox/test/build.gradle.kts\n+++ b/services/toolbox/test/build.gradle.kts\n@@ -14,4 +14,5 @@ android {\n \n dependencies {\n api(projects.services.toolbox.api)\n+ implementation(projects.tests.testutils)\n }\ndiff --git a/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/intent/FakeExternalIntentLauncher.kt b/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/intent/FakeExternalIntentLauncher.kt\nindex 721a6ebe1bf..a8e9589b6d8 100644\n--- a/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/intent/FakeExternalIntentLauncher.kt\n+++ b/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/intent/FakeExternalIntentLauncher.kt\n@@ -9,9 +9,10 @@ package io.element.android.services.toolbox.test.intent\n \n import android.content.Intent\n import io.element.android.services.toolbox.api.intent.ExternalIntentLauncher\n+import io.element.android.tests.testutils.lambda.lambdaError\n \n class FakeExternalIntentLauncher(\n- var launchLambda: (Intent) -> Unit = {},\n+ var launchLambda: (Intent) -> Unit = { lambdaError() },\n ) : ExternalIntentLauncher {\n override fun launch(intent: Intent) {\n launchLambda(intent)\ndiff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl.components_BatteryOptimizationBanner_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl.components_BatteryOptimizationBanner_Day_0_en.png\nnew file mode 100644\nindex 00000000000..6b81678de07\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl.components_BatteryOptimizationBanner_Day_0_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:ef31a93af4f24ebada1e1436812c01d949e75d09f1259fabbe0d7a2a7eae3400\n+size 26278\ndiff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl.components_BatteryOptimizationBanner_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl.components_BatteryOptimizationBanner_Night_0_en.png\nnew file mode 100644\nindex 00000000000..64406048487\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl.components_BatteryOptimizationBanner_Night_0_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:9bf4b769592e06e707a727bae111a6ebf27ced4c272c4aaace3368049873182b\n+size 25324\ndiff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Day_11_en.png\nnew file mode 100644\nindex 00000000000..b7e12785912\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Day_11_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:6041a7693307a30183606e7f8f2b605ba4c9bfb8c7ad5d8122837749813d6e2c\n+size 99928\ndiff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Night_11_en.png\nnew file mode 100644\nindex 00000000000..6cafa75e882\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Night_11_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:7563629f9df4012d7cc35b2805e1ac381ccdb171935b35cad0d1ea60186e3e7d\n+size 105496\n", "n2p_tests": "{\"io.element.android.libraries.push.impl.battery.AndroidBatteryOptimizationTest.in case of 1 error, requestDisablingBatteryOptimization returns true\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"io.element.android.libraries.fullscreenintent.test.FullScreenIntentPermissionsPresenterTest.shouldDisplay - is false if permission is granted\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.battery.AndroidBatteryOptimizationTest.in case of 2 errors, requestDisablingBatteryOptimization returns false\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.battery.BatteryOptimizationPresenterTest.present - should display banner, user dismisses\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.battery.BatteryOptimizationPresenterTest.present - should display banner, but setting already performed\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.libraries.fullscreenintent.test.FullScreenIntentPermissionsPresenterTest.openFullScreenIntentSettings - does nothing in old APIs\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.libraries.fullscreenintent.test.FullScreenIntentPermissionsPresenterTest.shouldDisplay - is true when permission is not granted and banner is not dismissed\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.battery.BatteryOptimizationPresenterTest.present - initial state\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.battery.AndroidBatteryOptimizationTest.requestDisablingBatteryOptimization is called once with expected intent\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.libraries.fullscreenintent.test.FullScreenIntentPermissionsPresenterTest.openFullScreenIntentSettings - opens external screen using intent\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.battery.BatteryOptimizationPresenterTest.present - should display banner, user continue, nominal case\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.libraries.fullscreenintent.test.FullScreenIntentPermissionsPresenterTest.dismissFullScreenIntentBanner - makes shouldDisplay false\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.battery.BatteryOptimizationPresenterTest.present - should display banner\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.battery.AndroidBatteryOptimizationTest.isIgnoringBatteryOptimizations should return false\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.battery.BatteryOptimizationPresenterTest.present - should display banner, user continue, error case\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"io.element.android.libraries.push.impl.push.DefaultPushHandlerTest.when ringing call PushData is received, the incoming call will be handled\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - should start with no user and then load user with success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - load 1 room with success\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.push.DefaultPushHandlerTest.when a redaction is received, the onRedactedEventReceived is informed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - handle DismissRequestVerificationPrompt\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - show context menu with view source on\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - when room service returns no room, then contentState is Empty\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.push.DefaultPushHandlerTest.when diagnostic PushData is received, the diagnostic push handler is informed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - leave room calls into leave room presenter\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - check that the room is marked as read with correct RR and as unread\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - UpdateVisibleRange will cancel the previous subscription if called too soon\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - change in notification settings updates the summary for decorations\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.push.DefaultPushHandlerTest.when PushData is received, but client secret is not known, and there is no latest session, nothing happen\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.push.DefaultPushHandlerTest.when classical PushData is received, but notifications are disabled, nothing happen\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.push.DefaultPushHandlerTest.when classical PushData is received, but not able to resolve the event, the banner to disable battery optimization will be displayed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.push.DefaultPushHandlerTest.when classical PushData is received, the notification drawer is informed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - UpdateVisibleRange subscribes to rooms in visible range\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - handle DismissRecoveryKeyPrompt\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.push.DefaultPushHandlerTest.when notify call PushData is received, the incoming call will be treated as a normal notification\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - hide context menu\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.push.DefaultPushHandlerTest.when notify call PushData is received, the incoming call will be treated as a normal notification even if notification are disabled\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.push.DefaultPushHandlerTest.check handleInvalid behavior\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - show context menu\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - when a room is invited then accept and decline events are sent to acceptDeclinePresenter\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - should start with no user and then load user with error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.push.DefaultPushHandlerTest.when PushData is received, but client secret is not known, fallback the latest session\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - show avatar indicator\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - toggle search menu\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - when set is favorite event is emitted, then the action is called\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.push.DefaultPushHandlerTest.when receiving several push notifications at the same time, those are batched before being processed\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.push.DefaultPushHandlerTest.when classical PushData is received, but a failure occurs (session not found), nothing happen\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-4752", "org": "element-hq", "repo": "element-x-android", "number": 4752, "state": "closed", "title": "Add support for login link", "body": "\r\n \r\n## Content\r\n\r\n\r\nAdd support for login link\r\n\r\n## Motivation and context\r\n\r\n\r\nLet the application be opened when the user opens link like\r\n\r\nhttps://mobile.element.io/element?account_provider=example.org&login_hint=mxid:@alice:example.org\r\n\r\nCloses #4705\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\nhttps://github.com/user-attachments/assets/4a25f676-47e9-41f0-ad6c-ffa88d4db3be\r\n\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Install the app\r\n- Open a link such as https://mobile.element.io/element?account_provider=element.io&login_hint=mxid:@alice:element.io\r\n- The system should start the app with a button to sign in to element.io\r\n- kill and start the app again\r\n- The app render the classical onboarding screen\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 24\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"e50dfa944aae40f473a14048d86a541ff5a99bc4\"}", "resolved_issues": "[{\"number\": 4705, \"title\": \"[Task] Deeplink to specify account provider & user\", \"body\": \"Please see and discuss the details in the meta issue.\\n\"}, {\"number\": 4074, \"title\": \"Multiple \\\"instances\\\" open when sharing media\", \"body\": \"### Steps to reproduce\\r\\n\\r\\nFirst I mainly use SchildiChat Next, but I also tested it with element x, and the issue there still persists.\\r\\n\\r\\nWhen sharing media via other apps (like YouTube or something), a new \\\"instance\\\" or window, whatever you want to call it, is created, and clog up the view of open apps\\r\\n\\r\\n**To Reproduce**\\r\\nSteps to reproduce the behavior:\\r\\n1. Go to your app to you liking and share media, to any room\\r\\n2. Element won't close the window, in which the media was shared.\\r\\n3. If you repeat this a few times, there will e many windows of element open\\r\\n\\r\\n### Outcome\\r\\n\\r\\n**Expected behavior**\\r\\nEither close the window after sharing, or open the sharing process in the already existing windows of element\\r\\n\\r\\n**Screenshots**\\r\\n![IMG_20241220_002347](https://github.com/user-attachments/assets/18a402e2-74ef-4b0f-91b8-3aa9276172aa)\\r\\n\\r\\n### Your phone model\\r\\n\\r\\nOneus 9 Pro\\r\\n\\r\\n### Operating system version\\r\\n\\r\\nAndroid 14\\r\\n\\r\\n### Application version and app store\\r\\n\\r\\nSchildiChat Next 0.7.5\\r\\n\\r\\n### Homeserver\\r\\n\\r\\nSynapse Docker v1.121.1\\r\\n\\r\\n### Will you send logs?\\r\\n\\r\\nYes\\r\\n\\r\\n### Are you willing to provide a PR?\\r\\n\\r\\nNo\"}]", "lang": "kotlin", "problem_statement": "[Task] Deeplink to specify account provider & user\nPlease see and discuss the details in the meta issue.\n\nMultiple \"instances\" open when sharing media\n### Steps to reproduce\r\n\r\nFirst I mainly use SchildiChat Next, but I also tested it with element x, and the issue there still persists.\r\n\r\nWhen sharing media via other apps (like YouTube or something), a new \"instance\" or window, whatever you want to call it, is created, and clog up the view of open apps\r\n\r\n**To Reproduce**\r\nSteps to reproduce the behavior:\r\n1. Go to your app to you liking and share media, to any room\r\n2. Element won't close the window, in which the media was shared.\r\n3. If you repeat this a few times, there will e many windows of element open\r\n\r\n### Outcome\r\n\r\n**Expected behavior**\r\nEither close the window after sharing, or open the sharing process in the already existing windows of element\r\n\r\n**Screenshots**\r\n![IMG_20241220_002347](https://github.com/user-attachments/assets/18a402e2-74ef-4b0f-91b8-3aa9276172aa)\r\n\r\n### Your phone model\r\n\r\nOneus 9 Pro\r\n\r\n### Operating system version\r\n\r\nAndroid 14\r\n\r\n### Application version and app store\r\n\r\nSchildiChat Next 0.7.5\r\n\r\n### Homeserver\r\n\r\nSynapse Docker v1.121.1\r\n\r\n### Will you send logs?\r\n\r\nYes\r\n\r\n### Are you willing to provide a PR?\r\n\r\nNo\n", "hints": "\n", "pull_url": "https://github.com/element-hq/element-x-android/pull/4752", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/4705\", \"https://github.com/element-hq/element-x-android/issues/4074\"]", "test_command": "./gradlew :features:login:impl:testDebugUnitTest --tests \"io.element.android.features.login.impl.screens.onboarding.OnBoardingPresenterTest\" --tests \"io.element.android.features.login.impl.DefaultLoginIntentResolverTest\" --tests \"io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderPresenterTest\" --tests \"io.element.android.features.login.impl.screens.onboarding.OnboardingViewTest\" --tests \"io.element.android.features.login.impl.onboarding.OnBoardingPresenterTest\" :appnav:testDebugUnitTest --tests \"io.element.android.appnav.intent.IntentResolverTest\"", "fix_patch": "diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml\nindex c26c9a5a513..6619603f937 100644\n--- a/app/src/main/AndroidManifest.xml\n+++ b/app/src/main/AndroidManifest.xml\n@@ -34,11 +34,17 @@\n android:value='androidx.startup' />\n \n \n+ \n \n \n@@ -54,6 +60,9 @@\n android:host=\"open\"\n android:scheme=\"elementx\" />\n \n+ \n \n \n \n@@ -80,6 +89,21 @@\n \n \n \n+ \n+ \n+ \n+\n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n \r\n \r\n## Content\r\n\r\n\r\nAdd minimum delay between two click handling on the room list.\r\nProtect:\r\n- opening the setting\r\n- opening a room\r\n- opening the create room screen\r\n\r\n## Motivation and context\r\n\r\n\r\nFixes #4619\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Open the room list\r\n- Tap on several rooms simultaneously\r\n- Observe that only one room is opened by going back to the room list\r\n- Quickly tap on a room\r\n- Observe that only one room is opened by going back to the room list\r\n- Tap on a room and on the user avatar icon\r\n- Observe that the settings screen is opened or the room is opened but not both by going back to the room list\r\n- Tap on a room and on the floating action button to create a room\r\n- Observe that the settings to create a room is opened or the room is opened but not both by going back to the room list\r\n\r\n## Tested devices\r\n\r\n- [x] Physical\r\n- [ ] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 24\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"390337c426939335c4b066a5dbab88c5f1b25f93\"}", "resolved_issues": "[{\"number\": 4619, \"title\": \"It's possible to open a room view twice by tapping it super quickly\", \"body\": \"### Steps to reproduce\\n\\nFrom the room list, tap the same room name twice super quickly.\\n\\n### Outcome\\n\\n#### What did you expect?\\n\\nThe room view to open only once.\\n\\n#### What happened instead?\\n\\nThe room view has opened twice: if I press return/back, then I get back to the same room view, instead of the room list.\\n\\n### Your phone model\\n\\nMotorola Razr\\n\\n### Operating system version\\n\\n_No response_\\n\\n### Application version and app store\\n\\nElementX beta from the app store\\n\\n### Homeserver\\n\\n_No response_\\n\\n### Will you send logs?\\n\\nNo\\n\\n### Are you willing to provide a PR?\\n\\nNo\"}]", "lang": "kotlin", "problem_statement": "It's possible to open a room view twice by tapping it super quickly\n### Steps to reproduce\n\nFrom the room list, tap the same room name twice super quickly.\n\n### Outcome\n\n#### What did you expect?\n\nThe room view to open only once.\n\n#### What happened instead?\n\nThe room view has opened twice: if I press return/back, then I get back to the same room view, instead of the room list.\n\n### Your phone model\n\nMotorola Razr\n\n### Operating system version\n\n_No response_\n\n### Application version and app store\n\nElementX beta from the app store\n\n### Homeserver\n\n_No response_\n\n### Will you send logs?\n\nNo\n\n### Are you willing to provide a PR?\n\nNo\n", "hints": "Additionally, it's possible to open multiple rooms by tapping on several rooms at the same time.", "pull_url": "https://github.com/element-hq/element-x-android/pull/4683", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/4619\"]", "test_command": "./gradlew :features:roomlist:impl:testDebugUnitTest --tests \"io.element.android.features.roomlist.impl.RoomListViewTest\" :libraries:androidutils:testDebugUnitTest --tests \"io.element.android.libraries.androidutils.throttler.FirstThrottlerTest\"", "fix_patch": "diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt\nindex 016cc4d116b..b00796c1fed 100644\n--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt\n+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt\n@@ -17,6 +17,8 @@ import androidx.compose.material3.ExperimentalMaterial3Api\n import androidx.compose.material3.TopAppBarDefaults\n import androidx.compose.material3.rememberTopAppBarState\n import androidx.compose.runtime.Composable\n+import androidx.compose.runtime.remember\n+import androidx.compose.runtime.rememberCoroutineScope\n import androidx.compose.ui.Modifier\n import androidx.compose.ui.input.nestedscroll.nestedScroll\n import androidx.compose.ui.res.stringResource\n@@ -30,6 +32,7 @@ import io.element.android.features.roomlist.impl.components.RoomListMenuAction\n import io.element.android.features.roomlist.impl.components.RoomListTopBar\n import io.element.android.features.roomlist.impl.model.RoomListRoomSummary\n import io.element.android.features.roomlist.impl.search.RoomListSearchView\n+import io.element.android.libraries.androidutils.throttler.FirstThrottler\n import io.element.android.libraries.designsystem.preview.ElementPreview\n import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n import io.element.android.libraries.designsystem.theme.components.FloatingActionButton\n@@ -54,6 +57,9 @@ fun RoomListView(\n modifier: Modifier = Modifier,\n acceptDeclineInviteView: @Composable () -> Unit,\n ) {\n+ val coroutineScope = rememberCoroutineScope()\n+ val firstThrottler = remember { FirstThrottler(300, coroutineScope) }\n+\n ConnectivityIndicatorContainer(\n modifier = modifier,\n isOnline = state.hasNetworkConnection,\n@@ -83,9 +89,9 @@ fun RoomListView(\n state = state,\n onSetUpRecoveryClick = onSetUpRecoveryClick,\n onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,\n- onRoomClick = onRoomClick,\n- onOpenSettings = onSettingsClick,\n- onCreateRoomClick = onCreateRoomClick,\n+ onRoomClick = { if (firstThrottler.canHandle()) onRoomClick(it) },\n+ onOpenSettings = { if (firstThrottler.canHandle()) onSettingsClick() },\n+ onCreateRoomClick = { if (firstThrottler.canHandle()) onCreateRoomClick() },\n onMenuActionClick = onMenuActionClick,\n modifier = Modifier.padding(top = topPadding),\n )\n@@ -94,7 +100,7 @@ fun RoomListView(\n state = state.searchState,\n eventSink = state.eventSink,\n hideInvitesAvatars = state.hideInvitesAvatars,\n- onRoomClick = onRoomClick,\n+ onRoomClick = { if (firstThrottler.canHandle()) onRoomClick(it) },\n modifier = Modifier\n .statusBarsPadding()\n .padding(top = topPadding)\ndiff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottler.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottler.kt\nindex 30919d52282..8f6766cdd6c 100644\n--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottler.kt\n+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottler.kt\n@@ -6,36 +6,29 @@\n */\n package io.element.android.libraries.androidutils.throttler\n \n-import android.os.SystemClock\n+import kotlinx.coroutines.CoroutineScope\n+import kotlinx.coroutines.delay\n+import kotlinx.coroutines.launch\n+import java.util.concurrent.atomic.AtomicBoolean\n \n /**\n * Simple ThrottleFirst\n * See https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleFirst.png\n */\n-class FirstThrottler(private val minimumInterval: Long = 800) {\n- private var lastDate = 0L\n+class FirstThrottler(\n+ private val minimumInterval: Long = 800,\n+ private val coroutineScope: CoroutineScope,\n+) {\n+ private val canHandle = AtomicBoolean(true)\n \n- sealed interface CanHandleResult {\n- data object Yes : CanHandleResult\n- data class No(val shouldWaitMillis: Long) : CanHandleResult\n-\n- fun waitMillis(): Long {\n- return when (this) {\n- Yes -> 0\n- is No -> shouldWaitMillis\n+ fun canHandle(): Boolean {\n+ return canHandle.getAndSet(false).also { result ->\n+ if (result) {\n+ coroutineScope.launch {\n+ delay(minimumInterval)\n+ canHandle.set(true)\n+ }\n }\n }\n }\n-\n- fun canHandle(): CanHandleResult {\n- val now = SystemClock.elapsedRealtime()\n- val delaySinceLast = now - lastDate\n- if (delaySinceLast > minimumInterval) {\n- lastDate = now\n- return CanHandleResult.Yes\n- }\n-\n- // Too early\n- return CanHandleResult.No(minimumInterval - delaySinceLast)\n- }\n }\n", "test_patch": "diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt\nindex ee4cc0b5642..0242591f55b 100644\n--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt\n+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt\n@@ -5,6 +5,8 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n+@file:OptIn(ExperimentalCoroutinesApi::class)\n+\n package io.element.android.features.roomlist.impl\n \n import androidx.activity.ComponentActivity\n@@ -27,6 +29,7 @@ import io.element.android.tests.testutils.EventsRecorder\n import io.element.android.tests.testutils.clickOn\n import io.element.android.tests.testutils.ensureCalledOnce\n import io.element.android.tests.testutils.ensureCalledOnceWithParam\n+import kotlinx.coroutines.ExperimentalCoroutinesApi\n import org.junit.Rule\n import org.junit.Test\n import org.junit.rules.TestRule\n@@ -168,6 +171,29 @@ class RoomListViewTest {\n eventsRecorder.assertEmpty()\n }\n \n+ @Test\n+ fun `clicking on a room twice invokes the expected callback only once`() {\n+ val eventsRecorder = EventsRecorder()\n+ val state = aRoomListState(\n+ eventSink = eventsRecorder,\n+ )\n+ val room0 = state.contentAsRooms().summaries.first {\n+ it.displayType == RoomSummaryDisplayType.ROOM\n+ }\n+ ensureCalledOnceWithParam(room0.roomId) { callback ->\n+ rule.setRoomListView(\n+ state = state,\n+ onRoomClick = callback,\n+ )\n+ // Remove automatic initial events\n+ eventsRecorder.clear()\n+ rule.onNodeWithText(room0.lastMessage!!.toString())\n+ .performClick()\n+ .performClick()\n+ }\n+ eventsRecorder.assertEmpty()\n+ }\n+\n @Test\n fun `long clicking on a room emits the expected Event`() {\n val eventsRecorder = EventsRecorder()\ndiff --git a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottlerTest.kt b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottlerTest.kt\nnew file mode 100644\nindex 00000000000..f33a3f237a8\n--- /dev/null\n+++ b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottlerTest.kt\n@@ -0,0 +1,32 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+@file:OptIn(ExperimentalCoroutinesApi::class)\n+\n+package io.element.android.libraries.androidutils.throttler\n+\n+import com.google.common.truth.Truth.assertThat\n+import kotlinx.coroutines.ExperimentalCoroutinesApi\n+import kotlinx.coroutines.test.advanceTimeBy\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Test\n+\n+class FirstThrottlerTest {\n+ @Test\n+ fun `throttle canHandle returns the expected result`() = runTest {\n+ val throttler = FirstThrottler(\n+ minimumInterval = 300,\n+ coroutineScope = backgroundScope,\n+ )\n+ assertThat(throttler.canHandle()).isTrue()\n+ assertThat(throttler.canHandle()).isFalse()\n+ advanceTimeBy(200)\n+ assertThat(throttler.canHandle()).isFalse()\n+ advanceTimeBy(110)\n+ assertThat(throttler.canHandle()).isTrue()\n+ }\n+}\n", "n2p_tests": "{\"io.element.android.features.roomlist.impl.RoomListViewTest.clicking on continue recovery key banner invokes the expected callback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListViewTest.clicking on a room twice invokes the expected callback only once\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListViewTest.clicking on close recovery key banner emits the expected Event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListViewTest.clicking on accept and decline invite emits the expected Events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.androidutils.throttler.FirstThrottlerTest.throttle canHandle returns the expected result\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListViewTest.clicking on a room setting invokes the expected callback and emits expected Event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"io.element.android.features.roomlist.impl.RoomListViewTest.long clicking on a room emits the expected Event\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"io.element.android.features.roomlist.impl.RoomListViewTest.clicking on close setup key banner emits the expected Event\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListViewTest.clicking on continue setup key banner invokes the expected callback\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListViewTest.displaying the view automatically sends a couple of UpdateVisibleRangeEvents\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListViewTest.clicking on a room invokes the expected callback\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListViewTest.clicking on start chat when the session has no room invokes the expected callback\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-4635", "org": "element-hq", "repo": "element-x-android", "number": 4635, "state": "closed", "title": "Render caller avatar on Incoming call screen", "body": "\r\n \r\n## Content\r\n\r\nEnsure that the image loader is set, else the IncomingCallActivity will not be able to render the avatar.\r\n\r\n\r\nNote that this is a temporary fix, we may want to revisit how we handle the Coil image loader singleton.\r\n\r\nThis PR also ensure that a background color is set else we can end up with light text on light background. \r\n\r\n## Motivation and context\r\n\r\n\r\nFixes #4633\r\nFixes #4629 \r\n\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\n\r\n|Before|After|\r\n|-|-|\r\n|![IncomingCall-Before2](https://github.com/user-attachments/assets/09a0846b-5769-413a-ae15-c3fb310c8123)|![IncomingCall-After](https://github.com/user-attachments/assets/3d72958c-2165-4b9d-a552-a1fce2b94a71)|\r\n\r\n\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Set the system color to light\r\n- Set the app theme to dark\r\n- Kill the app\r\n- Lock the device (screen is off)\r\n- Receive a call from a DM where other user has an avatar\r\n- Observe that the screen now renders the caller avatar and is rendering light text on dark background. Previously it was only rendering initials avatar, with light text on light background.\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 24\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"76e1612e74051ea4c96dd305908424a67fec5e09\"}", "resolved_issues": "[{\"number\": 4629, \"title\": \"EC 1:1 incoming call: still displayed in light color under certain conditions.\", \"body\": \"### Steps to reproduce\\n\\n1. If EXA is running, kill it first;\\n2. Start EXA, then remove it from the recent tasks list (make sure EXA disables battery optimization and allows running in the background);\\n3. Lock the phone (the screen needs to be turned off) and wait for an incoming call, then answer the call.\\n\\n### Outcome\\n\\n#### What did you expect?\\nn/a\\n\\n#### What happened instead?\\n![Image](https://github.com/user-attachments/assets/1e5aed5f-4db8-42d9-8d0d-5c7b3aca9876)![Image](https://github.com/user-attachments/assets/93188154-f422-46f4-93ac-d1f029941611)\\n\\nAt this time, the incoming call interface and EC WebUI are displayed in light color, regardless of the color setting of EXA.\\n**This phenomenon only occurs once since the last time EXA was started**, and each subsequent incoming call can return to normal.\\n\\n### Your phone model\\n\\nOnePlus MT2111\\n\\n### Operating system version\\n\\nOxygen OS 15 (Android 15)\\n\\n### Application version and app store\\n\\nElement X for Android 25.4.3\\n\\n### Homeserver\\n\\nSynapse 1.128.0\\n\\n### Will you send logs?\\n\\nNo\\n\\n### Are you willing to provide a PR?\\n\\nNo\"}, {\"number\": 4633, \"title\": \"Incoming Call screen does not render the caller avatar\", \"body\": \"### Steps to reproduce\\n\\n1. Kill the application\\n2. Lock the screen\\n3. Receive a call from someone who has set an avatar\\n\\n\\n### Outcome\\n\\n#### What did you expect?\\n\\nThe incoming call screen (IncomingCallActivity) render the caller avatar\\n\\n#### What happened instead?\\n\\nThe incoming call screen render an fallback initial avatar\\n\\nFrom the log:\\n\\n> java.lang.IllegalStateException: Unable to create a fetcher that supports: AvatarData(id=@user:matrix.org, name=Benoit, url=mxc://matrix.org/jRqrnjimPBREDACTED, size=IncomingCall)\\n\\nSo it seems that the `DefaultLoggedInImageLoaderFactory` is not correctly set in this configuration.\\n\\n### Your phone model\\n\\nEmu on API 35\\n\\n### Operating system version\\n\\nAndroid 15\\n\\n### Application version and app store\\n\\nLatest develop\\n\\n### Homeserver\\n\\nAny\\n\\n### Will you send logs?\\n\\nYes\\n\\n### Are you willing to provide a PR?\\n\\nYes\"}]", "lang": "kotlin", "problem_statement": "EC 1:1 incoming call: still displayed in light color under certain conditions.\n### Steps to reproduce\n\n1. If EXA is running, kill it first;\n2. Start EXA, then remove it from the recent tasks list (make sure EXA disables battery optimization and allows running in the background);\n3. Lock the phone (the screen needs to be turned off) and wait for an incoming call, then answer the call.\n\n### Outcome\n\n#### What did you expect?\nn/a\n\n#### What happened instead?\n![Image](https://github.com/user-attachments/assets/1e5aed5f-4db8-42d9-8d0d-5c7b3aca9876)![Image](https://github.com/user-attachments/assets/93188154-f422-46f4-93ac-d1f029941611)\n\nAt this time, the incoming call interface and EC WebUI are displayed in light color, regardless of the color setting of EXA.\n**This phenomenon only occurs once since the last time EXA was started**, and each subsequent incoming call can return to normal.\n\n### Your phone model\n\nOnePlus MT2111\n\n### Operating system version\n\nOxygen OS 15 (Android 15)\n\n### Application version and app store\n\nElement X for Android 25.4.3\n\n### Homeserver\n\nSynapse 1.128.0\n\n### Will you send logs?\n\nNo\n\n### Are you willing to provide a PR?\n\nNo\nIncoming Call screen does not render the caller avatar\n### Steps to reproduce\n\n1. Kill the application\n2. Lock the screen\n3. Receive a call from someone who has set an avatar\n\n\n### Outcome\n\n#### What did you expect?\n\nThe incoming call screen (IncomingCallActivity) render the caller avatar\n\n#### What happened instead?\n\nThe incoming call screen render an fallback initial avatar\n\nFrom the log:\n\n> java.lang.IllegalStateException: Unable to create a fetcher that supports: AvatarData(id=@user:matrix.org, name=Benoit, url=mxc://matrix.org/jRqrnjimPBREDACTED, size=IncomingCall)\n\nSo it seems that the `DefaultLoggedInImageLoaderFactory` is not correctly set in this configuration.\n\n### Your phone model\n\nEmu on API 35\n\n### Operating system version\n\nAndroid 15\n\n### Application version and app store\n\nLatest develop\n\n### Homeserver\n\nAny\n\n### Will you send logs?\n\nYes\n\n### Are you willing to provide a PR?\n\nYes\n", "hints": "Hello @YamatoRyou , I cannot reproduce this issue on my device, nor on my emulator, both running Android 15 OS.\n\nDo you have more details to provide?\n\nBut I have discovered this issue, which is related to this screen: #4633\n> Hello [@YamatoRyou](https://github.com/YamatoRyou) , I cannot reproduce this issue on my device, nor on my emulator, both running Android 15 OS.\n> \n> Do you have more details to provide?\n> \n> But I have discovered this issue, which is related to this screen: [#4633](https://github.com/element-hq/element-x-android/issues/4633)\n\nThe following steps can be added to increase the chances of reproducing the problem:\n4. Set the system's color scheme to light;\n5. Set EXA's color scheme to dark.\n6. Repeat steps 1 to 3 mentioned above.\n\n", "pull_url": "https://github.com/element-hq/element-x-android/pull/4635", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/4629\", \"https://github.com/element-hq/element-x-android/issues/4633\"]", "test_command": "./gradlew :features:call:impl:testDebugUnitTest --tests \"io.element.android.features.call.utils.DefaultActiveCallManagerTest\"", "fix_patch": "diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/ActiveCallManager.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/ActiveCallManager.kt\nindex 59e19d3fe2f..8804a91f79f 100644\n--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/ActiveCallManager.kt\n+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/ActiveCallManager.kt\n@@ -13,6 +13,8 @@ import android.os.PowerManager\n import androidx.annotation.VisibleForTesting\n import androidx.core.app.NotificationManagerCompat\n import androidx.core.content.getSystemService\n+import coil3.SingletonImageLoader\n+import coil3.annotation.DelicateCoilApi\n import com.squareup.anvil.annotations.ContributesBinding\n import io.element.android.appconfig.ElementCallConfig\n import io.element.android.features.call.api.CallType\n@@ -23,6 +25,8 @@ import io.element.android.libraries.di.AppScope\n import io.element.android.libraries.di.ApplicationContext\n import io.element.android.libraries.di.SingleIn\n import io.element.android.libraries.matrix.api.MatrixClientProvider\n+import io.element.android.libraries.matrix.api.core.SessionId\n+import io.element.android.libraries.matrix.ui.media.ImageLoaderHolder\n import io.element.android.libraries.push.api.notifications.ForegroundServiceType\n import io.element.android.libraries.push.api.notifications.NotificationIdProvider\n import io.element.android.libraries.push.api.notifications.OnMissedCallNotificationHandler\n@@ -89,6 +93,7 @@ class DefaultActiveCallManager @Inject constructor(\n private val matrixClientProvider: MatrixClientProvider,\n private val defaultCurrentCallService: DefaultCurrentCallService,\n private val appForegroundStateService: AppForegroundStateService,\n+ private val imageLoaderHolder: ImageLoaderHolder,\n ) : ActiveCallManager {\n private val tag = \"DefaultActiveCallManager\"\n private var timedOutCallJob: Job? = null\n@@ -125,6 +130,7 @@ class DefaultActiveCallManager @Inject constructor(\n )\n \n timedOutCallJob = coroutineScope.launch {\n+ setUpCoil(notificationData.sessionId)\n showIncomingCallNotification(notificationData)\n \n // Wait for the ringing call to time out\n@@ -140,6 +146,13 @@ class DefaultActiveCallManager @Inject constructor(\n }\n }\n \n+ @OptIn(DelicateCoilApi::class)\n+ private suspend fun setUpCoil(sessionId: SessionId) {\n+ val matrixClient = matrixClientProvider.getOrRestore(sessionId).getOrNull() ?: return\n+ // Ensure that the image loader is set, else the IncomingCallActivity will not be able to render the caller avatar\n+ SingletonImageLoader.setUnsafe(imageLoaderHolder.get(matrixClient))\n+ }\n+\n /**\n * Called when the incoming call timed out. It will remove the active call and remove any associated UI, adding a 'missed call' notification.\n */\ndiff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/OnboardingBackground.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/OnboardingBackground.kt\nindex 8ea58deb40c..b4830e0904a 100644\n--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/OnboardingBackground.kt\n+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/OnboardingBackground.kt\n@@ -8,6 +8,7 @@\n package io.element.android.libraries.designsystem.background\n \n import androidx.compose.foundation.Canvas\n+import androidx.compose.foundation.background\n import androidx.compose.foundation.layout.Box\n import androidx.compose.foundation.layout.fillMaxSize\n import androidx.compose.foundation.layout.fillMaxWidth\n@@ -32,13 +33,17 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n @Suppress(\"ModifierMissing\")\n @Composable\n fun OnboardingBackground() {\n- Box(modifier = Modifier.fillMaxSize()) {\n+ Box(\n+ modifier = Modifier\n+ .fillMaxSize()\n+ .background(ElementTheme.colors.bgCanvasDefault)\n+ ) {\n val isLightTheme = ElementTheme.isLightTheme\n Canvas(\n modifier = Modifier\n- .fillMaxWidth()\n- .height(220.dp)\n- .align(Alignment.BottomCenter)\n+ .fillMaxWidth()\n+ .height(220.dp)\n+ .align(Alignment.BottomCenter)\n ) {\n val gradientBrush = ShaderBrush(\n LinearGradientShader(\n", "test_patch": "diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultActiveCallManagerTest.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultActiveCallManagerTest.kt\nindex 5f7309344a4..2059e9836e4 100644\n--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultActiveCallManagerTest.kt\n+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultActiveCallManagerTest.kt\n@@ -325,5 +325,6 @@ class DefaultActiveCallManagerTest {\n matrixClientProvider = matrixClientProvider,\n defaultCurrentCallService = DefaultCurrentCallService(),\n appForegroundStateService = FakeAppForegroundStateService(),\n+ imageLoaderHolder = FakeImageLoaderHolder(),\n )\n }\n", "n2p_tests": "{\"io.element.android.features.call.utils.DefaultActiveCallManagerTest.observeRingingCalls - will cancel the active ringing call if the call is cancelled\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"io.element.android.features.call.utils.DefaultActiveCallManagerTest.hungUpCall - removes existing call if the CallType matches\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.call.utils.DefaultActiveCallManagerTest.joinedCall - register an ongoing call and tries sending the call notify event\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.call.utils.DefaultActiveCallManagerTest.hungUpCall - does nothing if the CallType doesn't match\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.call.utils.DefaultActiveCallManagerTest.observeRingingCalls - will do nothing if either the session or the room are not found\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.call.utils.DefaultActiveCallManagerTest.registerIncomingCall - sets the incoming call as active\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.call.utils.DefaultActiveCallManagerTest.incomingCallTimedOut - when there isn't an active call does nothing\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.call.utils.DefaultActiveCallManagerTest.registerIncomingCall - when there is an already active call adds missed call notification\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.call.utils.DefaultActiveCallManagerTest.incomingCallTimedOut - when there is an active call removes it and adds a missed call notification\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-4553", "org": "element-hq", "repo": "element-x-android", "number": 4553, "state": "closed", "title": "Update wording for push provider support test. (#4079)", "body": "\r\n \r\n## Content\r\n\r\n\r\nUpdate wording of the notification test about push provider support.\r\nThe text is quite similar, so its OK if translations are updated later. Created a `success_2` though, since we do not need a plural anymore.\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #4079\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\n|Before|After|\r\n|-|-|\r\n|\"image\"|\"image\"|\r\n\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Step 1\r\n- Step 2\r\n- Step ...\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [ ] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 24\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"20ac0f90e4a585393df802f2d32554c73fdad904\"}", "resolved_issues": "[{\"number\": 4079, \"title\": \"Firebase Error on LineageOS\", \"body\": \"### Steps to reproduce\\r\\n\\r\\n1. Install Element X on a LineageOS mobile phone\\r\\n2. Start it and login to your homeserver\\r\\n3. After logging in, an error appears that push notifications might not be available because of \\\"other error\\\"\\r\\n4. Click on \\\"Settings\\\" and click on \\\"Fix\\\" (i translated them myself from german -> english, so maybe they are not 100% the same wordings)\\r\\n5. Error will appear\\r\\n\\r\\n\\r\\n### Outcome\\r\\n![signal-2024-12-20-121052](https://github.com/user-attachments/assets/5550ff7e-249a-4788-9ec8-1edb38bd6c8d)\\r\\n\\r\\n#### What did you expect?\\r\\nNo error at all\\r\\n\\r\\n#### What happened instead?\\r\\nAn error and probably no push notifications at all\\r\\n\\r\\n\\r\\n### Your phone model\\r\\n\\r\\nOnePlus 11\\r\\n\\r\\n### Operating system version\\r\\n\\r\\nLineageOS 21\\r\\n\\r\\n### Application version and app store\\r\\n\\r\\n0.7.5\\r\\n\\r\\n### Homeserver\\r\\n\\r\\nSynapse 1.121.1 on debian trixie\\r\\n\\r\\n### Will you send logs?\\r\\n\\r\\nYes\\r\\n\\r\\n### Are you willing to provide a PR?\\r\\n\\r\\nNo\"}]", "lang": "kotlin", "problem_statement": "Firebase Error on LineageOS\n### Steps to reproduce\r\n\r\n1. Install Element X on a LineageOS mobile phone\r\n2. Start it and login to your homeserver\r\n3. After logging in, an error appears that push notifications might not be available because of \"other error\"\r\n4. Click on \"Settings\" and click on \"Fix\" (i translated them myself from german -> english, so maybe they are not 100% the same wordings)\r\n5. Error will appear\r\n\r\n\r\n### Outcome\r\n![signal-2024-12-20-121052](https://github.com/user-attachments/assets/5550ff7e-249a-4788-9ec8-1edb38bd6c8d)\r\n\r\n#### What did you expect?\r\nNo error at all\r\n\r\n#### What happened instead?\r\nAn error and probably no push notifications at all\r\n\r\n\r\n### Your phone model\r\n\r\nOnePlus 11\r\n\r\n### Operating system version\r\n\r\nLineageOS 21\r\n\r\n### Application version and app store\r\n\r\n0.7.5\r\n\r\n### Homeserver\r\n\r\nSynapse 1.121.1 on debian trixie\r\n\r\n### Will you send logs?\r\n\r\nYes\r\n\r\n### Are you willing to provide a PR?\r\n\r\nNo\n", "hints": "Yes, so what is the exact problem? If you have LineageOS without google apps installed, there will be no Google push available. If you do have the whole Google shebang installed, it should be working.\nIt says firebase is available and a line below it says firebase not available. My assumption is that the text is misleading, if thats the correct behaviour.\r\nI am not familiar with the push magic behind all those apps, so i assume firebase is the google push server. I installed ntfy as alternative, because thats the non-google push service, right? when firebase is not available, i would expect that to be used. Without an error. \nIn the troubleshoot notification test suite, this test:\r\n\r\n\"image\"\r\n\r\n(in English)\r\n\r\n\"image\"\r\n\r\nis actually confirming that the application is able to use Firebase, if it is installed on the device. It is a check that our internal module interacting with Firebase is included in the build.\r\n\r\nI also think that the wording may be a bit confusing.\r\n\r\nWe may want to change the wording `Detect push providers` to something else like `Detect push provider plugins` or something else.\nThanks, that makes a bit more sense then. \r\nIf my text is correct from https://github.com/element-hq/element-x-android/issues/4079#issuecomment-2558454340, it is still somehow confusing because i use LineageOS without any google services. Why is firebase available at all when its \"google-free\"? Is this a problem in LineageOS? The other thing is, firebase is available but seems like non-functioning? Why is UnifiedPush then not used? And why cant i change that in element x on android?\nOnly the code in Element X Android is available to manage Firebase Push for you. But Firebase is not available, conformed by this other test:\r\n\r\n\"image\"\r\n\r\nFor instance, if a user installs Element X Android from F-Droid (https://f-droid.org/packages/io.element.android.x/), the application will not have the code to manage Firebase, even if Firebase (Google Play Service) is available on their device.\nI see, so firebase is available when i install element x from google play store but when i use fdroid, that function is not available at all? so why list it then there? for me, as a bit more technical user, i am highly confused by that and it looks like something is wrong with my mobile phone. Also, i would not say \"Firebase ist nicht verf\u00fcgbar\" which means its not there at all, i would use something like \"Firebase inkompatibel mit Custom-ROM\" or so. \r\nI installed it from fdroid on a google-free phone, why is there firebase then and those checks? i am now really confused.\r\nI will install it with aurora (google play store wrapper) and see how that behaves. \r\n\r\nEdit: installed it now with aurora and get the same error. Just to be sure i will install it later again from fdroid\nWould it bit clearer with this wording?\r\n\r\n\"image\"\r\n\nAbsolutely! Just a bit much text but it makes now 100% more sense (imo).\r\nOr maybe \"The application was built with support for: Firebase, UnifiedPush\" ? Reminds me a bit of -configure flags in the linux c world :)\n`support` is the word I was looking for, thanks!", "pull_url": "https://github.com/element-hq/element-x-android/pull/4553", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/4079\"]", "test_command": "./gradlew :libraries:push:impl:testDebugUnitTest --tests \"io.element.android.libraries.push.impl.troubleshoot.PushProvidersTestTest\"", "fix_patch": "diff --git a/libraries/push/impl/src/main/res/values/localazy.xml b/libraries/push/impl/src/main/res/values/localazy.xml\nindex 5c6c852f145..9860c8bef7f 100644\n--- a/libraries/push/impl/src/main/res/values/localazy.xml\n+++ b/libraries/push/impl/src/main/res/values/localazy.xml\n@@ -58,13 +58,14 @@\n \"No push providers selected.\"\n \"Current push provider: %1$s.\"\n \"Current push provider\"\n- \"Ensure that the application has at least one push provider.\"\n- \"No push providers found.\"\n+ \"Ensure that the application supports at least one push provider.\"\n+ \"No push provider support found.\"\n \n \"Found %1$d push provider: %2$s\"\n \"Found %1$d push providers: %2$s\"\n \n- \"Detect push providers\"\n+ \"The application was built with support for: %1$s\"\n+ \"Push provider support\"\n \"Check that the application can display notification.\"\n \"The notification has not been clicked.\"\n \"Cannot display the notification.\"\n", "test_patch": "diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushProvidersTest.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushProvidersTest.kt\nindex d75c4f4d590..5a30db6f59e 100644\n--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushProvidersTest.kt\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushProvidersTest.kt\n@@ -38,10 +38,8 @@ class PushProvidersTest @Inject constructor(\n val result = sortedPushProvider.isNotEmpty()\n if (result) {\n delegate.updateState(\n- description = stringProvider.getQuantityString(\n- resId = R.plurals.troubleshoot_notifications_test_detect_push_provider_success,\n- quantity = sortedPushProvider.size,\n- sortedPushProvider.size,\n+ description = stringProvider.getString(\n+ resId = R.string.troubleshoot_notifications_test_detect_push_provider_success_2,\n sortedPushProvider.joinToString { it.name }\n ),\n status = NotificationTroubleshootTestState.Status.Success\ndiff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushProvidersTestTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushProvidersTestTest.kt\nindex cc4df51b556..8947b646a69 100644\n--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushProvidersTestTest.kt\n+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushProvidersTestTest.kt\n@@ -53,7 +53,6 @@ class PushProvidersTestTest {\n assertThat(awaitItem().status).isEqualTo(NotificationTroubleshootTestState.Status.InProgress)\n val lastItem = awaitItem()\n assertThat(lastItem.status).isEqualTo(NotificationTroubleshootTestState.Status.Success)\n- assertThat(lastItem.description).contains(\"2\")\n assertThat(lastItem.description).contains(\"foo\")\n assertThat(lastItem.description).contains(\"bar\")\n }\n", "n2p_tests": "{\"io.element.android.libraries.push.impl.troubleshoot.PushProvidersTestTest.test PushProvidersTest with 2 push providers\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.troubleshoot.PushProvidersTestTest.test PushProvidersTest with empty list\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-4301", "org": "element-hq", "repo": "element-x-android", "number": 4301, "state": "closed", "title": "Preload account urls", "body": "\r\n \r\n## Content\r\n\r\n\r\nPreload account management URL into SDK memory cache.\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #4300\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Signin using an OIDC managed account\r\n- Open the settings\r\n- All the items in the settings screen should load instantely.\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 24\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"1a7a8a860a3911bda5afb325b0613b10e64e4764\"}", "resolved_issues": "[{\"number\": 4300, \"title\": \"[Task] Preload account management URLs\", \"body\": \"A memory cache has been implemented in the SDK. See https://github.com/matrix-org/matrix-rust-sdk/pull/4663\\n\\nWe need the application to pre-load the 2 accounts management URLs to populate the in-memory cache. That way, when the user open the settings, the flickering will not be observed for the two entries:\\n\\n\\\"Image\\\"\\n\\nNote that if the app is started without network access, the url cannot be loaded and the settings entries will not be displayed.\\n\\nThere is no change expected on the setting screen, that should still requires the URLs from the SDK.\"}]", "lang": "kotlin", "problem_statement": "[Task] Preload account management URLs\nA memory cache has been implemented in the SDK. See https://github.com/matrix-org/matrix-rust-sdk/pull/4663\n\nWe need the application to pre-load the 2 accounts management URLs to populate the in-memory cache. That way, when the user open the settings, the flickering will not be observed for the two entries:\n\n\"Image\"\n\nNote that if the app is started without network access, the url cannot be loaded and the settings entries will not be displayed.\n\nThere is no change expected on the setting screen, that should still requires the URLs from the SDK.\n", "hints": NaN, "pull_url": "https://github.com/element-hq/element-x-android/pull/4301", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/4300\"]", "test_command": "./gradlew :features:preferences:impl:testDebugUnitTest --tests \"io.element.android.features.preferences.impl.root.PreferencesRootPresenterTest\" :appnav:testDebugUnitTest --tests \"io.element.android.appnav.loggedin.LoggedInPresenterTest\"", "fix_patch": "diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt\nindex 2539f9e1d54..fbecfeb60b8 100644\n--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt\n+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt\n@@ -26,6 +26,7 @@ import io.element.android.libraries.core.meta.BuildMeta\n import io.element.android.libraries.matrix.api.MatrixClient\n import io.element.android.libraries.matrix.api.encryption.EncryptionService\n import io.element.android.libraries.matrix.api.encryption.RecoveryState\n+import io.element.android.libraries.matrix.api.oidc.AccountManagementAction\n import io.element.android.libraries.matrix.api.roomlist.RoomListService\n import io.element.android.libraries.matrix.api.sync.SlidingSyncVersion\n import io.element.android.libraries.matrix.api.sync.SyncService\n@@ -35,6 +36,7 @@ import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatu\n import io.element.android.libraries.push.api.PushService\n import io.element.android.libraries.pushproviders.api.RegistrationFailure\n import io.element.android.services.analytics.api.AnalyticsService\n+import kotlinx.coroutines.CoroutineScope\n import kotlinx.coroutines.flow.combine\n import kotlinx.coroutines.flow.launchIn\n import kotlinx.coroutines.flow.onEach\n@@ -60,6 +62,7 @@ class LoggedInPresenter @Inject constructor(\n pushService.ignoreRegistrationError(matrixClient.sessionId)\n }.collectAsState(initial = false)\n val pusherRegistrationState = remember>> { mutableStateOf(AsyncData.Uninitialized) }\n+ LaunchedEffect(Unit) { preloadAccountManagementUrl() }\n LaunchedEffect(Unit) {\n sessionVerificationService.sessionVerifiedStatus\n .onEach { sessionVerifiedStatus ->\n@@ -202,4 +205,9 @@ class LoggedInPresenter @Inject constructor(\n analyticsService.capture(CryptoSessionStateChange(changeRecoveryState, changeVerificationState))\n }\n }\n+\n+ private fun CoroutineScope.preloadAccountManagementUrl() = launch {\n+ matrixClient.getAccountManagementUrl(AccountManagementAction.Profile)\n+ matrixClient.getAccountManagementUrl(AccountManagementAction.SessionsList)\n+ }\n }\n", "test_patch": "diff --git a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt\nindex bfd416eaf3a..aac40e000ce 100644\n--- a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt\n+++ b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt\n@@ -5,12 +5,11 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n+@file:OptIn(ExperimentalCoroutinesApi::class)\n+\n package io.element.android.appnav.loggedin\n \n-import app.cash.molecule.RecompositionMode\n-import app.cash.molecule.moleculeFlow\n import app.cash.turbine.ReceiveTurbine\n-import app.cash.turbine.test\n import com.google.common.truth.Truth.assertThat\n import im.vector.app.features.analytics.plan.CryptoSessionStateChange\n import im.vector.app.features.analytics.plan.UserProperties\n@@ -19,6 +18,7 @@ import io.element.android.libraries.matrix.api.MatrixClient\n import io.element.android.libraries.matrix.api.core.SessionId\n import io.element.android.libraries.matrix.api.encryption.EncryptionService\n import io.element.android.libraries.matrix.api.encryption.RecoveryState\n+import io.element.android.libraries.matrix.api.oidc.AccountManagementAction\n import io.element.android.libraries.matrix.api.roomlist.RoomListService\n import io.element.android.libraries.matrix.api.sync.SlidingSyncVersion\n import io.element.android.libraries.matrix.api.sync.SyncState\n@@ -45,8 +45,8 @@ import io.element.android.tests.testutils.lambda.any\n import io.element.android.tests.testutils.lambda.lambdaError\n import io.element.android.tests.testutils.lambda.lambdaRecorder\n import io.element.android.tests.testutils.lambda.value\n+import io.element.android.tests.testutils.test\n import kotlinx.coroutines.ExperimentalCoroutinesApi\n-import kotlinx.coroutines.test.TestScope\n import kotlinx.coroutines.test.advanceUntilIdle\n import kotlinx.coroutines.test.runTest\n import org.junit.Rule\n@@ -58,10 +58,7 @@ class LoggedInPresenterTest {\n \n @Test\n fun `present - initial state`() = runTest {\n- val presenter = createLoggedInPresenter()\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ createLoggedInPresenter().test {\n val initialState = awaitItem()\n assertThat(initialState.showSyncSpinner).isFalse()\n assertThat(initialState.pusherRegistrationState.isUninitialized()).isTrue()\n@@ -69,13 +66,32 @@ class LoggedInPresenterTest {\n }\n }\n \n+ @Test\n+ fun `present - ensure that account urls are preloaded`() = runTest {\n+ val accountManagementUrlResult = lambdaRecorder> { Result.success(\"aUrl\") }\n+ val matrixClient = FakeMatrixClient(\n+ accountManagementUrlResult = accountManagementUrlResult,\n+ )\n+ createLoggedInPresenter(\n+ matrixClient = matrixClient,\n+ ).test {\n+ awaitItem()\n+ advanceUntilIdle()\n+ accountManagementUrlResult.assertions().isCalledExactly(2)\n+ .withSequence(\n+ listOf(value(AccountManagementAction.Profile)),\n+ listOf(value(AccountManagementAction.SessionsList)),\n+ )\n+ }\n+ }\n+\n @Test\n fun `present - show sync spinner`() = runTest {\n val roomListService = FakeRoomListService()\n- val presenter = createLoggedInPresenter(roomListService, SyncState.Running)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ createLoggedInPresenter(\n+ syncState = SyncState.Running,\n+ matrixClient = FakeMatrixClient(roomListService = roomListService),\n+ ).test {\n val initialState = awaitItem()\n assertThat(initialState.showSyncSpinner).isFalse()\n roomListService.postSyncIndicator(RoomListService.SyncIndicator.Show)\n@@ -92,18 +108,18 @@ class LoggedInPresenterTest {\n val verificationService = FakeSessionVerificationService()\n val encryptionService = FakeEncryptionService()\n val buildMeta = aBuildMeta()\n- val presenter = LoggedInPresenter(\n- matrixClient = FakeMatrixClient(roomListService = roomListService, encryptionService = encryptionService),\n+ LoggedInPresenter(\n+ matrixClient = FakeMatrixClient(\n+ roomListService = roomListService,\n+ encryptionService = encryptionService,\n+ ),\n syncService = FakeSyncService(initialSyncState = SyncState.Running),\n pushService = FakePushService(),\n sessionVerificationService = verificationService,\n analyticsService = analyticsService,\n encryptionService = encryptionService,\n buildMeta = buildMeta,\n- )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ ).test {\n encryptionService.emitRecoveryState(RecoveryState.UNKNOWN)\n encryptionService.emitRecoveryState(RecoveryState.INCOMPLETE)\n verificationService.emitVerifiedStatus(SessionVerifiedStatus.Verified)\n@@ -129,13 +145,10 @@ class LoggedInPresenterTest {\n val verificationService = FakeSessionVerificationService(\n initialSessionVerifiedStatus = SessionVerifiedStatus.NotVerified\n )\n- val presenter = createLoggedInPresenter(\n+ createLoggedInPresenter(\n pushService = pushService,\n sessionVerificationService = verificationService,\n- )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ ).test {\n val finalState = awaitFirstItem()\n assertThat(finalState.pusherRegistrationState.errorOrNull())\n .isInstanceOf(PusherRegistrationFailure.AccountNotVerified::class.java)\n@@ -155,13 +168,13 @@ class LoggedInPresenterTest {\n val pushService = createFakePushService(\n registerWithLambda = lambda,\n )\n- val presenter = createLoggedInPresenter(\n+ createLoggedInPresenter(\n pushService = pushService,\n sessionVerificationService = sessionVerificationService,\n- )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ matrixClient = FakeMatrixClient(\n+ accountManagementUrlResult = { Result.success(null) },\n+ ),\n+ ).test {\n val finalState = awaitFirstItem()\n assertThat(finalState.pusherRegistrationState.isSuccess()).isTrue()\n lambda.assertions()\n@@ -188,13 +201,13 @@ class LoggedInPresenterTest {\n val pushService = createFakePushService(\n registerWithLambda = lambda,\n )\n- val presenter = createLoggedInPresenter(\n+ createLoggedInPresenter(\n pushService = pushService,\n sessionVerificationService = sessionVerificationService,\n- )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ matrixClient = FakeMatrixClient(\n+ accountManagementUrlResult = { Result.success(null) },\n+ ),\n+ ).test {\n val finalState = awaitFirstItem()\n assertThat(finalState.pusherRegistrationState.isFailure()).isTrue()\n lambda.assertions()\n@@ -233,13 +246,13 @@ class LoggedInPresenterTest {\n currentPushProvider = { pushProvider },\n registerWithLambda = lambda,\n )\n- val presenter = createLoggedInPresenter(\n+ createLoggedInPresenter(\n pushService = pushService,\n sessionVerificationService = sessionVerificationService,\n- )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ matrixClient = FakeMatrixClient(\n+ accountManagementUrlResult = { Result.success(null) },\n+ ),\n+ ).test {\n val finalState = awaitFirstItem()\n assertThat(finalState.pusherRegistrationState.isSuccess()).isTrue()\n lambda.assertions()\n@@ -277,13 +290,13 @@ class LoggedInPresenterTest {\n currentPushProvider = { pushProvider },\n registerWithLambda = lambda,\n )\n- val presenter = createLoggedInPresenter(\n+ createLoggedInPresenter(\n pushService = pushService,\n sessionVerificationService = sessionVerificationService,\n- )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ matrixClient = FakeMatrixClient(\n+ accountManagementUrlResult = { Result.success(null) },\n+ ),\n+ ).test {\n val finalState = awaitFirstItem()\n assertThat(finalState.pusherRegistrationState.isSuccess()).isTrue()\n lambda.assertions()\n@@ -317,13 +330,10 @@ class LoggedInPresenterTest {\n currentPushProvider = { pushProvider },\n registerWithLambda = lambda,\n )\n- val presenter = createLoggedInPresenter(\n+ createLoggedInPresenter(\n pushService = pushService,\n sessionVerificationService = sessionVerificationService,\n- )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ ).test {\n val finalState = awaitFirstItem()\n assertThat(finalState.pusherRegistrationState.errorOrNull())\n .isInstanceOf(PusherRegistrationFailure.NoDistributorsAvailable::class.java)\n@@ -345,13 +355,10 @@ class LoggedInPresenterTest {\n registerWithLambda = lambda,\n setIgnoreRegistrationErrorLambda = setIgnoreRegistrationErrorLambda,\n )\n- val presenter = createLoggedInPresenter(\n+ createLoggedInPresenter(\n pushService = pushService,\n sessionVerificationService = sessionVerificationService,\n- )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ ).test {\n val finalState = awaitFirstItem()\n assertThat(finalState.pusherRegistrationState.errorOrNull())\n .isInstanceOf(PusherRegistrationFailure.NoProvidersAvailable::class.java)\n@@ -394,13 +401,10 @@ class LoggedInPresenterTest {\n registerWithLambda = lambda,\n selectPushProviderLambda = selectPushProviderLambda,\n )\n- val presenter = createLoggedInPresenter(\n+ createLoggedInPresenter(\n pushService = pushService,\n sessionVerificationService = sessionVerificationService,\n- )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ ).test {\n val finalState = awaitFirstItem()\n assertThat(finalState.pusherRegistrationState.errorOrNull())\n .isInstanceOf(PusherRegistrationFailure.NoDistributorsAvailable::class.java)\n@@ -445,13 +449,13 @@ class LoggedInPresenterTest {\n pushProvider1 = pushProvider1,\n registerWithLambda = lambda,\n )\n- val presenter = createLoggedInPresenter(\n+ createLoggedInPresenter(\n pushService = pushService,\n sessionVerificationService = sessionVerificationService,\n- )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ matrixClient = FakeMatrixClient(\n+ accountManagementUrlResult = { Result.success(null) },\n+ ),\n+ ).test {\n val finalState = awaitFirstItem()\n assertThat(finalState.pusherRegistrationState.isSuccess()).isTrue()\n lambda.assertions().isCalledOnce()\n@@ -505,10 +509,9 @@ class LoggedInPresenterTest {\n currentSlidingSyncVersionLambda = { Result.success(SlidingSyncVersion.Proxy) },\n availableSlidingSyncVersionsLambda = { Result.success(listOf(SlidingSyncVersion.Native)) },\n )\n- val presenter = createLoggedInPresenter(matrixClient = matrixClient)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ createLoggedInPresenter(\n+ matrixClient = matrixClient,\n+ ).test {\n val initialState = awaitItem()\n assertThat(initialState.forceNativeSlidingSyncMigration).isFalse()\n \n@@ -526,13 +529,14 @@ class LoggedInPresenterTest {\n assertThat(ignoreSdkError).isTrue()\n null\n }\n- val matrixClient = FakeMatrixClient().apply {\n+ val matrixClient = FakeMatrixClient(\n+ accountManagementUrlResult = { Result.success(null) },\n+ ).apply {\n this.logoutLambda = logoutLambda\n }\n- val presenter = createLoggedInPresenter(matrixClient = matrixClient)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ createLoggedInPresenter(\n+ matrixClient = matrixClient,\n+ ).test {\n val initialState = awaitItem()\n \n initialState.eventSink(LoggedInEvents.LogoutAndMigrateToNativeSlidingSync)\n@@ -548,14 +552,15 @@ class LoggedInPresenterTest {\n return awaitItem()\n }\n \n- private fun TestScope.createLoggedInPresenter(\n- roomListService: RoomListService = FakeRoomListService(),\n+ private fun createLoggedInPresenter(\n syncState: SyncState = SyncState.Running,\n analyticsService: AnalyticsService = FakeAnalyticsService(),\n sessionVerificationService: SessionVerificationService = FakeSessionVerificationService(),\n encryptionService: EncryptionService = FakeEncryptionService(),\n pushService: PushService = FakePushService(),\n- matrixClient: MatrixClient = FakeMatrixClient(roomListService = roomListService),\n+ matrixClient: MatrixClient = FakeMatrixClient(\n+ accountManagementUrlResult = { Result.success(null) },\n+ ),\n buildMeta: BuildMeta = aBuildMeta(),\n ): LoggedInPresenter {\n return LoggedInPresenter(\ndiff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt\nindex 6f85c436210..72ae8bdb10e 100644\n--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt\n+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt\n@@ -5,12 +5,11 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n+@file:OptIn(ExperimentalCoroutinesApi::class)\n+\n package io.element.android.features.preferences.impl.root\n \n-import app.cash.molecule.RecompositionMode\n-import app.cash.molecule.moleculeFlow\n import app.cash.turbine.ReceiveTurbine\n-import app.cash.turbine.test\n import com.google.common.truth.Truth.assertThat\n import io.element.android.features.logout.api.direct.aDirectLogoutState\n import io.element.android.features.preferences.impl.utils.ShowDeveloperSettingsProvider\n@@ -18,6 +17,7 @@ import io.element.android.libraries.core.meta.BuildType\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.indicator.impl.DefaultIndicatorService\n+import io.element.android.libraries.matrix.api.oidc.AccountManagementAction\n import io.element.android.libraries.matrix.api.user.MatrixUser\n import io.element.android.libraries.matrix.test.AN_AVATAR_URL\n import io.element.android.libraries.matrix.test.A_USER_NAME\n@@ -27,6 +27,10 @@ import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService\n import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService\n import io.element.android.services.analytics.test.FakeAnalyticsService\n import io.element.android.tests.testutils.WarmUpRule\n+import io.element.android.tests.testutils.lambda.lambdaRecorder\n+import io.element.android.tests.testutils.lambda.value\n+import io.element.android.tests.testutils.test\n+import kotlinx.coroutines.ExperimentalCoroutinesApi\n import kotlinx.coroutines.test.runTest\n import org.junit.Rule\n import org.junit.Test\n@@ -37,11 +41,16 @@ class PreferencesRootPresenterTest {\n \n @Test\n fun `present - initial state`() = runTest {\n- val matrixClient = FakeMatrixClient(canDeactivateAccountResult = { true })\n- val presenter = createPresenter(matrixClient = matrixClient)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ val accountManagementUrlResult = lambdaRecorder> { action ->\n+ Result.success(\"$action url\")\n+ }\n+ val matrixClient = FakeMatrixClient(\n+ canDeactivateAccountResult = { true },\n+ accountManagementUrlResult = accountManagementUrlResult,\n+ )\n+ createPresenter(\n+ matrixClient = matrixClient,\n+ ).test {\n val initialState = awaitItem()\n assertThat(initialState.myUser).isEqualTo(\n MatrixUser(\n@@ -71,19 +80,26 @@ class PreferencesRootPresenterTest {\n assertThat(loadedState.canDeactivateAccount).isTrue()\n assertThat(loadedState.directLogoutState).isEqualTo(aDirectLogoutState())\n assertThat(loadedState.snackbarMessage).isNull()\n+ skipItems(1)\n+ val finalState = awaitItem()\n+ accountManagementUrlResult.assertions().isCalledExactly(2)\n+ .withSequence(\n+ listOf(value(AccountManagementAction.Profile)),\n+ listOf(value(AccountManagementAction.SessionsList)),\n+ )\n+ assertThat(finalState.accountManagementUrl).isEqualTo(\"Profile url\")\n+ assertThat(finalState.devicesManagementUrl).isEqualTo(\"SessionsList url\")\n }\n }\n \n @Test\n fun `present - can deactivate account is false if the Matrix client say so`() = runTest {\n- val presenter = createPresenter(\n+ createPresenter(\n matrixClient = FakeMatrixClient(\n- canDeactivateAccountResult = { false }\n- )\n- )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ canDeactivateAccountResult = { false },\n+ accountManagementUrlResult = { Result.success(null) },\n+ ),\n+ ).test {\n val loadedState = awaitFirstItem()\n assertThat(loadedState.canDeactivateAccount).isFalse()\n }\n@@ -91,12 +107,13 @@ class PreferencesRootPresenterTest {\n \n @Test\n fun `present - developer settings is hidden by default in release builds`() = runTest {\n- val presenter = createPresenter(\n+ createPresenter(\n+ matrixClient = FakeMatrixClient(\n+ canDeactivateAccountResult = { true },\n+ accountManagementUrlResult = { Result.success(null) },\n+ ),\n showDeveloperSettingsProvider = ShowDeveloperSettingsProvider(aBuildMeta(BuildType.RELEASE))\n- )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ ).test {\n val loadedState = awaitFirstItem()\n assertThat(loadedState.showDeveloperSettings).isFalse()\n }\n@@ -104,12 +121,13 @@ class PreferencesRootPresenterTest {\n \n @Test\n fun `present - developer settings can be enabled in release builds`() = runTest {\n- val presenter = createPresenter(\n+ createPresenter(\n+ matrixClient = FakeMatrixClient(\n+ canDeactivateAccountResult = { true },\n+ accountManagementUrlResult = { Result.success(null) },\n+ ),\n showDeveloperSettingsProvider = ShowDeveloperSettingsProvider(aBuildMeta(BuildType.RELEASE))\n- )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ ).test {\n val loadedState = awaitFirstItem()\n repeat(times = ShowDeveloperSettingsProvider.DEVELOPER_SETTINGS_COUNTER) {\n assertThat(loadedState.showDeveloperSettings).isFalse()\n@@ -125,7 +143,7 @@ class PreferencesRootPresenterTest {\n }\n \n private fun createPresenter(\n- matrixClient: FakeMatrixClient = FakeMatrixClient(canDeactivateAccountResult = { true }),\n+ matrixClient: FakeMatrixClient = FakeMatrixClient(),\n sessionVerificationService: FakeSessionVerificationService = FakeSessionVerificationService(),\n showDeveloperSettingsProvider: ShowDeveloperSettingsProvider = ShowDeveloperSettingsProvider(aBuildMeta(BuildType.DEBUG)),\n ) = PreferencesRootPresenter(\ndiff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt\nindex 93c2d4c075a..030e8db7131 100644\n--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt\n+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt\n@@ -72,11 +72,11 @@ class FakeMatrixClient(\n private val syncService: FakeSyncService = FakeSyncService(),\n private val encryptionService: FakeEncryptionService = FakeEncryptionService(),\n private val roomDirectoryService: RoomDirectoryService = FakeRoomDirectoryService(),\n- private val accountManagementUrlString: Result = Result.success(null),\n+ private val accountManagementUrlResult: (AccountManagementAction?) -> Result = { lambdaError() },\n private val resolveRoomAliasResult: (RoomAlias) -> Result> = {\n Result.success(\n- Optional.of(ResolvedRoomAlias(A_ROOM_ID, emptyList()))\n- )\n+ Optional.of(ResolvedRoomAlias(A_ROOM_ID, emptyList()))\n+ )\n },\n private val getRoomPreviewResult: (RoomIdOrAlias, List) -> Result = { _, _ -> Result.failure(AN_EXCEPTION) },\n private val clearCacheLambda: () -> Unit = { lambdaError() },\n@@ -192,8 +192,8 @@ class FakeMatrixClient(\n return Result.success(result)\n }\n \n- override suspend fun getAccountManagementUrl(action: AccountManagementAction?): Result {\n- return accountManagementUrlString\n+ override suspend fun getAccountManagementUrl(action: AccountManagementAction?): Result = simulateLongTask {\n+ accountManagementUrlResult(action)\n }\n \n override suspend fun uploadMedia(\n", "n2p_tests": "{\"io.element.android.appnav.loggedin.LoggedInPresenterTest.present - ensure that account urls are preloaded\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.appnav.loggedin.LoggedInPresenterTest.present - CheckSlidingSyncProxyAvailability forces the sliding sync migration under the right circumstances\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.appnav.loggedin.LoggedInPresenterTest.present - case two push providers but first one does not have distributor - second one will be used\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"io.element.android.appnav.loggedin.LoggedInPresenterTest.present - report crypto status analytics\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"io.element.android.features.preferences.impl.root.PreferencesRootPresenterTest.present - developer settings is hidden by default in release builds\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.root.PreferencesRootPresenterTest.present - initial state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.appnav.loggedin.LoggedInPresenterTest.present - LogoutAndMigrateToNativeSlidingSync logs out the user\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.appnav.loggedin.LoggedInPresenterTest.present - case no push provider available provider\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.appnav.loggedin.LoggedInPresenterTest.present - show sync spinner\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.appnav.loggedin.LoggedInPresenterTest.present - case one push provider but no distributor available\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.appnav.loggedin.LoggedInPresenterTest.present - ensure default pusher is registered with default provider\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.root.PreferencesRootPresenterTest.present - can deactivate account is false if the Matrix client say so\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.appnav.loggedin.LoggedInPresenterTest.present - initial state\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.appnav.loggedin.LoggedInPresenterTest.present - ensure default pusher is not registered if session is not verified\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.appnav.loggedin.LoggedInPresenterTest.present - if current push provider does not have distributors, nothing happen\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.appnav.loggedin.LoggedInPresenterTest.present - ensure default pusher is registered with default provider - fail to register\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.appnav.loggedin.LoggedInPresenterTest.present - ensure current provider is registered with current distributor\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.preferences.impl.root.PreferencesRootPresenterTest.present - developer settings can be enabled in release builds\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.appnav.loggedin.LoggedInPresenterTest.present - if current push provider does not have current distributor, the first one is used\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-4209", "org": "element-hq", "repo": "element-x-android", "number": 4209, "state": "closed", "title": "Consider that the topic of a room has been removed when it's blank.", "body": "\r\n \r\n## Content\r\n\r\n\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #4206\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\n\"image\"\r\n\r\n## Tests\r\n\r\n\r\n\r\n- In a room, set the topic to \"\"\r\n- observe the rendering on the timeline.\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 24\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"ebfb47ed03f60c6ec828577ebb4bbf9b179f8e62\"}", "resolved_issues": "[{\"number\": 4206, \"title\": \"[Task] Show a blank topic as removed in the state event.\", \"body\": \"Please see and discuss the details in the meta issue (this fixes Problem 2).\"}]", "lang": "kotlin", "problem_statement": "[Task] Show a blank topic as removed in the state event.\nPlease see and discuss the details in the meta issue (this fixes Problem 2).\n", "hints": NaN, "pull_url": "https://github.com/element-hq/element-x-android/pull/4209", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/4206\"]", "test_command": "./gradlew :libraries:eventformatter:impl:testDebugUnitTest --tests \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest\"", "fix_patch": "diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt\nindex 493f5b1584e..3f0f4a1dc29 100644\n--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt\n+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt\n@@ -63,7 +63,7 @@ class StateContentFormatter @Inject constructor(\n }\n }\n is OtherState.RoomTopic -> {\n- val hasRoomTopic = content.topic != null\n+ val hasRoomTopic = content.topic?.isNotBlank() == true\n when {\n senderIsYou && hasRoomTopic -> sp.getString(R.string.state_event_room_topic_changed_by_you, content.topic)\n senderIsYou && !hasRoomTopic -> sp.getString(R.string.state_event_room_topic_removed_by_you)\n", "test_patch": "diff --git a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt\nindex 7090b2467b5..11b809258e9 100644\n--- a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt\n+++ b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt\n@@ -662,6 +662,7 @@ class DefaultRoomLastMessageFormatterTest {\n val roomTopic = \"New topic\"\n val changedContent = StateContent(\"\", OtherState.RoomTopic(roomTopic))\n val removedContent = StateContent(\"\", OtherState.RoomTopic(null))\n+ val blankContent = StateContent(\"\", OtherState.RoomTopic(\"\"))\n \n val youChangedRoomTopicEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent)\n val youChangedRoomTopic = formatter.format(youChangedRoomTopicEvent, false)\n@@ -678,6 +679,14 @@ class DefaultRoomLastMessageFormatterTest {\n val someoneRemovedRoomTopicEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)\n val someoneRemovedRoomTopic = formatter.format(someoneRemovedRoomTopicEvent, false)\n assertThat(someoneRemovedRoomTopic).isEqualTo(\"$otherName removed the room topic\")\n+\n+ val youSetBlankRoomTopicEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = blankContent)\n+ val youSetBlankRoomTopic = formatter.format(youSetBlankRoomTopicEvent, false)\n+ assertThat(youSetBlankRoomTopic).isEqualTo(\"You removed the room topic\")\n+\n+ val someoneSetBlankRoomTopicEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = blankContent)\n+ val someoneSetBlankRoomTopic = formatter.format(someoneSetBlankRoomTopicEvent, false)\n+ assertThat(someoneSetBlankRoomTopic).isEqualTo(\"$otherName removed the room topic\")\n }\n \n @Test\n", "n2p_tests": "{}", "f2p_tests": "{\"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Room state change - room topic\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Unable to decrypt content\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - knocked\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Room state change - create\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Computes last message for poll in DM\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - invitation accepted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Room state change - avatar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.FailedToParseMessageLike, FailedToParseState & Unknown content\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - kicked\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Computes last message for poll in room\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Profile change - display name\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - invited\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - joined\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - invitation rejected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - None\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - unban\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Profile change - avatar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Redacted content\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Message contents sent by other user\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - banned\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - knock denied\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - knock retracted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Sticker content\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Room state change - third party invite\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - others\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Room state change - room name\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Message contents sent by current user\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - left\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - invitation revoked\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - knock accepted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Profile change - display name & avatar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Room state change - encryption\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Room state change - others must return null\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-4205", "org": "element-hq", "repo": "element-x-android", "number": 4205, "state": "closed", "title": "Add ability to swipe between media when opened from the timeline.", "body": "\r\n \r\n## Content\r\n\r\n\r\nAdd ability to swipe between media when open from the timeline. Previously it was only possible to swipe when the media was opened from the media gallery.\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #4174 \r\nCloses #1484 \r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\nhttps://github.com/user-attachments/assets/79785009-813a-4f59-bd54-96bf7576d167\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Open a room with some media / files\r\n- Click on a media\r\n- Observe that you can now swipe left or right to navigate between the medias of the room.\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 24\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"9e5c5fa48a95940d3813c04d99c3e9720cfe61de\"}", "resolved_issues": "[{\"number\": 1484, \"title\": \"Add capability to swipe through images in a chat.\", \"body\": \"### Your use case\\r\\n\\r\\n#### What would you like to do?\\r\\nWhen viewing a image I would like to be able to swipe left/right to see the previous/next image.\\r\\n#### Why would you like to do it?\\r\\nTo be able to quickly watch and download multiple images.\\r\\n#### How would you like to achieve it?\\r\\nBy a swipe gesture.\\r\\n\\r\\n### Have you considered any alternatives?\\r\\n\\r\\nClosing the image again scrolling up in the timeline and pressing on the previous/next image.\\r\\n\\r\\n### Additional context\\r\\n\\r\\nSee also https://github.com/vector-im/element-x-ios/issues/1520\\r\\n\"}, {\"number\": 4174, \"title\": \"[Task] Attachment viewer: navigation by swiping left and right\", \"body\": \"Please see and discuss the details in the meta issue.\\n\\n(Note: this is actually #1484)\"}]", "lang": "kotlin", "problem_statement": "Add capability to swipe through images in a chat.\n### Your use case\r\n\r\n#### What would you like to do?\r\nWhen viewing a image I would like to be able to swipe left/right to see the previous/next image.\r\n#### Why would you like to do it?\r\nTo be able to quickly watch and download multiple images.\r\n#### How would you like to achieve it?\r\nBy a swipe gesture.\r\n\r\n### Have you considered any alternatives?\r\n\r\nClosing the image again scrolling up in the timeline and pressing on the previous/next image.\r\n\r\n### Additional context\r\n\r\nSee also https://github.com/vector-im/element-x-ios/issues/1520\r\n\n[Task] Attachment viewer: navigation by swiping left and right\nPlease see and discuss the details in the meta issue.\n\n(Note: this is actually #1484)\n", "hints": "\n", "pull_url": "https://github.com/element-hq/element-x-android/pull/4205", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/1484\", \"https://github.com/element-hq/element-x-android/issues/4174\"]", "test_command": "./gradlew :libraries:mediaviewer:impl:testDebugUnitTest --tests \"io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItemsTest\" --tests \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest\" --tests \"io.element.android.libraries.mediaviewer.impl.viewer.SingleMediaGalleryDataSourceTest\" --tests \"io.element.android.libraries.mediaviewer.impl.viewer.PagerKeysHandlerTest\" --tests \"io.element.android.libraries.mediaviewer.impl.datasource.DefaultEventItemFactoryTest\" --tests \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest\" --tests \"io.element.android.libraries.mediaviewer.impl.datasource.FocusedMediaTimelineTest\" --tests \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest\" --tests \"io.element.android.libraries.mediaviewer.impl.datasource.LiveMediaTimelineTest\" --tests \"io.element.android.libraries.mediaviewer.impl.datasource.MediaItemsPostProcessorTest\" --tests \"io.element.android.libraries.mediaviewer.impl.datasource.DefaultFocusedTimelineMediaGalleryDataSourceFactoryTest\" --tests \"io.element.android.libraries.mediaviewer.impl.datasource.TimelineMediaGalleryDataSourceTest\" :tests:konsist:testDebugUnitTest --tests \"io.element.android.tests.konsist.KonsistClassNameTest\"", "fix_patch": "diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt\nindex f9d9bbf27f0..6b84423d44f 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt\n@@ -123,6 +123,7 @@ class MessagesFlowNode @AssistedInject constructor(\n \n @Parcelize\n data class MediaViewer(\n+ val mode: MediaViewerEntryPoint.MediaViewerMode,\n val eventId: EventId?,\n val mediaInfo: MediaInfo,\n val mediaSource: MediaSource,\n@@ -248,8 +249,7 @@ class MessagesFlowNode @AssistedInject constructor(\n }\n is NavTarget.MediaViewer -> {\n val params = MediaViewerEntryPoint.Params(\n- // TODO When we will be able to load a media timeline from a EventId, change mode here (and use a mixed mode?)\n- mode = MediaViewerEntryPoint.MediaViewerMode.SingleMedia,\n+ mode = navTarget.mode,\n eventId = navTarget.eventId,\n mediaInfo = navTarget.mediaInfo,\n mediaSource = navTarget.mediaSource,\n@@ -362,6 +362,7 @@ class MessagesFlowNode @AssistedInject constructor(\n val navTarget = when (event.content) {\n is TimelineItemImageContent -> {\n buildMediaViewerNavTarget(\n+ mode = MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos,\n event = event,\n content = event.content,\n mediaSource = event.content.mediaSource,\n@@ -373,6 +374,7 @@ class MessagesFlowNode @AssistedInject constructor(\n if encrypted on certain bridges */\n event.content.preferredMediaSource?.let { preferredMediaSource ->\n buildMediaViewerNavTarget(\n+ mode = MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos,\n event = event,\n content = event.content,\n mediaSource = preferredMediaSource,\n@@ -382,6 +384,7 @@ class MessagesFlowNode @AssistedInject constructor(\n }\n is TimelineItemVideoContent -> {\n buildMediaViewerNavTarget(\n+ mode = MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos,\n event = event,\n content = event.content,\n mediaSource = event.content.mediaSource,\n@@ -390,6 +393,7 @@ class MessagesFlowNode @AssistedInject constructor(\n }\n is TimelineItemFileContent -> {\n buildMediaViewerNavTarget(\n+ mode = MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios,\n event = event,\n content = event.content,\n mediaSource = event.content.mediaSource,\n@@ -398,6 +402,7 @@ class MessagesFlowNode @AssistedInject constructor(\n }\n is TimelineItemAudioContent -> {\n buildMediaViewerNavTarget(\n+ mode = MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios,\n event = event,\n content = event.content,\n mediaSource = event.content.mediaSource,\n@@ -426,12 +431,14 @@ class MessagesFlowNode @AssistedInject constructor(\n }\n \n private fun buildMediaViewerNavTarget(\n+ mode: MediaViewerEntryPoint.MediaViewerMode,\n event: TimelineItem.Event,\n content: TimelineItemEventContentWithAttachment,\n mediaSource: MediaSource,\n thumbnailSource: MediaSource?,\n ): NavTarget {\n return NavTarget.MediaViewer(\n+ mode = mode,\n eventId = event.eventId,\n mediaInfo = MediaInfo(\n filename = content.filename,\ndiff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt\nindex bb86684be0a..4d5f8c7a193 100644\n--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt\n+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt\n@@ -118,8 +118,9 @@ interface MatrixRoom : Closeable {\n \n /**\n * Create a new timeline for the media events of the room.\n+ * @param eventId The event to focus on, if any.\n */\n- suspend fun mediaTimeline(): Result\n+ suspend fun mediaTimeline(eventId: EventId?): Result\n \n fun destroy()\n \ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt\nindex ab16ac383f5..911a62f376c 100644\n--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt\n@@ -253,11 +253,21 @@ class RustMatrixRoom(\n }\n }\n \n- override suspend fun mediaTimeline(): Result = withContext(roomDispatcher) {\n+ override suspend fun mediaTimeline(\n+ eventId: EventId?,\n+ ): Result = withContext(roomDispatcher) {\n+ val focus = if (eventId != null) {\n+ TimelineFocus.Event(\n+ eventId = eventId.value,\n+ numContextEvents = 50u,\n+ )\n+ } else {\n+ TimelineFocus.Live\n+ }\n runCatching {\n innerRoom.timelineWithConfiguration(\n configuration = TimelineConfiguration(\n- focus = TimelineFocus.Live,\n+ focus = focus,\n allowedMessageTypes = AllowedMessageTypes.Only(\n types = listOf(\n RoomMessageEventMessageType.FILE,\n@@ -270,7 +280,7 @@ class RustMatrixRoom(\n dateDividerMode = DateDividerMode.MONTHLY,\n )\n ).let { inner ->\n- createTimeline(inner, mode = Timeline.Mode.MEDIA)\n+ createTimeline(inner, mode = if (eventId != null) Timeline.Mode.FOCUSED_ON_EVENT else Timeline.Mode.MEDIA)\n }\n }.onFailure {\n if (it is CancellationException) {\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/EventItemFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/EventItemFactory.kt\nsimilarity index 98%\nrename from libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/EventItemFactory.kt\nrename to libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/EventItemFactory.kt\nindex 293329c2dd6..705921db8b3 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/EventItemFactory.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/EventItemFactory.kt\n@@ -5,7 +5,7 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.libraries.mediaviewer.impl.gallery\n+package io.element.android.libraries.mediaviewer.impl.datasource\n \n import io.element.android.libraries.androidutils.filesize.FileSizeFormatter\n import io.element.android.libraries.dateformatter.api.DateFormatter\n@@ -40,6 +40,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.getAvatarUrl\n import io.element.android.libraries.matrix.api.timeline.item.event.getDisambiguatedDisplayName\n import io.element.android.libraries.mediaviewer.api.MediaInfo\n import io.element.android.libraries.mediaviewer.api.util.FileExtensionExtractor\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n import timber.log.Timber\n import javax.inject.Inject\n \ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedTimelineMediaGalleryDataSourceFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedTimelineMediaGalleryDataSourceFactory.kt\nnew file mode 100644\nindex 00000000000..f7426aa4e95\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedTimelineMediaGalleryDataSourceFactory.kt\n@@ -0,0 +1,45 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.datasource\n+\n+import com.squareup.anvil.annotations.ContributesBinding\n+import io.element.android.libraries.di.RoomScope\n+import io.element.android.libraries.matrix.api.core.EventId\n+import io.element.android.libraries.matrix.api.room.MatrixRoom\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import javax.inject.Inject\n+\n+interface FocusedTimelineMediaGalleryDataSourceFactory {\n+ fun createFor(\n+ eventId: EventId,\n+ mediaItem: MediaItem.Event,\n+ ): MediaGalleryDataSource\n+}\n+\n+@ContributesBinding(RoomScope::class)\n+class DefaultFocusedTimelineMediaGalleryDataSourceFactory @Inject constructor(\n+ private val room: MatrixRoom,\n+ private val timelineMediaItemsFactory: TimelineMediaItemsFactory,\n+ private val mediaItemsPostProcessor: MediaItemsPostProcessor,\n+) : FocusedTimelineMediaGalleryDataSourceFactory {\n+ override fun createFor(\n+ eventId: EventId,\n+ mediaItem: MediaItem.Event,\n+ ): MediaGalleryDataSource {\n+ return TimelineMediaGalleryDataSource(\n+ room = room,\n+ mediaTimeline = FocusedMediaTimeline(\n+ room = room,\n+ eventId = eventId,\n+ initialMediaItem = mediaItem,\n+ ),\n+ timelineMediaItemsFactory = timelineMediaItemsFactory,\n+ mediaItemsPostProcessor = mediaItemsPostProcessor,\n+ )\n+ }\n+}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryDataSource.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaGalleryDataSource.kt\nsimilarity index 83%\nrename from libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryDataSource.kt\nrename to libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaGalleryDataSource.kt\nindex 0e126531086..4ad36d88277 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryDataSource.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaGalleryDataSource.kt\n@@ -5,7 +5,7 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.libraries.mediaviewer.impl.gallery\n+package io.element.android.libraries.mediaviewer.impl.datasource\n \n import com.squareup.anvil.annotations.ContributesBinding\n import io.element.android.libraries.architecture.AsyncData\n@@ -15,6 +15,7 @@ import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.room.MatrixRoom\n import io.element.android.libraries.matrix.api.timeline.Timeline\n import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId\n+import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems\n import kotlinx.coroutines.ExperimentalCoroutinesApi\n import kotlinx.coroutines.flow.Flow\n import kotlinx.coroutines.flow.MutableSharedFlow\n@@ -39,6 +40,7 @@ interface MediaGalleryDataSource {\n @ContributesBinding(RoomScope::class)\n class TimelineMediaGalleryDataSource @Inject constructor(\n private val room: MatrixRoom,\n+ private val mediaTimeline: MediaTimeline,\n private val timelineMediaItemsFactory: TimelineMediaItemsFactory,\n private val mediaItemsPostProcessor: MediaItemsPostProcessor,\n ) : MediaGalleryDataSource {\n@@ -48,7 +50,9 @@ class TimelineMediaGalleryDataSource @Inject constructor(\n \n override fun groupedMediaItemsFlow(): Flow> = groupedMediaItemsFlow\n \n- override fun getLastData(): AsyncData = groupedMediaItemsFlow.replayCache.firstOrNull() ?: AsyncData.Uninitialized\n+ override fun getLastData(): AsyncData = groupedMediaItemsFlow.replayCache.firstOrNull()\n+ ?: mediaTimeline.cache?.let { AsyncData.Success(it) }\n+ ?: AsyncData.Uninitialized\n \n private val isStarted = AtomicBoolean(false)\n \n@@ -58,8 +62,13 @@ class TimelineMediaGalleryDataSource @Inject constructor(\n return\n }\n flow {\n- groupedMediaItemsFlow.emit(AsyncData.Loading())\n- room.mediaTimeline().fold(\n+ val cache = mediaTimeline.cache\n+ if (cache != null) {\n+ groupedMediaItemsFlow.emit(AsyncData.Success(cache))\n+ } else {\n+ groupedMediaItemsFlow.emit(AsyncData.Loading())\n+ }\n+ mediaTimeline.getTimeline().fold(\n {\n timeline = it\n emit(it)\n@@ -78,6 +87,8 @@ class TimelineMediaGalleryDataSource @Inject constructor(\n timelineMediaItemsFactory.timelineItems\n }.map { timelineItems ->\n mediaItemsPostProcessor.process(mediaItems = timelineItems)\n+ }.map {\n+ mediaTimeline.orCache(it)\n }.onEach { groupedMediaItems ->\n groupedMediaItemsFlow.emit(AsyncData.Success(groupedMediaItems))\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessor.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaItemsPostProcessor.kt\nsimilarity index 92%\nrename from libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessor.kt\nrename to libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaItemsPostProcessor.kt\nindex 3fb8d81b1fd..1d3fd09a6cf 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessor.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaItemsPostProcessor.kt\n@@ -5,8 +5,10 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.libraries.mediaviewer.impl.gallery\n+package io.element.android.libraries.mediaviewer.impl.datasource\n \n+import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n import kotlinx.collections.immutable.toImmutableList\n import javax.inject.Inject\n \ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaTimeline.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaTimeline.kt\nnew file mode 100644\nindex 00000000000..6dc41361936\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaTimeline.kt\n@@ -0,0 +1,97 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.datasource\n+\n+import com.squareup.anvil.annotations.ContributesBinding\n+import io.element.android.libraries.di.RoomScope\n+import io.element.android.libraries.di.SingleIn\n+import io.element.android.libraries.matrix.api.core.EventId\n+import io.element.android.libraries.matrix.api.core.UniqueId\n+import io.element.android.libraries.matrix.api.room.MatrixRoom\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.hasEvent\n+import kotlinx.collections.immutable.persistentListOf\n+import kotlinx.coroutines.sync.Mutex\n+import kotlinx.coroutines.sync.withLock\n+import javax.inject.Inject\n+\n+interface MediaTimeline {\n+ suspend fun getTimeline(): Result\n+ val cache: GroupedMediaItems?\n+ fun orCache(data: GroupedMediaItems): GroupedMediaItems\n+}\n+\n+/**\n+ * A timeline holder that can be used by the gallery and the media viewer.\n+ * When opening the Media Viewer, if the held timeline knows the Event, it will\n+ * be used, else a FocusedMediaTimeline will be used.\n+ */\n+@SingleIn(RoomScope::class)\n+@ContributesBinding(RoomScope::class)\n+class LiveMediaTimeline @Inject constructor(\n+ private val room: MatrixRoom,\n+) : MediaTimeline {\n+ private var timeline: Timeline? = null\n+ private val mutex = Mutex()\n+\n+ override suspend fun getTimeline(): Result = mutex.withLock {\n+ val currentTimeline = timeline\n+ if (currentTimeline == null) {\n+ room.mediaTimeline(null)\n+ .onSuccess { timeline = it }\n+ } else {\n+ Result.success(currentTimeline)\n+ }\n+ }\n+\n+ // No cache for LiveMediaTimeline\n+ override val cache = null\n+ override fun orCache(data: GroupedMediaItems) = data\n+}\n+\n+/**\n+ * A class that will provide a media timeline that is focused on a particular event.\n+ */\n+class FocusedMediaTimeline(\n+ private val room: MatrixRoom,\n+ private val eventId: EventId,\n+ initialMediaItem: MediaItem.Event,\n+) : MediaTimeline {\n+ override suspend fun getTimeline(): Result {\n+ return room.mediaTimeline(eventId)\n+ }\n+\n+ override val cache = persistentListOf(\n+ MediaItem.LoadingIndicator(\n+ id = UniqueId(\"loading_forwards\"),\n+ direction = Timeline.PaginationDirection.FORWARDS,\n+ timestamp = 0L,\n+ ),\n+ initialMediaItem,\n+ MediaItem.LoadingIndicator(\n+ id = UniqueId(\"loading_backwards\"),\n+ direction = Timeline.PaginationDirection.BACKWARDS,\n+ timestamp = 0L,\n+ ),\n+ ).let {\n+ GroupedMediaItems(\n+ fileItems = it,\n+ imageAndVideoItems = it,\n+ )\n+ }\n+\n+ override fun orCache(data: GroupedMediaItems): GroupedMediaItems {\n+ return if (data.hasEvent(eventId)) {\n+ data\n+ } else {\n+ cache\n+ }\n+ }\n+}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/TimelineMediaItemsFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaItemsFactory.kt\nsimilarity index 96%\nrename from libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/TimelineMediaItemsFactory.kt\nrename to libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaItemsFactory.kt\nindex 0313390ddd9..a759ba4d76b 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/TimelineMediaItemsFactory.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaItemsFactory.kt\n@@ -5,13 +5,14 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.libraries.mediaviewer.impl.gallery\n+package io.element.android.libraries.mediaviewer.impl.datasource\n \n import io.element.android.libraries.androidutils.diff.DefaultDiffCacheInvalidator\n import io.element.android.libraries.androidutils.diff.DiffCacheUpdater\n import io.element.android.libraries.androidutils.diff.MutableListDiffCache\n import io.element.android.libraries.core.coroutine.CoroutineDispatchers\n import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n import kotlinx.collections.immutable.ImmutableList\n import kotlinx.collections.immutable.toPersistentList\n import kotlinx.coroutines.flow.Flow\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/VirtualItemFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/VirtualItemFactory.kt\nsimilarity index 92%\nrename from libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/VirtualItemFactory.kt\nrename to libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/VirtualItemFactory.kt\nindex f364b06cb69..0c45edcf37a 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/VirtualItemFactory.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/VirtualItemFactory.kt\n@@ -5,12 +5,13 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.libraries.mediaviewer.impl.gallery\n+package io.element.android.libraries.mediaviewer.impl.datasource\n \n import io.element.android.libraries.dateformatter.api.DateFormatter\n import io.element.android.libraries.dateformatter.api.DateFormatterMode\n import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem\n import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTimelineItem\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n import javax.inject.Inject\n \n class VirtualItemFactory @Inject constructor(\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryEvents.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryEvents.kt\nindex 8978059a514..df7d82c7b29 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryEvents.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryEvents.kt\n@@ -11,6 +11,7 @@ import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.media.MediaSource\n import io.element.android.libraries.matrix.api.timeline.Timeline\n import io.element.android.libraries.mediaviewer.api.MediaInfo\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n \n sealed interface MediaGalleryEvents {\n data class ChangeMode(val mode: MediaGalleryMode) : MediaGalleryEvents\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt\nindex c4519fcc0f9..77520763f54 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt\n@@ -21,6 +21,7 @@ import io.element.android.libraries.di.RoomScope\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.mediaviewer.impl.gallery.di.LocalMediaItemPresenterFactories\n import io.element.android.libraries.mediaviewer.impl.gallery.di.MediaItemPresenterFactories\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n \n @ContributesNode(RoomScope::class)\n class MediaGalleryNode @AssistedInject constructor(\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt\nindex e094e1b9fbd..6617a8b9cbc 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt\n@@ -32,8 +32,14 @@ import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOther\n import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOwn\n import io.element.android.libraries.mediaviewer.api.local.LocalMedia\n import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory\n+import io.element.android.libraries.mediaviewer.impl.datasource.MediaGalleryDataSource\n import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState\n import io.element.android.libraries.mediaviewer.impl.local.LocalMediaActions\n+import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.eventId\n+import io.element.android.libraries.mediaviewer.impl.model.mediaInfo\n+import io.element.android.libraries.mediaviewer.impl.model.mediaSource\n import io.element.android.libraries.ui.strings.CommonStrings\n import kotlinx.coroutines.launch\n \ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryState.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryState.kt\nindex 750dbe10387..62877368d7e 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryState.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryState.kt\n@@ -11,7 +11,7 @@ import io.element.android.libraries.architecture.AsyncData\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage\n import io.element.android.libraries.mediaviewer.impl.R\n import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState\n-import kotlinx.collections.immutable.ImmutableList\n+import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems\n \n data class MediaGalleryState(\n val roomName: String,\n@@ -22,18 +22,6 @@ data class MediaGalleryState(\n val eventSink: (MediaGalleryEvents) -> Unit,\n )\n \n-data class GroupedMediaItems(\n- val imageAndVideoItems: ImmutableList,\n- val fileItems: ImmutableList,\n-) {\n- fun getItems(mode: MediaGalleryMode): ImmutableList {\n- return when (mode) {\n- MediaGalleryMode.Images -> imageAndVideoItems\n- MediaGalleryMode.Files -> fileItems\n- }\n- }\n-}\n-\n enum class MediaGalleryMode(val stringResource: Int) {\n Images(R.string.screen_media_browser_list_mode_media),\n Files(R.string.screen_media_browser_list_mode_files),\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryStateProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryStateProvider.kt\nindex 5a1b5fcca80..aedea1eb75b 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryStateProvider.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryStateProvider.kt\n@@ -13,13 +13,15 @@ import io.element.android.libraries.designsystem.components.media.aWaveForm\n import io.element.android.libraries.matrix.api.core.UniqueId\n import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState\n import io.element.android.libraries.mediaviewer.impl.details.aMediaDetailsBottomSheetState\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemAudio\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemDateSeparator\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemFile\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemImage\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemLoadingIndicator\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemVideo\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemVoice\n+import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemAudio\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemDateSeparator\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemFile\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemImage\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemLoadingIndicator\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemVideo\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemVoice\n import kotlinx.collections.immutable.toImmutableList\n \n open class MediaGalleryStateProvider : PreviewParameterProvider {\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt\nindex 3f5e1fc1072..38eed3252f8 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt\n@@ -72,6 +72,9 @@ import io.element.android.libraries.mediaviewer.impl.gallery.ui.FileItemView\n import io.element.android.libraries.mediaviewer.impl.gallery.ui.ImageItemView\n import io.element.android.libraries.mediaviewer.impl.gallery.ui.VideoItemView\n import io.element.android.libraries.mediaviewer.impl.gallery.ui.VoiceItemView\n+import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.id\n import io.element.android.libraries.voiceplayer.api.VoiceMessageState\n import kotlinx.collections.immutable.ImmutableList\n \n@@ -108,15 +111,15 @@ fun MediaGalleryView(\n ) { paddingValues ->\n Column(\n modifier = Modifier\n- .padding(paddingValues)\n- .consumeWindowInsets(paddingValues)\n- .fillMaxSize(),\n+ .padding(paddingValues)\n+ .consumeWindowInsets(paddingValues)\n+ .fillMaxSize(),\n verticalArrangement = Arrangement.spacedBy(2.dp),\n ) {\n SingleChoiceSegmentedButtonRow(\n modifier = Modifier\n- .fillMaxWidth()\n- .padding(horizontal = 16.dp),\n+ .fillMaxWidth()\n+ .padding(horizontal = 16.dp),\n ) {\n MediaGalleryMode.entries.forEach { mode ->\n SegmentedButton(\n@@ -354,8 +357,8 @@ private fun MediaGalleryImageGrid(\n ) {\n LazyVerticalGrid(\n modifier = Modifier\n- .fillMaxSize()\n- .padding(horizontal = 16.dp),\n+ .fillMaxSize()\n+ .padding(horizontal = 16.dp),\n columns = GridCells.Adaptive(80.dp),\n horizontalArrangement = Arrangement.spacedBy(4.dp),\n verticalArrangement = Arrangement.spacedBy(4.dp),\n@@ -426,9 +429,9 @@ private fun LoadingMoreIndicator(\n Timeline.PaginationDirection.FORWARDS -> {\n LinearProgressIndicator(\n modifier = Modifier\n- .fillMaxWidth()\n- .padding(top = 2.dp)\n- .height(1.dp)\n+ .fillMaxWidth()\n+ .padding(top = 2.dp)\n+ .height(1.dp)\n )\n }\n Timeline.PaginationDirection.BACKWARDS -> {\n@@ -466,9 +469,9 @@ private fun EmptyContent(\n OnboardingBackground()\n PageTitle(\n modifier = Modifier\n- .fillMaxWidth()\n- .padding(top = 44.dp)\n- .padding(24.dp),\n+ .fillMaxWidth()\n+ .padding(top = 44.dp)\n+ .padding(24.dp),\n title = stringResource(titleRes),\n iconStyle = BigIcon.Style.Default(icon),\n subtitle = stringResource(subtitleRes),\n@@ -486,9 +489,9 @@ private fun LoadingContent(\n OnboardingBackground()\n Column(\n modifier = Modifier\n- .fillMaxSize()\n- .padding(top = 48.dp)\n- .padding(24.dp),\n+ .fillMaxSize()\n+ .padding(top = 48.dp)\n+ .padding(24.dp),\n verticalArrangement = Arrangement.spacedBy(16.dp),\n horizontalAlignment = Alignment.CenterHorizontally,\n ) {\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/SingleMediaGalleryDataSource.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/SingleMediaGalleryDataSource.kt\ndeleted file mode 100644\nindex 8e6b708a7f1..00000000000\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/SingleMediaGalleryDataSource.kt\n+++ /dev/null\n@@ -1,85 +0,0 @@\n-/*\n- * Copyright 2025 New Vector Ltd.\n- *\n- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n- * Please see LICENSE files in the repository root for full details.\n- */\n-\n-package io.element.android.libraries.mediaviewer.impl.gallery\n-\n-import io.element.android.libraries.architecture.AsyncData\n-import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeAudio\n-import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeImage\n-import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeVideo\n-import io.element.android.libraries.matrix.api.core.EventId\n-import io.element.android.libraries.matrix.api.core.UniqueId\n-import io.element.android.libraries.matrix.api.timeline.Timeline\n-import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint\n-import kotlinx.collections.immutable.persistentListOf\n-import kotlinx.coroutines.flow.flowOf\n-\n-class SingleMediaGalleryDataSource(\n- private val data: GroupedMediaItems,\n-) : MediaGalleryDataSource {\n- override fun start() = Unit\n- override fun groupedMediaItemsFlow() = flowOf(AsyncData.Success(data))\n- override fun getLastData(): AsyncData = AsyncData.Success(data)\n- override suspend fun loadMore(direction: Timeline.PaginationDirection) = Unit\n- override suspend fun deleteItem(eventId: EventId) = Unit\n-\n- companion object {\n- fun createFrom(params: MediaViewerEntryPoint.Params) = SingleMediaGalleryDataSource(\n- data = when {\n- params.mediaInfo.mimeType.isMimeTypeImage() -> {\n- MediaItem.Image(\n- id = UniqueId(\"dummy\"),\n- eventId = params.eventId,\n- mediaInfo = params.mediaInfo,\n- mediaSource = params.mediaSource,\n- thumbnailSource = params.thumbnailSource,\n- )\n- }\n- params.mediaInfo.mimeType.isMimeTypeVideo() -> {\n- MediaItem.Video(\n- id = UniqueId(\"dummy\"),\n- eventId = params.eventId,\n- mediaInfo = params.mediaInfo,\n- mediaSource = params.mediaSource,\n- thumbnailSource = params.thumbnailSource,\n- )\n- }\n- params.mediaInfo.mimeType.isMimeTypeAudio() -> {\n- if (params.mediaInfo.waveform == null) {\n- MediaItem.Audio(\n- id = UniqueId(\"dummy\"),\n- eventId = params.eventId,\n- mediaInfo = params.mediaInfo,\n- mediaSource = params.mediaSource,\n- )\n- } else {\n- MediaItem.Voice(\n- id = UniqueId(\"dummy\"),\n- eventId = params.eventId,\n- mediaInfo = params.mediaInfo,\n- mediaSource = params.mediaSource,\n- )\n- }\n- }\n- else -> {\n- MediaItem.File(\n- id = UniqueId(\"dummy\"),\n- eventId = params.eventId,\n- mediaInfo = params.mediaInfo,\n- mediaSource = params.mediaSource,\n- )\n- }\n- }.let { mediaItem ->\n- GroupedMediaItems(\n- // Always use imageAndVideoItems, in Single mode, this is the data that will be used\n- imageAndVideoItems = persistentListOf(mediaItem),\n- fileItems = persistentListOf(),\n- )\n- }\n- )\n- }\n-}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemEventContentKey.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemEventContentKey.kt\nindex d76a631689a..ad2e49f16f8 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemEventContentKey.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemEventContentKey.kt\n@@ -8,7 +8,7 @@\n package io.element.android.libraries.mediaviewer.impl.gallery.di\n \n import dagger.MapKey\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n import kotlin.reflect.KClass\n \n /**\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemPresenterFactories.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemPresenterFactories.kt\nindex a2f72961354..02c0441d18b 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemPresenterFactories.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemPresenterFactories.kt\n@@ -15,7 +15,7 @@ import dagger.multibindings.Multibinds\n import io.element.android.libraries.architecture.Presenter\n import io.element.android.libraries.di.RoomScope\n import io.element.android.libraries.di.SingleIn\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n import javax.inject.Inject\n \n /**\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemPresenterFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemPresenterFactory.kt\nindex 1216a2dea65..9730fb4c053 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemPresenterFactory.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemPresenterFactory.kt\n@@ -8,7 +8,7 @@\n package io.element.android.libraries.mediaviewer.impl.gallery.di\n \n import io.element.android.libraries.architecture.Presenter\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n \n /**\n * A factory for a [Presenter] associated with a timeline item.\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryRootNode.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryRootNode.kt\nindex 71a4057f4b1..7317920005f 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryRootNode.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryRootNode.kt\n@@ -31,11 +31,11 @@ import io.element.android.libraries.mediaviewer.api.MediaGalleryEntryPoint\n import io.element.android.libraries.mediaviewer.api.MediaInfo\n import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint\n import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryNode\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n-import io.element.android.libraries.mediaviewer.impl.gallery.eventId\n-import io.element.android.libraries.mediaviewer.impl.gallery.mediaInfo\n-import io.element.android.libraries.mediaviewer.impl.gallery.mediaSource\n-import io.element.android.libraries.mediaviewer.impl.gallery.thumbnailSource\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.eventId\n+import io.element.android.libraries.mediaviewer.impl.model.mediaInfo\n+import io.element.android.libraries.mediaviewer.impl.model.mediaSource\n+import io.element.android.libraries.mediaviewer.impl.model.thumbnailSource\n import kotlinx.parcelize.Parcelize\n \n @ContributesNode(RoomScope::class)\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/AudioItemView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/AudioItemView.kt\nindex f25337343d5..2cbbe6826ca 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/AudioItemView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/AudioItemView.kt\n@@ -36,7 +36,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n import io.element.android.libraries.designsystem.theme.components.HorizontalDivider\n import io.element.android.libraries.designsystem.theme.components.Icon\n import io.element.android.libraries.designsystem.theme.components.Text\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n \n @Composable\n fun AudioItemView(\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/DateItemView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/DateItemView.kt\nindex c6488b42a55..84fe175fc9b 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/DateItemView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/DateItemView.kt\n@@ -18,7 +18,7 @@ import io.element.android.compound.theme.ElementTheme\n import io.element.android.libraries.designsystem.preview.ElementPreview\n import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n import io.element.android.libraries.designsystem.theme.components.Text\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n \n @Composable\n fun DateItemView(\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/FileItemView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/FileItemView.kt\nindex a6af3f5ad7a..bdb6539ecc5 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/FileItemView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/FileItemView.kt\n@@ -35,7 +35,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n import io.element.android.libraries.designsystem.theme.components.HorizontalDivider\n import io.element.android.libraries.designsystem.theme.components.Icon\n import io.element.android.libraries.designsystem.theme.components.Text\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n \n @Composable\n fun FileItemView(\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/ImageItemView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/ImageItemView.kt\nindex 51610a8bd06..8df451abd64 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/ImageItemView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/ImageItemView.kt\n@@ -28,7 +28,8 @@ import coil.compose.AsyncImagePainter\n import io.element.android.compound.theme.ElementTheme\n import io.element.android.libraries.designsystem.preview.ElementPreview\n import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemImage\n \n @OptIn(ExperimentalFoundationApi::class)\n @Composable\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemAudioProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemAudioProvider.kt\nindex 7a0f6282ce4..ccbc9079cd8 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemAudioProvider.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemAudioProvider.kt\n@@ -9,10 +9,8 @@ package io.element.android.libraries.mediaviewer.impl.gallery.ui\n \n import androidx.compose.ui.tooling.preview.PreviewParameterProvider\n import io.element.android.libraries.core.preview.loremIpsum\n-import io.element.android.libraries.matrix.api.core.UniqueId\n-import io.element.android.libraries.matrix.api.media.MediaSource\n-import io.element.android.libraries.mediaviewer.api.anAudioMediaInfo\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemAudio\n \n class MediaItemAudioProvider : PreviewParameterProvider {\n override val values: Sequence\n@@ -27,19 +25,3 @@ class MediaItemAudioProvider : PreviewParameterProvider {\n ),\n )\n }\n-\n-fun aMediaItemAudio(\n- id: UniqueId = UniqueId(\"fileId\"),\n- filename: String = \"filename\",\n- caption: String? = null,\n-): MediaItem.Audio {\n- return MediaItem.Audio(\n- id = id,\n- eventId = null,\n- mediaInfo = anAudioMediaInfo(\n- filename = filename,\n- caption = caption,\n- ),\n- mediaSource = MediaSource(\"\"),\n- )\n-}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemDateSeparatorProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemDateSeparatorProvider.kt\nindex 77f789310a5..13d49a99190 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemDateSeparatorProvider.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemDateSeparatorProvider.kt\n@@ -8,8 +8,8 @@\n package io.element.android.libraries.mediaviewer.impl.gallery.ui\n \n import androidx.compose.ui.tooling.preview.PreviewParameterProvider\n-import io.element.android.libraries.matrix.api.core.UniqueId\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemDateSeparator\n \n class MediaItemDateSeparatorProvider : PreviewParameterProvider {\n override val values: Sequence\n@@ -18,13 +18,3 @@ class MediaItemDateSeparatorProvider : PreviewParameterProvider {\n override val values: Sequence\n@@ -28,20 +25,3 @@ class MediaItemFileProvider : PreviewParameterProvider {\n ),\n )\n }\n-\n-fun aMediaItemFile(\n- id: UniqueId = UniqueId(\"fileId\"),\n- eventId: EventId? = null,\n- filename: String = \"filename\",\n- caption: String? = null,\n-): MediaItem.File {\n- return MediaItem.File(\n- id = id,\n- eventId = eventId,\n- mediaInfo = aPdfMediaInfo(\n- filename = filename,\n- caption = caption,\n- ),\n- mediaSource = MediaSource(\"\"),\n- )\n-}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemImageProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemImageProvider.kt\ndeleted file mode 100644\nindex ceb934fbe2b..00000000000\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemImageProvider.kt\n+++ /dev/null\n@@ -1,32 +0,0 @@\n-/*\n- * Copyright 2024 New Vector Ltd.\n- *\n- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n- * Please see LICENSE files in the repository root for full details.\n- */\n-\n-package io.element.android.libraries.mediaviewer.impl.gallery.ui\n-\n-import io.element.android.libraries.matrix.api.core.EventId\n-import io.element.android.libraries.matrix.api.core.UniqueId\n-import io.element.android.libraries.matrix.api.core.UserId\n-import io.element.android.libraries.matrix.api.media.MediaSource\n-import io.element.android.libraries.mediaviewer.api.anImageMediaInfo\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n-\n-fun aMediaItemImage(\n- id: UniqueId = UniqueId(\"imageId\"),\n- eventId: EventId? = null,\n- senderId: UserId? = null,\n- mediaSourceUrl: String = \"\",\n-): MediaItem.Image {\n- return MediaItem.Image(\n- id = id,\n- eventId = eventId,\n- mediaInfo = anImageMediaInfo(\n- senderId = senderId,\n- ),\n- mediaSource = MediaSource(mediaSourceUrl),\n- thumbnailSource = null,\n- )\n-}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemLoadingIndicatorProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemLoadingIndicatorProvider.kt\ndeleted file mode 100644\nindex 2c788983255..00000000000\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemLoadingIndicatorProvider.kt\n+++ /dev/null\n@@ -1,23 +0,0 @@\n-/*\n- * Copyright 2024 New Vector Ltd.\n- *\n- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n- * Please see LICENSE files in the repository root for full details.\n- */\n-\n-package io.element.android.libraries.mediaviewer.impl.gallery.ui\n-\n-import io.element.android.libraries.matrix.api.core.UniqueId\n-import io.element.android.libraries.matrix.api.timeline.Timeline\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n-\n-fun aMediaItemLoadingIndicator(\n- id: UniqueId = UniqueId(\"loadingId\"),\n- direction: Timeline.PaginationDirection = Timeline.PaginationDirection.BACKWARDS,\n-): MediaItem.LoadingIndicator {\n- return MediaItem.LoadingIndicator(\n- id = id,\n- direction = direction,\n- timestamp = 123,\n- )\n-}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVideoProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVideoProvider.kt\nindex 8e59b925b75..34eef52479b 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVideoProvider.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVideoProvider.kt\n@@ -8,10 +8,8 @@\n package io.element.android.libraries.mediaviewer.impl.gallery.ui\n \n import androidx.compose.ui.tooling.preview.PreviewParameterProvider\n-import io.element.android.libraries.matrix.api.core.UniqueId\n-import io.element.android.libraries.matrix.api.media.MediaSource\n-import io.element.android.libraries.mediaviewer.api.aVideoMediaInfo\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemVideo\n \n class MediaItemVideoProvider : PreviewParameterProvider {\n override val values: Sequence\n@@ -22,19 +20,3 @@ class MediaItemVideoProvider : PreviewParameterProvider {\n ),\n )\n }\n-\n-fun aMediaItemVideo(\n- id: UniqueId = UniqueId(\"videoId\"),\n- mediaSource: MediaSource = MediaSource(\"\"),\n- duration: String? = \"1:23\",\n-): MediaItem.Video {\n- return MediaItem.Video(\n- id = id,\n- eventId = null,\n- mediaInfo = aVideoMediaInfo(\n- duration = duration\n- ),\n- mediaSource = mediaSource,\n- thumbnailSource = null,\n- )\n-}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVoiceProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVoiceProvider.kt\nindex 43e04491de4..8353e5bfca6 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVoiceProvider.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVoiceProvider.kt\n@@ -9,11 +9,8 @@ package io.element.android.libraries.mediaviewer.impl.gallery.ui\n \n import androidx.compose.ui.tooling.preview.PreviewParameterProvider\n import io.element.android.libraries.core.preview.loremIpsum\n-import io.element.android.libraries.designsystem.components.media.aWaveForm\n-import io.element.android.libraries.matrix.api.core.UniqueId\n-import io.element.android.libraries.matrix.api.media.MediaSource\n-import io.element.android.libraries.mediaviewer.api.aVoiceMediaInfo\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemVoice\n \n class MediaItemVoiceProvider : PreviewParameterProvider {\n override val values: Sequence\n@@ -31,23 +28,3 @@ class MediaItemVoiceProvider : PreviewParameterProvider {\n ),\n )\n }\n-\n-fun aMediaItemVoice(\n- id: UniqueId = UniqueId(\"fileId\"),\n- filename: String = \"filename.ogg\",\n- caption: String? = null,\n- duration: String? = \"1:23\",\n- waveform: List = aWaveForm(),\n-): MediaItem.Voice {\n- return MediaItem.Voice(\n- id = id,\n- eventId = null,\n- mediaInfo = aVoiceMediaInfo(\n- filename = filename,\n- caption = caption,\n- duration = duration,\n- waveForm = waveform,\n- ),\n- mediaSource = MediaSource(\"\"),\n- )\n-}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VideoItemView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VideoItemView.kt\nindex 6b394e7c55c..f23be0f382d 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VideoItemView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VideoItemView.kt\n@@ -38,7 +38,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreview\n import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n import io.element.android.libraries.designsystem.theme.components.Icon\n import io.element.android.libraries.designsystem.theme.components.Text\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n \n @OptIn(ExperimentalFoundationApi::class)\n @Composable\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VoiceItemView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VoiceItemView.kt\nindex d34555e1758..89f9a30f40b 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VoiceItemView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VoiceItemView.kt\n@@ -46,7 +46,8 @@ import io.element.android.libraries.designsystem.theme.components.HorizontalDivi\n import io.element.android.libraries.designsystem.theme.components.Icon\n import io.element.android.libraries.designsystem.theme.components.IconButton\n import io.element.android.libraries.designsystem.theme.components.Text\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemVoice\n import io.element.android.libraries.ui.strings.CommonStrings\n import io.element.android.libraries.voiceplayer.api.VoiceMessageEvents\n import io.element.android.libraries.voiceplayer.api.VoiceMessageState\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/voice/VoiceMessagePresenter.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/voice/VoiceMessagePresenter.kt\nindex 4d215bc1971..92acc754fc5 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/voice/VoiceMessagePresenter.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/voice/VoiceMessagePresenter.kt\n@@ -17,9 +17,9 @@ import dagger.assisted.AssistedInject\n import dagger.multibindings.IntoMap\n import io.element.android.libraries.architecture.Presenter\n import io.element.android.libraries.di.RoomScope\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n import io.element.android.libraries.mediaviewer.impl.gallery.di.MediaItemEventContentKey\n import io.element.android.libraries.mediaviewer.impl.gallery.di.MediaItemPresenterFactory\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n import io.element.android.libraries.voiceplayer.api.VoiceMessagePresenterFactory\n import io.element.android.libraries.voiceplayer.api.VoiceMessageState\n import kotlin.time.Duration\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/GroupedMediaItems.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/GroupedMediaItems.kt\nnew file mode 100644\nindex 00000000000..448426f374e\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/GroupedMediaItems.kt\n@@ -0,0 +1,30 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.model\n+\n+import io.element.android.libraries.matrix.api.core.EventId\n+import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryMode\n+import kotlinx.collections.immutable.ImmutableList\n+\n+data class GroupedMediaItems(\n+ val imageAndVideoItems: ImmutableList,\n+ val fileItems: ImmutableList,\n+) {\n+ fun getItems(mode: MediaGalleryMode): ImmutableList {\n+ return when (mode) {\n+ MediaGalleryMode.Images -> imageAndVideoItems\n+ MediaGalleryMode.Files -> fileItems\n+ }\n+ }\n+}\n+\n+fun GroupedMediaItems.hasEvent(eventId: EventId): Boolean {\n+ return (fileItems + imageAndVideoItems)\n+ .filterIsInstance()\n+ .any { it.eventId() == eventId }\n+}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItem.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaItem.kt\nsimilarity index 98%\nrename from libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItem.kt\nrename to libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaItem.kt\nindex e1bd4d779ac..bf894869640 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItem.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaItem.kt\n@@ -5,7 +5,7 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.libraries.mediaviewer.impl.gallery\n+package io.element.android.libraries.mediaviewer.impl.model\n \n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.core.UniqueId\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaItemFactories.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaItemFactories.kt\nnew file mode 100644\nindex 00000000000..b04973322ac\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaItemFactories.kt\n@@ -0,0 +1,128 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.model\n+\n+import io.element.android.libraries.designsystem.components.media.aWaveForm\n+import io.element.android.libraries.matrix.api.core.EventId\n+import io.element.android.libraries.matrix.api.core.UniqueId\n+import io.element.android.libraries.matrix.api.core.UserId\n+import io.element.android.libraries.matrix.api.media.MediaSource\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.libraries.mediaviewer.api.aPdfMediaInfo\n+import io.element.android.libraries.mediaviewer.api.aVideoMediaInfo\n+import io.element.android.libraries.mediaviewer.api.aVoiceMediaInfo\n+import io.element.android.libraries.mediaviewer.api.anAudioMediaInfo\n+import io.element.android.libraries.mediaviewer.api.anImageMediaInfo\n+\n+fun aMediaItemImage(\n+ id: UniqueId = UniqueId(\"imageId\"),\n+ eventId: EventId? = null,\n+ senderId: UserId? = null,\n+ mediaSourceUrl: String = \"\",\n+): MediaItem.Image {\n+ return MediaItem.Image(\n+ id = id,\n+ eventId = eventId,\n+ mediaInfo = anImageMediaInfo(\n+ senderId = senderId,\n+ ),\n+ mediaSource = MediaSource(mediaSourceUrl),\n+ thumbnailSource = null,\n+ )\n+}\n+\n+fun aMediaItemVideo(\n+ id: UniqueId = UniqueId(\"videoId\"),\n+ mediaSource: MediaSource = MediaSource(\"\"),\n+ duration: String? = \"1:23\",\n+): MediaItem.Video {\n+ return MediaItem.Video(\n+ id = id,\n+ eventId = null,\n+ mediaInfo = aVideoMediaInfo(\n+ duration = duration\n+ ),\n+ mediaSource = mediaSource,\n+ thumbnailSource = null,\n+ )\n+}\n+\n+fun aMediaItemFile(\n+ id: UniqueId = UniqueId(\"fileId\"),\n+ eventId: EventId? = null,\n+ filename: String = \"filename\",\n+ caption: String? = null,\n+): MediaItem.File {\n+ return MediaItem.File(\n+ id = id,\n+ eventId = eventId,\n+ mediaInfo = aPdfMediaInfo(\n+ filename = filename,\n+ caption = caption,\n+ ),\n+ mediaSource = MediaSource(\"\"),\n+ )\n+}\n+\n+fun aMediaItemAudio(\n+ id: UniqueId = UniqueId(\"fileId\"),\n+ eventId: EventId? = null,\n+ filename: String = \"filename\",\n+ caption: String? = null,\n+): MediaItem.Audio {\n+ return MediaItem.Audio(\n+ id = id,\n+ eventId = eventId,\n+ mediaInfo = anAudioMediaInfo(\n+ filename = filename,\n+ caption = caption,\n+ ),\n+ mediaSource = MediaSource(\"\"),\n+ )\n+}\n+\n+fun aMediaItemVoice(\n+ id: UniqueId = UniqueId(\"fileId\"),\n+ filename: String = \"filename.ogg\",\n+ caption: String? = null,\n+ duration: String? = \"1:23\",\n+ waveform: List = aWaveForm(),\n+): MediaItem.Voice {\n+ return MediaItem.Voice(\n+ id = id,\n+ eventId = null,\n+ mediaInfo = aVoiceMediaInfo(\n+ filename = filename,\n+ caption = caption,\n+ duration = duration,\n+ waveForm = waveform,\n+ ),\n+ mediaSource = MediaSource(\"\"),\n+ )\n+}\n+\n+fun aMediaItemDateSeparator(\n+ id: UniqueId = UniqueId(\"dateId\"),\n+ formattedDate: String = \"October 2024\",\n+): MediaItem.DateSeparator {\n+ return MediaItem.DateSeparator(\n+ id = id,\n+ formattedDate = formattedDate,\n+ )\n+}\n+\n+fun aMediaItemLoadingIndicator(\n+ id: UniqueId = UniqueId(\"loadingId\"),\n+ direction: Timeline.PaginationDirection = Timeline.PaginationDirection.BACKWARDS,\n+): MediaItem.LoadingIndicator {\n+ return MediaItem.LoadingIndicator(\n+ id = id,\n+ direction = direction,\n+ timestamp = 123,\n+ )\n+}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSource.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSource.kt\nindex b185834c3e4..ebaba4cdcdf 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSource.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSource.kt\n@@ -18,15 +18,16 @@ import io.element.android.libraries.architecture.AsyncData\n import io.element.android.libraries.matrix.api.media.MatrixMediaLoader\n import io.element.android.libraries.matrix.api.media.MediaFile\n import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint.MediaViewerMode\n import io.element.android.libraries.mediaviewer.api.local.LocalMedia\n import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryDataSource\n+import io.element.android.libraries.mediaviewer.impl.datasource.MediaGalleryDataSource\n import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryMode\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n-import io.element.android.libraries.mediaviewer.impl.gallery.eventId\n-import io.element.android.libraries.mediaviewer.impl.gallery.mediaInfo\n-import io.element.android.libraries.mediaviewer.impl.gallery.mediaSource\n-import io.element.android.libraries.mediaviewer.impl.gallery.thumbnailSource\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.eventId\n+import io.element.android.libraries.mediaviewer.impl.model.mediaInfo\n+import io.element.android.libraries.mediaviewer.impl.model.mediaSource\n+import io.element.android.libraries.mediaviewer.impl.model.thumbnailSource\n import io.element.android.services.toolbox.api.systemclock.SystemClock\n import kotlinx.collections.immutable.PersistentList\n import kotlinx.collections.immutable.persistentListOf\n@@ -38,16 +39,23 @@ import kotlinx.coroutines.withContext\n import timber.log.Timber\n \n class MediaViewerDataSource(\n- private val galleryMode: MediaGalleryMode,\n+ mode: MediaViewerMode,\n private val dispatcher: CoroutineDispatcher,\n private val galleryDataSource: MediaGalleryDataSource,\n private val mediaLoader: MatrixMediaLoader,\n private val localMediaFactory: LocalMediaFactory,\n private val systemClock: SystemClock,\n+ private val pagerKeysHandler: PagerKeysHandler,\n ) {\n // List of media files that are currently being loaded\n private val mediaFiles: MutableList = mutableListOf()\n \n+ private val galleryMode = when (mode) {\n+ MediaViewerMode.SingleMedia,\n+ MediaViewerMode.TimelineImagesAndVideos -> MediaGalleryMode.Images\n+ MediaViewerMode.TimelineFilesAndAudios -> MediaGalleryMode.Files\n+ }\n+\n // Map of sourceUrl to local media state\n private val localMediaStates: MutableMap>> =\n mutableMapOf()\n@@ -78,6 +86,7 @@ class MediaViewerDataSource(\n MediaViewerPageData.Loading(\n direction = Timeline.PaginationDirection.BACKWARDS,\n timestamp = systemClock.epochMillis(),\n+ pagerKey = Long.MIN_VALUE,\n )\n )\n }\n@@ -108,7 +117,10 @@ class MediaViewerDataSource(\n * will be used to render the downloaded media (see [loadMedia] which will update this value).\n */\n private fun buildMediaViewerPageList(groupedItems: List) = buildList {\n- groupedItems.forEach { mediaItem ->\n+ // Filter out DateSeparator items, we do not need them for the media viewer\n+ val groupedItemsNoDateSeparator = groupedItems.filterNot { it is MediaItem.DateSeparator }\n+ pagerKeysHandler.accept(groupedItemsNoDateSeparator)\n+ groupedItemsNoDateSeparator.forEach { mediaItem ->\n when (mediaItem) {\n is MediaItem.DateSeparator -> Unit\n is MediaItem.Event -> {\n@@ -123,6 +135,7 @@ class MediaViewerDataSource(\n mediaSource = mediaItem.mediaSource(),\n thumbnailSource = mediaItem.thumbnailSource(),\n downloadedMedia = localMedia,\n+ pagerKey = pagerKeysHandler.getKey(mediaItem),\n )\n )\n }\n@@ -130,6 +143,7 @@ class MediaViewerDataSource(\n MediaViewerPageData.Loading(\n direction = mediaItem.direction,\n timestamp = systemClock.epochMillis(),\n+ pagerKey = pagerKeysHandler.getKey(mediaItem),\n )\n )\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt\nindex e06b6915202..78766410514 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt\n@@ -24,9 +24,9 @@ import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.media.MatrixMediaLoader\n import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint\n import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryMode\n-import io.element.android.libraries.mediaviewer.impl.gallery.SingleMediaGalleryDataSource\n-import io.element.android.libraries.mediaviewer.impl.gallery.TimelineMediaGalleryDataSource\n+import io.element.android.libraries.mediaviewer.impl.datasource.FocusedTimelineMediaGalleryDataSourceFactory\n+import io.element.android.libraries.mediaviewer.impl.datasource.TimelineMediaGalleryDataSource\n+import io.element.android.libraries.mediaviewer.impl.model.hasEvent\n import io.element.android.services.toolbox.api.systemclock.SystemClock\n \n @ContributesNode(RoomScope::class)\n@@ -35,10 +35,12 @@ class MediaViewerNode @AssistedInject constructor(\n @Assisted plugins: List,\n presenterFactory: MediaViewerPresenter.Factory,\n timelineMediaGalleryDataSource: TimelineMediaGalleryDataSource,\n+ focusedTimelineMediaGalleryDataSourceFactory: FocusedTimelineMediaGalleryDataSourceFactory,\n mediaLoader: MatrixMediaLoader,\n localMediaFactory: LocalMediaFactory,\n coroutineDispatchers: CoroutineDispatchers,\n systemClock: SystemClock,\n+ pagerKeysHandler: PagerKeysHandler,\n ) : Node(buildContext, plugins = plugins),\n MediaViewerNavigator {\n private val inputs = inputs()\n@@ -62,25 +64,36 @@ class MediaViewerNode @AssistedInject constructor(\n private val mediaGallerySource = if (inputs.mode == MediaViewerEntryPoint.MediaViewerMode.SingleMedia) {\n SingleMediaGalleryDataSource.createFrom(inputs)\n } else {\n- timelineMediaGalleryDataSource\n- }\n-\n- private val galleryMode = when (inputs.mode) {\n- MediaViewerEntryPoint.MediaViewerMode.SingleMedia,\n- MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos -> MediaGalleryMode.Images\n- MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios -> MediaGalleryMode.Files\n+ val eventId = inputs.eventId\n+ if (eventId == null) {\n+ // Should not happen\n+ timelineMediaGalleryDataSource\n+ } else {\n+ // Does timelineMediaGalleryDataSource knows the eventId?\n+ val lastData = timelineMediaGalleryDataSource.getLastData().dataOrNull()\n+ val isEventKnown = lastData?.hasEvent(eventId) == true\n+ if (isEventKnown) {\n+ timelineMediaGalleryDataSource\n+ } else {\n+ focusedTimelineMediaGalleryDataSourceFactory.createFor(\n+ eventId = eventId,\n+ mediaItem = inputs.toMediaItem(),\n+ )\n+ }\n+ }\n }\n \n private val presenter = presenterFactory.create(\n inputs = inputs,\n navigator = this,\n dataSource = MediaViewerDataSource(\n+ mode = inputs.mode,\n dispatcher = coroutineDispatchers.computation,\n- galleryMode = galleryMode,\n galleryDataSource = mediaGallerySource,\n mediaLoader = mediaLoader,\n localMediaFactory = localMediaFactory,\n systemClock = systemClock,\n+ pagerKeysHandler = pagerKeysHandler,\n )\n )\n \ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerState.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerState.kt\nindex cf363a70f18..32c22b04706 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerState.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerState.kt\n@@ -28,13 +28,17 @@ data class MediaViewerState(\n )\n \n sealed interface MediaViewerPageData {\n+ val pagerKey: Long\n+\n data class Failure(\n val throwable: Throwable,\n+ override val pagerKey: Long = 0,\n ) : MediaViewerPageData\n \n data class Loading(\n val direction: Timeline.PaginationDirection,\n val timestamp: Long,\n+ override val pagerKey: Long,\n ) : MediaViewerPageData\n \n data class MediaViewerData(\n@@ -43,5 +47,6 @@ sealed interface MediaViewerPageData {\n val mediaSource: MediaSource,\n val thumbnailSource: MediaSource?,\n val downloadedMedia: State>,\n+ override val pagerKey: Long,\n ) : MediaViewerPageData\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt\nindex 2c54751fed0..95557c13d67 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt\n@@ -169,6 +169,7 @@ fun aMediaViewerPageDataLoading(\n return MediaViewerPageData.Loading(\n direction = direction,\n timestamp = timestamp,\n+ pagerKey = 0L,\n )\n }\n \n@@ -182,6 +183,7 @@ fun aMediaViewerPageData(\n mediaSource = mediaSource,\n thumbnailSource = null,\n downloadedMedia = mutableStateOf(downloadedMedia),\n+ pagerKey = 0L,\n )\n \n fun aMediaViewerState(\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt\nindex 51476193d05..3ba57cae337 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt\n@@ -114,6 +114,7 @@ fun MediaViewerView(\n modifier = Modifier,\n // Pre-load previous and next pages\n beyondViewportPageCount = 1,\n+ key = { index -> state.listData[index].pagerKey },\n ) { page ->\n when (val dataForPage = state.listData[page]) {\n is MediaViewerPageData.Failure -> {\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/PagerKeysHandler.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/PagerKeysHandler.kt\nnew file mode 100644\nindex 00000000000..2c73ab26570\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/PagerKeysHandler.kt\n@@ -0,0 +1,86 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.viewer\n+\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.eventId\n+import javax.inject.Inject\n+\n+/**\n+ * x and y are loading items.\n+ * Capital letters are media items.\n+ * First list emitted\n+ * x F G H y\n+ * indexes will be\n+ * 0 1 2 3 4\n+ * (keyOffset = 0)\n+ * New items added to the end of the list\n+ * x F G H I J K y\n+ * indexes will be\n+ * 0 1 2 3 4 5 6 7\n+ * (keyOffset = 0)\n+ * New items added to the beginning of the list\n+ * x D E F G H I J K y\n+ * indexes will be\n+ * -2 -1 0 1 2 3 4 5 6 7\n+ * (keyOffset = -2)\n+ * loader item vanishes\n+ * D E F G H I J K\n+ * indexes will be\n+ * -1 0 1 2 3 4 5 6\n+ * (keyOffset = -1)\n+ */\n+class PagerKeysHandler @Inject constructor() {\n+ private data class Data(\n+ val mediaItems: List,\n+ val keyOffset: Long,\n+ )\n+\n+ // Will store the list of media items and the key offset of the first item in the list\n+ private var cachedData: Data = Data(emptyList(), 0)\n+\n+ fun accept(mediaItems: List) {\n+ if (cachedData.mediaItems.isEmpty()) {\n+ cachedData = Data(mediaItems, 0)\n+ } else {\n+ // Search a common item in both lists, i.e. an item with the same eventId\n+ val itemInCacheIndex = cachedData.mediaItems.indexOfFirst { mediaItem ->\n+ mediaItem is MediaItem.Event && mediaItems\n+ .filterIsInstance()\n+ .any { mediaItem.eventId() == it.eventId() }\n+ }\n+ cachedData = if (itemInCacheIndex == -1) {\n+ // If the item is not found, start with a new cache\n+ Data(mediaItems, 0)\n+ } else {\n+ val cachedItem = cachedData.mediaItems[itemInCacheIndex]\n+ val eventId = (cachedItem as? MediaItem.Event)?.eventId()\n+ if (eventId == null) {\n+ // Should not happen, but in this case, start with a new cache\n+ Data(mediaItems, 0)\n+ } else {\n+ // Search the index of the item in the new list\n+ val itemIndex = mediaItems.indexOfFirst { mediaItem ->\n+ mediaItem is MediaItem.Event && mediaItem.eventId() == eventId\n+ }\n+ if (itemIndex == -1) {\n+ // If the item is not found, start with a new cache\n+ Data(mediaItems, 0)\n+ } else {\n+ // Update the cache with the new list and the new offset\n+ Data(mediaItems, cachedData.keyOffset + itemInCacheIndex - itemIndex.toLong())\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ fun getKey(mediaItem: MediaItem): Long {\n+ return cachedData.mediaItems.indexOf(mediaItem) + cachedData.keyOffset\n+ }\n+}\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/SingleMediaGalleryDataSource.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/SingleMediaGalleryDataSource.kt\nnew file mode 100644\nindex 00000000000..94ac0fea216\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/SingleMediaGalleryDataSource.kt\n@@ -0,0 +1,88 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.viewer\n+\n+import io.element.android.libraries.architecture.AsyncData\n+import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeAudio\n+import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeImage\n+import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeVideo\n+import io.element.android.libraries.matrix.api.core.EventId\n+import io.element.android.libraries.matrix.api.core.UniqueId\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint\n+import io.element.android.libraries.mediaviewer.impl.datasource.MediaGalleryDataSource\n+import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import kotlinx.collections.immutable.persistentListOf\n+import kotlinx.coroutines.flow.flowOf\n+\n+class SingleMediaGalleryDataSource(\n+ private val data: GroupedMediaItems,\n+) : MediaGalleryDataSource {\n+ override fun start() = Unit\n+ override fun groupedMediaItemsFlow() = flowOf(AsyncData.Success(data))\n+ override fun getLastData(): AsyncData = AsyncData.Success(data)\n+ override suspend fun loadMore(direction: Timeline.PaginationDirection) = Unit\n+ override suspend fun deleteItem(eventId: EventId) = Unit\n+\n+ companion object {\n+ fun createFrom(params: MediaViewerEntryPoint.Params) = SingleMediaGalleryDataSource(\n+ data = GroupedMediaItems(\n+ // Always use imageAndVideoItems, in Single mode, this is the data that will be used\n+ imageAndVideoItems = persistentListOf(params.toMediaItem()),\n+ fileItems = persistentListOf(),\n+ )\n+ )\n+ }\n+}\n+\n+fun MediaViewerEntryPoint.Params.toMediaItem() = when {\n+ mediaInfo.mimeType.isMimeTypeImage() -> {\n+ MediaItem.Image(\n+ id = UniqueId(\"dummy\"),\n+ eventId = eventId,\n+ mediaInfo = mediaInfo,\n+ mediaSource = mediaSource,\n+ thumbnailSource = thumbnailSource,\n+ )\n+ }\n+ mediaInfo.mimeType.isMimeTypeVideo() -> {\n+ MediaItem.Video(\n+ id = UniqueId(\"dummy\"),\n+ eventId = eventId,\n+ mediaInfo = mediaInfo,\n+ mediaSource = mediaSource,\n+ thumbnailSource = thumbnailSource,\n+ )\n+ }\n+ mediaInfo.mimeType.isMimeTypeAudio() -> {\n+ if (mediaInfo.waveform == null) {\n+ MediaItem.Audio(\n+ id = UniqueId(\"dummy\"),\n+ eventId = eventId,\n+ mediaInfo = mediaInfo,\n+ mediaSource = mediaSource,\n+ )\n+ } else {\n+ MediaItem.Voice(\n+ id = UniqueId(\"dummy\"),\n+ eventId = eventId,\n+ mediaInfo = mediaInfo,\n+ mediaSource = mediaSource,\n+ )\n+ }\n+ }\n+ else -> {\n+ MediaItem.File(\n+ id = UniqueId(\"dummy\"),\n+ eventId = eventId,\n+ mediaInfo = mediaInfo,\n+ mediaSource = mediaSource,\n+ )\n+ }\n+}\n", "test_patch": "diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/TestData.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/TestData.kt\nindex 1946d2259bc..509fac833c3 100644\n--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/TestData.kt\n+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/TestData.kt\n@@ -48,6 +48,7 @@ val A_THREAD_ID = ThreadId(\"\\$aThreadId\")\n val A_THREAD_ID_2 = ThreadId(\"\\$aThreadId2\")\n val AN_EVENT_ID = EventId(\"\\$anEventId\")\n val AN_EVENT_ID_2 = EventId(\"\\$anEventId2\")\n+val AN_EVENT_ID_3 = EventId(\"\\$anEventId3\")\n val A_ROOM_ALIAS = RoomAlias(\"#alias1:domain\")\n val A_TRANSACTION_ID = TransactionId(\"aTransactionId\")\n val A_DEVICE_ID = DeviceId(\"ILAKNDNASDLK\")\ndiff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt\nindex 62d19bd66cb..1fd95da36b7 100644\n--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt\n+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt\n@@ -137,7 +137,7 @@ class FakeMatrixRoom(\n private val getMembersResult: (Int) -> Result> = { lambdaError() },\n private val timelineFocusedOnEventResult: (EventId) -> Result = { lambdaError() },\n private val pinnedEventsTimelineResult: () -> Result = { lambdaError() },\n- private val mediaTimelineResult: () -> Result = { lambdaError() },\n+ private val mediaTimelineResult: (EventId?) -> Result = { lambdaError() },\n private val setSendQueueEnabledLambda: (Boolean) -> Unit = { _: Boolean -> },\n private val saveComposerDraftLambda: (ComposerDraft) -> Result = { _: ComposerDraft -> Result.success(Unit) },\n private val loadComposerDraftLambda: () -> Result = { Result.success(null) },\n@@ -215,8 +215,8 @@ class FakeMatrixRoom(\n pinnedEventsTimelineResult()\n }\n \n- override suspend fun mediaTimeline(): Result = simulateLongTask {\n- mediaTimelineResult()\n+ override suspend fun mediaTimeline(eventId: EventId?): Result = simulateLongTask {\n+ mediaTimelineResult(eventId)\n }\n \n override suspend fun subscribeToSync() {\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/FakeTimelineItemPresenterFactories.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/FakeTimelineItemPresenterFactories.kt\nindex bde6a57ad56..7a2094d8903 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/FakeTimelineItemPresenterFactories.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/FakeTimelineItemPresenterFactories.kt\n@@ -8,7 +8,7 @@\n package io.element.android.libraries.mediaviewer.impl.gallery.di\n \n import io.element.android.libraries.architecture.Presenter\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n import io.element.android.libraries.voiceplayer.api.VoiceMessageState\n import io.element.android.libraries.voiceplayer.api.aVoiceMessageState\n \ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/DefaultEventItemFactoryTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultEventItemFactoryTest.kt\nsimilarity index 99%\nrename from libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/DefaultEventItemFactoryTest.kt\nrename to libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultEventItemFactoryTest.kt\nindex a0bc4c1f0fc..40e6721c10d 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/DefaultEventItemFactoryTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultEventItemFactoryTest.kt\n@@ -5,7 +5,7 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.libraries.mediaviewer.impl.gallery\n+package io.element.android.libraries.mediaviewer.impl.datasource\n \n import com.google.common.truth.Truth.assertThat\n import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter\n@@ -48,6 +48,7 @@ import io.element.android.libraries.matrix.test.timeline.aProfileChangeMessageCo\n import io.element.android.libraries.matrix.test.timeline.aStickerContent\n import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem\n import io.element.android.libraries.mediaviewer.api.MediaInfo\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n import io.element.android.libraries.mediaviewer.test.util.FileExtensionExtractorWithoutValidation\n import kotlinx.collections.immutable.persistentListOf\n import kotlinx.collections.immutable.toImmutableList\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultFocusedTimelineMediaGalleryDataSourceFactoryTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultFocusedTimelineMediaGalleryDataSourceFactoryTest.kt\nnew file mode 100644\nindex 00000000000..a2ab9b162f6\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultFocusedTimelineMediaGalleryDataSourceFactoryTest.kt\n@@ -0,0 +1,31 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.datasource\n+\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.matrix.test.AN_EVENT_ID\n+import io.element.android.libraries.matrix.test.room.FakeMatrixRoom\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemImage\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Test\n+\n+class DefaultFocusedTimelineMediaGalleryDataSourceFactoryTest {\n+ @Test\n+ fun `createFor should create a TimelineMediaGalleryDataSource`() = runTest {\n+ val sut = DefaultFocusedTimelineMediaGalleryDataSourceFactory(\n+ room = FakeMatrixRoom(),\n+ timelineMediaItemsFactory = createTimelineMediaItemsFactory(),\n+ mediaItemsPostProcessor = MediaItemsPostProcessor(),\n+ )\n+ val result = sut.createFor(\n+ eventId = AN_EVENT_ID,\n+ mediaItem = aMediaItemImage(),\n+ )\n+ assertThat(result).isInstanceOf(TimelineMediaGalleryDataSource::class.java)\n+ }\n+}\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/FakeMediaGalleryDataSource.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FakeMediaGalleryDataSource.kt\nsimilarity index 91%\nrename from libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/FakeMediaGalleryDataSource.kt\nrename to libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FakeMediaGalleryDataSource.kt\nindex 419c2c568a3..ea4bdfbad8b 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/FakeMediaGalleryDataSource.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FakeMediaGalleryDataSource.kt\n@@ -5,11 +5,12 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.libraries.mediaviewer.impl.gallery\n+package io.element.android.libraries.mediaviewer.impl.datasource\n \n import io.element.android.libraries.architecture.AsyncData\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems\n import io.element.android.tests.testutils.lambda.lambdaError\n import kotlinx.coroutines.flow.Flow\n import kotlinx.coroutines.flow.MutableSharedFlow\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedMediaTimelineTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedMediaTimelineTest.kt\nnew file mode 100644\nindex 00000000000..1d4fd3adbef\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedMediaTimelineTest.kt\n@@ -0,0 +1,102 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.datasource\n+\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.matrix.api.core.EventId\n+import io.element.android.libraries.matrix.api.room.MatrixRoom\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.libraries.matrix.test.AN_EVENT_ID\n+import io.element.android.libraries.matrix.test.room.FakeMatrixRoom\n+import io.element.android.libraries.matrix.test.timeline.FakeTimeline\n+import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemImage\n+import io.element.android.tests.testutils.lambda.lambdaRecorder\n+import io.element.android.tests.testutils.lambda.value\n+import kotlinx.collections.immutable.persistentListOf\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Test\n+\n+class FocusedMediaTimelineTest {\n+ @Test\n+ fun `check the returned cache data`() {\n+ val media = aMediaItemImage()\n+ val sut = createFocusedMediaTimeline(\n+ initialMediaItem = media,\n+ )\n+ val cache = sut.cache\n+ assertThat(cache.imageAndVideoItems.size).isEqualTo(3)\n+ assertThat(cache.fileItems.size).isEqualTo(3)\n+ assertThat(cache.imageAndVideoItems[1]).isEqualTo(media)\n+ assertThat(cache.fileItems[1]).isEqualTo(media)\n+ }\n+\n+ @Test\n+ fun `when event is not found, the cache is returned`() {\n+ val media = aMediaItemImage(\n+ eventId = AN_EVENT_ID,\n+ )\n+ val sut = createFocusedMediaTimeline(\n+ initialMediaItem = media,\n+ )\n+ val cache = sut.orCache(\n+ GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(),\n+ fileItems = persistentListOf(),\n+ )\n+ )\n+ assertThat(cache.imageAndVideoItems.size).isEqualTo(3)\n+ assertThat(cache.fileItems.size).isEqualTo(3)\n+ }\n+\n+ @Test\n+ fun `when event is found, the data is returned`() {\n+ val media = aMediaItemImage(\n+ eventId = AN_EVENT_ID,\n+ )\n+ val sut = createFocusedMediaTimeline(\n+ initialMediaItem = media,\n+ )\n+ val cache = sut.orCache(\n+ GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(media),\n+ fileItems = persistentListOf(),\n+ )\n+ )\n+ assertThat(cache.imageAndVideoItems.size).isEqualTo(1)\n+ assertThat(cache.fileItems).isEmpty()\n+ }\n+\n+ @Test\n+ fun `getTimeline returns the timeline provided by the room`() = runTest {\n+ val mediaTimelineResult = lambdaRecorder> {\n+ Result.success(FakeTimeline())\n+ }\n+ val room = FakeMatrixRoom(\n+ mediaTimelineResult = mediaTimelineResult,\n+ )\n+ val sut = createFocusedMediaTimeline(\n+ room = room,\n+ eventId = AN_EVENT_ID,\n+ )\n+ val timeline = sut.getTimeline()\n+ assertThat(timeline.isSuccess).isTrue()\n+ mediaTimelineResult.assertions().isCalledOnce().with(value(AN_EVENT_ID))\n+ }\n+\n+ private fun createFocusedMediaTimeline(\n+ room: MatrixRoom = FakeMatrixRoom(),\n+ eventId: EventId = AN_EVENT_ID,\n+ initialMediaItem: MediaItem.Event = aMediaItemImage(),\n+ ) = FocusedMediaTimeline(\n+ room = room,\n+ eventId = eventId,\n+ initialMediaItem = initialMediaItem,\n+ )\n+}\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/LiveMediaTimelineTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/LiveMediaTimelineTest.kt\nnew file mode 100644\nindex 00000000000..95b62a5824f\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/LiveMediaTimelineTest.kt\n@@ -0,0 +1,54 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.datasource\n+\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.matrix.api.core.EventId\n+import io.element.android.libraries.matrix.api.room.MatrixRoom\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.libraries.matrix.test.room.FakeMatrixRoom\n+import io.element.android.libraries.matrix.test.timeline.FakeTimeline\n+import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems\n+import io.element.android.tests.testutils.lambda.lambdaRecorder\n+import io.element.android.tests.testutils.lambda.value\n+import kotlinx.coroutines.test.runTest\n+import org.junit.Test\n+\n+class LiveMediaTimelineTest {\n+ @Test\n+ fun `LiveMediaTimeline cache is always null`() = runTest {\n+ val sut = createLiveMediaTimeline()\n+ assertThat(sut.cache).isNull()\n+ }\n+\n+ @Test\n+ fun `getTimeline returns the timeline provided by the room, then from cache`() = runTest {\n+ val mediaTimelineResult = lambdaRecorder> {\n+ Result.success(FakeTimeline())\n+ }\n+ val room = FakeMatrixRoom(\n+ mediaTimelineResult = mediaTimelineResult,\n+ )\n+ val sut = createLiveMediaTimeline(\n+ room = room,\n+ )\n+ val timeline = sut.getTimeline()\n+ assertThat(timeline.isSuccess).isTrue()\n+ mediaTimelineResult.assertions().isCalledOnce().with(value(null))\n+ val timeline2 = sut.getTimeline()\n+ assertThat(timeline2.isSuccess).isTrue()\n+ // No called another time\n+ mediaTimelineResult.assertions().isCalledOnce()\n+ }\n+\n+ private fun createLiveMediaTimeline(\n+ room: MatrixRoom = FakeMatrixRoom(),\n+ ) = LiveMediaTimeline(\n+ room = room,\n+ )\n+}\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessorTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaItemsPostProcessorTest.kt\nsimilarity index 88%\nrename from libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessorTest.kt\nrename to libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaItemsPostProcessorTest.kt\nindex 4c823350ce6..a8903394b31 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessorTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaItemsPostProcessorTest.kt\n@@ -5,17 +5,19 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.libraries.mediaviewer.impl.gallery\n+package io.element.android.libraries.mediaviewer.impl.datasource\n \n import com.google.common.truth.Truth.assertThat\n import io.element.android.libraries.matrix.api.core.UniqueId\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemAudio\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemDateSeparator\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemFile\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemImage\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemLoadingIndicator\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemVideo\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemVoice\n+import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemAudio\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemDateSeparator\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemFile\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemImage\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemLoadingIndicator\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemVideo\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemVoice\n import kotlinx.collections.immutable.toImmutableList\n import org.junit.Test\n \ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/TimelineMediaGalleryDataSourceTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaGalleryDataSourceTest.kt\nsimilarity index 93%\nrename from libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/TimelineMediaGalleryDataSourceTest.kt\nrename to libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaGalleryDataSourceTest.kt\nindex 2f8cd634eca..736fd309f36 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/TimelineMediaGalleryDataSourceTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaGalleryDataSourceTest.kt\n@@ -5,7 +5,7 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.libraries.mediaviewer.impl.gallery\n+package io.element.android.libraries.mediaviewer.impl.datasource\n \n import app.cash.turbine.test\n import com.google.common.truth.Truth.assertThat\n@@ -34,6 +34,8 @@ import io.element.android.libraries.matrix.test.timeline.aMessageContent\n import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem\n import io.element.android.libraries.matrix.ui.components.A_BLUR_HASH\n import io.element.android.libraries.mediaviewer.api.MediaInfo\n+import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n import io.element.android.libraries.mediaviewer.test.util.FileExtensionExtractorWithoutValidation\n import io.element.android.tests.testutils.WarmUpRule\n import io.element.android.tests.testutils.lambda.lambdaRecorder\n@@ -260,18 +262,21 @@ class TimelineMediaGalleryDataSourceTest {\n ): TimelineMediaGalleryDataSource {\n return TimelineMediaGalleryDataSource(\n room = room,\n- timelineMediaItemsFactory = TimelineMediaItemsFactory(\n- dispatchers = testCoroutineDispatchers(),\n- virtualItemFactory = VirtualItemFactory(\n- dateFormatter = FakeDateFormatter(),\n- ),\n- eventItemFactory = EventItemFactory(\n- fileSizeFormatter = FakeFileSizeFormatter(),\n- fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),\n- dateFormatter = FakeDateFormatter(),\n- ),\n- ),\n+ mediaTimeline = LiveMediaTimeline(room),\n+ timelineMediaItemsFactory = createTimelineMediaItemsFactory(),\n mediaItemsPostProcessor = MediaItemsPostProcessor(),\n )\n }\n }\n+\n+fun TestScope.createTimelineMediaItemsFactory() = TimelineMediaItemsFactory(\n+ dispatchers = testCoroutineDispatchers(),\n+ virtualItemFactory = VirtualItemFactory(\n+ dateFormatter = FakeDateFormatter(),\n+ ),\n+ eventItemFactory = EventItemFactory(\n+ fileSizeFormatter = FakeFileSizeFormatter(),\n+ fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),\n+ dateFormatter = FakeDateFormatter(),\n+ ),\n+)\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt\nindex 0f304f209e9..1a43bbacf6d 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt\n@@ -21,8 +21,10 @@ import io.element.android.libraries.matrix.test.A_USER_ID_2\n import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader\n import io.element.android.libraries.matrix.test.room.FakeMatrixRoom\n import io.element.android.libraries.matrix.test.timeline.FakeTimeline\n+import io.element.android.libraries.mediaviewer.impl.datasource.FakeMediaGalleryDataSource\n+import io.element.android.libraries.mediaviewer.impl.datasource.MediaGalleryDataSource\n import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemImage\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemImage\n import io.element.android.libraries.mediaviewer.test.FakeLocalMediaActions\n import io.element.android.libraries.mediaviewer.test.FakeLocalMediaFactory\n import io.element.android.tests.testutils.WarmUpRule\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/model/GroupedMediaItemsTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/model/GroupedMediaItemsTest.kt\nnew file mode 100644\nindex 00000000000..16f07779941\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/model/GroupedMediaItemsTest.kt\n@@ -0,0 +1,32 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.model\n+\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.matrix.test.AN_EVENT_ID\n+import io.element.android.libraries.matrix.test.AN_EVENT_ID_2\n+import io.element.android.libraries.matrix.test.AN_EVENT_ID_3\n+import kotlinx.collections.immutable.persistentListOf\n+import org.junit.Test\n+\n+class GroupedMediaItemsTest {\n+ @Test\n+ fun `hasEvent returns the expected value`() {\n+ val sut = GroupedMediaItems(\n+ imageAndVideoItems = persistentListOf(\n+ aMediaItemImage(eventId = AN_EVENT_ID),\n+ ),\n+ fileItems = persistentListOf(\n+ aMediaItemAudio(eventId = AN_EVENT_ID_2),\n+ ),\n+ )\n+ assertThat(sut.hasEvent(AN_EVENT_ID)).isTrue()\n+ assertThat(sut.hasEvent(AN_EVENT_ID_2)).isTrue()\n+ assertThat(sut.hasEvent(AN_EVENT_ID_3)).isFalse()\n+ }\n+}\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSourceTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSourceTest.kt\nindex 5348eb2aa34..b49c174d21e 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSourceTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSourceTest.kt\n@@ -17,15 +17,15 @@ import io.element.android.libraries.matrix.test.AN_EVENT_ID\n import io.element.android.libraries.matrix.test.AN_EVENT_ID_2\n import io.element.android.libraries.matrix.test.AN_EXCEPTION\n import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader\n+import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint.MediaViewerMode\n import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory\n-import io.element.android.libraries.mediaviewer.impl.gallery.FakeMediaGalleryDataSource\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryDataSource\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryMode\n+import io.element.android.libraries.mediaviewer.impl.datasource.FakeMediaGalleryDataSource\n+import io.element.android.libraries.mediaviewer.impl.datasource.MediaGalleryDataSource\n import io.element.android.libraries.mediaviewer.impl.gallery.aGroupedMediaItems\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemDateSeparator\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemFile\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemImage\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemLoadingIndicator\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemDateSeparator\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemFile\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemImage\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemLoadingIndicator\n import io.element.android.libraries.mediaviewer.test.FakeLocalMediaFactory\n import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP\n import io.element.android.services.toolbox.test.systemclock.FakeSystemClock\n@@ -122,10 +122,12 @@ class MediaViewerDataSourceTest {\n MediaViewerPageData.Loading(\n direction = Timeline.PaginationDirection.BACKWARDS,\n timestamp = A_FAKE_TIMESTAMP,\n+ pagerKey = 0L,\n ),\n MediaViewerPageData.Loading(\n direction = Timeline.PaginationDirection.FORWARDS,\n timestamp = A_FAKE_TIMESTAMP,\n+ pagerKey = 1L,\n ),\n )\n }\n@@ -135,7 +137,7 @@ class MediaViewerDataSourceTest {\n fun `test dataFlow with data galleryMode image`() = runTest {\n val galleryDataSource = FakeMediaGalleryDataSource()\n val sut = createMediaViewerDataSource(\n- galleryMode = MediaGalleryMode.Images,\n+ mode = MediaViewerMode.TimelineImagesAndVideos,\n galleryDataSource = galleryDataSource,\n )\n sut.dataFlow().test {\n@@ -157,7 +159,7 @@ class MediaViewerDataSourceTest {\n fun `test dataFlow with data galleryMode files`() = runTest {\n val galleryDataSource = FakeMediaGalleryDataSource()\n val sut = createMediaViewerDataSource(\n- galleryMode = MediaGalleryMode.Files,\n+ mode = MediaViewerMode.TimelineFilesAndAudios,\n galleryDataSource = galleryDataSource,\n )\n sut.dataFlow().test {\n@@ -263,16 +265,17 @@ class MediaViewerDataSourceTest {\n }\n \n private fun TestScope.createMediaViewerDataSource(\n- galleryMode: MediaGalleryMode = MediaGalleryMode.Images,\n+ mode: MediaViewerMode = MediaViewerMode.TimelineImagesAndVideos,\n galleryDataSource: MediaGalleryDataSource = FakeMediaGalleryDataSource(),\n mediaLoader: MatrixMediaLoader = FakeMatrixMediaLoader(),\n localMediaFactory: LocalMediaFactory = FakeLocalMediaFactory(mockMediaUrl),\n ) = MediaViewerDataSource(\n- galleryMode = galleryMode,\n+ mode = mode,\n dispatcher = testCoroutineDispatchers().computation,\n galleryDataSource = galleryDataSource,\n mediaLoader = mediaLoader,\n localMediaFactory = localMediaFactory,\n systemClock = FakeSystemClock(),\n+ pagerKeysHandler = PagerKeysHandler(),\n )\n }\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt\nindex 8a2d536a78c..03d66992bf4 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt\n@@ -29,13 +29,12 @@ import io.element.android.libraries.matrix.test.timeline.FakeTimeline\n import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint\n import io.element.android.libraries.mediaviewer.api.anApkMediaInfo\n import io.element.android.libraries.mediaviewer.impl.R\n+import io.element.android.libraries.mediaviewer.impl.datasource.FakeMediaGalleryDataSource\n+import io.element.android.libraries.mediaviewer.impl.datasource.MediaGalleryDataSource\n import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState\n-import io.element.android.libraries.mediaviewer.impl.gallery.FakeMediaGalleryDataSource\n-import io.element.android.libraries.mediaviewer.impl.gallery.GroupedMediaItems\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryDataSource\n-import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryMode\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemImage\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemLoadingIndicator\n+import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemImage\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemLoadingIndicator\n import io.element.android.libraries.mediaviewer.test.FakeLocalMediaActions\n import io.element.android.libraries.mediaviewer.test.FakeLocalMediaFactory\n import io.element.android.services.toolbox.test.systemclock.FakeSystemClock\n@@ -782,16 +781,13 @@ class MediaViewerPresenterTest {\n ),\n navigator = mediaViewerNavigator,\n dataSource = MediaViewerDataSource(\n- galleryMode = when (mode) {\n- MediaViewerEntryPoint.MediaViewerMode.SingleMedia -> MediaGalleryMode.Images\n- MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos -> MediaGalleryMode.Images\n- MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios -> MediaGalleryMode.Files\n- },\n+ mode = mode,\n dispatcher = testCoroutineDispatchers().computation,\n galleryDataSource = mediaGalleryDataSource,\n mediaLoader = matrixMediaLoader,\n localMediaFactory = localMediaFactory,\n systemClock = FakeSystemClock(),\n+ pagerKeysHandler = PagerKeysHandler(),\n ),\n room = room,\n localMediaActions = localMediaActions,\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/PagerKeysHandlerTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/PagerKeysHandlerTest.kt\nnew file mode 100644\nindex 00000000000..807c7b51cd1\n--- /dev/null\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/PagerKeysHandlerTest.kt\n@@ -0,0 +1,76 @@\n+/*\n+ * Copyright 2025 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\n+ * Please see LICENSE files in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.mediaviewer.impl.viewer\n+\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.matrix.api.timeline.Timeline\n+import io.element.android.libraries.matrix.test.AN_EVENT_ID\n+import io.element.android.libraries.matrix.test.AN_EVENT_ID_2\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemImage\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemLoadingIndicator\n+import org.junit.Test\n+\n+class PagerKeysHandlerTest {\n+ private val image1 = aMediaItemImage(\n+ eventId = AN_EVENT_ID,\n+ )\n+ private val image2 = aMediaItemImage(\n+ eventId = AN_EVENT_ID_2,\n+ )\n+ private val aBackwardLoadingIndicator = aMediaItemLoadingIndicator(\n+ direction = Timeline.PaginationDirection.BACKWARDS\n+ )\n+ private val aForwardLoadingIndicator = aMediaItemLoadingIndicator(\n+ direction = Timeline.PaginationDirection.FORWARDS\n+ )\n+\n+ @Test\n+ fun `when new items are inserted after existing items, keys are not shifted`() {\n+ val sut = PagerKeysHandler()\n+ sut.accept(listOf(aBackwardLoadingIndicator, image1, aForwardLoadingIndicator))\n+ assertThat(sut.getKey(aBackwardLoadingIndicator)).isEqualTo(0)\n+ assertThat(sut.getKey(image1)).isEqualTo(1)\n+ assertThat(sut.getKey(aForwardLoadingIndicator)).isEqualTo(2)\n+ sut.accept(listOf(aBackwardLoadingIndicator, image1, image2, aForwardLoadingIndicator))\n+ assertThat(sut.getKey(aBackwardLoadingIndicator)).isEqualTo(0)\n+ assertThat(sut.getKey(image1)).isEqualTo(1)\n+ assertThat(sut.getKey(image2)).isEqualTo(2)\n+ assertThat(sut.getKey(aForwardLoadingIndicator)).isEqualTo(3)\n+ }\n+\n+ @Test\n+ fun `when new items are inserted before existing items, keys are not shifted`() {\n+ val sut = PagerKeysHandler()\n+ sut.accept(listOf(aBackwardLoadingIndicator, image1, aForwardLoadingIndicator))\n+ assertThat(sut.getKey(aBackwardLoadingIndicator)).isEqualTo(0)\n+ assertThat(sut.getKey(image1)).isEqualTo(1)\n+ assertThat(sut.getKey(aForwardLoadingIndicator)).isEqualTo(2)\n+ sut.accept(listOf(aBackwardLoadingIndicator, image2, image1, aForwardLoadingIndicator))\n+ assertThat(sut.getKey(aBackwardLoadingIndicator)).isEqualTo(-1)\n+ assertThat(sut.getKey(image2)).isEqualTo(0)\n+ assertThat(sut.getKey(image1)).isEqualTo(1)\n+ assertThat(sut.getKey(aForwardLoadingIndicator)).isEqualTo(2)\n+ // Accepting the same list should not change the keys\n+ sut.accept(listOf(aBackwardLoadingIndicator, image2, image1, aForwardLoadingIndicator))\n+ assertThat(sut.getKey(aBackwardLoadingIndicator)).isEqualTo(-1)\n+ assertThat(sut.getKey(image2)).isEqualTo(0)\n+ assertThat(sut.getKey(image1)).isEqualTo(1)\n+ assertThat(sut.getKey(aForwardLoadingIndicator)).isEqualTo(2)\n+ }\n+\n+ @Test\n+ fun `when loaders are removed, keys are not shifted`() {\n+ val sut = PagerKeysHandler()\n+ sut.accept(listOf(aBackwardLoadingIndicator, image1, aForwardLoadingIndicator))\n+ assertThat(sut.getKey(aBackwardLoadingIndicator)).isEqualTo(0)\n+ assertThat(sut.getKey(image1)).isEqualTo(1)\n+ assertThat(sut.getKey(aForwardLoadingIndicator)).isEqualTo(2)\n+ sut.accept(listOf(image1))\n+ assertThat(sut.getKey(image1)).isEqualTo(1)\n+ }\n+}\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/SingleMediaGalleryDataSourceTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/SingleMediaGalleryDataSourceTest.kt\nsimilarity index 94%\nrename from libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/SingleMediaGalleryDataSourceTest.kt\nrename to libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/SingleMediaGalleryDataSourceTest.kt\nindex d616322ddca..540f1076010 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/SingleMediaGalleryDataSourceTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/SingleMediaGalleryDataSourceTest.kt\n@@ -5,7 +5,7 @@\n * Please see LICENSE files in the repository root for full details.\n */\n \n-package io.element.android.libraries.mediaviewer.impl.gallery\n+package io.element.android.libraries.mediaviewer.impl.viewer\n \n import app.cash.turbine.test\n import com.google.common.truth.Truth.assertThat\n@@ -22,8 +22,10 @@ import io.element.android.libraries.mediaviewer.api.aVoiceMediaInfo\n import io.element.android.libraries.mediaviewer.api.anApkMediaInfo\n import io.element.android.libraries.mediaviewer.api.anAudioMediaInfo\n import io.element.android.libraries.mediaviewer.api.anImageMediaInfo\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemFile\n-import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemImage\n+import io.element.android.libraries.mediaviewer.impl.gallery.aGroupedMediaItems\n+import io.element.android.libraries.mediaviewer.impl.model.MediaItem\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemFile\n+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemImage\n import io.element.android.tests.testutils.WarmUpRule\n import kotlinx.coroutines.test.runTest\n import org.junit.Rule\ndiff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt\nindex d140d3fea48..b5e75b904da 100644\n--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt\n+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt\n@@ -136,6 +136,7 @@ class KonsistClassNameTest {\n \"Enterprise\",\n \"Fdroid\",\n \"FileExtensionExtractor\",\n+ \"LiveMediaTimeline\",\n \"KeyStore\",\n \"Matrix\",\n \"Noop\",\n", "n2p_tests": "{\"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - delete bottom sheet\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - change mode\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.TimelineMediaGalleryDataSourceTest.test - delete item should call the timeline redact method\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - initial state cannot show info\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dataFlow loading items\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.FocusedMediaTimelineTest.when event is found, the data is returned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - save on disk\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - delete item\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.LiveMediaTimelineTest.getTimeline returns the timeline provided by the room, then from cache\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - load more\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.SingleMediaGalleryDataSourceTest.groupedMediaItemsFlow emit a single item\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.DefaultFocusedTimelineMediaGalleryDataSourceFactoryTest.createFor should create a TimelineMediaGalleryDataSource\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - save on disk\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - initial state\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.loadMore invokes the gallery data source loadMore\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.TimelineMediaGalleryDataSourceTest.test - getLastData should return the previous emitted data\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.TimelineMediaGalleryDataSourceTest.test - when timeline emits new data, the flow emits the data\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.TimelineMediaGalleryDataSourceTest.test - failing to load timeline should emit an error\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.SingleMediaGalleryDataSourceTest.function deleteItem is no op\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - data source update\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.MediaItemsPostProcessorTest.process will reorder files\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - delete\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.FocusedMediaTimelineTest.when event is not found, the cache is returned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.SingleMediaGalleryDataSourceTest.createFrom should create a SingleMediaGalleryDataSource with a file item\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - initial state null Event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.FocusedMediaTimelineTest.getTimeline returns the timeline provided by the room\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.DefaultEventItemFactoryTest.create check all null cases\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - view in timeline invokes the navigator\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.MediaItemsPostProcessorTest.process will skip date if there is no items\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dataFlow empty\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - initial state Event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.DefaultEventItemFactoryTest.create for FileMessageType\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dataFlow uninitialized, loading and error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - initial state Event from other\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.SingleMediaGalleryDataSourceTest.createFrom should create a SingleMediaGalleryDataSource with an image item\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.TimelineMediaGalleryDataSourceTest.test - load more should call the timeline paginate method\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - delete and cancel\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.DefaultEventItemFactoryTest.create for ImageMessageType\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItemsTest.hasEvent returns the expected value\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.MediaItemsPostProcessorTest.process Empty\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - snackbar displayed when there is no more items forward images and videos\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - snackbar displayed when there is no more items backward images and videos\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.MediaItemsPostProcessorTest.process will split images, videos and files\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.PagerKeysHandlerTest.when new items are inserted before existing items, keys are not shifted\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.DefaultEventItemFactoryTest.create for VideoMessageType\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.PagerKeysHandlerTest.when loaders are removed, keys are not shifted\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - bottom sheet state - own message and cannot delete own\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - bottom sheet state - other message and cannot delete other\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - snackbar displayed when there is no more items forward files and audio\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.LiveMediaTimelineTest.LiveMediaTimeline cache is always null\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.DefaultEventItemFactoryTest.create MessageContent check all null cases\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.setup should start the gallery data source\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.MediaItemsPostProcessorTest.process will reorder images\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.FocusedMediaTimelineTest.check the returned cache data\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dataFlow with data galleryMode image and load media\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - share item\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dispose\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - view in timeline hide the bottom sheet and invokes the navigator\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dataFlow with data galleryMode image\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - clear loading error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - share\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.TimelineMediaGalleryDataSourceTest.test - not started TimelineMediaGalleryDataSource emits no events\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.SingleMediaGalleryDataSourceTest.createFrom should create a SingleMediaGalleryDataSource with an audio item\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.MediaItemsPostProcessorTest.process will add the loading indicator to both list\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dataFlow with data galleryMode image and load media with failure then success\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - bottom sheet state - own message and can delete own\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.SingleMediaGalleryDataSourceTest.getLastData should return the data\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.SingleMediaGalleryDataSourceTest.function loadMore is no op\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - load more\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - load media\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.SingleMediaGalleryDataSourceTest.function start is no op\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.MediaItemsPostProcessorTest.process will handle complex case\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - snackbar displayed when there is no more items backward files and audio\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.SingleMediaGalleryDataSourceTest.createFrom should create a SingleMediaGalleryDataSource with a video item\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - open info\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - no snackbar displayed when there is no more items but not displaying a loading item\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - bottom sheet state - other message and can delete other\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.DefaultEventItemFactoryTest.create for StickerMessageType\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dataFlow - date separator are filtered out\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.DefaultEventItemFactoryTest.create for VoiceMessageType\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - open with\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - on navigate to\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerDataSourceTest.test dataFlow with data galleryMode files\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.datasource.DefaultEventItemFactoryTest.create for AudioMessageType\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.SingleMediaGalleryDataSourceTest.createFrom should create a SingleMediaGalleryDataSource with a voice item\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.PagerKeysHandlerTest.when new items are inserted after existing items, keys are not shifted\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{\"io.element.android.tests.konsist.KonsistClassNameTest.Class implementing interface should have name not end with 'Impl' but start with 'Default'\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.tests.konsist.KonsistClassNameTest.Classes extending 'Node' should have 'Node' suffix\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.tests.konsist.KonsistClassNameTest.Class with 'ContributeBinding' annotation should have allowed prefix\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.tests.konsist.KonsistClassNameTest.Classes extending 'Presenter' should have 'Presenter' suffix\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.tests.konsist.KonsistClassNameTest.Fake classes must be named using Fake and the interface it fakes\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.tests.konsist.KonsistClassNameTest.Classes extending 'PreviewParameterProvider' name MUST end with 'Provider' and MUST contain provided class name\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-4195", "org": "element-hq", "repo": "element-x-android", "number": 4195, "state": "closed", "title": "Fix snack bar not displayed in MediaViewer", "body": "\r\n \r\n## Content\r\n\r\n\r\nThe SnackBar was not displayed in the MediaViewer because it's in a Node which is displayed in Overlay mode. In this case, the Screen below (Messages or Gallery) is consuming the SnackBar. Using a local `SnackbarDispatcher` in `MediaViewerPresenter` fixes the issue. This is commit d36b4139f8011a6c0711c65a1a9fcb198defa9b8\r\n\r\nc3e148b97c98efa8658ee8b7acee8f53763be07d is closing the bottom sheet once an action is selected, to either leave space for the share native bottom sheet or the \"saved\" snackbar.\r\n\r\nOther commits are cleanup.\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #4128 \r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\nhttps://github.com/user-attachments/assets/b2b617e6-cbcc-4b6f-a2bf-9a2bc79a70f2\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Open an image and save it to disk.\r\n- You should see a confirmation snackbar.\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 24\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"3668e861f7535274d5ebe06b176d0b1b655bbe7f\"}", "resolved_issues": "[{\"number\": 4128, \"title\": \"Downloading currently gives no feedback if it started or if it is finished\", \"body\": \"### Your use case\\n\\n#### What would you like to do?\\r\\n\\r\\nCurrently EX is missing any indication that download has started/finished and it would suit to have some sort of information \\r\\n\\r\\n#### Why would you like to do it?\\r\\n\\r\\nElement had it, element x should also have it. \\r\\n\\r\\n#### How would you like to achieve it?\\r\\n\\r\\nSimple toast message, notification/ message in notification are that download has started or something similar\\r\\n\\n\\n### Have you considered any alternatives?\\n\\n_No response_\\n\\n### Additional context\\n\\n_No response_\\n\\n### Are you willing to provide a PR?\\n\\nNo\"}]", "lang": "kotlin", "problem_statement": "Downloading currently gives no feedback if it started or if it is finished\n### Your use case\n\n#### What would you like to do?\r\n\r\nCurrently EX is missing any indication that download has started/finished and it would suit to have some sort of information \r\n\r\n#### Why would you like to do it?\r\n\r\nElement had it, element x should also have it. \r\n\r\n#### How would you like to achieve it?\r\n\r\nSimple toast message, notification/ message in notification are that download has started or something similar\r\n\n\n### Have you considered any alternatives?\n\n_No response_\n\n### Additional context\n\n_No response_\n\n### Are you willing to provide a PR?\n\nNo\n", "hints": NaN, "pull_url": "https://github.com/element-hq/element-x-android/pull/4195", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/4128\"]", "test_command": "./gradlew :libraries:mediaviewer:impl:testDebugUnitTest --tests \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest\"", "fix_patch": "diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt\nindex f3ca8b92346..2759e49f70a 100644\n--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt\n+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt\n@@ -45,7 +45,7 @@ class LoggedInEventProcessor @Inject constructor(\n observingJob = null\n }\n \n- private suspend fun displayMessage(message: Int) {\n+ private fun displayMessage(message: Int) {\n snackbarDispatcher.post(SnackbarMessage(message))\n }\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt\nindex da50881d146..a01a3ed3c8f 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt\n@@ -484,7 +484,7 @@ class MessagesPresenter @AssistedInject constructor(\n )\n }\n \n- private suspend fun handleCopyContents(event: TimelineItem.Event) {\n+ private fun handleCopyContents(event: TimelineItem.Event) {\n val content = when (event.content) {\n is TimelineItemTextBasedContent -> event.content.body\n is TimelineItemStateContent -> event.content.body\n@@ -496,7 +496,7 @@ class MessagesPresenter @AssistedInject constructor(\n }\n }\n \n- private suspend fun handleCopyCaption(event: TimelineItem.Event) {\n+ private fun handleCopyCaption(event: TimelineItem.Event) {\n val content = (event.content as? TimelineItemEventContentWithAttachment)?.caption ?: return\n clipboardHelper.copyPlainText(content)\n if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {\ndiff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupNode.kt\nindex 1fcd1b792f6..03f44241581 100644\n--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupNode.kt\n+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupNode.kt\n@@ -8,7 +8,6 @@\n package io.element.android.features.securebackup.impl.setup\n \n import androidx.compose.runtime.Composable\n-import androidx.compose.runtime.rememberCoroutineScope\n import androidx.compose.ui.Modifier\n import com.bumble.appyx.core.modality.BuildContext\n import com.bumble.appyx.core.node.Node\n@@ -22,8 +21,6 @@ import io.element.android.libraries.architecture.inputs\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage\n import io.element.android.libraries.di.SessionScope\n-import kotlinx.coroutines.CoroutineScope\n-import kotlinx.coroutines.launch\n \n @ContributesNode(SessionScope::class)\n class SecureBackupSetupNode @AssistedInject constructor(\n@@ -42,12 +39,11 @@ class SecureBackupSetupNode @AssistedInject constructor(\n \n @Composable\n override fun View(modifier: Modifier) {\n- val coroutineScope = rememberCoroutineScope()\n val state = presenter.present()\n SecureBackupSetupView(\n state = state,\n onSuccess = {\n- coroutineScope.postSuccessSnackbar()\n+ postSuccessSnackbar()\n navigateUp()\n },\n onBackClick = ::navigateUp,\n@@ -55,7 +51,7 @@ class SecureBackupSetupNode @AssistedInject constructor(\n )\n }\n \n- private fun CoroutineScope.postSuccessSnackbar() = launch {\n+ private fun postSuccessSnackbar() {\n snackbarDispatcher.post(\n SnackbarMessage(\n messageResId = if (inputs.isChangeRecoveryKeyUserStory) {\ndiff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarDispatcher.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarDispatcher.kt\nindex 336d706d2ed..52fe5979e6d 100644\n--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarDispatcher.kt\n+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarDispatcher.kt\n@@ -36,7 +36,7 @@ class SnackbarDispatcher {\n }\n }\n \n- suspend fun post(message: SnackbarMessage) {\n+ fun post(message: SnackbarMessage) {\n if (snackBarMessageQueue.isEmpty()) {\n snackBarMessageQueue.add(message)\n if (queueMutex.isLocked) queueMutex.unlock()\n@@ -54,7 +54,7 @@ class SnackbarDispatcher {\n }\n \n /** Used to provide a [SnackbarDispatcher] to composable functions, it's needed for [rememberSnackbarHostState]. */\n-val LocalSnackbarDispatcher = compositionLocalOf { SnackbarDispatcher() }\n+val LocalSnackbarDispatcher = compositionLocalOf { SnackbarDispatcher() }\n \n @Composable\n fun SnackbarDispatcher.collectSnackbarMessageAsState(): State {\n@@ -72,10 +72,10 @@ fun rememberSnackbarHostState(snackbarMessage: SnackbarMessage?): SnackbarHostSt\n } ?: return snackbarHostState\n \n val dispatcher = LocalSnackbarDispatcher.current\n- LaunchedEffect(snackbarMessageText) {\n+ LaunchedEffect(snackbarMessage.id) {\n // If the message wasn't already displayed, do it now, and mark it as displayed\n // This will prevent the message from appearing in any other active SnackbarHosts\n- if (snackbarMessage.isDisplayed.getAndSet(true) == false) {\n+ if (snackbarMessage.isDisplayed.getAndSet(true).not()) {\n try {\n snackbarHostState.showSnackbar(\n message = snackbarMessageText,\ndiff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarMessage.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarMessage.kt\nindex 2597944c599..fb9be76f988 100644\n--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarMessage.kt\n+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarMessage.kt\n@@ -10,6 +10,7 @@ package io.element.android.libraries.designsystem.utils.snackbar\n import androidx.annotation.StringRes\n import androidx.compose.material3.SnackbarDuration\n import java.util.concurrent.atomic.AtomicBoolean\n+import kotlin.random.Random\n \n /**\n * A message to be displayed in a [Snackbar].\n@@ -17,6 +18,7 @@ import java.util.concurrent.atomic.AtomicBoolean\n * @param duration The duration of the message. The default value is [SnackbarDuration.Short].\n * @param actionResId The action text to be displayed. The default value is `null`.\n * @param isDisplayed Used to track if the current message is already displayed or not.\n+ * @param id The unique identifier of the message. The default value is a random long.\n * @param action The action to be performed when the action is clicked.\n */\n data class SnackbarMessage(\n@@ -24,5 +26,6 @@ data class SnackbarMessage(\n val duration: SnackbarDuration = SnackbarDuration.Short,\n @StringRes val actionResId: Int? = null,\n val isDisplayed: AtomicBoolean = AtomicBoolean(false),\n+ val id: Long = Random.nextLong(),\n val action: () -> Unit = {},\n )\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt\nindex 476e86c5c58..e094e1b9fbd 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt\n@@ -86,11 +86,13 @@ class MediaGalleryPresenter @AssistedInject constructor(\n mediaGalleryDataSource.deleteItem(event.eventId)\n }\n is MediaGalleryEvents.SaveOnDisk -> coroutineScope.launch {\n+ mediaBottomSheetState = MediaBottomSheetState.Hidden\n groupedMediaItems.dataOrNull().find(event.eventId)?.let {\n saveOnDisk(it)\n }\n }\n is MediaGalleryEvents.Share -> coroutineScope.launch {\n+ mediaBottomSheetState = MediaBottomSheetState.Hidden\n groupedMediaItems.dataOrNull().find(event.eventId)?.let {\n share(it)\n }\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt\nindex a801437e825..b039576e0ab 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt\n@@ -44,7 +44,6 @@ class MediaViewerPresenter @AssistedInject constructor(\n @Assisted private val dataSource: MediaViewerDataSource,\n private val room: MatrixRoom,\n private val localMediaActions: LocalMediaActions,\n- private val snackbarDispatcher: SnackbarDispatcher,\n ) : Presenter {\n @AssistedFactory\n interface Factory {\n@@ -55,6 +54,9 @@ class MediaViewerPresenter @AssistedInject constructor(\n ): MediaViewerPresenter\n }\n \n+ // Use a local snackbarDispatcher because this presenter is used in an Overlay Node\n+ private val snackbarDispatcher = SnackbarDispatcher()\n+\n @Composable\n override fun present(): MediaViewerState {\n val coroutineScope = rememberCoroutineScope()\n", "test_patch": "diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt\nindex ac0acfe7193..47e48ca9e15 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt\n@@ -13,7 +13,6 @@ import android.net.Uri\n import app.cash.turbine.ReceiveTurbine\n import com.google.common.truth.Truth.assertThat\n import io.element.android.libraries.architecture.AsyncData\n-import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.media.MediaSource\n import io.element.android.libraries.matrix.api.room.MatrixRoom\n@@ -568,7 +567,6 @@ class MediaViewerPresenterTest {\n eventId: EventId? = null,\n matrixMediaLoader: FakeMatrixMediaLoader = FakeMatrixMediaLoader(),\n localMediaActions: FakeLocalMediaActions = FakeLocalMediaActions(),\n- snackbarDispatcher: SnackbarDispatcher = SnackbarDispatcher(),\n mediaGalleryDataSource: MediaGalleryDataSource = FakeMediaGalleryDataSource(\n startLambda = { },\n ),\n@@ -598,7 +596,6 @@ class MediaViewerPresenterTest {\n ),\n room = room,\n localMediaActions = localMediaActions,\n- snackbarDispatcher = snackbarDispatcher,\n )\n }\n }\n", "n2p_tests": "{\"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - load media\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - view in timeline hide the bottom sheet and invokes the navigator\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - initial state Event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - initial state Event from other\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - data source update\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - initial state cannot show info\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - open info\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - delete\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - save on disk\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - open with\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - on navigate to\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - delete and cancel\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - initial state null Event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - clear loading error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - share\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerPresenterTest.present - load more\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-4056", "org": "element-hq", "repo": "element-x-android", "number": 4056, "state": "closed", "title": "Update message action list", "body": "\r\n \r\n## Content\r\n\r\n\r\nReorder some items in the message action list and add a few test.\r\nAlso create a dedicated item to edit polls and fix wrong icon used for \"Remove caption\"\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #4046\r\nFigma: https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=1967-4558\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Step 1\r\n- Step 2\r\n- Step ...\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [ ] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 23\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"270fcb90291309d23d08f68efee74881708183ff\"}", "resolved_issues": "[{\"number\": 4046, \"title\": \"Consider swapping the \\\"Pin\\\" and \\\"Edit\\\" message options\", \"body\": \"### Your use case\\n\\n#### What would you like to do?\\r\\n\\r\\nHaving easy access to message features I use most often.\\r\\n\\r\\n#### Why would you like to do it?\\r\\n\\r\\nI edit messages way more than I pin them. Therefore I believe it makes more sense for the \\\"Edit\\\" option to be close to the top of the message context menu, and \\\"Pin\\\" close to the bottom. A recent update moved the \\\"Pin\\\" option to the 3rd position, and \\\"Edit\\\" to the 5th, meaning I now need to scroll to access one of the features that is the most useful to me.\\r\\n\\r\\nMoreover, it seems my muscle memory tends to favour somewhere around the 3rd position in that menu; my memory isn't great so I'm not sure if a previous version of Element X had that option there, or if this is caused by something else. But at least in one occurrence, recently, I've been in a rush to edit a message, and I ended up pinning it by mistake. And, just this morning, I've seen the same thing happen to a friend I was chatting with.\\r\\n\\r\\n#### How would you like to achieve it?\\r\\n\\r\\nSwapping the \\\"Pin\\\" And \\\"Edit\\\" options in the message context menu.\\n\\n### Have you considered any alternatives?\\n\\n_No response_\\n\\n### Additional context\\n\\n_No response_\\n\\n### Are you willing to provide a PR?\\n\\nNo\"}]", "lang": "kotlin", "problem_statement": "Consider swapping the \"Pin\" and \"Edit\" message options\n### Your use case\n\n#### What would you like to do?\r\n\r\nHaving easy access to message features I use most often.\r\n\r\n#### Why would you like to do it?\r\n\r\nI edit messages way more than I pin them. Therefore I believe it makes more sense for the \"Edit\" option to be close to the top of the message context menu, and \"Pin\" close to the bottom. A recent update moved the \"Pin\" option to the 3rd position, and \"Edit\" to the 5th, meaning I now need to scroll to access one of the features that is the most useful to me.\r\n\r\nMoreover, it seems my muscle memory tends to favour somewhere around the 3rd position in that menu; my memory isn't great so I'm not sure if a previous version of Element X had that option there, or if this is caused by something else. But at least in one occurrence, recently, I've been in a rush to edit a message, and I ended up pinning it by mistake. And, just this morning, I've seen the same thing happen to a friend I was chatting with.\r\n\r\n#### How would you like to achieve it?\r\n\r\nSwapping the \"Pin\" And \"Edit\" options in the message context menu.\n\n### Have you considered any alternatives?\n\n_No response_\n\n### Additional context\n\n_No response_\n\n### Are you willing to provide a PR?\n\nNo\n", "hints": "@americanrefugee what do you think about this suggestion? I tend to agree with it. Please confirm before we take any action.\r\n\r\nOrder is coming from https://www.figma.com/design/ux3tYoZV9WghC7hHT9Fhk0/Compound-iOS-Components?node-id=2946-2392 and in the code [here](https://github.com/element-hq/element-x-android/blob/develop/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparator.kt#L10).\r\n\r\nCC @mxandreas \nI think the actions that are more frequently used, should be closer to your thumb - which is at the bottom. This seems to be a common design practice in other apps as well.\r\n\r\nHowever, if the list of actions is now that large that, the bottom of the list is not visible and requires scrolling, then following that principle is not possible. Thus, I think we should try to fix this - e.g. can we get rid of the need to scroll to the bottom?\n@bmarty I accept the proposal and have changed the ordering according to what was suggested:\r\n- [iOS](https://www.figma.com/design/ux3tYoZV9WghC7hHT9Fhk0/Compound-iOS-Components?node-id=2946-2134&t=0haRXC4C9iTSpXkp-4)\r\n- [Android](https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=2736-1252&t=TA0YzEdDlKjefFYg-4)\r\n\r\n@mxandreas @bmarty I never intended for the Share sheet to be scrollable in most cases. The number of list items is dependent on the user type and permissions. So, the size of the list will change, and the size of the screen will determine how much of the list we can show at once. In the worst case scenario, where all possible options are visible, the sheet might need minimal scrolling on a device screen that's only 800 px. But in the vast majority of cases, the list should not scroll.\n@americanrefugee Please have look at my previous comment and confirm if you really want to change the order.\n@mxandreas I did look and still think this is the right thing.\r\n\r\n- According to your logic, we would need to reorder the entire list.\r\n- Having the least used options at the top definitely feels strange to me, and without knowing how many instances the list will scroll, it seems dangerous.\r\n- But most importantly, regardless of what other apps do, we've trained our users to find the most important options at the top. Like @babolivier mentioned, our users get very frustrated when we break their muscle memory.\r\n\r\nSo, either we go with the above OR I think we need to align internally (Design and Product) before reconsidering the position of all the options.\nOk, if this is not the principle we have followed, we can do as you suggested.\nfwiw, I just checked some apps on iOS and they all put the most important actions at the top of the share sheet. So at least I have validation that I'm not crazy or breaking a universal pattern :)", "pull_url": "https://github.com/element-hq/element-x-android/pull/4056", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/4046\"]", "test_command": "./gradlew :features:messages:impl:testDebugUnitTest --tests \"io.element.android.features.messages.impl.pinned.list.PinnedMessagesListTimelineActionPostProcessorTest\" --tests \"io.element.android.features.messages.impl.actionlist.model.TimelineItemActionComparatorTest\" --tests \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest\" --tests \"io.element.android.features.messages.impl.MessagesPresenterTest\"", "fix_patch": "diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt\nindex 4895390ab87..5fc68a0c618 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt\n@@ -274,7 +274,8 @@ class MessagesPresenter @AssistedInject constructor(\n TimelineItemAction.CopyCaption -> handleCopyCaption(targetEvent)\n TimelineItemAction.CopyLink -> handleCopyLink(targetEvent)\n TimelineItemAction.Redact -> handleActionRedact(targetEvent)\n- TimelineItemAction.Edit -> handleActionEdit(targetEvent, composerState, enableTextFormatting)\n+ TimelineItemAction.Edit,\n+ TimelineItemAction.EditPoll -> handleActionEdit(targetEvent, composerState, enableTextFormatting)\n TimelineItemAction.AddCaption -> handleActionAddCaption(targetEvent, composerState)\n TimelineItemAction.EditCaption -> handleActionEditCaption(targetEvent, composerState)\n TimelineItemAction.RemoveCaption -> handleRemoveCaption(targetEvent)\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt\nindex 95a6dc5a6f3..d631cf3dcd7 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt\n@@ -178,6 +178,8 @@ class DefaultActionListPresenter @AssistedInject constructor(\n add(TimelineItemAction.EditCaption)\n add(TimelineItemAction.RemoveCaption)\n }\n+ } else if (timelineItem.content is TimelineItemPollContent) {\n+ add(TimelineItemAction.EditPoll)\n } else {\n add(TimelineItemAction.Edit)\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt\nindex 1638a03fa31..2fef1fc525b 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt\n@@ -203,6 +203,7 @@ fun aTimelineItemActionList(\n fun aTimelineItemPollActionList(): ImmutableList {\n return setOf(\n TimelineItemAction.EndPoll,\n+ TimelineItemAction.EditPoll,\n TimelineItemAction.Reply,\n TimelineItemAction.Pin,\n TimelineItemAction.CopyLink,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt\nindex f700dcc6b1e..bd506fa3a53 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt\n@@ -11,30 +11,30 @@ import androidx.annotation.DrawableRes\n import androidx.annotation.StringRes\n import androidx.compose.runtime.Immutable\n import io.element.android.libraries.designsystem.icons.CompoundDrawables\n-import io.element.android.libraries.designsystem.utils.CommonDrawables\n import io.element.android.libraries.ui.strings.CommonStrings\n \n @Immutable\n-sealed class TimelineItemAction(\n+enum class TimelineItemAction(\n @StringRes val titleRes: Int,\n @DrawableRes val icon: Int,\n val destructive: Boolean = false\n ) {\n- data object ViewInTimeline : TimelineItemAction(CommonStrings.action_view_in_timeline, CompoundDrawables.ic_compound_visibility_on)\n- data object Forward : TimelineItemAction(CommonStrings.action_forward, CompoundDrawables.ic_compound_forward)\n- data object CopyText : TimelineItemAction(CommonStrings.action_copy_text, CompoundDrawables.ic_compound_copy)\n- data object CopyCaption : TimelineItemAction(CommonStrings.action_copy_caption, CompoundDrawables.ic_compound_copy)\n- data object CopyLink : TimelineItemAction(CommonStrings.action_copy_link_to_message, CompoundDrawables.ic_compound_link)\n- data object Redact : TimelineItemAction(CommonStrings.action_remove, CompoundDrawables.ic_compound_delete, destructive = true)\n- data object Reply : TimelineItemAction(CommonStrings.action_reply, CompoundDrawables.ic_compound_reply)\n- data object ReplyInThread : TimelineItemAction(CommonStrings.action_reply_in_thread, CompoundDrawables.ic_compound_reply)\n- data object Edit : TimelineItemAction(CommonStrings.action_edit, CompoundDrawables.ic_compound_edit)\n- data object EditCaption : TimelineItemAction(CommonStrings.action_edit_caption, CompoundDrawables.ic_compound_edit)\n- data object AddCaption : TimelineItemAction(CommonStrings.action_add_caption, CompoundDrawables.ic_compound_edit)\n- data object RemoveCaption : TimelineItemAction(CommonStrings.action_remove_caption, CompoundDrawables.ic_compound_delete, destructive = true)\n- data object ViewSource : TimelineItemAction(CommonStrings.action_view_source, CommonDrawables.ic_developer_options)\n- data object ReportContent : TimelineItemAction(CommonStrings.action_report_content, CompoundDrawables.ic_compound_chat_problem, destructive = true)\n- data object EndPoll : TimelineItemAction(CommonStrings.action_end_poll, CompoundDrawables.ic_compound_polls_end)\n- data object Pin : TimelineItemAction(CommonStrings.action_pin, CompoundDrawables.ic_compound_pin)\n- data object Unpin : TimelineItemAction(CommonStrings.action_unpin, CompoundDrawables.ic_compound_unpin)\n+ ViewInTimeline(CommonStrings.action_view_in_timeline, CompoundDrawables.ic_compound_visibility_on),\n+ Forward(CommonStrings.action_forward, CompoundDrawables.ic_compound_forward),\n+ CopyText(CommonStrings.action_copy_text, CompoundDrawables.ic_compound_copy),\n+ CopyCaption(CommonStrings.action_copy_caption, CompoundDrawables.ic_compound_copy),\n+ CopyLink(CommonStrings.action_copy_link_to_message, CompoundDrawables.ic_compound_link),\n+ Redact(CommonStrings.action_remove, CompoundDrawables.ic_compound_delete, destructive = true),\n+ Reply(CommonStrings.action_reply, CompoundDrawables.ic_compound_reply),\n+ ReplyInThread(CommonStrings.action_reply_in_thread, CompoundDrawables.ic_compound_reply),\n+ Edit(CommonStrings.action_edit, CompoundDrawables.ic_compound_edit),\n+ EditPoll(CommonStrings.action_edit_poll, CompoundDrawables.ic_compound_edit),\n+ EditCaption(CommonStrings.action_edit_caption, CompoundDrawables.ic_compound_edit),\n+ AddCaption(CommonStrings.action_add_caption, CompoundDrawables.ic_compound_edit),\n+ RemoveCaption(CommonStrings.action_remove_caption, CompoundDrawables.ic_compound_close, destructive = true),\n+ ViewSource(CommonStrings.action_view_source, CompoundDrawables.ic_compound_code),\n+ ReportContent(CommonStrings.action_report_content, CompoundDrawables.ic_compound_chat_problem, destructive = true),\n+ EndPoll(CommonStrings.action_end_poll, CompoundDrawables.ic_compound_polls_end),\n+ Pin(CommonStrings.action_pin, CompoundDrawables.ic_compound_pin),\n+ Unpin(CommonStrings.action_unpin, CompoundDrawables.ic_compound_unpin),\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparator.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparator.kt\nindex 8eef2d76199..a8a42b17ed1 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparator.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparator.kt\n@@ -7,21 +7,25 @@\n \n package io.element.android.features.messages.impl.actionlist.model\n \n+import androidx.annotation.VisibleForTesting\n+\n class TimelineItemActionComparator : Comparator {\n // See order in https://www.figma.com/design/ux3tYoZV9WghC7hHT9Fhk0/Compound-iOS-Components?node-id=2946-2392\n- private val orderedList = listOf(\n+ @VisibleForTesting\n+ val orderedList = listOf(\n TimelineItemAction.EndPoll,\n TimelineItemAction.ViewInTimeline,\n TimelineItemAction.Reply,\n TimelineItemAction.ReplyInThread,\n TimelineItemAction.Forward,\n- TimelineItemAction.Pin,\n- TimelineItemAction.Unpin,\n- TimelineItemAction.CopyLink,\n TimelineItemAction.Edit,\n- TimelineItemAction.CopyText,\n+ TimelineItemAction.EditPoll,\n TimelineItemAction.AddCaption,\n TimelineItemAction.EditCaption,\n+ TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n+ TimelineItemAction.Unpin,\n+ TimelineItemAction.CopyText,\n TimelineItemAction.CopyCaption,\n TimelineItemAction.RemoveCaption,\n TimelineItemAction.ViewSource,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessor.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessor.kt\nindex 48fdb83d796..1e86d4af089 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessor.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessor.kt\n@@ -14,9 +14,9 @@ class PinnedMessagesListTimelineActionPostProcessor : TimelineItemActionPostProc\n override fun process(actions: List): List {\n return buildList {\n add(TimelineItemAction.ViewInTimeline)\n- actions.firstOrNull { it is TimelineItemAction.Unpin }?.let(::add)\n- actions.firstOrNull { it is TimelineItemAction.Forward }?.let(::add)\n- actions.firstOrNull { it is TimelineItemAction.ViewSource }?.let(::add)\n+ actions.firstOrNull { it == TimelineItemAction.Unpin }?.let(::add)\n+ actions.firstOrNull { it == TimelineItemAction.Forward }?.let(::add)\n+ actions.firstOrNull { it == TimelineItemAction.ViewSource }?.let(::add)\n }\n }\n }\ndiff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt\nindex 0c758852db8..c2c2fd0e215 100644\n--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt\n+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt\n@@ -25,6 +25,7 @@ import io.element.android.features.preferences.impl.user.UserPreferences\n import io.element.android.libraries.architecture.coverage.ExcludeFromCoverage\n import io.element.android.libraries.designsystem.components.list.ListItemContent\n import io.element.android.libraries.designsystem.components.preferences.PreferencePage\n+import io.element.android.libraries.designsystem.icons.CompoundDrawables\n import io.element.android.libraries.designsystem.preview.ElementPreviewDark\n import io.element.android.libraries.designsystem.preview.ElementPreviewLight\n import io.element.android.libraries.designsystem.preview.PreviewWithLargeHeight\n@@ -33,7 +34,6 @@ import io.element.android.libraries.designsystem.theme.components.IconSource\n import io.element.android.libraries.designsystem.theme.components.ListItem\n import io.element.android.libraries.designsystem.theme.components.ListItemStyle\n import io.element.android.libraries.designsystem.theme.components.Text\n-import io.element.android.libraries.designsystem.utils.CommonDrawables\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarHost\n import io.element.android.libraries.designsystem.utils.snackbar.rememberSnackbarHostState\n import io.element.android.libraries.matrix.api.core.DeviceId\n@@ -270,7 +270,7 @@ private fun ColumnScope.Footer(\n private fun DeveloperPreferencesView(onOpenDeveloperSettings: () -> Unit) {\n ListItem(\n headlineContent = { Text(stringResource(id = CommonStrings.common_developer_options)) },\n- leadingContent = ListItemContent.Icon(IconSource.Resource(CommonDrawables.ic_developer_options)),\n+ leadingContent = ListItemContent.Icon(IconSource.Resource(CompoundDrawables.ic_compound_code)),\n onClick = onOpenDeveloperSettings\n )\n }\ndiff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt\nindex 28d7f845987..3822401b372 100644\n--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt\n+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt\n@@ -13,9 +13,7 @@ import io.element.android.libraries.designsystem.R\n // All the icons should be defined in Compound.\n internal val iconsOther = listOf(\n R.drawable.ic_cancel,\n- R.drawable.ic_developer_options,\n R.drawable.ic_encryption_enabled,\n- R.drawable.ic_groups,\n R.drawable.ic_notification_small,\n R.drawable.ic_plus_composer,\n R.drawable.ic_stop,\ndiff --git a/libraries/designsystem/src/main/res/drawable/ic_developer_options.xml b/libraries/designsystem/src/main/res/drawable/ic_developer_options.xml\ndeleted file mode 100644\nindex a55953010c8..00000000000\n--- a/libraries/designsystem/src/main/res/drawable/ic_developer_options.xml\n+++ /dev/null\n@@ -1,9 +0,0 @@\n-\n- \n-\ndiff --git a/libraries/designsystem/src/main/res/drawable/ic_groups.xml b/libraries/designsystem/src/main/res/drawable/ic_groups.xml\ndeleted file mode 100644\nindex 6f4b91e8dce..00000000000\n--- a/libraries/designsystem/src/main/res/drawable/ic_groups.xml\n+++ /dev/null\n@@ -1,15 +0,0 @@\n-\n-\n- \n-\n", "test_patch": "diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt\nindex 8cb7464a9ad..1369b5af635 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt\n@@ -467,7 +467,7 @@ class MessagesPresenterTest {\n presenter.present()\n }.test {\n val initialState = awaitItem()\n- initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.Edit, aMessageEvent(content = aTimelineItemPollContent())))\n+ initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.EditPoll, aMessageEvent(content = aTimelineItemPollContent())))\n awaitItem()\n onEditPollClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))\n }\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt\nindex 14605f31d5c..cc4120ffab1 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt\n@@ -179,8 +179,8 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n- TimelineItemAction.Pin,\n TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n TimelineItemAction.CopyText,\n TimelineItemAction.ViewSource,\n TimelineItemAction.ReportContent,\n@@ -225,8 +225,8 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.ReplyInThread,\n TimelineItemAction.Forward,\n- TimelineItemAction.Pin,\n TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n TimelineItemAction.CopyText,\n TimelineItemAction.ViewSource,\n TimelineItemAction.ReportContent,\n@@ -273,8 +273,8 @@ class ActionListPresenterTest {\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n TimelineItemAction.Forward,\n- TimelineItemAction.Pin,\n TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n TimelineItemAction.CopyText,\n TimelineItemAction.ViewSource,\n TimelineItemAction.ReportContent,\n@@ -320,8 +320,8 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n- TimelineItemAction.Pin,\n TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n TimelineItemAction.CopyText,\n TimelineItemAction.ViewSource,\n TimelineItemAction.ReportContent,\n@@ -368,8 +368,8 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n- TimelineItemAction.Pin,\n TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n TimelineItemAction.CopyText,\n TimelineItemAction.ViewSource,\n TimelineItemAction.ReportContent,\n@@ -417,9 +417,9 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n- TimelineItemAction.Pin,\n- TimelineItemAction.CopyLink,\n TimelineItemAction.Edit,\n+ TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n TimelineItemAction.CopyText,\n TimelineItemAction.ViewSource,\n TimelineItemAction.Redact,\n@@ -463,9 +463,9 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.ReplyInThread,\n TimelineItemAction.Forward,\n- TimelineItemAction.Pin,\n- TimelineItemAction.CopyLink,\n TimelineItemAction.Edit,\n+ TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n TimelineItemAction.CopyText,\n TimelineItemAction.ViewSource,\n TimelineItemAction.Redact,\n@@ -512,9 +512,9 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n- TimelineItemAction.Pin,\n- TimelineItemAction.CopyLink,\n TimelineItemAction.Edit,\n+ TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n TimelineItemAction.CopyText,\n TimelineItemAction.ViewSource,\n )\n@@ -559,9 +559,9 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n- TimelineItemAction.Pin,\n- TimelineItemAction.CopyLink,\n TimelineItemAction.AddCaption,\n+ TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n TimelineItemAction.ViewSource,\n TimelineItemAction.Redact,\n )\n@@ -612,8 +612,8 @@ class ActionListPresenterTest {\n TimelineItemAction.Forward,\n // Not here\n // TimelineItemAction.AddCaption,\n- TimelineItemAction.Pin,\n TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n TimelineItemAction.ViewSource,\n TimelineItemAction.Redact,\n )\n@@ -660,9 +660,9 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n- TimelineItemAction.Pin,\n- TimelineItemAction.CopyLink,\n TimelineItemAction.EditCaption,\n+ TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n TimelineItemAction.CopyCaption,\n TimelineItemAction.RemoveCaption,\n TimelineItemAction.ViewSource,\n@@ -711,8 +711,8 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n- TimelineItemAction.Pin,\n TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n TimelineItemAction.CopyCaption,\n TimelineItemAction.ViewSource,\n TimelineItemAction.ReportContent,\n@@ -830,9 +830,9 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n- TimelineItemAction.Pin,\n- TimelineItemAction.CopyLink,\n TimelineItemAction.Edit,\n+ TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n TimelineItemAction.CopyText,\n TimelineItemAction.Redact,\n )\n@@ -878,8 +878,8 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n- TimelineItemAction.CopyLink,\n TimelineItemAction.Edit,\n+ TimelineItemAction.CopyLink,\n TimelineItemAction.CopyText,\n TimelineItemAction.ViewSource,\n TimelineItemAction.Redact,\n@@ -933,9 +933,9 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n- TimelineItemAction.Unpin,\n- TimelineItemAction.CopyLink,\n TimelineItemAction.Edit,\n+ TimelineItemAction.CopyLink,\n+ TimelineItemAction.Unpin,\n TimelineItemAction.CopyText,\n TimelineItemAction.ViewSource,\n TimelineItemAction.Redact,\n@@ -1072,9 +1072,9 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.EndPoll,\n TimelineItemAction.Reply,\n- TimelineItemAction.Pin,\n+ TimelineItemAction.EditPoll,\n TimelineItemAction.CopyLink,\n- TimelineItemAction.Edit,\n+ TimelineItemAction.Pin,\n TimelineItemAction.Redact,\n )\n )\n@@ -1116,8 +1116,8 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.EndPoll,\n TimelineItemAction.Reply,\n- TimelineItemAction.Pin,\n TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n TimelineItemAction.Redact,\n )\n )\n@@ -1158,8 +1158,8 @@ class ActionListPresenterTest {\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n TimelineItemAction.Reply,\n- TimelineItemAction.Pin,\n TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n TimelineItemAction.Redact,\n )\n )\n@@ -1203,8 +1203,8 @@ class ActionListPresenterTest {\n actions = persistentListOf(\n TimelineItemAction.Reply,\n TimelineItemAction.Forward,\n- TimelineItemAction.Pin,\n TimelineItemAction.CopyLink,\n+ TimelineItemAction.Pin,\n TimelineItemAction.Redact,\n )\n )\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparatorTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparatorTest.kt\nnew file mode 100644\nindex 00000000000..9866d846ec3\n--- /dev/null\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparatorTest.kt\n@@ -0,0 +1,28 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.features.messages.impl.actionlist.model\n+\n+import org.junit.Test\n+\n+class TimelineItemActionComparatorTest {\n+ @Test\n+ fun `check that the list in the comparator only contain each item once`() {\n+ val sut = TimelineItemActionComparator()\n+ sut.orderedList.forEach {\n+ require(sut.orderedList.count { item -> item == it } == 1, { \"Duplicate ${it::class.java}.$it\" })\n+ }\n+ }\n+\n+ @Test\n+ fun `check that the list in the comparator contains all the items`() {\n+ val sut = TimelineItemActionComparator()\n+ TimelineItemAction.entries.forEach {\n+ require(it in sut.orderedList, { \"Missing ${it::class.simpleName}.$it in orderedList\" })\n+ }\n+ }\n+}\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessorTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessorTest.kt\nindex 7043d3f8484..59545d66744 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessorTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessorTest.kt\n@@ -27,24 +27,7 @@ class PinnedMessagesListTimelineActionPostProcessorTest {\n fun `ensure that some actions are kept and some other are filtered out`() {\n val sut = PinnedMessagesListTimelineActionPostProcessor()\n val result = sut.process(\n- listOf(\n- TimelineItemAction.Forward,\n- TimelineItemAction.CopyText,\n- TimelineItemAction.CopyCaption,\n- TimelineItemAction.CopyLink,\n- TimelineItemAction.Redact,\n- TimelineItemAction.Reply,\n- TimelineItemAction.ReplyInThread,\n- TimelineItemAction.Edit,\n- TimelineItemAction.EditCaption,\n- TimelineItemAction.AddCaption,\n- TimelineItemAction.RemoveCaption,\n- TimelineItemAction.ViewSource,\n- TimelineItemAction.ReportContent,\n- TimelineItemAction.EndPoll,\n- TimelineItemAction.Pin,\n- TimelineItemAction.Unpin,\n- )\n+ TimelineItemAction.entries.toList()\n )\n assertThat(result).isEqualTo(\n listOf(\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_10_en.png\nindex 223d7869b6f..3bf8f0bd3d7 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_10_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_10_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:dbef9e8e887fa493ca9b875e64dc164bf35dd84ad25b84a1ad9b6fd523b26c38\n-size 27280\n+oid sha256:4bcf877df431dfe4cf3c7f19d58c413356cdf77ae26f9dfbc9f9136fea3f5c02\n+size 29361\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_11_en.png\nindex cc268a914fe..da9d93301b9 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_11_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_11_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:c1a0bc9c83b7e01f9492443433781509c0d899b397652fc7e9b7a539d8ce0412\n-size 48219\n+oid sha256:88d5893c849bfb7945535f1f450e0c8b8975b5b4eb3ca336bff73aa607f2f34d\n+size 48171\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_12_en.png\nindex d2eec8525c3..e0975da1a9d 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_12_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_12_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:3a624587095825c971186288a0ad5a40ddfcadc8f4b9f92b1102d8ae20ca3bda\n+oid sha256:3f0451276061db5c189062b32414fd93c2f174c3e7597ab723c3f1a0abbfae28\n size 49821\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_2_en.png\nindex 392c35230c9..6b36ec50596 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_2_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_2_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:4cdcc38bfae43298654c3e09d7ab1ca1e0d2fd32157a464539a360f3943f4f75\n-size 42839\n+oid sha256:f8ec0f80c44ea01158f58e53c0aeafe6df0586e13ff452a61c8b6a9ffb070702\n+size 42824\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_3_en.png\nindex 89efb1c866a..fe9b8d0f552 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_3_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_3_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:a56b3e488ceecd0bfb763d60b6827f7d8c460fa198d380a502ff0d97b13c9bc0\n-size 45962\n+oid sha256:22aabc7669365a40151e7ecd82a3324a53d0f55a370e0dd803d843a5275b1434\n+size 45949\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_4_en.png\nindex 496cf3053bc..2f90f049140 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_4_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_4_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:600f28097c6ef8c54fe136d9bb05b8b800d693bff23f238a4e3e0216ee9918ff\n-size 44404\n+oid sha256:1a82048429ed60a4b246c37bc1b104e166c8c2402884766a9e487ca98ad45a57\n+size 44391\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_5_en.png\nindex 834430dfb36..70d0754dabe 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_5_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_5_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:054cfe9290f91cf0f5d17e8f7c49e71eb50a2bb17067b1edc3c29f89410f76e8\n-size 40806\n+oid sha256:b7e8e9782859caf125c6258a612d52532cf005d1d21146e21068882b586f5d1d\n+size 40788\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_6_en.png\nindex f082532ffd9..8e3e0660c19 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_6_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_6_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:814bb524af65d077e3610e8cb920e5207aa808111a530357e8687831bd9c0413\n-size 44687\n+oid sha256:640a1d04239f041ae395b56eee251a2942764c97dc50db3a8d4c3bfc44225a1a\n+size 44670\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_7_en.png\nindex 6db122607cc..d1cba8905f6 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_7_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_7_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:4da93eb0b9fcea861ae80d6e14bc852acaacea52402b1b41e8c982b9c06b2b63\n-size 42105\n+oid sha256:150a3d6bd18e87b15575f7f452b222f07e6c3ef227032cbfe84a7728d17c491e\n+size 42088\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_8_en.png\nindex 358a9d9a81a..cf5c641ec78 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_8_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_8_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:4886407cfe23d5d16aadeef4226698957dad99dfc4d9ac5c184fe64347b3ee41\n-size 44524\n+oid sha256:737959115454525aa41c67d3ff47aa1829d78c7d18648b7c14b5e62ff6e44436\n+size 44511\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_9_en.png\nindex 4de11299786..9778b3513b5 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_9_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_9_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:3c0d8491dbf0b6f50ae6be5c7aaf0d77b9eaa3a31e7763f120d6e08993c1c74b\n-size 34028\n+oid sha256:dd031f67683678815eb3f4b55f3ee65fb79096035705019770a626bfc5c00794\n+size 34009\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_10_en.png\nindex 65a49cb609a..c281247aeb0 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_10_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_10_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:64a6d1a6af14176c933387a7a36de0d7392b1cd31cb04fcc5c6a282317874aac\n-size 26597\n+oid sha256:97fbbf4f3b9466a086a8824f9230a1ea5525314d818e19879a2c5340c9495138\n+size 28642\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_11_en.png\nindex 89e23b04441..c275736aa02 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_11_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_11_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:f92ebc24de4dd34b84fcbbcc656a369d4a79bca160666c2fd4d32b5516c2f8fb\n-size 47245\n+oid sha256:69f31cbb83a84e57e8a9e7bf4ff451d5a192523486c400abdc293a467ca0ffa5\n+size 47200\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_12_en.png\nindex 6e575e21c5e..17714bdf54c 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_12_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_12_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:2a4a3730a941a4c6863c116b401ea7e4d5c2cef3fe4098e353954c4f93aa660a\n-size 48771\n+oid sha256:410450770889b906c279084668980b41357e432345bc098560d8b06d6e35c86d\n+size 48841\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_2_en.png\nindex 053b3255570..674ba67cce3 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_2_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_2_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:77521de94c04228ca0fb5d09cb7809527cf0dc0acc52a271a8fa4738a752aa66\n-size 42028\n+oid sha256:4ce4a7fdb57fd4afae868aa733b013fd5e4daea6aaa736256ed72d9d5eb759e7\n+size 41988\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_3_en.png\nindex a3c9b39e278..faee81cc799 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_3_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_3_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:171ef67bdc5a1b6d921ecbdb13e3c79dfab073d7289862181a69515e6063c4c5\n-size 45246\n+oid sha256:6721b3503beb8ddfa9efc52a7ab269c6aea9fcefad2c1b1b9ce31b4240d48719\n+size 45204\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_4_en.png\nindex 1374a97dd7b..2e828a00058 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_4_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_4_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:1a8328afeab339104a83db16d7b4b894c060ff7e80c2b5c4d6ec64d3bc4cdc3a\n-size 43613\n+oid sha256:ac363ebe575582b39b3ebd7857ff891994f512064f167fee342a9a2b2a35dd1e\n+size 43572\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_5_en.png\nindex 6f45705e5ee..084646ff715 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_5_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_5_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:d575d08141bf446de510162f5dc1e04fccf4831649495bdf94945bd8957768a6\n-size 40201\n+oid sha256:3d30a38861e317010616e7b17614803439f345e376f36b32e3e6e832070ada71\n+size 40150\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_6_en.png\nindex 59e4356eb22..133a8cbd14b 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_6_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_6_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:606379fcb517afa4583ac03fcb2af4f5649a7fc064df841f442c19f5a71f629b\n-size 43863\n+oid sha256:96f4023e2a502fb50dc9c03ad53faa932baf1e316652651e109f21f531adb5de\n+size 43819\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_7_en.png\nindex 8225529b528..a6e70d1e6e8 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_7_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_7_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:d63dec242ea479beb9a7bf0a58c6f31e2bba84df0a7db51fb07ea46612944d9a\n-size 41355\n+oid sha256:8f52f074d2dbf93c3170c80dd18f4601ad1e2db6c57773d0e10c3f8c29ffdc9f\n+size 41303\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_8_en.png\nindex 26f908facc0..5d6104964e6 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_8_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_8_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:f5421b7b5ce8441213b1323b4cd88c2f5aff6689ecd091b5be581fe5690cd611\n-size 43685\n+oid sha256:504ac65ffbcb0705f3e73d32970cd345d23d19e4f190420f8953e55250056329\n+size 43641\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_9_en.png\nindex 0e328d07400..720075f0075 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_9_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_9_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:e1f4600552aebd3a567251a85105a423882942b23e96f7958238a9b5ba0bb8fc\n-size 33137\n+oid sha256:f72f6ec83324b0b6e3719e1e0f59387cb0376149decbb780970dcb7f219a1551\n+size 33053\ndiff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_0_en.png\nindex faf2367a0b8..c13d3cb3ba5 100644\n--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:48320aed4570138a76b04b08f37f67098a72e1b63f13273fd6d9c0a6e33b7e10\n-size 37955\n+oid sha256:4a6a54efb3bb7eeb97cfa06995a199eb83a7e630fb1b631d7992b464e0b04d20\n+size 37954\ndiff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_1_en.png\nindex 5ba26e89ea8..ef6e64aa892 100644\n--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_1_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_1_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:6a71b634518191f299c924f8ddd39b44ddc1255698e981796bb8b034377c515f\n-size 37712\n+oid sha256:d35962150a8dc5b7d774af160a994182afbe2d5538e204b2545c02287897cd99\n+size 37711\ndiff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_0_en.png\nindex b64b5e290dc..4e534c90418 100644\n--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:e33a80d4f6dc4a1bd1cd86b2bfd64471926871f92d8d83cae6b32a79459c8ea0\n-size 38775\n+oid sha256:a3711fb587d635b28a398bb5b475bee16d4abdbf691d494348fe11e270e0624d\n+size 38774\ndiff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_1_en.png\nindex 344a42b7a50..8d27190ccb0 100644\n--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_1_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_1_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:c69e1d5748e65b35525df64b83c6616ab439299284ab2bda3a8408d5f4139d2f\n-size 38802\n+oid sha256:41b91c8a1805bb24453c6f85091704e609a01f83a86ca17979d97de4c20e4cbe\n+size 38800\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsOther_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsOther_Day_0_en.png\nindex 2b971f938f1..ca94a884e3a 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsOther_Day_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsOther_Day_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:448e4fea5f9363a84c020548764328e477662aecc7f423237ea06e439563b507\n-size 25511\n+oid sha256:560c9159e78e9da940da58a4297aca1ac647218fab0e03c532016ac96a3a560d\n+size 21524\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsOther_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsOther_Night_0_en.png\nindex af0fbca7123..6793e1a4051 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsOther_Night_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsOther_Night_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:c4efddd547921361891b175554e3ae789259f7059fc18b68bcca2a38401f387a\n-size 24742\n+oid sha256:b0bb37fb7f6dbce206288431c59e3cc1b31d1a5a25d73b2f2321d7d46a459da5\n+size 20631\n", "n2p_tests": "{\"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for message from others redacted\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to an image media message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action view in timeline, it should have no effect\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action add caption without warning\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - check that the room's unread flag is removed\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - permission to post\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.model.TimelineItemActionComparatorTest.check that the list in the comparator only contain each item once\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.pinned.list.PinnedMessagesListTimelineActionPostProcessorTest.ensure that some actions are kept and some other are filtered out\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - no permission to post\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action pin\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action copy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action edit\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle toggling a reaction twice\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.pinned.list.PinnedMessagesListTimelineActionPostProcessorTest.ensure that ViewInTimeline is added\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - permission to redact own\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when memberlist is ready\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action redact\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to a file media message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for call notify\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action end poll\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when memberlist is error\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a media item - caption disabled\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - doesn't show reinvite prompt if other party is present\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action edit caption\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for my message cannot redact\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - doesn't show reinvite prompt in non-direct room\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for non-editable poll message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - initial state\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle dismiss action\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to a poll\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a media with caption item\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a state item in non-debuggable build\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message when user can't pin\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for ended poll message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message when event is already pinned\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action copy link\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.model.TimelineItemActionComparatorTest.check that the list in the comparator contains all the items\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message cannot sent message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action report content\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when memberlist is not ready\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for voice message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - shows prompt to reinvite users in DM\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a media with caption item - other user event\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for message from me redacted\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action edit caption without warning\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action remove caption\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to an event with no id does nothing\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for verified user send failure\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for my message in a thread\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action reply to a video media message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action forward\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message and cannot send reaction\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message and can redact\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message in non-debuggable build\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action add caption\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for my message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action unpin\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for editable poll message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action edit poll\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle toggling a reaction\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message with no actions\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a media item\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message in a thread\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle reinviting other user when inviting fails\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - handle action show developer info\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - initial state\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesPresenterTest.present - permission to redact other\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute not sent message\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a state item in debug build\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-4026", "org": "element-hq", "repo": "element-x-android", "number": 4026, "state": "closed", "title": "Implement month separator for the Gallery, and improve date rendering.", "body": "\r\n \r\n## Content\r\n\r\n\r\nImplement month separator for the Gallery.\r\nImprove day separator rendering in the timeline.\r\nUse Today, Yesterday, and the name of the day if less than 7 days and do not render the year for the current year. Improve date format for the media viewer.\r\nRework how date and time are computed.\r\nActionListView: Time can take more space, so update the layout.\r\n\r\n## Motivation and context\r\n\r\n\r\nPart of the work on the media gallery + Closes #2238\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Run the app in your current locale and check that all the date across the application look good.\r\n- Change the language of the phone / of the app and observe that the app uses the new languages (especially to render date and time).\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 23\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"5515c938d4f65c3dab2331ab96166d75dfd5869b\"}", "resolved_issues": "[{\"number\": 2238, \"title\": \"Iterate on date rendering\", \"body\": \"There are (at least) two places where timestamp is only rendered as time and date could be helpful.\\r\\n\\r\\n- [ ] In the message detail screen, when long clicking on a message. It can be helpful to have the date here, since when scrolling in the timeline the date can be hard to see in room with lots of message (we do not have floating date on the timeline). We may want to always display the full date here, but the space is quite small.\\r\\n- [ ] In the reaction list. In this case, only the time is displayed, and if the reactions are sent on several days, it may look like they are not sorted correctly. Also I guess that the users may consider that if only the time is displayed, it's for the current day only.\\r\\n- [ ] other?\\r\\n\\r\\nFor all those cases, maybe introduce a new date time formater, which displays only the time for the current day, and else the date and time for the previous days.\"}]", "lang": "kotlin", "problem_statement": "Iterate on date rendering\nThere are (at least) two places where timestamp is only rendered as time and date could be helpful.\r\n\r\n- [ ] In the message detail screen, when long clicking on a message. It can be helpful to have the date here, since when scrolling in the timeline the date can be hard to see in room with lots of message (we do not have floating date on the timeline). We may want to always display the full date here, but the space is quite small.\r\n- [ ] In the reaction list. In this case, only the time is displayed, and if the reactions are sent on several days, it may look like they are not sorted correctly. Also I guess that the users may consider that if only the time is displayed, it's for the current day only.\r\n- [ ] other?\r\n\r\nFor all those cases, maybe introduce a new date time formater, which displays only the time for the current day, and else the date and time for the previous days.\n", "hints": "Another weirdness I've noticed is in date rendering in the read receipts list. If a user sends a message at 23:59, 2 minutes later the receipt simply says \"yesterday\". It would be useful in that case to display an absolute timestamp until the relative time becomes significantly long enough in the past that the loss of precision becomes negligible.", "pull_url": "https://github.com/element-hq/element-x-android/pull/4026", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/2238\"]", "test_command": "./gradlew :features:roomlist:impl:testDebugUnitTest --tests \"io.element.android.features.roomlist.impl.search.RoomListSearchPresenterTest\" --tests \"io.element.android.features.roomlist.impl.RoomListPresenterTest\" --tests \"io.element.android.features.roomlist.impl.datasource.RoomListDataSourceTest\" --tests \"io.element.android.features.roomlist.impl.model.RoomListRoomSummaryTest\" :libraries:mediaviewer:impl:testDebugUnitTest --tests \"io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest\" --tests \"io.element.android.libraries.mediaviewer.impl.local.AndroidLocalMediaFactoryTest\" --tests \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest\" :libraries:dateformatter:impl:testDebugUnitTest --tests \"io.element.android.libraries.dateformatter.impl.DefaultLastMessageTimestampFormatterTest\" --tests \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest\" --tests \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest\" :features:messages:impl:testDebugUnitTest --tests \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest\" --tests \"io.element.android.features.messages.impl.MessagesViewTest\" :features:poll:impl:testDebugUnitTest --tests \"io.element.android.features.poll.impl.history.PollHistoryPresenterTest\" :features:verifysession:impl:testDebugUnitTest --tests \"io.element.android.features.verifysession.impl.incoming.IncomingVerificationPresenterTest\"", "fix_patch": "diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt\nindex 3b5fb675405..6754f5c683d 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt\n@@ -55,6 +55,8 @@ import io.element.android.libraries.architecture.createNode\n import io.element.android.libraries.architecture.overlay.Overlay\n import io.element.android.libraries.architecture.overlay.operation.hide\n import io.element.android.libraries.architecture.overlay.operation.show\n+import io.element.android.libraries.dateformatter.api.DateFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatterMode\n import io.element.android.libraries.di.RoomScope\n import io.element.android.libraries.matrix.api.MatrixClient\n import io.element.android.libraries.matrix.api.core.EventId\n@@ -97,6 +99,7 @@ class MessagesFlowNode @AssistedInject constructor(\n private val pinnedEventsTimelineProvider: PinnedEventsTimelineProvider,\n private val timelineController: TimelineController,\n private val knockRequestsListEntryPoint: KnockRequestsListEntryPoint,\n+ private val dateFormatter: DateFormatter,\n ) : BaseFlowNode(\n backstack = BackStack(\n initialElement = plugins.filterIsInstance().first().initialTarget.toNavTarget(),\n@@ -436,7 +439,14 @@ class MessagesFlowNode @AssistedInject constructor(\n senderId = event.senderId,\n senderName = event.safeSenderName,\n senderAvatar = event.senderAvatar.url,\n- dateSent = event.sentTime,\n+ dateSent = dateFormatter.format(\n+ event.sentTimeMillis,\n+ mode = DateFormatterMode.Day,\n+ ),\n+ dateSentFull = dateFormatter.format(\n+ timestamp = event.sentTimeMillis,\n+ mode = DateFormatterMode.Full,\n+ ),\n ),\n mediaSource = mediaSource,\n thumbnailSource = thumbnailSource,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt\nindex 411ff37c8f8..95a6dc5a6f3 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt\n@@ -37,6 +37,8 @@ import io.element.android.features.messages.impl.timeline.model.event.canBeCopie\n import io.element.android.features.messages.impl.timeline.model.event.canBeForwarded\n import io.element.android.features.messages.impl.timeline.model.event.canReact\n import io.element.android.libraries.architecture.Presenter\n+import io.element.android.libraries.dateformatter.api.DateFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatterMode\n import io.element.android.libraries.di.RoomScope\n import io.element.android.libraries.featureflag.api.FeatureFlagService\n import io.element.android.libraries.featureflag.api.FeatureFlags\n@@ -64,6 +66,7 @@ class DefaultActionListPresenter @AssistedInject constructor(\n private val room: MatrixRoom,\n private val userSendFailureFactory: VerifiedUserSendFailureFactory,\n private val featureFlagService: FeatureFlagService,\n+ private val dateFormatter: DateFormatter,\n ) : ActionListPresenter {\n @AssistedFactory\n @ContributesBinding(RoomScope::class)\n@@ -131,6 +134,11 @@ class DefaultActionListPresenter @AssistedInject constructor(\n if (actions.isNotEmpty() || displayEmojiReactions || verifiedUserSendFailure != VerifiedUserSendFailure.None) {\n target.value = ActionListState.Target.Success(\n event = timelineItem,\n+ sentTimeFull = dateFormatter.format(\n+ timelineItem.sentTimeMillis,\n+ DateFormatterMode.Full,\n+ useRelative = true,\n+ ),\n displayEmojiReactions = displayEmojiReactions,\n verifiedUserSendFailure = verifiedUserSendFailure,\n actions = actions.toImmutableList()\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListState.kt\nindex 75c598df36d..56bc1ca0bd9 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListState.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListState.kt\n@@ -24,6 +24,7 @@ data class ActionListState(\n data class Loading(val event: TimelineItem.Event) : Target\n data class Success(\n val event: TimelineItem.Event,\n+ val sentTimeFull: String,\n val displayEmojiReactions: Boolean,\n val verifiedUserSendFailure: VerifiedUserSendFailure,\n val actions: ImmutableList,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt\nindex a5f027a5355..1638a03fa31 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt\n@@ -37,6 +37,7 @@ open class ActionListStateProvider : PreviewParameterProvider {\n event = aTimelineItemEvent(\n timelineItemReactions = reactionsState\n ),\n+ sentTimeFull = \"January 1, 1970 at 12:00\u202fAM\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = aTimelineItemActionList(),\n@@ -49,6 +50,7 @@ open class ActionListStateProvider : PreviewParameterProvider {\n displayNameAmbiguous = true,\n timelineItemReactions = reactionsState,\n ),\n+ sentTimeFull = \"January 1, 1970 at 12:00\u202fAM\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = aTimelineItemActionList(\n@@ -62,6 +64,7 @@ open class ActionListStateProvider : PreviewParameterProvider {\n content = aTimelineItemVideoContent(),\n timelineItemReactions = reactionsState\n ),\n+ sentTimeFull = \"January 1, 1970 at 12:00\u202fAM\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = aTimelineItemActionList(\n@@ -75,6 +78,7 @@ open class ActionListStateProvider : PreviewParameterProvider {\n content = aTimelineItemFileContent(),\n timelineItemReactions = reactionsState\n ),\n+ sentTimeFull = \"January 1, 1970 at 12:00\u202fAM\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = aTimelineItemActionList(\n@@ -88,6 +92,7 @@ open class ActionListStateProvider : PreviewParameterProvider {\n content = aTimelineItemAudioContent(),\n timelineItemReactions = reactionsState\n ),\n+ sentTimeFull = \"January 1, 1970 at 12:00\u202fAM\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = aTimelineItemActionList(\n@@ -101,6 +106,7 @@ open class ActionListStateProvider : PreviewParameterProvider {\n content = aTimelineItemVoiceContent(caption = null),\n timelineItemReactions = reactionsState\n ),\n+ sentTimeFull = \"January 1, 1970 at 12:00\u202fAM\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = aTimelineItemActionList(\n@@ -114,6 +120,7 @@ open class ActionListStateProvider : PreviewParameterProvider {\n content = aTimelineItemLocationContent(),\n timelineItemReactions = reactionsState\n ),\n+ sentTimeFull = \"January 1, 1970 at 12:00\u202fAM\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = aTimelineItemActionList(),\n@@ -125,6 +132,7 @@ open class ActionListStateProvider : PreviewParameterProvider {\n content = aTimelineItemLocationContent(),\n timelineItemReactions = reactionsState\n ),\n+ sentTimeFull = \"January 1, 1970 at 12:00\u202fAM\",\n displayEmojiReactions = false,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = aTimelineItemActionList(),\n@@ -136,6 +144,7 @@ open class ActionListStateProvider : PreviewParameterProvider {\n content = aTimelineItemPollContent(),\n timelineItemReactions = reactionsState\n ),\n+ sentTimeFull = \"January 1, 1970 at 12:00\u202fAM\",\n displayEmojiReactions = false,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = aTimelineItemPollActionList(),\n@@ -147,6 +156,7 @@ open class ActionListStateProvider : PreviewParameterProvider {\n timelineItemReactions = reactionsState,\n messageShield = MessageShield.UnknownDevice(isCritical = true)\n ),\n+ sentTimeFull = \"January 1, 1970 at 12:00\u202fAM\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = aTimelineItemActionList(),\n@@ -155,6 +165,7 @@ open class ActionListStateProvider : PreviewParameterProvider {\n anActionListState(\n target = ActionListState.Target.Success(\n event = aTimelineItemEvent(),\n+ sentTimeFull = \"January 1, 1970 at 12:00\u202fAM\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = anUnsignedDeviceSendFailure(),\n actions = aTimelineItemActionList(),\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt\nindex 7d30edd1167..4cf0928d5c4 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt\n@@ -185,6 +185,7 @@ private fun ActionListViewContent(\n Column {\n MessageSummary(\n event = target.event,\n+ sentTimeFull = target.sentTimeFull,\n modifier = Modifier\n .fillMaxWidth()\n .padding(horizontal = 16.dp)\n@@ -245,7 +246,11 @@ private fun ActionListViewContent(\n \n @Suppress(\"MultipleEmitters\") // False positive\n @Composable\n-private fun MessageSummary(event: TimelineItem.Event, modifier: Modifier = Modifier) {\n+private fun MessageSummary(\n+ event: TimelineItem.Event,\n+ sentTimeFull: String,\n+ modifier: Modifier = Modifier,\n+) {\n val content: @Composable () -> Unit\n val icon: @Composable () -> Unit = { Avatar(avatarData = event.senderAvatar.copy(size = AvatarSize.MessageActionSender)) }\n val contentStyle = ElementTheme.typography.fontBodyMdRegular.copy(color = MaterialTheme.colorScheme.secondary)\n@@ -300,20 +305,23 @@ private fun MessageSummary(event: TimelineItem.Event, modifier: Modifier = Modif\n icon()\n Spacer(modifier = Modifier.width(8.dp))\n Column(modifier = Modifier.weight(1f)) {\n- SenderName(\n- senderId = event.senderId,\n- senderProfile = event.senderProfile,\n- senderNameMode = SenderNameMode.ActionList,\n- )\n+ Row {\n+ SenderName(\n+ modifier = Modifier.weight(1f),\n+ senderId = event.senderId,\n+ senderProfile = event.senderProfile,\n+ senderNameMode = SenderNameMode.ActionList,\n+ )\n+ Spacer(modifier = Modifier.width(16.dp))\n+ Text(\n+ text = sentTimeFull,\n+ style = ElementTheme.typography.fontBodyXsRegular,\n+ color = MaterialTheme.colorScheme.secondary,\n+ textAlign = TextAlign.End,\n+ )\n+ }\n content()\n }\n- Spacer(modifier = Modifier.width(16.dp))\n- Text(\n- event.sentTime,\n- style = ElementTheme.typography.fontBodyXsRegular,\n- color = MaterialTheme.colorScheme.secondary,\n- textAlign = TextAlign.End,\n- )\n }\n }\n \ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemEventFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemEventFactory.kt\nindex d94ca9013a7..3700e02ccfa 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemEventFactory.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemEventFactory.kt\n@@ -20,7 +20,8 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItemGrou\n import io.element.android.features.messages.impl.timeline.model.TimelineItemReactions\n import io.element.android.features.messages.impl.timeline.model.TimelineItemReadReceipts\n import io.element.android.libraries.core.bool.orTrue\n-import io.element.android.libraries.dateformatter.api.LastMessageTimestampFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatterMode\n import io.element.android.libraries.designsystem.components.avatar.AvatarData\n import io.element.android.libraries.designsystem.components.avatar.AvatarSize\n import io.element.android.libraries.matrix.api.MatrixClient\n@@ -32,14 +33,13 @@ import io.element.android.libraries.matrix.api.timeline.item.event.getDisambigua\n import io.element.android.libraries.matrix.ui.messages.reply.map\n import kotlinx.collections.immutable.persistentListOf\n import kotlinx.collections.immutable.toImmutableList\n-import java.text.DateFormat\n import java.util.Date\n \n class TimelineItemEventFactory @AssistedInject constructor(\n @Assisted private val config: TimelineItemsFactoryConfig,\n private val contentFactory: TimelineItemContentFactory,\n private val matrixClient: MatrixClient,\n- private val lastMessageTimestampFormatter: LastMessageTimestampFormatter,\n+ private val dateFormatter: DateFormatter,\n private val permalinkParser: PermalinkParser,\n ) {\n @AssistedFactory\n@@ -57,9 +57,10 @@ class TimelineItemEventFactory @AssistedInject constructor(\n val groupPosition =\n computeGroupPosition(currentTimelineItem, timelineItems, index)\n val senderProfile = currentTimelineItem.event.senderProfile\n- val timeFormatter = DateFormat.getTimeInstance(DateFormat.SHORT)\n- val sentTime = timeFormatter.format(Date(currentTimelineItem.event.timestamp))\n-\n+ val sentTime = dateFormatter.format(\n+ timestamp = currentTimelineItem.event.timestamp,\n+ mode = DateFormatterMode.TimeOnly,\n+ )\n val senderAvatarData = AvatarData(\n id = currentSender.value,\n name = senderProfile.getDisambiguatedDisplayName(currentSender),\n@@ -78,6 +79,7 @@ class TimelineItemEventFactory @AssistedInject constructor(\n isMine = currentTimelineItem.event.isOwn,\n isEditable = currentTimelineItem.event.isEditable,\n canBeRepliedTo = currentTimelineItem.event.canBeRepliedTo,\n+ sentTimeMillis = currentTimelineItem.event.timestamp,\n sentTime = sentTime,\n groupPosition = groupPosition,\n reactionsState = currentTimelineItem.computeReactionsState(),\n@@ -106,7 +108,6 @@ class TimelineItemEventFactory @AssistedInject constructor(\n if (!config.computeReactions) {\n return TimelineItemReactions(reactions = persistentListOf())\n }\n- val timeFormatter = DateFormat.getTimeInstance(DateFormat.SHORT)\n var aggregatedReactions = this.event.reactions.map { reaction ->\n // Sort reactions within an aggregation by timestamp descending.\n // This puts the most recent at the top, useful in cases like the\n@@ -121,7 +122,10 @@ class TimelineItemEventFactory @AssistedInject constructor(\n AggregatedReactionSender(\n senderId = it.senderId,\n timestamp = date,\n- sentTime = timeFormatter.format(date),\n+ sentTime = dateFormatter.format(\n+ it.timestamp,\n+ DateFormatterMode.TimeOrDate,\n+ ),\n )\n }\n .toImmutableList()\n@@ -157,7 +161,10 @@ class TimelineItemEventFactory @AssistedInject constructor(\n url = roomMember?.avatarUrl,\n size = AvatarSize.TimelineReadReceipt,\n ),\n- formattedDate = lastMessageTimestampFormatter.format(receipt.timestamp)\n+ formattedDate = dateFormatter.format(\n+ receipt.timestamp,\n+ mode = DateFormatterMode.TimeOrDate,\n+ )\n )\n }\n .toImmutableList()\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt\nindex 41966c036bd..cd680d4e809 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt\n@@ -9,13 +9,20 @@ package io.element.android.features.messages.impl.timeline.factories.virtual\n \n import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemDaySeparatorModel\n import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemVirtualModel\n-import io.element.android.libraries.dateformatter.api.DaySeparatorFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatterMode\n import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTimelineItem\n import javax.inject.Inject\n \n-class TimelineItemDaySeparatorFactory @Inject constructor(private val daySeparatorFormatter: DaySeparatorFormatter) {\n+class TimelineItemDaySeparatorFactory @Inject constructor(\n+ private val dateFormatter: DateFormatter,\n+) {\n fun create(virtualItem: VirtualTimelineItem.DayDivider): TimelineItemVirtualModel {\n- val formattedDate = daySeparatorFormatter.format(virtualItem.timestamp)\n+ val formattedDate = dateFormatter.format(\n+ timestamp = virtualItem.timestamp,\n+ mode = DateFormatterMode.Day,\n+ useRelative = true,\n+ )\n return TimelineItemDaySeparatorModel(\n formattedDate = formattedDate\n )\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt\nindex 0a392aac6a0..53237ef4dec 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt\n@@ -71,6 +71,7 @@ sealed interface TimelineItem {\n val senderProfile: ProfileTimelineDetails,\n val senderAvatar: AvatarData,\n val content: TimelineItemEventContent,\n+ val sentTimeMillis: Long = 0L,\n val sentTime: String = \"\",\n val isMine: Boolean = false,\n val isEditable: Boolean,\ndiff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItemsFactory.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItemsFactory.kt\nindex 60814477c9e..1c667efffbb 100644\n--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItemsFactory.kt\n+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItemsFactory.kt\n@@ -9,7 +9,8 @@ package io.element.android.features.poll.impl.history.model\n \n import io.element.android.features.poll.api.pollcontent.PollContentStateFactory\n import io.element.android.libraries.core.coroutine.CoroutineDispatchers\n-import io.element.android.libraries.dateformatter.api.DaySeparatorFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatterMode\n import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem\n import io.element.android.libraries.matrix.api.timeline.item.event.PollContent\n import kotlinx.collections.immutable.toPersistentList\n@@ -18,7 +19,7 @@ import javax.inject.Inject\n \n class PollHistoryItemsFactory @Inject constructor(\n private val pollContentStateFactory: PollContentStateFactory,\n- private val daySeparatorFormatter: DaySeparatorFormatter,\n+ private val dateFormatter: DateFormatter,\n private val dispatchers: CoroutineDispatchers,\n ) {\n suspend fun create(timelineItems: List): PollHistoryItems = withContext(dispatchers.computation) {\n@@ -45,7 +46,11 @@ class PollHistoryItemsFactory @Inject constructor(\n val pollContent = timelineItem.event.content as? PollContent ?: return null\n val pollContentState = pollContentStateFactory.create(timelineItem.event, pollContent)\n PollHistoryItem(\n- formattedDate = daySeparatorFormatter.format(timelineItem.event.timestamp),\n+ formattedDate = dateFormatter.format(\n+ timestamp = timelineItem.event.timestamp,\n+ mode = DateFormatterMode.Day,\n+ useRelative = true\n+ ),\n state = pollContentState\n )\n }\ndiff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactory.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactory.kt\nindex 534de3c4d4a..a77f1545da5 100644\n--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactory.kt\n+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactory.kt\n@@ -10,7 +10,8 @@ package io.element.android.features.roomlist.impl.datasource\n import io.element.android.features.roomlist.impl.model.RoomListRoomSummary\n import io.element.android.features.roomlist.impl.model.RoomSummaryDisplayType\n import io.element.android.libraries.core.extensions.orEmpty\n-import io.element.android.libraries.dateformatter.api.LastMessageTimestampFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatterMode\n import io.element.android.libraries.designsystem.components.avatar.AvatarSize\n import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter\n import io.element.android.libraries.matrix.api.room.CurrentUserMembership\n@@ -22,7 +23,7 @@ import kotlinx.collections.immutable.toImmutableList\n import javax.inject.Inject\n \n class RoomListRoomSummaryFactory @Inject constructor(\n- private val lastMessageTimestampFormatter: LastMessageTimestampFormatter,\n+ private val dateFormatter: DateFormatter,\n private val roomLastMessageFormatter: RoomLastMessageFormatter,\n ) {\n fun create(roomSummary: RoomSummary): RoomListRoomSummary {\n@@ -36,7 +37,11 @@ class RoomListRoomSummaryFactory @Inject constructor(\n numberOfUnreadMentions = roomInfo.numUnreadMentions,\n numberOfUnreadNotifications = roomInfo.numUnreadNotifications,\n isMarkedUnread = roomInfo.isMarkedUnread,\n- timestamp = lastMessageTimestampFormatter.format(roomSummary.lastMessageTimestamp),\n+ timestamp = dateFormatter.format(\n+ timestamp = roomSummary.lastMessageTimestamp,\n+ mode = DateFormatterMode.TimeOrDate,\n+ useRelative = true,\n+ ),\n lastMessage = roomSummary.lastMessage?.let { message ->\n roomLastMessageFormatter.format(message.event, roomInfo.isDm)\n }.orEmpty(),\ndiff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenter.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenter.kt\nindex ebd897d84c6..601e7cce165 100644\n--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenter.kt\n+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenter.kt\n@@ -20,7 +20,8 @@ import dagger.assisted.AssistedFactory\n import dagger.assisted.AssistedInject\n import io.element.android.features.verifysession.impl.incoming.IncomingVerificationState.Step\n import io.element.android.libraries.architecture.Presenter\n-import io.element.android.libraries.dateformatter.api.LastMessageTimestampFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatterMode\n import io.element.android.libraries.matrix.api.verification.SessionVerificationRequestDetails\n import io.element.android.libraries.matrix.api.verification.SessionVerificationService\n import io.element.android.libraries.matrix.api.verification.VerificationFlowState\n@@ -37,7 +38,7 @@ class IncomingVerificationPresenter @AssistedInject constructor(\n @Assisted private val navigator: IncomingVerificationNavigator,\n private val sessionVerificationService: SessionVerificationService,\n private val stateMachine: IncomingVerificationStateMachine,\n- private val dateFormatter: LastMessageTimestampFormatter,\n+ private val dateFormatter: DateFormatter,\n ) : Presenter {\n @AssistedFactory\n interface Factory {\n@@ -59,7 +60,10 @@ class IncomingVerificationPresenter @AssistedInject constructor(\n }\n val stateAndDispatch = stateMachine.rememberStateAndDispatch()\n val formattedSignInTime = remember {\n- dateFormatter.format(sessionVerificationRequestDetails.firstSeenTimestamp)\n+ dateFormatter.format(\n+ timestamp = sessionVerificationRequestDetails.firstSeenTimestamp,\n+ mode = DateFormatterMode.TimeOrDate,\n+ )\n }\n val step by remember {\n derivedStateOf {\ndiff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt\nindex 12aa5c4bfe6..22a0c518ecc 100644\n--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt\n+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt\n@@ -7,6 +7,8 @@\n \n package io.element.android.libraries.core.extensions\n \n+import java.util.Locale\n+\n fun Boolean.toOnOff() = if (this) \"ON\" else \"OFF\"\n fun Boolean.to01() = if (this) \"1\" else \"0\"\n \n@@ -68,3 +70,16 @@ fun String.replacePrefix(oldPrefix: String, newPrefix: String): String {\n fun String.withBrackets(prefix: String = \"(\", suffix: String = \")\"): String {\n return \"$prefix$this$suffix\"\n }\n+\n+/**\n+ * Capitalize the string.\n+ */\n+fun String.safeCapitalize(): String {\n+ return replaceFirstChar {\n+ if (it.isLowerCase()) {\n+ it.titlecase(Locale.getDefault())\n+ } else {\n+ it.toString()\n+ }\n+ }\n+}\ndiff --git a/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DateFormatter.kt b/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DateFormatter.kt\nnew file mode 100644\nindex 00000000000..5632962582a\n--- /dev/null\n+++ b/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DateFormatter.kt\n@@ -0,0 +1,56 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.api\n+\n+interface DateFormatter {\n+ fun format(\n+ timestamp: Long?,\n+ mode: DateFormatterMode = DateFormatterMode.Full,\n+ useRelative: Boolean = false,\n+ ): String\n+}\n+\n+enum class DateFormatterMode {\n+ /**\n+ * Full date and time.\n+ * Example:\n+ * \"April 6, 1980 at 6:35 PM\"\n+ * Format can be shorter when useRelative is true.\n+ * Example:\n+ * \"6:35 PM\"\n+ */\n+ Full,\n+\n+ /**\n+ * Only month and year.\n+ * Example:\n+ * \"April 1980\"\n+ * \"This month\" can be returned when useRelative is true.\n+ * Example:\n+ * \"This month\"\n+ */\n+ Month,\n+\n+ /**\n+ * Only day.\n+ * Example:\n+ * \"Sunday 6 April\"\n+ * \"Today\", \"Yesterday\" and day of week can be returned when useRelative is true.\n+ */\n+ Day,\n+\n+ /**\n+ * Time if same day, else date.\n+ */\n+ TimeOrDate,\n+\n+ /**\n+ * Only time whatever the day.\n+ */\n+ TimeOnly,\n+}\ndiff --git a/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DaySeparatorFormatter.kt b/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DaySeparatorFormatter.kt\ndeleted file mode 100644\nindex 4cc35218a0f..00000000000\n--- a/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DaySeparatorFormatter.kt\n+++ /dev/null\n@@ -1,12 +0,0 @@\n-/*\n- * Copyright 2023, 2024 New Vector Ltd.\n- *\n- * SPDX-License-Identifier: AGPL-3.0-only\n- * Please see LICENSE in the repository root for full details.\n- */\n-\n-package io.element.android.libraries.dateformatter.api\n-\n-interface DaySeparatorFormatter {\n- fun format(timestamp: Long): String\n-}\ndiff --git a/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/LastMessageTimestampFormatter.kt b/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/LastMessageTimestampFormatter.kt\ndeleted file mode 100644\nindex c5b9778669b..00000000000\n--- a/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/LastMessageTimestampFormatter.kt\n+++ /dev/null\n@@ -1,12 +0,0 @@\n-/*\n- * Copyright 2023, 2024 New Vector Ltd.\n- *\n- * SPDX-License-Identifier: AGPL-3.0-only\n- * Please see LICENSE in the repository root for full details.\n- */\n-\n-package io.element.android.libraries.dateformatter.api\n-\n-fun interface LastMessageTimestampFormatter {\n- fun format(timestamp: Long?): String\n-}\ndiff --git a/libraries/dateformatter/impl/build.gradle.kts b/libraries/dateformatter/impl/build.gradle.kts\nindex eb05eb18e0e..2fb4f8461fd 100644\n--- a/libraries/dateformatter/impl/build.gradle.kts\n+++ b/libraries/dateformatter/impl/build.gradle.kts\n@@ -8,7 +8,7 @@ import extension.setupAnvil\n */\n \n plugins {\n- id(\"io.element.android-library\")\n+ id(\"io.element.android-compose-library\")\n }\n \n setupAnvil()\n@@ -16,15 +16,30 @@ setupAnvil()\n android {\n namespace = \"io.element.android.libraries.dateformatter.impl\"\n \n+ testOptions {\n+ unitTests {\n+ isIncludeAndroidResources = true\n+ }\n+ }\n+\n dependencies {\n implementation(libs.dagger)\n+ implementation(projects.libraries.core)\n+ implementation(projects.libraries.designsystem)\n implementation(projects.libraries.di)\n+ implementation(projects.libraries.uiStrings)\n+ implementation(projects.services.toolbox.api)\n \n api(projects.libraries.dateformatter.api)\n api(libs.datetime)\n \n testImplementation(libs.test.junit)\n testImplementation(libs.test.truth)\n+ testImplementation(libs.test.turbine)\n+ testImplementation(libs.test.robolectric)\n testImplementation(projects.libraries.dateformatter.test)\n+ testImplementation(projects.services.toolbox.test)\n+ testImplementation(projects.tests.testutils)\n+ testImplementation(libs.androidx.compose.ui.test.junit)\n }\n }\ndiff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterDay.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterDay.kt\nnew file mode 100644\nindex 00000000000..2f34d480e0c\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterDay.kt\n@@ -0,0 +1,57 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.impl\n+\n+import com.squareup.anvil.annotations.ContributesBinding\n+import io.element.android.libraries.core.extensions.safeCapitalize\n+import io.element.android.libraries.di.AppScope\n+import javax.inject.Inject\n+\n+interface DateFormatterDay {\n+ fun format(\n+ timestamp: Long,\n+ useRelative: Boolean,\n+ ): String\n+}\n+\n+@ContributesBinding(AppScope::class)\n+class DefaultDateFormatterDay @Inject constructor(\n+ private val localDateTimeProvider: LocalDateTimeProvider,\n+ private val dateFormatters: DateFormatters,\n+) : DateFormatterDay {\n+ override fun format(\n+ timestamp: Long,\n+ useRelative: Boolean,\n+ ): String {\n+ val dateToFormat = localDateTimeProvider.providesFromTimestamp(timestamp)\n+ val today = localDateTimeProvider.providesNow()\n+ return if (useRelative) {\n+ val dayDiff = today.date.toEpochDays() - dateToFormat.date.toEpochDays()\n+ when (dayDiff) {\n+ 0 -> dateFormatters.getRelativeDay(timestamp, \"Today\")\n+ 1 -> dateFormatters.getRelativeDay(timestamp, \"Yesterday\")\n+ else -> if (dayDiff < 7) {\n+ dateFormatters.formatDateWithDay(dateToFormat)\n+ } else {\n+ if (today.year == dateToFormat.year) {\n+ dateFormatters.formatDateWithFullFormatNoYear(dateToFormat)\n+ } else {\n+ dateFormatters.formatDateWithFullFormat(dateToFormat)\n+ }\n+ }\n+ }\n+ } else {\n+ if (today.year == dateToFormat.year) {\n+ dateFormatters.formatDateWithFullFormatNoYear(dateToFormat)\n+ } else {\n+ dateFormatters.formatDateWithFullFormat(dateToFormat)\n+ }\n+ }\n+ .safeCapitalize()\n+ }\n+}\ndiff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterFull.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterFull.kt\nnew file mode 100644\nindex 00000000000..80e613e38ee\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterFull.kt\n@@ -0,0 +1,38 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.impl\n+\n+import io.element.android.services.toolbox.api.strings.StringProvider\n+import javax.inject.Inject\n+\n+class DateFormatterFull @Inject constructor(\n+ private val stringProvider: StringProvider,\n+ private val localDateTimeProvider: LocalDateTimeProvider,\n+ private val dateFormatters: DateFormatters,\n+ private val dateFormatterDay: DateFormatterDay,\n+) {\n+ fun format(\n+ timestamp: Long,\n+ useRelative: Boolean,\n+ ): String {\n+ val dateToFormat = localDateTimeProvider.providesFromTimestamp(timestamp)\n+ val time = dateFormatters.formatTime(dateToFormat)\n+ return if (useRelative) {\n+ val now = localDateTimeProvider.providesNow()\n+ if (now.date == dateToFormat.date) {\n+ time\n+ } else {\n+ val dateStr = dateFormatterDay.format(timestamp, true)\n+ stringProvider.getString(R.string.common_date_date_at_time, dateStr, time)\n+ }\n+ } else {\n+ val dateStr = dateFormatters.formatDateWithFullFormat(dateToFormat)\n+ stringProvider.getString(R.string.common_date_date_at_time, dateStr, time)\n+ }\n+ }\n+}\ndiff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterMonth.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterMonth.kt\nnew file mode 100644\nindex 00000000000..3d56ebcea1c\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterMonth.kt\n@@ -0,0 +1,32 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.impl\n+\n+import io.element.android.libraries.core.extensions.safeCapitalize\n+import io.element.android.services.toolbox.api.strings.StringProvider\n+import javax.inject.Inject\n+\n+class DateFormatterMonth @Inject constructor(\n+ private val stringProvider: StringProvider,\n+ private val localDateTimeProvider: LocalDateTimeProvider,\n+ private val dateFormatters: DateFormatters,\n+) {\n+ fun format(\n+ timestamp: Long,\n+ useRelative: Boolean,\n+ ): String {\n+ val today = localDateTimeProvider.providesNow()\n+ val dateToFormat = localDateTimeProvider.providesFromTimestamp(timestamp)\n+ return if (useRelative && dateToFormat.month == today.month && dateToFormat.year == today.year) {\n+ stringProvider.getString(R.string.common_date_this_month)\n+ } else {\n+ dateFormatters.formatDateWithMonthAndYear(dateToFormat)\n+ }\n+ .safeCapitalize()\n+ }\n+}\ndiff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DefaultLastMessageTimestampFormatter.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterTime.kt\nsimilarity index 62%\nrename from libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DefaultLastMessageTimestampFormatter.kt\nrename to libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterTime.kt\nindex 8c34905836b..b0ad28fdcfa 100644\n--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DefaultLastMessageTimestampFormatter.kt\n+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterTime.kt\n@@ -1,5 +1,5 @@\n /*\n- * Copyright 2023, 2024 New Vector Ltd.\n+ * Copyright 2024 New Vector Ltd.\n *\n * SPDX-License-Identifier: AGPL-3.0-only\n * Please see LICENSE in the repository root for full details.\n@@ -7,18 +7,16 @@\n \n package io.element.android.libraries.dateformatter.impl\n \n-import com.squareup.anvil.annotations.ContributesBinding\n-import io.element.android.libraries.dateformatter.api.LastMessageTimestampFormatter\n-import io.element.android.libraries.di.AppScope\n import javax.inject.Inject\n \n-@ContributesBinding(AppScope::class)\n-class DefaultLastMessageTimestampFormatter @Inject constructor(\n+class DateFormatterTime @Inject constructor(\n private val localDateTimeProvider: LocalDateTimeProvider,\n private val dateFormatters: DateFormatters,\n-) : LastMessageTimestampFormatter {\n- override fun format(timestamp: Long?): String {\n- if (timestamp == null) return \"\"\n+) {\n+ fun format(\n+ timestamp: Long,\n+ useRelative: Boolean,\n+ ): String {\n val currentDate = localDateTimeProvider.providesNow()\n val dateToFormat = localDateTimeProvider.providesFromTimestamp(timestamp)\n val isSameDay = currentDate.date == dateToFormat.date\n@@ -30,7 +28,7 @@ class DefaultLastMessageTimestampFormatter @Inject constructor(\n dateFormatters.formatDate(\n dateToFormat = dateToFormat,\n currentDate = currentDate,\n- useRelative = true\n+ useRelative = useRelative,\n )\n }\n }\ndiff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterTimeOnly.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterTimeOnly.kt\nnew file mode 100644\nindex 00000000000..ce412f0d435\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterTimeOnly.kt\n@@ -0,0 +1,22 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.impl\n+\n+import javax.inject.Inject\n+\n+class DateFormatterTimeOnly @Inject constructor(\n+ private val localDateTimeProvider: LocalDateTimeProvider,\n+ private val dateFormatters: DateFormatters,\n+) {\n+ fun format(\n+ timestamp: Long,\n+ ): String {\n+ val dateToFormat = localDateTimeProvider.providesFromTimestamp(timestamp)\n+ return dateFormatters.formatTime(dateToFormat)\n+ }\n+}\ndiff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatters.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatters.kt\nindex a78cc81c24c..a041952fc37 100644\n--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatters.kt\n+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatters.kt\n@@ -7,57 +7,64 @@\n \n package io.element.android.libraries.dateformatter.impl\n \n-import android.text.format.DateFormat\n import android.text.format.DateUtils\n+import io.element.android.libraries.di.AppScope\n+import io.element.android.libraries.di.SingleIn\n import kotlinx.datetime.Clock\n import kotlinx.datetime.LocalDateTime\n import kotlinx.datetime.toInstant\n import kotlinx.datetime.toJavaLocalDate\n import kotlinx.datetime.toJavaLocalDateTime\n+import timber.log.Timber\n import java.time.Period\n-import java.time.format.DateTimeFormatter\n-import java.time.format.FormatStyle\n import java.util.Locale\n import javax.inject.Inject\n import kotlin.math.absoluteValue\n \n+@SingleIn(AppScope::class)\n class DateFormatters @Inject constructor(\n- private val locale: Locale,\n+ localeChangeObserver: LocaleChangeObserver,\n private val clock: Clock,\n private val timeZoneProvider: TimezoneProvider,\n-) {\n- private val onlyTimeFormatter: DateTimeFormatter by lazy {\n- DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT).withLocale(locale)\n+ locale: Locale,\n+) : LocaleChangeListener {\n+ init {\n+ localeChangeObserver.addListener(this)\n }\n \n- private val dateWithMonthFormatter: DateTimeFormatter by lazy {\n- val pattern = DateFormat.getBestDateTimePattern(locale, \"d MMM\") ?: \"d MMM\"\n- DateTimeFormatter.ofPattern(pattern, locale)\n- }\n+ private var dateTimeFormatters: DateTimeFormatters = DateTimeFormatters(locale)\n \n- private val dateWithYearFormatter: DateTimeFormatter by lazy {\n- val pattern = DateFormat.getBestDateTimePattern(locale, \"dd.MM.yyyy\") ?: \"dd.MM.yyyy\"\n- DateTimeFormatter.ofPattern(pattern, locale)\n+ override fun onLocaleChange() {\n+ Timber.w(\"Locale changed, updating formatters\")\n+ dateTimeFormatters = DateTimeFormatters(Locale.getDefault())\n }\n \n- private val dateWithFullFormatFormatter: DateTimeFormatter by lazy {\n- DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL).withLocale(locale)\n+ internal fun formatTime(localDateTime: LocalDateTime): String {\n+ return dateTimeFormatters.onlyTimeFormatter.format(localDateTime.toJavaLocalDateTime())\n }\n \n- internal fun formatTime(localDateTime: LocalDateTime): String {\n- return onlyTimeFormatter.format(localDateTime.toJavaLocalDateTime())\n+ internal fun formatDateWithMonthAndYear(localDateTime: LocalDateTime): String {\n+ return dateTimeFormatters.dateWithMonthAndYearFormatter.format(localDateTime.toJavaLocalDateTime())\n }\n \n internal fun formatDateWithMonth(localDateTime: LocalDateTime): String {\n- return dateWithMonthFormatter.format(localDateTime.toJavaLocalDateTime())\n+ return dateTimeFormatters.dateWithMonthFormatter.format(localDateTime.toJavaLocalDateTime())\n+ }\n+\n+ internal fun formatDateWithDay(localDateTime: LocalDateTime): String {\n+ return dateTimeFormatters.dateWithDayFormatter.format(localDateTime.toJavaLocalDateTime())\n }\n \n internal fun formatDateWithYear(localDateTime: LocalDateTime): String {\n- return dateWithYearFormatter.format(localDateTime.toJavaLocalDateTime())\n+ return dateTimeFormatters.dateWithYearFormatter.format(localDateTime.toJavaLocalDateTime())\n }\n \n internal fun formatDateWithFullFormat(localDateTime: LocalDateTime): String {\n- return dateWithFullFormatFormatter.format(localDateTime.toJavaLocalDateTime())\n+ return dateTimeFormatters.dateWithFullFormatFormatter.format(localDateTime.toJavaLocalDateTime())\n+ }\n+\n+ internal fun formatDateWithFullFormatNoYear(localDateTime: LocalDateTime): String {\n+ return dateTimeFormatters.dateWithFullFormatNoYearFormatter.format(localDateTime.toJavaLocalDateTime())\n }\n \n internal fun formatDate(\n@@ -75,12 +82,12 @@ class DateFormatters @Inject constructor(\n }\n }\n \n- private fun getRelativeDay(ts: Long): String {\n+ internal fun getRelativeDay(ts: Long, default: String = \"\"): String {\n return DateUtils.getRelativeTimeSpanString(\n ts,\n clock.now().toEpochMilliseconds(),\n DateUtils.DAY_IN_MILLIS,\n DateUtils.FORMAT_SHOW_WEEKDAY\n- )?.toString() ?: \"\"\n+ )?.toString() ?: default\n }\n }\ndiff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateTimeFormatters.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateTimeFormatters.kt\nnew file mode 100644\nindex 00000000000..15dc6aa05eb\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateTimeFormatters.kt\n@@ -0,0 +1,54 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.impl\n+\n+import android.text.format.DateFormat\n+import java.time.format.DateTimeFormatter\n+import java.time.format.FormatStyle\n+import java.util.Locale\n+\n+class DateTimeFormatters(\n+ private val locale: Locale,\n+) {\n+ val onlyTimeFormatter: DateTimeFormatter by lazy {\n+ DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT).withLocale(locale)\n+ }\n+\n+ val dateWithMonthAndYearFormatter: DateTimeFormatter by lazy {\n+ val pattern = bestDateTimePattern(\"MMMM YYYY\")\n+ DateTimeFormatter.ofPattern(pattern, locale)\n+ }\n+\n+ val dateWithMonthFormatter: DateTimeFormatter by lazy {\n+ val pattern = bestDateTimePattern(\"d MMM\")\n+ DateTimeFormatter.ofPattern(pattern, locale)\n+ }\n+\n+ val dateWithDayFormatter: DateTimeFormatter by lazy {\n+ val pattern = bestDateTimePattern(\"EEEE\")\n+ DateTimeFormatter.ofPattern(pattern, locale)\n+ }\n+\n+ val dateWithYearFormatter: DateTimeFormatter by lazy {\n+ val pattern = bestDateTimePattern(\"dd.MM.yyyy\")\n+ DateTimeFormatter.ofPattern(pattern, locale)\n+ }\n+\n+ val dateWithFullFormatFormatter: DateTimeFormatter by lazy {\n+ DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).withLocale(locale)\n+ }\n+\n+ val dateWithFullFormatNoYearFormatter: DateTimeFormatter by lazy {\n+ val pattern = DateFormat.getBestDateTimePattern(locale, \"EEEE d MMMM\") ?: \"EEEE d MMMM\"\n+ DateTimeFormatter.ofPattern(pattern, locale)\n+ }\n+\n+ private fun bestDateTimePattern(pattern: String): String {\n+ return DateFormat.getBestDateTimePattern(locale, pattern) ?: pattern\n+ }\n+}\ndiff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatter.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatter.kt\nnew file mode 100644\nindex 00000000000..7497f8ee453\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatter.kt\n@@ -0,0 +1,48 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.impl\n+\n+import com.squareup.anvil.annotations.ContributesBinding\n+import io.element.android.libraries.dateformatter.api.DateFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatterMode\n+import io.element.android.libraries.di.AppScope\n+import javax.inject.Inject\n+\n+@ContributesBinding(AppScope::class)\n+class DefaultDateFormatter @Inject constructor(\n+ private val dateFormatterFull: DateFormatterFull,\n+ private val dateFormatterMonth: DateFormatterMonth,\n+ private val dateFormatterDay: DateFormatterDay,\n+ private val dateFormatterTime: DateFormatterTime,\n+ private val dateFormatterTimeOnly: DateFormatterTimeOnly,\n+) : DateFormatter {\n+ override fun format(\n+ timestamp: Long?,\n+ mode: DateFormatterMode,\n+ useRelative: Boolean,\n+ ): String {\n+ timestamp ?: return \"\"\n+ return when (mode) {\n+ DateFormatterMode.Full -> {\n+ dateFormatterFull.format(timestamp, useRelative)\n+ }\n+ DateFormatterMode.Month -> {\n+ dateFormatterMonth.format(timestamp, useRelative)\n+ }\n+ DateFormatterMode.Day -> {\n+ dateFormatterDay.format(timestamp, useRelative)\n+ }\n+ DateFormatterMode.TimeOrDate -> {\n+ dateFormatterTime.format(timestamp, useRelative)\n+ }\n+ DateFormatterMode.TimeOnly -> {\n+ dateFormatterTimeOnly.format(timestamp)\n+ }\n+ }\n+ }\n+}\ndiff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDaySeparatorFormatter.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDaySeparatorFormatter.kt\ndeleted file mode 100644\nindex 89ef9ee412a..00000000000\n--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDaySeparatorFormatter.kt\n+++ /dev/null\n@@ -1,25 +0,0 @@\n-/*\n- * Copyright 2023, 2024 New Vector Ltd.\n- *\n- * SPDX-License-Identifier: AGPL-3.0-only\n- * Please see LICENSE in the repository root for full details.\n- */\n-\n-package io.element.android.libraries.dateformatter.impl\n-\n-import com.squareup.anvil.annotations.ContributesBinding\n-import io.element.android.libraries.dateformatter.api.DaySeparatorFormatter\n-import io.element.android.libraries.di.AppScope\n-import javax.inject.Inject\n-\n-@ContributesBinding(AppScope::class)\n-class DefaultDaySeparatorFormatter @Inject constructor(\n- private val localDateTimeProvider: LocalDateTimeProvider,\n- private val dateFormatters: DateFormatters,\n-) : DaySeparatorFormatter {\n- override fun format(timestamp: Long): String {\n- val dateToFormat = localDateTimeProvider.providesFromTimestamp(timestamp)\n- // TODO use relative formatting once iOS uses it too\n- return dateFormatters.formatDateWithFullFormat(dateToFormat)\n- }\n-}\ndiff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/LocaleChangeObserver.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/LocaleChangeObserver.kt\nnew file mode 100644\nindex 00000000000..e89bfe7a991\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/LocaleChangeObserver.kt\n@@ -0,0 +1,56 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.impl\n+\n+import android.content.BroadcastReceiver\n+import android.content.Context\n+import android.content.Intent\n+import android.content.IntentFilter\n+import android.os.Build\n+import com.squareup.anvil.annotations.ContributesBinding\n+import io.element.android.libraries.di.AppScope\n+import io.element.android.libraries.di.ApplicationContext\n+import io.element.android.libraries.di.SingleIn\n+import javax.inject.Inject\n+\n+fun interface LocaleChangeObserver {\n+ fun addListener(listener: LocaleChangeListener)\n+}\n+\n+interface LocaleChangeListener {\n+ fun onLocaleChange()\n+}\n+\n+@SingleIn(AppScope::class)\n+@ContributesBinding(AppScope::class)\n+class DefaultLocaleChangeObserver @Inject constructor(\n+ @ApplicationContext private val context: Context,\n+) : LocaleChangeObserver {\n+ init {\n+ registerReceiver(object : BroadcastReceiver() {\n+ override fun onReceive(context: Context?, intent: Intent?) {\n+ listeners.forEach(LocaleChangeListener::onLocaleChange)\n+ }\n+ })\n+ }\n+\n+ private val listeners = mutableSetOf()\n+\n+ override fun addListener(listener: LocaleChangeListener) {\n+ listeners.add(listener)\n+ }\n+\n+ private fun registerReceiver(receiver: BroadcastReceiver) {\n+ val filter = IntentFilter()\n+ filter.addAction(Intent.ACTION_LOCALE_CHANGED)\n+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {\n+ filter.addAction(Intent.ACTION_APPLICATION_LOCALE_CHANGED)\n+ }\n+ context.registerReceiver(receiver, filter)\n+ }\n+}\ndiff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateForPreview.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateForPreview.kt\nnew file mode 100644\nindex 00000000000..5b9f732ceb3\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateForPreview.kt\n@@ -0,0 +1,53 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.impl.previews\n+\n+data class DateForPreview(\n+ val semantic: String,\n+ val date: String,\n+)\n+\n+val dateForPreviewToday = DateForPreview(\n+ semantic = \"Today\",\n+ date = \"1980-04-06T18:35:24.00Z\",\n+)\n+\n+val dateForPreviews = listOf(\n+ DateForPreview(\n+ semantic = \"Now\",\n+ date = dateForPreviewToday.date,\n+ ),\n+ DateForPreview(\n+ semantic = \"One second ago\",\n+ date = \"1980-04-06T18:35:23.00Z\",\n+ ),\n+ DateForPreview(\n+ semantic = \"One minute ago\",\n+ date = \"1980-04-06T18:34:24.00Z\",\n+ ),\n+ DateForPreview(\n+ semantic = \"One hour ago\",\n+ date = \"1980-04-06T17:35:24.00Z\",\n+ ),\n+ DateForPreview(\n+ semantic = \"One day ago\",\n+ date = \"1980-04-05T18:35:24.00Z\",\n+ ),\n+ DateForPreview(\n+ semantic = \"Two days ago\",\n+ date = \"1980-04-04T18:35:24.00Z\",\n+ ),\n+ DateForPreview(\n+ semantic = \"One month ago\",\n+ date = \"1980-03-06T18:35:24.00Z\",\n+ ),\n+ DateForPreview(\n+ semantic = \"One year ago\",\n+ date = \"1979-04-06T18:35:24.00Z\",\n+ ),\n+)\ndiff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateFormatterModeProvider.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateFormatterModeProvider.kt\nnew file mode 100644\nindex 00000000000..36d7acabfc2\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateFormatterModeProvider.kt\n@@ -0,0 +1,16 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.impl.previews\n+\n+import androidx.compose.ui.tooling.preview.PreviewParameterProvider\n+import io.element.android.libraries.dateformatter.api.DateFormatterMode\n+\n+class DateFormatterModeProvider : PreviewParameterProvider {\n+ override val values: Sequence\n+ get() = DateFormatterMode.entries.asSequence()\n+}\ndiff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateFormatterModeViewPreview.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateFormatterModeViewPreview.kt\nnew file mode 100644\nindex 00000000000..d12f7b07247\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateFormatterModeViewPreview.kt\n@@ -0,0 +1,124 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.impl.previews\n+\n+import androidx.compose.foundation.layout.Column\n+import androidx.compose.foundation.layout.Row\n+import androidx.compose.foundation.layout.Spacer\n+import androidx.compose.foundation.layout.fillMaxWidth\n+import androidx.compose.foundation.layout.padding\n+import androidx.compose.foundation.layout.width\n+import androidx.compose.runtime.Composable\n+import androidx.compose.runtime.remember\n+import androidx.compose.ui.Alignment\n+import androidx.compose.ui.Modifier\n+import androidx.compose.ui.platform.LocalContext\n+import androidx.compose.ui.text.intl.Locale\n+import androidx.compose.ui.tooling.preview.Preview\n+import androidx.compose.ui.tooling.preview.PreviewParameter\n+import androidx.compose.ui.unit.dp\n+import io.element.android.compound.theme.ElementTheme\n+import io.element.android.libraries.dateformatter.api.DateFormatterMode\n+import io.element.android.libraries.dateformatter.impl.DefaultDateFormatter\n+import io.element.android.libraries.designsystem.preview.ElementPreview\n+import io.element.android.libraries.designsystem.theme.components.Text\n+import io.element.android.libraries.designsystem.utils.allBooleans\n+import kotlinx.datetime.Instant\n+\n+@Preview\n+@Composable\n+internal fun DateFormatterModeViewPreview(\n+ @PreviewParameter(DateFormatterModeProvider::class) dateFormatterMode: DateFormatterMode,\n+) = ElementPreview {\n+ DateFormatterModeView(dateFormatterMode)\n+}\n+\n+@Composable\n+private fun DateFormatterModeView(\n+ mode: DateFormatterMode,\n+) {\n+ val context = LocalContext.current\n+ val composeLocale = Locale.current\n+ val dateFormatter = remember {\n+ createFormatter(\n+ context = context,\n+ currentDate = dateForPreviewToday.date,\n+ locale = java.util.Locale.Builder()\n+ .setLanguageTag(composeLocale.toLanguageTag())\n+ .build(),\n+ )\n+ }\n+ Column(\n+ modifier = Modifier\n+ .fillMaxWidth()\n+ .padding(4.dp),\n+ horizontalAlignment = Alignment.CenterHorizontally,\n+ ) {\n+ Text(\n+ text = \"Mode $mode / $composeLocale\",\n+ style = ElementTheme.typography.fontHeadingSmMedium\n+ )\n+ val today = Instant.parse(dateForPreviewToday.date).toEpochMilliseconds()\n+ Text(\n+ text = \"Today is: ${dateFormatter.format(today, DateFormatterMode.Full, useRelative = false)}\",\n+ style = ElementTheme.typography.fontHeadingSmMedium,\n+ )\n+ dateForPreviews.forEach { dateForPreview ->\n+ DateForPreviewItem(\n+ dateForPreview = dateForPreview,\n+ dateFormatter = dateFormatter,\n+ mode = mode,\n+ )\n+ }\n+ }\n+}\n+\n+@Composable\n+private fun DateForPreviewItem(\n+ dateForPreview: DateForPreview,\n+ dateFormatter: DefaultDateFormatter,\n+ mode: DateFormatterMode,\n+) {\n+ Column(\n+ modifier = Modifier\n+ .fillMaxWidth()\n+ .padding(2.dp),\n+ ) {\n+ Text(\n+ modifier = Modifier\n+ .fillMaxWidth()\n+ .padding(start = 8.dp),\n+ text = dateForPreview.semantic,\n+ style = ElementTheme.typography.fontBodyMdMedium,\n+ color = ElementTheme.colors.textSecondary,\n+ )\n+ val ts = Instant.parse(dateForPreview.date).toEpochMilliseconds()\n+ Row {\n+ Column {\n+ listOf(\"Absolute:\", \"Relative:\").forEach { label ->\n+ Text(\n+ text = label,\n+ style = ElementTheme.typography.fontBodyMdRegular,\n+ color = ElementTheme.colors.textPrimary,\n+ )\n+ }\n+ }\n+ Spacer(modifier = Modifier.width(8.dp))\n+ Column {\n+ allBooleans.forEach { useRelative ->\n+ Text(\n+ modifier = Modifier.fillMaxWidth(),\n+ text = dateFormatter.format(ts, mode, useRelative),\n+ style = ElementTheme.typography.fontBodyMdRegular,\n+ color = ElementTheme.colors.textPrimary,\n+ )\n+ }\n+ }\n+ }\n+ }\n+}\ndiff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/Factory.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/Factory.kt\nnew file mode 100644\nindex 00000000000..cf9787e9d3b\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/Factory.kt\n@@ -0,0 +1,66 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.impl.previews\n+\n+import android.content.Context\n+import io.element.android.libraries.dateformatter.impl.DateFormatterFull\n+import io.element.android.libraries.dateformatter.impl.DateFormatterMonth\n+import io.element.android.libraries.dateformatter.impl.DateFormatterTime\n+import io.element.android.libraries.dateformatter.impl.DateFormatterTimeOnly\n+import io.element.android.libraries.dateformatter.impl.DateFormatters\n+import io.element.android.libraries.dateformatter.impl.DefaultDateFormatter\n+import io.element.android.libraries.dateformatter.impl.DefaultDateFormatterDay\n+import io.element.android.libraries.dateformatter.impl.LocalDateTimeProvider\n+import kotlinx.datetime.Instant\n+import kotlinx.datetime.TimeZone\n+import java.util.Locale\n+\n+/**\n+ * Create DefaultDateFormatter and set current time to the provided date.\n+ */\n+fun createFormatter(\n+ context: Context,\n+ currentDate: String,\n+ locale: Locale,\n+): DefaultDateFormatter {\n+ val clock = PreviewClock().apply { givenInstant(Instant.parse(currentDate)) }\n+ val localDateTimeProvider = LocalDateTimeProvider(clock) { TimeZone.UTC }\n+ val dateFormatters = DateFormatters(\n+ localeChangeObserver = {},\n+ clock = clock,\n+ timeZoneProvider = { TimeZone.UTC },\n+ locale = locale,\n+ )\n+ val stringProvider = PreviewStringProvider(context.resources)\n+ val dateFormatterDay = DefaultDateFormatterDay(\n+ localDateTimeProvider = localDateTimeProvider,\n+ dateFormatters = dateFormatters,\n+ )\n+ return DefaultDateFormatter(\n+ dateFormatterFull = DateFormatterFull(\n+ stringProvider = stringProvider,\n+ localDateTimeProvider = localDateTimeProvider,\n+ dateFormatters = dateFormatters,\n+ dateFormatterDay = dateFormatterDay,\n+ ),\n+ dateFormatterMonth = DateFormatterMonth(\n+ stringProvider = stringProvider,\n+ localDateTimeProvider = localDateTimeProvider,\n+ dateFormatters = dateFormatters,\n+ ),\n+ dateFormatterDay = dateFormatterDay,\n+ dateFormatterTime = DateFormatterTime(\n+ localDateTimeProvider = localDateTimeProvider,\n+ dateFormatters = dateFormatters,\n+ ),\n+ dateFormatterTimeOnly = DateFormatterTimeOnly(\n+ localDateTimeProvider = localDateTimeProvider,\n+ dateFormatters = dateFormatters,\n+ ),\n+ )\n+}\ndiff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/PreviewClock.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/PreviewClock.kt\nnew file mode 100644\nindex 00000000000..3486d169a21\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/PreviewClock.kt\n@@ -0,0 +1,21 @@\n+/*\n+ * Copyright 2023, 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.impl.previews\n+\n+import kotlinx.datetime.Clock\n+import kotlinx.datetime.Instant\n+\n+class PreviewClock : Clock {\n+ private var instant: Instant = Instant.fromEpochMilliseconds(0)\n+\n+ fun givenInstant(instant: Instant) {\n+ this.instant = instant\n+ }\n+\n+ override fun now(): Instant = instant\n+}\ndiff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/PreviewStringProvider.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/PreviewStringProvider.kt\nnew file mode 100644\nindex 00000000000..6498b30d885\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/PreviewStringProvider.kt\n@@ -0,0 +1,29 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.impl.previews\n+\n+import android.content.res.Resources\n+import androidx.annotation.PluralsRes\n+import androidx.annotation.StringRes\n+import io.element.android.services.toolbox.api.strings.StringProvider\n+\n+class PreviewStringProvider(\n+ private val resources: Resources\n+) : StringProvider {\n+ override fun getString(@StringRes resId: Int): String {\n+ return resources.getString(resId)\n+ }\n+\n+ override fun getString(@StringRes resId: Int, vararg formatArgs: Any?): String {\n+ return resources.getString(resId, *formatArgs)\n+ }\n+\n+ override fun getQuantityString(@PluralsRes resId: Int, quantity: Int, vararg formatArgs: Any?): String {\n+ return resources.getQuantityString(resId, quantity, *formatArgs)\n+ }\n+}\ndiff --git a/libraries/dateformatter/impl/src/main/res/values-fr/translations.xml b/libraries/dateformatter/impl/src/main/res/values-fr/translations.xml\nnew file mode 100644\nindex 00000000000..f2635367677\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/main/res/values-fr/translations.xml\n@@ -0,0 +1,5 @@\n+\n+\n+ \"%1$s \u00e0 %2$s\"\n+ \"Ce mois-ci\"\n+\ndiff --git a/libraries/dateformatter/impl/src/main/res/values/localazy.xml b/libraries/dateformatter/impl/src/main/res/values/localazy.xml\nnew file mode 100644\nindex 00000000000..8b0dab8cff4\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/main/res/values/localazy.xml\n@@ -0,0 +1,5 @@\n+\n+\n+ \"%1$s at %2$s\"\n+ \"This month\"\n+\ndiff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt\nindex c84a37cdc38..daf90d63566 100644\n--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt\n+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt\n@@ -235,7 +235,7 @@ class RustMatrixRoom(\n RoomMessageEventMessageType.VIDEO,\n RoomMessageEventMessageType.AUDIO,\n ),\n- dateDividerMode = DateDividerMode.DAILY,\n+ dateDividerMode = DateDividerMode.MONTHLY,\n ).let { inner ->\n createTimeline(inner, mode = Timeline.Mode.MEDIA)\n }\ndiff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaInfo.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaInfo.kt\nindex 17a1052954f..7daa5ab7ef4 100644\n--- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaInfo.kt\n+++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaInfo.kt\n@@ -23,6 +23,7 @@ data class MediaInfo(\n val senderName: String?,\n val senderAvatar: String?,\n val dateSent: String?,\n+ val dateSentFull: String?,\n ) : Parcelable\n \n fun anImageMediaInfo(\n@@ -30,6 +31,7 @@ fun anImageMediaInfo(\n caption: String? = null,\n senderName: String? = null,\n dateSent: String? = null,\n+ dateSentFull: String? = null,\n ): MediaInfo = MediaInfo(\n filename = \"an image file.jpg\",\n caption = caption,\n@@ -40,12 +42,14 @@ fun anImageMediaInfo(\n senderName = senderName,\n senderAvatar = null,\n dateSent = dateSent,\n+ dateSentFull = dateSentFull,\n )\n \n fun aVideoMediaInfo(\n caption: String? = null,\n senderName: String? = null,\n dateSent: String? = null,\n+ dateSentFull: String? = null,\n ): MediaInfo = MediaInfo(\n filename = \"a video file.mp4\",\n caption = caption,\n@@ -56,6 +60,7 @@ fun aVideoMediaInfo(\n senderName = senderName,\n senderAvatar = null,\n dateSent = dateSent,\n+ dateSentFull = dateSentFull,\n )\n \n fun aPdfMediaInfo(\n@@ -63,6 +68,7 @@ fun aPdfMediaInfo(\n caption: String? = null,\n senderName: String? = null,\n dateSent: String? = null,\n+ dateSentFull: String? = null,\n ): MediaInfo = MediaInfo(\n filename = filename,\n caption = caption,\n@@ -73,12 +79,14 @@ fun aPdfMediaInfo(\n senderName = senderName,\n senderAvatar = null,\n dateSent = dateSent,\n+ dateSentFull = dateSentFull,\n )\n \n fun anApkMediaInfo(\n senderId: UserId? = UserId(\"@alice:server.org\"),\n senderName: String? = null,\n dateSent: String? = null,\n+ dateSentFull: String? = null,\n ): MediaInfo = MediaInfo(\n filename = \"an apk file.apk\",\n caption = null,\n@@ -89,11 +97,13 @@ fun anApkMediaInfo(\n senderName = senderName,\n senderAvatar = null,\n dateSent = dateSent,\n+ dateSentFull = dateSentFull,\n )\n \n fun anAudioMediaInfo(\n senderName: String? = null,\n dateSent: String? = null,\n+ dateSentFull: String? = null,\n ): MediaInfo = MediaInfo(\n filename = \"an audio file.mp3\",\n caption = null,\n@@ -104,4 +114,5 @@ fun anAudioMediaInfo(\n senderName = senderName,\n senderAvatar = null,\n dateSent = dateSent,\n+ dateSentFull = dateSentFull,\n )\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPoint.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPoint.kt\nindex f9611a70236..d85bf08b8ea 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPoint.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPoint.kt\n@@ -53,6 +53,7 @@ class DefaultMediaViewerEntryPoint @Inject constructor() : MediaViewerEntryPoint\n senderName = null,\n senderAvatar = null,\n dateSent = null,\n+ dateSentFull = null,\n ),\n mediaSource = MediaSource(url = avatarUrl),\n thumbnailSource = null,\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheet.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheet.kt\nindex a11abe945b7..42127db2290 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheet.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheet.kt\n@@ -71,7 +71,7 @@ fun MediaDetailsBottomSheet(\n }\n SectionText(\n title = stringResource(R.string.screen_media_details_uploaded_on),\n- text = state.mediaInfo.dateSent.orEmpty(),\n+ text = state.mediaInfo.dateSentFull.orEmpty(),\n )\n SectionText(\n title = stringResource(R.string.screen_media_details_filename),\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/Preview.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/Preview.kt\nindex 880fcb2b914..5957fd480fa 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/Preview.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/Preview.kt\n@@ -10,12 +10,15 @@ package io.element.android.libraries.mediaviewer.impl.details\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.mediaviewer.api.anImageMediaInfo\n \n-fun aMediaDetailsBottomSheetState(): MediaBottomSheetState.MediaDetailsBottomSheetState {\n+fun aMediaDetailsBottomSheetState(\n+ dateSentFull: String = \"December 6, 2024 at 12:59\",\n+): MediaBottomSheetState.MediaDetailsBottomSheetState {\n return MediaBottomSheetState.MediaDetailsBottomSheetState(\n eventId = EventId(\"\\$eventId\"),\n canDelete = true,\n mediaInfo = anImageMediaInfo(\n senderName = \"Alice\",\n+ dateSentFull = dateSentFull,\n ),\n thumbnailSource = null,\n )\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/EventItemFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/EventItemFactory.kt\nindex 6b965001495..8fcea07f529 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/EventItemFactory.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/EventItemFactory.kt\n@@ -8,7 +8,8 @@\n package io.element.android.libraries.mediaviewer.impl.gallery\n \n import io.element.android.libraries.androidutils.filesize.FileSizeFormatter\n-import io.element.android.libraries.dateformatter.api.LastMessageTimestampFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatterMode\n import io.element.android.libraries.dateformatter.api.toHumanReadableDuration\n import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem\n import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageType\n@@ -45,13 +46,20 @@ import javax.inject.Inject\n class EventItemFactory @Inject constructor(\n private val fileSizeFormatter: FileSizeFormatter,\n private val fileExtensionExtractor: FileExtensionExtractor,\n- private val lastMessageTimestampFormatter: LastMessageTimestampFormatter,\n+ private val dateFormatter: DateFormatter,\n ) {\n fun create(\n currentTimelineItem: MatrixTimelineItem.Event,\n ): MediaItem.Event? {\n val event = currentTimelineItem.event\n- val sentTime = lastMessageTimestampFormatter.format(currentTimelineItem.event.timestamp)\n+ val dateSent = dateFormatter.format(\n+ currentTimelineItem.event.timestamp,\n+ mode = DateFormatterMode.Day,\n+ )\n+ val dateSentFull = dateFormatter.format(\n+ timestamp = currentTimelineItem.event.timestamp,\n+ mode = DateFormatterMode.Full,\n+ )\n return when (val content = event.content) {\n CallNotifyContent,\n is FailedToParseMessageLikeContent,\n@@ -90,7 +98,8 @@ class EventItemFactory @Inject constructor(\n senderId = event.sender,\n senderName = event.senderProfile.getDisambiguatedDisplayName(event.sender),\n senderAvatar = event.senderProfile.getAvatarUrl(),\n- dateSent = sentTime,\n+ dateSent = dateSent,\n+ dateSentFull = dateSentFull,\n ),\n mediaSource = type.source,\n )\n@@ -106,7 +115,8 @@ class EventItemFactory @Inject constructor(\n senderId = event.sender,\n senderName = event.senderProfile.getDisambiguatedDisplayName(event.sender),\n senderAvatar = event.senderProfile.getAvatarUrl(),\n- dateSent = sentTime,\n+ dateSent = dateSent,\n+ dateSentFull = dateSentFull,\n ),\n mediaSource = type.source,\n )\n@@ -122,7 +132,8 @@ class EventItemFactory @Inject constructor(\n senderId = event.sender,\n senderName = event.senderProfile.getDisambiguatedDisplayName(event.sender),\n senderAvatar = event.senderProfile.getAvatarUrl(),\n- dateSent = sentTime,\n+ dateSent = dateSent,\n+ dateSentFull = dateSentFull,\n ),\n mediaSource = type.source,\n thumbnailSource = null,\n@@ -139,7 +150,8 @@ class EventItemFactory @Inject constructor(\n senderId = event.sender,\n senderName = event.senderProfile.getDisambiguatedDisplayName(event.sender),\n senderAvatar = event.senderProfile.getAvatarUrl(),\n- dateSent = sentTime,\n+ dateSent = dateSent,\n+ dateSentFull = dateSentFull,\n ),\n mediaSource = type.source,\n thumbnailSource = null,\n@@ -156,7 +168,8 @@ class EventItemFactory @Inject constructor(\n senderId = event.sender,\n senderName = event.senderProfile.getDisambiguatedDisplayName(event.sender),\n senderAvatar = event.senderProfile.getAvatarUrl(),\n- dateSent = sentTime,\n+ dateSent = dateSent,\n+ dateSentFull = dateSentFull,\n ),\n mediaSource = type.source,\n thumbnailSource = type.info?.thumbnailSource,\n@@ -174,7 +187,8 @@ class EventItemFactory @Inject constructor(\n senderId = event.sender,\n senderName = event.senderProfile.getDisambiguatedDisplayName(event.sender),\n senderAvatar = event.senderProfile.getAvatarUrl(),\n- dateSent = sentTime,\n+ dateSent = dateSent,\n+ dateSentFull = dateSentFull,\n ),\n mediaSource = type.source,\n )\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/VirtualItemFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/VirtualItemFactory.kt\nindex 22d5ef546b3..df0976b4688 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/VirtualItemFactory.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/VirtualItemFactory.kt\n@@ -7,19 +7,24 @@\n \n package io.element.android.libraries.mediaviewer.impl.gallery\n \n-import io.element.android.libraries.dateformatter.api.DaySeparatorFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatterMode\n import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem\n import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTimelineItem\n import javax.inject.Inject\n \n class VirtualItemFactory @Inject constructor(\n- private val daySeparatorFormatter: DaySeparatorFormatter,\n+ private val dateFormatter: DateFormatter,\n ) {\n fun create(timelineItem: MatrixTimelineItem.Virtual): MediaItem? {\n return when (val virtual = timelineItem.virtual) {\n is VirtualTimelineItem.DayDivider -> MediaItem.DateSeparator(\n id = timelineItem.uniqueId,\n- formattedDate = daySeparatorFormatter.format(virtual.timestamp)\n+ formattedDate = dateFormatter.format(\n+ timestamp = virtual.timestamp,\n+ mode = DateFormatterMode.Month,\n+ useRelative = true,\n+ )\n )\n VirtualTimelineItem.LastForwardIndicator -> null\n is VirtualTimelineItem.LoadingIndicator -> MediaItem.LoadingIndicator(\ndiff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactory.kt\nindex 62706f120ea..c17d613e550 100644\n--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactory.kt\n+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactory.kt\n@@ -46,6 +46,7 @@ class AndroidLocalMediaFactory @Inject constructor(\n senderName = mediaInfo.senderName,\n senderAvatar = mediaInfo.senderAvatar,\n dateSent = mediaInfo.dateSent,\n+ dateSentFull = mediaInfo.dateSentFull,\n )\n \n override fun createFromUri(\n@@ -63,6 +64,7 @@ class AndroidLocalMediaFactory @Inject constructor(\n senderName = null,\n senderAvatar = null,\n dateSent = null,\n+ dateSentFull = null,\n )\n \n private fun createFromUri(\n@@ -75,6 +77,7 @@ class AndroidLocalMediaFactory @Inject constructor(\n senderName: String?,\n senderAvatar: String?,\n dateSent: String?,\n+ dateSentFull: String?,\n ): LocalMedia {\n val resolvedMimeType = mimeType ?: context.getMimeType(uri) ?: MimeTypes.OctetStream\n val fileName = name ?: context.getFileName(uri) ?: \"\"\n@@ -92,6 +95,7 @@ class AndroidLocalMediaFactory @Inject constructor(\n senderName = senderName,\n senderAvatar = senderAvatar,\n dateSent = dateSent,\n+ dateSentFull = dateSentFull,\n )\n )\n }\ndiff --git a/tools/localazy/config.json b/tools/localazy/config.json\nindex fe2f7d3e036..2efd8eac976 100644\n--- a/tools/localazy/config.json\n+++ b/tools/localazy/config.json\n@@ -80,6 +80,12 @@\n \".*voice_message_tooltip\"\n ]\n },\n+ {\n+ \"name\" : \":libraries:dateformatter:impl\",\n+ \"includeRegex\" : [\n+ \"common\\\\.date\\\\..*\"\n+ ]\n+ },\n {\n \"name\" : \":libraries:permissions:api\",\n \"includeRegex\" : [\n", "test_patch": "diff --git a/.maestro/tests/roomList/createAndDeleteRoom.yaml b/.maestro/tests/roomList/createAndDeleteRoom.yaml\nindex ae6f5772c65..7cbf455ba23 100644\n--- a/.maestro/tests/roomList/createAndDeleteRoom.yaml\n+++ b/.maestro/tests/roomList/createAndDeleteRoom.yaml\n@@ -30,5 +30,6 @@ appId: ${MAESTRO_APP_ID}\n # assert there's 1 member and 2 invitees\n - tapOn: \"Back\"\n - scroll\n+- scroll\n - tapOn: \"Leave room\"\n - tapOn: \"Leave\"\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt\nindex b15f3588285..c8305f971be 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt\n@@ -327,6 +327,7 @@ class MessagesViewTest {\n actionListState = anActionListState(\n target = ActionListState.Target.Success(\n event = timelineItem,\n+ sentTimeFull = \"\",\n displayEmojiReactions = true,\n actions = persistentListOf(TimelineItemAction.Edit),\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n@@ -399,6 +400,7 @@ class MessagesViewTest {\n actionListState = anActionListState(\n target = ActionListState.Target.Success(\n event = timelineItem,\n+ sentTimeFull = \"\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(TimelineItemAction.Edit),\n@@ -427,6 +429,7 @@ class MessagesViewTest {\n actionListState = anActionListState(\n target = ActionListState.Target.Success(\n event = timelineItem,\n+ sentTimeFull = \"\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = aChangedIdentitySendFailure(),\n actions = persistentListOf(),\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt\nindex 49db6f6c955..14605f31d5c 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt\n@@ -26,6 +26,7 @@ import io.element.android.features.messages.impl.timeline.model.event.aTimelineI\n import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemStateEventContent\n import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemVoiceContent\n import io.element.android.features.poll.api.pollcontent.aPollAnswerItemList\n+import io.element.android.libraries.dateformatter.test.FakeDateFormatter\n import io.element.android.libraries.featureflag.api.FeatureFlags\n import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.matrix.api.room.MatrixRoom\n@@ -86,6 +87,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = false,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -128,6 +130,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = false,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -170,6 +173,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -215,6 +219,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -263,6 +268,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -308,6 +314,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -355,6 +362,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = false,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -403,6 +411,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -448,6 +457,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -496,6 +506,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -542,6 +553,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -592,6 +604,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -641,6 +654,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -691,6 +705,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -738,6 +753,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = stateEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = false,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -808,6 +824,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -855,6 +872,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -909,6 +927,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -1006,6 +1025,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -1046,6 +1066,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -1089,6 +1110,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -1131,6 +1153,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -1174,6 +1197,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = true,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -1214,6 +1238,7 @@ class ActionListPresenterTest {\n assertThat(successState.target).isEqualTo(\n ActionListState.Target.Success(\n event = messageEvent,\n+ sentTimeFull = \"0 Full true\",\n displayEmojiReactions = false,\n verifiedUserSendFailure = VerifiedUserSendFailure.None,\n actions = persistentListOf(\n@@ -1268,6 +1293,7 @@ private fun createActionListPresenter(\n initialState = mapOf(\n FeatureFlags.MediaCaptionCreation.key to allowCaption,\n ),\n- )\n+ ),\n+ dateFormatter = FakeDateFormatter(),\n )\n }\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/TimelineItemsFactoryFixtures.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/TimelineItemsFactoryFixtures.kt\nindex 51c4cb43ba0..df76e15b6c3 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/TimelineItemsFactoryFixtures.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/TimelineItemsFactoryFixtures.kt\n@@ -28,8 +28,7 @@ import io.element.android.features.messages.impl.utils.FakeTextPillificationHelp\n import io.element.android.features.messages.test.timeline.FakeHtmlConverterProvider\n import io.element.android.features.poll.test.pollcontent.FakePollContentStateFactory\n import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter\n-import io.element.android.libraries.dateformatter.test.FakeDaySeparatorFormatter\n-import io.element.android.libraries.dateformatter.test.FakeLastMessageTimestampFormatter\n+import io.element.android.libraries.dateformatter.test.FakeDateFormatter\n import io.element.android.libraries.eventformatter.api.TimelineEventFormatter\n import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem\n@@ -80,7 +79,7 @@ internal fun TestScope.aTimelineItemsFactory(\n failedToParseStateFactory = TimelineItemContentFailedToParseStateFactory(),\n ),\n matrixClient = matrixClient,\n- lastMessageTimestampFormatter = FakeLastMessageTimestampFormatter(),\n+ dateFormatter = FakeDateFormatter(),\n permalinkParser = FakePermalinkParser(),\n config = config\n )\n@@ -88,7 +87,7 @@ internal fun TestScope.aTimelineItemsFactory(\n },\n virtualItemFactory = TimelineItemVirtualFactory(\n daySeparatorFactory = TimelineItemDaySeparatorFactory(\n- FakeDaySeparatorFormatter()\n+ FakeDateFormatter()\n ),\n ),\n timelineItemGrouper = TimelineItemGrouper(),\ndiff --git a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenterTest.kt b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenterTest.kt\nindex 6dfa8df752e..d3e67e223ed 100644\n--- a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenterTest.kt\n+++ b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenterTest.kt\n@@ -21,7 +21,7 @@ import io.element.android.features.poll.impl.history.model.PollHistoryItemsFacto\n import io.element.android.features.poll.impl.model.DefaultPollContentStateFactory\n import io.element.android.features.poll.test.actions.FakeEndPollAction\n import io.element.android.features.poll.test.actions.FakeSendPollResponseAction\n-import io.element.android.libraries.dateformatter.test.FakeDaySeparatorFormatter\n+import io.element.android.libraries.dateformatter.test.FakeDateFormatter\n import io.element.android.libraries.matrix.api.room.MatrixRoom\n import io.element.android.libraries.matrix.api.timeline.Timeline\n import io.element.android.libraries.matrix.test.AN_EVENT_ID\n@@ -161,7 +161,7 @@ class PollHistoryPresenterTest {\n sendPollResponseAction: SendPollResponseAction = FakeSendPollResponseAction(),\n pollHistoryItemFactory: PollHistoryItemsFactory = PollHistoryItemsFactory(\n pollContentStateFactory = DefaultPollContentStateFactory(FakeMatrixClient()),\n- daySeparatorFormatter = FakeDaySeparatorFormatter(),\n+ dateFormatter = FakeDateFormatter(),\n dispatchers = testCoroutineDispatchers(),\n ),\n ): PollHistoryPresenter {\ndiff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt\nindex 69e9a7d4013..84ef3078e46 100644\n--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt\n+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt\n@@ -31,9 +31,8 @@ import io.element.android.features.roomlist.impl.search.RoomListSearchState\n import io.element.android.features.roomlist.impl.search.aRoomListSearchState\n import io.element.android.libraries.androidutils.system.DateTimeObserver\n import io.element.android.libraries.architecture.Presenter\n-import io.element.android.libraries.dateformatter.api.LastMessageTimestampFormatter\n-import io.element.android.libraries.dateformatter.test.A_FORMATTED_DATE\n-import io.element.android.libraries.dateformatter.test.FakeLastMessageTimestampFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatter\n+import io.element.android.libraries.dateformatter.test.FakeDateFormatter\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter\n import io.element.android.libraries.eventformatter.test.FakeRoomLastMessageFormatter\n@@ -188,6 +187,7 @@ class RoomListPresenterTest {\n createRoomListRoomSummary(\n numberOfUnreadMentions = 1,\n numberOfUnreadMessages = 2,\n+ timestamp = \"0 TimeOrDate true\",\n )\n )\n cancelAndIgnoreRemainingEvents()\n@@ -633,9 +633,7 @@ class RoomListPresenterTest {\n networkMonitor: NetworkMonitor = FakeNetworkMonitor(),\n snackbarDispatcher: SnackbarDispatcher = SnackbarDispatcher(),\n leaveRoomState: LeaveRoomState = aLeaveRoomState(),\n- lastMessageTimestampFormatter: LastMessageTimestampFormatter = FakeLastMessageTimestampFormatter().apply {\n- givenFormat(A_FORMATTED_DATE)\n- },\n+ dateFormatter: DateFormatter = FakeDateFormatter(),\n roomLastMessageFormatter: RoomLastMessageFormatter = FakeRoomLastMessageFormatter(),\n sessionPreferencesStore: SessionPreferencesStore = InMemorySessionPreferencesStore(),\n featureFlagService: FeatureFlagService = FakeFeatureFlagService(),\n@@ -652,7 +650,7 @@ class RoomListPresenterTest {\n roomListDataSource = RoomListDataSource(\n roomListService = client.roomListService,\n roomListRoomSummaryFactory = aRoomListRoomSummaryFactory(\n- lastMessageTimestampFormatter = lastMessageTimestampFormatter,\n+ dateFormatter = dateFormatter,\n roomLastMessageFormatter = roomLastMessageFormatter,\n ),\n coroutineDispatchers = testCoroutineDispatchers(),\ndiff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListDataSourceTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListDataSourceTest.kt\nindex f02c53e6f62..1839b35688e 100644\n--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListDataSourceTest.kt\n+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListDataSourceTest.kt\n@@ -11,7 +11,7 @@ import app.cash.turbine.test\n import com.google.common.truth.Truth.assertThat\n import io.element.android.features.roomlist.impl.FakeDateTimeObserver\n import io.element.android.libraries.androidutils.system.DateTimeObserver\n-import io.element.android.libraries.dateformatter.test.FakeLastMessageTimestampFormatter\n+import io.element.android.libraries.dateformatter.test.FakeDateFormatter\n import io.element.android.libraries.matrix.api.roomlist.RoomListService\n import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService\n import io.element.android.libraries.matrix.test.room.aRoomSummary\n@@ -30,12 +30,12 @@ class RoomListDataSourceTest {\n postAllRooms(listOf(aRoomSummary()))\n }\n val dateTimeObserver = FakeDateTimeObserver()\n- val lastMessageTimestampFormatter = FakeLastMessageTimestampFormatter()\n- lastMessageTimestampFormatter.givenFormat(\"Today\")\n+ var dateFormatterResult = \"Today\"\n+ val dateFormatter = FakeDateFormatter({ _, _, _ -> dateFormatterResult })\n val roomListDataSource = createRoomListDataSource(\n roomListService = roomListService,\n roomListRoomSummaryFactory = aRoomListRoomSummaryFactory(\n- lastMessageTimestampFormatter = lastMessageTimestampFormatter,\n+ dateFormatter = dateFormatter,\n ),\n dateTimeObserver = dateTimeObserver,\n )\n@@ -47,7 +47,7 @@ class RoomListDataSourceTest {\n val initialRoomList = awaitItem()\n assertThat(initialRoomList).isNotEmpty()\n assertThat(initialRoomList.first().timestamp).isEqualTo(\"Today\")\n- lastMessageTimestampFormatter.givenFormat(\"Yesterday\")\n+ dateFormatterResult = \"Yesterday\"\n // Trigger a date change\n dateTimeObserver.given(DateTimeObserver.Event.DateChanged(Instant.MIN, Instant.now()))\n // Check there is a new list and it's not the same as the previous one\n@@ -64,12 +64,12 @@ class RoomListDataSourceTest {\n postAllRooms(listOf(aRoomSummary()))\n }\n val dateTimeObserver = FakeDateTimeObserver()\n- val lastMessageTimestampFormatter = FakeLastMessageTimestampFormatter()\n- lastMessageTimestampFormatter.givenFormat(\"Today\")\n+ var dateFormatterResult = \"Today\"\n+ val dateFormatter = FakeDateFormatter({ _, _, _ -> dateFormatterResult })\n val roomListDataSource = createRoomListDataSource(\n roomListService = roomListService,\n roomListRoomSummaryFactory = aRoomListRoomSummaryFactory(\n- lastMessageTimestampFormatter = lastMessageTimestampFormatter,\n+ dateFormatter = dateFormatter,\n ),\n dateTimeObserver = dateTimeObserver,\n )\n@@ -80,7 +80,7 @@ class RoomListDataSourceTest {\n val initialRoomList = awaitItem()\n assertThat(initialRoomList).isNotEmpty()\n assertThat(initialRoomList.first().timestamp).isEqualTo(\"Today\")\n- lastMessageTimestampFormatter.givenFormat(\"Yesterday\")\n+ dateFormatterResult = \"Yesterday\"\n // Trigger a timezone change\n dateTimeObserver.given(DateTimeObserver.Event.TimeZoneChanged)\n // Check there is a new list and it's not the same as the previous one\ndiff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactoryTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactoryTest.kt\nindex 8a26120a9ee..41996b24db9 100644\n--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactoryTest.kt\n+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactoryTest.kt\n@@ -7,13 +7,14 @@\n \n package io.element.android.features.roomlist.impl.datasource\n \n-import io.element.android.libraries.dateformatter.api.LastMessageTimestampFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatter\n+import io.element.android.libraries.dateformatter.test.FakeDateFormatter\n import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter\n \n fun aRoomListRoomSummaryFactory(\n- lastMessageTimestampFormatter: LastMessageTimestampFormatter = LastMessageTimestampFormatter { _ -> \"Today\" },\n+ dateFormatter: DateFormatter = FakeDateFormatter { _, _, _ -> \"Today\" },\n roomLastMessageFormatter: RoomLastMessageFormatter = RoomLastMessageFormatter { _, _ -> \"Hey\" }\n ) = RoomListRoomSummaryFactory(\n- lastMessageTimestampFormatter = lastMessageTimestampFormatter,\n+ dateFormatter = dateFormatter,\n roomLastMessageFormatter = roomLastMessageFormatter\n )\ndiff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryTest.kt\nindex 7e91fa59de3..fbe7137ed89 100644\n--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryTest.kt\n+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryTest.kt\n@@ -8,7 +8,6 @@\n package io.element.android.features.roomlist.impl.model\n \n import com.google.common.truth.Truth.assertThat\n-import io.element.android.libraries.dateformatter.test.A_FORMATTED_DATE\n import io.element.android.libraries.designsystem.components.avatar.AvatarData\n import io.element.android.libraries.designsystem.components.avatar.AvatarSize\n import io.element.android.libraries.matrix.api.room.RoomNotificationMode\n@@ -84,6 +83,7 @@ internal fun createRoomListRoomSummary(\n isFavorite: Boolean = false,\n displayType: RoomSummaryDisplayType = RoomSummaryDisplayType.ROOM,\n heroes: List = emptyList(),\n+ timestamp: String? = null,\n ) = RoomListRoomSummary(\n id = A_ROOM_ID.value,\n roomId = A_ROOM_ID,\n@@ -92,7 +92,7 @@ internal fun createRoomListRoomSummary(\n numberOfUnreadMessages = numberOfUnreadMessages,\n numberOfUnreadNotifications = numberOfUnreadNotifications,\n isMarkedUnread = isMarkedUnread,\n- timestamp = A_FORMATTED_DATE,\n+ timestamp = timestamp,\n lastMessage = \"\",\n avatarData = AvatarData(id = A_ROOM_ID.value, name = A_ROOM_NAME, size = AvatarSize.RoomListItem),\n displayType = displayType,\ndiff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchPresenterTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchPresenterTest.kt\nindex 6ede9544ec3..0d86860445a 100644\n--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchPresenterTest.kt\n+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchPresenterTest.kt\n@@ -12,7 +12,7 @@ import app.cash.molecule.moleculeFlow\n import app.cash.turbine.test\n import com.google.common.truth.Truth.assertThat\n import io.element.android.features.roomlist.impl.datasource.aRoomListRoomSummaryFactory\n-import io.element.android.libraries.dateformatter.test.FakeLastMessageTimestampFormatter\n+import io.element.android.libraries.dateformatter.test.FakeDateFormatter\n import io.element.android.libraries.eventformatter.test.FakeRoomLastMessageFormatter\n import io.element.android.libraries.featureflag.api.FeatureFlagService\n import io.element.android.libraries.featureflag.api.FeatureFlags\n@@ -143,7 +143,7 @@ fun TestScope.createRoomListSearchPresenter(\n dataSource = RoomListSearchDataSource(\n roomListService = roomListService,\n roomSummaryFactory = aRoomListRoomSummaryFactory(\n- lastMessageTimestampFormatter = FakeLastMessageTimestampFormatter(),\n+ dateFormatter = FakeDateFormatter(),\n roomLastMessageFormatter = FakeRoomLastMessageFormatter(),\n ),\n coroutineDispatchers = testCoroutineDispatchers(),\ndiff --git a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenterTest.kt b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenterTest.kt\nindex 773b7b390b9..c4406009da0 100644\n--- a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenterTest.kt\n+++ b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenterTest.kt\n@@ -9,9 +9,8 @@ package io.element.android.features.verifysession.impl.incoming\n \n import com.google.common.truth.Truth.assertThat\n import io.element.android.features.verifysession.impl.ui.aEmojisSessionVerificationData\n-import io.element.android.libraries.dateformatter.api.LastMessageTimestampFormatter\n-import io.element.android.libraries.dateformatter.test.A_FORMATTED_DATE\n-import io.element.android.libraries.dateformatter.test.FakeLastMessageTimestampFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatter\n+import io.element.android.libraries.dateformatter.test.FakeDateFormatter\n import io.element.android.libraries.matrix.api.core.FlowId\n import io.element.android.libraries.matrix.api.verification.SessionVerificationRequestDetails\n import io.element.android.libraries.matrix.api.verification.SessionVerificationService\n@@ -56,7 +55,7 @@ class IncomingVerificationPresenterTest {\n IncomingVerificationState.Step.Initial(\n deviceDisplayName = \"a device name\",\n deviceId = A_DEVICE_ID,\n- formattedSignInTime = A_FORMATTED_DATE,\n+ formattedSignInTime = \"567 TimeOrDate false\",\n isWaiting = false,\n )\n )\n@@ -119,7 +118,7 @@ class IncomingVerificationPresenterTest {\n IncomingVerificationState.Step.Initial(\n deviceDisplayName = \"a device name\",\n deviceId = A_DEVICE_ID,\n- formattedSignInTime = A_FORMATTED_DATE,\n+ formattedSignInTime = \"567 TimeOrDate false\",\n isWaiting = false,\n )\n )\n@@ -178,7 +177,7 @@ class IncomingVerificationPresenterTest {\n IncomingVerificationState.Step.Initial(\n deviceDisplayName = \"a device name\",\n deviceId = A_DEVICE_ID,\n- formattedSignInTime = A_FORMATTED_DATE,\n+ formattedSignInTime = \"567 TimeOrDate false\",\n isWaiting = false,\n )\n )\n@@ -210,7 +209,7 @@ class IncomingVerificationPresenterTest {\n IncomingVerificationState.Step.Initial(\n deviceDisplayName = \"a device name\",\n deviceId = A_DEVICE_ID,\n- formattedSignInTime = A_FORMATTED_DATE,\n+ formattedSignInTime = \"567 TimeOrDate false\",\n isWaiting = false,\n )\n )\n@@ -281,7 +280,7 @@ class IncomingVerificationPresenterTest {\n sessionVerificationRequestDetails: SessionVerificationRequestDetails = aSessionVerificationRequestDetails,\n navigator: IncomingVerificationNavigator = IncomingVerificationNavigator { lambdaError() },\n service: SessionVerificationService = FakeSessionVerificationService(),\n- dateFormatter: LastMessageTimestampFormatter = FakeLastMessageTimestampFormatter(A_FORMATTED_DATE),\n+ dateFormatter: DateFormatter = FakeDateFormatter(),\n ) = IncomingVerificationPresenter(\n sessionVerificationRequestDetails = sessionVerificationRequestDetails,\n navigator = navigator,\ndiff --git a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterFrTest.kt b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterFrTest.kt\nnew file mode 100644\nindex 00000000000..8dd0c61d9fb\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterFrTest.kt\n@@ -0,0 +1,260 @@\n+/*\n+ * Copyright 2023, 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.impl\n+\n+import androidx.test.ext.junit.runners.AndroidJUnit4\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.dateformatter.api.DateFormatterMode\n+import kotlinx.datetime.Instant\n+import org.junit.Test\n+import org.junit.runner.RunWith\n+import org.robolectric.annotation.Config\n+\n+@RunWith(AndroidJUnit4::class)\n+@Config(qualifiers = \"fr\")\n+class DefaultDateFormatterFrTest {\n+ @Test\n+ fun `test null`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val ts: Long? = null\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts)).isEmpty()\n+ }\n+\n+ @Test\n+ fun `test epoch`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val ts = 0L\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"1 janvier 1970 \u00e0 00:00\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"Janvier 1970\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"1 janvier 1970\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"01.01.1970\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"00:00\")\n+ }\n+\n+ @Test\n+ fun `test epoch relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val ts = 0L\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"1 janvier 1970 \u00e0 00:00\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"Janvier 1970\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"1 janvier 1970\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"01.01.1970\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"00:00\")\n+ }\n+\n+ @Test\n+ fun `test now`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-06T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"6 avril 1980 \u00e0 18:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"Avril 1980\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"Dimanche 6 avril\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"18:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"18:35\")\n+ }\n+\n+ @Test\n+ fun `test now relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-06T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"18:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"Ce mois-ci\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"Aujourd\u2019hui\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"18:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"18:35\")\n+ }\n+\n+ @Test\n+ fun `test one second before`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-06T18:35:23.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"6 avril 1980 \u00e0 18:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"Avril 1980\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"Dimanche 6 avril\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"18:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"18:35\")\n+ }\n+\n+ @Test\n+ fun `test one second before relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-06T18:35:23.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"18:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"Ce mois-ci\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"Aujourd\u2019hui\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"18:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"18:35\")\n+ }\n+\n+ @Test\n+ fun `test one minute before`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-06T18:34:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"6 avril 1980 \u00e0 18:34\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"Avril 1980\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"Dimanche 6 avril\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"18:34\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"18:34\")\n+ }\n+\n+ @Test\n+ fun `test one minute before relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-06T18:34:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"18:34\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"Ce mois-ci\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"Aujourd\u2019hui\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"18:34\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"18:34\")\n+ }\n+\n+ @Test\n+ fun `test one hour before`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-06T17:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"6 avril 1980 \u00e0 17:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"Avril 1980\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"Dimanche 6 avril\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"17:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"17:35\")\n+ }\n+\n+ @Test\n+ fun `test one hour before relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-06T17:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"17:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"Ce mois-ci\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"Aujourd\u2019hui\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"17:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"17:35\")\n+ }\n+\n+ @Test\n+ fun `test one day before same time`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-05T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"5 avril 1980 \u00e0 18:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"Avril 1980\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"Samedi 5 avril\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"5 avr.\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"18:35\")\n+ }\n+\n+ @Test\n+ fun `test one day before same time relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-05T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"Hier \u00e0 18:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"Ce mois-ci\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"Hier\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"Hier\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"18:35\")\n+ }\n+\n+ @Test\n+ fun `test two days before same time`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-04T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"4 avril 1980 \u00e0 18:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"Avril 1980\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"Vendredi 4 avril\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"4 avr.\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"18:35\")\n+ }\n+\n+ @Test\n+ fun `test two days before same time relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-04T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"Vendredi \u00e0 18:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"Ce mois-ci\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"Vendredi\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"4 avr.\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"18:35\")\n+ }\n+\n+ @Test\n+ fun `test one month before same time`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-03-06T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"6 mars 1980 \u00e0 18:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"Mars 1980\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"Jeudi 6 mars\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"6 mars\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"18:35\")\n+ }\n+\n+ @Test\n+ fun `test one month before same time relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-03-06T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"Jeudi 6 mars \u00e0 18:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"Mars 1980\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"Jeudi 6 mars\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"6 mars\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"18:35\")\n+ }\n+\n+ @Test\n+ fun `test one year before same time`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1979-04-06T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"6 avril 1979 \u00e0 18:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"Avril 1979\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"6 avril 1979\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"06.04.1979\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"18:35\")\n+ }\n+\n+ @Test\n+ fun `test one year before same time relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1979-04-06T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"6 avril 1979 \u00e0 18:35\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"Avril 1979\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"6 avril 1979\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"06.04.1979\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"18:35\")\n+ }\n+}\ndiff --git a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterTest.kt b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterTest.kt\nnew file mode 100644\nindex 00000000000..b7bf9d818eb\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterTest.kt\n@@ -0,0 +1,260 @@\n+/*\n+ * Copyright 2023, 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.impl\n+\n+import androidx.test.ext.junit.runners.AndroidJUnit4\n+import com.google.common.truth.Truth.assertThat\n+import io.element.android.libraries.dateformatter.api.DateFormatterMode\n+import kotlinx.datetime.Instant\n+import org.junit.Test\n+import org.junit.runner.RunWith\n+import org.robolectric.annotation.Config\n+\n+@RunWith(AndroidJUnit4::class)\n+@Config(qualifiers = \"en\")\n+class DefaultDateFormatterTest {\n+ @Test\n+ fun `test null`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val ts: Long? = null\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts)).isEmpty()\n+ }\n+\n+ @Test\n+ fun `test epoch`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val ts = 0L\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"January 1, 1970 at 12:00\u202fAM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"January 1970\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"January 1, 1970\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"01.01.1970\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"12:00\u202fAM\")\n+ }\n+\n+ @Test\n+ fun `test epoch relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val ts = 0L\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"January 1, 1970 at 12:00\u202fAM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"January 1970\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"January 1, 1970\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"01.01.1970\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"12:00\u202fAM\")\n+ }\n+\n+ @Test\n+ fun `test now`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-06T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"April 6, 1980 at 6:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"April 1980\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"Sunday 6 April\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"6:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"6:35\u202fPM\")\n+ }\n+\n+ @Test\n+ fun `test now relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-06T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"6:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"This month\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"Today\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"6:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"6:35\u202fPM\")\n+ }\n+\n+ @Test\n+ fun `test one second before`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-06T18:35:23.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"April 6, 1980 at 6:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"April 1980\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"Sunday 6 April\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"6:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"6:35\u202fPM\")\n+ }\n+\n+ @Test\n+ fun `test one second before relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-06T18:35:23.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"6:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"This month\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"Today\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"6:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"6:35\u202fPM\")\n+ }\n+\n+ @Test\n+ fun `test one minute before`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-06T18:34:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"April 6, 1980 at 6:34\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"April 1980\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"Sunday 6 April\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"6:34\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"6:34\u202fPM\")\n+ }\n+\n+ @Test\n+ fun `test one minute before relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-06T18:34:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"6:34\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"This month\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"Today\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"6:34\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"6:34\u202fPM\")\n+ }\n+\n+ @Test\n+ fun `test one hour before`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-06T17:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"April 6, 1980 at 5:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"April 1980\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"Sunday 6 April\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"5:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"5:35\u202fPM\")\n+ }\n+\n+ @Test\n+ fun `test one hour before relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-06T17:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"5:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"This month\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"Today\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"5:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"5:35\u202fPM\")\n+ }\n+\n+ @Test\n+ fun `test one day before same time`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-05T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"April 5, 1980 at 6:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"April 1980\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"Saturday 5 April\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"5 Apr\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"6:35\u202fPM\")\n+ }\n+\n+ @Test\n+ fun `test one day before same time relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-05T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"Yesterday at 6:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"This month\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"Yesterday\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"Yesterday\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"6:35\u202fPM\")\n+ }\n+\n+ @Test\n+ fun `test two days before same time`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-04T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"April 4, 1980 at 6:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"April 1980\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"Friday 4 April\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"4 Apr\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"6:35\u202fPM\")\n+ }\n+\n+ @Test\n+ fun `test two days before same time relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-04-04T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"Friday at 6:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"This month\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"Friday\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"4 Apr\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"6:35\u202fPM\")\n+ }\n+\n+ @Test\n+ fun `test one month before same time`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-03-06T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"March 6, 1980 at 6:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"March 1980\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"Thursday 6 March\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"6 Mar\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"6:35\u202fPM\")\n+ }\n+\n+ @Test\n+ fun `test one month before same time relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1980-03-06T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"Thursday 6 March at 6:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"March 1980\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"Thursday 6 March\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"6 Mar\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"6:35\u202fPM\")\n+ }\n+\n+ @Test\n+ fun `test one year before same time`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1979-04-06T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo(\"April 6, 1979 at 6:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo(\"April 1979\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo(\"April 6, 1979\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo(\"06.04.1979\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo(\"6:35\u202fPM\")\n+ }\n+\n+ @Test\n+ fun `test one year before same time relative`() {\n+ val now = \"1980-04-06T18:35:24.00Z\"\n+ val dat = \"1979-04-06T18:35:24.00Z\"\n+ val ts = Instant.parse(dat).toEpochMilliseconds()\n+ val formatter = createFormatter(now)\n+ assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo(\"April 6, 1979 at 6:35\u202fPM\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo(\"April 1979\")\n+ assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo(\"April 6, 1979\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo(\"06.04.1979\")\n+ assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo(\"6:35\u202fPM\")\n+ }\n+}\ndiff --git a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultLastMessageTimestampFormatterTest.kt b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultLastMessageTimestampFormatterTest.kt\ndeleted file mode 100644\nindex 5c8de4462b1..00000000000\n--- a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultLastMessageTimestampFormatterTest.kt\n+++ /dev/null\n@@ -1,109 +0,0 @@\n-/*\n- * Copyright 2023, 2024 New Vector Ltd.\n- *\n- * SPDX-License-Identifier: AGPL-3.0-only\n- * Please see LICENSE in the repository root for full details.\n- */\n-\n-package io.element.android.libraries.dateformatter.impl\n-\n-import com.google.common.truth.Truth.assertThat\n-import io.element.android.libraries.dateformatter.api.LastMessageTimestampFormatter\n-import io.element.android.libraries.dateformatter.test.FakeClock\n-import kotlinx.datetime.Instant\n-import kotlinx.datetime.TimeZone\n-import kotlinx.datetime.toLocalDateTime\n-import org.junit.Test\n-import java.util.Locale\n-\n-class DefaultLastMessageTimestampFormatterTest {\n- @Test\n- fun `test null`() {\n- val now = \"1980-04-06T18:35:24.00Z\"\n- val formatter = createFormatter(now)\n- assertThat(formatter.format(null)).isEmpty()\n- }\n-\n- @Test\n- fun `test epoch`() {\n- val now = \"1980-04-06T18:35:24.00Z\"\n- val formatter = createFormatter(now)\n- assertThat(formatter.format(0)).isEqualTo(\"01.01.1970\")\n- }\n-\n- @Test\n- fun `test now`() {\n- val now = \"1980-04-06T18:35:24.00Z\"\n- val dat = \"1980-04-06T18:35:24.00Z\"\n- val formatter = createFormatter(now)\n- assertThat(formatter.format(Instant.parse(dat).toEpochMilliseconds())).isEqualTo(\"6:35\u202fPM\")\n- }\n-\n- @Test\n- fun `test one second before`() {\n- val now = \"1980-04-06T18:35:24.00Z\"\n- val dat = \"1980-04-06T18:35:23.00Z\"\n- val formatter = createFormatter(now)\n- assertThat(formatter.format(Instant.parse(dat).toEpochMilliseconds())).isEqualTo(\"6:35\u202fPM\")\n- }\n-\n- @Test\n- fun `test one minute before`() {\n- val now = \"1980-04-06T18:35:24.00Z\"\n- val dat = \"1980-04-06T18:34:24.00Z\"\n- val formatter = createFormatter(now)\n- assertThat(formatter.format(Instant.parse(dat).toEpochMilliseconds())).isEqualTo(\"6:34\u202fPM\")\n- }\n-\n- @Test\n- fun `test one hour before`() {\n- val now = \"1980-04-06T18:35:24.00Z\"\n- val dat = \"1980-04-06T17:35:24.00Z\"\n- val formatter = createFormatter(now)\n- assertThat(formatter.format(Instant.parse(dat).toEpochMilliseconds())).isEqualTo(\"5:35\u202fPM\")\n- }\n-\n- @Test\n- fun `test one day before same time`() {\n- val now = \"1980-04-06T18:35:24.00Z\"\n- val dat = \"1980-04-05T18:35:24.00Z\"\n- val formatter = createFormatter(now)\n- // TODO DateUtils.getRelativeTimeSpanString returns null.\n- assertThat(formatter.format(Instant.parse(dat).toEpochMilliseconds())).isEqualTo(\"\")\n- }\n-\n- @Test\n- fun `test one month before same time`() {\n- val now = \"1980-04-06T18:35:24.00Z\"\n- val dat = \"1980-03-06T18:35:24.00Z\"\n- val formatter = createFormatter(now)\n- assertThat(formatter.format(Instant.parse(dat).toEpochMilliseconds())).isEqualTo(\"6 Mar\")\n- }\n-\n- @Test\n- fun `test one year before same time`() {\n- val now = \"1980-04-06T18:35:24.00Z\"\n- val dat = \"1979-04-06T18:35:24.00Z\"\n- val formatter = createFormatter(now)\n- assertThat(formatter.format(Instant.parse(dat).toEpochMilliseconds())).isEqualTo(\"06.04.1979\")\n- }\n-\n- @Test\n- fun `test full format`() {\n- val now = \"1980-04-06T18:35:24.00Z\"\n- val dat = \"1979-04-06T18:35:24.00Z\"\n- val clock = FakeClock().apply { givenInstant(Instant.parse(now)) }\n- val dateFormatters = DateFormatters(Locale.US, clock) { TimeZone.UTC }\n- assertThat(dateFormatters.formatDateWithFullFormat(Instant.parse(dat).toLocalDateTime(TimeZone.UTC))).isEqualTo(\"Friday, April 6, 1979\")\n- }\n-\n- /**\n- * Create DefaultLastMessageFormatter and set current time to the provided date.\n- */\n- private fun createFormatter(@Suppress(\"SameParameterValue\") currentDate: String): LastMessageTimestampFormatter {\n- val clock = FakeClock().apply { givenInstant(Instant.parse(currentDate)) }\n- val localDateTimeProvider = LocalDateTimeProvider(clock) { TimeZone.UTC }\n- val dateFormatters = DateFormatters(Locale.US, clock) { TimeZone.UTC }\n- return DefaultLastMessageTimestampFormatter(localDateTimeProvider, dateFormatters)\n- }\n-}\ndiff --git a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/Factory.kt b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/Factory.kt\nnew file mode 100644\nindex 00000000000..dd1572fde67\n--- /dev/null\n+++ b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/Factory.kt\n@@ -0,0 +1,54 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.impl\n+\n+import io.element.android.tests.testutils.InstrumentationStringProvider\n+import kotlinx.datetime.Instant\n+import kotlinx.datetime.TimeZone\n+import java.util.Locale\n+\n+/**\n+ * Create DefaultDateFormatter and set current time to the provided date.\n+ */\n+fun createFormatter(currentDate: String): DefaultDateFormatter {\n+ val clock = FakeClock().apply { givenInstant(Instant.parse(currentDate)) }\n+ val localDateTimeProvider = LocalDateTimeProvider(clock) { TimeZone.UTC }\n+ val dateFormatters = DateFormatters(\n+ localeChangeObserver = {},\n+ clock = clock,\n+ timeZoneProvider = { TimeZone.UTC },\n+ locale = Locale.getDefault(),\n+ )\n+ val stringProvider = InstrumentationStringProvider()\n+ val dateFormatterDay = DefaultDateFormatterDay(\n+ localDateTimeProvider = localDateTimeProvider,\n+ dateFormatters = dateFormatters,\n+ )\n+ return DefaultDateFormatter(\n+ dateFormatterFull = DateFormatterFull(\n+ stringProvider = stringProvider,\n+ localDateTimeProvider = localDateTimeProvider,\n+ dateFormatters = dateFormatters,\n+ dateFormatterDay = dateFormatterDay,\n+ ),\n+ dateFormatterMonth = DateFormatterMonth(\n+ stringProvider = stringProvider,\n+ localDateTimeProvider = localDateTimeProvider,\n+ dateFormatters = dateFormatters,\n+ ),\n+ dateFormatterDay = dateFormatterDay,\n+ dateFormatterTime = DateFormatterTime(\n+ localDateTimeProvider = localDateTimeProvider,\n+ dateFormatters = dateFormatters,\n+ ),\n+ dateFormatterTimeOnly = DateFormatterTimeOnly(\n+ localDateTimeProvider = localDateTimeProvider,\n+ dateFormatters = dateFormatters,\n+ ),\n+ )\n+}\ndiff --git a/libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeClock.kt b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/FakeClock.kt\nsimilarity index 88%\nrename from libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeClock.kt\nrename to libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/FakeClock.kt\nindex 79e0eda10ff..c6bdbec73f4 100644\n--- a/libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeClock.kt\n+++ b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/FakeClock.kt\n@@ -5,7 +5,7 @@\n * Please see LICENSE in the repository root for full details.\n */\n \n-package io.element.android.libraries.dateformatter.test\n+package io.element.android.libraries.dateformatter.impl\n \n import kotlinx.datetime.Clock\n import kotlinx.datetime.Instant\ndiff --git a/libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeDateFormatter.kt b/libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeDateFormatter.kt\nnew file mode 100644\nindex 00000000000..722e43f2c90\n--- /dev/null\n+++ b/libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeDateFormatter.kt\n@@ -0,0 +1,25 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.dateformatter.test\n+\n+import io.element.android.libraries.dateformatter.api.DateFormatter\n+import io.element.android.libraries.dateformatter.api.DateFormatterMode\n+\n+class FakeDateFormatter(\n+ private val formatLambda: (Long?, DateFormatterMode, Boolean) -> String = { timestamp, mode, useRelative ->\n+ \"$timestamp $mode $useRelative\"\n+ },\n+) : DateFormatter {\n+ override fun format(\n+ timestamp: Long?,\n+ mode: DateFormatterMode,\n+ useRelative: Boolean,\n+ ): String {\n+ return formatLambda(timestamp, mode, useRelative)\n+ }\n+}\ndiff --git a/libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeDaySeparatorFormatter.kt b/libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeDaySeparatorFormatter.kt\ndeleted file mode 100644\nindex 529d8848098..00000000000\n--- a/libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeDaySeparatorFormatter.kt\n+++ /dev/null\n@@ -1,22 +0,0 @@\n-/*\n- * Copyright 2023, 2024 New Vector Ltd.\n- *\n- * SPDX-License-Identifier: AGPL-3.0-only\n- * Please see LICENSE in the repository root for full details.\n- */\n-\n-package io.element.android.libraries.dateformatter.test\n-\n-import io.element.android.libraries.dateformatter.api.DaySeparatorFormatter\n-\n-class FakeDaySeparatorFormatter : DaySeparatorFormatter {\n- private var format = \"\"\n-\n- fun givenFormat(format: String) {\n- this.format = format\n- }\n-\n- override fun format(timestamp: Long): String {\n- return format\n- }\n-}\ndiff --git a/libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeLastMessageTimestampFormatter.kt b/libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeLastMessageTimestampFormatter.kt\ndeleted file mode 100644\nindex 7edcf321cbe..00000000000\n--- a/libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeLastMessageTimestampFormatter.kt\n+++ /dev/null\n@@ -1,24 +0,0 @@\n-/*\n- * Copyright 2023, 2024 New Vector Ltd.\n- *\n- * SPDX-License-Identifier: AGPL-3.0-only\n- * Please see LICENSE in the repository root for full details.\n- */\n-\n-package io.element.android.libraries.dateformatter.test\n-\n-import io.element.android.libraries.dateformatter.api.LastMessageTimestampFormatter\n-\n-const val A_FORMATTED_DATE = \"formatted_date\"\n-\n-class FakeLastMessageTimestampFormatter(\n- var format: String = \"\",\n-) : LastMessageTimestampFormatter {\n- fun givenFormat(format: String) {\n- this.format = format\n- }\n-\n- override fun format(timestamp: Long?): String {\n- return format\n- }\n-}\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/DefaultEventItemFactoryTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/DefaultEventItemFactoryTest.kt\nindex 3dde8176b44..36b767e870b 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/DefaultEventItemFactoryTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/DefaultEventItemFactoryTest.kt\n@@ -10,8 +10,7 @@ package io.element.android.libraries.mediaviewer.impl.gallery\n import com.google.common.truth.Truth.assertThat\n import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter\n import io.element.android.libraries.core.mimetype.MimeTypes\n-import io.element.android.libraries.dateformatter.test.A_FORMATTED_DATE\n-import io.element.android.libraries.dateformatter.test.FakeLastMessageTimestampFormatter\n+import io.element.android.libraries.dateformatter.test.FakeDateFormatter\n import io.element.android.libraries.matrix.api.media.AudioDetails\n import io.element.android.libraries.matrix.api.media.AudioInfo\n import io.element.android.libraries.matrix.api.media.FileInfo\n@@ -162,7 +161,8 @@ class DefaultEventItemFactoryTest {\n senderId = A_USER_ID,\n senderName = \"alice\",\n senderAvatar = null,\n- dateSent = A_FORMATTED_DATE,\n+ dateSent = \"0 Day false\",\n+ dateSentFull = \"0 Full false\",\n ),\n mediaSource = MediaSource(\"\"),\n )\n@@ -209,7 +209,8 @@ class DefaultEventItemFactoryTest {\n senderId = A_USER_ID,\n senderName = \"alice\",\n senderAvatar = null,\n- dateSent = A_FORMATTED_DATE,\n+ dateSent = \"0 Day false\",\n+ dateSentFull = \"0 Full false\",\n ),\n mediaSource = MediaSource(\"\"),\n thumbnailSource = null,\n@@ -253,7 +254,8 @@ class DefaultEventItemFactoryTest {\n senderId = A_USER_ID,\n senderName = \"alice\",\n senderAvatar = null,\n- dateSent = A_FORMATTED_DATE,\n+ dateSent = \"0 Day false\",\n+ dateSentFull = \"0 Full false\",\n ),\n mediaSource = MediaSource(\"\"),\n )\n@@ -301,7 +303,8 @@ class DefaultEventItemFactoryTest {\n senderId = A_USER_ID,\n senderName = \"alice\",\n senderAvatar = null,\n- dateSent = A_FORMATTED_DATE,\n+ dateSent = \"0 Day false\",\n+ dateSentFull = \"0 Full false\",\n ),\n mediaSource = MediaSource(\"\"),\n thumbnailSource = null,\n@@ -350,7 +353,8 @@ class DefaultEventItemFactoryTest {\n senderId = A_USER_ID,\n senderName = \"alice\",\n senderAvatar = null,\n- dateSent = A_FORMATTED_DATE,\n+ dateSent = \"0 Day false\",\n+ dateSentFull = \"0 Full false\",\n ),\n mediaSource = MediaSource(\"\"),\n )\n@@ -397,7 +401,8 @@ class DefaultEventItemFactoryTest {\n senderId = A_USER_ID,\n senderName = \"alice\",\n senderAvatar = null,\n- dateSent = A_FORMATTED_DATE,\n+ dateSent = \"0 Day false\",\n+ dateSentFull = \"0 Full false\",\n ),\n mediaSource = MediaSource(\"\"),\n thumbnailSource = null,\n@@ -409,5 +414,5 @@ class DefaultEventItemFactoryTest {\n private fun createEventItemFactory() = EventItemFactory(\n fileSizeFormatter = FakeFileSizeFormatter(),\n fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),\n- lastMessageTimestampFormatter = FakeLastMessageTimestampFormatter(A_FORMATTED_DATE),\n+ dateFormatter = FakeDateFormatter(),\n )\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt\nindex 4aeada87010..8eeaef976c6 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt\n@@ -10,9 +10,7 @@ package io.element.android.libraries.mediaviewer.impl.gallery\n import android.net.Uri\n import com.google.common.truth.Truth.assertThat\n import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter\n-import io.element.android.libraries.dateformatter.test.A_FORMATTED_DATE\n-import io.element.android.libraries.dateformatter.test.FakeDaySeparatorFormatter\n-import io.element.android.libraries.dateformatter.test.FakeLastMessageTimestampFormatter\n+import io.element.android.libraries.dateformatter.test.FakeDateFormatter\n import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.room.MatrixRoom\n@@ -254,12 +252,12 @@ class MediaGalleryPresenterTest {\n timelineMediaItemsFactory = TimelineMediaItemsFactory(\n dispatchers = testCoroutineDispatchers(),\n virtualItemFactory = VirtualItemFactory(\n- daySeparatorFormatter = FakeDaySeparatorFormatter(),\n+ dateFormatter = FakeDateFormatter(),\n ),\n eventItemFactory = EventItemFactory(\n fileSizeFormatter = FakeFileSizeFormatter(),\n fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),\n- lastMessageTimestampFormatter = FakeLastMessageTimestampFormatter(A_FORMATTED_DATE),\n+ dateFormatter = FakeDateFormatter(),\n ),\n ),\n localMediaFactory = localMediaFactory,\ndiff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactoryTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactoryTest.kt\nindex f60c43572e4..d1f0f745f80 100644\n--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactoryTest.kt\n+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactoryTest.kt\n@@ -27,11 +27,15 @@ class AndroidLocalMediaFactoryTest {\n @Test\n fun `test AndroidLocalMediaFactory`() {\n val sut = createAndroidLocalMediaFactory()\n- val result = sut.createFromMediaFile(aMediaFile(), anImageMediaInfo(\n- senderId = A_USER_ID,\n- senderName = A_USER_NAME,\n- dateSent = \"12:34\",\n- ))\n+ val result = sut.createFromMediaFile(\n+ mediaFile = aMediaFile(),\n+ mediaInfo = anImageMediaInfo(\n+ senderId = A_USER_ID,\n+ senderName = A_USER_NAME,\n+ dateSent = \"12:34\",\n+ dateSentFull = \"full\",\n+ )\n+ )\n assertThat(result.uri.toString()).endsWith(\"aPath\")\n assertThat(result.info).isEqualTo(\n MediaInfo(\n@@ -43,7 +47,8 @@ class AndroidLocalMediaFactoryTest {\n senderId = A_USER_ID,\n senderName = A_USER_NAME,\n senderAvatar = null,\n- dateSent = \"12:34\"\n+ dateSent = \"12:34\",\n+ dateSentFull = \"full\"\n )\n )\n }\ndiff --git a/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaFactory.kt b/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaFactory.kt\nindex c41435afc0f..39014f90cbf 100644\n--- a/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaFactory.kt\n+++ b/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaFactory.kt\n@@ -40,7 +40,8 @@ class FakeLocalMediaFactory(\n senderId = null,\n senderName = null,\n senderAvatar = null,\n- dateSent = null\n+ dateSent = null,\n+ dateSentFull = null,\n )\n return aLocalMedia(uri, mediaInfo)\n }\ndiff --git a/tests/testutils/build.gradle.kts b/tests/testutils/build.gradle.kts\nindex ce9698ab3e3..7d9fa12efcf 100644\n--- a/tests/testutils/build.gradle.kts\n+++ b/tests/testutils/build.gradle.kts\n@@ -24,6 +24,7 @@ dependencies {\n implementation(projects.libraries.architecture)\n implementation(projects.libraries.core)\n implementation(projects.libraries.uiStrings)\n+ implementation(projects.services.toolbox.api)\n implementation(libs.test.turbine)\n implementation(libs.molecule.runtime)\n implementation(libs.androidx.compose.ui.test.junit)\ndiff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/InstrumentationStringProvider.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/InstrumentationStringProvider.kt\nnew file mode 100644\nindex 00000000000..fa60e497cdc\n--- /dev/null\n+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/InstrumentationStringProvider.kt\n@@ -0,0 +1,26 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.tests.testutils\n+\n+import androidx.test.platform.app.InstrumentationRegistry\n+import io.element.android.services.toolbox.api.strings.StringProvider\n+\n+class InstrumentationStringProvider : StringProvider {\n+ private val resource = InstrumentationRegistry.getInstrumentation().context.resources\n+ override fun getString(resId: Int): String {\n+ return resource.getString(resId)\n+ }\n+\n+ override fun getString(resId: Int, vararg formatArgs: Any?): String {\n+ return resource.getString(resId, *formatArgs)\n+ }\n+\n+ override fun getQuantityString(resId: Int, quantity: Int, vararg formatArgs: Any?): String {\n+ return resource.getQuantityString(resId, quantity, *formatArgs)\n+ }\n+}\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_10_en.png\nindex 0e0342e192a..223d7869b6f 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_10_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_10_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:e67a540966100272311381e87011149cdb15c8191a6f2bbc40d1febff999c431\n-size 24067\n+oid sha256:dbef9e8e887fa493ca9b875e64dc164bf35dd84ad25b84a1ad9b6fd523b26c38\n+size 27280\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_11_en.png\nindex f500ff60dd2..cc268a914fe 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_11_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_11_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:65023f7233f112547ccd0850c321b2d6610cfb6a1371c494f68722e75874f871\n-size 45915\n+oid sha256:c1a0bc9c83b7e01f9492443433781509c0d899b397652fc7e9b7a539d8ce0412\n+size 48219\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_12_en.png\nindex c80b8639e0b..d2eec8525c3 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_12_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_12_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:e2c2e01bd133c7b84e381141b6baf22783cb585cb3af9f790785dbf8aeaeeed6\n-size 47644\n+oid sha256:3a624587095825c971186288a0ad5a40ddfcadc8f4b9f92b1102d8ae20ca3bda\n+size 49821\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_2_en.png\nindex 4088be4e1e2..392c35230c9 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_2_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_2_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:9bd6fb63059cebc7dc7b850b5aa73549ab9846eda68b1b6d9a4f8e0716d42c3c\n-size 40419\n+oid sha256:4cdcc38bfae43298654c3e09d7ab1ca1e0d2fd32157a464539a360f3943f4f75\n+size 42839\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_3_en.png\nindex b3dbf77d1d2..89efb1c866a 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_3_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_3_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:6b4e4a075bcb4b95455c27ce2e5f9f1bdac4a1aca22ad944dd53fdbaeb6ca970\n-size 44550\n+oid sha256:a56b3e488ceecd0bfb763d60b6827f7d8c460fa198d380a502ff0d97b13c9bc0\n+size 45962\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_4_en.png\nindex 87c07faab3c..496cf3053bc 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_4_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_4_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:1a2bc7e9098301d17e72a61a7baf01e52aa11566e1da4ffe3b43a66fa37652b2\n-size 42103\n+oid sha256:600f28097c6ef8c54fe136d9bb05b8b800d693bff23f238a4e3e0216ee9918ff\n+size 44404\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_5_en.png\nindex 25da7b8bf1f..834430dfb36 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_5_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_5_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:f097af2773ff2ecf70a69e4292dc118b4c8616f1c8f979e7d121e86a16ef3072\n-size 38506\n+oid sha256:054cfe9290f91cf0f5d17e8f7c49e71eb50a2bb17067b1edc3c29f89410f76e8\n+size 40806\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_6_en.png\nindex 2bf210d5907..f082532ffd9 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_6_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_6_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:8f49870a5333cbaf1c6c3ac5ddcb85290d04efc79ffec93d8dc39b59f9712820\n-size 42391\n+oid sha256:814bb524af65d077e3610e8cb920e5207aa808111a530357e8687831bd9c0413\n+size 44687\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_7_en.png\nindex 6de43e00eed..6db122607cc 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_7_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_7_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:883f160afa3fc3d2c0be5098205ea616875084ee0f122ebf994d0fee53a8ecd1\n-size 39847\n+oid sha256:4da93eb0b9fcea861ae80d6e14bc852acaacea52402b1b41e8c982b9c06b2b63\n+size 42105\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_8_en.png\nindex cf03f3c12f4..358a9d9a81a 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_8_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_8_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:7790c892daeee8910ce17caac2c957d09fffec0d41a51b3adc1d5bef8dcee1a1\n-size 42261\n+oid sha256:4886407cfe23d5d16aadeef4226698957dad99dfc4d9ac5c184fe64347b3ee41\n+size 44524\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_9_en.png\nindex 63da19cb016..4de11299786 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_9_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_9_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:bc7b733680a0d86ee1231345e58641fb3a208da21de62a50f624d9ae04c6e140\n-size 31661\n+oid sha256:3c0d8491dbf0b6f50ae6be5c7aaf0d77b9eaa3a31e7763f120d6e08993c1c74b\n+size 34028\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_10_en.png\nindex 7e43e760b28..65a49cb609a 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_10_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_10_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:20504466241e36817557812f6b378aceab9c2e271a596bd3d037c6be41af7c54\n-size 23624\n+oid sha256:64a6d1a6af14176c933387a7a36de0d7392b1cd31cb04fcc5c6a282317874aac\n+size 26597\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_11_en.png\nindex 1667fe5ff02..89e23b04441 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_11_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_11_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:48028e4c3ca7e9b871683165f029430bcd4e0fc2411e4ffc83a93abb641d96a2\n-size 45132\n+oid sha256:f92ebc24de4dd34b84fcbbcc656a369d4a79bca160666c2fd4d32b5516c2f8fb\n+size 47245\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_12_en.png\nindex e44f3240152..6e575e21c5e 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_12_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_12_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:b040fe47521f5d9d76d7892412bb2b5cf7e2b93b951f5de5f772503797fb6b24\n-size 46548\n+oid sha256:2a4a3730a941a4c6863c116b401ea7e4d5c2cef3fe4098e353954c4f93aa660a\n+size 48771\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_2_en.png\nindex 5797dc53458..053b3255570 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_2_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_2_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:6db046a97f14f2df3db2415d71a02ffd6e706fe73def67c21f0d844be279da59\n-size 39617\n+oid sha256:77521de94c04228ca0fb5d09cb7809527cf0dc0acc52a271a8fa4738a752aa66\n+size 42028\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_3_en.png\nindex 9b837817e6f..a3c9b39e278 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_3_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_3_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:7ee53243923d7b5adcc2094d3fe6bb87be00a179cae11966dcb230f2c3e8246e\n-size 43681\n+oid sha256:171ef67bdc5a1b6d921ecbdb13e3c79dfab073d7289862181a69515e6063c4c5\n+size 45246\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_4_en.png\nindex 6d0c2a905bf..1374a97dd7b 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_4_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_4_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:b88e54ba4743e1e245b5a4c7d6b4045f816241f6cfc8716b8cede0b62666222b\n-size 41286\n+oid sha256:1a8328afeab339104a83db16d7b4b894c060ff7e80c2b5c4d6ec64d3bc4cdc3a\n+size 43613\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_5_en.png\nindex c479ebef749..6f45705e5ee 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_5_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_5_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:d88b4d82bb0d416aff7b32647479181ac9702c36c08370e7671d6e5ef80687c7\n-size 37825\n+oid sha256:d575d08141bf446de510162f5dc1e04fccf4831649495bdf94945bd8957768a6\n+size 40201\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_6_en.png\nindex 885d6afaedd..59e4356eb22 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_6_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_6_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:b3d4dd1766a3f46acd86bdd5ec920c56a5e5f897c81c1477df10ba59dcd3d5b7\n-size 41554\n+oid sha256:606379fcb517afa4583ac03fcb2af4f5649a7fc064df841f442c19f5a71f629b\n+size 43863\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_7_en.png\nindex 13b4a76016a..8225529b528 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_7_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_7_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:842fbea74e53c8804fd0a3e9fe96dcb21b5c91a099e1de33d8ec983fd9a8a80a\n-size 39112\n+oid sha256:d63dec242ea479beb9a7bf0a58c6f31e2bba84df0a7db51fb07ea46612944d9a\n+size 41355\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_8_en.png\nindex 18e022f292c..26f908facc0 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_8_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_8_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:1311ec5e008b44d81e6556164f780c57dea3e4721cc47caccdbf337dd4027eb7\n-size 41402\n+oid sha256:f5421b7b5ce8441213b1323b4cd88c2f5aff6689ecd091b5be581fe5690cd611\n+size 43685\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_9_en.png\nindex 99c6f765a55..0e328d07400 100644\n--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_9_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_9_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:d2cf27d2f053f33c67d944a8f45e0206165b2db2f3b959eb9e0bb943f84fe6a1\n-size 30657\n+oid sha256:e1f4600552aebd3a567251a85105a423882942b23e96f7958238a9b5ba0bb8fc\n+size 33137\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.dateformatter.impl.previews_DateFormatterModeView_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.dateformatter.impl.previews_DateFormatterModeView_0_en.png\nnew file mode 100644\nindex 00000000000..7c2a059e7ca\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/libraries.dateformatter.impl.previews_DateFormatterModeView_0_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:d0506879a20bd64cb3a4ea41c93dfa78da1ca3b0c2728ce3044caa56f6648584\n+size 105611\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.dateformatter.impl.previews_DateFormatterModeView_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.dateformatter.impl.previews_DateFormatterModeView_1_en.png\nnew file mode 100644\nindex 00000000000..160c9d66fd9\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/libraries.dateformatter.impl.previews_DateFormatterModeView_1_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:2e78aa3521464a53c000298dbd4ef51d4d0ea1d3c75b7bb8dcbd933701bab36b\n+size 84060\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.dateformatter.impl.previews_DateFormatterModeView_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.dateformatter.impl.previews_DateFormatterModeView_2_en.png\nnew file mode 100644\nindex 00000000000..36a6b1bf7ac\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/libraries.dateformatter.impl.previews_DateFormatterModeView_2_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:f9eec4fc7e72588f957cd7d741e29b8eaed71555fc0d66c43e6ae69cc64b924c\n+size 87650\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.dateformatter.impl.previews_DateFormatterModeView_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.dateformatter.impl.previews_DateFormatterModeView_3_en.png\nnew file mode 100644\nindex 00000000000..ef7b68df390\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/libraries.dateformatter.impl.previews_DateFormatterModeView_3_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:d4ae4608296b5bb24c128572cc6b80379a9e3cd12ec89db9693c301e427f6ae5\n+size 82330\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.dateformatter.impl.previews_DateFormatterModeView_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.dateformatter.impl.previews_DateFormatterModeView_4_en.png\nnew file mode 100644\nindex 00000000000..7b48600104a\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/libraries.dateformatter.impl.previews_DateFormatterModeView_4_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:e125730c22fcbc843fc0445e0af06d48b7dc31896053b5a7341b6dde84526eb8\n+size 82540\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en.png\nindex 55e944524e6..ceac4aade29 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:4f3557280a4010e7ffdb6f22c11561573780c0b24c27e264073d3a3899169014\n-size 29659\n+oid sha256:2c7ba307cf21056623bf35c8558809fdbc6deaacf4e9365a99ffcf829e8d9188\n+size 34477\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en.png\nindex 33c24c33417..8a0b19ace2d 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:63efb9744640b71cfde672821c7c1ea8b33f9c3c2e2ad4d5f41149b9749b31c2\n-size 28016\n+oid sha256:724bff130c547e7f0065ccb4c1b3319162ded2e6c1c1db666f4e08e01289a5a0\n+size 32776\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en.png\nindex 03b462a778c..319ab0eca48 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:983e505a211c92ae92e091f9ba7cc43a655d5f3ce6d6bcf70971d43984507326\n-size 36153\n+oid sha256:25ebb7460550b31bf2cebfca7bdab32e5f89e327b68f6687bf490e5d14cb9220\n+size 40950\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en.png\nindex 85ef965bae6..8e10c8a8aa9 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:4e7a43195bd617ee952ea084e6b17a7e08e8b3634e8f3ce7df6e98f067ab08dc\n-size 34296\n+oid sha256:39ecc9a50285df492417f5f22adcc391be2dcad0cc388efb756274c83aba077d\n+size 39030\ndiff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_11_en.png\nindex 99618a6ea00..a8777362d7e 100644\n--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_11_en.png\n+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_11_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:8a6916d2441316cb3ef55ee4c6a3b3ba9134d246d72c27aa3871408a6b9e59fc\n-size 30716\n+oid sha256:2d5f183f53f9e8d0dbbae473f2f853f4372dbff15b1d6ea17e78b4770781fa34\n+size 35468\n", "n2p_tests": "{\"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - change mode\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.incoming.IncomingVerificationPresenterTest.present - incoming verification is remotely canceled\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.datasource.RoomListDataSourceTest.when DateTimeObserver gets a time zone change, the room summaries are refreshed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.datasource.RoomListDataSourceTest.when DateTimeObserver gets a date change, the room summaries are refreshed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on room name invoke expected callback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test one minute before relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message and can redact\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message and cannot send reaction\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - initial state\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - when set is favorite event is emitted, then the action is called\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.long clicking on a reaction emits the expected Event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test one hour before\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test null\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on more reaction emits the expected Event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test one second before relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on pinned messages banner emits the expected Event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a state item in non-debuggable build\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test two days before same time relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test two days before same time\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message cannot sent message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test one hour before\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on join call invoke expected callback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on the sender of an Event invoke expected callback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.long clicking on an Event emits the expected Event userHasPermissionToRedactOwn\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test epoch\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on more reaction from action list emits the expected Event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on verified user send failure from action list emits the expected Event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test one month before same time relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest.create for AudioMessageType\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on an Event invoke expected callback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.incoming.IncomingVerificationPresenterTest.present - user goes back when comparing emoji - incoming verification failure\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - UpdateVisibleRange will cancel the previous subscription if called too soon\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest.create for VideoMessageType\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest.create for FileMessageType\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - UpdateVisibleRange subscribes to rooms in visible range\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.model.RoomListRoomSummaryTest.test muted room with unread message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.search.RoomListSearchPresenterTest.present - initial state\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.model.RoomListRoomSummaryTest.test default value\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest.create for ImageMessageType\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test one year before same time\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - should start with no user and then load user with error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for my message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - show avatar indicator\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test one hour before relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a state item in debug build\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.poll.impl.history.PollHistoryPresenterTest.present - change filter scenario\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest.create check all null cases\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test one month before same time\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.selecting a action on a message emits the expected Event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - handle DismissRequestVerificationPrompt\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test two days before same time relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for call notify\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.long clicking on an Event emits the expected Event userHasPermissionToSendReaction\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest.create MessageContent check all null cases\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test epoch relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test one year before same time relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for voice message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for message from me redacted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - bottom sheet state - other message and can delete other\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message with no actions\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test one year before same time relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test one hour before relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test now\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - load 1 room with success\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - delete bottom sheet\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on a read receipt list emits the expected Event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.swiping on an Event emits no Event if user does not have permission to send message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest.create for StickerMessageType\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message when user can't pin\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test now\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.incoming.IncomingVerificationPresenterTest.present - user ignores incoming request\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test one second before relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test null\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test one day before same time relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.model.RoomListRoomSummaryTest.test muted room\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on a custom emoji emits the expected Events\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on send location invoke expected callback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute not sent message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test now relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.long clicking on an Event emits the expected Event userHasPermissionToRedactOther\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - when room service returns no room, then contentState is Empty\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test one day before same time\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test one minute before\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for non-editable poll message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.model.RoomListRoomSummaryTest.when display type is invite then isHighlighted and hasNewContent are true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - initial state\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - check that the room is marked as read with correct RR and as unread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a media with caption item\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on a reaction emits the expected Event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - view in timeline invokes the navigator\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.search.RoomListSearchPresenterTest.present - room list changes\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.model.RoomListRoomSummaryTest.test isMarkedUnread set to true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - hide context menu\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test one month before same time relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for verified user send failure\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test one month before same time\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for editable poll message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message in a thread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.poll.impl.history.PollHistoryPresenterTest.present - poll actions scenario\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.search.RoomListSearchPresenterTest.present - room directory search\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - toggle search menu\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test one minute before relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test one day before same time\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - bottom sheet state - own message and cannot delete own\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - bottom sheet state - other message and cannot delete other\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a media item - caption disabled\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.poll.impl.history.PollHistoryPresenterTest.present - load more scenario\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.incoming.IncomingVerificationPresenterTest.present - nominal case - incoming verification successful\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.swiping on an Event emits the expected Event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for my message cannot redact\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - leave room calls into leave room presenter\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.search.RoomListSearchPresenterTest.present - query search changes\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for ended poll message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test one second before\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test epoch relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.search.RoomListSearchPresenterTest.present - toggle search visibility\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - handle DismissRecoveryKeyPrompt\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a media with caption item - other user event\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message in non-debuggable build\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.poll.impl.history.PollHistoryPresenterTest.present - initial states\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test one second before\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on create poll invoke expected callback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.local.AndroidLocalMediaFactoryTest.test AndroidLocalMediaFactory\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for message from others redacted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - should start with no user and then load user with success\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test two days before same time\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryPresenterTest.present - bottom sheet state - own message and can delete own\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.long clicking on an Event emits the expected Event userHasPermissionToSendMessage\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test epoch\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test now relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - change in notification settings updates the summary for decorations\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message when event is already pinned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test one year before same time\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.mediaviewer.impl.gallery.DefaultEventItemFactoryTest.create for VoiceMessageType\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for my message in a thread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - show context menu\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.RoomListPresenterTest.present - when a room is invited then accept and decline events are sent to acceptDeclinePresenter\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on back invoke expected callback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.roomlist.impl.model.RoomListRoomSummaryTest.test muted room isMarkedUnread set to true\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterTest.test one day before same time relative\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a media item\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.incoming.IncomingVerificationPresenterTest.present - emoji not matching case - incoming verification failure\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.dateformatter.impl.DefaultDateFormatterFrTest.test one minute before\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-3953", "org": "element-hq", "repo": "element-x-android", "number": 3953, "state": "closed", "title": "Add feature flag to temporary disable sending caption by default in production", "body": "Closes #3950\r\n\r\nAndroid friend of https://github.com/element-hq/element-x-ios/pull/3560", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"8d26af5b269d43bb08cd38432b8db80b09a19463\"}", "resolved_issues": "[{\"number\": 3950, \"title\": \"Add feature flag to disable caption sending / adding\", \"body\": \"The legacy applications cannot render captions on the timeline, so we're going to add a temporary disabled feature flag.\\r\\n\\r\\nWhen the flag is off:\\r\\n- [x] hide the caption form on the media preview screen\\r\\n- [x] hide the \\\"Add caption\\\" from the message menu\"}]", "lang": "kotlin", "problem_statement": "Add feature flag to disable caption sending / adding\nThe legacy applications cannot render captions on the timeline, so we're going to add a temporary disabled feature flag.\r\n\r\nWhen the flag is off:\r\n- [x] hide the caption form on the media preview screen\r\n- [x] hide the \"Add caption\" from the message menu\n", "hints": NaN, "pull_url": "https://github.com/element-hq/element-x-android/pull/3953", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/3950\"]", "test_command": "./gradlew :features:messages:impl:testDebugUnitTest --tests \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest\" --tests \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest\"", "fix_patch": "diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt\nindex e228f3eb736..f2b97769c03 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt\n@@ -37,6 +37,8 @@ import io.element.android.features.messages.impl.timeline.model.event.canBeForwa\n import io.element.android.features.messages.impl.timeline.model.event.canReact\n import io.element.android.libraries.architecture.Presenter\n import io.element.android.libraries.di.RoomScope\n+import io.element.android.libraries.featureflag.api.FeatureFlagService\n+import io.element.android.libraries.featureflag.api.FeatureFlags\n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.room.MatrixRoom\n import io.element.android.libraries.preferences.api.store.AppPreferencesStore\n@@ -60,6 +62,7 @@ class DefaultActionListPresenter @AssistedInject constructor(\n private val isPinnedMessagesFeatureEnabled: IsPinnedMessagesFeatureEnabled,\n private val room: MatrixRoom,\n private val userSendFailureFactory: VerifiedUserSendFailureFactory,\n+ private val featureFlagService: FeatureFlagService,\n ) : ActionListPresenter {\n @AssistedFactory\n @ContributesBinding(RoomScope::class)\n@@ -134,7 +137,7 @@ class DefaultActionListPresenter @AssistedInject constructor(\n }\n }\n \n- private fun buildActions(\n+ private suspend fun buildActions(\n timelineItem: TimelineItem.Event,\n usersEventPermissions: UserEventPermissions,\n isDeveloperModeEnabled: Boolean,\n@@ -157,7 +160,9 @@ class DefaultActionListPresenter @AssistedInject constructor(\n if (timelineItem.content is TimelineItemEventContentWithAttachment) {\n // Caption\n if (timelineItem.content.caption == null) {\n- add(TimelineItemAction.AddCaption)\n+ if (featureFlagService.isFeatureEnabled(FeatureFlags.MediaCaptionCreation)) {\n+ add(TimelineItemAction.AddCaption)\n+ }\n } else {\n add(TimelineItemAction.EditCaption)\n add(TimelineItemAction.RemoveCaption)\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt\nindex 69d28d8f202..606e91863d3 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt\n@@ -10,6 +10,7 @@ package io.element.android.features.messages.impl.attachments.preview\n import androidx.compose.runtime.Composable\n import androidx.compose.runtime.LaunchedEffect\n import androidx.compose.runtime.MutableState\n+import androidx.compose.runtime.collectAsState\n import androidx.compose.runtime.getValue\n import androidx.compose.runtime.mutableStateOf\n import androidx.compose.runtime.remember\n@@ -46,7 +47,7 @@ class AttachmentsPreviewPresenter @AssistedInject constructor(\n private val mediaSender: MediaSender,\n private val permalinkBuilder: PermalinkBuilder,\n private val temporaryUriDeleter: TemporaryUriDeleter,\n- private val featureFlagsService: FeatureFlagService,\n+ private val featureFlagService: FeatureFlagService,\n ) : Presenter {\n @AssistedFactory\n interface Factory {\n@@ -72,6 +73,7 @@ class AttachmentsPreviewPresenter @AssistedInject constructor(\n val ongoingSendAttachmentJob = remember { mutableStateOf(null) }\n \n val userSentAttachment = remember { mutableStateOf(false) }\n+ val allowCaption by featureFlagService.isFeatureEnabledFlow(FeatureFlags.MediaCaptionCreation).collectAsState(initial = false)\n \n val mediaUploadInfoState = remember { mutableStateOf>(AsyncData.Uninitialized) }\n LaunchedEffect(Unit) {\n@@ -112,7 +114,7 @@ class AttachmentsPreviewPresenter @AssistedInject constructor(\n fun handleEvents(attachmentsPreviewEvents: AttachmentsPreviewEvents) {\n when (attachmentsPreviewEvents) {\n is AttachmentsPreviewEvents.SendAttachment -> coroutineScope.launch {\n- val useSendQueue = featureFlagsService.isFeatureEnabled(FeatureFlags.MediaUploadOnSendQueue)\n+ val useSendQueue = featureFlagService.isFeatureEnabled(FeatureFlags.MediaUploadOnSendQueue)\n userSentAttachment.value = true\n val instantSending = mediaUploadInfoState.value.isReady() && useSendQueue\n sendActionState.value = if (instantSending) {\n@@ -142,6 +144,7 @@ class AttachmentsPreviewPresenter @AssistedInject constructor(\n attachment = attachment,\n sendActionState = sendActionState.value,\n textEditorState = textEditorState,\n+ allowCaption = allowCaption,\n eventSink = ::handleEvents\n )\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt\nindex 0e9724c4606..0878b52f803 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt\n@@ -15,11 +15,9 @@ data class AttachmentsPreviewState(\n val attachment: Attachment,\n val sendActionState: SendActionState,\n val textEditorState: TextEditorState,\n+ val allowCaption: Boolean,\n val eventSink: (AttachmentsPreviewEvents) -> Unit\n-) {\n- // Keep the val to eventually set to false for some mimetypes.\n- val allowCaption: Boolean = true\n-}\n+)\n \n @Immutable\n sealed interface SendActionState {\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewStateProvider.kt\nindex 1c55245e469..f7e215fa222 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewStateProvider.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewStateProvider.kt\n@@ -29,6 +29,7 @@ open class AttachmentsPreviewStateProvider : PreviewParameterProvider buildMeta.buildType != BuildType.RELEASE },\n isFinished = false,\n ),\n+ MediaCaptionCreation(\n+ key = \"feature.media_caption_creation\",\n+ title = \"Allow creation of media captions\",\n+ description = null,\n+ defaultValue = { buildMeta -> buildMeta.buildType != BuildType.RELEASE },\n+ isFinished = false,\n+ ),\n }\n", "test_patch": "diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt\nindex b79468f8200..aedd0cdc14b 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt\n@@ -26,6 +26,8 @@ import io.element.android.features.messages.impl.timeline.model.event.aTimelineI\n import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemStateEventContent\n import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemVoiceContent\n import io.element.android.features.poll.api.pollcontent.aPollAnswerItemList\n+import io.element.android.libraries.featureflag.api.FeatureFlags\n+import io.element.android.libraries.featureflag.test.FakeFeatureFlagService\n import io.element.android.libraries.matrix.api.room.MatrixRoom\n import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState\n import io.element.android.libraries.matrix.test.AN_EVENT_ID\n@@ -558,6 +560,57 @@ class ActionListPresenterTest {\n }\n }\n \n+ @Test\n+ fun `present - compute for a media item - caption disabled`() = runTest {\n+ val presenter = createActionListPresenter(\n+ isDeveloperModeEnabled = true,\n+ isPinFeatureEnabled = true,\n+ allowCaption = false,\n+ )\n+ moleculeFlow(RecompositionMode.Immediate) {\n+ presenter.present()\n+ }.test {\n+ val initialState = awaitItem()\n+ val messageEvent = aMessageEvent(\n+ isMine = true,\n+ isEditable = true,\n+ content = aTimelineItemImageContent(),\n+ )\n+ initialState.eventSink.invoke(\n+ ActionListEvents.ComputeForMessage(\n+ event = messageEvent,\n+ userEventPermissions = aUserEventPermissions(\n+ canRedactOwn = true,\n+ canRedactOther = false,\n+ canSendMessage = true,\n+ canSendReaction = true,\n+ canPinUnpin = true,\n+ ),\n+ )\n+ )\n+ val successState = awaitItem()\n+ assertThat(successState.target).isEqualTo(\n+ ActionListState.Target.Success(\n+ event = messageEvent,\n+ displayEmojiReactions = true,\n+ verifiedUserSendFailure = VerifiedUserSendFailure.None,\n+ actions = persistentListOf(\n+ TimelineItemAction.Reply,\n+ TimelineItemAction.Forward,\n+ // Not here\n+ // TimelineItemAction.AddCaption,\n+ TimelineItemAction.Pin,\n+ TimelineItemAction.CopyLink,\n+ TimelineItemAction.ViewSource,\n+ TimelineItemAction.Redact,\n+ )\n+ )\n+ )\n+ initialState.eventSink.invoke(ActionListEvents.Clear)\n+ assertThat(awaitItem().target).isEqualTo(ActionListState.Target.None)\n+ }\n+ }\n+\n @Test\n fun `present - compute for a media with caption item`() = runTest {\n val presenter = createActionListPresenter(isDeveloperModeEnabled = true, isPinFeatureEnabled = true)\n@@ -1151,6 +1204,7 @@ private fun createActionListPresenter(\n isDeveloperModeEnabled: Boolean,\n isPinFeatureEnabled: Boolean,\n room: MatrixRoom = FakeMatrixRoom(),\n+ allowCaption: Boolean = true,\n ): ActionListPresenter {\n val preferencesStore = InMemoryAppPreferencesStore(isDeveloperModeEnabled = isDeveloperModeEnabled)\n return DefaultActionListPresenter(\n@@ -1158,6 +1212,11 @@ private fun createActionListPresenter(\n appPreferencesStore = preferencesStore,\n isPinnedMessagesFeatureEnabled = { isPinFeatureEnabled },\n room = room,\n- userSendFailureFactory = VerifiedUserSendFailureFactory(room)\n+ userSendFailureFactory = VerifiedUserSendFailureFactory(room),\n+ featureFlagService = FakeFeatureFlagService(\n+ initialState = mapOf(\n+ FeatureFlags.MediaCaptionCreation.key to allowCaption,\n+ ),\n+ )\n )\n }\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt\nindex 48e5c208b6c..095b770f082 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt\n@@ -64,6 +64,28 @@ class AttachmentsPreviewPresenterTest {\n \n private val mockMediaUrl: Uri = mockk(\"localMediaUri\")\n \n+ @Test\n+ fun `present - initial state`() = runTest {\n+ createAttachmentsPreviewPresenter().test {\n+ skipItems(1)\n+ val initialState = awaitItem()\n+ assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)\n+ assertThat(initialState.allowCaption).isTrue()\n+ }\n+ }\n+\n+ @Test\n+ fun `present - initial state - caption not allowed`() = runTest {\n+ createAttachmentsPreviewPresenter(\n+ allowCaption = false,\n+ ).test {\n+ skipItems(1)\n+ val initialState = awaitItem()\n+ assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)\n+ assertThat(initialState.allowCaption).isFalse()\n+ }\n+ }\n+\n @Test\n fun `present - send media success scenario`() = runTest {\n val sendFileResult = lambdaRecorder> { _, _, _, _, _ ->\n@@ -420,6 +442,7 @@ class AttachmentsPreviewPresenterTest {\n temporaryUriDeleter: TemporaryUriDeleter = FakeTemporaryUriDeleter(),\n onDoneListener: OnDoneListener = OnDoneListener { lambdaError() },\n mediaUploadOnSendQueueEnabled: Boolean = true,\n+ allowCaption: Boolean = true,\n ): AttachmentsPreviewPresenter {\n return AttachmentsPreviewPresenter(\n attachment = aMediaAttachment(localMedia),\n@@ -427,8 +450,11 @@ class AttachmentsPreviewPresenterTest {\n mediaSender = MediaSender(mediaPreProcessor, room, InMemorySessionPreferencesStore()),\n permalinkBuilder = permalinkBuilder,\n temporaryUriDeleter = temporaryUriDeleter,\n- featureFlagsService = FakeFeatureFlagService(\n- initialState = mapOf(FeatureFlags.MediaUploadOnSendQueue.key to mediaUploadOnSendQueueEnabled),\n+ featureFlagService = FakeFeatureFlagService(\n+ initialState = mapOf(\n+ FeatureFlags.MediaUploadOnSendQueue.key to mediaUploadOnSendQueueEnabled,\n+ FeatureFlags.MediaCaptionCreation.key to allowCaption,\n+ ),\n )\n )\n }\ndiff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_7_en.png\nnew file mode 100644\nindex 00000000000..6920a089ef4\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_7_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:507c7dffae1aabfa687174f1f964e2c40b004183b6bc3a70b56d764e0d308b47\n+size 392923\n", "n2p_tests": "{\"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for message from others redacted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - cancel scenario\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send media success scenario\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for call notify\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a media item - caption disabled\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - initial state - caption not allowed\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send media with pre-processing failure before user sends media\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - dismissing the progress dialog stops media upload\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send media with pre-processing failure after user sends media\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for my message cannot redact\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for non-editable poll message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - initial state\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - initial state\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a media with caption item\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a state item in non-debuggable build\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send image with caption success scenario\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for ended poll message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message when user can't pin\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message when event is already pinned\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message cannot sent message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send media after pre-processing success scenario\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for voice message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for message from me redacted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for verified user send failure\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for my message in a thread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message in non-debuggable build\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message and can redact\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message and cannot send reaction\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send media before pre-processing success scenario\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for my message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for editable poll message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a media item\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute message with no actions\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for others message in a thread\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send video with caption success scenario\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send audio with caption success scenario\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.attachments.AttachmentsPreviewPresenterTest.present - send media failure scenario\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute not sent message\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.actionlist.ActionListPresenterTest.present - compute for a state item in debug build\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-3916", "org": "element-hq", "repo": "element-x-android", "number": 3916, "state": "closed", "title": "Enable all notification actions: quick reply, accept/decline invite, mark as read from notification.", "body": "\r\n \r\n## Content\r\n\r\n\r\nEnable all notification actions: quick reply, accept/decline invite, mark as read from notification.\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #3908\r\nCloses #1966\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\n![Notification action](https://github.com/user-attachments/assets/8e417828-8346-4252-b14d-6c09967472e8)\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Receive notification for message or for room invite and see that they now have actions.\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 23\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"e8af711777c97d75a8e2de9c07f38f0c388b08fb\"}", "resolved_issues": "[{\"number\": 3908, \"title\": \"bring \\\"mark as read\\\" button on the notification back\", \"body\": \"### Your use case\\r\\n\\r\\nPlease bring \\\"mark as read\\\" button on the notification back.\\r\\n\\r\\n![image](https://github.com/user-attachments/assets/18f2a8fa-104c-4ee4-8d4f-1d1cca709a0c)\\r\\n\\r\\n\\r\\n### Have you considered any alternatives?\\r\\n\\r\\n_No response_\\r\\n\\r\\n### Additional context\\r\\n\\r\\n_No response_\\r\\n\\r\\n### Are you willing to provide a PR?\\r\\n\\r\\nNo\"}, {\"number\": 1966, \"title\": \"have quick reply on notifs that when you reply via the notif it replies to the message in the room\", \"body\": \"### Your use case\\n\\n#### What would you like to do?\\r\\nwhen you reply to a notification of a message it replies to the message in element x\\r\\n#### Why would you like to do it?\\r\\nits nice to quickly reply to a message without opening the app and possible getting sidetracked by other rooms or conversations\\r\\n#### How would you like to achieve it?\\r\\nhave a quick reply option when a notification gets sent like in ele android, that replies to the message in the notification, which isnt how ele android does it currently\\n\\n### Have you considered any alternatives?\\n\\nyou could just send the message while not replying but that can easily cause confusion in a busy room\\n\\n### Additional context\\n\\n_No response_\\n\\n### Are you willing to provide a PR?\\n\\nNo\"}]", "lang": "kotlin", "problem_statement": "bring \"mark as read\" button on the notification back\n### Your use case\r\n\r\nPlease bring \"mark as read\" button on the notification back.\r\n\r\n![image](https://github.com/user-attachments/assets/18f2a8fa-104c-4ee4-8d4f-1d1cca709a0c)\r\n\r\n\r\n### Have you considered any alternatives?\r\n\r\n_No response_\r\n\r\n### Additional context\r\n\r\n_No response_\r\n\r\n### Are you willing to provide a PR?\r\n\r\nNo\nhave quick reply on notifs that when you reply via the notif it replies to the message in the room\n### Your use case\n\n#### What would you like to do?\r\nwhen you reply to a notification of a message it replies to the message in element x\r\n#### Why would you like to do it?\r\nits nice to quickly reply to a message without opening the app and possible getting sidetracked by other rooms or conversations\r\n#### How would you like to achieve it?\r\nhave a quick reply option when a notification gets sent like in ele android, that replies to the message in the notification, which isnt how ele android does it currently\n\n### Have you considered any alternatives?\n\nyou could just send the message while not replying but that can easily cause confusion in a busy room\n\n### Additional context\n\n_No response_\n\n### Are you willing to provide a PR?\n\nNo\n", "hints": "Thanks for creating the issue. We are waiting for a product decision to restore notification actions.\nI agree it would be nice to support this. It's currently disabled, waiting for a product decision.\nWould be great\nSee also #1547", "pull_url": "https://github.com/element-hq/element-x-android/pull/3916", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/3908\", \"https://github.com/element-hq/element-x-android/issues/1966\"]", "test_command": "./gradlew :libraries:push:impl:testDebugUnitTest --tests \"io.element.android.libraries.push.impl.notifications.factories.DefaultNotificationCreatorTest\" --tests \"io.element.android.libraries.push.impl.notifications.DefaultRoomGroupMessageCreatorTest\"", "fix_patch": "diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/NotificationConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/NotificationConfig.kt\nindex c5f605e5fe3..83ea9e3b77d 100644\n--- a/appconfig/src/main/kotlin/io/element/android/appconfig/NotificationConfig.kt\n+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/NotificationConfig.kt\n@@ -11,14 +11,20 @@ import android.graphics.Color\n import androidx.annotation.ColorInt\n \n object NotificationConfig {\n- // TODO EAx Implement and set to true at some point\n- const val SUPPORT_MARK_AS_READ_ACTION = false\n+ /**\n+ * If set to true, the notification will have a \"Mark as read\" action.\n+ */\n+ const val SHOW_MARK_AS_READ_ACTION = true\n \n- // TODO EAx Implement and set to true at some point\n- const val SUPPORT_JOIN_DECLINE_INVITE = false\n+ /**\n+ * If set to true, the notification for invitation will have two actions to accept or decline the invite.\n+ */\n+ const val SHOW_ACCEPT_AND_DECLINE_INVITE_ACTIONS = true\n \n- // TODO EAx Implement and set to true at some point\n- const val SUPPORT_QUICK_REPLY_ACTION = false\n+ /**\n+ * If set to true, the notification will have a \"Quick reply\" action, allow to compose and send a message to the room.\n+ */\n+ const val SHOW_QUICK_REPLY_ACTION = true\n \n @ColorInt\n val NOTIFICATION_ACCENT_COLOR: Int = Color.parseColor(\"#FF0DBD8B\")\ndiff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt\nindex 559322eaaef..6788410468a 100755\n--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt\n@@ -230,10 +230,8 @@ class DefaultNotificationCreator @Inject constructor(\n .setSmallIcon(smallIcon)\n .setColor(accentColor)\n .apply {\n- if (NotificationConfig.SUPPORT_JOIN_DECLINE_INVITE) {\n- addAction(rejectInvitationActionFactory.create(inviteNotifiableEvent))\n- addAction(acceptInvitationActionFactory.create(inviteNotifiableEvent))\n- }\n+ addAction(rejectInvitationActionFactory.create(inviteNotifiableEvent))\n+ addAction(acceptInvitationActionFactory.create(inviteNotifiableEvent))\n // Build the pending intent for when the notification is clicked\n setContentIntent(pendingIntentFactory.createOpenRoomPendingIntent(inviteNotifiableEvent.sessionId, inviteNotifiableEvent.roomId))\n \ndiff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/AcceptInvitationActionFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/AcceptInvitationActionFactory.kt\nindex ee3d392c1fb..9b2cf64a7d4 100644\n--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/AcceptInvitationActionFactory.kt\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/AcceptInvitationActionFactory.kt\n@@ -11,12 +11,14 @@ import android.app.PendingIntent\n import android.content.Context\n import android.content.Intent\n import androidx.core.app.NotificationCompat\n+import io.element.android.appconfig.NotificationConfig\n import io.element.android.libraries.androidutils.uri.createIgnoredUri\n import io.element.android.libraries.di.ApplicationContext\n import io.element.android.libraries.push.impl.R\n import io.element.android.libraries.push.impl.notifications.NotificationActionIds\n import io.element.android.libraries.push.impl.notifications.NotificationBroadcastReceiver\n import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent\n+import io.element.android.libraries.ui.strings.CommonStrings\n import io.element.android.services.toolbox.api.strings.StringProvider\n import io.element.android.services.toolbox.api.systemclock.SystemClock\n import javax.inject.Inject\n@@ -27,8 +29,8 @@ class AcceptInvitationActionFactory @Inject constructor(\n private val stringProvider: StringProvider,\n private val clock: SystemClock,\n ) {\n- // offer to type a quick accept button\n- fun create(inviteNotifiableEvent: InviteNotifiableEvent): NotificationCompat.Action {\n+ fun create(inviteNotifiableEvent: InviteNotifiableEvent): NotificationCompat.Action? {\n+ if (!NotificationConfig.SHOW_ACCEPT_AND_DECLINE_INVITE_ACTIONS) return null\n val sessionId = inviteNotifiableEvent.sessionId.value\n val roomId = inviteNotifiableEvent.roomId.value\n val intent = Intent(context, NotificationBroadcastReceiver::class.java)\n@@ -44,7 +46,7 @@ class AcceptInvitationActionFactory @Inject constructor(\n )\n return NotificationCompat.Action.Builder(\n R.drawable.vector_notification_accept_invitation,\n- stringProvider.getString(R.string.notification_invitation_action_join),\n+ stringProvider.getString(CommonStrings.action_accept),\n pendingIntent\n ).build()\n }\ndiff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/MarkAsReadActionFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/MarkAsReadActionFactory.kt\nindex b77e36cfc00..e6a2594bb83 100644\n--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/MarkAsReadActionFactory.kt\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/MarkAsReadActionFactory.kt\n@@ -29,7 +29,7 @@ class MarkAsReadActionFactory @Inject constructor(\n private val clock: SystemClock,\n ) {\n fun create(roomInfo: RoomEventGroupInfo): NotificationCompat.Action? {\n- if (!NotificationConfig.SUPPORT_MARK_AS_READ_ACTION) return null\n+ if (!NotificationConfig.SHOW_MARK_AS_READ_ACTION) return null\n val sessionId = roomInfo.sessionId.value\n val roomId = roomInfo.roomId.value\n val intent = Intent(context, NotificationBroadcastReceiver::class.java)\ndiff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt\nindex 3ada849026a..bced0abd904 100644\n--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt\n@@ -34,7 +34,7 @@ class QuickReplyActionFactory @Inject constructor(\n private val clock: SystemClock,\n ) {\n fun create(roomInfo: RoomEventGroupInfo, threadId: ThreadId?): NotificationCompat.Action? {\n- if (!NotificationConfig.SUPPORT_QUICK_REPLY_ACTION) return null\n+ if (!NotificationConfig.SHOW_QUICK_REPLY_ACTION) return null\n val sessionId = roomInfo.sessionId\n val roomId = roomInfo.roomId\n val replyPendingIntent = buildQuickReplyIntent(sessionId, roomId, threadId)\ndiff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/RejectInvitationActionFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/RejectInvitationActionFactory.kt\nindex 309acce44cf..d4eb28f1411 100644\n--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/RejectInvitationActionFactory.kt\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/RejectInvitationActionFactory.kt\n@@ -11,12 +11,14 @@ import android.app.PendingIntent\n import android.content.Context\n import android.content.Intent\n import androidx.core.app.NotificationCompat\n+import io.element.android.appconfig.NotificationConfig\n import io.element.android.libraries.androidutils.uri.createIgnoredUri\n import io.element.android.libraries.di.ApplicationContext\n import io.element.android.libraries.push.impl.R\n import io.element.android.libraries.push.impl.notifications.NotificationActionIds\n import io.element.android.libraries.push.impl.notifications.NotificationBroadcastReceiver\n import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent\n+import io.element.android.libraries.ui.strings.CommonStrings\n import io.element.android.services.toolbox.api.strings.StringProvider\n import io.element.android.services.toolbox.api.systemclock.SystemClock\n import javax.inject.Inject\n@@ -28,6 +30,7 @@ class RejectInvitationActionFactory @Inject constructor(\n private val clock: SystemClock,\n ) {\n fun create(inviteNotifiableEvent: InviteNotifiableEvent): NotificationCompat.Action? {\n+ if (!NotificationConfig.SHOW_ACCEPT_AND_DECLINE_INVITE_ACTIONS) return null\n val sessionId = inviteNotifiableEvent.sessionId.value\n val roomId = inviteNotifiableEvent.roomId.value\n val intent = Intent(context, NotificationBroadcastReceiver::class.java)\n@@ -41,10 +44,9 @@ class RejectInvitationActionFactory @Inject constructor(\n intent,\n PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE\n )\n-\n return NotificationCompat.Action.Builder(\n R.drawable.vector_notification_reject_invitation,\n- stringProvider.getString(R.string.notification_invitation_action_reject),\n+ stringProvider.getString(CommonStrings.action_reject),\n pendingIntent\n ).build()\n }\n", "test_patch": "diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultRoomGroupMessageCreatorTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultRoomGroupMessageCreatorTest.kt\nindex d0255aa4528..44846f80107 100644\n--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultRoomGroupMessageCreatorTest.kt\n+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultRoomGroupMessageCreatorTest.kt\n@@ -11,12 +11,15 @@ import android.content.Context\n import android.os.Build\n import androidx.core.app.NotificationCompat\n import com.google.common.truth.Truth.assertThat\n+import io.element.android.appconfig.NotificationConfig\n import io.element.android.libraries.matrix.api.media.MediaSource\n import io.element.android.libraries.matrix.test.A_ROOM_ID\n import io.element.android.libraries.matrix.test.A_TIMESTAMP\n import io.element.android.libraries.matrix.ui.components.aMatrixUser\n import io.element.android.libraries.matrix.ui.media.AVATAR_THUMBNAIL_SIZE_IN_PIXEL\n import io.element.android.libraries.matrix.ui.media.MediaRequestData\n+import io.element.android.libraries.push.impl.notifications.factories.MARK_AS_READ_ACTION_TITLE\n+import io.element.android.libraries.push.impl.notifications.factories.QUICK_REPLY_ACTION_TITLE\n import io.element.android.libraries.push.impl.notifications.factories.createNotificationCreator\n import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent\n import io.element.android.libraries.push.test.notifications.FakeImageLoader\n@@ -156,6 +159,13 @@ class DefaultRoomGroupMessageCreatorTest {\n )\n assertThat(result.number).isEqualTo(2)\n assertThat(result.`when`).isEqualTo(A_TIMESTAMP + 10)\n+ val actionTitles = result.actions?.map { it.title }\n+ assertThat(actionTitles).isEqualTo(\n+ listOfNotNull(\n+ MARK_AS_READ_ACTION_TITLE.takeIf { NotificationConfig.SHOW_MARK_AS_READ_ACTION },\n+ QUICK_REPLY_ACTION_TITLE.takeIf { NotificationConfig.SHOW_QUICK_REPLY_ACTION },\n+ )\n+ )\n assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)\n }\n \n@@ -175,7 +185,12 @@ class DefaultRoomGroupMessageCreatorTest {\n imageLoader = fakeImageLoader.getImageLoader(),\n existingNotification = null,\n )\n- assertThat(result.actions).isNull()\n+ val actionTitles = result.actions?.map { it.title }\n+ assertThat(actionTitles).isEqualTo(\n+ listOfNotNull(\n+ MARK_AS_READ_ACTION_TITLE.takeIf { NotificationConfig.SHOW_MARK_AS_READ_ACTION }\n+ )\n+ )\n assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)\n }\n \ndiff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/DefaultNotificationCreatorTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/DefaultNotificationCreatorTest.kt\nindex 9e2f3c10389..9a25ad2a726 100644\n--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/DefaultNotificationCreatorTest.kt\n+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/DefaultNotificationCreatorTest.kt\n@@ -13,6 +13,7 @@ import android.os.Build\n import androidx.core.app.NotificationCompat\n import androidx.core.app.NotificationManagerCompat\n import com.google.common.truth.Truth.assertThat\n+import io.element.android.appconfig.NotificationConfig\n import io.element.android.libraries.core.meta.BuildMeta\n import io.element.android.libraries.matrix.test.AN_EVENT_ID\n import io.element.android.libraries.matrix.test.A_ROOM_ID\n@@ -151,6 +152,13 @@ class DefaultNotificationCreatorTest {\n result.commonAssertions(\n expectedCategory = null,\n )\n+ val actionTitles = result.actions?.map { it.title }\n+ assertThat(actionTitles).isEqualTo(\n+ listOfNotNull(\n+ REJECT_INVITATION_ACTION_TITLE.takeIf { NotificationConfig.SHOW_ACCEPT_AND_DECLINE_INVITE_ACTIONS },\n+ ACCEPT_INVITATION_ACTION_TITLE.takeIf { NotificationConfig.SHOW_ACCEPT_AND_DECLINE_INVITE_ACTIONS },\n+ )\n+ )\n }\n \n @Test\n@@ -271,6 +279,11 @@ class DefaultNotificationCreatorTest {\n }\n }\n \n+const val MARK_AS_READ_ACTION_TITLE = \"MarkAsReadAction\"\n+const val QUICK_REPLY_ACTION_TITLE = \"QuickReplyAction\"\n+const val ACCEPT_INVITATION_ACTION_TITLE = \"AcceptInvitationAction\"\n+const val REJECT_INVITATION_ACTION_TITLE = \"RejectInvitationAction\"\n+\n fun createNotificationCreator(\n context: Context = RuntimeEnvironment.getApplication(),\n buildMeta: BuildMeta = aBuildMeta(),\n@@ -291,26 +304,26 @@ fun createNotificationCreator(\n markAsReadActionFactory = MarkAsReadActionFactory(\n context = context,\n actionIds = NotificationActionIds(buildMeta),\n- stringProvider = FakeStringProvider(\"MarkAsReadActionFactory\"),\n+ stringProvider = FakeStringProvider(MARK_AS_READ_ACTION_TITLE),\n clock = FakeSystemClock(),\n ),\n quickReplyActionFactory = QuickReplyActionFactory(\n context = context,\n actionIds = NotificationActionIds(buildMeta),\n- stringProvider = FakeStringProvider(\"QuickReplyActionFactory\"),\n+ stringProvider = FakeStringProvider(QUICK_REPLY_ACTION_TITLE),\n clock = FakeSystemClock(),\n ),\n bitmapLoader = bitmapLoader,\n acceptInvitationActionFactory = AcceptInvitationActionFactory(\n context = context,\n actionIds = NotificationActionIds(buildMeta),\n- stringProvider = FakeStringProvider(\"AcceptInvitationActionFactory\"),\n+ stringProvider = FakeStringProvider(ACCEPT_INVITATION_ACTION_TITLE),\n clock = FakeSystemClock(),\n ),\n rejectInvitationActionFactory = RejectInvitationActionFactory(\n context = context,\n actionIds = NotificationActionIds(buildMeta),\n- stringProvider = FakeStringProvider(\"RejectInvitationActionFactory\"),\n+ stringProvider = FakeStringProvider(REJECT_INVITATION_ACTION_TITLE),\n clock = FakeSystemClock(),\n ),\n )\n", "n2p_tests": "{\"io.element.android.libraries.push.impl.notifications.factories.DefaultNotificationCreatorTest.test createSummaryListNotification\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.factories.DefaultNotificationCreatorTest.test createSimpleEventNotification noisy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.factories.DefaultNotificationCreatorTest.test createRoomInvitationNotification noisy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.factories.DefaultNotificationCreatorTest.test createMessagesListNotification\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.factories.DefaultNotificationCreatorTest.test createSimpleEventNotification\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.factories.DefaultNotificationCreatorTest.test createSummaryListNotification noisy\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"io.element.android.libraries.push.impl.notifications.factories.DefaultNotificationCreatorTest.test createDiagnosticNotification\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.factories.DefaultNotificationCreatorTest.test createRoomInvitationNotification\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"io.element.android.libraries.push.impl.notifications.factories.DefaultNotificationCreatorTest.test createMessagesListNotification should bing and thread\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultRoomGroupMessageCreatorTest.test createRoomMessage with room avatar and sender avatar android P\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultRoomGroupMessageCreatorTest.test createRoomMessage with two Events\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultRoomGroupMessageCreatorTest.test createRoomMessage with room avatar and sender avatar android O\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultRoomGroupMessageCreatorTest.test createRoomMessage with one Event\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultRoomGroupMessageCreatorTest.test createRoomMessage with one noisy Event\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultRoomGroupMessageCreatorTest.test createRoomMessage with smart reply error\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.factories.DefaultNotificationCreatorTest.test createFallbackNotification\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultRoomGroupMessageCreatorTest.test createRoomMessage for DM\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-3864", "org": "element-hq", "repo": "element-x-android", "number": 3864, "state": "closed", "title": "Use formatted captions for images and video", "body": "## Content\r\n\r\nThis PR has the following changes:\r\n\r\n- Parse the `caption` and `formattedCaption` in the same way as we do for text messages.\r\n- Allow opening links from the caption UI text component.\r\n- Split the `onClick` action for timeline items between those whose onClick action should be triggered by the whole message bubble and those who should trigger it only from certain UI elements (as the image/video preview in the timeline).\r\n\r\nNote there's no way to send captions as either markdown or HTML at the moment from the app, so either you send these from some other client or you'd only be able to test this by sending a URL as part of the plain text caption.\r\n\r\nThis PR can be reviewed commit-by-commit.\r\n\r\n## Motivation and context\r\n\r\nFixes #3850.\r\n\r\n## Screenshots / GIFs\r\n\r\nNo changes in screenshots, I hope.\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Send an image/video with an URL in the caption and some other text.\r\n- Make sure the link in the caption is later clickable in the timeline item.\r\n- Clicking on the image/video preview should open the viewer.\r\n- Clicking on the text part that has no URL shouldn't do anything.\r\n- Clicking on the URL should open it.\r\n- Clicking on any other timeline items should have the same effect as before this patch.\r\n\r\n## Tested devices\r\n\r\n- [x] Physical\r\n- [ ] Emulator\r\n- OS version(s): 14\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 23\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [x] Pull request is based on the develop branch\r\n- [x] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)\r\n- [x] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"a9c74e9243d4822f9894f37205df567c30025b54\"}", "resolved_issues": "[{\"number\": 3850, \"title\": \"URLs are not clickable in media captions\", \"body\": \"### Steps to reproduce\\n\\n1. Send a message with a media Captain\\r\\n2. Make sure the caption contains a URL (https://...) somewhere\\r\\n3. Observe issue\\n\\n### Outcome\\n\\n#### What did you expect?\\r\\n\\r\\nURLs should be highlighted and clickable, as they are in normal text bodies\\r\\n\\r\\n#### What happened instead?\\r\\n\\r\\nThe text is entirely plain, unclickable, without an underline nor is it blue \\r\\n\\n\\n### Your phone model\\n\\n(Xiaomi) Poco F3\\n\\n### Operating system version\\n\\nAndroid 14\\n\\n### Application version and app store\\n\\nElement X 0.7.4 Nightly, b097e963\\n\\n### Homeserver\\n\\nbark.lgbt\\n\\n### Will you send logs?\\n\\nYes\\n\\n### Are you willing to provide a PR?\\n\\nNo\"}]", "lang": "kotlin", "problem_statement": "URLs are not clickable in media captions\n### Steps to reproduce\n\n1. Send a message with a media Captain\r\n2. Make sure the caption contains a URL (https://...) somewhere\r\n3. Observe issue\n\n### Outcome\n\n#### What did you expect?\r\n\r\nURLs should be highlighted and clickable, as they are in normal text bodies\r\n\r\n#### What happened instead?\r\n\r\nThe text is entirely plain, unclickable, without an underline nor is it blue \r\n\n\n### Your phone model\n\n(Xiaomi) Poco F3\n\n### Operating system version\n\nAndroid 14\n\n### Application version and app store\n\nElement X 0.7.4 Nightly, b097e963\n\n### Homeserver\n\nbark.lgbt\n\n### Will you send logs?\n\nYes\n\n### Are you willing to provide a PR?\n\nNo\n", "hints": "Duplicate of #3529 (although this issue is better worded)\n> Duplicate of #3529 (although this issue is better worded)\r\n\r\noh I didn't catch that as I searched for \"URL\" not something like \"link\" :woozy_face: ", "pull_url": "https://github.com/element-hq/element-x-android/pull/3864", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/3850\"]", "test_command": "./gradlew :features:messages:impl:testDebugUnitTest --tests \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest\" --tests \"io.element.android.features.messages.impl.timeline.TimelineViewTest\" --tests \"io.element.android.features.messages.impl.MessagesViewTest\"", "fix_patch": "diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt\nindex bf76f208e38..9fd823445f8 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt\n@@ -212,7 +212,7 @@ class MessagesNode @AssistedInject constructor(\n state = state,\n onBackClick = this::navigateUp,\n onRoomDetailsClick = this::onRoomDetailsClick,\n- onEventClick = this::onEventClick,\n+ onEventContentClick = this::onEventClick,\n onPreviewAttachments = this::onPreviewAttachments,\n onUserDataClick = this::onUserDataClick,\n onLinkClick = { url -> onLinkClick(activity, isDark, url, state.timelineState.eventSink) },\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt\nindex e5d73fbed60..3e2918b3ceb 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt\n@@ -114,7 +114,7 @@ fun MessagesView(\n state: MessagesState,\n onBackClick: () -> Unit,\n onRoomDetailsClick: () -> Unit,\n- onEventClick: (event: TimelineItem.Event) -> Boolean,\n+ onEventContentClick: (event: TimelineItem.Event) -> Boolean,\n onUserDataClick: (UserId) -> Unit,\n onLinkClick: (String) -> Unit,\n onPreviewAttachments: (ImmutableList) -> Unit,\n@@ -142,9 +142,9 @@ fun MessagesView(\n // This is needed because the composer is inside an AndroidView that can't be affected by the FocusManager in Compose\n val localView = LocalView.current\n \n- fun onMessageClick(event: TimelineItem.Event) {\n+ fun onContentClick(event: TimelineItem.Event) {\n Timber.v(\"onMessageClick= ${event.id}\")\n- val hideKeyboard = onEventClick(event)\n+ val hideKeyboard = onEventContentClick(event)\n if (hideKeyboard) {\n localView.hideKeyboard()\n }\n@@ -206,7 +206,7 @@ fun MessagesView(\n modifier = Modifier\n .padding(padding)\n .consumeWindowInsets(padding),\n- onMessageClick = ::onMessageClick,\n+ onContentClick = ::onContentClick,\n onMessageLongClick = ::onMessageLongClick,\n onUserDataClick = onUserDataClick,\n onLinkClick = onLinkClick,\n@@ -306,7 +306,7 @@ private fun AttachmentStateView(\n @Composable\n private fun MessagesViewContent(\n state: MessagesState,\n- onMessageClick: (TimelineItem.Event) -> Unit,\n+ onContentClick: (TimelineItem.Event) -> Unit,\n onUserDataClick: (UserId) -> Unit,\n onLinkClick: (String) -> Unit,\n onReactionClick: (key: String, TimelineItem.Event) -> Unit,\n@@ -382,7 +382,7 @@ private fun MessagesViewContent(\n timelineProtectionState = state.timelineProtectionState,\n onUserDataClick = onUserDataClick,\n onLinkClick = onLinkClick,\n- onMessageClick = onMessageClick,\n+ onContentClick = onContentClick,\n onMessageLongClick = onMessageLongClick,\n onSwipeToReply = onSwipeToReply,\n onReactionClick = onReactionClick,\n@@ -568,7 +568,7 @@ internal fun MessagesViewPreview(@PreviewParameter(MessagesStateProvider::class)\n state = state,\n onBackClick = {},\n onRoomDetailsClick = {},\n- onEventClick = { false },\n+ onEventContentClick = { false },\n onUserDataClick = {},\n onLinkClick = {},\n onPreviewAttachments = {},\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/MessagesViewWithIdentityChangePreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/MessagesViewWithIdentityChangePreview.kt\nindex c34f072c6d0..04750b6ad86 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/MessagesViewWithIdentityChangePreview.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/MessagesViewWithIdentityChangePreview.kt\n@@ -33,7 +33,7 @@ internal fun MessagesViewWithIdentityChangePreview(\n ),\n onBackClick = {},\n onRoomDetailsClick = {},\n- onEventClick = { false },\n+ onEventContentClick = { false },\n onUserDataClick = {},\n onLinkClick = {},\n onPreviewAttachments = {},\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListView.kt\nindex f4a3247cbab..7ae88b9647e 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListView.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListView.kt\n@@ -216,7 +216,7 @@ private fun PinnedMessagesListLoaded(\n focusedEventId = null,\n onUserDataClick = onUserDataClick,\n onLinkClick = onLinkClick,\n- onClick = onEventClick,\n+ onContentClick = onEventClick,\n onLongClick = ::onMessageLongClick,\n inReplyToClick = {},\n onReactionClick = { _, _ -> },\n@@ -230,6 +230,7 @@ private fun PinnedMessagesListLoaded(\n TimelineItemEventContentViewWrapper(\n event = event,\n timelineProtectionState = state.timelineProtectionState,\n+ onContentClick = { onEventClick(event) },\n onLinkClick = onLinkClick,\n modifier = contentModifier,\n onContentLayoutChange = onContentLayoutChange\n@@ -244,6 +245,7 @@ private fun PinnedMessagesListLoaded(\n private fun TimelineItemEventContentViewWrapper(\n event: TimelineItem.Event,\n timelineProtectionState: TimelineProtectionState,\n+ onContentClick: () -> Unit,\n onLinkClick: (String) -> Unit,\n onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,\n modifier: Modifier = Modifier,\n@@ -258,10 +260,11 @@ private fun TimelineItemEventContentViewWrapper(\n TimelineItemEventContentView(\n content = event.content,\n hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),\n- onShowClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },\n+ onShowContentClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },\n onLinkClick = onLinkClick,\n eventSink = { },\n modifier = modifier,\n+ onContentClick = onContentClick,\n onContentLayoutChange = onContentLayoutChange\n )\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt\nindex f0e976e3685..6e34bba9e1a 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt\n@@ -76,7 +76,7 @@ fun TimelineView(\n timelineProtectionState: TimelineProtectionState,\n onUserDataClick: (UserId) -> Unit,\n onLinkClick: (String) -> Unit,\n- onMessageClick: (TimelineItem.Event) -> Unit,\n+ onContentClick: (TimelineItem.Event) -> Unit,\n onMessageLongClick: (TimelineItem.Event) -> Unit,\n onSwipeToReply: (TimelineItem.Event) -> Unit,\n onReactionClick: (emoji: String, TimelineItem.Event) -> Unit,\n@@ -141,7 +141,7 @@ fun TimelineView(\n focusedEventId = state.focusedEventId,\n onUserDataClick = onUserDataClick,\n onLinkClick = onLinkClick,\n- onClick = onMessageClick,\n+ onContentClick = onContentClick,\n onLongClick = onMessageLongClick,\n inReplyToClick = ::inReplyToClick,\n onReactionClick = onReactionClick,\n@@ -322,7 +322,7 @@ internal fun TimelineViewPreview(\n timelineProtectionState = aTimelineProtectionState(),\n onUserDataClick = {},\n onLinkClick = {},\n- onMessageClick = {},\n+ onContentClick = {},\n onMessageLongClick = {},\n onSwipeToReply = {},\n onReactionClick = { _, _ -> },\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewMessageShieldPreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewMessageShieldPreview.kt\nindex 99f69675fa1..462e74137af 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewMessageShieldPreview.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewMessageShieldPreview.kt\n@@ -41,7 +41,7 @@ internal fun TimelineViewMessageShieldPreview() = ElementPreview {\n timelineProtectionState = aTimelineProtectionState(),\n onUserDataClick = {},\n onLinkClick = {},\n- onMessageClick = {},\n+ onContentClick = {},\n onMessageLongClick = {},\n onSwipeToReply = {},\n onReactionClick = { _, _ -> },\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ATimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ATimelineItemEventRow.kt\nindex 1fa5e7f9a1b..85e98549194 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ATimelineItemEventRow.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ATimelineItemEventRow.kt\n@@ -30,7 +30,7 @@ internal fun ATimelineItemEventRow(\n timelineProtectionState = timelineProtectionState,\n isLastOutgoingMessage = isLastOutgoingMessage,\n isHighlighted = isHighlighted,\n- onClick = {},\n+ onContentClick = {},\n onLongClick = {},\n onLinkClick = {},\n onUserDataClick = {},\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt\nindex 2f0165cd7b2..0061ebe6dff 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt\n@@ -114,7 +114,7 @@ fun TimelineItemEventRow(\n renderReadReceipts: Boolean,\n isLastOutgoingMessage: Boolean,\n isHighlighted: Boolean,\n- onClick: () -> Unit,\n+ onContentClick: () -> Unit,\n onLongClick: () -> Unit,\n onLinkClick: (String) -> Unit,\n onUserDataClick: (UserId) -> Unit,\n@@ -130,7 +130,8 @@ fun TimelineItemEventRow(\n TimelineItemEventContentView(\n content = event.content,\n hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),\n- onShowClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },\n+ onContentClick = onContentClick,\n+ onShowContentClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },\n onLinkClick = onLinkClick,\n eventSink = eventSink,\n modifier = contentModifier,\n@@ -150,6 +151,12 @@ fun TimelineItemEventRow(\n inReplyToClick(inReplyToEventId)\n }\n \n+ val onWholeItemClick = if (event.isWholeContentClickable) {\n+ onContentClick\n+ } else {\n+ {}\n+ }\n+\n Column(modifier = modifier.fillMaxWidth()) {\n if (event.groupPosition.isNew()) {\n Spacer(modifier = Modifier.height(16.dp))\n@@ -173,7 +180,7 @@ fun TimelineItemEventRow(\n isHighlighted = isHighlighted,\n timelineRoomInfo = timelineRoomInfo,\n interactionSource = interactionSource,\n- onClick = onClick,\n+ onContentClick = onWholeItemClick,\n onLongClick = onLongClick,\n inReplyToClick = ::inReplyToClick,\n onUserDataClick = ::onUserDataClick,\n@@ -207,7 +214,7 @@ fun TimelineItemEventRow(\n isHighlighted = isHighlighted,\n timelineRoomInfo = timelineRoomInfo,\n interactionSource = interactionSource,\n- onClick = onClick,\n+ onContentClick = onWholeItemClick,\n onLongClick = onLongClick,\n inReplyToClick = ::inReplyToClick,\n onUserDataClick = ::onUserDataClick,\n@@ -263,7 +270,7 @@ private fun TimelineItemEventRowContent(\n isHighlighted: Boolean,\n timelineRoomInfo: TimelineRoomInfo,\n interactionSource: MutableInteractionSource,\n- onClick: () -> Unit,\n+ onContentClick: () -> Unit,\n onLongClick: () -> Unit,\n inReplyToClick: () -> Unit,\n onUserDataClick: () -> Unit,\n@@ -340,7 +347,7 @@ private fun TimelineItemEventRowContent(\n },\n state = bubbleState,\n interactionSource = interactionSource,\n- onClick = onClick,\n+ onClick = onContentClick,\n onLongClick = onLongClick,\n ) {\n MessageEventBubbleContent(\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt\nindex d280efa62c8..fe89d6de022 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt\n@@ -57,10 +57,11 @@ fun TimelineItemGroupedEventsRow(\n TimelineItemEventContentView(\n content = event.content,\n hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),\n- onShowClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },\n+ onShowContentClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },\n onLinkClick = onLinkClick,\n eventSink = eventSink,\n modifier = contentModifier,\n+ onContentClick = {},\n onContentLayoutChange = onContentLayoutChange\n )\n },\n@@ -121,10 +122,11 @@ private fun TimelineItemGroupedEventsRowContent(\n TimelineItemEventContentView(\n content = event.content,\n hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),\n- onShowClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },\n+ onShowContentClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },\n onLinkClick = onLinkClick,\n eventSink = eventSink,\n modifier = contentModifier,\n+ onContentClick = {},\n onContentLayoutChange = onContentLayoutChange\n )\n },\n@@ -152,7 +154,7 @@ private fun TimelineItemGroupedEventsRowContent(\n focusedEventId = focusedEventId,\n onUserDataClick = onUserDataClick,\n onLinkClick = onLinkClick,\n- onClick = onClick,\n+ onContentClick = onClick,\n onLongClick = onLongClick,\n inReplyToClick = inReplyToClick,\n onReactionClick = onReactionClick,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt\nindex 13c247645bc..047f9b3d04a 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt\n@@ -28,7 +28,6 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt\n import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateContent\n import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionEvent\n import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionState\n-import io.element.android.features.messages.impl.timeline.protection.mustBeProtected\n import io.element.android.libraries.designsystem.text.toPx\n import io.element.android.libraries.designsystem.theme.highlightedMessageBackgroundColor\n import io.element.android.libraries.matrix.api.core.EventId\n@@ -44,7 +43,7 @@ internal fun TimelineItemRow(\n focusedEventId: EventId?,\n onUserDataClick: (UserId) -> Unit,\n onLinkClick: (String) -> Unit,\n- onClick: (TimelineItem.Event) -> Unit,\n+ onContentClick: (TimelineItem.Event) -> Unit,\n onLongClick: (TimelineItem.Event) -> Unit,\n inReplyToClick: (EventId) -> Unit,\n onReactionClick: (key: String, TimelineItem.Event) -> Unit,\n@@ -60,7 +59,8 @@ internal fun TimelineItemRow(\n TimelineItemEventContentView(\n content = event.content,\n hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),\n- onShowClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },\n+ onShowContentClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },\n+ onContentClick = { onContentClick(event) },\n onLinkClick = onLinkClick,\n eventSink = eventSink,\n modifier = contentModifier,\n@@ -95,7 +95,7 @@ internal fun TimelineItemRow(\n renderReadReceipts = renderReadReceipts,\n isLastOutgoingMessage = isLastOutgoingMessage,\n isHighlighted = timelineItem.isEvent(focusedEventId),\n- onClick = { onClick(timelineItem) },\n+ onClick = { onContentClick(timelineItem) },\n onReadReceiptsClick = onReadReceiptClick,\n onLongClick = { onLongClick(timelineItem) },\n eventSink = eventSink,\n@@ -118,11 +118,7 @@ internal fun TimelineItemRow(\n timelineProtectionState = timelineProtectionState,\n isLastOutgoingMessage = isLastOutgoingMessage,\n isHighlighted = timelineItem.isEvent(focusedEventId),\n- onClick = if (timelineProtectionState.hideMediaContent(timelineItem.eventId) && timelineItem.mustBeProtected()) {\n- {}\n- } else {\n- { onClick(timelineItem) }\n- },\n+ onContentClick = { onContentClick(timelineItem) },\n onLongClick = { onLongClick(timelineItem) },\n onLinkClick = onLinkClick,\n onUserDataClick = onUserDataClick,\n@@ -148,7 +144,7 @@ internal fun TimelineItemRow(\n renderReadReceipts = renderReadReceipts,\n isLastOutgoingMessage = isLastOutgoingMessage,\n focusedEventId = focusedEventId,\n- onClick = onClick,\n+ onClick = onContentClick,\n onLongClick = onLongClick,\n inReplyToClick = inReplyToClick,\n onUserDataClick = onUserDataClick,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemStateEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemStateEventRow.kt\nindex f023a63c359..61726860160 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemStateEventRow.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemStateEventRow.kt\n@@ -72,8 +72,9 @@ fun TimelineItemStateEventRow(\n content = event.content,\n onLinkClick = {},\n hideMediaContent = false,\n- onShowClick = {},\n+ onShowContentClick = {},\n eventSink = eventSink,\n+ onContentClick = {},\n modifier = Modifier.defaultTimelineContentPadding()\n )\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEventContentView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEventContentView.kt\nindex b24a5ca0be5..3a3a43a6fc2 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEventContentView.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEventContentView.kt\n@@ -36,7 +36,8 @@ import io.element.android.libraries.architecture.Presenter\n fun TimelineItemEventContentView(\n content: TimelineItemEventContent,\n hideMediaContent: Boolean,\n- onShowClick: () -> Unit,\n+ onContentClick: () -> Unit,\n+ onShowContentClick: () -> Unit,\n onLinkClick: (url: String) -> Unit,\n eventSink: (TimelineEvents.EventFromTimelineItem) -> Unit,\n modifier: Modifier = Modifier,\n@@ -67,25 +68,31 @@ fun TimelineItemEventContentView(\n )\n is TimelineItemLocationContent -> TimelineItemLocationView(\n content = content,\n+ onContentClick = onContentClick,\n modifier = modifier\n )\n is TimelineItemImageContent -> TimelineItemImageView(\n content = content,\n hideMediaContent = hideMediaContent,\n- onShowClick = onShowClick,\n+ onContentClick = onContentClick,\n+ onShowContentClick = onShowContentClick,\n+ onLinkClick = onLinkClick,\n onContentLayoutChange = onContentLayoutChange,\n modifier = modifier,\n )\n is TimelineItemStickerContent -> TimelineItemStickerView(\n content = content,\n hideMediaContent = hideMediaContent,\n- onShowClick = onShowClick,\n+ onContentClick = onContentClick,\n+ onShowClick = onShowContentClick,\n modifier = modifier,\n )\n is TimelineItemVideoContent -> TimelineItemVideoView(\n content = content,\n hideMediaContent = hideMediaContent,\n- onShowClick = onShowClick,\n+ onContentClick = onContentClick,\n+ onShowContentClick = onShowContentClick,\n+ onLinkClick = onLinkClick,\n onContentLayoutChange = onContentLayoutChange,\n modifier = modifier\n )\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemImageView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemImageView.kt\nindex 63bbac7f6f8..123ba195f1e 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemImageView.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemImageView.kt\n@@ -9,6 +9,7 @@ package io.element.android.features.messages.impl.timeline.components.event\n \n import android.text.SpannedString\n import androidx.compose.foundation.background\n+import androidx.compose.foundation.clickable\n import androidx.compose.foundation.layout.Column\n import androidx.compose.foundation.layout.Spacer\n import androidx.compose.foundation.layout.fillMaxWidth\n@@ -50,7 +51,6 @@ import io.element.android.features.messages.impl.timeline.protection.ProtectedVi\n import io.element.android.libraries.designsystem.components.blurhash.blurHashBackground\n import io.element.android.libraries.designsystem.preview.ElementPreview\n import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n-import io.element.android.libraries.matrix.api.timeline.item.event.MessageFormat\n import io.element.android.libraries.textcomposer.ElementRichTextEditorStyle\n import io.element.android.libraries.ui.strings.CommonStrings\n import io.element.android.wysiwyg.compose.EditorStyledText\n@@ -59,7 +59,9 @@ import io.element.android.wysiwyg.compose.EditorStyledText\n fun TimelineItemImageView(\n content: TimelineItemImageContent,\n hideMediaContent: Boolean,\n- onShowClick: () -> Unit,\n+ onContentClick: () -> Unit,\n+ onLinkClick: (String) -> Unit,\n+ onShowContentClick: () -> Unit,\n onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,\n modifier: Modifier = Modifier,\n ) {\n@@ -78,13 +80,14 @@ fun TimelineItemImageView(\n ) {\n ProtectedView(\n hideContent = hideMediaContent,\n- onShowClick = onShowClick,\n+ onShowClick = onShowContentClick,\n ) {\n var isLoaded by remember { mutableStateOf(false) }\n AsyncImage(\n modifier = Modifier\n .fillMaxWidth()\n- .then(if (isLoaded) Modifier.background(Color.White) else Modifier),\n+ .then(if (isLoaded) Modifier.background(Color.White) else Modifier)\n+ .clickable(onClick = onContentClick),\n model = content.thumbnailMediaRequestData,\n contentScale = ContentScale.Fit,\n alignment = Alignment.Center,\n@@ -99,9 +102,7 @@ fun TimelineItemImageView(\n val caption = if (LocalInspectionMode.current) {\n SpannedString(content.caption)\n } else {\n- content.formattedCaption?.body\n- ?.takeIf { content.formattedCaption.format == MessageFormat.HTML }\n- ?: SpannedString(content.caption)\n+ content.formattedCaption ?: SpannedString(content.caption)\n }\n CompositionLocalProvider(\n LocalContentColor provides ElementTheme.colors.textPrimary,\n@@ -114,6 +115,7 @@ fun TimelineItemImageView(\n .widthIn(min = MIN_HEIGHT_IN_DP.dp * aspectRatio, max = MAX_HEIGHT_IN_DP.dp * aspectRatio),\n text = caption,\n style = ElementRichTextEditorStyle.textStyle(),\n+ onLinkClickedListener = onLinkClick,\n releaseOnDetach = false,\n onTextLayout = ContentAvoidingLayout.measureLegacyLastTextLine(onContentLayoutChange = onContentLayoutChange),\n )\n@@ -128,7 +130,9 @@ internal fun TimelineItemImageViewPreview(@PreviewParameter(TimelineItemImageCon\n TimelineItemImageView(\n content = content,\n hideMediaContent = false,\n- onShowClick = {},\n+ onShowContentClick = {},\n+ onContentClick = {},\n+ onLinkClick = {},\n onContentLayoutChange = {},\n )\n }\n@@ -139,7 +143,9 @@ internal fun TimelineItemImageViewHideMediaContentPreview() = ElementPreview {\n TimelineItemImageView(\n content = aTimelineItemImageContent(),\n hideMediaContent = true,\n- onShowClick = {},\n+ onShowContentClick = {},\n+ onContentClick = {},\n+ onLinkClick = {},\n onContentLayoutChange = {},\n )\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLocationView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLocationView.kt\nindex 91cfcff1d8f..5d402bc8f16 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLocationView.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLocationView.kt\n@@ -7,6 +7,7 @@\n \n package io.element.android.features.messages.impl.timeline.components.event\n \n+import androidx.compose.foundation.clickable\n import androidx.compose.foundation.layout.Column\n import androidx.compose.foundation.layout.fillMaxWidth\n import androidx.compose.foundation.layout.heightIn\n@@ -25,9 +26,10 @@ import io.element.android.libraries.designsystem.theme.components.Text\n @Composable\n fun TimelineItemLocationView(\n content: TimelineItemLocationContent,\n+ onContentClick: () -> Unit,\n modifier: Modifier = Modifier,\n ) {\n- Column(modifier = modifier.fillMaxWidth()) {\n+ Column(modifier = modifier.clickable(onClick = onContentClick).fillMaxWidth()) {\n content.description?.let {\n Text(\n text = it,\n@@ -51,5 +53,8 @@ fun TimelineItemLocationView(\n @Composable\n internal fun TimelineItemLocationViewPreview(@PreviewParameter(TimelineItemLocationContentProvider::class) content: TimelineItemLocationContent) =\n ElementPreview {\n- TimelineItemLocationView(content)\n+ TimelineItemLocationView(\n+ content = content,\n+ onContentClick = {},\n+ )\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStickerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStickerView.kt\nindex 0574843dbaf..df087769ed8 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStickerView.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStickerView.kt\n@@ -8,6 +8,7 @@\n package io.element.android.features.messages.impl.timeline.components.event\n \n import androidx.compose.foundation.background\n+import androidx.compose.foundation.clickable\n import androidx.compose.foundation.layout.Column\n import androidx.compose.foundation.layout.fillMaxSize\n import androidx.compose.runtime.Composable\n@@ -40,6 +41,7 @@ private const val STICKER_SIZE_IN_DP = 128\n fun TimelineItemStickerView(\n content: TimelineItemStickerContent,\n hideMediaContent: Boolean,\n+ onContentClick: () -> Unit,\n onShowClick: () -> Unit,\n modifier: Modifier = Modifier,\n ) {\n@@ -61,7 +63,8 @@ fun TimelineItemStickerView(\n AsyncImage(\n modifier = Modifier\n .fillMaxSize()\n- .then(if (isLoaded) Modifier.background(Color.White) else Modifier),\n+ .then(if (isLoaded) Modifier.background(Color.White) else Modifier)\n+ .clickable(onClick = onContentClick),\n model = MediaRequestData(\n source = content.preferredMediaSource,\n kind = MediaRequestData.Kind.File(\n@@ -85,6 +88,7 @@ internal fun TimelineItemStickerViewPreview(@PreviewParameter(TimelineItemSticke\n TimelineItemStickerView(\n content = content,\n hideMediaContent = false,\n+ onContentClick = {},\n onShowClick = {},\n )\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt\nindex 64e6d00d718..65f59cd631f 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt\n@@ -10,6 +10,7 @@ package io.element.android.features.messages.impl.timeline.components.event\n import android.text.SpannedString\n import androidx.compose.foundation.Image\n import androidx.compose.foundation.background\n+import androidx.compose.foundation.clickable\n import androidx.compose.foundation.layout.Box\n import androidx.compose.foundation.layout.Column\n import androidx.compose.foundation.layout.Spacer\n@@ -56,7 +57,6 @@ import io.element.android.libraries.designsystem.components.blurhash.blurHashBac\n import io.element.android.libraries.designsystem.modifiers.roundedBackground\n import io.element.android.libraries.designsystem.preview.ElementPreview\n import io.element.android.libraries.designsystem.preview.PreviewsDayNight\n-import io.element.android.libraries.matrix.api.timeline.item.event.MessageFormat\n import io.element.android.libraries.matrix.ui.media.MAX_THUMBNAIL_HEIGHT\n import io.element.android.libraries.matrix.ui.media.MAX_THUMBNAIL_WIDTH\n import io.element.android.libraries.matrix.ui.media.MediaRequestData\n@@ -68,7 +68,9 @@ import io.element.android.wysiwyg.compose.EditorStyledText\n fun TimelineItemVideoView(\n content: TimelineItemVideoContent,\n hideMediaContent: Boolean,\n- onShowClick: () -> Unit,\n+ onContentClick: () -> Unit,\n+ onShowContentClick: () -> Unit,\n+ onLinkClick: (String) -> Unit,\n onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,\n modifier: Modifier = Modifier,\n ) {\n@@ -90,13 +92,14 @@ fun TimelineItemVideoView(\n ) {\n ProtectedView(\n hideContent = hideMediaContent,\n- onShowClick = onShowClick,\n+ onShowClick = onShowContentClick,\n ) {\n var isLoaded by remember { mutableStateOf(false) }\n AsyncImage(\n modifier = Modifier\n .fillMaxWidth()\n- .then(if (isLoaded) Modifier.background(Color.White) else Modifier),\n+ .then(if (isLoaded) Modifier.background(Color.White) else Modifier)\n+ .clickable(onClick = onContentClick),\n model = MediaRequestData(\n source = content.thumbnailSource,\n kind = MediaRequestData.Kind.Thumbnail(\n@@ -128,9 +131,7 @@ fun TimelineItemVideoView(\n val caption = if (LocalInspectionMode.current) {\n SpannedString(content.caption)\n } else {\n- content.formattedCaption?.body\n- ?.takeIf { content.formattedCaption.format == MessageFormat.HTML }\n- ?: SpannedString(content.caption)\n+ content.formattedCaption ?: SpannedString(content.caption)\n }\n CompositionLocalProvider(\n LocalContentColor provides ElementTheme.colors.textPrimary,\n@@ -142,6 +143,7 @@ fun TimelineItemVideoView(\n .padding(horizontal = 4.dp) // This is (12.dp - 8.dp) contentPadding from CommonLayout\n .widthIn(min = MIN_HEIGHT_IN_DP.dp * aspectRatio, max = MAX_HEIGHT_IN_DP.dp * aspectRatio),\n text = caption,\n+ onLinkClickedListener = onLinkClick,\n style = ElementRichTextEditorStyle.textStyle(),\n releaseOnDetach = false,\n onTextLayout = ContentAvoidingLayout.measureLegacyLastTextLine(onContentLayoutChange = onContentLayoutChange),\n@@ -157,7 +159,9 @@ internal fun TimelineItemVideoViewPreview(@PreviewParameter(TimelineItemVideoCon\n TimelineItemVideoView(\n content = content,\n hideMediaContent = false,\n- onShowClick = {},\n+ onShowContentClick = {},\n+ onContentClick = {},\n+ onLinkClick = {},\n onContentLayoutChange = {},\n )\n }\n@@ -168,7 +172,9 @@ internal fun TimelineItemVideoViewHideMediaContentPreview() = ElementPreview {\n TimelineItemVideoView(\n content = aTimelineItemVideoContent(),\n hideMediaContent = true,\n- onShowClick = {},\n+ onShowContentClick = {},\n+ onContentClick = {},\n+ onLinkClick = {},\n onContentLayoutChange = {},\n )\n }\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt\nindex 001d40b254f..ff5ca57c113 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt\n@@ -86,7 +86,7 @@ class TimelineItemContentMessageFactory @Inject constructor(\n TimelineItemImageContent(\n filename = messageType.filename,\n caption = messageType.caption?.trimEnd(),\n- formattedCaption = messageType.formattedCaption,\n+ formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(),\n mediaSource = messageType.source,\n thumbnailSource = messageType.info?.thumbnailSource,\n mimeType = messageType.info?.mimetype ?: MimeTypes.OctetStream,\n@@ -105,7 +105,7 @@ class TimelineItemContentMessageFactory @Inject constructor(\n TimelineItemStickerContent(\n filename = messageType.filename,\n caption = messageType.caption?.trimEnd(),\n- formattedCaption = messageType.formattedCaption,\n+ formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(),\n mediaSource = messageType.source,\n thumbnailSource = messageType.info?.thumbnailSource,\n mimeType = messageType.info?.mimetype ?: MimeTypes.OctetStream,\n@@ -142,7 +142,7 @@ class TimelineItemContentMessageFactory @Inject constructor(\n TimelineItemVideoContent(\n filename = messageType.filename,\n caption = messageType.caption?.trimEnd(),\n- formattedCaption = messageType.formattedCaption,\n+ formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(),\n thumbnailSource = messageType.info?.thumbnailSource,\n videoSource = messageType.source,\n mimeType = messageType.info?.mimetype ?: MimeTypes.OctetStream,\n@@ -161,7 +161,7 @@ class TimelineItemContentMessageFactory @Inject constructor(\n TimelineItemAudioContent(\n filename = messageType.filename,\n caption = messageType.caption?.trimEnd(),\n- formattedCaption = messageType.formattedCaption,\n+ formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(),\n mediaSource = messageType.source,\n duration = messageType.info?.duration ?: Duration.ZERO,\n mimeType = messageType.info?.mimetype ?: MimeTypes.OctetStream,\n@@ -176,7 +176,7 @@ class TimelineItemContentMessageFactory @Inject constructor(\n eventId = eventId,\n filename = messageType.filename,\n caption = messageType.caption?.trimEnd(),\n- formattedCaption = messageType.formattedCaption,\n+ formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(),\n mediaSource = messageType.source,\n duration = messageType.info?.duration ?: Duration.ZERO,\n mimeType = messageType.info?.mimetype ?: MimeTypes.OctetStream,\n@@ -187,7 +187,7 @@ class TimelineItemContentMessageFactory @Inject constructor(\n TimelineItemAudioContent(\n filename = messageType.filename,\n caption = messageType.caption?.trimEnd(),\n- formattedCaption = messageType.formattedCaption,\n+ formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(),\n mediaSource = messageType.source,\n duration = messageType.info?.duration ?: Duration.ZERO,\n mimeType = messageType.info?.mimetype ?: MimeTypes.OctetStream,\n@@ -202,7 +202,7 @@ class TimelineItemContentMessageFactory @Inject constructor(\n TimelineItemFileContent(\n filename = messageType.filename,\n caption = messageType.caption?.trimEnd(),\n- formattedCaption = messageType.formattedCaption,\n+ formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(),\n thumbnailSource = messageType.info?.thumbnailSource,\n fileSource = messageType.source,\n mimeType = messageType.info?.mimetype ?: MimeTypes.fromFileExtension(fileExtension),\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt\nindex dcf0e16aa83..e2c81a3794e 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt\n@@ -9,8 +9,10 @@ package io.element.android.features.messages.impl.timeline.model\n \n import androidx.compose.runtime.Immutable\n import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent\n+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent\n import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStickerContent\n import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextBasedContent\n+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent\n import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemVirtualModel\n import io.element.android.libraries.designsystem.components.avatar.AvatarData\n import io.element.android.libraries.matrix.api.core.EventId\n@@ -93,6 +95,17 @@ sealed interface TimelineItem {\n \n val isRemote = eventId != null\n \n+ /** Whether a click on any part of the event bubble should trigger the 'onContentClick' callback.\n+ *\n+ * This is `true` for all events except for visual media events with a caption or formatted caption.\n+ */\n+ val isWholeContentClickable = when (content) {\n+ is TimelineItemStickerContent -> content.formattedCaption == null && content.caption == null\n+ is TimelineItemImageContent -> content.formattedCaption == null && content.caption == null\n+ is TimelineItemVideoContent -> content.formattedCaption == null && content.caption == null\n+ else -> true\n+ }\n+\n val eventOrTransactionId: EventOrTransactionId\n get() = EventOrTransactionId.from(eventId = eventId, transactionId = transactionId)\n \ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContent.kt\nindex fa2957b8604..0ecf45ec55b 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContent.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContent.kt\n@@ -8,14 +8,13 @@\n package io.element.android.features.messages.impl.timeline.model.event\n \n import io.element.android.libraries.matrix.api.media.MediaSource\n-import io.element.android.libraries.matrix.api.timeline.item.event.FormattedBody\n import io.element.android.libraries.mediaviewer.api.helper.formatFileExtensionAndSize\n import kotlin.time.Duration\n \n data class TimelineItemAudioContent(\n override val filename: String,\n override val caption: String?,\n- override val formattedCaption: FormattedBody?,\n+ override val formattedCaption: CharSequence?,\n val duration: Duration,\n val mediaSource: MediaSource,\n val mimeType: String,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt\nindex 10204a75d8b..fafadcbf79d 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt\n@@ -8,7 +8,6 @@\n package io.element.android.features.messages.impl.timeline.model.event\n \n import androidx.compose.runtime.Immutable\n-import io.element.android.libraries.matrix.api.timeline.item.event.FormattedBody\n \n @Immutable\n sealed interface TimelineItemEventContent {\n@@ -19,7 +18,7 @@ sealed interface TimelineItemEventContent {\n sealed interface TimelineItemEventContentWithAttachment : TimelineItemEventContent {\n val filename: String\n val caption: String?\n- val formattedCaption: FormattedBody?\n+ val formattedCaption: CharSequence?\n \n val bestDescription: String\n get() = caption ?: filename\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContent.kt\nindex f11325727cc..b7007c8bbca 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContent.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContent.kt\n@@ -8,13 +8,12 @@\n package io.element.android.features.messages.impl.timeline.model.event\n \n import io.element.android.libraries.matrix.api.media.MediaSource\n-import io.element.android.libraries.matrix.api.timeline.item.event.FormattedBody\n import io.element.android.libraries.mediaviewer.api.helper.formatFileExtensionAndSize\n \n data class TimelineItemFileContent(\n override val filename: String,\n override val caption: String?,\n- override val formattedCaption: FormattedBody?,\n+ override val formattedCaption: CharSequence?,\n val fileSource: MediaSource,\n val thumbnailSource: MediaSource?,\n val formattedFileSize: String,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContent.kt\nindex e6e4bffb9b2..b13c7a4e377 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContent.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContent.kt\n@@ -9,7 +9,6 @@ package io.element.android.features.messages.impl.timeline.model.event\n \n import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeAnimatedImage\n import io.element.android.libraries.matrix.api.media.MediaSource\n-import io.element.android.libraries.matrix.api.timeline.item.event.FormattedBody\n import io.element.android.libraries.matrix.ui.media.MAX_THUMBNAIL_HEIGHT\n import io.element.android.libraries.matrix.ui.media.MAX_THUMBNAIL_WIDTH\n import io.element.android.libraries.matrix.ui.media.MediaRequestData\n@@ -17,7 +16,7 @@ import io.element.android.libraries.matrix.ui.media.MediaRequestData\n data class TimelineItemImageContent(\n override val filename: String,\n override val caption: String?,\n- override val formattedCaption: FormattedBody?,\n+ override val formattedCaption: CharSequence?,\n val mediaSource: MediaSource,\n val thumbnailSource: MediaSource?,\n val formattedFileSize: String,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStickerContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStickerContent.kt\nindex 3476d97e2fc..06886307ae6 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStickerContent.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStickerContent.kt\n@@ -8,12 +8,11 @@\n package io.element.android.features.messages.impl.timeline.model.event\n \n import io.element.android.libraries.matrix.api.media.MediaSource\n-import io.element.android.libraries.matrix.api.timeline.item.event.FormattedBody\n \n data class TimelineItemStickerContent(\n override val filename: String,\n override val caption: String?,\n- override val formattedCaption: FormattedBody?,\n+ override val formattedCaption: CharSequence?,\n val mediaSource: MediaSource,\n val thumbnailSource: MediaSource?,\n val formattedFileSize: String,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContent.kt\nindex 5c0e601708d..486a71b5d43 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContent.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContent.kt\n@@ -8,13 +8,12 @@\n package io.element.android.features.messages.impl.timeline.model.event\n \n import io.element.android.libraries.matrix.api.media.MediaSource\n-import io.element.android.libraries.matrix.api.timeline.item.event.FormattedBody\n import kotlin.time.Duration\n \n data class TimelineItemVideoContent(\n override val filename: String,\n override val caption: String?,\n- override val formattedCaption: FormattedBody?,\n+ override val formattedCaption: CharSequence?,\n val duration: Duration,\n val videoSource: MediaSource,\n val thumbnailSource: MediaSource?,\ndiff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContent.kt\nindex 853cc01045f..ebeabef7150 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContent.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContent.kt\n@@ -9,7 +9,6 @@ package io.element.android.features.messages.impl.timeline.model.event\n \n import io.element.android.libraries.matrix.api.core.EventId\n import io.element.android.libraries.matrix.api.media.MediaSource\n-import io.element.android.libraries.matrix.api.timeline.item.event.FormattedBody\n import kotlinx.collections.immutable.ImmutableList\n import kotlin.time.Duration\n \n@@ -17,7 +16,7 @@ data class TimelineItemVoiceContent(\n val eventId: EventId?,\n override val filename: String,\n override val caption: String?,\n- override val formattedCaption: FormattedBody?,\n+ override val formattedCaption: CharSequence?,\n val duration: Duration,\n val mediaSource: MediaSource,\n val mimeType: String,\n", "test_patch": "diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt\nindex a20acaa5df0..c040ce99264 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt\n@@ -529,7 +529,7 @@ private fun AndroidComposeTestRule.setMessa\n state = state,\n onBackClick = onBackClick,\n onRoomDetailsClick = onRoomDetailsClick,\n- onEventClick = onEventClick,\n+ onEventContentClick = onEventClick,\n onUserDataClick = onUserDataClick,\n onLinkClick = onLinkClick,\n onPreviewAttachments = onPreviewAttachments,\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewTest.kt\nindex 315abd83020..6a7b49c34c6 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewTest.kt\n@@ -158,7 +158,7 @@ private fun AndroidComposeTestRule.setTimel\n timelineProtectionState = timelineProtectionState,\n onUserDataClick = onUserDataClick,\n onLinkClick = onLinkClick,\n- onMessageClick = onMessageClick,\n+ onContentClick = onMessageClick,\n onMessageLongClick = onMessageLongClick,\n onSwipeToReply = onSwipeToReply,\n onReactionClick = onReactionClick,\ndiff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt\nindex e9343bf21d0..a34e601e5da 100644\n--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt\n+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt\n@@ -286,7 +286,7 @@ class TimelineItemContentMessageFactoryTest {\n val expected = TimelineItemVideoContent(\n filename = \"body.mp4\",\n caption = \"body.mp4 caption\",\n- formattedCaption = FormattedBody(MessageFormat.HTML, \"formatted\"),\n+ formattedCaption = SpannedString(\"formatted\"),\n duration = 1.minutes,\n videoSource = MediaSource(url = \"url\", json = null),\n thumbnailSource = MediaSource(\"url_thumbnail\"),\n@@ -527,7 +527,7 @@ class TimelineItemContentMessageFactoryTest {\n )\n val expected = TimelineItemImageContent(\n filename = \"body.jpg\",\n- formattedCaption = FormattedBody(MessageFormat.HTML, \"formatted\"),\n+ formattedCaption = SpannedString(\"formatted\"),\n caption = \"body.jpg caption\",\n mediaSource = MediaSource(url = \"url\", json = null),\n thumbnailSource = MediaSource(\"url_thumbnail\"),\n", "n2p_tests": "{}", "f2p_tests": "{\"io.element.android.features.messages.impl.MessagesViewTest.clicking on more reaction from action list emits the expected Event\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on verified user send failure from action list emits the expected Event\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on create poll invoke expected callback\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.selecting a action on a message emits the expected Event\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.long clicking on an Event emits the expected Event userHasPermissionToRedactOther\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.long clicking on an Event emits the expected Event userHasPermissionToSendMessage\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on more reaction emits the expected Event\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on a read receipt list emits the expected Event\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.swiping on an Event emits no Event if user does not have permission to send message\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on an Event invoke expected callback\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.long clicking on an Event emits the expected Event userHasPermissionToSendReaction\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.swiping on an Event emits the expected Event\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on pinned messages banner emits the expected Event\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on a reaction emits the expected Event\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on room name invoke expected callback\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on join call invoke expected callback\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on back invoke expected callback\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on the sender of an Event invoke expected callback\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.long clicking on a reaction emits the expected Event\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on a custom emoji emits the expected Events\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.clicking on send location invoke expected callback\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.MessagesViewTest.long clicking on an Event emits the expected Event userHasPermissionToRedactOwn\": {\"run\": \"FAIL\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create TextMessageType with unknown formatted body does nothing\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create LocationMessageType not null\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create VideoMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create VoiceMessageType feature disabled\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create TextMessageType with HTML formatted body\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create FileMessageType with info\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create StickerMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.a message with existing URLSpans keeps it after linkification\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create VideoMessageType with info\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create ImageMessageType with info\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create AudioMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create EmoteMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create EmoteMessageType with HTML formatted body\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create AudioMessageType with info\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.TimelineViewTest.reaching the end of the timeline with more events to load emits a LoadMore event\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.TimelineViewTest.scroll to bottom on detached timeline emits the expected Event\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.TimelineViewTest.scroll to bottom on live timeline does not emit the Event\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create ImageMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create OtherMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.TimelineViewTest.reaching the end of the timeline does not send a LoadMore event\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create FileMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.a message with plain URL in a formatted body Spanned format gets linkified too\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create NoticeMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create TextMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create LocationMessageType null\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.TimelineViewTest.hide shield dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.TimelineViewTest.show shield dialog\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create TextMessageType with simple link\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create VoiceMessageType with info\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create NoticeMessageType with HTML formatted body\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.a message with plain URL in a formatted body with plain text format gets linkified too\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentMessageFactoryTest.test create VoiceMessageType\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-3829", "org": "element-hq", "repo": "element-x-android", "number": 3829, "state": "closed", "title": "Verification UI / UX iteration", "body": "\r\n \r\n## Content\r\n\r\n\r\nIterate on a few screens of the verification flows\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #3824\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\nSee the recorded screenshots\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Perform a login followed by a session verification using another device\r\n- From an other device, perform a session verification flow.\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 23\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"a6fedbafbdbea7c37399fe67deb362a04097a5ad\"}", "resolved_issues": "[{\"number\": 3824, \"title\": \"Incoming verification iteration\", \"body\": \"- [ ] Verification cancelled: show the error screen.\\r\\n- [x] Add new intermediate screen:\\r\\n\\\"image\\\"\\r\\n\\r\\n- [ ] Check this screen copy:\\r\\n\\\"image\\\"\\r\\n\"}]", "lang": "kotlin", "problem_statement": "Incoming verification iteration\n- [ ] Verification cancelled: show the error screen.\r\n- [x] Add new intermediate screen:\r\n\"image\"\r\n\r\n- [ ] Check this screen copy:\r\n\"image\"\r\n\n", "hints": NaN, "pull_url": "https://github.com/element-hq/element-x-android/pull/3829", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/3824\"]", "test_command": "./gradlew :features:verifysession:impl:testDebugUnitTest --tests \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest\"", "fix_patch": "diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt\nindex cc2c9fbd2d0..e8f098f848e 100644\n--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt\n+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt\n@@ -80,14 +80,14 @@ fun IncomingVerificationView(\n @Composable\n private fun IncomingVerificationHeader(step: Step) {\n val iconStyle = when (step) {\n- Step.Canceled,\n+ Step.Canceled -> BigIcon.Style.AlertSolid\n is Step.Initial -> BigIcon.Style.Default(CompoundIcons.LockSolid())\n is Step.Verifying -> BigIcon.Style.Default(CompoundIcons.Reaction())\n Step.Completed -> BigIcon.Style.SuccessSolid\n Step.Failure -> BigIcon.Style.AlertSolid\n }\n val titleTextId = when (step) {\n- Step.Canceled -> CommonStrings.common_verification_cancelled\n+ Step.Canceled -> R.string.screen_session_verification_request_failure_title\n is Step.Initial -> R.string.screen_session_verification_request_title\n is Step.Verifying -> when (step.data) {\n is SessionVerificationData.Decimals -> R.string.screen_session_verification_compare_numbers_title\n@@ -97,7 +97,7 @@ private fun IncomingVerificationHeader(step: Step) {\n Step.Failure -> R.string.screen_session_verification_request_failure_title\n }\n val subtitleTextId = when (step) {\n- Step.Canceled -> R.string.screen_session_verification_cancelled_subtitle\n+ Step.Canceled -> R.string.screen_session_verification_request_failure_subtitle\n is Step.Initial -> R.string.screen_session_verification_request_subtitle\n is Step.Verifying -> when (step.data) {\n is SessionVerificationData.Decimals -> R.string.screen_session_verification_compare_numbers_subtitle\ndiff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionPresenter.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionPresenter.kt\nindex 360bf648750..97778b322b1 100644\n--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionPresenter.kt\n+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionPresenter.kt\n@@ -104,6 +104,7 @@ class VerifySelfSessionPresenter @AssistedInject constructor(\n fun handleEvents(event: VerifySelfSessionViewEvents) {\n Timber.d(\"Verification user action: ${event::class.simpleName}\")\n when (event) {\n+ VerifySelfSessionViewEvents.UseAnotherDevice -> stateAndDispatch.dispatchAction(StateMachineEvent.UseAnotherDevice)\n VerifySelfSessionViewEvents.RequestVerification -> stateAndDispatch.dispatchAction(StateMachineEvent.RequestVerification)\n VerifySelfSessionViewEvents.StartSasVerification -> stateAndDispatch.dispatchAction(StateMachineEvent.StartSasVerification)\n VerifySelfSessionViewEvents.ConfirmVerification -> stateAndDispatch.dispatchAction(StateMachineEvent.AcceptChallenge)\n@@ -134,6 +135,9 @@ class VerifySelfSessionPresenter @AssistedInject constructor(\n isLastDevice = encryptionService.isLastDevice.value\n )\n }\n+ VerifySelfSessionStateMachine.State.UseAnotherDevice -> {\n+ VerifySelfSessionState.Step.UseAnotherDevice\n+ }\n StateMachineState.RequestingVerification,\n StateMachineState.StartingSasVerification,\n StateMachineState.SasVerificationStarted,\ndiff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionState.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionState.kt\nindex e763305caa2..32664b347f0 100644\n--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionState.kt\n+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionState.kt\n@@ -26,6 +26,7 @@ data class VerifySelfSessionState(\n \n // FIXME canEnterRecoveryKey value is never read.\n data class Initial(val canEnterRecoveryKey: Boolean, val isLastDevice: Boolean = false) : Step\n+ data object UseAnotherDevice : Step\n data object Canceled : Step\n data object AwaitingOtherDeviceResponse : Step\n data object Ready : Step\ndiff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionStateMachine.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionStateMachine.kt\nindex f423b14aae3..a67cc4d3318 100644\n--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionStateMachine.kt\n+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionStateMachine.kt\n@@ -38,12 +38,14 @@ class VerifySelfSessionStateMachine @Inject constructor(\n init {\n spec {\n inState {\n+ on { _: Event.UseAnotherDevice, state ->\n+ state.override { State.UseAnotherDevice.andLogStateChange() }\n+ }\n+ }\n+ inState {\n on { _: Event.RequestVerification, state ->\n state.override { State.RequestingVerification.andLogStateChange() }\n }\n- on { _: Event.StartSasVerification, state ->\n- state.override { State.StartingSasVerification.andLogStateChange() }\n- }\n }\n inState {\n onEnterEffect {\n@@ -64,9 +66,6 @@ class VerifySelfSessionStateMachine @Inject constructor(\n }\n }\n inState {\n- on { _: Event.RequestVerification, state ->\n- state.override { State.RequestingVerification.andLogStateChange() }\n- }\n on { _: Event.Reset, state ->\n state.override { State.Initial.andLogStateChange() }\n }\n@@ -119,6 +118,7 @@ class VerifySelfSessionStateMachine @Inject constructor(\n on { _: Event.Cancel, state: MachineState ->\n when (state.snapshot) {\n State.Initial, State.Completed, State.Canceled -> state.noChange()\n+ State.UseAnotherDevice -> state.override { State.Initial.andLogStateChange() }\n // For some reason `cancelVerification` is not calling its delegate `didCancel` method so we don't pass from\n // `Canceling` state to `Canceled` automatically anymore\n else -> {\n@@ -144,6 +144,9 @@ class VerifySelfSessionStateMachine @Inject constructor(\n /** The initial state, before verification started. */\n data object Initial : State\n \n+ /** Let the user know that they need to get ready on their other session. */\n+ data object UseAnotherDevice : State\n+\n /** Waiting for verification acceptance. */\n data object RequestingVerification : State\n \n@@ -175,6 +178,9 @@ class VerifySelfSessionStateMachine @Inject constructor(\n }\n \n sealed interface Event {\n+ /** User wants to use another session. */\n+ data object UseAnotherDevice : Event\n+\n /** Request verification. */\n data object RequestVerification : Event\n \ndiff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionStateProvider.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionStateProvider.kt\nindex 8cb60a822f7..b9de96aae48 100644\n--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionStateProvider.kt\n+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionStateProvider.kt\n@@ -56,6 +56,9 @@ open class VerifySelfSessionStateProvider : PreviewParameterProvider state.eventSink(VerifySelfSessionViewEvents.Reset)\n- is Step.AwaitingOtherDeviceResponse, Step.Ready -> state.eventSink(VerifySelfSessionViewEvents.Cancel)\n+ is Step.AwaitingOtherDeviceResponse,\n+ Step.UseAnotherDevice,\n+ Step.Ready -> state.eventSink(VerifySelfSessionViewEvents.Cancel)\n is Step.Verifying -> {\n if (!step.state.isLoading()) {\n state.eventSink(VerifySelfSessionViewEvents.DeclineVerification)\n@@ -159,7 +161,9 @@ fun VerifySelfSessionView(\n private fun VerifySelfSessionHeader(step: Step) {\n val iconStyle = when (step) {\n Step.Loading -> error(\"Should not happen\")\n- is Step.Initial, Step.AwaitingOtherDeviceResponse -> BigIcon.Style.Default(CompoundIcons.LockSolid())\n+ is Step.Initial -> BigIcon.Style.Default(CompoundIcons.LockSolid())\n+ Step.UseAnotherDevice -> BigIcon.Style.Default(CompoundIcons.Devices())\n+ Step.AwaitingOtherDeviceResponse -> BigIcon.Style.Default(CompoundIcons.Devices())\n Step.Canceled -> BigIcon.Style.AlertSolid\n Step.Ready, is Step.Verifying -> BigIcon.Style.Default(CompoundIcons.Reaction())\n Step.Completed -> BigIcon.Style.SuccessSolid\n@@ -167,8 +171,10 @@ private fun VerifySelfSessionHeader(step: Step) {\n }\n val titleTextId = when (step) {\n Step.Loading -> error(\"Should not happen\")\n- is Step.Initial, Step.AwaitingOtherDeviceResponse -> R.string.screen_identity_confirmation_title\n- Step.Canceled -> CommonStrings.common_verification_cancelled\n+ is Step.Initial -> R.string.screen_identity_confirmation_title\n+ Step.UseAnotherDevice -> R.string.screen_session_verification_use_another_device_title\n+ Step.AwaitingOtherDeviceResponse -> R.string.screen_session_verification_waiting_another_device_title\n+ Step.Canceled -> CommonStrings.common_verification_failed\n Step.Ready -> R.string.screen_session_verification_compare_emojis_title\n Step.Completed -> R.string.screen_identity_confirmed_title\n is Step.Verifying -> when (step.data) {\n@@ -179,8 +185,10 @@ private fun VerifySelfSessionHeader(step: Step) {\n }\n val subtitleTextId = when (step) {\n Step.Loading -> error(\"Should not happen\")\n- is Step.Initial, Step.AwaitingOtherDeviceResponse -> R.string.screen_identity_confirmation_subtitle\n- Step.Canceled -> R.string.screen_session_verification_cancelled_subtitle\n+ is Step.Initial -> R.string.screen_identity_confirmation_subtitle\n+ Step.UseAnotherDevice -> R.string.screen_session_verification_use_another_device_subtitle\n+ Step.AwaitingOtherDeviceResponse -> R.string.screen_session_verification_waiting_another_device_subtitle\n+ Step.Canceled -> R.string.screen_session_verification_failed_subtitle\n Step.Ready -> R.string.screen_session_verification_ready_subtitle\n Step.Completed -> R.string.screen_identity_confirmed_subtitle\n is Step.Verifying -> when (step.data) {\n@@ -252,7 +260,7 @@ private fun VerifySelfSessionBottomMenu(\n Button(\n modifier = Modifier.fillMaxWidth(),\n text = stringResource(R.string.screen_identity_use_another_device),\n- onClick = { eventSink(VerifySelfSessionViewEvents.RequestVerification) },\n+ onClick = { eventSink(VerifySelfSessionViewEvents.UseAnotherDevice) },\n )\n }\n Button(\n@@ -267,18 +275,26 @@ private fun VerifySelfSessionBottomMenu(\n )\n }\n }\n- is Step.Canceled -> {\n+ is Step.UseAnotherDevice -> {\n VerificationBottomMenu {\n Button(\n modifier = Modifier.fillMaxWidth(),\n- text = stringResource(R.string.screen_session_verification_positive_button_canceled),\n+ text = stringResource(CommonStrings.action_start_verification),\n onClick = { eventSink(VerifySelfSessionViewEvents.RequestVerification) },\n )\n- TextButton(\n+ // Placeholder so the 1st button keeps its vertical position\n+ Spacer(modifier = Modifier.height(40.dp))\n+ }\n+ }\n+ is Step.Canceled -> {\n+ VerificationBottomMenu {\n+ Button(\n modifier = Modifier.fillMaxWidth(),\n- text = stringResource(CommonStrings.action_cancel),\n+ text = stringResource(CommonStrings.action_done),\n onClick = onCancelClick,\n )\n+ // Placeholder so the 1st button keeps its vertical position\n+ Spacer(modifier = Modifier.height(40.dp))\n }\n }\n is Step.Ready -> {\n@@ -302,6 +318,7 @@ private fun VerifySelfSessionBottomMenu(\n text = stringResource(R.string.screen_identity_waiting_on_other_device),\n onClick = {},\n showProgress = true,\n+ enabled = false,\n )\n // Placeholder so the 1st button keeps its vertical position\n Spacer(modifier = Modifier.height(40.dp))\ndiff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionViewEvents.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionViewEvents.kt\nindex 869bdc7051b..b4af38f7801 100644\n--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionViewEvents.kt\n+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionViewEvents.kt\n@@ -8,6 +8,7 @@\n package io.element.android.features.verifysession.impl.outgoing\n \n sealed interface VerifySelfSessionViewEvents {\n+ data object UseAnotherDevice : VerifySelfSessionViewEvents\n data object RequestVerification : VerifySelfSessionViewEvents\n data object StartSasVerification : VerifySelfSessionViewEvents\n data object ConfirmVerification : VerifySelfSessionViewEvents\ndiff --git a/features/verifysession/impl/src/main/res/values/localazy.xml b/features/verifysession/impl/src/main/res/values/localazy.xml\nindex f67a2024b92..db18590cbe2 100644\n--- a/features/verifysession/impl/src/main/res/values/localazy.xml\n+++ b/features/verifysession/impl/src/main/res/values/localazy.xml\n@@ -35,6 +35,10 @@\n \"Verification requested\"\n \"They don\u2019t match\"\n \"They match\"\n+ \"Make sure you have the app open in the other device before starting verification from here.\"\n+ \"Open the app on another verified device\"\n+ \"You should see a popup on the other device. Start the verification from there now.\"\n+ \"Start verification on the other device\"\n \"Accept the request to start the verification process in your other session to continue.\"\n \"Waiting to accept request\"\n \"Signing out\u2026\"\n", "test_patch": "diff --git a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionPresenterTest.kt b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionPresenterTest.kt\nindex bfdf27ee5d2..d8fe2f671c5 100644\n--- a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionPresenterTest.kt\n+++ b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionPresenterTest.kt\n@@ -7,10 +7,7 @@\n \n package io.element.android.features.verifysession.impl.outgoing\n \n-import app.cash.molecule.RecompositionMode\n-import app.cash.molecule.moleculeFlow\n import app.cash.turbine.ReceiveTurbine\n-import app.cash.turbine.test\n import com.google.common.truth.Truth.assertThat\n import io.element.android.features.logout.api.LogoutUseCase\n import io.element.android.features.logout.test.FakeLogoutUseCase\n@@ -33,6 +30,7 @@ import io.element.android.tests.testutils.WarmUpRule\n import io.element.android.tests.testutils.lambda.lambdaError\n import io.element.android.tests.testutils.lambda.lambdaRecorder\n import io.element.android.tests.testutils.lambda.value\n+import io.element.android.tests.testutils.test\n import kotlinx.coroutines.ExperimentalCoroutinesApi\n import kotlinx.coroutines.test.runTest\n import org.junit.Rule\n@@ -48,9 +46,7 @@ class VerifySelfSessionPresenterTest {\n val presenter = createVerifySelfSessionPresenter(\n service = unverifiedSessionService(),\n )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n awaitItem().run {\n assertThat(step).isEqualTo(Step.Initial(false))\n assertThat(displaySkipButton).isTrue()\n@@ -65,9 +61,7 @@ class VerifySelfSessionPresenterTest {\n service = unverifiedSessionService(),\n buildMeta = buildMeta,\n )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n assertThat(awaitItem().displaySkipButton).isFalse()\n }\n }\n@@ -83,9 +77,7 @@ class VerifySelfSessionPresenterTest {\n emitRecoveryState(RecoveryState.INCOMPLETE)\n }\n )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n assertThat(awaitItem().step).isEqualTo(Step.Initial(true))\n resetLambda.assertions().isCalledOnce().with(value(true))\n }\n@@ -100,9 +92,7 @@ class VerifySelfSessionPresenterTest {\n emitRecoveryState(RecoveryState.INCOMPLETE)\n }\n )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n assertThat(awaitItem().step).isEqualTo(Step.Initial(canEnterRecoveryKey = true, isLastDevice = true))\n }\n }\n@@ -114,43 +104,17 @@ class VerifySelfSessionPresenterTest {\n startVerificationLambda = { },\n )\n val presenter = createVerifySelfSessionPresenter(service)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n requestVerificationAndAwaitVerifyingState(service)\n }\n }\n \n- @Test\n- fun `present - Handles startSasVerification`() = runTest {\n- val service = unverifiedSessionService(\n- startVerificationLambda = { },\n- )\n- val presenter = createVerifySelfSessionPresenter(service)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n- val initialState = awaitItem()\n- assertThat(initialState.step).isEqualTo(Step.Initial(false))\n- initialState.eventSink(VerifySelfSessionViewEvents.StartSasVerification)\n- // Await for other device response:\n- assertThat(awaitItem().step).isEqualTo(Step.AwaitingOtherDeviceResponse)\n- service.emitVerificationFlowState(VerificationFlowState.DidStartSasVerification)\n- // ChallengeReceived:\n- service.emitVerificationFlowState(VerificationFlowState.DidReceiveVerificationData(SessionVerificationData.Emojis(emptyList())))\n- val verifyingState = awaitItem()\n- assertThat(verifyingState.step).isInstanceOf(Step.Verifying::class.java)\n- }\n- }\n-\n @Test\n fun `present - Cancellation on initial state does nothing`() = runTest {\n val presenter = createVerifySelfSessionPresenter(\n service = unverifiedSessionService(),\n )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n val initialState = awaitItem()\n assertThat(initialState.step).isEqualTo(Step.Initial(false))\n val eventSink = initialState.eventSink\n@@ -167,9 +131,7 @@ class VerifySelfSessionPresenterTest {\n approveVerificationLambda = { },\n )\n val presenter = createVerifySelfSessionPresenter(service)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n val state = requestVerificationAndAwaitVerifyingState(service)\n state.eventSink(VerifySelfSessionViewEvents.ConfirmVerification)\n // Cancelling\n@@ -186,9 +148,8 @@ class VerifySelfSessionPresenterTest {\n requestVerificationLambda = { },\n )\n val presenter = createVerifySelfSessionPresenter(service)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n+ awaitItem().eventSink(VerifySelfSessionViewEvents.UseAnotherDevice)\n awaitItem().eventSink(VerifySelfSessionViewEvents.RequestVerification)\n service.emitVerificationFlowState(VerificationFlowState.DidFail)\n assertThat(awaitItem().step).isInstanceOf(Step.AwaitingOtherDeviceResponse::class.java)\n@@ -204,9 +165,7 @@ class VerifySelfSessionPresenterTest {\n cancelVerificationLambda = { },\n )\n val presenter = createVerifySelfSessionPresenter(service)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n val state = requestVerificationAndAwaitVerifyingState(service)\n state.eventSink(VerifySelfSessionViewEvents.Cancel)\n assertThat(awaitItem().step).isEqualTo(Step.Canceled)\n@@ -220,35 +179,13 @@ class VerifySelfSessionPresenterTest {\n startVerificationLambda = { },\n )\n val presenter = createVerifySelfSessionPresenter(service)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n requestVerificationAndAwaitVerifyingState(service)\n service.emitVerificationFlowState(VerificationFlowState.DidReceiveVerificationData(SessionVerificationData.Emojis(emptyList())))\n ensureAllEventsConsumed()\n }\n }\n \n- @Test\n- fun `present - Restart after cancellation returns to requesting verification`() = runTest {\n- val service = unverifiedSessionService(\n- requestVerificationLambda = { },\n- startVerificationLambda = { },\n- )\n- val presenter = createVerifySelfSessionPresenter(service)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n- val state = requestVerificationAndAwaitVerifyingState(service)\n- service.emitVerificationFlowState(VerificationFlowState.DidCancel)\n- assertThat(awaitItem().step).isEqualTo(Step.Canceled)\n- state.eventSink(VerifySelfSessionViewEvents.RequestVerification)\n- // Went back to requesting verification\n- assertThat(awaitItem().step).isEqualTo(Step.AwaitingOtherDeviceResponse)\n- cancelAndIgnoreRemainingEvents()\n- }\n- }\n-\n @Test\n fun `present - Go back after cancellation returns to initial state`() = runTest {\n val service = unverifiedSessionService(\n@@ -256,9 +193,7 @@ class VerifySelfSessionPresenterTest {\n startVerificationLambda = { },\n )\n val presenter = createVerifySelfSessionPresenter(service)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n val state = requestVerificationAndAwaitVerifyingState(service)\n service.emitVerificationFlowState(VerificationFlowState.DidCancel)\n assertThat(awaitItem().step).isEqualTo(Step.Canceled)\n@@ -280,9 +215,7 @@ class VerifySelfSessionPresenterTest {\n approveVerificationLambda = { },\n )\n val presenter = createVerifySelfSessionPresenter(service)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n val state = requestVerificationAndAwaitVerifyingState(\n service,\n SessionVerificationData.Emojis(emojis)\n@@ -307,9 +240,7 @@ class VerifySelfSessionPresenterTest {\n declineVerificationLambda = { },\n )\n val presenter = createVerifySelfSessionPresenter(service)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n val state = requestVerificationAndAwaitVerifyingState(service)\n state.eventSink(VerifySelfSessionViewEvents.DeclineVerification)\n assertThat(awaitItem().step).isEqualTo(\n@@ -330,9 +261,7 @@ class VerifySelfSessionPresenterTest {\n startVerificationLambda = { },\n )\n val presenter = createVerifySelfSessionPresenter(service)\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n val state = requestVerificationAndAwaitVerifyingState(service)\n state.eventSink(VerifySelfSessionViewEvents.SkipVerification)\n assertThat(awaitItem().step).isEqualTo(Step.Skipped)\n@@ -352,9 +281,7 @@ class VerifySelfSessionPresenterTest {\n service = service,\n showDeviceVerifiedScreen = true,\n )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n assertThat(awaitItem().step).isEqualTo(Step.Completed)\n }\n }\n@@ -372,9 +299,7 @@ class VerifySelfSessionPresenterTest {\n service = service,\n showDeviceVerifiedScreen = false,\n )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n skipItems(1)\n assertThat(awaitItem().step).isEqualTo(Step.Skipped)\n }\n@@ -394,9 +319,7 @@ class VerifySelfSessionPresenterTest {\n service,\n logoutUseCase = FakeLogoutUseCase(signOutLambda)\n )\n- moleculeFlow(RecompositionMode.Immediate) {\n- presenter.present()\n- }.test {\n+ presenter.test {\n skipItems(1)\n val initialItem = awaitItem()\n initialItem.eventSink(VerifySelfSessionViewEvents.SignOut)\n@@ -414,6 +337,9 @@ class VerifySelfSessionPresenterTest {\n ): VerifySelfSessionState {\n var state = awaitItem()\n assertThat(state.step).isEqualTo(Step.Initial(false))\n+ state.eventSink(VerifySelfSessionViewEvents.UseAnotherDevice)\n+ state = awaitItem()\n+ assertThat(state.step).isEqualTo(Step.UseAnotherDevice)\n state.eventSink(VerifySelfSessionViewEvents.RequestVerification)\n // Await for other device response:\n fakeService.emitVerificationFlowState(VerificationFlowState.DidAcceptVerificationRequest)\ndiff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en.png\nindex 0aa47d9aa96..1c316959ed7 100644\n--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:bee1454db757b0897ae2113d3a11ed9adef0eb6bc52f3775edac56ed8533a88f\n-size 24076\n+oid sha256:d3340a2d29e6c1d86f5ec5664179cae9501fcc95381311174d7d6b45b15af326\n+size 24123\ndiff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en.png\nindex 32fa8a3383f..1c46f8eb533 100644\n--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:59a23ec5e3086349d3382f006cf1bcb4121183c83ea8c749aa95e3160561aef1\n-size 23524\n+oid sha256:c6c7e8cdf40bdf018931635565ac649fed518140a047a71cf70cf63e9edf54d3\n+size 23932\ndiff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_13_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_13_en.png\nnew file mode 100644\nindex 00000000000..567462d90f9\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_13_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:18dadaebe7a32aacde31afa0352a343913955b099ca4a07851e3ffe75e88b4d6\n+size 31012\ndiff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_1_en.png\nindex 130cc1d84a0..29667b296d6 100644\n--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_1_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_1_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:2cc647747c41f4c2cf96a3425e8b279b39fd4e09e1441e5b5afcd260f79afaa1\n-size 22714\n+oid sha256:71b9f32b26b391ff3bf231ca9f364a157f535c1e6ff52ee3e3ead3630bb1b239\n+size 30007\ndiff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_4_en.png\nindex 4e84bcb0c25..1faa04af50c 100644\n--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_4_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_4_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:a7fe45575eb8423161d355d9b99ecff4acc0f708e5b106d9d38aa2657942d736\n-size 28219\n+oid sha256:000374157cb5fbf6670b4af041fc385538df78bf4aecaf83ea24d39dfec84f23\n+size 24278\ndiff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_13_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_13_en.png\nnew file mode 100644\nindex 00000000000..bebfa94f6d2\n--- /dev/null\n+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_13_en.png\n@@ -0,0 +1,3 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:4dd274f8c2ade6213a13a47400ec3a571844eafcc82b292b1c813bd9aa098236\n+size 30241\ndiff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_1_en.png\nindex 7e3a1136101..af8d7eadbee 100644\n--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_1_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_1_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:786a63d0d824657270b44428a1a251d0d521e6a97a4239516ae5f2eff06fdc3b\n-size 22125\n+oid sha256:994b39ba25e011cce97504a1f3d4ed0c420b7bce87daafae77ba481cc629cdae\n+size 29051\ndiff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_4_en.png\nindex 76173e1b2d5..d9b8a3a0ded 100644\n--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_4_en.png\n+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_4_en.png\n@@ -1,3 +1,3 @@\n version https://git-lfs.github.com/spec/v1\n-oid sha256:c29d3f5bbff739d23800345feb42e73fe9374c5cb5db27690278fb22c5546fe3\n-size 27754\n+oid sha256:3a3f08002e805fe5f7a4c96aa4b73c2fcd6e8b79e6a9e82bcc7bd3df50d8c22d\n+size 24015\n", "n2p_tests": "{\"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - Handles requestVerification\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - Initial state is received, can use recovery key and is last device\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - When verification is done using recovery key, the flow is completed\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - Go back after cancellation returns to initial state\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - When verification is declined, the flow is canceled\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - Skip event skips the flow\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - When user request to sign out, the sign out use case is invoked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - When verification is approved, the flow completes if there is no error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - hides skip verification button on non-debuggable builds\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - When verification is not needed, the flow is skipped\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - A failure when verifying cancels it\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - Initial state is received\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - When verifying, if we receive another challenge we ignore it\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - A fail when requesting verification resets the state to the initial one\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - Canceling the flow once it's verifying cancels it\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - Initial state is received, can use recovery key\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.features.verifysession.impl.outgoing.VerifySelfSessionPresenterTest.present - Cancellation on initial state does nothing\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-3816", "org": "element-hq", "repo": "element-x-android", "number": 3816, "state": "closed", "title": "Iteration on caption", "body": "\r\n \r\n## Content\r\n\r\n\r\nThis PR is following #3803 .\r\n- Improve the last message preview in the room list for media. Either use the caption, or use the filename, as per EX on iOS.\r\n- Ensure that filename of voice message are not rendered to the user.\r\n- Render the caption in the notification, below the image.\r\n- Other small bug fixes.\r\n\r\n## Motivation and context\r\n\r\n\r\nPolish the application\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Alice send media with caption to Bob\r\n- Bob can see the caption in the notification, and in the room list\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 23\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"47d7eac1eac0ac6088e722c013c83a0be31a021b\"}", "resolved_issues": "[{\"number\": 2602, \"title\": \"Notifications of images with MSC2530 captions show no text \", \"body\": \"Notification:\\n![Screenshot_20240325-161912.png](https://github.com/element-hq/element-x-android/assets/775104/2700f3c4-d034-49c3-bc8a-a691d97b168e)\\n\\nMessage:\\n![Screenshot_20240325-162028.png](https://github.com/element-hq/element-x-android/assets/775104/ffaf241d-da1b-4966-9ac7-a510d279025e)\\n\\nThis should also display the image caption below the picture in the notification \"}]", "lang": "kotlin", "problem_statement": "Notifications of images with MSC2530 captions show no text \nNotification:\n![Screenshot_20240325-161912.png](https://github.com/element-hq/element-x-android/assets/775104/2700f3c4-d034-49c3-bc8a-a691d97b168e)\n\nMessage:\n![Screenshot_20240325-162028.png](https://github.com/element-hq/element-x-android/assets/775104/ffaf241d-da1b-4966-9ac7-a510d279025e)\n\nThis should also display the image caption below the picture in the notification \n", "hints": "I haven't updated SchildiChat to ElementX v0.4.7 yet, but if anybody wants to check if our old implementation of this is applicable: https://github.com/SchildiChat/schildichat-android-next/commit/9046a0a74b3b59a70d972fdb89f6578966d97485\r\n\r\nMaybe I'll PR this once I get Schildi updated to the upstream caption implementation. If someone else wants to PR my changes I'm fine with signing that off as well.\r\n\r\nReminder to self: need to check if upstream has/needs https://github.com/SchildiChat/schildichat-android-next/commit/54b420631844fa03470aadcd454d9b31fdf49f5b", "pull_url": "https://github.com/element-hq/element-x-android/pull/3816", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/2602\"]", "test_command": "./gradlew :libraries:eventformatter:impl:testDebugUnitTest --tests \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest\" --tests \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest\" :libraries:push:impl:testDebugUnitTest --tests \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest\"", "fix_patch": "diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt\nindex 675f9adfc6d..849084ea1cc 100644\n--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt\n+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt\n@@ -70,14 +70,14 @@ fun TimelineItemVideoView(\n onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,\n modifier: Modifier = Modifier,\n ) {\n- val description = stringResource(CommonStrings.common_image)\n+ val description = stringResource(CommonStrings.common_video)\n Column(\n modifier = modifier.semantics { contentDescription = description }\n ) {\n val containerModifier = if (content.showCaption) {\n Modifier\n- .padding(top = 6.dp)\n- .clip(RoundedCornerShape(6.dp))\n+ .padding(top = 6.dp)\n+ .clip(RoundedCornerShape(6.dp))\n } else {\n Modifier\n }\n@@ -93,8 +93,8 @@ fun TimelineItemVideoView(\n var isLoaded by remember { mutableStateOf(false) }\n AsyncImage(\n modifier = Modifier\n- .fillMaxWidth()\n- .then(if (isLoaded) Modifier.background(Color.White) else Modifier),\n+ .fillMaxWidth()\n+ .then(if (isLoaded) Modifier.background(Color.White) else Modifier),\n model = MediaRequestData(\n source = content.thumbnailSource,\n kind = MediaRequestData.Kind.File(\ndiff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatter.kt\nindex ab7a19a9c78..11873ee7c13 100644\n--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatter.kt\n+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatter.kt\n@@ -95,7 +95,9 @@ class DefaultPinnedMessagesBannerFormatter @Inject constructor(\n messageType.bestDescription.prefixWith(CommonStrings.common_audio)\n }\n is VoiceMessageType -> {\n- messageType.bestDescription.prefixWith(CommonStrings.common_voice_message)\n+ // In this case, do not use bestDescription, because the filename is useless, only use the caption if available.\n+ messageType.caption?.prefixWith(sp.getString(CommonStrings.common_voice_message))\n+ ?: sp.getString(CommonStrings.common_voice_message)\n }\n is OtherMessageType -> {\n messageType.body\ndiff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt\nindex 6b43fc3607f..40319154452 100644\n--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt\n+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt\n@@ -110,25 +110,27 @@ class DefaultRoomLastMessageFormatter @Inject constructor(\n messageType.toPlainText(permalinkParser)\n }\n is VideoMessageType -> {\n- sp.getString(CommonStrings.common_video)\n+ messageType.bestDescription.prefixWith(sp.getString(CommonStrings.common_video))\n }\n is ImageMessageType -> {\n- sp.getString(CommonStrings.common_image)\n+ messageType.bestDescription.prefixWith(sp.getString(CommonStrings.common_image))\n }\n is StickerMessageType -> {\n- sp.getString(CommonStrings.common_sticker)\n+ messageType.bestDescription.prefixWith(sp.getString(CommonStrings.common_sticker))\n }\n is LocationMessageType -> {\n sp.getString(CommonStrings.common_shared_location)\n }\n is FileMessageType -> {\n- sp.getString(CommonStrings.common_file)\n+ messageType.bestDescription.prefixWith(sp.getString(CommonStrings.common_file))\n }\n is AudioMessageType -> {\n- sp.getString(CommonStrings.common_audio)\n+ messageType.bestDescription.prefixWith(sp.getString(CommonStrings.common_audio))\n }\n is VoiceMessageType -> {\n- sp.getString(CommonStrings.common_voice_message)\n+ // In this case, do not use bestDescription, because the filename is useless, only use the caption if available.\n+ messageType.caption?.prefixWith(sp.getString(CommonStrings.common_voice_message))\n+ ?: sp.getString(CommonStrings.common_voice_message)\n }\n is OtherMessageType -> {\n messageType.body\n@@ -140,7 +142,7 @@ class DefaultRoomLastMessageFormatter @Inject constructor(\n return message.prefixIfNeeded(senderDisambiguatedDisplayName, isDmRoom, isOutgoing)\n }\n \n- private fun String.prefixIfNeeded(\n+ private fun CharSequence.prefixIfNeeded(\n senderDisambiguatedDisplayName: String,\n isDmRoom: Boolean,\n isOutgoing: Boolean,\ndiff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt\nindex 2fb6186bd4e..97e80f4dbf1 100644\n--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt\n@@ -107,6 +107,7 @@ class DefaultNotifiableEventResolver @Inject constructor(\n senderDisambiguatedDisplayName = senderDisambiguatedDisplayName,\n body = messageBody,\n imageUriString = content.fetchImageIfPresent(client)?.toString(),\n+ imageMimeType = content.getImageMimetype(),\n roomName = roomDisplayName,\n roomIsDm = isDm,\n roomAvatarPath = roomAvatarUrl,\n@@ -316,6 +317,17 @@ class DefaultNotifiableEventResolver @Inject constructor(\n }\n .getOrNull()\n }\n+\n+ private suspend fun NotificationContent.MessageLike.RoomMessage.getImageMimetype(): String? {\n+ if (appPreferencesStore.doesHideImagesAndVideosFlow().first()) {\n+ return null\n+ }\n+ return when (val messageType = messageType) {\n+ is ImageMessageType -> messageType.info?.mimetype\n+ is VideoMessageType -> null // Use the thumbnail here?\n+ else -> null\n+ }\n+ }\n }\n \n @Suppress(\"LongParameterList\")\n@@ -333,6 +345,7 @@ internal fun buildNotifiableMessageEvent(\n // We cannot use Uri? type here, as that could trigger a\n // NotSerializableException when persisting this to storage\n imageUriString: String? = null,\n+ imageMimeType: String? = null,\n threadId: ThreadId? = null,\n roomName: String? = null,\n roomIsDm: Boolean = false,\n@@ -358,6 +371,7 @@ internal fun buildNotifiableMessageEvent(\n senderDisambiguatedDisplayName = senderDisambiguatedDisplayName,\n body = body,\n imageUriString = imageUriString,\n+ imageMimeType = imageMimeType,\n threadId = threadId,\n roomName = roomName,\n roomIsDm = roomIsDm,\ndiff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandler.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandler.kt\nindex 97c53e945b7..a3d553ba91b 100644\n--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandler.kt\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandler.kt\n@@ -150,6 +150,7 @@ class NotificationBroadcastReceiverHandler @Inject constructor(\n ?: stringProvider.getString(R.string.notification_sender_me),\n body = message,\n imageUriString = null,\n+ imageMimeType = null,\n threadId = threadId,\n roomName = room.displayName,\n roomIsDm = room.isDm,\ndiff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt\nindex dc57b0fe7bc..559322eaaef 100755\n--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt\n@@ -419,11 +419,22 @@ class DefaultNotificationCreator @Inject constructor(\n senderPerson\n ).also { message ->\n event.imageUri?.let {\n- message.setData(\"image/\", it)\n+ message.setData(event.imageMimeType ?: \"image/\", it)\n }\n message.extras.putString(MESSAGE_EVENT_ID, event.eventId.value)\n }\n addMessage(message)\n+\n+ // Add additional message for captions\n+ if (event.imageUri != null && event.body != null) {\n+ addMessage(\n+ MessagingStyle.Message(\n+ event.body,\n+ event.timestamp,\n+ senderPerson,\n+ )\n+ )\n+ }\n }\n }\n }\ndiff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt\nindex 4a4d2612ae0..d51c7e09dee 100644\n--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt\n@@ -31,7 +31,8 @@ data class NotifiableMessageEvent(\n val body: String?,\n // We cannot use Uri? type here, as that could trigger a\n // NotSerializableException when persisting this to storage\n- val imageUriString: String?,\n+ private val imageUriString: String?,\n+ val imageMimeType: String?,\n val threadId: ThreadId?,\n val roomName: String?,\n val roomIsDm: Boolean = false,\n", "test_patch": "diff --git a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt\nindex af347135fbf..80a7691a1d0 100644\n--- a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt\n+++ b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt\n@@ -159,11 +159,11 @@ class DefaultPinnedMessagesBannerFormatterTest {\n val expectedResult = when (type) {\n is VideoMessageType,\n is AudioMessageType,\n- is VoiceMessageType,\n is ImageMessageType,\n is StickerMessageType,\n is FileMessageType,\n is LocationMessageType -> AnnotatedString::class.java\n+ is VoiceMessageType,\n is EmoteMessageType,\n is TextMessageType,\n is NoticeMessageType,\n@@ -176,7 +176,7 @@ class DefaultPinnedMessagesBannerFormatterTest {\n val expectedResult = when (type) {\n is VideoMessageType -> \"Video: Shared body\"\n is AudioMessageType -> \"Audio: Shared body\"\n- is VoiceMessageType -> \"Voice message: Shared body\"\n+ is VoiceMessageType -> \"Voice message\"\n is ImageMessageType -> \"Image: Shared body\"\n is StickerMessageType -> \"Sticker: Shared body\"\n is FileMessageType -> \"File: Shared body\"\ndiff --git a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt\nindex efc748d10fd..3c5038069ab 100644\n--- a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt\n+++ b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt\n@@ -208,32 +208,51 @@ class DefaultRoomLastMessageFormatterTest {\n \n // Verify results of DM mode\n for ((type, result) in resultsInDm) {\n+ val string = result.toString()\n val expectedResult = when (type) {\n- is VideoMessageType -> \"Video\"\n- is AudioMessageType -> \"Audio\"\n+ is VideoMessageType -> \"Video: Shared body\"\n+ is AudioMessageType -> \"Audio: Shared body\"\n is VoiceMessageType -> \"Voice message\"\n- is ImageMessageType -> \"Image\"\n- is StickerMessageType -> \"Sticker\"\n- is FileMessageType -> \"File\"\n+ is ImageMessageType -> \"Image: Shared body\"\n+ is StickerMessageType -> \"Sticker: Shared body\"\n+ is FileMessageType -> \"File: Shared body\"\n is LocationMessageType -> \"Shared location\"\n is EmoteMessageType -> \"* $senderName ${type.body}\"\n is TextMessageType,\n is NoticeMessageType,\n is OtherMessageType -> body\n }\n- assertWithMessage(\"$type was not properly handled for DM\").that(result).isEqualTo(expectedResult)\n+ val shouldCreateAnnotatedString = when (type) {\n+ is VideoMessageType -> true\n+ is AudioMessageType -> true\n+ is VoiceMessageType -> false\n+ is ImageMessageType -> true\n+ is StickerMessageType -> true\n+ is FileMessageType -> true\n+ is LocationMessageType -> false\n+ is EmoteMessageType -> false\n+ is TextMessageType -> false\n+ is NoticeMessageType -> false\n+ is OtherMessageType -> false\n+ }\n+ if (shouldCreateAnnotatedString) {\n+ assertWithMessage(\"$type doesn't produce an AnnotatedString\")\n+ .that(result)\n+ .isInstanceOf(AnnotatedString::class.java)\n+ }\n+ assertWithMessage(\"$type was not properly handled for DM\").that(string).isEqualTo(expectedResult)\n }\n \n // Verify results of Room mode\n for ((type, result) in resultsInRoom) {\n val string = result.toString()\n val expectedResult = when (type) {\n- is VideoMessageType -> \"$expectedPrefix: Video\"\n- is AudioMessageType -> \"$expectedPrefix: Audio\"\n+ is VideoMessageType -> \"$expectedPrefix: Video: Shared body\"\n+ is AudioMessageType -> \"$expectedPrefix: Audio: Shared body\"\n is VoiceMessageType -> \"$expectedPrefix: Voice message\"\n- is ImageMessageType -> \"$expectedPrefix: Image\"\n- is StickerMessageType -> \"$expectedPrefix: Sticker\"\n- is FileMessageType -> \"$expectedPrefix: File\"\n+ is ImageMessageType -> \"$expectedPrefix: Image: Shared body\"\n+ is StickerMessageType -> \"$expectedPrefix: Sticker: Shared body\"\n+ is FileMessageType -> \"$expectedPrefix: File: Shared body\"\n is LocationMessageType -> \"$expectedPrefix: Shared location\"\n is TextMessageType,\n is NoticeMessageType,\n@@ -249,7 +268,8 @@ class DefaultRoomLastMessageFormatterTest {\n is FileMessageType -> true\n is LocationMessageType -> false\n is EmoteMessageType -> false\n- is TextMessageType, is NoticeMessageType -> true\n+ is TextMessageType -> true\n+ is NoticeMessageType -> true\n is OtherMessageType -> true\n }\n if (shouldCreateAnnotatedString) {\ndiff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt\nindex de29fcf1f01..153ebe1ffcb 100644\n--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt\n+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt\n@@ -590,6 +590,7 @@ class DefaultNotifiableEventResolverTest {\n senderDisambiguatedDisplayName = A_USER_NAME_2,\n body = \"Call in progress (unsupported)\",\n imageUriString = null,\n+ imageMimeType = null,\n threadId = null,\n roomName = A_ROOM_NAME,\n roomAvatarPath = null,\n@@ -669,6 +670,7 @@ class DefaultNotifiableEventResolverTest {\n canBeReplaced = false,\n isRedacted = false,\n imageUriString = null,\n+ imageMimeType = null,\n type = EventType.CALL_NOTIFY,\n )\n )\n@@ -704,6 +706,7 @@ class DefaultNotifiableEventResolverTest {\n canBeReplaced = false,\n isRedacted = false,\n imageUriString = null,\n+ imageMimeType = null,\n type = EventType.CALL_NOTIFY,\n )\n )\ndiff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotifiableEventFixture.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotifiableEventFixture.kt\nindex faba6a6c651..438718582ff 100644\n--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotifiableEventFixture.kt\n+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotifiableEventFixture.kt\n@@ -100,6 +100,7 @@ fun aNotifiableMessageEvent(\n canBeReplaced = false,\n isRedacted = isRedacted,\n imageUriString = null,\n+ imageMimeType = null,\n roomAvatarPath = null,\n senderAvatarPath = null,\n soundName = null,\n", "n2p_tests": "{\"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve event message voice\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve event message image\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Room state change - create\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Computes last message for poll in DM\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - invitation accepted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve invite room\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve event message file\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.FailedToParseMessageLike, FailedToParseState & Unknown content\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve HTML formatted event message text takes plain text version\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve event message location\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve null cases\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve event failure\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve invite direct, no display name\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve invite direct\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - unban\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Profile change - avatar\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve incorrectly formatted event message text uses fallback\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Message contents sent by other user\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Room state change - third party invite\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Room state change - room name\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve poll\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Message contents sent by current user\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve event message text\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - left\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve RoomRedaction\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - knock accepted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve RoomMemberContent other\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Room state change - encryption\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Unable to decrypt content\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve RoomRedaction with null redactedEventId should return null\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - knocked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve RoomMemberContent invite room\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve RoomEncrypted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve CallNotify - ringing\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Room state change - avatar\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve event null\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Profile change - display name\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - invited\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve event message notice\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve event no session\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - None\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve invite direct, ambiguous display name\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Redacted content\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve CallInvite\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve event message video\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve CallNotify - ring but timed out displays the same as notify\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - knock denied\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - knock retracted\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Sticker content\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve CallNotify - notify\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - invitation revoked\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve event message with mention\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve event message sticker\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Profile change - display name & avatar\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve event message emote\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.notifications.DefaultNotifiableEventResolverTest.resolve event message audio\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{\"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Room state change - room topic\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - invitation rejected\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Message contents\": {\"run\": \"PASS\", \"test\": \"FAIL\", \"fix\": \"PASS\"}}", "p2p_tests": "{\"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Profile change - display name\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Redacted content\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Membership change - joined\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Profile change - avatar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Room state change - create\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.FailedToParseMessageLike, FailedToParseState & Unknown content\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Membership change - knock accepted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Computes last message for poll in room\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - joined\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Membership change - kicked\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Profile change - display name & avatar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Sticker content\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Room state change - third party invite\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Membership change - None\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Room state change - room name\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Membership change - invitation accepted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Membership change - knock retracted\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Computes last message for poll\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Membership change - invited\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Room state change - room topic\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Membership change - knocked\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Membership change - unban\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Membership change - banned\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Membership change - left\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - kicked\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Room state change - others must return null\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Unable to decrypt content\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Room state change - encryption\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Room state change - others must return null\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - banned\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Membership change - invitation rejected\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultRoomLastMessageFormatterTest.Membership change - others\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Membership change - knock denied\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Membership change - others\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Membership change - invitation revoked\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}, \"io.element.android.libraries.eventformatter.impl.DefaultPinnedMessagesBannerFormatterTest.Room state change - avatar\": {\"run\": \"PASS\", \"test\": \"PASS\", \"fix\": \"PASS\"}}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-3755", "org": "element-hq", "repo": "element-x-android", "number": 3755, "state": "closed", "title": "Rotate firebase token in case of error", "body": "\r\n \r\n## Content\r\n\r\n\r\nAdd a quick fix for the troubleshoot notification test in case of PusherRejected error, which means that the token is unknown.\r\n\r\nIn this case, the quick fix will rotate the Firebase token.\r\n\r\nNote: maybe later we will see if we can do the same thing for UnifiedPush provider.\r\n\r\n## Motivation and context\r\n\r\n\r\nCloses #3752 \r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\nYou can see in the video below that when clicking on QuickFix, the token is rotated.\r\n\r\nhttps://github.com/user-attachments/assets/0152344f-809e-482b-9cfa-1e2a6673d54d\r\n\r\n## Tests\r\n\r\n\r\n\r\n- @wrenix can you check if this is fixing your issue please?\r\n\r\nInternally, this can be tested by patching the code and let `DefaultPushService.testPush()` throw a `PushGatewayFailure.PusherRejected()` (this is what I have done for the video above).\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [x] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 23\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"1c020bcf2671bdb5c410aba882219733e38c0b27\"}", "resolved_issues": "[{\"number\": 3752, \"title\": \"Push-Notification Option for recreate token if test failed\", \"body\": \"Here a dedicated issue of this slice different Problem:\\r\\nhttps://github.com/element-hq/element-x-android/issues/3570#issuecomment-2423760827\\r\\n\\r\\n### Steps to reproduce\\r\\n\\r\\n1. Login to EXA\\r\\n2. See in microg if EXA was correct registerd to FCM\\r\\n3. test push works in EXA\\r\\n4. Delete registration in microg\\r\\n5. Run test in EXA again\\r\\n\\r\\n\\r\\n### Outcome\\r\\n\\r\\n#### What did you expect?\\r\\n\\r\\nToken validation success, but loop test failed.\\r\\n\\r\\n#### What happened instead?\\r\\nHere are two Option to fix it:\\r\\n - Option to reset the token to trigger new FCM registration\\r\\n - Reset FCM-Token after change Norification Provider (e.g. to ntfy)\\r\\n\\r\\n### Your phone model\\r\\n\\r\\n_No response_\\r\\n\\r\\n### Operating system version\\r\\n\\r\\n_No response_\\r\\n\\r\\n### Application version and app store\\r\\n\\r\\n_No response_\\r\\n\\r\\n### Homeserver\\r\\n\\r\\n_No response_\\r\\n\\r\\n### Will you send logs?\\r\\n\\r\\nNo\\r\\n\\r\\n### Are you willing to provide a PR?\\r\\n\\r\\nNo\"}]", "lang": "kotlin", "problem_statement": "Push-Notification Option for recreate token if test failed\nHere a dedicated issue of this slice different Problem:\r\nhttps://github.com/element-hq/element-x-android/issues/3570#issuecomment-2423760827\r\n\r\n### Steps to reproduce\r\n\r\n1. Login to EXA\r\n2. See in microg if EXA was correct registerd to FCM\r\n3. test push works in EXA\r\n4. Delete registration in microg\r\n5. Run test in EXA again\r\n\r\n\r\n### Outcome\r\n\r\n#### What did you expect?\r\n\r\nToken validation success, but loop test failed.\r\n\r\n#### What happened instead?\r\nHere are two Option to fix it:\r\n - Option to reset the token to trigger new FCM registration\r\n - Reset FCM-Token after change Norification Provider (e.g. to ntfy)\r\n\r\n### Your phone model\r\n\r\n_No response_\r\n\r\n### Operating system version\r\n\r\n_No response_\r\n\r\n### Application version and app store\r\n\r\n_No response_\r\n\r\n### Homeserver\r\n\r\n_No response_\r\n\r\n### Will you send logs?\r\n\r\nNo\r\n\r\n### Are you willing to provide a PR?\r\n\r\nNo\n", "hints": "Here a Screenshot of current broken state\r\n\r\n![1000008557](https://github.com/user-attachments/assets/eb849f57-1daa-446e-9214-0fce482b24e9)\r\n", "pull_url": "https://github.com/element-hq/element-x-android/pull/3755", "issue_urls": "[\"https://github.com/element-hq/element-x-android/issues/3752\"]", "test_command": "./gradlew :libraries:pushproviders:firebase:testDebugUnitTest --tests \"io.element.android.libraries.pushproviders.firebase.troubleshoot.FirebaseTokenTestTest\" --tests \"io.element.android.libraries.pushproviders.firebase.FirebasePushProviderTest\" :libraries:push:impl:testDebugUnitTest --tests \"io.element.android.libraries.push.impl.troubleshoot.PushLoopbackTestTest\"", "fix_patch": "diff --git a/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PushProvider.kt b/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PushProvider.kt\nindex 0f3cde8033b..90b4cb04658 100644\n--- a/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PushProvider.kt\n+++ b/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PushProvider.kt\n@@ -44,4 +44,10 @@ interface PushProvider {\n suspend fun unregister(matrixClient: MatrixClient): Result\n \n suspend fun getCurrentUserPushConfig(): CurrentUserPushConfig?\n+\n+ fun canRotateToken(): Boolean\n+\n+ suspend fun rotateToken(): Result {\n+ error(\"rotateToken() not implemented, you need to override this method in your implementation\")\n+ }\n }\ndiff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProvider.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProvider.kt\nindex 6bbdb1efe83..b1e31a23035 100644\n--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProvider.kt\n+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProvider.kt\n@@ -25,6 +25,7 @@ class FirebasePushProvider @Inject constructor(\n private val firebaseStore: FirebaseStore,\n private val pusherSubscriber: PusherSubscriber,\n private val isPlayServiceAvailable: IsPlayServiceAvailable,\n+ private val firebaseTokenRotator: FirebaseTokenRotator,\n ) : PushProvider {\n override val index = FirebaseConfig.INDEX\n override val name = FirebaseConfig.NAME\n@@ -71,6 +72,12 @@ class FirebasePushProvider @Inject constructor(\n }\n }\n \n+ override fun canRotateToken(): Boolean = true\n+\n+ override suspend fun rotateToken(): Result {\n+ return firebaseTokenRotator.rotate()\n+ }\n+\n companion object {\n private val firebaseDistributor = Distributor(\"Firebase\", \"Firebase\")\n }\ndiff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseStore.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseStore.kt\nindex 2058f716d4e..4ad36194544 100644\n--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseStore.kt\n+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseStore.kt\n@@ -11,6 +11,10 @@ import android.content.SharedPreferences\n import androidx.core.content.edit\n import com.squareup.anvil.annotations.ContributesBinding\n import io.element.android.libraries.di.AppScope\n+import kotlinx.coroutines.flow.Flow\n+import kotlinx.coroutines.flow.MutableStateFlow\n+import kotlinx.coroutines.flow.onCompletion\n+import kotlinx.coroutines.flow.onStart\n import javax.inject.Inject\n \n /**\n@@ -18,6 +22,7 @@ import javax.inject.Inject\n */\n interface FirebaseStore {\n fun getFcmToken(): String?\n+ fun fcmTokenFlow(): Flow\n fun storeFcmToken(token: String?)\n }\n \n@@ -29,6 +34,22 @@ class SharedPreferencesFirebaseStore @Inject constructor(\n return sharedPreferences.getString(PREFS_KEY_FCM_TOKEN, null)\n }\n \n+ override fun fcmTokenFlow(): Flow {\n+ val flow = MutableStateFlow(getFcmToken())\n+ val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, k ->\n+ if (k == PREFS_KEY_FCM_TOKEN) {\n+ try {\n+ flow.value = getFcmToken()\n+ } catch (e: Exception) {\n+ flow.value = null\n+ }\n+ }\n+ }\n+ return flow\n+ .onStart { sharedPreferences.registerOnSharedPreferenceChangeListener(listener) }\n+ .onCompletion { sharedPreferences.unregisterOnSharedPreferenceChangeListener(listener) }\n+ }\n+\n override fun storeFcmToken(token: String?) {\n sharedPreferences.edit {\n putString(PREFS_KEY_FCM_TOKEN, token)\ndiff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenDeleter.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenDeleter.kt\nnew file mode 100644\nindex 00000000000..597a39493f8\n--- /dev/null\n+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenDeleter.kt\n@@ -0,0 +1,49 @@\n+/*\n+ * Copyright 2023, 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.pushproviders.firebase\n+\n+import com.google.firebase.messaging.FirebaseMessaging\n+import com.squareup.anvil.annotations.ContributesBinding\n+import io.element.android.libraries.di.AppScope\n+import timber.log.Timber\n+import javax.inject.Inject\n+import kotlin.coroutines.resume\n+import kotlin.coroutines.resumeWithException\n+import kotlin.coroutines.suspendCoroutine\n+\n+interface FirebaseTokenDeleter {\n+ /**\n+ * Deletes the current Firebase token.\n+ */\n+ suspend fun delete()\n+}\n+\n+@ContributesBinding(AppScope::class)\n+class DefaultFirebaseTokenDeleter @Inject constructor(\n+ private val isPlayServiceAvailable: IsPlayServiceAvailable,\n+) : FirebaseTokenDeleter {\n+ override suspend fun delete() {\n+ // 'app should always check the device for a compatible Google Play services APK before accessing Google Play services features'\n+ isPlayServiceAvailable.checkAvailableOrThrow()\n+ suspendCoroutine { continuation ->\n+ try {\n+ FirebaseMessaging.getInstance().deleteToken()\n+ .addOnSuccessListener {\n+ continuation.resume(Unit)\n+ }\n+ .addOnFailureListener { e ->\n+ Timber.e(e, \"## deleteFirebaseToken() : failed\")\n+ continuation.resumeWithException(e)\n+ }\n+ } catch (e: Throwable) {\n+ Timber.e(e, \"## deleteFirebaseToken() : failed\")\n+ continuation.resumeWithException(e)\n+ }\n+ }\n+ }\n+}\ndiff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenGetter.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenGetter.kt\nnew file mode 100644\nindex 00000000000..a15d5a250c1\n--- /dev/null\n+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenGetter.kt\n@@ -0,0 +1,50 @@\n+/*\n+ * Copyright 2023, 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.pushproviders.firebase\n+\n+import com.google.firebase.messaging.FirebaseMessaging\n+import com.squareup.anvil.annotations.ContributesBinding\n+import io.element.android.libraries.di.AppScope\n+import timber.log.Timber\n+import javax.inject.Inject\n+import kotlin.coroutines.resume\n+import kotlin.coroutines.resumeWithException\n+import kotlin.coroutines.suspendCoroutine\n+\n+interface FirebaseTokenGetter {\n+ /**\n+ * Read the current Firebase token from FirebaseMessaging.\n+ * If the token does not exist, it will be generated.\n+ */\n+ suspend fun get(): String\n+}\n+\n+@ContributesBinding(AppScope::class)\n+class DefaultFirebaseTokenGetter @Inject constructor(\n+ private val isPlayServiceAvailable: IsPlayServiceAvailable,\n+) : FirebaseTokenGetter {\n+ override suspend fun get(): String {\n+ // 'app should always check the device for a compatible Google Play services APK before accessing Google Play services features'\n+ isPlayServiceAvailable.checkAvailableOrThrow()\n+ return suspendCoroutine { continuation ->\n+ try {\n+ FirebaseMessaging.getInstance().token\n+ .addOnSuccessListener { token ->\n+ continuation.resume(token)\n+ }\n+ .addOnFailureListener { e ->\n+ Timber.e(e, \"## retrievedFirebaseToken() : failed\")\n+ continuation.resumeWithException(e)\n+ }\n+ } catch (e: Throwable) {\n+ Timber.e(e, \"## retrievedFirebaseToken() : failed\")\n+ continuation.resumeWithException(e)\n+ }\n+ }\n+ }\n+}\ndiff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenRotator.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenRotator.kt\nnew file mode 100644\nindex 00000000000..fc55d11a77a\n--- /dev/null\n+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenRotator.kt\n@@ -0,0 +1,32 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.pushproviders.firebase\n+\n+import com.squareup.anvil.annotations.ContributesBinding\n+import io.element.android.libraries.di.AppScope\n+import javax.inject.Inject\n+\n+interface FirebaseTokenRotator {\n+ suspend fun rotate(): Result\n+}\n+\n+/**\n+ * This class delete the Firebase token and generate a new one.\n+ */\n+@ContributesBinding(AppScope::class)\n+class DefaultFirebaseTokenRotator @Inject constructor(\n+ private val firebaseTokenDeleter: FirebaseTokenDeleter,\n+ private val firebaseTokenGetter: FirebaseTokenGetter,\n+) : FirebaseTokenRotator {\n+ override suspend fun rotate(): Result {\n+ return runCatching {\n+ firebaseTokenDeleter.delete()\n+ firebaseTokenGetter.get()\n+ }\n+ }\n+}\ndiff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTroubleshooter.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTroubleshooter.kt\nindex 6ef6931ea14..6991da5f251 100644\n--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTroubleshooter.kt\n+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTroubleshooter.kt\n@@ -7,14 +7,9 @@\n \n package io.element.android.libraries.pushproviders.firebase\n \n-import com.google.firebase.messaging.FirebaseMessaging\n import com.squareup.anvil.annotations.ContributesBinding\n import io.element.android.libraries.di.AppScope\n-import timber.log.Timber\n import javax.inject.Inject\n-import kotlin.coroutines.resume\n-import kotlin.coroutines.resumeWithException\n-import kotlin.coroutines.suspendCoroutine\n \n interface FirebaseTroubleshooter {\n suspend fun troubleshoot(): Result\n@@ -26,37 +21,12 @@ interface FirebaseTroubleshooter {\n @ContributesBinding(AppScope::class)\n class DefaultFirebaseTroubleshooter @Inject constructor(\n private val newTokenHandler: FirebaseNewTokenHandler,\n- private val isPlayServiceAvailable: IsPlayServiceAvailable,\n+ private val firebaseTokenGetter: FirebaseTokenGetter,\n ) : FirebaseTroubleshooter {\n override suspend fun troubleshoot(): Result {\n return runCatching {\n- val token = retrievedFirebaseToken()\n+ val token = firebaseTokenGetter.get()\n newTokenHandler.handle(token)\n }\n }\n-\n- private suspend fun retrievedFirebaseToken(): String {\n- return suspendCoroutine { continuation ->\n- // 'app should always check the device for a compatible Google Play services APK before accessing Google Play services features'\n- if (isPlayServiceAvailable.isAvailable()) {\n- try {\n- FirebaseMessaging.getInstance().token\n- .addOnSuccessListener { token ->\n- continuation.resume(token)\n- }\n- .addOnFailureListener { e ->\n- Timber.e(e, \"## retrievedFirebaseToken() : failed\")\n- continuation.resumeWithException(e)\n- }\n- } catch (e: Throwable) {\n- Timber.e(e, \"## retrievedFirebaseToken() : failed\")\n- continuation.resumeWithException(e)\n- }\n- } else {\n- val e = Exception(\"No valid Google Play Services found. Cannot use FCM.\")\n- Timber.e(e)\n- continuation.resumeWithException(e)\n- }\n- }\n- }\n }\ndiff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/IsPlayServiceAvailable.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/IsPlayServiceAvailable.kt\nindex 02cf66cb744..a0177ef7576 100644\n--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/IsPlayServiceAvailable.kt\n+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/IsPlayServiceAvailable.kt\n@@ -20,6 +20,12 @@ interface IsPlayServiceAvailable {\n fun isAvailable(): Boolean\n }\n \n+fun IsPlayServiceAvailable.checkAvailableOrThrow() {\n+ if (!isAvailable()) {\n+ throw Exception(\"No valid Google Play Services found. Cannot use FCM.\").also(Timber::e)\n+ }\n+}\n+\n @ContributesBinding(AppScope::class)\n class DefaultIsPlayServiceAvailable @Inject constructor(\n @ApplicationContext private val context: Context,\ndiff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushProvider.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushProvider.kt\nindex 9a2d5d5c10f..1ce929a75b6 100644\n--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushProvider.kt\n+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushProvider.kt\n@@ -53,4 +53,6 @@ class UnifiedPushProvider @Inject constructor(\n override suspend fun getCurrentUserPushConfig(): CurrentUserPushConfig? {\n return unifiedPushCurrentUserPushConfigProvider.provide()\n }\n+\n+ override fun canRotateToken(): Boolean = false\n }\n", "test_patch": "diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTest.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTest.kt\nindex e91f4351f78..57c255a4064 100644\n--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTest.kt\n+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTest.kt\n@@ -52,9 +52,10 @@ class PushLoopbackTest @Inject constructor(\n val testPushResult = try {\n pushService.testPush()\n } catch (pusherRejected: PushGatewayFailure.PusherRejected) {\n+ val hasQuickFix = pushService.getCurrentPushProvider()?.canRotateToken() == true\n delegate.updateState(\n description = stringProvider.getString(R.string.troubleshoot_notifications_test_push_loop_back_failure_1),\n- status = NotificationTroubleshootTestState.Status.Failure(false)\n+ status = NotificationTroubleshootTestState.Status.Failure(hasQuickFix)\n )\n job.cancel()\n return\n@@ -96,5 +97,11 @@ class PushLoopbackTest @Inject constructor(\n )\n }\n \n+ override suspend fun quickFix(coroutineScope: CoroutineScope) {\n+ delegate.start()\n+ pushService.getCurrentPushProvider()?.rotateToken()\n+ run(coroutineScope)\n+ }\n+\n override suspend fun reset() = delegate.reset()\n }\ndiff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTestTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTestTest.kt\nindex b12e0cf80b7..57ba07a5f64 100644\n--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTestTest.kt\n+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTestTest.kt\n@@ -13,9 +13,11 @@ import io.element.android.libraries.matrix.test.AN_EXCEPTION\n import io.element.android.libraries.matrix.test.A_FAILURE_REASON\n import io.element.android.libraries.push.api.gateway.PushGatewayFailure\n import io.element.android.libraries.push.test.FakePushService\n+import io.element.android.libraries.pushproviders.test.FakePushProvider\n import io.element.android.libraries.troubleshoot.api.test.NotificationTroubleshootTestState\n import io.element.android.services.toolbox.test.strings.FakeStringProvider\n import io.element.android.services.toolbox.test.systemclock.FakeSystemClock\n+import io.element.android.tests.testutils.lambda.lambdaRecorder\n import kotlinx.coroutines.launch\n import kotlinx.coroutines.test.runTest\n import org.junit.Test\n@@ -67,6 +69,41 @@ class PushLoopbackTestTest {\n }\n }\n \n+ @Test\n+ fun `test PushLoopbackTest PusherRejected error with quick fix`() = runTest {\n+ val diagnosticPushHandler = DiagnosticPushHandler()\n+ val rotateTokenLambda = lambdaRecorder> { Result.success(Unit) }\n+ val sut = PushLoopbackTest(\n+ pushService = FakePushService(\n+ testPushBlock = {\n+ throw PushGatewayFailure.PusherRejected()\n+ },\n+ currentPushProvider = {\n+ FakePushProvider(\n+ canRotateTokenResult = { true },\n+ rotateTokenLambda = rotateTokenLambda,\n+ )\n+ }\n+ ),\n+ diagnosticPushHandler = diagnosticPushHandler,\n+ clock = FakeSystemClock(),\n+ stringProvider = FakeStringProvider(),\n+ )\n+ launch {\n+ sut.run(this)\n+ }\n+ sut.state.test {\n+ assertThat(awaitItem().status).isEqualTo(NotificationTroubleshootTestState.Status.Idle(true))\n+ assertThat(awaitItem().status).isEqualTo(NotificationTroubleshootTestState.Status.InProgress)\n+ val lastItem = awaitItem()\n+ assertThat(lastItem.status).isEqualTo(NotificationTroubleshootTestState.Status.Failure(true))\n+ sut.quickFix(this)\n+ assertThat(awaitItem().status).isEqualTo(NotificationTroubleshootTestState.Status.InProgress)\n+ assertThat(awaitItem().status).isEqualTo(NotificationTroubleshootTestState.Status.Failure(true))\n+ rotateTokenLambda.assertions().isCalledOnce()\n+ }\n+ }\n+\n @Test\n fun `test PushLoopbackTest setup error`() = runTest {\n val diagnosticPushHandler = DiagnosticPushHandler()\ndiff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseTokenTest.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseTokenTest.kt\nindex a0d6d22d101..7d042396697 100644\n--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseTokenTest.kt\n+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseTokenTest.kt\n@@ -19,7 +19,10 @@ import io.element.android.libraries.troubleshoot.api.test.NotificationTroublesho\n import io.element.android.libraries.troubleshoot.api.test.TestFilterData\n import io.element.android.services.toolbox.api.strings.StringProvider\n import kotlinx.coroutines.CoroutineScope\n+import kotlinx.coroutines.Job\n import kotlinx.coroutines.flow.StateFlow\n+import kotlinx.coroutines.flow.launchIn\n+import kotlinx.coroutines.flow.onEach\n import javax.inject.Inject\n \n @ContributesMultibinding(AppScope::class)\n@@ -41,23 +44,28 @@ class FirebaseTokenTest @Inject constructor(\n return data.currentPushProviderName == FirebaseConfig.NAME\n }\n \n+ private var currentJob: Job? = null\n override suspend fun run(coroutineScope: CoroutineScope) {\n+ currentJob?.cancel()\n delegate.start()\n- val token = firebaseStore.getFcmToken()\n- if (token != null) {\n- delegate.updateState(\n- description = stringProvider.getString(\n- R.string.troubleshoot_notifications_test_firebase_token_success,\n- \"${token.take(8)}*****\"\n- ),\n- status = NotificationTroubleshootTestState.Status.Success\n- )\n- } else {\n- delegate.updateState(\n- description = stringProvider.getString(R.string.troubleshoot_notifications_test_firebase_token_failure),\n- status = NotificationTroubleshootTestState.Status.Failure(true)\n- )\n- }\n+ currentJob = firebaseStore.fcmTokenFlow()\n+ .onEach { token ->\n+ if (token != null) {\n+ delegate.updateState(\n+ description = stringProvider.getString(\n+ R.string.troubleshoot_notifications_test_firebase_token_success,\n+ \"*****${token.takeLast(8)}\"\n+ ),\n+ status = NotificationTroubleshootTestState.Status.Success\n+ )\n+ } else {\n+ delegate.updateState(\n+ description = stringProvider.getString(R.string.troubleshoot_notifications_test_firebase_token_failure),\n+ status = NotificationTroubleshootTestState.Status.Failure(true)\n+ )\n+ }\n+ }\n+ .launchIn(coroutineScope)\n }\n \n override suspend fun reset() = delegate.reset()\ndiff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseTokenRotator.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseTokenRotator.kt\nnew file mode 100644\nindex 00000000000..c96c67c3fa4\n--- /dev/null\n+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseTokenRotator.kt\n@@ -0,0 +1,18 @@\n+/*\n+ * Copyright 2024 New Vector Ltd.\n+ *\n+ * SPDX-License-Identifier: AGPL-3.0-only\n+ * Please see LICENSE in the repository root for full details.\n+ */\n+\n+package io.element.android.libraries.pushproviders.firebase\n+\n+import io.element.android.tests.testutils.lambda.lambdaError\n+\n+class FakeFirebaseTokenRotator(\n+ private val rotateWithResult: () -> Result = { lambdaError() }\n+) : FirebaseTokenRotator {\n+ override suspend fun rotate(): Result {\n+ return rotateWithResult()\n+ }\n+}\ndiff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProviderTest.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProviderTest.kt\nindex f94f4ebac89..6a3a9474e40 100644\n--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProviderTest.kt\n+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProviderTest.kt\n@@ -166,15 +166,27 @@ class FirebasePushProviderTest {\n assertThat(result).isEqualTo(CurrentUserPushConfig(FirebaseConfig.PUSHER_HTTP_URL, \"aToken\"))\n }\n \n+ @Test\n+ fun `rotateToken invokes the FirebaseTokenRotator`() = runTest {\n+ val lambda = lambdaRecorder> { Result.success(Unit) }\n+ val firebasePushProvider = createFirebasePushProvider(\n+ firebaseTokenRotator = FakeFirebaseTokenRotator(lambda),\n+ )\n+ firebasePushProvider.rotateToken()\n+ lambda.assertions().isCalledOnce()\n+ }\n+\n private fun createFirebasePushProvider(\n firebaseStore: FirebaseStore = InMemoryFirebaseStore(),\n pusherSubscriber: PusherSubscriber = FakePusherSubscriber(),\n isPlayServiceAvailable: IsPlayServiceAvailable = FakeIsPlayServiceAvailable(false),\n+ firebaseTokenRotator: FirebaseTokenRotator = FakeFirebaseTokenRotator(),\n ): FirebasePushProvider {\n return FirebasePushProvider(\n firebaseStore = firebaseStore,\n pusherSubscriber = pusherSubscriber,\n isPlayServiceAvailable = isPlayServiceAvailable,\n+ firebaseTokenRotator = firebaseTokenRotator,\n )\n }\n }\ndiff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/InMemoryFirebaseStore.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/InMemoryFirebaseStore.kt\nindex 3a3e582f7f2..6728fd04903 100644\n--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/InMemoryFirebaseStore.kt\n+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/InMemoryFirebaseStore.kt\n@@ -7,11 +7,16 @@\n \n package io.element.android.libraries.pushproviders.firebase\n \n+import kotlinx.coroutines.flow.Flow\n+import kotlinx.coroutines.flow.flowOf\n+\n class InMemoryFirebaseStore(\n private var token: String? = null\n ) : FirebaseStore {\n override fun getFcmToken(): String? = token\n \n+ override fun fcmTokenFlow(): Flow = flowOf(token)\n+\n override fun storeFcmToken(token: String?) {\n this.token = token\n }\ndiff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseTokenTestTest.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseTokenTestTest.kt\nindex adf50300e77..e67c59c8867 100644\n--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseTokenTestTest.kt\n+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseTokenTestTest.kt\n@@ -35,7 +35,7 @@ class FirebaseTokenTestTest {\n assertThat(awaitItem().status).isEqualTo(NotificationTroubleshootTestState.Status.InProgress)\n val lastItem = awaitItem()\n assertThat(lastItem.status).isEqualTo(NotificationTroubleshootTestState.Status.Success)\n- assertThat(lastItem.description).contains(FAKE_TOKEN.take(8))\n+ assertThat(lastItem.description).contains(FAKE_TOKEN.takeLast(8))\n assertThat(lastItem.description).doesNotContain(FAKE_TOKEN)\n }\n }\ndiff --git a/libraries/pushproviders/test/src/main/kotlin/io/element/android/libraries/pushproviders/test/FakePushProvider.kt b/libraries/pushproviders/test/src/main/kotlin/io/element/android/libraries/pushproviders/test/FakePushProvider.kt\nindex 9fe222e1cba..6f5bdda5b77 100644\n--- a/libraries/pushproviders/test/src/main/kotlin/io/element/android/libraries/pushproviders/test/FakePushProvider.kt\n+++ b/libraries/pushproviders/test/src/main/kotlin/io/element/android/libraries/pushproviders/test/FakePushProvider.kt\n@@ -21,6 +21,8 @@ class FakePushProvider(\n private val currentUserPushConfig: CurrentUserPushConfig? = null,\n private val registerWithResult: (MatrixClient, Distributor) -> Result = { _, _ -> lambdaError() },\n private val unregisterWithResult: (MatrixClient) -> Result = { lambdaError() },\n+ private val canRotateTokenResult: () -> Boolean = { lambdaError() },\n+ private val rotateTokenLambda: () -> Result = { lambdaError() },\n ) : PushProvider {\n override fun getDistributors(): List = distributors\n \n@@ -39,4 +41,12 @@ class FakePushProvider(\n override suspend fun getCurrentUserPushConfig(): CurrentUserPushConfig? {\n return currentUserPushConfig\n }\n+\n+ override fun canRotateToken(): Boolean {\n+ return canRotateTokenResult()\n+ }\n+\n+ override suspend fun rotateToken(): Result {\n+ return rotateTokenLambda()\n+ }\n }\n", "n2p_tests": "{\"io.element.android.libraries.pushproviders.firebase.FirebasePushProviderTest.getDistributors return the unique distributor if available\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.troubleshoot.PushLoopbackTestTest.test PushLoopbackTest timeout - push is not received\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.pushproviders.firebase.FirebasePushProviderTest.test index and name\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.pushproviders.firebase.FirebasePushProviderTest.getCurrentUserPushConfig ok\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.pushproviders.firebase.troubleshoot.FirebaseTokenTestTest.test FirebaseTokenTest error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.pushproviders.firebase.FirebasePushProviderTest.rotateToken invokes the FirebaseTokenRotator\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.pushproviders.firebase.FirebasePushProviderTest.register ko error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.pushproviders.firebase.FirebasePushProviderTest.unregister ko error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.pushproviders.firebase.troubleshoot.FirebaseTokenTestTest.test FirebaseTokenTest error and reset\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.pushproviders.firebase.FirebasePushProviderTest.getDistributors return empty list if service is not available\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.pushproviders.firebase.troubleshoot.FirebaseTokenTestTest.test FirebaseTokenTest isRelevant\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.pushproviders.firebase.FirebasePushProviderTest.register ko no token\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.pushproviders.firebase.FirebasePushProviderTest.getCurrentDistributor always return the unique distributor\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.pushproviders.firebase.FirebasePushProviderTest.unregister no token - in this case, the error is ignored\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.troubleshoot.PushLoopbackTestTest.test PushLoopbackTest setup error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.pushproviders.firebase.FirebasePushProviderTest.getCurrentUserPushConfig no push ket\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.pushproviders.firebase.FirebasePushProviderTest.register ok\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.pushproviders.firebase.troubleshoot.FirebaseTokenTestTest.test FirebaseTokenTest success\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.troubleshoot.PushLoopbackTestTest.test PushLoopbackTest other error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.troubleshoot.PushLoopbackTestTest.test PushLoopbackTest PusherRejected error\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.troubleshoot.PushLoopbackTestTest.test PushLoopbackTest PusherRejected error with quick fix\": {\"run\": \"NONE\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.pushproviders.firebase.FirebasePushProviderTest.unregister ok\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}, \"io.element.android.libraries.push.impl.troubleshoot.PushLoopbackTestTest.test PushLoopbackTest push is received\": {\"run\": \"PASS\", \"test\": \"NONE\", \"fix\": \"PASS\"}}", "f2p_tests": "{}", "p2p_tests": "{}", "s2p_tests": "{}"} {"instance_id": "element-hq__element-x-android-3694", "org": "element-hq", "repo": "element-x-android", "number": 3694, "state": "closed", "title": "OIDC prompt", "body": "\r\n \r\n## Content\r\n\r\n\r\nSDK 0.1.54 and fix all the API break.\r\n\r\nThen last commit fixes #3635 (so this PR replaces #3635)\r\n\r\n## Motivation and context\r\n\r\n\r\nUse latest SDK and fix a UX issue.\r\n\r\n## Screenshots / GIFs\r\n\r\n\r\n\r\n## Tests\r\n\r\n\r\n\r\n- Step 1\r\n- Step 2\r\n- Step ...\r\n\r\n## Tested devices\r\n\r\n- [ ] Physical\r\n- [ ] Emulator\r\n- OS version(s):\r\n\r\n## Checklist\r\n\r\n\r\n\r\n- [ ] Changes have been tested on an Android device or Android emulator with API 23\r\n- [ ] UI change has been tested on both light and dark themes\r\n- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility\r\n- [ ] Pull request is based on the develop branch\r\n- [ ] Pull request title will be used in the release note, it clearly define what will change for the user\r\n- [ ] Pull request includes screenshots or videos if containing UI changes\r\n- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)\r\n- [ ] You've made a self review of your PR\r\n", "base": "{\"label\": \"element-hq:develop\", \"ref\": \"develop\", \"sha\": \"7ece6877404e56e9bf958da2ada6e732b8a773ba\"}", "resolved_issues": "[{\"number\": 3635, \"title\": \"When creating an account with MAS, change the `prompt` parameter to `create`\", \"body\": \"\\r\\n\\r\\n \\r\\n## Content\\r\\n\\r\\n\\r\\nWhen user is creating account, load the url page directly in the account creation mode by changing (or adding) the `prompt` url parameter to `create`.\\r\\n\\r\\n@sandhose does it make sense to you?\\r\\n\\r\\n## Motivation and context\\r\\n\\r\\n\\r\\nImprove user experience with MAS and closes #3627\\r\\n\\r\\n## Screenshots / GIFs\\r\\n\\r\\n\\r\\n\\r\\n|Before|After|\\r\\n|-|-|\\r\\n|