Merge branch 'trunk' into fix/reader-video-card-featured-images

Author: adalpari

CLAUDE.md

@@ -87,11 +87,20 @@ WordPress/src/main/java/org/wordpress/android/
 - **Checkstyle**: Java code style enforcement (`config/checkstyle.xml`)
 - **Detekt**: Kotlin code analysis (`config/detekt/detekt.yml`)
 - **Android Lint**: Built-in Android static analysis
-- **Line Length**: 120 characters max
+- **Line Length**: 120 characters max - **ALWAYS respect this limit in all code, comments, and strings**
 - **No FIXME**: Use TODO instead of FIXME in committed code
 - **No Deprecated APIs**: Avoid using deprecated methods and classes in new code
 - **No Reflection**: Avoid using reflection in new code; prefer type-safe alternatives
 
+### Code Style Guidelines
+- **IMPORTANT**: Always keep lines at or under 120 characters
+- Break long lines by:
+  - Splitting long comments across multiple lines
+  - Breaking method chains at logical points
+  - Splitting long strings with string concatenation or multiline strings
+  - Breaking parameter lists across multiple lines
+  - Using proper indentation for continuation lines
+
 ### Development Workflow
 - Default development flavor: `jetpackWasabi` (Jetpack app with beta suffix)
 - Remote build cache available for faster builds (requires setup)

RELEASE-NOTES.txt

@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+26.5
+-----
+
+
 26.4
 -----
 

WordPress/build.gradle

