Merge remote-tracking branch 'origin/trunk' into merge/24.4-rc-2-to-trunk

Author: oguzkocer

.github/PULL_REQUEST_TEMPLATE.md

@@ -32,7 +32,7 @@ Fixes #
 
 -----
 
-## Testing Checklist:
+## Testing Checklist (strike-out the not-applying and unnecessary ones):
 
 - [ ] WordPress.com sites and self-hosted Jetpack sites.
 - [ ] Portrait and landscape orientations.

RELEASE-NOTES.txt

@@ -2,7 +2,9 @@
 
 24.5
 -----
-
+* [*] [internal] Block editor: Remove code associated to Story block [https://github.com/wordpress-mobile/WordPress-Android/pull/20400]
+* [*] [Jetpack-only] Fixes broken links on some notifications [https://github.com/wordpress-mobile/WordPress-Android/pull/20417]
+* [**] [internal] Block editor: Upgrade React Native to version 0.73.3 [#20167]
 
 24.4
 -----

WordPress/build.gradle

@@ -4,14 +4,14 @@ import se.bjurr.violations.lib.model.SEVERITY
 plugins {
     id "com.android.application"
     id "org.jetbrains.kotlin.android"
-    id "org.jetbrains.kotlin.kapt"
     id "org.jetbrains.kotlin.plugin.parcelize"
     id "org.jetbrains.kotlin.plugin.allopen"
     id "io.sentry.android.gradle"
     id "se.bjurr.violations.violation-comments-to-github-gradle-plugin"
     id "com.google.gms.google-services"
     id "com.google.dagger.hilt.android"
     id "org.jetbrains.kotlinx.kover"
+    id "com.google.devtools.ksp"
 }
 
 sentry {
@@ -141,9 +141,9 @@ android {
         buildConfigField "boolean", "PLANS_IN_SITE_CREATION", "false"
         buildConfigField "boolean", "READER_IMPROVEMENTS", "false"
         buildConfigField "boolean", "BLOGANUARY_DASHBOARD_NUDGE", "false"
-        buildConfigField "boolean", "IN_APP_REVIEWS", "false"
         buildConfigField "boolean", "DYNAMIC_DASHBOARD_CARDS", "false"
         buildConfigField "boolean", "STATS_TRAFFIC_TAB", "false"
+        buildConfigField "boolean", "READER_DISCOVER_NEW_ENDPOINT", "false"
 
         // Override these constants in jetpack product flavor to enable/ disable features
         buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
@@ -158,6 +158,7 @@ android {
         buildConfigField "boolean", "BLAZE_MANAGE_CAMPAIGNS", "false"
         buildConfigField "boolean", "DASHBOARD_PERSONALIZATION", "false"
         buildConfigField "boolean", "ENABLE_SITE_MONITORING", "false"
+        buildConfigField "boolean", "SYNC_PUBLISHING", "false"
 
         manifestPlaceholders = [magicLinkScheme:"wordpress"]
     }
@@ -335,16 +336,12 @@ static def addBuildConfigFieldsFromPrefixedProperties(variant, properties, prefi
         variant.buildConfigField "String", it.key.toUpperCase(), "\"${it.value}\""
     }
 }
-kapt {
-    // Enable to infer error types in stubs (see: https://kotlinlang.org/docs/kapt.html#non-existent-type-correction)
-    correctErrorTypes true
-}
 
 dependencies {
     implementation 'androidx.webkit:webkit:1.10.0'
     implementation "androidx.navigation:navigation-compose:$androidxComposeNavigationVersion"
     compileOnly project(path: ':libs:annotations')
-    kapt project(':libs:processors')
+    ksp project(':libs:processors')
     implementation (project(path:':libs:networking')) {
         exclude group: "com.android.volley"
         exclude group: 'org.wordpress', module: 'utils'
@@ -446,7 +443,7 @@ dependencies {
         exclude group: 'androidx.appcompat', module: 'appcompat'
     }
     implementation "com.github.bumptech.glide:glide:$glideVersion"
-    kapt "com.github.bumptech.glide:compiler:$glideVersion"
+    ksp "com.github.bumptech.glide:ksp:$glideVersion"
     implementation "com.github.bumptech.glide:volley-integration:$glideVersion"
     implementation "com.github.indexos.media-for-mobile:domain:$indexosMediaForMobileVersion"
     implementation "com.github.indexos.media-for-mobile:android:$indexosMediaForMobileVersion"
@@ -460,9 +457,9 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
     implementation "com.google.dagger:dagger-android-support:$gradle.ext.daggerVersion"
-    kapt "com.google.dagger:dagger-android-processor:$gradle.ext.daggerVersion"
+    ksp "com.google.dagger:dagger-android-processor:$gradle.ext.daggerVersion"
     implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion"
-    kapt "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion"
+    ksp "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion"
 
     testImplementation("androidx.arch.core:core-testing:$androidxArchCoreVersion", {
         exclude group: 'com.android.support', module: 'support-compat'
@@ -517,7 +514,7 @@ dependencies {
     androidTestImplementation (name:'cloudtestingscreenshotter_lib', ext:'aar') // Screenshots on Firebase Cloud Testing
     androidTestImplementation "androidx.work:work-testing:$androidxWorkManagerVersion"
     androidTestImplementation "com.google.dagger:hilt-android-testing:$gradle.ext.daggerVersion"
-    kaptAndroidTest "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion"
+    kspAndroidTest "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion"
     // Enables Java 8+ API desugaring support
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$androidDesugarVersion"
     lintChecks "org.wordpress:lint:$wordPressLintVersion"

WordPress/src/androidTest/java/org/wordpress/android/ui/notifications/NotificationsUtilsTest.java

@@ -0,0 +1,118 @@
+package org.wordpress.android.ui.notifications
+
+import android.text.SpannableStringBuilder
+import android.text.style.ClickableSpan
+import android.widget.TextView
+import androidx.test.platform.app.InstrumentationRegistry
+import dagger.hilt.android.testing.HiltAndroidTest
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertNotNull
+import junit.framework.TestCase.assertTrue
+import org.junit.Test
+import org.wordpress.android.fluxc.tools.FormattableContent
+import org.wordpress.android.fluxc.tools.FormattableRange
+import org.wordpress.android.ui.notifications.blocks.NoteBlockClickableSpan
+import org.wordpress.android.ui.notifications.utils.NotificationsUtils
+
+@HiltAndroidTest
+class NotificationsUtilsTest {
+    @Test
+    fun testSpannableHasCharacterAtIndex() {
+        val spannableStringBuilder = SpannableStringBuilder("This is only a test.")
+
+        assertTrue(NotificationsUtils.spannableHasCharacterAtIndex(spannableStringBuilder, 's', 3))
+        assertFalse(NotificationsUtils.spannableHasCharacterAtIndex(spannableStringBuilder, 's', 4))
+
+        // Test with bogus params
+        assertFalse(NotificationsUtils.spannableHasCharacterAtIndex(null, 'b', -1))
+    }
+
+    @Test
+    fun testGetSpannableContentForRangesAndSkipInvalidUrls() {
+        // Create a FormattableContent object
+        val range1 = FormattableRange(indices = listOf(10, 14), url = "https://example.com", type = "a")
+        val range2 = FormattableRange(indices = listOf(5, 20), url = "", type = "a") // invalid url to skip
+        val formattableContent = FormattableContent(
+            text = "This is a test content with a link",
+            ranges = listOf(range1, range2)
+        )
+
+        // Create a TextView object
+        val textView = TextView(InstrumentationRegistry.getInstrumentation().context)
+
+        // Call the method with the created objects
+        val result = NotificationsUtils.getSpannableContentForRanges(formattableContent, textView, false) {}
+
+        // Check the result
+        assertNotNull(result)
+        assertEquals("This is a test content with a link", result.toString())
+
+        // Check if the link is correctly set
+        val spans = result.getSpans(10, 14, ClickableSpan::class.java)
+        assertTrue(spans.size == 1)
+        assertEquals("https://example.com", (spans[0] as NoteBlockClickableSpan).formattableRange.url)
+    }
+
+    @Test
+    fun testGetSpannableContentForRangesWithNoRanges() {
+        // Create a FormattableContent object with no ranges
+        val formattableContent = FormattableContent(text = "This is a test content with no link")
+
+        // Create a TextView object
+        val textView = TextView(InstrumentationRegistry.getInstrumentation().context)
+
+        // Call the method with the created objects
+        val result = NotificationsUtils.getSpannableContentForRanges(formattableContent, textView, false) {}
+
+        // Check the result
+        assertNotNull(result)
+        assertEquals("This is a test content with no link", result.toString())
+
+        // Check if no ClickableSpan is set
+        val spans = result.getSpans(0, result.length, ClickableSpan::class.java)
+        assertTrue(spans.isEmpty())
+    }
+
+    @Test
+    fun testGetSpannableContentForRangesWithInvalidIndex() {
+        // Create a FormattableContent object with a range with an invalid index
+        val range = FormattableRange(indices = listOf(50, 54), url = "https://example.com", type = "a")
+        val formattableContent = FormattableContent(text = "This is a test content", ranges = listOf(range))
+
+        // Create a TextView object
+        val textView = TextView(InstrumentationRegistry.getInstrumentation().context)
+
+        // Call the method with the created objects
+        val result = NotificationsUtils.getSpannableContentForRanges(formattableContent, textView, false) {}
+
+        // Check the result
+        assertNotNull(result)
+        assertEquals("This is a test content", result.toString())
+
+        // Check if no ClickableSpan is set
+        val spans = result.getSpans(0, result.length, ClickableSpan::class.java)
+        assertTrue(spans.isEmpty())
+    }
+
+    @Test
+    fun testGetSpannableContentForRangesWithNullUrl() {
+        // Create a FormattableContent object with a range with a null URL
+        val range = FormattableRange(indices = listOf(10, 14), url = null, type = "a")
+        val formattableContent = FormattableContent(text = "This is a test content with a link", ranges = listOf(range))
+
+        // Create a TextView object
+        val textView = TextView(InstrumentationRegistry.getInstrumentation().context)
+
+        // Call the method with the created objects
+        val result = NotificationsUtils.getSpannableContentForRanges(formattableContent, textView, false) {}
+
+        // Check the result
+        assertNotNull(result)
+        assertEquals("This is a test content with a link", result.toString())
+
+        // Check if no ClickableSpan is set for the range with the null URL
+        val spans = result.getSpans(10, 14, ClickableSpan::class.java)
+        assertTrue(spans.isEmpty())
+    }
+}

WordPress/src/androidTest/java/org/wordpress/android/ui/notifications/NotificationsUtilsTest.kt

@@ -0,0 +1,17 @@
+package org.wordpress.android.modules
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.wordpress.android.ui.posts.IPostFreshnessChecker
+import org.wordpress.android.ui.posts.PostFreshnessCheckerImpl
+import javax.inject.Singleton
+
+@InstallIn(SingletonComponent::class)
+@Module
+class PostModule {
+    @Singleton
+    @Provides
+    fun providePostFreshnessChecker(): IPostFreshnessChecker = PostFreshnessCheckerImpl()
+}

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

@@ -49,7 +49,7 @@ class ActivityNavigator @Inject constructor() {
 
     fun navigateToCampaignDetailPage(
         context: Context,
-        campaignId: Int,
+        campaignId: String,
         campaignDetailPageSource: CampaignDetailPageSource
     ) {
         context.startActivity(

WordPress/src/main/java/org/wordpress/android/ui/ActivityNavigator.kt

@@ -10,6 +10,6 @@ import org.wordpress.android.ui.blaze.blazecampaigns.campaignlisting.CampaignLis
 @SuppressLint("ParcelCreator")
 sealed class BlazeCampaignPage : Parcelable {
     data class CampaignListingPage(val source: CampaignListingPageSource) : BlazeCampaignPage()
-    data class CampaignDetailsPage(val campaignId: Int, val source: CampaignDetailPageSource) : BlazeCampaignPage()
+    data class CampaignDetailsPage(val campaignId: String, val source: CampaignDetailPageSource) : BlazeCampaignPage()
     object Done: BlazeCampaignPage()
 }

WordPress/src/main/java/org/wordpress/android/ui/blaze/blazecampaigns/BlazeCampaignPage.kt

@@ -54,10 +54,10 @@ private const val CAMPAIGN_DETAIL_CAMPAIGN_ID = "campaign_detail_campaign_id"
 @AndroidEntryPoint
 class CampaignDetailFragment : Fragment(), CampaignDetailWebViewClient.CampaignDetailWebViewClientListener {
     companion object {
-        fun newInstance(campaignId: Int, source: CampaignDetailPageSource) = CampaignDetailFragment().apply {
+        fun newInstance(campaignId: String, source: CampaignDetailPageSource) = CampaignDetailFragment().apply {
             arguments = Bundle().apply {
                 putSerializable(CAMPAIGN_DETAIL_PAGE_SOURCE, source)
-                putInt(CAMPAIGN_DETAIL_CAMPAIGN_ID, campaignId)
+                putString(CAMPAIGN_DETAIL_CAMPAIGN_ID, campaignId)
             }
         }
     }
@@ -110,7 +110,7 @@ class CampaignDetailFragment : Fragment(), CampaignDetailWebViewClient.CampaignD
             ?: CampaignDetailPageSource.UNKNOWN
     }
 
-    private fun getCampaignId() = requireArguments().getInt(CAMPAIGN_DETAIL_CAMPAIGN_ID)
+    private fun getCampaignId() = requireArguments().getString(CAMPAIGN_DETAIL_CAMPAIGN_ID) ?: ""
 
     override fun onRedirectToExternalBrowser(url: String) = viewModel.onRedirectToExternalBrowser(url)
 

WordPress/src/main/java/org/wordpress/android/ui/blaze/blazecampaigns/campaigndetail/CampaignDetailFragment.kt

@@ -30,15 +30,15 @@ class CampaignDetailViewModel @Inject constructor(
     @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
 ) : ScopedViewModel(bgDispatcher) {
     private lateinit var pageSource: CampaignDetailPageSource
-    private var campaignId: Int = 0
+    private var campaignId: String = ""
 
     private val _actionEvents = Channel<BlazeActionEvent>(Channel.BUFFERED)
     val actionEvents = _actionEvents.receiveAsFlow()
 
     private val _uiState = MutableStateFlow<CampaignDetailUiState>(CampaignDetailUiState.Preparing)
     val uiState = _uiState as StateFlow<CampaignDetailUiState>
 
-    fun start(campaignId: Int, campaignDetailPageSource: CampaignDetailPageSource) {
+    fun start(campaignId: String, campaignDetailPageSource: CampaignDetailPageSource) {
         this.campaignId = campaignId
         this.pageSource = campaignDetailPageSource
 
@@ -76,7 +76,7 @@ class CampaignDetailViewModel @Inject constructor(
             pathComponents = arrayOf(
                 ADVERTISING_PATH,
                 CAMPAIGNS_PATH,
-                campaignId.toString(),
+                campaignId,
                 extractAndSanitizeSiteUrl()
             ),
             source = pageSource.trackingName