Skip to content

Commit d91c8df

Browse files
author
Gerardo
committed
Merge branch 'trunk' into gutenberg/voice-to-content
# Conflicts: # build.gradle
2 parents a1f2a5c + 84df633 commit d91c8df

251 files changed

Lines changed: 10087 additions & 3295 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

RELEASE-NOTES.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
*** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
22

3+
25.1
4+
-----
5+
6+
37
25.0
48
-----
59
* [*] Fixed a rare crash on Posts List screen [https://github.com/wordpress-mobile/WordPress-Android/pull/20813]
610
* [*] Fixed a rare crash on the Login screen [https://github.com/wordpress-mobile/WordPress-Android/pull/20821]
711
* [*] Fix a crash that occurs when remove a user [https://github.com/wordpress-mobile/WordPress-Android/pull/20837]
812
* [*] Fixed a rare crash on the featured image confirmation dialog [https://github.com/wordpress-mobile/WordPress-Android/pull/20836]
913
* [*] Fixed an ANR issue on the Post List screen [https://github.com/wordpress-mobile/WordPress-Android/pull/20833]
14+
* [*] Fixed a crash that occurs with Blogging Reminders [https://github.com/wordpress-mobile/WordPress-Android/pull/20845]
1015
* [*] [internal] Block Editor: Upgrade target sdk version to Android API 34 [https://github.com/wordpress-mobile/WordPress-Android/pull/20841]
16+
* [*] [internal] In-app updates feature [https://github.com/wordpress-mobile/WordPress-Android/pull/20822]
17+
* [**] [Jetpack-only] Reader: Add a new feed dedicated to tags [https://github.com/wordpress-mobile/WordPress-Android/pull/20812]
1118

1219
24.9
1320
-----

WordPress/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ android {
151151
buildConfigField "boolean", "READER_DISCOVER_NEW_ENDPOINT", "false"
152152
buildConfigField "boolean", "READER_READING_PREFERENCES", "false"
153153
buildConfigField "boolean", "READER_READING_PREFERENCES_FEEDBACK", "false"
154+
buildConfigField "boolean", "READER_TAGS_FEED", "false"
155+
buildConfigField "boolean", "READER_ANNOUNCEMENT_CARD", "false"
156+
buildConfigField "boolean", "VOICE_TO_CONTENT", "false"
154157

155158
// Override these constants in jetpack product flavor to enable/ disable features
156159
buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"

WordPress/jetpack_metadata/PlayStoreStrings.po

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ msgstr ""
1010
"X-Generator: VsCode\n"
1111
"Project-Id-Version: Jetpack - Apps - Android - Release Notes\n"
1212

13+
msgctxt "release_note_250"
14+
msgid ""
15+
"25.0:\n"
16+
"The Tags feed is live! You can now see content with specific tags, all in one place. Tag, you’re it.\n"
17+
"\n"
18+
"We fixed assorted crashes on the login and Posts List screens, as well as actions associated with blogging reminders, feature images, and user removal. Less crashing? How smashing.\n"
19+
msgstr ""
20+
1321
msgctxt "release_note_249"
1422
msgid ""
1523
"24.9:\n"
@@ -19,13 +27,6 @@ msgid ""
1927
"- Site names and URLs are properly positioned for right-to-left language users.\n"
2028
msgstr ""
2129

22-
msgctxt "release_note_248"
23-
msgid ""
24-
"24.8:\n"
25-
"On the Stats screen, percentages now appear in their correct position for right-to-left language users. Right on.\n"
26-
"\n"
27-
msgstr ""
28-
2930
#. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
3031
#. translators: Title to be displayed in the Play Store. Limit to 30 characters including spaces and commas!
3132
msgctxt "play_store_app_title"
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
- We reorganized the Stats screen to show data about traffic and insights.
2-
- We added a Subscribers tab to show data about site subscribers.
3-
- We removed social subscribers from the Total Followers card.
4-
- Site names and URLs are properly positioned for right-to-left language users.
1+
The Tags feed is live! You can now see content with specific tags, all in one place. Tag, you’re it.
2+
3+
We fixed assorted crashes on the login and Posts List screens, as well as actions associated with blogging reminders, feature images, and user removal. Less crashing? How smashing.

WordPress/metadata/PlayStoreStrings.po

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ msgstr ""
1010
"X-Generator: VsCode\n"
1111
"Project-Id-Version: Release Notes & Play Store Descriptions\n"
1212

13-
msgctxt "release_note_249"
13+
msgctxt "release_note_250"
1414
msgid ""
15-
"24.9:\n"
16-
"Site names and URLs are now properly positioned for right-to-left language users. Right on.\n"
15+
"25.0:\n"
16+
"We fixed assorted crashes on the login and Posts List screens, as well as actions associated with blogging reminders, feature images, and user removal. Less crashing? How smashing.\n"
1717
msgstr ""
1818

19-
msgctxt "release_note_248"
19+
msgctxt "release_note_249"
2020
msgid ""
21-
"24.8:\n"
22-
"April showers bring May flowers, but they unfortunately don’t bring release notes. Stay Juned for the next update.\n"
21+
"24.9:\n"
22+
"Site names and URLs are now properly positioned for right-to-left language users. Right on.\n"
2323
msgstr ""
2424

2525
#. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Site names and URLs are now properly positioned for right-to-left language users. Right on.
1+
We fixed assorted crashes on the login and Posts List screens, as well as actions associated with blogging reminders, feature images, and user removal. Less crashing? How smashing.

WordPress/src/debug/AndroidManifest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
android:name="android.permission.DUMP"
2727
tools:ignore="ProtectedPermissions" />
2828

29+
<!-- Adds this permission temporarily here until Voice to content project is released -->
30+
<uses-permission android:name="android.permission.RECORD_AUDIO" />
31+
2932
<application
3033
android:name=".WordPressDebug"
3134
android:supportsRtl="true"
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* wvHandler is the name of the message handler in the webview, added via createJsObject inside
3+
* ReaderPostRenderer. It handles the `postMessage` calls from the WebView.
4+
*/
5+
6+
function debounce(fn, timeout) {
7+
let timer;
8+
return () => {
9+
clearTimeout(timer);
10+
timer = setTimeout(fn, timeout);
11+
}
12+
}
13+
14+
const textHighlighted = debounce(
15+
() => wvHandler.postMessage("articleTextHighlighted"),
16+
1000
17+
);
18+
19+
document.addEventListener('selectionchange', function(event) {
20+
const selection = document.getSelection().toString();
21+
if (selection.length > 0) {
22+
textHighlighted();
23+
}
24+
});
25+
26+
document.addEventListener('copy', event => wvHandler.postMessage("articleTextCopied"));

WordPress/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<uses-permission android:name="android.permission.CAMERA" />
1818
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
1919
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
20+
2021
<!-- Required for storing and retrieving screenshots, taking photos, accessing media files -->
2122
<uses-permission
2223
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
Binary file not shown.

0 commit comments

Comments
 (0)