@@ -374,6 +374,7 @@ static def addBuildConfigFieldsFromPrefixedProperties(variant, properties, prefi
 
 dependencies {
     implementation(libs.androidx.navigation.compose)
+    implementation(libs.commonmark)
     compileOnly project(path: ':libs:annotations')
     ksp project(':libs:processors')
     implementation (project(path:':libs:networking')) {

WordPress/jetpack_metadata/release_notes.txt

@@ -1,3 +1,2 @@
-We added file size info to your media library, so you can see exactly what you're working with.
-
-The experimental editor just got smoother, too. Your content stays put when you rotate your device or toggle dark mode, and dialogs now respond properly to the back button. Happy editing!
+* [*] Monochrome icon support for the WordPress app [#22321]
+* [*] Fixed high-resolution image loading issues [#22235]

WordPress/metadata/release_notes.txt

@@ -1,5 +1,2 @@
-We added file size info to your media library, so you can see exactly what you're working with.
-
-Increased the timeout for full-screen image loading, so some edge-cases and low connectivity cases have a higher chance to suncceed.
-
-The experimental editor just got smoother, too. Your content stays put when you rotate your device or toggle dark mode, and dialogs now respond properly to the back button. Happy editing!
+* [*] Monochrome icon support for the WordPress app [#22321]
+* [*] Fixed high-resolution image loading issues [#22235]

WordPress/src/main/AndroidManifest.xml

@@ -151,6 +151,10 @@
             android:name=".ui.accounts.login.applicationpassword.ApplicationPasswordRequiredDialogActivity"
             android:theme="@style/WordPress.TransparentDialog"
             android:exported="false" />
+        <activity
+            android:name=".ui.accounts.login.applicationpassword.ApplicationPasswordAutoAuthDialogActivity"
+            android:theme="@style/WordPress.TransparentDialog"
+            android:exported="false" />
 
         <activity
             android:name=".ui.accounts.LoginMagicLinkInterceptActivity"

WordPress/src/main/java/org/wordpress/android/AppInitializer.kt

@@ -110,7 +110,6 @@ import org.wordpress.android.util.analytics.AnalyticsUtils
 import org.wordpress.android.util.config.AppConfig
 import org.wordpress.android.util.config.OpenWebLinksWithJetpackFlowFeatureConfig
 import org.wordpress.android.util.enqueuePeriodicUploadWorkRequestForAllSites
-import org.wordpress.android.util.experiments.ExPlat
 import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.widgets.AppReviewManager
 import org.wordpress.android.workers.WordPressWorkersFactory
@@ -184,9 +183,6 @@ class AppInitializer @Inject constructor(
     @Inject
     lateinit var imageEditorFileUtils: ImageEditorFileUtils
 
-    @Inject
-    lateinit var exPlat: ExPlat
-
     @Inject
     lateinit var wordPressWorkerFactory: WordPressWorkersFactory
 
@@ -372,8 +368,6 @@ class AppInitializer @Inject constructor(
         systemNotificationsTracker.checkSystemNotificationsState()
         ImageEditorInitializer.init(imageManager, imageEditorTracker, imageEditorFileUtils, appScope)
 
-        exPlat.forceRefresh()
-
         initDebugCookieManager()
 
         if (!initialized && BuildConfig.DEBUG && Build.VERSION.SDK_INT >= VERSION_CODES.R) {
@@ -662,9 +656,6 @@ class AppInitializer @Inject constructor(
         if (accountStore.hasAccessToken()) {
             // Make sure the Push Notification token is sent to our servers after a successful login
             gcmRegistrationScheduler.scheduleRegistration()
-
-            // Force a refresh if user has logged in. This can be removed once we start using an anonymous ID.
-            exPlat.forceRefresh()
         }
     }
 
@@ -727,9 +718,6 @@ class AppInitializer @Inject constructor(
 
         // Clear WordPress.com account cookie cache
         wordPressCookieAuthenticator.clearAllCachedCookies()
-
-        // Clear cached assignments if user has logged out. This can be removed once we start using an anonymous ID.
-        exPlat.clear()
     }
 
     /*
@@ -934,11 +922,6 @@ class AppInitializer @Inject constructor(
 
             // Let's migrate the old editor preference if available in AppPrefs to the remote backend
             SiteUtils.migrateAppWideMobileEditorPreferenceToRemote(accountStore, siteStore, dispatcher)
-            if (!firstActivityResumed) {
-                // Since we're force refreshing on app startup, we don't need to try refreshing again when starting
-                // our first Activity.
-                exPlat.refreshIfNeeded()
-            }
             if (firstActivityResumed) {
                 deferredInit()
             }

WordPress/src/main/java/org/wordpress/android/modules/ExperimentModule.kt

@@ -1,10 +1,14 @@
 package org.wordpress.android.support.aibot.model
 
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.text.AnnotatedString
 import java.util.Date
 
+@Immutable
 data class BotMessage(
     val id: Long,
-    val text: String,
+    val rawText: String,
+    val formattedText: AnnotatedString,
     val date: Date,
     val isWrittenByUser: Boolean
 )

WordPress/src/main/java/org/wordpress/android/support/aibot/model/BotMessage.kt

@@ -7,17 +7,22 @@ import org.wordpress.android.modules.IO_THREAD
 import org.wordpress.android.networking.restapi.WpComApiClientProvider
 import org.wordpress.android.support.aibot.model.BotConversation
 import org.wordpress.android.support.aibot.model.BotMessage
+import org.wordpress.android.ui.compose.utils.markdownToAnnotatedString
 import org.wordpress.android.util.AppLog
 import rs.wordpress.api.kotlin.WpComApiClient
 import rs.wordpress.api.kotlin.WpRequestResult
 import uniffi.wp_api.AddMessageToBotConversationParams
 import uniffi.wp_api.BotConversationSummary
 import uniffi.wp_api.CreateBotConversationParams
 import uniffi.wp_api.GetBotConversationParams
+import uniffi.wp_api.ListBotConversationsParams
+import uniffi.wp_api.ListBotConversationsSummaryMethod
+import java.util.Date
 import javax.inject.Inject
 import javax.inject.Named
 
 private const val BOT_ID = "jetpack-chat-mobile"
+private const val ITEMS_PER_PAGE = 20
 
 class AIBotSupportRepository @Inject constructor(
     private val appLogWrapper: AppLogWrapper,
@@ -51,7 +56,12 @@ class AIBotSupportRepository @Inject constructor(
 
     suspend fun loadConversations(): List<BotConversation> = withContext(ioDispatcher) {
         val response = wpComApiClient.request { requestBuilder ->
-            requestBuilder.supportBots().getBotConverationList(BOT_ID)
+            requestBuilder.supportBots().getBotConversationList(
+                botId = BOT_ID,
+                params = ListBotConversationsParams(
+                    summaryMethod = ListBotConversationsSummaryMethod.LAST_MESSAGE
+                )
+            )
         }
         when (response) {
             is WpRequestResult.Success -> {
@@ -66,12 +76,15 @@ class AIBotSupportRepository @Inject constructor(
         }
     }
 
-    suspend fun loadConversation(chatId: Long): BotConversation? = withContext(ioDispatcher) {
+    suspend fun loadConversation(chatId: Long, pageNumber: Long = 1L): BotConversation? = withContext(ioDispatcher) {
         val response = wpComApiClient.request { requestBuilder ->
             requestBuilder.supportBots().getBotConversation(
                 botId = BOT_ID,
                 chatId = chatId.toULong(),
-                params = GetBotConversationParams()
+                params = GetBotConversationParams(
+                    pageNumber = pageNumber.toULong(),
+                    itemsPerPage = ITEMS_PER_PAGE.toULong()
+                )
             )
         }
         when (response) {
@@ -148,24 +161,25 @@ class AIBotSupportRepository @Inject constructor(
         BotConversation (
             id = chatId.toLong(),
             createdAt = createdAt,
-            mostRecentMessageDate = lastMessage.createdAt,
-            lastMessage = lastMessage.content,
+            mostRecentMessageDate = summaryMessage.createdAt,
+            lastMessage = summaryMessage.content,
             messages = listOf()
         )
 
     private fun uniffi.wp_api.BotConversation.toBotConversation(): BotConversation =
         BotConversation (
             id = chatId.toLong(),
             createdAt = createdAt,
-            mostRecentMessageDate = messages.last().createdAt,
-            lastMessage = messages.last().content,
+            mostRecentMessageDate = messages.lastOrNull()?.createdAt ?: Date(),
+            lastMessage = messages.lastOrNull()?.content.orEmpty(),
             messages = messages.map { it.toBotMessage() }
         )
 
     private fun uniffi.wp_api.BotMessage.toBotMessage(): BotMessage =
         BotMessage(
             id = messageId.toLong(),
-            text = content,
+            rawText = content,
+            formattedText = markdownToAnnotatedString(content),
             date = createdAt,
             isWrittenByUser = role == "user"
         )