Merge branch 'trunk' into feat/CMM-886-create-logs-sharing-with-HE

# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/support/he/ui/HESupportViewModel.kt

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)

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

@@ -93,6 +93,7 @@ class AIBotSupportActivity : AppCompatActivity() {
             val message = when (errorType) {
                 ConversationsSupportViewModel.ErrorType.GENERAL -> getString(R.string.ai_bot_generic_error)
                 ConversationsSupportViewModel.ErrorType.FORBIDDEN -> getString(R.string.he_support_forbidden_error)
+                ConversationsSupportViewModel.ErrorType.OFFLINE -> getString(R.string.no_network_title)
             }
             scope.launch {
                 snackbarHostState.showSnackbar(

WordPress/src/main/java/org/wordpress/android/support/aibot/ui/AIBotSupportActivity.kt

@@ -19,7 +19,7 @@ import org.wordpress.android.util.NetworkUtilsWrapper
 abstract class ConversationsSupportViewModel<ConversationType: Conversation>(
     protected val accountStore: AccountStore,
     protected val appLogWrapper: AppLogWrapper,
-    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    protected val networkUtilsWrapper: NetworkUtilsWrapper,
 ) : ViewModel() {
     sealed class NavigationEvent {
         data object NavigateToConversationDetail : NavigationEvent()
@@ -140,6 +140,11 @@ abstract class ConversationsSupportViewModel<ConversationType: Conversation>(
     fun onConversationClick(conversation: ConversationType) {
         viewModelScope.launch {
             try {
+                if (!networkUtilsWrapper.isNetworkAvailable()) {
+                    _errorMessage.value = ErrorType.OFFLINE
+                    return@launch
+                }
+
                 _isLoadingConversation.value = true
                 _selectedConversation.value = conversation
                 _navigationEvents.emit(NavigationEvent.NavigateToConversationDetail)
@@ -173,6 +178,10 @@ abstract class ConversationsSupportViewModel<ConversationType: Conversation>(
 
     fun onCreateNewConversationClick() {
         viewModelScope.launch {
+            if (!networkUtilsWrapper.isNetworkAvailable()) {
+                _errorMessage.value = ErrorType.OFFLINE
+                return@launch
+            }
             _navigationEvents.emit(NavigationEvent.NavigateToNewConversation)
         }
     }
@@ -182,5 +191,6 @@ abstract class ConversationsSupportViewModel<ConversationType: Conversation>(
     enum class ErrorType {
         GENERAL,
         FORBIDDEN,
+        OFFLINE,
     }
 }

WordPress/src/main/java/org/wordpress/android/support/common/ui/ConversationsSupportViewModel.kt

@@ -0,0 +1,10 @@
+package org.wordpress.android.support.he.model
+
+import android.net.Uri
+
+data class AttachmentState(
+    val acceptedUris: List<Uri> = emptyList(),
+    val rejectedUris: List<Uri> = emptyList(),
+    val currentTotalSizeBytes: Long = 0L,
+    val rejectedTotalSizeBytes: Long = 0L
+)

WordPress/src/main/java/org/wordpress/android/support/he/model/AttachmentState.kt

@@ -0,0 +1,21 @@
+package org.wordpress.android.support.he.model
+
+enum class ConversationStatus {
+    WAITING_FOR_SUPPORT,
+    WAITING_FOR_USER,
+    CLOSED,
+    SOLVED,
+    UNKNOWN;
+
+    companion object {
+        fun fromStatus(status: String): ConversationStatus {
+            return when (status.lowercase()) {
+                "open", "new", "hold" -> WAITING_FOR_SUPPORT
+                "closed" -> CLOSED
+                "pending" -> WAITING_FOR_USER
+                "solved" -> SOLVED
+                else -> UNKNOWN
+            }
+        }
+    }
+}

WordPress/src/main/java/org/wordpress/android/support/he/model/ConversationStatus.kt

@@ -0,0 +1,6 @@
+package org.wordpress.android.support.he.model
+
+sealed class MessageSendResult {
+    data object Success : MessageSendResult()
+    data object Failure : MessageSendResult()
+}

WordPress/src/main/java/org/wordpress/android/support/he/model/MessageSendResult.kt

@@ -8,6 +8,7 @@ data class SupportConversation(
     val title: String,
     val description: String,
     val lastMessageSentAt: Date,
+    val status: String,
     val messages: List<SupportMessage>
 ): Conversation {
     override fun getConversationId(): Long = id

WordPress/src/main/java/org/wordpress/android/support/he/model/SupportConversation.kt

@@ -0,0 +1,10 @@
+package org.wordpress.android.support.he.model
+
+import java.io.File
+
+sealed class VideoDownloadState {
+    object Idle : VideoDownloadState()
+    object Downloading : VideoDownloadState()
+    object Error : VideoDownloadState()
+    data class Success(val file: File) : VideoDownloadState()
+}