Merge branch 'trunk' of github.com:wordpress-mobile/WordPress-Android…

… into feature/tags-ia

.aiexclude

@@ -0,0 +1,39 @@
+# OS X generated file
+.DS_Store
+
+# Build-related files
+fastlane/
+
+# Key-related files
+.jks
+.keystore
+
+# Backup files
+.bak
+
+# Generated files
+bin/
+gen/
+build/
+build.log
+
+# Built application files
+.apk
+.ap_
+.aab
+
+# Dex VM files
+.dex
+
+# Configuration files
+.configure
+.configure-files/
+google-services.json
+google-upload-credentials.json
+firebase.secrets.json
+sentry.properties
+
+# Gradle files
+gradle.properties
+local.properties
+local-builds.gradle

.buildkite/pipeline.yml

@@ -29,6 +29,16 @@ steps:
   #################
   - group: "🕵️‍♂️ Linters"
     steps:
+      - label: "☢️ Danger - PR Check"
+        command: danger
+        key: danger
+        if: "build.pull_request.id != null"
+        retry:
+          manual:
+            permit_on_passed: true
+        agents:
+          queue: "linter"
+
       - label: "🕵️ checkstyle"
         command: |
           cp gradle.properties-example gradle.properties

.github/workflows/run-danger.yml

@@ -1,13 +1,17 @@
-name: ☢️ Danger
+name: ☢️ Trigger Danger On Buildkite
 
 on:
   pull_request:
-    types: [opened, reopened, ready_for_review, synchronize, edited, labeled, unlabeled, milestoned, demilestoned]
+    types: [labeled, unlabeled, milestoned, demilestoned]
 
 jobs:
   dangermattic:
-    # runs on draft PRs only for opened / synchronize events
-    if: ${{ (github.event.pull_request.draft == false) || (github.event.pull_request.draft == true && contains(fromJSON('["opened", "synchronize"]'), github.event.action)) }}
-    uses: Automattic/dangermattic/.github/workflows/reusable-run-danger.yml@v1.0.0
+    if: ${{ (github.event.pull_request.draft == false) }}
+    uses: Automattic/dangermattic/.github/workflows/reusable-retry-buildkite-step-on-events.yml@v1.1.0
+    with:
+      org-slug: "automattic"
+      pipeline-slug: "wordpress-android"
+      retry-step-key: "danger"
+      build-commit-sha: "${{ github.event.pull_request.head.sha }}"
     secrets:
-      github-token: ${{ secrets.DANGERMATTIC_GITHUB_TOKEN }}
+      buildkite-api-token: ${{ secrets.TRIGGER_BK_BUILD_TOKEN }}

Dangerfile

@@ -3,7 +3,8 @@
 github.dismiss_out_of_range_messages
 
 # `files: []` forces rubocop to scan all files, not just the ones modified in the PR
-rubocop.lint(files: [], force_exclusion: true, inline_comment: true, fail_on_inline_comment: true, include_cop_names: true)
+# Added a custom `rubocop_cmd` to prevent RuboCop from running using `bundle exec`, which we don't want on the linter agent
+rubocop.lint(files: [], force_exclusion: true, inline_comment: true, fail_on_inline_comment: true, include_cop_names: true, rubocop_cmd: ': | rubocop')
 
 manifest_pr_checker.check_gemfile_lock_updated
 

Gemfile.lock

@@ -69,29 +69,16 @@ GEM
       no_proxy_fix
       octokit (>= 4.0)
       terminal-table (>= 1, < 4)
-    danger-dangermattic (1.0.0)
+    danger-dangermattic (1.0.2)
       danger (~> 9.4)
-      danger-junit (~> 1.0)
       danger-plugin-api (~> 1.0)
       danger-rubocop (~> 0.12)
-      danger-swiftlint (~> 0.35)
-      danger-xcode_summary (~> 1.0)
-      rubocop (~> 1.60)
-    danger-junit (1.0.2)
-      danger (> 2.0)
-      ox (~> 2.0)
+      rubocop (~> 1.61)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
     danger-rubocop (0.12.0)
       danger
       rubocop (~> 1.0)
-    danger-swiftlint (0.35.0)
-      danger
-      rake (> 10)
-      thor (~> 1.0.0)
-    danger-xcode_summary (1.3.0)
-      danger-plugin-api (~> 1.0)
-      xcresult (~> 0.2)
     declarative (0.0.20)
     diffy (3.4.2)
     digest-crc (0.6.5)
@@ -241,7 +228,7 @@ GEM
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
-    json (2.7.1)
+    json (2.7.2)
     jwt (2.8.0)
       base64
     kramdown (2.4.0)
@@ -254,7 +241,7 @@ GEM
     mini_portile2 (2.8.5)
     minitest (5.22.2)
     multi_json (1.15.0)
-    multipart-post (2.4.0)
+    multipart-post (2.4.1)
     mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
@@ -271,23 +258,22 @@ GEM
     options (2.3.2)
     optparse (0.4.0)
     os (1.1.4)
-    ox (2.14.17)
     parallel (1.24.0)
-    parser (3.3.0.5)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     plist (3.7.1)
     progress_bar (1.3.3)
       highline (>= 1.6, < 3)
       options (~> 2.3.0)
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rake-compiler (1.2.7)
       rake
     rchardet (1.8.0)
-    regexp_parser (2.9.0)
+    regexp_parser (2.9.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -296,19 +282,19 @@ GEM
     rexml (3.2.6)
     rmagick (4.3.0)
     rouge (2.0.7)
-    rubocop (1.60.2)
+    rubocop (1.63.5)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -327,7 +313,6 @@ GEM
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.0.1)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
     tty-screen (0.8.2)
@@ -349,7 +334,6 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
-    xcresult (0.2.1)
 
 PLATFORMS
   ruby

RELEASE-NOTES.txt

@@ -1,5 +1,22 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+25.0
+-----
+* [*] Fixed a rare crash on Posts List screen [https://github.com/wordpress-mobile/WordPress-Android/pull/20813]
+* [*] Fixed a rare crash on the Login screen [https://github.com/wordpress-mobile/WordPress-Android/pull/20821]
+* [*] Fix a crash that occurs when remove a user [https://github.com/wordpress-mobile/WordPress-Android/pull/20837]
+* [*] Fixed a rare crash on the featured image confirmation dialog [https://github.com/wordpress-mobile/WordPress-Android/pull/20836]
+* [*] Fixed an ANR issue on the Post List screen [https://github.com/wordpress-mobile/WordPress-Android/pull/20833]
+* [*] Fixed a crash that occurs with Blogging Reminders [https://github.com/wordpress-mobile/WordPress-Android/pull/20845]
+* [*] [internal] Block Editor: Upgrade target sdk version to Android API 34 [https://github.com/wordpress-mobile/WordPress-Android/pull/20841]
+* [*] [internal] In-app updates feature [https://github.com/wordpress-mobile/WordPress-Android/pull/20822]
+
+24.9
+-----
+* [*] [Jetpack-only] Removed Social section from the detail screen of Total Followers card [https://github.com/wordpress-mobile/WordPress-Android/pull/20763]
+* [***] [Jetpack-only] Reorganized Stats to include updated Traffic and Insights tabs, along with a newly added Subscribers tab to improve subscriber metrics analysis [https://github.com/wordpress-mobile/WordPress-Android/pull/20756]
+* [*] Site picker: Fixed the UI alignment issue in RTL [https://github.com/wordpress-mobile/WordPress-Android/pull/20804]
+
 24.8
 -----
 * [*] [Jetpack-only] Fixed percentage numbers direction on Stats for RTL languages [https://github.com/wordpress-mobile/WordPress-Android/pull/20656]

WordPress/build.gradle

@@ -147,12 +147,13 @@ android {
         buildConfigField "boolean", "READER_IMPROVEMENTS", "false"
         buildConfigField "boolean", "BLOGANUARY_DASHBOARD_NUDGE", "false"
         buildConfigField "boolean", "DYNAMIC_DASHBOARD_CARDS", "false"
-        buildConfigField "boolean", "STATS_TRAFFIC_SUBSCRIBERS_TAB", "false"
+        buildConfigField "boolean", "STATS_TRAFFIC_SUBSCRIBERS_TABS", "false"
         buildConfigField "boolean", "READER_DISCOVER_NEW_ENDPOINT", "false"
         buildConfigField "boolean", "READER_READING_PREFERENCES", "false"
         buildConfigField "boolean", "READER_READING_PREFERENCES_FEEDBACK", "false"
         buildConfigField "boolean", "READER_TAGS_FEED", "false"
         buildConfigField "boolean", "READER_ANNOUNCEMENT_CARD", "false"
+        buildConfigField "boolean", "VOICE_TO_CONTENT", "false"
 
         // Override these constants in jetpack product flavor to enable/ disable features
         buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
@@ -168,6 +169,7 @@ android {
         buildConfigField "boolean", "DASHBOARD_PERSONALIZATION", "false"
         buildConfigField "boolean", "ENABLE_SITE_MONITORING", "false"
         buildConfigField "boolean", "SYNC_PUBLISHING", "false"
+        buildConfigField "boolean", "ENABLE_IN_APP_UPDATES", "false"
 
         manifestPlaceholders = [magicLinkScheme:"wordpress"]
     }
@@ -393,6 +395,9 @@ dependencies {
     implementation "org.wordpress:persistentedittext:$wordPressPersistentEditTextVersion"
     implementation "$gradle.ext.gravatarBinaryPath:$gravatarVersion"
 
+    implementation "com.google.android.play:app-update:$googlePlayInAppUpdateVersion"
+    implementation "com.google.android.play:app-update-ktx:$googlePlayInAppUpdateVersion"
+
     implementation "androidx.arch.core:core-common:$androidxArchCoreVersion"
     implementation "androidx.arch.core:core-runtime:$androidxArchCoreVersion"
     implementation "com.google.code.gson:gson:$googleGsonVersion"
@@ -566,6 +571,8 @@ dependencies {
     // Cascade - Compose nested menu
     implementation "me.saket.cascade:cascade-compose:2.3.0"
 
+    implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion"
+
     // - Flipper
     debugImplementation ("com.facebook.flipper:flipper:$flipperVersion") {
         exclude group:'org.jetbrains.kotlinx', module:'kotlinx-serialization-json-jvm'

WordPress/jetpack_metadata/PlayStoreStrings.po

@@ -10,19 +10,20 @@ msgstr ""
 "X-Generator: VsCode\n"
 "Project-Id-Version: Jetpack - Apps - Android - Release Notes\n"
 
-msgctxt "release_note_247"
+msgctxt "release_note_249"
 msgid ""
-"24.7:\n"
-"We redesigned the site picker screen. You can now pin your favorite sites, see recently accessed sites, and more. We also removed the ability to show and hide sites.\n"
-"(Did we say the word “sites” enough? We think so.)\n"
+"24.9:\n"
+"- We reorganized the Stats screen to show data about traffic and insights.\n"
+"- We added a Subscribers tab to show data about site subscribers.\n"
+"- We removed social subscribers from the Total Followers card.\n"
+"- Site names and URLs are properly positioned for right-to-left language users.\n"
 msgstr ""
 
-msgctxt "release_note_246"
+msgctxt "release_note_248"
 msgid ""
-"24.6:\n"
-"- We fixed a handful of issues with highlighted text formatting.\n"
-"- The app now supports text suggestions that are longer than the visible space in the editor.\n"
-"- We changed the infinity symbol to “100%” on the Stats screen. And in that moment, I swear we were 100%.\n"
+"24.8:\n"
+"On the Stats screen, percentages now appear in their correct position for right-to-left language users. Right on.\n"
+"\n"
 msgstr ""
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!

WordPress/jetpack_metadata/release_notes.txt

@@ -1,2 +1,4 @@
-We redesigned the site picker screen. You can now pin your favorite sites, see recently accessed sites, and more. We also removed the ability to show and hide sites.
-(Did we say the word “sites” enough? We think so.)
+- We reorganized the Stats screen to show data about traffic and insights.
+- We added a Subscribers tab to show data about site subscribers.
+- We removed social subscribers from the Total Followers card.
+- Site names and URLs are properly positioned for right-to-left language users.

WordPress/metadata/PlayStoreStrings.po

@@ -10,18 +10,16 @@ msgstr ""
 "X-Generator: VsCode\n"
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
-msgctxt "release_note_247"
+msgctxt "release_note_249"
 msgid ""
-"24.7:\n"
-"We redesigned the site picker screen. You can now pin your favorite sites, see recently accessed sites, and more. We also removed the ability to show and hide sites.\n"
-"(Did we say the word “sites” enough? We think so.)\n"
+"24.9:\n"
+"Site names and URLs are now properly positioned for right-to-left language users. Right on.\n"
 msgstr ""
 
-msgctxt "release_note_246"
+msgctxt "release_note_248"
 msgid ""
-"24.6:\n"
-"- We fixed a handful of issues with highlighted text formatting. We don’t know about you, but that’s the highlight of our week.\n"
-"- The app now supports text suggestions that are longer than the visible space in the editor. No crashes—just predictive text, as far as the eye can see.\n"
+"24.8:\n"
+"April showers bring May flowers, but they unfortunately don’t bring release notes. Stay Juned for the next update.\n"
 msgstr ""
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!

WordPress/metadata/release_notes.txt

@@ -1,2 +1 @@
-We redesigned the site picker screen. You can now pin your favorite sites, see recently accessed sites, and more. We also removed the ability to show and hide sites.
-(Did we say the word “sites” enough? We think so.)
+Site names and URLs are now properly positioned for right-to-left language users. Right on.

WordPress/src/androidTest/resources/new-stats-feature-response.json

@@ -1,3 +1,3 @@
 {
-  "stats_traffic_subscribers_tab": true
+  "stats_traffic_subscribers_tabs": true
 }

WordPress/src/jetpack/java/org/wordpress/android/util/config/InAppUpdateBlockingVersionConfigConstants.kt

@@ -0,0 +1,5 @@
+package org.wordpress.android.util.config
+
+const val IN_APP_UPDATE_BLOCKING_VERSION_REMOTE_FIELD = "jp_in_app_update_blocking_version_android"
+
+

WordPress/src/main/AndroidManifest.xml

@@ -1148,8 +1148,6 @@
             android:label="@string/site_monitoring"
             android:theme="@style/WordPress.NoActionBar"/>
 
-        <meta-data android:name="io.sentry.traces.activity.enable" android:value="false" />
-
     </application>
     <queries>
         <intent>

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

@@ -283,9 +283,9 @@ class AppInitializer @Inject constructor(
     }
 
     fun init() {
+        crashLogging.initialize()
         dispatcher.register(this)
         appConfig.init(appScope)
-
         // Upload any encrypted logs that were queued but not yet uploaded
         encryptedLogging.start()
 
@@ -432,17 +432,6 @@ class AppInitializer @Inject constructor(
             AppLog.enableRecording(false)
             AppLog.e(T.UTILS, "Error enabling log file persistence", e)
         }
-        AppLog.addListener { tag, logLevel, message ->
-            val sb = StringBuffer()
-            sb.append(logLevel.toString())
-                .append("/")
-                .append(AppLog.TAG)
-                .append("-")
-                .append(tag.toString())
-                .append(": ")
-                .append(message)
-            crashLogging.recordEvent(sb.toString(), null)
-        }
     }
 
     private fun sanitizeMediaUploadStateForSite() {